@thegitai/cli 1.0.0-preview.51 → 1.0.0-preview.53

package/README.md

@@ -152,6 +152,8 @@ work against it live, and stop it when the task is done, all in one session.
   read its output inline, **k** to stop it, **Esc** to close.
 - `/jobs output <id>` prints a job's full output, and `/jobs kill <id>` stops one
   by id.
+- When waiting for a job is all that's left, the agent can hand control back to
+  you and continue automatically once the job finishes on its own.
 - When you end the session, TheGitAI stops its background jobs for you.
 
 Full documentation: <https://thegit.ai/docs>

package/dist/src/api/chat.js

@@ -731,7 +731,7 @@ async function runTurnStream({ openStream, config, session, input, request, reco
         }
     }
 }
-export async function sendServerUserMessage({ config, session, input, imageAttachments = [], fetchImpl = globalThis.fetch, signal, onTurnStart, onInterjectionDelivered, recoverySleep, }) {
+export async function sendServerUserMessage({ config, session, input, jobFollowUp = false, imageAttachments = [], fetchImpl = globalThis.fetch, signal, onTurnStart, onInterjectionDelivered, recoverySleep, }) {
     const autoAttach = autoAttachImages(input, session.rootDir, imageAttachments);
     const requestImageAttachments = autoAttach.attachments.length > 0
         ? [...imageAttachments, ...autoAttach.attachments]
@@ -749,6 +749,8 @@ export async function sendServerUserMessage({ config, session, input, imageAttac
         session: snapshotForServer(session),
         input: requestInputBase,
         backgroundJobUpdate: backgroundJobUpdate || undefined,
+        supportsJobFollowUp: true,
+        ...(jobFollowUp ? { jobFollowUp: true } : {}),
         clientEnvironment: collectClientEnvironment({ env: session.env }),
         projectOrientation: collectProjectOrientation(session.rootDir) ?? undefined,
         sessionImageStore: describeSessionImageStore(session.env) ?? undefined,
@@ -834,6 +836,7 @@ export async function sendServerUserMessage({ config, session, input, imageAttac
         completed = true;
         return {
             text: outcome.result.text,
+            waitingForJobs: outcome.result.waitingForJobs,
             waitingForApproval: outcome.result.waitingForApproval,
             toolBudgetReached: outcome.result.toolBudgetReached,
             usageSummary: outcome.result.usageSummary,

package/dist/src/background-jobs.js

@@ -403,6 +403,10 @@ export function drainBackgroundJobNotifications({ sessionId } = {}) {
     const hasReadableFinalOutput = pending.some((snapshot) => snapshot.status !== 'killed');
     return `${lines.join(' ')}${hasReadableFinalOutput ? ' Use shell_job_output to read any final output.' : ''}`;
 }
+export function hasUnreportedBackgroundJobUpdate(id, { sessionId } = {}) {
+    const filter = sessionFilter(sessionId);
+    return pendingModelNotifications.some((snapshot) => snapshot.id === id && (!filter || snapshot.sessionId === filter));
+}
 function unknownJobError(id) {
     const known = listBackgroundJobs().map((job) => job.id);
     const hint = known.length

package/dist/src/job-follow-up.js

@@ -0,0 +1,40 @@
+import { getBackgroundJob, hasUnreportedBackgroundJobUpdate } from './background-jobs.js';
+export const MAX_CHAINED_JOB_FOLLOW_UPS = 3;
+function exitedOnItsOwn(id, sessionId) {
+    const job = getBackgroundJob(id, { sessionId });
+    return job !== null && job.status !== 'running' && job.status !== 'killed';
+}
+export function decideJobFollowUp(jobIds, chainedFollowUps, sessionId) {
+    if (!jobIds.some((id) => exitedOnItsOwn(id, sessionId)))
+        return 'wait';
+    return chainedFollowUps >= MAX_CHAINED_JOB_FOLLOW_UPS ? 'stop' : 'start';
+}
+export function remainingJobWait(jobIds, sessionId) {
+    return jobIds.filter((id) => {
+        const job = getBackgroundJob(id, { sessionId });
+        if (job?.status === 'running')
+            return true;
+        return exitedOnItsOwn(id, sessionId) && hasUnreportedBackgroundJobUpdate(id, { sessionId });
+    });
+}
+export function createJobWaitTracker(sessionId) {
+    let waiting = [];
+    let chained = 0;
+    return {
+        get waiting() {
+            return waiting;
+        },
+        turnStarted(jobFollowUp) {
+            chained = jobFollowUp ? chained + 1 : 0;
+        },
+        turnEnded(waitingForJobs) {
+            waiting = waitingForJobs ? [...waitingForJobs] : remainingJobWait(waiting, sessionId());
+        },
+        takeDecision() {
+            const decision = decideJobFollowUp(waiting, chained, sessionId());
+            if (decision !== 'wait')
+                waiting = [];
+            return decision;
+        },
+    };
+}

package/dist/src/ui/repl.js

@@ -14,6 +14,7 @@ import { agentModeLabel, nextAgentMode, } from '../agent-mode.js';
 import { chat, models } from '../api/index.js';
 import { isTurnCancelledError, isTurnOutcomeKnown } from '../api/chat.js';
 import { formatTurnRecoveryStatus } from '../api/turn-recovery.js';
+import { createJobWaitTracker } from '../job-follow-up.js';
 import { getJobBufferedOutput, getJobOutputPreview, hasRunningBackgroundJobs, killAllBackgroundJobs, killBackgroundJob, listBackgroundJobs, setBackgroundJobSession, setBackgroundJobUpdateHook, } from '../background-jobs.js';
 import { clearTodos, listTodos, setTodoSession } from '../todo-list.js';
 import { setScratchSession } from '../scratch-dir.js';
@@ -2491,8 +2492,9 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 rollback('turn ended — sending as the next prompt');
             }
         };
-        const handleSubmit = async (rawInput) => {
-            const chunks = store.getState().pastedChunks;
+        const jobWait = createJobWaitTracker(() => session.sessionId);
+        const handleSubmit = async (rawInput, { jobFollowUp = false } = {}) => {
+            const chunks = jobFollowUp ? [] : store.getState().pastedChunks;
             const expanded = chunks.length
                 ? expandPastedChunks(String(rawInput ?? ''), chunks)
                 : String(rawInput ?? '');
@@ -2552,19 +2554,21 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             const imageAttachments = store
                 .getState()
                 .imageAttachments.filter((attachment) => input.includes(`[Image #${attachment.index}]`));
-            scheduleLiveFrameRemount();
-            store.update((current) => ({
-                ...current,
-                cursor: 0,
-                imageAttachments: [],
-                input: '',
-                pastedChunks: [],
-                promptHistory: appendPromptToHistory(current.promptHistory, input),
-                promptHistoryCursor: null,
-                promptHistoryDraft: '',
-            }));
-            appendPromptHistory(input);
-            if (!input || exiting) {
+            if (!jobFollowUp) {
+                scheduleLiveFrameRemount();
+                store.update((current) => ({
+                    ...current,
+                    cursor: 0,
+                    imageAttachments: [],
+                    input: '',
+                    pastedChunks: [],
+                    promptHistory: appendPromptToHistory(current.promptHistory, input),
+                    promptHistoryCursor: null,
+                    promptHistoryDraft: '',
+                }));
+                appendPromptHistory(input);
+            }
+            if ((!input && !jobFollowUp) || exiting) {
                 store.update((current) => ({ ...current, imageAttachments: [] }));
                 return;
             }
@@ -2790,6 +2794,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 await flushQueuedMessage();
                 return;
             }
+            jobWait.turnStarted(jobFollowUp);
             latestUsageSummary = null;
             disarmExitConfirm();
             unacknowledged = new Map();
@@ -2799,7 +2804,8 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             activeTurnAbort = turnAbort;
             lastTurnStartedAt = turnStartedAt;
             todosTouchedThisTurn = false;
-            clearTodos();
+            if (!jobFollowUp)
+                clearTodos();
             syncTodosState();
             const userEntry = {
                 body: input,
@@ -2808,7 +2814,8 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 title: 'You',
             };
             pendingTurnEntries = [];
-            queueTurnEntry(userEntry);
+            if (!jobFollowUp)
+                queueTurnEntry(userEntry);
             resetThinkingPacer();
             activeTurnImageAttachments = imageAttachments;
             store.update((current) => ({
@@ -2836,6 +2843,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                     config: authConfig,
                     session,
                     input,
+                    jobFollowUp,
                     imageAttachments,
                     signal: turnAbort.signal,
                     onTurnStart: (serverTurnId) => {
@@ -2907,6 +2915,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                     status: result.waitingForApproval ? 'Awaiting approval' : 'Ready',
                     tokenUsage: formatClientTokenUsage(Date.now() - turnStartedAt, latestUsageSummary),
                 }));
+                jobWait.turnEnded(result.waitingForJobs);
                 recoverUnacknowledgedMessages();
                 await flushQueuedMessage();
             }
@@ -2991,6 +3000,8 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 }
                 recoverUnacknowledgedMessages();
                 await drainDeferredJobMutations();
+                if (turnGeneration === activeTurnGeneration)
+                    scheduleJobFollowUp();
             }
         };
         session.onImageAnalysis = (activeImageCount) => {
@@ -3096,10 +3107,35 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                     : null,
             }));
         };
+        const scheduleJobFollowUp = () => {
+            if (jobWait.waiting.length === 0)
+                return;
+            setTimeout(async () => {
+                const state = store.getState();
+                if (exiting || state.busy || state.modelPickerOpen || state.resumePickerOpen)
+                    return;
+                const decision = jobWait.takeDecision();
+                if (decision === 'wait')
+                    return;
+                if (decision === 'stop') {
+                    appendStaticEntry({
+                        body: 'A background job finished. Send a message to continue.',
+                        kind: 'system',
+                        title: 'Background job',
+                    });
+                    return;
+                }
+                await drainDeferredJobMutations();
+                if (exiting || store.getState().busy)
+                    return;
+                void handleSubmit('', { jobFollowUp: true });
+            }, 0);
+        };
         setBackgroundJobUpdateHook((snapshot) => {
             syncBackgroundJobsState();
             if (snapshot.status !== 'running') {
                 appendTurnAwareEntry(buildBackgroundJobNoticeEntry(snapshot));
+                scheduleJobFollowUp();
             }
         });
         session.requestSudoPassword = async ({ command, prompt, signal }) => openSudoPasswordPrompt(command, prompt, signal);
@@ -3173,6 +3209,8 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
         };
         const unsubscribe = store.subscribe(() => {
             renderCurrentFrame();
+            if (jobWait.waiting.length > 0 && !store.getState().busy)
+                scheduleJobFollowUp();
         });
         const spinnerTimer = setInterval(() => {
             spinnerFrame = (spinnerFrame + 1) % 6;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thegitai/cli",
-  "version": "1.0.0-preview.51",
+  "version": "1.0.0-preview.53",
   "description": "TheGitAI is an agentic AI coding tool for your terminal. It reads and searches your repository, writes and edits files, runs your tests, and verifies the change before handing it back.",
   "keywords": [
     "agentic-ai",
@@ -45,11 +45,11 @@
     "@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-preview.51",
-    "@thegitai/tui-darwin-x64": "1.0.0-preview.51",
-    "@thegitai/tui-linux-arm64": "1.0.0-preview.51",
-    "@thegitai/tui-linux-x64": "1.0.0-preview.51",
-    "@thegitai/tui-win32-x64": "1.0.0-preview.51",
+    "@thegitai/tui-darwin-arm64": "1.0.0-preview.53",
+    "@thegitai/tui-darwin-x64": "1.0.0-preview.53",
+    "@thegitai/tui-linux-arm64": "1.0.0-preview.53",
+    "@thegitai/tui-linux-x64": "1.0.0-preview.53",
+    "@thegitai/tui-win32-x64": "1.0.0-preview.53",
     "@vscode/ripgrep": "1.18.0"
   },
   "repository": {