khala-cli 0.4.6 → 0.4.8

package/dist/{chunk-FH2CZX5T.mjs → chunk-H3K4GA2P.mjs}

@@ -2,15 +2,7 @@ import { createRequire as __khalaCreateRequire } from 'node:module'; const requi
 import {
   parseChannelLink,
   resolveLocalOwnerName
-} from "./chunk-OECJ45NM.mjs";
-import {
-  KHALA_AGENT_VERSION
-} from "./chunk-RRBIVI77.mjs";
-import {
-  ensureHelper,
-  helperPaths,
-  readHelperFile
-} from "./chunk-IULQYQJZ.mjs";
+} from "./chunk-VAI7IUI4.mjs";
 import {
   LOCAL_AGENT_DEVICE_PREFIX,
   LOCAL_IDLE_EXIT_MS,
@@ -28,6 +20,8 @@ import {
   decodeOwnerProfile,
   defaultAgentName,
   defaultHumanColor,
+  ensureHelper,
+  helperPaths,
   isDefaultAgentName,
   isHumanColorId,
   isLocalRoomId,
@@ -35,25 +29,29 @@ import {
   newLocalAgentUserId,
   newLocalEventId,
   newLocalRoomId,
-  normalizeInitials
-} from "./chunk-2U4E7AM7.mjs";
+  normalizeInitials,
+  olderHelperVersion,
+  readHelperFile
+} from "./chunk-2DHIAFEV.mjs";
+import {
+  KHALA_AGENT_VERSION
+} from "./chunk-5LIE5GUU.mjs";
 import {
   bundle
-} from "./chunk-PFDUXY3N.mjs";
+} from "./chunk-APMWDF6B.mjs";
 import "./chunk-5GLTKWJ5.mjs";
 import {
   CHANNEL_EVENT_TYPE,
   decodeChannelEvent,
   encodeChannelEvent,
   memberRenameContent
-} from "./chunk-P5CP32X2.mjs";
-import "./chunk-DPW43YNC.mjs";
+} from "./chunk-54XFVSEC.mjs";
 import {
   StateError,
   ensureStateDir,
   readJson,
   writeJsonAtomic
-} from "./chunk-OW3DSTEZ.mjs";
+} from "./chunk-CBPLCCRZ.mjs";
 import {
   DEFAULT_LISTENING_MODE,
   LISTENING_MODE_COMMAND_TYPE,
@@ -61,17 +59,18 @@ import {
   decodeListeningMode,
   decodeListeningModeCommand,
   memberListeningMode
-} from "./chunk-AUJEUKVM.mjs";
+} from "./chunk-IQJQ4RF5.mjs";
 import {
-  HARNESSES,
+  LEGACY_HARNESSES,
   agentConfirmPagePath,
   decodeWith,
+  isHarnessId,
   object,
   utf8Length,
   validAgentRejoinSecret,
   validAgentSessionId
-} from "./chunk-SN3STAO2.mjs";
-import "./chunk-55KBLEX5.mjs";
+} from "./chunk-NKX3SLS7.mjs";
+import "./chunk-7HBRFY3Z.mjs";
 
 // src/local/cli.ts
 import { setTimeout as sleepDefault } from "node:timers/promises";
@@ -123,6 +122,7 @@ async function openLocalStore(input) {
       byTxn: /* @__PURE__ */ new Map(),
       lastMember: /* @__PURE__ */ new Map(),
       previousMembers: /* @__PURE__ */ new Map(),
+      harnesses: {},
       secrets: emptySecrets(),
       waiters: /* @__PURE__ */ new Set()
     };
@@ -166,6 +166,10 @@ async function openLocalStore(input) {
         if (error2.code === "ENOENT") continue;
         throw error2;
       }
+      const harnesses = await readJson(path.join(channel.dir, "harness.json"));
+      if (typeof harnesses === "object" && harnesses !== null && !Array.isArray(harnesses)) {
+        channel.harnesses = Object.fromEntries(Object.entries(harnesses).filter(([, id]) => isHarnessId(id)));
+      }
       const completeBytes = buffer.lastIndexOf(10) + 1;
       if (completeBytes < buffer.length) channel.validBytes = completeBytes;
       for (const line of buffer.subarray(0, completeBytes).toString("utf8").split("\n")) {
@@ -176,7 +180,13 @@ async function openLocalStore(input) {
           continue;
         }
         const decoded = decodeLocalEvent(parsed);
-        if (decoded.ok && decoded.value.roomId === roomId && decoded.value.seq > lastSeq(channel)) indexEvent(channel, decoded.value);
+        if (!decoded.ok || decoded.value.roomId !== roomId || decoded.value.seq <= lastSeq(channel)) continue;
+        const event = decoded.value;
+        if (event.type === "m.room.member" && event.content.harness === void 0) {
+          const harness = channel.harnesses[event.content.user];
+          if (harness) event.content.harness = harness;
+        }
+        indexEvent(channel, event);
       }
       if (channel.events[0]?.type !== "m.room.create") continue;
       const names = await readJson(path.join(channel.dir, "names.json"));
@@ -219,6 +229,27 @@ async function openLocalStore(input) {
       content: eventInput.content
     };
     const stored = structuredClone(event);
+    const disk = { ...stored, content: { ...stored.content } };
+    if (disk.type === "m.room.member") {
+      const user = disk.content.user;
+      const harness = disk.content.harness;
+      if (harness !== void 0 && !LEGACY_HARNESSES.includes(harness)) {
+        if (!isHarnessId(harness)) throw new LocalStoreError("storage_failed");
+        if (channel.harnesses[user] !== harness) {
+          const next = { ...channel.harnesses, [user]: harness };
+          await writeJsonAtomic(path.join(channel.dir, "harness.json"), next);
+          channel.harnesses = next;
+        }
+        delete disk.content.harness;
+      } else if (harness !== void 0 && Object.hasOwn(channel.harnesses, user)) {
+        const next = { ...channel.harnesses };
+        delete next[user];
+        await writeJsonAtomic(path.join(channel.dir, "harness.json"), next);
+        channel.harnesses = next;
+      } else if (harness === void 0 && channel.harnesses[user]) {
+        stored.content.harness = channel.harnesses[user];
+      }
+    }
     const logPath = path.join(channel.dir, "log.jsonl");
     if (channel.validBytes !== void 0) {
       await fs.truncate(logPath, channel.validBytes);
@@ -227,7 +258,7 @@ async function openLocalStore(input) {
     channel.handle ??= await fs.open(logPath, "a", 384);
     const start = (await channel.handle.stat()).size;
     try {
-      await channel.handle.writeFile(JSON.stringify(stored) + "\n", "utf8");
+      await channel.handle.writeFile(JSON.stringify(disk) + "\n", "utf8");
     } catch (error2) {
       channel.validBytes = start;
       throw error2;
@@ -861,7 +892,7 @@ function agentJoinRoutes() {
       if (Object.hasOwn(body, "sessionId") && !validAgentSessionId(body.sessionId)) return fail2(400, "invalid_link");
       if (Object.hasOwn(body, "rejoinSecret") && !validAgentRejoinSecret(body.rejoinSecret)) return fail2(400, "invalid_link");
       const harness = body.harness;
-      if (!HARNESSES.includes(harness)) return fail2(400, "invalid_harness");
+      if (!isHarnessId(harness)) return fail2(400, "invalid_harness");
       const url = new URL(body.link);
       if (url.origin !== ctx.origin && url.origin !== ctx.origin.replace("://127.0.0.1:", "://localhost:")) return fail2(404, "link_unavailable");
       const token = url.pathname.slice("/join/".length);
@@ -939,6 +970,14 @@ function agentJoinRoutes() {
   ];
 }
 
+// src/local/wire.ts
+function legacyHarnessView(content) {
+  if (!("harness" in content) || content.harness === void 0 || LEGACY_HARNESSES.includes(content.harness)) return content;
+  const legacy = { ...content };
+  delete legacy.harness;
+  return legacy;
+}
+
 // src/local/routes/rooms.ts
 var fail3 = (status, error2) => ({ status, json: { error: error2 } });
 function serial2() {
@@ -1077,10 +1116,14 @@ function roomRoutes() {
         if ("status" in current) return current;
         events = ctx.store.eventsAfter(caller.roomId, after, 200);
       }
-      const delivered = req.query.get("prev") === "1" ? events : events.map((event) => {
-        const legacy = { ...event };
-        delete legacy.previousContent;
-        return legacy;
+      const delivered = events.map((event) => {
+        const view = { ...event };
+        if (req.query.get("prev") !== "1") delete view.previousContent;
+        if (req.query.get("wire") !== "2") {
+          view.content = legacyHarnessView(view.content);
+          if (view.previousContent) view.previousContent = legacyHarnessView(view.previousContent);
+        }
+        return view;
       });
       return { status: 200, json: { events: delivered, next: events.at(-1)?.seq ?? after } };
     }),
@@ -1088,7 +1131,11 @@ function roomRoutes() {
       const before = req.query.get("before");
       const limit = req.query.get("limit") ?? "50";
       if (before !== null && !/^\$[A-Za-z0-9_-]{1,128}$/u.test(before) || !/^\d{1,3}$/u.test(limit) || Number(limit) < 1 || Number(limit) > 100) return fail3(400, "invalid_request");
-      return { status: 200, json: ctx.store.history(caller.roomId, before ?? void 0, Number(limit)) };
+      const page = ctx.store.history(caller.roomId, before ?? void 0, Number(limit));
+      return { status: 200, json: req.query.get("wire") === "2" ? page : {
+        ...page,
+        events: page.events.map((event) => ({ ...event, content: legacyHarnessView(event.content) }))
+      } };
     }),
     route("POST", /^\/api\/local\/rooms\/([^/]+)\/send$/u, "joined", async (req, params, ctx) => {
       const decoded = decodeWith(() => {
@@ -1114,9 +1161,9 @@ function roomRoutes() {
         return { status: 200, json: { eventId: event.eventId } };
       });
     }),
-    route("GET", /^\/api\/local\/rooms\/([^/]+)\/members$/u, "joined", async (_req, _params, ctx, caller) => ({
+    route("GET", /^\/api\/local\/rooms\/([^/]+)\/members$/u, "joined", async (req, _params, ctx, caller) => ({
       status: 200,
-      json: { members: ctx.store.members(caller.roomId) }
+      json: { members: ctx.store.members(caller.roomId).map((member) => req.query.get("wire") === "2" ? member : legacyHarnessView(member)) }
     })),
     route("PUT", /^\/api\/local\/rooms\/([^/]+)\/members\/([^/]+)$/u, "joined", async (req, params, ctx, caller) => {
       let target;
@@ -1211,7 +1258,7 @@ function ownerRoutes(options = {}) {
       const wait = req.query.get("wait") ?? "0";
       if (since !== null && !/^\d{1,15}$/u.test(since) || !/^\d{1,2}$/u.test(wait) || Number(wait) > LOCAL_LONG_POLL_MAX_S) return fail4(400, "invalid_request");
       if (since !== null && Number(since) === store.revision() && Number(wait) > 0) await store.waitForRevision(Number(since), Number(wait) * 1e3, req.signal);
-      return { status: 200, json: { revision: store.revision(), channels: store.listChannels() } };
+      return { status: 200, json: { revision: store.revision(), channels: store.listChannels().map((summary) => ({ ...summary, members: summary.members.map((member) => req.query.get("wire") === "2" ? member : legacyHarnessView(member)) })) } };
     }),
     route("GET", /^\/api\/local\/channels\/by-operation\/([^/]+)$/u, async (_req, params, { store }) => {
       const id = decodeParam(params[0]);
@@ -1219,10 +1266,10 @@ function ownerRoutes(options = {}) {
       const roomId = store.findByOperation(id);
       return roomId === void 0 ? fail4(404, "not_found") : { status: 200, json: { roomId } };
     }),
-    route("GET", /^\/api\/local\/channels\/([^/]+)$/u, async (_req, params, { store }) => {
+    route("GET", /^\/api\/local\/channels\/([^/]+)$/u, async (req, params, { store }) => {
       const roomId = channelParam(params[0], store);
       const summary = roomId === null ? void 0 : store.channelSummary(roomId);
-      return summary === void 0 ? fail4(404, "not_found") : { status: 200, json: summary };
+      return summary === void 0 ? fail4(404, "not_found") : { status: 200, json: { ...summary, members: summary.members.map((member) => req.query.get("wire") === "2" ? member : legacyHarnessView(member)) } };
     }),
     route("POST", /^\/api\/local\/channels$/u, async (req, _params, ctx) => {
       const body = req.body;
@@ -1242,7 +1289,7 @@ function ownerRoutes(options = {}) {
       const open2 = ctx.mintOpenToken(roomId);
       return { status: 201, json: { roomId, name: store.channelName(roomId), selfLink: `${ctx.origin}/join/${self.token}`, shareLink: `${ctx.origin}/join/${share.token}`, openUrl: `${ctx.origin}/open/${open2.token}`, expiresAt: self.expiresAt } };
     }, { serial: true }),
-    route("DELETE", /^\/api\/local\/channels\/([^/]+)$/u, async (_req, params, ctx) => {
+    route("DELETE", /^\/api\/local\/channels\/([^/]+)$/u, async (req, params, ctx) => {
       const roomId = channelParam(params[0], ctx.store);
       if (roomId === null) return fail4(404, "not_found");
       await ctx.store.deleteChannel(roomId);
@@ -1639,7 +1686,7 @@ async function runLocalCommand(argv, deps = {}) {
         return null;
       }
       const body = await response.json();
-      return body?.ok === true && body.pid === file.pid && typeof body.version === "string" ? body : null;
+      return body?.ok === true && body.pid === file.pid ? body : null;
     } catch {
       return null;
     }
@@ -1691,7 +1738,7 @@ async function runLocalCommand(argv, deps = {}) {
       return value;
     }
     async function channels() {
-      const page = await call("GET", "/api/local/channels");
+      const page = await call("GET", "/api/local/channels?wire=2");
       if (!Array.isArray(page?.channels)) throw new CliError("internal_error");
       return page.channels;
     }
@@ -1735,7 +1782,7 @@ async function runLocalCommand(argv, deps = {}) {
         break;
       }
       case "status":
-        result = { running: true, origin: file.origin, pid: file.pid, version: healthy.version, channels: (await channels()).length };
+        result = { running: true, origin: file.origin, pid: file.pid, version: healthy.version, ...olderHelperVersion(healthy.version) ? { detail: "older helper in use" } : {}, channels: (await channels()).length };
         break;
       case "stop": {
         if (await call("POST", "/api/local/shutdown") !== null) throw new CliError("internal_error");

package/dist/{chunk-AUJEUKVM.mjs → chunk-IQJQ4RF5.mjs}

@@ -5,7 +5,7 @@ import {
   object,
   readMatrixUserId,
   version
-} from "./chunk-SN3STAO2.mjs";
+} from "./chunk-NKX3SLS7.mjs";
 
 // ../contracts/src/delivery/decode.ts
 var MAX_IDENTIFIER_BYTES = 512;

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

@@ -114,6 +114,39 @@ function utcTimestamp(input, path) {
   return input;
 }
 
+// ../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/agent-names.ts
 var MAX_AGENT_NAME_BYTES = 80;
 var unsafe = /[\u0000-\u001f\u007f-\u009f\u061c\u200b-\u200f\u2028-\u202e\u2060-\u2069\ufeff]/u;
@@ -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");
@@ -178,7 +212,10 @@ export {
   utcTimestamp,
   reserved,
   validateAgentName,
-  HARNESSES,
+  isHarnessId,
+  LEGACY_HARNESSES,
+  HARNESS_REGISTRY,
+  harnessInfo,
   M1_LABEL_MAX_BYTES,
   agentConfirmPagePath,
   readHarness,