@thegitai/cli 1.0.0-preview.2 → 1.0.0-preview.20

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

@@ -2,13 +2,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, projectIndex, requestSudoPassword, onStatus, } = context;
     const command = String(args.command ?? '').trim();
     if (!command) {
         return { ok: false, error: 'command is required' };
@@ -31,33 +32,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);

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

@@ -1,5 +1,6 @@
 import chalk from '../colors.js';
 import { execFileSync, spawn } from 'node:child_process';
+import { ensurePermission } from '../permissions.js';
 import { syncIndexFromDisk } from '../project-index.js';
 import { isTuiMode } from '../runtime-mode.js';
 import { buildDeferredShellDiagnostics, invalidateShellDiagnosticsCache, } from './shell-diagnostics.js';
@@ -148,7 +149,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,32 +159,16 @@ 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

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

@@ -7,6 +7,7 @@ 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 +77,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, projectIndex } = context;
     const filePath = repairFilePath(rootDir, String(args.filePath ?? args.file_path ?? '').trim());
     let oldString = typeof args.old_string === 'string'
         ? args.old_string
@@ -175,23 +176,18 @@ 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);

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

@@ -2,11 +2,47 @@ import chalk from '../colors.js';
 import path from 'node:path';
 import { normalizeProjectRelativePath } from '../artifact-policy.js';
 import { classifyProjectPath, writeProjectFile } from '../patcher.js';
+import { readFileEditSnapshot } from '../edit-journal.js';
 import { upsertIndexFile } from '../project-index.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 filePath = String(args.filePath ?? '').trim();
@@ -60,6 +96,36 @@ export async function writeFile(context, args) {
         };
     }
     content = resolveRedactionTokens(context.safety, content, coveragePath, currentHash);
+    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 indexedChunks = 0;
     let retrievalTokensUsed = 0;

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