@qduc/term2 0.11.1 → 0.12.0

package/dist/services/subagents/role-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"role-loader.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/role-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAG3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAGhE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAKjE,eAAO,MAAM,WAAW,QAA2C,CAAC;AAepE,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAexD;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAmCpG;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,kBAAkB,CAoDrG;AAED,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAYlE;AAED,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,gBAAgB,EAC1B,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,OAAO,GACnB,OAAO,CAKT;AAED,wBAAgB,0BAA0B,CAAC,eAAe,EAAE,cAAc,EAAE,EAAE,cAAc,EAAE,OAAO,GAAG,MAAM,CA0C7G;AAED,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,kBAAkB,EAC9B,eAAe,EAAE,cAAc,EAAE,EACjC,cAAc,EAAE,OAAO,EACvB,QAAQ,EAAE,gBAAgB,EAC1B,gBAAgB,CAAC,EAAE,gBAAgB,EACnC,aAAa,CAAC,EAAE,aAAa,GAC5B,MAAM,CA4CR"}
+{"version":3,"file":"role-loader.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/role-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AACnE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAG9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAGhE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAKjE,eAAO,MAAM,WAAW,QAA2C,CAAC;AAcpE,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAexD;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAmCpG;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,kBAAkB,CAoDrG;AAED,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAYlE;AAED,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,gBAAgB,EAC1B,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,OAAO,GACnB,OAAO,CAKT;AAED,wBAAgB,0BAA0B,CACxC,eAAe,EAAE,SAAS,IAAI,CAAC,iBAAiB,EAAE,MAAM,CAAC,EAAE,EAC3D,cAAc,EAAE,OAAO,GACtB,MAAM,CA0CR;AAED,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,kBAAkB,EAC9B,eAAe,EAAE,SAAS,IAAI,CAAC,iBAAiB,EAAE,MAAM,CAAC,EAAE,EAC3D,cAAc,EAAE,OAAO,EACvB,QAAQ,EAAE,gBAAgB,EAC1B,gBAAgB,CAAC,EAAE,gBAAgB,EACnC,aAAa,CAAC,EAAE,aAAa,GAC5B,MAAM,CA4CR"}

package/dist/services/subagents/role-loader.js

@@ -12,7 +12,6 @@ const ROLE_MAX_TURNS_DEFAULT = 20;
 const roleModelTiers = {
     mentor: 'smart',
     worker: 'balanced',
-    researcher: 'balanced',
     explorer: 'cheap',
     librarian: 'cheap',
 };
@@ -80,15 +79,15 @@ export function loadRoleDefinition(role, settings) {
     const subagentPrefix = role === 'mentor' ? 'agent.mentor' : `agent.subagent${role.charAt(0).toUpperCase() + role.slice(1)}`;
     const tier = roleModelTiers[role] ?? 'balanced';
     const tierModel = resolveAncillaryModelTier(tier, settings);
-    const legacyModel = settings.get(`${subagentPrefix}Model`);
-    const legacyProvider = settings.get(`${subagentPrefix}Provider`);
-    const configuredLegacyReasoningEffort = settings.get(`${subagentPrefix}ReasoningEffort`);
+    const legacyModel = settings.getDynamic(`${subagentPrefix}Model`);
+    const legacyProvider = settings.getDynamic(`${subagentPrefix}Provider`);
+    const configuredLegacyReasoningEffort = settings.getDynamic(`${subagentPrefix}ReasoningEffort`);
     const legacyReasoningEffort = role === 'mentor' && configuredLegacyReasoningEffort === 'default' ? undefined : configuredLegacyReasoningEffort;
     const model = isInherited(frontmatter.model)
-        ? settings.get(`agent.${tier}Model`) ?? legacyModel ?? tierModel.model
+        ? settings.getDynamic(`agent.${tier}Model`) ?? legacyModel ?? tierModel.model
         : frontmatter.model;
     const provider = isInherited(frontmatter.provider)
-        ? settings.get(`agent.${tier}Provider`) ?? legacyProvider ?? tierModel.provider
+        ? settings.getDynamic(`agent.${tier}Provider`) ?? legacyProvider ?? tierModel.provider
         : frontmatter.provider;
     return {
         role,
@@ -102,7 +101,7 @@ export function loadRoleDefinition(role, settings) {
         model,
         provider,
         reasoningEffort: isInherited(frontmatter.reasoningEffort)
-            ? settings.get(`agent.${tier}ReasoningEffort`) ??
+            ? settings.getDynamic(`agent.${tier}ReasoningEffort`) ??
                 legacyReasoningEffort ??
                 settings.get('agent.reasoningEffort') ??
                 'default'

package/dist/services/subagents/role-loader.js.map

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

package/dist/services/subagents/runtime.d.ts

@@ -8,6 +8,9 @@ import { ExecutionSubagentRunner } from './execution-runner.js';
 import { MentorRunner } from './mentor-runner.js';
 import type { SkillsService } from '../skills/skills-service.js';
 import { SubagentAsyncRegistry } from './subagent-async-registry.js';
+import type { ToolOwnershipRegistry } from '../approval/tool-ownership-registry.js';
+import { NestedToolCompatibilityState } from '../session/nested-tool-compatibility-state.js';
+import type { BackgroundSubagentApprovalPauseSink } from './foreground-subagent-lease.js';
 export interface SubagentRuntimeDeps {
     logger: ILoggingService;
     settings: ISettingsService;
@@ -17,6 +20,11 @@ export interface SubagentRuntimeDeps {
     agentClient?: ISubagentClient;
     createClient?: ISubagentClientFactory['createClient'];
     skillsService?: SkillsService;
+    toolOwnership: ToolOwnershipRegistry;
+    /** Session-owned state for nested tools' legacy approval protocol only. */
+    nestedCompatibility?: NestedToolCompatibilityState;
+    /** Session-owned queue/control sink for pauses from adopted child runs. */
+    backgroundApprovalPauseSink?: BackgroundSubagentApprovalPauseSink;
 }
 export interface SubagentRuntime {
     toolPolicy: SubagentToolPolicy;
@@ -25,6 +33,8 @@ export interface SubagentRuntime {
     executionRunner: ExecutionSubagentRunner;
     mentorRunner: MentorRunner;
     asyncRegistry: SubagentAsyncRegistry;
+    /** The one exact compatibility state used by nested tool creation. */
+    nestedCompatibility: NestedToolCompatibilityState;
 }
 export declare function createSubagentRuntime(deps: SubagentRuntimeDeps): SubagentRuntime;
 //# sourceMappingURL=runtime.d.ts.map

package/dist/services/subagents/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAC1G,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAC1F,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAuB,MAAM,oBAAoB,CAAC;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAIrE,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,qBAAqB,EAAE,sBAAsB,CAAC;IAC9C,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC7C,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,YAAY,CAAC,EAAE,sBAAsB,CAAC,cAAc,CAAC,CAAC;IACtD,aAAa,CAAC,EAAE,aAAa,CAAC;CAC/B;AAED,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,kBAAkB,CAAC;IAC/B,WAAW,EAAE,mBAAmB,CAAC;IACjC,YAAY,EAAE,oBAAoB,CAAC;IACnC,eAAe,EAAE,uBAAuB,CAAC;IACzC,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa,EAAE,qBAAqB,CAAC;CACtC;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,mBAAmB,GAAG,eAAe,CA+FhF"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAC1G,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAC1F,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAuB,MAAM,oBAAoB,CAAC;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAGrE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AACpF,OAAO,EAAE,4BAA4B,EAAE,MAAM,+CAA+C,CAAC;AAC7F,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,gCAAgC,CAAC;AAE1F,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,qBAAqB,EAAE,sBAAsB,CAAC;IAC9C,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC7C,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,YAAY,CAAC,EAAE,sBAAsB,CAAC,cAAc,CAAC,CAAC;IACtD,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,aAAa,EAAE,qBAAqB,CAAC;IACrC,2EAA2E;IAC3E,mBAAmB,CAAC,EAAE,4BAA4B,CAAC;IACnD,2EAA2E;IAC3E,2BAA2B,CAAC,EAAE,mCAAmC,CAAC;CACnE;AAED,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,kBAAkB,CAAC;IAC/B,WAAW,EAAE,mBAAmB,CAAC;IACjC,YAAY,EAAE,oBAAoB,CAAC;IACnC,eAAe,EAAE,uBAAuB,CAAC;IACzC,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa,EAAE,qBAAqB,CAAC;IACrC,sEAAsE;IACtE,mBAAmB,EAAE,4BAA4B,CAAC;CACnD;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,mBAAmB,GAAG,eAAe,CA4GhF"}

package/dist/services/subagents/runtime.js

@@ -5,16 +5,24 @@ import { MentorRunner } from './mentor-runner.js';
 import { SubagentAsyncRegistry } from './subagent-async-registry.js';
 import { SubagentSession } from './subagent-session.js';
 import { loadRoleDefinition } from './role-loader.js';
+import { NestedToolCompatibilityState } from '../session/nested-tool-compatibility-state.js';
 export function createSubagentRuntime(deps) {
+    const nestedCompatibility = deps.nestedCompatibility ?? new NestedToolCompatibilityState(deps.settings);
     // Peek (get_subagent_status): route subagent_tool_started events into the
     // registry so it can capture live per-run progress. The registry is assigned
     // after the runners below (its `run` callback references them), so the
     // optional chaining keeps this safe until then. Events fire only during
     // execution, which always happens after the registry is assigned.
+    // `asyncRegistry` is assigned once below but referenced earlier by the
+    // `onEventWithPeek` closure; prefer-const lint would complain here so
+    // disable it for this declaration.
+    // eslint-disable-next-line prefer-const
     let asyncRegistry;
     const onEventWithPeek = (event) => {
-        deps.onEvent?.(event);
         asyncRegistry?.handleSubagentEvent(event);
+        // Registry state is updated before the bridge routes the event. This is
+        // what makes an adopted run's first terminal event background-owned.
+        deps.onEvent?.(event);
     };
     const toolPolicy = new SubagentToolPolicy({
         settings: deps.settings,
@@ -29,6 +37,7 @@ export function createSubagentRuntime(deps) {
         executionContext: deps.executionContext,
         toolPolicy,
         skillsService: deps.skillsService,
+        nestedCompatibility,
     });
     const roleToolCache = new Map();
     const nestedRunner = new NestedSubagentRunner({
@@ -40,6 +49,8 @@ export function createSubagentRuntime(deps) {
         onEvent: onEventWithPeek,
         roleToolCache,
         skillsService: deps.skillsService,
+        toolOwnership: deps.toolOwnership,
+        ...(deps.backgroundApprovalPauseSink ? { backgroundApprovalPauseSink: deps.backgroundApprovalPauseSink } : {}),
     });
     const executionRunner = new ExecutionSubagentRunner({
         logger: deps.logger,
@@ -50,6 +61,7 @@ export function createSubagentRuntime(deps) {
         toolFactory,
         onEvent: onEventWithPeek,
         skillsService: deps.skillsService,
+        toolOwnership: deps.toolOwnership,
     });
     const mentorSession = new SubagentSession('mentor', 'mentor');
     const mentorRunner = new MentorRunner({
@@ -70,6 +82,7 @@ export function createSubagentRuntime(deps) {
             return executionRunner.runInSession(runId, { ...request, signal }, { ...definition, ...(request.executionBudget ? { executionBudget: request.executionBudget } : {}) }, session, undefined, signal, undefined, control, input);
         },
         onEvent: deps.onEvent,
+        sessionContextService: deps.sessionContextService,
         ttlMs: deps.settings.get('subagent.asyncSessionTtlMs') ?? 30 * 60 * 1000,
         messageCap: deps.settings.get('subagent.asyncMessageCap') ?? 50,
         sessionForRole: (role) => (role === 'mentor' ? mentorSession : undefined),
@@ -81,6 +94,7 @@ export function createSubagentRuntime(deps) {
         executionRunner,
         mentorRunner,
         asyncRegistry,
+        nestedCompatibility,
     };
 }
 //# sourceMappingURL=runtime.js.map

package/dist/services/subagents/runtime.js.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../source/services/subagents/runtime.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../source/services/subagents/runtime.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAuB,MAAM,oBAAoB,CAAC;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGlD,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtD,OAAO,EAAE,4BAA4B,EAAE,MAAM,+CAA+C,CAAC;AA8B7F,MAAM,UAAU,qBAAqB,CAAC,IAAyB;IAC7D,MAAM,mBAAmB,GAAG,IAAI,CAAC,mBAAmB,IAAI,IAAI,4BAA4B,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACxG,0EAA0E;IAC1E,6EAA6E;IAC7E,uEAAuE;IACvE,wEAAwE;IACxE,kEAAkE;IAClE,uEAAuE;IACvE,sEAAsE;IACtE,mCAAmC;IACnC,wCAAwC;IACxC,IAAI,aAAgD,CAAC;IACrD,MAAM,eAAe,GAAG,CAAC,KAAwB,EAAQ,EAAE;QACzD,aAAa,EAAE,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAC1C,wEAAwE;QACxE,qEAAqE;QACrE,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG,IAAI,kBAAkB,CAAC;QACxC,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;QACjD,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;QACvC,WAAW,EAAE,IAAI,CAAC,WAAW;KAC9B,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,IAAI,mBAAmB,CAAC;QAC1C,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;QACvC,UAAU;QACV,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,mBAAmB;KACpB,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,IAAI,GAAG,EAAyC,CAAC;IAEvE,MAAM,YAAY,GAAG,IAAI,oBAAoB,CAAC;QAC5C,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;QACjD,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;QACvC,WAAW;QACX,OAAO,EAAE,eAAe;QACxB,aAAa;QACb,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,GAAG,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC,CAAC,EAAE,2BAA2B,EAAE,IAAI,CAAC,2BAA2B,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC/G,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,IAAI,uBAAuB,CAAC;QAClD,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;QACjD,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;QACvC,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,WAAW;QACX,OAAO,EAAE,eAAe;QACxB,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,aAAa,EAAE,IAAI,CAAC,aAAa;KAClC,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,IAAI,eAAe,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC9D,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC;QACpC,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;QACjD,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;QACvC,OAAO,EAAE,eAAe;QACxB,OAAO,EAAE,aAAa;KACvB,CAAC,CAAC;IAEH,aAAa,GAAG,IAAI,qBAAqB,CAAC;QACxC,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,GAAG,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE;YACjE,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC9B,OAAO,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;YAClF,CAAC;YACD,MAAM,UAAU,GAAG,kBAAkB,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YACnE,OAAO,eAAe,CAAC,YAAY,CACjC,KAAK,EACL,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,EACtB,EAAE,GAAG,UAAU,EAAE,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EACnG,OAAO,EACP,SAAS,EACT,MAAM,EACN,SAAS,EACT,OAAO,EACP,KAAK,CACN,CAAC;QACJ,CAAC;QACD,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;QACjD,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,4BAA4B,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;QACxE,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,0BAA0B,CAAC,IAAI,EAAE;QAC/D,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC;KAC1E,CAAC,CAAC;IAEH,OAAO;QACL,UAAU;QACV,WAAW;QACX,YAAY;QACZ,eAAe;QACf,YAAY;QACZ,aAAa;QACb,mBAAmB;KACpB,CAAC;AACJ,CAAC"}

package/dist/services/subagents/subagent-async-registry.d.ts

@@ -1,7 +1,8 @@
-import type { ILoggingService } from '../service-interfaces.js';
+import type { ILoggingService, ISessionContextService } from '../service-interfaces.js';
 import type { ConversationEvent } from '../conversation/conversation-events.js';
 import type { SubagentRequest, SubagentResult, SubagentRunHandle, SubagentRunStatus, SubagentSegmentControl, SubagentCancelAcknowledgement, SubagentSteerAcknowledgement } from './types.js';
 import { SubagentSession } from './subagent-session.js';
+import { ForegroundSubagentLease } from './foreground-subagent-lease.js';
 export declare const SUBAGENT_RUN_NAME_PATTERN: RegExp;
 export type SubagentRegistryErrorCode = 'not_found' | 'role_mismatch' | 'not_continuable' | 'already_active' | 'worker_blocked' | 'evicted' | 'invalid_name' | 'name_in_use';
 export declare class SubagentRegistryError extends Error {
@@ -20,6 +21,12 @@ export interface SubagentAsyncRegistryDeps {
         control: SubagentSegmentControl;
     }) => Promise<SubagentResult>;
     onEvent?: (event: ConversationEvent) => void;
+    /**
+     * Used to scope each run's provider traffic to the run itself. Optional only
+     * so unit tests that never reach a provider can omit it; production wiring in
+     * `createSubagentRuntime` always supplies it.
+     */
+    sessionContextService?: ISessionContextService;
     now?: () => number;
     ttlMs?: number;
     messageCap?: number;
@@ -33,6 +40,12 @@ export declare class SubagentAsyncRegistry {
     #private;
     constructor(deps: SubagentAsyncRegistryDeps);
     startRun(request: SubagentRequest, _legacyParentSignal?: AbortSignal): SubagentRunHandle;
+    /**
+     * Atomically publishes an already-running foreground child. Unlike
+     * startRun this never constructs a session runner or dispatches provider
+     * work; the supplied lease retains the exact live execution.
+     */
+    adoptForegroundLease(lease: ForegroundSubagentLease, request: Pick<SubagentRequest, 'role' | 'task' | 'name' | 'parentTool'>): SubagentRunHandle;
     hasActiveRunForRole(role: string): boolean;
     /**
      * Non-blocking progress snapshot for one run, or all non-evicted runs when
@@ -58,10 +71,16 @@ export declare class SubagentAsyncRegistry {
      * Queue bounded steering for an active execution run without awaiting its result.
      * Canonical active run ids are resolved before active names.
      */
-    sendMessage(target: string, guidance: string, replyTo?: string): SubagentSteerAcknowledgement;
+    sendMessage(target: string, guidance: string, replyToParam?: string | null): SubagentSteerAcknowledgement;
     cancelAllRuns(): void;
     reset(): void;
     dispose(): void;
+    /**
+     * Cancels retained adopted leases and waits for their terminal settlement.
+     * Session composition owns sink detachment and calls this before disconnecting
+     * its durable background-event and approval-pause consumers.
+     */
+    disposeAndWaitForAdoptedLeases(): Promise<void>;
     evictExpired(): void;
 }
 //# sourceMappingURL=subagent-async-registry.d.ts.map

package/dist/services/subagents/subagent-async-registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subagent-async-registry.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/subagent-async-registry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"subagent-async-registry.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/subagent-async-registry.ts"],"names":[],"mappings":"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"}

package/dist/services/subagents/subagent-async-registry.js

@@ -1,10 +1,13 @@
 import { randomUUID } from 'node:crypto';
+import { createCodenameRunId } from './codename-run-id.js';
 import { addTokenUsage } from '../../utils/ai/token-usage.js';
 import { SubagentRunControl } from './subagent-run-control.js';
 import { SubagentSession } from './subagent-session.js';
 import { isAbortLike, safeEmit, truncatePreview } from './utils.js';
 export const SUBAGENT_RUN_NAME_PATTERN = /^[a-z][a-z0-9_-]{0,31}$/;
 const MAX_STEERING_GUIDANCE_CHARACTERS = 2_000;
+/** Defensive retry bound before accepting a (vanishingly unlikely) id collision. */
+const MAX_RUN_ID_ATTEMPTS = 16;
 const MAX_TURN_HISTORY = 5;
 const TURN_TEXT_CHAR_LIMIT = 200;
 export class SubagentRegistryError extends Error {
@@ -28,6 +31,7 @@ export class SubagentAsyncRegistry {
     #ttlMs;
     #messageCap;
     #createRunId;
+    #sessionContextService;
     #sessionCap = 50;
     #sessionForRole;
     #timer;
@@ -40,7 +44,8 @@ export class SubagentAsyncRegistry {
         this.#now = deps.now ?? Date.now;
         this.#ttlMs = deps.ttlMs ?? 30 * 60 * 1000;
         this.#messageCap = deps.messageCap ?? 50;
-        this.#createRunId = deps.createRunId ?? randomUUID;
+        this.#createRunId = deps.createRunId ?? createCodenameRunId;
+        this.#sessionContextService = deps.sessionContextService;
         this.#sessionForRole = deps.sessionForRole;
         this.#clearInterval = deps.clearInterval ?? clearInterval;
         this.#timer = (deps.setInterval ?? setInterval)(() => this.#evictExpired(), Math.max(1000, Math.min(this.#ttlMs, 60_000)));
@@ -50,7 +55,7 @@ export class SubagentAsyncRegistry {
         if (this.#disposed)
             throw new Error('Subagent async registry is disposed');
         const role = request.role;
-        if (!['explorer', 'worker', 'researcher', 'mentor', 'librarian'].includes(role)) {
+        if (!['explorer', 'worker', 'mentor', 'librarian'].includes(role)) {
             throw new SubagentRegistryError('not_continuable', `Unknown subagent role: ${role}`);
         }
         const name = request.name;
@@ -62,6 +67,7 @@ export class SubagentAsyncRegistry {
         }
         const continuation = request.continueRunId;
         let session;
+        let trafficContext;
         if (continuation) {
             const previous = this.#runs.get(continuation);
             if (!previous) {
@@ -71,12 +77,15 @@ export class SubagentAsyncRegistry {
                 throw new SubagentRegistryError('role_mismatch', `Run ${continuation} belongs to role ${previous.role}, not ${role}`);
             if (isActiveStatus(previous.status))
                 throw new SubagentRegistryError('already_active', `Async subagent run ${continuation} is already active`);
+            if (previous.status !== 'completed')
+                throw new SubagentRegistryError('not_continuable', `Async subagent run ${continuation} cannot be continued from status ${previous.status}`);
             if (role === 'worker')
                 throw new SubagentRegistryError('worker_blocked', 'Worker runs cannot be continued asynchronously');
-            if (role !== 'mentor' && role !== 'librarian' && role !== 'explorer' && role !== 'researcher') {
+            if (role !== 'mentor' && role !== 'librarian' && role !== 'explorer') {
                 throw new SubagentRegistryError('not_continuable', `Role ${role} cannot be continued`);
             }
             session = previous.session;
+            trafficContext = previous.trafficContext;
         }
         else {
             const reuseDefault = role === 'mentor' || role === 'librarian';
@@ -90,7 +99,8 @@ export class SubagentAsyncRegistry {
             }
         }
         this.#evictToSessionCap();
-        const runId = continuation ?? this.#createRunId();
+        const runId = continuation ?? this.#allocateRunId();
+        trafficContext ??= this.#deriveTrafficContext(runId);
         const control = new SubagentRunControl();
         let resolve;
         const promise = new Promise((r) => (resolve = r));
@@ -116,6 +126,7 @@ export class SubagentAsyncRegistry {
             turnHistory: [],
             pendingToolCounts: new Map(),
             currentText: '',
+            ...(trafficContext ? { trafficContext } : {}),
         };
         this.#runs.set(runId, stored);
         if (name !== undefined)
@@ -131,14 +142,87 @@ export class SubagentAsyncRegistry {
         safeEmit(this.#logger, this.#onEvent, {
             type: 'subagent_started',
             agentId: runId,
+            ...(name !== undefined ? { name } : {}),
             role,
             task: request.task,
-            parentTool: request.parentTool ?? 'run_subagent_async',
+            parentTool: request.parentTool ?? 'run_subagent',
             async: true,
         });
         this.#startSegment(stored, request, request.task);
         return { runId, role, ...(name !== undefined ? { name } : {}), status: 'running', task: request.task };
     }
+    /**
+     * Atomically publishes an already-running foreground child. Unlike
+     * startRun this never constructs a session runner or dispatches provider
+     * work; the supplied lease retains the exact live execution.
+     */
+    adoptForegroundLease(lease, request) {
+        if (this.#disposed)
+            throw new Error('Subagent async registry is disposed');
+        if (lease.adopted || lease.settled)
+            throw new Error(`Foreground subagent lease ${lease.runId} is not adoptable.`);
+        if (this.#runs.has(lease.runId) || this.#evicted.has(lease.runId)) {
+            throw new Error(`Async subagent run id ${lease.runId} is already retained.`);
+        }
+        if (!['explorer', 'worker', 'mentor', 'librarian'].includes(request.role)) {
+            throw new SubagentRegistryError('not_continuable', `Unknown subagent role: ${request.role}`);
+        }
+        if (request.name !== undefined &&
+            (this.#activeNameToRunId.has(request.name) || !SUBAGENT_RUN_NAME_PATTERN.test(request.name))) {
+            throw new SubagentRegistryError(this.#activeNameToRunId.has(request.name) ? 'name_in_use' : 'invalid_name', `Invalid or active async subagent name: ${request.name}`);
+        }
+        // Validate every possible rejection before changing foreground ownership.
+        this.#evictToSessionCap();
+        const session = this.#sessionForRole?.(request.role) ?? new SubagentSession(lease.runId, request.role);
+        for (const active of this.#runs.values()) {
+            if (isActiveStatus(active.status) && active.session === session) {
+                throw new SubagentRegistryError('already_active', `Session for role ${request.role} is already active`);
+            }
+        }
+        let resolve;
+        const promise = new Promise((r) => (resolve = r));
+        const stored = {
+            runId: lease.runId,
+            role: request.role,
+            task: request.task,
+            ...(request.name !== undefined ? { name: request.name } : {}),
+            session,
+            status: 'running',
+            control: new SubagentRunControl(),
+            evidence: { filesChanged: new Set(), toolsUsed: new Map(), diffStat: new Map() },
+            lastUsedAt: this.#now(),
+            resolve,
+            promise,
+            settled: false,
+            startedAt: this.#now(),
+            toolCounts: new Map(),
+            turnHistory: [],
+            pendingToolCounts: new Map(),
+            currentText: '',
+            lease,
+        };
+        this.#runs.set(lease.runId, stored);
+        if (request.name !== undefined)
+            this.#activeNameToRunId.set(request.name, lease.runId);
+        try {
+            lease.adopt();
+        }
+        catch (error) {
+            this.#runs.delete(lease.runId);
+            if (request.name !== undefined)
+                this.#activeNameToRunId.delete(request.name);
+            throw error;
+        }
+        safeEmit(this.#logger, this.#onEvent, {
+            type: 'subagent_started',
+            agentId: lease.runId,
+            role: request.role,
+            task: request.task,
+            parentTool: request.parentTool ?? 'run_subagent',
+            async: true,
+        });
+        return { runId: lease.runId, role: request.role, status: 'running', task: request.task };
+    }
     hasActiveRunForRole(role) {
         return [...this.#runs.values()].some((run) => run.role === role && isActiveStatus(run.status));
     }
@@ -175,7 +259,7 @@ export class SubagentAsyncRegistry {
             runId: run.runId,
             ...(run.name !== undefined ? { name: run.name } : {}),
             role: run.role,
-            status: run.status,
+            status: run.lease?.getPendingApproval() ? 'awaiting_approval' : run.status,
             task: run.task,
             taskPreview: truncatePreview(run.task),
             startedAt: run.startedAt,
@@ -203,6 +287,14 @@ export class SubagentAsyncRegistry {
      * the registry learns `subagent_tool_started` mid-run.
      */
     handleSubagentEvent(event) {
+        if (event.type === 'subagent_completed') {
+            const run = this.#runs.get(event.result.agentId);
+            if (run?.lease && !run.settled) {
+                this.#accumulateEvidence(run.evidence, event.result);
+                this.#settle(run, this.#assembleTerminalResult(run, event.result), false);
+            }
+            return;
+        }
         if (event.type !== 'subagent_tool_started' &&
             event.type !== 'subagent_text_turn' &&
             event.type !== 'subagent_streaming_text')
@@ -265,10 +357,18 @@ export class SubagentAsyncRegistry {
      * Queue bounded steering for an active execution run without awaiting its result.
      * Canonical active run ids are resolved before active names.
      */
-    sendMessage(target, guidance, replyTo) {
+    sendMessage(target, guidance, replyToParam) {
+        // OpenAI strict tool schemas turn optional params into nullable-with-null-default,
+        // so an absent reply_to arrives as null. Treat it as absent, not as an answer.
+        const replyTo = replyToParam ?? undefined;
         const run = this.#resolveActiveTarget(target);
         if (!run)
             return { ok: false, code: 'not_active', target };
+        // An adopted nested loop has no steering segment consumer. Do not accept
+        // guidance that cannot be delivered; a later lease control port may add
+        // that capability explicitly.
+        if (run.lease)
+            return { ok: false, code: 'unsupported_control', target };
         if (run.role === 'mentor')
             return { ok: false, code: 'unsupported_control', target };
         const message = guidance.trim();
@@ -310,6 +410,7 @@ export class SubagentAsyncRegistry {
         if (run.status !== 'running' && run.status !== 'waiting_for_answer')
             return;
         run.status = 'cancelling';
+        run.lease?.cancel();
         run.control.requestCancellation();
     }
     reset() {
@@ -328,6 +429,18 @@ export class SubagentAsyncRegistry {
         this.#clearInterval(this.#timer);
         this.reset();
     }
+    /**
+     * Cancels retained adopted leases and waits for their terminal settlement.
+     * Session composition owns sink detachment and calls this before disconnecting
+     * its durable background-event and approval-pause consumers.
+     */
+    async disposeAndWaitForAdoptedLeases() {
+        const adoptedSettlements = [...this.#runs.values()]
+            .filter((run) => run.lease && !run.settled)
+            .map((run) => run.promise);
+        this.dispose();
+        await Promise.all(adoptedSettlements);
+    }
     #evictToSessionCap() {
         while (this.#sessions.size > this.#sessionCap) {
             const candidate = [...this.#runs.values()]
@@ -356,6 +469,32 @@ export class SubagentAsyncRegistry {
             }
         }
     }
+    /**
+     * Allocate a fresh run id, retrying the factory against an active, settled, or
+     * evicted id. A collision would silently overwrite a stored run, so even the
+     * vanishingly unlikely codename collision is defended here rather than
+     * relying on the factory's entropy alone.
+     */
+    /**
+     * Scopes the run's provider traffic to the run, under whichever context
+     * launched it — so a background subagent started by another subagent nests
+     * beneath its parent instead of flattening back onto the conversation.
+     */
+    #deriveTrafficContext(runId) {
+        const launchContext = this.#sessionContextService?.getContext();
+        if (!launchContext)
+            return undefined;
+        const parentKey = launchContext.providerHistoryKey ?? launchContext.sessionId;
+        return { ...launchContext, providerHistoryKey: `${parentKey}:subagent:${runId}` };
+    }
+    #allocateRunId() {
+        for (let attempt = 0; attempt < MAX_RUN_ID_ATTEMPTS; attempt++) {
+            const candidate = this.#createRunId();
+            if (!this.#runs.has(candidate) && !this.#evicted.has(candidate))
+                return candidate;
+        }
+        return this.#createRunId();
+    }
     #resolveActiveTarget(target) {
         const byRunId = this.#runs.get(target);
         if (byRunId && isActiveStatus(byRunId.status))
@@ -375,7 +514,7 @@ export class SubagentAsyncRegistry {
     async #executeSegment(run, request, input, controller) {
         let result;
         try {
-            result = await this.#run({
+            const runSegment = () => this.#run({
                 request,
                 runId: run.runId,
                 session: run.session,
@@ -387,6 +526,11 @@ export class SubagentAsyncRegistry {
                     askOrchestrator: (question) => this.#askOrchestrator(run, question),
                 },
             });
+            // Every segment — first launch, `continue_run_id`, steering continuation —
+            // runs under the run's own context, so they share one provider-side session.
+            result = await (run.trafficContext && this.#sessionContextService
+                ? this.#sessionContextService.runWithContext(run.trafficContext, runSegment)
+                : runSegment());
             run.session.trimHistory(this.#messageCap);
             result = { ...result, agentId: run.runId };
         }
@@ -415,7 +559,7 @@ export class SubagentAsyncRegistry {
         }
         this.#settle(run, this.#assembleTerminalResult(run, result));
     }
-    #settle(run, result) {
+    #settle(run, result, emit = true) {
         if (run.settled)
             return;
         run.status = result.status;
@@ -426,9 +570,10 @@ export class SubagentAsyncRegistry {
             this.#activeNameToRunId.delete(run.name);
         }
         run.control.settle();
+        run.lease?.settle();
         run.removeParentAbortListener?.();
         run.resolve(result);
-        if (!this.#disposed)
+        if (emit && !this.#disposed)
             safeEmit(this.#logger, this.#onEvent, { type: 'subagent_completed', result, async: true });
     }
     #askOrchestrator(run, question) {
@@ -458,6 +603,7 @@ export class SubagentAsyncRegistry {
         const diffStat = [...run.evidence.diffStat.values()];
         return {
             agentId: run.runId,
+            ...(run.name !== undefined ? { name: run.name } : {}),
             role: run.role,
             status,
             finalText: status === 'completed' ? segment.finalText : '',