@thegitai/cli 1.0.0-preview.5 → 1.0.0-preview.50

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