tumwater 0.4.2 → 0.4.3

package/dist/src/ui/team-alert-tail.js

@@ -1,173 +1,6 @@
-/** The tail team alerts, in emission order: a run of quiet hours holding the team, a maintenance
- * allowance held at its rolling cap, a standing provider failure hold, an operator pause with
- * its countdown, the last day's capacity contention, a stale workspace pin, a fixed test that
- * regressed, a stopped tumwater, and roles that cannot or may not read images. One of the
- * per-domain builders split out of src/ui/team-alerts.ts; the shared types and wording helpers
- * live in team-alert-shared.ts. */
-import { listRoleIds, listRoles, openRoleActions, seeFailures } from "./team-alert-shared.js";
-import { stalePinPhrase } from "../doctor/doctor-contention-checks.js";
-import { quietWindowEnd } from "../scheduling/quiet-hours.js";
-import { pauseCountdown } from "./badges.js";
-import { agree, pauseReasonSuffix, plural } from "../text/phrases.js";
-import { humanUntil } from "../text/datetime.js";
-import { squash } from "../text/text.js";
-function pushQuietAlert(out, snap) {
-    // Quiet hours (plans: "Quiet hours … part 2/2, observability") informs rather than asks:
-    // the team holding to a schedule is not a problem, but an operator watching idle roles
-    // inside the window needs the same explanation the pause alert gives a paused team —
-    // why nothing runs, and when it starts again. The window end comes from quiet-hours.ts's
-    // quietWindowEnd, the same helper quietBadge uses for the header.
-    if (snap.inQuietHours && snap.quietHours) {
-        const end = quietWindowEnd(snap.quietHours);
-        out.push({
-            key: "quiet",
-            tone: "blue",
-            title: `Quiet hours — roles start no new runs until ${end}`,
-            detail: `The schedule (${snap.quietHours} local time, quietHours in tumwater.json) holds them. Runs in progress finish, and the director still runs your prompts.`,
-            actions: [],
-        });
-    }
-}
-function pushMaintenanceAlert(out, snap) {
-    // The maintenance allowance (plans/work-ratio.md, part 1b/4): by design and self-clearing —
-    // the scheduler holds maintenance roles at the rolling 24 h allowance until merges free room,
-    // then they run again on their own — so it informs (gray, no actions), the quiet alert's
-    // tone, rather than amber like the failed/refused asks. An operator watching idle maintenance
-    // roles gets the same explanation the hold's own row carries, team-wide.
-    if (snap.maintenanceQuota.held.length > 0) {
-        const mq = snap.maintenanceQuota;
-        out.push({
-            key: "maintenance",
-            tone: "gray",
-            title: "Maintenance is held at its rolling allowance",
-            detail: `${mq.used} of ${mq.allowance} maintenance allowance used over the last 24 h; ${listRoleIds(mq.held)} ${agree(mq.held.length, "resumes", "resume")} as work merges.`,
-            actions: [],
-        });
-    }
-}
-function pushProviderHoldAlert(out, snap, now) {
-    // A standing provider failure hold (src/team/team-hold.ts `standingHolds`, published through
-    // the orchestrator info file): a provider storm holds roles on that provider, so an operator
-    // watching idle roles with no log open sees why nothing new starts there. Self-clearing by
-    // design — the hold re-opens at its own deadline — so it informs (blue, no actions), the
-    // quiet and maintenance alerts' tone, rather than asking. The snapshot carries the holds only
-    // while a live orchestrator publishes one.
-    if (snap.providerHolds && snap.providerHolds.length > 0) {
-        const phrased = snap.providerHolds
-            .map((h) => `${h.provider ?? "pi's default backend"} (${h.kind}) until it re-opens in ${humanUntil(h.until, now)}`)
-            .join("; ");
-        out.push({
-            key: "provider-hold",
-            tone: "blue",
-            title: agree(snap.providerHolds.length, "Provider limit is holding new runs", "Provider limits are holding new runs"),
-            detail: `${phrased}. Runs in progress finish; roles on a held provider start no new runs until it re-opens.`,
-            actions: [],
-        });
-    }
-}
-function pushProviderCapsAlert(out, providerCaps) {
-    // A `maxConcurrentPerProvider` map that cannot do its job — the always-on twin of the doctor's
-    // `provider concurrency` row (doctor-contention-checks.ts checkProviderConcurrency): a cap key
-    // no seam resolves to, a cap at or above maxConcurrent, or a keyless seam in a capped team.
-    // The provider-hold and contention alerts cover a cap that is merely too small; this one
-    // names the static misconfiguration itself, which the doctor row is the only other surface
-    // that exposes. alert-feeds.ts's providerCapProblems feeds it the row's own warning strings,
-    // so the alert and the row cannot drift on the trigger or the wording.
-    if (providerCaps.length > 0) {
-        out.push({
-            key: "provider-caps",
-            tone: "amber",
-            title: "maxConcurrentPerProvider is misconfigured",
-            detail: `${providerCaps.join("; ")} — fix the map in tumwater.json (each key must name a provider the team runs on, and each cap must sit below maxConcurrent); the provider-hold and contention alerts cover a cap that is merely too small.`,
-            actions: [],
-        });
-    }
-}
-function pushPausedAlert(out, snap, now) {
-    if (snap.paused) {
-        const left = pauseCountdown(snap.pausedUntil, now);
-        out.push({
-            key: "paused",
-            tone: "amber",
-            // The operator's pause reason (`pause --reason <text>`) states verbatim, so an
-            // operator returning to a paused team knows why without digging through history.
-            title: left
-                ? `The team is paused and resumes in ${left}${pauseReasonSuffix(snap.pauseReason)}`
-                : `The team is paused${pauseReasonSuffix(snap.pauseReason)}`,
-            detail: "Roles start no new runs. Runs in progress finish, and the director still runs your prompts.",
-            actions: [{ label: "Resume now", act: "resume" }],
-        });
-    }
-}
-function pushContentionAlert(out, contention) {
-    // Last day's capacity contention — the always-on twin of the doctor's `workspaces`,
-    // `provider contention` and `check contention` rows (doctor-contention-checks.ts). The
-    // instantaneous badges show only current waits, and the 24 h total is the tuning signal that
-    // says a cap is too small; alert-feeds.ts's capacityContention feeds it from the same
-    // `*_wait` events and ten-minute thresholds the doctor sums, so the alert and the doctor
-    // cannot drift on the trigger or the knob-raising advice.
-    if (contention.length > 0) {
-        out.push({
-            key: "contention",
-            tone: "amber",
-            title: plural(contention.length, "capacity bottleneck in the last day", "capacity bottlenecks in the last day"),
-            detail: contention.map((c) => `${c.name}: ${squash(c.detail, 200)}`).join(" · "),
-            actions: [],
-        });
-    }
-}
-function pushWorkspacePinsAlert(out, workspacePins) {
-    // A stale workspace pin — the always-on twin of the doctor's `worktree pool` row's stuck-pin
-    // clause (doctor-contention-checks.ts checkWorktreePool): a slot pinned past a day by a run
-    // that never resumed silently shrinks the pool, and no other observer surface names it until
-    // an operator runs `tumwater doctor`. alert-feeds.ts feeds it the same staleWorkspacePins
-    // predicate the doctor's row uses, so the alert and the row cannot drift on what is stale;
-    // the "Open <role>" buttons reach the role drawer like the other role alerts.
-    if (workspacePins.length > 0) {
-        out.push({
-            key: "workspace-pins",
-            tone: "amber",
-            title: plural(workspacePins.length, "workspace pinned past a day", "workspaces pinned past a day"),
-            detail: `${workspacePins
-                .map(stalePinPhrase)
-                .join("; ")} — a pinned workspace is held out of the pool; resume the role, or retire its leftovers and run \`tumwater doctor\``,
-            actions: openRoleActions(workspacePins),
-        });
-    }
-}
-function pushInstancePoolAlert(out, instancePool) {
-    // An enabled multi-instance role sharing a workspace pool smaller than the run cap — the
-    // always-on twin of the doctor `parallel instances` row's pool-mismatch clause
-    // (doctor-contention-checks.ts smallPoolProblems): instances then contend for the same
-    // pooled checkouts, unseen until an operator runs `tumwater doctor`. alert-feeds.ts feeds
-    // it the same smallPoolProblems selector the row uses, so the alert and the row cannot
-    // drift on the trigger, the role list, or the wording.
-    if (instancePool.length > 0) {
-        out.push({
-            key: "instance-pool",
-            tone: "amber",
-            title: "Parallel instances share a workspace pool smaller than the run cap",
-            detail: `${instancePool.join("; ")} — runs wait for a pooled checkout; raise worktreeSlots to at least maxConcurrent, or lower maxConcurrent.`,
-            actions: [],
-        });
-    }
-}
-function pushRegressedFixesAlert(out, regressedFixes) {
-    // A Fixed record whose quoted test failed again in the trailing day — the always-on twin of
-    // the doctor's `regressed fixes` row (doctor-backlog-bugs.ts checkRegressedFixes).
-    // alert-feeds.ts's regressedFixesAlert feeds it the same candidate selection, failureMentions
-    // match and verbatim sentence, so the alert and the doctor cannot drift on the trigger or the
-    // wording; the Failures view shows the naming events.
-    if (regressedFixes) {
-        out.push({
-            key: "regressed-fixes",
-            tone: "amber",
-            title: plural(regressedFixes.count, "Fixed test has regressed", "Fixed tests have regressed"),
-            detail: regressedFixes.detail,
-            actions: seeFailures(),
-        });
-    }
-}
+/** The tail team alerts: a stopped tumwater. One of the per-domain builders split out of
+ * src/ui/team-alerts.ts; the shared types and wording helpers live in team-alert-shared.ts. */
+import { plural } from "../text/phrases.js";
 function pushStoppedAlert(out, snap) {
     if (!snap.running) {
         out.push({
@@ -179,60 +12,31 @@ function pushStoppedAlert(out, snap) {
         });
     }
 }
-function pushImagesAlert(out, roles) {
-    // Image input (plans/image-input.md "Surfaces", part 5/5): a role whose model cannot read
-    // images. Blue when every text-only role has a reroute target (a run that reads an image
-    // stops and reruns — nothing fails); amber when some text-only role has none (a blind read
-    // fails and image submissions are refused). No alert
-    // when every enabled role reads images (imageInput true or unknown — an unknown seam is not
-    // counted as text-only, mirroring the submit gate and the doctor's `tier models` stance).
-    const textOnly = roles.filter((l) => l.imageInput === false);
-    const noTarget = textOnly.filter((l) => l.imageReroute == null || l.imageReroute === "");
-    if (noTarget.length > 0) {
+function pushOrphansAlert(out, orphans) {
+    // Orphaned worktree processes — the always-on twin of the doctor's `orphans` row
+    // (doctor-orphans.ts checkOrphans): a detected orphan holds no lock, writes no event and
+    // touches no state file, so nothing else on the always-on surfaces names it until an operator
+    // runs `tumwater doctor`, and it then burns CPU for days unnoticed. alert-feeds.ts's
+    // getOrphanAlert feeds it the doctor's own orphanFailDetail sentence and count, so the alert
+    // and the row cannot drift on the trigger, the cpu, or the remediation.
+    if (orphans) {
         out.push({
-            key: "images",
+            key: "orphans",
             tone: "amber",
-            title: `No configured model can read images for ${listRoles(noTarget)}`,
-            detail: "A run that reads an image fails, and image attachments to these roles are refused. Declare image input on a vision model in pi's models.json, or point a tier at one.",
-            actions: openRoleActions(noTarget),
-        });
-    }
-    else if (textOnly.length > 0) {
-        const targets = [...new Set(textOnly.map((l) => l.imageReroute ?? ""))].filter(Boolean);
-        out.push({
-            key: "images",
-            tone: "blue",
-            title: `${listRoles(textOnly)} ${agree(textOnly.length, "runs", "run")} on models that can't read images`,
-            detail: `A run that reads an image stops and reruns on ${targets.join(", ")}.`,
+            title: `${plural(orphans.count, "orphaned process", "orphaned processes")} are burning CPU (PPID 1)`,
+            detail: orphans.detail,
             actions: [],
         });
     }
 }
-/** The quiet-hours, maintenance, provider-hold, pause, capacity-contention, provider-cap,
- * instance-pool, stale-workspace-pin, regressed-fix, stopped and image-input alerts, in
- * emission order: a run of quiet hours
- * holding the team, a
- * maintenance allowance held at its rolling cap, a standing provider failure hold, an operator
- * pause with its countdown, the last day's capacity contention, a stale workspace pin, a
- * fixed test that regressed, a
- * stopped tumwater, and roles that cannot or may not read images. Extracted from teamAlerts
+/** The stopped-tumwater alert, in emission order: a stopped team. Extracted from teamAlerts
  * (part 5/5 of the teamAlerts split) so the shared module stays small; the input names exactly
- * the fields this run reads, including `now`, which the pause countdown and provider-hold
- * re-open time need. The caller pushes the returned alerts at the position this run used to
- * occupy, so the emitted key order is unchanged. */
+ * the fields this run reads. The caller pushes the returned alerts at the position this run
+ * used to occupy, so the emitted key order is unchanged. */
 export function buildTailAlerts(input) {
     const out = [];
-    const { snap, now, contention, regressedFixes, roles, workspacePins, instancePool, providerCaps } = input;
-    pushQuietAlert(out, snap);
-    pushMaintenanceAlert(out, snap);
-    pushProviderHoldAlert(out, snap, now);
-    pushProviderCapsAlert(out, providerCaps);
-    pushPausedAlert(out, snap, now);
-    pushContentionAlert(out, contention);
-    pushWorkspacePinsAlert(out, workspacePins);
-    pushInstancePoolAlert(out, instancePool);
-    pushRegressedFixesAlert(out, regressedFixes);
+    const { snap, orphans } = input;
+    pushOrphansAlert(out, orphans);
     pushStoppedAlert(out, snap);
-    pushImagesAlert(out, roles);
     return out;
 }

package/dist/src/ui/team-alerts.js

@@ -15,22 +15,21 @@ import { buildStatusAlerts } from "./team-alert-status.js";
 import { buildBacklogAlerts } from "./team-alert-backlog.js";
 import { buildTailAlerts } from "./team-alert-tail.js";
 /** Everything about the team that needs the operator, most urgent first: a spent budget, a red
- * main, roles failing run after run, roles that look stuck, a stale running build, open
+ * main, roles failing run after run, roles that look stuck, disk and install drift, open
  * questions, refused entries, a plan stalled by a Needs
  * review note, the team
  * waiting on capacity slots (workspace, provider or
- * check), parallel instances sharing a workspace pool smaller than the run cap, a plan
+ * check), a plan
  * filed under the wrong backlog section, a duplicated
  * backlog section heading, finished history still under a live backlog file's `## Done` or
- * `## Fixed`, a Fixed record with a bad Validation gap trace, a pause, a
+ * `## Fixed`, a Fixed record with a bad Validation gap trace, and a
  * stopped team.
- * `now` is passed so a timed
- * pause's countdown agrees with the rest of the frame. */
-export function teamAlerts(snap, questions, roles, now, refused = [], planDependency = null, stalledEntries = [], strandedPlans = [], duplicatedHeadings = [], validationGaps = [], contention = [], regressedFixes = null, staleClaims = [], staleQuestions = [], fixClaims = [], workspacePins = [], liveFinished = [], instancePool = [], providerCaps = []) {
+ */
+export function teamAlerts(snap, questions, roles, _now, refused = [], planDependency = null, stalledEntries = [], strandedPlans = [], duplicatedHeadings = [], validationGaps = [], staleQuestions = [], fixClaims = [], liveFinished = [], orphans = null) {
     const out = [];
-    out.push(...buildStatusAlerts({ snap, roles, staleClaims }));
+    out.push(...buildStatusAlerts({ snap, roles }));
     out.push(...buildBacklogAlerts({ questions, staleQuestions, refused, stalledEntries, planDependency, strandedPlans, duplicatedHeadings, liveFinished, validationGaps, fixClaims }));
-    out.push(...buildTailAlerts({ snap, now, contention, regressedFixes, roles, workspacePins, instancePool, providerCaps }));
+    out.push(...buildTailAlerts({ snap, orphans }));
     return out;
 }
 /** Does this alert ask something of the operator (red, amber, indigo), rather than inform? */

package/dist/src/ui/transcript-run.js

@@ -8,6 +8,31 @@ import { parsePiEventLine } from "../pi/pi-event-line.js";
  * renderer stamps its separator from). A segment with neither is skipped. */
 const MARKER_ONLY = new Set(["tumwater_run"]);
 const MESSAGE_ONLY = new Set(["message_end"]);
+function segmentsInText(text) {
+    const segments = [];
+    for (const line of text.split("\n")) {
+        if (line === "")
+            continue;
+        if (line.includes('"tumwater_run"') && parsePiEventLine(line, MARKER_ONLY))
+            segments.push([line]);
+        else
+            segments.at(-1)?.push(line);
+    }
+    return segments;
+}
+function keepInWindow(segments, fromTs, toTs) {
+    const kept = [];
+    for (const seg of segments) {
+        const start = segmentStart(seg);
+        if (start !== null && start >= fromTs && start <= (toTs ?? Infinity))
+            kept.push(...seg);
+    }
+    return kept;
+}
+function applyTranscriptGrep(entries, grep) {
+    const keep = createTranscriptFilter(grep);
+    return entries.flatMap((e) => keep(e) ?? []);
+}
 function segmentStart(lines) {
     const marker = parsePiEventLine(lines[0], MARKER_ONLY);
     if (typeof marker?.ts === "number")
@@ -35,24 +60,10 @@ export function readRunTranscript(file, fromTs, toTs, opts = {}) {
         catch {
             continue;
         }
-        const segments = [];
-        for (const line of text.split("\n")) {
-            if (line === "")
-                continue;
-            if (line.includes('"tumwater_run"') && parsePiEventLine(line, MARKER_ONLY))
-                segments.push([line]);
-            else
-                segments.at(-1)?.push(line);
-        }
-        for (const seg of segments) {
-            const start = segmentStart(seg);
-            if (start !== null && start >= fromTs && start <= (toTs ?? Infinity))
-                kept.push(...seg);
-        }
+        kept.push(...keepInWindow(segmentsInText(text), fromTs, toTs));
     }
     const entries = formatTranscript(kept, opts);
     if (opts.grep === undefined)
         return entries.flat();
-    const keep = createTranscriptFilter(opts.grep);
-    return entries.flatMap((e) => keep(e) ?? []);
+    return applyTranscriptGrep(entries, opts.grep);
 }

package/dist/src/ui/tui/tui-editor-answer.js

@@ -1,12 +1,14 @@
-import { questionAsker, tryAnswerQuestion, UNCLOSED_FENCE_MESSAGE, } from "../../backlog/question-answer.js";
+import { questionAsker, tryAnswerQuestion, UNCLOSED_FENCE_MESSAGE, } from "../../backlog/backlog-question-answer.js";
 import { wakeQuestionAsker } from "../../operator/operator-intent.js";
+import { savedPromptDraft } from "./tui-editor-session.js";
+import { guardError } from "./tui-guard.js";
 /** The backlog pane's answer editor (Ctrl+A on a selected open question) on the shared prompt
  * line. It owns its target (`answerFor`), its saved-draft pair, its exit helper, and the
  * tryAnswerQuestion / wake arms that record the decision. Mutually exclusive with the other
  * editors via the session's held registry. */
 export function createAnswerEditor(session) {
     let answerFor = null;
-    let restoreDraft = () => { };
+    const draft = savedPromptDraft(session);
     // Leave the backlog pane's answer editor (Esc, a recorded answer, or Ctrl+T): restore the
     // saved prompt text and reset the recall state, mirroring exitQueuedEdit.
     const exitAnswerMode = () => {
@@ -14,7 +16,7 @@ export function createAnswerEditor(session) {
             return;
         answerFor = null;
         session.held.answer = null;
-        restoreDraft();
+        draft.restore();
     };
     // Ctrl+A opens the answer editor on the selected open question (mnemonic: **A**nswer);
     // Enter records the decision through tryAnswerQuestion, the core `tumwater questions
@@ -23,26 +25,26 @@ export function createAnswerEditor(session) {
     const answerOpenEdit = (ctx) => {
         if (!session.anyEditorHeld() &&
             ctx.view === ctx.roleIds.length + 1 && ctx.selectedEntry !== null) {
-            try {
+            const selected = ctx.selectedEntry;
+            if (selected === null)
+                return false;
+            guardError(session, () => {
                 const entries = session.flat();
-                const sel = Math.min(ctx.selectedEntry, entries.length - 1);
+                const sel = Math.min(selected, entries.length - 1);
                 const entry = entries[sel];
                 if (entry?.label !== "question") {
                     session.flashMessage("only an open question can be answered here");
                 }
                 else {
                     const position = sel - entries.filter((e) => e.label === "plan" || e.label === "bug").length + 1;
-                    restoreDraft = session.takeDraft();
+                    draft.save();
                     answerFor = { position, title: entry.title };
                     session.held.answer = answerFor;
                     session.input = "";
                     session.cursor = 0;
                     session.flashMessage(`answering question #${position} — Enter to record, Esc to cancel`);
                 }
-            }
-            catch (err) {
-                session.flashError(err);
-            }
+            });
             return true;
         }
         return false;

package/dist/src/ui/tui/tui-editor-attach.js

@@ -1,6 +1,7 @@
 import path from "node:path";
 import { imagePromptGuidance } from "../../inbox/inbox-submit.js";
 import { promptImagesCountProblem, readPromptImageFiles } from "../../inbox/inbox-attachments.js";
+import { savedPromptDraft } from "./tui-editor-session.js";
 /** The Activity view's Ctrl+V image-attach editor on the shared prompt line, the terminal
  * twin of `tumwater prompt --attach <path>` and the dashboard composer's drop/paste. It owns
  * its `attachMode` flag, its saved-draft pair, and the handleKey arms for its key (the toggle
@@ -12,7 +13,7 @@ import { promptImagesCountProblem, readPromptImageFiles } from "../../inbox/inbo
  * their views. */
 export function createAttachEditor(session) {
     let attachMode = false;
-    let restoreDraft = () => { };
+    const draft = savedPromptDraft(session);
     // Leave attach mode (Esc, Ctrl+V again, or Ctrl+T): restore the saved prompt text. The
     // pending session.images are untouched — Esc cancels the path edit, not an attachment
     // already saved.
@@ -21,7 +22,7 @@ export function createAttachEditor(session) {
             return;
         attachMode = false;
         session.held.attach = false;
-        restoreDraft();
+        draft.restore();
     };
     // Ctrl+V toggles image-attach mode on the Activity view's prompt line (mnemonic: attach
     // **v**ia the same key the reset-counters and move-to-top arms use on their own views):
@@ -44,7 +45,7 @@ export function createAttachEditor(session) {
             // Mid-recall, hand the arrows' saved draft back before the attach editor takes the
             // line — the same settle the role editors do — so leaving restores the
             // draft, not a history entry, with no stale recall state riding along.
-            restoreDraft = session.takeDraft();
+            draft.save();
             attachMode = true;
             session.held.attach = true;
             session.input = "";

package/dist/src/ui/tui/tui-editor-backends.js

@@ -3,6 +3,7 @@ import { setConfigKey, unsetConfigKey } from "../../config/config-write.js";
 import { loadConfigSafe, parseJsonConfig } from "../../config/config.js";
 import { isJsonObject } from "../../files/json-object.js";
 import { CONFIG_BASENAME, configPath } from "../../paths.js";
+import { savedPromptDraft } from "./tui-editor-session.js";
 /** The Ctrl+X agent-backends editor on the Activity view's shared prompt line — the terminal
  * twin of the dashboard Settings `Agent backends (JSON)` field and `tumwater config set
  * backends`, completing the run-concurrency knob set `tumwater doctor` and the dashboard
@@ -19,14 +20,14 @@ import { CONFIG_BASENAME, configPath } from "../../paths.js";
  * arm. */
 export function createBackendsEditor(session) {
     let backendsMode = false;
-    let restoreDraft = () => { };
+    const draft = savedPromptDraft(session);
     // Leave backends mode (Esc, Ctrl+X again, or Ctrl+T): restore the saved prompt text.
     const exitBackendsMode = () => {
         if (!backendsMode)
             return;
         backendsMode = false;
         session.held.backends = false;
-        restoreDraft();
+        draft.restore();
     };
     // Ctrl+X edits the team's agent backends on the Activity view (view 0) — the terminal
     // twin of the dashboard Settings `Agent backends (JSON)` field and `tumwater config set
@@ -48,7 +49,7 @@ export function createBackendsEditor(session) {
         if (session.editorEntryDenied("backends"))
             return true;
         const existing = rawBackends(session.root);
-        restoreDraft = session.takeDraft();
+        draft.save();
         backendsMode = true;
         session.held.backends = true;
         session.input = existing !== undefined ? JSON.stringify(existing) : "";

package/dist/src/ui/tui/tui-editor-brief.js

@@ -1,5 +1,6 @@
 import { editBriefText } from "../../brief/brief-edit.js";
-import { readEditorPath } from "./tui-editor-session.js";
+import { readEditorPath, savedPromptDraft } from "./tui-editor-session.js";
+import { flashReject } from "./tui-guard.js";
 /** The Brief view's Ctrl+E replace-the-brief-from-a-file editor on the shared prompt line, the
  * terminal twin of `tumwater brief --file <path>` and the dashboard's Brief card. It owns its
  * `briefEdit` flag, its saved-draft pair, and the handleKey arms for its key (the toggle with
@@ -14,14 +15,14 @@ import { readEditorPath } from "./tui-editor-session.js";
  * re-entering. */
 export function createBriefEditor(session) {
     let briefEdit = false;
-    let restoreDraft = () => { };
+    const draft = savedPromptDraft(session);
     // Leave the brief editor (Esc or a successful Enter): restore the saved prompt text.
     const exitBriefMode = () => {
         if (!briefEdit)
             return;
         briefEdit = false;
         session.held.brief = false;
-        restoreDraft();
+        draft.restore();
     };
     // Ctrl+E opens the replace-the-brief editor on the Brief view's prompt line (mnemonic:
     // **e**dit brief — the same key the Health reclaim, Report window-cycle, Queued row-edit
@@ -39,7 +40,7 @@ export function createBriefEditor(session) {
         // Mid-recall, hand the arrows' saved draft back before the brief editor takes the line —
         // the same settle the other editors do — so leaving restores the draft, not a history
         // entry, with no stale recall state riding along.
-        restoreDraft = session.takeDraft();
+        draft.save();
         briefEdit = true;
         session.held.brief = true;
         session.input = "";
@@ -75,11 +76,7 @@ export function createBriefEditor(session) {
             session.flashMessage(outcome.changed
                 ? `brief updated in ${outcome.file}${outcome.committed ? " (committed to main)" : ""}`
                 : "brief unchanged");
-        }, (err) => {
-            // The read/replace/commit threw: flash the reason and stay in the editor so the
-            // operator can fix things, as the other editor Enter arms do.
-            session.flashError(err);
-        });
+        }, flashReject(session));
         return true;
     };
     const handleKey = (_str, key, ctx) => {

package/dist/src/ui/tui/tui-editor-budget.js

@@ -5,6 +5,7 @@ import { DIRECTOR_ROLE } from "../../roles/roles.js";
 import { baseRoleOf } from "../../roles/runner-ids.js";
 import { parseBudgetInput } from "./tui-input.js";
 import { viewedRoleOrNull } from "./tui-editor-ctx.js";
+import { savedPromptDraft } from "./tui-editor-session.js";
 /** The Ctrl+B budget editor on the shared prompt line. It owns its mode flag, its saved-draft
  * pair, the snapshot-fed cap/free flags `sync` drives, and the handleKey arms for its key: the
  * toggle (with the `heldEditorFlash(entering)` guard clause, which keeps the shared guard
@@ -12,7 +13,7 @@ import { viewedRoleOrNull } from "./tui-editor-ctx.js";
  * the one prompt line via the session's held registry. */
 export function createBudgetEditor(session) {
     let budgetMode = false;
-    let restoreDraft = () => { };
+    const draft = savedPromptDraft(session);
     // The last snapshot's cap, synced by render so the Ctrl+B handler can pre-fill without
     // re-reading config itself (render already polls snapshot every second).
     let currentCapUsd = 0;
@@ -29,7 +30,7 @@ export function createBudgetEditor(session) {
             return;
         budgetMode = false;
         session.held.budget = false;
-        restoreDraft();
+        draft.restore();
         lockedRole = null;
     };
     // Enter budget-edit mode (the shared entry, whether the team cap or a role's own cap is
@@ -37,7 +38,7 @@ export function createBudgetEditor(session) {
     // pre-fill the line from the cap (empty string when disabled — empty means "no cap"), and
     // announce the mode. Only the cap source and the announcement differ between the two scopes.
     const enterBudgetMode = (cap, message) => {
-        restoreDraft = session.takeDraft();
+        draft.save();
         budgetMode = true;
         session.held.budget = true;
         session.input = cap > 0 ? String(cap) : "";