@thegitai/cli 1.0.0-beta.8 → 1.0.0-preview.1

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

@@ -1,4 +1,5 @@
-import chalk from 'chalk';
+import chalk from '../colors.js';
+import { startBackgroundJob } from '../background-jobs.js';
 import { getBlockedCommandReason, runCommand, } from '../executor.js';
 import { syncIndexFromDisk } from '../project-index.js';
 import { isTuiMode } from '../runtime-mode.js';
@@ -12,9 +13,10 @@ export async function runShellCommand(context, args) {
     if (!command) {
         return { ok: false, error: 'command is required' };
     }
+    const runInBackground = args.background === true;
     const hasTimeout = typeof args.timeout_ms === 'number' && args.timeout_ms > 0;
     const repoHint = buildNestedGitHint(rootDir, command);
-    const blockedReason = getBlockedCommandReason(command, hasTimeout, rootDir);
+    const blockedReason = getBlockedCommandReason(command, hasTimeout || runInBackground, rootDir);
     if (blockedReason) {
         const error = blockedReason;
         if (!isTuiMode())
@@ -37,7 +39,9 @@ export async function runShellCommand(context, args) {
                 error: 'confirmCommand is required when autoYes is false',
             };
         }
-        const approved = await confirmCommand(command);
+        const approved = await confirmCommand(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}`));
@@ -45,10 +49,13 @@ export async function runShellCommand(context, args) {
                 ok: false,
                 skipped: true,
                 command,
-                error: 'User declined command execution',
+                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.',
             };
         }
     }
+    if (runInBackground) {
+        return runBackgroundCommand(context, command, args.timeout_ms, repoHint);
+    }
     const result = await runCommand(command, rootDir, {
         requestSudoPassword,
         timeout: typeof args.timeout_ms === 'number' && args.timeout_ms > 0 ? args.timeout_ms : undefined,
@@ -67,19 +74,9 @@ export async function runShellCommand(context, args) {
     if (repoSync.added || repoSync.modified || repoSync.removed) {
         onStatus(`Synced repo state after command (${repoSync.added} added, ${repoSync.modified} modified, ${repoSync.removed} removed).`);
     }
-    // Redact connection-string passwords so shell output (e.g. `cat .env`,
-    // `printenv`) cannot leak them into history or telemetry.
-    let output = typeof result.output === 'string'
-        ? redactConnectionStringCredentials(result.output)
+    const output = typeof result.output === 'string'
+        ? boundCommandOutput(redactConnectionStringCredentials(result.output))
         : result.output;
-    if (typeof output === 'string' && output.length > MAX_OUTPUT_CHARS) {
-        const headSize = Math.floor(MAX_OUTPUT_CHARS * 0.2);
-        const tailSize = MAX_OUTPUT_CHARS - headSize;
-        output =
-            output.slice(0, headSize) +
-                `\n\n... (${output.length - headSize - tailSize} chars truncated) ...\n\n` +
-                output.slice(-tailSize);
-    }
     return {
         ok: result.exitCode === 0,
         command,
@@ -92,3 +89,73 @@ export async function runShellCommand(context, args) {
         repoHint,
     };
 }
+export function boundCommandOutput(output) {
+    if (output.length <= MAX_OUTPUT_CHARS)
+        return output;
+    const headSize = Math.floor(MAX_OUTPUT_CHARS * 0.2);
+    const tailSize = MAX_OUTPUT_CHARS - headSize;
+    return (output.slice(0, headSize) +
+        `\n\n... (${output.length - headSize - tailSize} chars truncated) ...\n\n` +
+        output.slice(-tailSize));
+}
+async function runBackgroundCommand(context, command, timeoutMs, repoHint) {
+    const { rootDir, projectIndex, onStatus } = context;
+    const started = await startBackgroundJob(command, rootDir, {
+        startupWaitMs: typeof timeoutMs === 'number' && timeoutMs > 0 ? timeoutMs : undefined,
+        sessionId: context.sessionId,
+    });
+    if (!started.ok || !started.snapshot) {
+        if (!isTuiMode())
+            console.log(chalk.red(`\n  ✖ ${started.error}`));
+        return {
+            ok: false,
+            blocked: true,
+            command,
+            error: started.error ?? 'Background job failed to start.',
+            repoHint,
+        };
+    }
+    const snapshot = started.snapshot;
+    const repoSync = projectIndex.initialized
+        ? await syncIndexFromDisk(projectIndex)
+        : {
+            added: 0,
+            modified: 0,
+            removed: 0,
+            indexedChunks: 0,
+            retrievalTokensUsed: 0,
+        };
+    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 {
+            ok: true,
+            backgrounded: true,
+            command,
+            jobId: snapshot.id,
+            status: 'running',
+            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,
+        };
+    }
+    return {
+        ok: snapshot.exitCode === 0,
+        backgrounded: true,
+        command,
+        jobId: snapshot.id,
+        status: snapshot.status,
+        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,8 +1,9 @@
-import chalk from 'chalk';
+import chalk from '../colors.js';
 import { execFileSync, spawn } from 'node:child_process';
 import { syncIndexFromDisk } from '../project-index.js';
 import { isTuiMode } from '../runtime-mode.js';
 import { buildDeferredShellDiagnostics, invalidateShellDiagnosticsCache, } from './shell-diagnostics.js';
+import { ensureSessionScratchDir } from '../scratch-dir.js';
 const DEFAULT_TIMEOUT = 5 * 60 * 1000;
 const MAX_OUTPUT_CHARS = 4000;
 const MAX_CAPTURE_CHARS = 1024 * 1024;
@@ -99,6 +100,7 @@ function executeNodeScript(rootDir, script, timeout) {
                 npm_config_progress: 'false',
                 npm_config_fund: 'false',
                 npm_config_audit: 'false',
+                THEGITAI_SCRATCH_DIR: ensureSessionScratchDir(),
             },
             stdio: ['pipe', 'pipe', 'pipe'],
         });

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 { 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'

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

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