@bastani/atomic 0.8.6-0 → 0.8.7-0

package/dist/builtin/workflows/src/tui/stage-chat-view.ts

@@ -16,13 +16,14 @@
  * Behaviour:
  *  - **Idle** stage (empty transcript, not streaming, not settled): welcome
  *    panel describing the attached stage. Enter sends `handle.prompt(text)`.
- *  - **Running** stage with a live stream: Enter calls `handle.steer(text)`
- *    (interrupt mid-turn). Ctrl+F always queues a follow-up via
- *    `handle.followUp(text)`.
+ *  - **Running** stage with a live stream: Enter queues a Pi-style steering
+ *    message (interrupt mid-turn) without adding a premature transcript row.
+ *    Ctrl+F queues a follow-up the same way.
  *  - **Escape** mirrors the main coding-agent chat interrupt path for active
  *    live stages: it requests a controlled pause/abort while keeping the
  *    composer active. While paused, Enter calls `handle.resume(text)`.
- *  - **Ctrl+D** detaches (back to graph); **Escape** closes the popup when idle.
+ *  - **Ctrl+D** detaches (back to graph), or closes the popup while paused;
+ *    **Escape** closes the popup when idle.
  *  - **Blocked** stage: keystrokes absorbed; BLOCKED banner names the
  *    upstream awaiter.
  *  - **Settled** stage with a live handle remains a normal chat session:
@@ -65,6 +66,7 @@ import type {
 } from "@earendil-works/pi-tui";
 import type { Store } from "../shared/store.js";
 import type { StageNotice, StageSnapshot } from "../shared/store-types.js";
+import { elapsedStageMs } from "../shared/timing.js";
 import type { GraphTheme } from "./graph-theme.js";
 import type { StageControlHandle } from "../runs/foreground/stage-control-registry.js";
 import { BOLD, RESET, hexBg, hexToAnsi, lerpColor } from "./color-utils.js";
@@ -86,7 +88,7 @@ export interface StageChatViewOpts {
    * inspect-only (settled stage with no live handle).
    */
   handle?: StageControlHandle;
-  /** Called when the user presses Ctrl+D (back to graph). */
+  /** Called when the user presses Ctrl+D outside a paused stage (back to graph). */
   onDetach: () => void;
   /** Called when the user presses Escape (close the whole popup). */
   onClose: () => void;
@@ -199,6 +201,10 @@ export class StageChatView implements Component, Focusable {
   private workingMessage: string | undefined;
   /** User rows optimistically appended by this embedded editor, de-duped on SDK echo. */
   private optimisticUserSignatures = new Set<string>();
+  /** Pending steering messages emitted by AgentSession queue updates. */
+  private pendingSteeringMessages: readonly string[] = [];
+  /** Pending follow-up messages emitted by AgentSession queue updates. */
+  private pendingFollowUpMessages: readonly string[] = [];
   /** Chat-mode repaint driver for Pi-style loaders/spinners. */
   private animationTimer: ReturnType<typeof setInterval> | undefined;
   /** Coalesces high-frequency SDK deltas while the fixed overlay is streaming. */
@@ -391,6 +397,13 @@ export class StageChatView implements Component, Focusable {
         this.workingMessage = undefined;
         return true;
 
+      case "queue_update": {
+        const queue = event as Extract<AgentSessionEvent, { type: "queue_update" }>;
+        this.pendingSteeringMessages = queue.steering;
+        this.pendingFollowUpMessages = queue.followUp;
+        return true;
+      }
+
       // Compatibility with older/headless shims that predate the SDK's
       // tool_execution_* events. Project these shims into coding-agent's live
       // controller rather than maintaining a second workflow tool renderer.
@@ -533,6 +546,7 @@ export class StageChatView implements Component, Focusable {
 
     const headerLines = this._renderHeader(w, stage);
     const sepLines = [this._sepRule(w)];
+    const pendingLines = this._renderPendingMessages(w);
     const workingLines = this._renderWorkingStatus(w, stage, { streaming });
     const usageLines = this._renderUsage(w);
     const editorLines = this._renderEditor(w, blocked);
@@ -541,6 +555,7 @@ export class StageChatView implements Component, Focusable {
     const fixed =
       HEADER_ROWS +
       SEP_ROWS +
+      pendingLines.length +
       workingLines.length +
       usageLines.length +
       editorLines.length +
@@ -556,6 +571,7 @@ export class StageChatView implements Component, Focusable {
       ...headerLines,
       ...sepLines,
       ...bodyLines,
+      ...pendingLines,
       ...workingLines,
       ...usageLines,
       ...editorLines,
@@ -915,6 +931,36 @@ export class StageChatView implements Component, Focusable {
     }).render(width);
   }
 
+  private _renderPendingMessages(width: number): string[] {
+    if (
+      this.pendingSteeringMessages.length === 0 &&
+      this.pendingFollowUpMessages.length === 0
+    ) {
+      return [];
+    }
+    const lines = [this._blank(width)];
+    for (const message of this.pendingSteeringMessages) {
+      lines.push(...this._pendingMessageLine(width, "Steering", message));
+    }
+    for (const message of this.pendingFollowUpMessages) {
+      lines.push(...this._pendingMessageLine(width, "Follow-up", message));
+    }
+    return lines;
+  }
+
+  private _pendingMessageLine(
+    width: number,
+    label: "Steering" | "Follow-up",
+    message: string,
+  ): string[] {
+    const text = `${label}: ${message}`;
+    return new Text(
+      paint(truncateToWidth(text, Math.max(1, width - 2)), this.theme.dim),
+      1,
+      0,
+    ).render(width);
+  }
+
   private _renderUsage(width: number): string[] {
     const agentSession = this.handle?.agentSession;
     if (!agentSession) return [];
@@ -949,8 +995,9 @@ export class StageChatView implements Component, Focusable {
     if (this.bodyViewport.handleInput(data)) {
       return true;
     }
-    if (data === "\x04") {
-      this.onDetach();
+    if (matchesKey(data, "ctrl+d")) {
+      if (this._isPaused()) this.onClose();
+      else this.onDetach();
       return true;
     }
     if (matchesKey(data, "escape")) {
@@ -961,12 +1008,12 @@ export class StageChatView implements Component, Focusable {
       }
       return true;
     }
-    if (data === "\x03") {
+    if (matchesKey(data, "ctrl+c")) {
       this.onClose();
       return true;
     }
     const blocked = this._isBlocked();
-    if (data === "\x06") {
+    if (matchesKey(data, "ctrl+f")) {
       if (blocked) return true;
       void this._submit("followUp");
       return true;
@@ -976,12 +1023,12 @@ export class StageChatView implements Component, Focusable {
       this.editor.handleInput(data);
       return true;
     }
-    if (data === "\r" || data === "\n") {
+    if (matchesKey(data, "enter")) {
       if (blocked) return true;
       void this._submit("auto");
       return true;
     }
-    if (data === "\x7f" || data === "\b") {
+    if (matchesKey(data, "backspace")) {
       if (blocked) return true;
       this.inputBuffer = this.inputBuffer.slice(0, -1);
       return true;
@@ -1066,26 +1113,33 @@ export class StageChatView implements Component, Focusable {
       this.requestRender?.();
       return;
     }
-    this.liveChat.appendUserText(text);
-    this.bodyViewport.scrollToBottom();
-    this.optimisticUserSignatures.add(userMessageSignature(text));
+    const isPaused = this._isPaused();
+    const isStreaming = this._isStreaming();
+    const shouldAppendOptimisticUser = mode === "auto" && !isStreaming;
+    if (shouldAppendOptimisticUser) {
+      this.liveChat.appendUserText(text);
+      this.bodyViewport.scrollToBottom();
+      this.optimisticUserSignatures.add(userMessageSignature(text));
+    }
     this.requestRender?.();
     try {
-      if (this._isPaused()) {
+      if (isPaused) {
         await this._resume(text);
         return;
       }
       if (mode === "followUp") {
-        await this.handle.followUp(text);
+        await this._queueFollowUp(text);
         return;
       }
-      if (this.handle.isStreaming) {
-        await this.handle.steer(text);
+      if (isStreaming) {
+        await this._queueSteer(text);
       } else {
         this.sdkBusy = true;
         this._syncAnimationTick();
         await this.handle.ensureAttached();
         await this.handle.prompt(text);
+        this.sdkBusy = false;
+        this._syncAnimationTick();
       }
     } catch (err) {
       this.sdkBusy = false;
@@ -1095,6 +1149,24 @@ export class StageChatView implements Component, Focusable {
     }
   }
 
+  private async _queueSteer(text: string): Promise<void> {
+    const agentSession = this.handle?.agentSession;
+    if (agentSession?.isStreaming) {
+      await agentSession.prompt(text, { streamingBehavior: "steer" });
+      return;
+    }
+    await this.handle?.steer(text);
+  }
+
+  private async _queueFollowUp(text: string): Promise<void> {
+    const agentSession = this.handle?.agentSession;
+    if (agentSession?.isStreaming) {
+      await agentSession.prompt(text, { streamingBehavior: "followUp" });
+      return;
+    }
+    await this.handle?.followUp(text);
+  }
+
   invalidate(): void {
     // Stateless render reads directly from snapshot + handle.
   }
@@ -1460,10 +1532,9 @@ function tailStreamingText(text: string): string {
 }
 
 function stageDurationText(stage: StageSnapshot | undefined): string {
-  if (!stage?.startedAt) return "";
-  const end = stage.endedAt ?? Date.now();
-  const ms = Math.max(0, end - stage.startedAt);
-  return formatDuration(ms);
+  if (!stage) return "";
+  const elapsed = elapsedStageMs(stage);
+  return elapsed === undefined ? "" : formatDuration(elapsed);
 }
 
 function formatDuration(ms: number): string {

package/dist/builtin/workflows/src/tui/status-list.ts

@@ -27,6 +27,7 @@
  */
 
 import type { RunSnapshot, StageSnapshot, StageStatus } from "../shared/store-types.js";
+import { elapsedRunMs, elapsedStageMs } from "../shared/timing.js";
 import type { GraphTheme } from "./graph-theme.js";
 import { fmtDuration } from "./status-helpers.js";
 import {
@@ -211,7 +212,7 @@ function runCardMeta(run: RunSnapshot, now: number): string {
   const ago = run.endedAt !== undefined
     ? `${fmtDuration(now - run.endedAt)} ago`
     : run.startedAt != null
-      ? fmtDuration(now - run.startedAt)
+      ? fmtDuration(elapsedRunMs(run, now))
       : undefined;
 
   if (run.status === "running") {
@@ -264,11 +265,8 @@ function lastStageDuration(run: RunSnapshot, now: number): string | undefined {
 }
 
 function stageDurationString(stage: StageSnapshot, now: number): string | undefined {
-  if (stage.durationMs !== undefined) return fmtDuration(stage.durationMs);
-  if (stage.startedAt !== undefined && stage.endedAt === undefined) {
-    return fmtDuration(now - stage.startedAt);
-  }
-  return undefined;
+  const elapsed = elapsedStageMs(stage, now);
+  return elapsed === undefined ? undefined : fmtDuration(elapsed);
 }
 
 function stageCells(run: RunSnapshot): Array<{ status: StageStatus }> {

package/dist/builtin/workflows/src/tui/text-helpers.ts

@@ -4,6 +4,7 @@ import {
   visibleWidth,
   type KeyId,
 } from "@earendil-works/pi-tui";
+import { decodePrintableKey as piDecodePrintableKey } from "@earendil-works/pi-tui/dist/keys.js";
 
 export { visibleWidth };
 
@@ -35,7 +36,12 @@ export function truncateToWidth(
 
 /** Use pi-tui's key parser/matcher while preserving the local string API. */
 export function matchesKey(data: string, key: string): boolean {
-  return piMatchesKey(data, key as KeyId);
+  return data === key || piMatchesKey(data, key as KeyId);
+}
+
+/** Decode CSI-u / Kitty printable-key sequences emitted by terminals such as VSCode. */
+export function decodePrintableKey(data: string): string | undefined {
+  return piDecodePrintableKey(data);
 }
 
 export function sliceColumns(

package/dist/builtin/workflows/src/tui/widget.ts

@@ -29,6 +29,7 @@ import type {
   StoreSnapshot,
   RunSnapshot,
 } from "../shared/store-types.js";
+import { elapsedRunMs } from "../shared/timing.js";
 import type { PiTheme } from "./store-widget-installer.js";
 import { renderBandHeader } from "./header.js";
 import type { BandBadge } from "./header.js";
@@ -166,7 +167,7 @@ function elapsedLabel(run: RunSnapshot, now: number): string {
     if (run.status === "killed") return `killed · ${ago} ago`;
     return `${run.status} · ${ago} ago`;
   }
-  if (run.startedAt != null) return formatDuration(now - run.startedAt);
+  if (run.startedAt != null) return formatDuration(elapsedRunMs(run, now));
   return "";
 }
 

package/dist/builtin/workflows/src/tui/workflow-attach-pane.ts

@@ -5,7 +5,8 @@
  * between the orchestrator `GraphView` and a stage-scoped
  * `StageChatView`. Pressing Enter on a graph node attaches the popup
  * to that node's chat; Ctrl+D in chat mode swaps back to graph mode
- * with the same node still focused (see ui/attach-mockup.html).
+ * with the same node still focused (see ui/attach-mockup.html), except
+ * paused stage chats close the pane to mirror shell EOF semantics.
  *
  * The shell never remounts the overlay — it only flips a `mode`
  * field and re-renders, so the popup stays in pi-tui's overlay layer

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bastani/atomic",
-  "version": "0.8.6-0",
+  "version": "0.8.7-0",
   "description": "Atomic coding agent CLI with read, bash, edit, write tools and session management",
   "type": "module",
   "atomicConfig": {