@quatcode/agent 0.2.6 → 0.2.8

package/dist/tui.js

@@ -13,8 +13,8 @@ import { renderBanner } from "./logo.js";
 import { renderMarkdown, wrapSegments } from "./markdown.js";
 import { ADD_PROVIDER, allProviders, buildProvider, defaultModelFor, effortsForModel, hasKey, keyEnvFor, probeProviderModels, providerEnvKey, providerHasModel, providerMeta, providerSlug, registerCustomProvider, removeCustomProvider, resolveProviderForModel, } from "./models.js";
 import { activeThemeId, bg, bold, buildColorRemap, clipAnsi, fg, getThemes, glyphs, padEndTo, palette, remapColors, setTheme, stringWidth, stripAnsi, tone, toolGlyph, } from "./theme.js";
-import { listSessionsForDir, loadConfig, makeSessionId, saveConfig, saveSession, deleteSession } from "./store.js";
-import { configFile, conversationKey, deleteConversation, displayTitle, latestPerConversation, messagesForStorage, sortConversations, updateConversation, } from "./store.js";
+import { listSessions, listSessionsForDir, loadConfig, makeSessionId, saveConfig, saveSession, deleteSession } from "./store.js";
+import { configFile, conversationKey, deleteConversation, displayTitle, latestPerConversation, messagesForStorage, sameDir, sortConversations, updateConversation } from "./store.js";
 import { MCP_USAGE, isMcpUrl, mcpInstructionsSection, parseMcpAdd } from "./mcp.js";
 import { copyToClipboard, readClipboardImage, readClipboardText, } from "./clipboard.js";
 import { createLoadSkillTool, fetchSkillFromUrl, importSkillFile, listSkills, parseSkill, removeSkill, saveSkill, skillsRoot, skillsSystemSection, } from "./skills.js";
@@ -24,9 +24,10 @@ const COMMAND_INFO = [
     { name: "/new", desc: "new conversation (clears the screen)" },
     { name: "/model", args: "[id]", desc: "pick or set the model" },
     { name: "/provider", args: "[add|list|remove]", desc: "connect a provider by API key" },
+    { name: "/btw", args: "<question>", desc: "ask a side question without interrupting the task" },
     { name: "/effort", args: "[level]", desc: "reasoning effort (minimal…high)" },
     { name: "/key", desc: "enter the API key for the current provider" },
-    { name: "/dir", args: "[path]", desc: "change the project directory" },
+    { name: "/dir", args: "[path]", desc: "move this session to another project directory" },
     { name: "/context", desc: "project summary" },
     { name: "/usage", desc: "tokens, cost and time" },
     { name: "/sessions", desc: "list and resume recent sessions" },
@@ -136,12 +137,20 @@ class TuiApp {
     modeBadgeWidth = 0;
     modeBadgeHover = false;
     versionNotice = null;
+    sessionDir;
+    conversationTitle = null;
     bottomHintStart = -1;
     bottomHintWidth = 0;
     bottomHintRow = -1;
+    queue = [];
+    inputScroll = 0;
+    lastInputTotalRows = 0;
+    hoverRow = -1;
+    hoverCol = -1;
     constructor(options, input, output) {
         this.opts = options;
         this.dir = path.resolve(options.dir);
+        this.sessionDir = this.dir;
         this.gateMode = options.allowAll ? "always" : "ask";
         this.out = output;
         this.kb = new Keyboard(input, output);
@@ -240,8 +249,10 @@ class TuiApp {
             const prompt = this.opts.initialPrompt;
             this.buffer.addHistory(prompt);
             this.clearSplash();
-            this.append(this.userBlockLines(prompt));
+            this.appendUserBlock(prompt, 0);
             await this.turn(prompt);
+            if (await this.drainQueue())
+                return this.finish();
         }
         for (;;) {
             const result = await this.readLine();
@@ -267,7 +278,7 @@ class TuiApp {
                 transcriptLength: transcriptAt,
             };
             this.messageCursor = -1;
-            this.append(this.userBlockLines(input, images.length));
+            const blockStart = this.appendUserBlock(input, images.length);
             if (isCommand) {
                 this.turnUndo = null;
                 const shouldExit = await this.command(input);
@@ -275,9 +286,14 @@ class TuiApp {
                     break;
                 continue;
             }
-            this.userMarkers.push({ line: transcriptAt, text: input });
+            this.userMarkers.push({ line: blockStart, text: input });
             await this.turn(input, images);
+            if (await this.drainQueue())
+                break;
         }
+        return this.finish();
+    }
+    async finish() {
         this.printGoodbye();
         this.renderNow();
         await this.pause(120);
@@ -377,6 +393,12 @@ class TuiApp {
                         this.moveSuggestion(key.kind === "wheelup" ? -1 : 1);
                         continue;
                     }
+                    if ((this.mode === "editing" || this.mode === "running") &&
+                        this.inputOverflow() &&
+                        this.pointerOverInput()) {
+                        this.scrollInput(key.kind === "wheelup" ? 3 : -3);
+                        continue;
+                    }
                     const delta = key.kind === "wheelup" ? 3 : -3;
                     if (this.mode === "picker" && this.picker) {
                         const dir = key.kind === "wheelup" ? "up" : "down";
@@ -443,8 +465,14 @@ class TuiApp {
             }
             if (this.mode === "editing")
                 this.handleEditKey(key);
-            else if (this.mode === "running")
-                this.handleRunKey(key);
+            else if (this.mode === "running") {
+                const abortKey = key.type === "escape" || (key.type === "control" && key.ch === "c");
+                const undoKey = key.type === "control" && key.ch === "z";
+                if (abortKey || undoKey)
+                    this.handleRunKey(key);
+                else
+                    this.handleEditKey(key);
+            }
             else if (this.mode === "permission")
                 this.handleConfirmKey(key);
             else if (this.mode === "picker")
@@ -474,6 +502,10 @@ class TuiApp {
         if (key.type === "text" || key.type === "backspace" || key.type === "delete") {
             this.suggestionIndex = 0;
         }
+        if (key.type === "text" || key.type === "backspace" || key.type === "delete") {
+            this.suggestionIndex = 0;
+            this.inputScroll = 0;
+        }
         switch (key.type) {
             case "text":
                 this.buffer.insert(key.text);
@@ -481,14 +513,16 @@ class TuiApp {
             case "control":
                 switch (key.ch) {
                     case "c":
-                        if (this.buffer.isEmpty())
+                        if (this.buffer.isEmpty() && this.mode !== "running")
                             this.finishLine({ kind: "interrupt" });
                         else
                             this.buffer.clearLine();
                         break;
                     case "d":
-                        if (this.buffer.isEmpty())
-                            this.finishLine({ kind: "eof" });
+                        if (this.buffer.isEmpty()) {
+                            if (this.mode !== "running")
+                                this.finishLine({ kind: "eof" });
+                        }
                         else
                             this.buffer.deleteForward();
                         break;
@@ -551,7 +585,7 @@ class TuiApp {
                     if (!this.deleteImageTokenAfter())
                         this.buffer.deleteWordAfter();
                 }
-                else if (key.ch === "v" || key.ch === "V") {
+                else if (key.ch === "v" || key.ch === "V" || key.ch === "м" || key.ch === "М") {
                     void this.pasteFromClipboard();
                     return;
                 }
@@ -562,6 +596,7 @@ class TuiApp {
                     this.moveSuggestion(key.dir === "up" ? -1 : 1);
                     return;
                 }
+                this.inputScroll = 0;
                 if (key.dir === "up") {
                     if (!this.buffer.moveVertical(-1))
                         this.buffer.historyPrev();
@@ -596,6 +631,7 @@ class TuiApp {
                 }
                 break;
             case "newline":
+                this.inputScroll = 0;
                 this.buffer.insert("\n");
                 break;
             case "enter": {
@@ -607,7 +643,7 @@ class TuiApp {
                     const index = Math.max(0, Math.min(this.suggestionIndex, matches.length - 1));
                     const selected = matches[index];
                     if (selected) {
-                        this.finishLine({ kind: "submit", text: selected.name });
+                        this.submitText(selected.name);
                         return;
                     }
                 }
@@ -620,13 +656,13 @@ class TuiApp {
                     if (unique.length === 1)
                         text = unique[0].name;
                 }
-                this.finishLine({ kind: "submit", text });
+                this.submitText(text);
                 return;
             }
             case "tab":
                 if (this.suggestionMatches().length > 0)
                     this.completeCommand();
-                else
+                else if (this.mode !== "running")
                     this.toggleMode();
                 break;
             case "backspace":
@@ -652,13 +688,104 @@ class TuiApp {
         this.scheduleRender();
         resolve?.(result);
     }
+    submitText(raw) {
+        if (this.mode !== "running") {
+            this.buffer.reset();
+            this.inputScroll = 0;
+            this.finishLine({ kind: "submit", text: raw });
+            return;
+        }
+        const extracted = extractInputImages(raw, this.pendingImages);
+        this.pendingImages = new Map();
+        const text = extracted.text;
+        const images = extracted.images;
+        if (text)
+            this.buffer.addHistory(text);
+        this.buffer.reset();
+        this.inputScroll = 0;
+        if (/^\/btw\b/.test(text)) {
+            void this.runBtw(text.replace(/^\/btw\s*/, ""));
+            return;
+        }
+        this.queue.push({ text, images });
+        this.appendUserBlock(text, images.length, [
+            `  ${tone.mist("// QUEUED — will be sent when the current task finishes")}`,
+        ]);
+        this.scheduleRender();
+    }
+    async drainQueue() {
+        while (this.queue.length > 0) {
+            const next = this.queue.shift();
+            if (!next.text.trim())
+                continue;
+            if (next.text.startsWith("/")) {
+                const shouldExit = await this.command(next.text);
+                if (shouldExit)
+                    return true;
+                continue;
+            }
+            this.append([`  ${tone.mist("// SENDING QUEUED MESSAGE")}`]);
+            this.clearSplash();
+            this.userMarkers.push({ line: this.transcript.length, text: next.text });
+            await this.turn(next.text, next.images);
+        }
+        return false;
+    }
+    async runBtw(question) {
+        const text = question.trim();
+        if (!text) {
+            this.append([`  ${tone.mist("// usage: /btw <question>")}`]);
+            return;
+        }
+        const provider = this.ensureProvider();
+        const inner = Math.min(Math.max(44, this.contentWidth() - 8), 66);
+        if (!provider) {
+            this.append([
+                `  ${tone.red(glyphs.cross)} ${tone.mist("// BTW needs a configured provider")}`,
+            ]);
+            return;
+        }
+        const pending = box("BTW", [tone.silver(clipAnsi(text, inner - 2)), "", tone.mist("// thinking…")], inner, palette.steel);
+        this.append([...pending, ""]);
+        const start = Math.max(0, this.transcript.length - pending.length - 1);
+        try {
+            const response = await provider.complete({
+                model: this.model,
+                system: `${this.system ? `${this.system}\n\n` : ""}# side channel\nThe user is asking a quick side question while the main task runs. Answer briefly and directly. Do not use tools, do not change the main task, and do not ask to run anything.`,
+                messages: [
+                    ...this.session.getMessages(),
+                    { role: "user", content: [{ type: "text", text }] },
+                ],
+                maxTokens: 2048,
+            });
+            const answer = response.content
+                .map((part) => (part.type === "text" ? part.text : ""))
+                .join("")
+                .trim();
+            const answerLines = answer
+                ? renderMarkdown(answer, { width: inner - 2, indent: 2 })
+                : [tone.mist("// the model returned no answer")];
+            const card = box("BTW", [tone.silver(clipAnsi(text, inner - 2)), "", ...answerLines], inner, palette.steel);
+            this.transcript.splice(start, pending.length + 1, ...card, "");
+        }
+        catch (err) {
+            const card = box("BTW", [
+                tone.silver(clipAnsi(text, inner - 2)),
+                "",
+                tone.red(`// ${errorMessage(err)}`),
+            ], inner, palette.red);
+            this.transcript.splice(start, pending.length + 1, ...card, "");
+        }
+        this.scheduleRender();
+    }
     readLine(overrides = {}) {
         const initial = overrides.initial ?? this.pendingInitial ?? "";
         this.pendingInitial = null;
         if (initial)
             this.buffer.setText(initial);
-        else
+        else if (this.buffer.text().trim() === "")
             this.buffer.reset();
+        this.inputScroll = 0;
         this.inputPrompt = overrides.prompt ?? defaultPrompt();
         this.inputMask = overrides.mask ?? false;
         this.inputPlaceholder = overrides.placeholder ?? "ask anything, or /help";
@@ -754,6 +881,23 @@ class TuiApp {
         this.scheduleRender();
         return true;
     }
+    inputWindowSize() {
+        return Math.max(3, Math.floor(this.screen.rows / 2));
+    }
+    inputOverflow() {
+        return this.lastInputTotalRows > this.inputWindowSize();
+    }
+    pointerOverInput() {
+        if (!this.lastInputRender || this.hoverRow < 0)
+            return false;
+        const top = this.lastHeaderRows + this.lastViewport + this.lastInputOffset;
+        return (this.hoverRow >= top && this.hoverRow < top + this.lastInputRender.lines.length);
+    }
+    scrollInput(delta) {
+        const maxOffset = Math.max(0, this.lastInputTotalRows - this.inputWindowSize());
+        this.inputScroll = Math.max(0, Math.min(this.inputScroll + delta, maxOffset));
+        this.scheduleRender();
+    }
     bottomHintHit(row, col) {
         if (this.bottomHintRow < 0 || this.bottomHintStart < 0)
             return false;
@@ -776,6 +920,8 @@ class TuiApp {
         return `  ${tone.mist("─".repeat(Math.max(8, width - 2)))}`;
     }
     handleHover(row, col) {
+        this.hoverRow = row;
+        this.hoverCol = col;
         if (row === 1) {
             const hover = this.badgeHit(col);
             if (hover !== this.modeBadgeHover) {
@@ -797,11 +943,11 @@ class TuiApp {
             }
             return;
         }
-        if (this.mode === "editing") {
+        if (this.mode === "editing" || this.mode === "running") {
             const matches = this.suggestionMatches();
             if (matches.length === 0)
                 return;
-            const top = this.lastHeaderRows + this.lastViewport + 1;
+            const top = this.lastHeaderRows + this.lastViewport + 1 + (this.status ? 1 : 0);
             const index = row - top;
             if (index >= 0 && index < matches.length && index !== this.suggestionIndex) {
                 this.suggestionIndex = index;
@@ -837,16 +983,16 @@ class TuiApp {
             }
             return;
         }
-        if (this.mode === "editing") {
+        if (this.mode === "editing" || this.mode === "running") {
             if (this.placeInputCursor(row, col))
                 return;
             const matches = this.suggestionMatches();
             if (matches.length > 0) {
-                const top = this.lastHeaderRows + this.lastViewport + 1;
+                const top = this.lastHeaderRows + this.lastViewport + 1 + (this.status ? 1 : 0);
                 const index = row - top;
                 if (index >= 0 && index < matches.length) {
                     this.suggestionIndex = index;
-                    this.finishLine({ kind: "submit", text: matches[index].name });
+                    this.submitText(matches[index].name);
                 }
             }
             return;
@@ -1075,7 +1221,7 @@ class TuiApp {
             this.bottomHintStart >= 0 ? this.lastHeaderRows + viewport + footer.length - 1 : -1;
         let content;
         if (this.mode === "picker" && this.picker) {
-            content = this.picker.render(this.contentWidth() - 2, viewport);
+            content = this.picker.render(this.contentWidth(), viewport);
         }
         else {
             content = this.visibleTranscript(viewport);
@@ -1088,7 +1234,10 @@ class TuiApp {
         while (lines.length < rows)
             lines.push("");
         let cursor = null;
-        if (this.mode === "editing" && this.lastInputRender) {
+        if ((this.mode === "editing" || this.mode === "running") &&
+            this.lastInputRender &&
+            this.lastInputRender.cursorRow >= 0 &&
+            this.lastInputRender.cursorRow < this.lastInputRender.lines.length) {
             const inputTop = this.padTop + header.length + viewport + this.lastInputOffset;
             cursor = {
                 row: inputTop + this.lastInputRender.cursorRow,
@@ -1154,7 +1303,7 @@ class TuiApp {
         const width = this.contentWidth();
         const rule = `  ${tone.mist("─".repeat(Math.max(8, width - 2)))}`;
         const bottom = this.bottomRuleLine();
-        if (this.mode === "editing") {
+        if (this.mode === "editing" || this.mode === "running") {
             const rendered = this.buffer.render({
                 width,
                 prompt: this.inputPrompt,
@@ -1162,9 +1311,14 @@ class TuiApp {
                 mask: this.inputMask,
                 style: styleInputLine,
             });
-            const maxRows = Math.max(3, Math.floor(this.screen.rows / 2));
-            if (rendered.lines.length > maxRows) {
-                const start = Math.max(0, Math.min(rendered.cursorRow - maxRows + 1, rendered.lines.length - maxRows));
+            const maxRows = this.inputWindowSize();
+            const total = rendered.lines.length;
+            this.lastInputTotalRows = total;
+            if (total > maxRows) {
+                const maxOffset = total - maxRows;
+                const fromBottom = Math.max(0, Math.min(this.inputScroll, maxOffset));
+                this.inputScroll = fromBottom;
+                const start = maxOffset - fromBottom;
                 this.lastInputRender = {
                     lines: rendered.lines.slice(start, start + maxRows),
                     rows: rendered.rows.slice(start, start + maxRows),
@@ -1173,18 +1327,22 @@ class TuiApp {
                 };
             }
             else {
+                this.inputScroll = 0;
                 this.lastInputRender = rendered;
             }
             const suggestions = this.suggestions();
-            this.lastInputOffset = 1 + suggestions.length;
-            return [rule, ...suggestions, ...this.lastInputRender.lines, bottom];
+            const statusLines = this.status
+                ? [this.statusLine()]
+                : this.mode === "running"
+                    ? [`  ${tone.mist("// esc interrupts · enter queues a message")}`]
+                    : [];
+            this.lastInputOffset = 1 + statusLines.length + suggestions.length;
+            return [rule, ...statusLines, ...suggestions, ...this.lastInputRender.lines, bottom];
         }
         this.lastInputRender = null;
+        this.lastInputTotalRows = 0;
         if (this.status)
             return [rule, this.statusLine(), bottom];
-        if (this.mode === "running") {
-            return [rule, `  ${tone.mist("// esc interrupts")}`, bottom];
-        }
         if (this.mode === "permission")
             return [rule, `  ${this.permissionHint}`, bottom];
         if (this.mode === "picker" && this.picker) {
@@ -1195,14 +1353,22 @@ class TuiApp {
     statusLine() {
         const spin = tone.accent(glyphs.spinner[this.spinnerFrame % glyphs.spinner.length] ?? "-");
         const elapsed = ((performance.now() - this.statusStartedAt) / 1000).toFixed(1);
-        const meta = [this.status?.meta, `${elapsed}s`].filter(Boolean).join(" · ");
+        const meta = [
+            this.status?.meta,
+            `${elapsed}s`,
+            this.queue.length > 0 ? `${this.queue.length} queued` : "",
+        ]
+            .filter(Boolean)
+            .join(" · ");
         return `  ${spin} ${this.status?.label ?? ""}  ${tone.mist(meta)}`;
     }
     visibleTranscript(viewport) {
-        const total = this.transcript.length;
-        const maxOffset = Math.max(0, total - viewport);
+        let contentEnd = this.transcript.length;
+        while (contentEnd > 0 && this.transcript[contentEnd - 1] === "")
+            contentEnd -= 1;
+        const maxOffset = Math.max(0, contentEnd - viewport);
         this.scrollOffset = Math.max(0, Math.min(this.scrollOffset, maxOffset));
-        const end = total - this.scrollOffset;
+        const end = contentEnd - this.scrollOffset;
         const start = Math.max(0, end - viewport);
         this.lastVisibleStart = start;
         return this.transcript.slice(start, end);
@@ -1950,10 +2116,15 @@ class TuiApp {
             case "help":
                 this.printHelp();
                 return false;
+            case "btw":
+                await this.runBtw(arg);
+                return false;
             case "new":
                 this.session = new Session(this.system);
                 this.conversationId = makeSessionId();
                 this.providerSessionId = makeSessionId();
+                this.sessionDir = this.dir;
+                this.conversationTitle = null;
                 this.lastTurn = null;
                 this.pendingImages = new Map();
                 this.transcript = [];
@@ -2071,7 +2242,14 @@ class TuiApp {
             const records = await listSessionsForDir(this.dir, max);
             const conversations = sortConversations(latestPerConversation(records));
             if (conversations.length === 0) {
-                this.append([`  ${tone.mist(`// NO SESSIONS YET IN ${shortenHome(this.dir).toUpperCase()}`)}`]);
+                const lines = [
+                    `  ${tone.mist(`// NO SESSIONS YET IN ${shortenHome(this.dir).toUpperCase()}`)}`,
+                ];
+                const elsewhere = await this.latestSessionElsewhere();
+                if (elsewhere) {
+                    lines.push(`  ${tone.mist(`// latest: "${clipAnsi(displayTitle(elsewhere), 48)}" in ${shortenHome(elsewhere.cwd)}`)}`, `  ${tone.mist(`// resume it with: /dir ${shortenHome(elsewhere.cwd)}  then  /sessions`)}`);
+                }
+                this.append(lines);
                 return;
             }
             const labelWidth = Math.max(20, this.contentWidth() - 62);
@@ -2079,7 +2257,7 @@ class TuiApp {
                 kind: "item",
                 value: conversationKey(record),
                 label: `${record.pinned ? `${glyphs.pin} ` : ""}${clipAnsi(displayTitle(record), labelWidth)}`,
-                hint: `${record.pinned ? "pinned · " : ""}${record.createdAt.slice(0, 16).replace("T", " ")} · ${record.provider ? `${record.provider} · ` : ""}${record.model} · ${record.status} · ${record.steps} steps`,
+                hint: `${record.pinned ? "pinned · " : ""}${record.provider ? `${record.provider} · ` : ""}${record.model} · ${record.createdAt.slice(0, 16).replace("T", " ")}`,
             }));
             const chosen = await this.openPicker(new Picker({
                 title: "sessions · enter resumes",
@@ -2135,6 +2313,7 @@ class TuiApp {
         if (!title)
             return;
         await updateConversation(conversationKey(record), { title });
+        this.conversationTitle = title;
         this.append([
             `  ${tone.accent(glyphs.diamond)} ${tone.mist(`// SESSION RENAMED → ${clipAnsi(title, 60)}`)}`,
         ]);
@@ -2143,6 +2322,8 @@ class TuiApp {
         const messages = record.messages ?? [];
         this.session = new Session(this.system, messages);
         this.conversationId = conversationKey(record);
+        this.sessionDir = record.cwd ?? this.dir;
+        this.conversationTitle = record.title ?? null;
         this.providerSessionId = makeSessionId();
         if (record.model) {
             const resolved = record.provider && providerHasModel(record.provider, record.model)
@@ -2194,8 +2375,12 @@ class TuiApp {
                     .flatMap((part) => (part.type === "text" ? [part.text] : []))
                     .join("\n");
                 const images = message.content.filter((part) => part.type === "image").length;
-                if (text.trim() || images > 0)
+                if (text.trim() || images > 0) {
+                    if (lines.length > 0 && lines[lines.length - 1] !== "")
+                        lines.push("");
                     lines.push(...this.userBlockLines(text, images));
+                    lines.push("");
+                }
                 continue;
             }
             if (message.role === "assistant") {
@@ -2618,28 +2803,56 @@ class TuiApp {
         this.scheduleRender();
         return choice === "allow" || choice === "always";
     }
+    async latestSessionElsewhere() {
+        const records = await listSessions(50).catch(() => []);
+        return (records.find((record) => record.cwd && !sameDir(record.cwd, this.dir)) ?? null);
+    }
+    /**
+     * On Windows a leading "/" is the drive root, so "/Downloads" resolves to
+     * C:\Downloads instead of the user's Downloads folder. Treat it (and "~")
+     * as home-relative so Unix-style paths do what users expect.
+     */
+    resolveDirArg(arg) {
+        let target = arg.trim();
+        if (target === "~") {
+            target = homedir();
+        }
+        else if (target.startsWith("~/") || target.startsWith("~\\")) {
+            target = path.join(homedir(), target.slice(2));
+        }
+        else if (process.platform === "win32" &&
+            target.startsWith("/") &&
+            !target.startsWith("//")) {
+            target = path.join(homedir(), target);
+        }
+        return path.resolve(this.dir, target);
+    }
     async changeDir(arg) {
         if (!arg) {
             this.append([`  ${tone.mist(`// DIR ${this.dir}`)}`]);
             return;
         }
-        const next = path.resolve(this.dir, arg);
+        const next = this.resolveDirArg(arg);
         if (next === this.dir) {
             this.append([`  ${tone.mist("// already in this directory")}`]);
             return;
         }
+        const messages = this.session.getMessages().map((message) => ({ ...message }));
         this.dir = next;
         this.rebuildTools();
-        this.session = new Session("");
+        this.lastTurn = null;
         try {
             const meta = await this.loadProject();
-            this.session = new Session(this.system);
+            this.session = new Session(this.system, messages);
             this.append([
-                `  ${tone.mist(`// DIR → ${shortenHome(this.dir)}`)}`,
+                `  ${tone.accent(glyphs.diamond)} ${tone.mist(`// SESSION MOVED → ${shortenHome(this.dir)}`)}`,
                 `  ${tone.mist("// PROJECT")}  ${meta}`,
+                `  ${tone.mist(`// ${messages.length} message${messages.length === 1 ? "" : "s"} carried over`)}`,
+                `  ${tone.mist("// in-memory only — the session keeps its original history")}`,
             ]);
         }
         catch (err) {
+            this.session = new Session(this.system, messages);
             this.append([`  ${tone.red(`// failed to scan project: ${errorMessage(err)}`)}`]);
         }
     }
@@ -2738,6 +2951,7 @@ class TuiApp {
             ["↑ ↓", "input history — previous / next message"],
             ["wheel", "scroll the conversation"],
             ["ctrl+↓", "jump to the bottom of the chat (or click the ↓ button)"],
+            ["enter while running", "queue the message · /btw asks without interrupting"],
             ["ctrl+p/ctrl+n", "input history (same as ↑ ↓)"],
             ["tab / badge", "switch plan/build · click the header badge · complete commands"],
             ["ctrl+z", "undo the last message (works while thinking)"],
@@ -2755,6 +2969,13 @@ class TuiApp {
         }
         this.append(lines);
     }
+    appendUserBlock(input, imageCount, extra = []) {
+        const lines = this.userBlockLines(input, imageCount);
+        const last = this.transcript[this.transcript.length - 1];
+        const leading = this.transcript.length > 0 && last !== "" ? [""] : [];
+        this.append([...leading, ...lines, ...extra, ""]);
+        return Math.max(0, this.transcript.length - (extra.length + 1) - lines.length);
+    }
     userBlockLines(input, imageCount = 0) {
         const width = Math.max(20, this.contentWidth() - 2);
         const lines = input.split("\n");
@@ -2765,12 +2986,12 @@ class TuiApp {
                 out.push("");
                 continue;
             }
-            const prefix = index === 0 ? `  ${tone.accent(glyphs.prompt)} ` : "    ";
-            const kind = index === 0 ? "bold" : "plain";
-            out.push(...wrapSegments([{ text: line, kind }], prefix, "    ", width));
+            const prefix = index === 0 ? `${tone.accent(glyphs.prompt)} ` : "  ";
+            const kind = "bold";
+            out.push(...wrapSegments([{ text: line, kind }], prefix, "  ", width));
         }
         if (imageCount > 0) {
-            out.push(`    ${tone.mist(`[${imageCount} image${imageCount === 1 ? "" : "s"} attached]`)}`);
+            out.push(`  ${tone.mist(`[${imageCount} image${imageCount === 1 ? "" : "s"} attached]`)}`);
         }
         return out;
     }
@@ -2779,8 +3000,9 @@ class TuiApp {
         const record = {
             id: makeSessionId(),
             createdAt: new Date().toISOString(),
-            cwd: this.dir,
+            cwd: this.sessionDir,
             task: input,
+            title: this.conversationTitle ?? this.sessionTitleFromMessages(),
             provider: this.providerId,
             model: this.model,
             status: result.status,
@@ -2804,6 +3026,22 @@ class TuiApp {
         }
         return record.id;
     }
+    sessionTitleFromMessages() {
+        for (const message of this.session.getMessages()) {
+            if (message.role !== "user")
+                continue;
+            const text = message.content
+                .map((part) => (part.type === "text" ? part.text : ""))
+                .join(" ")
+                .replace(/\[Image \d+\]/g, " ")
+                .replace(/\s+/g, " ")
+                .trim();
+            if (!text)
+                continue;
+            return text.length > 60 ? `${text.slice(0, 59)}…` : text;
+        }
+        return "(untitled)";
+    }
     printGoodbye() {
         this.append(["", `  ${tone.mist(`// SESSION CLOSED · ${this.summaryLine()}`)}`]);
     }