kojee-mcp 0.5.10 → 0.5.11

package/dist/{chunk-SCDWPGH3.js → chunk-D42PZX2I.js}

@@ -16,14 +16,21 @@ import {
 import {
   startEventStream
 } from "./chunk-MKDMAAMN.js";
+import {
+  secureDir,
+  secureFile
+} from "./chunk-BLEGIR35.js";
+import {
+  parseTandemsConfig
+} from "./chunk-YKW54DKF.js";
 import {
   translateToolCallResult
 } from "./chunk-LDZXU3DW.js";
 
 // src/index.ts
-import fs2 from "fs";
-import os from "os";
-import path2 from "path";
+import fs4 from "fs";
+import os2 from "os";
+import path3 from "path";
 
 // src/tool-registry.ts
 var ToolRegistry = class {
@@ -136,14 +143,25 @@ function buildChannelInstructions(_tandemMembershipCount, eventLogPath) {
   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 intro + monitorSection + listenSection + advice;
 }
+function tandemIdArg(args) {
+  return typeof args["tandem_id"] === "string" ? args["tandem_id"] : null;
+}
 async function executeToolCall(registry, name, args, hooks) {
   const rawResult = await registry.callTool(name, args);
   const result = translateToolCallResult(rawResult);
-  if (name === "tandem_join" && !result.isError) {
-    try {
-      hooks?.onTandemJoin?.();
-    } catch (err) {
-      console.error("[mcp] onTandemJoin hook failed:", err?.message ?? String(err));
+  if (!result.isError) {
+    if (name === "tandem_join") {
+      try {
+        hooks?.onTandemJoin?.(tandemIdArg(args));
+      } catch (err) {
+        console.error("[mcp] onTandemJoin hook failed:", err?.message ?? String(err));
+      }
+    } else if (name === "tandem_leave") {
+      try {
+        hooks?.onTandemLeave?.(tandemIdArg(args));
+      } catch (err) {
+        console.error("[mcp] onTandemLeave hook failed:", err?.message ?? String(err));
+      }
     }
   }
   return result;
@@ -273,8 +291,116 @@ var unknownAdapter = {
   }
 };
 
+// src/runtime/cc-session-id.ts
+import fs2 from "fs";
+import { execFileSync } from "child_process";
+import { createHash } from "crypto";
+var CC_SESSION_ENV = "CLAUDE_CODE_SESSION_ID";
+function extractCcSessionId(raw) {
+  if (raw.includes("\0")) {
+    for (const entry of raw.split("\0")) {
+      if (entry.startsWith(`${CC_SESSION_ENV}=`)) {
+        const v = entry.slice(CC_SESSION_ENV.length + 1);
+        return v.length > 0 ? v : null;
+      }
+    }
+    return null;
+  }
+  const re = new RegExp(`(?:^|\\s)${CC_SESSION_ENV}=([^\\s]+)`, "g");
+  let last = null;
+  let m;
+  while ((m = re.exec(raw)) !== null) last = m[1];
+  return last;
+}
+function defaultReadProcessEnvRaw(pid, platform) {
+  try {
+    if (platform === "linux") {
+      return fs2.readFileSync(`/proc/${pid}/environ`, "utf8");
+    }
+    if (platform === "darwin") {
+      return execFileSync("ps", ["eww", "-p", String(pid), "-o", "command="], {
+        encoding: "utf8",
+        timeout: 2e3
+      });
+    }
+  } catch {
+    return null;
+  }
+  return null;
+}
+function sanitizeKey(value) {
+  return value.replace(/[^A-Za-z0-9_-]/g, "");
+}
+function resolveInstanceKey(deps = {}) {
+  const env = deps.env ?? process.env;
+  const platform = deps.platform ?? process.platform;
+  const ccPid = deps.ccPid ?? null;
+  if (ccPid !== null) {
+    const reader = deps.readProcessEnvRaw ?? defaultReadProcessEnvRaw;
+    const raw = reader(ccPid, platform);
+    if (raw) {
+      const sid = sanitizeKey(extractCcSessionId(raw) ?? "");
+      if (sid) return sid;
+    }
+  }
+  const explicit = sanitizeKey((env.KOJEE_INSTANCE ?? "").trim());
+  if (explicit) return `inst-${explicit}`;
+  const base = deps.projectDir ?? env.CLAUDE_PROJECT_DIR ?? deps.cwd ?? process.cwd() ?? "";
+  const hash = createHash("sha256").update(base).digest("hex").slice(0, 12);
+  return `wd-${hash}`;
+}
+
+// src/tandem/room-memory.ts
+import fs3 from "fs";
+import os from "os";
+import path2 from "path";
+function defaultKojeeDir() {
+  return path2.join(os.homedir(), ".kojee");
+}
+function seatedRoomsPath(key, dir = defaultKojeeDir()) {
+  return path2.join(dir, `seated-rooms-cc-${key}.json`);
+}
+function readSeatedRooms(key, dir = defaultKojeeDir()) {
+  let raw;
+  try {
+    raw = fs3.readFileSync(seatedRoomsPath(key, dir), "utf8");
+  } catch {
+    return [];
+  }
+  try {
+    const parsed = JSON.parse(raw);
+    return Array.isArray(parsed.rooms) ? parsed.rooms.filter((r) => typeof r === "string") : [];
+  } catch {
+    return [];
+  }
+}
+function hasSeatedRoomsFile(key, dir = defaultKojeeDir()) {
+  return fs3.existsSync(seatedRoomsPath(key, dir));
+}
+function seedSeatedRooms(key, rooms, dir = defaultKojeeDir()) {
+  writeSeatedRooms(key, [...new Set(rooms)], dir);
+}
+function writeSeatedRooms(key, rooms, dir) {
+  fs3.mkdirSync(dir, { recursive: true, mode: 448 });
+  secureDir(dir);
+  const filePath = seatedRoomsPath(key, dir);
+  const body = { schema: 1, rooms, updatedAt: (/* @__PURE__ */ new Date()).toISOString() };
+  fs3.writeFileSync(filePath, JSON.stringify(body, null, 2), { mode: 384 });
+  secureFile(filePath);
+}
+function addSeatedRoom(key, tandemId, dir = defaultKojeeDir()) {
+  const rooms = readSeatedRooms(key, dir);
+  if (rooms.includes(tandemId)) return;
+  writeSeatedRooms(key, [...rooms, tandemId], dir);
+}
+function removeSeatedRoom(key, tandemId, dir = defaultKojeeDir()) {
+  const rooms = readSeatedRooms(key, dir);
+  if (!rooms.includes(tandemId)) return;
+  writeSeatedRooms(key, rooms.filter((r) => r !== tandemId), dir);
+}
+
 // src/index.ts
-var DEFAULT_KEYSTORE_PATH = path2.join(os.homedir(), ".kojee", "keypair.json");
+var DEFAULT_KEYSTORE_PATH = path3.join(os2.homedir(), ".kojee", "keypair.json");
 function isDPoPEnrollmentError(err) {
   const msg = String(err?.message ?? err ?? "").toLowerCase();
   if (msg.includes("invalid or expired") && msg.includes("token")) return false;
@@ -317,6 +443,19 @@ async function startProxy(config) {
   console.error(
     `[kojee-mcp] Ready \u2014 ${registry.toolCount} tools available from ${config.url}`
   );
+  const ccPid = await findClaudeAncestorPid();
+  const instanceKey = resolveInstanceKey({ ccPid });
+  const roomMemory = {
+    hasMemory: () => hasSeatedRoomsFile(instanceKey),
+    read: () => readSeatedRooms(instanceKey),
+    seed: (rooms) => seedSeatedRooms(instanceKey, rooms)
+  };
+  const recordRooms = parseTandemsConfig(process.env["KOJEE_TANDEMS"]).mode === "auto-local";
+  if (recordRooms && instanceKey.startsWith("wd-")) {
+    console.error(
+      "[kojee-mcp] #28: no Claude Code session id available \u2014 room-memory keyed on project-dir hash; concurrent windows in the same dir will share it. Set KOJEE_INSTANCE=<unique-per-window> to keep them session-faithful."
+    );
+  }
   let activeStreamHandle = null;
   const { createJoinReconnectScheduler } = await import("./reconnect-scheduler-ARV6JIWK.js");
   const joinReconnect = createJoinReconnectScheduler({
@@ -331,7 +470,13 @@ async function startProxy(config) {
       return true;
     }
   });
-  const onTandemJoin = () => joinReconnect.requestReconnect();
+  const onTandemJoin = (tandemId) => {
+    joinReconnect.requestReconnect();
+    if (recordRooms && tandemId) addSeatedRoom(instanceKey, tandemId);
+  };
+  const onTandemLeave = (tandemId) => {
+    if (recordRooms && tandemId) removeSeatedRoom(instanceKey, tandemId);
+  };
   const teardownSteps = [];
   let shuttingDown = false;
   function shutdown(reason) {
@@ -353,12 +498,12 @@ async function startProxy(config) {
     console.error(`[kojee-mcp] shutting down (${reason}), exiting`);
     process.exit(0);
   }
-  const ccPid = await findClaudeAncestorPid();
-  const { ensureJoinTandems } = await import("./ensure-join-7AEDJMPE.js");
+  const { ensureJoinTandems } = await import("./ensure-join-5Y5IJ7HN.js");
   await ensureJoinTandems({
     gateway,
     env: process.env["KOJEE_TANDEMS"],
     listTandems: () => listTandemIds(gateway),
+    roomMemory,
     onJoined: () => joinReconnect.requestReconnect()
   });
   let tandemMembershipCount = -1;
@@ -411,7 +556,8 @@ async function startProxy(config) {
       });
     }
     server = createMcpServer(registry, adapter, tandemMembershipCount, eventLog.path, {
-      onTandemJoin
+      onTandemJoin,
+      onTandemLeave
     });
     const { issueControlToken, controlTokenPath } = await import("./control-token-4BUCTYQB.js");
     let controlToken = null;
@@ -546,7 +692,8 @@ async function startProxy(config) {
       });
     }
     server = createMcpServer(registry, adapter, tandemMembershipCount, void 0, {
-      onTandemJoin
+      onTandemJoin,
+      onTandemLeave
     });
     process.on("exit", () => eventLog.cleanup());
     teardownSteps.push(() => {
@@ -622,7 +769,7 @@ async function enrollAndDiscover(config, keystorePath, isRetry = false) {
       "[kojee-mcp] Auth failed, attempting recovery with fresh enrollment..."
     );
     try {
-      if (fs2.existsSync(keystorePath)) fs2.unlinkSync(keystorePath);
+      if (fs4.existsSync(keystorePath)) fs4.unlinkSync(keystorePath);
     } catch (unlinkErr) {
       console.error("[kojee-mcp] Could not remove stale keystore:", unlinkErr);
     }

package/dist/{chunk-YKS6YZKM.js → chunk-PHXO5P25.js}

@@ -2,9 +2,6 @@
 function sanitizeChannelAttr(value) {
   return String(value ?? "").replace(/["<>\u0000-\u001f\u007f]/g, "");
 }
-function defangChannelBody(content) {
-  return String(content ?? "").replace(/<(\/?)channel/gi, "&lt;$1channel");
-}
 function formatChannelEvents(events) {
   const header = `[${events.length} unread Tandem ${events.length === 1 ? "event" : "events"}]
 
@@ -12,7 +9,7 @@ function formatChannelEvents(events) {
   const bodies = events.map((evt) => {
     const attrs = Object.entries(evt.meta).map(([k, v]) => `${k}="${sanitizeChannelAttr(v)}"`).join(" ");
     return `<channel source="kojee-mcp" ${attrs}>
-${defangChannelBody(evt.content)}
+${evt.content}
 </channel>`;
   });
   return header + bodies.join("\n\n");

package/dist/{ensure-join-7AEDJMPE.js → chunk-YKW54DKF.js}

@@ -3,8 +3,9 @@ var OBJECT_ID_RE = /^[0-9a-f]{24}$/i;
 var DEFAULT_PER_CALL_TIMEOUT_MS = 1e4;
 function parseTandemsConfig(raw) {
   const trimmed = (raw ?? "").trim();
-  if (trimmed.length === 0) return { mode: "auto", ids: [], invalid: [] };
+  if (trimmed.length === 0) return { mode: "auto-local", ids: [], invalid: [] };
   if (trimmed.toLowerCase() === "none") return { mode: "disabled", ids: [], invalid: [] };
+  if (trimmed.toLowerCase() === "auto-agent") return { mode: "auto-agent", ids: [], invalid: [] };
   const ids = [];
   const invalid = [];
   for (const entry of trimmed.split(/[\s,]+/)) {
@@ -25,26 +26,54 @@ async function ensureJoinTandems(opts) {
   for (const bad of config.invalid) {
     log(`[ensure-join] skipping invalid tandem id "${bad}" (not a 24-hex ObjectId)`);
   }
-  let ids;
-  if (config.mode === "explicit") {
-    ids = config.ids;
-    log(`[ensure-join] mode=explicit n=${ids.length} (KOJEE_TANDEMS)`);
-  } else {
-    let listed = null;
+  const listAgentTandems = async () => {
     try {
-      listed = opts.listTandems ? await opts.listTandems() : null;
+      return opts.listTandems ? await opts.listTandems() : null;
     } catch (err) {
       log(`[ensure-join] tandem_list threw: ${err.message}`);
-      listed = null;
+      return null;
     }
+  };
+  const warnListFailed = () => {
+    log(
+      "[ensure-join] tandem_list failed \u2014 cannot re-seat this session (set KOJEE_TANDEMS=<ids> to pin, or KOJEE_TANDEMS=none to silence)"
+    );
+  };
+  let ids;
+  if (config.mode === "explicit") {
+    ids = config.ids;
+    log(`[ensure-join] mode=explicit n=${ids.length} (KOJEE_TANDEMS)`);
+  } else if (config.mode === "auto-agent") {
+    const listed = await listAgentTandems();
     if (listed === null) {
-      log(
-        "[ensure-join] tandem_list failed \u2014 cannot auto re-seat this session (set KOJEE_TANDEMS=<ids> to pin, or KOJEE_TANDEMS=none to silence)"
-      );
+      warnListFailed();
       return result;
     }
     ids = listed;
-    log(`[ensure-join] mode=auto n=${ids.length} (KOJEE_TANDEMS unset \u2014 re-seating where this agent already holds a seat)`);
+    log(`[ensure-join] mode=auto-agent n=${ids.length} (legacy \u2014 re-seating every room this agent holds a seat)`);
+  } else {
+    const mem = opts.roomMemory;
+    if (mem && mem.hasMemory()) {
+      ids = mem.read().filter((id) => OBJECT_ID_RE.test(id));
+      log(`[ensure-join] mode=auto-local n=${ids.length} (rejoining this session's own rooms from local memory)`);
+    } else {
+      const listed = await listAgentTandems();
+      if (listed === null) {
+        warnListFailed();
+        return result;
+      }
+      ids = listed;
+      if (mem) {
+        try {
+          mem.seed(ids);
+          log(`[ensure-join] mode=auto-local n=${ids.length} (first run \u2014 seeded local memory from membership)`);
+        } catch (err) {
+          log(`[ensure-join] mode=auto-local n=${ids.length} (first run \u2014 seed write FAILED: ${err.message}; joining without persisting)`);
+        }
+      } else {
+        log(`[ensure-join] mode=auto-local n=${ids.length} (no room-memory port \u2014 falling back to agent-scoped list)`);
+      }
+    }
   }
   for (const id of ids) {
     const outcome = await joinOne(opts.gateway, id, perCallTimeoutMs);
@@ -90,7 +119,8 @@ async function joinOne(gateway, tandemId, perCallTimeoutMs) {
     clearTimeout(timer);
   }
 }
+
 export {
-  ensureJoinTandems,
-  parseTandemsConfig
+  parseTandemsConfig,
+  ensureJoinTandems
 };

package/dist/cli.js

@@ -5,7 +5,7 @@ import {
 import {
   VERSION,
   startProxy
-} from "./chunk-SCDWPGH3.js";
+} from "./chunk-D42PZX2I.js";
 import "./chunk-X672ZN7V.js";
 import "./chunk-BJMASMKX.js";
 import {
@@ -20,6 +20,7 @@ import {
   deriveKeystorePath
 } from "./chunk-CH32ELFX.js";
 import "./chunk-BLEGIR35.js";
+import "./chunk-YKW54DKF.js";
 import "./chunk-LDZXU3DW.js";
 
 // src/cli.ts
@@ -42,11 +43,11 @@ program.command("pair <code>").description("Pair this machine against Kojee usin
 });
 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) => {
   if (opts.type === "stop") {
-    const { runStopHook } = await import("./stop-hook-OTCJGL6V.js");
+    const { runStopHook } = await import("./stop-hook-GEJF47SN.js");
     await runStopHook();
     process.exit(0);
   } else if (opts.type === "user-prompt-submit") {
-    const { runUserPromptSubmitHook } = await import("./user-prompt-submit-hook-QXMC7EZU.js");
+    const { runUserPromptSubmitHook } = await import("./user-prompt-submit-hook-DGRRFHOB.js");
     await runUserPromptSubmitHook();
     process.exit(0);
   } else if (opts.type === "codex-stop") {

package/dist/ensure-join-5Y5IJ7HN.js

@@ -0,0 +1,8 @@
+import {
+  ensureJoinTandems,
+  parseTandemsConfig
+} from "./chunk-YKW54DKF.js";
+export {
+  ensureJoinTandems,
+  parseTandemsConfig
+};

package/dist/index.js

@@ -1,7 +1,7 @@
 import {
   listTandemIds,
   startProxy
-} from "./chunk-SCDWPGH3.js";
+} from "./chunk-D42PZX2I.js";
 import "./chunk-X672ZN7V.js";
 import "./chunk-BJMASMKX.js";
 import "./chunk-JXMVZEQ7.js";
@@ -10,6 +10,7 @@ import "./chunk-MKDMAAMN.js";
 import "./chunk-2MIISF2W.js";
 import "./chunk-CH32ELFX.js";
 import "./chunk-BLEGIR35.js";
+import "./chunk-YKW54DKF.js";
 import "./chunk-LDZXU3DW.js";
 export {
   listTandemIds,

package/dist/{stop-hook-OTCJGL6V.js → stop-hook-GEJF47SN.js}

@@ -1,6 +1,6 @@
 import {
   formatChannelEvents
-} from "./chunk-YKS6YZKM.js";
+} from "./chunk-PHXO5P25.js";
 import {
   readHookStdin
 } from "./chunk-LSUB6QMP.js";

package/dist/{user-prompt-submit-hook-QXMC7EZU.js → user-prompt-submit-hook-DGRRFHOB.js}

@@ -1,6 +1,6 @@
 import {
   formatChannelEvents
-} from "./chunk-YKS6YZKM.js";
+} from "./chunk-PHXO5P25.js";
 import {
   readHookStdin
 } from "./chunk-LSUB6QMP.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kojee-mcp",
-  "version": "0.5.10",
+  "version": "0.5.11",
   "type": "module",
   "main": "dist/index.js",
   "exports": {