@thegitai/cli 1.0.0-beta.7 → 1.0.0-beta.8

package/dist/src/tools/path-suggest.js

@@ -0,0 +1,66 @@
+import { readdirSync } from 'node:fs';
+import path from 'node:path';
+import { isSensitiveProjectPath } from '../artifact-policy.js';
+// "File not found" recovery hint: when a model mistypes a filename (most
+// often Unicode punctuation — a straight ' for a curly ’ — or a small typo),
+// suggest the closest real file from the same directory.
+function foldName(name) {
+    return name
+        .normalize('NFC')
+        .replace(/[‘’ʼ]/g, "'")
+        .replace(/[“”]/g, '"')
+        .replace(/ /g, ' ')
+        .toLowerCase();
+}
+function levenshtein(a, b) {
+    if (a === b)
+        return 0;
+    const rows = a.length + 1;
+    const cols = b.length + 1;
+    let prev = Array.from({ length: cols }, (_, j) => j);
+    for (let i = 1; i < rows; i++) {
+        const current = [i, ...new Array(cols - 1).fill(0)];
+        for (let j = 1; j < cols; j++) {
+            current[j] = Math.min(prev[j] + 1, current[j - 1] + 1, prev[j - 1] + (a[i - 1] === b[j - 1] ? 0 : 1));
+        }
+        prev = current;
+    }
+    return prev[cols - 1];
+}
+export function suggestClosestPath(rootDir, missingPath) {
+    const resolved = path.isAbsolute(missingPath)
+        ? missingPath
+        : path.resolve(rootDir, missingPath);
+    const directory = path.dirname(resolved);
+    const wantedBase = foldName(path.basename(resolved));
+    if (!wantedBase)
+        return null;
+    let candidates;
+    try {
+        candidates = readdirSync(directory);
+    }
+    catch {
+        return null;
+    }
+    const threshold = Math.max(2, Math.floor(wantedBase.length * 0.25));
+    let best = null;
+    let bestDistance = Number.POSITIVE_INFINITY;
+    for (const candidate of candidates) {
+        // Never suggest a file the caller would refuse to read/write directly:
+        // probing a near-miss like `.enx` or `credential.docx` must not leak the
+        // existence of `.env`/credentials through the recovery hint.
+        const candidateRelative = path.relative(rootDir, path.join(directory, candidate));
+        if (isSensitiveProjectPath(candidateRelative))
+            continue;
+        const distance = levenshtein(wantedBase, foldName(candidate));
+        if (distance < bestDistance) {
+            bestDistance = distance;
+            best = candidate;
+        }
+    }
+    if (!best || bestDistance > threshold)
+        return null;
+    const suggested = path.join(directory, best);
+    const relative = path.relative(rootDir, suggested);
+    return relative && !relative.startsWith('..') ? relative : suggested;
+}

package/dist/src/tools/read-document.js

@@ -1,6 +1,7 @@
 import path from 'node:path';
 import { existsSync, readFileSync } from 'node:fs';
 import { isSensitiveProjectPath, normalizeProjectRelativePath, } from '../artifact-policy.js';
+import { suggestClosestPath } from './path-suggest.js';
 import { readCliAuthConfig } from '../api/auth.js';
 export function normalizeDocumentText(raw) {
     const text = String(raw ?? '').replace(/\r\n?/g, '\n');
@@ -55,6 +56,9 @@ async function parseDocumentOnServer(config, fileName, fileData, ext, args) {
             ...(includeParagraphArgs && args.firstParagraph !== undefined
                 ? { firstParagraph: args.firstParagraph }
                 : {}),
+            ...(includeParagraphArgs && args.lastParagraph !== undefined
+                ? { lastParagraph: args.lastParagraph }
+                : {}),
         }),
     });
     const data = await response.json().catch(() => null);
@@ -80,9 +84,12 @@ export async function readDocument(rootDir, args, env) {
         };
     }
     if (!existsSync(resolvedPath)) {
+        const suggestion = suggestClosestPath(rootDir, resolvedPath);
         return {
             ok: false,
-            error: `File not found: ${resolvedPath}`,
+            error: suggestion
+                ? `File not found: ${resolvedPath}. Did you mean "${suggestion}"? Note the exact punctuation (e.g. curly apostrophe ’ vs straight ').`
+                : `File not found: ${resolvedPath}`,
             failureCategory: 'not_found',
         };
     }

package/dist/src/tools/replace-document-text.js

@@ -4,6 +4,7 @@ import path from 'node:path';
 import { isSensitiveProjectPath, normalizeProjectRelativePath, } from '../artifact-policy.js';
 import { readCliAuthConfig } from '../api/auth.js';
 import { resolveProjectPath, writeProjectFileBuffer } from '../patcher.js';
+import { suggestClosestPath } from './path-suggest.js';
 import { isTuiMode } from '../runtime-mode.js';
 function normalizeReplacements(value) {
     if (!Array.isArray(value))
@@ -50,7 +51,7 @@ function renderPreview(filePath, preview) {
     }
     console.log();
 }
-async function replaceDocumentTextOnServer(config, fileName, fileData, replacements, replaceAll) {
+async function replaceDocumentTextOnServer(config, fileName, fileData, replacements, replaceAll, validate) {
     const response = await globalThis.fetch(`${config.serverUrl.replace(/\/+$/, '')}/v1/document/replace-text`, {
         method: 'POST',
         headers: {
@@ -62,6 +63,7 @@ async function replaceDocumentTextOnServer(config, fileName, fileData, replaceme
             fileData: fileData.toString('base64'),
             replacements,
             replaceAll,
+            validate,
         }),
     });
     const data = await response.json().catch(() => null);
@@ -128,14 +130,18 @@ export async function replaceDocumentText(context, args) {
     }
     const sourceAbsPath = resolveProjectPath(context.rootDir, sourcePath);
     if (!existsSync(sourceAbsPath)) {
+        const suggestion = suggestClosestPath(context.rootDir, sourceAbsPath);
         return {
             ok: false,
             filePath: sourcePath,
-            error: `File does not exist: ${sourcePath}`,
+            error: suggestion
+                ? `File does not exist: ${sourcePath}. Did you mean "${suggestion}"? Note the exact punctuation (e.g. curly apostrophe ’ vs straight ').`
+                : `File does not exist: ${sourcePath}`,
             failureCategory: 'not_found',
         };
     }
-    const serverResult = await replaceDocumentTextOnServer(authConfig, path.basename(sourcePath), readFileSync(sourceAbsPath), replacements, args.replaceAll === true || args.replace_all === true);
+    const validateOnly = args.validate === true || args.dryRun === true;
+    const serverResult = await replaceDocumentTextOnServer(authConfig, path.basename(sourcePath), readFileSync(sourceAbsPath), replacements, args.replaceAll === true || args.replace_all === true, validateOnly);
     if (!serverResult.ok) {
         return {
             ...serverResult,
@@ -143,6 +149,38 @@ export async function replaceDocumentText(context, args) {
             failureCategory: serverResult.failureCategory ?? 'external_service',
         };
     }
+    // Validate-only: report per-replacement match info without touching the file.
+    // changed:false marks it non-mutating so the agent loop does not count a
+    // dry-run as an applied edit.
+    if (validateOnly) {
+        return {
+            ok: true,
+            validate: true,
+            changed: false,
+            filePath: sourcePath,
+            operation: 'replace_document_text',
+            results: serverResult.results,
+        };
+    }
+    // No replacement matched: nothing was written. Surface per-item reasons so
+    // the model can correct and resend only the failing entries.
+    const replacementCount = Number(serverResult.replacementCount ?? 0);
+    if (replacementCount === 0) {
+        const failures = Array.isArray(serverResult.replacements)
+            ? serverResult.replacements
+                .filter((item) => item && item.ok === false)
+                .map((item) => `- ${item.error ?? 'no match'}`)
+            : [];
+        return {
+            ok: false,
+            filePath: sourcePath,
+            operation: 'replace_document_text',
+            failureCategory: 'conflict',
+            error: `0 of ${serverResult.requestedCount ?? replacements.length} replacements applied; file unchanged.` +
+                (failures.length ? `\n${failures.join('\n')}` : ''),
+            replacements: serverResult.replacements,
+        };
+    }
     const preview = String(serverResult.preview ?? '');
     renderPreview(targetPath, preview);
     if (!context.autoYes && context.confirmPatch) {
@@ -162,6 +200,14 @@ export async function replaceDocumentText(context, args) {
     const fileData = String(serverResult.fileData ?? '');
     const nextData = Buffer.from(fileData, 'base64');
     const write = writeProjectFileBuffer(context.rootDir, targetPath, nextData);
+    const failedCount = Number(serverResult.failedCount ?? 0);
+    const appliedCount = Number(serverResult.appliedCount ?? replacementCount);
+    const requestedCount = Number(serverResult.requestedCount ?? replacements.length);
+    const partialFailures = Array.isArray(serverResult.replacements)
+        ? serverResult.replacements
+            .filter((item) => item && item.ok === false)
+            .map((item) => `- ${item.error ?? 'no match'}`)
+        : [];
     return {
         ok: true,
         filePath: targetPath,
@@ -169,7 +215,28 @@ export async function replaceDocumentText(context, args) {
         changed: write.changed,
         operation: 'replace_document_text',
         replacementCount: serverResult.replacementCount,
+        requestedCount: serverResult.requestedCount,
+        appliedCount: serverResult.appliedCount,
+        failedCount: serverResult.failedCount,
         replacements: serverResult.replacements,
         bytesWritten: nextData.length,
+        // A partial batch still wrote the matched entries (changed:true above), but
+        // the loop must reflect and repair the missed entries — needsRepair forces
+        // that without losing credit for the applied edits.
+        ...(failedCount > 0
+            ? {
+                needsRepair: true,
+                failureCategory: 'conflict',
+                error: `${appliedCount} of ${requestedCount} replacements applied; ` +
+                    `${failedCount} missed and still need to be fixed:\n` +
+                    partialFailures.join('\n'),
+                failureDetails: {
+                    category: 'conflict',
+                    tool: 'replace_document_text',
+                    action: 'Re-issue replace_document_text for the missed entries only, with corrected oldText. ' +
+                        'Copy the exact text from read_document (mind curly vs straight quotes), or pass validate:true to test a match first.',
+                },
+            }
+            : {}),
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thegitai/cli",
-  "version": "1.0.0-beta.7",
+  "version": "1.0.0-beta.8",
   "description": "TheGitAI CLI client (source-visible, proprietary)",
   "license": "SEE LICENSE IN LICENSE",
   "homepage": "https://thegit.ai",
@@ -27,10 +27,10 @@
     "web-tree-sitter": "^0.26.6"
   },
   "optionalDependencies": {
-    "@thegitai/tui-darwin-arm64": "1.0.0-beta.7",
-    "@thegitai/tui-darwin-x64": "1.0.0-beta.7",
-    "@thegitai/tui-linux-x64": "1.0.0-beta.7",
-    "@thegitai/tui-win32-x64": "1.0.0-beta.7"
+    "@thegitai/tui-darwin-arm64": "1.0.0-beta.8",
+    "@thegitai/tui-darwin-x64": "1.0.0-beta.8",
+    "@thegitai/tui-linux-x64": "1.0.0-beta.8",
+    "@thegitai/tui-win32-x64": "1.0.0-beta.8"
   },
   "publishConfig": {
     "access": "public"