diff --git a/packages/tui/src/mini/footer.permission.tsx b/packages/tui/src/mini/footer.permission.tsx
index 6f11e8573a0b..47f4404ad97c 100644
--- a/packages/tui/src/mini/footer.permission.tsx
+++ b/packages/tui/src/mini/footer.permission.tsx
@@ -29,7 +29,7 @@ import {
type PermissionOption,
} from "./permission.shared"
import { stringWidth } from "../util/string-width"
-import { toolFiletype } from "./tool"
+import { toolFiletype, toolPath } from "./tool"
import { transparent, type RunBlockTheme, type RunFooterTheme } from "./theme"
import type { MiniPermissionRequest, PermissionReply } from "./types"
import { PatchDiff } from "../component/patch-diff"
@@ -154,7 +154,6 @@ export function RunPermissionBody(props: {
const [state, setState] = createSignal(createPermissionBodyState(props.request))
const stage = createMemo(() => state().stage)
const info = createMemo(() => permissionInfo(props.request, props.directory?.(), props.mono))
- const ft = createMemo(() => toolFiletype(info().file))
let scroll: ScrollBoxRenderable | undefined
const scrollbar = createMemo(() => ({
visible: !props.mono,
@@ -452,36 +451,47 @@ export function RunPermissionBody(props: {
}
>
- = 40}
- fallback={
-
- {info().diff}
-
- }
- >
-
-
+
+ {(item) => (
+
+
+
+ {toolPath(item.file, { home: true, directory: props.directory?.() })}
+
+
+ = 40}
+ fallback={
+
+ {item.diff}
+
+ }
+ >
+
+
+
+ )}
+
diff --git a/packages/tui/src/mini/permission.shared.ts b/packages/tui/src/mini/permission.shared.ts
index 38d2de31354a..06e9d3a00c70 100644
--- a/packages/tui/src/mini/permission.shared.ts
+++ b/packages/tui/src/mini/permission.shared.ts
@@ -62,10 +62,15 @@ export function permissionInfo(request: MiniPermissionRequest, directory?: strin
...info,
icon: monoPrefix(info.icon, true),
lines: [
- ...(info.diff || info.patch ? [info.diff ?? info.patch!] : []),
+ ...(info.files
+ ? info.files.flatMap((item) => [toolPath(item.file, { home: true, directory }), item.diff])
+ : info.diff || info.patch
+ ? [info.diff ?? info.patch!]
+ : []),
...info.lines.map((line) => monoPrefix(line, true)),
],
diff: undefined,
+ files: undefined,
patch: undefined,
}
}
diff --git a/packages/tui/src/routes/session/permission.tsx b/packages/tui/src/routes/session/permission.tsx
index 07338aba69d8..2af8b93f940d 100644
--- a/packages/tui/src/routes/session/permission.tsx
+++ b/packages/tui/src/routes/session/permission.tsx
@@ -19,15 +19,21 @@ import { useToast } from "../../ui/toast"
type PermissionStage = "permission" | "reject"
-function EditBody(props: { file?: string; diff?: string; patch?: string }) {
+function EditBody(props: {
+ file?: string
+ diff?: string
+ files?: { file: string; diff: string }[]
+ patch?: string
+ formatPath: (value: string) => string
+}) {
const theme = useTheme()
const themes = useThemes()
const syntax = themes.currentSyntax
const config = useConfig().data
const dimensions = useTerminalDimensions()
- const filepath = createMemo(() => props.file ?? "")
const diff = createMemo(() => props.diff ?? "")
+ const files = createMemo(() => props.files ?? [{ file: props.file ?? "", diff: diff() }])
const view = createMemo(() => {
const diffView = config.diffs?.view
@@ -36,7 +42,6 @@ function EditBody(props: { file?: string; diff?: string; patch?: string }) {
return dimensions().width > 120 ? "split" : "unified"
})
- const ft = createMemo(() => filetype(filepath()))
const scrollAcceleration = createMemo(() => getScrollAcceleration(config))
return (
@@ -52,26 +57,37 @@ function EditBody(props: { file?: string; diff?: string; patch?: string }) {
},
}}
>
-
+
+ {(item) => (
+
+
+
+ {props.formatPath(item.file)}
+
+
+
+
+ )}
+
@@ -167,7 +183,13 @@ export function PermissionPrompt(props: { request: PermissionRequest; directory?
)
const presentationBody = () =>
props.request.action === "edit" ? (
-
+
) : props.request.action === "external_directory" ? (
0}>
diff --git a/packages/tui/src/util/permission.ts b/packages/tui/src/util/permission.ts
index 09d607ff373e..402131f7c6c8 100644
--- a/packages/tui/src/util/permission.ts
+++ b/packages/tui/src/util/permission.ts
@@ -8,6 +8,7 @@ export type PermissionPresentation = {
title: string
lines: string[]
diff?: string
+ files?: { file: string; diff: string }[]
patch?: string
file?: string
}
@@ -31,13 +32,22 @@ export function permissionPresentation(
if (action === "edit") {
const file = text(input.path) || resources[0] || ""
- const first = dict(Array.isArray(metadata.files) ? metadata.files[0] : undefined)
- const diff = text(first.patch) || text(first.diff) || text(metadata.diff) || undefined
+ const entries = Array.isArray(metadata.files) ? metadata.files : []
+ const parsed = entries.flatMap((item) => {
+ const entry = dict(item)
+ const diff = text(entry.patch) || text(entry.diff)
+ return diff ? [{ file: text(entry.file) || text(entry.filePath) || text(entry.relativePath), diff }] : []
+ })
+ // An entry without a patch cannot be shown on its own; fall back to the combined diff instead of hiding it.
+ const files = parsed.length === entries.length || !text(metadata.diff) ? parsed : []
+ const diff = files[0]?.diff || text(metadata.diff) || undefined
+ const count = Math.max(entries.length, parsed.length)
return {
icon: "→",
- title: `Edit ${formatPath(file)}`,
+ title: count > 1 ? `Edit ${count} files` : `Edit ${formatPath(file)}`,
lines: [],
diff,
+ files: files.length > 1 ? files : undefined,
patch: diff ? undefined : text(input.patchText) || undefined,
file,
}
diff --git a/packages/tui/test/cli/tui/permission.edit.test.tsx b/packages/tui/test/cli/tui/permission.edit.test.tsx
new file mode 100644
index 000000000000..9547b227522d
--- /dev/null
+++ b/packages/tui/test/cli/tui/permission.edit.test.tsx
@@ -0,0 +1,79 @@
+/** @jsxImportSource @opentui/solid */
+import type { PermissionRequest } from "@opencode/client"
+import { testRender } from "@opentui/solid"
+import { expect, test } from "bun:test"
+import { ConfigProvider } from "../../../src/config"
+import { ClientProvider } from "../../../src/context/client"
+import { DataProvider } from "../../../src/context/data"
+import { Keymap } from "../../../src/context/keymap"
+import { InteractivityProvider } from "../../../src/context/interactivity"
+import { LocationProvider } from "../../../src/context/location"
+import { ThemeProvider } from "../../../src/context/theme"
+import { PermissionPrompt } from "../../../src/routes/session/permission"
+import { ToastProvider } from "../../../src/ui/toast"
+import { emptyThemeSource, tmpdir } from "../../fixture/fixture"
+import { createApi, createEventStream, createFetch } from "../../fixture/tui-client"
+import { TestTuiContexts } from "../../fixture/tui-environment"
+import { createTuiResolvedConfig } from "../../fixture/tui-runtime"
+
+const file = (name: string, patch: string) => ({ file: name, patch, additions: 1, deletions: 1, status: "modified" })
+
+async function render(root: string, request: PermissionRequest) {
+ const transport = createFetch(() => undefined, createEventStream())
+ const app = await testRender(
+ () => (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ),
+ { width: 100, height: 40, kittyKeyboard: true },
+ )
+ app.renderer.start()
+ await app.renderOnce()
+ await app.renderOnce()
+ return app
+}
+
+test("multi-file edit prompt labels each diff with its own file, including a move target", async () => {
+ await using tmp = await tmpdir()
+ // A move lists source and destination in resources, so resources are longer than the file entries.
+ const app = await render(tmp.path, {
+ id: "per_edit",
+ sessionID: "ses_edit",
+ action: "edit",
+ resources: ["src/old.ts", "src/new.ts", "src/other.ts"],
+ metadata: {
+ files: [
+ file("src/new.ts", "@@ -1 +1 @@\n-one\n+FIRST_DIFF\n"),
+ file("src/other.ts", "@@ -1 +1 @@\n-two\n+SECOND_DIFF\n"),
+ ],
+ },
+ } satisfies PermissionRequest)
+ try {
+ const frame = app.captureCharFrame()
+ expect(frame).toContain("Edit 2 files")
+ expect(frame).toContain("src/new.ts")
+ expect(frame).toContain("src/other.ts")
+ expect(frame).not.toContain("old.ts")
+ expect(frame).toContain("FIRST_DIFF")
+ expect(frame).toContain("SECOND_DIFF")
+ } finally {
+ app.renderer.destroy()
+ }
+})
diff --git a/packages/tui/test/mini/blocker.responsive.test.tsx b/packages/tui/test/mini/blocker.responsive.test.tsx
index b851f1b8bebe..1c177a86c646 100644
--- a/packages/tui/test/mini/blocker.responsive.test.tsx
+++ b/packages/tui/test/mini/blocker.responsive.test.tsx
@@ -497,6 +497,58 @@ test("form review scrolls from the first answer to the last", async () => {
}
})
+test.each([false, true])("multi-file edit permissions label each diff with its file (mono=%s)", async (mono) => {
+ const app = await testRender(
+ () => (
+ "/project"}
+ theme={mono ? RUN_THEME_MONO.footer : RUN_THEME_FALLBACK.footer}
+ block={mono ? RUN_THEME_MONO.block : RUN_THEME_FALLBACK.block}
+ mono={mono}
+ onReply={() => {}}
+ />
+ ),
+ { width: 100, height: 30 },
+ )
+ try {
+ await settle(app)
+ const frame = app.captureCharFrame()
+ expect(frame).toContain("Edit 2 files")
+ expect(frame).toContain("src/new.ts")
+ expect(frame).toContain("src/other.ts")
+ expect(frame).not.toContain("old.ts")
+ expect(frame).toContain("FIRST_DIFF")
+ expect(frame).toContain("SECOND_DIFF")
+ const order = ["src/new.ts", "FIRST_DIFF", "src/other.ts", "SECOND_DIFF"].map((value) => frame.indexOf(value))
+ expect(order).toEqual([...order].sort((a, b) => a - b))
+ } finally {
+ app.renderer.destroy()
+ }
+})
+
test("long permission paths, diffs and persistent scopes remain keyboard accessible", async () => {
const app = await testRender(
() => (
diff --git a/packages/tui/test/mini/permission.shared.test.ts b/packages/tui/test/mini/permission.shared.test.ts
index 0b0af972745e..8eacada19a77 100644
--- a/packages/tui/test/mini/permission.shared.test.ts
+++ b/packages/tui/test/mini/permission.shared.test.ts
@@ -128,6 +128,25 @@ describe("run permission shared", () => {
})
})
+ test("mono mode keeps every file diff of a multi-file edit, each under its path", () => {
+ expect(
+ permissionInfo(
+ req({
+ action: "edit",
+ resources: ["a.ts", "b.ts"],
+ metadata: {
+ files: [
+ { file: "a.ts", patch: "a-diff", additions: 1, deletions: 0, status: "modified" },
+ { file: "b.ts", patch: "b-diff", additions: 1, deletions: 0, status: "modified" },
+ ],
+ },
+ }),
+ undefined,
+ true,
+ ),
+ ).toMatchObject({ title: "Edit 2 files", lines: ["a.ts", "a-diff", "b.ts", "b-diff"] })
+ })
+
test("prefers canonical request metadata over source tool metadata", () => {
expect(
permissionInfo(
diff --git a/packages/tui/test/util/permission.test.ts b/packages/tui/test/util/permission.test.ts
index 4bd7c7cae42a..9489999e6199 100644
--- a/packages/tui/test/util/permission.test.ts
+++ b/packages/tui/test/util/permission.test.ts
@@ -21,3 +21,59 @@ test("preserves permission roots and self-contained metadata", () => {
},
)
})
+
+const info = (file: string, patch: string) => ({ file, patch, additions: 1, deletions: 1, status: "modified" })
+
+test("edit permission exposes every file in a multi-file patch", () => {
+ const result = permissionPresentation({
+ action: "edit",
+ resources: ["src/alpha.ts", "src/beta.ts", "src/gamma.ts"],
+ metadata: {
+ files: [info("src/alpha.ts", "alpha-diff"), info("src/beta.ts", "beta-diff"), info("src/gamma.ts", "gamma-diff")],
+ },
+ })
+ expect(result.files).toEqual([
+ { file: "src/alpha.ts", diff: "alpha-diff" },
+ { file: "src/beta.ts", diff: "beta-diff" },
+ { file: "src/gamma.ts", diff: "gamma-diff" },
+ ])
+ expect(result.title).toBe("Edit 3 files")
+})
+
+test("edit permission labels files by their own path when resources include a move source", () => {
+ // A move lists both the source and the destination in resources, so resources outnumber files.
+ const result = permissionPresentation({
+ action: "edit",
+ resources: ["src/old.ts", "src/new.ts", "src/other.ts"],
+ metadata: { files: [info("src/new.ts", "moved-diff"), info("src/other.ts", "other-diff")] },
+ })
+ expect(result.files).toEqual([
+ { file: "src/new.ts", diff: "moved-diff" },
+ { file: "src/other.ts", diff: "other-diff" },
+ ])
+})
+
+test("edit permission shows the combined diff when a file entry has no patch", () => {
+ const result = permissionPresentation({
+ action: "edit",
+ resources: ["a.ts", "b.ts"],
+ metadata: { diff: "combined-diff", files: [info("a.ts", "a-diff"), info("b.ts", "")] },
+ })
+ expect(result.title).toBe("Edit 2 files")
+ expect(result.files).toBeUndefined()
+ expect(result.diff).toBe("combined-diff")
+})
+
+test("edit permission still reads the legacy filePath label", () => {
+ const result = permissionPresentation({
+ action: "edit",
+ resources: [],
+ metadata: {
+ files: [
+ { filePath: "a.ts", patch: "a-diff" },
+ { filePath: "b.ts", patch: "b-diff" },
+ ],
+ },
+ })
+ expect(result.files?.map((item) => item.file)).toEqual(["a.ts", "b.ts"])
+})