fix(run): inherit main-session tool permissions for continuation prompts

src/shared/index.ts

@@ -56,3 +56,4 @@ export * from "./opencode-storage-paths"
 export * from "./opencode-message-dir"
 export * from "./normalize-sdk-response"
 export * from "./session-directory-resolver"
+export * from "./prompt-tools"

src/shared/prompt-tools.test.ts

@@ -0,0 +1,56 @@
+declare const require: (name: string) => any
+const { afterEach, describe, expect, test } = require("bun:test")
+import { clearSessionTools, setSessionTools } from "./session-tools-store"
+import { normalizePromptTools, resolveInheritedPromptTools } from "./prompt-tools"
+
+describe("prompt-tools", () => {
+  afterEach(() => {
+    clearSessionTools()
+  })
+
+  test("normalizes allow/deny style permissions to boolean tools", () => {
+    // given
+    const tools = {
+      question: "deny",
+      bash: "allow",
+      task: "ask",
+      read: true,
+      edit: false,
+    } as const
+
+    // when
+    const normalized = normalizePromptTools(tools)
+
+    // then
+    expect(normalized).toEqual({
+      question: false,
+      bash: true,
+      task: true,
+      read: true,
+      edit: false,
+    })
+  })
+
+  test("prefers per-session stored tools over fallback tools", () => {
+    // given
+    const sessionID = "ses_prompt_tools"
+    setSessionTools(sessionID, { question: false, bash: true })
+
+    // when
+    const resolved = resolveInheritedPromptTools(sessionID, { question: true, bash: false })
+
+    // then
+    expect(resolved).toEqual({ question: false, bash: true })
+  })
+
+  test("uses fallback tools when no per-session tools exist", () => {
+    // given
+    const sessionID = "ses_fallback_only"
+
+    // when
+    const resolved = resolveInheritedPromptTools(sessionID, { question: "deny", write: "allow" })
+
+    // then
+    expect(resolved).toEqual({ question: false, write: true })
+  })
+})

src/shared/prompt-tools.ts

@@ -0,0 +1,35 @@
+import { getSessionTools } from "./session-tools-store"
+
+export type PromptToolPermission = boolean | "allow" | "deny" | "ask"
+
+export function normalizePromptTools(
+  tools: Record<string, PromptToolPermission> | undefined
+): Record<string, boolean> | undefined {
+  if (!tools) {
+    return undefined
+  }
+
+  const normalized: Record<string, boolean> = {}
+  for (const [toolName, permission] of Object.entries(tools)) {
+    if (permission === false || permission === "deny") {
+      normalized[toolName] = false
+      continue
+    }
+    if (permission === true || permission === "allow" || permission === "ask") {
+      normalized[toolName] = true
+    }
+  }
+
+  return Object.keys(normalized).length > 0 ? normalized : undefined
+}
+
+export function resolveInheritedPromptTools(
+  sessionID: string,
+  fallbackTools?: Record<string, PromptToolPermission>
+): Record<string, boolean> | undefined {
+  const sessionTools = getSessionTools(sessionID)
+  if (sessionTools && Object.keys(sessionTools).length > 0) {
+    return { ...sessionTools }
+  }
+  return normalizePromptTools(fallbackTools)
+}