@qduc/term2 0.7.3 → 0.9.0

package/dist/lib/retry-executor.js

@@ -1,5 +1,4 @@
-import { APIConnectionError, APIConnectionTimeoutError, InternalServerError, RateLimitError } from 'openai';
-import { OpenRouterError, OpenAICompatibleError } from '../providers/common/provider-errors.js';
+import { classifyUpstreamRetryableError, computeUpstreamRetryDelayMs, } from '../services/retry/upstream-retry-policy.js';
 export async function executeWithRetry({ operation, retryAttempts, provider, model, traceId, logger, onRetry, sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms)), random = Math.random, }) {
     return execute(operation, retryAttempts, {
         retryAttempts,
@@ -17,72 +16,18 @@ async function execute(operation, retries, context) {
         return await operation();
     }
     catch (error) {
-        const isTransientError = error instanceof APIConnectionError ||
-            error instanceof APIConnectionTimeoutError ||
-            error instanceof InternalServerError ||
-            error instanceof RateLimitError;
-        const isOpenRouterRetryable = error instanceof OpenRouterError && (error.status === 429 || error.status >= 500);
-        const isOpenAICompatibleRetryable = error instanceof OpenAICompatibleError && (error.status === 429 || error.status >= 500);
-        const isGenericRetryable = (() => {
-            if (!error || typeof error !== 'object')
-                return false;
-            const statusRaw = error.status ?? error.statusCode;
-            const status = typeof statusRaw === 'number' ? statusRaw : parseInt(statusRaw, 10);
-            if (Number.isInteger(status)) {
-                return status === 429 || status >= 500;
-            }
-            const message = String(error.message || '').toLowerCase();
-            return message.includes('rate limit') || message.includes('too many requests') || message.includes('rate_limit');
-        })();
-        const isRetryable = retries > 0 && (isTransientError || isOpenRouterRetryable || isOpenAICompatibleRetryable || isGenericRetryable);
+        const classification = classifyUpstreamRetryableError(error);
+        const isRetryable = retries > 0 && classification.retryable;
         if (!isRetryable) {
             throw error;
         }
         const attemptIndex = context.retryAttempts - retries;
-        const getHeader = (err, name) => {
-            if (!err || typeof err !== 'object')
-                return undefined;
-            const headers = err.headers;
-            if (!headers)
-                return undefined;
-            if (typeof headers.get === 'function') {
-                return headers.get(name) || undefined;
-            }
-            if (typeof headers === 'object') {
-                const search = name.toLowerCase();
-                for (const key of Object.keys(headers)) {
-                    if (key.toLowerCase() === search) {
-                        return headers[key];
-                    }
-                }
-            }
-            return undefined;
-        };
-        const retryAfterHeader = (error instanceof RateLimitError && error.headers?.['retry-after']) ||
-            (error instanceof OpenRouterError && error.headers['retry-after']) ||
-            (error instanceof OpenAICompatibleError && error.headers['retry-after']) ||
-            getHeader(error, 'retry-after');
-        let delay;
-        if (retryAfterHeader) {
-            delay = parseInt(retryAfterHeader, 10) * 1000;
-        }
-        else {
-            const baseDelay = 500 + context.random() * 500;
-            const exponentialDelay = baseDelay * Math.pow(2, attemptIndex);
-            const cappedDelay = Math.min(exponentialDelay, 30000);
-            delay = context.random() * cappedDelay;
-        }
+        const delay = computeUpstreamRetryDelayMs({
+            retryAfterMs: classification.retryAfterMs,
+            attemptIndex,
+            random: context.random,
+        });
         await context.sleep(delay);
-        const status = (() => {
-            if (error instanceof OpenRouterError || error instanceof OpenAICompatibleError) {
-                return error.status;
-            }
-            if (!error || typeof error !== 'object')
-                return undefined;
-            const statusRaw = error.status ?? error.statusCode;
-            const statusNum = typeof statusRaw === 'number' ? statusRaw : parseInt(statusRaw, 10);
-            return Number.isInteger(statusNum) ? statusNum : undefined;
-        })();
         context.logger.warn('Agent operation retry', {
             eventType: 'retry.upstream',
             category: 'retry',
@@ -97,8 +42,8 @@ async function execute(operation, retries, context) {
             delayMs: Math.round(delay),
             attemptIndex,
             errorMessage: error instanceof Error ? error.message : String(error),
-            ...(status !== undefined && {
-                status,
+            ...(classification.status !== undefined && {
+                status: classification.status,
             }),
         });
         context.onRetry?.();

package/dist/lib/retry-executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"retry-executor.js","sourceRoot":"","sources":["../../source/lib/retry-executor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"retry-executor.js","sourceRoot":"","sources":["../../source/lib/retry-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,8BAA8B,EAC9B,2BAA2B,GAC5B,MAAM,4CAA4C,CAAC;AAMpD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAI,EACxC,SAAS,EACT,aAAa,EACb,QAAQ,EACR,KAAK,EACL,OAAO,EACP,MAAM,EACN,OAAO,EACP,KAAK,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EACzE,MAAM,GAAG,IAAI,CAAC,MAAM,GAWrB;IACC,OAAO,OAAO,CAAC,SAAS,EAAE,aAAa,EAAE;QACvC,aAAa;QACb,QAAQ;QACR,KAAK;QACL,OAAO;QACP,MAAM;QACN,OAAO;QACP,KAAK;QACL,MAAM;KACP,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,OAAO,CACpB,SAA2B,EAC3B,OAAe,EACf,OASC;IAED,IAAI,CAAC;QACH,OAAO,MAAM,SAAS,EAAE,CAAC;IAC3B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,cAAc,GAAG,8BAA8B,CAAC,KAAK,CAAC,CAAC;QAC7D,MAAM,WAAW,GAAG,OAAO,GAAG,CAAC,IAAI,cAAc,CAAC,SAAS,CAAC;QAC5D,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,KAAK,CAAC;QACd,CAAC;QAED,MAAM,YAAY,GAAG,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC;QACrD,MAAM,KAAK,GAAG,2BAA2B,CAAC;YACxC,YAAY,EAAE,cAAc,CAAC,YAAY;YACzC,YAAY;YACZ,MAAM,EAAE,OAAO,CAAC,MAAM;SACvB,CAAC,CAAC;QAEH,MAAM,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAE3B,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE;YAC3C,SAAS,EAAE,gBAAgB;YAC3B,QAAQ,EAAE,OAAO;YACjB,KAAK,EAAE,OAAO;YACd,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,SAAS,EAAE,UAAU;YACrB,YAAY,EAAE,YAAY,GAAG,CAAC;YAC9B,SAAS,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,KAAK;YACzE,gBAAgB,EAAE,OAAO,GAAG,CAAC;YAC7B,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;YAC1B,YAAY;YACZ,YAAY,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;YACpE,GAAG,CAAC,cAAc,CAAC,MAAM,KAAK,SAAS,IAAI;gBACzC,MAAM,EAAE,cAAc,CAAC,MAAM;aAC9B,CAAC;SACH,CAAC,CAAC;QAEH,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;QACpB,OAAO,OAAO,CAAC,SAAS,EAAE,OAAO,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;AACH,CAAC"}

package/dist/lib/retry-executor.test.js

@@ -1,11 +1,11 @@
-import test from 'ava';
+import { it, expect } from 'vitest';
 import { APIConnectionError, RateLimitError } from 'openai';
 import { OpenRouterError, OpenAICompatibleError } from '../providers/common/provider-errors.js';
 import { executeWithRetry } from './retry-executor.js';
 function asInstanceOf(prototype, props) {
     return Object.assign(Object.create(prototype), props);
 }
-test('retries transient OpenAI errors with jitter backoff and logs payload', async (t) => {
+it('retries transient OpenAI errors with jitter backoff and logs payload', async () => {
     const warnLogs = [];
     const delays = [];
     let callbackCount = 0;
@@ -41,12 +41,12 @@ test('retries transient OpenAI errors with jitter backoff and logs payload', asy
             return value;
         },
     });
-    t.is(result, 'ok');
-    t.is(attempts, 3);
-    t.is(callbackCount, 2);
-    t.is(warnLogs.length, 2);
-    t.deepEqual(delays, [140, 1200]);
-    t.deepEqual(warnLogs[0], {
+    expect(result).toBe('ok');
+    expect(attempts).toBe(3);
+    expect(callbackCount).toBe(2);
+    expect(warnLogs.length).toBe(2);
+    expect(delays).toEqual([3000, 24000]);
+    expect(warnLogs[0]).toEqual({
         message: 'Agent operation retry',
         meta: {
             eventType: 'retry.upstream',
@@ -59,13 +59,13 @@ test('retries transient OpenAI errors with jitter backoff and logs payload', asy
             retryAttempt: 1,
             errorType: 'APIConnectionError',
             retriesRemaining: 1,
-            delayMs: 140,
+            delayMs: 3000,
             attemptIndex: 0,
             errorMessage: 'temporary network issue',
         },
     });
 });
-test('uses Retry-After header for rate limit errors', async (t) => {
+it('uses Retry-After header for rate limit errors', async () => {
     const delays = [];
     let attempts = 0;
     const error = asInstanceOf(RateLimitError.prototype, {
@@ -88,9 +88,9 @@ test('uses Retry-After header for rate limit errors', async (t) => {
             delays.push(ms);
         },
     });
-    t.deepEqual(delays, [7000]);
+    expect(delays).toEqual([7000]);
 });
-test('retries OpenRouter 5xx and includes status in log payload', async (t) => {
+it('retries OpenRouter 5xx and includes status in log payload', async () => {
     const logs = [];
     let attempts = 0;
     await executeWithRetry({
@@ -112,10 +112,10 @@ test('retries OpenRouter 5xx and includes status in log payload', async (t) => {
         sleep: async () => { },
         random: () => 0,
     });
-    t.is(logs.length, 1);
-    t.is(logs[0].status, 503);
+    expect(logs.length).toBe(1);
+    expect(logs[0].status).toBe(503);
 });
-test('retries OpenAI-compatible 429 and includes status in log payload', async (t) => {
+it('retries OpenAI-compatible 429 and includes status in log payload', async () => {
     const logs = [];
     let attempts = 0;
     await executeWithRetry({
@@ -136,14 +136,14 @@ test('retries OpenAI-compatible 429 and includes status in log payload', async (
         },
         sleep: async () => { },
     });
-    t.is(logs.length, 1);
-    t.is(logs[0].status, 429);
-    t.is(logs[0].delayMs, 1000);
+    expect(logs.length).toBe(1);
+    expect(logs[0].status).toBe(429);
+    expect(logs[0].delayMs).toBe(1000);
 });
-test('does not retry non-retryable errors', async (t) => {
+it('does not retry non-retryable errors', async () => {
     const error = new Error('bad input');
     let attempts = 0;
-    const thrown = await t.throwsAsync(async () => executeWithRetry({
+    await expect(executeWithRetry({
         operation: async () => {
             attempts += 1;
             throw error;
@@ -153,14 +153,13 @@ test('does not retry non-retryable errors', async (t) => {
         model: 'test-model',
         logger: { warn: () => { } },
         sleep: async () => { },
-    }));
-    t.is(thrown, error);
-    t.is(attempts, 1);
+    })).rejects.toBe(error);
+    expect(attempts).toBe(1);
 });
-test('does not retry retryable errors when retries are exhausted', async (t) => {
+it('does not retry retryable errors when retries are exhausted', async () => {
     const error = new OpenRouterError('unavailable', 503, {});
     let attempts = 0;
-    const thrown = await t.throwsAsync(async () => executeWithRetry({
+    await expect(executeWithRetry({
         operation: async () => {
             attempts += 1;
             throw error;
@@ -170,11 +169,10 @@ test('does not retry retryable errors when retries are exhausted', async (t) =>
         model: 'test-model',
         logger: { warn: () => { } },
         sleep: async () => { },
-    }));
-    t.is(thrown, error);
-    t.is(attempts, 1);
+    })).rejects.toBe(error);
+    expect(attempts).toBe(1);
 });
-test('retries generic errors with rate limit status or message', async (t) => {
+it('retries generic errors with rate limit status or message', async () => {
     let attempts = 0;
     const logs = [];
     const result = await executeWithRetry({
@@ -206,14 +204,14 @@ test('retries generic errors with rate limit status or message', async (t) => {
         },
         sleep: async () => { },
     });
-    t.is(result, 'ok');
-    t.is(attempts, 4);
-    t.is(logs.length, 3);
-    t.is(logs[0].errorMessage, "We're currently processing too many requests — please try again later.");
-    t.is(logs[1].status, 429);
-    t.is(logs[2].status, 503);
+    expect(result).toBe('ok');
+    expect(attempts).toBe(4);
+    expect(logs.length).toBe(3);
+    expect(logs[0].errorMessage).toBe("We're currently processing too many requests — please try again later.");
+    expect(logs[1].status).toBe(429);
+    expect(logs[2].status).toBe(503);
 });
-test('uses case-insensitive retry-after header from generic errors', async (t) => {
+it('uses case-insensitive retry-after header from generic errors', async () => {
     let attempts = 0;
     const delays = [];
     await executeWithRetry({
@@ -234,7 +232,7 @@ test('uses case-insensitive retry-after header from generic errors', async (t) =
             delays.push(ms);
         },
     });
-    t.is(attempts, 2);
-    t.deepEqual(delays, [12000]);
+    expect(attempts).toBe(2);
+    expect(delays).toEqual([12000]);
 });
 //# sourceMappingURL=retry-executor.test.js.map

package/dist/lib/retry-executor.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"retry-executor.test.js","sourceRoot":"","sources":["../../source/lib/retry-executor.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"retry-executor.test.js","sourceRoot":"","sources":["../../source/lib/retry-executor.test.ts"],"names":[],"mappings":"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"}

package/dist/lib/runner-manager.d.ts

@@ -0,0 +1,22 @@
+import type { Runner } from '@openai/agents';
+import type { ISettingsService, ILoggingService, ISessionContextService } from '../services/service-interfaces.js';
+export interface RunnerManagerDeps {
+    settings: ISettingsService;
+    logger: ILoggingService;
+    sessionContextService: ISessionContextService;
+    /** Returns the current provider ID — used to key the cached runner */
+    getProvider: () => string;
+}
+export declare class RunnerManager {
+    #private;
+    constructor(config: {
+        maxTurns: number;
+        retryAttempts: number;
+    }, deps: RunnerManagerDeps);
+    get maxTurns(): number;
+    get retryAttempts(): number;
+    setRetryCallback(callback: () => void): void;
+    invalidateRunner(): void;
+    getOrCreateRunner(providerId: string): Runner | null;
+}
+//# sourceMappingURL=runner-manager.d.ts.map

package/dist/lib/runner-manager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"runner-manager.d.ts","sourceRoot":"","sources":["../../source/lib/runner-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAGnH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,MAAM,EAAE,eAAe,CAAC;IACxB,qBAAqB,EAAE,sBAAsB,CAAC;IAC9C,sEAAsE;IACtE,WAAW,EAAE,MAAM,MAAM,CAAC;CAC3B;AAED,qBAAa,aAAa;;gBAWZ,MAAM,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAE,EAAE,IAAI,EAAE,iBAAiB;IASxF,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED,gBAAgB,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI;IAI5C,gBAAgB,IAAI,IAAI;IAIxB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;CA4BrD"}

package/dist/lib/runner-manager.js

@@ -0,0 +1,56 @@
+import { getProvider } from '../providers/index.js';
+export class RunnerManager {
+    #runner = null;
+    #maxTurns;
+    #retryAttempts;
+    #retryCallback = null;
+    #settings;
+    #logger;
+    #sessionContextService;
+    #getProvider;
+    constructor(config, deps) {
+        this.#maxTurns = config.maxTurns;
+        this.#retryAttempts = config.retryAttempts;
+        this.#settings = deps.settings;
+        this.#logger = deps.logger;
+        this.#sessionContextService = deps.sessionContextService;
+        this.#getProvider = deps.getProvider;
+    }
+    get maxTurns() {
+        return this.#maxTurns;
+    }
+    get retryAttempts() {
+        return this.#retryAttempts;
+    }
+    setRetryCallback(callback) {
+        this.#retryCallback = callback;
+    }
+    invalidateRunner() {
+        this.#runner = null;
+    }
+    getOrCreateRunner(providerId) {
+        // For non-primary providers, always create fresh (no caching)
+        if (providerId !== this.#getProvider()) {
+            return this.#createRunner(providerId);
+        }
+        // For the primary provider, cache and reuse
+        if (this.#runner) {
+            return this.#runner;
+        }
+        this.#runner = this.#createRunner(providerId);
+        return this.#runner;
+    }
+    #createRunner(providerId) {
+        const providerDef = getProvider(providerId);
+        if (!providerDef?.createRunner) {
+            return null;
+        }
+        return providerDef.createRunner({
+            settingsService: this.#settings,
+            loggingService: this.#logger,
+            sessionContextService: this.#sessionContextService,
+            onRetry: () => this.#retryCallback?.(),
+        });
+    }
+}
+//# sourceMappingURL=runner-manager.js.map

package/dist/lib/runner-manager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"runner-manager.js","sourceRoot":"","sources":["../../source/lib/runner-manager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAUpD,MAAM,OAAO,aAAa;IACxB,OAAO,GAAkB,IAAI,CAAC;IAC9B,SAAS,CAAS;IAClB,cAAc,CAAS;IACvB,cAAc,GAAwB,IAAI,CAAC;IAE3C,SAAS,CAAmB;IAC5B,OAAO,CAAkB;IACzB,sBAAsB,CAAyB;IAC/C,YAAY,CAAe;IAE3B,YAAY,MAAmD,EAAE,IAAuB;QACtF,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,aAAa,CAAC;QAC3C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,qBAAqB,CAAC;QACzD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC;IACvC,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED,gBAAgB,CAAC,QAAoB;QACnC,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC;IACjC,CAAC;IAED,gBAAgB;QACd,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;IACtB,CAAC;IAED,iBAAiB,CAAC,UAAkB;QAClC,8DAA8D;QAC9D,IAAI,UAAU,KAAK,IAAI,CAAC,YAAY,EAAE,EAAE,CAAC;YACvC,OAAO,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QACxC,CAAC;QAED,4CAA4C;QAC5C,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC,OAAO,CAAC;QACtB,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAC9C,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,aAAa,CAAC,UAAkB;QAC9B,MAAM,WAAW,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;QAC5C,IAAI,CAAC,WAAW,EAAE,YAAY,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,WAAW,CAAC,YAAY,CAAC;YAC9B,eAAe,EAAE,IAAI,CAAC,SAAS;YAC/B,cAAc,EAAE,IAAI,CAAC,OAAO;YAC5B,qBAAqB,EAAE,IAAI,CAAC,sBAAsB;YAClD,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE;SACvC,CAAC,CAAC;IACL,CAAC;CACF"}

package/dist/lib/runner-manager.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=runner-manager.test.d.ts.map

package/dist/lib/runner-manager.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"runner-manager.test.d.ts","sourceRoot":"","sources":["../../source/lib/runner-manager.test.ts"],"names":[],"mappings":""}

package/dist/lib/runner-manager.test.js

@@ -0,0 +1,136 @@
+import { it, expect } from 'vitest';
+import { registerProvider, unregisterProvider, getProvider } from '../providers/registry.js';
+import { RunnerManager } from './runner-manager.js';
+// ========== Mock Utilities ==========
+function createMockLogger() {
+    return {
+        debug: () => { },
+        info: () => { },
+        warn: () => { },
+        error: () => { },
+        security: () => { },
+        setCorrelationId: () => { },
+        clearCorrelationId: () => { },
+        getCorrelationId: () => undefined,
+        log: () => { },
+    };
+}
+function createMockSettings(values = {}) {
+    const store = { ...values };
+    return {
+        get: (key) => store[key],
+        set: (key, value) => {
+            store[key] = value;
+        },
+        onChange: () => () => { },
+    };
+}
+function createSessionContext() {
+    return {
+        runWithContext: (_context, fn) => fn(),
+        getContext: () => null,
+    };
+}
+function createRunnerManagerDeps(overrides = {}) {
+    return {
+        logger: overrides.logger ?? createMockLogger(),
+        settings: overrides.settings ?? createMockSettings(),
+        sessionContextService: createSessionContext(),
+        getProvider: overrides.getProvider ?? (() => 'primary-provider'),
+    };
+}
+// ========== Mock Provider Registration ==========
+const RUNNER_RETURN_VALUE = { run: async () => ({ status: 'completed', finalOutput: 'mock' }) };
+function registerMockProvider(id, withCreateRunner) {
+    if (getProvider(id)) {
+        unregisterProvider(id);
+    }
+    registerProvider({
+        id,
+        label: `Mock ${id}`,
+        createRunner: withCreateRunner ? () => ({ ...RUNNER_RETURN_VALUE }) : undefined,
+        fetchModels: async () => [{ id: 'mock-model' }],
+        clearConversations: () => { },
+    });
+}
+function cleanupProvider(id) {
+    if (getProvider(id)) {
+        unregisterProvider(id);
+    }
+}
+// ========== Tests ==========
+it('constructor sets maxTurns and retryAttempts', () => {
+    const manager = new RunnerManager({ maxTurns: 5, retryAttempts: 3 }, createRunnerManagerDeps());
+    expect(manager.maxTurns).toBe(5);
+    expect(manager.retryAttempts).toBe(3);
+});
+it.sequential('getOrCreateRunner creates runner for known provider', () => {
+    registerMockProvider('test-with-runner', true);
+    // TODO: // TODO: t.teardown(() => cleanupProvider('test-with-runner')) needs manual try/finally conversion;
+    const manager = new RunnerManager({ maxTurns: 5, retryAttempts: 3 }, createRunnerManagerDeps());
+    const runner = manager.getOrCreateRunner('test-with-runner');
+    expect(runner).toBeTruthy();
+    expect(typeof runner?.run, 'runner should have a run method').toBe('function');
+});
+it.sequential('getOrCreateRunner returns null for provider without createRunner', () => {
+    registerMockProvider('test-no-runner', false);
+    // TODO: // TODO: t.teardown(() => cleanupProvider('test-no-runner')) needs manual try/finally conversion;
+    const manager = new RunnerManager({ maxTurns: 5, retryAttempts: 3 }, createRunnerManagerDeps());
+    const runner = manager.getOrCreateRunner('test-no-runner');
+    expect(runner).toBe(null);
+});
+it.sequential('getOrCreateRunner caches runner for primary provider', () => {
+    registerMockProvider('primary-provider', true);
+    // TODO: // TODO: t.teardown(() => cleanupProvider('primary-provider')) needs manual try/finally conversion;
+    const manager = new RunnerManager({ maxTurns: 5, retryAttempts: 3 }, createRunnerManagerDeps({ getProvider: () => 'primary-provider' }));
+    const first = manager.getOrCreateRunner('primary-provider');
+    const second = manager.getOrCreateRunner('primary-provider');
+    expect(first).toBeTruthy();
+    expect(second).toBeTruthy();
+    expect(first, 'should return the same cached instance').toBe(second);
+});
+it.sequential('getOrCreateRunner creates fresh runner for non-primary provider', () => {
+    registerMockProvider('primary-provider', true);
+    registerMockProvider('other-provider', true);
+    try {
+        const manager = new RunnerManager({ maxTurns: 5, retryAttempts: 3 }, createRunnerManagerDeps({ getProvider: () => 'primary-provider' }));
+        const first = manager.getOrCreateRunner('other-provider');
+        const second = manager.getOrCreateRunner('other-provider');
+        expect(first).toBeTruthy();
+        expect(second).toBeTruthy();
+        expect(first, 'should return different instances for non-primary provider').not.toBe(second);
+    }
+    finally {
+        cleanupProvider('primary-provider');
+        cleanupProvider('other-provider');
+    }
+});
+it.sequential('invalidateRunner clears cache', () => {
+    registerMockProvider('primary-provider', true);
+    // TODO: // TODO: t.teardown(() => cleanupProvider('primary-provider')) needs manual try/finally conversion;
+    const manager = new RunnerManager({ maxTurns: 5, retryAttempts: 3 }, createRunnerManagerDeps({ getProvider: () => 'primary-provider' }));
+    const first = manager.getOrCreateRunner('primary-provider');
+    expect(first).toBeTruthy();
+    manager.invalidateRunner();
+    const second = manager.getOrCreateRunner('primary-provider');
+    expect(second).toBeTruthy();
+    expect(first, 'should return a new instance after invalidation').not.toBe(second);
+});
+it.sequential('setRetryCallback wires callback to runner creation', () => {
+    registerMockProvider('primary-provider', true);
+    // TODO: // TODO: t.teardown(() => cleanupProvider('primary-provider')) needs manual try/finally conversion;
+    let retryCalled = false;
+    const manager = new RunnerManager({ maxTurns: 5, retryAttempts: 3 }, createRunnerManagerDeps({ getProvider: () => 'primary-provider' }));
+    manager.setRetryCallback(() => {
+        retryCalled = true;
+    });
+    // Create the runner — the onRetry callback should be wired to the provider's createRunner
+    manager.getOrCreateRunner('primary-provider');
+    // Verify the callback is callable by calling it directly
+    // (the actual invocation happens inside the runner; we just verify the wiring)
+    expect(retryCalled, 'callback should not be called yet').toBe(false);
+    // Get the provider to verify the callback was passed
+    // We can test that setRetryCallback doesn't throw and that the internal callback works
+    expect(() => manager.setRetryCallback(() => { }));
+});
+//# sourceMappingURL=runner-manager.test.js.map

package/dist/lib/runner-manager.test.js.map

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

package/dist/lib/subagent-bridge.d.ts

@@ -0,0 +1,45 @@
+import { SubagentManager } from '../services/subagents/subagent-manager.js';
+import type { ConversationEvent } from '../services/conversation/conversation-events.js';
+import type { ILoggingService, ISettingsService, ISessionContextService } from '../services/service-interfaces.js';
+import type { ExecutionContext } from '../services/execution-context.js';
+import type { SubagentResult } from '../services/subagents/types.js';
+export interface SubagentBridgeDeps {
+    logger: ILoggingService;
+    settings: ISettingsService;
+    executionContext?: ExecutionContext;
+    sessionContextService: ISessionContextService;
+    /** Chat method from the parent AgentClient — injected, not captured via `this` */
+    chat: (message: string, options?: any) => Promise<string>;
+    /** Factory for creating transient AgentClient instances for subagent runs */
+    createClient: (opts: {
+        agent: any;
+        provider: string;
+        maxTurns: number;
+        retryAttempts?: number;
+    }) => any;
+    /**
+     * Optional pre-built SubagentManager for test injection.
+     * When provided, the bridge uses it instead of creating one internally.
+     */
+    subagentManager?: SubagentManager;
+}
+export declare class SubagentBridge {
+    #private;
+    constructor(deps: SubagentBridgeDeps);
+    setEventSink(sink: ((event: ConversationEvent) => void) | null): void;
+    clearSubagentCache(): void;
+    clearCache(): void;
+    get activeSubagentsCount(): number;
+    /** Abort signal shared by all subagent runs spawned through this bridge. */
+    get signal(): AbortSignal;
+    /** Replace the shared abort controller so a new parent run starts fresh. */
+    resetAbortController(): void;
+    /** Abort all active subagent runs and prepare a fresh controller. */
+    abort(): void;
+    createMentor: (question: string) => Promise<string>;
+    runSubagent: (params: {
+        role: string;
+        task: string;
+    }, _context?: unknown, details?: unknown) => Promise<SubagentResult>;
+}
+//# sourceMappingURL=subagent-bridge.d.ts.map

package/dist/lib/subagent-bridge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"subagent-bridge.d.ts","sourceRoot":"","sources":["../../source/lib/subagent-bridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAC5E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iDAAiD,CAAC;AACzF,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AACnH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAGrE,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,qBAAqB,EAAE,sBAAsB,CAAC;IAC9C,kFAAkF;IAClF,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1D,6EAA6E;IAC7E,YAAY,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,GAAG,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,GAAG,CAAC;IACxG;;;OAGG;IACH,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;AAED,qBAAa,cAAc;;gBASb,IAAI,EAAE,kBAAkB;IAmBpC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI;IASrE,kBAAkB,IAAI,IAAI;IAM1B,UAAU,IAAI,IAAI;IAIlB,IAAI,oBAAoB,IAAI,MAAM,CAEjC;IAED,4EAA4E;IAC5E,IAAI,MAAM,IAAI,WAAW,CAExB;IAED,4EAA4E;IAC5E,oBAAoB,IAAI,IAAI;IAI5B,qEAAqE;IACrE,KAAK,IAAI,IAAI;IAgCb,YAAY,GAAU,UAAU,MAAM,KAAG,OAAO,CAAC,MAAM,CAAC,CA8BtD;IAEF,WAAW,GACT,QAAQ;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EACtC,WAAW,OAAO,EAClB,UAAU,OAAO,KAChB,OAAO,CAAC,cAAc,CAAC,CAoBxB;CACH"}