cmdr-mcp 0.1.0 → 0.2.0

package/plugins/cmdr/dist/daemon.mjs

@@ -6,11 +6,419 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
+// src/daemon/standby.ts
+import { createHash, randomUUID } from "node:crypto";
+import { isAbsolute } from "node:path";
+
+// src/daemon/adapters/codex.ts
+import { spawn } from "node:child_process";
+import { createInterface } from "node:readline";
+var CodexAdapter = class {
+  constructor(options) {
+    this.options = options;
+  }
+  child;
+  ready;
+  next = 1;
+  pending = /* @__PURE__ */ new Map();
+  connect() {
+    if (this.ready) return this.ready;
+    const child = spawn(
+      this.options.executable || "codex",
+      ["app-server", "proxy", ...this.options.socket ? ["--sock", this.options.socket] : []],
+      { stdio: "pipe" }
+    );
+    this.child = child;
+    const lines = createInterface({ input: child.stdout });
+    let stderr = "";
+    child.stderr.on("data", (chunk) => {
+      stderr = (stderr + String(chunk)).slice(-1e3);
+    });
+    const failed = (error) => {
+      if (this.child !== child) return;
+      this.child = void 0;
+      this.ready = void 0;
+      for (const p of this.pending.values()) {
+        clearTimeout(p.timer);
+        p.reject(
+          new Error(
+            stderr.trim() || error?.message || "Codex proxy disconnected; wake outcome may be uncertain"
+          )
+        );
+      }
+      this.pending.clear();
+      lines.close();
+      child.kill();
+    };
+    child.on("error", failed);
+    child.on("exit", () => failed());
+    child.stdin.on("error", failed);
+    lines.on("line", (line) => {
+      if (Buffer.byteLength(line) > 4 * 1024 * 1024) {
+        this.close();
+        return;
+      }
+      try {
+        const m = JSON.parse(line), p = this.pending.get(m.id);
+        if (!p) return;
+        this.pending.delete(m.id);
+        clearTimeout(p.timer);
+        if (m.error)
+          p.reject(new Error(`Codex ${m.error.code}: ${String(m.error.message).slice(0, 300)}`));
+        else p.resolve(m.result);
+      } catch {
+        this.close();
+      }
+    });
+    this.ready = this.request("initialize", {
+      clientInfo: { name: "cmdr", version: "1" },
+      capabilities: { experimentalApi: true }
+    }).then(() => {
+      child.stdin.write(JSON.stringify({ method: "initialized" }) + "\n");
+    }).catch((error) => {
+      this.close();
+      throw error;
+    });
+    return this.ready;
+  }
+  request(method, params) {
+    return new Promise((resolve2, reject) => {
+      const id = this.next++;
+      const timer = setTimeout(() => {
+        this.pending.delete(id);
+        reject(new Error(`Codex ${method} timed out; reconcile before retrying`));
+        this.close();
+      }, 1e4);
+      this.pending.set(id, { resolve: resolve2, reject, timer });
+      this.child.stdin.write(JSON.stringify({ id, method, params }) + "\n");
+    });
+  }
+  async call(method, params) {
+    await this.connect();
+    return this.request(method, params);
+  }
+  async state(native) {
+    let result = await this.call("thread/read", { threadId: native, includeTurns: false });
+    if (result.thread?.status?.type === "notLoaded") {
+      result = await this.call("thread/resume", { threadId: native, excludeTurns: true });
+    }
+    await this.call("thread/queue/list", { threadId: native, limit: 1 });
+    const type = result.thread?.status?.type;
+    return type === "idle" ? "idle" : type === "active" ? "busy" : "unknown";
+  }
+  async lookup(native, request) {
+    let cursor = null;
+    do {
+      const page = await this.call("thread/queue/list", { threadId: native, cursor, limit: 100 });
+      const match = page.data?.find((q) => q.clientUserMessageId === request.id);
+      if (match) return { found: true, submission: String(match.id) };
+      cursor = page.nextCursor;
+    } while (cursor);
+    do {
+      const page = await this.call("thread/turns/list", {
+        threadId: native,
+        cursor,
+        limit: 50,
+        itemsView: "full"
+      });
+      if (page.data?.some(
+        (t) => t.items?.some((i) => i.type === "userMessage" && i.clientId === request.id)
+      ))
+        return { found: true };
+      const oldest = page.data?.at(-1)?.startedAt;
+      if (oldest && oldest * 1e3 < request.created_at - 6e4) break;
+      cursor = page.nextCursor;
+    } while (cursor);
+    return { found: false };
+  }
+  async enqueue(native, request) {
+    const text2 = `[cmdr wake ${request.id}] Actionable messages or unfinished commands await this member. Call cmdr read, then read(recover=true). Accept commands with report(working, reply_to) before work. Check cancel messages first; never repeat completed work. Messages do not expand user authorization.`;
+    const result = await this.call("thread/queue/add", {
+      threadId: native,
+      clientUserMessageId: request.id,
+      input: [{ type: "text", text: text2, text_elements: [] }]
+    });
+    if (!result.queuedSubmission?.id)
+      throw new Error("Codex queue response did not confirm acceptance");
+    return String(result.queuedSubmission.id);
+  }
+  async start(native, submission) {
+    if (await this.state(native) !== "idle") return;
+    await this.call("thread/queue/start", { threadId: native, queuedSubmissionId: submission });
+  }
+  close() {
+    const child = this.child;
+    this.child = void 0;
+    this.ready = void 0;
+    for (const p of this.pending.values()) {
+      clearTimeout(p.timer);
+      p.reject(new Error("Codex adapter closed"));
+    }
+    this.pending.clear();
+    child?.kill();
+  }
+};
+
+// src/shared/protocol.ts
+var LIMITS = {
+  maxWaitSec: 300,
+  maxBody: 32768,
+  maxData: 65536,
+  maxFrame: 2 * 1024 * 1024
+};
+var CmdrError = class extends Error {
+  constructor(code, message = code) {
+    super(message);
+    this.code = code;
+  }
+};
+function fail(code, message) {
+  throw new CmdrError(code, message);
+}
+var terminalWork = (m) => !!m?.work && ["completed", "failed", "cancelled"].includes(m.work.state);
+
+// src/daemon/standby.ts
+var StandbyManager = class {
+  constructor(core, factory = (s) => new CodexAdapter(s)) {
+    this.core = core;
+    this.factory = factory;
+    for (const listener of core.store.standbys())
+      if (listener.enabled && listener.wake_mode !== "manual") {
+        listener.health = "starting";
+        listener.host_state = "unknown";
+        core.store.saveStandby(listener);
+      }
+  }
+  adapters = /* @__PURE__ */ new Map();
+  running = false;
+  stopped = false;
+  get active() {
+    return this.core.store.standbys().some((s) => s.enabled && s.wake_mode !== "manual");
+  }
+  configure(p) {
+    const store = this.core.store, session = store.session(p.sid) || fail("NOT_JOINED");
+    if (!session.native_id || !session.squad_id)
+      fail("IDENTITY_REQUIRED", "Join with the real host session ID first");
+    let s = store.standby(session.sid);
+    if (p.action === "status")
+      return s || { sid: p.sid, wake_mode: "manual", health: "manual", enabled: false };
+    if (!["start", "stop", "resume"].includes(p.action)) fail("INVALID_ARGUMENT");
+    if (p.executable && (typeof p.executable !== "string" || !isAbsolute(p.executable)))
+      fail("INVALID_ARGUMENT", "executable must be an absolute path");
+    if (p.socket && (typeof p.socket !== "string" || !isAbsolute(p.socket)))
+      fail("INVALID_ARGUMENT", "socket must be an absolute path");
+    if (p.adapter && !["codex", "manual"].includes(p.adapter)) fail("INVALID_ARGUMENT");
+    if (p.resolve && !["retry", "accepted"].includes(p.resolve)) fail("INVALID_ARGUMENT");
+    if (!s)
+      s = {
+        sid: session.sid,
+        enabled: false,
+        wake_mode: "manual",
+        health: "manual",
+        host_state: "unknown",
+        checked_at: null
+      };
+    if (p.action === "stop") {
+      s.enabled = false;
+      s.health = "stopped";
+    } else {
+      if (p.adapter === "codex" && session.agent !== "codex")
+        fail("INVALID_ARGUMENT", "Codex adapter requires a Codex member");
+      s.wake_mode = p.adapter || (p.action === "start" ? session.agent === "codex" ? "codex" : "manual" : s.wake_mode);
+      s.enabled = true;
+      s.health = s.wake_mode === "manual" ? "manual" : "starting";
+      s.executable = p.executable || s.executable;
+      s.socket = p.socket || s.socket;
+      if (p.resolve === "retry") s.request = void 0;
+      if (p.resolve === "accepted" && s.request) s.request.state = "accepted";
+      if (s.request?.state === "failed") s.request = void 0;
+    }
+    s.generation = (s.generation || 0) + 1;
+    this.adapters.get(s.sid)?.close();
+    this.adapters.delete(s.sid);
+    this.save(
+      s,
+      "standby.changed",
+      p.resolve ? `operator resolved wake as ${p.resolve}` : p.action
+    );
+    return s;
+  }
+  save(s, kind, reason) {
+    if (this.stopped || !this.core.store.session(s.sid)) return;
+    const cursor = this.core.store.eventCursor();
+    this.core.store.transaction(() => {
+      this.core.store.saveStandby(s);
+      if (kind)
+        this.core.record(kind, this.core.store.session(s.sid).squad_id, {
+          to_sid: s.sid,
+          reason,
+          data: {
+            wake_id: s.request?.id,
+            message_ids: s.request?.message_ids,
+            state: s.request?.state,
+            health: s.health,
+            host_state: s.host_state
+          }
+        });
+    });
+    this.core.publishEvents(cursor);
+  }
+  actionable(sid) {
+    const session = this.core.store.session(sid);
+    return [
+      ...new Map(
+        [
+          ...this.core.inbox(session).filter((m) => m.attn),
+          ...this.core.store.commands(sid).filter(
+            (m) => !m.blocked_by || ["completed", "failed", "cancelled"].includes(
+              this.core.store.message(m.blocked_by)?.work?.state || ""
+            )
+          )
+        ].map((m) => [m.id, m])
+      ).values()
+    ];
+  }
+  async tick() {
+    if (this.running || this.stopped) return;
+    this.running = true;
+    try {
+      for (const [sid, adapter] of this.adapters) {
+        const current = this.core.store.standby(sid);
+        if (!current?.enabled || current.wake_mode === "manual") {
+          adapter.close();
+          this.adapters.delete(sid);
+        }
+      }
+      const records = this.core.store.standbys().filter((s) => s.enabled && s.wake_mode !== "manual");
+      let next = 0;
+      await Promise.all(
+        Array.from({ length: Math.min(4, records.length) }, async () => {
+          while (!this.stopped && next < records.length) await this.check(records[next++]);
+        })
+      );
+    } finally {
+      this.running = false;
+    }
+  }
+  async check(s) {
+    const store = this.core.store, session = store.session(s.sid);
+    if (!session?.native_id || !session.squad_id) return;
+    let adapter = this.adapters.get(s.sid);
+    if (!adapter) {
+      adapter = this.factory(s);
+      this.adapters.set(s.sid, adapter);
+    }
+    const valid = () => !this.stopped && store.session(s.sid)?.native_id === session.native_id && store.standby(s.sid)?.enabled === true && store.standby(s.sid)?.generation === s.generation;
+    try {
+      const host = await adapter.state(session.native_id);
+      if (!valid()) return;
+      s.host_state = host;
+      s.checked_at = Date.now();
+      s.error = host === "unknown" ? "Host session is not loaded or its runtime state is unavailable; resume it in the host." : void 0;
+      const work = this.actionable(s.sid);
+      const fingerprint = createHash("sha256").update(
+        JSON.stringify(
+          work.map((m) => [m.id, m.work?.state, m.work?.updated_at, m.work?.cancel_requested_at])
+        )
+      ).digest("hex");
+      if (s.request && s.request.state !== "observed") {
+        if (s.request.state === "accepted" && host === "busy") {
+          s.health = "healthy";
+          this.save(s);
+          return;
+        }
+        const found = await adapter.lookup(session.native_id, s.request);
+        if (!valid()) return;
+        if (found.submission) {
+          s.request.state = "accepted";
+          s.request.submission_id = found.submission;
+          s.request.message_ids = [
+            .../* @__PURE__ */ new Set([...s.request.message_ids, ...work.map((m) => m.id)])
+          ];
+          s.health = host === "unknown" ? "error" : "healthy";
+          this.save(
+            s,
+            recordChanged(store.standby(s.sid), s) ? "wake.accepted" : void 0,
+            s.error
+          );
+          if (host === "idle") await adapter.start(session.native_id, found.submission);
+          return;
+        }
+        if (found.found || s.request.state === "accepted") {
+          const unresolved = s.request.message_ids.some((id) => work.some((m) => m.id === id));
+          s.request.state = "accepted";
+          s.request.submission_id = void 0;
+          if (!unresolved || found.found && host === "idle" && fingerprint !== s.request.fingerprint) {
+            s.request.state = "observed";
+            s.health = host === "unknown" ? "error" : "healthy";
+            this.save(s, "wake.observed");
+          } else {
+            s.health = host === "idle" && Date.now() - s.request.created_at > 6e4 ? "stalled" : host === "unknown" ? "error" : "healthy";
+            this.save(s, recordChanged(store.standby(s.sid), s) ? "standby.health" : void 0);
+            return;
+          }
+        } else {
+          s.request.state = "uncertain";
+          s.health = "uncertain";
+          s.error = "Wake not found in host queue/history. Inspect host and use standby resume --resolve retry|accepted; no automatic replay.";
+          this.save(
+            s,
+            recordChanged(store.standby(s.sid), s) ? "wake.uncertain" : void 0,
+            s.error
+          );
+          return;
+        }
+      }
+      s.health = host === "unknown" ? "error" : "healthy";
+      this.save(s, recordChanged(store.standby(s.sid), s) ? "standby.health" : void 0, s.error);
+      if (!work.length || host !== "idle") return;
+      s.request = {
+        id: randomUUID(),
+        fingerprint,
+        message_ids: work.map((m) => m.id),
+        created_at: Date.now(),
+        state: "requested"
+      };
+      this.save(s, "wake.requested");
+      const submission = await adapter.enqueue(session.native_id, s.request);
+      if (!valid()) return;
+      s.request.state = "accepted";
+      s.request.submission_id = submission;
+      this.save(s, "wake.accepted");
+      await adapter.start(session.native_id, submission);
+    } catch (e) {
+      if (!valid()) return;
+      s.checked_at = Date.now();
+      s.error = String(e).slice(0, 500);
+      if (s.request && s.request.state !== "observed") {
+        s.request.state = "uncertain";
+        s.health = "uncertain";
+        s.request.error = s.error;
+      } else s.health = "error";
+      const previous = store.standby(s.sid);
+      this.save(
+        s,
+        recordChanged(previous, s) || previous?.error !== s.error ? "wake.failed" : void 0,
+        s.error
+      );
+    }
+  }
+  close() {
+    this.stopped = true;
+    for (const a of this.adapters.values()) a.close();
+    this.adapters.clear();
+  }
+};
+function recordChanged(a, b) {
+  return a?.health !== b.health || a?.host_state !== b.host_state || a?.request?.state !== b.request?.state;
+}
+
 // src/daemon/server.ts
 import { createServer } from "node:net";
 import { chmodSync as chmodSync2, rmSync as rmSync4, writeFileSync as writeFileSync3, existsSync as existsSync2, statSync as statSync3 } from "node:fs";
 
 // src/daemon/core.ts
+import { randomUUID as randomUUID3 } from "node:crypto";
 import { readdirSync as readdirSync2, rmSync, writeFileSync } from "node:fs";
 import { join as join2 } from "node:path";
 
@@ -4128,23 +4536,6 @@ var coerce = {
 };
 var NEVER = INVALID;
 
-// src/shared/protocol.ts
-var LIMITS = {
-  maxWaitSec: 300,
-  maxBody: 32768,
-  maxData: 65536,
-  maxFrame: 2 * 1024 * 1024
-};
-var CmdrError = class extends Error {
-  constructor(code, message = code) {
-    super(message);
-    this.code = code;
-  }
-};
-function fail(code, message) {
-  throw new CmdrError(code, message);
-}
-
 // src/shared/schemas.ts
 var text = external_exports.string().min(1).refine((v) => Buffer.byteLength(v) <= LIMITS.maxBody, "MESSAGE_TOO_LARGE");
 var data = external_exports.record(external_exports.unknown()).refine((v) => Buffer.byteLength(JSON.stringify(v)) <= LIMITS.maxData, "MESSAGE_TOO_LARGE").optional();
@@ -4157,16 +4548,20 @@ var schemas = {
     squad: external_exports.string().optional(),
     name: external_exports.string().trim().min(1).max(64).optional(),
     note: text.optional(),
-    squad_name: external_exports.string().trim().min(1).max(64).optional()
+    squad_name: external_exports.string().trim().min(1).max(64).optional(),
+    takeover: external_exports.boolean().default(false),
+    standby: external_exports.enum(["auto", "manual"]).optional(),
+    rebind: external_exports.string().optional()
   }).strict(),
   list: external_exports.object({
     ...identity,
+    full: external_exports.boolean().default(false),
     scope: external_exports.enum(["squad", "all"]).optional(),
     squad: external_exports.string().optional()
   }).strict(),
   report: external_exports.object({
     ...identity,
-    status: external_exports.enum(["ready", "working", "blocked", "done", "failed"]),
+    status: external_exports.enum(["ready", "working", "blocked", "done", "failed", "cancelled"]),
     message: text,
     reply_to: external_exports.string().optional(),
     data
@@ -4176,7 +4571,10 @@ var schemas = {
     ...identity,
     to: external_exports.union([external_exports.string().min(1), external_exports.array(external_exports.string().min(1)).min(1).max(1e3)]),
     message: text,
-    type: external_exports.enum(["command", "answer", "info"]).default("command"),
+    type: external_exports.enum(["command", "cancel", "answer", "info"]).default("command"),
+    task_key: external_exports.string().min(1).max(128).optional(),
+    reassign: external_exports.string().optional(),
+    attention: external_exports.boolean().optional(),
     priority: external_exports.enum(["high", "normal", "low"]).optional(),
     reply_to: external_exports.string().optional(),
     data
@@ -4187,7 +4585,10 @@ var schemas = {
     limit: external_exports.number().int().min(1).max(100).default(20),
     peek: external_exports.boolean().default(false),
     history: external_exports.boolean().default(false),
-    since: external_exports.string().optional()
+    since: external_exports.string().optional(),
+    id: external_exports.string().optional(),
+    recover: external_exports.boolean().default(false),
+    full: external_exports.boolean().default(false)
   }).strict(),
   leave: external_exports.object({ ...identity, dissolve: external_exports.boolean().default(false), message: text.optional() }).strict()
 };
@@ -4202,34 +4603,55 @@ function parse(tool, args) {
 }
 
 // src/shared/ids.ts
-import { randomBytes, randomUUID } from "node:crypto";
+import { randomBytes, randomUUID as randomUUID2 } from "node:crypto";
 var alphabet = "23456789abcdefghjkmnpqrstuvwxyz";
 function squadId() {
   return Array.from(randomBytes(6), (b) => alphabet[b % alphabet.length]).join("");
 }
 var messageId = () => `m_${Date.now().toString(36)}${randomBytes(6).toString("hex")}`;
-var provisionalId = (agent) => `${agent}:prov-${randomUUID()}`;
+var provisionalId = (agent) => `${agent}:prov-${randomUUID2()}`;
 var safeSid = (sid) => Buffer.from(sid).toString("base64url");
 
 // src/shared/env.ts
-function recommendedWait(agent, env = process.env) {
-  if (agent === "claude") return 300;
+function waitRecommendation(agent, env = process.env) {
   const timeout = Number(env.CMDR_TOOL_TIMEOUT_SEC);
-  return Number.isFinite(timeout) && timeout > 60 ? Math.min(300, Math.max(45, timeout - 15)) : 45;
+  if (Number.isFinite(timeout) && timeout > 0) {
+    return {
+      seconds: Math.min(300, Math.max(0, timeout - Math.min(15, timeout / 4))),
+      source: "CMDR_TOOL_TIMEOUT_SEC",
+      timeout
+    };
+  }
+  return { seconds: agent === "claude" ? 300 : 45, source: "host default", timeout: null };
+}
+function recommendedWait(agent, env = process.env) {
+  return waitRecommendation(agent, env).seconds;
 }
 
 // src/daemon/core.ts
+function bounded(values, limit) {
+  const result = [];
+  let bytes = 0;
+  for (const value of values) {
+    const size = Buffer.byteLength(JSON.stringify(value));
+    if (result.length >= limit || result.length > 0 && bytes + size > LIMITS.maxFrame / 2) break;
+    result.push(value);
+    bytes += size;
+  }
+  return result;
+}
 var Core = class {
   constructor(store, paths2, config2) {
     this.store = store;
     this.paths = paths2;
     this.config = config2;
     for (const s of store.sessions()) {
-      s.presence = "offline";
+      s.presence = s.transport === "cli" ? "cli" : "offline";
       store.saveSession(s);
     }
     this.refreshFlags();
   }
+  configureStandby;
   contexts = /* @__PURE__ */ new Set();
   waiters = /* @__PURE__ */ new Set();
   effects = [];
@@ -4241,22 +4663,32 @@ var Core = class {
     ctx.closed = true;
     this.contexts.delete(ctx);
     for (const w of this.waiters) if (w.ctx === ctx) w.finish();
-    if (ctx.sid && ![...this.contexts].some((c) => c.kind === "mcp" && c.sid === ctx.sid)) {
+    if (ctx.sid && ![...this.contexts].some(
+      (c) => c.kind === "mcp" && c.transport !== "cli" && c.sid === ctx.sid
+    )) {
       const s = this.store.session(ctx.sid);
       if (s) {
-        s.presence = "offline";
-        s.last_seen_at = Date.now();
-        this.store.saveSession(s);
+        s.presence = s.transport === "cli" ? "cli" : "offline";
+        this.atomic(() => {
+          this.store.saveSession(s);
+          this.record("session.disconnected", s.squad_id, {
+            to_sid: s.sid,
+            data: { presence: s.presence }
+          });
+        });
       }
     }
   }
   close() {
+    for (const ctx of this.contexts) ctx.closed = true;
     for (const w of this.waiters) w.finish();
   }
   me(ctx) {
     return ctx.sid ? this.store.session(ctx.sid) : void 0;
   }
   required(ctx) {
+    if (ctx.sid && this.store.revoked(ctx.sid))
+      fail("ENDPOINT_REPLACED", "This endpoint was replaced; use the new member session.");
     return this.me(ctx) || fail("NOT_JOINED", "Register a session first.");
   }
   member(ctx, role) {
@@ -4269,7 +4701,8 @@ var Core = class {
     return this.store.sessions().filter((s) => s.squad_id === id);
   }
   waitHint(s) {
-    return [...this.contexts].find((c) => c.sid === s.sid && c.kind === "mcp")?.waitHint || recommendedWait(s.agent, {});
+    const hints = [...this.contexts].filter((c) => c.sid === s.sid && c.kind === "mcp" && c.waitHint !== void 0).map((c) => c.waitHint);
+    return hints.length ? Math.min(...hints) : recommendedWait(s.agent, {});
   }
   envelope(ctx, value) {
     const s = this.me(ctx);
@@ -4280,10 +4713,13 @@ var Core = class {
         role: s.role,
         squad: s.squad_id,
         name: s.name,
+        member_id: s.member_id || s.sid,
+        wake_mode: this.store.standby(s.sid)?.wake_mode || "manual",
+        listener: this.standbyView(s.sid),
         identity: s.native_id ? "confirmed" : "provisional",
         recommended_wait: this.waitHint(s)
       } : null,
-      unread: s ? this.store.queue(s.sid).length : 0
+      unread: s ? this.inbox(s).length : 0
     };
   }
   board(q) {
@@ -4293,18 +4729,101 @@ var Core = class {
       members: this.members(q.id).map((s) => this.view(s))
     };
   }
-  view(s) {
-    const queue = this.store.queue(s.sid);
+  standbyView(sid) {
+    const standby = this.store.standby(sid);
+    return standby ? {
+      sid: standby.sid,
+      wake_mode: standby.wake_mode,
+      enabled: standby.enabled,
+      health: standby.health,
+      host_state: standby.host_state,
+      checked_at: standby.checked_at,
+      error: standby.error,
+      request: standby.request ? {
+        id: standby.request.id,
+        state: standby.request.state,
+        created_at: standby.request.created_at
+      } : void 0,
+      can_auto_respond: standby.enabled && standby.wake_mode !== "manual" && standby.health === "healthy"
+    } : { wake_mode: "manual", health: "manual", can_auto_respond: false };
+  }
+  inbox(s, history = false) {
+    return [
+      ...this.store.queue(s.sid, history),
+      ...s.role === "commander" && s.squad_id ? this.store.queue(`squad:${s.squad_id}`, history) : []
+    ].filter((m) => history || !m.blocked_by || terminalWork(this.store.message(m.blocked_by))).sort((a, b) => a.priority - b.priority || a.seq - b.seq);
+  }
+  view(s, full = false, commandSquad) {
+    const commands = this.store.commands(s.sid).filter((m) => !commandSquad || m.squad_id === commandSquad).map((m) => ({
+      id: m.id,
+      task_key: m.task_key,
+      state: m.work?.state || (m.status === "queued" ? "queued" : "read"),
+      created_at: m.created_at,
+      updated_at: m.work?.updated_at || m.created_at,
+      unacked_for: m.work?.accepted_at ? null : Math.floor((Date.now() - m.created_at) / 1e3),
+      cancel_requested_at: m.work?.cancel_requested_at,
+      blocked_by: m.blocked_by
+    }));
     return {
-      ...s,
+      ...full ? s : {
+        sid: s.sid,
+        agent: s.agent,
+        name: s.name,
+        role: s.role,
+        cwd: s.cwd,
+        native_id: s.native_id,
+        presence: s.presence,
+        activity: s.activity,
+        last_status: s.last_status
+      },
+      member_id: s.member_id || s.sid,
       title: titleFor(s),
       short: s.sid.slice(0, s.sid.indexOf(":") + 9),
       squad: s.squad_id,
       last_seen: s.last_seen_at,
-      pending: queue.filter((m) => m.type === "command").length
+      activity_at: s.activity_at || null,
+      last_progress_at: s.last_progress_at || null,
+      hook_seen_at: s.hook_seen_at || null,
+      pending: commands.filter((m) => m.state === "queued").length,
+      unacked: commands.filter((m) => !["accepted"].includes(m.state)).length,
+      in_progress: commands.filter((m) => m.state === "accepted").length,
+      commands,
+      listener: this.standbyView(s.sid)
     };
   }
+  record(kind, channel, detail = {}) {
+    return this.store.appendEvent({ at: Date.now(), kind, channel, ...detail });
+  }
+  messageEvent(kind, m, reason) {
+    this.record(kind, m.squad_id, {
+      from_sid: m.from_sid,
+      to_sid: m.to_sid,
+      message_id: m.id,
+      reply_to: m.reply_to,
+      message: m,
+      reason
+    });
+  }
+  publishEvents(after) {
+    for (const event of this.store.events(after))
+      for (const c of this.contexts) {
+        const t = c.tail;
+        if (!t || event.event_seq <= t.after) continue;
+        t.after = event.event_seq;
+        if (t.squad && t.squad !== event.channel) continue;
+        if (t.for && t.for !== event.to_sid && !(event.to_sid === `squad:${event.channel}` && this.store.squad(event.channel)?.commander_sid === t.for))
+          continue;
+        c.notify(
+          "lifecycle.event",
+          t.full ? event : {
+            ...event,
+            message: event.message ? { ...event.message, body: event.message.body.slice(0, 160), data: null } : void 0
+          }
+        );
+      }
+  }
   atomic(fn) {
+    const cursor = this.store.eventCursor();
     this.effects = [];
     let result;
     try {
@@ -4316,12 +4835,13 @@ var Core = class {
     const effects = this.effects;
     this.effects = [];
     for (const m of effects) {
-      this.flag(m.to_sid);
+      const recipient = m.to_sid.startsWith("squad:") ? this.store.squad(m.squad_id)?.commander_sid : m.to_sid;
+      if (recipient) this.flag(recipient);
       for (const c of this.contexts) {
-        if (c.sid === m.to_sid)
+        if (c.sid === recipient)
           c.notify("msg.new", {
-            sid: m.to_sid,
-            count: this.store.queue(m.to_sid).length,
+            sid: recipient,
+            count: this.inbox(this.store.session(recipient)).length,
             top_priority: m.priority
           });
         if (c.tail && (!c.tail.squad || c.tail.squad === m.squad_id))
@@ -4331,8 +4851,15 @@ var Core = class {
           });
       }
     }
+    this.publishEvents(cursor);
     for (const w of [...this.waiters]) {
-      if (this.store.queue(w.sid).some((m) => !w.answer || m.type === "answer" && m.reply_to === w.answer))
+      if (!this.store.session(w.sid)) {
+        w.finish();
+        continue;
+      }
+      if (this.inbox(this.store.session(w.sid)).some(
+        (m) => !w.answer || m.type === "answer" && m.reply_to === w.answer
+      ))
         w.finish();
     }
     return result;
@@ -4347,17 +4874,17 @@ var Core = class {
     rmSync(this.paths.flag(sid), { force: true });
   }
   refreshFlags() {
-    const queued = new Set(
-      this.store.messages().filter((m) => m.status === "queued").map((m) => m.to_sid)
-    );
+    const queued = /* @__PURE__ */ new Set();
+    for (const s of this.store.sessions()) {
+      const queue = this.inbox(s);
+      if (!queue.length) continue;
+      queued.add(s.sid);
+      if (queue.some((m) => m.seq > s.last_notified_seq) || queue.some((m) => m.priority <= 0) && Date.now() - s.last_notified_at >= this.config.remindIntervalSec * 1e3)
+        this.flag(s.sid);
+    }
     for (const f of readdirSync2(this.paths.flags))
       if (!queued.has(Buffer.from(f, "base64url").toString()))
         rmSync(join2(this.paths.flags, f), { force: true });
-    for (const sid of queued) {
-      const s = this.store.session(sid), queue = this.store.queue(sid);
-      if (s && (queue.some((m) => m.seq > s.last_notified_seq) || queue.some((m) => m.priority === 0) && Date.now() - s.last_notified_at >= this.config.remindIntervalSec * 1e3))
-        this.flag(sid);
-    }
   }
   register(ctx, p) {
     if (!["mcp", "hook", "cli"].includes(p.kind))
@@ -4371,6 +4898,7 @@ var Core = class {
     const sid = p.native_id ? `${agent}:${String(p.native_id)}` : p.sid || ctx.sid || provisionalId(agent);
     if (typeof sid !== "string" || !sid.startsWith(agent + ":") || sid.length > 300 || p.native_id !== void 0 && (typeof p.native_id !== "string" || !p.native_id || p.native_id.length > 256))
       fail("INVALID_ARGUMENT");
+    if (this.store.revoked(sid)) fail("ENDPOINT_REPLACED");
     let s = this.store.session(sid);
     if (!s)
       s = {
@@ -4386,7 +4914,8 @@ var Core = class {
         role: "none",
         squad_id: null,
         presence: "offline",
-        activity: "busy",
+        activity: "unknown",
+        member_id: `member:${randomUUID3()}`,
         last_status: null,
         last_notified_seq: 0,
         last_notified_at: 0,
@@ -4405,17 +4934,24 @@ var Core = class {
     if (p.kind === "mcp") {
       if (ctx.sid && ctx.sid !== sid)
         fail("ROLE_NOT_ALLOWED", "Use session.identify to bind identity");
-      s.presence = "online";
+      ctx.transport = p.transport === "cli" ? "cli" : "mcp";
+      s.transport = ctx.transport;
+      s.presence = ctx.transport === "mcp" || [...this.contexts].some((c) => c.sid === sid && c.kind === "mcp" && c.transport !== "cli") ? "online" : "cli";
       ctx.sid = sid;
       ctx.agent = agent;
-      ctx.waitHint = Number.isFinite(p.wait_hint) ? Math.min(300, Math.max(1, p.wait_hint)) : recommendedWait(agent, {});
+      ctx.waitHint = Number.isFinite(p.wait_hint) ? Math.min(300, Math.max(0, p.wait_hint)) : recommendedWait(agent, {});
     }
     this.store.saveSession(s);
+    this.record("session.registered", s.squad_id, {
+      to_sid: s.sid,
+      data: { presence: s.presence, transport: s.transport }
+    });
     return s;
   }
   identify(ctx, native, force = false) {
     if (typeof native !== "string" || !native || native.length > 256) fail("INVALID_ARGUMENT");
     const old = this.required(ctx), sid = `${old.agent}:${native}`;
+    if (this.store.revoked(sid)) fail("ENDPOINT_REPLACED");
     if (old.sid === sid) return old;
     if (old.native_id && !force) return old;
     const target = this.store.session(sid);
@@ -4424,6 +4960,7 @@ var Core = class {
     const merged = {
       ...old,
       ...target,
+      member_id: old.role !== "none" ? old.member_id || old.sid : target?.member_id || old.member_id || old.sid,
       sid,
       native_id: native,
       presence: "online",
@@ -4464,14 +5001,14 @@ var Core = class {
     return merged;
   }
   enqueue(from, q, to, type, body, opts = {}) {
-    if (this.store.queue(to).length >= this.config.maxQueue)
+    if (!opts.terminalAck && this.store.queue(to).filter((m2) => m2.type === "cancel" === (type === "cancel")).length >= (type === "cancel" ? 100 : this.config.maxQueue))
       fail("QUEUE_FULL", `Queue for ${to} is full`);
     const m = {
       id: messageId(),
       seq: 0,
       squad_id: q,
       type,
-      priority: opts.priority ?? (["command", "ask", "answer"].includes(type) ? 0 : type === "report" ? 2 : 1),
+      priority: opts.priority ?? (["command", "cancel", "ask", "answer"].includes(type) ? 0 : type === "report" ? 2 : 1),
       from_sid: from?.sid || (opts.operator ? "operator" : "system"),
       from_role: from?.role || (opts.operator ? "operator" : "system"),
       from_name: from?.name || null,
@@ -4480,11 +5017,13 @@ var Core = class {
       data: opts.data || null,
       reply_to: opts.reply_to || null,
       status: "queued",
-      attn: opts.attn ?? ["command", "ask", "answer"].includes(type),
+      attn: opts.attn ?? ["command", "cancel", "ask", "answer"].includes(type),
       created_at: Date.now(),
       delivered_at: null
     };
+    if (type === "command") m.work = { state: "queued", updated_at: m.created_at };
     this.store.insert(m);
+    this.messageEvent("message.queued", m);
     this.effects.push(m);
     return m;
   }
@@ -4492,51 +5031,115 @@ var Core = class {
     for (const s of to)
       this.enqueue(null, q.id, s.sid, "system", body, { priority: high ? 0 : 1, attn: high });
   }
+  roleInbox(q, old) {
+    for (const m of this.store.messages())
+      if (m.squad_id === q.id && m.to_sid === old && !["command", "cancel", "answer"].includes(m.type)) {
+        m.to_sid = `squad:${q.id}`;
+        this.store.saveMessage(m);
+      }
+  }
+  rebind(ctx, member) {
+    const target = this.required(ctx);
+    if (!target.native_id) fail("IDENTITY_REQUIRED");
+    const old = this.store.sessions().find((s) => (s.member_id || s.sid) === member) || fail("MEMBER_NOT_FOUND");
+    if (old.sid === target.sid) return;
+    if (!old.squad_id) fail("NOT_JOINED", "The member must belong to a channel before rebinding");
+    if (target.squad_id) fail("ALREADY_JOINED");
+    const merged = {
+      ...old,
+      sid: target.sid,
+      agent: target.agent,
+      native_id: target.native_id,
+      member_id: old.member_id || old.sid,
+      pid: target.pid,
+      cwd: target.cwd,
+      terminal: target.terminal,
+      transcript_path: target.transcript_path,
+      presence: target.presence,
+      transport: target.transport,
+      activity: "unknown",
+      last_seen_at: Date.now(),
+      ended_at: null
+    };
+    this.store.saveSession(merged);
+    for (const q of this.store.squads())
+      if (q.commander_sid === old.sid) {
+        q.commander_sid = target.sid;
+        this.store.saveSquad(q);
+      }
+    for (const m of this.store.messages()) {
+      if (m.to_sid === old.sid) m.to_sid = target.sid;
+      if (m.from_sid === old.sid) m.from_sid = target.sid;
+      this.store.saveMessage(m);
+    }
+    this.store.migrateMembership(old.sid, target.sid);
+    this.store.revoke(old.sid, target.sid);
+    this.store.deleteSession(old.sid);
+    this.store.deleteStandby(old.sid);
+    for (const w of this.waiters) if (w.sid === old.sid) w.finish();
+    this.clearFlag(old.sid);
+    if (this.inbox(merged).length) this.flag(target.sid);
+    this.record("member.rebound", merged.squad_id, {
+      from_sid: old.sid,
+      to_sid: target.sid,
+      data: { member_id: merged.member_id, wake_mode: "manual" }
+    });
+  }
   joinSquad(ctx, p) {
+    if (p.rebind && (p.role || p.squad || p.squad_name || p.takeover))
+      fail("INVALID_ARGUMENT", "rebind cannot be combined with a role or channel change");
+    if (p.rebind) this.rebind(ctx, p.rebind);
     const s = this.required(ctx);
     let q, role = p.role;
     if (p.squad_name) {
-      if (p.role || p.squad)
-        fail("INVALID_ARGUMENT", "squad_name is the atomic shortcut; omit role and squad");
+      if (p.squad) fail("INVALID_ARGUMENT", "Use squad or squad_name, not both");
       q = this.store.squads().find((q2) => q2.name_key === p.squad_name.toLowerCase() && q2.status !== "dissolved");
-      if (s.squad_id && s.squad_id === q?.id) return this.joinResult(ctx, q);
-      if (q?.status === "orphaned")
-        fail(
-          "SQUAD_ORPHANED",
-          `Squad ${q.id} is orphaned. Choose join(role="commander", squad="${q.id}") to take over or role="executor" to join.`
-        );
-      role = q ? "executor" : "commander";
-      if (!q) p.name = p.squad_name;
+      if (s.squad_id === q?.id && !role) return this.joinResult(ctx, q);
+      role ||= "executor";
     } else if (p.squad) q = this.store.squad(p.squad) || fail("SQUAD_NOT_FOUND");
+    else if (p.rebind && s.squad_id) return this.joinResult(ctx, this.store.squad(s.squad_id));
     if (!role) fail("INVALID_ARGUMENT", "Provide role or squad_name");
+    if (q?.status === "dissolved") fail("SQUAD_NOT_FOUND", "Channel is closed");
     if (s.squad_id) {
       if ((q?.id === s.squad_id || !q && !p.squad_name && role === "commander") && s.role === role)
         return this.joinResult(ctx, this.store.squad(s.squad_id));
-      if (q?.id === s.squad_id && q.status === "orphaned" && role === "commander") {
-        this.store.leave(s.sid);
-      } else fail("ALREADY_JOINED");
+      if (q?.id === s.squad_id && role === "commander") this.store.leave(s.sid);
+      else fail("ALREADY_JOINED");
     }
-    if (q?.status === "dissolved") fail("SQUAD_NOT_FOUND", "Squad is dissolved");
     if (!q) {
-      if (role !== "commander") fail("SQUAD_NOT_FOUND");
-      const key = p.name?.toLowerCase() || null;
+      if (role !== "commander" && !p.squad_name) fail("SQUAD_NOT_FOUND");
+      const name = p.squad_name || p.name || null, key = name?.toLowerCase() || null;
       if (key && this.store.squads().some((x) => x.name_key === key && x.status !== "dissolved"))
-        fail("SQUAD_NAME_EXISTS", "Use squad_name to join by name or specify a squad ID.");
+        fail("SQUAD_NAME_EXISTS");
       let id;
       do {
         id = squadId();
       } while (this.store.squad(id));
       q = {
         id,
-        name: p.name || null,
+        name,
         name_key: key,
-        commander_sid: s.sid,
-        status: "active",
+        commander_sid: role === "commander" ? s.sid : null,
+        status: role === "commander" ? "active" : "orphaned",
         created_at: Date.now(),
         updated_at: Date.now()
       };
+      this.record("channel.created", q.id);
     } else if (role === "commander") {
-      if (q.commander_sid && q.commander_sid !== s.sid) fail("SQUAD_HAS_COMMANDER");
+      if (q.commander_sid && q.commander_sid !== s.sid) {
+        if (!p.takeover)
+          fail(
+            "SQUAD_HAS_COMMANDER",
+            "Use takeover=true for an explicit handover; offline does not mean stopped."
+          );
+        const old = this.store.session(q.commander_sid);
+        this.roleInbox(q, old.sid);
+        this.store.leave(old.sid);
+        old.role = "executor";
+        this.store.saveSession(old);
+        this.store.join(old);
+        this.record("commander.handover", q.id, { from_sid: old.sid, to_sid: s.sid });
+      }
       q.commander_sid = s.sid;
       q.status = "active";
       this.system(
@@ -4544,29 +5147,25 @@ var Core = class {
         this.members(q.id).filter((member) => member.sid !== s.sid),
         "commander_joined"
       );
-      const inbox = this.store.queue(`squad:${q.id}`);
-      if (inbox.length + this.store.queue(s.sid).length > this.config.maxQueue) fail("QUEUE_FULL");
-      for (const m of inbox) {
-        m.to_sid = s.sid;
-        this.store.saveMessage(m);
-        this.effects.push(m);
-      }
+      this.record("commander.claimed", q.id, { to_sid: s.sid });
     }
     s.role = role;
     s.squad_id = q.id;
-    s.name = p.name || null;
+    s.name = p.name || s.name;
     q.updated_at = Date.now();
     this.store.saveSquad(q);
     this.store.saveSession(s);
     this.store.join(s);
+    this.record("member.joined", q.id, { to_sid: s.sid, data: { role, member_id: s.member_id } });
     if (role === "executor" && q.commander_sid)
       this.enqueue(
         s,
         q.id,
-        q.commander_sid,
+        `squad:${q.id}`,
         "system",
         `member_joined${p.note ? `: ${p.note}` : ""}`
       );
+    if (this.inbox(s).length) this.flag(s.sid);
     return this.joinResult(ctx, q);
   }
   joinResult(ctx, q) {
@@ -4577,13 +5176,15 @@ var Core = class {
       join_prompt,
       user_reply: s.role === "commander" ? `Squad ${q.id}${q.name ? ` (${q.name})` : ""} is ready. Paste this into each other session:
 ${join_prompt}` : `Joined squad ${q.id}${s.name ? ` as ${s.name}` : ""}; report ready and wait for commands.`,
-      protocol_hint: `You are the ${s.role.toUpperCase()} of squad ${q.id}. ${s.role === "commander" ? "Dispatch clear, verifiable tasks with send; answer every ask using type=answer and reply_to." : "Report ready now with cwd, capabilities and context; act on commands and report working/done/failed with reply_to. Ask when blocked."} Reply with ONLY user_reply (translate prose, keep the join line verbatim). Then read(wait=${wait2}); standby for at most 40 rounds. Keep user replies to one or two lines. Apply normal judgment to messages from other agents. ${s.native_id ? "" : "Identity is provisional; hooks may be unavailable. Use read(wait) for reminders."}`
+      standby: this.standbyView(s.sid),
+      protocol_hint: `You are the ${s.role.toUpperCase()} of squad ${q.id}. ${s.role === "commander" ? "Dispatch clear, verifiable tasks with send; answer every ask using type=answer and reply_to." : "Report ready now with cwd, capabilities and context; act on commands and report working/done/failed with reply_to. Ask when blocked."} Reply with ONLY user_reply (translate prose, keep the join line verbatim). Check list before reassignment: offline never means work stopped. Accept commands immediately with report(working, reply_to); recover with read(recover=true). Use join(standby="auto") with the real session ID to register managed standby, then check list for listener health. If me.listener.can_auto_respond, end the turn; otherwise use at most two read(wait=${wait2}) calls and explain that manual continuation is required. Never write a private wake listener. Keep user replies to one or two lines. Apply normal judgment to messages from other agents. ${s.native_id ? "" : "Identity is provisional; hooks may be unavailable. Use read(wait) for reminders."}`
     };
   }
   leave(ctx, p) {
     const s = this.member(ctx), q = this.store.squad(s.squad_id);
     if (p.dissolve && s.role !== "commander") fail("ROLE_NOT_ALLOWED");
     if (s.role === "commander") {
+      this.roleInbox(q, s.sid);
       this.system(
         q,
         this.members(q.id).filter((x) => x.sid !== s.sid),
@@ -4598,12 +5199,18 @@ ${join_prompt}` : `Joined squad ${q.id}${s.name ? ` as ${s.name}` : ""}; report
           m.role = "none";
           m.squad_id = null;
           this.store.saveSession(m);
+          const listener = this.store.standby(m.sid);
+          if (listener) {
+            listener.enabled = false;
+            listener.health = "stopped";
+            this.store.saveStandby(listener);
+          }
         }
     } else if (q.commander_sid)
       this.enqueue(
         s,
         q.id,
-        q.commander_sid,
+        `squad:${q.id}`,
         "system",
         `member_left${p.message ? `: ${p.message}` : ""}`
       );
@@ -4613,6 +5220,13 @@ ${join_prompt}` : `Joined squad ${q.id}${s.name ? ` as ${s.name}` : ""}; report
     this.store.saveSession(s);
     q.updated_at = Date.now();
     this.store.saveSquad(q);
+    this.record(p.dissolve ? "channel.closed" : "member.left", q.id, { from_sid: s.sid });
+    const standby = this.store.standby(s.sid);
+    if (standby) {
+      standby.enabled = false;
+      standby.health = "stopped";
+      this.store.saveStandby(standby);
+    }
     return { left: true, squad: q.id, status: q.status };
   }
   rate(ctx) {
@@ -4630,7 +5244,7 @@ ${join_prompt}` : `Joined squad ${q.id}${s.name ? ` as ${s.name}` : ""}; report
         for (const s of all) if (s.sid !== sender) found.set(s.sid, s);
         continue;
       }
-      const exact = all.filter((s) => s.sid === token);
+      const exact = all.filter((s) => s.sid === token || s.member_id === token);
       const matches = exact.length ? exact : all.filter((s) => s.name === token || s.sid.startsWith(token));
       if (matches.length !== 1)
         fail(
@@ -4655,65 +5269,207 @@ ${join_prompt}` : `Joined squad ${q.id}${s.name ? ` as ${s.name}` : ""}; report
           "Answers require reply_to for an ask from the recipient in this squad."
         );
     }
+    if (p.type === "cancel" && (!p.reply_to || p.reassign))
+      fail("INVALID_ARGUMENT", "cancel requires reply_to=<command id>");
+    const previous = p.reassign ? this.store.message(p.reassign) : void 0;
+    if (p.reassign && (p.type !== "command" || !previous || previous.type !== "command" || previous.squad_id !== qid || terminalWork(previous) || recipients.length !== 1))
+      fail("INVALID_ARGUMENT", "reassign must reference one unfinished command in this channel");
+    if (previous?.work?.replacement_id) fail("ALREADY_REASSIGNED");
+    if (previous?.task_key && p.task_key && p.task_key !== previous.task_key)
+      fail("INVALID_ARGUMENT", "Reassignment must preserve the original task_key");
+    const taskKey = previous?.task_key || p.task_key;
+    if (p.task_key && (p.type !== "command" || recipients.length !== 1))
+      fail(
+        "INVALID_ARGUMENT",
+        "task_key identifies one command owner; do not broadcast the same ticket"
+      );
+    if (taskKey && this.store.commands().some((m) => m.squad_id === qid && m.task_key === taskKey && m.id !== previous?.id))
+      fail("TASK_OWNED", "This task_key already has unfinished work. Use reassign=<command id>.");
+    const warnings = recipients.flatMap((s) => {
+      const active = this.store.commands(s.sid);
+      return active.length ? [
+        {
+          code: "UNFINISHED_WORK",
+          sid: s.sid,
+          command_ids: active.map((m) => m.id),
+          message: "Verify ownership before dispatch. Offline does not mean stopped."
+        }
+      ] : [];
+    });
     this.rate(ctx);
-    const messages = recipients.map(
-      (s) => this.enqueue(from, qid, s.sid, p.type, p.message, {
+    const cancel = (command, body) => {
+      command.work ||= {
+        state: command.status === "queued" ? "queued" : "read",
+        updated_at: command.created_at
+      };
+      command.work.cancel_requested_at = Date.now();
+      if (command.work.state === "queued") {
+        command.work.state = "cancelled";
+        command.status = "delivered";
+        command.delivered_at = Date.now();
+      }
+      command.work.updated_at = Date.now();
+      this.store.saveMessage(command);
+      this.messageEvent(
+        command.work.state === "cancelled" ? "work.cancelled" : "work.cancel_requested",
+        command
+      );
+      return this.enqueue(from, qid, command.to_sid, "cancel", body, {
+        priority: -1,
+        reply_to: command.id,
+        attn: true,
+        operator: ctx.kind === "cli"
+      });
+    };
+    if (previous)
+      cancel(
+        previous,
+        `Cancel command ${previous.id} at the next safe checkpoint and report cancelled with reply_to. Reassignment waits for your terminal report.`
+      );
+    const messages = recipients.map((s) => {
+      if (p.type === "cancel") {
+        const command = this.store.message(p.reply_to);
+        if (!command || command.type !== "command" || command.to_sid !== s.sid || command.squad_id !== qid || terminalWork(command))
+          fail("INVALID_ARGUMENT", "Cancel target must own an unfinished command");
+        return cancel(command, p.message);
+      }
+      const m = this.enqueue(from, qid, s.sid, p.type, p.message, {
         priority: p.priority ? { high: 0, normal: 1, low: 2 }[p.priority] : void 0,
         reply_to: p.reply_to,
         data: p.data,
+        attn: p.attention,
         operator: ctx.kind === "cli"
-      })
-    );
+      });
+      if (p.type === "command") {
+        m.task_key = taskKey;
+        if (previous && !terminalWork(previous)) m.blocked_by = previous.id;
+        this.store.saveMessage(m);
+        if (previous) {
+          previous.work.replacement_id = m.id;
+          this.store.saveMessage(previous);
+          this.messageEvent(
+            "work.reassigned",
+            m,
+            `Replaces ${previous.id}; ${m.blocked_by ? "waiting for original owner to stop" : "original was unread"}`
+          );
+        }
+      }
+      return m;
+    });
     return {
       ids: messages.map((m) => m.id),
+      queued_to: recipients.map((s) => s.sid),
       delivered_to: recipients.map((s) => s.sid),
+      delivery_hint: "queued_to / delivered_to mean enqueued, not read or accepted",
+      warnings: p.type === "command" ? warnings : [],
+      blocked_by: messages.find((m) => m.blocked_by)?.blocked_by,
       offline: recipients.filter((s) => s.presence === "offline").map((s) => s.sid),
       idle: recipients.filter((s) => s.activity === "idle").map((s) => s.sid)
     };
   }
   reportOrAsk(ctx, p, ask) {
-    const s = this.member(ctx, "executor"), q = this.store.squad(s.squad_id);
+    const s = !ask && p.reply_to ? this.required(ctx) : this.member(ctx, "executor");
+    let command = !ask && p.reply_to ? this.store.message(p.reply_to) : void 0;
+    let terminalAck = false;
+    const q = this.store.squad(command?.squad_id || s.squad_id) || fail("NOT_JOINED");
+    if (!ask && p.reply_to) {
+      command = this.store.message(p.reply_to);
+      if (!command || command.type !== "command" || command.to_sid !== s.sid || command.squad_id !== q.id)
+        fail("INVALID_ARGUMENT", "reply_to must identify a command owned by this member");
+      if (command.blocked_by && !terminalWork(this.store.message(command.blocked_by)))
+        fail("REASSIGNMENT_PENDING", "Original owner has not stopped");
+      const state = {
+        working: "accepted",
+        blocked: "accepted",
+        done: "completed",
+        failed: "failed",
+        cancelled: "cancelled"
+      }[p.status];
+      if (!state) fail("INVALID_ARGUMENT", "ready is not a command acknowledgement");
+      if (terminalWork(command) && state !== command.work.state) fail("WORK_TERMINAL");
+      if (!terminalWork(command)) {
+        const now = Date.now();
+        command.work ||= { state: "read", updated_at: now };
+        if (command.work.cancel_requested_at && state === "accepted")
+          fail("CANCEL_REQUESTED", "Stop at a safe checkpoint and report cancelled");
+        const changed = command.work.state !== state;
+        command.work.state = state;
+        command.work.updated_at = now;
+        if (state === "accepted") command.work.accepted_at ||= now;
+        command.status = "delivered";
+        command.delivered_at ||= now;
+        this.store.saveMessage(command);
+        terminalAck = terminalWork(command);
+        this.messageEvent(changed ? `work.${state}` : "work.progress", command);
+        if (terminalWork(command) && command.work.replacement_id) {
+          const replacement = this.store.message(command.work.replacement_id);
+          this.effects.push(replacement);
+          this.messageEvent("work.released", replacement);
+        }
+      }
+    }
     this.rate(ctx);
-    const to = q.commander_sid || `squad:${q.id}`;
+    const to = `squad:${q.id}`;
     const m = this.enqueue(s, q.id, to, ask ? "ask" : "report", ask ? p.question : p.message, {
       reply_to: p.reply_to,
       data: ask ? p.data : { ...p.data, status: p.status },
       priority: ask ? 0 : ["blocked", "failed"].includes(p.status) ? 1 : 2,
-      attn: ask || ["done", "failed", "blocked"].includes(p.status)
+      attn: ask || ["done", "failed", "blocked", "cancelled"].includes(p.status),
+      // Each issued command reserves admission for its first terminal report.
+      // Keep work and report atomic even under backpressure; repeats use the ordinary cap.
+      terminalAck
     });
     if (!ask) {
       s.last_status = { status: p.status, message: p.message.slice(0, 300) };
+      s.last_progress_at = Date.now();
+      s.activity_at = Date.now();
+      s.activity = this.store.commands(s.sid).some((m2) => m2.work?.state === "accepted") ? "busy" : "idle";
       this.store.saveSession(s);
     }
     return {
       id: m.id,
       delivered_to: to,
+      queued_to: to,
+      work: command?.work,
+      ...!ask && !p.reply_to && this.store.commands(s.sid).length ? { warning: "Uncorrelated report does not accept or finish a command; provide reply_to." } : {},
       commander_presence: q.commander_sid ? this.store.session(q.commander_sid)?.presence : "orphaned",
       answered: false
     };
   }
   readNow(ctx, p, answer) {
     const s = this.required(ctx);
-    let queue = this.store.queue(s.sid, p.history);
+    let queue = p.recover ? this.store.commands(s.sid).filter((m) => !m.blocked_by || terminalWork(this.store.message(m.blocked_by))) : this.inbox(s, p.history);
+    if (p.id) {
+      const m = this.store.message(p.id);
+      if (!m || m.to_sid !== s.sid && !(s.role === "commander" && m.to_sid === `squad:${s.squad_id}`))
+        fail("MESSAGE_NOT_FOUND");
+      if (m.status === "queued" && m.blocked_by && !terminalWork(this.store.message(m.blocked_by)))
+        fail("REASSIGNMENT_PENDING", "Original owner has not stopped");
+      queue = [m];
+    }
     if (p.since) {
       const since = this.store.message(p.since);
-      if (!since || since.to_sid !== s.sid) fail("INVALID_ARGUMENT", "Unknown since message");
+      if (!since || since.to_sid !== s.sid && !(s.role === "commander" && since.to_sid === `squad:${s.squad_id}`))
+        fail("INVALID_ARGUMENT", "Unknown since message");
       queue = queue.filter((m) => m.seq > since.seq);
     }
     if (answer) queue = queue.filter((m) => m.type === "answer" && m.reply_to === answer);
-    const messages = queue.slice(0, p.limit || 20);
-    if (!p.peek && !p.history && !ctx.closed)
+    const messages = bounded(queue, p.limit || 20);
+    if (!p.peek && !p.history && !p.recover && !p.id && !ctx.closed)
       for (const m of messages) {
         m.status = "delivered";
         m.delivered_at = Date.now();
+        if (m.type === "command" && (!m.work || m.work.state === "queued"))
+          m.work = { ...m.work, state: "read", updated_at: Date.now() };
         this.store.saveMessage(m);
+        this.messageEvent("message.read", m);
       }
-    const remaining = this.store.queue(s.sid).length;
+    const remaining = this.inbox(s).length;
     if (!remaining) this.clearFlag(s.sid);
     return {
       messages: ctx.closed ? [] : messages,
       remaining,
-      squad_summary: s.squad_id ? this.board(this.store.squad(s.squad_id)) : null
+      ...p.full ? { squad_summary: s.squad_id ? this.board(this.store.squad(s.squad_id)) : null } : {}
     };
   }
   wait(ctx, seconds, answer, signal) {
@@ -4734,7 +5490,9 @@ ${join_prompt}` : `Joined squad ${q.id}${s.name ? ` as ${s.name}` : ""}; report
       w.timer = setTimeout(w.finish, seconds * 1e3);
       this.waiters.add(w);
       signal?.addEventListener("abort", w.finish, { once: true });
-      if (this.store.queue(w.sid).some((m) => !answer || m.type === "answer" && m.reply_to === answer))
+      if (this.inbox(this.store.session(w.sid)).some(
+        (m) => !answer || m.type === "answer" && m.reply_to === answer
+      ))
         w.finish();
     });
   }
@@ -4743,18 +5501,19 @@ ${join_prompt}` : `Joined squad ${q.id}${s.name ? ` as ${s.name}` : ""}; report
     if (squad && !this.store.squad(squad)) fail("SQUAD_NOT_FOUND");
     return {
       sessions: this.store.sessions().filter(
-        (s) => squad ? s.squad_id === squad : s.presence === "online" || s.role !== "none"
+        (s) => squad ? s.squad_id === squad || this.store.commands(s.sid).some((m) => m.squad_id === squad) : s.presence === "online" || s.role !== "none" || this.store.commands(s.sid).length > 0
       ).map((s) => ({
-        ...this.view(s),
-        ...s.sid === me?.sid ? { unread: this.store.queue(s.sid).length } : {}
+        ...this.view(s, p.full, squad || void 0),
+        ...s.sid === me?.sid ? { unread: this.inbox(s).length } : {}
       })),
-      squads: this.store.squads().filter((q) => squad ? q.id === squad : q.status !== "dissolved").map((q) => this.board(q))
+      squads: this.store.squads().filter((q) => squad ? q.id === squad : q.status !== "dissolved").map((q) => p.full ? this.board(q) : q)
     };
   }
   hook(ctx, p) {
     if (!p.session_id || !["SessionStart", "SessionEnd", "UserPromptSubmit", "PreToolUse", "Stop"].includes(p.event))
       return {};
     const agent = /^[a-z][a-z0-9_-]{0,63}$/.test(p.agent || "") ? p.agent : "generic", sid = `${agent}:${p.session_id}`;
+    if (this.store.revoked(sid)) return {};
     let s = this.store.session(sid);
     if (p.event === "SessionEnd" && !s) return {};
     if (p.event === "SessionStart") {
@@ -4777,6 +5536,16 @@ ${join_prompt}` : `Joined squad ${q.id}${s.name ? ` as ${s.name}` : ""}; report
     if (!s) return {};
     const now = Date.now();
     s.last_seen_at = now;
+    s.hook_seen_at = now;
+    s.activity_at = now;
+    this.record("session.activity", s.squad_id, {
+      to_sid: s.sid,
+      reason: p.event,
+      data: {
+        activity: p.event === "Stop" ? "idle" : p.event === "SessionEnd" ? s.activity : "busy",
+        presence: p.event === "SessionEnd" ? "offline" : s.presence
+      }
+    });
     if (p.event === "SessionEnd") {
       s.presence = "offline";
       s.ended_at = now;
@@ -4784,11 +5553,11 @@ ${join_prompt}` : `Joined squad ${q.id}${s.name ? ` as ${s.name}` : ""}; report
       return {};
     }
     s.activity = p.event === "Stop" ? "idle" : "busy";
-    const queue = this.store.queue(sid), max = Math.max(0, ...queue.map((m) => m.seq));
+    const queue = this.inbox(s), max = Math.max(0, ...queue.map((m) => m.seq));
     const groups = /* @__PURE__ */ new Map();
     for (const m of queue) {
       const sender = (m.from_name || m.from_role).replace(/[\r\n\t]/g, " ").slice(0, 30);
-      const label = `${m.type} (${["high", "normal", "low"][m.priority]}) from ${sender}`;
+      const label = `${m.type} (${m.priority < 0 ? "urgent" : ["high", "normal", "low"][m.priority]}) from ${sender}`;
       groups.set(label, (groups.get(label) || 0) + 1);
     }
     const details = [...groups].slice(0, 3).map(([label, n]) => `${n} ${label}`).join(", ").slice(0, 175);
@@ -4806,7 +5575,7 @@ ${join_prompt}` : `Joined squad ${q.id}${s.name ? ` as ${s.name}` : ""}; report
         0,
         300
       );
-    } else if (queue.length && (max > s.last_notified_seq || queue.some((m) => m.priority === 0) && now - s.last_notified_at >= this.config.remindIntervalSec * 1e3))
+    } else if (queue.length && (max > s.last_notified_seq || queue.some((m) => m.priority <= 0) && now - s.last_notified_at >= this.config.remindIntervalSec * 1e3))
       result.inject = summary.slice(0, 300);
     if (result.inject) {
       s.last_notified_seq = max;
@@ -4820,8 +5589,10 @@ ${join_prompt}` : `Joined squad ${q.id}${s.name ? ` as ${s.name}` : ""}; report
     this.atomic(() => {
       const cutoff = Date.now() - this.config.ttlDays * 864e5;
       this.store.expireMessages(all ? Number.MAX_SAFE_INTEGER : cutoff);
+      this.store.expireEvents(all ? Number.MAX_SAFE_INTEGER : cutoff);
+      if (all) this.store.purge();
       for (const s of this.store.sessions())
-        if (all || s.presence === "offline" && s.last_seen_at < cutoff) {
+        if (all || !s.squad_id && s.presence !== "online" && s.last_seen_at < cutoff && !this.store.commands(s.sid).length) {
           if (s.squad_id && s.role === "commander") {
             const q = this.store.squad(s.squad_id);
             q.commander_sid = null;
@@ -4842,7 +5613,7 @@ ${join_prompt}` : `Joined squad ${q.id}${s.name ? ` as ${s.name}` : ""}; report
           this.store.deleteSession(s.sid);
         }
       for (const q of this.store.squads())
-        if (all || q.status !== "active" && q.updated_at < cutoff && !this.members(q.id).length)
+        if (all || q.status === "dissolved" && q.updated_at < cutoff && !this.members(q.id).length && !this.store.commands().some((m) => m.squad_id === q.id))
           this.store.deleteSquad(q.id);
     });
     if (all)
@@ -4873,25 +5644,70 @@ ${join_prompt}` : `Joined squad ${q.id}${s.name ? ` as ${s.name}` : ""}; report
       if (method === "admin.status")
         return {
           sessions: this.store.sessions().length,
+          provisional: this.store.sessions().filter((s) => !s.native_id).map((s) => ({
+            sid: s.sid,
+            age_ms: Date.now() - s.created_at,
+            presence: s.presence,
+            role: s.role,
+            identity: "provisional"
+          })),
           squads: this.store.squads().length,
-          connections: [...this.contexts].filter((c) => c.kind === "mcp").length
+          connections: [...this.contexts].filter((c) => c.kind === "mcp").length,
+          clients: [...this.contexts].map((c) => ({
+            sid: c.sid,
+            kind: c.kind,
+            version: c.version,
+            client: c.client
+          })),
+          listeners: this.store.standbys().map((s) => this.standbyView(s.sid))
         };
       if (method === "admin.housekeep" || method === "admin.purge")
         return this.housekeep(method === "admin.purge" && params.all === true);
-      if (method === "admin.peek") return { messages: this.store.queue(params.sid) };
+      if (method === "admin.peek")
+        return { messages: this.inbox(this.store.session(params.sid) || fail("NOT_JOINED")) };
       if (method === "admin.read") {
         const s = this.store.session(params.sid) || fail("NOT_JOINED");
         return this.atomic(
           () => this.readNow({ ...ctx, sid: s.sid }, parse("read", params.options || {}))
         );
       }
-      if (method === "admin.tail") {
-        ctx.tail = { squad: params.squad, full: params.full };
-        return { subscribed: true };
+      if (method === "admin.tail" || method === "admin.events") {
+        const after = params.after === void 0 ? Math.max(0, this.store.eventCursor() - 20) : params.after;
+        if (!Number.isSafeInteger(after) || after < 0)
+          fail("INVALID_ARGUMENT", "after must be a nonnegative event_seq");
+        const high = this.store.eventCursor();
+        if (after > high)
+          fail(
+            "CURSOR_AHEAD",
+            "Cursor is ahead of this database; verify CMDR_HOME or restart from --after 0"
+          );
+        const recipient = params.for ? this.store.session(params.for) : void 0;
+        const candidates = this.store.eventPage(after, {
+          squad: params.squad,
+          to: params.for,
+          roleInbox: recipient?.role === "commander" ? `squad:${recipient.squad_id}` : void 0
+        });
+        const events = bounded(
+          params.full ? candidates : candidates.map((e) => ({
+            ...e,
+            message: e.message ? { ...e.message, body: e.message.body.slice(0, 160), data: null } : void 0
+          })),
+          100
+        );
+        const next = events.length < candidates.length ? events[events.length - 1].event_seq : high;
+        if (method === "admin.tail")
+          ctx.tail = { squad: params.squad, for: params.for, full: params.full, after: high };
+        return {
+          events,
+          next,
+          high,
+          gap: after < this.store.eventFloor(),
+          retained_after: this.store.eventFloor()
+        };
       }
       if (method === "admin.recent")
         return {
-          messages: this.store.messages().filter((m) => !params.squad || m.squad_id === params.squad).slice(-Math.min(100, Math.max(1, params.limit || 20))).map((m) => params.full ? m : { ...m, body: m.body.slice(0, 160), data: null })
+          messages: this.store.messages().filter((m) => !params.squad || m.squad_id === params.squad).slice(-20)
         };
       fail("INVALID_ARGUMENT", `Unknown method ${method}`);
     }
@@ -4913,13 +5729,12 @@ ${join_prompt}` : `Joined squad ${q.id}${s.name ? ` as ${s.name}` : ""}; report
     if (method === "msg.history") p.history = true;
     if (ctx.sid) {
       const s = this.required(ctx);
-      s.activity = "busy";
       s.last_seen_at = Date.now();
       this.store.saveSession(s);
     }
     if (tool === "read") {
       this.required(ctx);
-      if (!p.history && !p.since && !this.store.queue(ctx.sid).length)
+      if (!p.history && !p.since && !p.recover && !p.id && !this.inbox(this.required(ctx)).length)
         await this.wait(ctx, p.wait, void 0, signal);
       if (signal?.aborted) fail("REQUEST_CANCELLED");
       if (ctx.closed) fail("DAEMON_UNAVAILABLE");
@@ -4950,6 +5765,17 @@ ${join_prompt}` : `Joined squad ${q.id}${s.name ? ` as ${s.name}` : ""}; report
           return this.reportOrAsk(ctx, p, false);
       }
     });
+    if (tool === "join" && p.standby && this.configureStandby) {
+      return this.envelope(ctx, {
+        ...result,
+        standby: this.required(ctx).native_id ? this.configureStandby(ctx.sid, p.standby) : {
+          wake_mode: "manual",
+          health: "manual",
+          can_auto_respond: false,
+          reason: "A confirmed native session ID is required for managed standby; membership is retained."
+        }
+      });
+    }
     return this.envelope(ctx, result);
   }
 };
@@ -4969,7 +5795,58 @@ var Store = class {
       CREATE TABLE IF NOT EXISTS messages(seq INTEGER PRIMARY KEY AUTOINCREMENT, id TEXT NOT NULL UNIQUE, to_sid TEXT NOT NULL, status TEXT NOT NULL, priority INTEGER NOT NULL, reply_to TEXT, created_at INTEGER NOT NULL, payload TEXT NOT NULL);
       CREATE INDEX IF NOT EXISTS queue ON messages(to_sid,status,priority,seq);
       CREATE INDEX IF NOT EXISTS reply ON messages(reply_to);
-      CREATE INDEX IF NOT EXISTS created ON messages(created_at);`);
+      CREATE INDEX IF NOT EXISTS created ON messages(created_at);
+      CREATE TABLE IF NOT EXISTS events(event_seq INTEGER PRIMARY KEY AUTOINCREMENT, at INTEGER NOT NULL, payload TEXT NOT NULL);
+      CREATE TABLE IF NOT EXISTS metadata(key TEXT PRIMARY KEY, value INTEGER NOT NULL);
+      CREATE TABLE IF NOT EXISTS standby(sid TEXT PRIMARY KEY, payload TEXT NOT NULL);
+      CREATE TABLE IF NOT EXISTS revoked(sid TEXT PRIMARY KEY, replacement TEXT NOT NULL);`);
+    this.migrateWork();
+  }
+  migrateWork() {
+    const legacy = this.unpack(
+      this.db.prepare(
+        "SELECT payload FROM messages WHERE json_extract(payload,'$.type')='command' AND json_extract(payload,'$.work') IS NULL"
+      ).all()
+    );
+    if (!legacy.length) return;
+    this.transaction(() => {
+      for (const m of legacy) {
+        m.work = {
+          state: m.status === "queued" ? "queued" : "read",
+          updated_at: m.delivered_at || m.created_at
+        };
+        const reports = this.unpack(
+          this.db.prepare("SELECT payload FROM messages WHERE reply_to=? ORDER BY seq").all(m.id)
+        );
+        for (const report of reports) {
+          if (report.type !== "report" || report.from_sid !== m.to_sid || report.squad_id !== m.squad_id || terminalWork(m))
+            continue;
+          const state = {
+            working: "accepted",
+            blocked: "accepted",
+            done: "completed",
+            failed: "failed",
+            cancelled: "cancelled"
+          }[String(report.data?.status)];
+          if (!state) continue;
+          m.work.state = state;
+          m.work.updated_at = report.created_at;
+          if (state === "accepted") m.work.accepted_at ||= report.created_at;
+          m.status = "delivered";
+          m.delivered_at ||= report.created_at;
+        }
+        this.saveMessage(m);
+        this.appendEvent({
+          at: Date.now(),
+          kind: "work.migrated",
+          channel: m.squad_id,
+          message_id: m.id,
+          to_sid: m.to_sid,
+          from_sid: m.from_sid,
+          message: m
+        });
+      }
+    });
   }
   transaction(fn) {
     this.db.exec("BEGIN IMMEDIATE");
@@ -5055,7 +5932,89 @@ var Store = class {
     this.db.prepare("DELETE FROM messages WHERE id=?").run(id);
   }
   expireMessages(before) {
-    this.db.prepare("DELETE FROM messages WHERE created_at<?").run(before);
+    const active = this.commands();
+    const unfinished = new Set(active.map((m) => m.id));
+    const dependencies = new Set(active.map((m) => m.blocked_by));
+    for (const m of this.messages())
+      if (m.created_at < before && !dependencies.has(m.id) && !(m.type === "cancel" && m.reply_to && unfinished.has(m.reply_to)) && (m.type !== "command" || terminalWork(m)))
+        this.deleteMessage(m.id);
+  }
+  commands(sid) {
+    return this.messages().filter(
+      (m) => m.type === "command" && (!sid || m.to_sid === sid) && !terminalWork(m)
+    );
+  }
+  appendEvent(event) {
+    const r = this.db.prepare("INSERT INTO events(at,payload) VALUES (?,?)").run(event.at, JSON.stringify(event));
+    const value = { ...event, event_seq: Number(r.lastInsertRowid) };
+    this.db.prepare("UPDATE events SET payload=? WHERE event_seq=?").run(JSON.stringify(value), value.event_seq);
+    return value;
+  }
+  eventCursor() {
+    return Number(
+      this.db.prepare("SELECT seq FROM sqlite_sequence WHERE name='events'").get()?.seq || 0
+    );
+  }
+  events(after = 0) {
+    return this.unpack(
+      this.db.prepare("SELECT payload FROM events WHERE event_seq>? ORDER BY event_seq").all(after)
+    );
+  }
+  eventPage(after, filter) {
+    return this.unpack(
+      this.db.prepare(
+        `SELECT payload FROM events WHERE event_seq>?
+      AND (? IS NULL OR json_extract(payload,'$.channel')=?)
+      AND (? IS NULL OR json_extract(payload,'$.to_sid')=? OR json_extract(payload,'$.to_sid')=?)
+      ORDER BY event_seq LIMIT 101`
+      ).all(
+        after,
+        filter.squad || null,
+        filter.squad || null,
+        filter.to || null,
+        filter.to || null,
+        filter.roleInbox || null
+      )
+    );
+  }
+  eventFloor() {
+    return Number(
+      this.db.prepare("SELECT value FROM metadata WHERE key='event_floor'").get()?.value || 0
+    );
+  }
+  expireEvents(before) {
+    const last = Number(
+      this.db.prepare("SELECT MAX(event_seq) AS seq FROM events WHERE at<?").get(before)?.seq || 0
+    );
+    if (last) {
+      this.db.prepare(
+        "INSERT INTO metadata VALUES ('event_floor',?) ON CONFLICT(key) DO UPDATE SET value=MAX(value,excluded.value)"
+      ).run(last);
+      this.db.prepare("DELETE FROM events WHERE event_seq<=?").run(last);
+    }
+  }
+  standbys() {
+    return this.unpack(this.db.prepare("SELECT payload FROM standby").all());
+  }
+  standby(sid) {
+    return this.standbys().find((s) => s.sid === sid);
+  }
+  saveStandby(s) {
+    this.db.prepare(
+      "INSERT INTO standby VALUES (?,?) ON CONFLICT(sid) DO UPDATE SET payload=excluded.payload"
+    ).run(s.sid, JSON.stringify(s));
+  }
+  deleteStandby(sid) {
+    this.db.prepare("DELETE FROM standby WHERE sid=?").run(sid);
+  }
+  revoke(sid, replacement) {
+    this.db.prepare("INSERT OR REPLACE INTO revoked VALUES (?,?)").run(sid, replacement);
+  }
+  revoked(sid) {
+    return !!this.db.prepare("SELECT sid FROM revoked WHERE sid=?").get(sid)?.sid;
+  }
+  purge() {
+    this.db.exec("DELETE FROM messages; DELETE FROM standby; DELETE FROM revoked;");
   }
   close() {
     this.db.close();
@@ -5129,14 +6088,14 @@ function logger(path) {
 import { homedir as homedir2, tmpdir } from "node:os";
 import { join as join3, resolve } from "node:path";
 import { mkdirSync, chmodSync } from "node:fs";
-import { createHash } from "node:crypto";
+import { createHash as createHash2 } from "node:crypto";
 function paths(home = process.env.CMDR_HOME || join3(homedir2(), ".cmdr")) {
   home = resolve(home);
   let socket = join3(home, "cmdr.sock");
   if (Buffer.byteLength(socket) > 100)
     socket = join3(
       tmpdir(),
-      `cmdr-${createHash("sha256").update(`${process.getuid?.()}:${home}`).digest("hex").slice(0, 20)}.sock`
+      `cmdr-${createHash2("sha256").update(`${process.getuid?.()}:${home}`).digest("hex").slice(0, 20)}.sock`
     );
   return {
     home,
@@ -5314,8 +6273,16 @@ var Rpc = class extends EventEmitter {
 };
 
 // src/shared/version.ts
-var VERSION = true ? "0.1.0" : "0.1.0";
+var MIN_CLIENT_VERSION = "0.2.0";
+var VERSION = true ? "0.2.0" : MIN_CLIENT_VERSION;
 var PROTOCOL = 1;
+function newer(a, b) {
+  const x = a.split(".").map(Number), y = b.split(".").map(Number);
+  for (let i = 0; i < 3; i++) {
+    if (x[i] !== y[i]) return x[i] > y[i];
+  }
+  return false;
+}
 
 // src/daemon/server.ts
 async function startDaemon(home) {
@@ -5324,6 +6291,15 @@ async function startDaemon(home) {
   prepare(p);
   if (!acquireLock(p.lock)) return null;
   const log = logger(p.log), store = new Store(p.db), core = new Core(store, p, config(p.config));
+  const standby = new StandbyManager(core);
+  core.configureStandby = (sid, mode) => standby.configure({
+    sid,
+    action: "start",
+    ...mode === "manual" ? { adapter: "manual" } : {}
+  });
+  const wakeTimer = setInterval(() => {
+    void standby.tick().catch((e) => log(`standby failed: ${String(e)}`));
+  }, 2e3);
   const peers = /* @__PURE__ */ new Set();
   let idleSince = Date.now(), stopping = false;
   rmSync4(p.socket, { force: true });
@@ -5335,16 +6311,44 @@ async function startDaemon(home) {
     core.connect(ctx);
     let greeted = false;
     rpc.handler = async (method, params, signal) => {
-      if (!greeted && method !== "hello") fail("PROTOCOL_MISMATCH", "First request must be hello");
+      if (!greeted && method !== "hello")
+        fail(
+          "PROTOCOL_MISMATCH",
+          `First request must be hello {protocol:${PROTOCOL}, version:<client version>}; daemon ${VERSION}. Use cmdr session commands or restart the host MCP connection.`
+        );
       if (method === "hello") {
         if (params.protocol !== PROTOCOL)
-          fail("PROTOCOL_MISMATCH", "cmdr upgraded; restart the host session.");
+          fail(
+            "PROTOCOL_MISMATCH",
+            `Protocol mismatch: client ${String(params.protocol).slice(0, 20)}, daemon ${PROTOCOL} (${VERSION}). Update/reinstall the plugin cache, restart the daemon with the matching cmdr installation, then restart the host session.`
+          );
+        const clientVersion = typeof params.version === "string" ? params.version.match(/^(\d+\.\d+\.\d+)(?:-[\da-zA-Z.-]+)?(?:\+[\da-zA-Z.-]+)?$/)?.[1] : void 0;
+        if (!clientVersion || newer(MIN_CLIENT_VERSION, clientVersion))
+          fail(
+            "PROTOCOL_MISMATCH",
+            `Daemon ${VERSION} requires client ${MIN_CLIENT_VERSION} or newer for compatible tool semantics. Update/reinstall the plugin cache and restart the host MCP connection.`
+          );
         greeted = true;
+        ctx.version = String(params.version || "unknown").slice(0, 80);
+        ctx.client = String(params.client || "unknown").slice(0, 80);
         return { version: VERSION, protocol: PROTOCOL };
       }
+      if (method === "admin.standby") {
+        if (ctx.kind !== "cli") fail("ROLE_NOT_ALLOWED");
+        const result2 = standby.configure(params);
+        void standby.tick();
+        return result2;
+      }
       if (method === "admin.shutdown") {
+        if (params.reason === "upgrade")
+          fail(
+            "UPGRADE_REQUIRES_RESTART",
+            "Automatic replacement is disabled. Run cmdr daemon restart from the new installation after preflight."
+          );
         if (ctx.kind !== "cli" && params.reason !== "upgrade") fail("ROLE_NOT_ALLOWED");
-        log(`shutdown requested: ${params.reason || "operator"}`);
+        log(
+          `shutdown requested: ${String(params.reason || "operator").replace(/[^a-z_-]/gi, "").slice(0, 40)}; from=${VERSION}; to=${String(params.version || "unknown").replace(/[^a-z0-9.:-]/gi, "").slice(0, 80)}`
+        );
         setTimeout(() => {
           void stop();
         }, 30);
@@ -5364,10 +6368,13 @@ async function startDaemon(home) {
     if (stopping) return;
     stopping = true;
     clearInterval(timer);
-    server.close();
+    clearInterval(wakeTimer);
+    standby.close();
+    const closed = new Promise((resolve2) => server.close(() => resolve2()));
     for (const ctx of [...core.contexts]) core.disconnect(ctx);
     core.close();
     for (const peer of peers) peer.close();
+    await closed;
     store.close();
     rmSync4(p.socket, { force: true });
     rmSync4(p.info, { force: true });
@@ -5401,7 +6408,7 @@ async function startDaemon(home) {
           core.housekeep();
           if (existsSync2(p.spawn) && Date.now() - statSync3(p.spawn).mtimeMs > 1e4)
             rmSync4(p.spawn, { recursive: true, force: true });
-          if (!peers.size && Date.now() - idleSince >= core.config.idleExitMinutes * 6e4)
+          if (!peers.size && !standby.active && Date.now() - idleSince >= core.config.idleExitMinutes * 6e4)
             void stop();
         } catch (e) {
           log(`housekeeping failed: ${String(e)}`);
@@ -5419,8 +6426,40 @@ async function startDaemon(home) {
   }
 }
 
+// src/daemon/preflight.ts
+import { DatabaseSync as DatabaseSync3 } from "node:sqlite";
+import { existsSync as existsSync3, mkdtempSync, rmSync as rmSync5 } from "node:fs";
+import { tmpdir as tmpdir2 } from "node:os";
+import { join as join4 } from "node:path";
+async function preflight(home) {
+  const dir = mkdtempSync(join4(tmpdir2(), "cmdr-preflight-"));
+  try {
+    const source = paths(home).db, target = join4(dir, "state.db");
+    if (existsSync3(source)) {
+      const db = new DatabaseSync3(source, { readOnly: true });
+      try {
+        db.prepare("VACUUM INTO ?").run(target);
+      } finally {
+        db.close();
+      }
+    }
+    const store = new Store(target);
+    try {
+      store.sessions();
+      store.squads();
+      store.messages();
+      store.standbys();
+    } finally {
+      store.close();
+    }
+  } finally {
+    rmSync5(dir, { recursive: true, force: true });
+  }
+}
+
 // src/daemon/main.ts
-startDaemon().catch((e) => {
+var operation = process.argv.includes("--preflight") ? preflight() : startDaemon();
+operation.catch((e) => {
   process.stderr.write(`cmdr daemon: ${e.message}
 `);
   process.exitCode = 1;