khala-cli 0.4.7 → 0.4.8

package/README.md

@@ -1,6 +1,6 @@
 # khala-cli
 
-The `khala` command connects your existing Claude Code, Codex or Cursor session to a
+The `khala` command connects your existing Claude Code, Codex, Cursor or OpenCode session to a
 [Khala](https://khala.aiur.team) channel: an MCP server (`khala_join`, `khala_status`,
 `khala_read`, `khala_send`, `khala_event`), delivery hooks that bring channel messages into
 the session, and local channels on this computer. Requires Node 22 or newer.
@@ -40,6 +40,23 @@ under Settings → MCP). Undo with `npx -y khala-cli install cursor --uninstall`
 cannot wake an idle chat; new messages arrive when a chat finishes a turn (Sync) or after a
 tool call (Steer).
 
+## OpenCode
+
+```sh
+npx -y khala-cli install opencode
+```
+
+This installs a stable CLI and, when published on npm, pins `khala-opencode` at the same version in the global
+`~/.config/opencode/opencode.json` (or under `XDG_CONFIG_HOME`). The plugin registers
+Khala's MCP server. If the version is unpublished or the registry check fails, it configures
+MCP-only mode (Async, no wake); re-run `khala install opencode` after updating. Existing
+`opencode.jsonc` files require a manual merge or conversion to JSON before retrying. Restart OpenCode after installation. Existing settings and sibling
+plugins are preserved. Undo with `npx -y khala-cli install opencode --uninstall`.
+
+For unpublished-build testing only, `KHALA_INSTALL_SPEC` selects a CLI tarball and
+`KHALA_OPENCODE_PLUGIN_SPEC` forces plugin mode with a spec such as
+`file:/tmp/khala-opencode-0.1.0.tgz`.
+
 ## Then
 
 Tell your agent "Join this Khala channel: <link>" and open the confirmation link it returns.

package/dist/{chunk-25AX7UMF.mjs → chunk-2DHIAFEV.mjs}

@@ -1,19 +1,19 @@
 import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
 import {
   KHALA_AGENT_VERSION
-} from "./chunk-YIHRHD7W.mjs";
+} from "./chunk-5LIE5GUU.mjs";
 import {
   bundle
-} from "./chunk-SU6362YU.mjs";
+} from "./chunk-APMWDF6B.mjs";
 import {
   StateError,
   ensureStateDir,
   readJson,
   stateRoot
-} from "./chunk-WNOIHCCC.mjs";
+} from "./chunk-CBPLCCRZ.mjs";
 import {
   LISTENING_MODES
-} from "./chunk-3OFKVYOX.mjs";
+} from "./chunk-IQJQ4RF5.mjs";
 import {
   HARNESS_REGISTRY,
   M1_LABEL_MAX_BYTES,
@@ -37,7 +37,7 @@ import {
   utcTimestamp,
   utf8Length,
   version
-} from "./chunk-U3MKSPRO.mjs";
+} from "./chunk-NKX3SLS7.mjs";
 
 // src/client.ts
 var KhalaClientError = class extends Error {

package/dist/{chunk-OAFYPBCP.mjs → chunk-2VCAW4GH.mjs}

@@ -2,7 +2,7 @@ import { createRequire as __khalaCreateRequire } from 'node:module'; const requi
 import {
   decodeChannelEvent,
   formatChannelEventLine
-} from "./chunk-LNG3ZZBK.mjs";
+} from "./chunk-54XFVSEC.mjs";
 
 // src/events/receive.ts
 function toEventInboxEntry(base, rawContent) {

package/dist/{chunk-LNG3ZZBK.mjs → chunk-54XFVSEC.mjs}

@@ -9,7 +9,7 @@ import {
   utcTimestamp,
   utf8Length,
   version
-} from "./chunk-U3MKSPRO.mjs";
+} from "./chunk-NKX3SLS7.mjs";
 
 // ../contracts/src/m1/channel-event.ts
 var CHANNEL_EVENT_TYPE = "com.khala.event.v1";

package/dist/{chunk-JEI32DEA.mjs → chunk-5BQTYU66.mjs}

@@ -2,23 +2,26 @@ import { createRequire as __khalaCreateRequire } from 'node:module'; const requi
 import {
   advanceCursor,
   listChannels,
+  readActivity,
   readCursor,
   unread
-} from "./chunk-OP2HZ7EM.mjs";
+} from "./chunk-VKQ3KUYO.mjs";
 import {
   SESSION_ID_PATTERN,
   StateError,
+  ensureStateDir,
   readJson,
   stateRoot,
   writeJsonAtomic
-} from "./chunk-WNOIHCCC.mjs";
+} from "./chunk-CBPLCCRZ.mjs";
 import {
   DEFAULT_LISTENING_MODE,
   decodeListeningMode
-} from "./chunk-3OFKVYOX.mjs";
+} from "./chunk-IQJQ4RF5.mjs";
 import {
-  HARNESS_REGISTRY
-} from "./chunk-U3MKSPRO.mjs";
+  HARNESS_REGISTRY,
+  isHarnessId
+} from "./chunk-NKX3SLS7.mjs";
 
 // src/mode.ts
 async function readListeningMode(files) {
@@ -88,8 +91,8 @@ function wakeLine(nonce) {
 }
 
 // src/wake/idle-wake.ts
-function codexIdleWakeArgv(sessionId) {
-  return ["queue", "--thread", sessionId, "--message", CODEX_IDLE_WAKE_NOTICE];
+function codexIdleWakeArgv(sessionId, line) {
+  return ["queue", "--thread", sessionId, "--message", line];
 }
 
 // src/wake/idle-wake-process.ts
@@ -159,21 +162,57 @@ function createCodexQueueProcessPort(deps) {
   };
 }
 
-// src/wake/ladder.ts
-import path4 from "node:path";
-
-// src/activity.ts
+// src/wake/codex-probe.ts
+import { execFile } from "node:child_process";
+import { access, realpath, stat } from "node:fs/promises";
+import { constants } from "node:fs";
 import path from "node:path";
-async function readActivity(files) {
-  const activity = await readJson(path.join(files.dir, "activity.json"));
-  return activity && ["idle", "busy"].includes(activity.state) && typeof activity.updatedAt === "string" && Number.isFinite(Date.parse(activity.updatedAt)) ? activity : { state: "busy", updatedAt: (/* @__PURE__ */ new Date(0)).toISOString() };
-}
-async function writeActivity(files, state, now = () => /* @__PURE__ */ new Date()) {
-  const activity = { state, updatedAt: now().toISOString() };
-  await writeJsonAtomic(path.join(files.dir, "activity.json"), activity);
-  return activity;
+import { promisify } from "node:util";
+var execute = promisify(execFile);
+var probes = /* @__PURE__ */ new Map();
+async function probeCodexQueue(env) {
+  let command;
+  for (const dir of (env.PATH ?? "").split(path.delimiter).filter(Boolean)) {
+    try {
+      const candidate = path.join(dir, process.platform === "win32" ? "codex.exe" : "codex");
+      await access(candidate, constants.X_OK);
+      if (!(await stat(candidate)).isFile()) continue;
+      command = await realpath(candidate);
+      break;
+    } catch {
+    }
+  }
+  if (!command) return { available: false, reason: "codex_binary_missing" };
+  let mtime;
+  try {
+    mtime = (await stat(command)).mtimeMs;
+  } catch {
+    return { available: false, reason: "codex_binary_missing" };
+  }
+  const cached = probes.get(command);
+  if (cached?.mtime === mtime) return cached.result;
+  const binary = command;
+  const result = (async () => {
+    try {
+      const { stdout } = await execute(binary, ["queue", "--help"], {
+        env: scrubbedQueueEnv(env),
+        timeout: 5e3,
+        killSignal: "SIGKILL",
+        maxBuffer: 64 * 1024,
+        windowsHide: true
+      });
+      return /--thread\b/.test(stdout) && /--message\b/.test(stdout) ? { available: true, command: binary } : { available: false, reason: "codex_queue_unavailable" };
+    } catch {
+      return { available: false, reason: "codex_queue_unavailable" };
+    }
+  })();
+  probes.set(binary, { mtime, result });
+  return result;
 }
 
+// src/wake/ladder.ts
+import path4 from "node:path";
+
 // src/wake/shared/settings.ts
 import * as fs from "node:fs/promises";
 import path2 from "node:path";
@@ -499,18 +538,20 @@ function createCodexWakeDriver(deps = {}) {
     optIn: false,
     minIdleMs: 0,
     deadlineMs: 3e4,
-    // U13 introduces the nonce-bearing argv. Preserve U2 queue goldens until then.
-    verification: "none",
-    available: () => true,
-    async wake(ctx) {
-      const port = deps.port ?? createCodexQueueProcessPort({ command: "codex", env: ctx.env });
-      const outcome = await port.run(codexIdleWakeArgv(ctx.sessionId), ctx.signal);
+    verification: "nonce",
+    available: async (ctx) => (await (deps.probe ?? probeCodexQueue)(ctx.env)).available,
+    unavailableReason: async (ctx) => (await (deps.probe ?? probeCodexQueue)(ctx.env)).reason,
+    async wake(ctx, line) {
+      const probe = await (deps.probe ?? probeCodexQueue)(ctx.env);
+      if (!probe.available || ctx.signal.aborted) return;
+      const port = deps.port ?? createCodexQueueProcessPort({ command: probe.command, env: ctx.env });
+      const outcome = await port.run(codexIdleWakeArgv(ctx.sessionId, line), ctx.signal);
       if (outcome.status !== "queued") {
-        const line = JSON.stringify({ ok: false, warning: "codex_queue_failed", status: outcome.status }) + "\n";
+        const line2 = JSON.stringify({ ok: false, warning: "codex_queue_failed", status: outcome.status }) + "\n";
         try {
           (deps.stderr ?? ((value) => {
             process.stderr.write(value);
-          }))(line);
+          }))(line2);
         } catch {
         }
       }
@@ -520,7 +561,7 @@ function createCodexWakeDriver(deps = {}) {
 var codexWakeDriver = createCodexWakeDriver();
 
 // src/harness/codex.ts
-var install = async (flags, deps) => (await import("./chunk-S3FX7VCY.mjs")).runCodexInstall(flags, deps);
+var install = async (flags, deps) => (await import("./chunk-5PUQT3YS.mjs")).runCodexInstall(flags, deps);
 var codex = {
   id: "codex",
   // A string metadata id wins even when empty or invalid; validation happens after selection.
@@ -594,7 +635,7 @@ var cursorCodec = {
 };
 
 // src/harness/cursor.ts
-var install2 = async (flags, deps) => (await import("./chunk-S3FX7VCY.mjs")).runCursorInstall(flags, deps);
+var install2 = async (flags, deps) => (await import("./chunk-5PUQT3YS.mjs")).runCursorInstall(flags, deps);
 var cursor = {
   id: "cursor",
   sessionSources: [{
@@ -608,6 +649,213 @@ var cursor = {
   uninstall: (flags, deps) => install2([...flags, "--uninstall"], deps)
 };
 
+// src/harness/codecs/opencode.ts
+var events3 = { "session-start": "start", prompt: "prompt", "post-tool": "tool", "turn-end": "stop", idle: "stop" };
+var opencodeCodec = {
+  promptAcceptsContext: true,
+  promptDeliversWithoutWake: true,
+  suppressOutputErrors: false,
+  parse(stdin) {
+    try {
+      const input = JSON.parse(stdin.replace(/^\uFEFF/u, ""));
+      if (!input || typeof input.session_id !== "string" || typeof input.event !== "string" || !Object.hasOwn(events3, input.event)) return null;
+      return {
+        sessionId: input.session_id,
+        event: events3[input.event],
+        continuation: false,
+        ...typeof input.prompt === "string" ? { promptText: input.prompt } : {}
+      };
+    } catch {
+      return null;
+    }
+  },
+  noop: () => "",
+  render: (_kind, frame) => frame
+};
+
+// src/harness/session-sources.ts
+import path5 from "node:path";
+import { lstat } from "node:fs/promises";
+
+// src/harness/proc.ts
+import { execFile as execFile2 } from "node:child_process";
+import { readFile as readFile3 } from "node:fs/promises";
+import { promisify as promisify2 } from "node:util";
+var execFileAsync = promisify2(execFile2);
+var validPid = (pid) => Number.isSafeInteger(pid) && pid > 0;
+function startToken(value) {
+  return value.trim().replace(/[^a-zA-Z0-9_-]+/g, "-");
+}
+function parseLinuxStat(pid, text) {
+  const open = text.indexOf("(");
+  const close = text.lastIndexOf(")");
+  if (!validPid(pid) || open < 0 || close < open || Number(text.slice(0, open).trim()) !== pid) return null;
+  const fields = text.slice(close + 1).trim().split(/\s+/);
+  const ppid = Number(fields[1]);
+  const startTime = fields[19];
+  if (!Number.isSafeInteger(ppid) || ppid < 0 || !startTime || !/^\d+$/.test(startTime)) return null;
+  return { pid, ppid, startTime, command: text.slice(open + 1, close) };
+}
+function parseDarwinPs(pid, text) {
+  const match = text.trim().match(/^(\d+)\s+([A-Za-z]{3}\s+[A-Za-z]{3}\s+\d{1,2}\s+\d{2}:\d{2}:\d{2}\s+\d{4})\s+(.+)$/);
+  if (!validPid(pid) || !match) return null;
+  return { pid, ppid: Number(match[1]), startTime: startToken(match[2]), command: match[3] };
+}
+function csvFields(line) {
+  const fields = [];
+  let value = "";
+  let quoted = false;
+  for (let i = 0; i < line.length; i++) {
+    const char = line[i];
+    if (char === '"') {
+      if (quoted && line[i + 1] === '"') {
+        value += '"';
+        i++;
+      } else quoted = !quoted;
+    } else if (char === "," && !quoted) {
+      fields.push(value);
+      value = "";
+    } else value += char;
+  }
+  if (quoted) return null;
+  fields.push(value);
+  return fields;
+}
+function parseWindowsCsv(text, pid) {
+  if (!validPid(pid)) return null;
+  const lines = text.replace(/^\uFEFF/, "").split(/\r?\n/).filter((line) => line.trim() && !line.startsWith("#"));
+  const headers = csvFields(lines[0] ?? "");
+  if (!headers) return null;
+  for (const line of lines.slice(1)) {
+    const values = csvFields(line);
+    if (!values) continue;
+    const field = (name) => values[headers.indexOf(name)] ?? "";
+    if (Number(field("ProcessId")) !== pid) continue;
+    const ppid = Number(field("ParentProcessId"));
+    const startTime = startToken(field("CreationDate"));
+    const command = field("Name");
+    if (!field("ParentProcessId") || !Number.isSafeInteger(ppid) || ppid < 0 || !startTime || !command) return null;
+    return { pid, ppid, startTime, command };
+  }
+  return null;
+}
+async function readProcess(pid) {
+  if (!validPid(pid)) return null;
+  try {
+    if (process.platform === "linux") return parseLinuxStat(pid, await readFile3(`/proc/${pid}/stat`, "utf8"));
+    if (process.platform === "darwin") {
+      const { stdout } = await execFileAsync("ps", ["-o", "ppid=,lstart=,comm=", "-p", String(pid)], { env: { ...process.env, LC_ALL: "C" }, timeout: 5e3 });
+      return parseDarwinPs(pid, stdout);
+    }
+    if (process.platform === "win32") {
+      const script = `Get-CimInstance Win32_Process -Filter 'ProcessId = ${pid}' | Select-Object ProcessId,ParentProcessId,@{Name='CreationDate';Expression={$_.CreationDate.ToUniversalTime().ToString('o')}},Name | ConvertTo-Csv -NoTypeInformation`;
+      const { stdout } = await execFileAsync("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", script], { timeout: 5e3 });
+      return parseWindowsCsv(stdout, pid);
+    }
+  } catch {
+  }
+  return null;
+}
+async function* walkAncestors(pid, read = readProcess) {
+  const seen = /* @__PURE__ */ new Set([pid]);
+  let current = await read(pid);
+  while (current && validPid(current.ppid) && !seen.has(current.ppid)) {
+    seen.add(current.ppid);
+    current = await read(current.ppid);
+    if (current) yield current;
+  }
+}
+async function nearestNonShellAncestor(pid, read = readProcess) {
+  for await (const ancestor of walkAncestors(pid, read)) {
+    const name = ancestor.command.split(/[\\/]/).pop()?.replace(/^-/, "").toLowerCase() ?? "";
+    if (!/^(?:sh|bash|dash|zsh|fish|ksh|csh|tcsh|ash|cmd(?:\.exe)?|powershell(?:\.exe)?|pwsh(?:\.exe)?)$/.test(name)) return ancestor;
+  }
+  return null;
+}
+
+// src/harness/session-sources.ts
+var SESSION_UNKNOWN_HINT = "Send the agent one message first, then retry.";
+var mappingDir = (harness, env) => path5.join(stateRoot(env), harness, ".by-pid");
+async function recordHookSession(harness, sessionId, env, options = {}) {
+  if (!SESSION_ID_PATTERN.test(sessionId)) return;
+  const parent = await nearestNonShellAncestor(options.pid ?? process.pid, options.readProcess ?? readProcess);
+  if (!parent) return;
+  const dir = mappingDir(harness, env);
+  await ensureStateDir(dir);
+  const file = path5.join(dir, `${parent.pid}.json`);
+  const at = (options.now ?? (() => /* @__PURE__ */ new Date()))().toISOString();
+  const previous = await readJson(file);
+  if (previous?.startTime === parent.startTime && typeof previous.at === "string" && previous.at > at) return;
+  await writeJsonAtomic(file, {
+    sessionId,
+    startTime: parent.startTime,
+    at,
+    ...options.workspace !== void 0 ? { workspace: options.workspace } : {}
+  });
+}
+var hookMapSource = {
+  kind: "hook-map",
+  rejoinable: () => true,
+  async resolve(_meta, env, context) {
+    const dir = mappingDir(context.harness, env);
+    try {
+      await lstat(dir);
+    } catch (error) {
+      if (error.code === "ENOENT") return null;
+      throw error;
+    }
+    await ensureStateDir(dir);
+    const parent = await nearestNonShellAncestor(context.pid ?? process.pid, context.readProcess ?? readProcess);
+    if (!parent) return null;
+    const entry = await readJson(path5.join(dir, `${parent.pid}.json`));
+    if (entry?.startTime === parent.startTime && typeof entry.sessionId === "string" && SESSION_ID_PATTERN.test(entry.sessionId) && typeof entry.at === "string" && Number.isFinite(Date.parse(entry.at))) return entry.sessionId;
+    return null;
+  }
+};
+var processSource = {
+  kind: "process",
+  rejoinable: () => false,
+  async resolve(_meta, _env, context) {
+    for await (const parent of walkAncestors(context.pid ?? process.pid, context.readProcess ?? readProcess)) {
+      return `proc-${parent.pid}-${parent.startTime}`;
+    }
+    return null;
+  }
+};
+async function resolveSources(sources, meta, env, context) {
+  for (const source of sources) {
+    const value = await source.resolve(meta, env, context);
+    if (value === void 0 || value === null) continue;
+    return typeof value === "string" && SESSION_ID_PATTERN.test(value) ? { sessionId: value, rejoinable: source.rejoinable(value) } : null;
+  }
+  return null;
+}
+
+// src/harness/opencode.ts
+var install3 = async (flags, deps) => (await import("./chunk-5PUQT3YS.mjs")).runOpenCodeInstall(flags, deps);
+var opencode = {
+  id: "opencode",
+  sessionSources: [{ kind: "meta", resolve: (meta) => meta?.khala_session, rejoinable: () => true }, hookMapSource],
+  codec: opencodeCodec,
+  restoreAtStartup: false,
+  install: install3,
+  uninstall: (flags, deps) => install3([...flags, "--uninstall"], deps)
+};
+
+// src/harness/generic.ts
+var generic = {
+  id: "generic",
+  sessionSources: [
+    { kind: "env", resolve: (_meta, env) => env.KHALA_SESSION_ID, rejoinable: () => true },
+    processSource
+  ],
+  codec: void 0,
+  restoreAtStartup: true
+};
+function genericAdapter(id) {
+  return { ...generic, id };
+}
+
 // src/harness/index.ts
 function createAdapterRegistry(adapters) {
   const byId = /* @__PURE__ */ new Map();
@@ -618,17 +866,21 @@ function createAdapterRegistry(adapters) {
   }
   return Object.freeze({ resolve: (id) => byId.get(id) });
 }
-var ADAPTERS = Object.freeze([claude, codex, cursor]);
+var ADAPTERS = Object.freeze([claude, codex, cursor, opencode, generic]);
 var registry = createAdapterRegistry(ADAPTERS);
-var adapterFor = registry.resolve;
+function adapterFor(id) {
+  return registry.resolve(id) ?? (isHarnessId(id) ? genericAdapter(id) : void 0);
+}
 
 export {
   readListeningMode,
   applyListeningMode,
-  readActivity,
-  writeActivity,
+  readWakeState,
   settleAttempts,
   createWakeLadder,
   CURSOR_WORKSPACE_ENV,
+  SESSION_UNKNOWN_HINT,
+  recordHookSession,
+  resolveSources,
   adapterFor
 };

package/dist/{chunk-YIHRHD7W.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-SU6362YU.mjs";
+} from "./chunk-APMWDF6B.mjs";
 
 // src/version.ts
 var KHALA_AGENT_VERSION = bundle?.version ?? "0.0.0";