@qduc/term2 0.1.7 → 0.2.0

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

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

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

@@ -1,4 +1,17 @@
 import type { Tool } from '@openai/agents';
+/**
+ * Heuristic-based JSON repair for common model-generated errors.
+ *
+ * Fixes applied (in order):
+ * 1. Strip markdown code fences (```json ... ```)
+ * 2. Extract JSON object/array from surrounding prose
+ * 3. Escape unescaped double-quotes inside JSON string values
+ * 4. Remove trailing commas before closing braces/brackets
+ *
+ * IMPORTANT: Only runs the repair heuristics when `JSON.parse` fails on the
+ * input, so already-valid JSON is never modified.
+ */
+export declare const repairJson: (text: string) => string;
 export declare const normalizeToolInput: (input: unknown) => string;
 export declare const wrapToolInvoke: <T extends Tool>(tool: T) => T;
 //# 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;AAEzD,eAAO,MAAM,kBAAkB,GAAI,OAAO,OAAO,KAAG,MAWnD,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,IAAI,EAAE,MAAM,CAAC,KAAG,CAcxD,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;AAQzD;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,KAAG,MA6CzC,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,OAAO,OAAO,KAAG,MAWnD,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,IAAI,EAAE,MAAM,CAAC,KAAG,CAcxD,CAAC"}

package/dist/lib/tool-invoke.js

@@ -1,13 +1,71 @@
+/**
+ * Maximum payload size (in characters) for which JSON repair is attempted.
+ * Very large payloads are returned as-is to avoid regex backtracking costs.
+ */
+const MAX_REPAIR_LENGTH = 200_000;
+/**
+ * Heuristic-based JSON repair for common model-generated errors.
+ *
+ * Fixes applied (in order):
+ * 1. Strip markdown code fences (```json ... ```)
+ * 2. Extract JSON object/array from surrounding prose
+ * 3. Escape unescaped double-quotes inside JSON string values
+ * 4. Remove trailing commas before closing braces/brackets
+ *
+ * IMPORTANT: Only runs the repair heuristics when `JSON.parse` fails on the
+ * input, so already-valid JSON is never modified.
+ */
+export const repairJson = (text) => {
+    if (!text || text.trim() === '')
+        return text;
+    // Skip repair for very large payloads to avoid regex backtracking
+    if (text.length > MAX_REPAIR_LENGTH)
+        return text;
+    // Don't repair already-valid JSON – avoids corrupting valid input
+    try {
+        JSON.parse(text);
+        return text;
+    }
+    catch {
+        // Fall through to repair logic
+    }
+    let repaired = text;
+    // 1. Strip markdown code fences (```json ... ```)
+    repaired = repaired.replace(/^```(?:json)?\s*\n?/gm, '').replace(/\n?```\s*$/gm, '');
+    // 2. Extract JSON object/array from surrounding prose
+    const jsonMatch = repaired.match(/(\{[\s\S]*\}|\[[\s\S]*\])/);
+    if (jsonMatch) {
+        repaired = jsonMatch[1];
+    }
+    // Check again after stripping – the cleaned text may already be valid
+    try {
+        JSON.parse(repaired);
+        return repaired;
+    }
+    catch {
+        // Continue with deeper repairs
+    }
+    // 3. Fix unescaped double quotes inside values.
+    // Logic: find content between : " and "[,}] and escape only the quotes *inside* that content.
+    repaired = repaired.replace(/(:\s*")([\s\S]*?)("(?=\s*[,}\]]))/g, (_match, prefix, content, suffix) => {
+        // Escape unescaped double quotes (quotes not preceded by a backslash)
+        const escapedContent = content.replace(/(?<!\\)"/g, '\\"');
+        return prefix + escapedContent + suffix;
+    });
+    // 4. Fix trailing commas in objects/arrays
+    repaired = repaired.replace(/,(\s*[}\]])/g, '$1');
+    return repaired;
+};
 export const normalizeToolInput = (input) => {
     if (typeof input === 'string') {
-        return input;
+        return repairJson(input);
     }
     try {
         const serialized = JSON.stringify(input);
-        return typeof serialized === 'string' ? serialized : '';
+        return typeof serialized === 'string' ? serialized : '{}';
     }
     catch {
-        return '';
+        return '{}';
     }
 };
 export const wrapToolInvoke = (tool) => {

package/dist/lib/tool-invoke.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-invoke.js","sourceRoot":"","sources":["../../source/lib/tool-invoke.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,KAAc,EAAU,EAAE;IAC3D,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACzC,OAAO,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAiB,IAAO,EAAK,EAAE;IAC3D,yCAAyC;IACzC,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,YAAY,GAAG,IAAoB,CAAC;IAC1C,MAAM,cAAc,GAAG,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC9D,YAAY,CAAC,MAAM,GAAG,KAAK,EAAE,OAAY,EAAE,KAAc,EAAE,OAAY,EAAE,EAAE;QACzE,MAAM,eAAe,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAClD,OAAO,cAAc,CAAC,OAAO,EAAE,eAAe,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC,CAAC;IAEF,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}
+{"version":3,"file":"tool-invoke.js","sourceRoot":"","sources":["../../source/lib/tool-invoke.ts"],"names":[],"mappings":"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"}

package/dist/lib/tool-invoke.test.js

@@ -1,7 +1,145 @@
 import test from 'ava';
 import { tool as createTool } from '@openai/agents';
 import { z } from 'zod';
-import { wrapToolInvoke } from './tool-invoke.js';
+import { repairJson, normalizeToolInput, wrapToolInvoke } from './tool-invoke.js';
+// ---------------------------------------------------------------------------
+// repairJson – pass-through for valid / empty input
+// ---------------------------------------------------------------------------
+test('repairJson returns empty string as-is', (t) => {
+    t.is(repairJson(''), '');
+});
+test('repairJson returns whitespace-only string as-is', (t) => {
+    t.is(repairJson('   '), '   ');
+});
+test('repairJson returns null/undefined input as-is', (t) => {
+    // @ts-expect-error – testing runtime guard
+    t.is(repairJson(null), null);
+    // @ts-expect-error – testing runtime guard
+    t.is(repairJson(undefined), undefined);
+});
+test('repairJson does not modify already-valid JSON', (t) => {
+    const valid = '{"key": "value", "nested": {"a": 1}}';
+    t.is(repairJson(valid), valid);
+});
+test('repairJson does not modify valid JSON with escaped quotes', (t) => {
+    const valid = '{"key": "value with \\"escaped\\" quotes"}';
+    t.is(repairJson(valid), valid);
+});
+test('repairJson does not modify valid JSON arrays', (t) => {
+    const valid = '[1, 2, {"a": "b"}]';
+    t.is(repairJson(valid), valid);
+});
+// ---------------------------------------------------------------------------
+// repairJson – unescaped double quotes inside values
+// ---------------------------------------------------------------------------
+test('repairJson fixes unescaped double quotes in a single value', (t) => {
+    const broken = '{"search_content": "No results for "searchQuery" found"}';
+    const result = repairJson(broken);
+    t.notThrows(() => JSON.parse(result));
+    const parsed = JSON.parse(result);
+    t.is(parsed.search_content, 'No results for "searchQuery" found');
+});
+test('repairJson fixes unescaped quotes across multiple keys', (t) => {
+    const broken = '{"a": "he said "hi"", "b": "ok"}';
+    const result = repairJson(broken);
+    t.notThrows(() => JSON.parse(result));
+});
+// ---------------------------------------------------------------------------
+// repairJson – trailing commas
+// ---------------------------------------------------------------------------
+test('repairJson removes trailing comma in object', (t) => {
+    const broken = '{"a": 1, "b": 2,}';
+    const result = repairJson(broken);
+    t.notThrows(() => JSON.parse(result));
+    t.deepEqual(JSON.parse(result), { a: 1, b: 2 });
+});
+test('repairJson removes trailing comma in array', (t) => {
+    const broken = '[1, 2, 3,]';
+    const result = repairJson(broken);
+    t.notThrows(() => JSON.parse(result));
+    t.deepEqual(JSON.parse(result), [1, 2, 3]);
+});
+// ---------------------------------------------------------------------------
+// repairJson – markdown code fences
+// ---------------------------------------------------------------------------
+test('repairJson strips ```json code fences', (t) => {
+    const broken = '```json\n{"command": "ls"}\n```';
+    const result = repairJson(broken);
+    t.notThrows(() => JSON.parse(result));
+    t.deepEqual(JSON.parse(result), { command: 'ls' });
+});
+test('repairJson strips ``` code fences without language tag', (t) => {
+    const broken = '```\n{"command": "ls"}\n```';
+    const result = repairJson(broken);
+    t.notThrows(() => JSON.parse(result));
+    t.deepEqual(JSON.parse(result), { command: 'ls' });
+});
+// ---------------------------------------------------------------------------
+// repairJson – JSON extraction from surrounding prose
+// ---------------------------------------------------------------------------
+test('repairJson extracts JSON from surrounding text', (t) => {
+    const broken = 'Sure! Here is the tool call:\n{"command": "ls -la"}\nLet me know if you need anything else.';
+    const result = repairJson(broken);
+    t.notThrows(() => JSON.parse(result));
+    t.deepEqual(JSON.parse(result), { command: 'ls -la' });
+});
+test('repairJson extracts JSON array from surrounding text', (t) => {
+    const broken = 'The result is: [1, 2, 3] as expected.';
+    const result = repairJson(broken);
+    t.notThrows(() => JSON.parse(result));
+    t.deepEqual(JSON.parse(result), [1, 2, 3]);
+});
+// ---------------------------------------------------------------------------
+// repairJson – combined fixes
+// ---------------------------------------------------------------------------
+test('repairJson handles markdown fence + trailing comma', (t) => {
+    const broken = '```json\n{"a": 1, "b": 2,}\n```';
+    const result = repairJson(broken);
+    t.notThrows(() => JSON.parse(result));
+    t.deepEqual(JSON.parse(result), { a: 1, b: 2 });
+});
+test('repairJson handles prose + unescaped quotes', (t) => {
+    const broken = 'Here you go: {"content": "No results for "query" found"}';
+    const result = repairJson(broken);
+    t.notThrows(() => JSON.parse(result));
+    const parsed = JSON.parse(result);
+    t.is(parsed.content, 'No results for "query" found');
+});
+// ---------------------------------------------------------------------------
+// repairJson – size guard
+// ---------------------------------------------------------------------------
+test('repairJson skips repair for payloads exceeding max length', (t) => {
+    // Create a broken JSON string that's very large
+    const bigContent = 'x'.repeat(200_001);
+    const broken = `{"key": "${bigContent}"}`;
+    // Should return as-is without attempting repair
+    t.is(repairJson(broken), broken);
+});
+// ---------------------------------------------------------------------------
+// normalizeToolInput
+// ---------------------------------------------------------------------------
+test('normalizeToolInput returns repaired JSON for string input', (t) => {
+    const broken = '{"key": "bad "quote" here"}';
+    const result = normalizeToolInput(broken);
+    t.notThrows(() => JSON.parse(result));
+});
+test('normalizeToolInput stringifies object input', (t) => {
+    const result = normalizeToolInput({ a: 1 });
+    t.is(result, '{"a":1}');
+});
+test('normalizeToolInput returns {} for un-serializable input', (t) => {
+    const circular = {};
+    circular.self = circular;
+    const result = normalizeToolInput(circular);
+    t.is(result, '{}');
+});
+test('normalizeToolInput passes through valid JSON strings', (t) => {
+    const valid = '{"key": "value"}';
+    t.is(normalizeToolInput(valid), valid);
+});
+// ---------------------------------------------------------------------------
+// wrapToolInvoke
+// ---------------------------------------------------------------------------
 test('wrapToolInvoke stringifies object inputs for tool invocations', async (t) => {
     const rawTool = createTool({
         name: 'echo_tool',

package/dist/lib/tool-invoke.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-invoke.test.js","sourceRoot":"","sources":["../../source/lib/tool-invoke.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EAAE,IAAI,IAAI,UAAU,EAAc,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,IAAI,CAAC,+DAA+D,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAChF,MAAM,OAAO,GAAG,UAAU,CAAC;QACzB,IAAI,EAAE,WAAW;QACjB,WAAW,EAAE,yCAAyC;QACtD,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC;YACnB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;SAClB,CAAC;QACF,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,MAAM,CAAC,KAAK,EAAE;KAChD,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IAC5C,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,EAAgB,EAAE,gBAAgB,CAAC,CAAC;IAE5E,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AACxB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"tool-invoke.test.js","sourceRoot":"","sources":["../../source/lib/tool-invoke.test.ts"],"names":[],"mappings":"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"}

package/dist/lib/tool-selection-policy.d.ts

@@ -0,0 +1,14 @@
+import type { ProviderDefinition } from '../providers/registry.js';
+type ProviderCapabilities = ProviderDefinition['capabilities'];
+export declare function shouldPreferPatchEditingModel(model: string): boolean;
+export declare function shouldUseNativePatchTool({ providerId, model, capabilities, }: {
+    providerId: string;
+    model: string;
+    capabilities?: ProviderCapabilities;
+}): boolean;
+export declare function shouldUseStrictToolSchema({ providerId, capabilities, }: {
+    providerId: string;
+    capabilities?: ProviderCapabilities;
+}): boolean;
+export {};
+//# sourceMappingURL=tool-selection-policy.d.ts.map

package/dist/lib/tool-selection-policy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-selection-policy.d.ts","sourceRoot":"","sources":["../../source/lib/tool-selection-policy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAEnE,KAAK,oBAAoB,GAAG,kBAAkB,CAAC,cAAc,CAAC,CAAC;AAE/D,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAEpE;AAED,wBAAgB,wBAAwB,CAAC,EACvC,UAAU,EACV,KAAK,EACL,YAAY,GACb,EAAE;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,oBAAoB,CAAC;CACrC,GAAG,OAAO,CAOV;AAED,wBAAgB,yBAAyB,CAAC,EACxC,UAAU,EACV,YAAY,GACb,EAAE;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,oBAAoB,CAAC;CACrC,GAAG,OAAO,CAMV"}

package/dist/lib/tool-selection-policy.js

@@ -0,0 +1,17 @@
+export function shouldPreferPatchEditingModel(model) {
+    return model.toLowerCase().includes('gpt-5');
+}
+export function shouldUseNativePatchTool({ providerId, model, capabilities, }) {
+    const modelPrefixes = capabilities?.nativePatchModelPrefixes;
+    if (modelPrefixes && modelPrefixes.length > 0) {
+        return modelPrefixes.some((prefix) => model.startsWith(prefix));
+    }
+    return providerId === 'openai' && model.startsWith('gpt-5.1');
+}
+export function shouldUseStrictToolSchema({ providerId, capabilities, }) {
+    if (capabilities?.usesStrictToolSchema !== undefined) {
+        return capabilities.usesStrictToolSchema;
+    }
+    return providerId === 'openai';
+}
+//# sourceMappingURL=tool-selection-policy.js.map

package/dist/lib/tool-selection-policy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-selection-policy.js","sourceRoot":"","sources":["../../source/lib/tool-selection-policy.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,6BAA6B,CAAC,KAAa;IACzD,OAAO,KAAK,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,EACvC,UAAU,EACV,KAAK,EACL,YAAY,GAKb;IACC,MAAM,aAAa,GAAG,YAAY,EAAE,wBAAwB,CAAC;IAC7D,IAAI,aAAa,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9C,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;IAClE,CAAC;IAED,OAAO,UAAU,KAAK,QAAQ,IAAI,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;AAChE,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,EACxC,UAAU,EACV,YAAY,GAIb;IACC,IAAI,YAAY,EAAE,oBAAoB,KAAK,SAAS,EAAE,CAAC;QACrD,OAAO,YAAY,CAAC,oBAAoB,CAAC;IAC3C,CAAC;IAED,OAAO,UAAU,KAAK,QAAQ,CAAC;AACjC,CAAC"}

package/dist/lib/tool-selection-policy.test.d.ts

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

package/dist/lib/tool-selection-policy.test.d.ts.map

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

package/dist/lib/tool-selection-policy.test.js

@@ -0,0 +1,69 @@
+import test from 'ava';
+import { shouldPreferPatchEditingModel, shouldUseNativePatchTool, shouldUseStrictToolSchema, } from './tool-selection-policy.js';
+test('shouldPreferPatchEditingModel returns true for gpt-5 models', (t) => {
+    t.true(shouldPreferPatchEditingModel('gpt-5'));
+    t.true(shouldPreferPatchEditingModel('gpt-5.1'));
+    t.true(shouldPreferPatchEditingModel('GPT-5-mini'));
+});
+test('shouldPreferPatchEditingModel returns false for non gpt-5 models', (t) => {
+    t.false(shouldPreferPatchEditingModel('gpt-4.1'));
+    t.false(shouldPreferPatchEditingModel('claude-3.7-sonnet'));
+});
+test('shouldUseNativePatchTool returns true for OpenAI gpt-5.1 models', (t) => {
+    t.true(shouldUseNativePatchTool({
+        providerId: 'openai',
+        model: 'gpt-5.1',
+    }));
+});
+test('shouldUseNativePatchTool returns false for OpenAI non-5.1 models', (t) => {
+    t.false(shouldUseNativePatchTool({
+        providerId: 'openai',
+        model: 'gpt-5',
+    }));
+});
+test('shouldUseNativePatchTool returns false for non-OpenAI providers', (t) => {
+    t.false(shouldUseNativePatchTool({
+        providerId: 'openrouter',
+        model: 'gpt-5.1',
+    }));
+});
+test('shouldUseNativePatchTool honors provider model prefix capability', (t) => {
+    t.true(shouldUseNativePatchTool({
+        providerId: 'custom-provider',
+        model: 'custom-editor-v2',
+        capabilities: {
+            supportsConversationChaining: false,
+            supportsTracingControl: false,
+            nativePatchModelPrefixes: ['custom-editor'],
+        },
+    }));
+});
+test('shouldUseStrictToolSchema returns true for OpenAI provider', (t) => {
+    t.true(shouldUseStrictToolSchema({
+        providerId: 'openai',
+    }));
+});
+test('shouldUseStrictToolSchema honors explicit provider capability', (t) => {
+    t.false(shouldUseStrictToolSchema({
+        providerId: 'openai',
+        capabilities: {
+            supportsConversationChaining: true,
+            supportsTracingControl: true,
+            usesStrictToolSchema: false,
+        },
+    }));
+    t.true(shouldUseStrictToolSchema({
+        providerId: 'custom-provider',
+        capabilities: {
+            supportsConversationChaining: false,
+            supportsTracingControl: false,
+            usesStrictToolSchema: true,
+        },
+    }));
+});
+test('shouldUseStrictToolSchema returns false for non-OpenAI provider', (t) => {
+    t.false(shouldUseStrictToolSchema({
+        providerId: 'openrouter',
+    }));
+});
+//# sourceMappingURL=tool-selection-policy.test.js.map

package/dist/lib/tool-selection-policy.test.js.map

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

package/dist/prompts/simple.md

@@ -107,6 +107,10 @@ Modify files with exact text replacement.
 - Include surrounding context (whitespace, indentation) for accuracy
 - `replace_all: true` updates all occurrences; `false` expects single match
 - For large replacements, include 3+ lines of context
+- Use `<...>` on its own line in `search_content` to skip unchanged middle content (gap matching)
+  - Saves tokens: provide only the head and tail anchors, omit the middle
+  - Example: `"function foo() {\n<...>\nreturn result;\n}"` matches from head to tail
+  - `replace_content` is always the full replacement text (no `<...>` marker)
 
 ## grep
 

package/dist/providers/index.d.ts

@@ -1,5 +1,5 @@
 import './openai.provider.js';
 import './openrouter.provider.js';
 import './web-search/index.js';
-export { registerProvider, upsertProvider, getProvider, getAllProviders, getProviderIds, type ProviderDefinition, } from './registry.js';
+export { registerProvider, upsertProvider, unregisterProvider, getProvider, getAllProviders, getProviderIds, type ProviderDefinition, } from './registry.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/providers/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../source/providers/index.ts"],"names":[],"mappings":"AACA,OAAO,sBAAsB,CAAC;AAC9B,OAAO,0BAA0B,CAAC;AAGlC,OAAO,uBAAuB,CAAC;AAG/B,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,WAAW,EACX,eAAe,EACf,cAAc,EACd,KAAK,kBAAkB,GACxB,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../source/providers/index.ts"],"names":[],"mappings":"AACA,OAAO,sBAAsB,CAAC;AAC9B,OAAO,0BAA0B,CAAC;AAGlC,OAAO,uBAAuB,CAAC;AAG/B,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,kBAAkB,EAClB,WAAW,EACX,eAAe,EACf,cAAc,EACd,KAAK,kBAAkB,GACxB,MAAM,eAAe,CAAC"}

package/dist/providers/index.js

@@ -4,5 +4,5 @@ import './openrouter.provider.js';
 // Import web search provider registration
 import './web-search/index.js';
 // Re-export registry API and types
-export { registerProvider, upsertProvider, getProvider, getAllProviders, getProviderIds, } from './registry.js';
+export { registerProvider, upsertProvider, unregisterProvider, getProvider, getAllProviders, getProviderIds, } from './registry.js';
 //# sourceMappingURL=index.js.map

package/dist/providers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../source/providers/index.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,OAAO,sBAAsB,CAAC;AAC9B,OAAO,0BAA0B,CAAC;AAElC,0CAA0C;AAC1C,OAAO,uBAAuB,CAAC;AAE/B,mCAAmC;AACnC,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,WAAW,EACX,eAAe,EACf,cAAc,GAEf,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../source/providers/index.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,OAAO,sBAAsB,CAAC;AAC9B,OAAO,0BAA0B,CAAC;AAElC,0CAA0C;AAC1C,OAAO,uBAAuB,CAAC;AAE/B,mCAAmC;AACnC,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,kBAAkB,EAClB,WAAW,EACX,eAAe,EACf,cAAc,GAEf,MAAM,eAAe,CAAC"}

package/dist/providers/openai-compatible/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../source/providers/openai-compatible/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,YAAY,EAAE,KAAK,aAAa,EAAE,KAAK,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAElH,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AAK9F,qBAAa,qBAAsB,YAAW,KAAK;;IACjD,IAAI,EAAE,MAAM,CAAC;gBASD,IAAI,EAAE;QAChB,eAAe,EAAE,gBAAgB,CAAC;QAClC,cAAc,EAAE,eAAe,CAAC;QAChC,UAAU,EAAE,MAAM,CAAC;QACnB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB;IAUK,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC;IAsHzD,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,aAAa,CAAC,mBAAmB,CAAC;CAuUtF"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../source/providers/openai-compatible/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,YAAY,EAAE,KAAK,aAAa,EAAE,KAAK,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAElH,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AAK9F,qBAAa,qBAAsB,YAAW,KAAK;;IACjD,IAAI,EAAE,MAAM,CAAC;gBASD,IAAI,EAAE;QAChB,eAAe,EAAE,gBAAgB,CAAC;QAClC,cAAc,EAAE,eAAe,CAAC;QAChC,UAAU,EAAE,MAAM,CAAC;QACnB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB;IAUK,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC;IAqJzD,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,aAAa,CAAC,mBAAmB,CAAC;CA2WtF"}

package/dist/providers/openai-compatible/model.js

@@ -23,6 +23,13 @@ export class OpenAICompatibleModel {
         const resolvedModelId = this.#resolveModelFromRequest(request) || this.#modelId;
         const messages = buildMessagesFromRequest(request, resolvedModelId, this.#loggingService);
         const tools = extractFunctionToolsFromRequest(request);
+        this.#loggingService.debug('OpenAI-compatible response start', {
+            provider: this.#providerId,
+            messageCount: Array.isArray(messages) ? messages.length : 0,
+            messages,
+            toolsCount: Array.isArray(tools) ? tools.length : 0,
+            tools,
+        });
         const res = await callOpenAICompatibleChatCompletions({
             baseUrl: this.#baseUrl,
             apiKey: this.#apiKey,
@@ -39,7 +46,8 @@ export class OpenAICompatibleModel {
         const textContent = typeof contentFromChoice === 'string' ? contentFromChoice : JSON.stringify(contentFromChoice);
         const responseId = json?.id ?? randomUUID();
         const usage = normalizeUsage(json?.usage || {});
-        const reasoning = choice?.message?.reasoning || choice?.message?.reasoning_content;
+        const reasoningContent = choice?.message?.reasoning_content;
+        const reasoning = choice?.message?.reasoning;
         const reasoningDetails = choice?.message?.reasoning_details;
         const toolCalls = choice?.message?.tool_calls;
         // Log raw tool calls from API response
@@ -86,7 +94,16 @@ export class OpenAICompatibleModel {
                 output.push(outputItem);
             }
         }
-        if (textContent) {
+        const hasTextContent = textContent.length > 0;
+        const hasToolCalls = Array.isArray(toolCalls) && toolCalls.length > 0;
+        const shouldAddFallbackMessage = !hasTextContent && !hasToolCalls;
+        const assistantText = hasTextContent ? textContent : shouldAddFallbackMessage ? 'No response from model.' : '';
+        this.#loggingService.debug('OpenAI-compatible response done', {
+            text: assistantText,
+            reasoningDetails,
+            toolCalls,
+        });
+        if (hasTextContent || shouldAddFallbackMessage) {
             output.push({
                 type: 'message',
                 role: 'assistant',
@@ -94,11 +111,17 @@ export class OpenAICompatibleModel {
                 content: [
                     {
                         type: 'output_text',
-                        text: textContent,
+                        text: assistantText,
                     },
                 ],
                 ...(typeof reasoning === 'string' ? { reasoning } : {}),
+                ...(typeof reasoningContent === 'string' ? { reasoning_content: reasoningContent } : {}),
                 ...(reasoningDetails != null ? { reasoning_details: reasoningDetails } : {}),
+                providerData: {
+                    ...(typeof reasoning === 'string' ? { reasoning } : {}),
+                    ...(typeof reasoningContent === 'string' ? { reasoning_content: reasoningContent } : {}),
+                    ...(reasoningDetails != null ? { reasoning_details: reasoningDetails } : {}),
+                },
             });
         }
         // Non-streaming tool calls: OpenAI-style nested function object.
@@ -113,7 +136,13 @@ export class OpenAICompatibleModel {
                         arguments: decodedArgs,
                         status: 'completed',
                         ...(typeof reasoning === 'string' ? { reasoning } : {}),
+                        ...(typeof reasoningContent === 'string' ? { reasoning_content: reasoningContent } : {}),
                         ...(reasoningDetails != null ? { reasoning_details: reasoningDetails } : {}),
+                        providerData: {
+                            ...(typeof reasoning === 'string' ? { reasoning } : {}),
+                            ...(typeof reasoningContent === 'string' ? { reasoning_content: reasoningContent } : {}),
+                            ...(reasoningDetails != null ? { reasoning_details: reasoningDetails } : {}),
+                        },
                     });
                 }
             }
@@ -132,8 +161,9 @@ export class OpenAICompatibleModel {
         this.#loggingService.debug('OpenAI-compatible stream start', {
             provider: this.#providerId,
             messageCount: Array.isArray(messages) ? messages.length : 0,
-            messageRoles: Array.isArray(messages) ? messages.map((m) => m.role) : [],
+            messages,
             toolsCount: Array.isArray(tools) ? tools.length : 0,
+            tools,
         });
         const res = await callOpenAICompatibleChatCompletions({
             baseUrl: this.#baseUrl,
@@ -152,6 +182,7 @@ export class OpenAICompatibleModel {
         let responseId = 'unknown';
         let usageData = null;
         let accumulatedReasoningText = '';
+        let accumulatedReasoningContent = '';
         const accumulatedReasoning = [];
         const accumulatedToolCalls = [];
         if (!reader) {
@@ -171,6 +202,7 @@ export class OpenAICompatibleModel {
             responseId,
             usageData,
             accumulatedReasoningText,
+            accumulatedReasoningContent,
             accumulatedReasoning,
             accumulatedToolCalls,
         };
@@ -190,7 +222,7 @@ export class OpenAICompatibleModel {
             }
         }
     }
-    #buildStreamOutput(accumulatedText, reasoningDetails, toolCalls, reasoningText) {
+    #buildStreamOutput(accumulatedText, reasoningDetails, toolCalls, reasoningText, reasoningContent) {
         const output = [];
         if (reasoningDetails && Array.isArray(reasoningDetails)) {
             for (const reasoningItem of reasoningDetails) {
@@ -238,7 +270,17 @@ export class OpenAICompatibleModel {
                     },
                 ],
                 ...(typeof reasoningText === 'string' && reasoningText.length > 0 ? { reasoning: reasoningText } : {}),
+                ...(typeof reasoningContent === 'string' && reasoningContent.length > 0
+                    ? { reasoning_content: reasoningContent }
+                    : {}),
                 ...(reasoningDetails != null ? { reasoning_details: reasoningDetails } : {}),
+                providerData: {
+                    ...(typeof reasoningText === 'string' && reasoningText.length > 0 ? { reasoning: reasoningText } : {}),
+                    ...(typeof reasoningContent === 'string' && reasoningContent.length > 0
+                        ? { reasoning_content: reasoningContent }
+                        : {}),
+                    ...(reasoningDetails != null ? { reasoning_details: reasoningDetails } : {}),
+                },
             });
         }
         if (toolCalls && toolCalls.length > 0) {
@@ -253,7 +295,17 @@ export class OpenAICompatibleModel {
                         arguments: args,
                         status: 'completed',
                         ...(typeof reasoningText === 'string' && reasoningText.length > 0 ? { reasoning: reasoningText } : {}),
+                        ...(typeof reasoningContent === 'string' && reasoningContent.length > 0
+                            ? { reasoning_content: reasoningContent }
+                            : {}),
                         ...(reasoningDetails != null ? { reasoning_details: reasoningDetails } : {}),
+                        providerData: {
+                            ...(typeof reasoningText === 'string' && reasoningText.length > 0 ? { reasoning: reasoningText } : {}),
+                            ...(typeof reasoningContent === 'string' && reasoningContent.length > 0
+                                ? { reasoning_content: reasoningContent }
+                                : {}),
+                            ...(reasoningDetails != null ? { reasoning_details: reasoningDetails } : {}),
+                        },
                     });
                 }
             }
@@ -317,12 +369,17 @@ export class OpenAICompatibleModel {
             state.responseId = randomUUID();
         }
         const reasoningDetails = state.accumulatedReasoning.length > 0 ? state.accumulatedReasoning : undefined;
+        this.#loggingService.debug('OpenAI-compatible stream done', {
+            text: state.accumulated,
+            reasoningDetails,
+            toolCalls: state.accumulatedToolCalls,
+        });
         yield {
             type: 'response_done',
             response: {
                 id: state.responseId,
                 usage: normalizeUsage(state.usageData),
-                output: this.#buildStreamOutput(state.accumulated, reasoningDetails, state.accumulatedToolCalls, state.accumulatedReasoningText),
+                output: this.#buildStreamOutput(state.accumulated, reasoningDetails, state.accumulatedToolCalls, state.accumulatedReasoningText, state.accumulatedReasoningContent),
             },
         };
         yield {
@@ -381,10 +438,14 @@ export class OpenAICompatibleModel {
                 }
             }
         }
-        const reasoningDelta = json?.choices?.[0]?.delta?.reasoning || json?.choices?.[0]?.delta?.reasoning_content;
+        const reasoningDelta = json?.choices?.[0]?.delta?.reasoning;
         if (typeof reasoningDelta === 'string' && reasoningDelta.length > 0) {
             state.accumulatedReasoningText += reasoningDelta;
         }
+        const reasoningContentDelta = json?.choices?.[0]?.delta?.reasoning_content;
+        if (typeof reasoningContentDelta === 'string' && reasoningContentDelta.length > 0) {
+            state.accumulatedReasoningContent += reasoningContentDelta;
+        }
     }
     #accumulateToolCallsFromStream(json, state) {
         const deltaToolCalls = json?.choices?.[0]?.delta?.tool_calls;