Skip to content

Commit e37fd9c

Browse files
thdxrthdxr
authored
core: add interactive question tool for gathering user preferences and clarifying instructions (anomalyco#7268)
1 parent 2e4fe97 commit e37fd9c

File tree

19 files changed

+3966
-2695
lines changed

19 files changed

+3966
-2695
lines changed

‎STYLE_GUIDE.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
## Style Guide
22

33
- Try to keep things in one function unless composable or reusable
4-
- AVOID unnecessary destructuring of variables
4+
- AVOID unnecessary destructuring of variables. instead of doing `const { a, b }
5+
= obj` just reference it as obj.a and obj.b. this preserves context
56
- AVOID `try`/`catch` where possible
67
- AVOID `else` statements
78
- AVOID using `any` type

‎packages/opencode/src/agent/agent.ts‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ export namespace Agent {
5151
"*": "ask",
5252
[Truncate.DIR]: "allow",
5353
},
54+
question: "deny",
5455
// mirrors github.com/github/gitignore Node.gitignore pattern for .env files
5556
read: {
5657
"*": "allow",
@@ -65,7 +66,13 @@ export namespace Agent {
6566
build: {
6667
name: "build",
6768
options: {},
68-
permission: PermissionNext.merge(defaults, user),
69+
permission: PermissionNext.merge(
70+
defaults,
71+
PermissionNext.fromConfig({
72+
question: "allow",
73+
}),
74+
user,
75+
),
6976
mode: "primary",
7077
native: true,
7178
},
@@ -75,6 +82,7 @@ export namespace Agent {
7582
permission: PermissionNext.merge(
7683
defaults,
7784
PermissionNext.fromConfig({
85+
question: "allow",
7886
edit: {
7987
"*": "deny",
8088
".opencode/plan/*.md": "allow",

‎packages/opencode/src/cli/cmd/github.ts‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,15 @@ export const GithubRunCommand = cmd({
515515

516516
// Setup opencode session
517517
const repoData = await fetchRepo()
518-
session = await Session.create({})
518+
session = await Session.create({
519+
permission: [
520+
{
521+
permission: "question",
522+
action: "deny",
523+
pattern: "*",
524+
},
525+
],
526+
})
519527
subscribeSessionEvents()
520528
shareId = await (async () => {
521529
if (share === false) return

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

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,28 @@ export const RunCommand = cmd({
292292
: args.title
293293
: undefined
294294

295-
const result = await sdk.session.create(title ? { title } : {})
295+
const result = await sdk.session.create(
296+
title
297+
? {
298+
title,
299+
permission: [
300+
{
301+
permission: "question",
302+
action: "deny",
303+
pattern: "*",
304+
},
305+
],
306+
}
307+
: {
308+
permission: [
309+
{
310+
permission: "question",
311+
action: "deny",
312+
pattern: "*",
313+
},
314+
],
315+
},
316+
)
296317
return result.data?.id
297318
})()
298319

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

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import type {
88
Todo,
99
Command,
1010
PermissionRequest,
11+
QuestionRequest,
1112
LspStatus,
1213
McpStatus,
1314
McpResource,
@@ -42,6 +43,9 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
4243
permission: {
4344
[sessionID: string]: PermissionRequest[]
4445
}
46+
question: {
47+
[sessionID: string]: QuestionRequest[]
48+
}
4549
config: Config
4650
session: Session[]
4751
session_status: {
@@ -80,6 +84,7 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
8084
status: "loading",
8185
agent: [],
8286
permission: {},
87+
question: {},
8388
command: [],
8489
provider: [],
8590
provider_default: {},
@@ -142,6 +147,44 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
142147
break
143148
}
144149

150+
case "question.replied":
151+
case "question.rejected": {
152+
const requests = store.question[event.properties.sessionID]
153+
if (!requests) break
154+
const match = Binary.search(requests, event.properties.requestID, (r) => r.id)
155+
if (!match.found) break
156+
setStore(
157+
"question",
158+
event.properties.sessionID,
159+
produce((draft) => {
160+
draft.splice(match.index, 1)
161+
}),
162+
)
163+
break
164+
}
165+
166+
case "question.asked": {
167+
const request = event.properties
168+
const requests = store.question[request.sessionID]
169+
if (!requests) {
170+
setStore("question", request.sessionID, [request])
171+
break
172+
}
173+
const match = Binary.search(requests, request.id, (r) => r.id)
174+
if (match.found) {
175+
setStore("question", request.sessionID, match.index, reconcile(request))
176+
break
177+
}
178+
setStore(
179+
"question",
180+
request.sessionID,
181+
produce((draft) => {
182+
draft.splice(match.index, 0, request)
183+
}),
184+
)
185+
break
186+
}
187+
145188
case "todo.updated":
146189
setStore("todo", event.properties.sessionID, event.properties.todos)
147190
break

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

Lines changed: 49 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import type { EditTool } from "@/tool/edit"
4141
import type { PatchTool } from "@/tool/patch"
4242
import type { WebFetchTool } from "@/tool/webfetch"
4343
import type { TaskTool } from "@/tool/task"
44+
import type { QuestionTool } from "@/tool/question"
4445
import { useKeyboard, useRenderer, useTerminalDimensions, type JSX } from "@opentui/solid"
4546
import { useSDK } from "@tui/context/sdk"
4647
import { useCommandDialog } from "@tui/component/dialog-command"
@@ -69,6 +70,7 @@ import { usePromptRef } from "../../context/prompt"
6970
import { useExit } from "../../context/exit"
7071
import { Filesystem } from "@/util/filesystem"
7172
import { PermissionPrompt } from "./permission"
73+
import { QuestionPrompt } from "./question"
7274
import { DialogExportOptions } from "../../ui/dialog-export-options"
7375
import { formatTranscript } from "../../util/transcript"
7476

@@ -118,9 +120,13 @@ export function Session() {
118120
})
119121
const messages = createMemo(() => sync.data.message[route.sessionID] ?? [])
120122
const permissions = createMemo(() => {
121-
if (session()?.parentID) return sync.data.permission[route.sessionID] ?? []
123+
if (session()?.parentID) return []
122124
return children().flatMap((x) => sync.data.permission[x.id] ?? [])
123125
})
126+
const questions = createMemo(() => {
127+
if (session()?.parentID) return []
128+
return children().flatMap((x) => sync.data.question[x.id] ?? [])
129+
})
124130

125131
const pending = createMemo(() => {
126132
return messages().findLast((x) => x.role === "assistant" && !x.time.completed)?.id
@@ -1037,8 +1043,11 @@ export function Session() {
10371043
<Show when={permissions().length > 0}>
10381044
<PermissionPrompt request={permissions()[0]} />
10391045
</Show>
1046+
<Show when={permissions().length === 0 && questions().length > 0}>
1047+
<QuestionPrompt request={questions()[0]} />
1048+
</Show>
10401049
<Prompt
1041-
visible={!session()?.parentID && permissions().length === 0}
1050+
visible={!session()?.parentID && permissions().length === 0 && questions().length === 0}
10421051
ref={(r) => {
10431052
prompt = r
10441053
promptRef.set(r)
@@ -1047,7 +1056,7 @@ export function Session() {
10471056
r.set(route.initialPrompt)
10481057
}
10491058
}}
1050-
disabled={permissions().length > 0}
1059+
disabled={permissions().length > 0 || questions().length > 0}
10511060
onSubmit={() => {
10521061
toBottom()
10531062
}}
@@ -1381,6 +1390,9 @@ function ToolPart(props: { last: boolean; part: ToolPart; message: AssistantMess
13811390
<Match when={props.part.tool === "todowrite"}>
13821391
<TodoWrite {...toolprops} />
13831392
</Match>
1393+
<Match when={props.part.tool === "question"}>
1394+
<Question {...toolprops} />
1395+
</Match>
13841396
<Match when={true}>
13851397
<GenericTool {...toolprops} />
13861398
</Match>
@@ -1442,7 +1454,12 @@ function InlineTool(props: {
14421454

14431455
const error = createMemo(() => (props.part.state.status === "error" ? props.part.state.error : undefined))
14441456

1445-
const denied = createMemo(() => error()?.includes("rejected permission") || error()?.includes("specified a rule"))
1457+
const denied = createMemo(
1458+
() =>
1459+
error()?.includes("rejected permission") ||
1460+
error()?.includes("specified a rule") ||
1461+
error()?.includes("user dismissed"),
1462+
)
14461463

14471464
return (
14481465
<box
@@ -1816,6 +1833,34 @@ function TodoWrite(props: ToolProps<typeof TodoWriteTool>) {
18161833
)
18171834
}
18181835

1836+
function Question(props: ToolProps<typeof QuestionTool>) {
1837+
const { theme } = useTheme()
1838+
const count = createMemo(() => props.input.questions?.length ?? 0)
1839+
return (
1840+
<Switch>
1841+
<Match when={props.metadata.answers}>
1842+
<BlockTool title="# Questions" part={props.part}>
1843+
<box>
1844+
<For each={props.input.questions ?? []}>
1845+
{(q, i) => (
1846+
<box flexDirection="row" gap={1}>
1847+
<text fg={theme.textMuted}>{q.question}</text>
1848+
<text fg={theme.text}>{props.metadata.answers?.[i()] || "(no answer)"}</text>
1849+
</box>
1850+
)}
1851+
</For>
1852+
</box>
1853+
</BlockTool>
1854+
</Match>
1855+
<Match when={true}>
1856+
<InlineTool icon="→" pending="Asking questions..." complete={count()} part={props.part}>
1857+
Asked {count()} question{count() !== 1 ? "s" : ""}
1858+
</InlineTool>
1859+
</Match>
1860+
</Switch>
1861+
)
1862+
}
1863+
18191864
function normalizePath(input?: string) {
18201865
if (!input) return ""
18211866
if (path.isAbsolute(input)) {

0 commit comments

Comments
 (0)