khala-cli 0.4.6 → 0.4.7

package/dist/{chunk-Z4EDYB6Y.mjs → chunk-TOBQUAPD.mjs}

@@ -5,21 +5,20 @@ import {
   reportReady,
   requestJoin,
   saveHostedUsername
-} from "./chunk-OECJ45NM.mjs";
-import {
-  KHALA_AGENT_VERSION
-} from "./chunk-RRBIVI77.mjs";
+} from "./chunk-ODTSGEID.mjs";
 import {
   createEventKeyFilter,
   isWakeEntry,
   toEventInboxEntry
-} from "./chunk-CWHGNVZV.mjs";
+} from "./chunk-OAFYPBCP.mjs";
 import {
   KhalaClientError,
-  LOCAL_OWNER_USER_ID,
-  MODEL_NAMES
-} from "./chunk-2U4E7AM7.mjs";
-import "./chunk-PFDUXY3N.mjs";
+  LOCAL_OWNER_USER_ID
+} from "./chunk-25AX7UMF.mjs";
+import {
+  KHALA_AGENT_VERSION
+} from "./chunk-YIHRHD7W.mjs";
+import "./chunk-SU6362YU.mjs";
 import "./chunk-5GLTKWJ5.mjs";
 import {
   CHANNEL_EVENT_TYPE,
@@ -27,19 +26,21 @@ import {
   formatChannelEventLine,
   memberRenameContent,
   statusFor
-} from "./chunk-P5CP32X2.mjs";
+} from "./chunk-LNG3ZZBK.mjs";
 import {
   monitorArmed,
   resolveHarness,
-  resolveSessionId
-} from "./chunk-AWBKVTLV.mjs";
+  resolveSession
+} from "./chunk-4LSCOWWN.mjs";
 import {
-  adapterFor
-} from "./chunk-WHONG7UF.mjs";
+  SESSION_UNKNOWN_HINT
+} from "./chunk-5RGEO5HN.mjs";
 import {
+  adapterFor,
   applyListeningMode,
+  createWakeLadder,
   readListeningMode
-} from "./chunk-ZHMGB3PP.mjs";
+} from "./chunk-JEI32DEA.mjs";
 import {
   appendInbox,
   channelKey,
@@ -47,8 +48,7 @@ import {
   migrateLegacy,
   resolveChannel,
   unreadCount
-} from "./chunk-XUJIJ4KB.mjs";
-import "./chunk-DPW43YNC.mjs";
+} from "./chunk-OP2HZ7EM.mjs";
 import {
   StateError,
   TERMINAL_SESSION_DETAILS,
@@ -64,18 +64,19 @@ import {
   sessionFiles,
   writeJoinFile,
   writeStateFile
-} from "./chunk-OW3DSTEZ.mjs";
+} from "./chunk-WNOIHCCC.mjs";
 import {
   decodeListeningModeCommand
-} from "./chunk-AUJEUKVM.mjs";
+} from "./chunk-3OFKVYOX.mjs";
 import {
   displayText,
+  harnessInfo,
   isWellFormed,
   label,
   utf8Length,
   validAgentRejoinSecret
-} from "./chunk-SN3STAO2.mjs";
-import "./chunk-55KBLEX5.mjs";
+} from "./chunk-U3MKSPRO.mjs";
+import "./chunk-APIWKRKG.mjs";
 
 // src/mcp/main.ts
 import { Console } from "node:console";
@@ -504,6 +505,7 @@ function resolveEventInput(args) {
 
 // src/mcp/tools.ts
 var ERROR_CODES = [
+  "update_required",
   "channel_required",
   "channel_unknown",
   "channel_ambiguous",
@@ -529,12 +531,14 @@ function createKhalaTools(input) {
       async call(args, context) {
         if (!hasOnly(args, Object.keys(properties)) || !validate(args)) return failure(context.id, -32602, "Invalid params");
         try {
-          const client = input.clientFor(context.meta);
-          if (client === null) return success(context.id, toolError("session_unknown"));
+          const client = await input.clientFor(context.meta);
+          if (client === null) return success(context.id, toolError("session_unknown", { hint: SESSION_UNKNOWN_HINT }));
           const structuredContent = await invoke(client, args);
           return success(context.id, { content: [{ type: "text", text: render(structuredContent) }], structuredContent });
         } catch (error) {
-          return success(context.id, toolError(errorCode(error), error instanceof KhalaClientError ? error.extra : void 0));
+          const code = errorCode(error);
+          const extra = error instanceof KhalaClientError ? { ...error.extra, ...code === "update_required" ? { message: error.message } : {} } : void 0;
+          return success(context.id, toolError(code, extra));
         }
       }
     };
@@ -553,7 +557,7 @@ function createKhalaTools(input) {
       } },
       ["link"],
       (args) => typeof args.link === "string" && (!Object.hasOwn(args, "label") || typeof args.label === "string" && args.label.trim().length > 0 && [...args.label].length <= 40),
-      (client, args) => client.join(args.link, args.label ?? MODEL_NAMES[input.harness]),
+      (client, args) => client.join(args.link, args.label ?? harnessInfo(input.harness).modelName),
       (result) => {
         const joined = result;
         if (joined.state === "connected") return `Connected to ${joined.channelName}.`;
@@ -615,12 +619,14 @@ function createKhalaTools(input) {
           return success(context.id, { content: [{ type: "text", text: "Skipped channel event." }], structuredContent: { skipped: true } });
         }
         try {
-          const client = input.clientFor(context.meta);
-          if (client === null) return success(context.id, toolError("session_unknown"));
+          const client = await input.clientFor(context.meta);
+          if (client === null) return success(context.id, toolError("session_unknown", { hint: SESSION_UNKNOWN_HINT }));
           const sent = await (channel === void 0 ? client.sendChannelEvent(resolved.content) : client.sendChannelEvent(resolved.content, channel));
           return success(context.id, { content: [{ type: "text", text: `Posted channel event: ${resolved.content.body}` }], structuredContent: sent });
         } catch (error) {
-          return success(context.id, toolError(errorCode(error), error instanceof KhalaClientError ? error.extra : void 0));
+          const code = errorCode(error);
+          const extra = error instanceof KhalaClientError ? { ...error.extra, ...code === "update_required" ? { message: error.message } : {} } : void 0;
+          return success(context.id, toolError(code, extra));
         }
       }
     }
@@ -637,7 +643,7 @@ import * as fs from "node:fs/promises";
 import { createHash, randomBytes } from "node:crypto";
 
 // src/transport.ts
-var startChannelSession = async (creds, options) => creds.transport === "local" ? (await import("./chunk-SZIEG3RS.mjs")).createLocalSession(creds) : (await import("./chunk-JG5J3SHW.mjs")).createAgentMatrixSession(creds, options);
+var startChannelSession = async (creds, options) => creds.transport === "local" ? (await import("./chunk-W5HS2PQO.mjs")).createLocalSession(creds) : (await import("./chunk-IG2NU5J6.mjs")).createAgentMatrixSession(creds, options);
 
 // src/sender.ts
 function localpart(userId) {
@@ -680,7 +686,7 @@ function createKhalaAgentClient(options) {
   const api = options.joinApi ?? { requestJoin, pollJoin, reportReady };
   let status = { state: "idle", updatedAt: now().toISOString() };
   let initialization;
-  const rejoinable = adapterFor(options.harness)?.rejoinable(options.sessionId) ?? false;
+  const rejoinable = options.rejoinable ?? adapterFor(options.harness)?.sessionSources[0]?.rejoinable(options.sessionId) ?? false;
   let rejoinSecret;
   let savedSecret;
   let resuming;
@@ -1072,7 +1078,7 @@ function createKhalaAgentClient(options) {
           signal.addEventListener("abort", releaseAbort, { once: true });
           if (signal.aborted) releaseAbort();
         });
-        const request = restore?.localCredentials ? Promise.resolve({ ...attempt.created, origin: new URL(link).origin, autoConfirmed: true }) : api.requestJoin({ link, harness: options.harness, label: label2, ...rejoinSecret === void 0 ? {} : { sessionId: options.sessionId, rejoinSecret } }, restore ? { fetch: (input, init) => (options.fetch ?? fetch)(input, { ...init, signal: init?.signal ? AbortSignal.any([signal, init.signal]) : signal }) } : fetchDeps);
+        const request = restore?.localCredentials ? Promise.resolve({ ...attempt.created, origin: new URL(link).origin, autoConfirmed: true }) : api.requestJoin({ link, harness: options.harness, label: label2, ...rejoinSecret === void 0 ? {} : { sessionId: options.sessionId, rejoinSecret } }, { ...options.env ? { env: options.env } : {}, ...restore ? { fetch: (input, init) => (options.fetch ?? fetch)(input, { ...init, signal: init?.signal ? AbortSignal.any([signal, init.signal]) : signal }) } : fetchDeps });
         const created = await Promise.race([request, aborted]).finally(() => {
           if (releaseAbort) signal.removeEventListener("abort", releaseAbort);
         });
@@ -1284,14 +1290,22 @@ function createKhalaAgentClient(options) {
 
 // src/mcp/wiring.ts
 function createRealClientFactory(env, deps = {}) {
-  return ({ harness, sessionId }) => {
+  return ({ harness, sessionId, rejoinable }) => {
     const files = sessionFiles(harness, sessionId, env);
     const adapter = adapterFor(harness);
-    const createWaker = adapter?.waker && (deps.createWaker ?? adapter.waker);
-    const waker = createWaker?.({ files, threadId: sessionId });
+    const drivers = adapter?.wakeLadder;
+    const waker = drivers?.length ? deps.createWaker ? deps.createWaker({ files, threadId: sessionId }) : createWakeLadder({
+      files,
+      harness,
+      sessionId,
+      drivers,
+      env,
+      warningPrefix: adapter?.wakeWarningName ?? "wake"
+    }) : void 0;
     const client = (deps.createClient ?? createKhalaAgentClient)({
       harness,
       sessionId,
+      ...rejoinable !== void 0 ? { rejoinable } : {},
       env,
       ...waker ? { onInboxAppend: () => waker.notify() } : {}
     });
@@ -1386,21 +1400,23 @@ async function runMcpCommand(argv, deps) {
     return 2;
   }
   const clients = /* @__PURE__ */ new Map();
-  const clientForSession = (sessionId) => {
-    let client = clients.get(sessionId);
+  const clientForSession = (session) => {
+    const { sessionId, rejoinable } = session;
+    const key = `${rejoinable}:${sessionId}`;
+    let client = clients.get(key);
     if (client === void 0) {
-      client = deps.createClient({ harness, sessionId });
-      clients.set(sessionId, client);
+      client = deps.createClient({ harness, sessionId, rejoinable });
+      clients.set(key, client);
     }
     return client;
   };
-  const startupSession = resolveSessionId(harness, void 0, env);
-  if (startupSession !== null && harness !== "cursor") clientForSession(startupSession);
+  const startupSession = adapterFor(harness)?.restoreAtStartup ? await resolveSession(harness, void 0, env) : null;
+  if (startupSession !== null) clientForSession(startupSession);
   const tools = createKhalaTools({
     harness,
-    clientFor(meta) {
-      const sessionId = resolveSessionId(harness, meta, env);
-      return sessionId === null ? null : clientForSession(sessionId);
+    async clientFor(meta) {
+      const session = await resolveSession(harness, meta, env);
+      return session === null ? null : clientForSession(session);
     }
   });
   try {

package/dist/{chunk-SN3STAO2.mjs → chunk-U3MKSPRO.mjs}

@@ -1,5 +1,38 @@
 import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
 
+// ../contracts/src/m1/harness.ts
+var HARNESS_ID = /^[a-z][a-z0-9-]{1,23}$/;
+function isHarnessId(input) {
+  return typeof input === "string" && HARNESS_ID.exec(input)?.[0] === input;
+}
+var LEGACY_HARNESSES = ["claude", "codex", "cursor"];
+var HARNESS_REGISTRY = [
+  { id: "claude", displayName: "Claude Code", modelName: "Claude", logoKey: "claude", steer: true, sync: true, idleWake: "default", registered: true },
+  { id: "codex", displayName: "Codex", modelName: "Codex", logoKey: "codex", steer: true, sync: true, idleWake: "default", registered: true },
+  { id: "cursor", displayName: "Cursor", modelName: "Cursor", logoKey: "cursor", steer: true, sync: true, idleWake: "none", registered: true },
+  { id: "opencode", displayName: "OpenCode", modelName: "OpenCode", logoKey: "opencode", steer: true, sync: true, idleWake: "default", registered: true },
+  { id: "copilot", displayName: "Copilot CLI", modelName: "Copilot", logoKey: "copilot", steer: true, sync: true, idleWake: "opt-in", registered: true },
+  { id: "vscode", displayName: "Copilot (VS Code)", modelName: "VSCode", logoKey: "copilot", steer: true, sync: true, idleWake: "opt-in", registered: true },
+  { id: "gemini", displayName: "Gemini CLI", modelName: "Gemini", logoKey: "gemini", steer: true, sync: true, idleWake: "opt-in", registered: true },
+  // U29 and U33 establish these capabilities after their spikes.
+  { id: "antigravity", displayName: "Antigravity CLI", modelName: "Antigravity", logoKey: null, steer: false, sync: false, idleWake: "none", registered: true },
+  { id: "qwen", displayName: "Qwen Code", modelName: "Qwen", logoKey: "qwen", steer: true, sync: true, idleWake: "default", registered: true },
+  { id: "muse", displayName: "Muse Code", modelName: "Muse", logoKey: null, steer: false, sync: false, idleWake: "none", registered: true },
+  { id: "generic", displayName: "MCP agent", modelName: "Agent", logoKey: null, steer: false, sync: false, idleWake: "none", registered: true }
+];
+function harnessInfo(id) {
+  return HARNESS_REGISTRY.find((row) => row.id === id) ?? {
+    id,
+    displayName: id.split("-").map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(" "),
+    modelName: "Agent",
+    logoKey: null,
+    steer: false,
+    sync: false,
+    idleWake: "none",
+    registered: false
+  };
+}
+
 // ../contracts/src/messaging/decode.ts
 var MAX_IDENTIFIER_BYTES = 512;
 var DecodeFailure = class extends Error {
@@ -129,11 +162,12 @@ function validateAgentName(input) {
 }
 
 // ../contracts/src/m1/agent-join.ts
-var HARNESSES = ["claude", "codex", "cursor"];
 var M1_LABEL_MAX_BYTES = 512;
 var agentConfirmPagePath = (id) => `/agent/confirm?joinId=${encodeURIComponent(id)}`;
 function readHarness(input, path) {
-  return literal(input, path, HARNESSES);
+  if (typeof input !== "string") fail(path, "wrong_type");
+  if (!isHarnessId(input)) fail(path, "invalid_value");
+  return input;
 }
 function readHttpUrl(input, path) {
   if (typeof input !== "string") fail(path, "wrong_type");
@@ -160,6 +194,10 @@ var validAgentSessionId = (value) => typeof value === "string" && /^[A-Za-z0-9][
 var validAgentRejoinSecret = (value) => typeof value === "string" && /^[A-Za-z0-9_-]{43}$/u.test(value);
 
 export {
+  isHarnessId,
+  LEGACY_HARNESSES,
+  HARNESS_REGISTRY,
+  harnessInfo,
   fail,
   decodeWith,
   object,
@@ -178,7 +216,6 @@ export {
   utcTimestamp,
   reserved,
   validateAgentName,
-  HARNESSES,
   M1_LABEL_MAX_BYTES,
   agentConfirmPagePath,
   readHarness,

package/dist/{chunk-SZIEG3RS.mjs → chunk-W5HS2PQO.mjs}

@@ -1,7 +1,4 @@
 import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
-import {
-  ensureHelper
-} from "./chunk-IULQYQJZ.mjs";
 import {
   KhalaClientError,
   LOCAL_LONG_POLL_MAX_S,
@@ -15,21 +12,22 @@ import {
   decodeLocalMembersResponse,
   decodeLocalNameContent,
   decodeLocalSendResult,
+  ensureHelper,
   localRoomPath
-} from "./chunk-2U4E7AM7.mjs";
-import "./chunk-PFDUXY3N.mjs";
+} from "./chunk-25AX7UMF.mjs";
+import "./chunk-YIHRHD7W.mjs";
+import "./chunk-SU6362YU.mjs";
 import "./chunk-5GLTKWJ5.mjs";
 import {
   CHANNEL_EVENT_TYPE,
   memberRenameContent
-} from "./chunk-P5CP32X2.mjs";
-import "./chunk-DPW43YNC.mjs";
-import "./chunk-OW3DSTEZ.mjs";
+} from "./chunk-LNG3ZZBK.mjs";
+import "./chunk-WNOIHCCC.mjs";
 import {
   LISTENING_MODE_COMMAND_TYPE
-} from "./chunk-AUJEUKVM.mjs";
-import "./chunk-SN3STAO2.mjs";
-import "./chunk-55KBLEX5.mjs";
+} from "./chunk-3OFKVYOX.mjs";
+import "./chunk-U3MKSPRO.mjs";
+import "./chunk-APIWKRKG.mjs";
 
 // src/local/session.ts
 import { randomUUID } from "node:crypto";
@@ -228,7 +226,7 @@ async function createLocalSession(creds, opts = {}) {
       try {
         const page = decoded(await request(
           "GET",
-          `events?after=${after}&wait=${LOCAL_LONG_POLL_MAX_S}&prev=1`,
+          `events?after=${after}&wait=${LOCAL_LONG_POLL_MAX_S}&prev=1&wire=2`,
           void 0,
           controller.signal,
           (LOCAL_LONG_POLL_MAX_S + 10) * 1e3
@@ -324,7 +322,7 @@ async function createLocalSession(creds, opts = {}) {
         const result = decoded(await withHelper(() => request("POST", "join", {})), decodeLocalJoined);
         after = result.seq;
         await me();
-        const members = decoded(await withHelper(() => request("GET", "members")), decodeLocalMembersResponse);
+        const members = decoded(await withHelper(() => request("GET", "members?wire=2")), decodeLocalMembersResponse);
         check(roomId);
         for (const member of members.members) {
           names.set(member.userId, member.displayName);
@@ -342,7 +340,7 @@ async function createLocalSession(creds, opts = {}) {
     },
     async history(roomId, limit, before) {
       check(roomId);
-      const page = decoded(await withHelper(() => request("GET", `messages?limit=${limit}${before !== void 0 ? `&before=${encodeURIComponent(before)}` : ""}`)), decodeLocalHistoryPage);
+      const page = decoded(await withHelper(() => request("GET", `messages?wire=2&limit=${limit}${before !== void 0 ? `&before=${encodeURIComponent(before)}` : ""}`)), decodeLocalHistoryPage);
       const result = page.events.filter((e) => e.roomId === creds.roomId).map(message);
       return { messages: result, ...page.nextBefore !== void 0 ? { nextBefore: page.nextBefore } : {} };
     },

package/dist/{chunk-OW3DSTEZ.mjs → chunk-WNOIHCCC.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-U3MKSPRO.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-RRBIVI77.mjs → chunk-YIHRHD7W.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-SU6362YU.mjs";
 
 // src/version.ts
 var KHALA_AGENT_VERSION = bundle?.version ?? "0.0.0";

package/dist/khala.mjs

@@ -2,9 +2,9 @@
 import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
 import {
   KHALA_AGENT_VERSION
-} from "./chunk-RRBIVI77.mjs";
-import "./chunk-PFDUXY3N.mjs";
-import "./chunk-55KBLEX5.mjs";
+} from "./chunk-YIHRHD7W.mjs";
+import "./chunk-SU6362YU.mjs";
+import "./chunk-APIWKRKG.mjs";
 
 // src/cli.ts
 var HOOK_NAME = /^[a-z][a-z0-9-]{0,31}$/;
@@ -78,14 +78,14 @@ async function runCli(argv, modules) {
 
 // src/cli-bundle.ts
 var hooks = {
-  "session-start": () => import("./chunk-2XTYRBYX.mjs"),
-  deliver: () => import("./chunk-4X35OUAN.mjs"),
-  "claude-wake": () => import("./chunk-PY2ZNVNY.mjs")
+  "session-start": () => import("./chunk-7V2YQIRI.mjs"),
+  deliver: () => import("./chunk-K6EJSZYO.mjs"),
+  "claude-wake": () => import("./chunk-C5SMOUTO.mjs")
 };
 process.exitCode = await runCli(process.argv.slice(2), {
-  mcp: () => () => import("./chunk-Z4EDYB6Y.mjs"),
-  watch: () => () => import("./chunk-B2MOLCJM.mjs"),
-  local: () => () => import("./chunk-FH2CZX5T.mjs"),
-  install: () => () => import("./chunk-6E3UCO22.mjs"),
+  mcp: () => () => import("./chunk-TOBQUAPD.mjs"),
+  watch: () => () => import("./chunk-6YEYXZZB.mjs"),
+  local: () => () => import("./chunk-L7L6UNXN.mjs"),
+  install: () => () => import("./chunk-S3FX7VCY.mjs"),
   hook: (name) => Object.hasOwn(hooks, name) ? hooks[name] : void 0
 });