@ouro.bot/cli 0.1.0-alpha.180 → 0.1.0-alpha.181

package/changelog.json

@@ -1,6 +1,15 @@
 {
   "_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.181",
+      "changes": [
+        "feat(cli): Option+Arrow word jumping, Ctrl+A/E home/end, cursor positioning",
+        "feat(cli): never suppress input \u2014 type while agent responds (TTFA)",
+        "fix(cli): blockquote continuation lines keep \u2502 prefix on wrap",
+        "feat(cli): Option+Backspace to delete word"
+      ]
+    },
     {
       "version": "0.1.0-alpha.180",
       "changes": [

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

@@ -142,13 +142,22 @@ function LiveArea({ live, elapsed }) {
     return ((0, jsx_runtime_1.jsxs)(ink_1.Box, { flexDirection: "column", children: [live.streamingText ? ((0, jsx_runtime_1.jsx)(streaming_markdown_1.StreamingMarkdown, { text: live.streamingText, maxWidth: safeWidth() })) : null, live.activeTool ? ((0, jsx_runtime_1.jsx)(ActiveToolLine, { tool: live.activeTool })) : null, live.loading ? ((0, jsx_runtime_1.jsx)(Spinner, { phrasePool: live.spinnerPhrasePool, elapsed: elapsed })) : null, live.errorMessage ? ((0, jsx_runtime_1.jsxs)(ink_1.Text, { color: OURO.fang, children: ["✗ ", live.errorMessage] })) : null, live.kickMessage ? ((0, jsx_runtime_1.jsxs)(ink_1.Text, { color: OURO.gold, children: ["↻ ", live.kickMessage] })) : null] }));
 }
 // ─── Input ──────────────────────────────────────────────────────────
-function InputArea({ onSubmit, suppressed, onCtrlC, agentName, model, history }) {
+function InputArea({ onSubmit, onCtrlC, agentName, model, history }) {
     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)("");
     const [cursorVisible, setCursorVisible] = (0, react_1.useState)(true);
     const inputRef = (0, react_1.useRef)("");
-    const historyIdx = (0, react_1.useRef)(-1); // -1 = not browsing history
-    const savedInput = (0, react_1.useRef)(""); // saves current input when entering history
+    const cursorRef = (0, react_1.useRef)(0);
+    const historyIdx = (0, react_1.useRef)(-1);
+    const savedInput = (0, react_1.useRef)("");
+    // Helper: update input and cursor together
+    const updateInput = (text, pos) => {
+        inputRef.current = text;
+        cursorRef.current = pos ?? text.length;
+        setInput(text);
+        setCursorPos(cursorRef.current);
+    };
     // Blinking cursor
     (0, react_1.useEffect)(() => {
         const iv = setInterval(() => setCursorVisible(v => !v), 530);
@@ -174,14 +183,12 @@ function InputArea({ onSubmit, suppressed, onCtrlC, agentName, model, history })
             handleCtrlC();
             return;
         }
-        if (suppressed)
-            return;
+        // Input is NEVER blocked — user can type while agent responds (TTFA)
         // Any non-Ctrl-C input clears tooltip
         setTooltip("");
         if (key.escape) {
             if (inputRef.current) {
-                inputRef.current = "";
-                setInput("");
+                updateInput("");
                 historyIdx.current = -1;
                 setTooltip("Esc again to clear");
                 setTimeout(() => setTooltip(""), 2000);
@@ -192,71 +199,118 @@ function InputArea({ onSubmit, suppressed, onCtrlC, agentName, model, history })
             return;
         }
         if (key.return) {
-            // Alt+Enter: insert newline instead of submitting
             if (key.meta) {
-                inputRef.current += "\n";
-                setInput(inputRef.current);
+                // Alt+Enter: insert newline
+                const before = inputRef.current.slice(0, cursorRef.current);
+                const after = inputRef.current.slice(cursorRef.current);
+                updateInput(before + "\n" + after, cursorRef.current + 1);
                 return;
             }
             const text = inputRef.current;
             if (text.trim())
                 onSubmit(text);
-            inputRef.current = "";
-            setInput("");
+            updateInput("");
             historyIdx.current = -1;
             return;
         }
         if (key.backspace || key.delete) {
-            inputRef.current = inputRef.current.slice(0, -1);
-            setInput(inputRef.current);
+            if (cursorRef.current > 0) {
+                // Option+Backspace: delete word
+                if (key.meta) {
+                    const before = inputRef.current.slice(0, cursorRef.current);
+                    const after = inputRef.current.slice(cursorRef.current);
+                    const wordStart = before.replace(/\s*\S+\s*$/, "");
+                    updateInput(wordStart + after, wordStart.length);
+                }
+                else {
+                    const before = inputRef.current.slice(0, cursorRef.current - 1);
+                    const after = inputRef.current.slice(cursorRef.current);
+                    updateInput(before + after, cursorRef.current - 1);
+                }
+            }
             historyIdx.current = -1;
             return;
         }
-        // Up arrow: browse history (newest first)
+        // Left/right arrow: move cursor
+        if (key.leftArrow) {
+            if (key.meta) {
+                // Option+Left: jump to previous word boundary
+                const before = inputRef.current.slice(0, cursorRef.current);
+                const match = before.match(/(?:^|\s)\S+\s*$/);
+                const newPos = match ? cursorRef.current - match[0].length + (match[0].startsWith(" ") ? 1 : 0) : 0;
+                cursorRef.current = Math.max(0, newPos);
+                setCursorPos(cursorRef.current);
+            }
+            else {
+                cursorRef.current = Math.max(0, cursorRef.current - 1);
+                setCursorPos(cursorRef.current);
+            }
+            return;
+        }
+        if (key.rightArrow) {
+            if (key.meta) {
+                // Option+Right: jump to next word boundary
+                const after = inputRef.current.slice(cursorRef.current);
+                const match = after.match(/^\s*\S+/);
+                const newPos = match ? cursorRef.current + match[0].length : inputRef.current.length;
+                cursorRef.current = Math.min(inputRef.current.length, newPos);
+                setCursorPos(cursorRef.current);
+            }
+            else {
+                cursorRef.current = Math.min(inputRef.current.length, cursorRef.current + 1);
+                setCursorPos(cursorRef.current);
+            }
+            return;
+        }
+        // Up/Down: history
         if (key.upArrow && history.length > 0) {
             if (historyIdx.current === -1) {
-                // Entering history — save current input
                 savedInput.current = inputRef.current;
                 historyIdx.current = history.length - 1;
             }
             else if (historyIdx.current > 0) {
                 historyIdx.current--;
             }
-            inputRef.current = history[historyIdx.current];
-            setInput(inputRef.current);
+            updateInput(history[historyIdx.current]);
             return;
         }
-        // Down arrow: browse forward or restore saved input
         if (key.downArrow) {
             if (historyIdx.current >= 0) {
                 if (historyIdx.current < history.length - 1) {
                     historyIdx.current++;
-                    inputRef.current = history[historyIdx.current];
+                    updateInput(history[historyIdx.current]);
                 }
                 else {
-                    // Past end of history — restore saved input
                     historyIdx.current = -1;
-                    inputRef.current = savedInput.current;
+                    updateInput(savedInput.current);
                 }
-                setInput(inputRef.current);
             }
             return;
         }
+        // Ctrl+A / Ctrl+E: home / end
+        if (key.ctrl && inputChar === "a") {
+            cursorRef.current = 0;
+            setCursorPos(0);
+            return;
+        }
+        if (key.ctrl && inputChar === "e") {
+            cursorRef.current = inputRef.current.length;
+            setCursorPos(inputRef.current.length);
+            return;
+        }
+        // Regular character: insert at cursor position
         if (!key.ctrl && !key.meta && inputChar) {
-            inputRef.current += inputChar;
-            setInput(inputRef.current);
-            historyIdx.current = -1; // typing resets history browsing
+            const before = inputRef.current.slice(0, cursorRef.current);
+            const after = inputRef.current.slice(cursorRef.current);
+            updateInput(before + inputChar + after, cursorRef.current + 1);
+            historyIdx.current = -1;
         }
     });
     // Get terminal width (capped for sanity)
     const cols = safeWidth();
-    if (suppressed) {
-        // During model generation: show status bar but no input
-        return ((0, jsx_runtime_1.jsxs)(ink_1.Box, { flexDirection: "column", children: [(0, jsx_runtime_1.jsx)(ink_1.Text, { dimColor: true, children: "─".repeat(cols) }), (0, jsx_runtime_1.jsxs)(ink_1.Text, { dimColor: true, children: [agentName, model ? ` · ${model}` : ""] }), (0, jsx_runtime_1.jsx)(ink_1.Text, { dimColor: true, children: "─".repeat(cols) })] }));
-    }
     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(cols) }), 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: ") " }), (0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.bone, children: input }), cursorVisible ? (0, jsx_runtime_1.jsx)(ink_1.Text, { color: OURO.scale, children: "█" }) : (0, jsx_runtime_1.jsx)(ink_1.Text, { children: " " })] })), (0, jsx_runtime_1.jsxs)(ink_1.Box, { children: [(0, jsx_runtime_1.jsxs)(ink_1.Text, { dimColor: true, children: [agentName, model ? ` · ${model}` : ""] }), (0, jsx_runtime_1.jsx)(ink_1.Box, { flexGrow: 1 }), tooltip ? (0, jsx_runtime_1.jsx)(ink_1.Text, { dimColor: true, children: tooltip }) : null, isMultiline ? (0, jsx_runtime_1.jsx)(ink_1.Text, { dimColor: true, children: " (multi-line)" }) : null] }), (0, jsx_runtime_1.jsx)(ink_1.Text, { dimColor: true, children: "─".repeat(cols) })] }));
+    return ((0, jsx_runtime_1.jsxs)(ink_1.Box, { flexDirection: "column", children: [(0, jsx_runtime_1.jsx)(ink_1.Text, { dimColor: true, children: "─".repeat(cols) }), 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: ") " }), (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.jsxs)(ink_1.Box, { children: [(0, jsx_runtime_1.jsxs)(ink_1.Text, { dimColor: true, children: [agentName, model ? ` · ${model}` : ""] }), (0, jsx_runtime_1.jsx)(ink_1.Box, { flexGrow: 1 }), tooltip ? (0, jsx_runtime_1.jsx)(ink_1.Text, { dimColor: true, children: tooltip }) : null, isMultiline ? (0, jsx_runtime_1.jsx)(ink_1.Text, { dimColor: true, children: " (multi-line)" }) : null] }), (0, jsx_runtime_1.jsx)(ink_1.Text, { dimColor: true, children: "─".repeat(cols) })] }));
 }
 // ─── Main TUI Component ─────────────────────────────────────────────
 function OuroTui({ agentName, model, completedMessages, inputHistory, live, elapsedSeconds, contextPercent, onSubmit, onCtrlC, cwd, }) {
@@ -265,5 +319,5 @@ function OuroTui({ agentName, model, completedMessages, inputHistory, live, elap
                         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 Alt+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, (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, suppressed: live.inputSuppressed, onCtrlC: onCtrlC, agentName: agentName, model: model, history: inputHistory })] }));
+                } }), (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, (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, agentName: agentName, model: model, history: inputHistory })] }));
 }

package/dist/senses/cli/streaming-markdown.js

@@ -453,7 +453,7 @@ function TableRenderer({ lines }) {
     return ((0, jsx_runtime_1.jsxs)(ink_1.Box, { flexDirection: "column", children: [renderRow(headers, true), (0, jsx_runtime_1.jsx)(ink_1.Text, { dimColor: true, children: separatorRow }), rows.map((row, i) => ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: renderRow(row, false) }, i)))] }));
 }
 // ─── Block Renderer ────────────────────────────────────────────────
-function BlockRenderer({ block, isFirst, isLast }) {
+function BlockRenderer({ block, isFirst, isLast, maxWidth }) {
     switch (block.type) {
         case "blank":
             return (0, jsx_runtime_1.jsx)(ink_1.Text, { children: "" });
@@ -476,7 +476,29 @@ function BlockRenderer({ block, isFirst, isLast }) {
         case "blockquote": {
             const depth = block.level ?? 1;
             const barPrefix = "\u2502 ".repeat(depth);
-            return ((0, jsx_runtime_1.jsxs)(ink_1.Box, { flexDirection: "column", children: [!isFirst && (0, jsx_runtime_1.jsx)(ink_1.Text, { children: "" }), block.lines.map((line, i) => ((0, jsx_runtime_1.jsxs)(ink_1.Text, { children: [(0, jsx_runtime_1.jsx)(ink_1.Text, { dimColor: true, children: barPrefix }), (0, jsx_runtime_1.jsx)(ink_1.Text, { italic: true, children: (0, jsx_runtime_1.jsx)(InlineLine, { text: line }) })] }, i))), !isLast && (0, jsx_runtime_1.jsx)(ink_1.Text, { children: "" })] }));
+            const barLen = barPrefix.length;
+            const wrapWidth = Math.max(40, (maxWidth || 80) - barLen);
+            // Pre-wrap each line so continuation lines also get the bar prefix
+            const wrappedLines = [];
+            for (const line of block.lines) {
+                if (line.length <= wrapWidth) {
+                    wrappedLines.push(line);
+                }
+                else {
+                    // Simple word wrap
+                    let remaining = line;
+                    while (remaining.length > wrapWidth) {
+                        let breakAt = remaining.lastIndexOf(" ", wrapWidth);
+                        if (breakAt <= 0)
+                            breakAt = wrapWidth;
+                        wrappedLines.push(remaining.slice(0, breakAt));
+                        remaining = remaining.slice(breakAt).trimStart();
+                    }
+                    if (remaining)
+                        wrappedLines.push(remaining);
+                }
+            }
+            return ((0, jsx_runtime_1.jsxs)(ink_1.Box, { flexDirection: "column", children: [!isFirst && (0, jsx_runtime_1.jsx)(ink_1.Text, { children: "" }), wrappedLines.map((line, i) => ((0, jsx_runtime_1.jsxs)(ink_1.Text, { children: [(0, jsx_runtime_1.jsx)(ink_1.Text, { dimColor: true, children: barPrefix }), (0, jsx_runtime_1.jsx)(ink_1.Text, { italic: true, children: (0, jsx_runtime_1.jsx)(InlineLine, { text: line }) })] }, i))), !isLast && (0, jsx_runtime_1.jsx)(ink_1.Text, { children: "" })] }));
         }
         case "paragraph": {
             // Check for task list items and render them specially
@@ -499,5 +521,5 @@ function StreamingMarkdown({ text, maxWidth }) {
     if (blocks.length === 0) {
         return (0, jsx_runtime_1.jsx)(ink_1.Text, { children: "" });
     }
-    return ((0, jsx_runtime_1.jsx)(ink_1.Box, { flexDirection: "column", children: blocks.map((block, i) => ((0, jsx_runtime_1.jsx)(BlockRenderer, { block: block, isFirst: i === 0, isLast: i === blocks.length - 1 }, i))) }));
+    return ((0, jsx_runtime_1.jsx)(ink_1.Box, { flexDirection: "column", children: blocks.map((block, i) => ((0, jsx_runtime_1.jsx)(BlockRenderer, { block: block, isFirst: i === 0, isLast: i === blocks.length - 1, maxWidth: maxWidth }, i))) }));
 }

package/package.json

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