khala-cli 0.4.6 → 0.4.8

package/dist/{chunk-RRBIVI77.mjs → chunk-5LIE5GUU.mjs}

@@ -1,7 +1,7 @@
 import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
 import {
   bundle
-} from "./chunk-PFDUXY3N.mjs";
+} from "./chunk-APMWDF6B.mjs";
 
 // src/version.ts
 var KHALA_AGENT_VERSION = bundle?.version ?? "0.0.0";

package/dist/{chunk-6E3UCO22.mjs → chunk-5PUQT3YS.mjs}

@@ -1,23 +1,22 @@
 import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
 import {
   bundle
-} from "./chunk-PFDUXY3N.mjs";
+} from "./chunk-APMWDF6B.mjs";
 import {
+  CURSOR_WORKSPACE_ENV,
   adapterFor
-} from "./chunk-WHONG7UF.mjs";
+} from "./chunk-5BQTYU66.mjs";
+import "./chunk-VKQ3KUYO.mjs";
+import "./chunk-CBPLCCRZ.mjs";
+import "./chunk-IQJQ4RF5.mjs";
 import {
-  CURSOR_WORKSPACE_ENV
-} from "./chunk-ZHMGB3PP.mjs";
-import "./chunk-XUJIJ4KB.mjs";
-import "./chunk-DPW43YNC.mjs";
-import "./chunk-OW3DSTEZ.mjs";
-import "./chunk-AUJEUKVM.mjs";
-import "./chunk-SN3STAO2.mjs";
-import "./chunk-55KBLEX5.mjs";
+  isHarnessId
+} from "./chunk-NKX3SLS7.mjs";
+import "./chunk-7HBRFY3Z.mjs";
 
 // src/install/main.ts
 import { spawnSync } from "node:child_process";
-import * as fs2 from "node:fs/promises";
+import * as fs3 from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 
@@ -82,6 +81,35 @@ function mergeCodexHooks(config, action, hooksFragment = codexHooksFragment()) {
   return { config, warnings };
 }
 
+// src/install/mcp.ts
+var USAGE = "usage: khala install mcp --print [--harness <id>]";
+async function runMcpInstall(flags, deps) {
+  const stdout = deps.stdout ?? ((line) => {
+    process.stdout.write(line + "\n");
+  });
+  const stderr = deps.stderr ?? ((line) => {
+    process.stderr.write(line + "\n");
+  });
+  let harness = "generic";
+  let print = false;
+  for (let i = 0; i < flags.length; i++) {
+    if (flags[i] === "--print" && !print) print = true;
+    else if (flags[i] === "--harness" && isHarnessId(flags[i + 1])) harness = flags[++i];
+    else {
+      stderr(USAGE);
+      return 1;
+    }
+  }
+  if (!print) {
+    stderr(USAGE);
+    return 1;
+  }
+  const args = ["-y", "khala-cli", "mcp", "--harness", harness];
+  stdout(JSON.stringify({ mcpServers: { khala: { command: "npx", args } } }, null, 2));
+  stdout(`npx ${args.join(" ")}`);
+  return 0;
+}
+
 // src/install/cursor.ts
 import * as fs from "node:fs/promises";
 var CURSOR_HOOK_EVENTS = ["beforeSubmitPrompt", "postToolUse", "stop"];
@@ -198,9 +226,120 @@ async function installCursor(input) {
   return 0;
 }
 
+// src/install/opencode.ts
+import * as fs2 from "node:fs/promises";
+function opencodePaths(input) {
+  const { path: path2, home, env, platform } = input;
+  const configHome = env.XDG_CONFIG_HOME && path2.isAbsolute(env.XDG_CONFIG_HOME) ? env.XDG_CONFIG_HOME : path2.join(home, ".config");
+  const configDir = path2.join(configHome, "opencode");
+  const { prefix } = cursorPaths(input);
+  return {
+    configDir,
+    configFile: path2.join(configDir, "opencode.json"),
+    prefix,
+    bin: platform === "win32" ? path2.join(prefix, "khala.cmd") : path2.join(prefix, "bin", "khala")
+  };
+}
+function opencodeMcpEntry(platform, bin) {
+  return {
+    type: "local",
+    command: [...platform === "win32" ? ["cmd", "/c"] : [], bin, "mcp", "--harness", "opencode"],
+    environment: {},
+    enabled: true
+  };
+}
+var isObject2 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+var isPlugin = (spec) => spec === "khala-opencode" || spec.startsWith("khala-opencode@") || /^file:.*[/\\]khala-opencode-[^/\\]+\.tgz$/u.test(spec);
+var isMcp = (entry) => {
+  if (!isObject2(entry) || !Array.isArray(entry.command)) return false;
+  const at = entry.command.indexOf("--harness");
+  return entry.command.includes("mcp") && at >= 0 && entry.command[at + 1] === "opencode";
+};
+function mergeOpenCodeConfig(config, plugin, previousOverride) {
+  if (!isObject2(config) || config.plugin !== void 0 && (!Array.isArray(config.plugin) || config.plugin.some((p) => typeof p !== "string")) || config.mcp !== void 0 && !isObject2(config.mcp)) return { error: "invalid_config" };
+  const plugins = (config.plugin ?? []).filter((spec) => !isPlugin(spec) && spec !== previousOverride && spec !== plugin);
+  if (plugin) plugins.push(plugin);
+  const next = { ...config };
+  if (plugins.length) next.plugin = plugins;
+  else delete next.plugin;
+  if (isObject2(config.mcp) && isMcp(config.mcp.khala)) {
+    const mcp = { ...config.mcp };
+    delete mcp.khala;
+    if (Object.keys(mcp).length) next.mcp = mcp;
+    else delete next.mcp;
+  }
+  return { config: next };
+}
+async function installOpenCode(input) {
+  const { paths, uninstall, stdout, stderr } = input;
+  try {
+    await fs2.stat(paths.configFile.replace(/\.json$/u, ".jsonc"));
+    stderr(`khala: opencode.jsonc exists in ${paths.configDir}; ${uninstall ? "remove" : "merge"} the Khala config manually or convert it to opencode.json before retrying`);
+    return 1;
+  } catch (error) {
+    if (error.code !== "ENOENT") throw error;
+  }
+  let text = null;
+  try {
+    text = await fs2.readFile(paths.configFile, "utf8");
+  } catch (error) {
+    if (error.code !== "ENOENT") throw error;
+  }
+  let config;
+  try {
+    config = text?.trim() ? JSON.parse(text.replace(/^\uFEFF/u, "")) : {};
+  } catch {
+    stderr(`khala: invalid JSON in ${paths.configFile}`);
+    return 1;
+  }
+  const marker = paths.configFile + ".khala-plugin";
+  let previousOverride;
+  try {
+    previousOverride = (await fs2.readFile(marker, "utf8")).trim();
+  } catch (error) {
+    if (error.code !== "ENOENT") throw error;
+  }
+  const merged = mergeOpenCodeConfig(config, uninstall ? null : input.plugin, previousOverride ?? input.plugin ?? void 0);
+  if ("error" in merged) {
+    stderr(`khala: invalid config in ${paths.configFile}`);
+    return 1;
+  }
+  if (!uninstall && input.plugin === null) {
+    if (isObject2(config) && isObject2(config.mcp) && Object.hasOwn(config.mcp, "khala") && !isMcp(config.mcp.khala)) {
+      stderr(`khala: refusing to overwrite existing mcp.khala in ${paths.configFile}; remove or rename it before retrying`);
+      return 1;
+    }
+    merged.config.mcp = { ...merged.config.mcp, khala: opencodeMcpEntry(input.platform, paths.bin) };
+  }
+  if (!uninstall && input.install && !input.install()) return 1;
+  if (uninstall && text === null) return 0;
+  await fs2.mkdir(paths.configDir, { recursive: true });
+  if (!uninstall && text !== null) {
+    try {
+      await fs2.writeFile(paths.configFile + ".khala-bak", text, { flag: "wx" });
+    } catch (error) {
+      if (error.code !== "EEXIST") throw error;
+    }
+  }
+  const next = JSON.stringify(merged.config, null, 2) + "\n";
+  if (next !== text) await fs2.writeFile(paths.configFile, next);
+  if (uninstall || input.plugin === null) await fs2.rm(marker, { force: true });
+  else await fs2.writeFile(marker, input.plugin + "\n");
+  stdout(uninstall ? `removed the Khala plugin and MCP entry from ${paths.configFile}; delete ${paths.prefix} to remove the CLI` : input.plugin ? `configured ${paths.configFile}; restart OpenCode to load the Khala plugin` : "OpenCode installed in MCP-only mode (Async, no wake); re-run khala install opencode after updating");
+  return 0;
+}
+async function opencodePluginPublished(version, fetchRegistry = fetch) {
+  try {
+    const response = await fetchRegistry(`https://registry.npmjs.org/khala-opencode/${encodeURIComponent(version)}`, { signal: AbortSignal.timeout(3e3) });
+    return response.ok;
+  } catch {
+    return false;
+  }
+}
+
 // src/install/main.ts
 var MCP_MARKER = "# Khala MCP server, managed by `khala install codex`";
-var USAGE = "usage: khala install codex [--codex-home <dir>] [--uninstall] | khala install cursor [--uninstall]";
+var USAGE2 = "usage: khala install codex [--codex-home <dir>] [--uninstall] | khala install cursor [--uninstall] | khala install opencode [--uninstall] | khala install mcp --print [--harness <id>]";
 async function runCursorInstall(flags, deps) {
   const env = deps.env ?? process.env;
   const stdout = deps.stdout ?? ((line) => {
@@ -213,7 +352,7 @@ async function runCursorInstall(flags, deps) {
   for (const flag of flags) {
     if (flag === "--uninstall") uninstall = true;
     else {
-      stderr(USAGE);
+      stderr(USAGE2);
       return 1;
     }
   }
@@ -242,6 +381,45 @@ async function runCursorInstall(flags, deps) {
     }
   });
 }
+async function runOpenCodeInstall(flags, deps) {
+  const env = deps.env ?? process.env;
+  const stdout = deps.stdout ?? ((line) => {
+    process.stdout.write(line + "\n");
+  });
+  const stderr = deps.stderr ?? ((line) => {
+    process.stderr.write(line + "\n");
+  });
+  if (flags.some((flag) => flag !== "--uninstall")) {
+    stderr(USAGE2);
+    return 1;
+  }
+  const uninstall = flags.includes("--uninstall");
+  const pkg = "package" in deps ? deps.package : bundle;
+  if (!pkg && !uninstall) {
+    stderr("khala: install runs from the published package (npx -y khala-cli install opencode)");
+    return 1;
+  }
+  const platform = deps.platform ?? process.platform;
+  const home = deps.home ?? (platform === "win32" ? env.USERPROFILE || os.homedir() : env.HOME || os.homedir());
+  const paths = opencodePaths({ platform, path: platform === "win32" ? path.win32 : path.posix, home, env });
+  const spec = pkg ? env.KHALA_INSTALL_SPEC || `${pkg.name}@${pkg.version}` : "";
+  const override = env.KHALA_OPENCODE_PLUGIN_SPEC;
+  const plugin = uninstall ? null : override || (await opencodePluginPublished(pkg.version, deps.fetchRegistry) ? `khala-opencode@${pkg.version}` : null);
+  return installOpenCode({
+    paths,
+    platform,
+    uninstall,
+    stdout,
+    stderr,
+    plugin,
+    install: () => {
+      stdout(`installing ${spec} into ${paths.prefix}`);
+      if ((deps.npmInstall ?? defaultNpmInstall)(paths.prefix, spec)) return true;
+      stderr("khala: npm install failed for " + spec);
+      return false;
+    }
+  });
+}
 function shellQuote(value) {
   return /^[A-Za-z0-9_./-]+$/u.test(value) ? value : `'${value.replaceAll("'", `'\\''`)}'`;
 }
@@ -281,7 +459,7 @@ function codexMcpBlock(bin, env) {
 }
 async function readOr(file, fallback) {
   try {
-    return { text: await fs2.readFile(file, "utf8"), mode: (await fs2.stat(file)).mode & 511 };
+    return { text: await fs3.readFile(file, "utf8"), mode: (await fs3.stat(file)).mode & 511 };
   } catch (error) {
     if (error.code === "ENOENT") return { text: fallback, mode: 384 };
     throw error;
@@ -301,7 +479,7 @@ async function runCodexInstall(flags, deps) {
     if (flags[i] === "--uninstall") uninstall = true;
     else if (flags[i] === "--codex-home" && flags[i + 1]) codexHome = path.resolve(flags[++i]);
     else {
-      stderr(USAGE);
+      stderr(USAGE2);
       return 1;
     }
   }
@@ -345,17 +523,17 @@ async function runCodexInstall(flags, deps) {
       return 1;
     }
   }
-  await fs2.mkdir(codexHome, { recursive: true });
+  await fs3.mkdir(codexHome, { recursive: true });
   if (!uninstall) {
     try {
-      await fs2.writeFile(hooksFile + ".khala-bak", hooks.text, { flag: "wx", mode: hooks.mode });
+      await fs3.writeFile(hooksFile + ".khala-bak", hooks.text, { flag: "wx", mode: hooks.mode });
     } catch (error) {
       if (error.code !== "EEXIST") throw error;
     }
   }
   for (const warning of merged.warnings) stderr(warning);
-  await fs2.writeFile(hooksFile, JSON.stringify(merged.config, null, 2) + "\n", { mode: hooks.mode });
-  await fs2.writeFile(tomlFile, nextToml.text, { mode: toml.mode });
+  await fs3.writeFile(hooksFile, JSON.stringify(merged.config, null, 2) + "\n", { mode: hooks.mode });
+  await fs3.writeFile(tomlFile, nextToml.text, { mode: toml.mode });
   if (uninstall) {
     stdout(`removed the Khala MCP server and hooks from ${codexHome}; delete ${prefix} to remove the CLI`);
   } else {
@@ -366,12 +544,13 @@ async function runCodexInstall(flags, deps) {
 }
 async function runInstall(argv, deps = {}) {
   const [target = "", ...flags] = argv;
+  if (target === "mcp") return runMcpInstall(flags, deps);
   const adapter = adapterFor(target);
   const run = adapter?.install;
   if (run) return run(flags, deps);
   (deps.stderr ?? ((line) => {
     process.stderr.write(line + "\n");
-  }))(USAGE);
+  }))(USAGE2);
   return 1;
 }
 async function main(argv) {
@@ -384,6 +563,7 @@ export {
   runCodexInstall,
   runCursorInstall,
   runInstall,
+  runOpenCodeInstall,
   shellQuote,
   updateCodexToml
 };

package/dist/{chunk-55KBLEX5.mjs → chunk-7HBRFY3Z.mjs}

@@ -1,7 +1,7 @@
 import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
 
 // <define:__KHALA_BUNDLE__>
-var define_KHALA_BUNDLE_default = { name: "khala-cli", version: "0.4.6" };
+var define_KHALA_BUNDLE_default = { name: "khala-cli", version: "0.4.8" };
 
 export {
   define_KHALA_BUNDLE_default

package/dist/{chunk-PFDUXY3N.mjs → chunk-APMWDF6B.mjs}

@@ -1,7 +1,7 @@
 import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
 import {
   define_KHALA_BUNDLE_default
-} from "./chunk-55KBLEX5.mjs";
+} from "./chunk-7HBRFY3Z.mjs";
 
 // src/bundle.ts
 var bundle = typeof define_KHALA_BUNDLE_default === "undefined" ? void 0 : define_KHALA_BUNDLE_default;

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

@@ -1,10 +1,22 @@
 import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
-import "./chunk-55KBLEX5.mjs";
+import {
+  sessionStartWakeChannels
+} from "./chunk-FV32AQTC.mjs";
+import {
+  adapterFor
+} from "./chunk-5BQTYU66.mjs";
+import "./chunk-VKQ3KUYO.mjs";
+import {
+  filesForDir,
+  resolveStateDir
+} from "./chunk-CBPLCCRZ.mjs";
+import "./chunk-IQJQ4RF5.mjs";
+import "./chunk-NKX3SLS7.mjs";
+import "./chunk-7HBRFY3Z.mjs";
 
 // hooks/claude-wake.ts
 import fs from "node:fs/promises";
 import path from "node:path";
-import os from "node:os";
 import { randomBytes } from "node:crypto";
 import { setTimeout as sleep } from "node:timers/promises";
 var NOTICE = "Khala: new channel messages. They arrive in the next hook context.\n";
@@ -73,20 +85,38 @@ function parentAlive(parent) {
 }
 async function watch(stdin, _argv, io = { stderr: process.stderr, env: process.env, now: () => /* @__PURE__ */ new Date() }) {
   let temporary;
+  let finish;
+  let state = "exited";
   try {
     const parent = process.ppid;
     const input = JSON.parse(stdin);
-    if (input?.hook_event_name !== "Stop" || typeof input.session_id !== "string" || !/^[A-Za-z0-9][A-Za-z0-9._:-]{0,127}$/.test(input.session_id)) return 0;
-    const root = io.env.XDG_STATE_HOME && path.isAbsolute(io.env.XDG_STATE_HOME) ? io.env.XDG_STATE_HOME : path.join(io.env.HOME ?? os.homedir(), ".local/state");
-    const dir = path.join(root, "khala", "claude", input.session_id);
+    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;
+    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") {
+      if (io.env.CLAUDE_CODE_ENTRYPOINT !== "cli" || !["startup", "resume"].includes(input.source)) return 0;
+      const files = filesForDir(dir);
+      if (!(await sessionStartWakeChannels(files, io.env)).length) return 0;
+    }
     const nonce = randomBytes(6).toString("hex");
     const owner = path.join(dir, "watcher.json");
     temporary = path.join(dir, `.watcher-${nonce}.tmp`);
     const started = io.now();
-    await fs.writeFile(temporary, JSON.stringify({ nonce, armedAt: started.toISOString() }) + "\n", { mode: 384, flag: "wx" });
+    const record = { nonce, armedAt: started.toISOString(), pid: process.pid, parentPid: parent, state: "armed" };
+    await fs.writeFile(temporary, JSON.stringify(record) + "\n", { mode: 384, flag: "wx" });
     await fs.rename(temporary, owner);
     temporary = void 0;
+    finish = async () => {
+      const file = await fs.open(owner, "r+");
+      try {
+        if (JSON.parse(await file.readFile("utf8")).nonce !== nonce) return;
+        const body = JSON.stringify({ ...record, state }) + "\n";
+        await file.write(body, 0, "utf8");
+        await file.truncate(Buffer.byteLength(body));
+      } finally {
+        await file.close();
+      }
+    };
     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;
@@ -94,18 +124,35 @@ async function watch(stdin, _argv, io = { stderr: process.stderr, env: process.e
       const activity = await readJson(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);
+      }
+      return messages;
+    };
     while (io.now().getTime() < deadline) {
       if (!await owns() || !parentAlive(parent)) return 0;
-      if (await idle() && await unreadMessages(dir) > 0) {
-        if (await unreadMessages(dir) > 0 && await idle() && await owns() && parentAlive(parent) && io.now().getTime() < deadline) {
+      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) {
           io.stderr.write(NOTICE);
+          state = "woke";
           return 2;
         }
       }
       await sleep(Math.min(poll, Math.max(0, deadline - io.now().getTime())));
     }
+    state = "expired";
   } catch {
   } finally {
+    if (finish) {
+      try {
+        await finish();
+      } catch {
+      }
+    }
     if (temporary) {
       try {
         await fs.unlink(temporary);

package/dist/{chunk-OW3DSTEZ.mjs → chunk-CBPLCCRZ.mjs}

@@ -1,7 +1,7 @@
 import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
 import {
-  HARNESSES
-} from "./chunk-SN3STAO2.mjs";
+  isHarnessId
+} from "./chunk-NKX3SLS7.mjs";
 
 // src/state.ts
 import { constants } from "node:fs";
@@ -71,7 +71,7 @@ async function removeJoinFile(files, link) {
   }
 }
 function sessionFiles(harness, sessionId, env) {
-  if (!HARNESSES.includes(harness) || !SESSION_ID_PATTERN.test(sessionId)) throw new StateError("invalid_session_id");
+  if (!isHarnessId(harness) || !SESSION_ID_PATTERN.test(sessionId)) throw new StateError("invalid_session_id");
   return filesForDir(path.join(stateRoot(env), harness, sessionId));
 }
 function resolveStateDir(harness, sessionId, env) {
@@ -80,9 +80,9 @@ function resolveStateDir(harness, sessionId, env) {
 async function ensureStateDir(dir) {
   try {
     let sessionDir = dir;
-    if (path.basename(path.dirname(dir)) === "channels" && /^[a-f0-9]{24}$/.test(path.basename(dir)) && HARNESSES.includes(path.basename(path.dirname(path.dirname(path.dirname(dir)))))) {
+    if (path.basename(path.dirname(dir)) === "channels" && /^[a-f0-9]{24}$/.test(path.basename(dir)) && isHarnessId(path.basename(path.dirname(path.dirname(path.dirname(dir))))) && path.basename(path.dirname(path.dirname(path.dirname(path.dirname(dir))))) === "khala") {
       sessionDir = path.dirname(path.dirname(dir));
-    } else if (["channels", "joins"].includes(path.basename(dir)) && HARNESSES.includes(path.basename(path.dirname(path.dirname(dir))))) {
+    } else if (["channels", "joins"].includes(path.basename(dir)) && isHarnessId(path.basename(path.dirname(path.dirname(dir)))) && path.basename(path.dirname(path.dirname(path.dirname(dir)))) === "khala") {
       sessionDir = path.dirname(dir);
     }
     const directories = [path.dirname(path.dirname(sessionDir)), path.dirname(sessionDir), sessionDir];

package/dist/{chunk-JG5J3SHW.mjs → chunk-CJTCU755.mjs}

@@ -4,14 +4,14 @@ import {
   CHANNEL_EVENT_TYPE,
   encodeChannelEvent,
   memberRenameContent
-} from "./chunk-P5CP32X2.mjs";
+} from "./chunk-54XFVSEC.mjs";
 import {
   LISTENING_MODE_COMMAND_TYPE,
   LISTENING_MODE_MEMBER_KEY,
   memberListeningMode
-} from "./chunk-AUJEUKVM.mjs";
-import "./chunk-SN3STAO2.mjs";
-import "./chunk-55KBLEX5.mjs";
+} from "./chunk-IQJQ4RF5.mjs";
+import "./chunk-NKX3SLS7.mjs";
+import "./chunk-7HBRFY3Z.mjs";
 
 // src/matrix/session.ts
 import { createClient, ClientEvent, RoomEvent, MatrixEventEvent, SyncState, Direction, Method, EventType } from "matrix-js-sdk";

package/dist/{chunk-AWBKVTLV.mjs → chunk-FH34B3I3.mjs}

@@ -1,22 +1,21 @@
 import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
 import {
-  adapterFor
-} from "./chunk-WHONG7UF.mjs";
-import {
-  readListeningMode
-} from "./chunk-ZHMGB3PP.mjs";
+  adapterFor,
+  readListeningMode,
+  resolveSources
+} from "./chunk-5BQTYU66.mjs";
 import {
   listChannels,
   readCursor,
   readEntries
-} from "./chunk-XUJIJ4KB.mjs";
+} from "./chunk-VKQ3KUYO.mjs";
 import {
   SESSION_ID_PATTERN,
   readJson,
   readStatus,
   sessionFiles,
   writeJsonAtomic
-} from "./chunk-OW3DSTEZ.mjs";
+} from "./chunk-CBPLCCRZ.mjs";
 
 // src/watch.ts
 import * as fs from "node:fs/promises";
@@ -35,13 +34,11 @@ function resolveHarness(argv, env) {
   if (isHarness(env.KHALA_MCP_HARNESS)) return env.KHALA_MCP_HARNESS;
   return env.CLAUDE_CODE_SESSION_ID !== void 0 ? "claude" : "codex";
 }
-function resolveSessionId(harness, meta, env) {
-  let value;
-  for (const source of adapterFor(harness)?.sessionSources ?? []) {
-    value = source(meta, env);
-    if (value !== void 0 && value !== null) break;
-  }
-  return typeof value === "string" && value.match(/^[A-Za-z0-9][A-Za-z0-9._:-]{0,127}$/)?.[0] === value ? value : null;
+async function resolveSession(harness, meta, env, context = {}) {
+  return resolveSources(adapterFor(harness)?.sessionSources ?? [], meta, env, { ...context, harness });
+}
+async function resolveSessionId(harness, meta, env) {
+  return (await resolveSession(harness, meta, env))?.sessionId ?? null;
 }
 
 // src/watch.ts
@@ -207,9 +204,9 @@ ${WATCH_USAGE}`);
   };
   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") return invalid("invalid_harness");
+  if (harness === "invalid" || !adapterFor(harness)?.codec) return invalid("invalid_harness");
   const index = argv.indexOf("--session");
-  const id = index === -1 ? resolveSessionId(harness, void 0, process.env) : argv[index + 1];
+  const id = index === -1 ? await resolveSessionId(harness, void 0, process.env) : argv[index + 1];
   if (!id) return invalid("session_unknown");
   if (!SESSION_ID_PATTERN.test(id)) return invalid("invalid_session_id");
   const files = sessionFiles(harness, id, process.env);
@@ -229,7 +226,7 @@ ${WATCH_USAGE}`);
 
 export {
   resolveHarness,
-  resolveSessionId,
+  resolveSession,
   monitorArmed,
   mentions,
   watchSession,

package/dist/chunk-FV32AQTC.mjs

@@ -0,0 +1,40 @@
+import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
+import {
+  listChannels
+} from "./chunk-VKQ3KUYO.mjs";
+import {
+  TERMINAL_SESSION_DETAILS,
+  readStateFile,
+  readStatus
+} from "./chunk-CBPLCCRZ.mjs";
+import {
+  validAgentRejoinSecret
+} from "./chunk-NKX3SLS7.mjs";
+
+// src/session-start-wake.ts
+import { createHash } from "node:crypto";
+import path from "node:path";
+async function sessionStartWakeChannels(files, env) {
+  const channels = await listChannels(files);
+  const secret = (await readStateFile(files.dir, "rejoin.json"))?.secret;
+  const hash = validAgentRejoinSecret(secret) ? createHash("sha256").update(secret).digest("hex") : void 0;
+  const candidates = channels.length ? channels : [{ files, roomId: void 0 }];
+  const result = [];
+  for (const channel of candidates) {
+    const status = await readStatus(channel.files);
+    if (TERMINAL_SESSION_DETAILS.some((detail) => detail === status?.detail)) continue;
+    if (status?.state === "connected" || status?.state === "send_failed") {
+      result.push({ files: channel.files, connected: true });
+      continue;
+    }
+    if (!channel.roomId || !hash || !["joining", "disconnected"].includes(status?.state ?? "")) continue;
+    const authorization = await readStateFile(channel.files.dir, "resume.json");
+    if (!authorization || authorization.roomId !== channel.roomId || authorization.workspace !== path.resolve(env.PWD ?? process.cwd()) || authorization.secretHash !== hash || typeof authorization.link !== "string" || typeof authorization.label !== "string" || authorization.localCredentials && (authorization.localCredentials.transport !== "local" || authorization.localCredentials.roomId !== channel.roomId)) continue;
+    result.push({ files: channel.files, connected: false });
+  }
+  return result;
+}
+
+export {
+  sessionStartWakeChannels
+};