khala-cli 0.4.4 → 0.4.5

package/dist/{chunk-LN3G2LJV.mjs → chunk-6LC66VHK.mjs}

@@ -1,7 +1,7 @@
 import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
 import {
   ensureHelper
-} from "./chunk-LHAMBQK7.mjs";
+} from "./chunk-HB3UGIZG.mjs";
 import {
   KhalaClientError,
   LOCAL_LONG_POLL_MAX_S,
@@ -16,19 +16,19 @@ import {
   decodeLocalNameContent,
   decodeLocalSendResult,
   localRoomPath
-} from "./chunk-OS2JLDL7.mjs";
-import "./chunk-ZRFXZK72.mjs";
+} from "./chunk-TZKEQIHP.mjs";
+import "./chunk-OLZ62X7S.mjs";
 import "./chunk-5GLTKWJ5.mjs";
 import {
   CHANNEL_EVENT_TYPE,
   memberRenameContent
 } from "./chunk-P5CP32X2.mjs";
-import "./chunk-XEYKJMZL.mjs";
+import "./chunk-KCJFSVDN.mjs";
 import {
   LISTENING_MODE_COMMAND_TYPE
 } from "./chunk-AUJEUKVM.mjs";
 import "./chunk-SN3STAO2.mjs";
-import "./chunk-ZKDDKUUA.mjs";
+import "./chunk-PXKGKVGW.mjs";
 
 // src/local/session.ts
 import { randomUUID } from "node:crypto";

package/dist/{chunk-ENPBK5W2.mjs → chunk-7G2G4E4U.mjs}

@@ -1,19 +1,21 @@
 import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
 import {
+  listChannels,
   readCursor,
   readEntries,
   readListeningMode
-} from "./chunk-N5VYKQMR.mjs";
+} from "./chunk-T7YRVE43.mjs";
 import {
   CURSOR_WORKSPACE_ENV,
   cursorSessionId
 } from "./chunk-VUE2DDYY.mjs";
 import {
+  SESSION_ID_PATTERN,
   readJson,
   readStatus,
   sessionFiles,
   writeJsonAtomic
-} from "./chunk-XEYKJMZL.mjs";
+} from "./chunk-KCJFSVDN.mjs";
 import {
   HARNESSES
 } from "./chunk-SN3STAO2.mjs";
@@ -67,6 +69,7 @@ function channelLabel(name) {
 async function watchSession(files, io) {
   const nonce = randomUUID();
   let watcher;
+  let timer;
   let running;
   let dirty = false;
   let done = false;
@@ -79,47 +82,79 @@ async function watchSession(files, io) {
     done = true;
     code = exit;
     watcher?.close();
+    clearInterval(timer);
     finish();
   };
   const abort = () => stop();
   try {
-    const session = await readJson(files.session);
     const status = await readStatus(files);
-    if (!session || typeof session.userId !== "string" || typeof session.roomId !== "string" || !["connected", "send_failed"].includes(status?.state ?? "")) return 0;
-    const initialDelivered = (await readCursor(files)).deliveredCount;
+    const initialSession = await readJson(files.session);
+    if (!["connected", "send_failed"].includes(status?.state ?? "") || !initialSession && !(await listChannels(files)).length) return 0;
+    const initialDelivered = /* @__PURE__ */ new Map();
+    const seedBaseline = async (target, session) => {
+      initialDelivered.set(target.dir, {
+        identity: JSON.stringify([session.roomId, session.userId]),
+        cursor: await readCursor(target)
+      });
+    };
+    if (initialSession) await seedBaseline(files, initialSession);
+    for (const channel of await listChannels(files)) {
+      const session = await readJson(channel.files.session);
+      if (session) await seedBaseline(channel.files, session);
+    }
     const evaluate = async () => {
-      const owner = await readJson(path.join(files.dir, MARKER));
-      const current = await readJson(files.session);
-      const status2 = await readStatus(files);
-      if (owner?.nonce !== nonce || current?.userId !== session.userId || current?.roomId !== session.roomId || !["connected", "send_failed"].includes(status2?.state ?? "")) {
-        stop();
-        return;
-      }
-      const mode = await readListeningMode(files);
-      const entries = await readEntries(files);
-      const observed = await readJson(path.join(files.dir, OBSERVATION));
-      const position = observed?.userId === session.userId && observed?.roomId === session.roomId && Number.isSafeInteger(observed.count) && observed.count >= 0 && observed.count <= entries.length && (observed.count === 0 || entries[observed.count - 1]?.eventId === observed.lastEventId) ? observed.count : 0;
-      const fresh = entries.slice(Math.max(initialDelivered, position));
-      const latestMode = await readListeningMode(files);
-      const latestSession = await readJson(files.session);
-      const latestStatus = await readStatus(files);
-      const latestOwner = await readJson(path.join(files.dir, MARKER));
-      if (latestOwner?.nonce !== nonce || latestSession?.userId !== session.userId || latestSession?.roomId !== session.roomId || !["connected", "send_failed"].includes(latestStatus?.state ?? "")) {
+      const ownsSession = async () => {
+        const owner = await readJson(path.join(files.dir, MARKER));
+        const status2 = await readJson(files.status);
+        return owner?.nonce === nonce && !["disconnected", "closed"].includes(status2?.state ?? "");
+      };
+      if (!await ownsSession()) {
         stop();
         return;
       }
-      for (const entry of fresh) {
-        if (done || mode === "async" || latestMode === "async" || entry.kind !== "message" || entry.sender === session.userId || entry.roomId !== session.roomId) continue;
-        const mention = mentions(entry, latestStatus?.displayName);
-        io.write(`khala: 1 new message in #${channelLabel(latestStatus?.channelName ?? "channel")} (${mention ? 1 : 0} mentions you)
+      for (const channel of await listChannels(files)) {
+        const target = channel.files;
+        const session = await readJson(target.session);
+        const status2 = await readStatus(target);
+        if (!session || session.roomId !== channel.roomId || typeof session.userId !== "string" || !["connected", "send_failed"].includes(status2?.state ?? "")) continue;
+        const identity = JSON.stringify([session.roomId, session.userId]);
+        if (initialDelivered.get(target.dir)?.identity !== identity) {
+          await seedBaseline(target, session);
+        }
+        const mode = await readListeningMode(target);
+        const entries = await readEntries(target);
+        const observed = await readJson(path.join(target.dir, OBSERVATION));
+        const position = observed?.userId === session.userId && observed?.roomId === session.roomId && Number.isSafeInteger(observed.count) && observed.count >= 0 && observed.count <= entries.length && (observed.count === 0 || entries[observed.count - 1]?.eventId === observed.lastEventId) ? observed.count : 0;
+        const baseline = initialDelivered.get(target.dir).cursor;
+        const initialCount = baseline.deliveredCount === 0 || entries[baseline.deliveredCount - 1]?.eventId === baseline.lastDeliveredEventId ? baseline.deliveredCount : 0;
+        const fresh = entries.slice(Math.max(initialCount, position));
+        const latestMode = await readListeningMode(target);
+        const latestSession = await readJson(target.session);
+        const latestStatus = await readStatus(target);
+        if (!await ownsSession()) {
+          stop();
+          return;
+        }
+        if (latestSession?.userId !== session.userId || latestSession?.roomId !== session.roomId || !["connected", "send_failed"].includes(latestStatus?.state ?? "")) continue;
+        const messages = fresh.filter((entry) => entry.kind === "message" && entry.sender !== session.userId && entry.roomId === session.roomId);
+        if (!done && mode !== "async" && latestMode !== "async" && messages.length) {
+          const count = messages.filter((entry) => mentions(entry, latestStatus?.displayName)).length;
+          io.write(`khala: ${messages.length} new message${messages.length === 1 ? "" : "s"} in #${channelLabel(latestStatus?.channelName ?? channel.channelName ?? "channel")} (${count} mentions you)
 `);
+        }
+        if (position !== entries.length && !done && await ownsSession() && JSON.stringify(await readJson(target.session)) === JSON.stringify(latestSession)) {
+          try {
+            await writeJsonAtomic(path.join(target.dir, OBSERVATION), {
+              userId: session.userId,
+              roomId: session.roomId,
+              count: entries.length,
+              lastEventId: entries.at(-1)?.eventId ?? null
+            });
+          } catch (error) {
+            if (await readJson(target.session)) throw error;
+          }
+        }
       }
-      if (position !== entries.length && !done && (await readJson(path.join(files.dir, MARKER)))?.nonce === nonce) await writeJsonAtomic(path.join(files.dir, OBSERVATION), {
-        userId: session.userId,
-        roomId: session.roomId,
-        count: entries.length,
-        lastEventId: entries.at(-1)?.eventId ?? null
-      });
     };
     const notify = () => {
       if (done) return;
@@ -141,6 +176,7 @@ async function watchSession(files, io) {
       if (filename === null || [MARKER, "inbox.jsonl", "cursor.json", "mode.json", "session.json", "status.json"].includes(String(filename))) notify();
     });
     watcher.on("error", () => stop(1));
+    timer = setInterval(notify, 100);
     io.signal.addEventListener("abort", abort, { once: true });
     if (io.signal.aborted) stop();
     else notify();
@@ -148,6 +184,7 @@ async function watchSession(files, io) {
     await running;
     return code;
   } finally {
+    clearInterval(timer);
     watcher?.close();
     io.signal.removeEventListener("abort", abort);
     await fs.unlink(leaseFile(files, nonce)).catch((error) => {
@@ -155,13 +192,24 @@ async function watchSession(files, io) {
     });
   }
 }
+var WATCH_USAGE = "usage: khala watch [--harness claude|codex|cursor --session <id>]";
 async function run(argv) {
-  if (argv.length !== 0 && !(argv.length === 2 && argv[0] === "--session") && !(argv.length === 4 && argv[0] === "--harness" && argv[2] === "--session")) throw new Error("invalid_arguments");
+  if (argv.length === 1 && ["--help", "-h"].includes(argv[0])) {
+    console.log(WATCH_USAGE);
+    return 0;
+  }
+  const invalid = (reason) => {
+    console.error(`khala: ${reason}
+${WATCH_USAGE}`);
+    return 1;
+  };
+  if (argv.length !== 0 && !(argv.length === 2 && argv[0] === "--session") && !(argv.length === 4 && argv[0] === "--harness" && argv[2] === "--session")) return invalid("invalid_arguments");
   const harness = resolveHarness(argv, process.env);
-  if (harness === "invalid") throw new Error("invalid_harness");
+  if (harness === "invalid") return invalid("invalid_harness");
   const index = argv.indexOf("--session");
   const id = index === -1 ? resolveSessionId(harness, void 0, process.env) : argv[index + 1];
-  if (!id) throw new Error("session_unknown");
+  if (!id) return invalid("session_unknown");
+  if (!SESSION_ID_PATTERN.test(id)) return invalid("invalid_session_id");
   const files = sessionFiles(harness, id, process.env);
   const controller = new AbortController();
   const stop = () => controller.abort();
@@ -183,5 +231,6 @@ export {
   monitorArmed,
   mentions,
   watchSession,
+  WATCH_USAGE,
   run
 };