@bastani/atomic 0.8.6-0 → 0.8.7-0

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

@@ -22,7 +22,7 @@
  *   ╰──────────────────────────────────────────╯
  *     select  ·  required  ·  How aggressively to scope the work.
  *
- *   tab next  ·  shift+tab prev  ·  ctrl+enter run  ·  esc cancel
+ *   tab next  ·  shift+tab prev  ·  ctrl+x run  ·  esc cancel
  *
  * Field-type renderers:
  *   - string / number : single-row text input with blinking cursor
@@ -40,7 +40,7 @@
 import type { WorkflowInputEntry } from "../extension/render-result.js";
 import type { GraphTheme } from "./graph-theme.js";
 import { paint } from "./color-utils.js";
-import { matchesKey, truncateToWidth, visibleWidth } from "./text-helpers.js";
+import { decodePrintableKey, matchesKey, truncateToWidth, visibleWidth } from "./text-helpers.js";
 import {
   type KeybindingsLike,
   deleteRange,
@@ -718,10 +718,10 @@ export function renderInputsPicker(opts: InputsPickerRenderOpts): string[] {
 /**
  * Footer hint row, tier-degraded so it never wraps on resize. Tiers:
  *
- *   wide   (≥ widest):  tab next  ·  shift+tab prev  ·  ctrl+enter run  ·  esc cancel
- *   medium (≥ keys):    tab  ·  shift+tab  ·  ctrl+enter  ·  esc
- *   tight  (≥ short):   tab  ·  ⇧tab  ·  ⌃↵  ·  esc
- *   narrow (else):      ⌃↵  ·  esc
+ *   wide   (≥ widest):  tab next  ·  shift+tab prev  ·  ctrl+x run  ·  esc cancel
+ *   medium (≥ keys):    tab  ·  shift+tab  ·  ctrl+x  ·  esc
+ *   tight  (≥ short):   tab  ·  ⇧tab  ·  ctrl+x  ·  esc
+ *   narrow (else):      ctrl+x  ·  esc
  */
 function renderFooterHints(width: number, theme: GraphTheme, submitDisabled: boolean): string {
   const sep = dimSep(theme);
@@ -735,23 +735,23 @@ function renderFooterHints(width: number, theme: GraphTheme, submitDisabled: boo
   const wide = [
     { width: 8, render: () => hint("tab", "Next") },
     { width: 14, render: () => hint("shift+tab", "Prev") },
-    { width: 14, render: () => hint("ctrl+enter", "Run", submitColor, submitLabelColor) },
+    { width: 10, render: () => hint("ctrl+x", "Run", submitColor, submitLabelColor) },
     { width: 10, render: () => hint("esc", "Cancel") },
   ];
   const medium = [
     { width: 3, render: () => keyOnly("tab") },
     { width: 9, render: () => keyOnly("shift+tab") },
-    { width: 10, render: () => keyOnly("ctrl+enter", submitColor) },
+    { width: 6, render: () => keyOnly("ctrl+x", submitColor) },
     { width: 6, render: () => keyOnly("esc") },
   ];
   const tight = [
     { width: 3, render: () => keyOnly("tab") },
     { width: 4, render: () => keyOnly("⇧tab") },
-    { width: 2, render: () => keyOnly("⌃↵", submitColor) },
+    { width: 6, render: () => keyOnly("ctrl+x", submitColor) },
     { width: 6, render: () => keyOnly("esc") },
   ];
   const narrow = [
-    { width: 2, render: () => keyOnly("⌃↵", submitColor) },
+    { width: 6, render: () => keyOnly("ctrl+x", submitColor) },
     { width: 6, render: () => keyOnly("esc") },
   ];
 
@@ -762,7 +762,7 @@ function renderFooterHints(width: number, theme: GraphTheme, submitDisabled: boo
     }
   }
   // Truly tiny terminal — show just the run+cancel keys joined by a single space.
-  return paint("⌃↵", submitColor) + " " + paint("esc", theme.text);
+  return paint("ctrl+x", submitColor) + " " + paint("esc", theme.text);
 }
 
 /**
@@ -827,7 +827,7 @@ function shortVal(s: string): string {
  *   left / right     — select: cycle choices; boolean: flip; text: caret
  *   space            — boolean: flip
  *   enter            — text: newline; otherwise: next field
- *   ctrl+enter       — open confirm modal (if all required filled)
+ *   ctrl+x       — open confirm modal (if all required filled)
  *   backspace        — delete char left of caret
  *   esc / ctrl+c     — close picker without running
  *
@@ -860,7 +860,7 @@ function handleFormKey(
 ): InputsPickerAction {
   // ── Global navigation (workflow form contract, not Pi actions) ──
   if (isCancelKey(key)) return { kind: "cancel" };
-  if (matchesKey(key, "ctrl+enter")) return attemptPickerSubmit(state, fields);
+  if (matchesKey(key, "ctrl+x")) return attemptPickerSubmit(state, fields);
   if (matchesKey(key, "tab")) {
     moveFocus(state, fields, +1);
     return { kind: "noop" };
@@ -989,11 +989,13 @@ function handleFormKey(
     }
     return { kind: "noop" };
   }
-  // Printable insert. Accept exactly one grapheme cluster so CJK, emoji ZWJ
-  // sequences, and combining-mark input follow pi-tui Input semantics.
-  if (isPrintableGrapheme(key)) {
-    state.rawText[name] = cur.slice(0, caret) + key + cur.slice(caret);
-    state.caret = caret + key.length;
+  // Printable insert. Accept raw graphemes and terminal-encoded printable
+  // keys (CSI-u / Kitty). VSCode's integrated terminal can emit printable
+  // keys as escape sequences when modifyOtherKeys is active.
+  const printable = decodePrintableKey(key) ?? key;
+  if (isPrintableGrapheme(printable)) {
+    state.rawText[name] = cur.slice(0, caret) + printable + cur.slice(caret);
+    state.caret = caret + printable.length;
     return { kind: "noop" };
   }
   return { kind: "noop" };
@@ -1037,7 +1039,7 @@ function handleBooleanKey(
   kb: KeybindingsLike | undefined,
 ): InputsPickerAction {
   if (
-    key === " " ||
+    matchesKey(key, "space") ||
     matchesAction(kb, key, "tui.input.submit") ||
     matchesAction(kb, key, "tui.editor.cursorLeft") ||
     matchesAction(kb, key, "tui.editor.cursorRight")
@@ -1064,10 +1066,10 @@ function handleConfirmKey(
   // Confirm-modal answers are single-char prompts (`y`/`n`) plus the form's
   // raw esc/enter contract. These do not flow through Pi action ids because
   // they're a confirmation-modal contract, not an editor-mode action.
-  if (key === "y" || key === "Y" || key === "\r" || key === "\n") {
+  if (key === "y" || key === "Y" || matchesKey(key, "enter")) {
     return { kind: "run", values: coerceValues(fields, state.rawText) };
   }
-  if (key === "\x03") return { kind: "cancel" };
+  if (matchesKey(key, "ctrl+c")) return { kind: "cancel" };
   if (key === "n" || key === "N" || matchesKey(key, "escape")) {
     state.confirmOpen = false;
     return { kind: "noop" };
@@ -1076,7 +1078,7 @@ function handleConfirmKey(
 }
 
 function isCancelKey(key: string): boolean {
-  return key === "\x03" || matchesKey(key, "escape");
+  return matchesKey(key, "ctrl+c") || matchesKey(key, "escape");
 }
 
 function attemptPickerSubmit(

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

@@ -26,6 +26,7 @@
  */
 
 import type { StageSnapshot, StageStatus } from "../shared/store-types.js";
+import { elapsedStageMs } from "../shared/timing.js";
 import type { GraphTheme } from "./graph-theme.js";
 import { fmtDuration, statusIcon } from "./status-helpers.js";
 import { lerpColor, hexToAnsi, hexBg, paint, RESET, BOLD } from "./color-utils.js";
@@ -111,9 +112,8 @@ function blockedBadgeText(
 }
 
 function durationText(stage: StageSnapshot): string {
-  if (stage.durationMs != null) return fmtDuration(stage.durationMs);
-  if (stage.startedAt != null) return fmtDuration(Date.now() - stage.startedAt);
-  return "—";
+  const elapsed = elapsedStageMs(stage);
+  return elapsed === undefined ? "—" : fmtDuration(elapsed);
 }
 
 function metaText(stage: StageSnapshot): string {
@@ -253,8 +253,6 @@ export function renderNodeCard(stage: StageSnapshot, opts: NodeCardOpts): string
   const bodyText =
     stage.status === "blocked"
       ? blockedBadgeText(stage, opts.stages, innerWidth)
-      : stage.status === "paused"
-        ? "❚❚ paused"
       : durationText(stage);
   const bodyHex = durationColor(stage.status, theme);
   const statusText = `${statusIcon(stage.status)} ${statusLabel(stage.status)}`;

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

@@ -99,7 +99,7 @@ export function handlePromptCardInput(
   data: string,
   state: PromptCardState,
 ): PromptCardAction {
-  if (data === "\x03" || matchesKey(data, "escape")) {
+  if (matchesKey(data, "ctrl+c") || matchesKey(data, "escape")) {
     return { kind: "cancel" };
   }
 
@@ -119,7 +119,7 @@ function handleConfirm(
   data: string,
   state: PromptCardState,
 ): PromptCardAction {
-  if (matchesKey(data, "left") || data === "\x1b[D" || matchesKey(data, "right") || data === "\x1b[C" || data === " " || matchesKey(data, "tab")) {
+  if (matchesKey(data, "left") || matchesKey(data, "right") || matchesKey(data, "space") || matchesKey(data, "tab")) {
     state.confirmValue = !state.confirmValue;
     return { kind: "noop" };
   }
@@ -129,7 +129,7 @@ function handleConfirm(
   if (data === "n" || data === "N") {
     return { kind: "submit", response: false };
   }
-  if (matchesKey(data, "enter") || data === "\r" || data === "\n") {
+  if (matchesKey(data, "enter")) {
     return { kind: "submit", response: state.confirmValue };
   }
   return { kind: "noop" };
@@ -138,7 +138,7 @@ function handleConfirm(
 function handleSelect(data: string, state: PromptCardState): PromptCardAction {
   const choices = state.prompt.choices ?? [];
   if (choices.length === 0) {
-    if (matchesKey(data, "enter") || data === "\r" || data === "\n") {
+    if (matchesKey(data, "enter")) {
       return { kind: "submit", response: "" };
     }
     return { kind: "noop" };
@@ -155,7 +155,7 @@ function handleSelect(data: string, state: PromptCardState): PromptCardAction {
 }
 
 function handleInput(data: string, state: PromptCardState): PromptCardAction {
-  if (matchesKey(data, "enter") || data === "\r" || data === "\n") {
+  if (matchesKey(data, "enter")) {
     return { kind: "submit", response: state.rawText };
   }
   return applyTextEdit(data, state);
@@ -172,7 +172,7 @@ function handleEditor(data: string, state: PromptCardState): PromptCardAction {
     }
     return { kind: "noop" };
   }
-  if (data === "\r" || data === "\n") {
+  if (matchesKey(data, "enter")) {
     state.rawText = state.rawText.slice(0, state.caret) + "\n" + state.rawText.slice(state.caret);
     state.caret += 1;
     return { kind: "noop" };
@@ -184,15 +184,15 @@ function applyTextEdit(
   data: string,
   state: PromptCardState,
 ): PromptCardAction {
-  if (data === "\x1b[D") {
+  if (matchesKey(data, "left")) {
     state.caret = previousGraphemeBoundary(state.rawText, state.caret);
     return { kind: "noop" };
   }
-  if (data === "\x1b[C") {
+  if (matchesKey(data, "right")) {
     state.caret = nextGraphemeBoundary(state.rawText, state.caret);
     return { kind: "noop" };
   }
-  if (data === "\x7f" || data === "\b") {
+  if (matchesKey(data, "backspace")) {
     if (state.caret > 0) {
       const prev = previousGraphemeBoundary(state.rawText, state.caret);
       state.rawText = state.rawText.slice(0, prev) + state.rawText.slice(state.caret);
@@ -335,8 +335,8 @@ function normalizeSelectKeyData(data: string): string {
   // The historical prompt card accepted left/right as select aliases; feed the
   // corresponding vertical key into pi-tui's SelectList so it owns the actual
   // wrap/clamp/selection update behavior.
-  if (matchesKey(data, "right") || data === "\x1b[C") return "\x1b[B";
-  if (matchesKey(data, "left") || data === "\x1b[D") return "\x1b[A";
+  if (matchesKey(data, "right")) return "\x1b[B";
+  if (matchesKey(data, "left")) return "\x1b[A";
   return data;
 }
 

package/dist/builtin/workflows/src/tui/run-detail.ts

@@ -19,6 +19,7 @@
 
 import type { RunDetail } from "../runs/background/status.js";
 import type { StageSnapshot } from "../shared/store-types.js";
+import { elapsedRunMs, elapsedStageMs } from "../shared/timing.js";
 import type { GraphTheme } from "./graph-theme.js";
 import { renderBandHeader } from "./header.js";
 import type { BandBadge } from "./header.js";
@@ -201,7 +202,7 @@ function summaryRows(detail: RunDetail, now: number): Array<[string, string | un
   const startedAgo = formatRelative(now - detail.startedAt);
   const updatedAt = detail.endedAt ?? detail.startedAt;
   const updatedAgo = formatRelative(now - updatedAt);
-  const duration = detail.durationMs ?? (detail.endedAt !== undefined ? detail.endedAt - detail.startedAt : now - detail.startedAt);
+  const duration = elapsedRunMs(detail, now);
 
   const rows: Array<[string, string | undefined]> = [
     ["workflow", detail.name],
@@ -276,11 +277,8 @@ function stageLineThemed(stage: StageSnapshot, now: number, theme: GraphTheme, w
 }
 
 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 stageActivityString(stage: StageSnapshot): string | undefined {

package/dist/builtin/workflows/src/tui/session-confirm.ts

@@ -19,11 +19,13 @@
  */
 
 import { keyText } from "@bastani/atomic";
-import type { RunSnapshot } from "../shared/store-types.js";
+import { Key } from "@earendil-works/pi-tui";
+import type { RunSnapshot, RunStatus } from "../shared/store-types.js";
+import { elapsedRunMs } from "../shared/timing.js";
 import type { GraphTheme } from "./graph-theme.js";
 import { fmtDuration } from "./status-helpers.js";
 import { hexToAnsi, hexBg, RESET, BOLD } from "./color-utils.js";
-import { truncateToWidth, visibleWidth } from "./text-helpers.js";
+import { matchesKey, truncateToWidth, visibleWidth } from "./text-helpers.js";
 
 export interface KillConfirmState {
   /** 0 = Cancel (focused by default), 1 = Kill. */
@@ -117,9 +119,7 @@ export function renderKillConfirm(opts: KillConfirmRenderOpts): string[] {
   const inner = Math.max(50, width - 2);
 
   const idShort = run.id.slice(0, 8);
-  const elapsed = run.endedAt !== undefined
-    ? fmtDuration(run.durationMs ?? Math.max(0, run.endedAt - run.startedAt))
-    : fmtDuration(Math.max(0, now - run.startedAt));
+  const elapsed = fmtDuration(elapsedRunMs(run, now));
   const stagesRunning = run.stages.filter((s) => s.status === "running").length;
   const stagesTotal = run.stages.length;
 
@@ -195,15 +195,100 @@ export function handleKillConfirmInput(
   // Direct shortcuts bypass focus.
   if (data === "y" || data === "Y") return { kind: "confirm" };
   if (data === "n" || data === "N") return { kind: "cancel" };
-  if (data === "\x1b") return { kind: "cancel" };
+  if (matchesKey(data, Key.escape)) return { kind: "cancel" };
 
   // Tab / arrows toggle focus.
-  if (data === "\t" || data === "\x1b[C" || data === "\x1b[D" || data === "h" || data === "l") {
+  if (matchesKey(data, Key.tab) || matchesKey(data, Key.right) || matchesKey(data, Key.left) || data === "h" || data === "l") {
     state.focusedButton = state.focusedButton === 0 ? 1 : 0;
     return { kind: "noop" };
   }
-  if (data === "\r" || data === "\n") {
+  if (matchesKey(data, Key.enter)) {
     return state.focusedButton === 1 ? { kind: "confirm" } : { kind: "cancel" };
   }
   return { kind: "noop" };
 }
+
+export interface WorkflowKilledNoticeRenderOpts {
+  width: number;
+  theme: GraphTheme;
+  run: RunSnapshot;
+  previousStatus: RunStatus;
+  wasInFlight: boolean;
+}
+
+const KILLED_TITLE = "Workflow killed";
+
+function renderKilledHeader(width: number, theme: GraphTheme): string {
+  const inner = Math.max(4, width - 2);
+  const border = hexToAnsi(theme.border);
+  const error = hexToAnsi(theme.error);
+  const padded = ` ${KILLED_TITLE} `;
+  const padLen = Math.max(0, inner - visibleWidth(padded));
+  const left = Math.min(2, padLen);
+  const right = padLen - left;
+  return `${border}╭${"─".repeat(left)}${RESET}${error}${BOLD}${padded}${RESET}${border}${"─".repeat(right)}╮${RESET}`;
+}
+
+function renderKilledFooter(width: number, theme: GraphTheme): string {
+  const inner = Math.max(4, width - 2);
+  const border = hexToAnsi(theme.border);
+  return `${border}╰${"─".repeat(inner)}╯${RESET}`;
+}
+
+function renderKilledTextRow(
+  inner: number,
+  theme: GraphTheme,
+  content: string,
+): string {
+  return renderTextRow(inner, theme, truncateToWidth(content, inner, "…", true));
+}
+
+export function renderWorkflowKilledNotice(
+  opts: WorkflowKilledNoticeRenderOpts,
+): string[] {
+  const { width, theme, run, previousStatus, wasInFlight } = opts;
+  const inner = Math.max(4, width - 2);
+  const idShort = run.id.slice(0, 8);
+  const stageCount = run.stages.length;
+  const runningStages = run.stages.filter((s) => s.status === "running").length;
+
+  const error = hexToAnsi(theme.error);
+  const success = hexToAnsi(theme.success);
+  const text = hexToAnsi(theme.text);
+  const dim = hexToAnsi(theme.dim);
+  const muted = hexToAnsi(theme.textMuted);
+  const panelBg = hexBg(theme.bg);
+
+  const lines: string[] = [];
+  lines.push(renderKilledHeader(width, theme));
+  lines.push(renderBlankRow(inner, theme));
+
+  const identityPrefixW = visibleWidth("   ⊘  ");
+  const identitySuffixW = visibleWidth(`  ·  ${idShort}`);
+  const nameBudget = Math.max(1, inner - identityPrefixW - identitySuffixW);
+  const name = truncateToWidth(run.name, nameBudget, "…");
+  const identity =
+    `   ${error}⊘${RESET}${panelBg}  ${text}${BOLD}${name}${RESET}${panelBg}  ${dim}·${RESET}${panelBg}  ${muted}${idShort}${RESET}`;
+  lines.push(renderKilledTextRow(inner, theme, identity));
+
+  const statusText = `${previousStatus} → killed`;
+  lines.push(renderKilledTextRow(
+    inner,
+    theme,
+    `      ${muted}${statusText}, ${runningStages}/${stageCount} stages were active${RESET}`,
+  ));
+  lines.push(renderBlankRow(inner, theme));
+
+  const action = wasInFlight
+    ? "Active stage work was aborted."
+    : "The completed run was removed.";
+  lines.push(renderKilledTextRow(inner, theme, `      ${success}✓${RESET}${panelBg} ${muted}${action}${RESET}`));
+  lines.push(renderKilledTextRow(
+    inner,
+    theme,
+    `      ${success}✓${RESET}${panelBg} ${muted}Run removed from live history and status.${RESET}`,
+  ));
+  lines.push(renderBlankRow(inner, theme));
+  lines.push(renderKilledFooter(width, theme));
+  return lines;
+}

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

@@ -19,11 +19,12 @@
  */
 
 import type { RunSnapshot } from "../shared/store-types.js";
+import { elapsedRunMs } from "../shared/timing.js";
 import type { GraphTheme } from "./graph-theme.js";
 import { keyText } from "@bastani/atomic";
 import { fmtDuration, statusIcon, statusColor } from "./status-helpers.js";
 import { hexToAnsi, hexBg, RESET, BOLD } from "./color-utils.js";
-import { truncateToWidth, visibleWidth } from "./text-helpers.js";
+import { matchesKey, truncateToWidth, visibleWidth } from "./text-helpers.js";
 
 // ---------------------------------------------------------------------------
 // State + filtering
@@ -206,13 +207,7 @@ function renderFilterRow(inner: number, theme: GraphTheme, state: SessionPickerS
 }
 
 function fmtElapsed(run: RunSnapshot, now: number): string {
-  if (run.endedAt !== undefined && run.durationMs !== undefined) {
-    return fmtDuration(run.durationMs);
-  }
-  if (run.endedAt !== undefined) {
-    return fmtDuration(Math.max(0, run.endedAt - run.startedAt));
-  }
-  return fmtDuration(Math.max(0, now - run.startedAt));
+  return fmtDuration(elapsedRunMs(run, now));
 }
 
 function stageProgress(run: RunSnapshot): string {
@@ -347,15 +342,15 @@ export function handleSessionPickerInput(
 ): SessionPickerAction {
   // Filter mode — typed chars feed the query, Enter/Esc exit.
   if (state.filterFocused) {
-    if (data === "\x1b" || data === "\x1b\x1b") {
+    if (matchesKey(data, "escape") || data === "\x1b\x1b") {
       state.filterFocused = false;
       return { kind: "noop" };
     }
-    if (data === "\r" || data === "\n") {
+    if (matchesKey(data, "enter")) {
       state.filterFocused = false;
       return { kind: "noop" };
     }
-    if (data === "\x7f" || data === "\b") {
+    if (matchesKey(data, "backspace")) {
       state.query = state.query.slice(0, -1);
       state.selectedIndex = 0;
       return { kind: "noop" };
@@ -373,7 +368,7 @@ export function handleSessionPickerInput(
     state.filterFocused = true;
     return { kind: "noop" };
   }
-  if (data === "\x1b") return { kind: "close" };
+  if (matchesKey(data, "escape")) return { kind: "close" };
   if (data === "q" || data === "Q") return { kind: "close" };
   if (data === "a" || data === "A") {
     state.includeAll = !state.includeAll;
@@ -382,17 +377,17 @@ export function handleSessionPickerInput(
   }
 
   // Arrows + j/k.
-  if (data === "\x1b[B" || data === "j") {
+  if (matchesKey(data, "down") || data === "j") {
     state.selectedIndex = Math.min(state.selectedIndex + 1, Math.max(0, rows.length - 1));
     return { kind: "noop" };
   }
-  if (data === "\x1b[A" || data === "k") {
+  if (matchesKey(data, "up") || data === "k") {
     if (rows.length > 0 && state.selectedIndex === 0) return { kind: "noop" };
     state.selectedIndex = Math.max(state.selectedIndex - 1, 0);
     return { kind: "noop" };
   }
 
-  if (data === "\r" || data === "\n") {
+  if (matchesKey(data, "enter")) {
     const row = rows[state.selectedIndex];
     if (!row) return { kind: "noop" };
     return { kind: "connect", runId: row.run.id };