@qduc/term2 0.11.0 → 0.12.0

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+EhF"}
+{"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,7 +5,25 @@ 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) => {
+        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,
         logger: deps.logger,
@@ -19,6 +37,7 @@ export function createSubagentRuntime(deps) {
         executionContext: deps.executionContext,
         toolPolicy,
         skillsService: deps.skillsService,
+        nestedCompatibility,
     });
     const roleToolCache = new Map();
     const nestedRunner = new NestedSubagentRunner({
@@ -27,9 +46,11 @@ export function createSubagentRuntime(deps) {
         sessionContextService: deps.sessionContextService,
         executionContext: deps.executionContext,
         toolFactory,
-        onEvent: deps.onEvent,
+        onEvent: onEventWithPeek,
         roleToolCache,
         skillsService: deps.skillsService,
+        toolOwnership: deps.toolOwnership,
+        ...(deps.backgroundApprovalPauseSink ? { backgroundApprovalPauseSink: deps.backgroundApprovalPauseSink } : {}),
     });
     const executionRunner = new ExecutionSubagentRunner({
         logger: deps.logger,
@@ -38,8 +59,9 @@ export function createSubagentRuntime(deps) {
         executionContext: deps.executionContext,
         createClient: deps.createClient,
         toolFactory,
-        onEvent: deps.onEvent,
+        onEvent: onEventWithPeek,
         skillsService: deps.skillsService,
+        toolOwnership: deps.toolOwnership,
     });
     const mentorSession = new SubagentSession('mentor', 'mentor');
     const mentorRunner = new MentorRunner({
@@ -47,19 +69,20 @@ export function createSubagentRuntime(deps) {
         settings: deps.settings,
         sessionContextService: deps.sessionContextService,
         executionContext: deps.executionContext,
-        onEvent: deps.onEvent,
+        onEvent: onEventWithPeek,
         session: mentorSession,
     });
-    const asyncRegistry = new SubagentAsyncRegistry({
+    asyncRegistry = new SubagentAsyncRegistry({
         logger: deps.logger,
-        run: async ({ request, runId, session, signal }) => {
+        run: async ({ request, runId, session, signal, input, control }) => {
             if (request.role === 'mentor') {
-                return mentorRunner.run(runId, request.task, signal, session, request.executionBudget);
+                return mentorRunner.run(runId, input, signal, session, request.executionBudget);
             }
             const definition = loadRoleDefinition(request.role, deps.settings);
-            return executionRunner.runInSession(runId, { ...request, signal }, { ...definition, ...(request.executionBudget ? { executionBudget: request.executionBudget } : {}) }, session);
+            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),
@@ -71,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":"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"}

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

@@ -1,8 +1,10 @@
-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 } from './types.js';
+import type { SubagentRequest, SubagentResult, SubagentRunHandle, SubagentRunStatus, SubagentSegmentControl, SubagentCancelAcknowledgement, SubagentSteerAcknowledgement } from './types.js';
 import { SubagentSession } from './subagent-session.js';
-export type SubagentRegistryErrorCode = 'not_found' | 'role_mismatch' | 'not_continuable' | 'already_active' | 'worker_blocked' | 'evicted';
+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 {
     readonly code: SubagentRegistryErrorCode;
     constructor(code: SubagentRegistryErrorCode, message: string);
@@ -14,11 +16,21 @@ export interface SubagentAsyncRegistryDeps {
         runId: string;
         session: SubagentSession;
         signal: AbortSignal;
+        /** A fresh user-turn input for this segment, never SDK RunState reuse. */
+        input: string;
+        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;
+    createRunId?: () => string;
     sessionForRole?: (role: string) => SubagentSession | undefined;
     setInterval?: (callback: () => void, delay: number) => ReturnType<typeof setInterval>;
     clearInterval?: (timer: ReturnType<typeof setInterval>) => void;
@@ -28,12 +40,47 @@ 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
+     * `runId` is omitted. Never awaits a run promise and never carries
+     * completion detail — that stays on `get_subagent_result`.
+     */
+    getRunStatus(runId?: string): SubagentRunStatus | SubagentRunStatus[];
+    /**
+     * Receive a conversation event and update the owning run's peek progress.
+     * No-op for events whose `agentId` is not a run this registry owns (sync /
+     * nested subagent events are ignored here). This is the only path by which
+     * the registry learns `subagent_tool_started` mid-run.
+     */
+    handleSubagentEvent(event: ConversationEvent): void;
     getResult(runId: string, signal?: AbortSignal): Promise<SubagentResult>;
     abortRun(runId: string): void;
+    /**
+     * Non-blocking public cancellation addressed by canonical runId first, then
+     * its active name. `abortRun` remains the internal user-stop compatibility API.
+     */
+    cancelRun(target: string): SubagentCancelAcknowledgement;
+    /**
+     * 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, 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":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AACrF,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,MAAM,MAAM,yBAAyB,GACjC,WAAW,GACX,eAAe,GACf,iBAAiB,GACjB,gBAAgB,GAChB,gBAAgB,GAChB,SAAS,CAAC;AAEd,qBAAa,qBAAsB,SAAQ,KAAK;IAC9C,QAAQ,CAAC,IAAI,EAAE,yBAAyB,CAAC;IACzC,YAAY,IAAI,EAAE,yBAAyB,EAAE,OAAO,EAAE,MAAM,EAI3D;CACF;AAiBD,MAAM,WAAW,yBAAyB;IACxC,MAAM,EAAE,eAAe,CAAC;IACxB,GAAG,EAAE,CAAC,MAAM,EAAE;QACZ,OAAO,EAAE,eAAe,CAAC;QACzB,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,eAAe,CAAC;QACzB,MAAM,EAAE,WAAW,CAAC;KACrB,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;IAC9B,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC7C,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,eAAe,GAAG,SAAS,CAAC;IAC/D,WAAW,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,KAAK,EAAE,MAAM,KAAK,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC;IACtF,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,KAAK,IAAI,CAAC;CACjE;AAED,yFAAyF;AACzF,qBAAa,qBAAqB;;IAgBhC,YAAY,IAAI,EAAE,yBAAyB,EAc1C;IAED,QAAQ,CAAC,OAAO,EAAE,eAAe,EAAE,mBAAmB,CAAC,EAAE,WAAW,GAAG,iBAAiB,CA6EvF;IAED,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEzC;IAED,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,CAatE;IAED,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAG5B;IAED,aAAa,IAAI,IAAI,CAEpB;IAuBD,KAAK,IAAI,IAAI,CAMZ;IAED,OAAO,IAAI,IAAI,CAKd;IAgBD,YAAY,IAAI,IAAI,CAEnB;CAwCF"}
+{"version":3,"file":"subagent-async-registry.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/subagent-async-registry.ts"],"names":[],"mappings":"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"}