@ouro.bot/cli 0.1.0-alpha.243 → 0.1.0-alpha.244

package/changelog.json

@@ -1,6 +1,14 @@
 {
   "_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.244",
+      "changes": [
+        "refactor(sync): git-status-based bundle sync \u2014 postTurnPush discovers dirty files via `git status --porcelain` instead of broken explicit trackSyncWrite tracking (only 3/9 writers used it). Removed dead infrastructure. Remote push optional and non-fatal.",
+        "feat(tui): queued input steer \u2014 messages typed while agent is thinking appear dimmed above input area. UP/ESC pops all queued messages back into input for editing. Placeholder hint. Multiple messages supported, each sent as separate turn.",
+        "chore: deleted legacy InkCliApp adapter (776 lines dead code)."
+      ]
+    },
     {
       "version": "0.1.0-alpha.243",
       "changes": [

package/dist/arc/episodes.js

@@ -38,7 +38,6 @@ exports.readRecentEpisodes = readRecentEpisodes;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const runtime_1 = require("../nerves/runtime");
-const sync_1 = require("../heart/sync");
 function episodesDir(agentRoot) {
     return path.join(agentRoot, "arc", "episodes");
 }
@@ -64,7 +63,6 @@ function emitEpisode(agentRoot, input) {
     fs.mkdirSync(dir, { recursive: true });
     const filePath = path.join(dir, `${id}.json`);
     fs.writeFileSync(filePath, JSON.stringify(episode, null, 2), "utf-8");
-    (0, sync_1.trackSyncWrite)(filePath);
     (0, runtime_1.emitNervesEvent)({
         component: "mind",
         event: "mind.episode_emitted",

package/dist/arc/json-store.js

@@ -47,7 +47,6 @@ exports.readJsonFileOrThrow = readJsonFileOrThrow;
 exports.writeJsonFile = writeJsonFile;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const sync_1 = require("../heart/sync");
 /**
  * Generate a timestamped random ID.
  * @param prefix Optional prefix (e.g. "care", "int"). Omit for plain timestamp IDs.
@@ -110,11 +109,9 @@ function readJsonFileOrThrow(dir, id, label) {
 }
 /**
  * Write a record to a JSON file, creating the directory if needed.
- * Automatically calls trackSyncWrite.
  */
 function writeJsonFile(dir, id, record) {
     fs.mkdirSync(dir, { recursive: true });
     const filePath = path.join(dir, `${id}.json`);
     fs.writeFileSync(filePath, JSON.stringify(record, null, 2), "utf-8");
-    (0, sync_1.trackSyncWrite)(filePath);
 }

package/dist/heart/sync.js

@@ -33,48 +33,12 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runWithSyncContext = runWithSyncContext;
-exports.trackSyncWrite = trackSyncWrite;
-exports.drainSyncWrites = drainSyncWrites;
 exports.preTurnPull = preTurnPull;
 exports.postTurnPush = postTurnPush;
-const node_async_hooks_1 = require("node:async_hooks");
 const child_process_1 = require("child_process");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const runtime_1 = require("../nerves/runtime");
-/**
- * Turn-scoped write tracker using AsyncLocalStorage.
- * Each turn runs inside its own async context (via runWithSyncContext),
- * so concurrent turns from different senses never share or clobber each
- * other's tracked writes.
- *
- * Continuity writers (episodes, obligations, cares, intentions, diary)
- * call trackSyncWrite() after every fs write. drainSyncWrites() returns
- * the current turn's accumulated set and clears it.
- */
-const syncContext = new node_async_hooks_1.AsyncLocalStorage();
-/**
- * Run a function inside its own sync-write tracking context.
- * All trackSyncWrite / drainSyncWrites calls within `fn` (including
- * across awaits) operate on a private Set scoped to this invocation.
- */
-function runWithSyncContext(fn) {
-    return syncContext.run(new Set(), fn);
-}
-/** Register an absolute file path written during this turn. No-op if called outside a sync context. */
-function trackSyncWrite(absolutePath) {
-    syncContext.getStore()?.add(absolutePath);
-}
-/** Return all paths written this turn and clear the set. Returns [] if called outside a sync context. */
-function drainSyncWrites() {
-    const store = syncContext.getStore();
-    if (!store)
-        return [];
-    const paths = [...store];
-    store.clear();
-    return paths;
-}
 /**
  * Pre-turn pull: sync the agent bundle from remote before assembling the start-of-turn packet.
  */
@@ -111,42 +75,47 @@ function preTurnPull(agentRoot, config) {
     }
 }
 /**
- * Post-turn push: commit and push files written during this turn.
- * Receives an explicit list of absolute paths (from drainSyncWrites) instead of
- * discovering changes via git status. Empty list = no changes = skip.
+ * Post-turn push: discover dirty files via `git status`, commit, and push.
+ * Uses git-status-based discovery instead of explicit path tracking, ensuring
+ * all file writers are captured regardless of whether they call a tracking API.
  */
-function postTurnPush(agentRoot, config, writtenPaths) {
+function postTurnPush(agentRoot, config) {
     (0, runtime_1.emitNervesEvent)({
         component: "heart",
         event: "heart.sync_push_start",
         message: "post-turn push starting",
         meta: { agentRoot, remote: config.remote },
     });
-    if (writtenPaths.length === 0) {
+    let statusOutput;
+    try {
+        statusOutput = (0, child_process_1.execFileSync)("git", ["status", "--porcelain"], {
+            cwd: agentRoot,
+            stdio: "pipe",
+            timeout: 10000,
+        }).toString().trim();
+    }
+    catch (err) {
+        const error = err instanceof Error ? err.message : String(err);
         (0, runtime_1.emitNervesEvent)({
             component: "heart",
-            event: "heart.sync_push_end",
-            message: "post-turn push: no changes to sync",
-            meta: { agentRoot },
+            event: "heart.sync_push_error",
+            message: "post-turn push: git status failed",
+            meta: { agentRoot, error },
         });
-        return { ok: true };
+        return { ok: false, error };
     }
-    // Convert absolute paths to relative (for git add)
-    const relativePaths = writtenPaths
-        .map((p) => path.relative(agentRoot, p))
-        .filter((p) => p.length > 0 && !p.startsWith(".."));
-    if (relativePaths.length === 0) {
+    if (statusOutput.length === 0) {
         (0, runtime_1.emitNervesEvent)({
             component: "heart",
             event: "heart.sync_push_end",
-            message: "post-turn push: no in-bundle paths to sync",
+            message: "post-turn push: no changes to sync",
             meta: { agentRoot },
         });
         return { ok: true };
     }
+    const changedCount = statusOutput.split("\n").length;
     try {
-        // Stage only the specific files written during this turn
-        (0, child_process_1.execFileSync)("git", ["add", "--", ...relativePaths], {
+        (0, child_process_1.execFileSync)("git", ["add", "-A"], {
             cwd: agentRoot,
             stdio: "pipe",
             timeout: 10000,
@@ -156,6 +125,21 @@ function postTurnPush(agentRoot, config, writtenPaths) {
             stdio: "pipe",
             timeout: 10000,
         });
+        // Check if a remote exists
+        const remoteOutput = (0, child_process_1.execFileSync)("git", ["remote"], {
+            cwd: agentRoot,
+            stdio: "pipe",
+            timeout: 5000,
+        }).toString().trim();
+        if (remoteOutput.length === 0) {
+            (0, runtime_1.emitNervesEvent)({
+                component: "heart",
+                event: "heart.sync_push_end",
+                message: "post-turn push: committed locally, no remote configured",
+                meta: { agentRoot, changedCount },
+            });
+            return { ok: true };
+        }
         try {
             (0, child_process_1.execFileSync)("git", ["push", config.remote], {
                 cwd: agentRoot,
@@ -185,7 +169,6 @@ function postTurnPush(agentRoot, config, writtenPaths) {
                 fs.writeFileSync(pendingSyncPath, JSON.stringify({
                     error: retryError,
                     failedAt: new Date().toISOString(),
-                    paths: relativePaths,
                 }, null, 2), "utf-8");
                 (0, runtime_1.emitNervesEvent)({
                     component: "heart",
@@ -200,7 +183,7 @@ function postTurnPush(agentRoot, config, writtenPaths) {
             component: "heart",
             event: "heart.sync_push_end",
             message: "post-turn push complete",
-            meta: { agentRoot, changedCount: relativePaths.length },
+            meta: { agentRoot, changedCount },
         });
         return { ok: true };
     }

package/dist/mind/diary.js

@@ -45,7 +45,6 @@ const path = __importStar(require("path"));
 const crypto_1 = require("crypto");
 const identity_1 = require("../heart/identity");
 const runtime_1 = require("../nerves/runtime");
-const sync_1 = require("../heart/sync");
 const associative_recall_1 = require("./associative-recall");
 const embedding_provider_1 = require("./embedding-provider");
 const DEDUP_THRESHOLD = 0.6;
@@ -175,11 +174,8 @@ function appendEntriesWithDedup(stores, incoming, options) {
         all.push(fact);
         added++;
         fs.appendFileSync(stores.factsPath, `${JSON.stringify(fact)}\n`, "utf8");
-        (0, sync_1.trackSyncWrite)(stores.factsPath);
         updateEntityIndex(stores.entitiesPath, fact);
-        (0, sync_1.trackSyncWrite)(stores.entitiesPath);
         appendDailyFact(stores.dailyDir, fact);
-        (0, sync_1.trackSyncWrite)(path.join(stores.dailyDir, `${(fact.createdAt.slice(0, 10) || "unknown")}.jsonl`));
     }
     (0, runtime_1.emitNervesEvent)({
         component: "mind",
@@ -295,7 +291,6 @@ async function backfillEmbeddings(options) {
     // Rewrite facts file with updated embeddings
     const lines = facts.map((f) => JSON.stringify(f)).join("\n") + "\n";
     fs.writeFileSync(factsPath, lines, "utf8");
-    (0, sync_1.trackSyncWrite)(factsPath);
     (0, runtime_1.emitNervesEvent)({
         component: "mind",
         event: "mind.diary_backfill_complete",

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

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.QueuedMessages = QueuedMessages;
 exports.OuroTui = OuroTui;
 const jsx_runtime_1 = require("react/jsx-runtime");
 /**
@@ -141,8 +142,14 @@ function ActiveToolLine({ tool }) {
 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] }));
 }
+// ─── Queued Messages ───────────────────────────────────────────────
+function QueuedMessages({ items }) {
+    if (items.length === 0)
+        return (0, jsx_runtime_1.jsx)(ink_1.Text, { children: "" });
+    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, agentName, model }) {
+function InputArea({ onSubmit, onCtrlC, history, queuedInputs, onPopQueue, agentName, model }) {
     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)("");
@@ -202,6 +209,12 @@ function InputArea({ onSubmit, onCtrlC, history, agentName, model }) {
                     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("");
             }
@@ -271,16 +284,25 @@ function InputArea({ onSubmit, onCtrlC, history, agentName, model }) {
             }
             return;
         }
-        // Up/Down: history
-        if (key.upArrow && history.length > 0) {
-            if (historyIdx.current === -1) {
-                savedInput.current = inputRef.current;
-                historyIdx.current = history.length - 1;
+        // Up/Down: queue pop takes priority over history
+        if (key.upArrow) {
+            // If not already browsing history and queue has items, pop queue into input
+            if (historyIdx.current === -1 && queuedInputs.length > 0) {
+                const items = onPopQueue();
+                updateInput(items.join("\n"));
+                return;
             }
-            else if (historyIdx.current > 0) {
-                historyIdx.current--;
+            // Otherwise, browse history
+            if (history.length > 0) {
+                if (historyIdx.current === -1) {
+                    savedInput.current = inputRef.current;
+                    historyIdx.current = history.length - 1;
+                }
+                else if (historyIdx.current > 0) {
+                    historyIdx.current--;
+                }
+                updateInput(history[historyIdx.current]);
             }
-            updateInput(history[historyIdx.current]);
             return;
         }
         if (key.downArrow) {
@@ -345,14 +367,14 @@ function InputArea({ onSubmit, onCtrlC, history, agentName, model }) {
     const cols = safeWidth();
     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.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(cols) }), (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 }) : null] })] }));
+    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: ") " }), !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(cols) }), (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 }) : null] })] }));
 }
 // ─── Main TUI Component ─────────────────────────────────────────────
-function OuroTui({ agentName, model, completedMessages, inputHistory, live, elapsedSeconds, contextPercent, onSubmit, onCtrlC, cwd, }) {
+function OuroTui({ agentName, model, completedMessages, inputHistory, queuedInputs, live, elapsedSeconds, contextPercent, onSubmit, onCtrlC, onPopQueue, cwd, }) {
     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 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, onCtrlC: onCtrlC, history: inputHistory, 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 })] }));
 }

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

@@ -32,10 +32,12 @@ class TuiStore {
     _listeners = new Set();
     _headerShown = false;
     _inputHistory = [];
+    _queuedInputs = [];
     get completedMessages() { return this._completed; }
     get live() { return this._live; }
     get headerShown() { return this._headerShown; }
     get inputHistory() { return this._inputHistory; }
+    get queuedInputs() { return this._queuedInputs; }
     /** Elapsed seconds since spinner started — computed on demand, not stored */
     getElapsed() {
         if (this._live.loading && this._spinnerStart > 0) {
@@ -171,6 +173,28 @@ class TuiStore {
     seedHistory(texts) {
         this._inputHistory.push(...texts);
     }
+    // ─── Queued input display ────────────────────────────────────────
+    enqueueInput(text) {
+        this._queuedInputs.push(text);
+        this.notify();
+    }
+    dequeueInput(text) {
+        const idx = this._queuedInputs.indexOf(text);
+        if (idx !== -1) {
+            this._queuedInputs.splice(idx, 1);
+        }
+        this.notify();
+    }
+    popAllQueuedForEditing() {
+        const copy = [...this._queuedInputs];
+        this._queuedInputs = [];
+        this.notify();
+        return copy;
+    }
+    clearQueue() {
+        this._queuedInputs = [];
+        this.notify();
+    }
 }
 exports.TuiStore = TuiStore;
 // ─── Callbacks factory ──────────────────────────────────────────────

package/dist/senses/cli.js

@@ -464,6 +464,12 @@ class InputQueue {
             r({ value: undefined, done: true });
         }
     }
+    /** Drain all buffered items, leaving any pending async awaiter untouched. */
+    drainAll() {
+        const items = [...this.queue];
+        this.queue = [];
+        return items;
+    }
     [Symbol.asyncIterator]() {
         return {
             next: () => {
@@ -566,11 +572,13 @@ async function runCliSession(options) {
                     model: (0, identity_1.loadAgentConfig)().humanFacing?.model ?? "",
                     completedMessages: storeRef.completedMessages,
                     inputHistory: storeRef.inputHistory,
+                    queuedInputs: storeRef.queuedInputs,
                     live: storeRef.live,
                     elapsedSeconds: elapsed,
                     contextPercent: 0,
-                    onSubmit: (text) => { ctrlCWarned = false; inputQueue.push(text); },
+                    onSubmit: (text) => { ctrlCWarned = false; inputQueue.push(text); storeRef.enqueueInput(text); },
                     onCtrlC: handleCtrlC,
+                    onPopQueue: () => { const items = storeRef.popAllQueuedForEditing(); inputQueue.drainAll(); return items; },
                     headerShown: storeRef.headerShown,
                     cwd: process.cwd().replace(process.env.HOME ?? "", "~"),
                 });
@@ -729,6 +737,8 @@ async function runCliSession(options) {
                 break;
             if (!input.trim())
                 continue;
+            // Remove from TUI queue display as the agent picks up this message
+            tuiStore?.dequeueInput(input);
             // Optional input gate (e.g. trust gate in main)
             if (options.onInput) {
                 const gate = options.onInput(input);