@qduc/term2 0.11.1 → 0.13.0

package/dist/non-interactive.js

@@ -1,10 +1,9 @@
 import { createConversationRuntime } from './services/conversation/conversation-runtime-factory.js';
 import { SessionContextService } from './services/session/session-context-service.js';
+import { createCallerOwnedSessionClientFactory, } from './services/session/session-client-factory.js';
 import { randomUUID } from 'node:crypto';
-import { classifyCommandDetailed } from './utils/shell/command-safety/index.js';
-import { SafetyStatus } from './utils/shell/command-safety/constants.js';
-import { evaluateShellAutoApprovalAdvisories } from './services/approval/shell-auto-approval-evaluator.js';
-export const NON_INTERACTIVE_REJECTION_REASON = 'Non-interactive mode: use --auto-approve to allow tool execution';
+import { NonInteractiveApprovalPolicy } from './services/approval/non-interactive-approval-policy.js';
+export { NON_INTERACTIVE_REJECTION_REASON } from './services/approval/non-interactive-approval-policy.js';
 export const createNonInteractiveSessionId = () => `non-interactive-${randomUUID()}`;
 const safePreview = (value, maxLen = 500) => {
     try {
@@ -46,8 +45,16 @@ export async function runWithSession(session, config) {
     const stdout = config.stdout ?? process.stdout;
     const stderr = config.stderr ?? process.stderr;
     const sessionContextService = config.sessionContextService ?? new SessionContextService();
+    const approvalPolicy = new NonInteractiveApprovalPolicy({
+        settingsService: config.settingsService,
+        agentClient: config.agentClient,
+        logger: config.logger,
+        sessionContextService,
+    });
+    let streamedTextLength = 0;
     const onEvent = (event) => {
         if (event.type === 'text_delta') {
+            streamedTextLength += event.delta.length;
             stdout.write(event.delta);
             return;
         }
@@ -55,6 +62,16 @@ export async function runWithSession(session, config) {
             stderr.write(event.delta);
             return;
         }
+        if (event.type === 'final') {
+            // Some completion paths (e.g. tool-only turns, or providers that don't
+            // stream token deltas) deliver the response text solely via `finalText`
+            // rather than `text_delta`. Write whatever wasn't already streamed so
+            // the response isn't silently dropped.
+            if (event.finalText && event.finalText.length > streamedTextLength) {
+                stdout.write(event.finalText.slice(streamedTextLength));
+            }
+            return;
+        }
         const line = formatEventForStderr(event);
         if (line) {
             stderr.write(line);
@@ -73,77 +90,18 @@ export async function runWithSession(session, config) {
             ? await session.sendMessage(config.prompt)
             : await session.sendMessage(config.prompt, { onEvent });
         while (result?.type === 'approval_required') {
-            if (config.autoApprove) {
-                const approval = result.approval;
-                let shouldApprove = true;
-                let rejectionReason;
-                if (approval.toolName === 'shell' || approval.toolName === 'bash') {
-                    const command = approval.argumentsText;
-                    const classification = classifyCommandDetailed(command, config.logger);
-                    if (classification.status === SafetyStatus.RED) {
-                        shouldApprove = false;
-                        rejectionReason = `Heuristic validation failed: command is RED (dangerous) and cannot be executed automatically: ${command}`;
-                    }
-                    else if (classification.status === SafetyStatus.YELLOW) {
-                        const autoApproveModel = config.settingsService && config.agentClient
-                            ? config.settingsService.get('agent.choreModel') ??
-                                config.settingsService.get('agent.autoApproveModel')
-                            : undefined;
-                        if (!autoApproveModel) {
-                            shouldApprove = false;
-                            rejectionReason = `Heuristic validation failed: command is YELLOW (suspicious) and no auto-approve model is configured: ${command}`;
-                        }
-                        else {
-                            const history = session.exportState ? session.exportState().history : [];
-                            try {
-                                const advisories = await evaluateShellAutoApprovalAdvisories({
-                                    commands: [{ id: approval.callId || '__single__', command }],
-                                    history: history,
-                                    settingsService: config.settingsService,
-                                    agentClient: config.agentClient,
-                                    logger: config.logger ??
-                                        {
-                                            debug: () => { },
-                                            info: () => { },
-                                            warn: () => { },
-                                            error: () => { },
-                                            security: () => { },
-                                        },
-                                    sessionContextService,
-                                });
-                                const advisory = advisories.get(approval.callId || '__single__');
-                                if (advisory?.approved) {
-                                    shouldApprove = true;
-                                }
-                                else {
-                                    shouldApprove = false;
-                                    rejectionReason = `LLM evaluation rejected the command: ${advisory?.reasoning ?? 'No reasoning provided'}`;
-                                }
-                            }
-                            catch (err) {
-                                shouldApprove = false;
-                                rejectionReason = `LLM auto-approval evaluation failed: ${err instanceof Error ? err.message : String(err)}`;
-                            }
-                        }
-                    }
-                }
-                if (shouldApprove) {
-                    result = supportsPersistentEventSink
-                        ? await session.handleApprovalDecision('y', undefined)
-                        : await session.handleApprovalDecision('y', undefined, { onEvent });
-                }
-                else {
-                    stderr.write(`Approval Rejected: ${rejectionReason}\n`);
-                    result = supportsPersistentEventSink
-                        ? await session.handleApprovalDecision('n', rejectionReason)
-                        : await session.handleApprovalDecision('n', rejectionReason, { onEvent });
-                }
-            }
-            else {
-                result = supportsPersistentEventSink
-                    ? await session.handleApprovalDecision('n', NON_INTERACTIVE_REJECTION_REASON)
-                    : await session.handleApprovalDecision('n', NON_INTERACTIVE_REJECTION_REASON, { onEvent });
+            const decision = await approvalPolicy.decide({
+                autoApprove: config.autoApprove,
+                approval: result.approval,
+                getHistory: () => session.exportState?.().history ?? [],
+            });
+            const rejectionReason = decision.answer === 'n' ? decision.rejectionReason : undefined;
+            if (decision.answer === 'n' && decision.reportRejection) {
+                stderr.write(`Approval Rejected: ${rejectionReason}\n`);
             }
+            result = supportsPersistentEventSink
+                ? await session.handleApprovalDecision(decision.answer, rejectionReason)
+                : await session.handleApprovalDecision(decision.answer, rejectionReason, { onEvent });
             if (result === null) {
                 stderr.write('error No pending approval context (unexpected in non-interactive mode).\n');
                 return 1;
@@ -169,20 +127,69 @@ export async function runWithSession(session, config) {
 }
 export async function runNonInteractive(config) {
     const sessionContextService = config.sessionContextService ?? new SessionContextService();
-    const { runtime, adapter } = createConversationRuntime({
-        sessionId: createNonInteractiveSessionId(),
-        agentClient: config.agentClient,
-        deps: {
-            logger: config.logger,
-            settingsService: config.settingsService,
-            sessionContextService,
-        },
+    if (!config.sessionClientFactory && !config.agentClient) {
+        throw new Error('runNonInteractive requires an agentClient or sessionClientFactory');
+    }
+    if (!config.sessionClientFactory && !config.toolOwnership) {
+        throw new Error('runNonInteractive requires toolOwnership with an agentClient');
+    }
+    const clientFactory = config.sessionClientFactory ?? createCallerOwnedSessionClientFactory(config.agentClient, config.toolOwnership);
+    const sessionId = createNonInteractiveSessionId();
+    const clientHandle = clientFactory.create(sessionId, { allowBackgroundShell: false });
+    const removeBackgroundShellInterceptor = clientHandle.agentClient.addToolInterceptor(async (name, params) => {
+        if (name === 'shell' &&
+            params !== null &&
+            typeof params === 'object' &&
+            !Array.isArray(params) &&
+            params.background === true) {
+            return 'Error: Background shell execution is unavailable in non-interactive mode.';
+        }
+        return null;
     });
+    let runtime;
+    let fatal = false;
     try {
-        return await runWithSession(adapter, { ...config, sessionContextService });
+        const createdRuntime = createConversationRuntime({
+            sessionId,
+            agentClient: clientHandle.agentClient,
+            toolOwnership: clientHandle.toolOwnership,
+            deps: {
+                logger: config.logger,
+                settingsService: config.settingsService,
+                sessionContextService,
+            },
+            hookLifecycle: config.hookLifecycle ?? clientHandle.hookLifecycle,
+            hookEvents: config.hookEvents ?? clientHandle.hookEvents,
+        });
+        runtime = createdRuntime.runtime;
+        if (config.hookLifecycle && clientHandle.hookEvents) {
+            await config.hookLifecycle.emit(clientHandle.hookEvents.create('session.start', {
+                cwd: process.cwd(),
+                mode: 'non-interactive',
+                providerName: clientHandle.agentClient.getProvider?.() ?? config.settingsService.get('agent.provider'),
+                modelName: config.settingsService.get('agent.model'),
+            }));
+        }
+        return await runWithSession(createdRuntime.adapter, {
+            ...config,
+            agentClient: clientHandle.agentClient,
+            sessionContextService,
+        });
+    }
+    catch (error) {
+        fatal = true;
+        throw error;
     }
     finally {
-        runtime.dispose();
+        removeBackgroundShellInterceptor();
+        if (config.hookLifecycle && clientHandle.hookEvents) {
+            await config.hookLifecycle.emit(clientHandle.hookEvents.create('session.end', {
+                reason: fatal ? 'fatal_error' : 'normal',
+                sessionDuration: runtime ? Math.max(0, Date.now() - Date.parse(runtime.sessionStartedAt)) : 0,
+            }));
+        }
+        await runtime?.shutdown();
+        clientHandle.dispose();
     }
 }
 //# sourceMappingURL=non-interactive.js.map

package/dist/non-interactive.js.map

@@ -1 +1 @@
-{"version":3,"file":"non-interactive.js","sourceRoot":"","sources":["../source/non-interactive.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"non-interactive.js","sourceRoot":"","sources":["../source/non-interactive.ts"],"names":[],"mappings":"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"}

package/dist/prompts/async-subagent-delegation.d.ts

@@ -1,7 +1,4 @@
-/**
- * Guidance for the asynchronous subagent tools (`run_subagent_async` and
- * `get_subagent_result`). Injected when both tools are available.
- */
+/** @deprecated Compatibility wrapper for callers not yet using the unified delegation prompt builder. */
 export declare function getAsyncSubagentDelegationAddendum({ memoryEnabled, orchestratorMode, controlsEnabled, }?: {
     memoryEnabled?: boolean;
     orchestratorMode?: boolean;

package/dist/prompts/async-subagent-delegation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"async-subagent-delegation.d.ts","sourceRoot":"","sources":["../../source/prompts/async-subagent-delegation.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,wBAAgB,kCAAkC,CAAC,EACjD,aAAoB,EACpB,gBAAwB,EACxB,eAAuB,GACxB,GAAE;IAAE,aAAa,CAAC,EAAE,OAAO,CAAC;IAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAAC,eAAe,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,MAAM,CAsDlG"}
+{"version":3,"file":"async-subagent-delegation.d.ts","sourceRoot":"","sources":["../../source/prompts/async-subagent-delegation.ts"],"names":[],"mappings":"AAEA,yGAAyG;AACzG,wBAAgB,kCAAkC,CAAC,EACjD,aAAoB,EACpB,gBAAwB,EACxB,eAAuB,GACxB,GAAE;IAAE,aAAa,CAAC,EAAE,OAAO,CAAC;IAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAAC,eAAe,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,MAAM,CAQlG"}

package/dist/prompts/async-subagent-delegation.js

@@ -1,50 +1,12 @@
-import { getSubagentsRolesSection } from '../tools/agent/run-subagent.js';
-/**
- * Guidance for the asynchronous subagent tools (`run_subagent_async` and
- * `get_subagent_result`). Injected when both tools are available.
- */
+import { getSubagentDelegationAddendum } from './subagent-delegation.js';
+/** @deprecated Compatibility wrapper for callers not yet using the unified delegation prompt builder. */
 export function getAsyncSubagentDelegationAddendum({ memoryEnabled = true, orchestratorMode = false, controlsEnabled = false, } = {}) {
-    const header = `### Asynchronous subagents
-
-You have the following tools for running and controlling background subagents:
-
-- \`run_subagent_async\`: starts a subagent and returns a \`runId\` immediately — the call does NOT block.
-- \`get_subagent_result\`: BLOCKS until the started subagent finishes and returns the final \`SubagentResult\`. Do not call it right after launching a run; that freezes you out of doing other work — end your turn and wait for the completion notification instead.
-${controlsEnabled
-        ? `- \`send_message\`: non-blockingly steer an active execution run, or answer a waiting \`ask_orchestrator\` question with \`reply_to\`.
-- \`cancel_run\`: non-blockingly request two-phase cancellation of an active run; its eventual partial result still arrives through normal completion.`
-        : ''}
-
-Use these when you want to start a background investigation, return control while it runs, and collect the result after the automatic completion notification.`;
-    const rules = `**Rules for async subagents:**
-- Fresh async runs support explorer, worker, researcher, mentor, and librarian.
-- Runs persist across parent turns in process memory until their 30-minute sliding TTL expires or the 50-session cap evicts them. Ordinary turn completion does not cancel them.
-- A returned handle with \`status: "running"\` means delegation succeeded.
-- Use \`get_subagent_result\` with the exact \`runId\` returned by \`run_subagent_async\`.
-- Do NOT call \`get_subagent_result\` immediately after \`run_subagent_async\` returns — it blocks until completion and freezes you out of doing other work or receiving the next user instruction. End your turn instead and let the harness notify you when the run finishes; only retrieve inline if you truly cannot take any other useful action without the result at all.
-- Mentor and librarian fresh calls reuse their default session. Explorer and researcher fresh calls start a new session; pass \`continue_run_id\` to explicitly continue a completed explorer or researcher run. Worker runs are always fresh and cannot be continued.
-- Only completed runs can be continued. A continuation uses the same runId; do not invent runIds or continue an active, failed, cancelled, missing, or evicted run.
-- The result uses the structured \`SubagentResult\` shape: status, final text, tools used, and files changed.`;
-    const controls = controlsEnabled
-        ? `**Controlling a live async run:**
-- Address \`send_message\` and \`cancel_run\` by the active name or runId; runId remains canonical. Use \`send_message\` to redirect productive execution, and \`cancel_run\` only when it should stop.
-- Steering never waits for a result. It ends only a safe model-stream boundary (never an active tool), then starts a bounded fresh session turn with the guidance. This is not SDK live injection or RunState continuation.
-- A run accepts a maximum of three continuation segments. Mentor runs do not support steering; cancel them if needed.
-- When an execution subagent asks a genuine blocker through \`ask_orchestrator\`, answer its exact messageId with \`reply_to\`. That resumes only the waiting tool call; the subagent continues after the answer. Keep the orchestrator as the single point of contact — subagents never contact the user.
-- While a question waits, plain steering is refused with \`question_pending\`: only an answer resumes the blocked call. Answer it with \`reply_to\`, then steer if you still need to, or \`cancel_run\` the run.
-- Both controls return acknowledgements immediately. Do NOT call \`get_subagent_result\` immediately after steering or cancelling; wait for the normal completion notification and retrieve the rich result later.`
-        : '';
-    const triggers = `**When to use async subagents:**
-- A codebase exploration or web research task can run in parallel with other reasoning.
-- You want to keep your context focused while a mentor pressure-tests a plan in the background.
-- The result is needed later, not immediately, and you have other useful work to do first.${orchestratorMode
-        ? `
-
-In Orchestrator mode, use \`run_subagent_async\` for delegable work. A returned handle with \`status: "running"\` means delegation succeeded. Do not duplicate or independently perform the delegated unit. After a successful launch, do NOT immediately call \`get_subagent_result\` — it blocks until completion and freezes you out of doing other work or receiving the next user instruction; end the current turn and wait for the automatic completion notification. Use \`get_subagent_result\` from that notification turn; only call it earlier if, after honest assessment, you truly cannot take any other useful action or reply to the user without this result at all.`
-        : ''}`;
-    const framing = `**Task framing:** Describe the goal, relevant context, and constraints—not implementation steps. Do not repeat automatically supplied context: role instructions, generic tool guidance, worktree hygiene, environment metadata, root \`AGENTS.md\`, or skills catalog.`;
-    return `${header}\n\n${rules}${controls ? `\n\n${controls}` : ''}\n\n${triggers}\n\n${framing}\n\n${getSubagentsRolesSection({
-        includeLibrarian: memoryEnabled,
-    })}`;
+    return getSubagentDelegationAddendum({
+        memoryEnabled,
+        orchestratorMode,
+        foregroundEnabled: false,
+        backgroundEnabled: true,
+        controlsEnabled,
+    });
 }
 //# sourceMappingURL=async-subagent-delegation.js.map

package/dist/prompts/async-subagent-delegation.js.map

@@ -1 +1 @@
-{"version":3,"file":"async-subagent-delegation.js","sourceRoot":"","sources":["../../source/prompts/async-subagent-delegation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAE1E;;;GAGG;AACH,MAAM,UAAU,kCAAkC,CAAC,EACjD,aAAa,GAAG,IAAI,EACpB,gBAAgB,GAAG,KAAK,EACxB,eAAe,GAAG,KAAK,GACxB,GAAuF,EAAE;IACxF,MAAM,MAAM,GAAG;;;;;;EAOf,eAAe;QACb,CAAC,CAAC;uJACiJ;QACnJ,CAAC,CAAC,EACN;;+JAE+J,CAAC;IAE9J,MAAM,KAAK,GAAG;;;;;;;;8GAQ8F,CAAC;IAE7G,MAAM,QAAQ,GAAG,eAAe;QAC9B,CAAC,CAAC;;;;;;mNAM6M;QAC/M,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,QAAQ,GAAG;;;4FAIf,gBAAgB;QACd,CAAC,CAAC;;upBAE+oB;QACjpB,CAAC,CAAC,EACN,EAAE,CAAC;IAEH,MAAM,OAAO,GAAG,yQAAyQ,CAAC;IAE1R,OAAO,GAAG,MAAM,OAAO,KAAK,GAC1B,QAAQ,CAAC,CAAC,CAAC,OAAO,QAAQ,EAAE,CAAC,CAAC,CAAC,EACjC,OAAO,QAAQ,OAAO,OAAO,OAAO,wBAAwB,CAAC;QAC3D,gBAAgB,EAAE,aAAa;KAChC,CAAC,EAAE,CAAC;AACP,CAAC"}
+{"version":3,"file":"async-subagent-delegation.js","sourceRoot":"","sources":["../../source/prompts/async-subagent-delegation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC;AAEzE,yGAAyG;AACzG,MAAM,UAAU,kCAAkC,CAAC,EACjD,aAAa,GAAG,IAAI,EACpB,gBAAgB,GAAG,KAAK,EACxB,eAAe,GAAG,KAAK,GACxB,GAAuF,EAAE;IACxF,OAAO,6BAA6B,CAAC;QACnC,aAAa;QACb,gBAAgB;QAChB,iBAAiB,EAAE,KAAK;QACxB,iBAAiB,EAAE,IAAI;QACvB,eAAe;KAChB,CAAC,CAAC;AACL,CAAC"}

package/dist/prompts/async-subagent-delegation.ts

@@ -1,65 +1,16 @@
-import { getSubagentsRolesSection } from '../tools/agent/run-subagent.js';
+import { getSubagentDelegationAddendum } from './subagent-delegation.js';
 
-/**
- * Guidance for the asynchronous subagent tools (`run_subagent_async` and
- * `get_subagent_result`). Injected when both tools are available.
- */
+/** @deprecated Compatibility wrapper for callers not yet using the unified delegation prompt builder. */
 export function getAsyncSubagentDelegationAddendum({
   memoryEnabled = true,
   orchestratorMode = false,
   controlsEnabled = false,
 }: { memoryEnabled?: boolean; orchestratorMode?: boolean; controlsEnabled?: boolean } = {}): string {
-  const header = `### Asynchronous subagents
-
-You have the following tools for running and controlling background subagents:
-
-- \`run_subagent_async\`: starts a subagent and returns a \`runId\` immediately — the call does NOT block.
-- \`get_subagent_result\`: BLOCKS until the started subagent finishes and returns the final \`SubagentResult\`. Do not call it right after launching a run; that freezes you out of doing other work — end your turn and wait for the completion notification instead.
-${
-  controlsEnabled
-    ? `- \`send_message\`: non-blockingly steer an active execution run, or answer a waiting \`ask_orchestrator\` question with \`reply_to\`.
-- \`cancel_run\`: non-blockingly request two-phase cancellation of an active run; its eventual partial result still arrives through normal completion.`
-    : ''
-}
-
-Use these when you want to start a background investigation, return control while it runs, and collect the result after the automatic completion notification.`;
-
-  const rules = `**Rules for async subagents:**
-- Fresh async runs support explorer, worker, researcher, mentor, and librarian.
-- Runs persist across parent turns in process memory until their 30-minute sliding TTL expires or the 50-session cap evicts them. Ordinary turn completion does not cancel them.
-- A returned handle with \`status: "running"\` means delegation succeeded.
-- Use \`get_subagent_result\` with the exact \`runId\` returned by \`run_subagent_async\`.
-- Do NOT call \`get_subagent_result\` immediately after \`run_subagent_async\` returns — it blocks until completion and freezes you out of doing other work or receiving the next user instruction. End your turn instead and let the harness notify you when the run finishes; only retrieve inline if you truly cannot take any other useful action without the result at all.
-- Mentor and librarian fresh calls reuse their default session. Explorer and researcher fresh calls start a new session; pass \`continue_run_id\` to explicitly continue a completed explorer or researcher run. Worker runs are always fresh and cannot be continued.
-- Only completed runs can be continued. A continuation uses the same runId; do not invent runIds or continue an active, failed, cancelled, missing, or evicted run.
-- The result uses the structured \`SubagentResult\` shape: status, final text, tools used, and files changed.`;
-
-  const controls = controlsEnabled
-    ? `**Controlling a live async run:**
-- Address \`send_message\` and \`cancel_run\` by the active name or runId; runId remains canonical. Use \`send_message\` to redirect productive execution, and \`cancel_run\` only when it should stop.
-- Steering never waits for a result. It ends only a safe model-stream boundary (never an active tool), then starts a bounded fresh session turn with the guidance. This is not SDK live injection or RunState continuation.
-- A run accepts a maximum of three continuation segments. Mentor runs do not support steering; cancel them if needed.
-- When an execution subagent asks a genuine blocker through \`ask_orchestrator\`, answer its exact messageId with \`reply_to\`. That resumes only the waiting tool call; the subagent continues after the answer. Keep the orchestrator as the single point of contact — subagents never contact the user.
-- While a question waits, plain steering is refused with \`question_pending\`: only an answer resumes the blocked call. Answer it with \`reply_to\`, then steer if you still need to, or \`cancel_run\` the run.
-- Both controls return acknowledgements immediately. Do NOT call \`get_subagent_result\` immediately after steering or cancelling; wait for the normal completion notification and retrieve the rich result later.`
-    : '';
-
-  const triggers = `**When to use async subagents:**
-- A codebase exploration or web research task can run in parallel with other reasoning.
-- You want to keep your context focused while a mentor pressure-tests a plan in the background.
-- The result is needed later, not immediately, and you have other useful work to do first.${
-    orchestratorMode
-      ? `
-
-In Orchestrator mode, use \`run_subagent_async\` for delegable work. A returned handle with \`status: "running"\` means delegation succeeded. Do not duplicate or independently perform the delegated unit. After a successful launch, do NOT immediately call \`get_subagent_result\` — it blocks until completion and freezes you out of doing other work or receiving the next user instruction; end the current turn and wait for the automatic completion notification. Use \`get_subagent_result\` from that notification turn; only call it earlier if, after honest assessment, you truly cannot take any other useful action or reply to the user without this result at all.`
-      : ''
-  }`;
-
-  const framing = `**Task framing:** Describe the goal, relevant context, and constraints—not implementation steps. Do not repeat automatically supplied context: role instructions, generic tool guidance, worktree hygiene, environment metadata, root \`AGENTS.md\`, or skills catalog.`;
-
-  return `${header}\n\n${rules}${
-    controls ? `\n\n${controls}` : ''
-  }\n\n${triggers}\n\n${framing}\n\n${getSubagentsRolesSection({
-    includeLibrarian: memoryEnabled,
-  })}`;
+  return getSubagentDelegationAddendum({
+    memoryEnabled,
+    orchestratorMode,
+    foregroundEnabled: false,
+    backgroundEnabled: true,
+    controlsEnabled,
+  });
 }

package/dist/prompts/background-shell.d.ts

@@ -0,0 +1,3 @@
+/** Model-facing lifecycle contract for session-owned background shell jobs. */
+export declare function getBackgroundShellAddendum(): string;
+//# sourceMappingURL=background-shell.d.ts.map

package/dist/prompts/background-shell.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"background-shell.d.ts","sourceRoot":"","sources":["../../source/prompts/background-shell.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,wBAAgB,0BAA0B,IAAI,MAAM,CAQnD"}

package/dist/prompts/background-shell.js

@@ -0,0 +1,11 @@
+/** Model-facing lifecycle contract for session-owned background shell jobs. */
+export function getBackgroundShellAddendum() {
+    return `### Background shell jobs
+
+Use \`shell\` with \`background: true\` only for work that can continue after you return control. A successful launch returns \`{ jobId, status: "running" }\`.
+
+- A \`status: "running"\` handle means the job launched successfully. Do NOT call \`get_shell_job\` as a polling loop and do not run \`sleep\` merely to wait.
+- End the current turn and wait for the automatic completion notification. It arrives when the job settles and includes its terminal status and bounded output, so continue from that notification.
+- Use \`get_shell_job\` only when a later user instruction requires an early status check for a specific job. Use \`cancel_shell_job\` only when the user asks to stop that job or the task requires cancellation.`;
+}
+//# sourceMappingURL=background-shell.js.map

package/dist/prompts/background-shell.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"background-shell.js","sourceRoot":"","sources":["../../source/prompts/background-shell.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,MAAM,UAAU,0BAA0B;IACxC,OAAO;;;;;;mNAM0M,CAAC;AACpN,CAAC"}

package/dist/prompts/background-shell.ts

@@ -0,0 +1,10 @@
+/** Model-facing lifecycle contract for session-owned background shell jobs. */
+export function getBackgroundShellAddendum(): string {
+  return `### Background shell jobs
+
+Use \`shell\` with \`background: true\` only for work that can continue after you return control. A successful launch returns \`{ jobId, status: "running" }\`.
+
+- A \`status: "running"\` handle means the job launched successfully. Do NOT call \`get_shell_job\` as a polling loop and do not run \`sleep\` merely to wait.
+- End the current turn and wait for the automatic completion notification. It arrives when the job settles and includes its terminal status and bounded output, so continue from that notification.
+- Use \`get_shell_job\` only when a later user instruction requires an early status check for a specific job. Use \`cancel_shell_job\` only when the user asks to stop that job or the task requires cancellation.`;
+}

package/dist/prompts/memory.md

@@ -2,7 +2,7 @@
 
 You have access to persistent memory. Only a concise index is loaded initially.
 
-Memory has global and project scopes. Use global for cross-project preferences and reusable knowledge; use project for repository-specific decisions and conventions. Memory tools default to global when scope is omitted.
+Memory has global and project scopes. Use global for cross-project preferences and reusable knowledge; use project for repository-specific decisions and conventions. Read tools (memory_list, memory_get, memory_search, memory_retrieve) operate across both scopes together; write tools (memory_create, memory_update, memory_delete) take a scope parameter.
 
 When you encounter uncertainty about prior conversations, user preferences, project decisions, or established conventions, consider retrieving relevant memories before making assumptions. Retrieve memory when it could materially improve correctness or avoid repeating work — not mechanically.
 

package/dist/prompts/orchestrator-prompt.test.ts

@@ -9,6 +9,11 @@ it('orchestrator prompt keeps the orchestrator as the single point of contact th
   expect(orchestratorPrompt).toContain('Delegation transfers execution, never outcome ownership');
 });
 
+it('orchestrator prompt does not encourage continued or direct work while delegation is available', () => {
+  expect(orchestratorPrompt).not.toContain('Continue through obvious necessary next steps');
+  expect(orchestratorPrompt).not.toContain('Directly inspect, edit, run commands, and test small or clear work');
+});
+
 it('orchestrator prompt gives the orchestrator standing to overrule a subagent recommendation', () => {
   const lower = orchestratorPrompt.toLowerCase();
 
@@ -32,6 +37,23 @@ it('orchestrator prompt requires the final report to be the orchestrator’s own
   expect(lower).toContain('never a substitute for it');
 });
 
+it('orchestrator prompt delegates bounded mechanical follow-through while retaining integration judgement', () => {
+  const lower = orchestratorPrompt.toLowerCase();
+
+  expect(lower).toContain('mechanical follow-through');
+  expect(lower).toContain('commits');
+  expect(lower).toContain('worktree cleanup');
+  expect(lower).toContain('integration judgement');
+  expect(lower).toContain('coordination costs more than direct execution');
+});
+
+it('orchestrator prompt pins workers into existing worktrees via run_subagent worktree', () => {
+  expect(orchestratorPrompt).toContain('worktree');
+  expect(orchestratorPrompt).toContain('role: "worker"');
+  expect(orchestratorPrompt).toContain('do not ask the worker to enter the worktree itself');
+  expect(orchestratorPrompt).toContain('git worktree add .worktrees/<slug> -b <slug>');
+});
+
 it('orchestrator prompt documents get_subagent_status as the non-blocking mid-run peek', () => {
   const lower = orchestratorPrompt.toLowerCase();
 

package/dist/prompts/orchestrator.md

@@ -1,10 +1,12 @@
-You are in Orchestrator mode. You own the user-requested outcome end to end: investigate, decide, act, integrate results, correct mistakes, validate, and report. Continue through obvious necessary next steps without waiting for another user prompt. Remain the single point of contact for the user.
+You are in Orchestrator mode. You own the user-requested outcome end to end: investigate, decide, act, integrate results, correct mistakes, validate, and report. Remain the single point of contact for the user.
 
 ## How to work
 
 Choose investigation, planning, delegation, implementation, review, and validation adaptively. Let uncertainty, impact, reversibility, and coordination risk determine the next useful action; there is no universal task pipeline.
 
-Get the work done with the least delegation that fully and safely covers it. Directly inspect, edit, run commands, and test small or clear work when delegation has no meaningful leverage. Delegate for specialization, context compression, safe parallelism, or cohesive separable work — not merely because workspace access or tools are involved. Decompose only when a task genuinely spans multiple concerns; one bounded agent is correct for a one-step task, and do not split a small task across roles merely because roles exist.
+Get the work done with the least delegation that fully and safely covers it. Delegate for specialization, context compression, safe parallelism, or cohesive separable work — not merely because workspace access or tools are involved. Decompose only when a task genuinely spans multiple concerns; one bounded agent is correct for a one-step task, and do not split a small task across roles merely because roles exist.
+
+Preserve orchestrator attention for investigation, decisions, review, and integration judgement by delegating bounded mechanical follow-through when it forms a clean execution unit. Routine formatting and validation, focused commits, merges, diff collection, and branch or worktree cleanup are appropriate worker tasks when they can proceed with explicit acceptance criteria. Do not delegate merely to avoid one trivial command when coordination costs more than direct execution, and take over a blocked mechanical operation rather than stalling the outcome.
 
 Delegation transfers execution, never outcome ownership. Treat subagent results as internal checkpoints: integrate them, follow up on gaps, correct errors, and complete the task yourself. Do not quietly take over worker work, and do not treat a subagent summary as completion without evidence. Avoid concurrent overlapping edits; sequence work that shares files, contracts, schemas, state flows, or dependencies.
 
@@ -18,7 +20,7 @@ Protect pre-existing user work. Report truthfully. Apply stricter scrutiny to de
 
 Choose the most fitting available role for the task. Give each task one owner and avoid overlapping edits.
 
-For modifying work, ask the worker to use an isolated git worktree when the change is non-trivial or concurrent work is active and the repository and provider support it. Otherwise assign one writer per checkout and escalate conflicts rather than racing edits. Keep scouts and reviewers read-only unless edits are explicitly authorized. Escalate destructive, irreversible, external, production, credential, security-sensitive, or materially scope-changing decisions when the consequence is genuinely material.
+For non-trivial or concurrent modifying work, isolate the worker in a git worktree when the repository and provider support it. Create the worktree under the workspace root first (`git worktree add .worktrees/<slug> -b <slug>` — the shell sandbox grants writes only there and to the temp dir, so a sibling-directory worktree cannot be created), then call `run_subagent` with `role: "worker"` and `worktree` set to that directory basename or branch name. That pins the child's tools into the existing tree without re-rooting this session; do not ask the worker to enter the worktree itself. Otherwise assign one writer per checkout and escalate conflicts rather than racing edits. Keep scouts and reviewers read-only unless edits are explicitly authorized. Escalate destructive, irreversible, external, production, credential, security-sensitive, or materially scope-changing decisions when the consequence is genuinely material.
 
 Do not treat a summary as completion. For modifications, require changed-file or diff/commit evidence and relevant test output when the change plausibly affects behavior; for inert changes such as docs or comments, the diff/commit is sufficient. Report outcomes, evidence, blockers, risks, integration instructions, and needed user decisions concisely.
 
@@ -41,13 +43,13 @@ Do not redo completed work without reason. If a result looks wrong, inspect the
 
 `get_subagent_status` gives you a non-blocking answer to "what is it doing right now." Omit the runId to list all live runs at once. It returns status, elapsed time, the last tool called, and tool counts — never the final report or diff evidence — so it costs almost nothing to consult. Use it to answer a mid-run user question about a delegated task without blocking your turn or waiting for the run to finish.
 
-Peek is on-demand, not a substitute for the async completion discipline. It does not tell you when a run finishes, it never carries completion detail, and it is not a reason to poll in a loop. When a run settles, wait for the harness automatic completion notification and call `get_subagent_result` for the full report, exactly as you would without peek.
+Peek is on-demand, not a substitute for the async completion discipline. It does not tell you when a run finishes, it never carries completion detail, and it is not a reason to poll in a loop. When a run settles, the harness completion notification inlines the full result — status, validation evidence, diff stat, and final text — so you can continue directly without calling `get_subagent_result`.
 
 ## Steering or cancelling delegated work
 
 Address active runs by their optional name or canonical runId. Use `send_message` to redirect productive execution and `cancel_run` when the run should stop; both acknowledge immediately and never wait for a result. Steering reaches a safe model-stream boundary, never interrupts an active tool, and continues in a fresh session turn. It is not SDK live injection or RunState continuation, and each logical run permits at most three continuation segments.
 
-If a worker or researcher is waiting on `ask_orchestrator`, answer its specific `messageId` through `send_message` with `reply_to`. The answer resumes only that waiting tool call; the subagent should continue afterward. While that question waits, steering without `reply_to` is refused with `question_pending` — only an answer can resume the blocked call, so answer it or `cancel_run` the run. Keep the single point of contact invariant: resolve or escalate the blocker yourself and never let a subagent contact the user. Mentor runs cannot be steered; `cancel_run` remains available. After either control acknowledgement, do not immediately call `get_subagent_result`; wait for normal completion notification and use the rich result path.
+If a worker or explorer is waiting on `ask_orchestrator`, answer its specific `messageId` through `send_message` with `reply_to`. The answer resumes only that waiting tool call; the subagent should continue afterward. While that question waits, steering without `reply_to` is refused with `question_pending` — only an answer can resume the blocked call, so answer it or `cancel_run` the run. Keep the single point of contact invariant: resolve or escalate the blocker yourself and never let a subagent contact the user. Mentor runs cannot be steered; `cancel_run` remains available. After either control acknowledgement, do not immediately call `get_subagent_result`; the completion notification inlines the full result.
 
 ## Verifying and reporting
 

package/dist/prompts/plan-mode-info.md

@@ -5,7 +5,7 @@ This environment supports a read-only **Plan Mode**, which you will be notified
 When Plan Mode is active, you are strictly restricted from making modifications to the workspace or system state.
 
 - You should not attempt to create or modify files, run state-changing shell commands, or spawn write-capable subagents (the `worker` role).
-- You **should** use read-only tools (like search tools, file-reading tools, and read-only shell commands like `ls`, `git log`) to investigate and research. Read-only subagents (`explorer`, `researcher`, `mentor`) are still available for delegated investigation.
+- You **should** use read-only tools (like search tools, file-reading tools, and read-only shell commands like `ls`, `git log`) to investigate and research. Read-only subagents (`explorer`, `mentor`) are still available for delegated investigation.
 - Your goal in Plan Mode is to deliver a concrete, ordered, step-by-step implementation plan.
 - The user will notify you via a system message when Plan Mode is enabled or disabled.
 - Any attempts to execute mutating actions while Plan Mode is active will be blocked and returned as tool execution errors by the system.

package/dist/prompts/prompt-constructor.d.ts

@@ -8,8 +8,10 @@ export type PromptConstructorOptions = {
     searchViaShell?: boolean;
     codeContextEnabled?: boolean;
     runSubagentEnabled?: boolean;
+    runSubagentForegroundEnabled?: boolean;
     runSubagentAsyncEnabled?: boolean;
     asyncSubagentControlsEnabled?: boolean;
+    backgroundShellEnabled?: boolean;
     sandboxEnabled?: boolean;
     memoryEnabled?: boolean;
     memoryGuidance?: string;

package/dist/prompts/prompt-constructor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompt-constructor.d.ts","sourceRoot":"","sources":["../../source/prompts/prompt-constructor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAOzE,MAAM,MAAM,wBAAwB,GAAG;IACrC,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC;IAClB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B,CAAC;AAEF,wBAAgB,eAAe,CAAC,OAAO,EAAE,wBAAwB,GAAG,UAAU,CAyE7E"}
+{"version":3,"file":"prompt-constructor.d.ts","sourceRoot":"","sources":["../../source/prompts/prompt-constructor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAOzE,MAAM,MAAM,wBAAwB,GAAG;IACrC,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC;IAClB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B,CAAC;AAEF,wBAAgB,eAAe,CAAC,OAAO,EAAE,wBAAwB,GAAG,UAAU,CA6E7E"}