@jsonstudio/llms 0.6.1462 → 0.6.1733

package/dist/tools/apply-patch/patch-text/normalize.js

@@ -53,6 +53,77 @@ const convertUnifiedDiffToApplyPatchIfPossible = (text) => {
         return null;
     }
 };
+const convertStarHeaderDiffToApplyPatchIfPossible = (text) => {
+    try {
+        if (!text || text.includes('*** Begin Patch') || text.includes('diff --git'))
+            return null;
+        const lines = text.replace(/\r\n/g, '\n').split('\n');
+        if (lines.length < 3)
+            return null;
+        const first = String(lines[0] ?? '').trim();
+        const second = String(lines[1] ?? '').trim();
+        if (!first.startsWith('*** ') || !second.startsWith('--- '))
+            return null;
+        if (first.startsWith('*** Add File:') || first.startsWith('*** Update File:') || first.startsWith('*** Delete File:')) {
+            return null;
+        }
+        if (!lines.some((line) => line.startsWith('@@')))
+            return null;
+        const normalizeHeaderPath = (value) => {
+            const v = String(value || '').trim().replace(/\s+\*\*\*$/g, '').trim();
+            if (!v)
+                return '';
+            const m = v.match(/^(?:a\/|b\/)?(.+)$/);
+            return (m && m[1] ? m[1] : v).trim();
+        };
+        const oldPath = normalizeHeaderPath(first.slice(4));
+        const newPath = normalizeHeaderPath(second.slice(4));
+        const body = lines.slice(2);
+        const out = ['*** Begin Patch'];
+        if (oldPath === '/dev/null' && newPath && newPath !== '/dev/null') {
+            out.push(`*** Add File: ${newPath}`);
+            for (const line of body) {
+                if (line.startsWith('+')) {
+                    out.push(line);
+                }
+            }
+            out.push('*** End Patch');
+            return out.join('\n');
+        }
+        if (newPath === '/dev/null' && oldPath && oldPath !== '/dev/null') {
+            out.push(`*** Delete File: ${oldPath}`);
+            out.push('*** End Patch');
+            return out.join('\n');
+        }
+        const filePath = newPath || oldPath;
+        if (!filePath)
+            return null;
+        out.push(`*** Update File: ${filePath}`);
+        for (const line of body) {
+            out.push(line);
+        }
+        out.push('*** End Patch');
+        return out.join('\n');
+    }
+    catch {
+        return null;
+    }
+};
+const normalizeApplyPatchFileHeader = (line) => {
+    const addMatch = line.match(/^\*\*\* Add File:\s*(.+?)(?:\s+\*\*\*)?\s*$/);
+    if (addMatch && addMatch[1]) {
+        return `*** Add File: ${addMatch[1].trim()}`;
+    }
+    const updateMatch = line.match(/^\*\*\* Update File:\s*(.+?)(?:\s+\*\*\*)?\s*$/);
+    if (updateMatch && updateMatch[1]) {
+        return `*** Update File: ${updateMatch[1].trim()}`;
+    }
+    const deleteMatch = line.match(/^\*\*\* Delete File:\s*(.+?)(?:\s+\*\*\*)?\s*$/);
+    if (deleteMatch && deleteMatch[1]) {
+        return `*** Delete File: ${deleteMatch[1].trim()}`;
+    }
+    return line;
+};
 const stripCodeFences = (text) => {
     const trimmed = text.trim();
     // Only treat the entire payload as fenced when it *starts* with a code fence.
@@ -152,7 +223,12 @@ export const normalizeApplyPatchText = (raw) => {
         if (converted)
             text = converted;
     }
-    else if (!text.includes('*** Begin Patch') &&
+    else if (!text.includes('*** Begin Patch') && !text.includes('diff --git')) {
+        const converted = convertStarHeaderDiffToApplyPatchIfPossible(text);
+        if (converted)
+            text = converted;
+    }
+    if (!text.includes('*** Begin Patch') &&
         !text.includes('diff --git') &&
         text.includes('***************') &&
         /^\*\*\*\s+\S+/m.test(text) &&
@@ -172,9 +248,11 @@ export const normalizeApplyPatchText = (raw) => {
         if (converted)
             text = converted;
     }
-    if (text.includes('*** Add File:')) {
-        text = text.replace(/\*\*\* Create File:/g, '*** Add File:');
-    }
+    text = text.replace(/\*\*\* Create File:/g, '*** Add File:');
+    text = text
+        .split('\n')
+        .map((line) => normalizeApplyPatchFileHeader(line))
+        .join('\n');
     let hasBegin = text.includes('*** Begin Patch');
     const hasEnd = text.includes('*** End Patch');
     if (hasBegin && !hasEnd) {
@@ -216,29 +294,41 @@ export const normalizeApplyPatchText = (raw) => {
     const lines = text.split('\n');
     const output = [];
     let inUpdateSection = false;
+    let inAddSection = false;
     let afterUpdateHeader = false;
     for (const line of lines) {
         if (line.startsWith('*** Begin Patch')) {
             output.push(line);
             inUpdateSection = false;
+            inAddSection = false;
             afterUpdateHeader = false;
             continue;
         }
         if (line.startsWith('*** End Patch')) {
             output.push(line);
             inUpdateSection = false;
+            inAddSection = false;
             afterUpdateHeader = false;
             continue;
         }
         if (line.startsWith('*** Update File:')) {
             output.push(line);
             inUpdateSection = true;
+            inAddSection = false;
             afterUpdateHeader = true;
             continue;
         }
-        if (line.startsWith('*** Add File:') || line.startsWith('*** Delete File:')) {
+        if (line.startsWith('*** Add File:')) {
             output.push(line);
             inUpdateSection = false;
+            inAddSection = true;
+            afterUpdateHeader = false;
+            continue;
+        }
+        if (line.startsWith('*** Delete File:')) {
+            output.push(line);
+            inUpdateSection = false;
+            inAddSection = false;
             afterUpdateHeader = false;
             continue;
         }
@@ -255,6 +345,15 @@ export const normalizeApplyPatchText = (raw) => {
             }
             continue;
         }
+        if (inAddSection) {
+            if (line.startsWith('+')) {
+                output.push(line);
+            }
+            else {
+                output.push(`+${line}`);
+            }
+            continue;
+        }
         output.push(line);
     }
     return output.join('\n');

package/dist/tools/apply-patch/structured/coercion.js

@@ -1,6 +1,22 @@
 import { isStructuredApplyPatchPayload } from '../structured.js';
 import { tryParseJson } from '../json/parse-loose.js';
 import { asString } from '../validation/shared.js';
+const resolveTopLevelFile = (record) => {
+    const direct = asString(record.file) ??
+        asString(record.path) ??
+        asString(record.filepath) ??
+        asString(record.filename);
+    if (direct)
+        return direct;
+    const targetAlias = asString(record.target);
+    if (!targetAlias)
+        return undefined;
+    if (targetAlias.includes('\n') || targetAlias.includes('\r'))
+        return undefined;
+    if (!/[./\\]/.test(targetAlias))
+        return undefined;
+    return targetAlias;
+};
 const buildSingleChangePayload = (record) => {
     const kindRaw = asString(record.kind);
     if (!kindRaw)
@@ -14,7 +30,11 @@ const buildSingleChangePayload = (record) => {
     if (typeof record.use_anchor_indent === 'boolean') {
         change.use_anchor_indent = record.use_anchor_indent;
     }
-    const changeFile = asString(record.file);
+    const changeFile = asString(record.file) ??
+        asString(record.path) ??
+        asString(record.filepath) ??
+        asString(record.filename) ??
+        resolveTopLevelFile(record);
     if (changeFile) {
         change.file = changeFile;
     }
@@ -44,7 +64,11 @@ const coerceChangesArray = (value) => {
     return undefined;
 };
 export const coerceStructuredPayload = (record) => {
+    const topLevelFile = resolveTopLevelFile(record);
     if (isStructuredApplyPatchPayload(record)) {
+        if (topLevelFile && !asString(record.file)) {
+            return { ...record, file: topLevelFile };
+        }
         return record;
     }
     if (Array.isArray(record.changes) && record.changes.length === 0) {
@@ -55,7 +79,7 @@ export const coerceStructuredPayload = (record) => {
         const changesFromInstructions = coerceChangesArray(record.instructions);
         if (changesFromInstructions) {
             return {
-                ...(typeof record.file === 'string' ? { file: record.file } : {}),
+                ...(topLevelFile ? { file: topLevelFile } : {}),
                 changes: changesFromInstructions
             };
         }
@@ -63,14 +87,14 @@ export const coerceStructuredPayload = (record) => {
         const changesFromString = coerceChangesArray(record.changes);
         if (changesFromString) {
             return {
-                ...(typeof record.file === 'string' ? { file: record.file } : {}),
+                ...(topLevelFile ? { file: topLevelFile } : {}),
                 changes: changesFromString
             };
         }
         const editsFromString = coerceChangesArray(record.edits ?? record.operations ?? record.ops);
         if (editsFromString) {
             return {
-                ...(typeof record.file === 'string' ? { file: record.file } : {}),
+                ...(topLevelFile ? { file: topLevelFile } : {}),
                 changes: editsFromString
             };
         }

package/dist/tools/apply-patch/validator.js

@@ -1,8 +1,5 @@
-import { buildStructuredPatch, StructuredApplyPatchError } from './structured.js';
-import { coerceStructuredPayload } from './structured/coercion.js';
-import { tryParseJsonLoose } from './json/parse-loose.js';
+import { normalizeApplyPatchArgs } from './args-normalizer/index.js';
 import { normalizeApplyPatchText, looksLikePatch } from './patch-text/normalize.js';
-import { asString, isRecord } from './validation/shared.js';
 export { looksLikePatch, normalizeApplyPatchText };
 const toJson = (value) => {
     try {
@@ -13,148 +10,12 @@ const toJson = (value) => {
     }
 };
 export function validateApplyPatchArgs(argsString, rawArgs) {
-    const rawTrimmed = typeof argsString === 'string' ? argsString.trim() : '';
-    const looksJsonContainer = rawTrimmed.startsWith('{') || rawTrimmed.startsWith('[');
-    // Raw patch text without JSON wrapper
-    if (!looksJsonContainer && looksLikePatch(rawTrimmed)) {
-        const patchText = normalizeApplyPatchText(rawTrimmed);
-        if (!patchText.includes('*** Begin Patch')) {
-            return { ok: false, reason: 'unsupported_patch_format' };
-        }
-        return { ok: true, normalizedArgs: toJson({ patch: patchText, input: patchText }) };
+    const normalized = normalizeApplyPatchArgs(argsString, rawArgs);
+    if (normalized.ok === false) {
+        return { ok: false, reason: normalized.reason };
     }
-    const extractFromRecord = (rec) => {
-        // Special case: argsString claims to be JSON but isn't parseable and raw text looks like a patch.
-        if (looksJsonContainer && Object.keys(rec).length === 0 && looksLikePatch(rawTrimmed)) {
-            const patchText = normalizeApplyPatchText(rawTrimmed);
-            if (!patchText.includes('*** Begin Patch'))
-                return { failureReason: 'unsupported_patch_format' };
-            return { patchText };
-        }
-        const patchField = asString(rec.patch);
-        if (patchField && looksLikePatch(patchField)) {
-            const patchText = normalizeApplyPatchText(patchField);
-            if (!patchText.includes('*** Begin Patch'))
-                return { failureReason: 'unsupported_patch_format' };
-            return { patchText };
-        }
-        const diffField = asString(rec.diff) ?? asString(rec.patchText) ?? asString(rec.body);
-        if (diffField && looksLikePatch(diffField)) {
-            const patchText = normalizeApplyPatchText(diffField);
-            if (!patchText.includes('*** Begin Patch'))
-                return { failureReason: 'unsupported_patch_format' };
-            return { patchText };
-        }
-        const inputField = asString(rec.input);
-        if (inputField && looksLikePatch(inputField)) {
-            const patchText = normalizeApplyPatchText(inputField);
-            if (!patchText.includes('*** Begin Patch'))
-                return { failureReason: 'unsupported_patch_format' };
-            return { patchText };
-        }
-        // Common shape: patch text stored under `instructions` (e.g. "*** Update File: ...").
-        const instructionsField = asString(rec.instructions);
-        if (instructionsField && looksLikePatch(instructionsField)) {
-            const patchText = normalizeApplyPatchText(instructionsField);
-            if (!patchText.includes('*** Begin Patch'))
-                return { failureReason: 'unsupported_patch_format' };
-            return { patchText };
-        }
-        // Common wrapper shape (seen in codex samples): { _raw: "{...json...}" }.
-        // `_raw` may contain either patch text or a JSON-encoded structured payload.
-        const rawEnvelope = asString(rec._raw);
-        if (rawEnvelope) {
-            const trimmed = rawEnvelope.trim();
-            if (looksLikePatch(trimmed)) {
-                const patchText = normalizeApplyPatchText(trimmed);
-                if (!patchText.includes('*** Begin Patch'))
-                    return { failureReason: 'unsupported_patch_format' };
-                return { patchText };
-            }
-            const parsed = tryParseJsonLoose(trimmed);
-            if (parsed && isRecord(parsed)) {
-                return extractFromRecord(parsed);
-            }
-            if (Array.isArray(parsed) && parsed.length > 0) {
-                const changesArray = parsed.filter((entry) => isRecord(entry));
-                if (changesArray.length && changesArray.some((c) => typeof c.kind === 'string')) {
-                    const payload = { changes: changesArray };
-                    try {
-                        return { patchText: buildStructuredPatch(payload) };
-                    }
-                    catch (error) {
-                        if (!(error instanceof StructuredApplyPatchError))
-                            throw error;
-                        return { failureReason: error.reason || 'structured_apply_patch_error' };
-                    }
-                }
-            }
-        }
-        const payload = coerceStructuredPayload(rec);
-        if (payload) {
-            try {
-                return { patchText: buildStructuredPatch(payload) };
-            }
-            catch (error) {
-                if (!(error instanceof StructuredApplyPatchError))
-                    throw error;
-                return { failureReason: error.reason || 'structured_apply_patch_error' };
-            }
-        }
-        return {};
+    return {
+        ok: true,
+        normalizedArgs: toJson({ patch: normalized.patchText, input: normalized.patchText })
     };
-    let patchText;
-    let failureReason;
-    if (isRecord(rawArgs)) {
-        const res = extractFromRecord(rawArgs);
-        patchText = res.patchText;
-        failureReason = res.failureReason;
-    }
-    else if (Array.isArray(rawArgs) && rawArgs.length > 0) {
-        // compatibility: arguments may be either:
-        // - a single-element array [{ file, changes: [...] }]
-        // - a raw changes array [{ kind, ... }, ...]
-        const first = rawArgs.find((entry) => isRecord(entry));
-        if (first && Array.isArray(first.changes)) {
-            const res = extractFromRecord(first);
-            patchText = res.patchText;
-            failureReason = res.failureReason;
-        }
-        else {
-            const changesArray = rawArgs.filter((entry) => isRecord(entry));
-            if (changesArray.length && changesArray.some((c) => typeof c.kind === 'string')) {
-                const payload = { changes: changesArray };
-                try {
-                    patchText = buildStructuredPatch(payload);
-                }
-                catch (error) {
-                    if (!(error instanceof StructuredApplyPatchError))
-                        throw error;
-                    failureReason = error.reason || 'structured_apply_patch_error';
-                }
-            }
-        }
-    }
-    else if (typeof rawArgs === 'string' && looksLikePatch(rawArgs)) {
-        const normalized = normalizeApplyPatchText(rawArgs);
-        if (normalized.includes('*** Begin Patch')) {
-            patchText = normalized;
-        }
-        else {
-            failureReason = 'unsupported_patch_format';
-        }
-    }
-    if (!patchText) {
-        if (failureReason)
-            return { ok: false, reason: failureReason };
-        if (looksJsonContainer &&
-            isRecord(rawArgs) &&
-            Object.keys(rawArgs).length === 0 &&
-            rawTrimmed.length > 0 &&
-            !looksLikePatch(rawTrimmed)) {
-            return { ok: false, reason: 'invalid_json' };
-        }
-        return { ok: false, reason: 'missing_changes' };
-    }
-    return { ok: true, normalizedArgs: toJson({ patch: patchText, input: patchText }) };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonstudio/llms",
-  "version": "0.6.1462",
+  "version": "0.6.1733",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -27,7 +27,8 @@
     "test:looprt:gemini": "npm run build && node scripts/tests/loop-rt-gemini.mjs",
     "replay:responses:chat-sse": "node scripts/exp3-responses-sse-to-chat-sse.mjs",
     "replay:responses:loop": "node scripts/exp4-responses-sse-loop.mjs",
-    "test:virtual-router": "npm run build:dev && node scripts/tests/virtual-router-prefer-autoclear.mjs && node scripts/tests/virtual-router-dry-run.mjs && node scripts/tests/virtual-router-context.mjs && node scripts/tests/virtual-router-antigravity-alias-pin.mjs && node scripts/tests/virtual-router-antigravity-auth-verify.mjs",
+    "test:quota-manager": "npm run build:dev && node scripts/tests/quota-manager-402-reset.mjs",
+    "test:virtual-router": "npm run build:dev && node scripts/tests/virtual-router-prefer-autoclear.mjs && node scripts/tests/virtual-router-dry-run.mjs && node scripts/tests/virtual-router-context.mjs && node scripts/tests/virtual-router-antigravity-alias-pin.mjs && node scripts/tests/virtual-router-antigravity-session-binding.mjs && node scripts/tests/virtual-router-antigravity-auth-verify.mjs",
     "test:virtual-router-health": "npm run build:dev && node scripts/tests/virtual-router-health.mjs",
     "test:golden": "npm run build:ci && node scripts/tests/chat-golden-roundtrip.mjs && node scripts/tests/anthropic-golden-roundtrip.mjs",
     "test:coverage": "node scripts/run-ci-coverage.mjs"