kojee-mcp 0.7.0 → 0.7.2

package/dist/{chunk-SGRVG4HW.js → chunk-ZUIYFRO5.js}

@@ -1,8 +1,12 @@
+import {
+  VERSION
+} from "./chunk-5DHIUN73.js";
 import {
   buildCatchUpNote,
+  buildCondensedTandemRules,
   buildMonitorSpawn,
   buildReplyRecipe
-} from "./chunk-QEJUNP3X.js";
+} from "./chunk-XFGGMDZ4.js";
 import {
   translateToolCallResult
 } from "./chunk-PPTKGWFF.js";
@@ -14,32 +18,9 @@ import {
   ListToolsRequestSchema,
   CallToolRequestSchema
 } from "@modelcontextprotocol/sdk/types.js";
-
-// src/version.ts
-import fs from "fs";
-import path from "path";
-import { fileURLToPath } from "url";
-var FALLBACK_VERSION = "0.0.0-unknown";
-function resolveVersion() {
-  try {
-    const here = path.dirname(fileURLToPath(import.meta.url));
-    const parsed = JSON.parse(
-      fs.readFileSync(path.join(here, "..", "package.json"), "utf8")
-    );
-    return typeof parsed?.version === "string" && parsed.version ? parsed.version : FALLBACK_VERSION;
-  } catch (err) {
-    process.stderr.write(
-      `kojee-mcp: could not resolve version from package.json, falling back to ${FALLBACK_VERSION}: ${String(err)}
-`
-    );
-    return FALLBACK_VERSION;
-  }
-}
-var VERSION = resolveVersion();
-
-// src/server.ts
-function buildNonChannelInstructions() {
-  return "You are connected through the LOCAL kojee proxy. Do ALL Tandem operations (tandem_join/tandem_messages/tandem_send/tandem_set_wake_filter) through THESE tools \u2014 this is your ONLY wake-capable path: the proxy can only wake you for Tandem traffic that flows through it. If a REMOTE Kojee connector (e.g. a claude.ai-hosted 'Kojee' MCP) is ALSO available, do NOT use its Tandem tools \u2014 they cannot wake you.";
+function buildNonChannelInstructions(runtime) {
+  const skillPointer = runtime === "codex" ? " Before working in rooms, read the using-tandems skill at ~/.agents/skills/using-tandems/SKILL.md (if present)." : "";
+  return "You are connected through the LOCAL kojee proxy. Do ALL Tandem operations (tandem_join/tandem_messages/tandem_send/tandem_set_wake_filter) through THESE tools \u2014 this is your ONLY wake-capable path: the proxy can only wake you for Tandem traffic that flows through it. If a REMOTE Kojee connector (e.g. a claude.ai-hosted 'Kojee' MCP) is ALSO available, do NOT use its Tandem tools \u2014 they cannot wake you.\n\n" + buildCondensedTandemRules() + skillPointer;
 }
 function buildChannelInstructions(_tandemMembershipCount, eventLogPath) {
   const localProxyRule = "You are connected through the LOCAL kojee proxy. Do ALL Tandem operations (join/read/send/set_wake_filter) through THESE tools \u2014 this is your ONLY wake-capable path: it writes the wake log the Monitor and stop-hook read. If a REMOTE Kojee connector (e.g. a claude.ai-hosted 'Kojee' MCP) is ALSO available, do NOT use its Tandem tools \u2014 they cannot wake you.\n\n";
@@ -53,11 +34,44 @@ function buildChannelInstructions(_tandemMembershipCount, eventLogPath) {
 `;
   const listenSection = "(3) If you want to BLOCK until any single reply lands (rather than receive a stream of events), call tandem_listen(tandem_id, since=cursor, timeout_ms=N) instead.";
   const advice = "\n\nPrefer (2) at session start \u2014 it's the default no-allowlist wake mechanism. (1) supplements it when channels are enabled; (3) is for one-shot blocking waits.";
-  return localProxyRule + intro + monitorSection + listenSection + advice;
+  const skillPointer = "\n\nTeamwork guide: read the using-tandems skill at ~/.claude/skills/using-tandems/SKILL.md (if present) before working in rooms.";
+  return localProxyRule + intro + monitorSection + listenSection + advice + skillPointer;
 }
 function tandemIdArg(args) {
   return typeof args["tandem_id"] === "string" ? args["tandem_id"] : null;
 }
+var DRAIN_TOOLS = /* @__PURE__ */ new Set(["tandem_messages", "tandem_ack"]);
+function extractDrainCursor(name, args, content) {
+  const candidates = [];
+  const push = (v) => {
+    if (typeof v === "number" && Number.isFinite(v) && v >= 0) candidates.push(Math.floor(v));
+  };
+  if (name === "tandem_ack") push(args["cursor"]);
+  for (const item of content) {
+    if (item.type !== "text" || typeof item.text !== "string") continue;
+    let parsed;
+    try {
+      parsed = JSON.parse(item.text);
+    } catch {
+      continue;
+    }
+    const rows = Array.isArray(parsed) ? parsed : [];
+    if (parsed !== null && typeof parsed === "object" && !Array.isArray(parsed)) {
+      const obj = parsed;
+      push(obj["cursor"]);
+      push(obj["latest_cursor"]);
+      push(obj["next_cursor"]);
+      for (const key of ["messages", "events"]) {
+        const arr = obj[key];
+        if (Array.isArray(arr)) rows.push(...arr);
+      }
+    }
+    for (const row of rows) {
+      if (row !== null && typeof row === "object") push(row["cursor"]);
+    }
+  }
+  return candidates.length > 0 ? Math.max(...candidates) : null;
+}
 async function executeToolCall(registry, name, args, hooks) {
   const rawResult = await registry.callTool(name, args);
   const result = translateToolCallResult(rawResult);
@@ -68,6 +82,24 @@ async function executeToolCall(registry, name, args, hooks) {
       console.error("[mcp] onTandemJoin hook failed:", err?.message ?? String(err));
     }
   }
+  if (!result.isError && name === "tandem_leave") {
+    try {
+      hooks?.onTandemLeave?.(tandemIdArg(args));
+    } catch (err) {
+      console.error("[mcp] onTandemLeave hook failed:", err?.message ?? String(err));
+    }
+  }
+  if (!result.isError && DRAIN_TOOLS.has(name)) {
+    const tandemId = tandemIdArg(args);
+    const cursor = tandemId !== null ? extractDrainCursor(name, args, result.content) : null;
+    if (tandemId !== null && cursor !== null) {
+      try {
+        hooks?.onTandemDrain?.(tandemId, cursor);
+      } catch (err) {
+        console.error("[mcp] onTandemDrain hook failed:", err?.message ?? String(err));
+      }
+    }
+  }
   return result;
 }
 function createMcpServer(registry, adapter, tandemMembershipCount = -1, eventLogPath, hooks) {
@@ -79,7 +111,7 @@ function createMcpServer(registry, adapter, tandemMembershipCount = -1, eventLog
     { name: "kojee-mcp", version: VERSION },
     {
       capabilities,
-      ...adapter.supportsChannels ? { instructions: buildChannelInstructions(tandemMembershipCount, eventLogPath ?? "") } : { instructions: buildNonChannelInstructions() }
+      ...adapter.supportsChannels ? { instructions: buildChannelInstructions(tandemMembershipCount, eventLogPath ?? "") } : { instructions: buildNonChannelInstructions(adapter.runtime) }
     }
   );
   server.setRequestHandler(ListToolsRequestSchema, async () => {
@@ -104,9 +136,9 @@ async function startMcpServer(server) {
 }
 
 export {
-  VERSION,
   buildNonChannelInstructions,
   buildChannelInstructions,
+  extractDrainCursor,
   executeToolCall,
   createMcpServer,
   startMcpServer

package/dist/cli.js

@@ -4,24 +4,25 @@ import {
 } from "./chunk-EIAUW6KO.js";
 import {
   startProxy
-} from "./chunk-5H75AEZ2.js";
-import "./chunk-OB5T6P24.js";
+} from "./chunk-R5GC2GRD.js";
+import "./chunk-E35VWFZV.js";
 import {
   pairedConfigPath
 } from "./chunk-5SZHXYPK.js";
 import "./chunk-247WFMCJ.js";
-import "./chunk-I67C2HYA.js";
 import "./chunk-Z5LPNJQ6.js";
+import "./chunk-I67C2HYA.js";
 import "./chunk-MIEI4PLB.js";
 import {
   defaultPairedKeystorePath,
   deriveKeystorePath
 } from "./chunk-6G6YYST6.js";
 import "./chunk-U5HHHRXA.js";
+import "./chunk-ZUIYFRO5.js";
 import {
   VERSION
-} from "./chunk-SGRVG4HW.js";
-import "./chunk-QEJUNP3X.js";
+} from "./chunk-5DHIUN73.js";
+import "./chunk-XFGGMDZ4.js";
 import "./chunk-PPTKGWFF.js";
 import "./chunk-XJEBJIQE.js";
 import "./chunk-KNEJTD6G.js";
@@ -47,7 +48,7 @@ program.command("pair <code>").description("Pair this machine against Kojee usin
 program.command("connect <code>").description(
   "Connect this runtime to Kojee with a per-agent pair code from the dashboard (claude-code | codex | openclaw | hermes). claude-code/codex/openclaw write a per-runtime paired slot (~/.kojee/agents/<runtime>/config.json) and point the runtime launcher at it via --paired-config; hermes writes the global ~/.kojee/config.json (its daemon + `kojee-mcp send` read that). Idempotent."
 ).requiredOption("--runtime <id>", "Target runtime: claude-code | codex | openclaw | hermes").option("--url <url>", "Broker base URL (default: the canonical staging broker)").action(async (code, opts) => {
-  const { runConnect } = await import("./connect-handler-HIRM624N.js");
+  const { runConnect } = await import("./connect-handler-2JFIMQY6.js");
   const result = await runConnect({
     code,
     runtime: opts.runtime,
@@ -57,9 +58,12 @@ program.command("connect <code>").description(
   console.error(result.output);
   process.exit(result.exitCode);
 });
-program.command("hook").description("Run a kojee MCP hook script (called by Claude Code via ~/.claude/settings.json)").requiredOption("--type <type>", "Hook type: stop, user-prompt-submit, or codex-stop").action(async (opts) => {
+program.command("hook").description("Run a kojee MCP hook script (called by Claude Code via ~/.claude/settings.json)").requiredOption(
+  "--type <type>",
+  "Hook type: stop, user-prompt-submit, codex-stop, or codex-prompt-submit"
+).action(async (opts) => {
   if (opts.type === "stop") {
-    const { runStopHook } = await import("./stop-hook-YI4KRKF2.js");
+    const { runStopHook } = await import("./stop-hook-PWTAP227.js");
     await runStopHook();
     process.exit(0);
   } else if (opts.type === "user-prompt-submit") {
@@ -67,16 +71,22 @@ program.command("hook").description("Run a kojee MCP hook script (called by Clau
     await runUserPromptSubmitHook();
     process.exit(0);
   } else if (opts.type === "codex-stop") {
-    const { runCodexStopHook } = await import("./codex-stop-hook-EOMQD3J4.js");
+    const { runCodexStopHook } = await import("./codex-stop-hook-PNWYNQKM.js");
     await runCodexStopHook();
     process.exit(0);
+  } else if (opts.type === "codex-prompt-submit") {
+    const { runCodexPromptSubmitHook } = await import("./codex-prompt-submit-hook-FOBPGZHJ.js");
+    await runCodexPromptSubmitHook();
+    process.exit(0);
   } else {
-    console.error(`Unknown hook type: ${opts.type}. Expected 'stop', 'user-prompt-submit', or 'codex-stop'.`);
+    console.error(
+      `Unknown hook type: ${opts.type}. Expected 'stop', 'user-prompt-submit', 'codex-stop', or 'codex-prompt-submit'.`
+    );
     process.exit(1);
   }
 });
 program.command("install-hooks").description("Install kojee Stop + UserPromptSubmit hooks in ~/.claude/settings.json (idempotent)").option("--hooks-path <path>", "Override default ~/.claude/settings.json").option("--uninstall", "Remove kojee hook entries instead of installing them").action(async (opts) => {
-  const { installHooks, uninstallHooks } = await import("./install-V7LSQCYZ.js");
+  const { installHooks, uninstallHooks } = await import("./install-GGI6GU6C.js");
   if (opts.uninstall) {
     const removed = uninstallHooks({ hooksPath: opts.hooksPath });
     console.error(removed ? "Removed kojee hook entries." : "No kojee hook entries found.");
@@ -105,7 +115,7 @@ program.command("send <tandem_id>").description(
   process.exit(exitCode);
 });
 program.command("tail <path>").description("Stream a file's contents and follow appends (portable replacement for `tail -F`)").action(async (filePath) => {
-  const { runTail } = await import("./tail-stream-NBGHHBS4.js");
+  const { runTail } = await import("./tail-stream-N43D53RC.js");
   try {
     await runTail(filePath);
   } catch (err) {
@@ -114,7 +124,7 @@ program.command("tail <path>").description("Stream a file's contents and follow
   }
 });
 program.command("doctor").description("Diagnose the kojee wake path (proxy, hook-server, SSE stream, event log, Monitor) and print the exact wake recipe").action(async () => {
-  const { runDoctor } = await import("./doctor-PLKLHTJM.js");
+  const { runDoctor } = await import("./doctor-HXMCO5PR.js");
   const code = await runDoctor();
   process.exit(code);
 });
@@ -133,7 +143,7 @@ function addInstallOptions(cmd, runtimeHelp) {
 function makeInstallAction(verb) {
   return async (opts) => {
     const interactive = process.stdin.isTTY === true && opts.runtime === void 0;
-    const { runSetup, resolvePairCode } = await import("./setup-handler-UHVKSX7E.js");
+    const { runSetup, resolvePairCode } = await import("./setup-handler-GBPXDETR.js");
     const pairCode = resolvePairCode(opts);
     const result = await runSetup({
       verb,

package/dist/codex-prompt-submit-hook-FOBPGZHJ.js

@@ -0,0 +1,39 @@
+import {
+  readHookStdin
+} from "./chunk-LSUB6QMP.js";
+import {
+  listPending
+} from "./chunk-IZN7IZPW.js";
+import {
+  CODEX_WAKE_BELL
+} from "./chunk-XFGGMDZ4.js";
+
+// src/hooks/codex-prompt-submit-hook.ts
+function buildCodexPromptSubmitOutput() {
+  let pending;
+  try {
+    pending = listPending();
+  } catch {
+    return "{}";
+  }
+  if (pending.length === 0) return "{}";
+  return JSON.stringify({
+    hookSpecificOutput: {
+      hookEventName: "UserPromptSubmit",
+      additionalContext: CODEX_WAKE_BELL
+    }
+  });
+}
+async function runCodexPromptSubmitHook() {
+  await readHookStdin();
+  let out = "{}";
+  try {
+    out = buildCodexPromptSubmitOutput();
+  } catch {
+  }
+  process.stdout.write(out);
+}
+export {
+  buildCodexPromptSubmitOutput,
+  runCodexPromptSubmitHook
+};

package/dist/codex-stop-hook-PNWYNQKM.js

@@ -0,0 +1,136 @@
+import {
+  readHookStdin
+} from "./chunk-LSUB6QMP.js";
+import {
+  drainedRoomsPath,
+  listPending,
+  pendingRoomsPath
+} from "./chunk-IZN7IZPW.js";
+import {
+  CODEX_WAKE_BELL
+} from "./chunk-XFGGMDZ4.js";
+
+// src/hooks/codex-stop-hook.ts
+import fs from "fs";
+import path2 from "path";
+
+// src/hooks/codex-pending-path.ts
+import path from "path";
+function codexNudgeAttemptsPath() {
+  return path.join(path.dirname(pendingRoomsPath()), "codex-nudge-attempts");
+}
+function codexWakeDropLogPath() {
+  return path.join(path.dirname(pendingRoomsPath()), "codex-pending-wake-drops.log");
+}
+
+// src/hooks/codex-stop-hook.ts
+var CODEX_PEEK_MS = clampPeekMs(
+  Number.parseInt(process.env["KOJEE_CODEX_PEEK_MS"] ?? "150", 10)
+);
+function clampPeekMs(raw) {
+  if (!Number.isFinite(raw) || raw <= 0) return 150;
+  return Math.min(raw, 500);
+}
+var MAX_NUDGES_PER_ROOM = 3;
+var ANON_KEY = "-";
+function readNudgeAttempts() {
+  const out = /* @__PURE__ */ new Map();
+  let raw;
+  try {
+    raw = fs.readFileSync(codexNudgeAttemptsPath(), "utf8");
+  } catch {
+    return out;
+  }
+  for (const line of raw.split("\n")) {
+    const parts = line.trim().split(/\s+/);
+    if (parts.length !== 3) continue;
+    const cursor = Number.parseInt(parts[1], 10);
+    const count = Number.parseInt(parts[2], 10);
+    if (!Number.isFinite(cursor) || !Number.isFinite(count) || count < 0) continue;
+    out.set(parts[0], { cursor, count });
+  }
+  return out;
+}
+function writeNudgeAttempts(attempts) {
+  const filePath = codexNudgeAttemptsPath();
+  const tmp = `${filePath}.tmp-${process.pid}`;
+  try {
+    fs.mkdirSync(path2.dirname(filePath), { recursive: true });
+    const body = Array.from(attempts.entries()).map(([key, rec]) => `${key} ${rec.cursor} ${rec.count}`).join("\n");
+    fs.writeFileSync(tmp, body === "" ? "" : body + "\n", { mode: 384 });
+    fs.renameSync(tmp, filePath);
+  } catch {
+    try {
+      fs.unlinkSync(tmp);
+    } catch {
+    }
+  }
+}
+function logCappedRoom(key, cursor, attempts) {
+  try {
+    const logPath = codexWakeDropLogPath();
+    fs.mkdirSync(path2.dirname(logPath), { recursive: true });
+    fs.appendFileSync(
+      logPath,
+      `${(/* @__PURE__ */ new Date()).toISOString()} stopped nudging room ${key} (cursor=${cursor}) after ${attempts} un-drained block attempts \u2014 either Codex is silently rejecting the Stop-hook output (run \`kojee-mcp doctor\` and approve Codex's trust prompt) or the room belongs to another session; the room stays pending in the ledger until its proxy drains it
+`,
+      { mode: 384 }
+    );
+  } catch {
+  }
+}
+function decideCodexStop(stopHookActive) {
+  if (stopHookActive) return "{}";
+  let pending;
+  try {
+    pending = listPending();
+  } catch {
+    return "{}";
+  }
+  if (pending.length === 0) return "{}";
+  const attempts = readNudgeAttempts();
+  const next = /* @__PURE__ */ new Map();
+  const nudgeable = [];
+  for (const room of pending) {
+    const key = room.tandemId ?? ANON_KEY;
+    const prior = attempts.get(key);
+    const count = prior !== void 0 && prior.cursor === room.cursor ? prior.count : 0;
+    if (count >= MAX_NUDGES_PER_ROOM) {
+      if (count === MAX_NUDGES_PER_ROOM) {
+        logCappedRoom(key, room.cursor, count);
+        next.set(key, { cursor: room.cursor, count: count + 1 });
+      } else {
+        next.set(key, { cursor: room.cursor, count });
+      }
+      continue;
+    }
+    next.set(key, { cursor: room.cursor, count: count + 1 });
+    nudgeable.push(room);
+  }
+  writeNudgeAttempts(next);
+  if (nudgeable.length === 0) return "{}";
+  return JSON.stringify({
+    decision: "block",
+    reason: CODEX_WAKE_BELL
+  });
+}
+async function runCodexStopHook() {
+  const { stopHookActive } = await readHookStdin();
+  let out = "{}";
+  try {
+    out = decideCodexStop(stopHookActive);
+  } catch {
+  }
+  process.stdout.write(out);
+}
+var CODEX_PEEK_BUDGET_MS = CODEX_PEEK_MS;
+export {
+  CODEX_PEEK_BUDGET_MS,
+  MAX_NUDGES_PER_ROOM,
+  codexNudgeAttemptsPath,
+  codexWakeDropLogPath,
+  decideCodexStop,
+  drainedRoomsPath,
+  pendingRoomsPath,
+  runCodexStopHook
+};

package/dist/{connect-handler-HIRM624N.js → connect-handler-2JFIMQY6.js}

@@ -2,17 +2,17 @@ import {
   DEFAULT_BROKER_URL,
   reconcileConnectPairSlot,
   runWizard
-} from "./chunk-GVWYW7MY.js";
+} from "./chunk-EDHG4375.js";
+import "./chunk-RVLUZLXD.js";
 import "./chunk-E6WMFMM2.js";
-import "./chunk-OBIJ6WQP.js";
-import "./chunk-QJFMU4QC.js";
+import "./chunk-77HWBSRH.js";
+import "./chunk-TMCNB4JH.js";
 import "./chunk-D6JKFJ6A.js";
 import {
   CONNECT_RUNTIMES
 } from "./chunk-EIH2LNF4.js";
 import "./chunk-RDLF4NQC.js";
 import "./chunk-SQL56SEB.js";
-import "./chunk-77HWBSRH.js";
 import "./chunk-V5VZPYMZ.js";
 import {
   runPair
@@ -29,7 +29,8 @@ import {
   deriveKeystorePath
 } from "./chunk-6G6YYST6.js";
 import "./chunk-U5HHHRXA.js";
-import "./chunk-QEJUNP3X.js";
+import "./chunk-5DHIUN73.js";
+import "./chunk-XFGGMDZ4.js";
 
 // src/wizard/connect-handler.ts
 import os from "os";
@@ -47,6 +48,13 @@ function identityLabel(cfg) {
   if (cfg?.principal_id) return cfg.principal_id;
   return "this runtime";
 }
+function identityChangeWarning(runtime, oldConfig, newConfig) {
+  if (oldConfig.agent_id && newConfig?.agent_id) {
+    if (oldConfig.agent_id === newConfig.agent_id) return null;
+    return `\u26A0 WARNING: this paired ${runtime} as a NEW agent identity (${oldConfig.agent_id} \u2192 ${newConfig.agent_id}) \u2014 room seats stay with the old agent. Re-join rooms, or regenerate a code for the SAME agent in the dashboard.`;
+  }
+  return `Note: identity continuity cannot be verified for this re-connect (the broker response carries no agent id). If this code was minted for a different agent, room seats stay with the old one \u2014 re-join rooms if wakes stop.`;
+}
 async function runConnect(opts) {
   if (opts.runtime === "hermes") return runConnectHermes(opts);
   const messages = [];
@@ -88,8 +96,8 @@ async function runConnect(opts) {
   const newConfig = loadPairedConfig(configPath);
   const newLabel = identityLabel(newConfig);
   const summary = oldConfig ? `\u21BB re-connected ${runtime} as ${newLabel} (was ${identityLabel(oldConfig)})` : `\u2713 connected ${runtime} as ${newLabel} \u2192 ${url}`;
-  const output = `${summary}
-Restart ${runtime} to pick up the connection.`;
+  const warning = runtime === "codex" && oldConfig ? identityChangeWarning(runtime, oldConfig, newConfig) : null;
+  const output = [summary, ...warning ? [warning] : [], `Restart ${runtime} to pick up the connection.`].join("\n");
   return { messages, output, exitCode: 0 };
 }
 async function runConnectHermes(opts) {

package/dist/{doctor-PLKLHTJM.js → doctor-HXMCO5PR.js}

@@ -18,7 +18,7 @@ import "./chunk-U5HHHRXA.js";
 import {
   buildMonitorSpawn,
   buildReplyRecipe
-} from "./chunk-QEJUNP3X.js";
+} from "./chunk-XFGGMDZ4.js";
 import {
   deriveDiscoveryKey,
   findClaudeAncestorPid
@@ -354,7 +354,7 @@ function formatDoctorReport(report) {
 async function runDoctor() {
   const { readRecordedRuntime } = await import("./runtime-record-OXRLTOLC.js");
   if (readRecordedRuntime() === "codex") {
-    const { collectCodexDoctorReport, formatCodexDoctorReport } = await import("./doctor-codex-HARAAH4Y.js");
+    const { collectCodexDoctorReport, formatCodexDoctorReport } = await import("./doctor-codex-ZSALZPH3.js");
     const report2 = collectCodexDoctorReport();
     console.error(formatCodexDoctorReport(report2));
     return report2.verdict === "broken" ? 1 : 0;