@thegitai/cli 1.0.0-beta.15 → 1.0.0-beta.16

package/dist/src/api/chat.js

@@ -65,7 +65,9 @@ function snapshotForServer(session) {
     return snapshot;
 }
 function imageAttachmentsForServer(attachments) {
-    return (attachments ?? []).map(({ filePath: _filePath, ...attachment }) => attachment);
+    return (attachments ?? []).map(({ filePath, ...attachment }) => attachment.source === 'file' && filePath
+        ? { ...attachment, filePath }
+        : attachment);
 }
 function userHistoryText(entry) {
     return (entry.parts ?? [])

package/dist/src/client-environment.js

@@ -1,6 +1,7 @@
 import { accessSync, constants, readFileSync } from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
+import { ensureSessionScratchDir } from './scratch-dir.js';
 const PACKAGE_MANAGER_CANDIDATES = [
     'apt',
     'apt-get',
@@ -123,5 +124,6 @@ export function collectClientEnvironment(options = {}) {
         shell: detectShell(platform, env),
         ...linuxDistro,
         packageManagers: detectPackageManagers(env, platform, executableExists),
+        scratchDir: options.scratchDir ?? ensureSessionScratchDir(),
     };
 }

package/dist/src/core/image-path-extractor.js

@@ -1,4 +1,4 @@
-import { existsSync } from 'node:fs';
+import { existsSync, statSync } from 'node:fs';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { loadImageFromFile } from './clipboard.js';
@@ -9,12 +9,51 @@ const IMAGE_PATH_PATTERN = new RegExp(`"([^"]*\\.${EXT})"` +
     `|'([^']*\\.${EXT})'` +
     `|file://(\\S*\\.${EXT})` +
     `|(${BARE_PATH})`, 'gi');
+const EXTENSION_TOKEN = new RegExp(`^(?:[A-Za-z]:[\\\\/])?(?:\\\\ |${BARE_CHAR})+$`);
+const MAX_EXTENSION_TOKENS = 8;
+function isFile(p) {
+    try {
+        return statSync(p, { throwIfNoEntry: false })?.isFile() ?? false;
+    }
+    catch {
+        return false;
+    }
+}
+function extendBareMatchAcrossSpaces(input, matchStart, raw, cwd) {
+    const baseInner = raw.replace(/\\ /g, ' ');
+    const baseExists = isFile(path.isAbsolute(baseInner) ? baseInner : path.resolve(cwd, baseInner));
+    let best = null;
+    let candidate = raw;
+    let start = matchStart;
+    let addedSeparator = false;
+    for (let hops = 0; hops < MAX_EXTENSION_TOKENS; hops++) {
+        if (start < 2 || input[start - 1] !== ' ' || /\s/.test(input[start - 2]))
+            break;
+        let i = start - 2;
+        while (i >= 0 && !/\s/.test(input[i]))
+            i--;
+        const tokenStart = i + 1;
+        const token = input.slice(tokenStart, start - 1);
+        if (!EXTENSION_TOKEN.test(token))
+            break;
+        candidate = `${token} ${candidate}`;
+        start = tokenStart;
+        addedSeparator = addedSeparator || /[\\/]/.test(token);
+        if (baseExists && !addedSeparator)
+            continue;
+        const inner = candidate.replace(/\\ /g, ' ');
+        const resolved = path.isAbsolute(inner) ? inner : path.resolve(cwd, inner);
+        if (isFile(resolved))
+            best = candidate;
+    }
+    return best ?? raw;
+}
 function detectImagePaths(input, cwd) {
     const regex = new RegExp(IMAGE_PATH_PATTERN.source, IMAGE_PATH_PATTERN.flags);
-    const rawsByPath = new Map();
+    const detected = [];
     let match;
     while ((match = regex.exec(input)) !== null) {
-        const raw = match[0];
+        let raw = match[0];
         if (match[4] != null && raw.includes('://'))
             continue;
         let inner;
@@ -46,9 +85,21 @@ function detectImagePaths(input, cwd) {
             }
         }
         else {
-            inner = match[4].replace(/\\ /g, ' ');
+            raw = extendBareMatchAcrossSpaces(input, match.index, raw, cwd);
+            inner = raw.replace(/\\ /g, ' ');
         }
         const resolvedPath = path.isAbsolute(inner) ? inner : path.resolve(cwd, inner);
+        const start = match.index - (raw.length - match[0].length);
+        while (detected.length > 0) {
+            const prev = detected[detected.length - 1];
+            if (prev.start + prev.raw.length <= start)
+                break;
+            detected.pop();
+        }
+        detected.push({ resolvedPath, raw, start });
+    }
+    const rawsByPath = new Map();
+    for (const { resolvedPath, raw } of detected) {
         const existing = rawsByPath.get(resolvedPath);
         if (existing) {
             existing.push(raw);

package/dist/src/executor.js

@@ -6,6 +6,7 @@ import os from 'os';
 import path from 'path';
 import { ARTIFACT_INSPECT_BLOCK_DIRS, getBlockedArtifactInspectDir, relativeProjectPath, } from './artifact-policy.js';
 import { emitCommandOutput, isTuiMode } from './runtime-mode.js';
+import { ensureSessionScratchDir, isInsideTheGitAiScratch, sessionScratchDir, } from './scratch-dir.js';
 const requireFromHere = createRequire(import.meta.url);
 let nodePtyCache;
 function loadNodePty() {
@@ -217,6 +218,7 @@ function isExistingDirectory(absPath) {
         return false;
     }
 }
+const OS_TEMP_BLOCK_MARKER = 'os-temp:';
 function getBlockedOsTempInspection(rawToken, rootDir) {
     const token = normalizeToken(rawToken);
     if (!token || !path.isAbsolute(token))
@@ -224,6 +226,8 @@ function getBlockedOsTempInspection(rawToken, rootDir) {
     const resolved = path.resolve(token);
     if (!isInsideOsTemp(resolved))
         return null;
+    if (isInsideTheGitAiScratch(resolved))
+        return null;
     if (rootDir) {
         const resolvedRoot = path.resolve(rootDir);
         if (resolved === resolvedRoot ||
@@ -234,7 +238,7 @@ function getBlockedOsTempInspection(rawToken, rootDir) {
     if (resolved === path.resolve(os.tmpdir()) ||
         hasPathGlob(token) ||
         isExistingDirectory(resolved)) {
-        return path.basename(os.tmpdir()) || os.tmpdir();
+        return `${OS_TEMP_BLOCK_MARKER}${path.basename(os.tmpdir()) || os.tmpdir()}`;
     }
     return null;
 }
@@ -250,6 +254,9 @@ function findBlockedDirForToken(rawToken, rootDir, baseDir, allowBareDirMatch =
         const resolved = path.isAbsolute(token)
             ? path.resolve(token)
             : path.resolve(baseDir ?? rootDir, token);
+        const osTempResolved = getBlockedOsTempInspection(resolved, rootDir);
+        if (osTempResolved)
+            return osTempResolved;
         return getBlockedProjectPathDir(resolved, rootDir);
     }
     if (!allowBareDirMatch || !BLOCKED_PATH_INSPECT_DIRS.has(token)) {
@@ -386,11 +393,16 @@ function findBlockedDirInCommandTokens(command, rootDir, baseDir) {
     }
     return null;
 }
+function expandTempEnvRefs(command) {
+    return command
+        .replace(/\$\{THEGITAI_SCRATCH_DIR[^}]*\}|\$THEGITAI_SCRATCH_DIR\b/g, sessionScratchDir())
+        .replace(/\$\{TMPDIR[^}]*\}|\$TMPDIR\b/g, process.env.TMPDIR || os.tmpdir());
+}
 function findIgnoredPathInspection(command, rootDir) {
     if (!FILE_INSPECTION_COMMAND_PATTERN.test(command)) {
         return null;
     }
-    const haystack = maskNonPathIgnoreDirTokens(maskHereDocumentBodies(command));
+    const haystack = maskNonPathIgnoreDirTokens(maskHereDocumentBodies(expandTempEnvRefs(command)));
     const baseDir = getCommandBaseDir(haystack, rootDir);
     const blockedDir = findBlockedDirInCommandTokens(haystack, rootDir, baseDir);
     if (blockedDir) {
@@ -550,10 +562,17 @@ function terminateChild(child, signal) {
     }
 }
 export function getBlockedPathInspectDir(command, rootDir) {
-    return findIgnoredPathInspection(command, rootDir);
+    const blocked = findIgnoredPathInspection(command, rootDir);
+    return blocked?.startsWith(OS_TEMP_BLOCK_MARKER)
+        ? blocked.slice(OS_TEMP_BLOCK_MARKER.length)
+        : blocked;
 }
 export function getBlockedCommandReason(command, hasTimeout, rootDir) {
     const ignoredDir = findIgnoredPathInspection(command, rootDir);
+    if (ignoredDir?.startsWith(OS_TEMP_BLOCK_MARKER)) {
+        const tempName = ignoredDir.slice(OS_TEMP_BLOCK_MARKER.length);
+        return `Listing or scanning the shared OS temp directory (${tempName}) is blocked because it can contain other users' and processes' files. Use the session scratch directory ${ensureSessionScratchDir()} for temporary scripts and files — creating, running, and listing are all allowed there — or reference an exact file path.`;
+    }
     if (ignoredDir) {
         return `Command inspects an off-limits generated or dependency directory (${ignoredDir}). Avoid that path.`;
     }
@@ -615,6 +634,7 @@ function buildCommandEnv(cwd) {
         npm_config_fund: 'false',
         npm_config_audit: 'false',
         NUXI_INIT_SKIP_PROMPT: 'true',
+        THEGITAI_SCRATCH_DIR: ensureSessionScratchDir(),
     };
 }
 function sanitizePtyOutput(command, output, cwd, secrets) {

package/dist/src/scratch-dir.js

@@ -0,0 +1,57 @@
+import { chmodSync, lstatSync, mkdirSync, mkdtempSync } from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+let cachedScratchDir = null;
+export function sessionScratchDir() {
+    if (!cachedScratchDir) {
+        cachedScratchDir = path.join(os.tmpdir(), `thegitai-${process.pid}`);
+    }
+    return cachedScratchDir;
+}
+function isSquattedScratchRoot(dir) {
+    try {
+        const st = lstatSync(dir);
+        if (st.isSymbolicLink() || !st.isDirectory())
+            return true;
+        if (process.platform !== 'win32' &&
+            typeof process.getuid === 'function' &&
+            st.uid !== process.getuid()) {
+            return true;
+        }
+        return false;
+    }
+    catch {
+        return false;
+    }
+}
+export function ensureSessionScratchDir() {
+    const dir = sessionScratchDir();
+    try {
+        if (isSquattedScratchRoot(dir)) {
+            cachedScratchDir = mkdtempSync(path.join(os.tmpdir(), 'thegitai-'));
+            return cachedScratchDir;
+        }
+        mkdirSync(dir, { recursive: true, mode: 0o700 });
+        if (process.platform !== 'win32') {
+            chmodSync(dir, 0o700);
+        }
+    }
+    catch {
+    }
+    return sessionScratchDir();
+}
+export function isInsideTheGitAiScratch(absPath) {
+    const tempRoot = path.resolve(os.tmpdir());
+    const relPath = path.relative(tempRoot, path.resolve(absPath));
+    if (!relPath || relPath.startsWith('..') || path.isAbsolute(relPath)) {
+        return false;
+    }
+    const first = relPath.split(/[\\/]/, 1)[0] ?? '';
+    if (!/^thegitai(?:$|[-.])/i.test(first)) {
+        return false;
+    }
+    if (/[*?[\]{}]/.test(first)) {
+        return false;
+    }
+    return !isSquattedScratchRoot(path.join(tempRoot, first));
+}

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

@@ -45,7 +45,7 @@ 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.',
             };
         }
     }

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

@@ -3,6 +3,7 @@ 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thegitai/cli",
-  "version": "1.0.0-beta.15",
+  "version": "1.0.0-beta.16",
   "description": "TheGitAI CLI client (source-visible, proprietary)",
   "license": "SEE LICENSE IN LICENSE",
   "homepage": "https://thegit.ai",
@@ -25,10 +25,10 @@
     "@lydell/node-pty-linux-x64": "1.1.0",
     "@lydell/node-pty-win32-arm64": "1.1.0",
     "@lydell/node-pty-win32-x64": "1.1.0",
-    "@thegitai/tui-darwin-arm64": "1.0.0-beta.15",
-    "@thegitai/tui-darwin-x64": "1.0.0-beta.15",
-    "@thegitai/tui-linux-x64": "1.0.0-beta.15",
-    "@thegitai/tui-win32-x64": "1.0.0-beta.15",
+    "@thegitai/tui-darwin-arm64": "1.0.0-beta.16",
+    "@thegitai/tui-darwin-x64": "1.0.0-beta.16",
+    "@thegitai/tui-linux-x64": "1.0.0-beta.16",
+    "@thegitai/tui-win32-x64": "1.0.0-beta.16",
     "@vscode/ripgrep": "1.18.0"
   },
   "publishConfig": {