@thegitai/cli 1.0.0-preview.1 → 1.0.0-preview.11

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

@@ -49,7 +49,13 @@ export async function runShellCommand(context, args) {
                 ok: false,
                 skipped: true,
                 command,
-                error: 'User declined command execution. Do not rerun this command or try a broader variant of it; either continue without it or ask the user one specific question about how to proceed.',
+                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.',
             };
         }
     }
@@ -60,15 +66,7 @@ export async function runShellCommand(context, args) {
         requestSudoPassword,
         timeout: typeof args.timeout_ms === 'number' && args.timeout_ms > 0 ? args.timeout_ms : undefined,
     });
-    const repoSync = projectIndex.initialized
-        ? await syncIndexFromDisk(projectIndex)
-        : {
-            added: 0,
-            modified: 0,
-            removed: 0,
-            indexedChunks: 0,
-            retrievalTokensUsed: 0,
-        };
+    const repoSync = await syncRepoIndex(projectIndex, onStatus);
     invalidateShellDiagnosticsCache(rootDir);
     const diagnostics = buildDeferredShellDiagnostics('run_command');
     if (repoSync.added || repoSync.modified || repoSync.removed) {
@@ -98,6 +96,34 @@ 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 started = await startBackgroundJob(command, rootDir, {
@@ -116,15 +142,7 @@ async function runBackgroundCommand(context, command, timeoutMs, repoHint) {
         };
     }
     const snapshot = started.snapshot;
-    const repoSync = projectIndex.initialized
-        ? await syncIndexFromDisk(projectIndex)
-        : {
-            added: 0,
-            modified: 0,
-            removed: 0,
-            indexedChunks: 0,
-            retrievalTokensUsed: 0,
-        };
+    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).`);

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

@@ -175,7 +175,13 @@ export async function runNodeScript(context, args) {
                 ok: false,
                 skipped: true,
                 command: COMMAND_LABEL,
-                error: 'User declined command execution',
+                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.',
             };
         }
     }
@@ -186,13 +192,27 @@ export async function runNodeScript(context, args) {
     const afterGitStatus = readGitStatusSignature(rootDir);
     const gitStatusCleanBeforeAndAfter = beforeGitStatus === '' && afterGitStatus === '';
     const shouldSync = context.projectIndex.initialized && !gitStatusCleanBeforeAndAfter;
-    const repoSync = shouldSync
-        ? await syncIndexFromDisk(context.projectIndex)
-        : emptyRepoSync(!context.projectIndex.initialized
+    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).`);

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

@@ -1,7 +1,7 @@
 import chalk from '../colors.js';
 import path from 'node:path';
 import { normalizeProjectRelativePath } from '../artifact-policy.js';
-import { readProjectFile, writeProjectFile } from '../patcher.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';
@@ -106,6 +106,21 @@ export async function strReplace(context, args) {
             failureCategory: 'invalid_argument',
         };
     }
+    const pathKind = classifyProjectPath(rootDir, filePath);
+    if (pathKind === 'outside') {
+        return {
+            ok: false,
+            filePath,
+            error: `Refusing to edit outside the project root: ${filePath}. Editable locations are the project root and the session scratch directory ($THEGITAI_SCRATCH_DIR).`,
+            failureCategory: 'invalid_argument',
+            failureDetails: {
+                category: 'invalid_argument',
+                tool: 'str_replace',
+                action: 'Edit files inside the project root, or use an absolute path under the session scratch directory ($THEGITAI_SCRATCH_DIR) for temporary files.',
+            },
+        };
+    }
+    const scratchPath = pathKind === 'scratch';
     let originalContent;
     try {
         originalContent = readProjectFile(rootDir, filePath);
@@ -169,7 +184,13 @@ export async function strReplace(context, args) {
                 ok: false,
                 skipped: true,
                 filePath,
-                error: 'User declined str_replace',
+                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.',
             };
         }
     }
@@ -178,13 +199,16 @@ export async function strReplace(context, args) {
     const replacements = changed ? (replaceAll ? n : 1) : 0;
     let indexedChunks = 0;
     let retrievalTokensUsed = 0;
-    if (changed) {
+    if (changed && !scratchPath) {
         const indexResult = await upsertIndexFile(projectIndex, filePath);
         indexedChunks = indexResult.indexedChunks;
         retrievalTokensUsed = indexResult.retrievalTokensUsed ?? 0;
     }
-    invalidateShellDiagnosticsCache(rootDir, filePath);
-    const diagnostics = runShellDiagnostics(rootDir, filePath);
+    let diagnostics;
+    if (!scratchPath) {
+        invalidateShellDiagnosticsCache(rootDir, filePath);
+        diagnostics = runShellDiagnostics(rootDir, filePath);
+    }
     const originalLines = originalContent.split('\n').length;
     const nextLines = nextContent.split('\n').length;
     if (!isTuiMode()) {
@@ -197,6 +221,7 @@ export async function strReplace(context, args) {
         filePath,
         changed,
         operation: 'str_replace',
+        ...(scratchPath ? { scratch: true } : {}),
         replacements,
         indexedChunks,
         retrievalTokensUsed,

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

@@ -1,7 +1,7 @@
 import chalk from '../colors.js';
 import path from 'node:path';
 import { normalizeProjectRelativePath } from '../artifact-policy.js';
-import { writeProjectFile } from '../patcher.js';
+import { classifyProjectPath, writeProjectFile } from '../patcher.js';
 import { upsertIndexFile } from '../project-index.js';
 import { isTuiMode } from '../runtime-mode.js';
 import { getCurrentFileHash, hasFreshFullReadCoverage, resolveRedactionTokens, } from '../session-safety.js';
@@ -25,9 +25,25 @@ export async function writeFile(context, args) {
             failureCategory: 'invalid_argument',
         };
     }
+    const pathKind = classifyProjectPath(rootDir, filePath);
+    if (pathKind === 'outside') {
+        return {
+            ok: false,
+            filePath,
+            error: `Refusing to write outside the project root: ${filePath}. Writable locations are the project root and the session scratch directory ($THEGITAI_SCRATCH_DIR).`,
+            failureCategory: 'invalid_argument',
+            failureDetails: {
+                category: 'invalid_argument',
+                tool: 'write_file',
+                action: 'Write inside the project root, or use an absolute path under the session scratch directory ($THEGITAI_SCRATCH_DIR) for temporary files.',
+            },
+        };
+    }
+    const scratchPath = pathKind === 'scratch';
     const coveragePath = normalizeProjectRelativePath(rootDir, filePath) ?? filePath;
     const currentHash = getCurrentFileHash(rootDir, filePath);
-    if (currentHash !== null &&
+    if (!scratchPath &&
+        currentHash !== null &&
         context.safety &&
         !hasFreshFullReadCoverage(context.safety, coveragePath, currentHash)) {
         return {
@@ -47,13 +63,16 @@ export async function writeFile(context, args) {
     const { changed } = writeProjectFile(rootDir, filePath, content);
     let indexedChunks = 0;
     let retrievalTokensUsed = 0;
-    if (changed) {
+    if (changed && !scratchPath) {
         const indexResult = await upsertIndexFile(projectIndex, filePath);
         indexedChunks = indexResult.indexedChunks;
         retrievalTokensUsed = indexResult.retrievalTokensUsed ?? 0;
     }
-    invalidateShellDiagnosticsCache(rootDir, filePath);
-    const diagnostics = runShellDiagnostics(rootDir, filePath);
+    let diagnostics;
+    if (!scratchPath) {
+        invalidateShellDiagnosticsCache(rootDir, filePath);
+        diagnostics = runShellDiagnostics(rootDir, filePath);
+    }
     if (!isTuiMode()) {
         const icon = changed ? '✨' : '📝';
         const label = changed ? 'Created/Updated' : 'Created/Updated (no change)';
@@ -64,6 +83,7 @@ export async function writeFile(context, args) {
         filePath,
         changed,
         operation: 'write',
+        ...(scratchPath ? { scratch: true } : {}),
         indexedChunks,
         retrievalTokensUsed,
         bytesWritten: Buffer.byteLength(content, 'utf-8'),

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);