@catalyst-cloud/schema 0.1.50 → 0.1.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@catalyst-cloud/schema",
-  "version": "0.1.50",
+  "version": "0.1.52",
   "type": "module",
   "description": "Typed Drizzle schema = single source of truth for the per-tenant Mirror DO SQLite store (CTC-13 / ADR-0002). Shared by the mirror Worker, the host-sync replica, and the browser OPFS replica.",
   "license": "MIT",

package/src/events/registry.ts

@@ -791,68 +791,86 @@ export const durableEventTypes = {
     wakes: false,
     entity: "ticket",
   },
-  // ── CTC-1597 — `intake` is the renamed `triage` phase, ADDITIVE beside it (D4). Same shape as the
-  // `phase.triage.*` block below; nothing in this repo emits these yet (the phase is dormant, outside
-  // RELAY_PHASES), declared now so CTC-1530 can be re-cut under the right name.
+  // CTC-1530 — `intake` joins `RELAY_PHASES` at its HEAD, gated dark behind `CATALYST_INTAKE_PHASE`.
+  // This block mirrors `phase.remediate.*`'s own set exactly (no git/rebase-specific suffixes —
+  // intake never touches a branch), so the generic phase-lifecycle/park machinery every relay phase
+  // already shares works for it with no special-casing. Supersedes CTC-1597's placeholder
+  // declaration of the same family (a smaller, `phase.triage.*`-shaped set, since at that point
+  // `intake` was still dormant outside `RELAY_PHASES`) now that this ticket makes it a real,
+  // lease-backed, preemptable phase.
   "phase.intake.abandoned": {
     rationale:
-      "ADR-0039 durable-fact example ('a phase started, completed, failed, or was preempted'): the phase's worker abandoned it — a lifecycle terminal fact. CTC-1597 — the renamed `triage` phase.",
+      "ADR-0039 durable-fact example ('a phase started, completed, failed, or was preempted'): the phase's worker abandoned it — a lifecycle terminal fact.",
     ingestVerb: "coordination.publish",
     wakes: false,
     entity: "ticket",
   },
   "phase.intake.boot-resume": {
     rationale:
-      "ADR-0039 durable-fact example ('a phase started, completed, failed, or was preempted'): the daemon restarted and resumed this phase — a real coordination fact about continuity across a restart. CTC-1597 — the renamed `triage` phase.",
+      "ADR-0039 durable-fact example ('a phase started, completed, failed, or was preempted'): the daemon restarted and resumed this phase — a real coordination fact about continuity across a restart.",
     ingestVerb: "coordination.publish",
     wakes: false,
     entity: "ticket",
   },
-  "phase.intake.complete": {
+  "phase.intake.boot-resume-gated": {
     rationale:
-      "ADR-0039 durable-fact example ('a phase started, completed, failed, or was preempted'): the phase reported success. CTC-1597 — the renamed `triage` phase.",
+      "ADR-0039 durable-fact example ('a phase started, completed, failed, or was preempted'): the daemon restarted but gated (did not immediately resume) this phase.",
     ingestVerb: "coordination.publish",
     wakes: false,
     entity: "ticket",
   },
-  "phase.intake.escalated": {
+  "phase.intake.complete": {
     rationale:
-      "ADR-0039 durable-fact example ('a phase started, completed, failed, or was preempted'): the phase escalated to a human. CTC-1597 — the renamed `triage` phase.",
+      "ADR-0039 durable-fact example ('a phase started, completed, failed, or was preempted'): the phase reported success.",
     ingestVerb: "coordination.publish",
-    wakes: { consumerClass: "host-channel" },
+    wakes: false,
     entity: "ticket",
   },
   "phase.intake.failed": {
     rationale:
-      "ADR-0039 durable-fact example ('a phase started, completed, failed, or was preempted'): the phase reported failure. CTC-1597 — the renamed `triage` phase.",
+      "ADR-0039 durable-fact example ('a phase started, completed, failed, or was preempted'): the phase reported failure.",
     ingestVerb: "coordination.publish",
     wakes: false,
     entity: "ticket",
   },
-  "phase.intake.failure-retracted": {
+  "phase.intake.orphan-detected": {
     rationale:
-      "ADR-0039 durable-fact example ('a phase started, completed, failed, or was preempted'): a previously-reported failure was retracted (corrected) — a real correction fact. CTC-1597 — the renamed `triage` phase.",
+      "ADR-0039 durable-fact example ('a phase started, completed, failed, or was preempted'): an orphaned phase-agent worker was detected — a coordination fact (state discovered), not a sample.",
     ingestVerb: "coordination.publish",
     wakes: false,
     entity: "ticket",
   },
-  "phase.intake.linear-transition": {
+  "phase.intake.park": {
     rationale:
-      "ADR-0039 durable-fact example ('a phase started, completed, failed, or was preempted'): the phase performed a real Linear ticket-state transition as part of its own execution. CTC-1597 — the renamed `triage` phase.",
+      "ADR-0039 durable-fact example ('a phase started, completed, failed, or was preempted'): the intake phase was PARKED after N consecutive failures (CTC-1270) — a terminal-until-released outcome, distinct from `phase.intake.failed`, which a reader must be able to tell apart. Paired with `phase.intake.revive`.",
     ingestVerb: "coordination.publish",
     wakes: false,
     entity: "ticket",
   },
-  "phase.intake.orphan-detected": {
+  "phase.intake.preempted": {
     rationale:
-      "ADR-0039 durable-fact example ('a phase started, completed, failed, or was preempted'): an orphaned phase-agent worker was detected — a coordination fact (state discovered), not a sample. CTC-1597 — the renamed `triage` phase.",
+      "ADR-0039 durable-fact example ('a phase started, completed, failed, or was preempted'): a higher-priority worker preempted this phase.",
+    ingestVerb: "coordination.publish",
+    wakes: false,
+    entity: "ticket",
+  },
+  "phase.intake.reclaim": {
+    rationale:
+      "ADR-0039 durable-fact example ('a phase started, completed, failed, or was preempted'): ownership of orphaned work was reclaimed by a new worker — an ownership transition akin to a lease reassignment.",
+    ingestVerb: "coordination.publish",
+    wakes: false,
+    entity: "ticket",
+  },
+  "phase.intake.resumed-after-preemption": {
+    rationale:
+      "ADR-0039 durable-fact example ('a phase started, completed, failed, or was preempted'): the phase resumed after being preempted earlier — the paired fact to *.preempted.",
     ingestVerb: "coordination.publish",
     wakes: false,
     entity: "ticket",
   },
   "phase.intake.revive": {
     rationale:
-      "ADR-0039 durable-fact example ('a phase started, completed, failed, or was preempted'): a parked phase was revived. CTC-1597 — the renamed `triage` phase.",
+      "ADR-0039 durable-fact example ('a phase started, completed, failed, or was preempted'): a repeated-failure park of the intake phase was revived (CTC-1270) — the paired fact to `phase.intake.park`.",
     ingestVerb: "coordination.publish",
     wakes: false,
     entity: "ticket",

package/src/migrations.generated.ts

@@ -277,6 +277,13 @@ export const MIRROR_MIGRATIONS = {
         tag: "0037_ctc1597_workflow_slot_intake",
         breakpoints: true,
       },
+      {
+        idx: 38,
+        version: "6",
+        when: 1788900456820,
+        tag: "0038_ctc1855_fleet_activity_routing",
+        breakpoints: true,
+      },
     ],
   },
   migrations: {
@@ -353,5 +360,7 @@ export const MIRROR_MIGRATIONS = {
       "CREATE TABLE `fleet_activity_rate` (\n\t`host_id` text NOT NULL,\n\t`ticket` text NOT NULL,\n\t`bucket_start_ms` integer NOT NULL,\n\t`events` integer NOT NULL,\n\tPRIMARY KEY(`host_id`, `ticket`, `bucket_start_ms`)\n);\n--> statement-breakpoint\nCREATE TABLE `fleet_anomalies` (\n\t`kind` text NOT NULL,\n\t`host_id` text NOT NULL,\n\t`ticket` text NOT NULL,\n\t`detected_at_ms` integer NOT NULL,\n\t`observed` integer NOT NULL,\n\t`baseline` integer NOT NULL,\n\t`detail` text,\n\t`updated_at` integer NOT NULL,\n\tPRIMARY KEY(`kind`, `host_id`, `ticket`)\n);\n--> statement-breakpoint\nCREATE TABLE `fleet_health_sends` (\n\t`host_id` text NOT NULL,\n\t`status` text NOT NULL,\n\t`status_changed_at_ms` integer NOT NULL,\n\t`sent_at_ms` integer NOT NULL,\n\t`delivered` integer NOT NULL,\n\t`failed` integer NOT NULL,\n\tPRIMARY KEY(`host_id`, `status`, `status_changed_at_ms`)\n);\n--> statement-breakpoint\nCREATE TABLE `fleet_host_liveness` (\n\t`host_id` text PRIMARY KEY NOT NULL,\n\t`status` text NOT NULL,\n\t`reason` text,\n\t`last_heartbeat_ms` integer,\n\t`last_activity_ms` integer,\n\t`last_seen_ms` integer,\n\t`period_ms` integer,\n\t`grace_ms` integer,\n\t`agent_version` text,\n\t`status_changed_at_ms` integer,\n\t`updated_at` integer NOT NULL\n);\n",
     "0037_ctc1597_workflow_slot_intake":
       "-- CTC-1597 — rename the persisted workflow slot `triage` -> `intake`.\n--\n-- ⭐ Deliberately a DATA migration in the SHARED bundle (the 0014/0031 pattern): the DO and every\n-- host / OPFS replica apply the same MIRROR_MIGRATIONS through the same runner, so each side renames\n-- its OWN rows locally. That converges every replica WITHOUT emitting a change_log delta per row\n-- (migrations bypass appendChange), so no ring-buffer flood.\n--\n-- ⚠️ THE REGISTRY D1 IS THE AUTHORITY and gets its own migration\n-- (apps/mirror/src/registry/migrations/20260903T1928_workflow_slot_intake.sql); this one exists\n-- because a D1-only rewrite bumps no `workflow_rev` and pushes nothing, so a DO that is never\n-- re-saved would sit on the old value forever. THIS migration is what makes the rename correct on\n-- every DO/replica, including one offline at merge time. There is no separate re-projection script:\n-- an already-connected browser/host that needs to see the rename before its own next open converges\n-- the ordinary way — an operator re-saving that team's stage mapping calls the existing full-replace\n-- projection handler (`handleWorkflowMappingUpsert`, MirrorDO.ts), which DOES emit a change_log\n-- delta. No new production route was added for a one-time rename.\n--\n-- PK-safe: (team_id, slot) — and the PK does NOT consider `removed_at`, so a SOFT-DELETED `intake`\n-- row still occupies the slot. Drop a stale `triage` row for a team that already holds ANY `intake`\n-- row — live or soft-deleted — then rename what is left. Idempotent under execReplaySafe replay — a\n-- row already renamed to `intake` no longer matches `slot = 'triage'` on a re-run.\n--\n-- ⛔ CTC-1597 remediate (C2): an earlier draft of the EXISTS guard filtered `removed_at IS NULL`,\n-- reasoning that a soft-deleted `intake` row should never cause a still-live `triage` row to be\n-- dropped instead of renamed. That reasoning had it backwards — the PK collision this guard exists\n-- to prevent happens precisely BECAUSE `removed_at` is not part of the primary key: a host that\n-- receives a soft-deleted `intake` row via replication (from a DO that already renamed and was then\n-- unmapped) before it has applied this migration locally still has its own live `triage` row: the\n-- DELETE's old filter left the `triage` row in place, and the following blind UPDATE then tried to\n-- rename it to a slot value a row already occupies, violating the PK and aborting the whole bundle.\n-- Matching on ANY `intake` row (regardless of `removed_at`) fixes it: the stale `triage` row is\n-- dropped, not renamed, whenever the slot is already spoken for.\n--\n-- ⛔ CTC-1597 remediate (validate-plan finding 1) — a `triage`-slot row whose OWN mapped state is\n-- ITSELF type='triage' (Linear's reserved Triage inbox, legally name-matched into the OLD\n-- `RECOMMENDED_STAGES` entry before this ticket) must NOT be renamed blind: `SLOT_STATE_TYPES.intake`\n-- no longer accepts that type (Scope B), so renaming it in place would silently flip the team's\n-- `types_compatible` check from pass to a blocking fail with no data fix and no recourse — the write\n-- path's own validation (the same narrowing) would refuse a re-save of the identical row. Soft-delete\n-- it instead, via `removed_at` — this table's own convention for \"this slot is unmapped\" (see the\n-- table's doc comment in packages/schema/src/mirror.ts) — so the team lands in the ordinary,\n-- already-actionable \"needs a stage\" state a brand-new team starts in, which Scope C's per-team\n-- runbook resolves. Runs BEFORE the final rename so no live-or-dead row anywhere keeps the retired\n-- `triage` slot value; guarded by `removed_at IS NULL` so a replay is a no-op.\nUPDATE `team_workflow_mapping`\n   SET `removed_at` = CAST(unixepoch() AS INTEGER) * 1000\n WHERE `slot` = 'triage' AND `linear_state_type` = 'triage' AND `removed_at` IS NULL;\n--> statement-breakpoint\nDELETE FROM `team_workflow_mapping`\n WHERE `slot` = 'triage'\n   AND EXISTS (SELECT 1 FROM `team_workflow_mapping` m2\n                WHERE m2.`team_id` = `team_workflow_mapping`.`team_id` AND m2.`slot` = 'intake');\n--> statement-breakpoint\nUPDATE `team_workflow_mapping` SET `slot` = 'intake' WHERE `slot` = 'triage';\n",
+    "0038_ctc1855_fleet_activity_routing":
+      "ALTER TABLE `fleet_activity` ADD `provider` text;--> statement-breakpoint\nALTER TABLE `fleet_activity` ADD `model` text;--> statement-breakpoint\nALTER TABLE `fleet_activity` ADD `effort` text;--> statement-breakpoint\nALTER TABLE `fleet_activity` ADD `routing_source` text;",
   },
 } as const;

package/src/mirror.ts

@@ -1179,6 +1179,14 @@ export const fleet_activity = sqliteTable(
     pr_number: integer("pr_number"),
     pr_url: text("pr_url"),
     orch_id: text("orch_id"),
+    // CTC-1855 — the CTC-1095 routing tuple a phase actually started with, projected from the
+    // worker.session.started / phase.<p>.complete attrs the runner already emits. COALESCE-forward
+    // in reduceFleetActivity (a tuple-less later event never wipes it). Nullable: sibling-daemon
+    // rows and pre-migration rows genuinely have no tuple, and absence must stay absence.
+    provider: text("provider"),
+    model: text("model"),
+    effort: text("effort"),
+    routing_source: text("routing_source"), // StageRouting.source verbatim: "exact" | "fallback"
     last_event_name: text("last_event_name"),
     last_event_ts: integer("last_event_ts"), // ms epoch — the reducer watermark
     updated_at: integer("updated_at"), // ms epoch — mirrors last_event_ts; upsertRow guard column