@bastani/atomic 0.8.21-0 → 0.8.22-0

package/dist/builtin/workflows/src/tui/graph-view.ts

@@ -13,7 +13,7 @@
  *  - No decorative progress bar. Counts live in the header pills.
  *
  * cross-ref:
- *   - github.com/flora131/atomic packages/atomic-sdk/src/components/session-graph-panel.tsx
+ *   - github.com/bastani-inc/atomic packages/atomic-sdk/src/components/session-graph-panel.tsx
  *   - DESIGN.md §4 (Elevation), §5 (Components)
  */
 import type { Component } from "@earendil-works/pi-tui";
@@ -31,17 +31,21 @@ import type {
   StoreSnapshot,
   RunSnapshot,
 } from "../shared/store-types.js";
-import { elapsedStageMs } from "../shared/timing.js";
 import type { GraphTheme } from "./graph-theme.js";
 import type { SwitcherState } from "./switcher.js";
 import type { LayoutNode } from "./layout.js";
+import {
+  expandWorkflowGraph,
+  expandedStageTarget,
+  type ExpandedWorkflowGraph,
+  type ExpandedWorkflowStage,
+} from "../shared/expanded-workflow-graph.js";
 import { computeLayout, NODE_W, NODE_H } from "./layout.js";
 import { renderHeader, renderOutlinePill } from "./header.js";
 import { renderNodeCard } from "./node-card.js";
 import { renderSwitcher, filterStages } from "./switcher.js";
 import { renderToasts, createToastManager } from "./toast.js";
 import { hexToAnsi, hexBg, RESET, BOLD } from "./color-utils.js";
-import { fmtDuration } from "./status-helpers.js";
 import { GraphCanvas } from "./graph-canvas.js";
 import {
   createPromptCardState,
@@ -50,6 +54,7 @@ import {
   renderPromptCard,
   type PromptCardState,
 } from "./prompt-card.js";
+import { isKeybindingsLike, type KeybindingsLike } from "./keybindings-adapter.js";
 
 export type GraphViewMode = "overlay" | "widget";
 
@@ -115,6 +120,8 @@ export interface GraphViewOpts {
    * `overlay-adapter.ts`).
    */
   requestRender?: () => void;
+  /** Host Pi keybindings manager used by run-level prompt cards. */
+  piKeybindings?: unknown;
 }
 
 const HINT_KEYS: Array<{ key: string; label: string }> = [
@@ -177,6 +184,7 @@ export class GraphView implements Component {
   private initialFocusedStageId?: string;
   private getViewportRows?: () => number | undefined;
   private requestRender?: () => void;
+  private piKeybindings?: unknown;
 
   /** Active HIL prompt state, set when `_rebuildLayout` sees a new prompt id. */
   private promptState: PromptCardState | null = null;
@@ -187,6 +195,7 @@ export class GraphView implements Component {
   private toastManager = createToastManager();
   private detailsExpanded = true;
   private cachedLayout: LayoutNode[] = [];
+  private expandedGraph: ExpandedWorkflowGraph = { stages: [], targets: new Map() };
   private currentSnapshot: StoreSnapshot | null = null;
   private graphScrollOffset = 0;
   private graphScrollColOffset = 0;
@@ -211,6 +220,7 @@ export class GraphView implements Component {
     this.initialFocusedStageId = opts.initialFocusedStageId;
     this.getViewportRows = opts.getViewportRows;
     this.requestRender = opts.requestRender;
+    this.piKeybindings = opts.piKeybindings;
 
     this._unsubscribe = this.store.subscribe((snap) => {
       this.currentSnapshot = snap;
@@ -242,6 +252,7 @@ export class GraphView implements Component {
     const run = this._getCurrentRun();
     if (!run) {
       this.cachedLayout = [];
+      this.expandedGraph = { stages: [], targets: new Map() };
       this.focusedIndex = 0;
       this.graphScrollOffset = 0;
       this.graphScrollColOffset = 0;
@@ -262,7 +273,9 @@ export class GraphView implements Component {
     // the same node the user just attached to.
     if (this.initialFocusedStageId !== undefined) {
       const idx = this.cachedLayout.findIndex(
-        (n) => n.stage.id === this.initialFocusedStageId,
+        (n) =>
+          n.stage.id === this.initialFocusedStageId ||
+          expandedStageTarget(this.expandedGraph, n.stage.id)?.stageId === this.initialFocusedStageId,
       );
       if (idx >= 0 && idx !== this.focusedIndex) {
         this.focusedIndex = idx;
@@ -316,31 +329,37 @@ export class GraphView implements Component {
   }
 
   private _awaitingInputKey(stage: StageSnapshot): { key: string; createdAt: number } | null {
+    const target = expandedStageTarget(this.expandedGraph, stage.id);
+    const prefix = target ? `${target.runId}:${target.stageId}` : stage.id;
     if (stage.pendingPrompt) {
       return {
-        key: `prompt:${stage.id}:${stage.pendingPrompt.id}`,
+        key: `prompt:${prefix}:${stage.pendingPrompt.id}`,
         createdAt: stage.pendingPrompt.createdAt,
       };
     }
     if (stage.inputRequest) {
       return {
-        key: `input-request:${stage.id}:${stage.inputRequest.id}`,
+        key: `input-request:${prefix}:${stage.inputRequest.id}`,
         createdAt: stage.inputRequest.createdAt,
       };
     }
     if (stage.status === "awaiting_input") {
       return {
-        key: `awaiting:${stage.id}:${stage.awaitingInputSince ?? "active"}`,
+        key: `awaiting:${prefix}:${stage.awaitingInputSince ?? "active"}`,
         createdAt: stage.awaitingInputSince ?? stage.startedAt ?? 0,
       };
     }
     return null;
   }
 
-  private _graphStages(run: RunSnapshot): StageSnapshot[] {
-    const hasStagePrompt = run.stages.some((stage) => stage.pendingPrompt !== undefined);
-    if (!hasStagePrompt) return [...run.stages];
-    return run.stages.filter((stage) => {
+  private _graphStages(run: RunSnapshot): ExpandedWorkflowStage[] {
+    this.expandedGraph = this.currentSnapshot
+      ? expandWorkflowGraph(this.currentSnapshot, run.id)
+      : { stages: [], targets: new Map() };
+    const stages = [...this.expandedGraph.stages];
+    const hasStagePrompt = stages.some((stage) => stage.pendingPrompt !== undefined);
+    if (!hasStagePrompt) return stages;
+    return stages.filter((stage) => {
       // Prompt-node injection can leave unstarted author stages in the store
       // while the prompt node owns focus; hide only these inert placeholders.
       const isUnstartedPlaceholder =
@@ -394,11 +413,12 @@ export class GraphView implements Component {
     if (!run) {
       return [`${hexToAnsi(this.graphTheme.dim)}no active workflow${RESET}`];
     }
-    const headerLines = renderHeader(run, { width, theme: this.graphTheme });
-    const counts = this._counts(run);
+    const displayStages = this._displayStages(run);
+    const headerLines = renderHeader({ ...run, stages: displayStages }, { width, theme: this.graphTheme });
+    const counts = this._counts(displayStages);
     const trailer =
       `${hexToAnsi(this.graphTheme.dim)}` +
-      `${counts.completed}/${run.stages.length} done` +
+      `${counts.completed}/${displayStages.length} done` +
       (counts.running > 0 ? ` · ${counts.running} running` : "") +
       (counts.failed > 0 ? ` · ${counts.failed} failed` : "") +
       (counts.blocked > 0 ? ` · ${counts.blocked} blocked` : "") +
@@ -473,7 +493,7 @@ export class GraphView implements Component {
 
     // 1. Header chrome (3 rows: outline pill + session name + counts).
     lines.push(
-      ...renderHeader(run, { width: frameWidth, theme: this.graphTheme }),
+      ...renderHeader({ ...run, stages: this._displayStages(run) }, { width: frameWidth, theme: this.graphTheme }),
     );
 
     // 2. Graph occupies the full body. No section labels, no focused-
@@ -502,7 +522,7 @@ export class GraphView implements Component {
         lines[row] = this._blankRow(frameWidth);
       }
       const switcherWidth = Math.min(60, Math.max(40, frameWidth - 8));
-      const switcherLines = renderSwitcher(run.stages, this.switcherState, {
+      const switcherLines = renderSwitcher(this._displayStages(run), this.switcherState, {
         width: switcherWidth,
         theme: this.graphTheme,
       });
@@ -520,8 +540,9 @@ export class GraphView implements Component {
 
     // 4. Pending HIL prompt — floats over the graph body, centred. The
     //    chat editor remains free regardless: the overlay is the only
-    //    surface that interacts with the prompt.
-    if (this.promptState) {
+    //    surface that interacts with the prompt. When the stage switcher is
+    //    open it owns the body/input, so hide the prompt card until it closes.
+    if (this.promptState && !this.switcherOpen) {
       const cardWidth = Math.min(72, Math.max(40, frameWidth - 6));
       const cardLines = renderPromptCard({
         state: this.promptState,
@@ -677,7 +698,7 @@ export class GraphView implements Component {
         focused,
         pulsePhase,
         theme: this.graphTheme,
-        stages: run.stages,
+        stages: this.cachedLayout.map((layoutNode) => layoutNode.stage),
       });
       for (let li = 0; li < cardLines.length; li++) {
         const rowIdx = node.y + li;
@@ -796,7 +817,7 @@ export class GraphView implements Component {
     this._clampGraphScroll(totalRows, bodyRows);
   }
 
-  private _focusedGraphRowRange(frameWidth: number): { start: number; end: number } | null {
+  private _focusedGraphRowRange(_frameWidth: number): { start: number; end: number } | null {
     const node = this.cachedLayout[this.focusedIndex];
     if (!node) return null;
     return { start: node.y, end: node.y + NODE_H - 1 };
@@ -1014,37 +1035,13 @@ export class GraphView implements Component {
     return `${bg}${" ".repeat(leftPad)}${RESET}${cardLine}${bg}${" ".repeat(rightPadLen)}${RESET}`;
   }
 
-  /** Overlay a fixed-width panel on a row while preserving graph cells
-   * outside the panel bounds. Used by the stage switcher so the picker
-   * does not erase nodes to its right. */
-  private _overlayInline(
-    base: string,
-    overlay: string,
-    leftPad: number,
-    totalWidth: number,
-  ): string {
-    const overlayWidth = Math.min(
-      Math.max(0, totalWidth - leftPad),
-      visibleWidth(overlay),
-    );
-    const left = this._sliceColumns(base, 0, leftPad);
-    const panel = truncateToWidth(overlay, overlayWidth, "", true);
-    const right = this._sliceColumns(
-      base,
-      leftPad + overlayWidth,
-      totalWidth,
-    );
-    const merged = `${left}${panel}${right}`;
-    const pad = Math.max(0, totalWidth - visibleWidth(merged));
-    return `${merged}${hexBg(this.graphTheme.bg)}${" ".repeat(pad)}${RESET}`;
+  private _displayStages(run: RunSnapshot): StageSnapshot[] {
+    return this.cachedLayout.length > 0
+      ? this.cachedLayout.map((layoutNode) => layoutNode.stage)
+      : [...run.stages];
   }
 
-  private _duration(stage: StageSnapshot): string {
-    const elapsed = elapsedStageMs(stage);
-    return elapsed === undefined ? "" : fmtDuration(elapsed);
-  }
-
-  private _counts(run: RunSnapshot): {
+  private _counts(stages: readonly StageSnapshot[]): {
     pending: number;
     running: number;
     awaiting_input: number;
@@ -1064,7 +1061,7 @@ export class GraphView implements Component {
       failed: 0,
       skipped: 0,
     };
-    for (const s of run.stages) c[s.status]++;
+    for (const s of stages) c[s.status]++;
     return c;
   }
 
@@ -1074,25 +1071,40 @@ export class GraphView implements Component {
 
   /** Returns true if consumed. */
   handleInput(data: string): boolean {
-    // Pending HIL prompt owns input — once a prompt is active, every key
-    // routes to it until the user submits or skips. This is what keeps
-    // the chat editor free: the workflow author called ctx.ui.editor()
-    // long ago in a background promise; only the overlay handles the
-    // response. The graph nav resumes after `_resolvePrompt` clears
-    // `promptState` (mirrored from the store via `_syncPromptState`).
-    if (this.promptState) {
-      return this._handlePromptInput(data);
-    }
     if (this.switcherOpen) {
       return this._handleSwitcherInput(data);
     }
+    // Stage-local HIL is represented by graph nodes and remains graph-first;
+    // only the legacy run-level prompt card sets `promptState`. Keep that
+    // fallback answerable, but let a narrow set of non-text graph controls
+    // through first so the workflow overlay can still be detached or scrolled
+    // instead of feeling modal while a prompt is visible. Printable keys such
+    // as "/" belong to the prompt card while legacy run-level text/editor
+    // prompts own input.
+    if (this.promptState) {
+      if (this._isNonTextGraphControlBeforePrompt(data)) {
+        return this._handleGraphInput(data);
+      }
+      return this._handlePromptInput(data);
+    }
     return this._handleGraphInput(data);
   }
 
+  private _promptKeybindings(): KeybindingsLike | undefined {
+    return isKeybindingsLike(this.piKeybindings) ? this.piKeybindings : undefined;
+  }
+
+  private _isNonTextGraphControlBeforePrompt(data: string): boolean {
+    return (
+      this._mouseWheelDeltaRows(data) !== 0 ||
+      matchesKey(data, Key.ctrl("d"))
+    );
+  }
+
   private _handlePromptInput(data: string): boolean {
     const state = this.promptState;
     if (!state) return false;
-    const action = handlePromptCardInput(data, state);
+    const action = handlePromptCardInput(data, state, this._promptKeybindings());
     if (action.kind === "noop") return true;
     const runId = this.runId;
     if (!runId) return true;
@@ -1181,8 +1193,12 @@ export class GraphView implements Component {
     // the overlay's setHidden() flag (not unmount); Escape/Ctrl+C closes.
     if (matchesKey(data, "q")) {
       const run = this._getCurrentRun();
-      if (run && run.endedAt === undefined && this.onKill) {
-        this.onKill(run.id);
+      const targetRunId = this._focusedStageTarget()?.runId ?? run?.id;
+      const targetRun = targetRunId !== undefined
+        ? this.currentSnapshot?.runs.find((candidate) => candidate.id === targetRunId)
+        : undefined;
+      if (targetRun && targetRun.endedAt === undefined && this.onKill) {
+        this.onKill(targetRun.id);
       }
       this.onClose?.();
       return true;
@@ -1199,8 +1215,7 @@ export class GraphView implements Component {
   }
 
   private _handleSwitcherInput(data: string): boolean {
-    const run = this._getCurrentRun();
-    const stages = run?.stages ?? [];
+    const stages = this.cachedLayout.map((layoutNode) => layoutNode.stage);
 
     if (matchesKey(data, Key.escape)) {
       this.switcherOpen = false;
@@ -1326,10 +1341,21 @@ export class GraphView implements Component {
     const node = this.cachedLayout[this.focusedIndex];
     const run = this._getCurrentRun();
     if (!node || !run) return false;
-    this.onStageAttach(run.id, node.stage.id);
+    const target = expandedStageTarget(this.expandedGraph, node.stage.id) ?? {
+      runId: run.id,
+      stageId: node.stage.id,
+    };
+    this.onStageAttach(target.runId, target.stageId);
     return true;
   }
 
+  private _focusedStageTarget(): { runId: string; stageId: string } | undefined {
+    const node = this.cachedLayout[this.focusedIndex];
+    if (!node) return undefined;
+    const target = expandedStageTarget(this.expandedGraph, node.stage.id);
+    return target ? { runId: target.runId, stageId: target.stageId } : undefined;
+  }
+
   private _setFocusedIndex(index: number): void {
     const max = Math.max(0, this.cachedLayout.length - 1);
     const next = Math.max(0, Math.min(index, max));

package/dist/builtin/workflows/src/tui/inline-form-card.ts

@@ -283,7 +283,7 @@ function renderCaretLine(
   raw: string,
   caret: number,
   usable: number,
-  theme: GraphTheme,
+  _theme: GraphTheme,
   color: string,
 ): string {
   const safe = clampGraphemeOffset(raw, caret);

package/dist/builtin/workflows/src/tui/inline-form-overlay.ts

@@ -30,6 +30,7 @@ import type {
   PiEditorFactory,
 } from "../extension/wiring.js";
 import type { WorkflowInputEntry } from "../extension/render-result.js";
+import type { WorkflowInputValues } from "../shared/types.js";
 import type { GraphTheme } from "./graph-theme.js";
 import { renderInlineCard } from "./inline-form-card.js";
 import { InlineFormEditor } from "./inline-form-editor.js";
@@ -51,14 +52,14 @@ interface FormMessageDetails {
  * care which surface was used.
  */
 export type InlineFormResult =
-  | { kind: "run"; values: Record<string, unknown> }
+  | { kind: "run"; values: WorkflowInputValues }
   | { kind: "cancel" }
   | { kind: "unsupported" };
 
 export interface OpenInlineFormOpts {
   workflowName: string;
   fields: readonly WorkflowInputEntry[];
-  prefilled?: Record<string, unknown>;
+  prefilled?: WorkflowInputValues;
   theme: GraphTheme;
 }
 

package/dist/builtin/workflows/src/tui/inputs-overlay.ts

@@ -38,6 +38,7 @@ import type {
 } from "../extension/wiring.js";
 import type { WorkflowInputEntry } from "../extension/render-result.js";
 import type { GraphTheme } from "./graph-theme.js";
+import type { WorkflowInputValues } from "../shared/types.js";
 import {
   coerceValues,
   createInputsPickerState,
@@ -50,7 +51,7 @@ export interface InputsUiSurface {
 }
 
 export type InputsPickerResult =
-  | { kind: "run"; values: Record<string, unknown> }
+  | { kind: "run"; values: WorkflowInputValues }
   | { kind: "cancel" };
 
 export interface OpenInputsPickerOpts {
@@ -58,7 +59,7 @@ export interface OpenInputsPickerOpts {
   fields: WorkflowInputEntry[];
   /** Prefilled values (e.g. from `key=value` slash args). The form
    *  seeds these into the form so the user doesn't re-type what they typed. */
-  prefilled?: Record<string, unknown>;
+  prefilled?: WorkflowInputValues;
   theme: GraphTheme;
 }
 

package/dist/builtin/workflows/src/tui/inputs-picker.ts

@@ -24,13 +24,14 @@
  *   - select          : vertical choice list, ←/→ cycles choices
  *
  * cross-ref:
- *   - flora131/atomic research/designs/workflow-picker-tui.tsx (PROMPT phase)
- *   - flora131/atomic packages/atomic-sdk/src/components/workflow-picker-panel.tsx
+ *   - bastani-inc/atomic research/designs/workflow-picker-tui.tsx (PROMPT phase)
+ *   - bastani-inc/atomic packages/atomic-sdk/src/components/workflow-picker-panel.tsx
  *   - src/tui/session-picker.ts (sibling overlay; same chrome + key style)
  *   - DESIGN.md §5 Section Labels
  */
 
 import type { WorkflowInputEntry } from "../extension/render-result.js";
+import type { WorkflowInputValues, WorkflowSerializableValue } from "../shared/types.js";
 import type { GraphTheme } from "./graph-theme.js";
 import { paint } from "./color-utils.js";
 import {
@@ -95,7 +96,7 @@ export interface InputsPickerState {
 export type InputsPickerAction =
   | { kind: "noop" }
   | { kind: "cancel" }
-  | { kind: "run"; values: Record<string, unknown> };
+  | { kind: "run"; values: WorkflowInputValues };
 
 export interface InputsPickerRenderOpts {
   width: number;
@@ -119,7 +120,7 @@ export interface InputsPickerRenderOpts {
  */
 export function createInputsPickerState(
   fields: readonly WorkflowInputEntry[],
-  prefilled: Record<string, unknown> = {},
+  prefilled: WorkflowInputValues = {},
 ): InputsPickerState {
   const rawText: Record<string, string> = {};
   for (const f of fields) {
@@ -169,8 +170,8 @@ export function createInputsPickerState(
 export function coerceValues(
   fields: readonly WorkflowInputEntry[],
   raw: Record<string, string>,
-): Record<string, unknown> {
-  const out: Record<string, unknown> = {};
+): WorkflowInputValues {
+  const out: Record<string, WorkflowSerializableValue> = {};
   for (const f of fields) {
     const v = raw[f.name] ?? "";
     if (v === "" && !f.required) continue; // skip empty optionals
@@ -198,7 +199,7 @@ export function coerceValues(
           (v.startsWith("[") && v.endsWith("]"))
         ) {
           try {
-            out[f.name] = JSON.parse(v) as unknown;
+            out[f.name] = JSON.parse(v) as WorkflowSerializableValue;
             break;
           } catch {
             // fall through

package/dist/builtin/workflows/src/tui/keybindings-adapter.ts

@@ -46,6 +46,8 @@ export const TUI_ACTION = {
   inputSubmit: "tui.input.submit",
   selectUp: "tui.select.up",
   selectDown: "tui.select.down",
+  selectPageUp: "tui.select.pageUp",
+  selectPageDown: "tui.select.pageDown",
   selectConfirm: "tui.select.confirm",
 } as const;
 

package/dist/builtin/workflows/src/tui/node-card.ts

@@ -18,7 +18,7 @@
  * the same ANSI shape Pi's renderer uses for every other styled run.
  *
  * cross-ref:
- *   - github.com/flora131/atomic packages/atomic-sdk/src/components/node-card.tsx
+ *   - github.com/bastani-inc/atomic packages/atomic-sdk/src/components/node-card.tsx
  *   - DESIGN.md §5 "Node Cards (orchestrator graph)"
  *   - src/tui/graph-theme.ts `deriveGraphThemeFromPiTheme` — the
  *     accent/surface tokens used below are sourced from Pi's live
@@ -120,8 +120,32 @@ function durationText(stage: StageSnapshot): string {
 
 function metaText(stage: StageSnapshot): string {
   const deps = stage.parentIds.length;
-  if (deps === 0) return "root";
-  return deps === 1 ? "1 dep" : `${deps} deps`;
+  const dependencyText = deps === 0 ? "root" : deps === 1 ? "1 dep" : `${deps} deps`;
+  return stage.fastMode === true ? `${dependencyText} · fast` : dependencyText;
+}
+
+function shortRunId(runId: string): string {
+  return runId.length <= 8 ? runId : runId.slice(0, 8);
+}
+
+function workflowChildSummaryText(stage: StageSnapshot): string {
+  const child = stage.workflowChild ?? stage.workflowChildRun;
+  if (child === undefined) return durationText(stage);
+  return `↳ ${child.workflow}`;
+}
+
+function workflowChildMetaText(stage: StageSnapshot): string {
+  const completed = stage.workflowChild;
+  if (completed !== undefined) {
+    const outputCount = Object.keys(completed.outputs).length;
+    const outputs = outputCount === 1 ? "1 out" : `${outputCount} outs`;
+    return `run ${shortRunId(completed.runId)} · ${outputs}`;
+  }
+
+  const live = stage.workflowChildRun;
+  if (live !== undefined) return `run ${shortRunId(live.runId)} · live`;
+
+  return metaText(stage);
 }
 
 function statusLabel(status: StageStatus): string {
@@ -248,13 +272,15 @@ export function renderNodeCard(stage: StageSnapshot, opts: NodeCardOpts): string
   const top = `${bg}${bc}╭${topMiddle}╮${RESET}`;
   const bottom = `${bg}${bc}╰${"─".repeat(innerWidth)}╯${RESET}`;
 
-  // Interior — compact status + duration. Each `│` border is followed
-  // by a `bg`-primed centred run so the inner cells stay on the card
-  // stratum without leaving the cards visually hollow.
+  // Interior — compact status + duration. Child workflow boundary
+  // stages otherwise look like empty completed nodes, so use the first
+  // body row for the child workflow identity and the final row for a
+  // terse child-run summary. This keeps the graph dense while making
+  // the boundary explain what actually ran.
   const bodyText =
     stage.status === "blocked"
       ? blockedBadgeText(stage, opts.stages, innerWidth)
-      : durationText(stage);
+      : workflowChildSummaryText(stage);
   const bodyHex = durationColor(stage.status, theme);
   const statusText = `${statusIcon(stage.status)} ${statusLabel(stage.status)}`;
   const statusLine =
@@ -271,7 +297,7 @@ export function renderNodeCard(stage: StageSnapshot, opts: NodeCardOpts): string
     `${bg}${bc}│${RESET}`;
   const metaLine =
     `${bg}${bc}│${RESET}` +
-    centreColored(metaText(stage), innerWidth, theme.dim, bg) +
+    centreColored(workflowChildMetaText(stage), innerWidth, theme.dim, bg) +
     `${bg}${bc}│${RESET}`;
 
   const interior: string[] =

package/dist/builtin/workflows/src/tui/overlay-adapter.ts

@@ -115,6 +115,8 @@ export interface BuildGraphOverlayAdapterOpts {
    * inspection.
    */
   onKillRun?: (runId: string) => void;
+  /** Optional clock injection for deterministic attach-pane transition tests. */
+  now?: () => number;
 }
 
 export function buildGraphOverlayAdapter(
@@ -177,21 +179,11 @@ export function buildGraphOverlayAdapter(
     }
   }
 
-  function snapshotHasAwaitingInput(snapshot: StoreSnapshot): boolean {
-    return snapshot.runs.some(
-      (run) => run.pendingPrompt !== undefined || run.stages.some(
-        (stage) => stage.status === "awaiting_input"
-          || stage.pendingPrompt !== undefined
-          || stage.inputRequest !== undefined,
-      ),
-    );
-  }
-
   function refocusVisibleOverlayForAwaitingInput(snapshot: StoreSnapshot): void {
-    if (!snapshotHasAwaitingInput(snapshot)) return;
     if (currentHandle === null) return;
     if (currentHandle.isHidden()) return;
     if (currentHandle.isFocused()) return;
+    if (currentView?.wantsFocusForAwaitingInput(snapshot) !== true) return;
     currentHandle.focus();
   }
 
@@ -318,6 +310,7 @@ export function buildGraphOverlayAdapter(
           currentHandle?.focus();
         },
         setMouseScrollTracking,
+        now: buildOpts.now,
       } as ConstructorParameters<typeof WorkflowAttachPane>[0] & {
         piTui?: PiCustomOverlayFactoryTui;
         piTheme?: PiTheme;