khala-cli 0.4.0 → 0.4.2

package/dist/{chunk-THNGKHZD.mjs → chunk-2OO725IZ.mjs}

@@ -4,17 +4,17 @@ import {
   MODEL_NAMES,
   checkName,
   isDefaultAgentName
-} from "./chunk-AAX35R7C.mjs";
+} from "./chunk-BZ53MZEE.mjs";
 import {
   StateError,
   readJson,
   stateRoot,
   writeJsonAtomic
-} from "./chunk-AYPFL33Q.mjs";
+} from "./chunk-B5BFL7OD.mjs";
 import {
   HARNESSES,
   validateAgentName
-} from "./chunk-SMCTSZYU.mjs";
+} from "./chunk-N6LMHR7P.mjs";
 
 // src/local/identity.ts
 import * as fs from "node:fs/promises";
@@ -143,9 +143,17 @@ async function requestJoin(input, deps = {}) {
   const label = validateAgentName(input.label);
   if (!label.ok || [...label.name].length > 40) fail("invalid_label");
   const { origin } = parsed;
-  const response = await post(new URL("/api/agent/join", origin), origin, { link: input.link, harness: input.harness, label: label.name }, deps);
-  const body = await json(response);
-  const code = serverCode(body);
+  const url = new URL("/api/agent/join", origin);
+  const base = { link: input.link, harness: input.harness, label: label.name };
+  const rejoin = input.sessionId !== void 0 && input.rejoinSecret !== void 0;
+  let response = await post(url, origin, rejoin ? { ...base, sessionId: input.sessionId, rejoinSecret: input.rejoinSecret } : base, deps);
+  let body = await json(response);
+  let 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-H2INZPFK.mjs → chunk-46PTKRZC.mjs}

@@ -1,4 +1,16 @@
 import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
+import {
+  ensureHelper,
+  helperPaths,
+  readHelperFile
+} from "./chunk-YP45XTOH.mjs";
+import {
+  parseChannelLink,
+  resolveLocalOwnerName
+} from "./chunk-2OO725IZ.mjs";
+import {
+  KHALA_AGENT_VERSION
+} from "./chunk-MHZWR4A3.mjs";
 import {
   LOCAL_AGENT_DEVICE_PREFIX,
   LOCAL_IDLE_EXIT_MS,
@@ -9,39 +21,28 @@ import {
   LOCAL_OWNER_USER_ID,
   LOCAL_TOKEN_BYTES,
   base64url,
+  checkName,
   decodeChannelSecrets,
   decodeLocalEvent,
   decodeOwnerProfile,
-  ensureHelper,
-  helperPaths,
+  defaultAgentName,
+  defaultHumanColor,
+  isDefaultAgentName,
+  isHumanColorId,
   isLocalRoomId,
   localRoomKey,
   newLocalAgentUserId,
   newLocalEventId,
   newLocalRoomId,
-  readHelperFile
-} from "./chunk-3WTRQEVS.mjs";
-import {
-  parseChannelLink,
-  resolveLocalOwnerName
-} from "./chunk-THNGKHZD.mjs";
-import {
-  KHALA_AGENT_VERSION
-} from "./chunk-ENNXMNKZ.mjs";
-import {
-  checkName,
-  defaultAgentName,
-  defaultHumanColor,
-  isDefaultAgentName,
-  isHumanColorId,
   normalizeInitials
-} from "./chunk-AAX35R7C.mjs";
+} from "./chunk-BZ53MZEE.mjs";
 import {
   StateError,
   ensureStateDir,
   readJson,
   writeJsonAtomic
-} from "./chunk-AYPFL33Q.mjs";
+} from "./chunk-B5BFL7OD.mjs";
+import "./chunk-5GLTKWJ5.mjs";
 import {
   CHANNEL_EVENT_TYPE,
   DEFAULT_LISTENING_MODE,
@@ -55,13 +56,16 @@ import {
   decodeWith,
   encodeChannelEvent,
   memberListeningMode,
+  memberRenameContent,
   object,
-  utf8Length
-} from "./chunk-SMCTSZYU.mjs";
+  utf8Length,
+  validAgentRejoinSecret,
+  validAgentSessionId
+} from "./chunk-N6LMHR7P.mjs";
 import {
   bundle
-} from "./chunk-NX27G3SB.mjs";
-import "./chunk-ZXJIFFFU.mjs";
+} from "./chunk-RW3DXWNC.mjs";
+import "./chunk-A3LJU4JA.mjs";
 
 // src/local/cli.ts
 import { setTimeout as sleepDefault } from "node:timers/promises";
@@ -112,6 +116,7 @@ async function openLocalStore(input) {
       byEventId: /* @__PURE__ */ new Map(),
       byTxn: /* @__PURE__ */ new Map(),
       lastMember: /* @__PURE__ */ new Map(),
+      previousMembers: /* @__PURE__ */ new Map(),
       secrets: emptySecrets(),
       waiters: /* @__PURE__ */ new Set()
     };
@@ -126,6 +131,8 @@ async function openLocalStore(input) {
     } else if (event.type === "m.room.name") channel.name = event.content.name;
     else if (event.type === "m.room.member") {
       const user = event.content.user;
+      const previous = channel.lastMember.get(user)?.event.content;
+      if (previous) channel.previousMembers.set(event.eventId, previous);
       const firstSeq = channel.lastMember.get(user)?.firstSeq ?? event.seq;
       channel.lastMember.set(user, { event, firstSeq });
     }
@@ -380,7 +387,11 @@ async function openLocalStore(input) {
         if (events[mid].seq <= after) lo = mid + 1;
         else hi = mid;
       }
-      return structuredClone(events.slice(lo, lo + Math.max(0, limit)));
+      const channel = channels.get(roomId);
+      return structuredClone(events.slice(lo, lo + Math.max(0, limit)).map((event) => {
+        const previousContent = channel?.previousMembers.get(event.eventId);
+        return previousContent ? { ...event, previousContent } : event;
+      }));
     },
     waitForEvent: (roomId, after, timeoutMs, signal) => {
       const channel = channels.get(roomId);
@@ -390,7 +401,17 @@ async function openLocalStore(input) {
       const channel = channels.get(roomId);
       const cutoff = before !== void 0 ? channel?.byEventId.get(before)?.seq : Infinity;
       if (!channel || cutoff === void 0 || limit <= 0) return { events: [] };
-      const candidates = channel.events.filter((e) => e.seq < cutoff && (e.type === "m.room.message" || e.type === "com.khala.event.v1"));
+      const previousMembers = /* @__PURE__ */ new Map();
+      const candidates = [];
+      for (const event of channel.events) {
+        if (event.seq >= cutoff) break;
+        if (event.type === "m.room.member") {
+          const user = event.content.user;
+          const content = memberRenameContent(event.content, previousMembers.get(user));
+          previousMembers.set(user, event.content);
+          if (content) candidates.push({ ...event, type: "com.khala.event.v1", content });
+        } else if (event.type === "m.room.message" || event.type === "com.khala.event.v1") candidates.push(event);
+      }
       const events = candidates.slice(-limit);
       return { events: structuredClone(events), ...candidates.length > events.length ? { nextBefore: events[0].eventId } : {} };
     },
@@ -422,11 +443,20 @@ async function openLocalStore(input) {
       }
       return null;
     }),
-    setMemberToken: (roomId, userId, tokenSha256) => enqueue(async () => {
+    memberForSession: (roomId, sessionKey) => {
+      const channel = channels.get(roomId);
+      if (!channel) return void 0;
+      const userId = Object.entries(channel.secrets.members).find(([, secret]) => secret.sessionKey === sessionKey)?.[0];
+      return userId ? member(channel, userId) : void 0;
+    },
+    setMemberToken: (roomId, userId, tokenSha256, sessionKey) => enqueue(async () => {
       const channel = requireChannel(roomId);
       const next = { ...channel.secrets.members };
       if (tokenSha256 === null) delete next[userId];
-      else if (userId !== LOCAL_OWNER_USER_ID) next[userId] = { tokenSha256 };
+      else if (userId !== LOCAL_OWNER_USER_ID) {
+        const identity = sessionKey ?? channel.secrets.members[userId]?.sessionKey;
+        next[userId] = { tokenSha256, ...identity ? { sessionKey: identity } : {} };
+      }
       await saveSecrets(channel, { ...channel.secrets, members: next });
     }),
     agentForToken: (token) => {
@@ -779,8 +809,10 @@ function agentJoinRoutes() {
       prune(ctx);
       if (typeof req.body !== "object" || req.body === null || Array.isArray(req.body)) return fail(400, "invalid_link");
       const body = req.body;
-      if (!Object.hasOwn(body, "link") || Object.keys(body).some((key) => !["link", "harness", "label"].includes(key))) return fail(400, "invalid_link");
+      if (!Object.hasOwn(body, "link") || Object.keys(body).some((key) => !["link", "harness", "label", "sessionId", "rejoinSecret"].includes(key))) return fail(400, "invalid_link");
       if (typeof body.link !== "string" || !parseChannelLink(body.link)) return fail(400, "invalid_link");
+      if (Object.hasOwn(body, "sessionId") && !validAgentSessionId(body.sessionId)) return fail(400, "invalid_link");
+      if (Object.hasOwn(body, "rejoinSecret") && !validAgentRejoinSecret(body.rejoinSecret)) return fail(400, "invalid_link");
       const harness = body.harness;
       if (!HARNESSES.includes(harness)) return fail(400, "invalid_harness");
       const url = new URL(body.link);
@@ -793,22 +825,32 @@ function agentJoinRoutes() {
         const link = await ctx.store.consumeLink(token);
         if (!link || !ctx.store.hasChannel(link.roomId)) return fail(404, "link_unavailable");
         const roomId = link.roomId;
+        const sessionKey = body.sessionId === void 0 || body.rejoinSecret === void 0 ? void 0 : sha256hex(JSON.stringify([harness, body.sessionId, body.rejoinSecret]));
+        const previous = sessionKey ? ctx.store.memberForSession(roomId, sessionKey) : void 0;
         const taken = new Set(ctx.store.members(roomId).map((member) => member.displayName.toLowerCase()));
         let n = 1;
         while (taken.has(defaultAgentName(username, harness, n).toLowerCase())) n++;
         const checked = checkName(defaultAgentName(username, harness, n), "agent");
         if (!checked.ok) return fail(503, "unavailable");
-        let userId = newLocalAgentUserId(ctx.random(4));
-        for (let attempt = 0; attempt < 5 && ctx.store.channelOfMember(userId) !== void 0; attempt++) userId = newLocalAgentUserId(ctx.random(4));
-        if (ctx.store.channelOfMember(userId) !== void 0) return fail(503, "unavailable");
+        let userId = previous?.userId ?? newLocalAgentUserId(ctx.random(4));
+        for (let attempt = 0; attempt < 5 && !previous && ctx.store.channelOfMember(userId) !== void 0; attempt++) userId = newLocalAgentUserId(ctx.random(4));
+        if (!previous && ctx.store.channelOfMember(userId) !== void 0) return fail(503, "unavailable");
         const deviceId = "KH_LOCAL_" + userId.slice("@agent-".length, -":local".length);
         const accessToken = b64(ctx.random(LOCAL_TOKEN_BYTES));
         await ctx.store.append(roomId, {
           type: "m.room.member",
           sender: LOCAL_OWNER_USER_ID,
-          content: { user: userId, membership: "invite", displayname: checked.name, kind: "agent", harness, invitedBy: LOCAL_OWNER_USER_ID }
+          content: {
+            user: userId,
+            membership: "invite",
+            displayname: previous?.displayName ?? checked.name,
+            kind: "agent",
+            harness,
+            invitedBy: LOCAL_OWNER_USER_ID,
+            ...previous ? { "com.khala.listening_mode": previous.listeningMode ?? "sync" } : {}
+          }
         });
-        await ctx.store.setMemberToken(roomId, userId, sha256hex(accessToken));
+        await ctx.store.setMemberToken(roomId, userId, sha256hex(accessToken), sessionKey);
         const joinId = b64(ctx.random(16)), pollSecret = b64(ctx.random(LOCAL_TOKEN_BYTES));
         const expiresAt = ctx.now() + LOCAL_LINK_TTL_MS;
         const credentials = { homeserver: ctx.origin, userId, accessToken, deviceId, roomId, transport: "local" };
@@ -887,6 +929,7 @@ function memberEvents(store, roomId, userId) {
   let current;
   let joined;
   let announced = false;
+  let joins = 0;
   for (; ; ) {
     const page = store.eventsAfter(roomId, after, 200);
     for (const event of page) {
@@ -897,13 +940,14 @@ function memberEvents(store, roomId, userId) {
         } else if (current?.content["membership"] !== "join") {
           joined = event;
           announced = false;
+          joins++;
         }
         current = event;
       } else if (joined && event.type === "com.khala.event.v1" && event.sender === LOCAL_OWNER_USER_ID && event.txnId === announcementTxn(joined)) {
         announced = true;
       }
     }
-    if (page.length < 200) return { current, joined, announced };
+    if (page.length < 200) return { current, joined, announced, joins };
     after = page.at(-1).seq;
   }
 }
@@ -952,14 +996,18 @@ function roomRoutes() {
         let event;
         let joined;
         let announced = false;
+        let rejoin = false;
         if (caller.member.membership === "join") {
-          ({ current: event, joined, announced } = memberEvents(ctx.store, caller.roomId, caller.userId));
+          let joins;
+          ({ current: event, joined, announced, joins } = memberEvents(ctx.store, caller.roomId, caller.userId));
+          rejoin = joins > 1;
         } else {
+          rejoin = memberEvents(ctx.store, caller.roomId, caller.userId).joins > 0;
           event = await ctx.store.append(caller.roomId, { type: "m.room.member", sender: caller.userId, content: memberContent(caller.member) });
           joined = event;
         }
         if (caller.kind === "agent" && joined && !announced) {
-          const encoded = encodeChannelEvent({ kind: "member", summary: `${joined.content["displayname"]} joined`, status: "info", source: { system: "khala-local" } });
+          const encoded = encodeChannelEvent({ kind: "member", summary: `${joined.content["displayname"]} ${rejoin ? "rejoined" : "joined"}`, status: "info", source: { system: "khala-local" } });
           if (encoded.ok) await ctx.store.append(caller.roomId, {
             type: "com.khala.event.v1",
             sender: LOCAL_OWNER_USER_ID,
@@ -985,7 +1033,12 @@ function roomRoutes() {
         if ("status" in current) return current;
         events = ctx.store.eventsAfter(caller.roomId, after, 200);
       }
-      return { status: 200, json: { events, next: events.at(-1)?.seq ?? after } };
+      const delivered = req.query.get("prev") === "1" ? events : events.map((event) => {
+        const legacy = { ...event };
+        delete legacy.previousContent;
+        return legacy;
+      });
+      return { status: 200, json: { events: delivered, next: events.at(-1)?.seq ?? after } };
     }),
     route("GET", /^\/api\/local\/rooms\/([^/]+)\/messages$/u, "joined", async (req, _params, ctx, caller) => {
       const before = req.query.get("before");
@@ -1232,14 +1285,14 @@ async function cascade(store, previous, next) {
       const members = store.members(roomId);
       const taken = new Set(members.map((m) => m.displayName.toLowerCase()));
       const owner2 = members.find((m) => m.userId === LOCAL_OWNER_USER_ID);
-      if (owner2 && owner2.displayName !== next) {
+      if (owner2 && previous !== next) {
         try {
           await store.append(roomId, {
             type: "m.room.member",
             sender: LOCAL_OWNER_USER_ID,
             content: { user: LOCAL_OWNER_USER_ID, membership: owner2.membership, displayname: next, kind: "human" }
           });
-          taken.delete(owner2.displayName.toLowerCase());
+          taken.delete(previous.toLowerCase());
           taken.add(next.toLowerCase());
         } catch {
         }

package/dist/chunk-5GLTKWJ5.mjs

@@ -0,0 +1 @@
+import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);

package/dist/{chunk-3YSVED2R.mjs → chunk-7MQAMABY.mjs}

@@ -4,8 +4,8 @@ import {
 } from "./chunk-VUE2DDYY.mjs";
 import {
   bundle
-} from "./chunk-NX27G3SB.mjs";
-import "./chunk-ZXJIFFFU.mjs";
+} from "./chunk-RW3DXWNC.mjs";
+import "./chunk-A3LJU4JA.mjs";
 
 // src/install/main.ts
 import { spawnSync } from "node:child_process";

package/dist/{chunk-ZXJIFFFU.mjs → chunk-A3LJU4JA.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.0" };
+var define_KHALA_BUNDLE_default = { name: "khala-cli", version: "0.4.2" };
 
 export {
   define_KHALA_BUNDLE_default

package/dist/{chunk-AYPFL33Q.mjs → chunk-B5BFL7OD.mjs}

@@ -1,7 +1,7 @@
 import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
 import {
   HARNESSES
-} from "./chunk-SMCTSZYU.mjs";
+} from "./chunk-N6LMHR7P.mjs";
 
 // src/state.ts
 import { constants } from "node:fs";
@@ -105,7 +105,7 @@ function readStatus(files) {
   return readJson(files.status);
 }
 async function writeStateFile(dir, name, value) {
-  if (!["join.json", "session.json", "cursor.json", "status.json", "mode.json"].includes(name)) throw new StateError("storage_failed");
+  if (!["join.json", "session.json", "cursor.json", "status.json", "mode.json", "rejoin.json"].includes(name)) throw new StateError("storage_failed");
   await writeJsonAtomic(path.join(dir, name), value);
 }
 function readStateFile(dir, name) {