khala-cli 0.4.8 → 0.4.10

package/dist/{chunk-BKLW2SPG.mjs → chunk-VAC3JTAV.mjs}

@@ -1,20 +1,33 @@
 import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
 import {
   sessionStartWakeChannels
-} from "./chunk-FV32AQTC.mjs";
+} from "./chunk-4BZQ4GVW.mjs";
 import {
   adapterFor
-} from "./chunk-5BQTYU66.mjs";
-import "./chunk-VKQ3KUYO.mjs";
+} from "./chunk-5JSGA6OB.mjs";
+import "./chunk-6AQVW5W7.mjs";
+import {
+  driverAllowed,
+  readListeningMode
+} from "./chunk-2AMWQ7RB.mjs";
+import "./chunk-4BP7V3OP.mjs";
+import {
+  wakesAgent
+} from "./chunk-OEV5DFLW.mjs";
+import "./chunk-JKOJQTFT.mjs";
 import {
   filesForDir,
-  resolveStateDir
-} from "./chunk-CBPLCCRZ.mjs";
-import "./chunk-IQJQ4RF5.mjs";
-import "./chunk-NKX3SLS7.mjs";
-import "./chunk-7HBRFY3Z.mjs";
+  readJson,
+  resolveStateDir,
+  stateRoot
+} from "./chunk-PN25BUQ4.mjs";
+import "./chunk-ZSKLNZWZ.mjs";
+import {
+  init_define_KHALA_BUNDLE
+} from "./chunk-EVT2DWNZ.mjs";
 
 // hooks/claude-wake.ts
+init_define_KHALA_BUNDLE();
 import fs from "node:fs/promises";
 import path from "node:path";
 import { randomBytes } from "node:crypto";
@@ -22,7 +35,7 @@ import { setTimeout as sleep } from "node:timers/promises";
 var NOTICE = "Khala: new channel messages. They arrive in the next hook context.\n";
 var DEADLINE_MS = 24 * 60 * 60 * 1e3;
 var POLL_MS = 500;
-async function readJson(file) {
+async function readJson2(file) {
   try {
     return JSON.parse(await fs.readFile(file, "utf8"));
   } catch (error) {
@@ -31,7 +44,10 @@ async function readJson(file) {
   }
 }
 async function unreadChannelMessages(dir) {
-  const cursor = await readJson(path.join(dir, "cursor.json"));
+  const files = filesForDir(dir);
+  const mode = await readListeningMode(files);
+  const you = (await readJson(files.status))?.displayName;
+  const cursor = await readJson2(path.join(dir, "cursor.json"));
   const delivered = cursor && (cursor.lastDeliveredEventId === null || typeof cursor.lastDeliveredEventId === "string") && Number.isSafeInteger(cursor.deliveredCount) && typeof cursor.deliveredCount === "number" && cursor.deliveredCount >= 0 ? cursor.deliveredCount : 0;
   let content;
   try {
@@ -49,7 +65,7 @@ async function unreadChannelMessages(dir) {
       continue;
     }
     if (!entry || !["eventId", "roomId", "ts", "sender", "senderLabel", "body"].every((key) => typeof entry[key] === "string") || !["human", "agent", "unknown"].includes(entry.senderKind) || !["message", "event"].includes(entry.kind)) continue;
-    if (index++ >= delivered && entry.kind === "message") messages++;
+    if (index++ >= delivered && wakesAgent(entry, mode, you)) messages++;
   }
   return messages;
 }
@@ -64,7 +80,7 @@ async function unreadMessages(dir) {
   }
   let messages = 0;
   for (const directory of directories) {
-    if ((await readJson(path.join(directory, "mode.json")))?.mode === "async") continue;
+    if ((await readJson2(path.join(directory, "mode.json")))?.mode === "async") continue;
     messages += await unreadChannelMessages(directory);
   }
   return messages;
@@ -91,6 +107,7 @@ async function watch(stdin, _argv, io = { stderr: process.stderr, env: process.e
     const parent = process.ppid;
     const input = JSON.parse(stdin);
     if (!["Stop", "SessionStart"].includes(input?.hook_event_name) || typeof input.session_id !== "string" || !/^[A-Za-z0-9][A-Za-z0-9._:-]{0,127}$/.test(input.session_id)) return 0;
+    if (!await driverAllowed(stateRoot(io.env), "claude", "watcher", false)) return 0;
     const dir = resolveStateDir(adapterFor("claude").id, input.session_id, io.env);
     if (!(await fs.stat(dir)).isDirectory()) return 0;
     if (input.hook_event_name === "SessionStart") {
@@ -119,24 +136,24 @@ async function watch(stdin, _argv, io = { stderr: process.stderr, env: process.e
     };
     const deadline = started.getTime() + testDuration(io.env.KHALA_WAKE_TEST_DEADLINE_MS, DEADLINE_MS);
     const poll = testDuration(io.env.KHALA_WAKE_TEST_POLL_MS, POLL_MS);
-    const owns = async () => (await readJson(owner))?.nonce === nonce;
+    const owns = async () => (await readJson2(owner))?.nonce === nonce;
     const idle = async () => {
-      const activity = await readJson(path.join(dir, "activity.json"));
+      const activity = await readJson2(path.join(dir, "activity.json"));
       return activity?.state === "idle" && typeof activity.updatedAt === "string" && Number.isFinite(Date.parse(activity.updatedAt));
     };
     const unread = async () => {
       if (input.hook_event_name !== "SessionStart") return unreadMessages(dir);
       let messages = 0;
       for (const channel of await sessionStartWakeChannels(filesForDir(dir), io.env)) {
-        if (channel.connected && (await readJson(channel.files.mode))?.mode !== "async") messages += await unreadChannelMessages(channel.files.dir);
+        if (channel.connected && (await readJson2(channel.files.mode))?.mode !== "async") messages += await unreadChannelMessages(channel.files.dir);
       }
       return messages;
     };
     while (io.now().getTime() < deadline) {
-      if (!await owns() || !parentAlive(parent)) return 0;
+      if (!await driverAllowed(stateRoot(io.env), "claude", "watcher", false) || !await owns() || !parentAlive(parent)) return 0;
       if (input.hook_event_name === "SessionStart" && !(await sessionStartWakeChannels(filesForDir(dir), io.env)).length) return 0;
       if (await idle() && await unread() > 0) {
-        if (await unread() > 0 && await idle() && await owns() && parentAlive(parent) && io.now().getTime() < deadline) {
+        if (await driverAllowed(stateRoot(io.env), "claude", "watcher", false) && await unread() > 0 && await idle() && await owns() && parentAlive(parent) && io.now().getTime() < deadline) {
           io.stderr.write(NOTICE);
           state = "woke";
           return 2;

package/dist/{chunk-VAI7IUI4.mjs → chunk-VDZK4LW3.mjs}

@@ -4,20 +4,22 @@ import {
   checkName,
   isDefaultAgentName,
   restartHelper
-} from "./chunk-2DHIAFEV.mjs";
+} from "./chunk-SRZTHCXP.mjs";
 import {
   StateError,
+  harnessInfo,
+  isHarnessId,
   readJson,
   stateRoot,
+  validateAgentName,
   writeJsonAtomic
-} from "./chunk-CBPLCCRZ.mjs";
+} from "./chunk-PN25BUQ4.mjs";
 import {
-  harnessInfo,
-  isHarnessId,
-  validateAgentName
-} from "./chunk-NKX3SLS7.mjs";
+  init_define_KHALA_BUNDLE
+} from "./chunk-EVT2DWNZ.mjs";
 
 // src/local/identity.ts
+init_define_KHALA_BUNDLE();
 import * as fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
@@ -76,6 +78,7 @@ async function resolveLocalOwnerName(env = process.env) {
 }
 
 // src/join.ts
+init_define_KHALA_BUNDLE();
 function parseChannelLink(link) {
   try {
     const url = new URL(link);
@@ -285,12 +288,27 @@ async function pollUntilDeadline(input, options) {
   }
 }
 async function reportReady(input, deps = {}) {
-  const response = await post(endpoint(input, "/api/agent/join/ready"), input.origin, {}, deps, input.pollSecret);
-  if (response.status === 204) return;
-  const code = serverCode(await json(response));
-  if (response.status === 404) fail("ready_not_found");
-  if (response.status === 409) fail("not_confirmed");
-  gatewayError(response.status, code);
+  const now = deps.now ?? Date.now;
+  const deadline = now() + (deps.timeoutMs ?? 12e4);
+  for (let delay = 1e3; ; delay = Math.min(delay * 2, 15e3)) {
+    const response = await post(endpoint(input, "/api/agent/join/ready"), input.origin, {}, deps, input.pollSecret);
+    if (response.status === 204) return;
+    const code = serverCode(await json(response));
+    if ((response.status === 429 || response.status === 503 && code === "unavailable") && now() + delay <= deadline) {
+      try {
+        await (deps.sleep ?? sleep)(delay, deps.signal);
+      } catch {
+        fail("network");
+      }
+      continue;
+    }
+    readyError(response.status, code);
+  }
+}
+function readyError(status, code) {
+  if (status === 404) fail("ready_not_found");
+  if (status === 409) fail("not_confirmed");
+  gatewayError(status, code);
   fail("protocol");
 }