@jsonstudio/llms 0.6.753 → 0.6.795

package/dist/conversion/compat/actions/apply-patch-fixer.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/conversion/compat/actions/apply-patch-fixer.js

@@ -0,0 +1,30 @@
+import { registerBridgeAction } from '../../shared/bridge-actions.js';
+import { ensureMessagesArray } from '../../shared/bridge-message-utils.js';
+import { validateToolCall } from '../../../tools/tool-registry.js';
+const fixApplyPatchAction = (ctx) => {
+    const messages = ensureMessagesArray(ctx.state);
+    for (const message of messages) {
+        if (message.role !== 'assistant')
+            continue;
+        if (!Array.isArray(message.tool_calls))
+            continue;
+        for (const toolCall of message.tool_calls) {
+            if (toolCall.type !== 'function')
+                continue;
+            const fn = toolCall.function;
+            if (!fn || fn.name !== 'apply_patch')
+                continue;
+            const rawArgs = fn.arguments;
+            if (typeof rawArgs !== 'string')
+                continue;
+            const validation = validateToolCall('apply_patch', rawArgs);
+            if (validation?.ok && typeof validation.normalizedArgs === 'string') {
+                if (validation.normalizedArgs !== rawArgs) {
+                    fn.arguments = validation.normalizedArgs;
+                    toolCall._fixed_apply_patch = true;
+                }
+            }
+        }
+    }
+};
+registerBridgeAction('compat.fix-apply-patch', fixApplyPatchAction);

package/dist/conversion/compat/actions/apply-patch-format-fixer.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/conversion/compat/actions/apply-patch-format-fixer.js

@@ -0,0 +1,233 @@
+import { registerBridgeAction } from '../../shared/bridge-actions.js';
+import { ensureMessagesArray } from '../../shared/bridge-message-utils.js';
+/**
+ * apply-patch-format-fixer.ts
+ *
+ * 专门处理 apply_patch 的格式错误修复，包括：
+ * 1. 修复缺失 '*** Begin Patch' 包装的 raw diff
+ * 2. 修复混用 git diff 头部的情况
+ * 3. 修复 hunk 中缺少前缀的代码行
+ *
+ * 注意：仅修复格式问题，不修复上下文匹配问题
+ */
+import { captureApplyPatchRegression } from '../../../tools/patch-regression-capturer.js';
+/**
+ * 检测是否是裸 diff 格式（没有 Begin Patch 包装）
+ */
+function isBareDiff(text) {
+    const trimmed = text.trim();
+    // 检测典型的 git diff 标记
+    const hasGitDiffMarkers = trimmed.startsWith('diff --git') ||
+        /^---\s+a\//.test(trimmed) ||
+        /^\+\+\+\s+b\//.test(trimmed) ||
+        /^@@\s+-\d+,\d+\s+\+\d+,\d+\s+@@/.test(trimmed);
+    // 确保不是标准的 apply_patch 格式
+    const hasApplyPatchMarkers = trimmed.includes('*** Begin Patch') ||
+        trimmed.includes('*** Update File:') ||
+        trimmed.includes('*** Add File:');
+    return hasGitDiffMarkers && !hasApplyPatchMarkers;
+}
+/**
+ * 转换裸 diff 为 apply_patch 格式
+ */
+function convertBareDiffToApplyPatch(diffText) {
+    const lines = diffText.replace(/\r\n/g, '\n').split('\n');
+    const patches = new Map();
+    let currentFile = '';
+    let currentHunk = [];
+    let inHunk = false;
+    for (const line of lines) {
+        // 检测文件头
+        const diffMatch = line.match(/^diff --git\s+a\/(.+?)\s+b\/(.+)$/);
+        if (diffMatch) {
+            // 保存上一个文件的 hunk
+            if (currentFile && currentHunk.length > 0) {
+                patches.set(currentFile, {
+                    header: `*** Update File: ${diffMatch[2]}`,
+                    hunk: [...currentHunk]
+                });
+            }
+            currentFile = diffMatch[2];
+            currentHunk = [];
+            inHunk = false;
+            continue;
+        }
+        // 检测 hunk 头
+        if (/^@@\s+-\d+/.test(line)) {
+            currentHunk.push(line);
+            inHunk = true;
+            continue;
+        }
+        // 在 hunk 中收集行
+        if (inHunk) {
+            // 确保每行都有正确的前缀
+            if (line.startsWith('+') || line.startsWith('-') || line.startsWith(' ')) {
+                currentHunk.push(line);
+            }
+            else if (line.trim() === '') {
+                currentHunk.push(' ');
+            }
+            else {
+                // 行缺少前缀，作为上下文行处理
+                currentHunk.push(' ' + line);
+            }
+        }
+    }
+    // 保存最后一个文件
+    if (currentFile && currentHunk.length > 0) {
+        patches.set(currentFile, {
+            header: `*** Update File: ${currentFile}`,
+            hunk: [...currentHunk]
+        });
+    }
+    if (patches.size === 0) {
+        // 如果无法解析，返回原始文本包装
+        return `*** Begin Patch\n${diffText}\n*** End Patch`;
+    }
+    // 构建 apply_patch 格式
+    const result = ['*** Begin Patch'];
+    for (const [file, { header, hunk }] of patches.entries()) {
+        result.push(header);
+        result.push(...hunk);
+    }
+    result.push('*** End Patch');
+    return result.join('\n');
+}
+/**
+ * 修复 hunk 中缺少前缀的行
+ */
+function fixHunkPrefixes(patchText) {
+    const lines = patchText.split('\n');
+    const result = [];
+    let inUpdateSection = false;
+    let afterHeader = false;
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i];
+        if (line.startsWith('*** Begin Patch')) {
+            result.push(line);
+            continue;
+        }
+        if (line.startsWith('*** End Patch')) {
+            result.push(line);
+            inUpdateSection = false;
+            afterHeader = false;
+            continue;
+        }
+        if (line.startsWith('*** Update File:') || line.startsWith('*** Add File:') || line.startsWith('*** Delete File:')) {
+            result.push(line);
+            inUpdateSection = true;
+            afterHeader = true;
+            continue;
+        }
+        if (inUpdateSection) {
+            // 跳过紧跟在 header 后的空行
+            if (afterHeader && line.trim() === '') {
+                continue;
+            }
+            afterHeader = false;
+            // 检查是否是 hunk 行
+            if (/^@@\s+-\d+,\d+\s+\+\d+,\d+\s+@@/.test(line)) {
+                result.push(line);
+                continue;
+            }
+            // 检查是否已经有正确前缀
+            if (/^[+-]\s/.test(line) || /^\s/.test(line)) {
+                result.push(line);
+                continue;
+            }
+            // 行缺少前缀，作为上下文行处理
+            if (line.trim() === '') {
+                result.push(' ');
+            }
+            else {
+                result.push(' ' + line);
+            }
+        }
+        else {
+            result.push(line);
+        }
+    }
+    return result.join('\n');
+}
+/**
+ * 主要的修复函数
+ */
+function fixApplyPatchFormat(argsStr) {
+    try {
+        let args;
+        try {
+            args = JSON.parse(argsStr);
+        }
+        catch {
+            return { fixed: argsStr }; // 无法解析，返回原值
+        }
+        if (!args || typeof args !== 'object') {
+            return { fixed: argsStr };
+        }
+        let patch = args.patch || args.input || '';
+        if (typeof patch !== 'string') {
+            return { fixed: argsStr };
+        }
+        let modified = false;
+        let errorType;
+        // 修复 1: 裸 diff 缺少包装
+        if (isBareDiff(patch)) {
+            patch = convertBareDiffToApplyPatch(patch);
+            modified = true;
+            errorType = 'missing_begin_patch';
+        }
+        // 修复 2: hunk 中缺少前缀的行
+        const hasInvalidHunkLine = /"(.*?)".*Unexpected line found in update hunk/.test(patch);
+        if (hasInvalidHunkLine || !patch.match(/^@@/m)) {
+            const originalLength = patch.length;
+            patch = fixHunkPrefixes(patch);
+            if (patch.length !== originalLength) {
+                modified = true;
+                errorType = errorType || 'invalid_hunk_prefix';
+            }
+        }
+        if (modified) {
+            const newArgs = { ...args, patch, input: patch };
+            return { fixed: JSON.stringify(newArgs), errorType };
+        }
+        return { fixed: argsStr };
+    }
+    catch {
+        return { fixed: argsStr };
+    }
+}
+/**
+ * Bridge action: 遍历消息，修复 apply_patch 格式问题
+ */
+const fixApplyPatchFormatAction = (ctx) => {
+    const messages = ensureMessagesArray(ctx.state);
+    for (const message of messages) {
+        if (message.role !== 'assistant')
+            continue;
+        if (!Array.isArray(message.tool_calls))
+            continue;
+        for (const toolCall of message.tool_calls) {
+            if (toolCall.type !== 'function')
+                continue;
+            const fn = toolCall.function;
+            if (!fn || fn.name !== 'apply_patch')
+                continue;
+            const rawArgs = fn.arguments;
+            if (typeof rawArgs !== 'string')
+                continue;
+            const { fixed, errorType } = fixApplyPatchFormat(rawArgs);
+            if (fixed !== rawArgs) {
+                // 保存可修复样本
+                captureApplyPatchRegression({
+                    errorType: errorType || 'unknown_format_issue',
+                    originalArgs: rawArgs,
+                    fixerResult: fixed,
+                    source: 'compat.fix-apply-patch-format'
+                });
+                fn.arguments = fixed;
+                toolCall._format_fixed = true;
+            }
+        }
+    }
+};
+registerBridgeAction('compat.fix-apply-patch-format', fixApplyPatchFormatAction);

package/dist/conversion/compat/actions/index.d.ts

@@ -0,0 +1,2 @@
+import './apply-patch-fixer.js';
+import './apply-patch-format-fixer.js';

package/dist/conversion/compat/actions/index.js

@@ -0,0 +1,2 @@
+import './apply-patch-fixer.js';
+import './apply-patch-format-fixer.js';

package/dist/conversion/compat/profiles/chat-gemini.json

@@ -1,17 +1,17 @@
 {
-    "id": "chat:gemini",
-    "protocol": "gemini-chat",
-    "request": {
-        "mappings": [
-            { "action": "snapshot", "phase": "compat-pre" },
-            { "action": "claude_thinking_tool_schema" },
-            {
-                "action": "gemini_web_search_request"
-            },
-            { "action": "snapshot", "phase": "compat-post" }
-        ]
-    },
-    "response": {
-        "mappings": []
-    }
+  "id": "chat:gemini",
+  "protocol": "gemini-chat",
+  "request": {
+    "mappings": [
+      { "action": "snapshot", "phase": "compat-pre" },
+      { "action": "claude_thinking_tool_schema" },
+      {
+        "action": "gemini_web_search_request"
+      },
+      { "action": "snapshot", "phase": "compat-post" }
+    ]
+  },
+  "response": {
+    "mappings": []
+  }
 }