mindweave 3.2.2 → 3.2.4

package/dist/cli/App.js

@@ -69,6 +69,7 @@ import { APP_EXPLANATION, APP_PAGE_URL, appAnnouncement, openInBrowser } from ".
 import { PromptInput } from "./components/PromptInput.js";
 import { Picker } from "./components/Picker.js";
 import { ApprovalBox } from "./components/ApprovalBox.js";
+import { approvalAnswer, approvalBlock, workedSeconds } from "./approvalText.js";
 import { BlockView } from "./components/BlockView.js";
 import { initialState, lastExpandable, reduce, trimNarration } from "./transcript.js";
 import { isTight } from "./blockSpacing.js";
@@ -358,6 +359,10 @@ export function App({ resumeSessionId, initialScreen }) {
     const [lastMs, setLastMs] = useState(null);
     const [taskUsage, setTaskUsage] = useState(null);
     const turnStart = useRef(null);
+    // Time spent waiting for the person to answer a question, which is not time the agent worked: the working
+    // line's clock leaves it out, and says it is waiting while it lasts. `waitSince` is when the current wait began.
+    const waitedMs = useRef(0);
+    const waitSince = useRef(null);
     // Token accounting for the status line. A task (one turn) may span several model
     // calls; we keep each call's REAL usage and fold it into a meaningful summary
     // (context size + cache-aware cost), not a raw sum of re-sent context — that sum
@@ -558,6 +563,16 @@ export function App({ resumeSessionId, initialScreen }) {
     // An interactive overlay (session picker, model/think chooser, or an approval
     // prompt). When set, it owns the keyboard and the input box is hidden.
     const [overlay, setOverlay] = useState(null);
+    // While a question is open the working line stands still (see StatusLine), so the wait is counted here.
+    useEffect(() => {
+        const open = overlay?.kind === "approval";
+        if (open && waitSince.current == null)
+            waitSince.current = Date.now();
+        if (!open && waitSince.current != null) {
+            waitedMs.current += Date.now() - waitSince.current;
+            waitSince.current = null;
+        }
+    }, [overlay]);
     // Set while a command that opens one of those surfaces is on its way, so the box that
     // holds them stays on screen for the gap between the command list closing and the
     // surface appearing. See `OVERLAY_COMMANDS`.
@@ -587,7 +602,11 @@ export function App({ resumeSessionId, initialScreen }) {
         if (body) {
             // Titled → a facts block on a rail, rendered verbatim (a command must not be
             // reinterpreted as markdown). Untitled → prose, because it is a document to read.
-            dispatch(detailTitle ? { type: "notice", title: detailTitle, body } : { type: "say", text: body });
+            //
+            // The question goes in the block with what it is about. The block used to hold the command alone, and
+            // the question lived only in the box at the bottom, which is gone once it is answered: what was left
+            // in the conversation was a command with no word about why it had been asked or how it was answered.
+            dispatch(detailTitle ? { type: "notice", title: detailTitle, body: approvalBlock(question, body) } : { type: "say", text: body });
         }
         const answer = approvals.current.ask({
             kind: "approval",
@@ -599,6 +618,15 @@ export function App({ resumeSessionId, initialScreen }) {
             ...(freeText ? { freeText } : {}),
         });
         showNextApproval.current();
+        // And what was answered, once it is, so the record reads as a question and its answer. Only for a
+        // question that printed a block above; a plain one-line question leaves nothing to answer later.
+        if (body && detailTitle) {
+            void answer.then((choice) => {
+                const line = approvalAnswer(choice);
+                if (line)
+                    note(line);
+            });
+        }
         return answer;
     });
     // Bumped whenever a background shell starts/finishes, to re-render the indicator.
@@ -998,6 +1026,8 @@ export function App({ resumeSessionId, initialScreen }) {
     // Start/stop a turn's timer (drives the persistent status line).
     function startTurn() {
         turnStart.current = Date.now();
+        waitedMs.current = 0;
+        waitSince.current = null;
         usageSamples.current = [];
         meter.current = meterReset();
         setTaskUsage(null); // clear the previous task's summary while this one runs
@@ -2054,10 +2084,10 @@ export function App({ resumeSessionId, initialScreen }) {
                             gov.notices = [];
                     }
                     else if (e.type === "subagent" && e.phase === "start") {
-                        enqueueReveal({ type: "subagentStart", agentId: e.id, task: e.task, readOnly: e.readOnly });
+                        enqueueReveal({ type: "subagentStart", agentId: e.id, task: e.task, readOnly: e.readOnly, ...(e.taskFull ? { full: e.taskFull } : {}) });
                     }
                     else if (e.type === "subagent" && e.phase === "end") {
-                        enqueueReveal({ type: "subagentEnd", agentId: e.id, ok: !e.error, summary: e.summary });
+                        enqueueReveal({ type: "subagentEnd", agentId: e.id, ok: !e.error, summary: e.summary, ...(e.headline ? { headline: e.headline } : {}), ...(e.verdict ? { verdict: e.verdict } : {}), ...(e.steps !== undefined ? { steps: e.steps } : {}) });
                     }
                     else if (e.type === "todos") {
                         setMarathonUi((ui) => marathonUiReduce(ui, { type: "todos", items: e.items }));
@@ -3756,7 +3786,7 @@ export function App({ resumeSessionId, initialScreen }) {
     // The status line, the queued bar, the input and whatever sits under it. Built once
     // and rendered by BOTH shells: the only thing that differs between them is where it
     // ends up — pinned to the bottom of a frame we own, or simply the last thing printed.
-    const footerView = (_jsxs(Box, { ref: footerRef, flexDirection: "column", flexShrink: 0, children: [_jsx(Box, { flexShrink: 0, children: _jsx(Text, { children: " " }) }), _jsx(Box, { flexShrink: 0, children: _jsx(StatusLine, { busy: busy, startedAt: turnStart.current, lastMs: lastMs, usage: taskUsage, received: liveTokens, advance: advanceTokens }) }), _jsx(Box, { flexShrink: 0, children: _jsx(QueuedBar, { queued: queued }) }), marathonUi ? (_jsx(Box, { flexShrink: 0, children: _jsx(MarathonBox, { ui: marathonUi, width: width, cap: shell === "inline" ? 4 : 7 }) })) : null, _jsx(Box, { flexShrink: 0, flexDirection: "column", children: ready ? (_jsx(PromptInput, { onSubmit: onSend, opening: opening, disabled: false, placeholder: marathonUi?.phase === "armed" ? "describe the goal…" : busy ? "type to queue a message…" : "say something…", width: width, history: history, completions: completions, pathComplete: pathComplete.current, onLargePaste: registerPaste, onDroppedPaths: (text) => dropHandles.current.register(text), registerCaretClick: (place) => {
+    const footerView = (_jsxs(Box, { ref: footerRef, flexDirection: "column", flexShrink: 0, children: [_jsx(Box, { flexShrink: 0, children: _jsx(Text, { children: " " }) }), _jsx(Box, { flexShrink: 0, children: _jsx(StatusLine, { busy: busy, startedAt: turnStart.current, lastMs: lastMs, usage: taskUsage, received: liveTokens, advance: advanceTokens, waiting: overlay?.kind === "approval", waited: () => waitedMs.current + (waitSince.current != null ? Date.now() - waitSince.current : 0) }) }), _jsx(Box, { flexShrink: 0, children: _jsx(QueuedBar, { queued: queued }) }), marathonUi ? (_jsx(Box, { flexShrink: 0, children: _jsx(MarathonBox, { ui: marathonUi, width: width, cap: shell === "inline" ? 4 : 7 }) })) : null, _jsx(Box, { flexShrink: 0, flexDirection: "column", children: ready ? (_jsx(PromptInput, { onSubmit: onSend, opening: opening, disabled: false, placeholder: marathonUi?.phase === "armed" ? "describe the goal…" : busy ? "type to queue a message…" : "say something…", width: width, history: history, completions: completions, pathComplete: pathComplete.current, onLargePaste: registerPaste, onDroppedPaths: (text) => dropHandles.current.register(text), registerCaretClick: (place) => {
                         caretClick.current = place;
                     }, registerTextSelect: (select) => {
                         textSelect.current = select;
@@ -4245,7 +4275,7 @@ function timeAgo(ms) {
  * line above separating it from the conversation, where the
  * receipt belongs to the prompt area, not glued to the last reply.
  */
-function StatusLine({ busy, startedAt, lastMs, usage, received, advance, }) {
+function StatusLine({ busy, startedAt, lastMs, usage, received, advance, waiting, waited, }) {
     // The render clock while busy: it advances the elapsed timer AND steps the eased token
     // counter one frame. It runs at about the display's pace (16ms): the number reads as counting
     // rather than as jumping, and the working dot moves smoothly. It was 50ms (20 frames a
@@ -4271,14 +4301,14 @@ function StatusLine({ busy, startedAt, lastMs, usage, received, advance, }) {
         // are what make it read as a live gauge rather than a sentence, and the verb is
         // swapped every few seconds (see workingVerb) and steady inside each, so the line does not flicker between
         // words while the seconds tick.
-        const secs = Math.floor((Date.now() - startedAt) / 1000);
+        const secs = workedSeconds(Date.now(), startedAt, waited());
         // OUTPUT tokens for THIS task, estimated from what has streamed back. It is the task's
         // own work: the re-sent conversation (the whole session's context, re-billed each tool
         // round) is NOT counted here, because that is session overhead, not what this task
         // did. Output is
         // also the only thing that grows continuously while a turn runs, so it animates cleanly.
         const got = received();
-        label = (_jsxs(Text, { children: [" ", workingVerb(startedAt, Date.now() - startedAt), "\u2026", "  ", _jsxs(Text, { dimColor: true, children: ["< ", fmtElapsed(secs), got > 0 ? ` · ↓ ${formatTokens(got)} tokens` : "", " >"] })] }));
+        label = (_jsxs(Text, { children: [" ", waiting ? "Waiting for your answer" : workingVerb(startedAt, Date.now() - startedAt - waited()), "\u2026", "  ", _jsxs(Text, { dimColor: true, children: ["< ", fmtElapsed(secs), got > 0 ? ` · ↓ ${formatTokens(got)} tokens` : "", " >"] })] }));
     }
     else if (lastMs != null) {
         // Settled receipt: elapsed time and the turn's real token cost, shown at once,