@qduc/term2 0.7.3 → 0.8.0

package/dist/lib/subagent-bridge.js

@@ -0,0 +1,122 @@
+import { SubagentManager } from '../services/subagents/subagent-manager.js';
+import { createAbortError } from '../services/subagents/utils.js';
+export class SubagentBridge {
+    #subagentManager;
+    #subagentEventSink = null;
+    #activeSubagentsCount = 0;
+    #pendingClearSink = false;
+    #logger;
+    #abortController = new AbortController();
+    constructor(deps) {
+        this.#logger = deps.logger;
+        if (deps.subagentManager !== undefined) {
+            this.#subagentManager = deps.subagentManager;
+        }
+        else {
+            this.#subagentManager = new SubagentManager({
+                logger: deps.logger,
+                settings: deps.settings,
+                executionContext: deps.executionContext,
+                sessionContextService: deps.sessionContextService,
+                onEvent: (event) => this.#subagentEventSink?.(event),
+                agentClient: { chat: (message, options) => deps.chat(message, options) },
+                createClient: deps.createClient,
+            });
+        }
+    }
+    setEventSink(sink) {
+        if (sink === null && this.#activeSubagentsCount > 0) {
+            this.#pendingClearSink = true;
+        }
+        else {
+            this.#subagentEventSink = sink;
+            this.#pendingClearSink = false;
+        }
+    }
+    clearSubagentCache() {
+        if (this.#subagentManager) {
+            this.#subagentManager.resetMentorSession();
+        }
+    }
+    clearCache() {
+        this.#subagentManager?.clearCache();
+    }
+    get activeSubagentsCount() {
+        return this.#activeSubagentsCount;
+    }
+    /** Abort signal shared by all subagent runs spawned through this bridge. */
+    get signal() {
+        return this.#abortController.signal;
+    }
+    /** Replace the shared abort controller so a new parent run starts fresh. */
+    resetAbortController() {
+        this.#abortController = new AbortController();
+    }
+    /** Abort all active subagent runs and prepare a fresh controller. */
+    abort() {
+        this.#abortController.abort();
+        this.#abortController = new AbortController();
+    }
+    /** Increment active count and return a disposer that decrements + handles pending sink clear */
+    #beginSubagentRun() {
+        this.#activeSubagentsCount++;
+        return () => {
+            this.#activeSubagentsCount--;
+            if (this.#pendingClearSink && this.#activeSubagentsCount === 0) {
+                this.#subagentEventSink = null;
+                this.#pendingClearSink = false;
+            }
+        };
+    }
+    createMentor = async (question) => {
+        if (!this.#subagentManager) {
+            throw new Error('Transient agent clients cannot spawn subagents.');
+        }
+        const endRun = this.#beginSubagentRun();
+        try {
+            const result = await this.#subagentManager.run({
+                role: 'mentor',
+                task: question,
+                parentTool: 'ask_mentor',
+                signal: this.signal,
+            });
+            if (result.status === 'failed') {
+                throw new Error(result.error || 'Mentor consultation failed');
+            }
+            if (result.status === 'cancelled') {
+                throw createAbortError('The mentor consultation was aborted.');
+            }
+            return result.finalText;
+        }
+        catch (error) {
+            this.#logger.error('Mentor consultation failed', {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            });
+            throw error;
+        }
+        finally {
+            endRun();
+        }
+    };
+    runSubagent = async (params, _context, details) => {
+        if (!this.#subagentManager) {
+            throw new Error('Transient agent clients cannot spawn subagents.');
+        }
+        const detailsRecord = details;
+        const request = {
+            ...params,
+            parentTool: 'run_subagent',
+            ...(detailsRecord?.resumeState ? { resumeState: detailsRecord.resumeState } : {}),
+            signal: this.signal,
+        };
+        const endRun = this.#beginSubagentRun();
+        try {
+            return await this.#subagentManager.runAsTool(request, _context, details);
+        }
+        finally {
+            endRun();
+        }
+    };
+}
+//# sourceMappingURL=subagent-bridge.js.map

package/dist/lib/subagent-bridge.js.map

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

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

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

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

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

package/dist/lib/subagent-bridge.test.js

@@ -0,0 +1,183 @@
+import { it, expect } from 'vitest';
+import { SubagentBridge } from './subagent-bridge.js';
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+const noopLogger = {
+    debug: () => { },
+    info: () => { },
+    warn: () => { },
+    error: () => { },
+    security: () => { },
+    setCorrelationId: () => { },
+    clearCorrelationId: () => { },
+    getCorrelationId: () => undefined,
+    log: () => { },
+};
+const noopSettings = {
+    get: () => undefined,
+    set: () => { },
+};
+const noopSessionContextService = {
+    runWithContext: (_context, fn) => fn(),
+    getContext: () => null,
+};
+/** Creates a mock SubagentManager-shaped object with per-instance tracked calls. */
+function createMockManager() {
+    const trackRun = { callCount: 0, lastArgs: null };
+    const trackRunAsTool = { callCount: 0, lastArgs: null };
+    const trackReset = { callCount: 0 };
+    const trackClearCache = { callCount: 0 };
+    const manager = {
+        run: async (args) => {
+            trackRun.callCount++;
+            trackRun.lastArgs = args;
+            return { finalText: 'mock-result', status: 'completed', toolsUsed: [], filesChanged: [] };
+        },
+        runAsTool: async (args, _context, _details) => {
+            trackRunAsTool.callCount++;
+            trackRunAsTool.lastArgs = { args, context: _context, details: _details };
+            return { finalText: 'mock-tool-result', status: 'completed', toolsUsed: [], filesChanged: [] };
+        },
+        resetMentorSession: () => {
+            trackReset.callCount++;
+        },
+        clearCache: () => {
+            trackClearCache.callCount++;
+        },
+    };
+    return { manager, trackRun, trackRunAsTool, trackReset, trackClearCache };
+}
+function makeBridge(subagentManager) {
+    return new SubagentBridge({
+        logger: noopLogger,
+        settings: noopSettings,
+        sessionContextService: noopSessionContextService,
+        chat: async () => '',
+        createClient: () => ({}),
+        subagentManager: subagentManager,
+    });
+}
+// ---------------------------------------------------------------------------
+// Tests
+// ---------------------------------------------------------------------------
+it('setEventSink stores the sink', () => {
+    const { manager } = createMockManager();
+    const bridge = makeBridge(manager);
+    const sink = (_event) => { };
+    bridge.setEventSink(sink);
+    // Clearing when count is 0 works immediately (no deferral).
+    bridge.setEventSink(null);
+    expect(true).toBe(true);
+});
+it('setEventSink defers clear when subagents are active', async () => {
+    const { manager } = createMockManager();
+    const bridge = makeBridge(manager);
+    bridge.setEventSink((_event) => { });
+    const mentorPromise = bridge.createMentor('test');
+    // While subagent is running, try to clear the sink — should be deferred
+    bridge.setEventSink(null);
+    await mentorPromise;
+    // After completion, setting a new sink should work cleanly
+    bridge.setEventSink((_event) => { });
+    bridge.setEventSink(null);
+    expect(true).toBe(true);
+});
+it('clearSubagentCache delegates to SubagentManager.resetMentorSession', () => {
+    const { manager, trackReset } = createMockManager();
+    const bridge = makeBridge(manager);
+    bridge.clearSubagentCache();
+    expect(trackReset.callCount).toBe(1);
+    bridge.clearSubagentCache();
+    expect(trackReset.callCount).toBe(2);
+});
+it('clearCache delegates to SubagentManager.clearCache', () => {
+    const { manager, trackClearCache } = createMockManager();
+    const bridge = makeBridge(manager);
+    bridge.clearCache();
+    expect(trackClearCache.callCount).toBe(1);
+    bridge.clearCache();
+    expect(trackClearCache.callCount).toBe(2);
+});
+it('createMentor calls SubagentManager.run with role mentor', async () => {
+    const { manager, trackRun } = createMockManager();
+    const bridge = makeBridge(manager);
+    const result = await bridge.createMentor('help me');
+    expect(trackRun.callCount).toBe(1);
+    expect(trackRun.lastArgs).toBeTruthy();
+    expect(trackRun.lastArgs.role).toBe('mentor');
+    expect(trackRun.lastArgs.task).toBe('help me');
+    expect(trackRun.lastArgs.parentTool).toBe('ask_mentor');
+    expect(result).toBe('mock-result');
+});
+it('createMentor throws when SubagentManager is null', async () => {
+    const bridge = makeBridge(null);
+    await expect(() => bridge.createMentor('test')).rejects.toThrow(/Transient agent clients cannot spawn subagents/);
+});
+it('createMentor throws when result status is failed', async () => {
+    const { manager, trackRun } = createMockManager();
+    // Override run to return a failed result
+    manager.run = async () => ({
+        finalText: '',
+        status: 'failed',
+        error: 'Something went wrong',
+        toolsUsed: [],
+        filesChanged: [],
+    });
+    // Reset tracking since we overrode
+    trackRun.callCount = 0;
+    const bridge = makeBridge(manager);
+    await expect(() => bridge.createMentor('test')).rejects.toThrow(/Something went wrong/);
+});
+it('runSubagent calls SubagentManager.runAsTool', async () => {
+    const { manager, trackRunAsTool } = createMockManager();
+    const bridge = makeBridge(manager);
+    const params = { role: 'worker', task: 'do something' };
+    const result = await bridge.runSubagent(params, undefined, undefined);
+    expect(trackRunAsTool.callCount).toBe(1);
+    expect(trackRunAsTool.lastArgs).toBeTruthy();
+    expect(trackRunAsTool.lastArgs.args.role).toBe('worker');
+    expect(trackRunAsTool.lastArgs.args.task).toBe('do something');
+    expect(trackRunAsTool.lastArgs.args.parentTool).toBe('run_subagent');
+    expect(result.finalText).toBe('mock-tool-result');
+});
+it('runSubagent throws when SubagentManager is null', async () => {
+    const bridge = makeBridge(null);
+    await expect(() => bridge.runSubagent({ role: 'worker', task: 'test' })).rejects.toThrow(/Transient agent clients cannot spawn subagents/);
+});
+it('runSubagent forwards resumeState from details', async () => {
+    const { manager, trackRunAsTool } = createMockManager();
+    const bridge = makeBridge(manager);
+    const params = { role: 'worker', task: 'task' };
+    const details = { resumeState: 'test-state', signal: undefined, toolCall: { callId: 'call-1' } };
+    await bridge.runSubagent(params, undefined, details);
+    expect(trackRunAsTool.lastArgs).toBeTruthy();
+    expect(trackRunAsTool.lastArgs.args.resumeState).toBe('test-state');
+});
+it('activeSubagentsCount tracks active subagent runs', async () => {
+    const { manager } = createMockManager();
+    const bridge = makeBridge(manager);
+    expect(bridge.activeSubagentsCount).toBe(0);
+    // Start a mentor run (doesn't complete yet)
+    const mentorPromise = bridge.createMentor('test');
+    expect(bridge.activeSubagentsCount).toBe(1);
+    await mentorPromise;
+    expect(bridge.activeSubagentsCount).toBe(0);
+});
+it('deferred sink clear is applied after active subagents complete', async () => {
+    const { manager } = createMockManager();
+    const bridge = makeBridge(manager);
+    // Set initial sink
+    bridge.setEventSink((_event) => { });
+    // Start a subagent run
+    const mentorPromise = bridge.createMentor('test');
+    // While running, try to clear the sink — should be deferred
+    bridge.setEventSink(null);
+    // Complete the run
+    await mentorPromise;
+    // Sink should now be cleared (deferred clear applied after count hits 0)
+    // Setting a new sink should work without crashing
+    bridge.setEventSink((_event) => { });
+    bridge.setEventSink(null);
+});
+//# sourceMappingURL=subagent-bridge.test.js.map

package/dist/lib/subagent-bridge.test.js.map

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

package/dist/lib/tool-interceptor-registry.d.ts

@@ -0,0 +1,11 @@
+import type { ToolInterceptor } from '../services/conversation-agent-client.js';
+import type { ILoggingService } from '../services/service-interfaces.js';
+export declare class ToolInterceptorRegistry {
+    #private;
+    constructor(deps: {
+        logger: ILoggingService;
+    });
+    add(interceptor: ToolInterceptor): () => void;
+    check(name: string, params: unknown, toolCallId?: string): Promise<string | null>;
+}
+//# sourceMappingURL=tool-interceptor-registry.d.ts.map

package/dist/lib/tool-interceptor-registry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-interceptor-registry.d.ts","sourceRoot":"","sources":["../../source/lib/tool-interceptor-registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAEzE,qBAAa,uBAAuB;;gBAItB,IAAI,EAAE;QAAE,MAAM,EAAE,eAAe,CAAA;KAAE;IAI7C,GAAG,CAAC,WAAW,EAAE,eAAe,GAAG,MAAM,IAAI;IAOvC,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;CAoBxF"}

package/dist/lib/tool-interceptor-registry.js

@@ -0,0 +1,35 @@
+export class ToolInterceptorRegistry {
+    #interceptors = [];
+    #logger;
+    constructor(deps) {
+        this.#logger = deps.logger;
+    }
+    add(interceptor) {
+        this.#interceptors.push(interceptor);
+        return () => {
+            this.#interceptors = this.#interceptors.filter((i) => i !== interceptor);
+        };
+    }
+    async check(name, params, toolCallId) {
+        for (const interceptor of this.#interceptors) {
+            try {
+                const result = await interceptor(name, params, toolCallId);
+                if (result !== null) {
+                    return result;
+                }
+            }
+            catch (error) {
+                this.#logger.error('Tool interceptor threw an error', {
+                    name,
+                    params,
+                    toolCallId,
+                    error: error instanceof Error ? error.message : String(error),
+                    stack: error instanceof Error ? error.stack : undefined,
+                });
+                return `Tool execution intercepted but failed: ${error instanceof Error ? error.message : String(error)}`;
+            }
+        }
+        return null;
+    }
+}
+//# sourceMappingURL=tool-interceptor-registry.js.map

package/dist/lib/tool-interceptor-registry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-interceptor-registry.js","sourceRoot":"","sources":["../../source/lib/tool-interceptor-registry.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,uBAAuB;IAClC,aAAa,GAAsB,EAAE,CAAC;IACtC,OAAO,CAAkB;IAEzB,YAAY,IAAiC;QAC3C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC;IAC7B,CAAC;IAED,GAAG,CAAC,WAA4B;QAC9B,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACrC,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,WAAW,CAAC,CAAC;QAC3E,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,IAAY,EAAE,MAAe,EAAE,UAAmB;QAC5D,KAAK,MAAM,WAAW,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YAC7C,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;gBAC3D,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;oBACpB,OAAO,MAAM,CAAC;gBAChB,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,iCAAiC,EAAE;oBACpD,IAAI;oBACJ,MAAM;oBACN,UAAU;oBACV,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;oBAC7D,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;iBACxD,CAAC,CAAC;gBACH,OAAO,0CAA0C,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YAC5G,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}

package/dist/lib/tool-interceptor-registry.test.d.ts

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

package/dist/lib/tool-interceptor-registry.test.d.ts.map

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

package/dist/lib/tool-interceptor-registry.test.js

@@ -0,0 +1,108 @@
+import { it, expect } from 'vitest';
+import { ToolInterceptorRegistry } from './tool-interceptor-registry.js';
+const createMockLogger = () => ({
+    info: () => { },
+    warn: () => { },
+    error: () => { },
+    debug: () => { },
+    security: () => { },
+    setCorrelationId: () => { },
+    getCorrelationId: () => undefined,
+    clearCorrelationId: () => { },
+});
+it('add returns a removal function', () => {
+    const registry = new ToolInterceptorRegistry({ logger: createMockLogger() });
+    const remove = registry.add(async () => null);
+    expect(typeof remove).toBe('function');
+    remove();
+    expect(true).toBe(true);
+});
+it('check returns null when no interceptors registered', async () => {
+    const registry = new ToolInterceptorRegistry({ logger: createMockLogger() });
+    const result = await registry.check('some_tool', {});
+    expect(result).toBe(null);
+});
+it('check returns null when all interceptors return null', async () => {
+    const registry = new ToolInterceptorRegistry({ logger: createMockLogger() });
+    registry.add(async () => null);
+    registry.add(async () => null);
+    const result = await registry.check('some_tool', {});
+    expect(result).toBe(null);
+});
+it('check returns first non-null rejection', async () => {
+    const registry = new ToolInterceptorRegistry({ logger: createMockLogger() });
+    registry.add(async () => null);
+    registry.add(async () => 'second interceptor rejected');
+    const result = await registry.check('some_tool', {});
+    expect(result).toBe('second interceptor rejected');
+});
+it('check short-circuits on first rejection', async () => {
+    let secondCalled = false;
+    const registry = new ToolInterceptorRegistry({ logger: createMockLogger() });
+    registry.add(async () => 'first interceptor rejected');
+    registry.add(async () => {
+        secondCalled = true;
+        return 'second interceptor rejected';
+    });
+    const result = await registry.check('some_tool', {});
+    expect(result).toBe('first interceptor rejected');
+    expect(secondCalled).toBe(false);
+});
+it('check catches thrown errors and returns error message', async () => {
+    const registry = new ToolInterceptorRegistry({ logger: createMockLogger() });
+    registry.add(async () => {
+        throw new Error('something went wrong');
+    });
+    const result = await registry.check('some_tool', {});
+    expect(result).toBeTruthy();
+    expect(result.includes('something went wrong')).toBe(true);
+});
+it('check logs errors from interceptors', async () => {
+    let loggedMessage = '';
+    let loggedMeta = null;
+    const logger = {
+        info: () => { },
+        warn: () => { },
+        debug: () => { },
+        security: () => { },
+        setCorrelationId: () => { },
+        getCorrelationId: () => undefined,
+        clearCorrelationId: () => { },
+        error: (message, meta) => {
+            loggedMessage = message;
+            loggedMeta = meta;
+        },
+    };
+    const registry = new ToolInterceptorRegistry({ logger });
+    registry.add(async () => {
+        throw new Error('boom');
+    });
+    await registry.check('some_tool', { foo: 'bar' }, 'call-123');
+    expect(loggedMessage).toBe('Tool interceptor threw an error');
+    expect(loggedMeta?.name).toBe('some_tool');
+    expect(loggedMeta?.toolCallId).toBe('call-123');
+    expect(loggedMeta?.error).toBe('boom');
+});
+it('removed interceptor is no longer called', async () => {
+    let callCount = 0;
+    const registry = new ToolInterceptorRegistry({ logger: createMockLogger() });
+    const interceptor = async () => {
+        callCount++;
+        return null;
+    };
+    const remove = registry.add(interceptor);
+    remove();
+    await registry.check('some_tool', {});
+    expect(callCount).toBe(0);
+});
+it('check passes toolCallId to interceptors', async () => {
+    let capturedToolCallId;
+    const registry = new ToolInterceptorRegistry({ logger: createMockLogger() });
+    registry.add(async (_name, _params, toolCallId) => {
+        capturedToolCallId = toolCallId;
+        return null;
+    });
+    await registry.check('some_tool', {}, 'tool-call-42');
+    expect(capturedToolCallId).toBe('tool-call-42');
+});
+//# sourceMappingURL=tool-interceptor-registry.test.js.map

package/dist/lib/tool-interceptor-registry.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-interceptor-registry.test.js","sourceRoot":"","sources":["../../source/lib/tool-interceptor-registry.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAGzE,MAAM,gBAAgB,GAAG,GAAoB,EAAE,CAAC,CAAC;IAC/C,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;IACd,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;IACd,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;IACf,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;IACf,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC;IAClB,gBAAgB,EAAE,GAAG,EAAE,GAAE,CAAC;IAC1B,gBAAgB,EAAE,GAAG,EAAE,CAAC,SAAS;IACjC,kBAAkB,EAAE,GAAG,EAAE,GAAE,CAAC;CAC7B,CAAC,CAAC;AAEH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;IACxC,MAAM,QAAQ,GAAG,IAAI,uBAAuB,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAAE,CAAC,CAAC;IAC7E,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,CAAC,OAAO,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACvC,MAAM,EAAE,CAAC;IACT,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;IAClE,MAAM,QAAQ,GAAG,IAAI,uBAAuB,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAAE,CAAC,CAAC;IAC7E,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IACrD,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;IACpE,MAAM,QAAQ,GAAG,IAAI,uBAAuB,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAAE,CAAC,CAAC;IAC7E,QAAQ,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC;IAC/B,QAAQ,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC;IAC/B,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IACrD,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;IACtD,MAAM,QAAQ,GAAG,IAAI,uBAAuB,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAAE,CAAC,CAAC;IAC7E,QAAQ,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC;IAC/B,QAAQ,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,6BAA6B,CAAC,CAAC;IACxD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IACrD,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;AACrD,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;IACvD,IAAI,YAAY,GAAG,KAAK,CAAC;IACzB,MAAM,QAAQ,GAAG,IAAI,uBAAuB,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAAE,CAAC,CAAC;IAC7E,QAAQ,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,4BAA4B,CAAC,CAAC;IACvD,QAAQ,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;QACtB,YAAY,GAAG,IAAI,CAAC;QACpB,OAAO,6BAA6B,CAAC;IACvC,CAAC,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IACrD,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;IAClD,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;IACrE,MAAM,QAAQ,GAAG,IAAI,uBAAuB,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAAE,CAAC,CAAC;IAC7E,QAAQ,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;QACtB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IACrD,MAAM,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,CAAC;IAC5B,MAAM,CAAC,MAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC9D,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;IACnD,IAAI,aAAa,GAAG,EAAE,CAAC;IACvB,IAAI,UAAU,GAAQ,IAAI,CAAC;IAC3B,MAAM,MAAM,GAAoB;QAC9B,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;QACd,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;QACd,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;QACf,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC;QAClB,gBAAgB,EAAE,GAAG,EAAE,GAAE,CAAC;QAC1B,gBAAgB,EAAE,GAAG,EAAE,CAAC,SAAS;QACjC,kBAAkB,EAAE,GAAG,EAAE,GAAE,CAAC;QAC5B,KAAK,EAAE,CAAC,OAAe,EAAE,IAAU,EAAE,EAAE;YACrC,aAAa,GAAG,OAAO,CAAC;YACxB,UAAU,GAAG,IAAI,CAAC;QACpB,CAAC;KACF,CAAC;IACF,MAAM,QAAQ,GAAG,IAAI,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IACzD,QAAQ,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;QACtB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;IACH,MAAM,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,UAAU,CAAC,CAAC;IAC9D,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;IAC9D,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC3C,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAChD,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACzC,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;IACvD,IAAI,SAAS,GAAG,CAAC,CAAC;IAClB,MAAM,QAAQ,GAAG,IAAI,uBAAuB,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAAE,CAAC,CAAC;IAC7E,MAAM,WAAW,GAAG,KAAK,IAAI,EAAE;QAC7B,SAAS,EAAE,CAAC;QACZ,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IACF,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACzC,MAAM,EAAE,CAAC;IACT,MAAM,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IACtC,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAC5B,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;IACvD,IAAI,kBAAsC,CAAC;IAC3C,MAAM,QAAQ,GAAG,IAAI,uBAAuB,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAAE,CAAC,CAAC;IAC7E,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE;QAChD,kBAAkB,GAAG,UAAU,CAAC;QAChC,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IACH,MAAM,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,EAAE,cAAc,CAAC,CAAC;IACtD,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;AAClD,CAAC,CAAC,CAAC"}

package/dist/lib/tool-invoke.d.ts

@@ -24,7 +24,8 @@ export declare const repairJson: (text: string) => string;
  * Skips non-object / null inputs and returns them unchanged.
  */
 export declare const normalizeObjectParams: (params: unknown, schema?: z.ZodTypeAny) => unknown;
-export declare const normalizeToolInput: (input: unknown, schema?: z.ZodTypeAny) => string;
+type ToolInputNormalizationMode = 'repair' | 'strict';
+export declare const normalizeToolInput: (input: unknown, schema?: z.ZodTypeAny, mode?: ToolInputNormalizationMode) => string;
 /**
  * Detects the SDK's schema-validation error (thrown by `tool()` when the
  * incoming arguments fail to parse) across SDK versions / bundlers that may
@@ -42,5 +43,40 @@ export declare const isInvalidToolInputError: (error: any) => boolean;
  * (mirroring the SDK's default behavior) so the runner stays stable.
  */
 export declare const toolErrorFunction: (_context: unknown, error: unknown) => string;
-export declare const wrapToolInvoke: <T extends Tool>(tool: T, originalSchema?: z.ZodTypeAny) => T;
+export declare const wrapToolInvoke: <T extends Tool>(tool: T, originalSchema?: z.ZodTypeAny, options?: {
+    argumentParsing?: ToolInputNormalizationMode;
+}) => T;
+/**
+ * Wraps a tool definition's needsApproval so that structurally invalid params
+ * (those that fail Zod schema validation) never trigger an approval prompt.
+ * The tool's execute will receive those params and return a structured error.
+ *
+ * Params are normalised using schema-aware coercion before validation:
+ *  1. Null sentinels (null, "null", "None", "") on optional fields → omitted
+ *  2. Boolean strings ("true"/"false") on boolean fields → true/false
+ *  3. Stringified JSON arrays/objects on typed fields → parsed values
+ *
+ * This handles the OpenAI strict-schema convention where omitted optional fields
+ * arrive as null, as well as models that stringify structured parameters.
+ */
+export declare function wrapNeedsApproval(definition: {
+    name?: string;
+    parameters: {
+        safeParse: (v: unknown) => {
+            success: boolean;
+        };
+    };
+    needsApproval: (params: unknown, context?: unknown) => Promise<boolean> | boolean;
+}, options?: {
+    checkInterceptors?: (params: unknown) => Promise<string | null>;
+    toolName?: string;
+    registry?: {
+        register: (registration: {
+            toolName: string;
+            parameters?: unknown;
+            needsApproval: (params: unknown, context?: unknown) => Promise<boolean> | boolean;
+        }) => void;
+    };
+}): (context: unknown, params: unknown) => Promise<boolean>;
+export {};
 //# sourceMappingURL=tool-invoke.d.ts.map

package/dist/lib/tool-invoke.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-invoke.d.ts","sourceRoot":"","sources":["../../source/lib/tool-invoke.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAgB,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAwExB;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,KAAG,MA2DzC,CAAC;AAkDF;;;;;;;;GAQG;AACH,eAAO,MAAM,qBAAqB,GAAI,QAAQ,OAAO,EAAE,SAAS,CAAC,CAAC,UAAU,KAAG,OAgF9E,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,OAAO,OAAO,EAAE,SAAS,CAAC,CAAC,UAAU,KAAG,MA4B1E,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,GAAI,OAAO,GAAG,KAAG,OAIpD,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,iBAAiB,GAAI,UAAU,OAAO,EAAE,OAAO,OAAO,KAAG,MAMrE,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,IAAI,EAAE,MAAM,CAAC,EAAE,iBAAiB,CAAC,CAAC,UAAU,KAAG,CA8DvF,CAAC"}
+{"version":3,"file":"tool-invoke.d.ts","sourceRoot":"","sources":["../../source/lib/tool-invoke.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAgB,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAyExB;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,KAAG,MA2DzC,CAAC;AAkDF;;;;;;;;GAQG;AACH,eAAO,MAAM,qBAAqB,GAAI,QAAQ,OAAO,EAAE,SAAS,CAAC,CAAC,UAAU,KAAG,OAgF9E,CAAC;AAEF,KAAK,0BAA0B,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAEtD,eAAO,MAAM,kBAAkB,GAC7B,OAAO,OAAO,EACd,SAAS,CAAC,CAAC,UAAU,EACrB,OAAM,0BAAqC,KAC1C,MA4BF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,GAAI,OAAO,GAAG,KAAG,OAIpD,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,iBAAiB,GAAI,UAAU,OAAO,EAAE,OAAO,OAAO,KAAG,MASrE,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,IAAI,EAC3C,MAAM,CAAC,EACP,iBAAiB,CAAC,CAAC,UAAU,EAC7B,UAAS;IAAE,eAAe,CAAC,EAAE,0BAA0B,CAAA;CAAO,KAC7D,CA8DF,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE;IACV,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,EAAE;QAAE,SAAS,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK;YAAE,OAAO,EAAE,OAAO,CAAA;SAAE,CAAA;KAAE,CAAC;IAChE,aAAa,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;CACnF,EACD,OAAO,CAAC,EAAE;IAGR,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAChE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE;QACT,QAAQ,EAAE,CAAC,YAAY,EAAE;YACvB,QAAQ,EAAE,MAAM,CAAC;YACjB,UAAU,CAAC,EAAE,OAAO,CAAC;YACrB,aAAa,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;SACnF,KAAK,IAAI,CAAC;KACZ,CAAC;CACH,GACA,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CAuDzD"}