zames_pro 2.29.16 → 2.32.0

package/dist/index.js

@@ -16,7 +16,8 @@ import { translate, normalizeLocale, localeDisplayName, isLocale, } from './i18n
 import { Transcript } from './transcript.js';
 import { UndoStore } from './undo.js';
 import { selfReview, selfDiff, selfApply, selfList } from './self-review.js';
-import { formatDiff, diffGitArgs, parseTranscript, summarizeTranscript, renderCost, formatExport, defaultExportPath, renderDoctor, renderPermissions, resolveExtraDir, buildReviewPrompt, trimRestoredMessages, RESTORED_HISTORY_LIMIT, buildCompactPrompt, buildCompactCarryover, formatRestoredHistory, isUsableCompactSummary, } from './commands.js';
+import { formatDiff, diffGitArgs, parseTranscript, summarizeTranscript, renderCost, formatExport, defaultExportPath, renderDoctor, renderPermissions, resolveExtraDir, buildReviewPrompt, trimRestoredMessages, RESTORED_HISTORY_LIMIT, mergeMessages, isSlashCommand, ctrlCEscalation, } from './commands.js';
+import { performCompact } from './compact.js';
 import { renderMarkdown } from './markdown.js';
 import { closeWeb } from './web.js';
 import { saveSession, loadLastSession, listSessions, sessionsDir, } from './sessions.js';
@@ -57,8 +58,8 @@ function getPositional() {
 }
 // /compact asks the OLD chat for a summary. If browser.ask() exhausts its own
 // rate-limit budget, aborting the whole compaction used to force the operator
-// to start over. We retry the summary call a few times instead.
-const COMPACT_SUMMARY_ATTEMPTS = 3;
+// to start over. We retry the summary call a few times instead (inside
+// performCompact()).
 // How many restored messages the LOCAL fallback summary keeps when the model
 // could not produce one (a rate limit / server error must not lose the
 // compaction).
@@ -287,6 +288,7 @@ ${theme.bold(t('help.commands'))}
  ${t('help.cmd.add_dir')}
  ${t('help.cmd.review')}
  ${t('help.cmd.compact')}
+  ${t('help.cmd.queue')}
   ${t('help.cmd.config')}
   ${t('help.cmd.lang')}
   ${t('help.cmd.debug_dom')}
@@ -343,6 +345,7 @@ const SLASH_COMMANDS = [
     { name: '/add-dir', key: 'help.cmd.add_dir' },
     { name: '/review', key: 'help.cmd.review' },
     { name: '/compact', key: 'help.cmd.compact' },
+    { name: '/queue', key: 'help.cmd.queue' },
     { name: '/config', key: 'help.cmd.config' },
     { name: '/skills', key: 'help.cmd.skills' },
     { name: '/memory', key: 'help.cmd.memory' },
@@ -844,7 +847,7 @@ async function resolveWorkdir() {
     const dir = explicitDir ? path.resolve(explicitDir) : process.cwd();
     const stat = await fs.stat(dir).catch(() => null);
     if (!stat || !stat.isDirectory()) {
-        throw new Error('Не директория: ' + dir);
+        throw new Error(t('msg.not_dir', { v: dir }));
     }
     return dir;
 }
@@ -903,6 +906,16 @@ async function printRestoredHistory(browser, ui, chatId = null) {
     const restoredTokens = browser.getLastTokenUsage();
     if (typeof restoredTokens === 'number') {
         out(theme.dim(t('chats.history_tokens', { v: String(restoredTokens) })));
+        // Warn when the restored chat is near the context limit, and suggest
+        // /compact. The threshold mirrors the auto-compact one so the operator
+        // sees the same signal whether or not auto-compact is enabled.
+        const limit = config.ui.contextLimit;
+        if (limit > 0) {
+            const pct = (restoredTokens / limit) * 100;
+            if (pct >= 80) {
+                out(theme.warn(t('chats.history_near_limit', { pct: String(Math.round(pct)) })));
+            }
+        }
     }
     for (const m of messages) {
         if (m.role === 'user') {
@@ -922,7 +935,7 @@ async function printRestoredHistory(browser, ui, chatId = null) {
 }
 // ---------- task runner ----------
 async function runTask(browser, tools, taskText, workdir, opts, attachments = []) {
-    const { transcript, freshChat, sendSystemPrompt, queue = [], ui: editor, onChatReady, } = opts;
+    const { transcript, freshChat, sendSystemPrompt, queue = [], ui: editor, onChatReady, onAutoCompact = null, autoCompactPct = 95, contextLimit = 1_000_000, getTokenUsage = null, } = opts;
     // In TTY mode the UI is a LineEditor: it owns the input (queue, Esc,
     // Ctrl+C) and draws the status ABOVE the permanent input line. In non-TTY
     // mode (pipes) — a regular spinner + watchInput.
@@ -971,6 +984,11 @@ async function runTask(browser, tools, taskText, workdir, opts, attachments = []
         // the whole pre-send phase (chat creation, throttle wait) with no
         // generation in flight.
         while (true) {
+            // T7: per-task summary (duration + number of tool calls). Counts tools
+            // via the UI callback and reports ONE dim line after the task, so the
+            // operator sees how long it took and how much work happened.
+            const taskStart = Date.now();
+            let taskTools = 0;
             const outcome = await mod.runAgentLoop({
                 browser,
                 tools,
@@ -984,13 +1002,27 @@ async function runTask(browser, tools, taskText, workdir, opts, attachments = []
                 onThinking: () => ui.thinking(),
                 onSendPause: (seconds) => ui.sendPause(seconds),
                 onNotice: (msg) => ui.warning(msg),
-                onToolCall: (name, toolArgs) => ui.toolCall(name, toolArgs),
+                onToolCall: (name, toolArgs) => {
+                    taskTools++;
+                    ui.toolCall(name, toolArgs);
+                },
                 onToolResult: (result) => ui.toolResult(result),
                 onAssistantMessage: (msg) => ui.assistant(msg),
                 onWarning: (msg) => ui.warning(msg),
                 onChatReady,
                 debugLog: debug,
                 locale: currentLocale,
+                askDeadlineMs: config.browser.askDeadlineMs,
+                maxAfterToolRetries: config.browser.maxAfterToolRetries,
+                // Auto-compact between tool calls when the context nears the
+                // window limit. The callback is provided by the caller (runTask) so it
+                // can refresh the outer currentChatId. It runs in the SAME execution
+                // context (this task owns the browser send loop) and the loop awaits
+                // it, so it serializes with the throttle.
+                onAutoCompact,
+                autoCompactPct,
+                contextLimit,
+                getTokenUsage,
             });
             // The loop may end WITHOUT a model answer: an exhausted iteration
             // limit or an ask() watchdog (the model stopped responding). In that
@@ -1002,6 +1034,16 @@ async function runTask(browser, tools, taskText, workdir, opts, attachments = []
                 ui.warning(outcome);
                 transcript?.log('agent_no_answer', { outcome });
             }
+            // T7: one dim summary line per task (duration + tool calls). Printed
+            // even on an abort, so the operator sees what happened.
+            const summary = theme.dim(t('msg.task_summary', {
+                sec: ((Date.now() - taskStart) / 1000).toFixed(1),
+                tools: String(taskTools),
+            }));
+            if (editor)
+                editor.printAbove(summary);
+            else
+                console.log(summary);
             // Aborted (Esc/Ctrl+C) — we don't start the next tasks from the queue
             // and clear it, so "stop" really stops everything.
             if (browser._stopped) {
@@ -1010,18 +1052,34 @@ async function runTask(browser, tools, taskText, workdir, opts, attachments = []
             }
             if (!queue.length)
                 break;
-            const queued = queue.shift() ?? { text: '' };
+            // Merge the LEADING plain-text messages into ONE batch (fewer sends ->
+            // less rate-limit risk and the operator's thoughts arrive together). We
+            // stop at the first slash-command: it must NOT be sent as a task — it is
+            // handled by the main loop, so we leave it (and anything after it) in
+            // the queue and break out of this task's drain loop.
+            let batchLen = 0;
+            while (batchLen < queue.length && !isSlashCommand(queue[batchLen].text)) {
+                batchLen++;
+            }
+            if (batchLen === 0)
+                break;
+            const batch = queue.splice(0, batchLen);
+            const merged = mergeMessages(batch);
+            if (!merged.text.trim())
+                break;
             ui.stop();
-            if (editor) {
-                editor.printAbove(theme.user(t('msg.from_queue')) + theme.assistant(queued.text));
-            }
-            else {
-                console.log(theme.user(t('msg.from_queue')) + theme.assistant(queued.text));
-            }
-            transcript?.log('queued_task', { task: queued.text });
+            const banner = batch.length === 1
+                ? theme.user(t('msg.from_queue')) + theme.assistant(batch[0].text)
+                : theme.user(t('msg.from_queue_batch', { n: batch.length })) +
+                    theme.assistant(t('msg.batch_joined', { n: batch.length }));
+            if (editor)
+                editor.printAbove(banner);
+            else
+                console.log(banner);
+            transcript?.log('queued_task', { task: merged.text, count: batch.length });
             next = {
-                text: queued.text,
-                attachments: queued.attachments,
+                text: merged.text,
+                attachments: merged.attachments,
                 freshChat: false,
                 sendSystemPrompt: false,
             };
@@ -1200,6 +1258,9 @@ async function main() {
     const pendingQueue = [];
     // Show the "no clipboard image" hint only once per session.
     let clipboardWarned = false;
+    // Timestamp of the last Ctrl+C while the agent was busy. Two presses
+    // within 2s escalate from "abort the running tool" to "stop the whole run".
+    let lastCtrlCAt = 0;
     // ---------- review mode state ----------
     // null — normal mode.
     // { snapDir, snapName, originalWorkdir } — we're inside a snapshot, the chat
@@ -1214,6 +1275,10 @@ async function main() {
         if (mcpPool)
             await mcpPool.close().catch(() => { });
         transcript.close();
+        console.log(theme.dim(t('msg.exit_summary', {
+            transcript: transcript.file || t('common.off'),
+            chat: currentChatId || t('chats.not_created'),
+        })));
         console.log(theme.system(String.fromCharCode(10) + t('msg.bye')));
         process.exit(0);
     });
@@ -1228,7 +1293,9 @@ async function main() {
         const last = loadLastSession(currentWorkdir);
         if (last && last.id) {
             resumeId = last.id;
-            console.log(theme.system(`Восстанавливаю сессию ${last.id}${last.title ? ` (${last.title})` : ''}...`));
+            console.log(theme.system(t('msg.resuming', {
+                id: last.id + (last.title ? ` (${last.title})` : ''),
+            })));
         }
     }
     if (resumeId) {
@@ -1286,6 +1353,8 @@ async function main() {
         // The editor pulls the number on every render, so it follows the live
         // DeepSeek counter (accumulated_token_usage) without a polling timer.
         ed.onContextQuery = () => browser.getLastTokenUsage();
+        // Use the configured context window for the fill percentage/color.
+        ed.setContextLimit(config.ui.contextLimit);
         // Toggle icons (🧠 deep thinking, 🌐 web search) before the context
         // counter. The editor pulls the live state on every render.
         ed.onToggleQuery = () => browser.getToggleStatesSync();
@@ -1304,6 +1373,7 @@ async function main() {
                 ed.printAbove(theme.system(t('msg.attached_image', {
                     marker: att.marker,
                     size: formatSize(image.data.length),
+                    path: p,
                 })));
                 return att;
             }
@@ -1326,6 +1396,7 @@ async function main() {
                 marker: att.marker,
                 name,
                 size: formatSize(data.length),
+                path: filePath,
             })));
             return att;
         };
@@ -1349,6 +1420,7 @@ async function main() {
                         marker: att.marker,
                         name: nm,
                         size: formatSize(data.length),
+                        path: fp,
                     }) + theme.dim(' (windows-clipboard)')));
                     return att;
                 }
@@ -1374,6 +1446,7 @@ async function main() {
             ed.printAbove(theme.system(t('msg.attached_image', {
                 marker: att.marker,
                 size: formatSize(res.data.length),
+                path: p,
             }) + theme.dim('  (' + res.via + ')')));
             return att;
         };
@@ -1399,8 +1472,22 @@ async function main() {
         };
         ed.onCtrlC = () => {
             if (ed.busy) {
-                ed.printAbove(theme.warn(t('msg.abort_ctrlc_short')));
-                browser.stopGeneration().catch(() => { });
+                // A running tool can be long (npm test, a big build). The FIRST
+                // Ctrl+C aborts just the TOOL (sets browser._abort, which the tool's
+                // AbortSignal follows and which makes the loop drop the tool result).
+                // A SECOND Ctrl+C within 2s is an explicit "stop the whole run"
+                // (sets _stopped, which also halts the queue). This makes the two
+                // intents distinguishable instead of one press doing everything.
+                const now = Date.now();
+                if (ctrlCEscalation(now - lastCtrlCAt) === 'run') {
+                    ed.printAbove(theme.warn(t('msg.abort_ctrlc_short')));
+                    browser.stopGeneration().catch(() => { });
+                }
+                else {
+                    ed.printAbove(theme.warn(t('msg.abort_tool_short')));
+                    browser._abort = true;
+                }
+                lastCtrlCAt = now;
             }
             else {
                 // Not busy — exit. We wake takeInput() so the loop finishes.
@@ -1480,6 +1567,15 @@ async function main() {
             if (editor)
                 editor.refreshStatus();
         }
+        // The context window size feeds the status-bar percentage and its color.
+        // Apply it to the live editor immediately (the value is a plain number,
+        // no restart needed).
+        if (path === 'ui.contextLimit' && typeof value === 'number') {
+            if (editor) {
+                editor.setContextLimit(value);
+                editor.refreshStatus();
+            }
+        }
     }
     function configSetRaw(field, raw) {
         const value = validateConfigValue(field, raw);
@@ -1700,7 +1796,6 @@ async function main() {
             continue;
         }
         if (['/new', '/clear', 'new'].includes(lower)) {
-            console.log(theme.system(t('msg.new_chat')));
             if (editor)
                 editor.lock(t('msg.input_locked'));
             try {
@@ -1710,6 +1805,10 @@ async function main() {
                 currentChatId = await browser.getCurrentChatId();
                 saveLastChat(currentChatId, currentWorkdir);
                 transcript.log('new_chat');
+                // Start the new chat on a clean screen (like /clear in a shell).
+                if (editor)
+                    editor.clearScreen();
+                console.log(theme.system(t('msg.new_chat')));
                 console.log(theme.system(t('msg.new_chat_ok') + String.fromCharCode(10)));
             }
             catch (e) {
@@ -1852,7 +1951,7 @@ async function main() {
                 await mod.selfList({ config });
             }
             catch (e) {
-                console.error(theme.error('Ошибка:'), e.message);
+                console.error(theme.error(t('msg.error')), e.message);
             }
             continue;
         }
@@ -1866,7 +1965,7 @@ async function main() {
                 await mod.selfDiff({ config, name });
             }
             catch (e) {
-                console.error(theme.error('Ошибка:'), e.message);
+                console.error(theme.error(t('msg.error')), e.message);
             }
             continue;
         }
@@ -1880,7 +1979,7 @@ async function main() {
                 await mod.selfApply({ config, name });
             }
             catch (e) {
-                console.error(theme.error('Ошибка:'), e.message);
+                console.error(theme.error(t('msg.error')), e.message);
             }
             continue;
         }
@@ -1894,7 +1993,7 @@ async function main() {
                 lastChats = await browser.listChats(30);
                 spin.stop();
                 if (!lastChats.length) {
-                    console.log(theme.system('Чатов не найдено. Возможно, сайдбар свёрнут или селекторы устарели.'));
+                    console.log(theme.system(t('chats.none_hint')));
                 }
                 else {
                     console.log(theme.system(t('chats.recent')));
@@ -1935,7 +2034,6 @@ async function main() {
                 console.error(theme.error(t('chats.no_n', { n, total: lastChats.length })));
                 continue;
             }
-            console.log(theme.system(t('chats.opening', { v: pick.title })));
             if (editor)
                 editor.lock(t('msg.input_locked'));
             try {
@@ -1945,12 +2043,14 @@ async function main() {
                 sendSystemPromptNext = promptOnResume();
                 saveLastChat(pick.id, currentWorkdir, pick.title);
                 transcript.log('resume_chat', { id: pick.id, title: pick.title });
+                // Resume on a clean screen so the restored dialogue is readable.
+                if (editor)
+                    editor.clearScreen();
+                console.log(theme.system(t('chats.opening', { v: pick.title })));
                 console.log(theme.assistant(t('msg.chat_opened')) +
                     theme.system(sendSystemPromptNext
-                        ? String.fromCharCode(10) +
-                            ' Системный промпт будет переслан на следующей задаче.\n'
-                        : String.fromCharCode(10) +
-                            ' Системный промпт НЕ пересылается (он уже в начале чата). Включить: /config set browser.resendPromptOnResume true.\n'));
+                        ? String.fromCharCode(10) + t('chats.prompt_will_resend')
+                        : String.fromCharCode(10) + t('chats.prompt_no_resend')));
                 await printRestoredHistory(browser, editor, pick.id);
             }
             catch (e) {
@@ -2000,6 +2100,8 @@ async function main() {
             if (editor)
                 editor.lock(t('msg.input_locked'));
             try {
+                if (editor)
+                    editor.clearScreen();
                 console.log(theme.system(t('msg.opening_chat', { id })));
                 await browser.openChat(id);
                 currentChatId = id;
@@ -2007,7 +2109,7 @@ async function main() {
                 sendSystemPromptNext = promptOnResume();
                 saveLastChat(id, currentWorkdir);
                 transcript.log('resume_chat', { id });
-                console.log(theme.assistant('Чат открыт.') +
+                console.log(theme.assistant(t('msg.chat_opened')) +
                     theme.system(String.fromCharCode(10)));
                 await printRestoredHistory(browser, editor, id);
             }
@@ -2024,6 +2126,37 @@ async function main() {
             console.log(theme.system(currentWorkdir));
             continue;
         }
+        if (lower === '/queue' || lower.startsWith('/queue ')) {
+            const sub = trimmed.slice('/queue'.length).trim().toLowerCase();
+            if (sub === 'clear' || sub === 'c' || sub === 'clean') {
+                const n = pendingQueue.length;
+                pendingQueue.length = 0;
+                console.log(theme.system(t('msg.queue_cleared') + ' (' + n + ')'));
+                continue;
+            }
+            if (sub && sub !== 'list' && sub !== 'ls') {
+                console.error(theme.error(t('msg.queue_usage')));
+                continue;
+            }
+            if (!pendingQueue.length) {
+                console.log(theme.dim(t('msg.queue_empty')));
+                continue;
+            }
+            console.log(theme.system(t('msg.queue_title')));
+            pendingQueue.forEach((m, i) => {
+                const one = String(m.text || '')
+                    .replace(/\s+/g, ' ')
+                    .trim();
+                const shown = one.length > 80 ? one.slice(0, 80) + ' …' : one;
+                const att = m.attachments?.length
+                    ? ' [+' + m.attachments.length + ']'
+                    : '';
+                console.log(theme.system('  ') +
+                    theme.assistant(t('msg.queue_item', { n: i + 1, text: shown + att })));
+            });
+            console.log(theme.dim(t('msg.queue_cleared_hint')));
+            continue;
+        }
         if (lower === '/mcp') {
             if (!mcpPool) {
                 console.log(theme.dim(t('mcp.none')));
@@ -2179,7 +2312,7 @@ async function main() {
                         console.error(theme.error('  ' + e));
                 }
                 else {
-                    console.log(theme.assistant(`Перезагружено модулей: ${count}. Браузер и чат не тронуты.`));
+                    console.log(theme.assistant(t('msg.reloaded', { n: count })));
                 }
             }
             catch (e) {
@@ -2328,6 +2461,11 @@ async function main() {
                 mcpTools: mcpStatus.toolCount,
                 transcriptOk: !!transcript.file,
                 authSaved: authMarkerExists(),
+                contextLimit: config.ui.contextLimit,
+                hasOrigin: gitOk
+                    ? (await runGit('git remote', currentWorkdir, 5000)).includes('origin')
+                    : undefined,
+                minSendIntervalMs: config.browser.minSendIntervalMs,
             })));
             continue;
         }
@@ -2359,153 +2497,27 @@ async function main() {
             // Compaction: ask DeepSeek (in the CURRENT chat) to compress the
             // history into a handover summary, then start a NEW chat, resend the
             // system prompt and post the summary as the carried-over context.
-            // This keeps the model working with a small context while nothing is
-            // lost: the summary plus the system prompt are all the new chat needs.
-            if (!currentChatId) {
-                currentChatId = await browser.getCurrentChatId();
-            }
-            if (!currentChatId) {
-                console.error(theme.warn(t('compact.no_chat')));
-                continue;
-            }
-            const beforeTokens = browser.getLastTokenUsage();
-            if (editor)
-                editor.lock(t('msg.input_locked'));
-            try {
-                console.log(theme.system(t('compact.start')));
-                // 1) Ask the OLD chat to summarize itself. agent: true - this is a
-                // real back-and-forth, so the send throttle applies.
-                //
-                // The call is retried a few times: browser.ask() already retries the
-                // "Messages too frequent" rate limit internally, but if it exhausts
-                // its own budget the whole /compact used to abort and the operator
-                // had to start over. A transient server error must NOT lose the
-                // compaction, so we keep trying with a growing pause before giving up.
-                let summary = '';
-                let summaryErr = '';
-                for (let attempt = 1; attempt <= COMPACT_SUMMARY_ATTEMPTS; attempt++) {
-                    // On a retry after an unusable answer we append an explicit
-                    // "plain text only" note. In reasoning mode DeepSeek answered the
-                    // /compact prompt with a Bash TOOL CALL ("gather the current state")
-                    // instead of a summary — protocol noise that must NOT be carried
-                    // into the new chat.
-                    let prompt = buildCompactPrompt(currentLocale);
-                    if (attempt > 1) {
-                        prompt +=
-                            currentLocale === 'en'
-                                ? '\n\nIMPORTANT: reply with the summary as PLAIN TEXT only. Do NOT call any tools and do NOT output tool-call JSON/DSML.'
-                                : '\n\nВАЖНО: ответь ТОЛЬКО текстом резюме. НЕ вызывай инструменты и НЕ выводи JSON/DSML вызова инструмента.';
-                    }
-                    let answer = '';
-                    try {
-                        answer = await browser.ask(prompt, {
-                            agent: true,
-                            timeout: Math.max(60_000, config.browser.answerTimeoutMs),
-                        });
-                    }
-                    catch (e) {
-                        summaryErr = e.message;
-                    }
-                    const trimmed = String(answer || '').trim();
-                    // The user aborted (Esc) — do not keep retrying.
-                    if (/^\(прервано пользователем\)$/.test(trimmed)) {
-                        summaryErr = trimmed;
-                        break;
-                    }
-                    if (!summaryErr && isUsableCompactSummary(trimmed)) {
-                        summary = trimmed;
-                        summaryErr = '';
-                        break;
-                    }
-                    // The turn may have succeeded yet produced an unusable answer (a
-                    // tool call, empty text). Record it and retry with the note.
-                    if (!summaryErr)
-                        summaryErr = trimmed || t('common.unknown');
-                    if (attempt < COMPACT_SUMMARY_ATTEMPTS) {
-                        console.error(theme.warn(t('compact.summary_retry', {
-                            v: summaryErr,
-                            attempt: String(attempt),
-                            max: String(COMPACT_SUMMARY_ATTEMPTS),
-                        })));
-                        await new Promise((r) => setTimeout(r, 3000 * attempt));
-                    }
-                }
-                // A model summary that never arrived (a server error, or only
-                // tool-call answers) must NOT lose the compaction: fall back to a
-                // LOCAL summary built from the restored chat history (the same
-                // displayable dialogue /resume prints).
-                if (!summary) {
-                    let fallback = '';
-                    try {
-                        const all = currentChatId && browser.fetchChatMessages
-                            ? await browser.fetchChatMessages(currentChatId).catch(() => [])
-                            : [];
-                        const msgs = trimRestoredMessages(all, 0);
-                        if (msgs.length) {
-                            fallback = formatRestoredHistory(msgs, {
-                                limit: COMPACT_FALLBACK_LIMIT,
-                            });
-                        }
-                    }
-                    catch { }
-                    fallback = String(fallback || '').trim();
-                    if (fallback) {
-                        summary = fallback;
-                        console.error(theme.warn(t('compact.summary_fallback', {
-                            v: String(COMPACT_FALLBACK_LIMIT),
-                        })));
-                    }
-                    else {
-                        console.error(theme.error(t('compact.summary_failed', {
-                            v: summaryErr || t('common.unknown'),
-                        })));
-                        continue;
-                    }
-                }
-                transcript.log('compact_summary', {
-                    chars: summary.length,
-                    beforeTokens,
-                });
-                // 2) New chat + system prompt + the summary as the first message.
-                await browser.newChat();
-                await browser.ask(mod.buildSystemPrompt({
-                    workdir: currentWorkdir,
-                    tools: mod.createTools(currentWorkdir, { undo }),
-                    locale: currentLocale,
-                }), { timeout: 60_000, agent: false });
-                await browser.ask(buildCompactCarryover(summary, task ?? undefined), {
-                    timeout: 60_000,
-                    agent: false,
-                });
-                currentChatId = await browser.getCurrentChatId();
+            // Shared with the AUTO-compact path via performCompact() so both
+            // paths stay identical (same retries, same fallback, same resend).
+            const res = await performCompact({
+                browser,
+                currentChatId,
+                workdir: currentWorkdir,
+                locale: currentLocale,
+                task: task ?? undefined,
+                transcript,
+                ui: editor,
+                buildSystemPrompt: mod.buildSystemPrompt,
+                tools: mod.createTools(currentWorkdir, { undo }),
+                answerTimeoutMs: config.browser.answerTimeoutMs,
+                fallbackLimit: COMPACT_FALLBACK_LIMIT,
+            });
+            if (res.ok) {
+                currentChatId = res.chatId;
                 saveLastChat(currentChatId, currentWorkdir);
                 freshChatNext = false;
                 // The new chat already carries the system prompt and the context.
                 sendSystemPromptNext = false;
-                console.log(theme.assistant(t('compact.done') +
-                    String.fromCharCode(10) +
-                    t('compact.report', {
-                        chars: summary.length,
-                        tokens: beforeTokens === null
-                            ? t('common.unknown')
-                            : String(beforeTokens),
-                    })));
-                if (editor) {
-                    editor.printAbove(theme.dim(String.fromCharCode(10) +
-                        '--- compacted context ---' +
-                        String.fromCharCode(10) +
-                        summary +
-                        String.fromCharCode(10) +
-                        '--- end ---' +
-                        String.fromCharCode(10)));
-                }
-            }
-            catch (e) {
-                console.error(theme.error(e.message));
-            }
-            finally {
-                if (editor)
-                    editor.unlock();
             }
             continue;
         }
@@ -2653,6 +2665,36 @@ async function main() {
                         saveLastChat(chatId, currentWorkdir);
                     }
                 },
+                // Auto-compact between tool calls when the context nears the
+                // window limit. Enabled via browser.autoCompact. It sends messages
+                // from THIS execution context (the task owns the browser), and the
+                // loop awaits it, so it serializes with the throttle.
+                onAutoCompact: config.browser.autoCompact
+                    ? async () => {
+                        const res = await performCompact({
+                            browser,
+                            currentChatId,
+                            workdir: currentWorkdir,
+                            locale: currentLocale,
+                            task: taskText,
+                            transcript,
+                            ui: editor,
+                            buildSystemPrompt: mod.buildSystemPrompt,
+                            tools: mod.createTools(currentWorkdir, { undo }),
+                            answerTimeoutMs: config.browser.answerTimeoutMs,
+                            quiet: true,
+                            skipUiLock: true,
+                        });
+                        if (res.ok) {
+                            currentChatId = res.chatId;
+                            saveLastChat(res.chatId, currentWorkdir);
+                        }
+                        return res.ok ? res.chatId : null;
+                    }
+                    : null,
+                autoCompactPct: config.browser.autoCompactPct,
+                contextLimit: config.ui.contextLimit,
+                getTokenUsage: () => browser.getLastTokenUsage(),
             }, inputAttachments);
         }
         finally {
@@ -2673,6 +2715,12 @@ async function main() {
     if (mcpPool)
         await mcpPool.close().catch(() => { });
     transcript.close();
+    // One dim line so the operator can find the log and the session after
+    // the run (previously the path was only available via /transcript).
+    console.log(theme.dim(t('msg.exit_summary', {
+        transcript: transcript.file || t('common.off'),
+        chat: currentChatId || t('chats.not_created'),
+    })));
 }
 main().catch((e) => {
     console.error(theme.error(t('msg.critical')), e.message);