omp-conductor 0.19.6 → 0.20.0

package/src/arm-challenge.ts

@@ -1,48 +1,60 @@
 /**
  * Authenticated pending-challenge state for the arming handshake (conductor
- * #415, transaction reworked by #614, storage hardened by review of #896).
+ * #415, transaction reworked by #614, storage hardened by review of #896,
+ * targets recorded when the console took over verification in phase 1 of the
+ * orchestrator-workflow redesign).
  *
  * `armTicks` (fleet.ts) sends a short-lived `FLEET-…` code to the operator and
- * waits for the orchestrator to acknowledge it. The acknowledgement is
- * conductor-owned state: the orchestrator's inbound user-turn adapter
- * (orchestrator-tick.ts) writes it the moment the real reply arrives as a user
- * turn — never the model, and never a transcript scan, so the proof no longer
- * depends on where (or whether) a session file lives.
+ * files the challenge here. Verification is a second, mechanical CLI step:
+ * `omp-conductor arm --reply "<the operator's message>"` classifies the
+ * message against these records and arms the projects the challenge named.
  *
- * This module is the bridge between the two roles without an import cycle:
- * `fleet.ts` imports `daemon.ts`, `daemon.ts` imports `orchestrator-tick.ts`,
- * so `orchestrator-tick.ts` can never import `fleet.ts`. Both already import
- * `config.ts`, so the state lives next to the other state under `stateDir()`
- * and both sides reach it through *this* leaf module.
+ * Nothing waits for the reply any more. The console session owns the operator
+ * DM, and no tick extension runs there — so the in-session acknowledgement
+ * wait `armTicks` used to hold could never be satisfied. What survives is the
+ * durable half: the record that says which code is live, until when, and which
+ * projects it arms.
+ *
+ * This module stays a leaf so both roles can reach the state without an import
+ * cycle: `fleet.ts` imports `daemon.ts`, `daemon.ts` imports
+ * `orchestrator-tick.ts`, so `orchestrator-tick.ts` can never import
+ * `fleet.ts`. Everything here reads only `config.ts`.
  *
  * The handshake keeps no shared mutable state at all — every file is named by
  * its own key, and every deletion is id-addressed, so two processes can
  * neither lose each other's updates nor delete each other's proofs:
  *
  * - `arm-challenges/<project key>.json` — one pending challenge per project:
- *   `{ project, id, hash, sentAt, expiresAt }`. Host-owned: only `armTicks`
- *   writes it (record before the send, settle on consumption/timeout/send
- *   failure), always through the atomic tmp+rename write the admission ack
- *   uses. A re-armed project overwrites its own file — pruning only its own
- *   prior id's acknowledgement; a concurrent arm for a different project
- *   touches a different file.
+ *   `{ project, id, hash, sentAt, expiresAt, targets?, owner? }`. Host-owned:
+ *   only the arm ceremony writes it (record before the send, settle on
+ *   consumption or send failure), always through the atomic tmp+rename write
+ *   the admission ack uses. A re-armed project overwrites its own file —
+ *   pruning only its own prior id's acknowledgement; a concurrent arm for a
+ *   different project touches a different file.
  * - `arm-challenge-acks/<challenge id>.json` — one file per acknowledgement:
- *   `{ challengeId, acknowledgedAt }`. The adapter's acknowledgement is a
+ *   `{ challengeId, acknowledgedAt }`. The reply step's acknowledgement is a
  *   single-file create/overwrite via rename — it never reads or rewrites
- *   another transaction's record. Files that outlive their transaction (a
- *   crash between the adapter's write and the host's settle) are inert by
+ *   another transaction's record, and `doctor` reads it to report a handshake
+ *   that was answered but never settled. Files that outlive their transaction
+ *   (a crash between the acknowledgement and the settle) are inert by
  *   construction and removed only by age, never by membership in any
  *   directory snapshot (see {@link gcAgedAcks}).
  *
+ * `targets` is why the reply step never re-derives what to arm: the challenge
+ * the operator answered named specific projects, and the config could have
+ * changed between the send and the reply. Arming what the record says is the
+ * only reading that matches what the operator was asked. It is optional purely
+ * for backward tolerance — a record written before this field existed still
+ * verifies (see {@link resolveArmReply}).
+ *
  * Only the sha-256 of the code is ever persisted — never the code, whose
- * plaintext appearance in the protected session transcript is already the
- * backend proof and must not leak into a durable report, an issue comment, or
- * a diagnostic line the way a new artifact could. The id is a random UUID cut
- * with the challenge, so acknowledgement records are challenge-specific
- * without carrying anything guessable. Neither side trusts a `FLEET-` prefix:
- * a reply is classified by hashing its whitespace-separated tokens against
- * the pending record, so nothing on the east side of the boundary can arm a
- * fleet with a lookalike.
+ * plaintext appearance in the chat is the whole proof and must not leak into a
+ * durable report, an issue comment, or a diagnostic line the way a new
+ * artifact could. The id is a random UUID cut with the challenge, so
+ * acknowledgement records are challenge-specific without carrying anything
+ * guessable. No `FLEET-` prefix is ever trusted: a reply is classified by
+ * hashing its whitespace-separated tokens against the pending record, so no
+ * lookalike can arm a fleet.
  */
 
 import { createHash, randomUUID } from "node:crypto";
@@ -53,6 +65,21 @@ import { stateDir } from "./config.ts";
 const ARM_CHALLENGES_DIR = "arm-challenges";
 const ARM_ACKS_DIR = "arm-challenge-acks";
 
+/**
+ * One project a challenge arms: recorded with the challenge so the reply step
+ * arms exactly what the operator was asked about, never a re-derivation.
+ */
+export interface ArmTarget {
+  /**
+   * The configured project name, absent only for a legacy unstamped
+   * single-project fleet — the same value `resolveArmState` needs to decide
+   * whether the pre-per-project shared marker still speaks for this project.
+   */
+  project?: string;
+  /** The arm marker path this project's heartbeat reads. */
+  armedFile: string;
+}
+
 interface PendingChallenge {
   /** The project key this pending belongs to, mirrored for read-back checks. */
   project: string;
@@ -64,12 +91,24 @@ interface PendingChallenge {
   sentAt: number;
   /** Unix ms after which a matching reply is no longer an active proof. */
   expiresAt: number;
+  /**
+   * The projects this challenge arms. Absent on a record written before the
+   * field existed; callers fall back rather than crash.
+   */
+  targets?: ArmTarget[];
+  /**
+   * The chat the challenge was actually sent to, so the marker the reply step
+   * writes attributes the arm to the operator who was asked — not to whatever
+   * the paired channel happens to say minutes later. Absent on a pre-targets
+   * record.
+   */
+  owner?: string;
 }
 
 interface ArmAcknowledgement {
   /** The exact challenge id this record satisfies. */
   challengeId: string;
-  /** Unix ms the inbound adapter acknowledged the reply. */
+  /** Unix ms the reply step classified the operator's message as this proof. */
   acknowledgedAt: number;
 }
 
@@ -125,6 +164,31 @@ function writeFileAtomic(path: string, content: string): void {
   }
 }
 
+/**
+ * A recorded target list, validated element by element, or undefined when the
+ * record carries none. `invalid` is deliberately distinct from `absent`: a
+ * torn target list must fail the whole record closed (below) rather than
+ * silently degrade into the legacy fallback, which would arm a project the
+ * challenge may never have named.
+ */
+function readTargets(raw: unknown): { kind: "absent" } | { kind: "invalid" } | { kind: "ok"; targets: ArmTarget[] } {
+  if (raw === undefined) return { kind: "absent" };
+  if (!Array.isArray(raw) || raw.length === 0) return { kind: "invalid" };
+  const targets: ArmTarget[] = [];
+  for (const entry of raw) {
+    if (entry === null || typeof entry !== "object") return { kind: "invalid" };
+    const target = entry as { project?: unknown; armedFile?: unknown };
+    if (typeof target.armedFile !== "string" || target.armedFile.length === 0) return { kind: "invalid" };
+    if (target.project !== undefined && typeof target.project !== "string") return { kind: "invalid" };
+    targets.push(
+      target.project === undefined
+        ? { armedFile: target.armedFile }
+        : { project: target.project, armedFile: target.armedFile },
+    );
+  }
+  return { kind: "ok", targets };
+}
+
 /**
  * This project's pending challenge parsed from its own file, with every field
  * validated. Anything absent, torn, garbage, pre-#614, or naming another
@@ -144,11 +208,17 @@ function readPendingFor(key: string): PendingChallenge | undefined {
     pending.project !== key ||
     typeof pending.id !== "string" ||
     typeof pending.hash !== "string" ||
-    typeof pending.expiresAt !== "number"
+    typeof pending.expiresAt !== "number" ||
+    (pending.owner !== undefined && typeof pending.owner !== "string")
   ) {
     return undefined;
   }
-  return pending as PendingChallenge;
+  const targets = readTargets(pending.targets);
+  if (targets.kind === "invalid") return undefined;
+  return {
+    ...(pending as PendingChallenge),
+    ...(targets.kind === "ok" ? { targets: targets.targets } : {}),
+  };
 }
 
 /** sha-256 hex of the challenge code — the persisted token, never the code. */
@@ -182,14 +252,13 @@ export function looksLikeChallengeCode(token: string): boolean {
 
 /**
  * Acknowledgement files outliving their transaction — a crash between the
- * adapter's write and the host's settle — are inert by construction: no
- * waiter ever polls their id again, and ids are UUIDs, so no future
- * transaction can collide with one. They are therefore not swept by
- * membership (a directory listing captured before another process records is
- * stale the moment it is taken, and acting on it deletes on-time proofs),
- * only by age: a file older than {@link ACK_ORPHAN_GC_AFTER_MS} cannot belong
- * to a live handshake under any configured window, so its mtime alone decides
- * removal.
+ * classification and the settle — are inert by construction: nothing ever
+ * reads their id again, and ids are UUIDs, so no future transaction can
+ * collide with one. They are therefore not swept by membership (a directory
+ * listing captured before another process records is stale the moment it is
+ * taken, and acting on it deletes on-time proofs), only by age: a file older
+ * than {@link ACK_ORPHAN_GC_AFTER_MS} cannot belong to a live handshake under
+ * any configured window, so its mtime alone decides removal.
  */
 const ACK_ORPHAN_GC_AFTER_MS = 24 * 60 * 60 * 1000;
 
@@ -212,6 +281,17 @@ function gcAgedAcks(now: number): void {
   }
 }
 
+/**
+ * What a challenge arms, recorded with it: the projects the operator was told
+ * about and the chat they were asked in.
+ */
+export interface ArmChallengePlan {
+  /** Every project a matching reply arms — one for `arm --project X`, all of them for a fleet ceremony. */
+  targets: readonly ArmTarget[];
+  /** The chat the challenge is being sent to. */
+  owner: string;
+}
+
 /**
  * Register a new active arming challenge for the project — overwriting the
  * project's own pending file — and return the transaction id. Before the
@@ -219,18 +299,31 @@ function gcAgedAcks(now: number): void {
  * acknowledgement is pruned: project-local cleanup with no directory
  * snapshot, so another project's handshake cannot lose its proof here no
  * matter how the calls interleave.
+ *
+ * `plan` is optional only so the pre-targets call shape stays valid for the
+ * surfaces (doctor's fixtures, the CLI's own tests) that record a challenge
+ * without meaning to arm anything through the reply step. The ceremony always
+ * passes one.
  */
 export function recordArmChallenge(
   project: string | undefined,
   code: string,
   sentAt: number,
   expiresAt: number,
+  plan?: ArmChallengePlan,
 ): string {
   const key = projectKey(project);
   // Read the prior record BEFORE the overwrite shadows it.
   const prior = readPendingFor(key);
   const id = randomUUID();
-  const record: PendingChallenge = { project: key, id, hash: challengeHash(code), sentAt, expiresAt };
+  const record: PendingChallenge = {
+    project: key,
+    id,
+    hash: challengeHash(code),
+    sentAt,
+    expiresAt,
+    ...(plan === undefined ? {} : { targets: [...plan.targets], owner: plan.owner }),
+  };
   writeFileAtomic(pendingPath(key), `${JSON.stringify(record)}\n`);
   if (prior !== undefined) rmSync(ackPath(prior.id), { force: true });
   gcAgedAcks(sentAt);
@@ -238,35 +331,53 @@ export function recordArmChallenge(
 }
 
 /**
- * The inbound adapter's acknowledgement (conductor #614): classify the reply
- * against the project's non-expired pending challenge and, on a match,
- * atomically write the challenge-id-specific acknowledgement record the host
- * waits on. Returns whether the reply is an active arming proof, driving the
- * existing deterministic UX path.
- *
- * Writes only this challenge's own file — it never reads or rewrites any other
- * record — so a wrong token, wrong project, expired challenge, or a racing
- * host settle all fail closed without touching anyone else's handshake, and
- * two projects acknowledging concurrently cannot clobber each other.
- */
-/**
- * What an inbound reply was, so the adapter can answer it (#991).
+ * What a reply was, so the console can answer it (#991, retained now that the
+ * console — not a tick session — does the answering).
  *
- * Before this, a non-matching or expired code was simply ignored: the waiter
- * kept waiting and the operator had no idea they had been heard. The fastest
- * way to be sure you held the current code was to scroll the chat, which is
- * exactly the work conductor-owned verification was supposed to end.
+ * Before this, a non-matching or expired code was simply ignored: the operator
+ * had no idea they had been heard, and the fastest way to be sure you held the
+ * current code was to scroll the chat. That is exactly the work
+ * conductor-owned verification exists to end.
  *
  * - `matched` — an active proof; the acknowledgement is written.
  * - `expired` — a code that hashes to a pending record whose window has closed.
  * - `unknown` — a challenge-shaped token that matches nothing readable here.
- * - `none` — no challenge-shaped token at all: ordinary chat, answer nothing.
+ * - `none` — no challenge-shaped token at all: ordinary chat, arm nothing.
  */
 export type ArmReplyVerdict = "matched" | "expired" | "unknown" | "none";
 
+/** The transaction a matching reply proved, and what the challenge said it arms. */
+export interface ArmReplyMatch {
+  /**
+   * The state key the matched record lives under — a project key (possibly the
+   * empty key of an unstamped config) or {@link FLEET_ARM_KEY}. Passed straight
+   * back to {@link clearArmTransaction}, so the settle is addressed to the
+   * record that was actually consumed.
+   */
+  key: string;
+  /** The matched transaction's id; every deletion is addressed by it. */
+  id: string;
+  /**
+   * The projects the challenge recorded. Absent on a record written before
+   * targets existed — the caller falls back rather than crashing.
+   */
+  targets?: ArmTarget[];
+  /** The chat the challenge was sent to. Absent on a pre-targets record. */
+  owner?: string;
+}
+
 /**
- * Classify one inbound reply against this session's own records, writing the
- * acknowledgement on a match.
+ * Discriminated so a caller cannot reach for `match` on a verdict that has
+ * none: only `matched` carries the transaction, and only `matched` may write a
+ * marker.
+ */
+export type ArmReplyResolution =
+  | { verdict: "matched"; match: ArmReplyMatch }
+  | { verdict: Exclude<ArmReplyVerdict, "matched">; match?: undefined };
+
+/**
+ * Classify one operator reply against this host's own records and, on a match,
+ * write the challenge-id-specific acknowledgement.
  *
  * Two records are consulted and no others: this project's, and the fleet-wide
  * one (#991). That bound is the non-disclosure property — a reply that matches
@@ -274,25 +385,35 @@ export type ArmReplyVerdict = "matched" | "expired" | "unknown" | "none";
  * challenge, because no other project's record is ever read.
  *
  * Fail-closed ordering is unchanged: the project's own active challenge wins,
- * then the fleet ceremony, and an expired record is never a proof.
+ * then the fleet ceremony, and an expired record is never a proof. The write
+ * touches only the matched challenge's own file, so a wrong token, a wrong
+ * project, an expired challenge or a racing settle all fail closed without
+ * touching anyone else's handshake.
+ *
+ * The acknowledgement record is no longer something a waiter polls — nothing
+ * waits any more. It is kept because it is the only durable evidence that a
+ * reply was seen, which is what `doctor`'s `arm-ack` finding reports when a
+ * ceremony was answered but never settled.
  */
-export function classifyArmReply(
+export function resolveArmReply(
   project: string | undefined,
   replyText: string,
   now: number,
-): ArmReplyVerdict {
+): ArmReplyResolution {
   // Challenge codes contain no whitespace, so tokenising on whitespace never
   // splits one; empty replies simply yield no token.
   const tokens = replyText.trim().split(/\s+/).filter((token) => token.length > 0);
-  if (tokens.length === 0) return "none";
-  const candidates = [readPendingFor(projectKey(project)), readPendingFor(FLEET_ARM_KEY)].filter(
-    (pending): pending is PendingChallenge => pending !== undefined,
-  );
+  if (tokens.length === 0) return { verdict: "none" };
+  const candidates: { key: string; pending: PendingChallenge }[] = [];
+  for (const key of [projectKey(project), FLEET_ARM_KEY]) {
+    const pending = readPendingFor(key);
+    if (pending !== undefined) candidates.push({ key, pending });
+  }
 
   let expired = false;
   for (const token of tokens) {
     const hash = challengeHash(token);
-    for (const pending of candidates) {
+    for (const { key, pending } of candidates) {
       if (pending.hash !== hash) continue;
       if (now >= pending.expiresAt) {
         // Keep looking: a fresh record for the same code is a proof, and only
@@ -300,27 +421,25 @@ export function classifyArmReply(
         expired = true;
         continue;
       }
-      // Keyed by the challenge id, so replays overwrite the one record the
-      // single live waiter consumes; a stale id's file can never be created
-      // here.
+      // Keyed by the challenge id, so replays overwrite the one record this
+      // transaction owns; a stale id's file can never be created here.
       const record: ArmAcknowledgement = { challengeId: pending.id, acknowledgedAt: now };
       writeFileAtomic(ackPath(pending.id), `${JSON.stringify(record)}\n`);
-      return "matched";
+      return {
+        verdict: "matched",
+        match: {
+          key,
+          id: pending.id,
+          ...(pending.targets === undefined ? {} : { targets: pending.targets }),
+          ...(pending.owner === undefined ? {} : { owner: pending.owner }),
+        },
+      };
     }
   }
-  if (expired) return "expired";
-  // Shape only, and only to decide whether the operator gets an answer. A token
-  // that is not challenge-shaped is ordinary chat.
-  return tokens.some((token) => looksLikeChallengeCode(token)) ? "unknown" : "none";
-}
-
-/**
- * The inbound adapter's acknowledgement (conductor #614), kept as the boolean
- * the availability gate already reads. {@link classifyArmReply} is the same
- * pass with the non-matching cases named.
- */
-export function acknowledgeArmReply(project: string | undefined, replyText: string, now: number): boolean {
-  return classifyArmReply(project, replyText, now) === "matched";
+  if (expired) return { verdict: "expired" };
+  // Shape only, and only to decide how the operator is answered. A token that
+  // is not challenge-shaped is ordinary chat.
+  return { verdict: tokens.some((token) => looksLikeChallengeCode(token)) ? "unknown" : "none" };
 }
 
 /** The acknowledgement record for one exact challenge id, or undefined. */