@qduc/term2 0.11.1 → 0.12.0

package/dist/services/subagents/subagent-notification-store.js

@@ -1,5 +1,5 @@
 import { formatToolCommand, parseToolArguments } from '../../utils/conversation/conversation-utils.js';
-import { truncatePreview } from './utils.js';
+import { formatSubagentResult, truncatePreview } from './utils.js';
 const DEFAULT_DELIVERED_ID_CAP = 256;
 export const BACKGROUND_TASK_RECENT_RETENTION_MS = 5_000;
 /**
@@ -23,8 +23,11 @@ export const BACKGROUND_TASK_RECENT_RETENTION_MS = 5_000;
 export class SubagentNotificationStore {
     #pending = new Map();
     #seen = new Set();
+    /** Stop requests are session-scoped and their target count is registry-bounded. */
+    #userControlMessageIds = new Set();
     #tasks = new Map();
     #settledTaskIds = new Set();
+    #lifecycleEpochs = new Map();
     #now;
     #deliveredIdCap;
     #recentTaskRetentionMs;
@@ -39,20 +42,65 @@ export class SubagentNotificationStore {
      * answers "what is it doing now", not "what has it done".
      */
     recordLifecycle(event) {
+        if (event.type === 'background_shell_started') {
+            this.#purgeExpiredTasks();
+            const existing = this.#tasks.get(event.jobId);
+            if (existing?.kind === 'shell' && existing.status !== 'running')
+                return false;
+            if (existing?.kind === 'shell' && existing.status === 'running' && existing.command === event.command)
+                return false;
+            this.#tasks.set(event.jobId, {
+                kind: 'shell',
+                jobId: event.jobId,
+                command: event.command,
+                status: 'running',
+                startedAt: existing?.startedAt ?? this.#now(),
+            });
+            return true;
+        }
+        if (event.type === 'background_shell_completed') {
+            const existing = this.#tasks.get(event.jobId);
+            if (existing?.kind === 'shell' && existing.status !== 'running')
+                return false;
+            const completedAt = this.#now();
+            this.#tasks.set(event.jobId, {
+                kind: 'shell',
+                jobId: event.jobId,
+                command: event.command,
+                status: event.status,
+                startedAt: existing?.kind === 'shell' ? existing.startedAt : completedAt,
+                completedAt,
+                ...(event.error ? { error: event.error } : {}),
+            });
+            return true;
+        }
         if (event.type === 'subagent_tool_started' || event.type === 'subagent_command_message') {
             return this.#recordToolActivity(event);
         }
         if (event.type === 'subagent_started' && event.async === true) {
-            if (this.#settledTaskIds.has(event.agentId))
-                return false;
+            // Retention is what separates replay from continuation here, so it has to
+            // be current whether or not the UI has read a snapshot since.
+            this.#purgeExpiredTasks();
             const existing = this.#tasks.get(event.agentId);
+            // A terminal task still inside its retention window means this start is a
+            // replay of the run that just finished, not a continuation of it.
             if (existing && existing.status !== 'running')
                 return false;
-            if (existing?.status === 'running' && existing.role === event.role && existing.task === event.task) {
+            if (existing?.kind !== 'shell' &&
+                existing?.status === 'running' &&
+                existing.role === event.role &&
+                existing.task === event.task) {
                 return false;
             }
+            // `continue_run_id` reuses a settled run id, so a start for one opens a
+            // fresh lifecycle rather than replaying the old one.
+            if (this.#settledTaskIds.delete(event.agentId)) {
+                this.#bumpLifecycleEpoch(event.agentId);
+            }
             this.#tasks.set(event.agentId, {
+                kind: 'subagent',
                 runId: event.agentId,
+                ...(event.name !== undefined ? { name: event.name } : {}),
                 role: event.role,
                 task: event.task,
                 status: 'running',
@@ -72,12 +120,20 @@ export class SubagentNotificationStore {
             return false;
         const completedAt = this.#now();
         this.#tasks.set(result.agentId, {
+            kind: 'subagent',
             runId: result.agentId,
-            role: existing?.role ?? result.role,
-            task: existing?.task ?? '',
+            ...(existing?.kind !== 'shell' && existing?.name !== undefined
+                ? { name: existing.name }
+                : result.name !== undefined
+                    ? { name: result.name }
+                    : {}),
+            role: existing && existing.kind !== 'shell' ? existing.role : result.role,
+            task: existing && existing.kind !== 'shell' ? existing.task : '',
             status: result.status,
-            startedAt: existing?.startedAt ?? completedAt,
+            startedAt: existing && existing.kind !== 'shell' ? existing.startedAt : completedAt,
             completedAt,
+            ...(result.usage !== undefined ? { usage: result.usage } : {}),
+            ...(result.error ? { error: result.error } : {}),
         });
         this.#settledTaskIds.add(result.agentId);
         while (this.#settledTaskIds.size > this.#deliveredIdCap) {
@@ -95,7 +151,7 @@ export class SubagentNotificationStore {
      */
     #recordToolActivity(event) {
         const task = this.#tasks.get(event.agentId);
-        if (!task || task.status !== 'running')
+        if (!task || task.kind !== 'subagent' || task.status !== 'running')
             return false;
         const lastTool = event.type === 'subagent_tool_started'
             ? {
@@ -114,13 +170,16 @@ export class SubagentNotificationStore {
         return true;
     }
     getTaskSnapshot() {
+        this.#purgeExpiredTasks();
+        return [...this.#tasks.values()];
+    }
+    #purgeExpiredTasks() {
         const now = this.#now();
         for (const [runId, task] of this.#tasks) {
             if (task.completedAt !== undefined && now - task.completedAt >= this.#recentTaskRetentionMs) {
                 this.#tasks.delete(runId);
             }
         }
-        return [...this.#tasks.values()];
     }
     /** Records one novel async completion or question, returning whether it woke the queue. */
     enqueue(event) {
@@ -157,6 +216,17 @@ export class SubagentNotificationStore {
         for (const notification of newer)
             this.#pending.set(notification.messageId, notification);
     }
+    enqueueUserControl(notification) {
+        const lifecycleSuffix = notification.target.kind === 'subagent' ? `:${this.#lifecycleEpochs.get(notification.target.id) ?? 1}` : '';
+        const messageId = `user_control:${notification.action}:${notification.target.kind}:${notification.target.id}${lifecycleSuffix}`;
+        if (this.#userControlMessageIds.has(messageId))
+            return false;
+        this.#pending.set(messageId, { kind: 'user_control', ...notification, messageId, requestedAt: this.#now() });
+        this.#userControlMessageIds.add(messageId);
+        this.#seen.add(messageId);
+        this.#evictOldestSeen();
+        return true;
+    }
     /**
      * Drops the oldest remembered ids once the cap is exceeded, skipping runs that
      * still owe a notification: correctness of an undelivered notification wins
@@ -175,19 +245,57 @@ export class SubagentNotificationStore {
             this.#seen.delete(messageId);
         }
     }
+    /**
+     * Completion ids are stable per lifecycle, not per run id. A run id that is
+     * continued completes once per continuation, and each of those completions
+     * owes the main agent its own notification; only a replay within one
+     * lifecycle is a duplicate.
+     */
+    #completionMessageId(runId) {
+        const epoch = this.#lifecycleEpochs.get(runId) ?? 1;
+        return epoch > 1 ? `completion:${runId}#${epoch}` : `completion:${runId}`;
+    }
+    #bumpLifecycleEpoch(runId) {
+        this.#lifecycleEpochs.set(runId, (this.#lifecycleEpochs.get(runId) ?? 1) + 1);
+        while (this.#lifecycleEpochs.size > this.#deliveredIdCap) {
+            const oldest = this.#lifecycleEpochs.keys().next().value;
+            if (oldest === undefined || oldest === runId)
+                break;
+            this.#lifecycleEpochs.delete(oldest);
+        }
+    }
     #notificationFor(event) {
+        if (event.type === 'background_shell_completed') {
+            return {
+                kind: 'shell_completion',
+                messageId: `shell_completion:${event.jobId}`,
+                jobId: event.jobId,
+                command: event.command,
+                status: event.status,
+                output: event.output,
+                ...(event.error ? { error: event.error } : {}),
+                completedAt: this.#now(),
+            };
+        }
         if (event.type === 'subagent_completed' && event.async === true) {
             const result = event.result;
             const runId = result?.agentId;
             if (!result || !runId)
                 return undefined;
+            const task = this.#tasks.get(runId);
             return {
                 kind: 'completion',
-                messageId: `completion:${runId}`,
+                messageId: this.#completionMessageId(runId),
                 runId,
+                ...(task?.kind !== 'shell' && task?.name !== undefined
+                    ? { name: task.name }
+                    : result.name !== undefined
+                        ? { name: result.name }
+                        : {}),
                 role: result.role,
                 status: result.status,
                 preview: truncatePreview(result.finalText || result.error),
+                formattedResult: formatSubagentResult(result),
                 ...(result.error ? { error: result.error } : {}),
                 completedAt: this.#now(),
             };

package/dist/services/subagents/subagent-notification-store.js.map

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

package/dist/services/subagents/subagent-session.d.ts

@@ -1,5 +1,6 @@
-import type { Agent, Runner, AgentInputItem } from '@openai/agents';
+import type { StreamedModelTurn } from '../../contracts/streamed-model-turn.js';
 import type { SavedToolExecution } from '../tool-execution-ledger.js';
+import type { ProviderInputItem } from '../../contracts/provider-input.js';
 /**
  * General-purpose subagent session. Replaces the private MentorSession shape.
  *
@@ -7,7 +8,7 @@ import type { SavedToolExecution } from '../tool-execution-ledger.js';
  * For one-shot runs (e.g. run_subagent): create a new session per call, discard after.
  */
 export type SubagentSessionState = {
-    history: AgentInputItem[];
+    history: ProviderInputItem[];
     previousResponseId: string | null;
     toolLedger: SavedToolExecution[];
 };
@@ -17,8 +18,8 @@ export declare class SubagentSession {
     readonly role: string;
     constructor(id: string, role: string);
     get provider(): string | null;
-    get runner(): Runner | null;
-    get agent(): Agent | null;
+    get model(): StreamedModelTurn | null;
+    get agent(): unknown;
     get previousResponseId(): string | null;
     reset(): void;
     exportState(): SubagentSessionState;
@@ -26,12 +27,16 @@ export declare class SubagentSession {
     getUserTurnCount(): number;
     trimHistory(maxUserTurns: number): void;
     switchProvider(provider: string): void;
-    ensureRunner(provider: string, createRunner: (providerId: string) => Runner | null): Runner | null;
-    ensureAgent(createAgent: () => Agent): Agent;
+    ensureModel(provider: string, createModel: (providerId: string) => StreamedModelTurn | Promise<StreamedModelTurn>): Promise<StreamedModelTurn>;
+    ensureAgent(createAgent: () => unknown): unknown;
     addUserMessage(message: string): void;
     getInput(task: string, supportsConversationChaining: boolean): any;
     getRunOptions(supportsConversationChaining: boolean, maxTurns: number): Record<string, any>;
-    appendOutput(result: any): void;
+    appendOutput(result: {
+        output?: unknown[];
+        lastResponseId?: string | null;
+        history?: unknown[];
+    }): void;
     setToolLedger(toolLedger: SavedToolExecution[]): void;
 }
 //# sourceMappingURL=subagent-session.d.ts.map

package/dist/services/subagents/subagent-session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subagent-session.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/subagent-session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEpE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEtE;;;;;GAKG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,UAAU,EAAE,kBAAkB,EAAE,CAAC;CAClC,CAAC;AAEF,qBAAa,eAAe;;IAC1B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAQtB,YAAY,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAGnC;IAED,IAAI,QAAQ,IAAI,MAAM,GAAG,IAAI,CAE5B;IAED,IAAI,MAAM,IAAI,MAAM,GAAG,IAAI,CAE1B;IAED,IAAI,KAAK,IAAI,KAAK,GAAG,IAAI,CAExB;IAED,IAAI,kBAAkB,IAAI,MAAM,GAAG,IAAI,CAEtC;IAED,KAAK,IAAI,IAAI,CAUZ;IAED,WAAW,IAAI,oBAAoB,CAMlC;IAED,WAAW,CAAC,KAAK,EAAE,oBAAoB,GAAG,IAAI,CAU7C;IAED,gBAAgB,IAAI,MAAM,CAEzB;IAED,WAAW,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAEtC;IAED,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAQrC;IAED,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAKjG;IAED,WAAW,CAAC,WAAW,EAAE,MAAM,KAAK,GAAG,KAAK,CAM3C;IAED,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAEpC;IAED,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,4BAA4B,EAAE,OAAO,GAAG,GAAG,CAEjE;IAED,aAAa,CAAC,4BAA4B,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAQ1F;IAED,YAAY,CAAC,MAAM,EAAE,GAAG,GAAG,IAAI,CAK9B;IAED,aAAa,CAAC,UAAU,EAAE,kBAAkB,EAAE,GAAG,IAAI,CAEpD;CACF"}
+{"version":3,"file":"subagent-session.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/subagent-session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAEhF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAE3E;;;;;GAKG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,iBAAiB,EAAE,CAAC;IAC7B,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,UAAU,EAAE,kBAAkB,EAAE,CAAC;CAClC,CAAC;AAEF,qBAAa,eAAe;;IAC1B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAQtB,YAAY,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAGnC;IAED,IAAI,QAAQ,IAAI,MAAM,GAAG,IAAI,CAE5B;IAED,IAAI,KAAK,IAAI,iBAAiB,GAAG,IAAI,CAEpC;IAED,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED,IAAI,kBAAkB,IAAI,MAAM,GAAG,IAAI,CAEtC;IAED,KAAK,IAAI,IAAI,CAUZ;IAED,WAAW,IAAI,oBAAoB,CAMlC;IAED,WAAW,CAAC,KAAK,EAAE,oBAAoB,GAAG,IAAI,CAU7C;IAED,gBAAgB,IAAI,MAAM,CAEzB;IAED,WAAW,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAEtC;IAED,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAQrC;IAEK,WAAW,CACf,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC,GAClF,OAAO,CAAC,iBAAiB,CAAC,CAG5B;IAED,WAAW,CAAC,WAAW,EAAE,MAAM,OAAO,GAAG,OAAO,CAM/C;IAED,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAEpC;IAED,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,4BAA4B,EAAE,OAAO,GAAG,GAAG,CAEjE;IAED,aAAa,CAAC,4BAA4B,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAQ1F;IAED,YAAY,CAAC,MAAM,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAA;KAAE,GAAG,IAAI,CAMtG;IAED,aAAa,CAAC,UAAU,EAAE,kBAAkB,EAAE,GAAG,IAAI,CAEpD;CACF"}

package/dist/services/subagents/subagent-session.js

@@ -3,7 +3,7 @@ export class SubagentSession {
     id;
     role;
     #provider = null;
-    #runner = null;
+    #model = null;
     #agent = null;
     #store = null;
     #previousResponseId = null;
@@ -15,8 +15,8 @@ export class SubagentSession {
     get provider() {
         return this.#provider;
     }
-    get runner() {
-        return this.#runner;
+    get model() {
+        return this.#model;
     }
     get agent() {
         return this.#agent;
@@ -31,7 +31,7 @@ export class SubagentSession {
         this.#previousResponseId = null;
         this.#toolLedger = [];
         this.#store = null;
-        this.#runner = null;
+        this.#model = null;
         this.#provider = null;
         this.#agent = null;
     }
@@ -64,15 +64,14 @@ export class SubagentSession {
             this.#agent = null;
             this.#store = null;
             this.#previousResponseId = null;
-            this.#runner = null;
+            this.#model = null;
             this.#provider = provider;
         }
     }
-    ensureRunner(provider, createRunner) {
-        if (!this.#runner && provider !== 'openai') {
-            this.#runner = createRunner(provider);
-        }
-        return this.#runner;
+    async ensureModel(provider, createModel) {
+        if (!this.#model)
+            this.#model = await createModel(provider);
+        return this.#model;
     }
     ensureAgent(createAgent) {
         if (!this.#agent) {
@@ -97,10 +96,10 @@ export class SubagentSession {
         };
     }
     appendOutput(result) {
-        this.#store.appendOutput(result.output);
-        if (result.responseId) {
-            this.#previousResponseId = result.responseId;
-        }
+        const items = (result.output ?? result.history ?? []).flatMap((event) => event?.type === 'item' && event.item ? [event.item] : [event]);
+        this.#store.appendOutput(items);
+        if (result.lastResponseId)
+            this.#previousResponseId = result.lastResponseId;
     }
     setToolLedger(toolLedger) {
         this.#toolLedger = [...toolLedger];

package/dist/services/subagents/subagent-session.js.map

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

package/dist/services/subagents/test-helpers/subagent-manager-fixtures.d.ts

@@ -6,8 +6,7 @@ import { SubagentManager as RealSubagentManager } from '../subagent-manager.js';
 declare const ROLE_MENTOR = "mentor";
 declare const ROLE_EXPLORER = "explorer";
 declare const ROLE_WORKER = "worker";
-declare const ROLE_RESEARCHER = "researcher";
-export type MockRunner = (agent: any, input: any, options: any) => any;
+export type MockStreamedModelFactory = (model: string, deps: any) => any;
 export declare function registerTestProvider(partial: Partial<Omit<ProviderDefinition, 'id'>> & {
     id?: string;
 }): string;
@@ -16,8 +15,8 @@ export declare function createMockSettings(values?: Record<string, unknown>): IS
 export declare function createSessionContextService(): ISessionContextService;
 export declare function createMockExecutionContext(cwd?: string): ExecutionContext;
 export declare function getAgentTool(agent: any, name: string): any;
-export declare function wrapResultAsAgentStream(result: any): any;
-export declare function wrapErrorAsAgentStream(error: any): any;
+export declare function wrapResultAsAgentStream(result: any): AsyncGenerator<any>;
+export declare function wrapErrorAsAgentStream(error: any): AsyncGenerator<any>;
 export declare function createTempDir(prefix: string): string;
 export declare function removeTempDir(dir: string): void;
 export declare class TestSubagentManager extends RealSubagentManager {
@@ -32,5 +31,5 @@ export declare class TestSubagentManager extends RealSubagentManager {
         skillsService?: any;
     });
 }
-export { ROLE_MENTOR, ROLE_EXPLORER, ROLE_WORKER, ROLE_RESEARCHER };
+export { ROLE_MENTOR, ROLE_EXPLORER, ROLE_WORKER };
 //# sourceMappingURL=subagent-manager-fixtures.d.ts.map

package/dist/services/subagents/test-helpers/subagent-manager-fixtures.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subagent-manager-fixtures.d.ts","sourceRoot":"","sources":["../../../../source/services/subagents/test-helpers/subagent-manager-fixtures.ts"],"names":[],"mappings":"AAMA,OAAO,EAAwC,KAAK,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAC/G,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAC7G,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAC3F,OAAO,EAAE,eAAe,IAAI,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAEhF,QAAA,MAAM,WAAW,WAAW,CAAC;AAC7B,QAAA,MAAM,aAAa,aAAa,CAAC;AACjC,QAAA,MAAM,WAAW,WAAW,CAAC;AAC7B,QAAA,MAAM,eAAe,eAAe,CAAC;AAerC,MAAM,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,KAAK,GAAG,CAAC;AAEvE,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC,GAAG;IACjD,EAAE,CAAC,EAAE,MAAM,CAAC;CACb,GACA,MAAM,CAWR;AAED,wBAAgB,gBAAgB,IAAI,eAAe,CAWlD;AAED,wBAAgB,kBAAkB,CAAC,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GAAG,gBAAgB,CAQzF;AAED,wBAAgB,2BAA2B,IAAI,sBAAsB,CAKpE;AAED,wBAAgB,0BAA0B,CAAC,GAAG,SAAmB,GAAG,gBAAgB,CAMnF;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,GAAG,CAE1D;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,GAAG,GAAG,GAAG,CA2CxD;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,GAAG,GAAG,GAAG,CAoBtD;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAI/C;AAED,qBAAa,mBAAoB,SAAQ,mBAAmB;IAC1D,YAAY,IAAI,EAAE;QAChB,MAAM,CAAC,EAAE,eAAe,CAAC;QACzB,QAAQ,EAAE,gBAAgB,CAAC;QAC3B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,qBAAqB,CAAC,EAAE,sBAAsB,CAAC;QAC/C,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;QAC/B,WAAW,CAAC,EAAE,eAAe,CAAC;QAC9B,YAAY,CAAC,EAAE,sBAAsB,CAAC,cAAc,CAAC,CAAC;QACtD,aAAa,CAAC,EAAE,GAAG,CAAC;KACrB,EA6BA;CACF;AAED,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,EAAE,eAAe,EAAE,CAAC"}
+{"version":3,"file":"subagent-manager-fixtures.d.ts","sourceRoot":"","sources":["../../../../source/services/subagents/test-helpers/subagent-manager-fixtures.ts"],"names":[],"mappings":"AAOA,OAAO,EAAwC,KAAK,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAC/G,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAC7G,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAC3F,OAAO,EAAE,eAAe,IAAI,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAEhF,QAAA,MAAM,WAAW,WAAW,CAAC;AAC7B,QAAA,MAAM,aAAa,aAAa,CAAC;AACjC,QAAA,MAAM,WAAW,WAAW,CAAC;AAe7B,MAAM,MAAM,wBAAwB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,GAAG,CAAC;AAEzE,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC,GAAG;IACjD,EAAE,CAAC,EAAE,MAAM,CAAC;CACb,GACA,MAAM,CAYR;AAED,wBAAgB,gBAAgB,IAAI,eAAe,CAWlD;AAED,wBAAgB,kBAAkB,CAAC,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GAAG,gBAAgB,CAyDzF;AAED,wBAAgB,2BAA2B,IAAI,sBAAsB,CAKpE;AAED,wBAAgB,0BAA0B,CAAC,GAAG,SAAmB,GAAG,gBAAgB,CAMnF;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,GAAG,CAE1D;AAED,wBAAuB,uBAAuB,CAAC,MAAM,EAAE,GAAG,GAAG,cAAc,CAAC,GAAG,CAAC,CAY/E;AAED,wBAAuB,sBAAsB,CAAC,KAAK,EAAE,GAAG,GAAG,cAAc,CAAC,GAAG,CAAC,CAE7E;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAI/C;AAED,qBAAa,mBAAoB,SAAQ,mBAAmB;IAC1D,YAAY,IAAI,EAAE;QAChB,MAAM,CAAC,EAAE,eAAe,CAAC;QACzB,QAAQ,EAAE,gBAAgB,CAAC;QAC3B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,qBAAqB,CAAC,EAAE,sBAAsB,CAAC;QAC/C,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;QAC/B,WAAW,CAAC,EAAE,eAAe,CAAC;QAC9B,YAAY,CAAC,EAAE,sBAAsB,CAAC,cAAc,CAAC,CAAC;QACtD,aAAa,CAAC,EAAE,GAAG,CAAC;KACrB,EAgCA;CACF;AAED,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,EAAE,CAAC"}

package/dist/services/subagents/test-helpers/subagent-manager-fixtures.js

@@ -4,12 +4,12 @@ import path from 'node:path';
 import os from 'node:os';
 import { randomUUID } from 'node:crypto';
 import { AgentClient } from '../../../lib/agent-client.js';
+import { ToolOwnershipRegistry } from '../../approval/tool-ownership-registry.js';
 import { registerProvider, unregisterProvider } from '../../../providers/registry.js';
 import { SubagentManager as RealSubagentManager } from '../subagent-manager.js';
 const ROLE_MENTOR = 'mentor';
 const ROLE_EXPLORER = 'explorer';
 const ROLE_WORKER = 'worker';
-const ROLE_RESEARCHER = 'researcher';
 const registeredProviderIds = new Set();
 beforeEach(() => {
     registeredProviderIds.clear();
@@ -22,12 +22,13 @@ afterEach(() => {
 });
 export function registerTestProvider(partial) {
     const id = partial.id ?? `test-provider-${randomUUID()}`;
+    const createStreamedModel = partial.createStreamedModel;
     registerProvider({
         id,
         label: partial.label ?? id,
         fetchModels: partial.fetchModels ?? (async () => []),
         capabilities: partial.capabilities,
-        createRunner: partial.createRunner,
+        createStreamedModel,
     });
     registeredProviderIds.add(id);
     return id;
@@ -46,10 +47,57 @@ export function createMockLogger() {
 }
 export function createMockSettings(values = {}) {
     const store = { ...values };
+    const getNested = (key) => {
+        const keys = key.split('.');
+        let value = store;
+        for (const k of keys) {
+            if (value && typeof value === 'object') {
+                value = value[k];
+            }
+            else {
+                return undefined;
+            }
+        }
+        return value;
+    };
+    // Mirrors SettingsService.getDynamic (dotted-key traversal) while keeping the
+    // flat-store fallback so callers that configure flat dotted keys keep working.
+    const get = (key) => {
+        const nested = getNested(key);
+        return nested === undefined ? store[key] : nested;
+    };
+    // Mirrors SettingsService set-family behavior: dotted keys create nested
+    // objects as needed instead of writing a flat key.
+    const setNested = (key, value) => {
+        const keys = key.split('.');
+        let obj = store;
+        for (let i = 0; i < keys.length - 1; i++) {
+            const next = obj[keys[i]];
+            if (next && typeof next === 'object') {
+                obj = next;
+            }
+            else {
+                const created = {};
+                obj[keys[i]] = created;
+                obj = created;
+            }
+        }
+        obj[keys[keys.length - 1]] = value;
+    };
     return {
-        get: (key) => store[key],
+        get: (key) => get(key),
+        getDynamic: (key) => get(key),
         set: (key, value) => {
-            store[key] = value;
+            setNested(key, value);
+        },
+        setDynamic: (key, value) => {
+            setNested(key, value);
+        },
+        setPersistent: (key, value) => {
+            setNested(key, value);
+        },
+        setPersistentDynamic: (key, value) => {
+            setNested(key, value);
         },
     };
 }
@@ -69,70 +117,20 @@ export function createMockExecutionContext(cwd = '/tmp/workspace') {
 export function getAgentTool(agent, name) {
     return agent.tools.find((tool) => tool.name === name);
 }
-export function wrapResultAsAgentStream(result) {
-    const events = [];
+export async function* wrapResultAsAgentStream(result) {
     if (typeof result.finalOutput === 'string' && result.finalOutput) {
-        events.push({ type: 'response.output_text.delta', delta: result.finalOutput });
+        yield { type: 'text_delta', text: result.finalOutput };
     }
-    const findSynthesizedOutput = () => {
-        if (Array.isArray(result.output) && result.output.length > 0)
-            return result.output;
-        if (Array.isArray(result.newItems) && result.newItems.length > 0)
-            return result.newItems;
-        if (Array.isArray(result.history) && result.history.length > 0)
-            return result.history;
-        if (typeof result.finalOutput === 'string' && result.finalOutput) {
-            return [{ role: 'assistant', type: 'message', content: result.finalOutput }];
-        }
-        return [];
-    };
-    const synthesizedOutput = findSynthesizedOutput();
-    return {
-        [Symbol.asyncIterator]() {
-            let index = 0;
-            return {
-                async next() {
-                    if (index < events.length) {
-                        return { value: events[index++], done: false };
-                    }
-                    return { value: undefined, done: true };
-                },
-            };
-        },
-        completed: Promise.resolve(result),
-        rawResponses: [result],
-        status: result.status ?? 'completed',
-        finalOutput: result.finalOutput,
-        state: result.state,
-        output: synthesizedOutput,
-        newItems: result.newItems ?? synthesizedOutput,
-        interruptions: result.interruptions ?? [],
-        history: result.history ?? synthesizedOutput,
-        messages: result.messages ?? synthesizedOutput,
-        responseId: result.responseId ?? null,
-        lastResponseId: result.responseId ?? null,
+    yield {
+        type: 'completion',
+        responseId: result.responseId ?? 'fixture-response',
+        output: typeof result.finalOutput === 'string' && result.finalOutput
+            ? [{ type: 'message', content: [{ type: 'text', text: result.finalOutput }] }]
+            : [],
     };
 }
-export function wrapErrorAsAgentStream(error) {
-    const completed = Promise.reject(error);
-    completed.catch(() => { });
-    return {
-        [Symbol.asyncIterator]() {
-            return {
-                async next() {
-                    throw error;
-                },
-            };
-        },
-        completed,
-        rawResponses: [],
-        status: 'failed',
-        interruptions: [],
-        history: [],
-        messages: [],
-        responseId: null,
-        lastResponseId: null,
-    };
+export async function* wrapErrorAsAgentStream(error) {
+    throw error;
 }
 export function createTempDir(prefix) {
     return fs.mkdtempSync(path.join(os.tmpdir(), prefix));
@@ -146,6 +144,7 @@ export class TestSubagentManager extends RealSubagentManager {
     constructor(deps) {
         const logger = deps.logger ?? createMockLogger();
         const sessionContextService = deps.sessionContextService ?? createSessionContextService();
+        const toolOwnership = new ToolOwnershipRegistry();
         super({
             logger,
             settings: deps.settings,
@@ -154,6 +153,7 @@ export class TestSubagentManager extends RealSubagentManager {
             onEvent: deps.onEvent,
             agentClient: deps.agentClient,
             skillsService: deps.skillsService,
+            toolOwnership,
             createClient: deps.createClient ??
                 (({ agent, provider, maxTurns, retryAttempts }) => new AgentClient({
                     model: agent.model,
@@ -168,9 +168,10 @@ export class TestSubagentManager extends RealSubagentManager {
                     },
                     agentOverride: agent,
                     providerOverride: provider,
+                    toolOwnership,
                 })),
         });
     }
 }
-export { ROLE_MENTOR, ROLE_EXPLORER, ROLE_WORKER, ROLE_RESEARCHER };
+export { ROLE_MENTOR, ROLE_EXPLORER, ROLE_WORKER };
 //# sourceMappingURL=subagent-manager-fixtures.js.map