@thegitai/cli 1.0.0-preview.3 → 1.0.0-preview.31

package/dist/src/tools/run-command.js

@@ -1,14 +1,14 @@
 import chalk from '../colors.js';
 import { startBackgroundJob } from '../background-jobs.js';
 import { getBlockedCommandReason, runCommand, } from '../executor.js';
-import { syncIndexFromDisk } from '../project-index.js';
+import { ensurePermission } from '../permissions.js';
 import { isTuiMode } from '../runtime-mode.js';
 import { redactConnectionStringCredentials } from '../secret-preview.js';
 import { buildNestedGitHint } from '../session-safety.js';
 import { buildDeferredShellDiagnostics, invalidateShellDiagnosticsCache, } from './shell-diagnostics.js';
 const MAX_OUTPUT_CHARS = 4000;
 export async function runShellCommand(context, args) {
-    const { rootDir, projectIndex, autoYes, confirmCommand, requestSudoPassword, onStatus, } = context;
+    const { rootDir, requestSudoPassword, onStatus, } = context;
     const command = String(args.command ?? '').trim();
     if (!command) {
         return { ok: false, error: 'command is required' };
@@ -31,33 +31,18 @@ export async function runShellCommand(context, args) {
     }
     if (!isTuiMode())
         console.log(chalk.bold.yellow(`\n  ⚡ Command: ${command}`));
-    if (!autoYes) {
-        if (confirmCommand == null) {
-            return {
-                ok: false,
-                command,
-                error: 'confirmCommand is required when autoYes is false',
-            };
-        }
-        const approved = await confirmCommand(runInBackground
+    const denied = await ensurePermission(context, {
+        bucket: 'run',
+        title: 'Approve command?',
+        body: runInBackground
             ? `${command}\n\nRuns as a managed background job until it exits or is killed.`
-            : command);
-        if (!approved) {
-            if (!isTuiMode())
-                console.log(chalk.dim(`  ⏭  Skipped: ${command}`));
-            return {
-                ok: false,
-                skipped: true,
-                command,
-                failureCategory: 'user_declined',
-                failureDetails: {
-                    category: 'user_declined',
-                    tool: 'run_command',
-                    action: 'Respect the real user’s decision. Do not retry the same or an equivalent action; reconsider the approach or ask one specific question if needed.',
-                },
-                error: 'The real user rejected this proposed command. Nothing was executed; this was not a tool failure or an automated system skip.',
-            };
-        }
+            : command,
+        command,
+    }, 'run_command', { command });
+    if (denied) {
+        if (!isTuiMode())
+            console.log(chalk.dim(`  ⏭  Skipped: ${command}`));
+        return denied;
     }
     if (runInBackground) {
         return runBackgroundCommand(context, command, args.timeout_ms, repoHint);
@@ -66,12 +51,8 @@ export async function runShellCommand(context, args) {
         requestSudoPassword,
         timeout: typeof args.timeout_ms === 'number' && args.timeout_ms > 0 ? args.timeout_ms : undefined,
     });
-    const repoSync = await syncRepoIndex(projectIndex, onStatus);
     invalidateShellDiagnosticsCache(rootDir);
     const diagnostics = buildDeferredShellDiagnostics('run_command');
-    if (repoSync.added || repoSync.modified || repoSync.removed) {
-        onStatus(`Synced repo state after command (${repoSync.added} added, ${repoSync.modified} modified, ${repoSync.removed} removed).`);
-    }
     const output = typeof result.output === 'string'
         ? boundCommandOutput(redactConnectionStringCredentials(result.output))
         : result.output;
@@ -81,8 +62,6 @@ export async function runShellCommand(context, args) {
         exitCode: result.exitCode,
         timedOut: result.timedOut,
         output,
-        repoSync,
-        retrievalTokensUsed: repoSync.retrievalTokensUsed,
         diagnostics,
         repoHint,
     };
@@ -96,36 +75,8 @@ export function boundCommandOutput(output) {
         `\n\n... (${output.length - headSize - tailSize} chars truncated) ...\n\n` +
         output.slice(-tailSize));
 }
-async function syncRepoIndex(projectIndex, onStatus) {
-    if (!projectIndex.initialized) {
-        return {
-            added: 0,
-            modified: 0,
-            removed: 0,
-            indexedChunks: 0,
-            retrievalTokensUsed: 0,
-        };
-    }
-    try {
-        return await syncIndexFromDisk(projectIndex);
-    }
-    catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        onStatus(`Command completed, but local index sync failed: ${message}`);
-        return {
-            added: 0,
-            modified: 0,
-            removed: 0,
-            indexedChunks: 0,
-            retrievalTokensUsed: 0,
-            skipped: true,
-            reason: 'local index sync failed after command execution',
-            error: message,
-        };
-    }
-}
 async function runBackgroundCommand(context, command, timeoutMs, repoHint) {
-    const { rootDir, projectIndex, onStatus } = context;
+    const { rootDir, onStatus } = context;
     const started = await startBackgroundJob(command, rootDir, {
         startupWaitMs: typeof timeoutMs === 'number' && timeoutMs > 0 ? timeoutMs : undefined,
         sessionId: context.sessionId,
@@ -142,11 +93,7 @@ async function runBackgroundCommand(context, command, timeoutMs, repoHint) {
         };
     }
     const snapshot = started.snapshot;
-    const repoSync = await syncRepoIndex(projectIndex, onStatus);
     invalidateShellDiagnosticsCache(rootDir);
-    if (repoSync.added || repoSync.modified || repoSync.removed) {
-        onStatus(`Synced repo state after command (${repoSync.added} added, ${repoSync.modified} modified, ${repoSync.removed} removed).`);
-    }
     const output = boundCommandOutput(redactConnectionStringCredentials(started.startupOutput ?? '').trim());
     if (snapshot.status === 'running') {
         return {
@@ -158,8 +105,6 @@ async function runBackgroundCommand(context, command, timeoutMs, repoHint) {
             pid: snapshot.pid,
             output,
             note: `Background job ${snapshot.id} is running. Use shell_job_output to poll status and new output, and shell_job_kill to stop it.`,
-            repoSync,
-            retrievalTokensUsed: repoSync.retrievalTokensUsed,
             repoHint,
         };
     }
@@ -172,8 +117,6 @@ async function runBackgroundCommand(context, command, timeoutMs, repoHint) {
         exitCode: snapshot.exitCode,
         output,
         note: `Background job ${snapshot.id} finished during the startup window.`,
-        repoSync,
-        retrievalTokensUsed: repoSync.retrievalTokensUsed,
         repoHint,
     };
 }

package/dist/src/tools/run-node-script.js

@@ -1,6 +1,6 @@
 import chalk from '../colors.js';
-import { execFileSync, spawn } from 'node:child_process';
-import { syncIndexFromDisk } from '../project-index.js';
+import { spawn } from 'node:child_process';
+import { ensurePermission } from '../permissions.js';
 import { isTuiMode } from '../runtime-mode.js';
 import { buildDeferredShellDiagnostics, invalidateShellDiagnosticsCache, } from './shell-diagnostics.js';
 import { ensureSessionScratchDir } from '../scratch-dir.js';
@@ -56,29 +56,6 @@ function buildOutput(stdout, stderr, exitCode) {
         return trimOutput(stdout.trim());
     return trimOutput([stdout, stderr].filter(Boolean).join('\n').trim());
 }
-function emptyRepoSync(reason) {
-    return {
-        added: 0,
-        modified: 0,
-        removed: 0,
-        indexedChunks: 0,
-        retrievalTokensUsed: 0,
-        skipped: true,
-        ...(reason ? { reason } : {}),
-    };
-}
-function readGitStatusSignature(rootDir) {
-    try {
-        return execFileSync('git', ['-C', rootDir, 'status', '--porcelain=v1', '--untracked-files=all'], {
-            encoding: 'utf-8',
-            stdio: ['ignore', 'pipe', 'ignore'],
-            timeout: 10_000,
-        });
-    }
-    catch {
-        return null;
-    }
-}
 function executeNodeScript(rootDir, script, timeout) {
     const effectiveTimeout = typeof timeout === 'number' && timeout > 0
         ? timeout
@@ -148,7 +125,7 @@ function executeNodeScript(rootDir, script, timeout) {
     });
 }
 export async function runNodeScript(context, args) {
-    const { rootDir, autoYes, confirmCommand } = context;
+    const { rootDir } = context;
     const script = typeof args.script === 'string' ? args.script : '';
     if (!script.trim()) {
         return { ok: false, error: 'script is required' };
@@ -158,65 +135,21 @@ export async function runNodeScript(context, args) {
         console.log(chalk.bold.yellow(`\n  ⚡ Node script:\n${commandForApproval}\n`));
         console.log(chalk.dim(`    in: ${rootDir}\n`));
     }
-    if (!autoYes) {
-        if (confirmCommand == null) {
-            return {
-                ok: false,
-                command: COMMAND_LABEL,
-                error: 'confirmCommand is required when autoYes is false',
-            };
-        }
-        const approved = await confirmCommand(commandForApproval);
-        if (!approved) {
-            if (!isTuiMode()) {
-                console.log(chalk.dim(`  ⏭  Skipped: ${COMMAND_LABEL}`));
-            }
-            return {
-                ok: false,
-                skipped: true,
-                command: COMMAND_LABEL,
-                failureCategory: 'user_declined',
-                failureDetails: {
-                    category: 'user_declined',
-                    tool: 'run_node_script',
-                    action: 'Respect the real user’s decision. Do not retry the same or an equivalent action; reconsider the approach or ask one specific question if needed.',
-                },
-                error: 'The real user rejected this proposed script. Nothing was executed; this was not a tool failure or an automated system skip.',
-            };
+    const denied = await ensurePermission(context, {
+        bucket: 'run',
+        title: 'Approve node script?',
+        body: commandForApproval,
+    }, 'run_node_script', { command: COMMAND_LABEL });
+    if (denied) {
+        if (!isTuiMode()) {
+            console.log(chalk.dim(`  ⏭  Skipped: ${COMMAND_LABEL}`));
         }
+        return denied;
     }
-    const beforeGitStatus = readGitStatusSignature(rootDir);
     const result = await executeNodeScript(rootDir, script, typeof args.timeout_ms === 'number' && args.timeout_ms > 0
         ? args.timeout_ms
         : undefined);
-    const afterGitStatus = readGitStatusSignature(rootDir);
-    const gitStatusCleanBeforeAndAfter = beforeGitStatus === '' && afterGitStatus === '';
-    const shouldSync = context.projectIndex.initialized && !gitStatusCleanBeforeAndAfter;
-    let repoSync;
-    if (shouldSync) {
-        try {
-            repoSync = await syncIndexFromDisk(context.projectIndex);
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            context.onStatus(`Node script completed, but local index sync failed: ${message}`);
-            repoSync = {
-                ...emptyRepoSync('local index sync failed after Node script execution'),
-                error: message,
-            };
-        }
-    }
-    else {
-        repoSync = emptyRepoSync(!context.projectIndex.initialized
-            ? 'project index not initialized'
-            : gitStatusCleanBeforeAndAfter
-                ? 'git status clean before and after'
-                : 'sync not needed');
-    }
     invalidateShellDiagnosticsCache(rootDir);
-    if (repoSync.added || repoSync.modified || repoSync.removed) {
-        context.onStatus(`Synced repo state after Node script (${repoSync.added} added, ${repoSync.modified} modified, ${repoSync.removed} removed).`);
-    }
     return {
         ok: result.exitCode === 0,
         command: COMMAND_LABEL,
@@ -225,8 +158,6 @@ export async function runNodeScript(context, args) {
         stdout: result.stdout,
         stderr: result.stderr,
         output: result.output,
-        repoSync,
-        retrievalTokensUsed: repoSync.retrievalTokensUsed,
         diagnostics: buildDeferredShellDiagnostics('run_node_script'),
     };
 }

package/dist/src/tools/save-generated-image.js

@@ -0,0 +1,120 @@
+import { existsSync, mkdirSync, readdirSync, rmSync, statSync, writeFileSync, } from 'node:fs';
+import path from 'node:path';
+import { getClientStateDir } from '../client-state.js';
+import { MAX_IMAGE_SIZE_BYTES, sniffImageMimeType, } from '../core/image-limits.js';
+const IMAGE_FILE_MODE = 0o600;
+const IMAGE_DIR_MODE = 0o700;
+export const GENERATED_IMAGES_SUBDIR = 'generated_images';
+export const GENERATED_IMAGE_MAX_AGE_MS = 30 * 24 * 60 * 60 * 1000;
+export function getGeneratedImagesDir(env = process.env) {
+    return path.join(getClientStateDir(env), GENERATED_IMAGES_SUBDIR);
+}
+export function sanitizeGeneratedImageBasename(raw) {
+    const trimmed = String(raw ?? '').trim();
+    const base = trimmed
+        .replace(/\\/g, '/')
+        .split('/')
+        .pop()
+        ?.replace(/^\.+/, '')
+        .replace(/[^\w.\-]+/g, '-')
+        .replace(/-+/g, '-')
+        .replace(/^-+|-+$/g, '')
+        .replace(/-\.|\.-/g, '.')
+        .replace(/^-+|-+$/g, '')
+        .slice(0, 80);
+    if (!base || base === '.' || base === '..') {
+        return `generated-${Date.now()}.png`;
+    }
+    if (/\.png$/i.test(base)) {
+        return base.replace(/\.png$/i, '.png');
+    }
+    const withoutExt = base.replace(/\.[^.]+$/, '').replace(/-+$/g, '');
+    return `${withoutExt || 'generated'}.png`;
+}
+function uniquePath(dir, basename) {
+    const candidate = path.join(dir, basename);
+    if (!existsSync(candidate)) {
+        return candidate;
+    }
+    const ext = path.extname(basename) || '.png';
+    const stem = path.basename(basename, ext);
+    for (let i = 2; i < 10_000; i += 1) {
+        const next = path.join(dir, `${stem}-${i}${ext}`);
+        if (!existsSync(next)) {
+            return next;
+        }
+    }
+    return path.join(dir, `${stem}-${Date.now()}${ext}`);
+}
+export function sweepGeneratedImages({ maxAgeMs = GENERATED_IMAGE_MAX_AGE_MS, env = process.env, now = Date.now(), } = {}) {
+    const dir = getGeneratedImagesDir(env);
+    if (!existsSync(dir))
+        return 0;
+    let removed = 0;
+    let entries;
+    try {
+        entries = readdirSync(dir);
+    }
+    catch {
+        return 0;
+    }
+    for (const entry of entries) {
+        const filePath = path.join(dir, entry);
+        try {
+            if (now - statSync(filePath).mtimeMs < maxAgeMs)
+                continue;
+            rmSync(filePath, { force: true });
+            removed += 1;
+        }
+        catch {
+        }
+    }
+    return removed;
+}
+export function saveGeneratedImage(args) {
+    const base64Data = String(args.base64Data ?? '').trim();
+    if (!base64Data) {
+        return {
+            ok: false,
+            error: 'This CLI build cannot generate images without server-supplied image bytes. Update TheGitAI CLI.',
+            failureCategory: 'tool_exception',
+        };
+    }
+    let bytes;
+    try {
+        bytes = Buffer.from(base64Data, 'base64');
+    }
+    catch {
+        return {
+            ok: false,
+            error: 'Generated image bytes are invalid.',
+            failureCategory: 'invalid_argument',
+        };
+    }
+    if (bytes.length === 0 || bytes.length > MAX_IMAGE_SIZE_BYTES) {
+        return {
+            ok: false,
+            error: 'Generated image exceeded the allowed size limit.',
+            failureCategory: 'invalid_argument',
+        };
+    }
+    const sniffed = sniffImageMimeType(bytes);
+    if (sniffed !== 'image/png') {
+        return {
+            ok: false,
+            error: 'Generated image must be a PNG.',
+            failureCategory: 'invalid_argument',
+        };
+    }
+    const env = args.env ?? process.env;
+    const dir = getGeneratedImagesDir(env);
+    mkdirSync(dir, { recursive: true, mode: IMAGE_DIR_MODE });
+    const basename = sanitizeGeneratedImageBasename(args.suggestedFilename ?? args.filename);
+    const target = uniquePath(dir, basename);
+    writeFileSync(target, bytes, { mode: IMAGE_FILE_MODE });
+    return {
+        ok: true,
+        path: target,
+        message: `Image saved to ${target}`,
+    };
+}

package/dist/src/tools/str-replace.js

@@ -3,10 +3,10 @@ import path from 'node:path';
 import { normalizeProjectRelativePath } from '../artifact-policy.js';
 import { classifyProjectPath, readProjectFile, writeProjectFile, } from '../patcher.js';
 import { repairFilePath } from './path-suggest.js';
-import { upsertIndexFile } from '../project-index.js';
 import { isTuiMode } from '../runtime-mode.js';
 import { getCurrentFileHash, resolveRedactionTokens } from '../session-safety.js';
 import { invalidateShellDiagnosticsCache, runShellDiagnostics, } from './shell-diagnostics.js';
+import { ensurePermission } from '../permissions.js';
 const DOCUMENT_EXTENSIONS = new Set(['.pdf', '.xlsx', '.docx']);
 function countOccurrences(haystack, needle) {
     if (needle.length === 0)
@@ -76,7 +76,7 @@ function buildStrReplacePreview(oldString, newString) {
     return `@@ str_replace @@\n${minus}\n${plus}`;
 }
 export async function strReplace(context, args) {
-    const { rootDir, projectIndex, autoYes, confirmPatch } = context;
+    const { rootDir } = context;
     const filePath = repairFilePath(rootDir, String(args.filePath ?? args.file_path ?? '').trim());
     let oldString = typeof args.old_string === 'string'
         ? args.old_string
@@ -175,35 +175,23 @@ export async function strReplace(context, args) {
         }
         console.log();
     }
-    if (!autoYes && confirmPatch) {
-        const confirmed = await confirmPatch(filePath, preview);
-        if (!confirmed) {
+    if (!scratchPath) {
+        const denied = await ensurePermission(context, {
+            bucket: 'edit',
+            title: 'Approve patch?',
+            body: 'Review changes before applying.',
+            filePath,
+            diff: preview,
+        }, 'str_replace', { filePath });
+        if (denied) {
             if (!isTuiMode())
                 console.log(chalk.dim(`  ⏭  str_replace skipped: ${filePath}`));
-            return {
-                ok: false,
-                skipped: true,
-                filePath,
-                failureCategory: 'user_declined',
-                failureDetails: {
-                    category: 'user_declined',
-                    tool: 'str_replace',
-                    action: 'Respect the real user’s decision. Do not retry the same or an equivalent edit; reconsider the approach or ask one specific question if needed.',
-                },
-                error: 'The real user rejected this proposed edit. Nothing was changed; this was not a tool failure or an automated system skip.',
-            };
+            return denied;
         }
     }
     const nextContent = originalContent.split(oldString).join(newString);
     const { changed } = writeProjectFile(rootDir, filePath, nextContent);
     const replacements = changed ? (replaceAll ? n : 1) : 0;
-    let indexedChunks = 0;
-    let retrievalTokensUsed = 0;
-    if (changed && !scratchPath) {
-        const indexResult = await upsertIndexFile(projectIndex, filePath);
-        indexedChunks = indexResult.indexedChunks;
-        retrievalTokensUsed = indexResult.retrievalTokensUsed ?? 0;
-    }
     let diagnostics;
     if (!scratchPath) {
         invalidateShellDiagnosticsCache(rootDir, filePath);
@@ -223,8 +211,6 @@ export async function strReplace(context, args) {
         operation: 'str_replace',
         ...(scratchPath ? { scratch: true } : {}),
         replacements,
-        indexedChunks,
-        retrievalTokensUsed,
         bytesWritten: Buffer.byteLength(nextContent, 'utf-8'),
         diagnostics,
         message: changed ? undefined : 'The provided replacement resulted in no changes to the file content.',

package/dist/src/tools/undo-edit.js

@@ -1,7 +1,6 @@
 import chalk from '../colors.js';
 import { hashStoredContent, readFileEditSnapshot, storedContentBuffer, } from '../edit-journal.js';
 import { deleteProjectFile, writeProjectFile, writeProjectFileBuffer, } from '../patcher.js';
-import { removeIndexFile, upsertIndexFile, } from '../project-index.js';
 import { isTuiMode } from '../runtime-mode.js';
 import { invalidateShellDiagnosticsCache, runShellDiagnostics, } from './shell-diagnostics.js';
 function normalizeTarget(value) {
@@ -101,10 +100,9 @@ function validateUndoPlan(rootDir, records) {
     return { ok: true };
 }
 async function applyUndo(context, record) {
-    const { rootDir, projectIndex } = context;
+    const { rootDir } = context;
     if (record.operation === 'create') {
         deleteProjectFile(rootDir, record.filePath);
-        await removeIndexFile(projectIndex, record.filePath);
         return { changed: true };
     }
     if (record.beforeContent === null) {
@@ -113,9 +111,6 @@ async function applyUndo(context, record) {
     const { changed } = record.beforeContentEncoding === 'base64'
         ? writeProjectFileBuffer(rootDir, record.filePath, storedContentBuffer(record.beforeContent, record.beforeContentEncoding))
         : writeProjectFile(rootDir, record.filePath, record.beforeContent);
-    if (changed) {
-        await upsertIndexFile(projectIndex, record.filePath);
-    }
     return { changed };
 }
 function summarizeUndoRecord(record) {

package/dist/src/tools/write-file.js

@@ -2,13 +2,48 @@ import chalk from '../colors.js';
 import path from 'node:path';
 import { normalizeProjectRelativePath } from '../artifact-policy.js';
 import { classifyProjectPath, writeProjectFile } from '../patcher.js';
-import { upsertIndexFile } from '../project-index.js';
+import { readFileEditSnapshot } from '../edit-journal.js';
 import { isTuiMode } from '../runtime-mode.js';
 import { getCurrentFileHash, hasFreshFullReadCoverage, resolveRedactionTokens, } from '../session-safety.js';
 import { invalidateShellDiagnosticsCache, runShellDiagnostics, } from './shell-diagnostics.js';
+import { ensurePermission } from '../permissions.js';
 const DOCUMENT_EXTENSIONS = new Set(['.pdf', '.xlsx', '.docx']);
+const MAX_WRITE_PREVIEW_LINES = 400;
+function boundedLines(text, limit) {
+    const lines = [];
+    let omitted = 0;
+    let start = 0;
+    for (;;) {
+        const newline = text.indexOf('\n', start);
+        if (lines.length < limit) {
+            lines.push(text.slice(start, newline === -1 ? undefined : newline));
+        }
+        else {
+            omitted += 1;
+        }
+        if (newline === -1)
+            break;
+        start = newline + 1;
+    }
+    return { lines, omitted };
+}
+function buildWritePreview(previous, next) {
+    const rows = ['@@ write_file @@'];
+    const append = (text, sign, marker) => {
+        const { lines, omitted } = boundedLines(text, MAX_WRITE_PREVIEW_LINES);
+        for (const line of lines)
+            rows.push(`${sign}${line}`);
+        if (omitted > 0) {
+            rows.push(`@@ ${omitted} more ${marker} line(s) not shown @@`);
+        }
+    };
+    if (previous !== null)
+        append(previous, '-', 'removed');
+    append(next, '+', 'added');
+    return rows.join('\n');
+}
 export async function writeFile(context, args) {
-    const { rootDir, projectIndex } = context;
+    const { rootDir } = context;
     const filePath = String(args.filePath ?? '').trim();
     let content = typeof args.content === 'string' ? args.content : '';
     if (!filePath) {
@@ -60,14 +95,37 @@ export async function writeFile(context, args) {
         };
     }
     content = resolveRedactionTokens(context.safety, content, coveragePath, currentHash);
-    const { changed } = writeProjectFile(rootDir, filePath, content);
-    let indexedChunks = 0;
-    let retrievalTokensUsed = 0;
-    if (changed && !scratchPath) {
-        const indexResult = await upsertIndexFile(projectIndex, filePath);
-        indexedChunks = indexResult.indexedChunks;
-        retrievalTokensUsed = indexResult.retrievalTokensUsed ?? 0;
+    if (!scratchPath) {
+        const before = currentHash === null ? null : readFileEditSnapshot(rootDir, filePath);
+        const existing = before && before.contentEncoding === 'utf8' ? before.content : null;
+        const denied = await ensurePermission(context, {
+            bucket: currentHash === null ? 'create' : 'edit',
+            title: currentHash === null ? 'Approve new file?' : 'Approve patch?',
+            body: 'Review changes before applying.',
+            filePath,
+            diff: buildWritePreview(existing, content),
+        }, 'write_file', { filePath });
+        if (denied) {
+            if (!isTuiMode())
+                console.log(chalk.dim(`  ⏭  write_file skipped: ${filePath}`));
+            return denied;
+        }
+        if (getCurrentFileHash(rootDir, filePath) !== currentHash) {
+            return {
+                ok: false,
+                filePath,
+                failureCategory: 'conflict',
+                error: `write_file refused: ${filePath} changed on disk while the approval prompt was open.`,
+                failureDetails: {
+                    category: 'conflict',
+                    tool: 'write_file',
+                    action: 'Re-read the file to see its current contents, then decide whether the write is still correct and retry.',
+                },
+                currentHash,
+            };
+        }
     }
+    const { changed } = writeProjectFile(rootDir, filePath, content);
     let diagnostics;
     if (!scratchPath) {
         invalidateShellDiagnosticsCache(rootDir, filePath);
@@ -84,8 +142,6 @@ export async function writeFile(context, args) {
         changed,
         operation: 'write',
         ...(scratchPath ? { scratch: true } : {}),
-        indexedChunks,
-        retrievalTokensUsed,
         bytesWritten: Buffer.byteLength(content, 'utf-8'),
         diagnostics,
     };

package/dist/src/turn-failure-marker.js

@@ -0,0 +1,11 @@
+const TURN_FAILURE_MARKER_PATTERN = /^Turn failed before completion: ([a-z][a-z0-9_-]*)\.?$/i;
+export function formatTurnFailureMarker(category) {
+    const normalized = category.trim().toLowerCase();
+    const safeCategory = /^[a-z][a-z0-9_-]*$/.test(normalized)
+        ? normalized
+        : 'unknown_error';
+    return `Turn failed before completion: ${safeCategory}.`;
+}
+export function isTurnFailureMarker(text) {
+    return TURN_FAILURE_MARKER_PATTERN.test(text.trim());
+}

package/dist/src/ui/prompt-history-store.js

@@ -3,7 +3,7 @@ import path from 'node:path';
 import { getClientStateDir } from '../client-state.js';
 const HISTORY_FILE = 'prompt-history.json';
 const LEGACY_HISTORY_FILE = 'prompt-history.txt';
-export const MAX_PROMPT_HISTORY_ENTRIES = 15;
+export const MAX_PROMPT_HISTORY_ENTRIES = 20;
 const ENTRY_SEPARATOR = '\x1e';
 function getHistoryFilePath(env = process.env) {
     return path.join(getClientStateDir(env), HISTORY_FILE);