amicus 4.4.0 → 4.5.0

package/src/workspace/fold-format.js

@@ -2,9 +2,16 @@
  * Council Workspace — fold payload builder (v4.4 §7).
  *
  * MIRRORS the shipped fold-header builder `formatFoldOutput`
- * (src/headless.js:775-789, exported at :797, re-exported from src/index.js:20)
- * — byte-for-byte the same 8-line head. src/headless.js is the SOURCE OF
- * TRUTH; keep the head in sync with it. The duplication is deliberate:
+ * (src/headless.js `formatFoldOutput`, exported from src/headless.js and
+ * re-exported from src/index.js) — byte-for-byte the same **7-line** head:
+ * marker, Model, Session, Client, CWD, Mode, `---`. ⚠️ v4.4.1 DOC-5: this said
+ * "8-line" for two releases. Line 8 (`VERDICT:`) is council's OWN addition and
+ * has no counterpart in formatFoldOutput, whose 8th element is the summary
+ * body. Only the first 7 lines are the shared contract; anyone changing the
+ * shared format must sync those and leave `VERDICT:` alone.
+ * src/headless.js is the SOURCE OF TRUTH; keep the head in sync with it.
+ * (Line numbers deliberately omitted — the previous `:775-789`/`:797` citation
+ * had drifted by ~500 lines.) The duplication is deliberate:
  * requiring headless.js transitively pulls opencode-client / progress /
  * conversation-mirror at require time (src/headless.js:8-17), which
  * src/workspace/ must stay free of.
@@ -79,7 +86,29 @@ function buildFoldText(o) {
   } else {
     head.push(`Run: ${run.status || 'unknown'} — ${stageSummary(run)}`);
   }
-  head.push(`Cost: ${formatCost(cost)}${cost && cost.source ? ` (${cost.source})` : ''}`);
+  // ⚠️ v4.4.1 DOC-5: this used to append ` (${cost.source})` for EVERY source,
+  // on top of a glyph formatCost had already spent on the same fact —
+  // `~$0.0100 (estimated)`, `? (unknown)`. formatCost (src/utils/pricing.js)
+  // prefixes `~` for both 'estimated' and 'mixed', and returns a bare `?` when
+  // the source is 'unknown'. So for 'estimated' and 'unknown' the word was pure
+  // repetition and is gone.
+  //
+  // Two sources still spell themselves out, because the glyph vocabulary cannot
+  // express them:
+  //   - `reported` — a plain `$0.4321` is also what an unrecognised/absent
+  //     source renders as, so the absence of a glyph cannot mean "exact".
+  //   - `mixed` — `~` encodes *inexact*, not *which kind of inexact*. Collapsing
+  //     'mixed' into a bare `~$…` makes it indistinguishable from 'estimated',
+  //     and the two are not the same claim: 'mixed' means some legs reported
+  //     real usage and some were estimated, i.e. part of this number is
+  //     measured. That is strictly more information than 'estimated', and this
+  //     is the fold line of a release whose theme is cost truthfulness.
+  // Each thing is still said exactly once — the `~` says "inexact", the word
+  // says "which kind", and neither restates the other.
+  const costSourceLabel = cost && (cost.source === 'reported' || cost.source === 'mixed')
+    ? ` (${cost.source})`
+    : '';
+  head.push(`Cost: ${formatCost(cost)}${costSourceLabel}`);
 
   // Review follow-up #1: strip FIRST, then test emptiness on the STRIPPED
   // result — not the raw one. A chair body consisting solely of a marker

package/src/workspace/live-normalize.js

@@ -20,10 +20,14 @@
 const { formatCost } = require('../utils/pricing');
 const { TERMINAL_STATUSES } = require('./run-detail');
 
+// ⚠️ v4.4.1 RN-7: the `doc.wave.legs` fallback that used to sit here is GONE, deliberately.
+// No producer nests legs under `wave` — the WAVE composed doc (src/mcp-server.js:592-662)
+// carries a TOP-LEVEL `legs`, exactly like the council one, and this file's header already
+// says not to model the wave doc at all. The arm asserted a shape that does not exist, and
+// wsgate01's reviewer believed it. If a nested shape ever appears, add it back WITH a
+// producer to point at.
 function legRowsOf(doc) {
-  if (Array.isArray(doc.legs)) { return doc.legs; }
-  if (doc.wave && Array.isArray(doc.wave.legs)) { return doc.wave.legs; }
-  return [];
+  return Array.isArray(doc.legs) ? doc.legs : [];
 }
 
 function numOrNull(v) { return typeof v === 'number' ? v : null; }
@@ -32,7 +36,9 @@ function seatOf(leg) {
   const usage = leg.usage || null;
   const tokens = usage && usage.tokens ? usage.tokens : null;
   return {
-    id: leg.taskId || leg.legId || null,
+    // ⚠️ v4.4.1 RN-7: `leg.legId` was a second dead fallback here — no leg row, council or
+    // wave, has ever carried it (src/observe/council-legs.js stamps `taskId`). Deleted.
+    id: leg.taskId || null,
     // ⚠️ DE-ROT (F34/F36): `model` and `modelInput` are TWO SEPARATE fields, never collapsed.
     // A live leg's `model` is the resolved executable id (e.g. `google/gemini-2.5`); `modelInput`
     // is the council ALIAS (e.g. `gemini`) that run.json's labelMap and blind mode's labelFor()
@@ -108,19 +114,26 @@ function normalizeLive(doc) {
     view: doc.view || null,
     runId: doc.runId || doc.taskId || null,
     status,
-    // ⚠️ PRE-FLIGHT (P6): the fallback read `doc.stage`, which NO producer emits — the council
-    // payload's field is `currentStage` (src/mcp-council-awareness.js:155). Harmless today only by
-    // coincidence: `currentStage` is computed from the same `stages.find(status === 'running')`
-    // predicate as `active`, so both arms are null in exactly the same cases. But it is the same
-    // read-a-field-nobody-writes class as P5, and this is the arm that would matter if `stages`
-    // ever arrived non-array. Read the field that exists.
-    stageName: active ? active.name : (doc.currentStage || null),
+    // ⚠️ v4.4.1 RN-7 (was PRE-FLIGHT P6): the `|| doc.currentStage` fallback is GONE. P6 had
+    // already corrected it once — from the phantom `doc.stage` to the real `currentStage` — and
+    // its own comment conceded the arm was "harmless today only by coincidence". It is in fact
+    // strictly unreachable: buildCouncilStatusPayload writes `stages` as `(run.stages || []).map(…)`
+    // (always an array) and derives `currentStage` from the SAME
+    // `stages.find(s => s.status === 'running')` predicate `active` uses one line up
+    // (src/mcp-council-awareness.js:155-157), so `active` is null in exactly the cases
+    // `currentStage` is too. Keeping it asserted a divergence between the two fields that no
+    // producer can create.
+    stageName: active ? active.name : null,
     stages,
     seats: legRowsOf(doc).map(seatOf),
-    // The two counters the payload already ships (src/mcp-council-awareness.js:149) — the honest
-    // fallback readout if a seat row is ever unavailable.
-    legsTotal: typeof doc.legsTotal === 'number' ? doc.legsTotal : null,
-    legsComplete: typeof doc.legsComplete === 'number' ? doc.legsComplete : null,
+    // ⚠️ v4.4.1 RN-8 (D1 ruling: delete the promise). `legsTotal`/`legsComplete` used to be
+    // mapped here under a comment promising them as "the honest fallback readout if a seat row
+    // is ever unavailable" — a UI fallback nobody ever wired. Nothing in electron/workspace-ui/
+    // read either field. Documenting a feature that does not exist is worse than not having it,
+    // so the fields and the promise are both gone. ⚠️ The SAME names on the composed doc
+    // (src/mcp-council-awareness.js) and in src/cli-handlers-status.js / src/mcp-wait.js ARE
+    // consumed — this deletion is scoped to the workspace's LiveModel only. If a future task
+    // wants the counters in the GUI, re-add them WITH the renderer that paints them.
     // ⚠️ DE-ROT (F39): these two are ACTIVE-STAGE spend, not the run total.
     // buildCouncilStatusPayload rolls up only the legs of the currently-RUNNING stage's sub-waves
     // (mcp-council-awareness.js:136-146) and omits `usage` entirely until one of those legs flushes

package/src/workspace/run-detail.js

@@ -23,7 +23,13 @@ const { isRealpathContained } = require('../utils/path-fence');
  * ("zero v4.3") and live-doc.js is v4.3. Not to be confused with the shipped
  * src/utils/result-schema.js:13 TERMINAL_STATUSES, which is the LEG set (no 'partial').
  */
-const TERMINAL_STATUSES = ['complete', 'partial', 'error', 'crashed', 'aborted', 'timeout', 'idle-timeout'];
+// ⚠️ v4.4.1 A1: 'timed-out' added alongside 'timeout' — see the long note at
+// src/observe/live-doc.js:18 for why both spellings are real and which producer writes each.
+// Council run.json only ever carries aborted|complete|error|partial (run-finalize.js:38
+// statusForExit), so the new name is inert for THIS module's own reads; it is carried anyway
+// because the drift pin demands byte-identity with the source list, and that pin is the only
+// thing keeping the three copies honest.
+const TERMINAL_STATUSES = ['complete', 'partial', 'error', 'crashed', 'aborted', 'timeout', 'timed-out', 'idle-timeout'];
 
 /** Friendly labels for known v4.0 stage names; unknown names pass through raw
  *  — the graceful-when-present rule (spec §5.2). */
@@ -203,6 +209,12 @@ function getRunDetail(project, runId) {
       // would otherwise silently misattribute prose. Surfaced here (rather than only inside
       // the low-level allowlist helper) so the renderer can warn the user directly.
       artifactCollisions: artifactNames.collisions || [],
+      // ⚠️ Task 18 (RN-1): the de-collision map itself (raw model -> {review, judge} filename),
+      // built once in artifactAllowlist alongside `collisions` above. `|| null` (absent, not an
+      // empty object) so workspace-panels.js can tell "no map at all" (older detail payloads —
+      // pre-v4.5 runs, live-doc consumers not yet updated) apart from a real map, and fall back
+      // to its legacy sanitizeName(model) computation only in the former case.
+      artifactsByModel: artifactNames.artifactsByModel || null,
     };
   }