khala-cli 0.4.6 → 0.4.8

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

@@ -5,21 +5,20 @@ import {
   reportReady,
   requestJoin,
   saveHostedUsername
-} from "./chunk-OECJ45NM.mjs";
-import {
-  KHALA_AGENT_VERSION
-} from "./chunk-RRBIVI77.mjs";
+} from "./chunk-VAI7IUI4.mjs";
 import {
   createEventKeyFilter,
   isWakeEntry,
   toEventInboxEntry
-} from "./chunk-CWHGNVZV.mjs";
+} from "./chunk-2VCAW4GH.mjs";
 import {
   KhalaClientError,
-  LOCAL_OWNER_USER_ID,
-  MODEL_NAMES
-} from "./chunk-2U4E7AM7.mjs";
-import "./chunk-PFDUXY3N.mjs";
+  LOCAL_OWNER_USER_ID
+} from "./chunk-2DHIAFEV.mjs";
+import {
+  KHALA_AGENT_VERSION
+} from "./chunk-5LIE5GUU.mjs";
+import "./chunk-APMWDF6B.mjs";
 import "./chunk-5GLTKWJ5.mjs";
 import {
   CHANNEL_EVENT_TYPE,
@@ -27,19 +26,20 @@ import {
   formatChannelEventLine,
   memberRenameContent,
   statusFor
-} from "./chunk-P5CP32X2.mjs";
+} from "./chunk-54XFVSEC.mjs";
 import {
   monitorArmed,
   resolveHarness,
-  resolveSessionId
-} from "./chunk-AWBKVTLV.mjs";
-import {
-  adapterFor
-} from "./chunk-WHONG7UF.mjs";
+  resolveSession
+} from "./chunk-FH34B3I3.mjs";
 import {
+  SESSION_UNKNOWN_HINT,
+  adapterFor,
   applyListeningMode,
-  readListeningMode
-} from "./chunk-ZHMGB3PP.mjs";
+  createWakeLadder,
+  readListeningMode,
+  readWakeState
+} from "./chunk-5BQTYU66.mjs";
 import {
   appendInbox,
   channelKey,
@@ -47,8 +47,7 @@ import {
   migrateLegacy,
   resolveChannel,
   unreadCount
-} from "./chunk-XUJIJ4KB.mjs";
-import "./chunk-DPW43YNC.mjs";
+} from "./chunk-VKQ3KUYO.mjs";
 import {
   StateError,
   TERMINAL_SESSION_DETAILS,
@@ -64,18 +63,19 @@ import {
   sessionFiles,
   writeJoinFile,
   writeStateFile
-} from "./chunk-OW3DSTEZ.mjs";
+} from "./chunk-CBPLCCRZ.mjs";
 import {
   decodeListeningModeCommand
-} from "./chunk-AUJEUKVM.mjs";
+} from "./chunk-IQJQ4RF5.mjs";
 import {
   displayText,
+  harnessInfo,
   isWellFormed,
   label,
   utf8Length,
   validAgentRejoinSecret
-} from "./chunk-SN3STAO2.mjs";
-import "./chunk-55KBLEX5.mjs";
+} from "./chunk-NKX3SLS7.mjs";
+import "./chunk-7HBRFY3Z.mjs";
 
 // src/mcp/main.ts
 import { Console } from "node:console";
@@ -504,6 +504,7 @@ function resolveEventInput(args) {
 
 // src/mcp/tools.ts
 var ERROR_CODES = [
+  "update_required",
   "channel_required",
   "channel_unknown",
   "channel_ambiguous",
@@ -522,19 +523,24 @@ function errorCode(error) {
   return typeof code === "string" && ERROR_CODES.includes(code) ? code : "internal_error";
 }
 function createKhalaTools(input) {
+  const sessionProperties = input.harness === "opencode" ? { khala_session: { type: "string", minLength: 1, description: "Session ID stamped by the OpenCode plugin." } } : {};
+  const validSession = (args) => !Object.hasOwn(args, "khala_session") || input.harness === "opencode" && typeof args.khala_session === "string" && args.khala_session.length > 0;
+  const sessionMeta = (args, meta) => input.harness === "opencode" && Object.hasOwn(args, "khala_session") ? { ...meta, khala_session: args.khala_session } : meta;
   function tool(name, description, properties, required, validate, invoke, render = JSON.stringify) {
     return {
       name,
-      definition: () => ({ name, description, inputSchema: { type: "object", properties, required, additionalProperties: false } }),
+      definition: () => ({ name, description, inputSchema: { type: "object", properties: { ...properties, ...sessionProperties }, required, additionalProperties: false } }),
       async call(args, context) {
-        if (!hasOnly(args, Object.keys(properties)) || !validate(args)) return failure(context.id, -32602, "Invalid params");
+        if (!hasOnly(args, Object.keys({ ...properties, ...sessionProperties })) || !validSession(args) || !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(sessionMeta(args, 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));
         }
       }
     };
@@ -549,11 +555,11 @@ function createKhalaTools(input) {
         type: "string",
         minLength: 1,
         maxLength: 40,
-        description: "Optional and ignored: Khala names you <OwnerUsername>-<Claude|Codex>, and your owner can rename you."
+        description: "Optional and ignored: Khala names you <OwnerUsername>-<Model>, and your owner can rename you."
       } },
       ["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}.`;
@@ -597,15 +603,16 @@ function createKhalaTools(input) {
         description: 'Select channel by name or channel ID; required when joined to more than one channel. Post a compact progress event (PR, CI, ticket status) into the Khala channel. Events are progress signals, not channel messages: they never wake other agents. Pass Khala JSON as "event", or a raw Aiur bus event, wake record or alert as "aiur".',
         inputSchema: {
           type: "object",
-          properties: { channel: channelProperty, event: { type: "object" }, aiur: { type: "object" }, ticketPrefix: { type: "string", minLength: 0, maxLength: 16 } },
+          properties: { ...sessionProperties, channel: channelProperty, event: { type: "object" }, aiur: { type: "object" }, ticketPrefix: { type: "string", minLength: 0, maxLength: 16 } },
           required: [],
           additionalProperties: false,
           oneOf: [{ required: ["event"], not: { required: ["aiur"] } }, { required: ["aiur"], not: { required: ["event"] } }]
         }
       }),
       async call(args, context) {
-        if (!validChannel(args)) return failure(context.id, -32602, "Invalid params");
+        if (!validSession(args) || !validChannel(args)) return failure(context.id, -32602, "Invalid params");
         const { channel, ...eventArgs } = args;
+        if (input.harness === "opencode") delete eventArgs.khala_session;
         const resolved = resolveEventInput(eventArgs);
         if (resolved.kind === "invalid") {
           const error = { error: "invalid_event", path: resolved.path, code: resolved.code };
@@ -615,12 +622,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(sessionMeta(args, 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 +646,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-ZJ4W7P33.mjs")).createLocalSession(creds) : (await import("./chunk-CJTCU755.mjs")).createAgentMatrixSession(creds, options);
 
 // src/sender.ts
 function localpart(userId) {
@@ -674,13 +683,15 @@ function errorDetail(error, fallback) {
   return ["unsafe_state_dir", "storage_failed"].includes(failure2.message) ? failure2.message : fallback;
 }
 function createKhalaAgentClient(options) {
+  const asyncOnly = !adapterFor(options.harness)?.codec;
+  const defaultMode = asyncOnly ? "async" : "sync";
   const dir = resolveStateDir(options.harness, options.sessionId, options.env);
   const now = options.now ?? (() => /* @__PURE__ */ new Date());
   const fetchDeps = options.fetch ? { fetch: options.fetch } : {};
   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;
@@ -962,8 +973,9 @@ function createKhalaAgentClient(options) {
         if (!decoded.ok || decoded.value.agent !== session.userId) return;
         attempt.appends = attempt.appends.then(async () => {
           if (!current(attempt)) return;
-          await applyListeningMode(attempt.files, decoded.value.mode, { changedBy: "owner", eventId: command.eventId }, now);
-          await publishMode(attempt, session, credentials.roomId, decoded.value.mode);
+          const mode = asyncOnly ? "async" : decoded.value.mode;
+          await applyListeningMode(attempt.files, mode, { changedBy: "owner", eventId: command.eventId }, now);
+          await publishMode(attempt, session, credentials.roomId, mode);
         }).catch(async () => {
           if (current(attempt)) await setStatus(attempt, "disconnected", "internal_error").catch(() => {
           });
@@ -975,7 +987,10 @@ function createKhalaAgentClient(options) {
       await wait(session.waitForInvite(credentials.roomId, options.inviteTimeoutMs ?? 12e4));
       await wait(session.join(credentials.roomId));
       if (!current(attempt)) return;
-      if (session.listeningMode) await writeStateFile(channelDir, "mode.json", { mode: session.listeningMode(credentials.roomId) });
+      if (asyncOnly) {
+        await writeStateFile(channelDir, "mode.json", { mode: "async" });
+        await publishMode(attempt, session, credentials.roomId, "async");
+      } else if (session.listeningMode) await writeStateFile(channelDir, "mode.json", { mode: session.listeningMode(credentials.roomId) });
       else await removeStateFile(channelDir, "mode.json");
       attempt.joined = true;
       attempt.status.channelName = session.roomName(credentials.roomId) ?? credentials.roomId;
@@ -1072,7 +1087,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);
         });
@@ -1163,7 +1178,7 @@ function createKhalaAgentClient(options) {
             link: attempt.link,
             state: "joining",
             unread: 0,
-            listeningMode: "sync"
+            listeningMode: defaultMode
           });
         }
       }
@@ -1174,11 +1189,11 @@ function createKhalaAgentClient(options) {
         ...single?.detail !== void 0 ? { detail: single.detail } : channel === void 0 && status.detail ? { detail: status.detail } : {},
         ...single ? {
           channelName: single.channel,
-          ...single.you !== void 0 ? { displayName: single.you } : {},
+          ...single.you !== void 0 ? { displayName: single.you, you: single.you } : {},
           ...single.agentUserId !== void 0 ? { agentUserId: single.agentUserId } : {}
         } : {},
         unread: items.reduce((sum, item) => sum + item.unread, 0),
-        ...single ? { listeningMode: single.listeningMode } : items.length === 0 ? { listeningMode: "sync" } : {},
+        ...single ? { listeningMode: single.listeningMode } : items.length === 0 ? { listeningMode: defaultMode } : {},
         channels: items
       };
     },
@@ -1284,14 +1299,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() } : {}
     });
@@ -1314,7 +1337,22 @@ function createRealClientFactory(env, deps = {}) {
       async status(channel) {
         await initialize();
         const status = await (channel === void 0 ? client.status() : client.status(channel));
-        return adapter?.watcherStatus && ["connected", "send_failed"].includes(status.state) ? { ...status, watcherArmed: await monitorArmed(files) } : status;
+        let wakeDrivers;
+        if (drivers?.length) {
+          try {
+            const states = await readWakeState(files.dir);
+            wakeDrivers = await Promise.all(drivers.map(async (driver) => {
+              const ctx = { files, harness, sessionId, env, now: Date.now(), signal: new AbortController().signal };
+              const available = !states[driver.id]?.disabled && await driver.available(ctx);
+              const reason = states[driver.id]?.disabled ? states[driver.id]?.reason : available ? void 0 : await driver.unavailableReason?.(ctx);
+              return { id: driver.id, available, ...reason ? { reason } : {} };
+            }));
+          } catch {
+            wakeDrivers = drivers.map((driver) => ({ id: driver.id, available: false, reason: "wake_status_unavailable" }));
+          }
+        }
+        const withWake = wakeDrivers ? { ...status, wakeDrivers } : status;
+        return adapter?.watcherStatus && ["connected", "send_failed"].includes(status.state) ? { ...withWake, watcherArmed: await monitorArmed(files) } : withWake;
       },
       async read(limit, before, channel) {
         await initialize();
@@ -1386,21 +1424,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-OECJ45NM.mjs → chunk-VAI7IUI4.mjs}

@@ -1,20 +1,21 @@
 import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
 import {
   KhalaClientError,
-  MODEL_NAMES,
   checkName,
-  isDefaultAgentName
-} from "./chunk-2U4E7AM7.mjs";
+  isDefaultAgentName,
+  restartHelper
+} from "./chunk-2DHIAFEV.mjs";
 import {
   StateError,
   readJson,
   stateRoot,
   writeJsonAtomic
-} from "./chunk-OW3DSTEZ.mjs";
+} from "./chunk-CBPLCCRZ.mjs";
 import {
-  HARNESSES,
+  harnessInfo,
+  isHarnessId,
   validateAgentName
-} from "./chunk-SN3STAO2.mjs";
+} from "./chunk-NKX3SLS7.mjs";
 
 // src/local/identity.ts
 import * as fs from "node:fs/promises";
@@ -23,7 +24,7 @@ import path from "node:path";
 var HOSTED_PROFILE_FILE = "hosted-profile.json";
 var LOCAL_OWNER_FALLBACK_NAME = "User";
 function hostedUsernameFromAgentName(displayName, harness) {
-  const suffix = new RegExp(`-${MODEL_NAMES[harness]}(?:-\\d+)?$`, "iu");
+  const suffix = new RegExp(`-${harnessInfo(harness).modelName}(?:-\\d+)?$`, "iu");
   if (!suffix.test(displayName)) return null;
   const candidate = displayName.replace(suffix, "");
   const checked = checkName(candidate, "username");
@@ -139,7 +140,7 @@ async function post(url, origin, body, deps, pollSecret) {
 async function requestJoin(input, deps = {}) {
   const parsed = parseChannelLink(input.link);
   if (!parsed) throw new KhalaClientError("invalid_link", "invalid_link");
-  if (!HARNESSES.includes(input.harness)) fail("invalid_harness");
+  if (!isHarnessId(input.harness)) fail("invalid_harness");
   const label = validateAgentName(input.label);
   if (!label.ok || [...label.name].length > 40) fail("invalid_label");
   const { origin } = parsed;
@@ -154,6 +155,21 @@ async function requestJoin(input, deps = {}) {
     body = await json(response);
     code = serverCode(body);
   }
+  if (response.status === 400 && code === "invalid_harness") {
+    if (new URL(origin).protocol === "https:") {
+      throw new KhalaClientError("update_required", `Khala's hosted service does not accept ${harnessInfo(input.harness).displayName} agents yet. Local channels work now.`);
+    }
+    if (await (deps.restartHelper ?? ((origin2) => restartHelper(origin2, deps.env, deps.fetch ? { fetch: deps.fetch } : {})))(origin)) {
+      response = await post(url, origin, rejoin ? { ...base, sessionId: input.sessionId, rejoinSecret: input.rejoinSecret } : base, deps);
+      body = await json(response);
+      code = serverCode(body);
+      if (rejoin && response.status === 400 && code === "invalid_link") {
+        response = await post(url, origin, base, deps);
+        body = await json(response);
+        code = serverCode(body);
+      }
+    }
+  }
   if (response.status !== 201) {
     if (response.status === 400 && code === "invalid_link") throw new KhalaClientError("invalid_link", "invalid_link");
     if (response.status === 400 && (code === "invalid_label" || code === "invalid_harness")) fail(code);

package/dist/{chunk-XUJIJ4KB.mjs → chunk-VKQ3KUYO.mjs}

@@ -11,7 +11,7 @@ import {
   stateKey,
   writeJsonAtomic,
   writeStateFile
-} from "./chunk-OW3DSTEZ.mjs";
+} from "./chunk-CBPLCCRZ.mjs";
 
 // src/inbox.ts
 import * as fs from "node:fs/promises";
@@ -202,6 +202,18 @@ function resolveChannel(list, ref) {
   return { ok: false, code: matches.length ? "channel_ambiguous" : "channel_unknown", channels };
 }
 
+// src/activity.ts
+import path2 from "node:path";
+async function readActivity(files) {
+  const activity = await readJson(path2.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(path2.join(files.dir, "activity.json"), activity);
+  return activity;
+}
+
 export {
   readEntries,
   readCursor,
@@ -212,5 +224,7 @@ export {
   channelKey,
   listChannels,
   migrateLegacy,
-  resolveChannel
+  resolveChannel,
+  readActivity,
+  writeActivity
 };