@qduc/term2 0.6.1 → 0.7.1

package/dist/lib/tool-invoke.js

@@ -1,3 +1,4 @@
+import { z } from 'zod';
 /**
  * Maximum payload size (in characters) for which JSON repair is attempted.
  * Very large payloads are returned as-is to avoid regex backtracking costs.
@@ -121,19 +122,163 @@ export const repairJson = (text) => {
     repaired = repaired.replace(/,(\s*[}\]])/g, '$1');
     return repaired;
 };
-export const normalizeToolInput = (input) => {
+function getZodSchema(schema) {
+    if (!schema)
+        return null;
+    if (schema.safeParse && typeof schema.safeParse === 'function') {
+        return schema;
+    }
+    if (schema.schema && typeof schema.schema.safeParse === 'function') {
+        return schema.schema;
+    }
+    return null;
+}
+function getObjectShape(schema) {
+    const zodSchema = getZodSchema(schema);
+    if (!zodSchema)
+        return null;
+    if (zodSchema instanceof z.ZodObject || zodSchema.shape) {
+        return zodSchema.shape;
+    }
+    if (zodSchema._def && zodSchema._def.schema) {
+        return getObjectShape(zodSchema._def.schema);
+    }
+    return null;
+}
+function unwrapSchema(schema) {
+    let current = schema;
+    while (current) {
+        const def = current.def || current._def;
+        if (!def)
+            break;
+        const typeName = def.type || def.typeName;
+        const isOptional = typeName === 'optional' || typeName === 'ZodOptional';
+        const isNullable = typeName === 'nullable' || typeName === 'ZodNullable';
+        if (isOptional || isNullable) {
+            if (typeof current.unwrap === 'function') {
+                current = current.unwrap();
+            }
+            else {
+                current = def.innerType;
+            }
+        }
+        else if (typeName === 'default' || typeName === 'ZodDefault') {
+            current = def.innerType;
+        }
+        else if (typeName === 'effects' || typeName === 'ZodEffects') {
+            current = def.schema;
+        }
+        else {
+            break;
+        }
+    }
+    return current;
+}
+export const normalizeToolInput = (input, schema) => {
+    let jsonStr = '';
     if (typeof input === 'string') {
-        return repairJson(input);
+        jsonStr = repairJson(input);
     }
-    try {
-        const serialized = JSON.stringify(input);
-        return typeof serialized === 'string' ? serialized : '{}';
+    else {
+        try {
+            jsonStr = JSON.stringify(input);
+            if (typeof jsonStr !== 'string') {
+                jsonStr = '{}';
+            }
+        }
+        catch {
+            jsonStr = '{}';
+        }
     }
-    catch {
-        return '{}';
+    if (schema) {
+        try {
+            const parsed = JSON.parse(jsonStr);
+            if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
+                const shape = getObjectShape(schema);
+                if (shape) {
+                    let modified = false;
+                    for (const key of Object.keys(shape)) {
+                        const fieldSchema = shape[key];
+                        if (!fieldSchema || typeof fieldSchema.safeParse !== 'function') {
+                            continue;
+                        }
+                        const value = parsed[key];
+                        if (value !== undefined) {
+                            // 1. Optional field sentinels: "null", "None", "" or null -> undefined (omit)
+                            if (fieldSchema.safeParse(undefined).success) {
+                                if (value === 'null' || value === 'None' || value === '' || value === null) {
+                                    delete parsed[key];
+                                    modified = true;
+                                    continue;
+                                }
+                            }
+                            // 2. Boolean coercion: "true"/"false" -> boolean
+                            const isBool = fieldSchema.safeParse(true).success &&
+                                fieldSchema.safeParse(false).success &&
+                                !fieldSchema.safeParse('not a boolean').success;
+                            if (isBool && typeof value === 'string') {
+                                const lower = value.toLowerCase();
+                                if (lower === 'true') {
+                                    parsed[key] = true;
+                                    modified = true;
+                                }
+                                else if (lower === 'false') {
+                                    parsed[key] = false;
+                                    modified = true;
+                                }
+                            }
+                            // 3. Array or Object coercion from stringified representation
+                            const unwrapped = unwrapSchema(fieldSchema);
+                            if (typeof value === 'string' && unwrapped) {
+                                const def = unwrapped.def || unwrapped._def;
+                                if (def) {
+                                    const typeName = def.type || def.typeName;
+                                    const trimmed = value.trim();
+                                    if ((typeName === 'array' || typeName === 'ZodArray') &&
+                                        trimmed.startsWith('[') &&
+                                        trimmed.endsWith(']')) {
+                                        try {
+                                            const parsedArray = JSON.parse(trimmed);
+                                            if (Array.isArray(parsedArray)) {
+                                                parsed[key] = parsedArray;
+                                                modified = true;
+                                            }
+                                        }
+                                        catch {
+                                            // Ignore parsing error
+                                        }
+                                    }
+                                    else if ((typeName === 'object' || typeName === 'ZodObject') &&
+                                        trimmed.startsWith('{') &&
+                                        trimmed.endsWith('}')) {
+                                        try {
+                                            const parsedObj = JSON.parse(trimmed);
+                                            if (parsedObj && typeof parsedObj === 'object' && !Array.isArray(parsedObj)) {
+                                                parsed[key] = parsedObj;
+                                                modified = true;
+                                            }
+                                        }
+                                        catch {
+                                            // Ignore parsing error
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    if (modified) {
+                        jsonStr = JSON.stringify(parsed);
+                    }
+                }
+            }
+        }
+        catch {
+            // Ignore parsing errors and return jsonStr as-is
+        }
     }
+    return jsonStr;
 };
-export const wrapToolInvoke = (tool) => {
+export const wrapToolInvoke = (tool, originalSchema) => {
     // Only FunctionTool has an invoke method
     if (tool.type !== 'function') {
         return tool;
@@ -141,8 +286,66 @@ export const wrapToolInvoke = (tool) => {
     const functionTool = tool;
     const originalInvoke = functionTool.invoke.bind(functionTool);
     functionTool.invoke = async (context, input, details) => {
-        const normalizedInput = normalizeToolInput(input);
-        return originalInvoke(context, normalizedInput, details);
+        const targetSchema = originalSchema || functionTool.parameters;
+        const normalizedInput = normalizeToolInput(input, targetSchema);
+        const isInvalidToolInputError = (error) => {
+            if (!error)
+                return false;
+            const name = error.name || error.constructor?.name;
+            return name === 'InvalidToolInputError' || name === 'AI_InvalidToolInputError';
+        };
+        const isValidationErrorString = (str) => {
+            return (str.includes('InvalidToolInputError') ||
+                str.includes('AI_InvalidToolInputError') ||
+                str.includes('Invalid JSON input for tool'));
+        };
+        const runDiagnostics = (toolName, schema, rawInput) => {
+            let parsedInput;
+            try {
+                parsedInput = typeof rawInput === 'string' ? JSON.parse(rawInput) : rawInput;
+            }
+            catch {
+                parsedInput = rawInput;
+            }
+            const zodSchema = getZodSchema(schema);
+            if (zodSchema) {
+                const parseResult = zodSchema.safeParse(parsedInput);
+                if (!parseResult.success) {
+                    const issues = parseResult.error.issues.map((issue) => {
+                        const field = issue.path.join('.') || 'input';
+                        let actualVal = parsedInput;
+                        for (const segment of issue.path) {
+                            if (actualVal && typeof actualVal === 'object') {
+                                actualVal = actualVal[segment];
+                            }
+                        }
+                        const valStr = typeof actualVal === 'string' ? `"${actualVal}"` : JSON.stringify(actualVal);
+                        const typeStr = actualVal === null ? 'null' : typeof actualVal;
+                        let msg = issue.message;
+                        if (issue.code === 'invalid_type') {
+                            msg = `must be ${issue.expected}`;
+                        }
+                        return `${field} ${msg}, got ${typeStr} ${valStr}`;
+                    });
+                    return `Tool input did not match schema for ${toolName}: ${issues.join('; ')}. Retry with valid JSON arguments.`;
+                }
+            }
+            return `Tool input was invalid for this tool. Retry with arguments matching the tool schema.`;
+        };
+        try {
+            const result = await originalInvoke(context, normalizedInput, details);
+            if (typeof result === 'string' && isValidationErrorString(result)) {
+                return runDiagnostics(functionTool.name, targetSchema, normalizedInput);
+            }
+            return result;
+        }
+        catch (error) {
+            if (isInvalidToolInputError(error)) {
+                const diagnosticsMsg = runDiagnostics(functionTool.name, targetSchema, normalizedInput);
+                throw new Error(diagnosticsMsg);
+            }
+            throw error;
+        }
     };
     return 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":"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"}
+{"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

@@ -179,4 +179,107 @@ test('wrapToolInvoke repairs multiline string arguments before SDK validation',
     const result = await wrappedTool.invoke({}, '{"diff":"+line 1\n+line 2\n"}');
     t.is(result, '+line 1\n+line 2\n');
 });
+test('normalizeToolInput with schema filters sentinel values for optional fields', (t) => {
+    const schema = z.object({
+        path: z.string(),
+        start_line: z.number().optional(),
+        end_line: z.number().optional(),
+        writeBoundary: z.array(z.string()).optional(),
+    });
+    const input = {
+        path: 'README.md',
+        start_line: 'None',
+        end_line: 'null',
+        writeBoundary: 'null',
+    };
+    const result = normalizeToolInput(input, schema);
+    t.deepEqual(JSON.parse(result), { path: 'README.md' });
+});
+test('normalizeToolInput with schema coerces boolean string inputs', (t) => {
+    const schema = z.object({
+        pattern: z.string(),
+        no_ignore: z.boolean().optional(),
+        case_sensitive: z.boolean(),
+    });
+    const input = {
+        pattern: 'test',
+        no_ignore: 'false',
+        case_sensitive: 'TRUE',
+    };
+    const result = normalizeToolInput(input, schema);
+    t.deepEqual(JSON.parse(result), {
+        pattern: 'test',
+        no_ignore: false,
+        case_sensitive: true,
+    });
+});
+test('wrapToolInvoke intercepts InvalidToolInputError exception and formats diagnostics', async (t) => {
+    const parametersSchema = z.object({
+        pattern: z.string(),
+        no_ignore: z.boolean().optional(),
+    });
+    const rawTool = createTool({
+        name: 'grep',
+        description: 'grep tool',
+        parameters: parametersSchema,
+        execute: async () => 'ok',
+    });
+    rawTool.invoke = async (_context, _input, _details) => {
+        const err = new Error('Invalid JSON input for tool');
+        err.name = 'InvalidToolInputError';
+        throw err;
+    };
+    const wrappedTool = wrapToolInvoke(rawTool, parametersSchema);
+    const err = await t.throwsAsync(() => wrappedTool.invoke({}, '{"pattern": "test", "no_ignore": "not-a-bool"}'));
+    t.is(err?.message, 'Tool input did not match schema for grep: no_ignore must be boolean, got string "not-a-bool". Retry with valid JSON arguments.');
+});
+test('wrapToolInvoke intercepts InvalidToolInputError result string and formats diagnostics', async (t) => {
+    const parametersSchema = z.object({
+        pattern: z.string(),
+        no_ignore: z.boolean().optional(),
+    });
+    const rawTool = createTool({
+        name: 'grep',
+        description: 'grep tool',
+        parameters: parametersSchema,
+        execute: async () => 'ok',
+    });
+    rawTool.invoke = async (_context, _input, _details) => {
+        return 'An error occurred while running the tool. Please try again. Error: InvalidToolInputError: Invalid JSON input for tool';
+    };
+    const wrappedTool = wrapToolInvoke(rawTool, parametersSchema);
+    const result = await wrappedTool.invoke({}, '{"pattern": "test", "no_ignore": "not-a-bool"}');
+    t.is(result, 'Tool input did not match schema for grep: no_ignore must be boolean, got string "not-a-bool". Retry with valid JSON arguments.');
+});
+test('normalizeToolInput with schema coerces stringified array and object inputs', (t) => {
+    const schema = z.object({
+        writeBoundary: z.array(z.string()).optional(),
+        config: z
+            .object({
+            debug: z.boolean(),
+        })
+            .optional(),
+    });
+    const input = {
+        writeBoundary: '["src", "tests"]',
+        config: '{"debug": true}',
+    };
+    const result = normalizeToolInput(input, schema);
+    t.deepEqual(JSON.parse(result), {
+        writeBoundary: ['src', 'tests'],
+        config: { debug: true },
+    });
+});
+test('normalizeToolInput with schema coerces empty stringified array', (t) => {
+    const schema = z.object({
+        writeBoundary: z.array(z.string()).optional(),
+    });
+    const input = {
+        writeBoundary: '[]',
+    };
+    const result = normalizeToolInput(input, schema);
+    t.deepEqual(JSON.parse(result), {
+        writeBoundary: [],
+    });
+});
 //# sourceMappingURL=tool-invoke.test.js.map

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":"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"}
+{"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.map

@@ -1 +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"}
+{"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;AAwD/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

@@ -1,12 +1,53 @@
+function parseGptVersion(value) {
+    const trimmed = value.trim();
+    const match = trimmed.match(/^gpt-(\d+)(?:\.(\d+))?/i);
+    if (!match) {
+        return null;
+    }
+    // Reject ambiguous exact-match multi-digit versions like 'gpt-50'.
+    // A valid GPT version prefix should either have a minor version or a suffix.
+    const afterMatch = trimmed.slice(match[0].length);
+    if (!afterMatch && match[1].length > 1 && !match[2]) {
+        return null;
+    }
+    return {
+        major: Number(match[1]),
+        minor: Number(match[2] ?? '0'),
+    };
+}
+function isGptVersionAtLeast(model, minimum) {
+    const modelVersion = parseGptVersion(model);
+    const minimumVersion = parseGptVersion(minimum);
+    if (!modelVersion || !minimumVersion) {
+        return false;
+    }
+    if (modelVersion.major !== minimumVersion.major) {
+        return modelVersion.major > minimumVersion.major;
+    }
+    return modelVersion.minor >= minimumVersion.minor;
+}
+function matchesNativePatchPrefix(model, prefix) {
+    const normalizedModel = model.trim();
+    const normalizedPrefix = prefix.trim();
+    if (!normalizedModel || !normalizedPrefix) {
+        return false;
+    }
+    const modelVersion = parseGptVersion(normalizedModel);
+    const prefixVersion = parseGptVersion(normalizedPrefix);
+    if (modelVersion && prefixVersion) {
+        return isGptVersionAtLeast(normalizedModel, normalizedPrefix);
+    }
+    return normalizedModel.startsWith(normalizedPrefix);
+}
 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 modelPrefixes.some((prefix) => matchesNativePatchPrefix(model, prefix));
     }
-    return providerId === 'openai' && model.startsWith('gpt-5.1');
+    return providerId === 'openai' && isGptVersionAtLeast(model, 'gpt-5.1');
 }
 export function shouldUseStrictToolSchema({ providerId, capabilities, }) {
     if (capabilities?.usesStrictToolSchema !== undefined) {

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

@@ -1 +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"}
+{"version":3,"file":"tool-selection-policy.js","sourceRoot":"","sources":["../../source/lib/tool-selection-policy.ts"],"names":[],"mappings":"AASA,SAAS,eAAe,CAAC,KAAa;IACpC,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;IACvD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,IAAI,CAAC;IACd,CAAC;IACD,mEAAmE;IACnE,6EAA6E;IAC7E,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAClD,IAAI,CAAC,UAAU,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QACpD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO;QACL,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACvB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC;KAC/B,CAAC;AACJ,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAa,EAAE,OAAe;IACzD,MAAM,YAAY,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IAC5C,MAAM,cAAc,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IAChD,IAAI,CAAC,YAAY,IAAI,CAAC,cAAc,EAAE,CAAC;QACrC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,YAAY,CAAC,KAAK,KAAK,cAAc,CAAC,KAAK,EAAE,CAAC;QAChD,OAAO,YAAY,CAAC,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC;IACnD,CAAC;IAED,OAAO,YAAY,CAAC,KAAK,IAAI,cAAc,CAAC,KAAK,CAAC;AACpD,CAAC;AAED,SAAS,wBAAwB,CAAC,KAAa,EAAE,MAAc;IAC7D,MAAM,eAAe,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IACrC,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;IAEvC,IAAI,CAAC,eAAe,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC1C,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,YAAY,GAAG,eAAe,CAAC,eAAe,CAAC,CAAC;IACtD,MAAM,aAAa,GAAG,eAAe,CAAC,gBAAgB,CAAC,CAAC;IACxD,IAAI,YAAY,IAAI,aAAa,EAAE,CAAC;QAClC,OAAO,mBAAmB,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;IAChE,CAAC;IAED,OAAO,eAAe,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;AACtD,CAAC;AAED,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,wBAAwB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;IACjF,CAAC;IAED,OAAO,UAAU,KAAK,QAAQ,IAAI,mBAAmB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;AAC1E,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.js

@@ -15,6 +15,16 @@ test('shouldUseNativePatchTool returns true for OpenAI gpt-5.1 models', (t) => {
         model: 'gpt-5.1',
     }));
 });
+test('shouldUseNativePatchTool returns true for OpenAI gpt-5.10 and newer models', (t) => {
+    t.true(shouldUseNativePatchTool({
+        providerId: 'openai',
+        model: 'gpt-5.10',
+    }));
+    t.true(shouldUseNativePatchTool({
+        providerId: 'openai',
+        model: 'gpt-6.0',
+    }));
+});
 test('shouldUseNativePatchTool returns false for OpenAI non-5.1 models', (t) => {
     t.false(shouldUseNativePatchTool({
         providerId: 'openai',
@@ -38,6 +48,35 @@ test('shouldUseNativePatchTool honors provider model prefix capability', (t) =>
         },
     }));
 });
+test('shouldUseNativePatchTool treats gpt model prefixes semantically', (t) => {
+    t.true(shouldUseNativePatchTool({
+        providerId: 'custom-provider',
+        model: 'gpt-5.1-mini',
+        capabilities: {
+            supportsConversationChaining: false,
+            supportsTracingControl: false,
+            nativePatchModelPrefixes: ['gpt-5.1'],
+        },
+    }));
+    t.true(shouldUseNativePatchTool({
+        providerId: 'custom-provider',
+        model: 'gpt-6.0',
+        capabilities: {
+            supportsConversationChaining: false,
+            supportsTracingControl: false,
+            nativePatchModelPrefixes: ['gpt-5.1'],
+        },
+    }));
+    t.false(shouldUseNativePatchTool({
+        providerId: 'custom-provider',
+        model: 'gpt-5.0',
+        capabilities: {
+            supportsConversationChaining: false,
+            supportsTracingControl: false,
+            nativePatchModelPrefixes: ['gpt-5.1'],
+        },
+    }));
+});
 test('shouldUseStrictToolSchema returns true for OpenAI provider', (t) => {
     t.true(shouldUseStrictToolSchema({
         providerId: 'openai',

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

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