@thegitai/cli 1.0.0-preview.8 → 1.0.0-preview.9

package/dist/bin/ai.js

@@ -8,7 +8,7 @@ import { authenticationErrorMessage, isAuthenticationError, isTransientNetworkEr
 import { formatCliHelpText } from '../src/help-text.js';
 import { createIndex } from '../src/project-index.js';
 import { createSession } from '../src/session.js';
-import { applySessionSnapshot, listSessionMetadata, loadSessionSnapshot, saveSessionState, } from '../src/session-store.js';
+import { applySessionSnapshot, listSessionMetadata, loadSessionSnapshot, saveSessionState, sessionHasUserMessage, } from '../src/session-store.js';
 import { runClientInteractive } from '../src/ui/repl.js';
 import { appendPromptToFile } from '../src/ui/prompt-history-store.js';
 import { formatSessionExitNotice } from '../src/session-exit.js';
@@ -116,6 +116,8 @@ function modelLabel(serverModels, modelId) {
         `Model ${modelId}`);
 }
 async function saveSessionBoth({ session, serverSessionClient, }) {
+    if (!sessionHasUserMessage(session))
+        return;
     saveSessionState(session);
     try {
         await serverSessionClient.save(session);

package/dist/src/api/browser-login.js

@@ -1,4 +1,6 @@
+import { execSync } from 'node:child_process';
 import crypto from 'node:crypto';
+import { readFileSync } from 'node:fs';
 import http from 'node:http';
 import os from 'node:os';
 import { openUrl } from '../core/open-url.js';
@@ -21,6 +23,73 @@ function defaultDeviceName() {
         return os.hostname();
     }
 }
+function readLinuxOsPrettyName() {
+    try {
+        const content = readFileSync('/etc/os-release', 'utf8');
+        return content.match(/^PRETTY_NAME="?([^"\n]*)"?$/m)?.[1]?.trim() ?? '';
+    }
+    catch {
+        return '';
+    }
+}
+function macArchLabel() {
+    try {
+        if (process.arch === 'arm64')
+            return 'Apple Silicon';
+        if (os.cpus().some((cpu) => cpu.model.includes('Apple'))) {
+            return 'Apple Silicon';
+        }
+    }
+    catch {
+    }
+    return 'Intel';
+}
+export function describeOperatingSystem() {
+    try {
+        if (process.platform === 'linux') {
+            const base = readLinuxOsPrettyName() || `Linux ${os.release()}`;
+            return process.arch === 'arm64' ? `${base}, ARM64` : base;
+        }
+        if (process.platform === 'darwin') {
+            let version = '';
+            try {
+                version = execSync('sw_vers -productVersion', {
+                    stdio: ['ignore', 'pipe', 'ignore'],
+                })
+                    .toString()
+                    .trim();
+            }
+            catch {
+            }
+            return `${version ? `macOS ${version}` : 'macOS'}, ${macArchLabel()}`;
+        }
+        if (process.platform === 'win32') {
+            let label = '';
+            try {
+                label = os.version();
+            }
+            catch {
+            }
+            const build = Number(os.release().split('.')[2] ?? '0');
+            if (build >= 22000)
+                label = label.replace(/Windows 10/i, 'Windows 11');
+            const base = label || `Windows ${os.release()}`;
+            return process.arch === 'arm64' ? `${base}, ARM64` : base;
+        }
+        return `${process.platform} ${os.release()}`;
+    }
+    catch {
+        return process.platform;
+    }
+}
+export function withOperatingSystemInfo(name) {
+    const trimmed = name.trim();
+    const osLabel = describeOperatingSystem();
+    const combined = osLabel && !trimmed.includes(osLabel)
+        ? `${trimmed} (${osLabel})`
+        : trimmed;
+    return combined.slice(0, 180);
+}
 export function generatePkce() {
     const verifier = crypto.randomBytes(32).toString('base64url');
     const challenge = crypto
@@ -77,7 +146,7 @@ export async function loginViaBrowser(options) {
     const fetchImpl = options.fetchImpl ?? globalThis.fetch;
     const openBrowser = options.openBrowser ?? openUrl;
     const onUrl = options.onUrl ?? (() => { });
-    const deviceName = options.deviceName ?? defaultDeviceName();
+    const deviceName = withOperatingSystemInfo(options.deviceName ?? defaultDeviceName());
     const { verifier, challenge } = generatePkce();
     if (options.noBrowser) {
         const authUrl = buildAuthUrl(websiteUrl, {

package/dist/src/api/chat.js

@@ -146,6 +146,9 @@ function publicStatusMessage(data) {
         : 'tool';
     if (event.phase === 'thinking')
         return 'Thinking...';
+    if (event.phase === 'analyzing_image') {
+        return (event.imageCount ?? 1) > 1 ? 'Analyzing images...' : 'Analyzing image...';
+    }
     if (event.phase === 'running_tool')
         return `Running ${toolName}...`;
     if (event.phase === 'waiting_for_tool')
@@ -303,6 +306,13 @@ async function consumeTurnStream({ response, config, projectIndex, session, inpu
     }
     async function handleEvent(event) {
         if (event.event === 'status') {
+            const data = event.data;
+            if (data?.phase === 'analyzing_image') {
+                session.onImageAnalysis?.(Math.max(1, Number(data.imageCount ?? 1) || 1));
+            }
+            else if (data?.phase) {
+                session.onImageAnalysis?.(0);
+            }
             const message = publicStatusMessage(event.data);
             if (message)
                 session.onStatus(message);

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),
@@ -154,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);
@@ -168,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,
@@ -210,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)
@@ -218,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 '';
 }
@@ -247,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/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);

package/dist/src/ui/repl.js

@@ -16,7 +16,7 @@ import { authenticationErrorMessage, isAuthenticationError, } from '../api/http.
 import { setCommandOutputHook, withTuiMode } from '../runtime-mode.js';
 import { collectBackgroundJobUiKillMutations, collectBackgroundJobUiOutputMutations, } from '../tool-executor.js';
 import { startNewConversation, } from '../session.js';
-import { applySessionSnapshot, listSessionMetadata, loadSessionSnapshot, saveSessionState, } from '../session-store.js';
+import { applySessionSnapshot, listSessionMetadata, loadSessionSnapshot, saveSessionState, sessionHasUserMessage, } from '../session-store.js';
 import { truncate } from '../utils.js';
 import { writeClipboardText } from '../core/clipboard.js';
 import { openUrl } from '../core/open-url.js';
@@ -963,6 +963,7 @@ function createInitialShellState(session, serverModels, debugUi) {
         activeTurnInput: '',
         activeTurnInputPreformatted: false,
         agentMode: session.agentMode,
+        analyzingImages: 0,
         approvalCursor: getDefaultApprovalCursor(),
         approvalPrompt: null,
         autoYes: session.autoYes,
@@ -1282,6 +1283,8 @@ function appendCommandLog(state, text) {
     };
 }
 async function saveSessionBoth({ serverSessionClient, session, }) {
+    if (!sessionHasUserMessage(session))
+        return;
     saveSessionState(session);
     await serverSessionClient.save(session);
 }
@@ -1661,7 +1664,9 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
             if (!isAuthenticationError(error))
                 return false;
             clearCliAuthConfig(session.env);
-            saveSessionState(session);
+            if (sessionHasUserMessage(session)) {
+                saveSessionState(session);
+            }
             fatalError = new Error(authenticationErrorMessage(error));
             requestExit();
             return true;
@@ -2327,6 +2332,7 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 ...current,
                 activeTurnInput: input,
                 activeTurnInputPreformatted: preformatted,
+                analyzingImages: 0,
                 busy: true,
                 busySince: turnStartedAt,
                 clockNow: turnStartedAt,
@@ -2450,6 +2456,12 @@ export async function runClientInteractive({ appendPromptHistory, authConfig, de
                 }
             }
         };
+        session.onImageAnalysis = (activeImageCount) => {
+            store.update((current) => ({
+                ...current,
+                analyzingImages: Math.max(0, activeImageCount),
+            }));
+        };
         session.onStatus = (message) => {
             const panel = thinkingPanelFromStatus(message);
             store.update((current) => ({

package/dist/src/ui/tui/build-frame.js

@@ -1,5 +1,5 @@
 import { agentModeLabel } from '../../agent-mode.js';
-import { truncate } from '../../utils.js';
+import { singleLinePreview, truncate } from '../../utils.js';
 import { formatClientTokenUsage } from '../repl.js';
 import { renderFormattedBodyLines, renderPreformattedBodyLines, } from './markdown-render.js';
 import { displayWidth, line, plainLine, sliceToWidth, span, wrapText, } from './text.js';
@@ -212,6 +212,9 @@ export function getSlashCommandSuggestions(input) {
 function formatModelLabel(modelId, serverModels) {
     return serverModels.find((model) => model.id === modelId)?.label ?? 'Unknown model';
 }
+function pickerModelLabel(modelId, serverModels) {
+    return formatModelLabel(modelId, serverModels).replace(/\s*\([^)]*\)\s*$/, '');
+}
 function filterResumeSessions(sessions, filter, serverModels) {
     const q = filter.trim().toLowerCase();
     if (!q)
@@ -549,7 +552,12 @@ function buildLiveLines(state, width, spinnerFrame, elapsedSeconds) {
         }
         lines.push(plainLine(''));
     }
-    lines.push(plainLine(`${WORKING_CLOCK_ICON} Working · ${elapsedSeconds < 60 ? `${elapsedSeconds}s` : `${Math.floor(elapsedSeconds / 60)}m ${String(elapsedSeconds % 60).padStart(2, '0')}s`}`, { color: 'yellow' }));
+    const busyLabel = state.analyzingImages > 0
+        ? state.analyzingImages > 1
+            ? 'Analyzing images'
+            : 'Analyzing image'
+        : 'Working';
+    lines.push(plainLine(`${WORKING_CLOCK_ICON} ${busyLabel} · ${elapsedSeconds < 60 ? `${elapsedSeconds}s` : `${Math.floor(elapsedSeconds / 60)}m ${String(elapsedSeconds % 60).padStart(2, '0')}s`}`, { color: 'yellow' }));
     const todos = state.todos ?? [];
     if (todos.length > 0) {
         lines.push(plainLine(''));
@@ -865,18 +873,54 @@ function buildOverlayLines(state, width, height, nowMs) {
     }
     if (state.resumePickerOpen) {
         const filtered = filterResumeSessions(state.resumePickerSessions, state.resumePickerFilter, state.serverModels);
+        const pickerWidth = Math.max(20, width - 2);
+        const divider = () => plainLine('─'.repeat(pickerWidth), { color: 'gray', dim: true });
         lines.push(plainLine('Resume a previous session', { color: 'cyan', bold: true }));
         lines.push(line(span('Search: ', { color: 'gray' }), span(state.resumePickerFilter, {}), span('█', { color: 'gray' })));
-        for (const [index, session] of filtered.entries()) {
+        lines.push(divider());
+        const maxCards = Math.max(2, Math.min(filtered.length, Math.floor((height - 10) / 3)));
+        let start = 0;
+        if (filtered.length > maxCards) {
+            start = Math.min(Math.max(0, state.resumePickerIndex - Math.floor(maxCards / 2)), filtered.length - maxCards);
+        }
+        const visible = filtered.slice(start, start + maxCards);
+        if (start > 0) {
+            lines.push(plainLine(`  … ${start} newer`, { color: 'gray', dim: true }));
+        }
+        for (const [offset, session] of visible.entries()) {
+            const index = start + offset;
             const selected = index === state.resumePickerIndex;
-            const color = selected ? 'cyan' : undefined;
-            const model = truncate(formatModelLabel(session.modelId, state.serverModels), 26);
-            lines.push(plainLine(`${selected ? '› ' : '  '}${formatRelativeTime(session.updatedAt).padEnd(11)} ${(session.branch ?? '(no branch)').slice(0, 13).padEnd(14)} ${model.padEnd(26)} ${(session.lastUserMessage.slice(0, 40) || '(empty)')}`, { color, bold: selected }));
+            const prompt = singleLinePreview(session.lastUserMessage, pickerWidth) ||
+                session.name ||
+                `Session ${session.id}`;
+            lines.push(line(span(selected ? '› ' : '  ', { color: 'cyan' }), span(fitLine(prompt, Math.max(10, pickerWidth - 2)), selected
+                ? { color: 'cyan', bold: true }
+                : session.lastUserMessage
+                    ? {}
+                    : { color: 'gray', dim: true })));
+            const meta = [
+                formatRelativeTime(session.updatedAt),
+                pickerModelLabel(session.modelId, state.serverModels),
+                session.branch ?? null,
+            ]
+                .filter(Boolean)
+                .join(' · ');
+            lines.push(line(span('    '), span(fitLine(meta, Math.max(10, pickerWidth - 4)), {
+                color: selected ? 'cyan' : 'gray',
+                dim: !selected,
+            })));
+            if (offset < visible.length - 1)
+                lines.push(plainLine(''));
+        }
+        const remaining = filtered.length - (start + visible.length);
+        if (remaining > 0) {
+            lines.push(plainLine(`  … ${remaining} older`, { color: 'gray', dim: true }));
         }
         if (filtered.length === 0) {
             lines.push(plainLine('No sessions match.', { color: 'gray' }));
         }
-        lines.push(plainLine('↑/↓ move    enter resume    esc start new    ctrl+c quit', {
+        lines.push(divider());
+        lines.push(plainLine('↑/↓ move · enter resume · esc start new · ctrl+c quit', {
             color: 'gray',
         }));
     }

package/dist/src/utils.js

@@ -17,6 +17,15 @@ export function truncate(text, maxChars = 4000) {
         return text;
     return `${text.slice(0, maxChars)}\n... (truncated)`;
 }
+export function singleLinePreview(text, maxChars) {
+    const collapsed = String(text ?? '')
+        .replace(/\n\.\.\. \(truncated\)\s*$/, '…')
+        .replace(/\s+/g, ' ')
+        .trim();
+    if (collapsed.length <= maxChars)
+        return collapsed;
+    return `${collapsed.slice(0, Math.max(0, maxChars - 1)).trimEnd()}…`;
+}
 export function clampInteger(value, fallback, max) {
     const numeric = Number(value);
     if (!Number.isFinite(numeric) || numeric <= 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thegitai/cli",
-  "version": "1.0.0-preview.8",
+  "version": "1.0.0-preview.9",
   "description": "TheGitAI is an AI coding agent for your terminal. It indexes your repository, writes and edits files, runs commands, and builds features with you.",
   "keywords": [
     "ai",
@@ -37,10 +37,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-preview.8",
-    "@thegitai/tui-darwin-x64": "1.0.0-preview.8",
-    "@thegitai/tui-linux-x64": "1.0.0-preview.8",
-    "@thegitai/tui-win32-x64": "1.0.0-preview.8",
+    "@thegitai/tui-darwin-arm64": "1.0.0-preview.9",
+    "@thegitai/tui-darwin-x64": "1.0.0-preview.9",
+    "@thegitai/tui-linux-x64": "1.0.0-preview.9",
+    "@thegitai/tui-win32-x64": "1.0.0-preview.9",
     "@vscode/ripgrep": "1.18.0"
   },
   "publishConfig": {