Merge pull request #1833 from code-yeongyu/fix/inherit-parent-session-tools

fix: inherit parent session tool restrictions in background task notifications

src/tools/delegate-task/background-continuation.ts

@@ -2,6 +2,7 @@ import type { DelegateTaskArgs, ToolContextWithMetadata } from "./types"
 import type { ExecutorContext, ParentContext } from "./executor-types"
 import { storeToolMetadata } from "../../features/tool-metadata-store"
 import { formatDetailedError } from "./error-formatting"
+import { getSessionTools } from "../../shared/session-tools-store"
 
 export async function executeBackgroundContinuation(
   args: DelegateTaskArgs,
@@ -19,6 +20,7 @@ export async function executeBackgroundContinuation(
       parentMessageID: parentContext.messageID,
       parentModel: parentContext.model,
       parentAgent: parentContext.agent,
+      parentTools: getSessionTools(parentContext.sessionID),
     })
 
     const bgContMeta = {

src/tools/delegate-task/background-task.ts

@@ -3,6 +3,7 @@ import type { ExecutorContext, ParentContext } from "./executor-types"
 import { getTimingConfig } from "./timing"
 import { storeToolMetadata } from "../../features/tool-metadata-store"
 import { formatDetailedError } from "./error-formatting"
+import { getSessionTools } from "../../shared/session-tools-store"
 
 export async function executeBackgroundTask(
   args: DelegateTaskArgs,
@@ -24,6 +25,7 @@ export async function executeBackgroundTask(
       parentMessageID: parentContext.messageID,
       parentModel: parentContext.model,
       parentAgent: parentContext.agent,
+      parentTools: getSessionTools(parentContext.sessionID),
       model: categoryModel,
       skills: args.load_skills.length > 0 ? args.load_skills : undefined,
       skillContent: systemContent,

src/tools/delegate-task/sync-continuation.ts

@@ -9,6 +9,7 @@ import { promptWithModelSuggestionRetry } from "../../shared/model-suggestion-re
 import { findNearestMessageWithFields } from "../../features/hook-message-injector"
 import { formatDuration } from "./time-formatter"
 import { syncContinuationDeps, type SyncContinuationDeps } from "./sync-continuation-deps"
+import { setSessionTools } from "../../shared/session-tools-store"
 
 export async function executeSyncContinuation(
   args: DelegateTaskArgs,
@@ -77,6 +78,13 @@ export async function executeSyncContinuation(
     }
 
     const allowTask = isPlanFamily(resumeAgent)
+    const tools = {
+      ...(resumeAgent ? getAgentToolRestrictions(resumeAgent) : {}),
+      task: allowTask,
+      call_omo_agent: true,
+      question: false,
+    }
+    setSessionTools(args.session_id!, tools)
 
     await promptWithModelSuggestionRetry(client, {
       path: { id: args.session_id! },
@@ -84,12 +92,7 @@ export async function executeSyncContinuation(
         ...(resumeAgent !== undefined ? { agent: resumeAgent } : {}),
         ...(resumeModel !== undefined ? { model: resumeModel } : {}),
         ...(resumeVariant !== undefined ? { variant: resumeVariant } : {}),
-        tools: {
-          ...(resumeAgent ? getAgentToolRestrictions(resumeAgent) : {}),
-          task: allowTask,
-          call_omo_agent: true, // Intentionally overrides restrictions - continuation context needs delegation capability even for restricted agents
-          question: false,
-        },
+        tools,
         parts: [{ type: "text", text: args.prompt }],
       },
     })

src/tools/delegate-task/sync-prompt-sender.ts

@@ -3,6 +3,7 @@ import { isPlanFamily } from "./constants"
 import { promptWithModelSuggestionRetry } from "../../shared/model-suggestion-retry"
 import { formatDetailedError } from "./error-formatting"
 import { getAgentToolRestrictions } from "../../shared/agent-tool-restrictions"
+import { setSessionTools } from "../../shared/session-tools-store"
 
 export async function sendSyncPrompt(
   client: OpencodeClient,
@@ -18,17 +19,19 @@ export async function sendSyncPrompt(
 ): Promise<string | null> {
   try {
     const allowTask = isPlanFamily(input.agentToUse)
+    const tools = {
+      task: allowTask,
+      call_omo_agent: true,
+      question: false,
+      ...getAgentToolRestrictions(input.agentToUse),
+    }
+    setSessionTools(input.sessionID, tools)
     await promptWithModelSuggestionRetry(client, {
       path: { id: input.sessionID },
       body: {
         agent: input.agentToUse,
         system: input.systemContent,
-        tools: {
-          task: allowTask,
-          call_omo_agent: true,
-          question: false,
-          ...getAgentToolRestrictions(input.agentToUse),
-        },
+        tools,
         parts: [{ type: "text", text: input.args.prompt }],
         ...(input.categoryModel ? { model: { providerID: input.categoryModel.providerID, modelID: input.categoryModel.modelID } } : {}),
         ...(input.categoryModel?.variant ? { variant: input.categoryModel.variant } : {}),

src/tools/delegate-task/unstable-agent-task.ts

@@ -4,6 +4,7 @@ import { getTimingConfig } from "./timing"
 import { storeToolMetadata } from "../../features/tool-metadata-store"
 import { formatDuration } from "./time-formatter"
 import { formatDetailedError } from "./error-formatting"
+import { getSessionTools } from "../../shared/session-tools-store"
 
 export async function executeUnstableAgentTask(
   args: DelegateTaskArgs,
@@ -26,6 +27,7 @@ export async function executeUnstableAgentTask(
       parentMessageID: parentContext.messageID,
       parentModel: parentContext.model,
       parentAgent: parentContext.agent,
+      parentTools: getSessionTools(parentContext.sessionID),
       model: categoryModel,
       skills: args.load_skills.length > 0 ? args.load_skills : undefined,
       skillContent: systemContent,