@qduc/term2 0.11.0 → 0.12.0

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

@@ -1,11 +1,12 @@
 import path from 'node:path';
-import { Agent } from '@openai/agents';
 import { randomUUID } from 'node:crypto';
+import { ApplicationRunLoop } from '../agent-runtime/application-run-loop.js';
 import { SubagentSession } from './subagent-session.js';
 import { loadRoleDefinition, resolvePrompt, PROMPTS_DIR } from './role-loader.js';
 import { getEnvInfo, getAgentsInstructions } from '../../agent.js';
 import { getProvider } from '../../providers/index.js';
-import { runWithProvider, extractFinalText } from './utils.js';
+import { extractFinalText, isAbortLike } from './utils.js';
+import { selectAgentStreamItems } from '../agent-stream.js';
 import { normalizeAgentRunUsage, extractUsage } from '../../utils/ai/token-usage.js';
 import { AcquiredChildSlot } from '../agent-runtime/execution-budget.js';
 export class MentorRunner {
@@ -47,10 +48,29 @@ export class MentorRunner {
         if (session)
             this.#mentorSession = session;
         try {
-            const result = await this.#runWithSession(agentId, task, signal);
-            if (slot && result.usage)
-                childBudget.recordUsage(result.usage);
-            return result;
+            try {
+                const result = await this.#runWithSession(agentId, task, signal);
+                if (slot && result.usage)
+                    childBudget.recordUsage(result.usage);
+                return result;
+            }
+            catch (error) {
+                if (!signal?.aborted && !isAbortLike(error?.message, error))
+                    throw error;
+                const usage = normalizeAgentRunUsage(error?.usage) ?? extractUsage(error);
+                if (slot && usage)
+                    childBudget.recordUsage(usage);
+                return {
+                    agentId,
+                    role: 'mentor',
+                    status: 'cancelled',
+                    finalText: '',
+                    filesChanged: [],
+                    toolsUsed: [],
+                    error: error?.message ?? 'The subagent run was aborted.',
+                    ...(usage ? { usage } : {}),
+                };
+            }
         }
         finally {
             slot?.release();
@@ -63,7 +83,7 @@ export class MentorRunner {
     }
     async #runWithSession(agentId, task, signal) {
         const definition = loadRoleDefinition('mentor', this.#settings);
-        const mentorModel = definition.model;
+        const mentorModelName = definition.model;
         const mentorProvider = definition.provider;
         const mentorMode = this.#settings.get('app.mentorMode');
         const baseInstructions = mentorMode
@@ -74,14 +94,24 @@ export class MentorRunner {
         const agentsInstructions = this.#executionContext?.isRemote() ? '' : getAgentsInstructions(cwd);
         const instructions = `${baseInstructions}\n\nEnvironment: ${envInfo}${agentsInstructions}`;
         this.#mentorSession.switchProvider(mentorProvider);
-        const mentorRunner = this.#mentorSession.ensureRunner(mentorProvider, (providerId) => {
-            const providerDef = getProvider(providerId);
-            return (providerDef?.createRunner?.({
+        const providerDef = getProvider(mentorProvider);
+        if (!providerDef?.createStreamedModel) {
+            const providerLabel = providerDef?.label || mentorProvider;
+            throw new Error(`${providerLabel} is configured but could not be initialized. ` +
+                `Please check that all required credentials and provider settings are set.`);
+        }
+        const streamedModel = await this.#mentorSession.ensureModel(mentorProvider, (providerId) => {
+            const definition = getProvider(providerId);
+            if (!definition?.createStreamedModel)
+                throw new Error(`${providerId} has no streamed model`);
+            return definition.createStreamedModel(mentorModelName, {
                 settingsService: this.#settings,
                 loggingService: this.#logger,
                 sessionContextService: this.#sessionContextService,
-            }) ?? null);
+            });
         });
+        if (!streamedModel)
+            throw new Error(`${providerDef.label || mentorProvider} is configured but could not be initialized.`);
         const mentorAgent = this.#mentorSession.ensureAgent(() => {
             const reasoningEffort = this.#settings.get('agent.mentorReasoningEffort');
             const modelSettings = {
@@ -90,42 +120,43 @@ export class MentorRunner {
             if (reasoningEffort && reasoningEffort !== 'default') {
                 modelSettings.reasoning = { effort: reasoningEffort, summary: 'auto' };
             }
-            return new Agent({
+            return {
                 name: definition.name,
-                model: mentorModel,
+                model: mentorModelName,
                 ...(Object.keys(modelSettings).length > 0 ? { modelSettings } : {}),
                 instructions,
-            });
+                tools: [],
+            };
         });
         this.#mentorSession.addUserMessage(task);
-        const providerDef = getProvider(mentorProvider);
-        const supportsChaining = providerDef?.capabilities?.supportsConversationChaining ?? false;
+        const supportsChaining = providerDef.capabilities?.supportsConversationChaining ?? false;
         const input = this.#mentorSession.getInput(task, supportsChaining);
-        const subagentContext = {
-            turnCount: 0,
-            maxTurns: definition.maxTurns,
-        };
-        const runOptions = {
-            ...this.#mentorSession.getRunOptions(supportsChaining, definition.maxTurns),
-            context: subagentContext,
-            callModelInputFilter: (args) => {
-                if (args.context) {
-                    args.context.turnCount = (args.context.turnCount ?? 0) + 1;
-                }
-                return args.modelData;
-            },
+        const loop = new ApplicationRunLoop({ resolveModel: () => streamedModel });
+        const stream = loop.startStream(mentorAgent, input, {
             ...(signal ? { signal } : {}),
-        };
-        const result = await runWithProvider(mentorProvider, mentorRunner, mentorAgent, input, runOptions);
-        this.#mentorSession.appendOutput(result);
+            maxTurns: definition.maxTurns,
+            ...(supportsChaining && this.#mentorSession.previousResponseId
+                ? { previousResponseId: this.#mentorSession.previousResponseId }
+                : {}),
+        });
+        try {
+            await stream.completed;
+        }
+        catch (error) {
+            if (stream.runUsage !== undefined)
+                error.usage = stream.runUsage;
+            throw error;
+        }
+        this.#mentorSession.appendOutput({ output: selectAgentStreamItems(stream), lastResponseId: stream.lastResponseId });
         return {
             agentId,
             role: 'mentor',
             status: 'completed',
-            finalText: extractFinalText(result),
+            finalText: extractFinalText(stream),
             filesChanged: [],
             toolsUsed: [],
-            usage: normalizeAgentRunUsage(result?.state?.usage) ?? extractUsage(result),
+            usage: normalizeAgentRunUsage(stream.runUsage) ?? extractUsage(stream),
+            costRecords: stream.runCostRecords,
         };
     }
 }

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

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

package/dist/services/subagents/nested-runner.d.ts

@@ -1,29 +1,27 @@
-import { Agent, type Tool } from '@openai/agents';
+import { type ApplicationAgent } from '../agent-runtime/application-run-loop.js';
+import type { AnyToolDefinition } from '../../tools/types.js';
 import type { ILoggingService, ISettingsService, ISessionContextService } from '../service-interfaces.js';
 import type { ExecutionContext } from '../execution-context.js';
-import type { SubagentRequest, SubagentResult, SupportedSubagentRole, SubagentDefinition } from './types.js';
+import type { NestedSubagentResult, SubagentRequest, SupportedSubagentRole, SubagentDefinition } from './types.js';
 import type { SkillsService } from '../skills/skills-service.js';
-import { SubagentToolFactory, type SubagentRunContext } from './tool-policy.js';
+import { SubagentToolFactory } from './tool-policy.js';
 import type { ConversationEvent } from '../conversation/conversation-events.js';
+import { ToolOwnershipRegistry } from '../approval/tool-ownership-registry.js';
+import { ForegroundSubagentLease, type BackgroundSubagentApprovalPauseSink } from './foreground-subagent-lease.js';
 export type CachedRoleTool = {
-    agent: Agent<SubagentRunContext>;
-    tool: Tool<SubagentRunContext>;
+    agent: ApplicationAgent;
+    tool: AnyToolDefinition;
+};
+/** Observable foreground work that may be adopted without recreating it. */
+export interface ForegroundSubagentCandidate {
+    runId: string;
+    role: string;
+    task: string;
+    parentTool?: string;
+}
+type ForegroundLeaseCandidate = ForegroundSubagentCandidate & {
+    lease: ForegroundSubagentLease;
 };
-/**
- * Increments the subagent's turn counter on every model call.
- *
- * The OpenAI Agents SDK invokes `callModelInputFilter` with `args.context` set
- * to the **unwrapped** user context (see `applyCallModelInputFilter` in
- * `@openai/agents-core/dist/runner/conversation.js`, which passes
- * `context: context.context`). Earlier versions of this code read
- * `args.context.context.turnCount`, which is always `undefined` and caused the
- * counter to never advance, preventing the turn-limit warning from ever
- * being injected into nested subagent tool output.
- */
-export declare function incrementSubagentTurnCount(args: {
-    context?: unknown;
-    modelData: any;
-}): any;
 export declare class NestedSubagentRunner {
     #private;
     constructor(deps: {
@@ -37,10 +35,36 @@ export declare class NestedSubagentRunner {
         /** Optional role resolver for shared resolution path. */
         resolveRole?: (role: SupportedSubagentRole) => SubagentDefinition;
         skillsService?: SkillsService;
+        /** Session-owned registry where this runner records pending tool owners. */
+        toolOwnership: ToolOwnershipRegistry;
+        /** Session-owned queue/control sink for approvals from adopted child runs. */
+        backgroundApprovalPauseSink?: BackgroundSubagentApprovalPauseSink;
     });
     clearCache(): void;
-    getRoleAgentTool(role: SupportedSubagentRole): Tool<SubagentRunContext>;
-    getRoleAgent(role: SupportedSubagentRole): Agent<SubagentRunContext>;
-    runAsTool(request: SubagentRequest, context?: unknown, details?: unknown): Promise<SubagentResult>;
+    getRoleAgentTool(role: SupportedSubagentRole): AnyToolDefinition;
+    getRoleAgent(role: SupportedSubagentRole): any;
+    /** Candidate lookup only; ownership moves through the async registry. */
+    getForegroundLease(runId: string): ForegroundSubagentLease | undefined;
+    getForegroundCandidate(runId: string): ForegroundLeaseCandidate | undefined;
+    /** Observational projection; the lease itself remains runner-owned. */
+    listForegroundCandidates(): ForegroundSubagentCandidate[];
+    /** Replaces the session-owned pause publication sink without rebuilding role tools. */
+    setBackgroundApprovalPauseSink(sink: BackgroundSubagentApprovalPauseSink | undefined): void;
+    /** A move is unsafe unless a later child-tool pause has a session owner. */
+    hasBackgroundApprovalPauseSink(): boolean;
+    /**
+     * Builds the `run_subagent_<role>` tool. Its `execute` actually runs the role
+     * agent through `ApplicationRunLoop` — replacing the legacy `Agent.asTool`
+     * stub whose execute returned the raw task string and dropped every run
+     * option, which is why nested subagents could never return a result (F1).
+     *
+     * The run's `SubagentRunContext` and the replayed parent approvals arrive on
+     * the `ToolInvocationContext` that `runAsTool` builds; the loop seeds its
+     * ledger from `toolContext.approvals`, so parent decisions are honored (F5)
+     * and the run's own decisions accumulate on the same ledger.
+     */
+    createSubagentTool(role: SupportedSubagentRole, definition: SubagentDefinition, agent: ApplicationAgent): AnyToolDefinition;
+    runAsTool(request: SubagentRequest, context?: unknown, details?: unknown): Promise<NestedSubagentResult>;
 }
+export {};
 //# sourceMappingURL=nested-runner.d.ts.map

package/dist/services/subagents/nested-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nested-runner.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/nested-runner.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAsB,KAAK,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtE,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,eAAe,EAAE,cAAc,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAC7G,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAyB,KAAK,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAYvG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAGhF,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACjC,IAAI,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;CAChC,CAAC;AAIF;;;;;;;;;;GAUG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,GAAG,CAAA;CAAE,GAAG,GAAG,CAM3F;AAWD,qBAAa,oBAAoB;;IAkB/B,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,WAAW,EAAE,mBAAmB,CAAC;QACjC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;QAC7C,aAAa,EAAE,GAAG,CAAC,qBAAqB,EAAE,cAAc,CAAC,CAAC;QAC1D,yDAAyD;QACzD,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,qBAAqB,KAAK,kBAAkB,CAAC;QAClE,aAAa,CAAC,EAAE,aAAa,CAAC;KAC/B,EAUA;IAED,UAAU,IAAI,IAAI,CAEjB;IAED,gBAAgB,CAAC,IAAI,EAAE,qBAAqB,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAEtE;IAED,YAAY,CAAC,IAAI,EAAE,qBAAqB,GAAG,KAAK,CAAC,kBAAkB,CAAC,CAEnE;IAwKK,SAAS,CAAC,OAAO,EAAE,eAAe,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC,CAoHvG;CACF"}
+{"version":3,"file":"nested-runner.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/nested-runner.ts"],"names":[],"mappings":"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"}