Skip to content

feat(tui): add approval command dialog #7981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
T1mn wants to merge 1 commit into
base: dev
Choose a base branch
from
+164 −46
Open

feat(tui): add approval command dialog #7981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions packages/opencode/src/cli/cmd/tui/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { DialogHelp } from "./ui/dialog-help"
import { CommandProvider, useCommandDialog } from "@tui/component/dialog-command"
import { DialogAgent } from "@tui/component/dialog-agent"
import { DialogSessionList } from "@tui/component/dialog-session-list"
import { DialogApproval } from "@tui/component/dialog-approval"
import { KeybindProvider } from "@tui/context/keybind"
import { ThemeProvider, useTheme } from "@tui/context/theme"
import { Home } from "@tui/routes/home"
Expand Down Expand Up @@ -314,6 +315,23 @@ function App() {
dialog.clear()
},
},
{
title: "Approval mode",
value: "session.approval",
category: "Permissions",
disabled: route.data.type !== "session",
onSelect: () => {
const sessionID = route.data.type === "session" ? route.data.sessionID : undefined
if (!sessionID) {
toast.show({
variant: "warning",
message: "Open a session to update approvals",
})
return
}
dialog.replace(() => <DialogApproval sessionID={sessionID} />)
},
},
{
title: "Switch model",
value: "model.list",
Expand Down
60 changes: 60 additions & 0 deletions packages/opencode/src/cli/cmd/tui/component/dialog-approval.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
import { DialogSelect } from "@tui/ui/dialog-select"
import { useDialog } from "@tui/ui/dialog"
import { useSDK } from "@tui/context/sdk"
import { useToast } from "@tui/ui/toast"

type ApprovalMode = "allow" | "ask" | "reject"

type ApprovalOption = {
title: string
value: ApprovalMode
description: string
}

const options: ApprovalOption[] = [
{
title: "Allow",
value: "allow",
description: "Auto-approve tools",
},
{
title: "Ask",
value: "ask",
description: "Ask for each tool",
},
{
title: "Reject",
value: "reject",
description: "Deny all tools",
},
]

export function DialogApproval(props: { sessionID: string }) {
const sdk = useSDK()
const dialog = useDialog()
const toast = useToast()

const apply = (mode: ApprovalMode) => {
const action = mode === "reject" ? "deny" : mode
sdk.client.session
.update({
sessionID: props.sessionID,
permission: [{ permission: "*", pattern: "*", action }],
})
.then(() => {
dialog.clear()
toast.show({
variant: "success",
message: `Approval mode: ${mode}`,
})
})
.catch(() => {
toast.show({
variant: "error",
message: "Failed to update approvals",
})
})
}

return <DialogSelect title="Approval mode" options={options} onSelect={(option) => apply(option.value)} />
}
5 changes: 5 additions & 0 deletions packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,11 @@ export function Autocomplete(props: {
description: "create a new session",
onSelect: () => command.trigger("session.new"),
},
{
display: "/approval",
description: "set approval mode",
onSelect: () => command.trigger("session.approval"),
},
{
display: "/models",
description: "list models",
Expand Down
119 changes: 73 additions & 46 deletions packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import { createColors, createFrames } from "../../ui/spinner.ts"
import { useDialog } from "@tui/ui/dialog"
import { DialogProvider as DialogProviderConnect } from "../dialog-provider"
import { DialogAlert } from "../../ui/dialog-alert"
import { DialogApproval } from "../dialog-approval"
import { useToast } from "../../ui/toast"
import { useKV } from "../../context/kv"
import { useTextareaKeybindings } from "../textarea-keybindings"
Expand Down Expand Up @@ -495,14 +496,26 @@ export function Prompt(props: PromptProps) {
promptModelWarning()
return
}
let inputText = store.prompt.input
const isApproval = inputText.startsWith("/approval")
if (isApproval && !props.sessionID) {
toast.show({
variant: "warning",
message: "Open a session to update approvals",
})
input.extmarks.clear()
input.clear()
setStore("prompt", { input: "", parts: [] })
setStore("extmarkToPartIndex", new Map())
return
}
const sessionID = props.sessionID
? props.sessionID
: await (async () => {
const sessionID = await sdk.client.session.create({}).then((x) => x.data!.id)
return sessionID
})()
const messageID = Identifier.ascending("message")
let inputText = store.prompt.input

// Expand pasted text inline before submitting
const allExtmarks = input.extmarks.getAllForTypeId(promptPartTypeId)
Expand All @@ -527,7 +540,8 @@ export function Prompt(props: PromptProps) {
const currentMode = store.mode
const variant = local.model.variant.current()

if (store.mode === "shell") {
const isShell = store.mode === "shell"
if (isShell) {
sdk.client.session.shell({
sessionID,
agent: local.agent.current().name,
Expand All @@ -538,50 +552,63 @@ export function Prompt(props: PromptProps) {
command: inputText,
})
setStore("mode", "normal")
} else if (
inputText.startsWith("/") &&
iife(() => {
const command = inputText.split(" ")[0].slice(1)
console.log(command)
return sync.data.command.some((x) => x.name === command)
})
) {
let [command, ...args] = inputText.split(" ")
sdk.client.session.command({
sessionID,
command: command.slice(1),
arguments: args.join(" "),
agent: local.agent.current().name,
model: `${selectedModel.providerID}/${selectedModel.modelID}`,
messageID,
variant,
parts: nonTextParts
.filter((x) => x.type === "file")
.map((x) => ({
id: Identifier.ascending("part"),
...x,
})),
})
} else {
sdk.client.session.prompt({
sessionID,
...selectedModel,
messageID,
agent: local.agent.current().name,
model: selectedModel,
variant,
parts: [
{
id: Identifier.ascending("part"),
type: "text",
text: inputText,
},
...nonTextParts.map((x) => ({
id: Identifier.ascending("part"),
...x,
})),
],
})
}

if (!isShell) {
if (inputText.startsWith("/approval")) {
dialog.replace(() => <DialogApproval sessionID={sessionID} />)
input.extmarks.clear()
setStore("prompt", { input: "", parts: [] })
setStore("extmarkToPartIndex", new Map())
input.clear()
return
}

if (
inputText.startsWith("/") &&
iife(() => {
const command = inputText.split(" ")[0].slice(1)
console.log(command)
return sync.data.command.some((x) => x.name === command)
})
) {
const [command, ...args] = inputText.split(" ")
sdk.client.session.command({
sessionID,
command: command.slice(1),
arguments: args.join(" "),
agent: local.agent.current().name,
model: `${selectedModel.providerID}/${selectedModel.modelID}`,
messageID,
variant,
parts: nonTextParts
.filter((x) => x.type === "file")
.map((x) => ({
id: Identifier.ascending("part"),
...x,
})),
})
} else {
sdk.client.session.prompt({
sessionID,
...selectedModel,
messageID,
agent: local.agent.current().name,
model: selectedModel,
variant,
parts: [
{
id: Identifier.ascending("part"),
type: "text",
text: inputText,
},
...nonTextParts.map((x) => ({
id: Identifier.ascending("part"),
...x,
})),
],
})
}
}
history.append({
...store.prompt,
Expand Down
2 changes: 2 additions & 0 deletions packages/opencode/src/server/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,6 +939,7 @@ export namespace Server {
archived: z.number().optional(),
})
.optional(),
permission: PermissionNext.Ruleset.optional(),
}),
),
async (c) => {
Expand All @@ -950,6 +951,7 @@ export namespace Server {
session.title = updates.title
}
if (updates.time?.archived !== undefined) session.time.archived = updates.time.archived
if (updates.permission !== undefined) session.permission = updates.permission
})

return c.json(updatedSession)
Expand Down
2 changes: 2 additions & 0 deletions packages/sdk/js/src/v2/gen/sdk.gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -938,6 +938,7 @@ export class Session extends HeyApiClient {
time?: {
archived?: number
}
permission?: PermissionRuleset
},
options?: Options<never, ThrowOnError>,
) {
Expand All @@ -950,6 +951,7 @@ export class Session extends HeyApiClient {
{ in: "query", key: "directory" },
{ in: "body", key: "title" },
{ in: "body", key: "time" },
{ in: "body", key: "permission" },
],
},
],
Expand Down
1 change: 1 addition & 0 deletions packages/sdk/js/src/v2/gen/types.gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2742,6 +2742,7 @@ export type SessionUpdateData = {
time?: {
archived?: number
}
permission?: PermissionRuleset
}
path: {
sessionID: string
Expand Down
3 changes: 3 additions & 0 deletions packages/sdk/openapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1339,6 +1339,9 @@
"type": "number"
}
}
},
"permission": {
"$ref": "#/components/schemas/PermissionRuleset"
}
}
}
Expand Down