@rubytech/create-maxy-code 0.1.576 → 0.1.577

package/payload/server/server.js

@@ -757,7 +757,7 @@ var init_parse_transcript = __esm({
       webchat: "webchat",
       "webchat-channel": "webchat"
     };
-    COMPOSED_ADMIN_FRAME = /^(?:## Scheduled automation \(platform-verified\)\n[\s\S]*?\n\n)?(?:## Message provenance \(platform-verified\)\n[\s\S]*?\n\n)?(?:## Standing rules\n[\s\S]*?\n\n)?## Context\n([\s\S]*)\n\n## Instruction\n[\s\S]*$/;
+    COMPOSED_ADMIN_FRAME = /^(?:## Scheduled automation \(platform-verified\)\n[\s\S]*?\n\n)?(?:## Message provenance \(platform-verified\)\n[\s\S]*?\n\n)?(?:## Standing rules(?: \(account owner\))?\n[\s\S]*?\n\n)?## Context\n([\s\S]*)\n\n## Instruction\n[\s\S]*$/;
     SCHEDULED_MARKER_PREFIX = "## Scheduled automation (platform-verified)\n";
     UPLOAD_ANNOTATION = /(?:\n\n)?\[The operator uploaded \d+ file\(s\): [\s\S]*\]$/;
     REPLY_NOTE = /^\[In reply to an earlier message in this conversation(?:\.|: "([\s\S]*?)")\]\n\n/;
@@ -1911,8 +1911,9 @@ var require_dist2 = __commonJS({
       if (rules.length === 0)
         return "";
       const lines = rules.map((r) => `- ${r.value}`);
-      return `## Standing rules
-${lines.join("\n")}`;
+      return `## Standing rules (account owner)
+These standing rules belong to the account owner. Some of them may name the account owner in the third person. None of them says who sent this turn, so do not infer from them who is speaking.
+` + lines.join("\n");
     }
     async function resolveOwnerUserId3(session, accountId) {
       const res = await session.run(`
@@ -3018,6 +3019,40 @@ var require_keyboard = __commonJS({
   }
 });
 
+// ../lib/dispatch-read/dist/allocate.js
+var require_allocate = __commonJS({
+  "../lib/dispatch-read/dist/allocate.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.selectCandidates = selectCandidates2;
+    exports.overlaps = overlaps2;
+    function selectCandidates2(params) {
+      const { jobType, cfg, commitments } = params;
+      const type = cfg.jobTypes.find((t) => t.name === jobType);
+      if (!type) {
+        return { offered: [], excluded: [], required: "" };
+      }
+      const offered = [];
+      const excluded = [];
+      for (const worker of cfg.workers) {
+        if (!worker.qualifications.includes(type.requiredQualification)) {
+          excluded.push({ workerId: worker.workerId, reason: "missing-qualification" });
+          continue;
+        }
+        offered.push({
+          workerId: worker.workerId,
+          name: worker.name,
+          conflicts: commitments.get(worker.workerId) ?? []
+        });
+      }
+      return { offered, excluded, required: type.requiredQualification };
+    }
+    function overlaps2(a, b) {
+      return a.start < b.end && b.start < a.end;
+    }
+  }
+});
+
 // ../lib/dispatch-read/dist/session.js
 var require_session = __commonJS({
   "../lib/dispatch-read/dist/session.js"(exports) {
@@ -3217,7 +3252,7 @@ var require_read = __commonJS({
     exports.readJobList = readJobList2;
     exports.readCounts = readCounts2;
     var session_js_1 = require_session();
-    function num4(v) {
+    function num5(v) {
       if (typeof v === "number")
         return v;
       if (v && typeof v === "object" && "low" in v) {
@@ -3241,7 +3276,7 @@ var require_read = __commonJS({
         workerId: String(a.workerId),
         arrivedPressedAt: str2(a.arrivedPressedAt),
         arrivedObservedAt: str2(a.arrivedObservedAt),
-        arrivedObservedDistanceM: a.arrivedObservedDistanceM == null ? null : num4(a.arrivedObservedDistanceM)
+        arrivedObservedDistanceM: a.arrivedObservedDistanceM == null ? null : num5(a.arrivedObservedDistanceM)
       })).sort((x, y) => x.workerId < y.workerId ? -1 : x.workerId > y.workerId ? 1 : 0);
       const sole = attendances.length === 1 ? attendances[0] : null;
       return {
@@ -3334,12 +3369,12 @@ var require_read = __commonJS({
       }
       const g = r.records[0];
       return {
-        notes: num4(g.get("notes")),
-        media: num4(g.get("media")),
-        parts: num4(g.get("parts")),
-        checklistDone: num4(g.get("checklistDone")),
-        checklistTotal: num4(g.get("checklistTotal")),
-        signatures: num4(g.get("signatures"))
+        notes: num5(g.get("notes")),
+        media: num5(g.get("media")),
+        parts: num5(g.get("parts")),
+        checklistDone: num5(g.get("checklistDone")),
+        checklistTotal: num5(g.get("checklistTotal")),
+        signatures: num5(g.get("signatures"))
       };
     }
     async function readVisitsForJob3(session, accountId, jobId) {
@@ -3392,7 +3427,7 @@ var require_read = __commonJS({
           workerId,
           arrivedPressedAt: str2(g.get("ownArrivedPressedAt")),
           arrivedObservedAt: str2(g.get("ownArrivedObservedAt")),
-          arrivedObservedDistanceM: dist == null ? null : num4(dist)
+          arrivedObservedDistanceM: dist == null ? null : num5(dist)
         };
       });
     }
@@ -3517,9 +3552,9 @@ var require_read = __commonJS({
       const rad = g.get("geofenceRadiusM");
       return {
         siteId: String(g.get("siteId")),
-        latitude: lat == null ? null : num4(lat),
-        longitude: lon == null ? null : num4(lon),
-        geofenceRadiusM: rad == null ? null : num4(rad)
+        latitude: lat == null ? null : num5(lat),
+        longitude: lon == null ? null : num5(lon),
+        geofenceRadiusM: rad == null ? null : num5(rad)
       };
     }
     var DRAFT_RETURN = `d.draftId AS draftId, d.receivedAt AS receivedAt, d.source AS source,
@@ -3584,7 +3619,7 @@ var require_read = __commonJS({
         notes: g.get("notes") ?? [],
         // A count, not the references. A worker at a door needs to know whether
         // photographs exist before deciding to load them on a bad signal.
-        mediaCount: num4(g.get("mediaCount") ?? 0),
+        mediaCount: num5(g.get("mediaCount") ?? 0),
         ...projectAttendances2(g)
       }));
     }
@@ -3709,7 +3744,7 @@ var require_read = __commonJS({
             workerId,
             arrivedPressedAt: str2(g.get("ownArrivedPressedAt")),
             arrivedObservedAt: str2(g.get("ownArrivedObservedAt")),
-            arrivedObservedDistanceM: dist == null ? null : num4(dist)
+            arrivedObservedDistanceM: dist == null ? null : num5(dist)
           });
         });
       });
@@ -3749,9 +3784,9 @@ var require_read = __commonJS({
               sum(CASE WHEN overdue THEN 1 ELSE 0 END) AS overdue`, { accountId, nowIso, terminalJob: terminalJobStatuses2 });
         const g = r.records[0];
         return {
-          total: num4(g?.get("total")),
-          unallocated: num4(g?.get("unallocated")),
-          overdue: num4(g?.get("overdue"))
+          total: num5(g?.get("total")),
+          unallocated: num5(g?.get("unallocated")),
+          overdue: num5(g?.get("overdue"))
         };
       });
     }
@@ -3792,7 +3827,7 @@ var require_dist3 = __commonJS({
   "../lib/dispatch-read/dist/index.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.readWorkerDay = exports.readJobList = exports.readDay = exports.readCounts = exports.nonZuluStarts = exports.geofenceVerdict = exports.distanceM = exports.readVisitsInWindow = exports.readVisitsForJob = exports.readVisitRecordState = exports.readVisit = exports.readSiteLocation = exports.readSiteHistory = exports.readPreviousVisits = exports.readOpenVisitsForWorker = exports.readNodeId = exports.readJobs = exports.readJob = exports.readFieldVisit = exports.readDrafts = exports.readDraft = exports.readCommitments = exports.projectVisit = exports.projectJob = exports.projectFieldVisit = exports.buildJobListQuery = exports.zonedRangeBounds = exports.zonedDayStartUtc = exports.ymdInZone = exports.minutesIntoDay = exports.daysBetween = exports.currentWeekYmd = exports.addDaysYmd = exports.MAX_RANGE_DAYS = exports.resolveAccountZone = exports.withSession = exports.parseDispatchCallback = exports.dispatchCallbackData = exports.buildVisitKeyboard = exports.CALLBACK_DATA_MAX_BYTES = exports.workerForTelegramUser = exports.terminalVisitStatuses = exports.terminalJobStatuses = exports.loadDispatchConfig = exports.RECORDABLE_FIELDS = void 0;
+    exports.readWorkerDay = exports.readJobList = exports.readDay = exports.readCounts = exports.nonZuluStarts = exports.geofenceVerdict = exports.distanceM = exports.readVisitsInWindow = exports.readVisitsForJob = exports.readVisitRecordState = exports.readVisit = exports.readSiteLocation = exports.readSiteHistory = exports.readPreviousVisits = exports.readOpenVisitsForWorker = exports.readNodeId = exports.readJobs = exports.readJob = exports.readFieldVisit = exports.readDrafts = exports.readDraft = exports.readCommitments = exports.projectVisit = exports.projectJob = exports.projectFieldVisit = exports.buildJobListQuery = exports.zonedRangeBounds = exports.zonedDayStartUtc = exports.ymdInZone = exports.minutesIntoDay = exports.daysBetween = exports.currentWeekYmd = exports.addDaysYmd = exports.MAX_RANGE_DAYS = exports.resolveAccountZone = exports.withSession = exports.selectCandidates = exports.overlaps = exports.parseDispatchCallback = exports.dispatchCallbackData = exports.buildVisitKeyboard = exports.CALLBACK_DATA_MAX_BYTES = exports.workerForTelegramUser = exports.terminalVisitStatuses = exports.terminalJobStatuses = exports.loadDispatchConfig = exports.RECORDABLE_FIELDS = void 0;
     var config_js_1 = require_config();
     Object.defineProperty(exports, "RECORDABLE_FIELDS", { enumerable: true, get: function() {
       return config_js_1.RECORDABLE_FIELDS;
@@ -3822,6 +3857,13 @@ var require_dist3 = __commonJS({
     Object.defineProperty(exports, "parseDispatchCallback", { enumerable: true, get: function() {
       return keyboard_js_1.parseDispatchCallback;
     } });
+    var allocate_js_1 = require_allocate();
+    Object.defineProperty(exports, "overlaps", { enumerable: true, get: function() {
+      return allocate_js_1.overlaps;
+    } });
+    Object.defineProperty(exports, "selectCandidates", { enumerable: true, get: function() {
+      return allocate_js_1.selectCandidates;
+    } });
     var session_js_1 = require_session();
     Object.defineProperty(exports, "withSession", { enumerable: true, get: function() {
       return session_js_1.withSession;
@@ -12706,6 +12748,32 @@ function buildVisitKeyboard(p) {
   return { rows, dropped };
 }
 
+// ../lib/dispatch-read/src/allocate.ts
+function selectCandidates(params) {
+  const { jobType, cfg, commitments } = params;
+  const type = cfg.jobTypes.find((t) => t.name === jobType);
+  if (!type) {
+    return { offered: [], excluded: [], required: "" };
+  }
+  const offered = [];
+  const excluded = [];
+  for (const worker of cfg.workers) {
+    if (!worker.qualifications.includes(type.requiredQualification)) {
+      excluded.push({ workerId: worker.workerId, reason: "missing-qualification" });
+      continue;
+    }
+    offered.push({
+      workerId: worker.workerId,
+      name: worker.name,
+      conflicts: commitments.get(worker.workerId) ?? []
+    });
+  }
+  return { offered, excluded, required: type.requiredQualification };
+}
+function overlaps(a, b) {
+  return a.start < b.end && b.start < a.end;
+}
+
 // ../lib/dispatch-read/src/session.ts
 import { readFileSync as readFileSync15 } from "fs";
 import { resolve as resolve12 } from "path";
@@ -12989,6 +13057,30 @@ async function readOpenVisitsForWorker(session, accountId, workerId, terminalSta
     };
   });
 }
+async function readCommitments(session, accountId, from, to) {
+  const r = await session.run(
+    // One row per ATTENDANCE is correct here and nowhere else: a commitment
+    // belongs to a worker, so a two-worker visit legitimately commits both.
+    `MATCH (v:Visit {accountId: $accountId})-[:HAS_ATTENDANCE]->(:Attendance)-[:BY_ENGINEER]->(e:Engineer)
+     WHERE v.startDate < $to AND coalesce(v.endDate, v.startDate) > $from
+     RETURN e.engineerId AS workerId, v.visitId AS visitId,
+            v.startDate AS start, coalesce(v.endDate, v.startDate) AS end`,
+    { accountId, from, to }
+  );
+  const out = /* @__PURE__ */ new Map();
+  for (const g of r.records) {
+    const workerId = str(g.get("workerId"));
+    if (!workerId) continue;
+    const list = out.get(workerId) ?? [];
+    list.push({
+      visitId: String(g.get("visitId")),
+      start: String(g.get("start")),
+      end: String(g.get("end"))
+    });
+    out.set(workerId, list);
+  }
+  return out;
+}
 async function readSiteLocation(session, accountId, siteId) {
   const r = await session.run(
     `MATCH (s:Site {accountId: $accountId, siteId: $siteId})
@@ -13170,6 +13262,7 @@ var ZONE_FALLBACK = "UTC";
 var EMPTY_META = {
   vocabulary: { job: "", visit: "", worker: "" },
   statuses: [],
+  transitions: [],
   zone: ""
 };
 var PORTAL_VISITS_PUSH_INTERVAL_MS = 6e4;
@@ -13185,17 +13278,28 @@ function parseVisitRows(raw) {
     const visitId = typeof o.visitId === "string" ? o.visitId : "";
     if (!visitId) continue;
     const str2 = (v) => typeof v === "string" ? v : "";
+    const cnt = (v) => typeof v === "number" && Number.isFinite(v) ? v : 0;
     out.push({
       visitId,
       ownerId: str2(o.ownerId),
       jobId: str2(o.jobId),
       status: str2(o.status),
       startDate: str2(o.startDate),
-      purpose: str2(o.purpose)
+      purpose: str2(o.purpose),
+      notes: cnt(o.notes),
+      media: cnt(o.media),
+      parts: cnt(o.parts),
+      checklistDone: cnt(o.checklistDone),
+      checklistTotal: cnt(o.checklistTotal),
+      signatures: cnt(o.signatures)
     });
   }
   return out;
 }
+function num2(v) {
+  const n = Number(v?.toNumber?.() ?? v);
+  return Number.isFinite(n) ? n : 0;
+}
 async function readVisitsForAccount(accountId) {
   const session = getSession();
   try {
@@ -13207,6 +13311,12 @@ async function readVisitsForAccount(accountId) {
       // the worker sees no job and has nothing to report but confusion, where a
       // duplicate on the account-scope list is visible and reads as what it is.
       // The duplicate is real and is Task 2551.
+      // The record counts ride the visit row (Task 2511). One projection rather
+      // than a `readVisitRecordState` call per visit: this query already runs
+      // once for the whole account, and a per-visit round trip would multiply
+      // every tick by the account's whole visit history. The six expressions
+      // are `readVisitRecordState`'s own, so the two cannot disagree about what
+      // a count means.
       `MATCH (j:Job {accountId: $accountId})-[:HAS_VISIT]->(v:Visit {accountId: $accountId})
        OPTIONAL MATCH (v)-[:HAS_ATTENDANCE]->(:Attendance)-[:BY_ENGINEER]->(e:Engineer)
        RETURN toString(v.visitId) AS visitId,
@@ -13214,7 +13324,13 @@ async function readVisitsForAccount(accountId) {
               coalesce(toString(j.jobId), '') AS jobId,
               coalesce(toString(v.status), '') AS status,
               coalesce(toString(v.startDate), '') AS startDate,
-              coalesce(toString(v.purpose), '') AS purpose`,
+              coalesce(toString(v.purpose), '') AS purpose,
+              size(coalesce(v.notes, []))         AS notes,
+              size(coalesce(v.media, []))         AS media,
+              size(coalesce(v.parts, []))         AS parts,
+              size(coalesce(v.checklistDone, [])) AS checklistDone,
+              size(coalesce(v.checklist, []))     AS checklistTotal,
+              size(coalesce(v.signatures, []))    AS signatures`,
       { accountId }
     );
     return parseVisitRows([
@@ -13225,7 +13341,13 @@ async function readVisitsForAccount(accountId) {
           jobId: rec.get("jobId"),
           status: rec.get("status"),
           startDate: rec.get("startDate"),
-          purpose: rec.get("purpose")
+          purpose: rec.get("purpose"),
+          notes: num2(rec.get("notes")),
+          media: num2(rec.get("media")),
+          parts: num2(rec.get("parts")),
+          checklistDone: num2(rec.get("checklistDone")),
+          checklistTotal: num2(rec.get("checklistTotal")),
+          signatures: num2(rec.get("signatures"))
         }))
       }
     ]);
@@ -13256,8 +13378,72 @@ async function readRosterForAccount(accountId, workers) {
     await session.close();
   }
 }
+async function readCandidatesForAccount(accountId, cfg) {
+  const session = getSession();
+  try {
+    const open3 = await session.run(
+      `MATCH (j:Job {accountId: $accountId})-[:HAS_VISIT]->(v:Visit {accountId: $accountId})
+       WHERE NOT (v)-[:HAS_ATTENDANCE]->()
+       RETURN toString(v.visitId) AS visitId,
+              coalesce(toString(j.jobType), '') AS jobType,
+              coalesce(toString(v.startDate), '') AS startDate,
+              coalesce(toString(v.endDate), toString(v.startDate), '') AS endDate`,
+      { accountId }
+    );
+    if (open3.records.length === 0) return [];
+    const windows = open3.records.map((rec) => ({
+      visitId: String(rec.get("visitId")),
+      jobType: String(rec.get("jobType")),
+      start: String(rec.get("startDate")),
+      end: String(rec.get("endDate"))
+    }));
+    const dated = windows.filter((w) => w.start !== "");
+    const from = dated.reduce((lo, w) => lo === "" || w.start < lo ? w.start : lo, "");
+    const to = dated.reduce((hi, w) => w.end > hi ? w.end : hi, "");
+    const committed = from === "" ? /* @__PURE__ */ new Map() : await readCommitments(session, accountId, from, to);
+    const out = [];
+    const nameOf = new Map(cfg.workers.map((w) => [w.workerId, w.name]));
+    for (const w of windows) {
+      const windowed = new Map(
+        [...committed].map(([workerId, list]) => [
+          workerId,
+          // A visit with no start overlaps nothing rather than everything: an
+          // undated visit is already listed separately by the page, and
+          // reporting the whole roster as clashing with it would be false.
+          w.start === "" ? [] : list.filter((c) => overlaps({ start: w.start, end: w.end }, c))
+        ])
+      );
+      const selection = selectCandidates({ jobType: w.jobType, cfg, commitments: windowed });
+      for (const c of selection.offered) {
+        out.push({
+          visitId: w.visitId,
+          workerId: c.workerId,
+          name: c.name,
+          kind: "offered",
+          reason: "",
+          conflicts: c.conflicts
+        });
+      }
+      for (const e of selection.excluded) {
+        out.push({
+          visitId: w.visitId,
+          workerId: e.workerId,
+          // The config is the authority on a worker's name, and an excluded
+          // worker is never in `selection.offered` to carry one.
+          name: nameOf.get(e.workerId) ?? "",
+          kind: "excluded",
+          reason: e.reason,
+          conflicts: []
+        });
+      }
+    }
+    return out;
+  } finally {
+    await session.close();
+  }
+}
 async function pushVisitsForAccount(opts) {
-  const { accountId, client, rows, roster, meta, log: log2 } = opts;
+  const { accountId, client, rows, roster, meta, candidates, log: log2 } = opts;
   const unbound = rows.filter((r) => r.ownerId === "").length;
   const seen = /* @__PURE__ */ new Set();
   const shared = /* @__PURE__ */ new Set();
@@ -13268,7 +13454,7 @@ async function pushVisitsForAccount(opts) {
   const unresolved = roster.filter((w) => w.ownerId === "").length;
   if (rows.length === 0 && roster.length === 0) {
     log2(`${TAG19} op=skip account=${accountId} reason=no-visits-no-roster`);
-    return { rows: 0, unbound: 0, roster: 0, unresolved: 0 };
+    return { rows: 0, unbound: 0, roster: 0, unresolved: 0, candidates: 0 };
   }
   const state = await client.query(
     "SELECT currentGeneration FROM visits_state WHERE accountId = ?",
@@ -13281,8 +13467,23 @@ async function pushVisitsForAccount(opts) {
   const next = Math.max(current, Number(staged[0]?.g ?? 0)) + 1;
   for (const row of rows) {
     await client.query(
-      "INSERT INTO visits (accountId, visitId, ownerId, jobId, status, startDate, purpose, generation) VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
-      [accountId, row.visitId, row.ownerId, row.jobId, row.status, row.startDate, row.purpose, next]
+      "INSERT INTO visits (accountId, visitId, ownerId, jobId, status, startDate, purpose, notes, media, parts, checklistDone, checklistTotal, signatures, generation) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+      [
+        accountId,
+        row.visitId,
+        row.ownerId,
+        row.jobId,
+        row.status,
+        row.startDate,
+        row.purpose,
+        row.notes,
+        row.media,
+        row.parts,
+        row.checklistDone,
+        row.checklistTotal,
+        row.signatures,
+        next
+      ]
     );
   }
   for (const w of roster) {
@@ -13293,19 +13494,26 @@ async function pushVisitsForAccount(opts) {
   }
   if (roster.length > 0) {
     await client.query(
-      "INSERT INTO dispatch_meta (accountId, vocabulary, statuses, zone, publishedAt, generation) VALUES (?, ?, ?, ?, ?, ?)",
+      "INSERT INTO dispatch_meta (accountId, vocabulary, statuses, transitions, zone, publishedAt, generation) VALUES (?, ?, ?, ?, ?, ?, ?)",
       [
         accountId,
         JSON.stringify(meta.vocabulary),
         JSON.stringify(meta.statuses),
+        JSON.stringify(meta.transitions),
         meta.zone,
         (/* @__PURE__ */ new Date()).toISOString(),
         next
       ]
     );
   }
+  for (const c of candidates) {
+    await client.query(
+      "INSERT INTO visit_candidates (accountId, visitId, workerId, name, kind, reason, conflicts, generation) VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
+      [accountId, c.visitId, c.workerId, c.name, c.kind, c.reason, JSON.stringify(c.conflicts), next]
+    );
+  }
   log2(
-    `${TAG19} op=stage account=${accountId} generation=${next} rows=${rows.length} visits=${seen.size} shared=${shared.size} roster=${roster.length}`
+    `${TAG19} op=stage account=${accountId} generation=${next} rows=${rows.length} visits=${seen.size} shared=${shared.size} roster=${roster.length} candidates=${candidates.length}`
   );
   await client.query(
     "INSERT INTO visits_state (accountId, currentGeneration) VALUES (?, ?) ON CONFLICT (accountId) DO UPDATE SET currentGeneration = excluded.currentGeneration WHERE excluded.currentGeneration > visits_state.currentGeneration",
@@ -13325,6 +13533,7 @@ async function pushVisitsForAccount(opts) {
       unbound,
       roster: roster.length,
       unresolved,
+      candidates: candidates.length,
       generation: next,
       superseded: true
     };
@@ -13345,12 +13554,23 @@ async function pushVisitsForAccount(opts) {
       accountId,
       next
     ]);
+    await client.query("DELETE FROM visit_candidates WHERE accountId = ? AND generation < ?", [
+      accountId,
+      next
+    ]);
   } catch (err) {
     log2(
       `${TAG19} op=sweep account=${accountId} generation=${next} result=failed err="${err instanceof Error ? err.message : String(err)}"`
     );
   }
-  return { rows: rows.length, unbound, roster: roster.length, unresolved, generation: next };
+  return {
+    rows: rows.length,
+    unbound,
+    roster: roster.length,
+    unresolved,
+    candidates: candidates.length,
+    generation: next
+  };
 }
 function visitsStateFilePath(platformRoot5) {
   return resolve13(platformRoot5, "..", "data", "portal-visits-state.json");
@@ -13358,17 +13578,40 @@ function visitsStateFilePath(platformRoot5) {
 function visitsDigest(rows) {
   const h = createHash3("sha256");
   for (const r of [...rows].sort((a, b) => a.visitId.localeCompare(b.visitId))) {
-    h.update(JSON.stringify([r.visitId, r.ownerId, r.jobId, r.status, r.startDate, r.purpose]));
+    h.update(
+      JSON.stringify([
+        r.visitId,
+        r.ownerId,
+        r.jobId,
+        r.status,
+        r.startDate,
+        r.purpose,
+        // Task 2511's counts are fields of a visit, so they belong in the
+        // visits half. Listed explicitly rather than spread, because the array
+        // literal is what fixes field order here rather than key insertion.
+        r.notes,
+        r.media,
+        r.parts,
+        r.checklistDone,
+        r.checklistTotal,
+        r.signatures
+      ])
+    );
   }
   return h.digest("hex");
 }
-function payloadDigest(rows, roster, meta) {
+function payloadDigest(rows, roster, meta, candidates) {
   const h = createHash3("sha256");
   h.update(visitsDigest(rows));
   for (const w of [...roster].sort((a, b) => a.workerId.localeCompare(b.workerId))) {
     h.update(JSON.stringify([w.workerId, w.ownerId, w.name, w.workingHours]));
   }
-  h.update(JSON.stringify([meta.vocabulary, meta.statuses, meta.zone]));
+  h.update(JSON.stringify([meta.vocabulary, meta.statuses, meta.transitions, meta.zone]));
+  for (const c of [...candidates].sort(
+    (a, b) => a.visitId.localeCompare(b.visitId) || a.workerId.localeCompare(b.workerId)
+  )) {
+    h.update(JSON.stringify([c.visitId, c.workerId, c.name, c.kind, c.reason, c.conflicts]));
+  }
   return h.digest("hex");
 }
 function readVisitsPushState(platformRoot5) {
@@ -13416,9 +13659,11 @@ async function runPortalVisitsPush(root) {
       const meta = cfg.present ? {
         vocabulary: cfg.value.vocabulary,
         statuses: cfg.value.statuses.visit,
+        transitions: cfg.value.statuses.visitTransitions,
         zone: await resolveAccountZone(portal.accountId) ?? ZONE_FALLBACK
       } : EMPTY_META;
-      const digest = payloadDigest(rows, roster, meta);
+      const candidates = cfg.present ? await readCandidatesForAccount(portal.accountId, cfg.value) : [];
+      const digest = payloadDigest(rows, roster, meta, candidates);
       const unresolved = roster.filter((w) => w.ownerId === "").length;
       if (state[portal.accountId]?.digest === digest && (rows.length > 0 || roster.length > 0)) {
         recordVisitsPush(root, portal.accountId, {
@@ -13443,10 +13688,11 @@ async function runPortalVisitsPush(root) {
         rows,
         roster,
         meta,
+        candidates,
         log: (l) => console.error(l)
       });
       console.error(
-        `${TAG19} op=push account=${portal.accountId} visits=${rows.length} pushed=${r.rows} roster=${r.roster} workers-unresolved=${r.unresolved} ms=${Date.now() - startedAt}`
+        `${TAG19} op=push account=${portal.accountId} visits=${rows.length} pushed=${r.rows} roster=${r.roster} workers-unresolved=${r.unresolved} transitions=${meta.transitions.length} candidates=${r.candidates} ms=${Date.now() - startedAt}`
       );
       if (r.generation !== void 0) {
         recordVisitsPush(root, portal.accountId, {
@@ -13491,12 +13737,15 @@ function parsePendingStatusRows(raw) {
       statusAt: str2(o.statusAt),
       dayHundredths: typeof o.dayHundredths === "number" ? o.dayHundredths : 0,
       workDate: str2(o.workDate),
-      workNote: str2(o.workNote)
+      workNote: str2(o.workNote),
+      assignedOwnerId: str2(o.assignedOwnerId),
+      startDate: str2(o.startDate)
     });
   }
   return out;
 }
 var WORK_DATE_RE = /^\d{4}-\d{2}-\d{2}$/;
+var INSTANT_RE = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/;
 function buildVisitStatusWrite(accountId, row) {
   const base = {
     accountId,
@@ -13504,6 +13753,72 @@ function buildVisitStatusWrite(accountId, row) {
     status: row.status,
     statusAt: row.statusAt
   };
+  if (row.assignedOwnerId !== "" || row.startDate !== "") {
+    if (row.startDate !== "" && !INSTANT_RE.test(row.startDate)) return { kind: "bad-instant" };
+    if (row.dayHundredths > 0) return { kind: "move-with-labour" };
+    return {
+      kind: "move",
+      // EXACTLY ONE ATTENDANCE to replace, and EXACTLY ONE ENGINEER to replace
+      // it with, or nothing runs at all.
+      //
+      // A visit two workers share cannot be re-assigned by replacing "the"
+      // attendance: whichever went, the other worker would silently lose the
+      // job and the arrival times they had already pressed. A per-worker move
+      // is Task 2551. The engineer gate is the mirror: the `portalOwnerId`
+      // binding is a property and is not unique by construction, so an id
+      // naming several must not resolve to whichever came back first. Both turn
+      // into the zero count this function already returns for a visit missing
+      // its job, so the row stays unclaimed and counted.
+      //
+      // NO `CALL` SUBQUERY, deliberately. A returning subquery replaces each
+      // outer row with the rows it yields, so one that yields nothing on a
+      // status-only or re-time-only edit would eliminate the visit before the
+      // SET ran: the re-timing would write nothing, return 0, and the row would
+      // never drain. A unit subquery does not filter, but then an unresolvable
+      // ownerId would leave the SET running and the row CLAIMED with nobody
+      // moved. Both gates therefore sit in the main query's WHERE, where they
+      // fail the whole statement, and the writes ride FOREACH over lists that
+      // are empty when this edit re-assigns nobody.
+      //
+      // The re-assignment REPLACES rather than adds, because a drag onto
+      // another worker's row means "move this", not "add a second person". The
+      // attendance key is `engineerId + '-' + visitId`, the key
+      // `dispatch-allocate` merges on, so allocating that worker to that visit
+      // afterwards is a no-op rather than a second attendance — and the delete
+      // skips an attendance already held by the incoming engineer, so
+      // re-assigning somebody to the visit they are already on keeps the
+      // arrival times they pressed instead of resetting them.
+      cypher: `MATCH (v:Visit {accountId: $accountId, visitId: $visitId})
+               OPTIONAL MATCH (v)-[:HAS_ATTENDANCE]->(a:Attendance)
+               WITH v, collect(a) AS atts
+               OPTIONAL MATCH (e:Engineer {accountId: $accountId})
+                 WHERE $assignedOwnerId <> ''
+                   AND e.portalOwnerId = $assignedOwnerId
+                   AND e.engineerId IS NOT NULL
+               WITH v, atts, collect(e) AS es
+               WHERE $assignedOwnerId = '' OR (size(atts) = 1 AND size(es) = 1)
+               SET v.status = $status, v.statusAt = $statusAt
+               FOREACH (_ IN CASE WHEN $startDate <> '' THEN [1] ELSE [] END |
+                 SET v.startDate = $startDate)
+               FOREACH (old IN [x IN atts
+                   WHERE NOT x.engineerId IN [eng IN es | eng.engineerId]] |
+                 DETACH DELETE old)
+               FOREACH (eng IN es |
+                 MERGE (a2:Attendance {
+                   accountId: $accountId,
+                   attendanceId: eng.engineerId + '-' + $visitId
+                 })
+                   ON CREATE SET a2.engineerId = eng.engineerId, a2.createdAt = $statusAt
+                 MERGE (v)-[:HAS_ATTENDANCE]->(a2)
+                 MERGE (a2)-[:BY_ENGINEER]->(eng))
+               RETURN count(v) AS n`,
+      params: {
+        ...base,
+        assignedOwnerId: row.assignedOwnerId,
+        startDate: row.startDate
+      }
+    };
+  }
   if (row.dayHundredths <= 0) {
     return {
       kind: "status",
@@ -13562,6 +13877,14 @@ async function pullVisitStatusForAccount(opts) {
       await claim(row.id);
       merged += 1;
       log2(`${TAG20} op=merged account=${accountId} id=${row.id} labour=${row.dayHundredths > 0}`);
+      const fields = ["status"];
+      if (row.workDate !== "") fields.push("workDate");
+      if (row.workNote !== "") fields.push("workNote");
+      if (row.assignedOwnerId !== "") fields.push("assignedOwnerId");
+      if (row.startDate !== "") fields.push("startDate");
+      for (const field2 of fields) {
+        log2(`${TAG20} op=applied visitId=${row.visitId} field=${field2}`);
+      }
     } catch (err) {
       failed2 += 1;
       const detail = err.message.split("\n")[0].replaceAll('"', "'").slice(0, 160);
@@ -13589,7 +13912,7 @@ async function runPortalVisitsPull(root) {
       const pending = parsePendingStatusRows(
         await cf.d1Exec(
           portal.portalDbName,
-          "SELECT id, visitId, ownerId, status, statusAt, dayHundredths, workDate, workNote FROM visit_status WHERE accountId = ? AND claimed = 0",
+          "SELECT id, visitId, ownerId, status, statusAt, dayHundredths, workDate, workNote, assignedOwnerId, startDate FROM visit_status WHERE accountId = ? AND claimed = 0",
           [portal.accountId]
         )
       );
@@ -13598,7 +13921,9 @@ async function runPortalVisitsPull(root) {
         pending,
         applyToGraph: async (accountId, row) => {
           const write = buildVisitStatusWrite(accountId, row);
-          if (write.kind === "undated") return false;
+          if (write.kind === "undated" || write.kind === "bad-instant" || write.kind === "move-with-labour") {
+            return false;
+          }
           const session = getSession();
           try {
             const res = await session.run(write.cypher, write.params);
@@ -13642,7 +13967,7 @@ function buildVisitsAuditLine(input) {
     input.d1Error !== null ? `d1:${auditErrorText(input.d1Error)}` : null,
     input.neo4jError !== null ? `neo4j:${auditErrorText(input.neo4jError)}` : null
   ].filter(Boolean).join(" | ");
-  return `${TAG21} account=${input.accountId} pushedRows=${na(input.pushedRows)} graphVisits=${na(input.graphVisits)} unboundVisits=${na(input.unboundVisits)} pendingStatusRows=${na(input.pendingStatusRows)} oldestPendingHrs=${na(input.oldestPendingHrs, 1)} unresolvedVisitIds=${na(input.unresolvedVisitIds)} labourClaims=${na(input.labourClaims)} labourCosts=${na(input.labourCosts)} undatedClaims=${na(input.undatedClaims)} lastPushAgeSec=${na(input.lastPushAgeSec)}` + (degradation ? ` degraded=${degradation} err="${reasons}"` : "");
+  return `${TAG21} account=${input.accountId} pushedRows=${na(input.pushedRows)} graphVisits=${na(input.graphVisits)} unboundVisits=${na(input.unboundVisits)} pendingStatusRows=${na(input.pendingStatusRows)} oldestPendingHrs=${na(input.oldestPendingHrs, 1)} unresolvedVisitIds=${na(input.unresolvedVisitIds)} labourClaims=${na(input.labourClaims)} labourCosts=${na(input.labourCosts)} undatedClaims=${na(input.undatedClaims)} stalePendingRows=${na(input.stalePendingRows)} lastPushAgeSec=${na(input.lastPushAgeSec)}` + (degradation ? ` degraded=${degradation} err="${reasons}"` : "");
 }
 function readLastVisitsPushAgeSec(platformRoot5, accountId, nowMs) {
   try {
@@ -13655,7 +13980,7 @@ function readLastVisitsPushAgeSec(platformRoot5, accountId, nowMs) {
     return null;
   }
 }
-var num2 = (raw, field2) => {
+var num3 = (raw, field2) => {
   const envelope = Array.isArray(raw) ? raw[0] : null;
   const results = envelope?.results;
   if (!Array.isArray(results)) {
@@ -13681,12 +14006,13 @@ async function runPortalVisitsAudit(root) {
     let unresolvedVisitIds = null;
     let labourClaims = null;
     let undatedClaims = null;
+    let stalePendingRows = null;
     let d1Error = null;
     try {
       if (!SAFE_ACCOUNT_ID3.test(portal.accountId)) {
         throw new Error(`refusing to query for unsafe accountId "${portal.accountId}"`);
       }
-      pushedRows = num2(
+      pushedRows = num3(
         await cf.d1Exec(
           portal.portalDbName,
           "SELECT COUNT(*) AS n FROM visits v JOIN visits_state s ON s.accountId = v.accountId AND s.currentGeneration = v.generation WHERE v.accountId = ?",
@@ -13694,7 +14020,7 @@ async function runPortalVisitsAudit(root) {
         ),
         "n"
       );
-      unboundVisits = num2(
+      unboundVisits = num3(
         await cf.d1Exec(
           portal.portalDbName,
           "SELECT COUNT(*) AS n FROM visits v JOIN visits_state s ON s.accountId = v.accountId AND s.currentGeneration = v.generation WHERE v.accountId = ? AND v.ownerId = ''",
@@ -13707,12 +14033,12 @@ async function runPortalVisitsAudit(root) {
         "SELECT COUNT(*) AS n, MIN(statusAt) AS oldest FROM visit_status WHERE accountId = ? AND claimed = 0",
         [portal.accountId]
       );
-      pendingStatusRows = num2(pending, "n");
+      pendingStatusRows = num3(pending, "n");
       const envelope = Array.isArray(pending) ? pending[0] : null;
       const oldest = envelope?.results?.[0]?.oldest;
       const oldestMs = typeof oldest === "string" ? Date.parse(oldest) : NaN;
       oldestPendingHrs = Number.isNaN(oldestMs) ? pendingStatusRows === 0 ? 0 : null : Math.max(0, (nowMs - oldestMs) / 36e5);
-      unresolvedVisitIds = num2(
+      unresolvedVisitIds = num3(
         await cf.d1Exec(
           portal.portalDbName,
           "SELECT COUNT(*) AS n FROM visit_status vs WHERE vs.accountId = ? AND vs.claimed = 0 AND NOT EXISTS (SELECT 1 FROM visits v JOIN visits_state s ON s.accountId = v.accountId AND s.currentGeneration = v.generation WHERE v.accountId = vs.accountId AND v.visitId = vs.visitId)",
@@ -13720,7 +14046,7 @@ async function runPortalVisitsAudit(root) {
         ),
         "n"
       );
-      labourClaims = num2(
+      labourClaims = num3(
         await cf.d1Exec(
           portal.portalDbName,
           "SELECT COUNT(*) AS n FROM visit_status WHERE accountId = ? AND claimed = 0 AND dayHundredths > 0",
@@ -13728,7 +14054,7 @@ async function runPortalVisitsAudit(root) {
         ),
         "n"
       );
-      undatedClaims = num2(
+      undatedClaims = num3(
         await cf.d1Exec(
           portal.portalDbName,
           "SELECT COUNT(*) AS n FROM visit_status WHERE accountId = ? AND claimed = 0 AND dayHundredths > 0 AND workDate NOT GLOB '[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]'",
@@ -13736,6 +14062,15 @@ async function runPortalVisitsAudit(root) {
         ),
         "n"
       );
+      const staleCutoff = new Date(nowMs - 2 * PORTAL_VISITS_PULL_INTERVAL_MS).toISOString();
+      stalePendingRows = num3(
+        await cf.d1Exec(
+          portal.portalDbName,
+          "SELECT COUNT(*) AS n FROM visit_status WHERE accountId = ? AND claimed = 0 AND statusAt < ?",
+          [portal.accountId, staleCutoff]
+        ),
+        "n"
+      );
     } catch (err) {
       d1Error = err.message;
     }
@@ -13774,6 +14109,7 @@ async function runPortalVisitsAudit(root) {
         labourClaims,
         labourCosts,
         undatedClaims,
+        stalePendingRows,
         lastPushAgeSec: readLastVisitsPushAgeSec(root, portal.accountId, nowMs),
         d1Error,
         neo4jError
@@ -30168,7 +30504,7 @@ app55.get("/", requireAdminSession, async (c) => {
   }
 });
 function mapRun(props) {
-  const num4 = (v) => {
+  const num5 = (v) => {
     if (v === null || v === void 0) return null;
     if (typeof v === "number") return v;
     if (typeof v === "object" && typeof v.toNumber === "function") {
@@ -30188,11 +30524,11 @@ function mapRun(props) {
     startedAt: props.startedAt,
     endedAt: props.endedAt ?? null,
     finishedAt: props.finishedAt ?? null,
-    ranMs: num4(props.ranMs),
-    httpStatus: num4(props.httpStatus),
+    ranMs: num5(props.ranMs),
+    httpStatus: num5(props.httpStatus),
     dispatchResult: props.dispatchResult ?? null,
     sessionKey: props.sessionKey ?? null,
-    transcriptOffset: num4(props.transcriptOffset),
+    transcriptOffset: num5(props.transcriptOffset),
     // Strict identity: an absent or null `bounded` means the boundary was never
     // established, which is the false case.
     bounded: props.bounded === true,
@@ -33931,7 +34267,7 @@ function formatConfigAuditLine(a, accountId) {
 function formatRecordCensus(f, accountId) {
   return `${RECORD_CENSUS_TAG}${accountId ? ` account=${accountId}` : ""} closedVisits=${f.closedVisits} withNote=${f.withNote} withMedia=${f.withMedia} medianRecordLagS=${f.medianRecordLagS} p90RecordLagS=${f.p90RecordLagS}`;
 }
-function num3(v) {
+function num4(v) {
   if (typeof v === "number") return v;
   if (v && typeof v === "object" && "low" in v) {
     return Number(v.low);
@@ -34027,15 +34363,15 @@ async function readCensusCounts(session, accountId, terminal, now) {
     { accountId, canonical: `^${CANONICAL_INSTANT_PATTERN}$` }
   );
   return {
-    jobs: num3(g?.get("jobs")),
-    unallocated: num3(g?.get("unallocated")),
+    jobs: num4(g?.get("jobs")),
+    unallocated: num4(g?.get("unallocated")),
     oldestUnallocatedAgeH,
-    overdue: num3(g?.get("overdue")),
-    visitsOpen: num3(vg?.get("visitsOpen")),
-    visitsOpenOver24h: num3(vg?.get("visitsOpenOver24h")),
-    intakeUnreviewed: num3(dg?.get("intakeUnreviewed")),
+    overdue: num4(g?.get("overdue")),
+    visitsOpen: num4(vg?.get("visitsOpen")),
+    visitsOpenOver24h: num4(vg?.get("visitsOpenOver24h")),
+    intakeUnreviewed: num4(dg?.get("intakeUnreviewed")),
     oldestIntakeAgeH,
-    nonCanonicalInstants: num3(nc.records[0]?.get("nonCanonicalInstants"))
+    nonCanonicalInstants: num4(nc.records[0]?.get("nonCanonicalInstants"))
   };
 }
 async function readRecordCensus(session, accountId, terminal, now) {
@@ -34053,8 +34389,8 @@ async function readRecordCensus(session, accountId, terminal, now) {
   let withMedia = 0;
   const lags = [];
   for (const g of r.records) {
-    if (num3(g.get("notes")) > 0) withNote++;
-    if (num3(g.get("media")) > 0) withMedia++;
+    if (num4(g.get("notes")) > 0) withNote++;
+    if (num4(g.get("media")) > 0) withMedia++;
     const closedAt = g.get("closedAt");
     const dueToLeaveAt = g.get("dueToLeaveAt");
     if (typeof closedAt === "string" && typeof dueToLeaveAt === "string") {
@@ -35489,15 +35825,15 @@ function createWaChannelRoutes(deps) {
     }
     const interactive = body?.interactive === true;
     const finalText = typeof body?.finalText === "string" ? body.finalText : "";
-    const num4 = (v) => typeof v === "number" && Number.isFinite(v) ? v : -1;
-    const finalBytes = num4(body?.finalBytes);
-    const queueDepth = num4(body?.queueDepth);
-    const pendingTurns = num4(body?.pendingTurns);
-    const consumed2 = num4(body?.consumed);
+    const num5 = (v) => typeof v === "number" && Number.isFinite(v) ? v : -1;
+    const finalBytes = num5(body?.finalBytes);
+    const queueDepth = num5(body?.queueDepth);
+    const pendingTurns = num5(body?.pendingTurns);
+    const consumed2 = num5(body?.consumed);
     const source = typeof body?.source === "string" ? body.source : null;
     const sid = sessionId.slice(0, 8);
     console.error(
-      `[whatsapp-native] op=turn-context sessionId=${sid} cacheReadTokens=${num4(body?.cacheReadTokens)} inputTokens=${num4(body?.inputTokens)} outputTokens=${num4(body?.outputTokens)} thinkingBlocks=${num4(body?.thinkingBlocks)} thinkingChars=${num4(body?.thinkingChars)}`
+      `[whatsapp-native] op=turn-context sessionId=${sid} cacheReadTokens=${num5(body?.cacheReadTokens)} inputTokens=${num5(body?.inputTokens)} outputTokens=${num5(body?.outputTokens)} thinkingBlocks=${num5(body?.thinkingBlocks)} thinkingChars=${num5(body?.thinkingChars)}`
     );
     const role = body?.role;
     if (role !== "admin" && role !== "public") {
@@ -36459,12 +36795,12 @@ function createWebchatChannelRoutes(deps) {
     const finalBytes = typeof body?.finalBytes === "number" && Number.isFinite(body.finalBytes) ? body.finalBytes : 0;
     const k = key2.slice(0, 8);
     const sid = sessionId.slice(0, 8);
-    const num4 = (v) => typeof v === "number" && Number.isFinite(v) ? v : -1;
+    const num5 = (v) => typeof v === "number" && Number.isFinite(v) ? v : -1;
     console.error(
-      `[webchat-native] op=turn-context sessionId=${sid} cacheReadTokens=${num4(body?.cacheReadTokens)} inputTokens=${num4(body?.inputTokens)} outputTokens=${num4(body?.outputTokens)} thinkingBlocks=${num4(body?.thinkingBlocks)} thinkingChars=${num4(body?.thinkingChars)}`
+      `[webchat-native] op=turn-context sessionId=${sid} cacheReadTokens=${num5(body?.cacheReadTokens)} inputTokens=${num5(body?.inputTokens)} outputTokens=${num5(body?.outputTokens)} thinkingBlocks=${num5(body?.thinkingBlocks)} thinkingChars=${num5(body?.thinkingChars)}`
     );
-    const segmentStart = num4(body?.segmentStart);
-    const segmentEnd = num4(body?.segmentEnd);
+    const segmentStart = num5(body?.segmentStart);
+    const segmentEnd = num5(body?.segmentEnd);
     const resolved = deps.onTurnEnd?.(key2, role, { sessionId, segmentStart, segmentEnd }) ?? "none";
     const resolvedField = role === "public" ? ` resolved=${resolved}` : "";
     console.error(`[webchat-native] op=turn-end channel=webchat key=${k} role=${role} sessionId=${sid} trailing=${finalBytes}${resolvedField}`);
@@ -37821,38 +38157,38 @@ function followerCensusTick(deps, state = makeCensusState()) {
   const bound = deps.bound();
   const live = new Set(deps.live());
   for (const senderId of live) state.attempts.delete(senderId);
-  const missing = bound.filter((b) => !live.has(b.senderId));
+  const missing = bound.filter((senderId) => !live.has(senderId));
   console.error(
-    `[channel-follower] op=follower-census bound=${bound.length} attached=${live.size} missing=${missing.length} missingSenders=${missing.map((m) => id82(m.senderId)).join(",") || "none"}`
+    `[channel-follower] op=follower-census channel=${deps.channel} bound=${bound.length} attached=${live.size} missing=${missing.length} missingSenders=${missing.map(id82).join(",") || "none"}`
   );
-  for (const m of missing) {
-    const used = state.attempts.get(m.senderId) ?? 0;
+  for (const senderId of missing) {
+    const used = state.attempts.get(senderId) ?? 0;
     if (used >= CENSUS_MAX_REATTEMPTS) {
       console.error(
-        `[channel-follower] op=follower-reattach sessionId=${id82(deps.paramsFor(m.senderId)?.sessionId ?? "none")} senderId=${id82(m.senderId)} outcome=skipped reason=reattach-exhausted attempts=${used}`
+        `[channel-follower] op=follower-reattach channel=${deps.channel} sessionId=${id82(deps.paramsFor(senderId)?.sessionId ?? "none")} senderId=${id82(senderId)} outcome=skipped reason=reattach-exhausted attempts=${used}`
       );
       continue;
     }
-    const p = deps.paramsFor(m.senderId);
+    const p = deps.paramsFor(senderId);
     if (!p) {
       console.error(
-        `[channel-follower] op=follower-reattach sessionId=none senderId=${id82(m.senderId)} outcome=failed reason=no-attach-params`
+        `[channel-follower] op=follower-reattach channel=${deps.channel} sessionId=none senderId=${id82(senderId)} outcome=failed reason=no-attach-params`
       );
       continue;
     }
     try {
-      state.attempts.set(m.senderId, used + 1);
+      state.attempts.set(senderId, used + 1);
       deps.attach(p);
       console.error(
-        `[channel-follower] op=follower-reattach sessionId=${id82(p.sessionId)} senderId=${id82(p.senderId)} outcome=attached reason=none`
+        `[channel-follower] op=follower-reattach channel=${deps.channel} sessionId=${id82(p.sessionId)} senderId=${id82(p.senderId)} outcome=attached reason=none`
       );
     } catch (err) {
       console.error(
-        `[channel-follower] op=follower-reattach sessionId=${id82(p.sessionId)} senderId=${id82(p.senderId)} outcome=failed reason=${err instanceof Error ? err.message : String(err)}`
+        `[channel-follower] op=follower-reattach channel=${deps.channel} sessionId=${id82(p.sessionId)} senderId=${id82(p.senderId)} outcome=failed reason=${err instanceof Error ? err.message : String(err)}`
       );
     }
   }
-  return `${bound.length} door(s), ${missing.length} without a reader`;
+  return `${deps.channel}: ${bound.length} door(s), ${missing.length} without a reader`;
 }
 
 // app/lib/telegram/gateway/inbound-hub.ts
@@ -38008,7 +38344,8 @@ function createTelegramChannelRoutes(deps) {
     if (typeof key2 !== "string" || typeof messageId !== "string") {
       return c.json({ error: "key and messageId required" }, 400);
     }
-    deps.onReceived?.(key2, messageId);
+    const provenance = typeof body?.provenance === "boolean" ? body.provenance : void 0;
+    deps.onReceived?.(key2, messageId, provenance);
     return c.json({ ok: true });
   });
   app81.post("/tg-channel/turn-end", async (c) => {
@@ -38022,9 +38359,9 @@ function createTelegramChannelRoutes(deps) {
     const interactive = body?.interactive === true;
     const finalText = typeof body?.finalText === "string" ? body.finalText : "";
     const sid = sessionId.slice(0, 8);
-    const num4 = (v) => typeof v === "number" && Number.isFinite(v) ? v : -1;
+    const num5 = (v) => typeof v === "number" && Number.isFinite(v) ? v : -1;
     console.error(
-      `[telegram-native] op=turn-context sessionId=${sid} cacheReadTokens=${num4(body?.cacheReadTokens)} inputTokens=${num4(body?.inputTokens)} outputTokens=${num4(body?.outputTokens)} thinkingBlocks=${num4(body?.thinkingBlocks)} thinkingChars=${num4(body?.thinkingChars)}`
+      `[telegram-native] op=turn-context sessionId=${sid} cacheReadTokens=${num5(body?.cacheReadTokens)} inputTokens=${num5(body?.inputTokens)} outputTokens=${num5(body?.outputTokens)} thinkingBlocks=${num5(body?.thinkingBlocks)} thinkingChars=${num5(body?.thinkingChars)}`
     );
     const role = body?.role;
     if (role !== "admin" && role !== "public") {
@@ -38142,6 +38479,16 @@ var TelegramGateway = class {
   }
   hub = new InboundHub3();
   replies = /* @__PURE__ */ new Map();
+  /** Task 2559 — the keys whose last inbound was `role:'admin'`. The follower
+   *  census's bound set is the doors that SHOULD have a reader, and a public
+   *  Telegram session is given none by design: the public branch of
+   *  `buildTelegramEnsureSession` returns before the attach block, because the
+   *  file follower is an admin surface. Including a public key would report it
+   *  missing on every tick for ever and stop `missing=` ever reaching zero,
+   *  which is the one signal the census exists to give. Removed on a public
+   *  inbound, because the role is read from account config on every inbound and
+   *  a bot can be flipped between the two. */
+  adminKeys = /* @__PURE__ */ new Set();
   spawning = /* @__PURE__ */ new Set();
   /** Task 2428 — keys whose channel server signalled ready while their spawn was
    *  still in flight. The harness discards a channel notification that arrives
@@ -38169,7 +38516,7 @@ var TelegramGateway = class {
         }
         this.drain(key2);
       },
-      onReceived: (key2, messageId) => {
+      onReceived: (key2, messageId, provenance) => {
         const acked = this.hub.ack(key2, messageId);
         if (acked !== null && (acked.source ?? "user") === "user") {
           noteReceived(key2, parseTelegramChannelKey(key2)?.botId ?? "unknown", messageId, Date.now());
@@ -38177,6 +38524,10 @@ var TelegramGateway = class {
         console.error(
           `[telegram-native] op=channel-received key=${key2} messageId=${messageId}${acked !== null ? "" : " note=unknown"}`
         );
+        const prov = provenance === void 0 ? "unknown" : provenance ? "yes" : "no";
+        console.error(
+          `[telegram:reframe] op=compose key=${key2} provenance=${prov} source=${acked?.source ?? "unknown"}`
+        );
       }
     });
   }
@@ -38249,6 +38600,8 @@ var TelegramGateway = class {
     const willDeliverNow = this.hub.isReady(key2);
     const source = input.source ?? "user";
     this.replies.set(key2, input.reply);
+    if (input.role === "admin") this.adminKeys.add(key2);
+    else this.adminKeys.delete(key2);
     let standingRules;
     if (input.role === "admin" && this.deps.fetchStandingRules) {
       const res = await this.deps.fetchStandingRules(input.accountId);
@@ -38260,7 +38613,21 @@ var TelegramGateway = class {
       );
     }
     this.hub.deliver(
-      { key: key2, text: input.text, media: input.media, messageId: `tg-${++this.seq}`, source, standingRules, scheduleProvenance: input.scheduleProvenance },
+      {
+        key: key2,
+        text: input.text,
+        media: input.media,
+        messageId: `tg-${++this.seq}`,
+        source,
+        // Task 2561 — passed explicitly rather than parsed out of `key`:
+        // accountId is not in the key, and the channel service imports nothing
+        // from app/lib. Without them the composer cannot name who is speaking,
+        // and the turn opens straight into rules written about the owner.
+        senderId: input.senderId,
+        accountId: input.accountId,
+        standingRules,
+        scheduleProvenance: input.scheduleProvenance
+      },
       Date.now()
     );
     const resolvedSessionId = this.sessionIdFor(input);
@@ -38300,6 +38667,18 @@ var TelegramGateway = class {
   liveReplyTarget(key2) {
     return this.replies.get(key2) ?? null;
   }
+  /** Task 2559 — every admin door this gateway currently holds a live delivery
+   *  closure for, as the `<botId>:<senderId>` channel key the follower registry
+   *  keys on. The twin of `WaGateway.boundTargets()`: the census reconciles
+   *  against exactly this set, so "should have a reader" and "can be sent to"
+   *  are one fact and cannot drift. A key `parseTelegramChannelKey` rejects is
+   *  the pre-2368 bare-sender shape, skipped rather than halved at an arbitrary
+   *  offset, which would yield a door id nothing keys on. */
+  boundTargets() {
+    return [...this.replies.keys()].filter(
+      (key2) => this.adminKeys.has(key2) && parseTelegramChannelKey(key2) !== null
+    );
+  }
   async sendOutbound(key2, text) {
     const reply = this.replies.get(key2);
     if (!reply) throw new Error(`telegram-gateway: no reply route for key ${key2}`);
@@ -38394,24 +38773,13 @@ function buildTelegramEnsureSession(deps) {
       `${TAG62} op=spawn botId=${input.botId} sessionId=${req.sessionId} targetAccountId=${input.accountId} role=admin`
     );
     noteSpawnOk2(input.botId);
-    deps.followers.get(req.channelKey)?.abort();
-    let ac;
-    ac = deps.startFileFollower({
+    deps.followers.attach({
       sessionId: req.sessionId,
       senderId: req.channelKey,
       accountId: input.accountId,
       chatId: input.chatId,
-      botToken: input.botToken,
-      // Task 2521 — resolved per answer, not captured once, so a door that goes
-      // live after this session started still receives.
-      fanTargets: () => deps.fanTargets(req.channelKey),
-      // Identity-guarded eviction: only delete if this controller is still the
-      // current one, so a stale self-close never removes a live follower.
-      onClose: () => {
-        if (deps.followers.get(req.channelKey) === ac) deps.followers.delete(req.channelKey);
-      }
+      botToken: input.botToken
     });
-    deps.followers.set(req.channelKey, ac);
   };
 }
 
@@ -39736,20 +40104,6 @@ var waGateway = new WaGateway({
     });
   }
 });
-var followerCensusState = makeCensusState();
-registerLoop({
-  name: "channel-follower",
-  intervalMs: 6e4,
-  run: () => followerCensusTick(
-    {
-      bound: () => waGateway.boundTargets(),
-      live: () => nativeFileFollowers.live(),
-      paramsFor: (senderId) => nativeFileFollowers.paramsFor(senderId),
-      attach: (p) => nativeFileFollowers.attach(p)
-    },
-    followerCensusState
-  )
-});
 app80.route("/", waGateway.routes());
 waGateway.startSweeper();
 registerLoop({
@@ -39917,7 +40271,6 @@ setWebchatGateway(webchatGateway);
 app80.route("/", webchatGateway.routes());
 webchatGateway.startSweeper();
 webchatGateway.startPublicReaper();
-var telegramFileFollowers = /* @__PURE__ */ new Map();
 var telegramFanTargets = (key2) => {
   const account = listValidAccounts().find(
     (a) => listBotEntries(a.config.telegram).some((e) => e.id === key2.slice(0, key2.indexOf(":")))
@@ -39934,6 +40287,19 @@ var telegramFanTargets = (key2) => {
     deps: adminFanDeps("telegram", account.accountId)
   });
 };
+var telegramFileFollowers = createFollowerRegistry(
+  (p, onClose) => startTelegramNativeFileFollower({
+    sessionId: p.sessionId,
+    senderId: p.senderId,
+    accountId: p.accountId,
+    chatId: p.chatId,
+    botToken: p.botToken,
+    // Task 2521 — resolved per answer, not captured once, so a door that goes
+    // live after this session started still receives.
+    fanTargets: () => telegramFanTargets(p.senderId),
+    onClose
+  })
+);
 var telegramGateway = new TelegramGateway({
   fetchStandingRules: fetchAccountStandingRules,
   // Task 2353 — no turn-instruction resolver on this door. See the dep comment in
@@ -39954,14 +40320,39 @@ var telegramGateway = new TelegramGateway({
     managerRcSpawn,
     managerSpawn,
     resolveSessionOverride: (accountId, channelKey) => resolveChannelOverride(accountId, "telegram", channelKey),
-    startFileFollower: startTelegramNativeFileFollower,
-    fanTargets: telegramFanTargets,
     followers: telegramFileFollowers
   })
 });
 setTelegramGateway(telegramGateway);
 app80.route("/", telegramGateway.routes());
 telegramGateway.startSweeper();
+var followerCensusState = { whatsapp: makeCensusState(), telegram: makeCensusState() };
+registerLoop({
+  name: "channel-follower",
+  intervalMs: 6e4,
+  run: () => [
+    followerCensusTick(
+      {
+        channel: "whatsapp",
+        bound: () => waGateway.boundTargets().map((t) => t.senderId),
+        live: () => nativeFileFollowers.live(),
+        paramsFor: (senderId) => nativeFileFollowers.paramsFor(senderId),
+        attach: (p) => nativeFileFollowers.attach(p)
+      },
+      followerCensusState.whatsapp
+    ),
+    followerCensusTick(
+      {
+        channel: "telegram",
+        bound: () => telegramGateway.boundTargets(),
+        live: () => telegramFileFollowers.live(),
+        paramsFor: (senderId) => telegramFileFollowers.paramsFor(senderId),
+        attach: (p) => telegramFileFollowers.attach(p)
+      },
+      followerCensusState.telegram
+    )
+  ].join("; ")
+});
 var chatRoutes = createChatRoutes({
   handleInbound: (input) => webchatGateway.handleInbound(input),
   awaitReply: (key2, timeoutMs) => webchatGateway.awaitReply(key2, timeoutMs)