@openrig/cli 0.6.14 → 0.7.1

package/tui/dist/render.js

@@ -52,15 +52,15 @@ function agentColumns(contentWidth) {
     if (contentWidth >= 110)
         return [
             ["pod", "POD", 8, "left"], ["seat", "SEAT", 15, "left"], ["runtime", "RT", 4, "left"],
-            ["model", "MODEL", 12, "left"], ["context", "CTX", 8, "right"], ["status", "STATE", 11, "left"],
-            ["queue", "Q", 3, "right"], ["work", "WORK", 15, "left"], ["now", "NOW", 27, "left"],
+            ["model", "MODEL", 12, "left"], ["effort", "CFG EFF", 7, "left"], ["context", "CTX", 8, "right"], ["status", "STATE", 11, "left"],
+            ["queue", "Q", 3, "right"], ["work", "WORK", 15, "left"], ["now", "NOW", 19, "left"],
             ["actions", "ACTIONS", 14, "left"],
         ];
     if (contentWidth >= 88)
         return [
-            ["pod", "POD", 6, "left"], ["seat", "SEAT", 12, "left"], ["runtime", "RT", 3, "left"],
-            ["model", "MODEL", 8, "left"], ["context", "CTX", 6, "right"], ["status", "STATE", 9, "left"],
-            ["queue", "Q", 2, "right"], ["work", "WORK", 8, "left"], ["now", "NOW", 11, "left"],
+            ["pod", "POD", 5, "left"], ["seat", "SEAT", 10, "left"], ["runtime", "RT", 3, "left"],
+            ["model", "MODEL", 8, "left"], ["effort", "CFG", 4, "left"], ["context", "CTX", 6, "right"], ["status", "STATE", 9, "left"],
+            ["queue", "Q", 2, "right"], ["work", "WORK", 6, "left"], ["now", "NOW", 11, "left"],
             ["actions", "ACTIONS", 14, "left"],
         ];
     // At 84x28 the L2 content pane is 58 cells. The three explicitly deferred
@@ -110,6 +110,98 @@ function runtimeShort(runtime) {
 function tableModel(model) {
     return model?.replace(/^claude-/i, "") || "—";
 }
+/** Table cell for the CONFIGURED value only. A trailing mark names its source:
+ *  `*` the seat's saved choice, `+` the authored value. `—` = no configured level
+ *  (runtime default); `?` = the daemon did not report one (older daemon / read gap).
+ *  A value compacts only when the mark would otherwise overflow the cell. */
+const CONFIGURED_MARK = { seat_choice: "*", authored: "+" };
+const COMPACT_EFFORT = { high: "hi", medium: "med", xhigh: "xhi", minimal: "min", none: "no" };
+function tableEffort(effort, source, width) {
+    const value = effort?.trim();
+    if (!value)
+        return source === "runtime_default" ? "—" : "?";
+    const mark = source ? CONFIGURED_MARK[source] ?? "" : "";
+    if (value.length + mark.length <= width)
+        return `${value}${mark}`;
+    const compact = COMPACT_EFFORT[value] ?? value;
+    return `${compact.slice(0, Math.max(0, width - mark.length))}${mark}`;
+}
+/** The report-level reason when the whole read is unavailable; null when it answered. */
+function effortReportStatus(report) {
+    if (!report)
+        return "report not read";
+    if (report.ok !== true)
+        return `report refused ${report.code ?? "unknown_code"}`;
+    return null;
+}
+/** requested: the last saved choice request. null (no event) and an explicit clear differ. */
+function effortRequestedText(report) {
+    if (!report || report.ok !== true)
+        return "unknown";
+    if (!report.requested)
+        return "never set";
+    return report.requested.value == null ? "cleared" : report.requested.value;
+}
+/** The configured side. The report's saved resolution is authoritative; the node
+ *  inventory (same resolver) fills in when the report was not read. */
+function effortSavedText(report, agent) {
+    const saved = report?.ok === true ? report.saved : undefined;
+    if (saved?.effective) {
+        if (saved.source === "seat_choice") {
+            const authored = saved.authored && saved.authored !== saved.effective ? `; authored ${saved.authored}` : "";
+            return `${saved.effective} (seat choice${authored})`;
+        }
+        if (saved.source === "authored")
+            return `${saved.effective} (authored)`;
+        return `${saved.effective} (source ${saved.source ?? "not reported"})`;
+    }
+    if (saved?.source === "runtime_default")
+        return "none (runtime default)";
+    if (agent.effort) {
+        const source = agent.effortSource === "seat_choice" ? "seat choice"
+            : agent.effortSource === "authored" ? "authored"
+                : "source not reported";
+        return `${agent.effort} (${source}; node inventory)`;
+    }
+    if (agent.effortSource === "runtime_default")
+        return "none (runtime default; node inventory)";
+    return "unknown";
+}
+/** emitted: the flag the running process was launched with, never a saved value. */
+function effortEmittedText(report) {
+    if (!report || report.ok !== true)
+        return "unknown";
+    const emitted = report.emitted;
+    if (!emitted || emitted.state !== "observed")
+        return "unknown";
+    const value = emitted.value == null ? "no flag" : emitted.value;
+    return emitted.matchesSaved === false ? `${value} (differs from saved)` : value;
+}
+/** The native side. "applied" appears only for outcome `accepted`: every other
+ *  outcome leaves the applied level unproven or judged not taken. */
+function effortObservedText(report) {
+    if (!report || report.ok !== true)
+        return "unknown";
+    const observed = report.observed;
+    if (!observed || observed.state !== "observed")
+        return "unknown";
+    const value = observed.value ?? "—";
+    const outcome = observed.outcome ?? "not reported";
+    const wording = outcome === "accepted" ? "accepted — applied"
+        : outcome === "recorded" ? "recorded; applied not proven"
+            : outcome === "rejected" ? "rejected — not taken"
+                : outcome === "failed" || outcome === "interrupted" || outcome === "pending" ? `${outcome} — not judged`
+                    : `outcome ${outcome}`;
+    const differs = observed.matchesEmitted === false ? "; differs from launch" : "";
+    return `${value} (${wording}${differs})`;
+}
+/** One wrapped row: the four values stay labelled and distinguishable. */
+function effortDetailText(report, agent) {
+    const status = effortReportStatus(report);
+    return `requested ${effortRequestedText(report)} · saved ${effortSavedText(report, agent)} · emitted ${effortEmittedText(report)} · observed ${effortObservedText(report)}${status ? ` · ${status}` : ""}`;
+}
+/** One line under the table naming what the column holds: configured, never observed. */
+const EFFORT_LEGEND = "EFFORT (configured): * seat choice · + authored · — none · ? unknown; observed on drill";
 function contextCompact(value, narrow) {
     if (value == null)
         return "—";
@@ -265,7 +357,14 @@ function agentDetailLines(snap, found, contentWidth, timeZone = DEFAULT_TIME_ZON
         ...runtimeMarkSegs(agent.runtime),
     ];
     const runtimeLine = { text: rtSegs.map((segment) => segment.text).join(""), segs: rtSegs };
+    const effortReport = snap.seatEffort && snap.seatEffort.seatRef === `${agent.name}@${rig.name}`
+        ? snap.seatEffort.report
+        : null;
     const activityReason = agent.activity?.needsInput?.reason ?? agent.activity?.signalReason ?? null;
+    const attention = agent.needsAttention == null ? "unknown" : agent.needsAttention ? "needed" : "not raised";
+    const rawInputSource = agent.activity?.signalSource === "runtime_hook" ? "hook"
+        : agent.activity?.signalSource === "pane_heuristic" ? "pane" : "unknown";
+    const inputEvidence = agent.arbitratedNeedsInput == null ? (agent.activity?.signalState === "needs_input" ? rawInputSource : "absent") : `${agent.arbitratedNeedsInput ? "observed input" : "observed clear"}${agent.needsInputEvidence ? ` · ${agent.needsInputEvidence.rung} · ${displayTime(agent.needsInputEvidence.observedAt, timeZone)}` : ""}`;
     const needsRows = needs.length > 0
         ? needs.flatMap((item) => [
             ...wrapDetailValue("qitem", item.qitemId ?? "no actionable qitem id served", contentWidth),
@@ -284,6 +383,9 @@ function agentDetailLines(snap, found, contentWidth, timeZone = DEFAULT_TIME_ZON
                     fieldLine({ label: "meter", value: context == null ? "— (not yet known)" : `${context}% used  ${barCells(context / 100, meterWidth)}` }),
                     fieldLine({ label: "tokens", value: `${number(agent.totalInputTokens)} input · ${number(agent.totalOutputTokens)} output · ${number(agent.contextWindowSize)} window` }),
                     runtimeLine,
+                    // #1347 — four values stay distinguishable on one wrapped row. "applied"
+                    // appears only for outcome `accepted`; unknowns stay unknown.
+                    ...wrapDetailValue("effort", effortDetailText(effortReport, agent), contentWidth),
                     ...(agent.attach ? [fieldLine({ label: "attach", value: agent.attach })] : []),
                     fieldLine({ label: "terminal", value: `Open terminals ▸ pod ${pod.name}`, link: { type: "act", act: "open-terminal", view: `pod:${rig.name}/${pod.name}` } }),
                 ],
@@ -291,7 +393,7 @@ function agentDetailLines(snap, found, contentWidth, timeZone = DEFAULT_TIME_ZON
             {
                 title: "CURRENT ACTIVITY",
                 fields: [
-                    { label: "activity", value: agent.activity?.activity ?? agent.status },
+                    { label: "activity", value: `${agent.activity?.activity ?? agent.status} · attention ${attention} · needs-input evidence ${inputEvidence}` },
                     ...(activityReason ? [{ label: "reason", value: activityReason }] : []),
                     ...(agent.activity?.decidedBy ? [{ label: "decided by", value: agent.activity.decidedBy }] : []),
                     ...(agent.activity?.signalSource || agent.activity?.signalReason ? [{ label: "signal", value: `${agent.activity.signalSource ?? "unknown"} · ${agent.activity.signalReason ?? "no reason"}` }] : []),
@@ -627,6 +729,7 @@ function instanceContentLines(state, snap, host, contentWidth, motion) {
     let seatCount = 0;
     let workingCount = 0;
     let attentionCount = 0;
+    let attentionUnknown = 0;
     let openCount = 0;
     for (const rig of host.rigs) {
         const agents = rig.pods.flatMap((pod) => pod.agents.map((agent) => ({ pod: pod.name, agent })))
@@ -652,8 +755,10 @@ function instanceContentLines(state, snap, host, contentWidth, motion) {
             seatCount += 1;
             if (["active", "working", "running"].includes(agent.status))
                 workingCount += 1;
-            if (/attention|needs|blocked|unknown|failed/.test(agent.status))
+            if (agent.needsAttention === true)
                 attentionCount += 1;
+            else if (agent.needsAttention == null)
+                attentionUnknown += 1;
             openCount += queue.count;
             lines.push({
                 text: tableRow(columns, {
@@ -672,7 +777,7 @@ function instanceContentLines(state, snap, host, contentWidth, motion) {
             });
         }
     }
-    lines.push({ text: "" }, { text: host.rigs.some(r => r.inventoryUnavailable) ? `${host.rigs.length} rigs · inventory incomplete · ${seatCount} seats read` : `${host.rigs.length} rigs · ${seatCount} seats · ${workingCount} working · ${attentionCount} need attention · ${openCount}${queueIncomplete(snap) ? "+ sampled" : ""} open rows` });
+    lines.push({ text: "" }, { text: host.rigs.some(r => r.inventoryUnavailable) ? `${host.rigs.length} rigs · inventory incomplete · ${seatCount} seats read` : `${host.rigs.length} rigs · ${seatCount} seats · ${workingCount} working · ${attentionCount} need attention${attentionUnknown ? ` · ${attentionUnknown} attention unknown` : ""} · ${openCount}${queueIncomplete(snap) ? "+ sampled" : ""} open rows` });
     lines.push(...recentLines(snap, scope, contentWidth, false, state.timeZone));
     return lines;
 }
@@ -858,14 +963,17 @@ function contentLines(state, snap, contentWidth, motion) {
         const agentCols = agentColumns(contentWidth);
         lines.push(...queueSampleLines(snap, contentWidth));
         const narrowFactory = !agentCols.some(([key]) => key === "model");
+        const effortCol = agentCols.find(([key]) => key === "effort");
         if (narrowFactory)
-            lines.push({ text: "MODEL/NOW/ACTIONS on drill (enter)" });
+            lines.push({ text: "MODEL/EFFORT/NOW/ACTIONS on drill (enter)" });
         lines.push({
             text: tableRow(agentCols, {
-                pod: "POD", seat: "SEAT", runtime: "RT", model: "MODEL", context: "CTX",
+                pod: "POD", seat: "SEAT", runtime: "RT", model: "MODEL", effort: effortCol?.[1] ?? "CFG EFF", context: "CTX",
                 status: "STATE", queue: "Q", work: "WORK", now: "NOW", actions: "ACTIONS",
             }),
         });
+        if (effortCol)
+            lines.push({ text: EFFORT_LEGEND });
         lines.push({ text: "━".repeat(columnsWidth(agentCols)) });
         const actionsIndex = agentCols.findIndex(([key]) => key === "actions");
         const actionsColStart = actionsIndex < 0 ? -1 : agentCols.slice(0, actionsIndex).reduce((n, [, , width]) => n + width + 1, 0);
@@ -902,6 +1010,7 @@ function contentLines(state, snap, contentWidth, motion) {
                     seat: `${stateCell.mark} ${seatName(a.pod, a.name)}`,
                     runtime: runtimeShort(a.runtime),
                     model: tableModel(a.model),
+                    effort: tableEffort(a.effort, a.effortSource, effortCol?.[2] ?? 0),
                     context: contextCompact(a.context, narrowFactory),
                     status: stateCell.word,
                     queue: queueCount(snap, queue.count),
@@ -1301,6 +1410,8 @@ function pushExplorerTargets(hitMap, row, display, y, explorerWidth) {
 function readStatus(load, zone) {
     const at = load.retainedAt ?? load.lastSuccessAt;
     const basis = at === undefined ? "" : ` · last ${displayTime(new Date(at).toISOString(), zone)}`;
+    if (load.skew)
+        return load.skew;
     if (load.inFlight)
         return `${load.settled ? "Refreshing" : "Loading"}…${basis} · ? Help`;
     if (load.stale)