@thegitai/cli 1.0.0-beta.9 → 1.0.0-preview.10

package/dist/src/tools/shell-job-kill.js

@@ -0,0 +1,48 @@
+import { killBackgroundJob } from '../background-jobs.js';
+import { redactConnectionStringCredentials } from '../secret-preview.js';
+const MAX_JOB_TOOL_OUTPUT_CHARS = 64 * 1024;
+function boundJobToolOutput(output) {
+    if (output.length <= MAX_JOB_TOOL_OUTPUT_CHARS)
+        return output;
+    const headSize = Math.floor(MAX_JOB_TOOL_OUTPUT_CHARS * 0.2);
+    const tailSize = MAX_JOB_TOOL_OUTPUT_CHARS - headSize;
+    return (output.slice(0, headSize) +
+        `\n\n... (${output.length - headSize - tailSize} chars truncated) ...\n\n` +
+        output.slice(-tailSize));
+}
+export async function shellJobKill(context, args) {
+    const jobId = String(args.job_id ?? '').trim();
+    if (!jobId) {
+        return {
+            ok: false,
+            error: 'job_id is required',
+            failureCategory: 'missing_required_argument',
+        };
+    }
+    const result = await killBackgroundJob(jobId, {
+        sessionId: context.sessionId,
+    });
+    if (!result.ok || !result.snapshot) {
+        return {
+            ok: false,
+            error: result.error ?? 'Background job lookup failed.',
+            failureCategory: 'not_found',
+        };
+    }
+    const snapshot = result.snapshot;
+    let finalOutput = redactConnectionStringCredentials(result.finalOutput ?? '');
+    if (result.droppedChars) {
+        finalOutput = `... (${result.droppedChars} chars of older output dropped) ...\n${finalOutput}`;
+    }
+    finalOutput = boundJobToolOutput(finalOutput);
+    return {
+        ok: true,
+        jobId: snapshot.id,
+        command: snapshot.command,
+        status: snapshot.status,
+        exitCode: snapshot.exitCode,
+        alreadyFinished: result.alreadyFinished === true,
+        ranMs: (snapshot.endedAt ?? Date.now()) - snapshot.startedAt,
+        finalOutput,
+    };
+}

package/dist/src/tools/shell-job-output.js

@@ -0,0 +1,51 @@
+import { MAX_JOB_WAIT_MS, readBackgroundJobOutput, } from '../background-jobs.js';
+import { redactConnectionStringCredentials } from '../secret-preview.js';
+const MAX_JOB_TOOL_OUTPUT_CHARS = 64 * 1024;
+function boundJobToolOutput(output) {
+    if (output.length <= MAX_JOB_TOOL_OUTPUT_CHARS)
+        return output;
+    const headSize = Math.floor(MAX_JOB_TOOL_OUTPUT_CHARS * 0.2);
+    const tailSize = MAX_JOB_TOOL_OUTPUT_CHARS - headSize;
+    return (output.slice(0, headSize) +
+        `\n\n... (${output.length - headSize - tailSize} chars truncated) ...\n\n` +
+        output.slice(-tailSize));
+}
+export async function shellJobOutput(context, args) {
+    const jobId = String(args.job_id ?? '').trim();
+    if (!jobId) {
+        return {
+            ok: false,
+            error: 'job_id is required',
+            failureCategory: 'missing_required_argument',
+        };
+    }
+    const waitMs = typeof args.wait_ms === 'number' && args.wait_ms > 0
+        ? Math.min(args.wait_ms, MAX_JOB_WAIT_MS)
+        : 0;
+    const result = await readBackgroundJobOutput(jobId, {
+        waitMs,
+        sessionId: context.sessionId,
+    });
+    if (!result.ok || !result.snapshot) {
+        return {
+            ok: false,
+            error: result.error ?? 'Background job lookup failed.',
+            failureCategory: 'not_found',
+        };
+    }
+    const snapshot = result.snapshot;
+    let newOutput = redactConnectionStringCredentials(result.newOutput ?? '');
+    if (result.droppedChars) {
+        newOutput = `... (${result.droppedChars} chars of older output dropped) ...\n${newOutput}`;
+    }
+    newOutput = boundJobToolOutput(newOutput);
+    return {
+        ok: true,
+        jobId: snapshot.id,
+        command: snapshot.command,
+        status: snapshot.status,
+        exitCode: snapshot.exitCode,
+        elapsedMs: (snapshot.endedAt ?? Date.now()) - snapshot.startedAt,
+        newOutput,
+    };
+}

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

@@ -1,7 +1,8 @@
-import chalk from 'chalk';
+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';
 import { getCurrentFileHash, resolveRedactionTokens } from '../session-safety.js';
@@ -76,7 +77,7 @@ function buildStrReplacePreview(oldString, newString) {
 }
 export async function strReplace(context, args) {
     const { rootDir, projectIndex, autoYes, confirmPatch } = context;
-    const filePath = String(args.filePath ?? args.file_path ?? '').trim();
+    const filePath = repairFilePath(rootDir, String(args.filePath ?? args.file_path ?? '').trim());
     let oldString = typeof args.old_string === 'string'
         ? args.old_string
         : typeof args.oldString === 'string'
@@ -105,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);
@@ -168,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.',
             };
         }
     }
@@ -177,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()) {
@@ -196,6 +221,7 @@ export async function strReplace(context, args) {
         filePath,
         changed,
         operation: 'str_replace',
+        ...(scratchPath ? { scratch: true } : {}),
         replacements,
         indexedChunks,
         retrievalTokensUsed,

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

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+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';

package/dist/src/tools/update-todos.js

@@ -0,0 +1,27 @@
+import { extractTodosArg, replaceTodos } from '../todo-list.js';
+export function updateTodos(_context, args) {
+    const rawTodos = extractTodosArg(args);
+    if (rawTodos === undefined) {
+        return {
+            ok: false,
+            error: 'todos is required (pass [] to clear the list).',
+            failureCategory: 'missing_required_argument',
+        };
+    }
+    const result = replaceTodos(rawTodos);
+    if (!result.ok) {
+        return {
+            ok: false,
+            error: result.error,
+            failureCategory: 'invalid_argument',
+        };
+    }
+    const { snapshot, normalizations } = result;
+    return {
+        ok: true,
+        todos: snapshot.items,
+        completedCount: snapshot.completedCount,
+        totalCount: snapshot.totalCount,
+        ...(normalizations.length ? { normalizations } : {}),
+    };
+}

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

@@ -1,7 +1,7 @@
-import chalk from 'chalk';
+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/tree-sitter-runtime.js

@@ -5,8 +5,15 @@ import { fileURLToPath } from 'node:url';
 import { addSignatureForNode } from './extractors/index.js';
 import { getRepoMapLanguageForFile, } from './repo-map-languages.js';
 const require = createRequire(import.meta.url);
-const TreeSitter = require('web-tree-sitter');
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
+function resolveVendoredTreeSitter() {
+    const candidates = [
+        path.resolve(__dirname, '..', 'vendor', 'web-tree-sitter', 'web-tree-sitter.cjs'),
+        path.resolve(__dirname, '..', '..', 'vendor', 'web-tree-sitter', 'web-tree-sitter.cjs'),
+    ];
+    return candidates.find((candidate) => existsSync(candidate)) ?? candidates[0];
+}
+const TreeSitter = require(resolveVendoredTreeSitter());
 let parserInitPromise = null;
 const parserCache = Object.create(null);
 const languageCache = Object.create(null);

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