@ouro.bot/cli 0.1.0-alpha.253 → 0.1.0-alpha.255

package/changelog.json

@@ -1,6 +1,20 @@
 {
   "_note": "This changelog is maintained as part of the PR/version-bump workflow. Agent-curated, not auto-generated. Agents read this file directly via read_file to understand what changed between versions.",
   "versions": [
+    {
+      "version": "0.1.0-alpha.255",
+      "changes": [
+        "feat(tui): session resume shows last messages as regular chat (no dimmed preview) with teal resume banner in header.",
+        "feat(tui): image/file drag-and-drop \u2014 detects image paths in pasted text, reads to base64, inserts [Image #N] references, sends as image_url content blocks to model.",
+        "refactor(tui): removed custom history-* roles and addSessionHistory (KISS/DRY)."
+      ]
+    },
+    {
+      "version": "0.1.0-alpha.254",
+      "changes": [
+        "fix(daemon): orphan-cleanup fallback no longer kills processes from sibling harness instances. On startup, `killOrphanProcesses` scans `ps` for harness entry points (`agent-entry.js`, `daemon-entry.js`, `bluebubbles/entry.js`, `teams-entry.js`) and SIGTERMs them when the pidfile is missing. Previously any matching process was fair game, so a vitest-driven harness run from a sibling worktree (or a parallel Claude Code session running the coverage gate) would terminate the production daemon's children, triggering cascading graceful shutdowns and making production slugger unavailable for seconds-to-minutes at a time. Now the fallback only flags true orphans \u2014 processes whose PPID has been reparented to init (PID 1). Sibling daemons' live-parented children are left alone. New exported helper `parseOrphanPidsFromPs` isolates the filter for direct unit coverage. Complements the test-isolation guard shipped in alpha.253 (#333): that PR stopped tests from SENDING `inner.wake testagent` commands into the production socket; this PR stops the production daemon from SIGTERMing test-spawned child processes during its own startup."
+      ]
+    },
     {
       "version": "0.1.0-alpha.253",
       "changes": [

package/dist/heart/daemon/daemon.js

@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OuroDaemon = void 0;
+exports.parseOrphanPidsFromPs = parseOrphanPidsFromPs;
 exports.killOrphanProcesses = killOrphanProcesses;
 exports.writePidfile = writePidfile;
 exports.handleAgentSenseTurn = handleAgentSenseTurn;
@@ -62,13 +63,55 @@ const outlook_types_1 = require("../outlook/outlook-types");
 const outlook_read_1 = require("../outlook/outlook-read");
 const outlook_view_1 = require("../outlook/outlook-view");
 const PIDFILE_PATH = path.join(os.homedir(), ".ouro-cli", "daemon.pids");
+/**
+ * Scan `ps -eo pid,ppid,command` output for daemon-owned entry points whose
+ * parent has died (PPID reparented to init/PID 1). Returns the list of PIDs
+ * that are safe to SIGTERM — true orphans, not children of live sibling
+ * daemons running from worktrees, test suites, or other users of the harness.
+ *
+ * Exported so unit tests can exercise the filter without shelling out.
+ */
+function parseOrphanPidsFromPs(psOutput, selfPid) {
+    const orphans = [];
+    for (const line of psOutput.split("\n")) {
+        // Explicitly exclude MCP server processes — they share a harness entry
+        // point but are not daemon children and must never be killed.
+        if (line.includes("mcp-serve") || line.includes("mcp serve"))
+            continue;
+        // Match only daemon-owned JS entry points.
+        if (!line.includes("agent-entry.js")
+            && !line.includes("daemon-entry.js")
+            && !line.includes("bluebubbles/entry.js")
+            && !line.includes("teams-entry.js"))
+            continue;
+        // Parse `<pid> <ppid> <command...>`. ps pads these with leading spaces.
+        // Regex guarantees both groups are \d+ so parseInt can't produce NaN.
+        const match = line.trim().match(/^(\d+)\s+(\d+)\s/);
+        if (!match)
+            continue;
+        const pid = parseInt(match[1], 10);
+        const ppid = parseInt(match[2], 10);
+        if (pid === selfPid)
+            continue;
+        // CRITICAL: only kill processes whose parent is init (PID 1). A live
+        // PPID means the process belongs to another daemon instance (parallel
+        // test run, sibling worktree, another user of /tmp/ouroboros-daemon.sock).
+        // Killing those will crash unrelated harnesses — we saw this in B6
+        // when a vitest worker's daemon killed slugger's production children.
+        if (ppid !== 1)
+            continue;
+        orphans.push(pid);
+    }
+    return orphans;
+}
 /**
  * Kill all ouro processes from the previous daemon instance using the pidfile.
  * On startup, reads PIDs from ~/.ouro-cli/daemon.pids, kills them all, then
  * deletes the file. The new daemon writes its own PIDs after spawning.
  *
- * Falls back to ps-based scanning if the pidfile doesn't exist (first run
- * or manual cleanup).
+ * Falls back to ps-based scanning scoped to true orphans (PPID=1) if the
+ * pidfile doesn't exist (first run, previous daemon crashed before writing,
+ * manual cleanup). The scope is narrow on purpose — see parseOrphanPidsFromPs.
  */
 /* v8 ignore start -- process lifecycle: uses kill/ps, tested via deployment @preserve */
 function killOrphanProcesses() {
@@ -81,22 +124,12 @@ function killOrphanProcesses() {
             fs.unlinkSync(PIDFILE_PATH);
         }
         catch {
-            // No pidfile — fall back to ps scan
+            // No pidfile — fall back to ps scan (scoped to orphans with PPID=1).
         }
-        // Fallback: scan ps for daemon-owned processes only (not MCP servers or external tools)
         if (pidsToKill.length === 0) {
             try {
-                const result = (0, child_process_1.execSync)("ps -eo pid,command", { encoding: "utf-8", timeout: 5000 });
-                for (const line of result.split("\n")) {
-                    // Only match daemon-owned entry points, NOT mcp-serve or other external processes
-                    if (line.includes("mcp-serve") || line.includes("mcp serve"))
-                        continue;
-                    if (!line.includes("agent-entry.js") && !line.includes("daemon-entry.js") && !line.includes("bluebubbles/entry.js") && !line.includes("teams-entry.js"))
-                        continue;
-                    const pid = parseInt(line.trim(), 10);
-                    if (!isNaN(pid) && pid !== process.pid)
-                        pidsToKill.push(pid);
-                }
+                const result = (0, child_process_1.execSync)("ps -eo pid,ppid,command", { encoding: "utf-8", timeout: 5000 });
+                pidsToKill = parseOrphanPidsFromPs(result, process.pid);
             }
             catch { /* ps failed — best effort */ }
         }

package/dist/senses/cli/image-paste.js

@@ -0,0 +1,162 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IMAGE_EXTENSION_REGEX = void 0;
+exports.isImagePath = isImagePath;
+exports.unescapePath = unescapePath;
+exports.tryReadImage = tryReadImage;
+exports.formatImageRef = formatImageRef;
+exports.replacePathsWithRefs = replacePathsWithRefs;
+exports.processSubmitInput = processSubmitInput;
+exports.resolveImageContent = resolveImageContent;
+/**
+ * Image paste detection and resolution for the TUI.
+ *
+ * When a user drags an image file onto the terminal, macOS pastes the absolute
+ * path (often with backslash-escaped spaces). This module detects image paths
+ * in the input text, replaces them with `[Image #N]` references, reads the
+ * files, and produces OpenAI-compatible `image_url` content blocks.
+ */
+const promises_1 = require("fs/promises");
+const path = __importStar(require("path"));
+const runtime_1 = require("../../nerves/runtime");
+/** Matches image file extensions (case-insensitive) */
+exports.IMAGE_EXTENSION_REGEX = /\.(png|jpe?g|gif|webp)$/i;
+/** Check whether a string (possibly backslash-escaped) ends with an image extension */
+function isImagePath(str) {
+    return exports.IMAGE_EXTENSION_REGEX.test(unescapePath(str));
+}
+/** Convert backslash-escaped spaces to plain spaces (macOS drag-drop format) */
+function unescapePath(str) {
+    return str.replace(/\\ /g, " ");
+}
+/** Map file extension to MIME media type */
+function extensionToMediaType(ext) {
+    switch (ext.toLowerCase()) {
+        case ".jpg":
+        case ".jpeg":
+            return "image/jpeg";
+        case ".png":
+            return "image/png";
+        case ".gif":
+            return "image/gif";
+        case ".webp":
+            return "image/webp";
+        default:
+            return "image/png";
+    }
+}
+/**
+ * Read an image file and return base64 + media type.
+ * Returns null on any error (file not found, permission denied, etc.)
+ */
+async function tryReadImage(absolutePath) {
+    try {
+        const buffer = await (0, promises_1.readFile)(absolutePath);
+        const ext = path.extname(absolutePath);
+        return {
+            base64: Buffer.from(buffer).toString("base64"),
+            mediaType: extensionToMediaType(ext),
+        };
+    }
+    catch {
+        (0, runtime_1.emitNervesEvent)({
+            component: "senses",
+            event: "senses.image_read_error",
+            message: `Failed to read image: ${absolutePath}`,
+            meta: { path: absolutePath },
+        });
+        return null;
+    }
+}
+/** Format an image reference placeholder */
+function formatImageRef(n) {
+    return `[Image #${n}]`;
+}
+/**
+ * Scan input for absolute path tokens ending with image extensions.
+ * Matches `/` followed by non-whitespace chars (allowing `\ ` for escaped spaces)
+ * ending with an image extension.
+ */
+function replacePathsWithRefs(input) {
+    const images = new Map();
+    // Match absolute paths starting with / that end with an image extension.
+    // Allow backslash-escaped characters (like `\ ` for spaces in macOS drag-drop).
+    const pathRegex = /(\/(?:[^\s\\]|\\.)+\.(?:png|jpe?g|gif|webp))/gi;
+    let counter = 0;
+    const text = input.replace(pathRegex, (match) => {
+        counter++;
+        images.set(counter, unescapePath(match));
+        return formatImageRef(counter);
+    });
+    return { text, images };
+}
+/**
+ * Process submit input: detect image paths, replace with refs, return map.
+ * This is the entry point called by InputArea on submit.
+ */
+function processSubmitInput(text) {
+    return replacePathsWithRefs(text);
+}
+/**
+ * Build OpenAI content parts from text + image map.
+ * For each image in the map, reads the file and creates an `image_url` content part.
+ * Images that fail to read are silently skipped.
+ * Returns `[{ type: "text", text }]` when no images resolve.
+ */
+async function resolveImageContent(text, images) {
+    if (images.size === 0) {
+        return [{ type: "text", text }];
+    }
+    const parts = [];
+    // Read all images in parallel
+    const entries = Array.from(images.entries());
+    const results = await Promise.all(entries.map(async ([, absolutePath]) => tryReadImage(absolutePath)));
+    for (const result of results) {
+        if (result) {
+            parts.push({
+                type: "image_url",
+                image_url: { url: `data:${result.mediaType};base64,${result.base64}` },
+            });
+        }
+    }
+    // Always include the text part
+    parts.push({ type: "text", text });
+    // If no images resolved, return just text
+    if (parts.length === 1) {
+        return [{ type: "text", text }];
+    }
+    return parts;
+}

package/dist/senses/cli/ouro-tui.js

@@ -17,6 +17,7 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const ink_1 = require("ink");
 const streaming_markdown_1 = require("./streaming-markdown");
+const image_paste_1 = require("./image-paste");
 // ─── Ouroboros Brand Palette (ANSI RGB) ─────────────────────────────
 // From packages/outlook-ui/src/style.css and ouroboros.bot
 const OURO = {
@@ -49,7 +50,7 @@ function safeWidth() {
 function termWidth() {
     return process.stdout.columns || 80;
 }
-function Header({ agentName, model, contextPercent, cwd }) {
+function Header({ agentName, model, contextPercent, cwd, resumeInfo }) {
     const showCtx = contextPercent > 0;
     const info = [agentName, model, cwd, showCtx ? `ctx ${contextPercent}%` : ""].filter(Boolean).join(" · ");
     // 3-segment snake: TAIL (fixed) + MIDDLE (stretches) + HEAD (fixed)
@@ -66,7 +67,7 @@ function Header({ agentName, model, contextPercent, cwd }) {
     const line1 = TAIL1 + " ".repeat(middleLen) + HEAD1;
     const line2 = TAIL2 + "_".repeat(middleLen) + HEAD2;
     const line3text = (info.length > middleLen ? info.slice(0, middleLen) : info) + "_".repeat(textPad);
-    return ((0, jsx_runtime_1.jsxs)(ink_1.Box, { flexDirection: "column", children: [(0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.scale, children: line1 }), (0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.scale, children: line2 }), (0, jsx_runtime_1.jsxs)(ink_1.Text, { color: OURO.scale, children: [TAIL3, (0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.glow, children: line3text }), (0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.scale, children: HEAD3 })] })] }));
+    return ((0, jsx_runtime_1.jsxs)(ink_1.Box, { flexDirection: "column", children: [(0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.scale, children: line1 }), (0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.scale, children: line2 }), (0, jsx_runtime_1.jsxs)(ink_1.Text, { color: OURO.scale, children: [TAIL3, (0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.glow, children: line3text }), (0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.scale, children: HEAD3 })] }), resumeInfo ? ((0, jsx_runtime_1.jsxs)(ink_1.Text, { color: OURO.teal, children: ["  resuming \u00b7 ", resumeInfo.messageCount, " messages \u00b7 last active ", resumeInfo.timeAgo] })) : null] }));
 }
 // ─── Message Rendering ──────────────────────────────────────────────
 // Flow control tools are invisible to the user — they are internal agent mechanics
@@ -85,19 +86,6 @@ function MessageBlock({ msg }) {
             return (0, jsx_runtime_1.jsx)(ink_1.Text, { children: "" });
         return ((0, jsx_runtime_1.jsx)(ink_1.Box, { flexDirection: "column", children: visibleCalls.map((tc, i) => (0, jsx_runtime_1.jsx)(ToolResultLine, { tc: tc }, i)) }));
     }
-    // ── Session history (dimmed recap of recent exchanges) ──
-    if (msg.role === "history-summary") {
-        return ((0, jsx_runtime_1.jsx)(ink_1.Box, { flexDirection: "column", marginTop: 1, marginBottom: 1, children: (0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.shadow, children: msg.content }) }));
-    }
-    if (msg.role === "history-user") {
-        return ((0, jsx_runtime_1.jsxs)(ink_1.Box, { flexDirection: "column", marginTop: 1, children: [(0, jsx_runtime_1.jsxs)(ink_1.Box, { children: [(0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.shadow, bold: true, children: ") " }), (0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.shadow, bold: true, children: msg.content })] }), (0, jsx_runtime_1.jsx)(ink_1.Box, { marginBottom: 1, children: (0, jsx_runtime_1.jsx)(ink_1.Text, { children: "" }) })] }));
-    }
-    if (msg.role === "history-assistant") {
-        return ((0, jsx_runtime_1.jsxs)(ink_1.Box, { flexDirection: "column", marginBottom: 1, children: [msg.content ? (0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.shadow, children: msg.content }) : null, (0, jsx_runtime_1.jsx)(ink_1.Box, { marginBottom: 1, children: (0, jsx_runtime_1.jsx)(ink_1.Text, { children: "" }) })] }));
-    }
-    if (msg.role === "history-end") {
-        return ((0, jsx_runtime_1.jsx)(ink_1.Box, { flexDirection: "column", marginBottom: 1, children: (0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.separator, children: "─".repeat(termWidth()) }) }));
-    }
     if (msg.role === "user") {
         return ((0, jsx_runtime_1.jsxs)(ink_1.Box, { flexDirection: "column", marginTop: 1, children: [msg.content ? (0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.bone, bold: true, children: msg.content }) : null, (0, jsx_runtime_1.jsx)(ink_1.Box, { marginBottom: 1, children: (0, jsx_runtime_1.jsx)(ink_1.Text, { children: "" }) })] }));
     }
@@ -166,7 +154,7 @@ function QueuedMessages({ items }) {
     return ((0, jsx_runtime_1.jsx)(ink_1.Box, { flexDirection: "column", children: items.map((text, i) => ((0, jsx_runtime_1.jsxs)(ink_1.Text, { children: [(0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.shadow, children: "\u231B queued: " }), (0, jsx_runtime_1.jsxs)(ink_1.Text, { color: OURO.mist, children: ["\"", text, "\""] })] }, i))) }));
 }
 // ─── Input ──────────────────────────────────────────────────────────
-function InputArea({ onSubmit, onCtrlC, history, queuedInputs, onPopQueue, agentName, model }) {
+function InputArea({ onSubmit, onCtrlC, history, queuedInputs, onPopQueue, agentName, model, onImageMap }) {
     const [input, setInput] = (0, react_1.useState)("");
     const [cursorPos, setCursorPos] = (0, react_1.useState)(0); // cursor position within input
     const [tooltip, setTooltip] = (0, react_1.useState)("");
@@ -270,8 +258,13 @@ function InputArea({ onSubmit, onCtrlC, history, queuedInputs, onPopQueue, agent
                 return;
             }
             const text = inputRef.current;
-            if (text.trim())
-                onSubmit(text);
+            if (text.trim()) {
+                const { text: processedText, images } = (0, image_paste_1.processSubmitInput)(text);
+                if (images.size > 0 && onImageMap) {
+                    onImageMap(images);
+                }
+                onSubmit(images.size > 0 ? processedText : text);
+            }
             updateInput("");
             historyIdx.current = -1;
             return;
@@ -409,11 +402,11 @@ function InputArea({ onSubmit, onCtrlC, history, queuedInputs, onPopQueue, agent
     return ((0, jsx_runtime_1.jsxs)(ink_1.Box, { flexDirection: "column", children: [(0, jsx_runtime_1.jsx)(ink_1.Text, { dimColor: true, children: "─".repeat(termWidth()) }), isMultiline ? ((0, jsx_runtime_1.jsx)(ink_1.Box, { flexDirection: "column", children: inputLines.map((line, i) => ((0, jsx_runtime_1.jsxs)(ink_1.Box, { children: [(0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.teal, bold: true, children: i === 0 ? ") " : "· " }), (0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.bone, children: line }), i === inputLines.length - 1 ? (cursorVisible ? (0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.scale, children: "█" }) : (0, jsx_runtime_1.jsx)(ink_1.Text, { children: " " })) : null] }, i))) })) : ((0, jsx_runtime_1.jsxs)(ink_1.Box, { children: [(0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.teal, bold: true, children: ") " }), !input && queuedInputs.length > 0 ? ((0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.shadow, children: "Press up to edit queued messages" })) : ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.bone, children: input.slice(0, cursorPos) }), cursorVisible ? (0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.scale, children: "█" }) : (0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.bone, children: input[cursorPos] ?? " " }), (0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.bone, children: input.slice(cursorPos + (cursorVisible ? 0 : 1)) })] }))] })), (0, jsx_runtime_1.jsx)(ink_1.Text, { dimColor: true, children: "─".repeat(termWidth()) }), (0, jsx_runtime_1.jsxs)(ink_1.Box, { children: [(0, jsx_runtime_1.jsxs)(ink_1.Text, { dimColor: true, children: ["  ", agentName, model ? ` · ${model}` : "", " \u00B7 /help"] }), (0, jsx_runtime_1.jsx)(ink_1.Box, { flexGrow: 1 }), tooltip ? (0, jsx_runtime_1.jsx)(ink_1.Text, { dimColor: true, children: tooltip }) : (0, jsx_runtime_1.jsx)(ink_1.Text, { dimColor: true, children: "opt+enter for newline" })] })] }));
 }
 // ─── Main TUI Component ─────────────────────────────────────────────
-function OuroTui({ agentName, model, completedMessages, inputHistory, queuedInputs, live, elapsedSeconds, contextPercent, onSubmit, onCtrlC, onPopQueue, cwd, }) {
+function OuroTui({ agentName, model, completedMessages, inputHistory, queuedInputs, live, elapsedSeconds, contextPercent, onSubmit, onCtrlC, onPopQueue, cwd, resumeInfo, onImageMap, }) {
     return ((0, jsx_runtime_1.jsxs)(ink_1.Box, { flexDirection: "column", children: [(0, jsx_runtime_1.jsx)(ink_1.Static, { items: [{ id: "__header__" }, ...completedMessages], children: (item, index) => {
                     if (index === 0) {
-                        return ((0, jsx_runtime_1.jsxs)(ink_1.Box, { flexDirection: "column", marginBottom: 2, children: [(0, jsx_runtime_1.jsx)(ink_1.Box, { marginTop: 1, children: (0, jsx_runtime_1.jsx)(ink_1.Text, { children: "" }) }), (0, jsx_runtime_1.jsx)(Header, { agentName: agentName, model: model, contextPercent: contextPercent, cwd: cwd }), (0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.shadow, dimColor: true, children: "  Ctrl-C twice to exit \u00b7 \u2191\u2193 history \u00b7 Esc clear \u00b7 opt+Enter newline" })] }, "header"));
+                        return ((0, jsx_runtime_1.jsxs)(ink_1.Box, { flexDirection: "column", marginBottom: 2, children: [(0, jsx_runtime_1.jsx)(ink_1.Box, { marginTop: 1, children: (0, jsx_runtime_1.jsx)(ink_1.Text, { children: "" }) }), (0, jsx_runtime_1.jsx)(Header, { agentName: agentName, model: model, contextPercent: contextPercent, cwd: cwd, resumeInfo: resumeInfo }), (0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.shadow, dimColor: true, children: "  Ctrl-C twice to exit \u00b7 \u2191\u2193 history \u00b7 Esc clear \u00b7 opt+Enter newline" })] }, "header"));
                     }
                     return (0, jsx_runtime_1.jsx)(MessageBlock, { msg: item }, item.id);
-                } }), (live.loading || live.streamingText || live.activeTool) ? (0, jsx_runtime_1.jsx)(ink_1.Box, { marginTop: 1, children: (0, jsx_runtime_1.jsx)(ink_1.Text, { children: "" }) }) : null, (0, jsx_runtime_1.jsx)(LiveArea, { live: live, elapsed: elapsedSeconds }), (live.loading || live.streamingText || live.activeTool) ? (0, jsx_runtime_1.jsx)(ink_1.Box, { marginBottom: 1, children: (0, jsx_runtime_1.jsx)(ink_1.Text, { children: "" }) }) : null, queuedInputs.length > 0 ? (0, jsx_runtime_1.jsx)(QueuedMessages, { items: queuedInputs }) : null, (0, jsx_runtime_1.jsx)(ink_1.Box, { marginTop: 1, children: (0, jsx_runtime_1.jsx)(ink_1.Text, { children: "" }) }), (0, jsx_runtime_1.jsx)(InputArea, { onSubmit: onSubmit, onCtrlC: onCtrlC, history: inputHistory, queuedInputs: queuedInputs, onPopQueue: onPopQueue, agentName: agentName, model: model })] }));
+                } }), (live.loading || live.streamingText || live.activeTool) ? (0, jsx_runtime_1.jsx)(ink_1.Box, { marginTop: 1, children: (0, jsx_runtime_1.jsx)(ink_1.Text, { children: "" }) }) : null, (0, jsx_runtime_1.jsx)(LiveArea, { live: live, elapsed: elapsedSeconds }), (live.loading || live.streamingText || live.activeTool) ? (0, jsx_runtime_1.jsx)(ink_1.Box, { marginBottom: 1, children: (0, jsx_runtime_1.jsx)(ink_1.Text, { children: "" }) }) : null, queuedInputs.length > 0 ? (0, jsx_runtime_1.jsx)(QueuedMessages, { items: queuedInputs }) : null, (0, jsx_runtime_1.jsx)(ink_1.Box, { marginTop: 1, children: (0, jsx_runtime_1.jsx)(ink_1.Text, { children: "" }) }), (0, jsx_runtime_1.jsx)(InputArea, { onSubmit: onSubmit, onCtrlC: onCtrlC, history: inputHistory, queuedInputs: queuedInputs, onPopQueue: onPopQueue, agentName: agentName, model: model, onImageMap: onImageMap })] }));
 }

package/dist/senses/cli/tui-store.js

@@ -173,17 +173,17 @@ class TuiStore {
     seedHistory(texts) {
         this._inputHistory.push(...texts);
     }
-    /** Show session resume context: summary line + last N exchanges (dimmed), then separator */
-    addSessionHistory(summary, exchanges) {
-        const msgs = [
-            { id: "history-summary", role: "history-summary", content: summary },
-            ...exchanges.map((ex, i) => ({
-                id: `history-${i}`,
-                role: (ex.role === "user" ? "history-user" : "history-assistant"),
-                content: ex.content,
-            })),
-            { id: "history-end", role: "history-end", content: "" },
-        ];
+    /** Push previous session exchanges as normal user/assistant messages (for resume display) */
+    addResumeMessages(exchanges) {
+        if (exchanges.length === 0) {
+            this.notify();
+            return;
+        }
+        const msgs = exchanges.map((ex, i) => ({
+            id: `resume-${i}`,
+            role: ex.role,
+            content: ex.content,
+        }));
         this._completed = [...msgs, ...this._completed];
         this.notify();
     }

package/dist/senses/cli.js

@@ -36,6 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InputQueue = exports.MarkdownStreamer = exports.InputController = exports.Spinner = exports.StreamingWordWrapper = exports.wrapCliText = exports.formatEchoedInputSummary = void 0;
 exports.formatPendingPrefix = formatPendingPrefix;
 exports.getCliContinuityIngressTexts = getCliContinuityIngressTexts;
+exports.formatTimeAgo = formatTimeAgo;
 exports.writeCliAsyncAssistantMessage = writeCliAsyncAssistantMessage;
 exports.pauseActiveSpinner = pauseActiveSpinner;
 exports.resumeActiveSpinner = resumeActiveSpinner;
@@ -75,6 +76,7 @@ const bundle_meta_1 = require("../heart/daemon/hooks/bundle-meta");
 const agent_config_v2_1 = require("../heart/daemon/hooks/agent-config-v2");
 const bundle_manifest_1 = require("../mind/bundle-manifest");
 const cli_layout_1 = require("./cli-layout");
+const image_paste_1 = require("./cli/image-paste");
 const spinner_imperative_1 = require("./cli/spinner-imperative");
 const tool_display_1 = require("./cli/tool-display");
 var cli_layout_2 = require("./cli-layout");
@@ -513,6 +515,8 @@ async function runCliSession(options) {
     const useTui = !options._testInputSource && process.stdin.isTTY === true;
     let currentAbort = null;
     let closed = false;
+    // eslint-disable-next-line prefer-const -- set by onImageMap callback during input
+    let pendingImages = null;
     let cliCallbacks;
     let tuiStore = null;
     let inkRef = null;
@@ -535,8 +539,7 @@ async function runCliSession(options) {
                 .filter((msg) => msg.role === "user" && typeof msg.content === "string")
                 .map(msg => msg.content);
             tuiStore.seedHistory(prevUserMsgs);
-            // Show session resume context: summary + last few exchanges (dimmed)
-            /* v8 ignore start -- session resume display: integration-only, tested visually @preserve */
+            // Show session resume context: last 2 exchanges as normal messages
             if (messages.length > 1) {
                 const userAssistantMsgs = messages.filter((m) => (m.role === "user" || m.role === "assistant") && typeof m.content === "string" && m.content.trim().length > 0);
                 // Extract last 2 exchanges (up to 4 messages)
@@ -544,12 +547,15 @@ async function runCliSession(options) {
                 for (let i = userAssistantMsgs.length - 1; i >= 0 && lastExchanges.length < 4; i--) {
                     lastExchanges.unshift({ role: userAssistantMsgs[i].role, content: userAssistantMsgs[i].content });
                 }
-                const msgCount = messages.filter(m => m.role === "user" || m.role === "assistant").length;
-                const timeAgo = options.lastActivityAt ? formatTimeAgo(new Date(options.lastActivityAt)) : null;
-                const summary = `  resuming session · ${msgCount} messages${timeAgo ? ` · last active ${timeAgo}` : ""} · showing recent`;
-                tuiStore.addSessionHistory(summary, lastExchanges);
+                tuiStore.addResumeMessages(lastExchanges);
             }
-            /* v8 ignore stop */
+            // Compute resumeInfo for header banner
+            const resumeInfo = messages.length > 1
+                ? {
+                    messageCount: messages.filter(m => m.role === "user" || m.role === "assistant").length,
+                    timeAgo: options.lastActivityAt ? formatTimeAgo(new Date(options.lastActivityAt)) : "unknown",
+                }
+                : undefined;
             // Ctrl-C state machine (Claude Code behavior):
             // During generation: abort current request
             // Idle with text: clear input
@@ -610,6 +616,8 @@ async function runCliSession(options) {
                     onPopQueue: () => { const items = storeRef.popAllQueuedForEditing(); inputQueue.drainAll(); return items; },
                     headerShown: storeRef.headerShown,
                     cwd: process.cwd().replace(process.env.HOME ?? "", "~"),
+                    resumeInfo,
+                    onImageMap: (images) => { pendingImages = images; },
                 });
             }
             inkRef = ink.render(React.createElement(TuiRoot), { exitOnCtrlC: false, patchConsole: false });
@@ -811,12 +819,19 @@ async function runCliSession(options) {
             if (tuiStore)
                 tuiStore.suppressInput();
             inputCtrl?.suppress(() => { currentAbort?.abort(); });
+            // Resolve pending image content before the turn executes
+            let contentParts = null;
+            const currentImages = pendingImages;
+            if (currentImages && currentImages.size > 0) {
+                contentParts = await (0, image_paste_1.resolveImageContent)(input, currentImages);
+                pendingImages = null;
+            }
             let result;
             try {
                 if (options.runTurn) {
                     // Pipeline-based turn: the runTurn callback handles user message assembly,
                     // pending drain, trust gate, runAgent, postTurn, and token accumulation.
-                    result = await options.runTurn(messages, input, cliCallbacks, currentAbort.signal, effectiveToolContext);
+                    result = await options.runTurn(messages, input, cliCallbacks, currentAbort.signal, effectiveToolContext, contentParts ?? undefined);
                     // Handle pipeline-intercepted commands with loop-control side effects
                     if (result?.turnOutcome === "command") {
                         if (result.commandAction === "exit") {
@@ -838,7 +853,10 @@ async function runCliSession(options) {
                 else {
                     // Legacy path: inline runAgent (used by serpent guide and tests)
                     const prefix = options.getContentPrefix?.();
-                    messages.push({ role: "user", content: prefix ? `${prefix}\n\n${input}` : input });
+                    const userContent = contentParts
+                        ? contentParts
+                        : (prefix ? `${prefix}\n\n${input}` : input);
+                    messages.push({ role: "user", content: userContent });
                     const traceId = (0, nerves_1.createTraceId)();
                     result = await (0, core_1.runAgent)(messages, cliCallbacks, options.skipSystemPromptRefresh ? undefined : "cli", currentAbort.signal, {
                         toolChoiceRequired: getEffectiveToolChoiceRequired(),
@@ -973,7 +991,7 @@ async function main(agentName, options) {
             onAsyncAssistantMessage: async (messages, _assistantMessage) => {
                 (0, context_1.postTurn)(messages, sessPath, undefined, undefined, sessionState);
             },
-            runTurn: async (messages, userInput, callbacks, signal, toolContext) => {
+            runTurn: async (messages, userInput, callbacks, signal, toolContext, userContent) => {
                 // Run the full per-turn pipeline: resolve -> gate -> session -> drain -> runAgent -> postTurn -> tokens
                 // User message passed via input.messages so the pipeline can prepend pending messages to it.
                 const failoverState = cliFailoverState;
@@ -997,7 +1015,7 @@ async function main(agentName, options) {
                     channel: "cli",
                     sessionKey: "session",
                     capabilities: cliCapabilities,
-                    messages: [{ role: "user", content: userInput }],
+                    messages: [{ role: "user", content: userContent ?? userInput }],
                     continuityIngressTexts: getCliContinuityIngressTexts(userInput),
                     callbacks: failoverAwareCallbacks,
                     friendResolver: { resolve: () => Promise.resolve(resolvedContext) },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ouro.bot/cli",
-  "version": "0.1.0-alpha.253",
+  "version": "0.1.0-alpha.255",
   "main": "dist/heart/daemon/ouro-entry.js",
   "bin": {
     "cli": "dist/heart/daemon/ouro-bot-entry.js",