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

src/features/background-agent/manager.ts

@@ -6,7 +6,14 @@ import type {
   ResumeInput,
 } from "./types"
 import { TaskHistory } from "./task-history"
-import { log, getAgentToolRestrictions, normalizeSDKResponse, promptWithModelSuggestionRetry } from "../../shared"
+import {
+  log,
+  getAgentToolRestrictions,
+  normalizePromptTools,
+  normalizeSDKResponse,
+  promptWithModelSuggestionRetry,
+  resolveInheritedPromptTools,
+} from "../../shared"
 import { setSessionTools } from "../../shared/session-tools-store"
 import { ConcurrencyManager } from "./concurrency"
 import type { BackgroundTaskConfig, TmuxConfig } from "../../config/schema"
@@ -1246,12 +1253,19 @@ Use \`background_output(task_id="${task.id}")\` to retrieve this result when rea
 
       let agent: string | undefined = task.parentAgent
       let model: { providerID: string; modelID: string } | undefined
+      let tools: Record<string, boolean> | undefined = task.parentTools
 
       if (this.enableParentSessionNotifications) {
         try {
           const messagesResp = await this.client.session.messages({ path: { id: task.parentSessionID } })
           const messages = normalizeSDKResponse(messagesResp, [] as Array<{
-            info?: { agent?: string; model?: { providerID: string; modelID: string }; modelID?: string; providerID?: string }
+            info?: {
+              agent?: string
+              model?: { providerID: string; modelID: string }
+              modelID?: string
+              providerID?: string
+              tools?: Record<string, boolean | "allow" | "deny" | "ask">
+            }
           }>)
           for (let i = messages.length - 1; i >= 0; i--) {
             const info = messages[i].info
@@ -1261,6 +1275,7 @@ Use \`background_output(task_id="${task.id}")\` to retrieve this result when rea
             if (info?.agent || info?.model || (info?.modelID && info?.providerID)) {
               agent = info.agent ?? task.parentAgent
               model = info.model ?? (info.providerID && info.modelID ? { providerID: info.providerID, modelID: info.modelID } : undefined)
+              tools = normalizePromptTools(info.tools) ?? tools
               break
             }
           }
@@ -1277,8 +1292,11 @@ Use \`background_output(task_id="${task.id}")\` to retrieve this result when rea
           model = currentMessage?.model?.providerID && currentMessage?.model?.modelID
             ? { providerID: currentMessage.model.providerID, modelID: currentMessage.model.modelID }
             : undefined
+          tools = normalizePromptTools(currentMessage?.tools) ?? tools
         }
 
+        tools = resolveInheritedPromptTools(task.parentSessionID, tools)
+
         log("[background-agent] notifyParentSession context:", {
           taskId: task.id,
           resolvedAgent: agent,
@@ -1292,7 +1310,7 @@ Use \`background_output(task_id="${task.id}")\` to retrieve this result when rea
               noReply: !allComplete,
               ...(agent !== undefined ? { agent } : {}),
               ...(model !== undefined ? { model } : {}),
-              ...(task.parentTools ? { tools: task.parentTools } : {}),
+              ...(tools ? { tools } : {}),
               parts: [{ type: "text", text: notification }],
             },
           })

src/features/background-agent/parent-session-context-resolver.ts

@@ -2,6 +2,7 @@ import type { OpencodeClient } from "./constants"
 import type { BackgroundTask } from "./types"
 import { findNearestMessageWithFields } from "../hook-message-injector"
 import { getMessageDir } from "../../shared"
+import { normalizePromptTools, resolveInheritedPromptTools } from "../../shared"
 
 type AgentModel = { providerID: string; modelID: string }
 
@@ -12,6 +13,7 @@ function isObject(value: unknown): value is Record<string, unknown> {
 function extractAgentAndModelFromMessage(message: unknown): {
   agent?: string
   model?: AgentModel
+  tools?: Record<string, boolean>
 } {
   if (!isObject(message)) return {}
   const info = message["info"]
@@ -19,31 +21,33 @@ function extractAgentAndModelFromMessage(message: unknown): {
 
   const agent = typeof info["agent"] === "string" ? info["agent"] : undefined
   const modelObj = info["model"]
+  const tools = normalizePromptTools(isObject(info["tools"]) ? info["tools"] as Record<string, unknown> as Record<string, boolean | "allow" | "deny" | "ask"> : undefined)
   if (isObject(modelObj)) {
     const providerID = modelObj["providerID"]
     const modelID = modelObj["modelID"]
     if (typeof providerID === "string" && typeof modelID === "string") {
-      return { agent, model: { providerID, modelID } }
+      return { agent, model: { providerID, modelID }, tools }
     }
   }
 
   const providerID = info["providerID"]
   const modelID = info["modelID"]
   if (typeof providerID === "string" && typeof modelID === "string") {
-    return { agent, model: { providerID, modelID } }
+    return { agent, model: { providerID, modelID }, tools }
   }
 
-  return { agent }
+  return { agent, tools }
 }
 
 export async function resolveParentSessionAgentAndModel(input: {
   client: OpencodeClient
   task: BackgroundTask
-}): Promise<{ agent?: string; model?: AgentModel }> {
+}): Promise<{ agent?: string; model?: AgentModel; tools?: Record<string, boolean> }> {
   const { client, task } = input
 
   let agent: string | undefined = task.parentAgent
   let model: AgentModel | undefined
+  let tools: Record<string, boolean> | undefined = task.parentTools
 
   try {
     const messagesResp = await client.session.messages({
@@ -55,9 +59,10 @@ export async function resolveParentSessionAgentAndModel(input: {
 
     for (let i = messages.length - 1; i >= 0; i--) {
       const extracted = extractAgentAndModelFromMessage(messages[i])
-      if (extracted.agent || extracted.model) {
+      if (extracted.agent || extracted.model || extracted.tools) {
         agent = extracted.agent ?? task.parentAgent
         model = extracted.model
+        tools = extracted.tools ?? tools
         break
       }
     }
@@ -69,7 +74,8 @@ export async function resolveParentSessionAgentAndModel(input: {
       currentMessage?.model?.providerID && currentMessage?.model?.modelID
         ? { providerID: currentMessage.model.providerID, modelID: currentMessage.model.modelID }
         : undefined
+    tools = normalizePromptTools(currentMessage?.tools) ?? tools
   }
 
-  return { agent, model }
+  return { agent, model, tools: resolveInheritedPromptTools(task.parentSessionID, tools) }
 }

src/features/background-agent/parent-session-notifier.ts

@@ -56,7 +56,7 @@ export async function notifyParentSession(
     completedTasks,
   })
 
-  const { agent, model } = await resolveParentSessionAgentAndModel({ client, task })
+  const { agent, model, tools } = await resolveParentSessionAgentAndModel({ client, task })
 
   log("[background-agent] notifyParentSession context:", {
     taskId: task.id,
@@ -71,7 +71,7 @@ export async function notifyParentSession(
         noReply: !allComplete,
         ...(agent !== undefined ? { agent } : {}),
         ...(model !== undefined ? { model } : {}),
-        ...(task.parentTools ? { tools: task.parentTools } : {}),
+        ...(tools ? { tools } : {}),
         parts: [{ type: "text", text: notification }],
       },
     })