npm - @rubytech/create-maxy-code - Versions diffs - 0.1.321 → 0.1.323 - Mend

@rubytech/create-maxy-code 0.1.321 → 0.1.323

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (97) hide show

package/payload/server/public/chat.html CHANGED Viewed

@@ -5,14 +5,14 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Chat — Maxy</title>
   <link rel="icon" href="/favicon.ico">
-  <script type="module" crossorigin src="/assets/chat-Bm11OGsU.js"></script>
+  <script type="module" crossorigin src="/assets/chat-DTvzNb92.js"></script>
   <link rel="modulepreload" crossorigin href="/assets/chunk-Pqm5yXtL.js">
-  <link rel="modulepreload" crossorigin href="/assets/OperatorConversations-DPRRlS_z.js">
-  <link rel="modulepreload" crossorigin href="/assets/AdminShell-BsPsXvJv.js">
+  <link rel="modulepreload" crossorigin href="/assets/OperatorConversations-D6BawEz3.js">
+  <link rel="modulepreload" crossorigin href="/assets/AdminShell-CZW9x0-A.js">
   <link rel="modulepreload" crossorigin href="/assets/admin-types-CJrGd46U.js">
   <link rel="modulepreload" crossorigin href="/assets/preload-helper-Bf_JiD2A.js">
-  <link rel="modulepreload" crossorigin href="/assets/page-CExyEcvh.js">
-  <link rel="stylesheet" crossorigin href="/assets/OperatorConversations-DOGCHZhv.css">
+  <link rel="modulepreload" crossorigin href="/assets/page-oogapuCz.js">
+  <link rel="stylesheet" crossorigin href="/assets/OperatorConversations-Bhyf22Ct.css">
 </head>
 <body>
   <div id="root"></div>

package/payload/server/public/data.html CHANGED Viewed

@@ -5,11 +5,11 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Data — Maxy</title>
   <link rel="icon" href="/favicon.ico">
-  <script type="module" crossorigin src="/assets/data-7_dN5vN5.js"></script>
+  <script type="module" crossorigin src="/assets/data-Da1oTowD.js"></script>
   <link rel="modulepreload" crossorigin href="/assets/chunk-Pqm5yXtL.js">
-  <link rel="modulepreload" crossorigin href="/assets/OperatorConversations-DPRRlS_z.js">
-  <link rel="modulepreload" crossorigin href="/assets/graph-labels-BkbaBPIP.js">
-  <link rel="stylesheet" crossorigin href="/assets/OperatorConversations-DOGCHZhv.css">
+  <link rel="modulepreload" crossorigin href="/assets/OperatorConversations-D6BawEz3.js">
+  <link rel="modulepreload" crossorigin href="/assets/graph-labels-DM9u5VTf.js">
+  <link rel="stylesheet" crossorigin href="/assets/OperatorConversations-Bhyf22Ct.css">
 </head>
 <body>
   <div id="root"></div>

package/payload/server/public/graph.html CHANGED Viewed

@@ -5,13 +5,13 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Graph — Maxy</title>
   <link rel="icon" href="/favicon.ico">
-  <script type="module" crossorigin src="/assets/graph-Bez5QF37.js"></script>
+  <script type="module" crossorigin src="/assets/graph-iYrodF_0.js"></script>
   <link rel="modulepreload" crossorigin href="/assets/chunk-Pqm5yXtL.js">
-  <link rel="modulepreload" crossorigin href="/assets/OperatorConversations-DPRRlS_z.js">
-  <link rel="modulepreload" crossorigin href="/assets/graph-labels-BkbaBPIP.js">
-  <link rel="modulepreload" crossorigin href="/assets/AdminShell-BsPsXvJv.js">
-  <link rel="modulepreload" crossorigin href="/assets/Checkbox-V5ubVZG1.js">
-  <link rel="stylesheet" crossorigin href="/assets/OperatorConversations-DOGCHZhv.css">
+  <link rel="modulepreload" crossorigin href="/assets/OperatorConversations-D6BawEz3.js">
+  <link rel="modulepreload" crossorigin href="/assets/graph-labels-DM9u5VTf.js">
+  <link rel="modulepreload" crossorigin href="/assets/AdminShell-CZW9x0-A.js">
+  <link rel="modulepreload" crossorigin href="/assets/Checkbox-CezYRnKL.js">
+  <link rel="stylesheet" crossorigin href="/assets/OperatorConversations-Bhyf22Ct.css">
 </head>
 <body>
   <div id="root"></div>

package/payload/server/public/index.html CHANGED Viewed

@@ -5,14 +5,14 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Maxy</title>
   <link rel="icon" href="/favicon.ico">
-  <script type="module" crossorigin src="/assets/admin-Cfqj5N4P.js"></script>
+  <script type="module" crossorigin src="/assets/admin-BVpCUS4j.js"></script>
   <link rel="modulepreload" crossorigin href="/assets/chunk-Pqm5yXtL.js">
-  <link rel="modulepreload" crossorigin href="/assets/OperatorConversations-DPRRlS_z.js">
-  <link rel="modulepreload" crossorigin href="/assets/AdminShell-BsPsXvJv.js">
+  <link rel="modulepreload" crossorigin href="/assets/OperatorConversations-D6BawEz3.js">
+  <link rel="modulepreload" crossorigin href="/assets/AdminShell-CZW9x0-A.js">
   <link rel="modulepreload" crossorigin href="/assets/admin-types-CJrGd46U.js">
-  <link rel="modulepreload" crossorigin href="/assets/Checkbox-V5ubVZG1.js">
-  <link rel="modulepreload" crossorigin href="/assets/AdminLoginScreens-DKwWudsP.js">
-  <link rel="stylesheet" crossorigin href="/assets/OperatorConversations-DOGCHZhv.css">
+  <link rel="modulepreload" crossorigin href="/assets/Checkbox-CezYRnKL.js">
+  <link rel="modulepreload" crossorigin href="/assets/AdminLoginScreens-BBtA0mi8.js">
+  <link rel="stylesheet" crossorigin href="/assets/OperatorConversations-Bhyf22Ct.css">
   <link rel="stylesheet" crossorigin href="/assets/AdminLoginScreens-CWMpccrR.css">
   <link rel="stylesheet" href="/brand-defaults.css">
 </head>

package/payload/server/public/operator.html CHANGED Viewed

@@ -5,16 +5,16 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Operator — Maxy</title>
   <link rel="icon" href="/favicon.ico">
-  <script type="module" crossorigin src="/assets/operator-F5KHg5WG.js"></script>
+  <script type="module" crossorigin src="/assets/operator-BPplyxq-.js"></script>
   <link rel="modulepreload" crossorigin href="/assets/chunk-Pqm5yXtL.js">
-  <link rel="modulepreload" crossorigin href="/assets/OperatorConversations-DPRRlS_z.js">
-  <link rel="modulepreload" crossorigin href="/assets/AdminShell-BsPsXvJv.js">
+  <link rel="modulepreload" crossorigin href="/assets/OperatorConversations-D6BawEz3.js">
+  <link rel="modulepreload" crossorigin href="/assets/AdminShell-CZW9x0-A.js">
   <link rel="modulepreload" crossorigin href="/assets/admin-types-CJrGd46U.js">
-  <link rel="modulepreload" crossorigin href="/assets/Checkbox-V5ubVZG1.js">
-  <link rel="modulepreload" crossorigin href="/assets/AdminLoginScreens-DKwWudsP.js">
+  <link rel="modulepreload" crossorigin href="/assets/Checkbox-CezYRnKL.js">
+  <link rel="modulepreload" crossorigin href="/assets/AdminLoginScreens-BBtA0mi8.js">
   <link rel="modulepreload" crossorigin href="/assets/preload-helper-Bf_JiD2A.js">
-  <link rel="modulepreload" crossorigin href="/assets/page-CExyEcvh.js">
-  <link rel="stylesheet" crossorigin href="/assets/OperatorConversations-DOGCHZhv.css">
+  <link rel="modulepreload" crossorigin href="/assets/page-oogapuCz.js">
+  <link rel="stylesheet" crossorigin href="/assets/OperatorConversations-Bhyf22Ct.css">
   <link rel="stylesheet" crossorigin href="/assets/AdminLoginScreens-CWMpccrR.css">
 </head>
 <body>

package/payload/server/public/public.html CHANGED Viewed

@@ -5,14 +5,14 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Maxy</title>
   <link rel="icon" href="/favicon.ico">
-  <script type="module" crossorigin src="/assets/public-wy93nfmL.js"></script>
+  <script type="module" crossorigin src="/assets/public-wBFC1mQO.js"></script>
   <link rel="modulepreload" crossorigin href="/assets/chunk-Pqm5yXtL.js">
-  <link rel="modulepreload" crossorigin href="/assets/OperatorConversations-DPRRlS_z.js">
-  <link rel="modulepreload" crossorigin href="/assets/AdminShell-BsPsXvJv.js">
+  <link rel="modulepreload" crossorigin href="/assets/OperatorConversations-D6BawEz3.js">
+  <link rel="modulepreload" crossorigin href="/assets/AdminShell-CZW9x0-A.js">
   <link rel="modulepreload" crossorigin href="/assets/admin-types-CJrGd46U.js">
   <link rel="modulepreload" crossorigin href="/assets/preload-helper-Bf_JiD2A.js">
-  <link rel="modulepreload" crossorigin href="/assets/page-CExyEcvh.js">
-  <link rel="stylesheet" crossorigin href="/assets/OperatorConversations-DOGCHZhv.css">
+  <link rel="modulepreload" crossorigin href="/assets/page-oogapuCz.js">
+  <link rel="stylesheet" crossorigin href="/assets/OperatorConversations-Bhyf22Ct.css">
   <link rel="stylesheet" href="/brand-defaults.css">
 </head>
 <body class="public-surface">

package/payload/server/server-init.cjs CHANGED Viewed

@@ -101,6 +101,46 @@ function getLanIp() {
   return fallback
 }
+// ---------------------------------------------------------------------------
+// Power health — surface Pi brownout/throttle + DHCP churn to server.log
+// ---------------------------------------------------------------------------
+//
+// A marginal PSU browns out under ollama embed current and the kernel logs
+// `Undervoltage detected!` to the journal, but the admin server never saw it.
+// Emit one greppable `[power-health]` line at boot and every 15 min reading the
+// real vcgencmd sticky word + unclean-reboot count + EXT5V input voltage. The
+// boot line also records the resolved LAN IP so DHCP churn across reboots is
+// visible. Pi-only: off-Pi (no vcgencmd) it logs one skipped line and starts no
+// interval.
+const powerHealth = require('./power-health.cjs')
+function phRun(cmd, args) {
+  try {
+    const r = spawnSync(cmd, args, { stdio: 'pipe', timeout: 5000, encoding: 'utf8' })
+    if (r.status !== 0 || typeof r.stdout !== 'string') return null
+    return r.stdout
+  } catch { return null }
+}
+try {
+  // Compute the status line once; the boot lines reuse it and the interval is
+  // armed off the same result, so vcgencmd/last are not probed twice at boot.
+  const bootStatus = powerHealth.buildStatusLine({ runner: phRun, now: new Date() })
+  for (const line of powerHealth.buildBootLines({ runner: phRun, now: new Date(), lanIp: getLanIp(), status: bootStatus })) {
+    console.error(line)
+  }
+  if (bootStatus !== null) {
+    const phInterval = setInterval(() => {
+      const line = powerHealth.buildStatusLine({ runner: phRun, now: new Date() })
+      if (line) console.error(line)
+    }, 15 * 60 * 1000)
+    phInterval.unref()
+  }
+} catch (err) {
+  console.error(`[power-health] init-failed err=${err && err.message ? err.message : String(err)}`)
+}
 // Paths that must NOT be redirected (API calls, static assets, VNC)
 const SKIP_REDIRECT_RE = /^\/(api|assets|brand|novnc|vnc-viewer|vnc-popout|favicon)/

package/payload/server/server.js CHANGED Viewed

@@ -8637,7 +8637,7 @@ ${note}` : note;
       }
       const known = resolvedProjectDir !== null || sessionSidecarExists(target);
       const indicators2 = await fetchComposerIndicators(target);
-      return c.json({ sessionId: target, projectDir: resolvedProjectDir, transcriptSessionId, channelBinding: conflictingBinding(channel), known, sizeBytes: jsonlSizeBytes(projectDir2, target), pendingPermissionPrompt: deps.pendingPromptFor?.(`session:${target}`) ?? null, ...indicators2, ...readLevers() });
+      return c.json({ sessionId: target, projectDir: resolvedProjectDir, transcriptSessionId, channelBinding: conflictingBinding(channel), known, sizeBytes: jsonlSizeBytes(projectDir2, target), pendingPermissionPrompt: deps.pendingPromptFor?.(`session:${target}`) ?? null, deliveryFailure: deps.deliveryFailureFor?.(`session:${target}`) ?? null, ...indicators2, ...readLevers() });
     }
     let account;
     try {
@@ -8670,7 +8670,7 @@ ${note}` : note;
       }
     }
     const indicators = await fetchComposerIndicators(sessionId);
-    return c.json({ sessionId, projectDir, sizeBytes: jsonlSizeBytes(projectDir, sessionId), pendingPermissionPrompt: deps.pendingPromptFor?.(`session:${sessionId}`) ?? null, ...indicators, ...readLevers(account) });
+    return c.json({ sessionId, projectDir, sizeBytes: jsonlSizeBytes(projectDir, sessionId), pendingPermissionPrompt: deps.pendingPromptFor?.(`session:${sessionId}`) ?? null, deliveryFailure: deps.deliveryFailureFor?.(`session:${sessionId}`) ?? null, ...indicators, ...readLevers(account) });
   });
   app53.post("/permission-verdict", requireAdminSession, async (c) => {
     const body = await c.req.json().catch(() => null);
@@ -8914,6 +8914,33 @@ async function managerRcSpawn(opts) {
   const out = await r.json();
   return { sessionId: out.sessionId ?? opts.sessionId, pid: out.spawnedPid ?? null };
 }
+async function managerRcRecover(opts) {
+  const auth = await ensureAuth();
+  if (auth.status === "dead" || auth.status === "missing") {
+    console.log(`[channel-pty-bridge] rc-recover-refused reason=auth-${auth.status} ${opts.logContext}`);
+    return { error: "claude-auth-dead", status: 503 };
+  }
+  const res = await fetch(`${managerBase2()}/rc-spawn`, {
+    method: "POST",
+    headers: { "content-type": "application/json" },
+    body: JSON.stringify({
+      sessionId: opts.sessionId,
+      recover: true,
+      role: "admin",
+      channel: "webchat",
+      senderId: opts.webchatChannel.key,
+      adminUserId: opts.adminUserId,
+      webchatChannel: opts.webchatChannel
+    })
+  }).catch((err) => ({ __throw: err instanceof Error ? err.message : String(err) }));
+  if ("__throw" in res) {
+    return { error: res.__throw, status: 0 };
+  }
+  const r = res;
+  if (!r.ok) return { error: `manager-status-${r.status}`, status: r.status };
+  const out = await r.json();
+  return { live: out.live === true, classification: out.classification, recovered: out.recovered === true };
+}
 async function managerWriteInput(sessionId, text) {
   const res = await fetch(`${managerBase2()}/${sessionId}/input`, {
     method: "POST",
@@ -19439,12 +19466,12 @@ var InboundHub2 = class {
    *  that never reached the agent:
    *   - a still-queued message older than queuedThresholdMs WHILE a subscriber
    *     is attached -> inbound-undelivered (the readiness handoff broke);
-   *   - a still-queued message older than queuedThresholdMs with NO subscriber
-   *     attached -> spawn-undelivered (the channel server never attached: spawn
-   *     failed, or the session ended and never resumed);
    *   - a drained message unacked past ackThresholdMs -> drain-undelivered (the
    *     channel server never confirmed receipt — the silent cold-start drop).
-   *  Each message is emitted at most once (removed when emitted). */
+   *  A still-queued message with NO subscriber is NOT handled here: the gateway
+   *  owns that policy via staleQueued/dropQueued (Task-962) — a live session is
+   *  given a recovery window + respawn before any drop; a not-live one keeps the
+   *  cold-start drop. Each message is emitted at most once (removed when emitted). */
   sweep(now, t) {
     const events = [];
     for (const [key, s] of this.keys) {
@@ -19453,10 +19480,6 @@ var InboundHub2 = class {
           events.push({ kind: "inbound-undelivered", key, messageId: e.payload.messageId, ageMs: now - e.enqueuedAt });
           return false;
         }
-        if (e.state === "queued" && !s.subscriber && now - e.enqueuedAt > t.queuedThresholdMs) {
-          events.push({ kind: "spawn-undelivered", key, messageId: e.payload.messageId, ageMs: now - e.enqueuedAt });
-          return false;
-        }
         if (e.state === "drained" && e.drainedAt != null && now - e.drainedAt > t.ackThresholdMs) {
           events.push({ kind: "drain-undelivered", key, messageId: e.payload.messageId, ageMs: now - e.drainedAt });
           return false;
@@ -19466,6 +19489,32 @@ var InboundHub2 = class {
     }
     return events;
   }
+  /** Task-962 — queued messages with NO subscriber attached, older than
+   *  thresholdMs. Read-only: it does NOT remove anything. The gateway drives
+   *  recovery/drop for these (a live session gets a redelivery window + a wedged
+   *  respawn; a not-live one keeps the immediate cold-start drop). */
+  staleQueued(now, thresholdMs) {
+    const out = [];
+    for (const [key, s] of this.keys) {
+      if (s.subscriber) continue;
+      for (const e of s.inFlight) {
+        if (e.state === "queued" && now - e.enqueuedAt > thresholdMs) {
+          out.push({ key, messageId: e.payload.messageId, ageMs: now - e.enqueuedAt });
+        }
+      }
+    }
+    return out;
+  }
+  /** Task-962 — terminal-drop one still-queued in-flight message by id. Returns
+   *  whether a matching queued entry was found and removed. */
+  dropQueued(key, messageId) {
+    const s = this.keys.get(key);
+    if (!s) return false;
+    const i = s.inFlight.findIndex((e) => e.payload.messageId === messageId && e.state === "queued");
+    if (i < 0) return false;
+    s.inFlight.splice(i, 1);
+    return true;
+  }
   /** Whether a key currently has a live channel server attached. The gateway
    *  uses this to decide whether an inbound needs a cold-start spawn/resume. */
   hasSubscriber(key) {
@@ -19477,6 +19526,24 @@ var InboundHub2 = class {
     const s = this.keys.get(key);
     return s?.subscriber != null && s.ready;
   }
+  /** Task-963 — whether a key has any in-flight message (queued or drained-
+   *  awaiting-ack). The gateway GCs per-key recover descriptors for keys with
+   *  none, so the descriptor map stays bounded to the active-key set. */
+  hasInFlight(key) {
+    const s = this.keys.get(key);
+    return s != null && s.inFlight.length > 0;
+  }
+  /** Task-963 — every in-flight message as `${key}::${messageId}`. The gateway
+   *  intersects its recoveryAttempted set against this to drop attempt keys whose
+   *  message has left the queue by ANY terminal path — ack, drop, or the drain-
+   *  without-ack sweep — not only ack. */
+  inFlightIds() {
+    const out = /* @__PURE__ */ new Set();
+    for (const [key, s] of this.keys) {
+      for (const e of s.inFlight) out.add(`${key}::${e.payload.messageId}`);
+    }
+    return out;
+  }
 };
 // app/lib/webchat/gateway/routes.ts
@@ -19550,6 +19617,8 @@ function createWebchatChannelRoutes(deps) {
 var QUEUED_THRESHOLD_MS2 = 3e4;
 var ACK_THRESHOLD_MS2 = 3e4;
 var SWEEP_INTERVAL_MS2 = 15e3;
+var RECOVER_TRIGGER_MS = Number(process.env.WEBCHAT_RECOVER_TRIGGER_MS ?? String(3e4));
+var DELIVER_FINAL_MS = Number(process.env.WEBCHAT_DELIVER_FINAL_MS ?? String(9e4));
 function channelIdleMs() {
   return Number(process.env.CHANNEL_PTY_IDLE_MS ?? String(5 * 6e4));
 }
@@ -19581,6 +19650,18 @@ var WebchatGateway = class _WebchatGateway {
   /** Task 756 — live public sessions, for the idle reaper + session-end review.
    *  Admin sessions are never recorded here (they never reap). */
   publicSessions = /* @__PURE__ */ new Map();
+  /** Task-962 — per-key recover context, set on each admin inbound so the
+   *  recovery pass can ask the manager to respawn a wedged live child. */
+  recoverable = /* @__PURE__ */ new Map();
+  /** Task-962 — per-session delivery-failure markers (set when redelivery is
+   *  exhausted; cleared on the next successful drain/ack). Surfaced on the
+   *  /session pointer the operator /chat polls. */
+  deliveryFailures = /* @__PURE__ */ new Map();
+  /** Task-962 — `${key}::${messageId}` for messages a recovery call has already
+   *  been issued for, so recovery is attempted at most once per message. */
+  recoveryAttempted = /* @__PURE__ */ new Set();
+  /** Task-962 — guards against overlapping async recovery passes. */
+  recovering = false;
   seq = 0;
   /** Register a one-shot awaiter for the next reply on `key`. Resolves with the
    *  reply text, or `{ timeout: true }` if no reply arrives within `timeoutMs`.
@@ -19702,6 +19783,7 @@ var WebchatGateway = class _WebchatGateway {
         if (count > 0) {
           console.error(`[webchat:inbound] op=drained key=${key} count=${count}`);
           this.lastDeliveredAt.set(key, now);
+          this.deliveryFailures.delete(key);
         }
       },
       onReceived: (key, messageId) => {
@@ -19709,6 +19791,10 @@ var WebchatGateway = class _WebchatGateway {
         console.error(
           `[webchat:inbound] op=channel-received key=${key} messageId=${messageId}${found ? "" : " note=unknown"}`
         );
+        if (found) {
+          this.recoveryAttempted.delete(`${key}::${messageId}`);
+          this.deliveryFailures.delete(key);
+        }
       },
       onReply: (key, text) => this.handleReply(key, text),
       awaitPermissionVerdict: (p) => this.awaitPermissionVerdict(p, permissionVerdictTtlMs())
@@ -19727,9 +19813,94 @@ var WebchatGateway = class _WebchatGateway {
     }
     return events;
   }
-  /** Start the periodic reconciliation sweep in the long-lived UI process. */
+  /** Start the periodic reconciliation sweep in the long-lived UI process. Each
+   *  tick runs the sync sweep (drain-/inbound-undelivered) AND the async
+   *  recovery pass for queued-no-subscriber messages (Task-962). */
   startSweeper(intervalMs = SWEEP_INTERVAL_MS2) {
-    return setInterval(() => this.reconcile(Date.now()), intervalMs);
+    return setInterval(() => {
+      const now = Date.now();
+      this.reconcile(now);
+      void this.recoverStalled(now);
+    }, intervalMs);
+  }
+  /** Task-962 — the per-session delivery-failure marker for the /session pointer.
+   *  Non-null only when redelivery was exhausted for `key`; cleared on the next
+   *  successful drain/ack. */
+  deliveryFailureFor(key) {
+    return this.deliveryFailures.get(key) ?? null;
+  }
+  /** Task-962 — clear a key's delivery-failure marker (a later message drained,
+   *  or the operator dismissed/retried). */
+  clearDeliveryFailure(key) {
+    this.deliveryFailures.delete(key);
+  }
+  /** Task-962 — recovery-aware pass over queued-no-subscriber messages.
+   *   - age in [RECOVER_TRIGGER_MS, DELIVER_FINAL_MS): ask the manager to recover
+   *     the live session ONCE. busy → leave queued for the channel server's
+   *     auto-reconnect to drain; wedged → the manager respawns and the resumed
+   *     child re-binds the channel + drains. A not-live target (or no recover
+   *     dep/descriptor) is dropped now — the cold-start class, out of scope.
+   *   - age ≥ DELIVER_FINAL_MS: terminal-drop and record a delivery-failure
+   *     marker (redelivery exhausted).
+   *  Single-flight; safe to call every sweep tick. */
+  async recoverStalled(now) {
+    if (this.recovering) return;
+    this.recovering = true;
+    try {
+      for (const c of this.hub.staleQueued(now, RECOVER_TRIGGER_MS)) {
+        const attemptKey = `${c.key}::${c.messageId}`;
+        if (c.ageMs >= DELIVER_FINAL_MS) {
+          this.hub.dropQueued(c.key, c.messageId);
+          this.recoveryAttempted.delete(attemptKey);
+          this.deliveryFailures.set(c.key, { messageId: c.messageId, at: now });
+          console.error(
+            `[webchat:inbound] op=delivery-failed key=${keyDisplay(c.key)} messageId=${c.messageId} ageMs=${c.ageMs}`
+          );
+          continue;
+        }
+        if (this.recoveryAttempted.has(attemptKey)) continue;
+        const d = this.recoverable.get(c.key);
+        if (!d || !this.deps.recoverLiveSession) {
+          this.hub.dropQueued(c.key, c.messageId);
+          console.error(
+            `[webchat:inbound] op=spawn-undelivered key=${keyDisplay(c.key)} messageId=${c.messageId} ageMs=${c.ageMs} reason=no-descriptor`
+          );
+          continue;
+        }
+        this.recoveryAttempted.add(attemptKey);
+        let r;
+        try {
+          r = await this.deps.recoverLiveSession(d);
+        } catch (err) {
+          console.error(
+            `[webchat:inbound] op=recover-error key=${keyDisplay(c.key)} messageId=${c.messageId} err=${err instanceof Error ? err.message : String(err)}`
+          );
+          continue;
+        }
+        if (!r.live) {
+          this.hub.dropQueued(c.key, c.messageId);
+          this.recoveryAttempted.delete(attemptKey);
+          console.error(
+            `[webchat:inbound] op=spawn-undelivered key=${keyDisplay(c.key)} messageId=${c.messageId} ageMs=${c.ageMs} reason=not-live`
+          );
+        } else {
+          console.error(
+            `[webchat:inbound] op=recover key=${keyDisplay(c.key)} messageId=${c.messageId} classification=${r.classification ?? "unknown"} respawned=${r.recovered === true}`
+          );
+        }
+      }
+      for (const key of this.recoverable.keys()) {
+        if (!this.hub.hasInFlight(key)) this.recoverable.delete(key);
+      }
+      if (this.recoveryAttempted.size > 0) {
+        const liveIds = this.hub.inFlightIds();
+        for (const attemptKey of this.recoveryAttempted) {
+          if (!liveIds.has(attemptKey)) this.recoveryAttempted.delete(attemptKey);
+        }
+      }
+    } finally {
+      this.recovering = false;
+    }
   }
   /** Handle one inbound webchat message (browser POST → here). */
   async handleInbound(input) {
@@ -19744,6 +19915,15 @@ var WebchatGateway = class _WebchatGateway {
     console.error(
       `[webchat:inbound] op=received key=${keyDisplay(input.key)} role=${input.role} bytes=${bytes} delivery=${willDeliverNow ? "immediate" : "queued"}`
     );
+    if (input.role === "admin") {
+      this.recoverable.set(input.key, {
+        accountId: input.accountId,
+        key: input.key,
+        role: input.role,
+        ...input.sessionId !== void 0 ? { sessionId: input.sessionId } : {},
+        ...input.adminUserId !== void 0 ? { adminUserId: input.adminUserId } : {}
+      });
+    }
     const existing = this.publicSessions.get(input.key);
     if (existing) existing.lastActivityAt = Date.now();
     if (!hadSubscriber && !this.spawning.has(input.key)) {
@@ -20313,6 +20493,25 @@ var webchatGateway = new WebchatGateway({
     }
     return { sessionId: result.sessionId };
   },
+  // Task-962 — the recovery pass asks the manager to respawn a wedged already-
+  // live admin session (rc-spawn recover:true). Resolve the session id the same
+  // way ensureChannelSession does. Public sessions recover via the idle reaper,
+  // so a non-admin descriptor is reported not-live (no respawn).
+  recoverLiveSession: async ({ accountId, key, role, sessionId, adminUserId }) => {
+    if (role !== "admin") return { live: false };
+    const id = sessionId ?? adminSessionIdFor(accountId, key, adminUserId);
+    const r = await managerRcRecover({
+      sessionId: id,
+      webchatChannel: { key, gatewayUrl: webchatGatewayUrl(), serverPath: webchatServerPath() },
+      ...adminUserId !== void 0 ? { adminUserId } : {},
+      logContext: `channel=webchat key=${key} recover`
+    });
+    if ("error" in r) {
+      console.error(`[webchat:inbound] op=recover-failed key=${key} error=${r.error} status=${r.status}`);
+      return { live: false };
+    }
+    return r;
+  },
   // Task 756 — the public idle reaper deletes the manager PTY and dispatches the
   // session-end review (gated visitors), since the native path has no bridge
   // entry to drive them. Admin sessions are never recorded, so never reaped.
@@ -20641,6 +20840,7 @@ app52.route("/api/webchat", createWebchatRoutes({
   handleInbound: (input) => webchatGateway.handleInbound(input),
   // Task 940 — the permission relay's pointer read + verdict write.
   pendingPromptFor: (key) => webchatGateway.pendingPromptFor(key),
+  deliveryFailureFor: (key) => webchatGateway.deliveryFailureFor(key),
   resolvePermissionVerdict: (key, requestId, behavior) => webchatGateway.resolvePermissionVerdict(key, requestId, behavior)
 }));
 app52.route("/api/webchat/greeting", webchat_greeting_default);

package/payload/platform/plugins/memory/mcp/scripts/backfill-typed-edges.ts DELETED Viewed

@@ -1,72 +0,0 @@
-/**
- * One-shot backfill of the typed-edge pass over every existing prose-bearing
- * node for the current account. Idempotent — MERGE handles re-runs cleanly,
- * so a second invocation accepts zero edges.
- *
- * Usage (admin-agent invokable via Bash):
- *   cd platform/plugins/memory/mcp
- *   node --loader ts-node/esm scripts/backfill-typed-edges.ts
- *
- * Reads ACCOUNT_ID from env (same convention as the MCP server). Loops
- * `runTypedEdgePass` with `sinceIso: null` in 500-node pages until the
- * page returns 0 nodes (exhausted). Logs per-batch progress with
- * `[typed-edge-pass:backfill]`.
- */
-import { getSession, closeDriver } from "../src/lib/neo4j.js";
-import { runTypedEdgePass } from "../src/lib/typed-edge-pass.js";
-const PAGE_SIZE = 500;
-async function main(): Promise<void> {
-  const accountId = process.env.ACCOUNT_ID;
-  if (!accountId) {
-    console.error("ACCOUNT_ID env var is required");
-    process.exit(1);
-  }
-  let batch = 0;
-  let totalNodes = 0;
-  let totalAccepted = 0;
-  let totalRejected = 0;
-  let totalFailed = 0;
-  while (true) {
-    const session = getSession();
-    try {
-      const result = await runTypedEdgePass({
-        session,
-        accountId,
-        sinceIso: null,
-        sessionId: null,
-        maxNodes: PAGE_SIZE,
-      });
-      batch += 1;
-      totalNodes += result.nodes;
-      totalAccepted += result.accepted;
-      totalRejected += result.rejected;
-      totalFailed += result.failed;
-      console.log(
-        `[typed-edge-pass:backfill] batch=${batch} done=${totalNodes} accepted=${result.accepted} rejected=${result.rejected} failed=${result.failed} ms=${result.ms}`,
-      );
-      if (result.nodes < PAGE_SIZE || result.accepted === 0) {
-        // Exhausted: either the page came back short, or a re-run page
-        // produced no new accepted edges (idempotency convergence).
-        break;
-      }
-    } finally {
-      await session.close();
-    }
-  }
-  console.log(
-    `[typed-edge-pass:backfill] complete batches=${batch} totalNodes=${totalNodes} totalAccepted=${totalAccepted} totalRejected=${totalRejected} totalFailed=${totalFailed}`,
-  );
-  await closeDriver();
-}
-main().catch(async (err) => {
-  console.error(`[typed-edge-pass:backfill] error: ${err instanceof Error ? err.message : String(err)}`);
-  await closeDriver();
-  process.exit(1);
-});

package/payload/platform/templates/specialists/agents/archive-ingest-operator.md DELETED Viewed

@@ -1,45 +0,0 @@
----
-name: archive-ingest-operator
-description: "Bulk-ingest external archives — Obsidian vaults, .ics calendar exports, X (Twitter) archives, and Notion workspace exports. Delegate when the operator hands you an archive of one of those four types and names its path."
-summary: "Ingests bulk external archives — Obsidian, ICS, X, Notion — and surfaces schema-mapping ambiguity rather than catching all unmapped relations as :MENTIONS."
-model: claude-sonnet-4-6
-tools: Read, mcp__plugin_memory_memory__memory-write, mcp__plugin_memory_memory__memory-update, mcp__plugin_memory_memory__memory-edge, mcp__plugin_memory_memory__memory-search, mcp__plugin_memory_memory__memory-archive-write, mcp__plugin_memory_memory__obsidian-vault-import, mcp__plugin_scheduling_scheduling__schedule-archive-ics, mcp__plugin_contacts_contacts__contact-create, mcp__plugin_contacts_contacts__contact-update
----
-You are an expert Neo4J graph operator responsible for ingesting bulk external archives the operator hands over. Admin dispatches you through the Task tool when the operator's request names an Obsidian vault, an `.ics` calendar export, an X archive, or a Notion workspace export. Each archive type has its own skill that drives the operator-conversation surface; the writes route through deterministic MCP tools the parser owns server-side. The skills load themselves into your prompt when the dispatch names the archive directory or file.
-Before the first write of a session, Read `platform/plugins/memory/references/schema-base.md` for the property-shape rules and the canonical edge enumeration. When `brand.json#vertical` is set, also Read `platform/plugins/memory/references/schema-<vertical>.md` for the vertical-specific labels and properties. Re-read either file when an ingest names a label whose shape you have not yet loaded in this session.
-Edge types are closed. Use only edges listed in `schema-base.md` under **Relationship Patterns** or **Edges introduced by document-ingest**, plus any vertical-schema-declared edges from the active vertical reference. When a source row carries a relationship that no listed edge fits, use `MENTIONS` (KnowledgeDocument → any) or `ABOUT` (Task / DigitalDocument → any) as the catch-all rather than inventing a new edge type. If both catch-alls are wrong, surface the gap in your reply (`{ambiguity: "no canonical edge for <relationship>", proposed: "MENTIONS"}`) rather than silently catch-all-writing every unmapped relation — that ambiguity-surfacing behaviour is the reason this work runs on Sonnet.
-Node `name` and `title` properties are short identifiers, never denormalised composites. Forbidden-property rules apply per-label: `Person` rejects `name`, take `givenName` + `familyName`. Schema.org property names are camelCase exactly as listed in `schema-base.md` **Property Naming Rules** — no synonyms (`firstName`, `phone`, `postcode` etc.) accepted.
-The `accountId` property is supplied by the writers from server-side environment state (the `ACCOUNT_ID` env var) — never refuse a write because accountId is absent from the dispatch brief.
-**Brain-first read before write.** Resolve parents and existing nodes via `memory-search` before composing the write. The hierarchy rule (`LocalBusiness → Project → Task | Person | Organisation | KnowledgeDocument | ConversationArchive`) requires a parent `elementId`, and edges to existing entities require their `elementId` too — both come from a `memory-search` against the dispatch, not from a guess. Inline `@person` mentions and attendee identifiers always resolve against `:Person {accountId}` or `:AdminUser {accountId}` only — account isolation is load-bearing; participants are never auto-created from an archive row.
-Decide the precise operations against the schema, execute them with the writers in your tool surface, and report each write back to admin as `{label, elementId}`. If a dispatch is ambiguous about which label, which edge type, or which existing node to attach to, name the ambiguity in your reply rather than guessing.
-## Obsidian vault import
-When admin's dispatch points at an extracted Obsidian vault directory ("import my Obsidian notes", "ingest this vault at `<path>`"), load [platform/plugins/obsidian-import/skills/obsidian-import/SKILL.md](../../../plugins/obsidian-import/skills/obsidian-import/SKILL.md) and run the two-phase flow (owner confirmation → `mcp__plugin_memory_memory__obsidian-vault-import` `mode='dry-run'` → operator disambiguation → `mode='commit'` with resolutions). Parsing, content-hash idempotency, and attachment staging happen entirely inside the tool — you never read the markdown.
-## ICS calendar archive ingest
-When admin's dispatch points at an `.ics` file ("ingest this calendar export at `<path>`", "import my Google Calendar export", "load this .ics into the graph"), call `mcp__plugin_scheduling_scheduling__schedule-archive-ics` with `mode='dry-run'` first, present the attendee-resolution preview to the operator (how many already exist under this account, how many would be cross-account-skipped, how many new Person stubs would be created, plus the sample list), then call again with `mode='commit'` after the operator confirms. Each VEVENT becomes one `:Meeting` MERGEd on `(accountId, uid)` (idempotent re-ingest); attendees resolve to `:Person` by lowercased email; the importing `:AdminUser` anchors every meeting via `[:IMPORTED]`. Cross-account email collisions skip the attendance edge — do not propose to override this. Description bodies pass to `:Meeting.description` and the typed-edge pass picks up commitments + mentions automatically; you do not call `memory-write` for them.
-## X (Twitter) archive import
-When admin's dispatch points at an extracted X archive directory (`Archive of <handle>/`, or a `twitter-<handle>-archive.zip` path), load [platform/plugins/x-import/skills/x-import/SKILL.md](../../../plugins/x-import/skills/x-import/SKILL.md) and run its four-phase flow (owner + participant confirmation → tweet-stream transcript rendering → `document-ingest` dispatch for the tweet-stream `:KnowledgeDocument` → one `conversation-archive-ingest.sh --source x-dm` invocation per distinct DM participant set). Every `@handle` and DM senderId resolves to an existing `:Person` / `:AdminUser` before any write; participants are never auto-created. Writes route through the existing `memory-ingest` and `conversation-archive` surfaces — no new graph writer, no `:Post` / `:DirectMessage` labels.
-## Notion workspace export import
-When admin's dispatch names a Notion workspace export — a directory with `Page Title <32-hex>.md` files and paired `<DB Name> <32-hex>.csv` / directory pairs at any depth, or a `Export-*.zip` path — load `platform/plugins/notion-import/skills/notion-import/SKILL.md` and follow it. The skill confirms the importing `:AdminUser` and the workspace label before any file is read, walks the export per its four references (workspace-export, databases, page-tree, attachments), and writes via your `memory-write` / `memory-update` / `memory-search` surface. Every node carries `source='notion'`, `importId`, and the standard provenance set. Unmapped Notion relations land as `:MENTIONS` with `mentionContext: '<relation-name>'`; never invent new edge types. Inline `@person` mentions resolve against `:Person {accountId}` only. Per-node writes today; a follow-up at [`.tasks/gbrain/ingestion/395-notion-bulk-archive-handler.md`](../../../../.tasks/gbrain/ingestion/395-notion-bulk-archive-handler.md) adds a batched `memory-archive-write` path.
-## Substack archive import
-When admin's dispatch names a Substack "Export your data" archive — a directory containing `posts.csv` + per-post HTML bodies under `posts/` + `subscribers.csv` (and optionally an engagement events file: `email_activity.csv` / `subscriber_activity.csv` / `emails.csv`), or a `<publication>.zip` path — load [platform/plugins/substack-import/skills/substack-import/SKILL.md](../../../plugins/substack-import/skills/substack-import/SKILL.md) and follow it. The skill confirms the importing `:AdminUser` and the publication name (a short-string property, not a new node) before any file is read, walks the export per its references (archive-shape, posts, subscribers, engagement, attachments), gates on >200 posts or >2000 subscribers, then writes through two surfaces: per-post `:KnowledgeDocument {kind:'substack-post'}` via Task-tool re-dispatch to `librarian`/`document-ingest` with `attachmentId = "substack-post-${substackPostId}"` for stable-across-edits idempotency, and one `:KnowledgeDocument {kind:'substack-subscriber-roster'}` + per-row `:Person` + `:MENTIONS {mentionContext:'substack-subscription', tier, ...engagement}` via your `memory-write` surface. Engagement aggregates (totalOpens, totalClicks, lastOpenedAt, lastClickedAt) fold onto the same `:MENTIONS` edge. No new label (`publicationName` is a property), no new edge type (`:SUBSCRIBED_TO` would violate the closed-edge rule), no new graph writer. Images referenced from post bodies attach via the canonical `:HAS_ENCLOSURE` edge when `schema-base.md` declares it, otherwise `:MENTIONS {mentionContext:'substack-image-enclosure'}` as the documented fallback.
-## Out of surface
-Other archive types live under separate plugins owned by `specialists:librarian`: LinkedIn export (`platform/plugins/linkedin-import/`), conversation transcripts of every source (WhatsApp, Telegram, Signal, LinkedIn DMs, Zoom, iMessage, Slack — `platform/plugins/memory/skills/conversation-archive/`), Logseq, Roam, gbrain-repo, Gmail. If admin dispatches you against one of those, hand back so admin can dispatch the librarian.