npm - @qduc/term2 - Versions diffs - 0.10.1 → 0.11.0 - Mend

@qduc/term2 0.10.1 → 0.11.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (169) hide show

package/dist/services/subagents/execution-runner.js CHANGED Viewed

@@ -1,4 +1,5 @@
 import { Agent } from '@openai/agents';
+import { SubagentSession } from './subagent-session.js';
 import { MAX_SUBAGENT_MODEL_RETRIES } from '../retry/conversation-retry-policy.js';
 import { isAbortLike, aggregateToolUsage, safeEmit } from './utils.js';
 import { normalizeAgentRunUsage, extractUsage } from '../../utils/ai/token-usage.js';
@@ -25,14 +26,22 @@ export class ExecutionSubagentRunner {
         this.#skillsService = deps.skillsService;
     }
     async run(agentId, request, definition) {
+        return this.#execute(agentId, request, definition, new SubagentSession(agentId, request.role), undefined, request.signal, undefined);
+    }
+    async runInSession(agentId, request, definition, session, providedChildSlot, signal, onEventOverride) {
+        return this.#execute(agentId, request, definition, session, providedChildSlot, signal, onEventOverride);
+    }
+    async #execute(agentId, request, definition, session, providedChildSlot, signal, onEventOverride) {
         if (!this.#createClient) {
             throw new Error('SubagentManager: createClient factory not provided');
         }
         // ── Budget enforcement ──
         // Root executions do NOT consume a child slot; only actual nested
         // agent runs do. The root budget tracks children, not itself.
-        let childSlot;
-        if (definition.executionBudget && !definition.isRootExecution) {
+        let childSlot = providedChildSlot;
+        let executionBudget = definition.executionBudget;
+        if (definition.executionBudget && !definition.isRootExecution && !childSlot) {
+            executionBudget = definition.executionBudget.createChildBudget();
             const slot = definition.executionBudget.tryAcquireChild();
             if (!(slot instanceof AcquiredChildSlot)) {
                 return {
@@ -94,6 +103,11 @@ export class ExecutionSubagentRunner {
                 allowFreshStartRetries: false,
             },
         });
+        const initialState = session.exportState();
+        if (initialState.history.length > 0) {
+            runtime.state.importState(initialState);
+        }
+        const onEvent = onEventOverride ?? this.#onEvent;
         const userTurn = { text: request.task, images: [] };
         let finalText = '';
         let usage = undefined;
@@ -102,13 +116,13 @@ export class ExecutionSubagentRunner {
         let loopProcessedError = false;
         try {
             for await (const event of runtime.turns.start(userTurn, {
-                signal: request.signal,
+                signal,
                 maxModelRetries: MAX_SUBAGENT_MODEL_RETRIES,
             })) {
                 switch (event.type) {
                     case 'tool_started':
                         if (event.toolName) {
-                            safeEmit(this.#logger, this.#onEvent, {
+                            safeEmit(this.#logger, onEvent, {
                                 type: 'subagent_tool_started',
                                 agentId,
                                 role: request.role,
@@ -119,7 +133,7 @@ export class ExecutionSubagentRunner {
                         }
                         break;
                     case 'command_message':
-                        safeEmit(this.#logger, this.#onEvent, {
+                        safeEmit(this.#logger, onEvent, {
                             type: 'subagent_command_message',
                             agentId,
                             role: request.role,
@@ -141,7 +155,7 @@ export class ExecutionSubagentRunner {
                         subagentStatus = isAbortLike(event.message, event) ? 'cancelled' : 'failed';
                         break;
                     case 'retry':
-                        safeEmit(this.#logger, this.#onEvent, {
+                        safeEmit(this.#logger, onEvent, {
                             type: 'retry',
                             toolName: event.toolName,
                             attempt: event.attempt,
@@ -167,9 +181,21 @@ export class ExecutionSubagentRunner {
             }
         }
         finally {
+            try {
+                const exported = runtime.state.exportState();
+                session.importState(exported);
+                const messageCap = this.#settings.get('subagent.asyncMessageCap') ?? 50;
+                session.trimHistory(messageCap);
+            }
+            catch (exportErr) {
+                this.#logger.debug('Failed to export async subagent session state', {
+                    agentId,
+                    error: exportErr?.message || String(exportErr),
+                });
+            }
             // Record usage to the budget on every terminal path
             if (childSlot && usage) {
-                definition.executionBudget.recordUsage(usage);
+                executionBudget.recordUsage(usage);
             }
             // Release the child slot
             childSlot?.release();

package/dist/services/subagents/execution-runner.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"execution-runner.js","sourceRoot":"","sources":["../../../source/services/subagents/execution-runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAKvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACvE,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,iBAAiB,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAC;AAGpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAGzE,MAAM,OAAO,uBAAuB;IAClC,OAAO,CAAkB;IACzB,SAAS,CAAmB;IAC5B,sBAAsB,CAAyB;IAC/C,iBAAiB,CAAoB;IACrC,aAAa,CAA0C;IACvD,YAAY,CAAsB;IAClC,QAAQ,CAAsC;IAC9C,cAAc,CAAiB;IAE/B,YAAY,IASX;QACC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC/B,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,qBAAqB,CAAC;QACzD,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAC/C,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC;QACvC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC;QACrC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC;QAC7B,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,OAAe,EAAE,OAAwB,EAAE,UAA8B;QACjF,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;QACxE,CAAC;QAED,2BAA2B;QAC3B,kEAAkE;QAClE,8DAA8D;QAC9D,IAAI,~~SAAwC~~,CAAC;~~QAC7C~~,IAAI,UAAU,CAAC,eAAe,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,CAAC;~~YAC9D~~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~~,EAAE,OAAO,CAAC,MAAM~~;~~gBACtB~~,eAAe,EAAE,0BAA0B;aAC5C,CAAC,EAAE,CAAC;gBACH,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;oBACnB,KAAK,cAAc;wBACjB,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;4BACnB,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,~~IAAI~~,~~CAAC,QAAQ,~~EAAE;~~gCACpC~~,IAAI,EAAE,uBAAuB;gCAC7B,OAAO;gCACP,IAAI,EAAE,OAAO,CAAC,IAAI;gCAClB,UAAU,EAAE,KAAK,CAAC,UAAU;gCAC5B,QAAQ,EAAE,KAAK,CAAC,QAAQ;gCACxB,SAAS,EAAE,KAAK,CAAC,SAAS;6BAC3B,CAAC,CAAC;wBACL,CAAC;wBACD,MAAM;oBACR,KAAK,iBAAiB;wBACpB,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,~~IAAI~~,~~CAAC,QAAQ,~~EAAE;~~4BACpC~~,IAAI,EAAE,0BAA0B;4BAChC,OAAO;4BACP,IAAI,EAAE,OAAO,CAAC,IAAI;4BAClB,OAAO,EAAE,KAAK,CAAC,OAAO;yBACvB,CAAC,CAAC;wBACH,MAAM;oBACR,KAAK,OAAO;wBACV,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;wBAC5B,IAAI,KAAK,CAAC,KAAK;4BAAE,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;wBACrC,MAAM;oBACR,KAAK,cAAc;wBACjB,IAAI,KAAK,CAAC,KAAK;4BAAE,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;wBACrC,MAAM;oBACR,KAAK,OAAO;wBACV,KAAK,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;wBACjC,kBAAkB,GAAG,IAAI,CAAC;wBAC1B,cAAc,GAAG,WAAW,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC;wBAC5E,MAAM;oBACR,KAAK,OAAO;wBACV,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,~~IAAI~~,~~CAAC,QAAQ,~~EAAE;~~4BACpC~~,IAAI,EAAE,OAAO;4BACb,QAAQ,EAAE,KAAK,CAAC,QAAQ;4BACxB,OAAO,EAAE,KAAK,CAAC,OAAO;4BACtB,UAAU,EAAE,KAAK,CAAC,UAAU;4BAC5B,YAAY,EAAE,KAAK,CAAC,YAAY;4BAChC,SAAS,EAAE,KAAK,CAAC,SAAS;4BAC1B,OAAO;4BACP,IAAI,EAAE,OAAO,CAAC,IAAI;yBACZ,CAAC,CAAC;wBACV,MAAM;gBACV,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,KAAK,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;YAC9D,CAAC;YACD,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBACxB,cAAc,GAAG,WAAW,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC;YAChH,CAAC;YACD,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,KAAK,GAAG,sBAAsB,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,YAAY,CAAC,GAAG,CAAC,CAAC;YACzE,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,oDAAoD;YACpD,IAAI,SAAS,IAAI,KAAK,EAAE,CAAC;gBACvB,~~UAAU,CAAC,~~eAAgB,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;~~YACjD~~,CAAC;YACD,yBAAyB;YACzB,SAAS,EAAE,OAAO,EAAE,CAAC;YACrB,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,CAAC;QAED,IAAI,KAAK,EAAE,CAAC;YACV,OAAO;gBACL,OAAO;gBACP,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,MAAM,EAAE,cAAc;gBACtB,SAAS,EAAE,EAAE;gBACb,YAAY,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC;gBACxC,SAAS,EAAE,kBAAkB,CAAC,UAAU,CAAC;gBACzC,KAAK,EAAE,KAAK,CAAC,OAAO;gBACpB,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC5B,CAAC;QACJ,CAAC;QAED,OAAO;YACL,OAAO;YACP,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,MAAM,EAAE,WAAW;YACnB,SAAS;YACT,YAAY,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC;YACxC,SAAS,EAAE,kBAAkB,CAAC,UAAU,CAAC;YACzC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC5B,CAAC;IACJ,CAAC;CACF"}
1	+ {"version":3,"file":"execution-runner.js","sourceRoot":"","sources":["../../../source/services/subagents/execution-runner.ts"],"names":[],"mappings":"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"}

package/dist/services/subagents/mentor-runner.d.ts CHANGED Viewed

@@ -1,7 +1,9 @@
 import type { ILoggingService, ISettingsService, ISessionContextService } from '../service-interfaces.js';
 import type { ExecutionContext } from '../execution-context.js';
 import type { SubagentResult } from './types.js';
+import { SubagentSession } from './subagent-session.js';
 import type { ConversationEvent } from '../conversation/conversation-events.js';
+import type { ExecutionBudget } from '../agent-runtime/execution-budget.js';
 export declare class MentorRunner {
     #private;
     constructor(deps: {
@@ -10,8 +12,10 @@ export declare class MentorRunner {
         sessionContextService: ISessionContextService;
         executionContext?: ExecutionContext;
         onEvent?: (event: ConversationEvent) => void;
+        session?: SubagentSession;
     });
     reset(): void;
-    run(agentId: string, task: string, signal?: AbortSignal): Promise<SubagentResult>;
+    run(agentId: string, task: string, signal?: AbortSignal, session?: SubagentSession, executionBudget?: ExecutionBudget): Promise<SubagentResult>;
+    runInSession(agentId: string, task: string, signal: AbortSignal | undefined, session: SubagentSession): Promise<SubagentResult>;
 }
 //# sourceMappingURL=mentor-runner.d.ts.map

package/dist/services/subagents/mentor-runner.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"mentor-runner.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/mentor-runner.ts"],"names":[],"mappings":"AAGA,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,cAAc,EAAE,MAAM,YAAY,CAAC;~~AAOjD~~,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAEhF,qBAAa,YAAY;;IAOvB,YAAY,IAAI,EAAE;QAChB,MAAM,EAAE,eAAe,CAAC;QACxB,QAAQ,EAAE,gBAAgB,CAAC;QAC3B,qBAAqB,EAAE,sBAAsB,CAAC;QAC9C,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;~~KAC9C~~,EAMA;IAED,KAAK,IAAI,IAAI,CAEZ;IAEK,GAAG,~~CAAC~~,OAAO,EAAE,MAAM,~~EAAE~~,IAAI,EAAE,MAAM,~~EAAE~~,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,~~CA8EtF~~;~~CACF~~"}
1	+ {"version":3,"file":"mentor-runner.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/mentor-runner.ts"],"names":[],"mappings":"AAGA,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,cAAc,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAMxD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAEhF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAE5E,qBAAa,YAAY;;IAOvB,YAAY,IAAI,EAAE;QAChB,MAAM,EAAE,eAAe,CAAC;QACxB,QAAQ,EAAE,gBAAgB,CAAC;QAC3B,qBAAqB,EAAE,sBAAsB,CAAC;QAC9C,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;QAC7C,OAAO,CAAC,EAAE,eAAe,CAAC;KAC3B,EAMA;IAED,KAAK,IAAI,IAAI,CAEZ;IAEK,GAAG,CACP,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,WAAW,EACpB,OAAO,CAAC,EAAE,eAAe,EACzB,eAAe,CAAC,EAAE,eAAe,GAChC,OAAO,CAAC,cAAc,CAAC,CA+BzB;IAEK,YAAY,CAChB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,cAAc,CAAC,CAEzB;CAiFF"}

package/dist/services/subagents/mentor-runner.js CHANGED Viewed

@@ -7,6 +7,7 @@ import { getEnvInfo, getAgentsInstructions } from '../../agent.js';
 import { getProvider } from '../../providers/index.js';
 import { runWithProvider, extractFinalText } from './utils.js';
 import { normalizeAgentRunUsage, extractUsage } from '../../utils/ai/token-usage.js';
+import { AcquiredChildSlot } from '../agent-runtime/execution-budget.js';
 export class MentorRunner {
     #logger;
     #settings;
@@ -18,12 +19,49 @@ export class MentorRunner {
         this.#settings = deps.settings;
         this.#sessionContextService = deps.sessionContextService;
         this.#executionContext = deps.executionContext;
-        this.#mentorSession = new SubagentSession(randomUUID(), 'mentor');
+        this.#mentorSession = deps.session ?? new SubagentSession(randomUUID(), 'mentor');
     }
     reset() {
         this.#mentorSession.reset();
     }
-    async run(agentId, task, signal) {
+    async run(agentId, task, signal, session, executionBudget) {
+        let slot;
+        let childBudget = executionBudget;
+        if (executionBudget) {
+            childBudget = executionBudget.createChildBudget();
+            const acquired = executionBudget.tryAcquireChild();
+            if (!(acquired instanceof AcquiredChildSlot)) {
+                return {
+                    agentId,
+                    role: 'mentor',
+                    status: 'failed',
+                    finalText: '',
+                    filesChanged: [],
+                    toolsUsed: [],
+                    error: `Budget exhausted: ${acquired.reason}${acquired.max !== undefined ? ` (${acquired.current}/${acquired.max})` : ''}`,
+                };
+            }
+            slot = acquired;
+        }
+        const previousSession = this.#mentorSession;
+        if (session)
+            this.#mentorSession = session;
+        try {
+            const result = await this.#runWithSession(agentId, task, signal);
+            if (slot && result.usage)
+                childBudget.recordUsage(result.usage);
+            return result;
+        }
+        finally {
+            slot?.release();
+            if (session)
+                this.#mentorSession = previousSession;
+        }
+    }
+    async runInSession(agentId, task, signal, session) {
+        return this.run(agentId, task, signal, session, undefined);
+    }
+    async #runWithSession(agentId, task, signal) {
         const definition = loadRoleDefinition('mentor', this.#settings);
         const mentorModel = definition.model;
         const mentorProvider = definition.provider;

package/dist/services/subagents/mentor-runner.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"mentor-runner.js","sourceRoot":"","sources":["../../../source/services/subagents/mentor-runner.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAIzC,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAClF,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;~~AAGrF~~,MAAM,OAAO,YAAY;IACvB,OAAO,CAAkB;IACzB,SAAS,CAAmB;IAC5B,sBAAsB,CAAyB;IAC/C,iBAAiB,CAAoB;IACrC,cAAc,CAAkB;IAEhC,YAAY,~~IAMX~~;QACC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC/B,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,qBAAqB,CAAC;QACzD,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAC/C,IAAI,CAAC,cAAc,GAAG,IAAI,eAAe,CAAC,UAAU,EAAE,EAAE,QAAQ,CAAC,CAAC;~~IACpE~~,CAAC;IAED,KAAK;QACH,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,OAAe,EAAE,IAAY,EAAE,MAAoB;~~QAC3D~~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"}
1	+ {"version":3,"file":"mentor-runner.js","sourceRoot":"","sources":["../../../source/services/subagents/mentor-runner.ts"],"names":[],"mappings":"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"}

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

@@ -7,6 +7,7 @@ import { NestedSubagentRunner } from './nested-runner.js';
 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';
 export interface SubagentRuntimeDeps {
     logger: ILoggingService;
     settings: ISettingsService;
@@ -23,6 +24,7 @@ export interface SubagentRuntime {
     nestedRunner: NestedSubagentRunner;
     executionRunner: ExecutionSubagentRunner;
     mentorRunner: MentorRunner;
+    asyncRegistry: SubagentAsyncRegistry;
 }
 export declare function createSubagentRuntime(deps: SubagentRuntimeDeps): SubagentRuntime;
 //# sourceMappingURL=runtime.d.ts.map

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

	@@ -1 +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;~~AAEjE~~,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;~~CAC5B~~;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,mBAAmB,GAAG,eAAe,~~CAwDhF~~"}
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"}

package/dist/services/subagents/runtime.js CHANGED Viewed

@@ -2,6 +2,9 @@ import { SubagentToolPolicy, SubagentToolFactory } from './tool-policy.js';
 import { NestedSubagentRunner } from './nested-runner.js';
 import { ExecutionSubagentRunner } from './execution-runner.js';
 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';
 export function createSubagentRuntime(deps) {
     const toolPolicy = new SubagentToolPolicy({
         settings: deps.settings,
@@ -38,12 +41,28 @@ export function createSubagentRuntime(deps) {
         onEvent: deps.onEvent,
         skillsService: deps.skillsService,
     });
+    const mentorSession = new SubagentSession('mentor', 'mentor');
     const mentorRunner = new MentorRunner({
         logger: deps.logger,
         settings: deps.settings,
         sessionContextService: deps.sessionContextService,
         executionContext: deps.executionContext,
         onEvent: deps.onEvent,
+        session: mentorSession,
+    });
+    const asyncRegistry = new SubagentAsyncRegistry({
+        logger: deps.logger,
+        run: async ({ request, runId, session, signal }) => {
+            if (request.role === 'mentor') {
+                return mentorRunner.run(runId, request.task, signal, session, request.executionBudget);
+            }
+            const definition = loadRoleDefinition(request.role, deps.settings);
+            return executionRunner.runInSession(runId, { ...request, signal }, { ...definition, ...(request.executionBudget ? { executionBudget: request.executionBudget } : {}) }, session);
+        },
+        onEvent: deps.onEvent,
+        ttlMs: deps.settings.get('subagent.asyncSessionTtlMs') ?? 30 * 60 * 1000,
+        messageCap: deps.settings.get('subagent.asyncMessageCap') ?? 50,
+        sessionForRole: (role) => (role === 'mentor' ? mentorSession : undefined),
     });
     return {
         toolPolicy,
@@ -51,6 +70,7 @@ export function createSubagentRuntime(deps) {
         nestedRunner,
         executionRunner,
         mentorRunner,
+        asyncRegistry,
     };
 }
 //# sourceMappingURL=runtime.js.map

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

	@@ -1 +1 @@
1	- {"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;~~AAuBlD~~,MAAM,UAAU,qBAAqB,CAAC,IAAyB;IAC7D,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;KAClC,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,IAAI,CAAC,OAAO;QACrB,aAAa;QACb,aAAa,EAAE,IAAI,CAAC,aAAa;KAClC,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,IAAI,CAAC,OAAO;QACrB,aAAa,EAAE,IAAI,CAAC,aAAa;KAClC,CAAC,CAAC;IAEH,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,IAAI,CAAC,OAAO;~~KACtB~~,CAAC,CAAC;IAEH,OAAO;QACL,UAAU;QACV,WAAW;QACX,YAAY;QACZ,eAAe;QACf,YAAY;~~KACb~~,CAAC;AACJ,CAAC"}
1	+ {"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 ADDED Viewed

@@ -0,0 +1,39 @@
+import type { ILoggingService } from '../service-interfaces.js';
+import type { ConversationEvent } from '../conversation/conversation-events.js';
+import type { SubagentRequest, SubagentResult, SubagentRunHandle } from './types.js';
+import { SubagentSession } from './subagent-session.js';
+export type SubagentRegistryErrorCode = 'not_found' | 'role_mismatch' | 'not_continuable' | 'already_active' | 'worker_blocked' | 'evicted';
+export declare class SubagentRegistryError extends Error {
+    readonly code: SubagentRegistryErrorCode;
+    constructor(code: SubagentRegistryErrorCode, message: string);
+}
+export interface SubagentAsyncRegistryDeps {
+    logger: ILoggingService;
+    run: (params: {
+        request: SubagentRequest;
+        runId: string;
+        session: SubagentSession;
+        signal: AbortSignal;
+    }) => Promise<SubagentResult>;
+    onEvent?: (event: ConversationEvent) => void;
+    now?: () => number;
+    ttlMs?: number;
+    messageCap?: number;
+    sessionForRole?: (role: string) => SubagentSession | undefined;
+    setInterval?: (callback: () => void, delay: number) => ReturnType<typeof setInterval>;
+    clearInterval?: (timer: ReturnType<typeof setInterval>) => void;
+}
+/** Owns async subagent sessions, terminal records, continuation policy and retention. */
+export declare class SubagentAsyncRegistry {
+    #private;
+    constructor(deps: SubagentAsyncRegistryDeps);
+    startRun(request: SubagentRequest, _legacyParentSignal?: AbortSignal): SubagentRunHandle;
+    hasActiveRunForRole(role: string): boolean;
+    getResult(runId: string, signal?: AbortSignal): Promise<SubagentResult>;
+    abortRun(runId: string): void;
+    cancelAllRuns(): void;
+    reset(): void;
+    dispose(): void;
+    evictExpired(): void;
+}
+//# sourceMappingURL=subagent-async-registry.d.ts.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,233 @@
+import { randomUUID } from 'node:crypto';
+import { SubagentSession } from './subagent-session.js';
+import { isAbortLike, safeEmit } from './utils.js';
+export class SubagentRegistryError extends Error {
+    code;
+    constructor(code, message) {
+        super(message);
+        this.name = 'SubagentRegistryError';
+        this.code = code;
+    }
+}
+/** Owns async subagent sessions, terminal records, continuation policy and retention. */
+export class SubagentAsyncRegistry {
+    #logger;
+    #run;
+    #onEvent;
+    #runs = new Map();
+    #sessions = new Map();
+    #evicted = new Set();
+    #now;
+    #ttlMs;
+    #messageCap;
+    #sessionCap = 50;
+    #sessionForRole;
+    #timer;
+    #clearInterval;
+    #disposed = false;
+    constructor(deps) {
+        this.#logger = deps.logger;
+        this.#run = deps.run;
+        this.#onEvent = deps.onEvent;
+        this.#now = deps.now ?? Date.now;
+        this.#ttlMs = deps.ttlMs ?? 30 * 60 * 1000;
+        this.#messageCap = deps.messageCap ?? 50;
+        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)));
+        this.#timer.unref?.();
+    }
+    startRun(request, _legacyParentSignal) {
+        if (this.#disposed)
+            throw new Error('Subagent async registry is disposed');
+        const role = request.role;
+        if (!['explorer', 'worker', 'researcher', 'mentor', 'librarian'].includes(role)) {
+            throw new SubagentRegistryError('not_continuable', `Unknown subagent role: ${role}`);
+        }
+        const continuation = request.continueRunId;
+        let session;
+        if (continuation) {
+            const previous = this.#runs.get(continuation);
+            if (!previous) {
+                throw new SubagentRegistryError(this.#evicted.has(continuation) ? 'evicted' : 'not_found', `Async subagent run not found: ${continuation}`);
+            }
+            if (previous.role !== role)
+                throw new SubagentRegistryError('role_mismatch', `Run ${continuation} belongs to role ${previous.role}, not ${role}`);
+            if (previous.status === 'running')
+                throw new SubagentRegistryError('already_active', `Async subagent run ${continuation} is already active`);
+            if (role === 'worker')
+                throw new SubagentRegistryError('worker_blocked', 'Worker runs cannot be continued asynchronously');
+            if (role !== 'mentor' && role !== 'librarian' && role !== 'explorer' && role !== 'researcher') {
+                throw new SubagentRegistryError('not_continuable', `Role ${role} cannot be continued`);
+            }
+            session = previous.session;
+        }
+        else {
+            const reuseDefault = role === 'mentor' || role === 'librarian';
+            const key = reuseDefault ? `role:${role}` : randomUUID();
+            session = this.#sessionForRole?.(role) ?? this.#sessions.get(key) ?? new SubagentSession(key, role);
+            this.#sessions.set(key, session);
+        }
+        for (const active of this.#runs.values()) {
+            if (active.status === 'running' && active.session === session) {
+                throw new SubagentRegistryError('already_active', `Session for role ${role} is already active`);
+            }
+        }
+        this.#evictToSessionCap();
+        const runId = continuation ?? randomUUID();
+        const controller = new AbortController();
+        let resolve;
+        const promise = new Promise((r) => (resolve = r));
+        const stored = {
+            runId,
+            role,
+            task: request.task,
+            session,
+            status: 'running',
+            abortController: controller,
+            lastUsedAt: this.#now(),
+            resolve,
+            promise,
+            settled: false,
+        };
+        const parentSignal = request.signal ?? _legacyParentSignal;
+        if (parentSignal) {
+            const onAbort = () => this.#cancelRun(stored);
+            parentSignal.addEventListener('abort', onAbort, { once: true });
+            stored.removeParentAbortListener = () => parentSignal.removeEventListener('abort', onAbort);
+            if (parentSignal.aborted)
+                onAbort();
+        }
+        this.#runs.set(runId, stored);
+        safeEmit(this.#logger, this.#onEvent, {
+            type: 'subagent_started',
+            agentId: runId,
+            role,
+            task: request.task,
+            parentTool: request.parentTool ?? 'run_subagent_async',
+            async: true,
+        });
+        void this.#execute(stored, request);
+        return { runId, role, status: 'running', task: request.task };
+    }
+    hasActiveRunForRole(role) {
+        return [...this.#runs.values()].some((run) => run.role === role && run.status === 'running');
+    }
+    getResult(runId, signal) {
+        const run = this.#runs.get(runId);
+        if (!run)
+            return Promise.reject(new SubagentRegistryError(this.#evicted.has(runId) ? 'evicted' : 'not_found', `Async subagent run not found: ${runId}`));
+        run.lastUsedAt = this.#now();
+        if (run.result)
+            return Promise.resolve(run.result);
+        if (signal?.aborted)
+            return Promise.reject(new Error('The get_subagent_result call was aborted.'));
+        return run.promise;
+    }
+    abortRun(runId) {
+        const run = this.#runs.get(runId);
+        if (run?.status === 'running')
+            this.#cancelRun(run);
+    }
+    cancelAllRuns() {
+        for (const run of this.#runs.values())
+            if (run.status === 'running')
+                this.#cancelRun(run);
+    }
+    #cancelRun(run) {
+        if (run.status !== 'running')
+            return;
+        run.abortController.abort();
+        const result = {
+            agentId: run.runId,
+            role: run.role,
+            status: 'cancelled',
+            finalText: '',
+            filesChanged: [],
+            toolsUsed: [],
+            error: 'The subagent run was aborted.',
+        };
+        run.status = 'cancelled';
+        run.result = result;
+        run.lastUsedAt = this.#now();
+        run.settled = true;
+        run.removeParentAbortListener?.();
+        run.resolve(result);
+        safeEmit(this.#logger, this.#onEvent, { type: 'subagent_completed', result, async: true });
+    }
+    reset() {
+        for (const run of this.#runs.values())
+            if (run.status === 'running')
+                run.abortController.abort();
+        this.cancelAllRuns();
+        this.#runs.clear();
+        this.#sessions.clear();
+        this.#evicted.clear();
+    }
+    dispose() {
+        if (this.#disposed)
+            return;
+        this.#disposed = true;
+        this.#clearInterval(this.#timer);
+        this.reset();
+    }
+    #evictToSessionCap() {
+        while (this.#sessions.size > this.#sessionCap) {
+            const candidate = [...this.#runs.values()]
+                .filter((run) => run.status !== 'running')
+                .sort((a, b) => a.lastUsedAt - b.lastUsedAt)[0];
+            if (!candidate)
+                return;
+            this.#runs.delete(candidate.runId);
+            this.#evicted.add(candidate.runId);
+            if (![...this.#runs.values()].some((run) => run.session === candidate.session)) {
+                for (const [key, session] of this.#sessions)
+                    if (session === candidate.session)
+                        this.#sessions.delete(key);
+            }
+        }
+    }
+    evictExpired() {
+        this.#evictExpired();
+    }
+    #evictExpired() {
+        const cutoff = this.#now() - this.#ttlMs;
+        for (const [id, run] of this.#runs) {
+            if (run.status !== 'running' && run.lastUsedAt <= cutoff) {
+                this.#runs.delete(id);
+                this.#evicted.add(id);
+            }
+        }
+    }
+    async #execute(run, request) {
+        let result;
+        try {
+            result = await this.#run({ request, runId: run.runId, session: run.session, signal: run.abortController.signal });
+            run.session.trimHistory(this.#messageCap);
+            result = { ...result, agentId: run.runId };
+        }
+        catch (error) {
+            const cancelled = isAbortLike(error?.message, error) || run.abortController.signal.aborted;
+            result = {
+                agentId: run.runId,
+                role: run.role,
+                status: cancelled ? 'cancelled' : 'failed',
+                finalText: '',
+                filesChanged: [],
+                toolsUsed: [],
+                error: error?.message ?? String(error),
+            };
+        }
+        // Explicit cancellation is terminal and wins over a late executor result.
+        if (run.settled)
+            return;
+        run.status = result.status;
+        run.result = result;
+        run.lastUsedAt = this.#now();
+        run.settled = true;
+        run.removeParentAbortListener?.();
+        run.resolve(result);
+        safeEmit(this.#logger, this.#onEvent, { type: 'subagent_completed', result, async: true });
+    }
+}
+//# sourceMappingURL=subagent-async-registry.js.map

package/dist/services/subagents/subagent-async-registry.js.map ADDED Viewed

@@ -0,0 +1 @@

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