@ouro.bot/cli 0.1.0-alpha.257 → 0.1.0-alpha.259

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.259",
+      "changes": [
+        "fix(daemon): SIGINT and SIGTERM now ALWAYS write a tombstone before exiting, instead of silently skipping when `_gracefulShutdown` was set. The previous behavior made signal-driven shutdowns invisible in `~/.ouro-cli/daemon-death.json` \u2014 launchd policy decisions, the OOM killer, manual `kill`, and `killOrphanProcesses` from a sibling daemon all looked identical to a clean exit. After a real outage where the user's daemon kept dying with a tombstone from a week earlier, this restores observability: every signal-driven exit now records `reason: \"sigint\"` or `reason: \"sigterm\"` with timestamp + recentCrashes accumulator. The catch-all `process.on('exit')` handler also no longer short-circuits on graceful shutdown."
+      ]
+    },
+    {
+      "version": "0.1.0-alpha.258",
+      "changes": [
+        "fix(tui): deferred ESC handling fixes arrow keys and Alt+Enter.",
+        "fix(tui): green cursor background.",
+        "fix(tui): clipboard fallback for macOS temp screenshots, proper path splitting and unescaping for image drag-drop."
+      ]
+    },
     {
       "version": "0.1.0-alpha.257",
       "changes": [

package/dist/heart/daemon/daemon-entry.js

@@ -195,7 +195,15 @@ void daemon.start().then(() => {
     process.exit(1);
 });
 process.on("SIGINT", () => {
-    _gracefulShutdown = true;
+    // ALWAYS write a tombstone, even on signal-driven shutdown. The previous
+    // behavior was to set _gracefulShutdown=true and skip the tombstone, which
+    // meant ANY external SIGINT/SIGTERM (launchd policy, OOM killer, manual
+    // kill, killOrphanProcesses from a sibling daemon) silently disappeared
+    // from the death log. The user lost weeks of visibility into why their
+    // daemon kept dying. Tombstones are informational — having a "sigint"
+    // tombstone is strictly better than silence.
+    _tombstoneWritten = true;
+    (0, daemon_tombstone_1.writeDaemonTombstone)("sigint", new Error("daemon received SIGINT"));
     for (const s of habitSchedulers) {
         s.stopWatching();
         s.stop();
@@ -204,7 +212,8 @@ process.on("SIGINT", () => {
     void daemon.stop().then(() => process.exit(0));
 });
 process.on("SIGTERM", () => {
-    _gracefulShutdown = true;
+    _tombstoneWritten = true;
+    (0, daemon_tombstone_1.writeDaemonTombstone)("sigterm", new Error("daemon received SIGTERM"));
     for (const s of habitSchedulers) {
         s.stopWatching();
         s.stop();
@@ -221,7 +230,6 @@ process.stderr?.on?.("error", () => { });
 /* v8 ignore start -- global exception handlers: genuinely untestable in vitest; exercised by real daemon crashes @preserve */
 let _uncaughtCount = 0;
 let _tombstoneWritten = false;
-let _gracefulShutdown = false;
 let _lastKnownCause = null;
 const CIRCUIT_BREAKER_WINDOW_MS = 60_000;
 const CIRCUIT_BREAKER_MAX = 10;
@@ -270,8 +278,14 @@ process.on("unhandledRejection", (reason) => {
 });
 // Catch-all: write tombstone on any exit where we didn't already record the cause.
 // process.on('exit') is synchronous-only — writeDaemonTombstone uses writeFileSync, so it works.
+//
+// Previously this skipped writing if `_gracefulShutdown` was true, which made
+// SIGINT/SIGTERM-driven exits invisible in the death log. The signal handlers
+// above now always write their own tombstone before exiting, so this catch-all
+// only runs for exits the signal handlers didn't reach (e.g. process.exit
+// called from somewhere unexpected).
 process.on("exit", (code) => {
-    if (_tombstoneWritten || _gracefulShutdown)
+    if (_tombstoneWritten)
         return;
     const reason = code === 0 ? "unexpectedCleanExit" : "unexpectedExit";
     const error = _lastKnownCause ?? new Error(`daemon exited with code ${code} (no specific cause captured)`);

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

@@ -50,6 +50,7 @@ exports.resolveImageContent = resolveImageContent;
  * files, and produces OpenAI-compatible `image_url` content blocks.
  */
 const promises_1 = require("fs/promises");
+const child_process_1 = require("child_process");
 const path = __importStar(require("path"));
 const runtime_1 = require("../../nerves/runtime");
 /** Matches image file extensions (case-insensitive) */
@@ -58,10 +59,14 @@ exports.IMAGE_EXTENSION_REGEX = /\.(png|jpe?g|gif|webp)$/i;
 function isImagePath(str) {
     return exports.IMAGE_EXTENSION_REGEX.test(unescapePath(str));
 }
-/** Convert backslash-escaped spaces to plain spaces (macOS drag-drop format) */
+/** Strip shell escape backslashes from a path (macOS/Linux drag-drop format) */
 function unescapePath(str) {
-    return str.replace(/\\ /g, " ");
+    // Handle double-backslashes first (actual backslash in filename)
+    // then remove single escape backslashes
+    return str.replace(/\\(.)/g, "$1");
 }
+/** Detect temp screenshot paths from macOS screencapture */
+const TEMP_SCREENSHOT_RE = /\/TemporaryItems\/.*screencaptureui.*\/Screenshot/i;
 /** Map file extension to MIME media type */
 function extensionToMediaType(ext) {
     switch (ext.toLowerCase()) {
@@ -80,41 +85,85 @@ function extensionToMediaType(ext) {
 }
 /**
  * Read an image file and return base64 + media type.
- * Returns null on any error (file not found, permission denied, etc.)
+ * Falls back to clipboard for temp screenshot paths (macOS screencapture
+ * creates ephemeral files in TemporaryItems that are cleaned up quickly).
+ * Returns null on any error.
  */
 async function tryReadImage(absolutePath) {
+    // Try reading the file directly first
     try {
         const buffer = await (0, promises_1.readFile)(absolutePath);
-        const ext = path.extname(absolutePath);
+        if (buffer.length > 0) {
+            const ext = path.extname(absolutePath);
+            return {
+                base64: Buffer.from(buffer).toString("base64"),
+                mediaType: extensionToMediaType(ext),
+            };
+        }
+    }
+    catch {
+        // File not found or permission denied — try clipboard fallback
+    }
+    // Clipboard fallback for macOS temp screenshots
+    /* v8 ignore start -- clipboard fallback requires real macOS screencapture @preserve */
+    if (process.platform === "darwin" && TEMP_SCREENSHOT_RE.test(absolutePath)) {
+        const clipboardImage = await getImageFromClipboard();
+        if (clipboardImage)
+            return clipboardImage;
+    }
+    /* v8 ignore stop */
+    (0, runtime_1.emitNervesEvent)({
+        component: "senses",
+        event: "senses.image_read_error",
+        message: `Failed to read image: ${absolutePath}`,
+        meta: { path: absolutePath },
+    });
+    return null;
+}
+/**
+ * Read image data from macOS clipboard via osascript.
+ * Used as fallback when temp screenshot files are already cleaned up.
+ */
+/* v8 ignore start -- macOS clipboard integration @preserve */
+async function getImageFromClipboard() {
+    const tmpPath = "/tmp/ouro_clipboard_image.png";
+    try {
+        // Check if clipboard has image data
+        (0, child_process_1.execFileSync)("osascript", ["-e", "the clipboard as «class PNGf»"], { stdio: "pipe" });
+        // Save clipboard image to temp file
+        (0, child_process_1.execFileSync)("osascript", [
+            "-e", "set png_data to (the clipboard as «class PNGf»)",
+            "-e", `set fp to open for access POSIX file "${tmpPath}" with write permission`,
+            "-e", "write png_data to fp",
+            "-e", "close access fp",
+        ], { stdio: "pipe" });
+        const buffer = await (0, promises_1.readFile)(tmpPath);
+        void (0, promises_1.unlink)(tmpPath).catch(() => { });
+        if (buffer.length === 0)
+            return null;
         return {
             base64: Buffer.from(buffer).toString("base64"),
-            mediaType: extensionToMediaType(ext),
+            mediaType: "image/png",
         };
     }
     catch {
-        (0, runtime_1.emitNervesEvent)({
-            component: "senses",
-            event: "senses.image_read_error",
-            message: `Failed to read image: ${absolutePath}`,
-            meta: { path: absolutePath },
-        });
         return null;
     }
 }
+/* v8 ignore stop */
 /** 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.
+ * Scan input for absolute image file paths and replace with [Image #N] references.
+ * Handles backslash-escaped characters (macOS drag-drop) and paths with spaces.
  */
 function replacePathsWithRefs(input) {
     const images = new Map();
-    // Match absolute paths starting with / that end with an image extension.
-    // Allow backslash-escaped spaces (like `\ ` from macOS drag-drop).
-    const pathRegex = /(\/(?:[^\s]|\\ )+\.(?:png|jpe?g|gif|webp))/gi;
+    // Match absolute paths: start with /, contain non-whitespace or backslash-escaped chars,
+    // end with an image extension. The (?:\\.|\S) alternation allows `\ ` sequences.
+    const pathRegex = /(?:\/(?:\\.|[^\s])+\.(?:png|jpe?g|gif|webp))/gi;
     let counter = 0;
     const text = input.replace(pathRegex, (match) => {
         counter++;

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

@@ -163,9 +163,10 @@ function InputArea({ onSubmit, onCtrlC, history, queuedInputs, onPopQueue, agent
     const cursorRef = (0, react_1.useRef)(0);
     const historyIdx = (0, react_1.useRef)(-1);
     const savedInput = (0, react_1.useRef)("");
-    // Track last ESC timestamp for Alt+Enter detection.
-    // Ink 3.2 splits \x1b\r into separate escape + return events.
-    // We detect the pattern by checking if Return arrives within 50ms of Escape.
+    // Deferred ESC handling: Ink 3.2 fires escape events for ESC prefix of arrow
+    // keys (\x1b[D) and Alt+Enter (\x1b\r). We defer ESC actions by 80ms — if
+    // another key arrives in that window, it was an escape sequence, not standalone ESC.
+    const escTimerRef = (0, react_1.useRef)(null);
     const lastEscTime = (0, react_1.useRef)(0);
     const tooltipTimerRef = (0, react_1.useRef)(null);
     (0, react_1.useEffect)(() => () => {
@@ -211,25 +212,36 @@ function InputArea({ onSubmit, onCtrlC, history, queuedInputs, onPopQueue, agent
         setTooltip("");
         if (key.escape) {
             lastEscTime.current = Date.now();
-            if (inputRef.current) {
-                updateInput("");
-                historyIdx.current = -1;
-                setTooltip("Esc again to clear");
-                if (tooltipTimerRef.current)
-                    clearTimeout(tooltipTimerRef.current);
-                tooltipTimerRef.current = setTimeout(() => setTooltip(""), 2000);
-            }
-            else if (queuedInputs.length > 0) {
-                // Pop all queued messages into input for editing
-                const items = onPopQueue();
-                updateInput(items.join("\n"));
-                historyIdx.current = -1;
-            }
-            else {
-                setTooltip("");
-            }
+            // Defer ESC action — if another key arrives within 80ms, this was an escape
+            // sequence prefix (arrow key, Alt+Enter), not a standalone Escape press.
+            if (escTimerRef.current)
+                clearTimeout(escTimerRef.current);
+            escTimerRef.current = setTimeout(() => {
+                escTimerRef.current = null;
+                if (inputRef.current) {
+                    updateInput("");
+                    historyIdx.current = -1;
+                    setTooltip("Esc again to clear");
+                    if (tooltipTimerRef.current)
+                        clearTimeout(tooltipTimerRef.current);
+                    tooltipTimerRef.current = setTimeout(() => setTooltip(""), 2000);
+                }
+                else if (queuedInputs.length > 0) {
+                    const items = onPopQueue();
+                    updateInput(items.join("\n"));
+                    historyIdx.current = -1;
+                }
+                else {
+                    setTooltip("");
+                }
+            }, 80);
             return;
         }
+        // Cancel pending ESC action — this key is part of an escape sequence
+        if (escTimerRef.current) {
+            clearTimeout(escTimerRef.current);
+            escTimerRef.current = null;
+        }
         if (key.return) {
             // Alt+Enter: detect via key.meta OR recent ESC (within 50ms — Ink splits \x1b\r)
             const recentEsc = (Date.now() - lastEscTime.current) < 50;
@@ -389,8 +401,8 @@ function InputArea({ onSubmit, onCtrlC, history, queuedInputs, onPopQueue, agent
     });
     const isMultiline = input.includes("\n");
     const inputLines = input.split("\n");
-    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, { inverse: true, 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, { inverse: true, children: input[cursorPos] ?? " " })
+    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, { backgroundColor: OURO.scale, color: "#000000", 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, { backgroundColor: OURO.scale, color: "#000000", children: input[cursorPos] ?? " " })
                                 : (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 + 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 ─────────────────────────────────────────────

package/package.json

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