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

package/dist/src/scratch-dir.js

@@ -0,0 +1,75 @@
+import { chmodSync, lstatSync, mkdtempSync } from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+const scratchDirs = new Map();
+let activeSessionId = 'default';
+export function setScratchSession(sessionId) {
+    activeSessionId = String(sessionId ?? '').trim() || 'default';
+}
+function allocateSessionScratchDir() {
+    const dir = mkdtempSync(path.join(os.tmpdir(), 'thegitai-'));
+    scratchDirs.set(activeSessionId, dir);
+    return dir;
+}
+export function sessionScratchDir() {
+    return scratchDirs.get(activeSessionId) ?? allocateSessionScratchDir();
+}
+function isOwnedDirectory(dir) {
+    try {
+        const st = lstatSync(dir);
+        if (st.isSymbolicLink() || !st.isDirectory())
+            return false;
+        if (process.platform !== 'win32' &&
+            typeof process.getuid === 'function' &&
+            st.uid !== process.getuid()) {
+            return false;
+        }
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+export function ensureSessionScratchDir() {
+    let dir = sessionScratchDir();
+    if (!isOwnedDirectory(dir)) {
+        dir = allocateSessionScratchDir();
+    }
+    if (process.platform !== 'win32') {
+        chmodSync(dir, 0o700);
+    }
+    return dir;
+}
+function hasUnsafeScratchComponent(root, relativePath) {
+    let current = root;
+    for (const segment of relativePath.split(path.sep).filter(Boolean)) {
+        current = path.join(current, segment);
+        try {
+            const stat = lstatSync(current);
+            if (stat.isSymbolicLink())
+                return true;
+            if (stat.isDirectory())
+                continue;
+            if (!stat.isFile() || stat.nlink > 1)
+                return true;
+        }
+        catch (error) {
+            return error?.code !== 'ENOENT';
+        }
+    }
+    return false;
+}
+export function isWithinSessionScratchDir(absPath) {
+    const root = path.resolve(ensureSessionScratchDir());
+    const resolved = path.resolve(absPath);
+    const relative = path.relative(root, resolved);
+    return !relative.startsWith('..') && !path.isAbsolute(relative);
+}
+export function isInsideTheGitAiScratch(absPath) {
+    const root = path.resolve(ensureSessionScratchDir());
+    const resolved = path.resolve(absPath);
+    const relative = path.relative(root, resolved);
+    if (!isWithinSessionScratchDir(resolved))
+        return false;
+    return !hasUnsafeScratchComponent(root, relative);
+}

package/dist/src/secret-preview.js

@@ -6,11 +6,7 @@ const PRIVATE_KEY_REDACTION = '[REDACTED: private key]';
 const SENSITIVE_JSON_KEY_PATTERN = /^(?:private[_-]?key|secret|api[_-]?key|password|client_secret|refresh_token|access_token|id_token|auth_provider_x509_cert_url)$/i;
 const PEM_BLOCK_PATTERN = /-----BEGIN [^-]*(?:PRIVATE KEY|SECRET KEY|OPENSSH PRIVATE KEY)[\s\S]*?-----END [^-]*(?:PRIVATE KEY|SECRET KEY|OPENSSH PRIVATE KEY)-----/gi;
 const PEM_SECRET_PATH_PATTERN = /\.(?:pem|key)$/i;
-// Password embedded in a connection-string URL, e.g.
-// `postgresql://user:PASS@host`. Redacted from shell output so secrets in
-// commands like `cat .env` do not leak into history or telemetry.
 const URL_CREDENTIALS_PATTERN = /\b([a-z][a-z0-9+.-]*:\/\/[^\s:/@]+:)([^\s/@]+)(@)/gi;
-/** Redact only userinfo passwords in connection-string URLs (zero false positives). */
 export function redactConnectionStringCredentials(text) {
     return text.replace(URL_CREDENTIALS_PATTERN, (_match, prefix, _password, at) => `${prefix}${VALUE_REDACTION}${at}`);
 }
@@ -72,12 +68,6 @@ export function isDotenvLikePath(value) {
     const base = path.posix.basename(text.replace(/\\/g, '/'));
     return DOTENV_BASENAME_PATTERN.test(base);
 }
-/**
- * True only for a clean dotenv file we can safely show with keys visible and
- * values tokenized: no PEM block, not JSON, and every non-blank/non-comment line
- * is a `KEY=VALUE` assignment. Anything ambiguous (a stray line that might be a
- * raw secret) returns false so the caller keeps the opaque blackout instead.
- */
 export function looksLikeEditableDotenv(content) {
     PEM_BLOCK_PATTERN.lastIndex = 0;
     if (PEM_BLOCK_PATTERN.test(content))

package/dist/src/session-safety.js

@@ -454,17 +454,6 @@ export function resolveRedactionTokens(state, text, filePath, hash) {
 }
 const DOTENV_ASSIGNMENT_PATTERN = /^(\s*(?:export\s+)?[A-Za-z_][A-Za-z0-9_]*\s*=)(.*)$/;
 const DOTENV_COMMENT_PATTERN = /^(\s*#\s*)(\S.*)$/;
-/**
- * Redact a dotenv file's values while leaving keys visible. Every assignment's
- * value is replaced with a stable, reversible token so the agent can see the
- * file's structure and edit it (remove or replace lines) without ever seeing a
- * secret value; `resolveRedactionTokens` swaps the real values back on write.
- * Comment bodies are tokenized too, because developers routinely leave
- * commented-out credentials in dotenv files and those must not leak where the
- * opaque preview would have hidden them. Callers must confirm the content is
- * clean dotenv (`looksLikeEditableDotenv`) first so the only non-assignment
- * lines reaching here are blanks and comments.
- */
 export function redactDotenvWithStableTokens(state, content, filePath, hash) {
     const tokens = [];
     const redactedLines = content.split('\n').map((line) => {
@@ -490,14 +479,6 @@ export function redactDotenvWithStableTokens(state, content, filePath, hash) {
     });
     return { content: redactedLines.join('\n'), tokens };
 }
-/**
- * The redaction-token registry is capped at `MAX_REDACTION_TOKENS`; a read that
- * emits more tokens than that would evict its own oldest tokens, leaving
- * `[REDACTED:n]` markers in the preview that `write_file`/`str_replace` can no
- * longer resolve (silently writing the literal token back). So a dotenv file
- * with more tokenizable lines than the budget must not use the editable preview
- * — the caller falls back to the opaque blackout instead.
- */
 export function dotenvFitsRedactionBudget(content) {
     let count = 0;
     for (const line of content.split('\n')) {

package/dist/src/session-store.js

@@ -1,12 +1,13 @@
+import { spawnSync } from 'node:child_process';
 import { createHash } from 'node:crypto';
 import { existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, writeFileSync, } from 'node:fs';
 import path from 'node:path';
 import { getClientStateDir } from './client-state.js';
 import { normalizeAssistantEditJournal } from './edit-journal.js';
 import { cloneSessionSafetyState, createSessionSafetyState, mergeLocalSessionSafetyState, normalizeSessionSafetyState, } from './session-safety.js';
-import { truncate } from './utils.js';
+import { singleLinePreview } from './utils.js';
 const SESSION_STORE_VERSION = 1;
-const MAX_RECENT_SESSIONS = 5;
+export const MAX_RECENT_SESSIONS = 10;
 function cloneJson(value) {
     return JSON.parse(JSON.stringify(value ?? null));
 }
@@ -77,6 +78,12 @@ function listSessionFiles(rootDir, env = process.env) {
         .filter((name) => name.endsWith('.json'))
         .map((name) => path.join(dir, name));
 }
+function normalizeBranch(value) {
+    const text = String(value ?? '')
+        .replace(/[\r\n\t]/g, ' ')
+        .trim();
+    return text ? text.slice(0, 120) : null;
+}
 function normalizeHistory(value) {
     if (!Array.isArray(value))
         return [];
@@ -107,6 +114,7 @@ function normalizeSnapshot(raw, rootDir) {
         createdAt: normalizeIsoDate(raw.createdAt),
         updatedAt: normalizeIsoDate(raw.updatedAt),
         modelId,
+        branch: normalizeBranch(raw.branch),
         history: cloneJson(normalizeHistory(raw.history)),
         clientState: sanitizeClientState(raw.clientState),
         serverState: sanitizeOpaqueState(raw.serverState),
@@ -122,7 +130,6 @@ function loadAllSnapshots(rootDir, env = process.env) {
             snapshots.push(loadSnapshotFile(filePath, rootDir));
         }
         catch {
-            // Skip corrupted snapshots silently — customers have no actionable debug path here.
         }
     }
     return snapshots.sort((a, b) => b.updatedAt.localeCompare(a.updatedAt));
@@ -155,6 +162,21 @@ export function pruneSavedSessions(rootDir, env = process.env) {
         }
     }
 }
+export function readGitBranch(rootDir) {
+    try {
+        const result = spawnSync('git', ['rev-parse', '--abbrev-ref', 'HEAD'], {
+            cwd: rootDir,
+            encoding: 'utf8',
+            timeout: 1500,
+            stdio: ['ignore', 'pipe', 'ignore'],
+        });
+        const branch = result.status === 0 ? String(result.stdout ?? '').trim() : '';
+        return branch && branch !== 'HEAD' ? branch : null;
+    }
+    catch {
+        return null;
+    }
+}
 export function snapshotFromSession(session) {
     const now = new Date().toISOString();
     const createdAt = normalizeIsoDate(session.sessionCreatedAt ?? now);
@@ -169,6 +191,7 @@ export function snapshotFromSession(session) {
         createdAt,
         updatedAt: now,
         modelId: session.modelId,
+        branch: readGitBranch(session.rootDir),
         history: cloneJson(session.history),
         clientState: {
             editCounter: session.clientState.editCounter,
@@ -211,6 +234,9 @@ export function applySessionSnapshot(session, snapshot, options = {}) {
         safety: mergeLocalSessionSafetyState(session.clientState.safety, snapshot.clientState.safety),
     };
 }
+export function sessionHasUserMessage(session) {
+    return session.history.some((entry) => Boolean(userPromptText(entry)));
+}
 function extractMarkedSection(text, marker) {
     const index = text.indexOf(marker);
     if (index === -1)
@@ -219,23 +245,27 @@ function extractMarkedSection(text, marker) {
     const end = after.indexOf('\n\n');
     return (end === -1 ? after : after.slice(0, end)).trim();
 }
-function extractLastUserMessage(history) {
-    for (let i = history.length - 1; i >= 0; i--) {
-        const entry = history[i];
-        if (!entry || entry.role !== 'user')
-            continue;
-        const text = (entry.parts ?? [])
-            .map((part) => (typeof part?.text === 'string' ? part.text : ''))
-            .filter(Boolean)
-            .join('\n')
-            .trim();
-        if (!text)
-            continue;
-        const request = extractMarkedSection(text, 'Current user request:') ||
-            extractMarkedSection(text, 'User request:');
-        const message = extractMarkedSection(text, 'Current user message:') ||
-            extractMarkedSection(text, 'User message:');
-        return truncate(request || message || text, 120);
+export function userPromptText(entry) {
+    if (!entry || entry.role !== 'user' || entry.kind !== 'turnStart')
+        return '';
+    const text = (entry.parts ?? [])
+        .map((part) => (typeof part?.text === 'string' ? part.text : ''))
+        .filter(Boolean)
+        .join('\n')
+        .trim();
+    if (!text)
+        return '';
+    const request = extractMarkedSection(text, 'Current user request:') ||
+        extractMarkedSection(text, 'User request:');
+    const message = extractMarkedSection(text, 'Current user message:') ||
+        extractMarkedSection(text, 'User message:');
+    return (request || message || text).trim();
+}
+function extractFirstUserPrompt(history) {
+    for (const entry of history) {
+        const text = userPromptText(entry);
+        if (text)
+            return singleLinePreview(text, 120);
     }
     return '';
 }
@@ -248,8 +278,9 @@ function metadataFromSnapshot(snapshot) {
         updatedAt: snapshot.updatedAt,
         modelId: snapshot.modelId,
         messageCount: snapshot.history.length,
-        lastUserMessage: extractLastUserMessage(snapshot.history),
+        lastUserMessage: extractFirstUserPrompt(snapshot.history),
         summaryPreview: '',
+        branch: snapshot.branch ?? null,
     };
 }
 export function listSessionMetadata(rootDir, env = process.env) {

package/dist/src/session.js

@@ -69,6 +69,14 @@ export function createSession({ rootDir, autoYes = false, agentMode, modelId, ma
         serverState: cloneOpaqueState(serverState),
     };
 }
+export function startNewConversation(session) {
+    clearConversation(session);
+    const createdAt = new Date().toISOString();
+    session.sessionId = createSessionId();
+    session.sessionName = null;
+    session.sessionCreatedAt = createdAt;
+    session.sessionUpdatedAt = createdAt;
+}
 export function clearConversation(session) {
     session.history = [];
     session.serverState = preserveProviderSelection(session.serverState);

package/dist/src/todo-list.js

@@ -0,0 +1,106 @@
+export const MAX_TODO_ITEMS = 20;
+export const MAX_TODO_TEXT_CHARS = 160;
+let items = [];
+let activeSessionId = null;
+const STATUS_ALIASES = {
+    pending: 'pending',
+    todo: 'pending',
+    not_started: 'pending',
+    in_progress: 'in_progress',
+    active: 'in_progress',
+    doing: 'in_progress',
+    completed: 'completed',
+    complete: 'completed',
+    done: 'completed',
+};
+function normalizeStatus(raw) {
+    const key = String(raw ?? '')
+        .trim()
+        .toLowerCase()
+        .replace(/[-\s]+/g, '_');
+    return STATUS_ALIASES[key] ?? null;
+}
+export function isCompletedStatus(raw) {
+    return normalizeStatus(raw) === 'completed';
+}
+const TODOS_ARG_ALIASES = ['items', 'todo_list', 'todoList', 'list', 'tasks'];
+export function extractTodosArg(args) {
+    if (!args || typeof args !== 'object')
+        return undefined;
+    const record = args;
+    if (record.todos !== undefined)
+        return record.todos;
+    for (const key of TODOS_ARG_ALIASES) {
+        if (record[key] !== undefined)
+            return record[key];
+    }
+    return undefined;
+}
+export function setTodoSession(sessionId) {
+    const next = String(sessionId ?? '').trim() || null;
+    if (activeSessionId !== next) {
+        items = [];
+    }
+    activeSessionId = next;
+}
+export function listTodos() {
+    return items.map((item) => ({ ...item }));
+}
+export function getTodoSnapshot() {
+    return {
+        items: listTodos(),
+        completedCount: items.filter((item) => item.status === 'completed').length,
+        totalCount: items.length,
+    };
+}
+export function clearTodos() {
+    items = [];
+}
+export function replaceTodos(raw) {
+    if (!Array.isArray(raw)) {
+        return { ok: false, error: 'todos must be an array of { text, status } items.' };
+    }
+    const normalizations = [];
+    if (raw.length > MAX_TODO_ITEMS) {
+        return {
+            ok: false,
+            error: `todos supports at most ${MAX_TODO_ITEMS} items; got ${raw.length}. Use fewer, broader steps.`,
+        };
+    }
+    const next = [];
+    let sawInProgress = false;
+    for (const [index, entry] of raw.entries()) {
+        if (!entry || typeof entry !== 'object' || Array.isArray(entry)) {
+            return { ok: false, error: `todos[${index}] must be an object with text and status.` };
+        }
+        const text = String(entry.text ?? '')
+            .replace(/\s+/g, ' ')
+            .trim();
+        if (!text) {
+            return { ok: false, error: `todos[${index}].text must be a non-empty string.` };
+        }
+        const status = normalizeStatus(entry.status);
+        if (!status) {
+            return {
+                ok: false,
+                error: `todos[${index}].status must be one of: pending, in_progress, completed.`,
+            };
+        }
+        let boundedText = text;
+        if (boundedText.length > MAX_TODO_TEXT_CHARS) {
+            boundedText = `${boundedText.slice(0, MAX_TODO_TEXT_CHARS - 1)}…`;
+            normalizations.push(`todos[${index}].text truncated to ${MAX_TODO_TEXT_CHARS} chars`);
+        }
+        let finalStatus = status;
+        if (status === 'in_progress') {
+            if (sawInProgress) {
+                finalStatus = 'pending';
+                normalizations.push(`todos[${index}] demoted to pending: only one item can be in_progress`);
+            }
+            sawInProgress = true;
+        }
+        next.push({ text: boundedText, status: finalStatus });
+    }
+    items = next;
+    return { ok: true, snapshot: getTodoSnapshot(), normalizations };
+}

package/dist/src/tool-executor.js

@@ -1,8 +1,13 @@
+import { drainBackgroundJobNotifications, getBackgroundJob, } from './background-jobs.js';
 import { canStoreEditSnapshot, isEditToolName, isGitWorkTree, MAX_EDIT_JOURNAL_RECORDS, operationFromSnapshots, readFileEditSnapshot, } from './edit-journal.js';
 import { clearEditFailure, collectCommandMutations, captureMutationBaseline, ensureActiveCheckpoint, recordEditFailure, recordSessionEdit, rememberCheckpointFiles, } from './session-safety.js';
 import { buildAgentModeToolBlockedResult, } from './agent-mode.js';
+import { classifyProjectPath } from './patcher.js';
 import { dispatchTool } from './tools/index.js';
+import { syncIndexFromDisk } from './project-index.js';
+import { PATH_REPAIRING_EDIT_TOOLS, repairFilePath } from './tools/path-suggest.js';
 import { invalidateShellDiagnosticsCache, runShellDiagnostics, } from './tools/shell-diagnostics.js';
+import { extractTodosArg } from './todo-list.js';
 const EDIT_FILE_PATH_ARG_ALIASES = [
     'filePath',
     'file_path',
@@ -11,6 +16,7 @@ const EDIT_FILE_PATH_ARG_ALIASES = [
     'file',
     'filename',
 ];
+const backgroundCommandTrackers = new Map();
 function toolCallSummary(call) {
     const args = call.args && typeof call.args === 'object' ? call.args : {};
     if (call.name === 'run_command') {
@@ -19,6 +25,17 @@ function toolCallSummary(call) {
     if (call.name === 'run_node_script') {
         return String(args.script ?? '').trim().slice(0, 120);
     }
+    if (call.name === 'shell_job_output' ||
+        call.name === 'shell_job_kill') {
+        return String(args.job_id ?? '').trim();
+    }
+    if (call.name === 'update_todos') {
+        const raw = extractTodosArg(args);
+        const todos = Array.isArray(raw) ? raw : [];
+        if (todos.length === 0)
+            return '';
+        return `${todos.length} item${todos.length === 1 ? '' : 's'}`;
+    }
     const filePath = getEditToolFilePath(call);
     if (filePath)
         return filePath;
@@ -45,8 +62,125 @@ function getEditToolFilePath(call) {
     }
     return '';
 }
+function editToolWritesSeparateOutput(call) {
+    if (call.name !== 'replace_document_text')
+        return false;
+    const args = call.args && typeof call.args === 'object' ? call.args : {};
+    const output = args.outputPath ?? args.output_path;
+    return typeof output === 'string' && output.trim().length > 0;
+}
+async function collectTrackedCommandMutations({ session, projectIndex, result, tracker, toolName, toolCallId, turnId, }) {
+    const checkpoint = ensureActiveCheckpoint(session.clientState.safety, turnId);
+    const records = collectCommandMutations({
+        state: session.clientState.safety,
+        rootDir: session.rootDir,
+        tracker,
+        toolName,
+        toolCallId,
+        turnId,
+        checkpointId: checkpoint.id,
+    });
+    if (!records.length)
+        return;
+    invalidateShellDiagnosticsCache(session.rootDir);
+    rememberCheckpointFiles(session.clientState.safety, session.rootDir, records.map((record) => record.filePath), turnId);
+    const priorSync = result.repoSync;
+    if (!(priorSync && (priorSync.added || priorSync.modified || priorSync.removed))) {
+        const mutationCounts = {
+            added: records.filter((record) => record.operation === 'create').length,
+            modified: records.filter((record) => record.operation === 'update').length,
+            removed: records.filter((record) => record.operation === 'delete').length,
+            indexedChunks: 0,
+            retrievalTokensUsed: 0,
+        };
+        if (priorSync?.error) {
+            result.repoSync = {
+                ...mutationCounts,
+                indexSyncError: priorSync.error,
+                skipped: true,
+                reason: 'local index sync failed after command execution',
+            };
+        }
+        else {
+            try {
+                const repoSync = await syncIndexFromDisk(projectIndex);
+                result.repoSync = {
+                    ...repoSync,
+                    added: Math.max(repoSync.added, mutationCounts.added),
+                    modified: Math.max(repoSync.modified, mutationCounts.modified),
+                    removed: Math.max(repoSync.removed, mutationCounts.removed),
+                };
+            }
+            catch (error) {
+                const indexSyncError = error instanceof Error ? error.message : String(error);
+                result.repoSync = { ...mutationCounts, indexSyncError };
+                session.onStatus(`Repository changes were recorded, but local index sync failed: ${indexSyncError}`);
+            }
+        }
+    }
+    result.sessionEdits = records.map((record) => ({
+        id: record.id,
+        filePath: record.filePath,
+        operation: record.operation,
+        beforeHash: record.beforeHash,
+        afterHash: record.afterHash,
+    }));
+    result.diagnostics = runShellDiagnostics(session.rootDir);
+}
+export async function collectBackgroundJobUiKillMutations({ session, projectIndex, jobId, result, }) {
+    const normalizedJobId = String(jobId ?? result.snapshot?.id ?? '').trim();
+    if (!normalizedJobId || !result.ok)
+        return;
+    const tracked = backgroundCommandTrackers.get(normalizedJobId);
+    if (!tracked)
+        return;
+    const mutationResult = result;
+    await collectTrackedCommandMutations({
+        session,
+        projectIndex,
+        result: mutationResult,
+        tracker: tracked.tracker,
+        toolName: tracked.toolName,
+        toolCallId: tracked.toolCallId,
+        turnId: tracked.turnId,
+    });
+    if (result.snapshot?.status === 'running') {
+        tracked.tracker = captureMutationBaseline(session.rootDir);
+    }
+    else {
+        backgroundCommandTrackers.delete(normalizedJobId);
+    }
+}
+export async function collectBackgroundJobUiOutputMutations({ session, projectIndex, jobId, }) {
+    const normalizedJobId = String(jobId ?? '').trim();
+    if (!normalizedJobId)
+        return;
+    const tracked = backgroundCommandTrackers.get(normalizedJobId);
+    if (!tracked)
+        return;
+    const snapshot = getBackgroundJob(normalizedJobId, {
+        sessionId: session.sessionId,
+    });
+    if (!snapshot)
+        return;
+    await collectTrackedCommandMutations({
+        session,
+        projectIndex,
+        result: {},
+        tracker: tracked.tracker,
+        toolName: tracked.toolName,
+        toolCallId: tracked.toolCallId,
+        turnId: tracked.turnId,
+    });
+    if (snapshot.status === 'running') {
+        tracked.tracker = captureMutationBaseline(session.rootDir);
+    }
+    else {
+        backgroundCommandTrackers.delete(normalizedJobId);
+    }
+}
 function recordAssistantEdit(session, call, result, before) {
-    if (!before || !isEditToolName(call.name))
+    if (!before || !isEditToolName(call.name) || result?.scratch === true)
         return;
     if (!result || typeof result !== 'object' || result.ok !== true) {
         const filePath = getEditToolFilePath(call);
@@ -119,11 +253,20 @@ export async function executeLocalToolCall(toolContext, session, call) {
             session.onToolEvent?.({ call, result });
             return result;
         }
-        const filePathBeforeEdit = isEditToolName(call.name) ? getEditToolFilePath(call) : '';
-        if (filePathBeforeEdit) {
+        const rawEditFilePath = isEditToolName(call.name)
+            ? getEditToolFilePath(call)
+            : '';
+        const filePathBeforeEdit = rawEditFilePath &&
+            PATH_REPAIRING_EDIT_TOOLS.has(call.name) &&
+            !editToolWritesSeparateOutput(call)
+            ? repairFilePath(session.rootDir, rawEditFilePath)
+            : rawEditFilePath;
+        const tracksRepositoryEdit = filePathBeforeEdit &&
+            classifyProjectPath(session.rootDir, filePathBeforeEdit) === 'project';
+        if (tracksRepositoryEdit) {
             rememberCheckpointFiles(session.clientState.safety, session.rootDir, [filePathBeforeEdit], session.turnState.id);
         }
-        const beforeEditSnapshot = filePathBeforeEdit
+        const beforeEditSnapshot = tracksRepositoryEdit
             ? readFileEditSnapshot(session.rootDir, filePathBeforeEdit)
             : null;
         const commandTracker = call.name === 'run_command' || call.name === 'run_node_script'
@@ -131,6 +274,7 @@ export async function executeLocalToolCall(toolContext, session, call) {
             : null;
         const context = {
             rootDir: session.rootDir,
+            sessionId: session.sessionId,
             projectIndex: toolContext.projectIndex,
             autoYes: session.autoYes,
             confirmCommand: session.confirmCommand,
@@ -152,28 +296,57 @@ export async function executeLocalToolCall(toolContext, session, call) {
         };
         const result = await dispatchTool(context, call);
         recordAssistantEdit(session, call, result, beforeEditSnapshot);
-        if (result && commandTracker && (call.name === 'run_command' || call.name === 'run_node_script')) {
-            const checkpoint = ensureActiveCheckpoint(session.clientState.safety, session.turnState.id);
-            const records = collectCommandMutations({
-                state: session.clientState.safety,
-                rootDir: session.rootDir,
+        if (result && typeof result === 'object' && commandTracker) {
+            await collectTrackedCommandMutations({
+                session,
+                projectIndex: toolContext.projectIndex,
+                result,
                 tracker: commandTracker,
                 toolName: call.name,
                 toolCallId: call.id,
                 turnId: session.turnState.id,
-                checkpointId: checkpoint.id,
             });
-            if (records.length) {
-                invalidateShellDiagnosticsCache(session.rootDir);
-                rememberCheckpointFiles(session.clientState.safety, session.rootDir, records.map((record) => record.filePath), session.turnState.id);
-                result.sessionEdits = records.map((record) => ({
-                    id: record.id,
-                    filePath: record.filePath,
-                    operation: record.operation,
-                    beforeHash: record.beforeHash,
-                    afterHash: record.afterHash,
-                }));
-                result.diagnostics = runShellDiagnostics(session.rootDir);
+            if (call.name === 'run_command' &&
+                result.backgrounded === true &&
+                result.status === 'running' &&
+                result.jobId) {
+                backgroundCommandTrackers.set(String(result.jobId), {
+                    tracker: captureMutationBaseline(session.rootDir),
+                    toolName: call.name,
+                    toolCallId: call.id,
+                    turnId: session.turnState.id,
+                });
+            }
+        }
+        if (result &&
+            typeof result === 'object' &&
+            (call.name === 'shell_job_output' || call.name === 'shell_job_kill')) {
+            const jobId = String(result.jobId ?? call.args?.job_id ?? '').trim();
+            const tracked = backgroundCommandTrackers.get(jobId);
+            if (tracked) {
+                await collectTrackedCommandMutations({
+                    session,
+                    projectIndex: toolContext.projectIndex,
+                    result,
+                    tracker: tracked.tracker,
+                    toolName: tracked.toolName,
+                    toolCallId: tracked.toolCallId,
+                    turnId: tracked.turnId,
+                });
+                if (result.status === 'running') {
+                    tracked.tracker = captureMutationBaseline(session.rootDir);
+                }
+                else {
+                    backgroundCommandTrackers.delete(jobId);
+                }
+            }
+        }
+        if (result && typeof result === 'object') {
+            const backgroundJobUpdate = drainBackgroundJobNotifications({
+                sessionId: session.sessionId,
+            });
+            if (backgroundJobUpdate) {
+                result.backgroundJobUpdate = backgroundJobUpdate;
             }
         }
         session.onToolEvent?.({ call, result });