Skip to content

Commit c27518a

Browse files
Apply PR #12633: feat(tui): add auto-accept mode for permission requests
2 parents 4865242 + e31f00a commit c27518a

File tree

11 files changed

+84
-24
lines changed

11 files changed

+84
-24
lines changed

packages/opencode/src/agent/agent.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ export namespace Agent {
6363
question: "deny",
6464
plan_enter: "deny",
6565
plan_exit: "deny",
66+
edit: "ask",
6667
// mirrors github.com/github/gitignore Node.gitignore pattern for .env files
6768
read: {
6869
"*": "allow",

packages/opencode/src/cli/cmd/run.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,11 @@ export const RunCommand = cmd({
366366
action: "deny",
367367
pattern: "*",
368368
},
369+
{
370+
permission: "edit",
371+
action: "allow",
372+
pattern: "*",
373+
},
369374
]
370375

371376
function title() {

packages/opencode/src/cli/cmd/tui/app.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,7 @@ function App() {
457457
{
458458
title: "Toggle MCPs",
459459
value: "mcp.list",
460+
search: "toggle mcps",
460461
category: "Agent",
461462
slash: {
462463
name: "mcps",
@@ -532,8 +533,9 @@ function App() {
532533
category: "System",
533534
},
534535
{
535-
title: "Toggle appearance",
536+
title: mode() === "dark" ? "Light mode" : "Dark mode",
536537
value: "theme.switch_mode",
538+
search: "toggle appearance",
537539
onSelect: (dialog) => {
538540
setMode(mode() === "dark" ? "light" : "dark")
539541
dialog.clear()
@@ -572,6 +574,7 @@ function App() {
572574
},
573575
{
574576
title: "Toggle debug panel",
577+
search: "toggle debug",
575578
category: "System",
576579
value: "app.debug",
577580
onSelect: (dialog) => {
@@ -581,6 +584,7 @@ function App() {
581584
},
582585
{
583586
title: "Toggle console",
587+
search: "toggle console",
584588
category: "System",
585589
value: "app.console",
586590
onSelect: (dialog) => {
@@ -621,6 +625,7 @@ function App() {
621625
{
622626
title: terminalTitleEnabled() ? "Disable terminal title" : "Enable terminal title",
623627
value: "terminal.title.toggle",
628+
search: "toggle terminal title",
624629
keybind: "terminal_title_toggle",
625630
category: "System",
626631
onSelect: (dialog) => {
@@ -636,6 +641,7 @@ function App() {
636641
{
637642
title: kv.get("animations_enabled", true) ? "Disable animations" : "Enable animations",
638643
value: "app.toggle.animations",
644+
search: "toggle animations",
639645
category: "System",
640646
onSelect: (dialog) => {
641647
kv.set("animations_enabled", !kv.get("animations_enabled", true))
@@ -645,6 +651,7 @@ function App() {
645651
{
646652
title: kv.get("diff_wrap_mode", "word") === "word" ? "Disable diff wrapping" : "Enable diff wrapping",
647653
value: "app.toggle.diffwrap",
654+
search: "toggle diff wrapping",
648655
category: "System",
649656
onSelect: (dialog) => {
650657
const current = kv.get("diff_wrap_mode", "word")

packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx

Lines changed: 35 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ export function Prompt(props: PromptProps) {
7575
const renderer = useRenderer()
7676
const { theme, syntax } = useTheme()
7777
const kv = useKV()
78+
const [autoaccept, setAutoaccept] = kv.signal<"none" | "edit">("permission_auto_accept", "edit")
7879

7980
function promptModelWarning() {
8081
toast.show({
@@ -168,6 +169,17 @@ export function Prompt(props: PromptProps) {
168169

169170
command.register(() => {
170171
return [
172+
{
173+
title: autoaccept() === "none" ? "Enable autoedit" : "Disable autoedit",
174+
value: "permission.auto_accept.toggle",
175+
search: "toggle permissions",
176+
keybind: "permission_auto_accept_toggle",
177+
category: "Agent",
178+
onSelect: (dialog) => {
179+
setAutoaccept(() => (autoaccept() === "none" ? "edit" : "none"))
180+
dialog.clear()
181+
},
182+
},
171183
{
172184
title: "Clear prompt",
173185
value: "prompt.clear",
@@ -994,23 +1006,30 @@ export function Prompt(props: PromptProps) {
9941006
cursorColor={theme.text}
9951007
syntaxStyle={syntax()}
9961008
/>
997-
<box flexDirection="row" flexShrink={0} paddingTop={1} gap={1}>
998-
<text fg={highlight()}>
999-
{store.mode === "shell" ? "Shell" : Locale.titlecase(local.agent.current().name)}{" "}
1000-
</text>
1001-
<Show when={store.mode === "normal"}>
1002-
<box flexDirection="row" gap={1}>
1003-
<text flexShrink={0} fg={keybind.leader ? theme.textMuted : theme.text}>
1004-
{local.model.parsed().model}
1005-
</text>
1006-
<text fg={theme.textMuted}>{local.model.parsed().provider}</text>
1007-
<Show when={showVariant()}>
1008-
<text fg={theme.textMuted}>·</text>
1009-
<text>
1010-
<span style={{ fg: theme.warning, bold: true }}>{local.model.variant.current()}</span>
1009+
<box flexDirection="row" flexShrink={0} paddingTop={1} gap={1} justifyContent="space-between">
1010+
<box flexDirection="row" gap={1}>
1011+
<text fg={highlight()}>
1012+
{store.mode === "shell" ? "Shell" : Locale.titlecase(local.agent.current().name)}{" "}
1013+
</text>
1014+
<Show when={store.mode === "normal"}>
1015+
<box flexDirection="row" gap={1}>
1016+
<text flexShrink={0} fg={keybind.leader ? theme.textMuted : theme.text}>
1017+
{local.model.parsed().model}
10111018
</text>
1012-
</Show>
1013-
</box>
1019+
<text fg={theme.textMuted}>{local.model.parsed().provider}</text>
1020+
<Show when={showVariant()}>
1021+
<text fg={theme.textMuted}>·</text>
1022+
<text>
1023+
<span style={{ fg: theme.warning, bold: true }}>{local.model.variant.current()}</span>
1024+
</text>
1025+
</Show>
1026+
</box>
1027+
</Show>
1028+
</box>
1029+
<Show when={autoaccept() === "edit"}>
1030+
<text>
1031+
<span style={{ fg: theme.warning }}>autoedit</span>
1032+
</text>
10141033
</Show>
10151034
</box>
10161035
</box>

packages/opencode/src/cli/cmd/tui/context/sync.tsx

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import { createSimpleContext } from "./helper"
2525
import type { Snapshot } from "@/snapshot"
2626
import { useExit } from "./exit"
2727
import { useArgs } from "./args"
28+
import { useKV } from "./kv"
2829
import { batch, onMount } from "solid-js"
2930
import { Log } from "@/util/log"
3031
import type { Path } from "@opencode-ai/sdk"
@@ -103,6 +104,8 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
103104
})
104105

105106
const sdk = useSDK()
107+
const kv = useKV()
108+
const [autoaccept] = kv.signal<"none" | "edit">("permission_auto_accept", "edit")
106109

107110
sdk.event.listen((e) => {
108111
const event = e.details
@@ -127,6 +130,13 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
127130

128131
case "permission.asked": {
129132
const request = event.properties
133+
if (autoaccept() === "edit" && request.permission === "edit") {
134+
sdk.client.permission.reply({
135+
reply: "once",
136+
requestID: request.id,
137+
})
138+
break
139+
}
130140
const requests = store.permission[request.sessionID]
131141
if (!requests) {
132142
setStore("permission", request.sessionID, [request])
@@ -441,6 +451,7 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
441451
get ready() {
442452
return store.status !== "loading"
443453
},
454+
444455
session: {
445456
get(sessionID: string) {
446457
const match = Binary.search(store.session, sessionID, (s) => s.id)

packages/opencode/src/cli/cmd/tui/routes/home.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ export function Home() {
4646
{
4747
title: tipsHidden() ? "Show tips" : "Hide tips",
4848
value: "tips.toggle",
49+
search: "toggle tips",
4950
keybind: "tips_toggle",
5051
category: "System",
5152
onSelect: (dialog) => {

packages/opencode/src/cli/cmd/tui/routes/session/index.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,7 @@ export function Session() {
515515
{
516516
title: sidebarVisible() ? "Hide sidebar" : "Show sidebar",
517517
value: "session.sidebar.toggle",
518+
search: "toggle sidebar",
518519
keybind: "sidebar_toggle",
519520
category: "Session",
520521
onSelect: (dialog) => {
@@ -529,6 +530,7 @@ export function Session() {
529530
{
530531
title: conceal() ? "Disable code concealment" : "Enable code concealment",
531532
value: "session.toggle.conceal",
533+
search: "toggle code concealment",
532534
keybind: "messages_toggle_conceal" as any,
533535
category: "Session",
534536
onSelect: (dialog) => {
@@ -539,6 +541,7 @@ export function Session() {
539541
{
540542
title: showTimestamps() ? "Hide timestamps" : "Show timestamps",
541543
value: "session.toggle.timestamps",
544+
search: "toggle timestamps",
542545
category: "Session",
543546
slash: {
544547
name: "timestamps",
@@ -552,6 +555,7 @@ export function Session() {
552555
{
553556
title: showThinking() ? "Hide thinking" : "Show thinking",
554557
value: "session.toggle.thinking",
558+
search: "toggle thinking",
555559
keybind: "display_thinking",
556560
category: "Session",
557561
slash: {
@@ -566,6 +570,7 @@ export function Session() {
566570
{
567571
title: showDetails() ? "Hide tool details" : "Show tool details",
568572
value: "session.toggle.actions",
573+
search: "toggle tool details",
569574
keybind: "tool_details",
570575
category: "Session",
571576
onSelect: (dialog) => {
@@ -574,8 +579,9 @@ export function Session() {
574579
},
575580
},
576581
{
577-
title: "Toggle session scrollbar",
582+
title: showScrollbar() ? "Hide session scrollbar" : "Show session scrollbar",
578583
value: "session.toggle.scrollbar",
584+
search: "toggle session scrollbar",
579585
keybind: "scrollbar_toggle",
580586
category: "Session",
581587
onSelect: (dialog) => {

packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ export interface DialogSelectOption<T = any> {
3434
title: string
3535
value: T
3636
description?: string
37+
search?: string
3738
footer?: JSX.Element | string
3839
category?: string
3940
disabled?: boolean
@@ -85,8 +86,8 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
8586
// users typically search by the item name, and not its category.
8687
const result = fuzzysort
8788
.go(needle, options, {
88-
keys: ["title", "category"],
89-
scoreFn: (r) => r[0].score * 2 + r[1].score,
89+
keys: ["title", "category", "search"],
90+
scoreFn: (r) => r[0].score * 2 + r[1].score + r[2].score,
9091
})
9192
.map((x) => x.obj)
9293

packages/opencode/src/config/config.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,12 @@ export namespace Config {
821821
command_list: z.string().optional().default("ctrl+p").describe("List available commands"),
822822
agent_list: z.string().optional().default("<leader>a").describe("List agents"),
823823
agent_cycle: z.string().optional().default("tab").describe("Next agent"),
824-
agent_cycle_reverse: z.string().optional().default("shift+tab").describe("Previous agent"),
824+
agent_cycle_reverse: z.string().optional().default("none").describe("Previous agent"),
825+
permission_auto_accept_toggle: z
826+
.string()
827+
.optional()
828+
.default("shift+tab")
829+
.describe("Toggle auto-accept mode for permissions"),
825830
variant_cycle: z.string().optional().default("ctrl+t").describe("Cycle model variants"),
826831
input_clear: z.string().optional().default("ctrl+c").describe("Clear input field"),
827832
input_paste: z.string().optional().default("ctrl+v").describe("Paste from clipboard"),

packages/opencode/test/agent/agent.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ test("build agent has correct default properties", async () => {
3838
expect(build).toBeDefined()
3939
expect(build?.mode).toBe("primary")
4040
expect(build?.native).toBe(true)
41-
expect(evalPerm(build, "edit")).toBe("allow")
41+
expect(evalPerm(build, "edit")).toBe("ask")
4242
expect(evalPerm(build, "bash")).toBe("allow")
4343
},
4444
})
@@ -203,8 +203,8 @@ test("agent permission config merges with defaults", async () => {
203203
expect(build).toBeDefined()
204204
// Specific pattern is denied
205205
expect(PermissionNext.evaluate("bash", "rm -rf *", build!.permission).action).toBe("deny")
206-
// Edit still allowed
207-
expect(evalPerm(build, "edit")).toBe("allow")
206+
// Edit still asks (default behavior)
207+
expect(evalPerm(build, "edit")).toBe("ask")
208208
},
209209
})
210210
})

0 commit comments

Comments
 (0)