@songsid/agend 2.1.4-beta.37 → 2.1.4-beta.39

package/dist/config.d.ts

@@ -3,6 +3,8 @@ export declare function getTmuxSession(): string;
 export declare const DEFAULT_COST_GUARD: CostGuardConfig;
 export declare const DEFAULT_HANG_DETECTOR: HangDetectorConfig;
 export declare const DEFAULT_DAILY_SUMMARY: DailySummaryConfig;
+/** Product-level context protection for cross-instance message bodies (12 KiB). */
+export declare const DEFAULT_MAX_CROSS_INSTANCE_MESSAGE_BYTES: number;
 export declare const DEFAULT_INSTANCE_CONFIG: Omit<InstanceConfig, "working_directory">;
 /** Effective instance defaults, including AgEnD built-ins and fleet overrides. */
 export declare function getEffectiveInstanceDefaults(fleetDefaults?: Partial<InstanceConfig>): Partial<InstanceConfig>;

package/dist/config.js

@@ -39,6 +39,8 @@ export const DEFAULT_DAILY_SUMMARY = {
     hour: 21,
     minute: 0,
 };
+/** Product-level context protection for cross-instance message bodies (12 KiB). */
+export const DEFAULT_MAX_CROSS_INSTANCE_MESSAGE_BYTES = 12 * 1024;
 export const DEFAULT_INSTANCE_CONFIG = {
     auto_pause_after: 0, // minutes; 0 = disabled (opt-in)
     mcp_auto_restart: true, // restart (idle-gated) when the MCP server dies
@@ -66,7 +68,7 @@ export function getEffectiveInstanceDefaults(fleetDefaults = {}) {
     // Fleet-only controls live under defaults for YAML ergonomics but must not
     // leak into every daemon's InstanceConfig (where an on/off toggle would look
     // like an unknown cold field and restart the whole fleet).
-    const { tips: _tips, ...instanceDefaults } = fleetDefaults;
+    const { tips: _tips, max_cross_instance_message_bytes: _maxCrossInstanceMessageBytes, ...instanceDefaults } = fleetDefaults;
     return deepMergeGeneric(DEFAULT_INSTANCE_CONFIG, instanceDefaults);
 }
 /** Validate IANA timezone string. Throws if invalid. */

package/dist/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAC9D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,IAAI,MAAM,SAAS,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAGlF,SAAS,gBAAgB,CAAmB,MAAS,EAAE,MAAkB;IACvE,MAAM,MAAM,GAAG,EAAE,GAAG,MAAM,EAA6B,CAAC;IACxD,MAAM,YAAY,GAAG,MAAiC,CAAC;IAEvD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;QAC5C,MAAM,SAAS,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;QACpC,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC9B,IACE,SAAS,KAAK,IAAI;YAClB,OAAO,SAAS,KAAK,QAAQ;YAC7B,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC;YACzB,OAAO,SAAS,KAAK,QAAQ;YAC7B,SAAS,KAAK,IAAI;YAClB,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EACzB,CAAC;YACD,MAAM,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAC5B,SAAmB,EACnB,SAA4B,CAC7B,CAAC;QACJ,CAAC;aAAM,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YACnC,MAAM,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;QAC1B,CAAC;IACH,CAAC;IACD,OAAO,MAAsB,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,cAAc;IAC5B,OAAO,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,kBAAkB,EAAE,CAAC;AAChE,CAAC;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAoB;IACjD,eAAe,EAAE,CAAC,EAAE,eAAe;IACnC,kBAAkB,EAAE,EAAE;IACtB,QAAQ,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,eAAe,EAAE,CAAC,QAAQ;CAC3D,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAuB;IACvD,OAAO,EAAE,IAAI;IACb,eAAe,EAAE,EAAE;CACpB,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAuB;IACvD,OAAO,EAAE,IAAI;IACb,IAAI,EAAE,EAAE;IACR,MAAM,EAAE,CAAC;CACV,CAAC;AAEF,mFAAmF;AACnF,MAAM,CAAC,MAAM,wCAAwC,GAAG,EAAE,GAAG,IAAI,CAAC;AAElE,MAAM,CAAC,MAAM,uBAAuB,GAA8C;IAChF,gBAAgB,EAAE,CAAC,EAAE,iCAAiC;IACtD,gBAAgB,EAAE,IAAI,EAAE,gDAAgD;IACxE,eAAe,EAAE,KAAK,EAAE,4EAA4E;IACpG,aAAa,EAAE,KAAK,EAAE,oEAAoE;IAE1F,OAAO,EAAE,QAAQ;IACjB,QAAQ,EAAE;QACR,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,GAAG;QACZ,IAAI,EAAE,EAAE;KACT;IACD,cAAc,EAAE;QACd,WAAW,EAAE,EAAE;QACf,OAAO,EAAE,aAAa;QACtB,WAAW,EAAE,GAAG;KACjB;IACD,gBAAgB,EAAE;QAChB,eAAe,EAAE,OAAO;QACxB,aAAa,EAAE,CAAC,EAAE,gEAAgE;KACnF;IACD,SAAS,EAAE,MAAM;CAClB,CAAC;AAEF,kFAAkF;AAClF,MAAM,UAAU,4BAA4B,CAC1C,gBAAyC,EAAE;IAE3C,2EAA2E;IAC3E,6EAA6E;IAC7E,2DAA2D;IAC3D,MAAM,EACJ,IAAI,EAAE,KAAK,EACX,gCAAgC,EAAE,6BAA6B,EAC/D,GAAG,gBAAgB,EACpB,GAAG,aAA8B,CAAC;IACnC,OAAO,gBAAgB,CACrB,uBAAkD,EAClD,gBAAgB,CACjB,CAAC;AACJ,CAAC;AAED,wDAAwD;AACxD,MAAM,UAAU,gBAAgB,CAAC,EAAU,EAAE,KAAa;IACxD,IAAI,CAAC;QACH,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;IACnD,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,uBAAuB,EAAE,uCAAuC,CAAC,CAAC;IAC5F,CAAC;AACH,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,UAAkB;IAChD,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC5B,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;IACzC,CAAC;IAED,MAAM,GAAG,GAAG,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAC9C,0EAA0E;IAC1E,uFAAuF;IACvF,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,qCAAqC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEvF,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAWxB,CAAC;IAET,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;IACzC,CAAC;IAED,MAAM,aAAa,GAAkB,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC;IAC3D,MAAM,YAAY,GAAG,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC;IAC5C,MAAM,SAAS,GAAmC,EAAE,CAAC;IAErD,KAAK,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;QAC7D,MAAM,MAAM,GAAG,gBAAgB,CAC7B,4BAA4B,CAAC,aAAa,CAAC,EAC3C,SAAS,CACiB,CAAC;QAE7B,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC;YAC9B,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,EAAE,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;YAC5D,SAAS,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3C,kBAAkB,CAAC,UAAU,CAAC,CAAC;YAC/B,MAAM,CAAC,iBAAiB,GAAG,UAAU,CAAC;QACxC,CAAC;QAED,SAAS,CAAC,IAAI,CAAC,GAAG,MAAwB,CAAC;IAC7C,CAAC;IAED,sEAAsE;IACtE,MAAM,SAAS,GAAkC,EAAE,CAAC;IACpD,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QACrB,KAAK,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;YAC3D,IAAI,CAAC,GAAG,CAAC,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC9D,MAAM,IAAI,KAAK,CAAC,aAAa,IAAI,qCAAqC,CAAC,CAAC;YAC1E,CAAC;YACD,SAAS,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;QACxB,CAAC;IACH,CAAC;IAED,uFAAuF;IACvF,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO;QAClC,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,OAAgB,EAAE;QACpH,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,QAAQ,GAA4B,MAAM,CAAC,QAAQ;QACvD,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,OAAgB,EAAE,CAAC,CAAC;QACjG,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAEhD,kFAAkF;IAClF,MAAM,cAAc,GAAG,aAAa,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC;IAErE,OAAO;QACL,OAAO,EAAE,cAAc;QACvB,QAAQ;QACR,aAAa,EAAE,MAAM,CAAC,aAAa;QACnC,QAAQ,EAAE,aAAa;QACvB,SAAS;QACT,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,EAAE;QACzB,SAAS;QACT,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,GAAG,EAAE,MAAM,CAAC,GAAG;KAChB,CAAC;AACJ,CAAC;AAED,gFAAgF;AAChF,MAAM,UAAU,kBAAkB,CAAC,UAAkB;IACnD,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;QAAE,OAAO,EAAE,CAAC;IACvC,MAAM,GAAG,GAAG,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAC9C,+EAA+E;IAC/E,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,qCAAqC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACvF,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAClC,OAAO,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QACnE,CAAC,CAAC,MAAwB;QAC1B,CAAC,CAAC,EAAE,CAAC;AACT,CAAC"}

package/dist/cross-instance-envelope.d.ts

@@ -0,0 +1,6 @@
+/** Product guard that reserves room for routing metadata and protects recipient context. */
+export declare const MAX_ASSEMBLED_CROSS_INSTANCE_MESSAGE_BYTES = 16000;
+/** Render metadata carried in a cross-instance handoff. */
+export declare function renderCrossInstanceHandoffMetadata(meta: Record<string, string>): string;
+/** Exact cross-instance block pasted by the receiving daemon. */
+export declare function formatCrossInstanceInboundMessage(content: string, meta: Record<string, string>): string;

package/dist/cross-instance-envelope.js

@@ -0,0 +1,30 @@
+/** Product guard that reserves room for routing metadata and protects recipient context. */
+export const MAX_ASSEMBLED_CROSS_INSTANCE_MESSAGE_BYTES = 16_000;
+/** Render metadata carried in a cross-instance handoff. */
+export function renderCrossInstanceHandoffMetadata(meta) {
+    const rows = [];
+    const add = (label, value) => {
+        if (value && value.trim())
+            rows.push(`${label}: ${value.trim()}`);
+    };
+    add("message_id", meta.message_id);
+    add("correlation_id", meta.correlation_id);
+    add("request_kind", meta.request_kind);
+    add("task_summary", meta.task_summary);
+    add("working_directory", meta.working_directory);
+    add("branch", meta.branch);
+    add("attachment_file_id", meta.attachment_file_id);
+    return rows.length ? `\n(${rows.join(" | ")})` : "";
+}
+/** Exact cross-instance block pasted by the receiving daemon. */
+export function formatCrossInstanceInboundMessage(content, meta) {
+    const fromInstance = meta.from_instance || "unknown";
+    const fromLabel = meta.from_display ? `${meta.from_display} (${fromInstance})` : fromInstance;
+    let formatted = `[from:${fromLabel}] ${content}`;
+    formatted += renderCrossInstanceHandoffMetadata(meta);
+    formatted += meta.requires_reply === "true"
+        ? "\n(A reply IS required: use report_result with the correlation_id above — or send_to_instance. Not direct text.)"
+        : "\n(If you need to reply, use send_to_instance tool, NOT direct text. If there is nothing to add, you may stay silent.)";
+    return formatted;
+}
+//# sourceMappingURL=cross-instance-envelope.js.map

package/dist/cross-instance-envelope.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cross-instance-envelope.js","sourceRoot":"","sources":["../src/cross-instance-envelope.ts"],"names":[],"mappings":"AAAA,4FAA4F;AAC5F,MAAM,CAAC,MAAM,0CAA0C,GAAG,MAAM,CAAC;AAEjE,2DAA2D;AAC3D,MAAM,UAAU,kCAAkC,CAAC,IAA4B;IAC7E,MAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,MAAM,GAAG,GAAG,CAAC,KAAa,EAAE,KAAyB,EAAE,EAAE;QACvD,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,EAAE;YAAE,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,KAAK,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACpE,CAAC,CAAC;IACF,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IACnC,GAAG,CAAC,gBAAgB,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IAC3C,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IACvC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IACvC,GAAG,CAAC,mBAAmB,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACjD,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC3B,GAAG,CAAC,oBAAoB,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;IACnD,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;AACtD,CAAC;AAED,iEAAiE;AACjE,MAAM,UAAU,iCAAiC,CAAC,OAAe,EAAE,IAA4B;IAC7F,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,IAAI,SAAS,CAAC;IACrD,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,YAAY,KAAK,YAAY,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC;IAC9F,IAAI,SAAS,GAAG,SAAS,SAAS,KAAK,OAAO,EAAE,CAAC;IACjD,SAAS,IAAI,kCAAkC,CAAC,IAAI,CAAC,CAAC;IACtD,SAAS,IAAI,IAAI,CAAC,cAAc,KAAK,MAAM;QACzC,CAAC,CAAC,kHAAkH;QACpH,CAAC,CAAC,wHAAwH,CAAC;IAC7H,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/daemon.d.ts

@@ -488,6 +488,16 @@ export declare class Daemon extends EventEmitter {
      * past this point interrupting the turn costs less than staying mute.
      */
     private static readonly MCP_RESTART_MAX_WAIT_MS;
+    /**
+     * How long the revival restart waits, at the point of firing, for a
+     * CLI-respawned MCP server to announce itself.
+     *
+     * Codex <0.146 tears down and recreates ALL MCP connections on an auth/config
+     * change — healthy ones included — so the daemon sees the old pid die while
+     * the CLI is fine and a replacement is seconds away. Module load measured
+     * ~0.36s, so 2s is roughly 5x headroom without making a genuine loss wait.
+     */
+    private static readonly MCP_REPLACEMENT_GRACE_MS;
     /**
      * Sticky "restart to revive the MCP server as soon as the pane idles" — same
      * shape as pausePending, because the death is usually detected mid-turn when
@@ -496,6 +506,25 @@ export declare class Daemon extends EventEmitter {
      */
     private mcpRestartPending;
     private mcpRestartStaleTimer;
+    /** In-flight replacement grace; also the guard against three triggers stacking. */
+    private mcpRestartGraceTimer;
+    /**
+     * Which trigger the in-flight grace will commit under.
+     *
+     * The single-timer guard would otherwise SWALLOW a stale_timeout that lands
+     * during an idle-gated grace — and because the stale timer is one-shot and
+     * already cleared itself, the 30-minute backstop would be gone for good on an
+     * instance that never idles, which is the exact case it exists for.
+     */
+    private mcpRestartGraceTrigger;
+    /**
+     * A dead-MCP sighting held back once, pending a possible replacement.
+     *
+     * Deliberately NOT the same field as `mcpDeathNotifiedForPid`: deferring must
+     * not consume the once-per-pid budget, or a suspicion that turns out to be a
+     * real loss could never be reported at all.
+     */
+    private mcpDeathDeferredForPid;
     /** Prevent in-flight monitor callbacks from re-arming after a pause. */
     private runtimeMonitorsFrozen;
     private errorWaitingForRecovery;
@@ -538,7 +567,22 @@ export declare class Daemon extends EventEmitter {
      * process would have no client reading it. Only the CLI can restore its own
      * tools — hence notify, and let the operator decide about restarting.
      */
+    /**
+       * An MCP server has connected and announced itself.
+       *
+       * Beyond the existing session bookkeeping this is the earliest evidence that
+       * tools are back — roughly 30s ahead of the next health tick, which is
+       * exactly the window #663's false restarts fired in.
+       */
+    private handleMcpReady;
     private checkMcpServerAlive;
+    /**
+     * Whether a dead MCP pid on this backend is more likely a CLI-driven
+     * replacement than a real loss. Codex only, and deliberately narrow: it is
+     * the backend whose released fix (0.146) confirms it tore down healthy MCP
+     * connections alongside the one it meant to restart.
+     */
+    private suspectsTransientMcpReplacement;
     /**
      * Arm an automatic instance restart to revive a dead MCP server. Fires on the
      * next busy→idle edge — or immediately when the pane is already idle, which is
@@ -547,7 +591,36 @@ export declare class Daemon extends EventEmitter {
      * force-restarted: see that constant for why staying mute costs more.
      */
     private armMcpRestartWhenIdle;
+    /**
+     * Single chokepoint for all three revival triggers (already_idle, idle_edge,
+     * stale_timeout) — and therefore the one place worth re-checking reality.
+     *
+     * The pending flag is armed by a health tick that saw the OLD pid die, and
+     * was previously fired without ever looking again. When a CLI legitimately
+     * respawns its own MCP child, the replacement is already serving by the time
+     * the turn ends — but the idle edge fires inside the ~30s before the next
+     * health tick can stand the request down, restarting a healthy instance. One
+     * external user was restarted 18 times in two days this way (#663).
+     *
+     * Re-reading here is safe for every backend: worst case it clears a pending
+     * restart that should not have existed.
+     */
     private fireMcpRestartRequest;
+    /**
+     * A recovery is already reshaping the CLI: crash-loop handling
+     * (healthCheckPaused), a respawn in flight (spawning), or a pause
+     * (isPaused / frozen monitors). Each ends in a fresh CLI — and with it a
+     * fresh MCP server — or in supervision ending, where a restart on top would
+     * fight the recovery. Either way the revival restart is moot.
+     */
+    private mcpRestartCancelledByRecovery;
+    /**
+     * Emit a dead-MCP report that was held back as a suspected replacement, once
+     * it is clear no replacement is coming. Consumes the once-per-pid budget
+     * here — deferring was to avoid spending it on a false alarm, not to drop
+     * the incident.
+     */
+    private reportDeferredMcpDeath;
     private clearMcpRestartRequest;
     private startHealthCheck;
     /**

package/dist/daemon.js

@@ -22,6 +22,7 @@ import { HangDetector } from "./hang-detector.js";
 import { writeSecretFile } from "./secret-file.js";
 import { PaneWriteLock } from "./pane-write-lock.js";
 import { buildFleetInstructions } from "./instructions.js";
+import { formatCrossInstanceInboundMessage, renderCrossInstanceHandoffMetadata, } from "./cross-instance-envelope.js";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 // Tool routing sets — module-level to avoid re-creation on every handleToolCall
@@ -138,19 +139,7 @@ export function writeLastInboundAt(instanceDir, timestamp) {
  * message_id line.
  */
 export function renderHandoffMetadata(meta) {
-    const rows = [];
-    const add = (label, value) => {
-        if (value && value.trim())
-            rows.push(`${label}: ${value.trim()}`);
-    };
-    add("message_id", meta.message_id);
-    add("correlation_id", meta.correlation_id);
-    add("request_kind", meta.request_kind);
-    add("task_summary", meta.task_summary);
-    add("working_directory", meta.working_directory);
-    add("branch", meta.branch);
-    add("attachment_file_id", meta.attachment_file_id);
-    return rows.length ? `\n(${rows.join(" | ")})` : "";
+    return renderCrossInstanceHandoffMetadata(meta);
 }
 /** Headless inactivity timer used by the daemon and unit tests. */
 export class AutoPauseController {
@@ -924,6 +913,16 @@ export class Daemon extends EventEmitter {
      * past this point interrupting the turn costs less than staying mute.
      */
     static MCP_RESTART_MAX_WAIT_MS = 30 * 60_000;
+    /**
+     * How long the revival restart waits, at the point of firing, for a
+     * CLI-respawned MCP server to announce itself.
+     *
+     * Codex <0.146 tears down and recreates ALL MCP connections on an auth/config
+     * change — healthy ones included — so the daemon sees the old pid die while
+     * the CLI is fine and a replacement is seconds away. Module load measured
+     * ~0.36s, so 2s is roughly 5x headroom without making a genuine loss wait.
+     */
+    static MCP_REPLACEMENT_GRACE_MS = 2_000;
     /**
      * Sticky "restart to revive the MCP server as soon as the pane idles" — same
      * shape as pausePending, because the death is usually detected mid-turn when
@@ -932,6 +931,25 @@ export class Daemon extends EventEmitter {
      */
     mcpRestartPending = false;
     mcpRestartStaleTimer = null;
+    /** In-flight replacement grace; also the guard against three triggers stacking. */
+    mcpRestartGraceTimer = null;
+    /**
+     * Which trigger the in-flight grace will commit under.
+     *
+     * The single-timer guard would otherwise SWALLOW a stale_timeout that lands
+     * during an idle-gated grace — and because the stale timer is one-shot and
+     * already cleared itself, the 30-minute backstop would be gone for good on an
+     * instance that never idles, which is the exact case it exists for.
+     */
+    mcpRestartGraceTrigger = null;
+    /**
+     * A dead-MCP sighting held back once, pending a possible replacement.
+     *
+     * Deliberately NOT the same field as `mcpDeathNotifiedForPid`: deferring must
+     * not consume the once-per-pid budget, or a suspicion that turns out to be a
+     * real loss could never be reported at all.
+     */
+    mcpDeathDeferredForPid = null;
     /** Prevent in-flight monitor callbacks from re-arming after a pause. */
     runtimeMonitorsFrozen = false;
     errorWaitingForRecovery = false; // true = error detected, waiting for ready pattern
@@ -1077,20 +1095,7 @@ export class Daemon extends EventEmitter {
                 this.handleToolCall(msg, socket);
             }
             else if (msg.type === "mcp_ready") {
-                const sessionName = msg.sessionName;
-                if (sessionName) {
-                    this.socketSessionNames.set(socket, sessionName);
-                    socket.on("close", () => {
-                        this.socketSessionNames.delete(socket);
-                        // Notify fleet manager so it can clean up sessionRegistry
-                        if (sessionName !== this.name) {
-                            this.ipcServer?.broadcast({ type: "session_disconnected", sessionName });
-                        }
-                    });
-                }
-                this.logger.debug({ sessionName }, "MCP channel server connected and ready");
-                // Notify FleetManager's IPC client that MCP is ready
-                this.ipcServer?.broadcast({ type: "mcp_ready", sessionName });
+                this.handleMcpReady(msg, socket);
             }
             else if (msg.type === "query_sessions") {
                 // Fleet manager asks for all registered session names (catches sessions
@@ -1310,6 +1315,42 @@ export class Daemon extends EventEmitter {
      * process would have no client reading it. Only the CLI can restore its own
      * tools — hence notify, and let the operator decide about restarting.
      */
+    /**
+       * An MCP server has connected and announced itself.
+       *
+       * Beyond the existing session bookkeeping this is the earliest evidence that
+       * tools are back — roughly 30s ahead of the next health tick, which is
+       * exactly the window #663's false restarts fired in.
+       */
+    handleMcpReady(msg, socket) {
+        const sessionName = msg.sessionName;
+        if (sessionName) {
+            this.socketSessionNames.set(socket, sessionName);
+            socket.on("close", () => {
+                this.socketSessionNames.delete(socket);
+                // Notify fleet manager so it can clean up sessionRegistry
+                if (sessionName !== this.name) {
+                    this.ipcServer?.broadcast({ type: "session_disconnected", sessionName });
+                }
+            });
+        }
+        this.logger.debug({ sessionName, pid: msg.pid }, "MCP channel server connected and ready");
+        // Gated on ownership: this ipcServer also accepts EXTERNAL sessions (a
+        // `claude` run in another directory registers as `external-<cwd>-<pid>`).
+        // Without the gate an unrelated session could stand down a restart armed
+        // for THIS instance's genuinely dead server. The liveness re-read below is
+        // a second guard, but ownership is the one that is semantically right.
+        if (sessionName === this.name && this.mcpRestartPending) {
+            const live = mcpServerState(this.instanceDir);
+            if (live.state === "alive") {
+                this.logger.info({ pid: live.pid }, "MCP server replaced — standing down the pending revival restart");
+                this.mcpDeathNotifiedForPid = null;
+                this.mcpDeathDeferredForPid = null;
+                this.clearMcpRestartRequest();
+            }
+        }
+        this.ipcServer?.broadcast({ type: "mcp_ready", sessionName });
+    }
     checkMcpServerAlive() {
         if (this.isPaused)
             return;
@@ -1318,26 +1359,53 @@ export class Daemon extends EventEmitter {
             return;
         if (status.state === "alive") {
             this.mcpDeathNotifiedForPid = null; // the CLI respawned it — re-arm
+            this.mcpDeathDeferredForPid = null;
             this.clearMcpRestartRequest(); // tools are back — stand down a pending auto-restart
             return;
         }
         // Dead: report once per pid, and at most once per cooldown window.
         if (this.mcpDeathNotifiedForPid === status.pid)
             return;
-        if (Date.now() - this.lastMcpDeathNotifiedAt < Daemon.MCP_DEATH_COOLDOWN_MS)
-            return;
-        this.mcpDeathNotifiedForPid = status.pid;
-        this.lastMcpDeathNotifiedAt = Date.now();
         // An auth-broken CLI cannot keep an MCP server alive, and restarting it
         // only loops back to the sign-in screen — hold the auto-restart until a
         // re-login (which restarts the instance and replaces this daemon anyway).
         const authSuspected = this.authFailureUnresolved;
         const autoRestart = this.config.mcp_auto_restart !== false && !authSuspected;
+        // Codex <0.146 kills and recreates its MCP connections wholesale, so the
+        // FIRST sighting of a dead pid under a live Codex is more likely a swap
+        // than a loss. Hold the alarm for one tick — only the alarm: the restart is
+        // still armed, and the chokepoint's re-read cancels it if the replacement
+        // arrives. Not generalised to other backends, where a dead MCP under a live
+        // CLI is a genuine incident that silence would mask.
+        //
+        // Crucially this does NOT touch mcpDeathNotifiedForPid or the cooldown
+        // clock: if the suspicion is wrong the incident must still be reportable.
+        if (this.suspectsTransientMcpReplacement() && this.mcpDeathDeferredForPid !== status.pid) {
+            this.mcpDeathDeferredForPid = status.pid;
+            this.logger.warn({ pid: status.pid }, "MCP server pid is gone under a live Codex — holding the alarm one tick for a possible replacement");
+            if (autoRestart)
+                this.armMcpRestartWhenIdle();
+            return;
+        }
+        if (Date.now() - this.lastMcpDeathNotifiedAt < Daemon.MCP_DEATH_COOLDOWN_MS)
+            return;
+        this.mcpDeathNotifiedForPid = status.pid;
+        this.mcpDeathDeferredForPid = null;
+        this.lastMcpDeathNotifiedAt = Date.now();
         this.logger.error({ pid: status.pid, autoRestart, authSuspected }, "MCP server process is gone — instance has no agend tools");
         this.emit("mcp_died", { name: this.name, pid: status.pid, autoRestart, authSuspected });
         if (autoRestart)
             this.armMcpRestartWhenIdle();
     }
+    /**
+     * Whether a dead MCP pid on this backend is more likely a CLI-driven
+     * replacement than a real loss. Codex only, and deliberately narrow: it is
+     * the backend whose released fix (0.146) confirms it tore down healthy MCP
+     * connections alongside the one it meant to restart.
+     */
+    suspectsTransientMcpReplacement() {
+        return (this.config.backend ?? this.backend?.binaryName) === "codex";
+    }
     /**
      * Arm an automatic instance restart to revive a dead MCP server. Fires on the
      * next busy→idle edge — or immediately when the pane is already idle, which is
@@ -1360,21 +1428,110 @@ export class Daemon extends EventEmitter {
             this.fireMcpRestartRequest("already_idle");
         }
     }
+    /**
+     * Single chokepoint for all three revival triggers (already_idle, idle_edge,
+     * stale_timeout) — and therefore the one place worth re-checking reality.
+     *
+     * The pending flag is armed by a health tick that saw the OLD pid die, and
+     * was previously fired without ever looking again. When a CLI legitimately
+     * respawns its own MCP child, the replacement is already serving by the time
+     * the turn ends — but the idle edge fires inside the ~30s before the next
+     * health tick can stand the request down, restarting a healthy instance. One
+     * external user was restarted 18 times in two days this way (#663).
+     *
+     * Re-reading here is safe for every backend: worst case it clears a pending
+     * restart that should not have existed.
+     */
     fireMcpRestartRequest(trigger) {
-        // A recovery is already reshaping the CLI: crash-loop handling
-        // (healthCheckPaused), a respawn in flight (spawning), or a pause
-        // (isPaused / frozen monitors). Each of those paths ends in a fresh CLI —
-        // and with it a fresh MCP server — or in supervision ending, where a
-        // restart on top would fight the recovery. Either way the revival restart
-        // is moot: cancel it rather than defer it.
-        if (this.healthCheckPaused || this.spawning || this.isPaused || this.runtimeMonitorsFrozen) {
-            this.logger.warn({ trigger }, "MCP revival restart cancelled — instance is already pausing/spawning/recovering");
+        if (this.mcpRestartCancelledByRecovery(trigger))
+            return;
+        // Authoritative re-read — the CLI may have replaced the server since the
+        // health tick that armed this.
+        if (mcpServerState(this.instanceDir).state === "alive") {
+            this.logger.info({ trigger }, "MCP revival restart stood down — a live MCP server is already serving");
             this.clearMcpRestartRequest();
             return;
         }
+        // Not back yet: give a CLI-driven replacement a bounded moment rather than
+        // restarting the instance out from under it. One timer covers all three
+        // triggers; a second trigger during the wait is a no-op.
+        if (this.mcpRestartGraceTimer) {
+            // stale_timeout outranks the idle-gated triggers: it is the backstop for
+            // a turn that never ends, so it must not be lost to an in-flight grace.
+            if (trigger === "stale_timeout")
+                this.mcpRestartGraceTrigger = "stale_timeout";
+            return;
+        }
+        this.mcpRestartGraceTrigger = trigger;
+        this.mcpRestartGraceTimer = setTimeout(() => {
+            this.mcpRestartGraceTimer = null;
+            const committed = this.mcpRestartGraceTrigger ?? trigger;
+            this.mcpRestartGraceTrigger = null;
+            if (!this.mcpRestartPending || this.runtimeMonitorsFrozen)
+                return;
+            if (this.mcpRestartCancelledByRecovery(committed))
+                return;
+            if (mcpServerState(this.instanceDir).state === "alive") {
+                this.logger.info({ trigger: committed }, "MCP revival restart stood down — replacement came up during the grace window");
+                this.clearMcpRestartRequest();
+                return;
+            }
+            // Re-check the idle gate. The grace turned what used to be a synchronous
+            // decision into a 2s window, and "idle edge, then a queued message lands"
+            // is the NORMAL ordering for queued delivery — so without this the
+            // restart tears down a turn that started during the wait. Worse than the
+            // race it replaced: the #485 proxy reply only runs at turn end, so an
+            // in-flight answer would be swallowed with no fallback. Only the
+            // 30-minute stale timer may interrupt a live turn, by design.
+            //
+            // Deliberately does NOT clear pending: the MCP really is gone, so the
+            // request must survive to the next idle edge (which re-enters here), and
+            // the stale timer keeps running underneath as the backstop.
+            if (committed !== "stale_timeout" && !(this.instanceState === "idle" && this.pasteQueueDepth === 0)) {
+                this.logger.info({ trigger: committed, instanceState: this.instanceState, pasteQueueDepth: this.pasteQueueDepth }, "MCP revival restart deferred — the pane went busy during the grace window");
+                return;
+            }
+            // The suspicion was wrong: a real loss. Report it BEFORE asking for the
+            // restart — instance-lifecycle's suppression path documents that it
+            // assumes the mcp_died notification has already gone out, and this daemon
+            // does not survive the restart to send it afterwards.
+            this.reportDeferredMcpDeath();
+            this.clearMcpRestartRequest();
+            this.logger.warn({ trigger: committed }, "Requesting instance restart to revive its MCP server");
+            this.emit("mcp_restart_requested", { name: this.name, trigger: committed });
+        }, Daemon.MCP_REPLACEMENT_GRACE_MS);
+        this.mcpRestartGraceTimer.unref?.();
+    }
+    /**
+     * A recovery is already reshaping the CLI: crash-loop handling
+     * (healthCheckPaused), a respawn in flight (spawning), or a pause
+     * (isPaused / frozen monitors). Each ends in a fresh CLI — and with it a
+     * fresh MCP server — or in supervision ending, where a restart on top would
+     * fight the recovery. Either way the revival restart is moot.
+     */
+    mcpRestartCancelledByRecovery(trigger) {
+        if (!(this.healthCheckPaused || this.spawning || this.isPaused || this.runtimeMonitorsFrozen))
+            return false;
+        this.logger.warn({ trigger }, "MCP revival restart cancelled — instance is already pausing/spawning/recovering");
         this.clearMcpRestartRequest();
-        this.logger.warn({ trigger }, "Requesting instance restart to revive its MCP server");
-        this.emit("mcp_restart_requested", { name: this.name, trigger });
+        return true;
+    }
+    /**
+     * Emit a dead-MCP report that was held back as a suspected replacement, once
+     * it is clear no replacement is coming. Consumes the once-per-pid budget
+     * here — deferring was to avoid spending it on a false alarm, not to drop
+     * the incident.
+     */
+    reportDeferredMcpDeath() {
+        const pid = this.mcpDeathDeferredForPid;
+        if (pid == null || this.mcpDeathNotifiedForPid === pid)
+            return;
+        const authSuspected = this.authFailureUnresolved;
+        const autoRestart = this.config.mcp_auto_restart !== false && !authSuspected;
+        this.mcpDeathNotifiedForPid = pid;
+        this.lastMcpDeathNotifiedAt = Date.now();
+        this.logger.error({ pid, autoRestart, authSuspected }, "MCP server process is gone — no replacement arrived, instance has no agend tools");
+        this.emit("mcp_died", { name: this.name, pid, autoRestart, authSuspected });
     }
     clearMcpRestartRequest() {
         this.mcpRestartPending = false;
@@ -1382,6 +1539,11 @@ export class Daemon extends EventEmitter {
             clearTimeout(this.mcpRestartStaleTimer);
             this.mcpRestartStaleTimer = null;
         }
+        if (this.mcpRestartGraceTimer) {
+            clearTimeout(this.mcpRestartGraceTimer);
+            this.mcpRestartGraceTimer = null;
+        }
+        this.mcpRestartGraceTrigger = null;
     }
     startHealthCheck() {
         if (this.runtimeMonitorsFrozen || this.healthCheckTimer)
@@ -3112,16 +3274,7 @@ export class Daemon extends EventEmitter {
         const fromInstance = meta.from_instance;
         let formatted;
         if (fromInstance) {
-            // #77: show the sender's display name for readability, keeping the machine
-            // instance name in parens so the recipient's send_to_instance target is valid.
-            const fromLabel = meta.from_display ? `${meta.from_display} (${fromInstance})` : fromInstance;
-            formatted = `[from:${fromLabel}] ${content}`;
-            formatted += renderHandoffMetadata(meta);
-            // A delegated task that requires a reply must not read like a chatty FYI —
-            // the "you may stay silent" line is for the latter only.
-            formatted += meta.requires_reply === "true"
-                ? "\n(A reply IS required: use report_result with the correlation_id above — or send_to_instance. Not direct text.)"
-                : "\n(If you need to reply, use send_to_instance tool, NOT direct text. If there is nothing to add, you may stay silent.)";
+            formatted = formatCrossInstanceInboundMessage(content, meta);
         }
         else {
             const via = meta.source ? ` via ${meta.source}` : "";
@@ -3303,8 +3456,19 @@ export class Daemon extends EventEmitter {
                 // A fresh delivery begins a fresh turn — its bubble must not inherit
                 // the previous turn's tool list.
                 this.resetToolProgress();
-                if (await this.deliverMessage(formatted, status, { deliveryEpoch }))
+                if (await this.deliverMessage(formatted, status, { deliveryEpoch })) {
                     this.markTurnStarted(meta, formatted);
+                }
+                else if (meta.from_instance && this.isDeliveryEpochCurrent(deliveryEpoch)) {
+                    const error = this.tmux?.getLastPasteError?.() ?? "target pane rejected the delivery";
+                    this.ipcServer?.broadcast({
+                        type: "cross_instance_delivery_failed",
+                        senderSession: meta.from_instance,
+                        targetInstance: this.name,
+                        correlationId: meta.correlation_id ?? "unknown",
+                        error,
+                    });
+                }
             }
             finally {
                 this.pasteQueueDepth--;
@@ -3480,7 +3644,16 @@ export class Daemon extends EventEmitter {
             const pasteStartedAt = Date.now();
             const pasted = await this.tmux.pasteBuffer(formatted);
             if (!pasted) {
-                this.logger.warn({ attempt }, "pasteBuffer failed — recovering window and backing off");
+                const tmuxError = this.tmux.getLastPasteError?.() ?? "unknown tmux paste failure";
+                const recoverable = this.tmux.isLastPasteFailureRecoverable?.() ?? true;
+                this.logger[recoverable ? "warn" : "error"]({ attempt, tmuxError, recoverable }, recoverable
+                    ? "pasteBuffer failed — recovering window and backing off"
+                    : "pasteBuffer failed — non-retryable tmux error");
+                if (!recoverable) {
+                    if (status)
+                        this.emit("message_failed", status);
+                    return false;
+                }
                 windowId = (await this.recoverWindow()) ?? windowId;
                 if (attempt < maxAttempts)
                     await new Promise(r => setTimeout(r, 2000));
@@ -3562,7 +3735,9 @@ export class Daemon extends EventEmitter {
                 }
                 const repasted = await this.tmux.pasteBuffer(formatted);
                 if (!repasted) {
-                    this.logger.error("Idle-gated redelivery paste failed after native-queue silent loss");
+                    this.logger.error({
+                        tmuxError: this.tmux.getLastPasteError?.() ?? "unknown tmux paste failure",
+                    }, "Idle-gated redelivery paste failed after native-queue silent loss");
                     if (status)
                         this.emit("message_failed", status); // ❌
                     return false;