cmdr-mcp 0.2.0 → 0.3.0

package/plugins/cmdr/dist/cli.mjs

@@ -6,6 +6,9 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
+// src/cli/watch.ts
+import { randomUUID as randomUUID2 } from "node:crypto";
+
 // src/shared/diagnostics.ts
 import { mkdirSync as mkdirSync2, readFileSync, writeFileSync, renameSync, rmSync } from "node:fs";
 import { join as join2 } from "node:path";
@@ -268,7 +271,7 @@ var Rpc = class extends EventEmitter {
 };
 
 // src/shared/version.ts
-var VERSION = true ? "0.2.0" : MIN_CLIENT_VERSION;
+var VERSION = true ? "0.3.0" : MIN_CLIENT_VERSION;
 var PROTOCOL = 1;
 function newer(a, b) {
   const x = a.split(".").map(Number), y = b.split(".").map(Number);
@@ -453,6 +456,97 @@ var DaemonClient = class {
   }
 };
 
+// src/cli/watch.ts
+async function watch(sid, once = false) {
+  const rpc = await daemonConnection({ start: true, upgrade: true });
+  const token = randomUUID2();
+  let timer;
+  let stopped = false;
+  let checking = false;
+  let dirty = false;
+  let error;
+  const seen = /* @__PURE__ */ new Set();
+  const stop = () => {
+    stopped = true;
+    rpc.close();
+  };
+  process.on("SIGINT", stop);
+  process.on("SIGTERM", stop);
+  const closed = new Promise(
+    (resolve3) => rpc.once("close", () => {
+      if (!stopped) error ||= new Error("cmdr daemon disconnected; re-arm the host watcher");
+      resolve3();
+    })
+  );
+  const show = (result, initial = false) => {
+    const current = /* @__PURE__ */ new Set();
+    const fresh = result.messages.filter((m) => {
+      const key = JSON.stringify([m.id, m.cancel_requested_at]);
+      current.add(key);
+      const alreadyAccepted = initial && m.type === "command" && m.work_state === "accepted" && !m.cancel_requested_at;
+      return !alreadyAccepted && !seen.has(key);
+    });
+    seen.clear();
+    for (const key of current) seen.add(key);
+    if (!fresh.length) return;
+    process.stdout.write(
+      JSON.stringify({
+        kind: "cmdr.wake",
+        sid,
+        messages: fresh,
+        instruction: "Call read and read(recover=true); handle cancellation first and report with reply_to."
+      }) + "\n"
+    );
+    if (once || result.wake_mode === "zcode") stop();
+  };
+  const check = async () => {
+    if (stopped) return;
+    if (checking) {
+      dirty = true;
+      return;
+    }
+    checking = true;
+    try {
+      do {
+        dirty = false;
+        show(await rpc.request("admin.watch", { sid, token, action: "pulse" }));
+      } while (dirty && !stopped);
+    } catch (e) {
+      if (!stopped) {
+        error = e;
+        stop();
+      }
+    } finally {
+      checking = false;
+    }
+  };
+  try {
+    await rpc.request("session.register", { kind: "cli" });
+    rpc.on("notification", (method) => {
+      if (method === "lifecycle.event") {
+        dirty = true;
+        if (timer) void check();
+      }
+    });
+    await rpc.request("admin.tail", { for: sid, after: "now" });
+    show(await rpc.request("admin.watch", { sid, token, action: "attach" }), true);
+    if (!stopped) {
+      timer = setInterval(() => {
+        void check();
+      }, 3e4);
+      if (dirty) await check();
+    }
+    await closed;
+    if (error) throw error;
+  } finally {
+    clearInterval(timer);
+    stopped = true;
+    rpc.close();
+    process.off("SIGINT", stop);
+    process.off("SIGTERM", stop);
+  }
+}
+
 // src/cli/tail.ts
 async function tail(options) {
   let after = options.after, stopped = false;
@@ -464,9 +558,10 @@ async function tail(options) {
   process.on("SIGINT", stop);
   process.on("SIGTERM", stop);
   const show = (event) => {
-    if (after !== void 0 && event.event_seq <= after) return;
+    if (typeof after === "number" && event.event_seq <= after) return;
     process.stdout.write(
-      options.json ? JSON.stringify(event) + "\n" : `${event.event_seq} ${new Date(event.at).toISOString()} ${event.channel || "-"} ${event.kind} ${event.from_sid || "-"} \u2192 ${event.to_sid || "-"} ${event.message_id || ""}${event.reply_to ? ` reply_to=${event.reply_to}` : ""}${event.reason ? ` ${event.reason}` : ""}${event.message ? ` ${event.message.body.replace(/\s+/g, " ")}` : ""}
+      options.json ? JSON.stringify(event) + "\n" : options.line ? `[cmdr] ${event.message?.type || event.kind} id=${event.message_id || "-"} from=${event.from_sid || "-"}${event.reply_to ? ` reply_to=${event.reply_to}` : ""}; call read and read(recover=true)
+` : `${event.event_seq} ${new Date(event.at).toISOString()} ${event.channel || "-"} ${event.kind} ${event.from_sid || "-"} \u2192 ${event.to_sid || "-"} ${event.message_id || ""}${event.reply_to ? ` reply_to=${event.reply_to}` : ""}${event.reason ? ` ${event.reason}` : ""}${event.message ? ` ${event.message.body.replace(/\s+/g, " ")}` : ""}
 `
     );
     after = event.event_seq;
@@ -497,7 +592,7 @@ async function tail(options) {
         }
         for (; ; ) {
           for (const event of result.events) show(event);
-          after = Math.max(after || 0, result.next);
+          after = Math.max(typeof after === "number" ? after : 0, result.next);
           if (result.next >= result.high) break;
           result = await rpc.request("admin.events", { ...options, after });
         }
@@ -4940,6 +5035,10 @@ if (process.argv[2] === "session") {
       after: { type: "string" },
       for: { type: "string" },
       adapter: { type: "string" },
+      transport: { type: "string" },
+      actionable: { type: "boolean" },
+      once: { type: "boolean" },
+      format: { type: "string" },
       executable: { type: "string" },
       socket: { type: "string" },
       resolve: { type: "string" },
@@ -5042,7 +5141,7 @@ if (process.argv[2] === "session") {
   try {
     if (v.help)
       process.stdout.write(
-        "cmdr status | list [--all] [--squad ID] | tail [--follow] [--full] [--json] [--after EVENT_SEQ] [--for SID] | standby start|status|stop|resume --session SID [--adapter codex|manual] | send --squad ID [--to MEMBER] [--type command|cancel|info|answer] TEXT | read --session SID [--peek] | daemon start|stop|restart|status|logs | config [--agent HOST] [--session ID] | doctor [--plugin-root PATH] [--deep] | session --help | purge [--all]\n"
+        "cmdr status | list [--all] [--squad ID] | tail [--follow] [--full] [--json] [--after EVENT_SEQ|now] [--actionable] [--format line|json] [--for SID] | standby start|status|stop|resume|watch --session SID [--adapter codex|claude|zcode|manual] [--transport auto|proxy|queue] [--once] | send --squad ID [--to MEMBER] [--type command|cancel|info|answer] TEXT | read --session SID [--peek] | daemon start|stop|restart|status|logs | config [--agent HOST] [--session ID] | doctor [--plugin-root PATH] [--deep] | session --help | purge [--all]\n"
       );
     else if (cmd === "config") {
       const agent = v.agent || "generic";
@@ -5137,30 +5236,37 @@ if (process.argv[2] === "session") {
     } else if (cmd === "purge") print(await call("admin.purge", { all: !!v.all }));
     else if (cmd === "standby") {
       if (!v.session) throw new Error("--session SID is required");
-      print(
-        await call(
-          "admin.standby",
-          {
-            sid: v.session,
-            action: args[1] || "status",
-            adapter: v.adapter,
-            executable: v.executable,
-            socket: v.socket,
-            resolve: v.resolve
-          },
-          true
-        )
-      );
+      if (args[1] === "watch") await watch(v.session, !!v.once);
+      else
+        print(
+          await call(
+            "admin.standby",
+            {
+              sid: v.session,
+              action: args[1] || "status",
+              adapter: v.adapter,
+              transport: v.transport,
+              executable: v.executable,
+              socket: v.socket,
+              resolve: v.resolve
+            },
+            true
+          )
+        );
     } else if (cmd === "tail") {
-      const after = v.after === void 0 ? void 0 : Number(v.after);
-      if (after !== void 0 && (!Number.isSafeInteger(after) || after < 0))
-        throw new Error("--after requires a nonnegative event_seq");
+      const after = v.after === void 0 ? void 0 : v.after === "now" ? "now" : Number(v.after);
+      if (after !== void 0 && after !== "now" && (!Number.isSafeInteger(after) || after < 0))
+        throw new Error("--after requires now or a nonnegative event_seq");
+      if (v.format && !["line", "json"].includes(v.format))
+        throw new Error("--format must be line or json");
       await tail({
         squad: v.squad,
         for: v.for,
         after,
         full: !!v.full,
-        json: !!v.json,
+        json: !!v.json || v.format === "json",
+        line: v.format === "line",
+        actionable: !!v.actionable,
         follow: !!v.follow
       });
     } else if (cmd === "daemon") {