khala-cli 0.4.8 → 0.4.9

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

@@ -9,9 +9,13 @@ import {
   utcTimestamp,
   utf8Length,
   version
-} from "./chunk-NKX3SLS7.mjs";
+} from "./chunk-NPSQNCOY.mjs";
+import {
+  init_define_KHALA_BUNDLE
+} from "./chunk-7R3EIDGR.mjs";
 
 // ../contracts/src/m1/channel-event.ts
+init_define_KHALA_BUNDLE();
 var CHANNEL_EVENT_TYPE = "com.khala.event.v1";
 var CHANNEL_EVENT_STATUSES = ["info", "pending", "success", "failure", "attention"];
 var MAX_CHANNEL_EVENT_BYTES = 4096;

package/dist/{chunk-Z4JF2M5C.mjs → chunk-DJM23SIU.mjs}

@@ -3,19 +3,20 @@ import {
   WATCH_USAGE,
   mentions,
   monitorArmed,
+  monitorOwner,
   run,
   watchSession
-} from "./chunk-FH34B3I3.mjs";
-import "./chunk-5BQTYU66.mjs";
-import "./chunk-VKQ3KUYO.mjs";
-import "./chunk-CBPLCCRZ.mjs";
-import "./chunk-IQJQ4RF5.mjs";
-import "./chunk-NKX3SLS7.mjs";
-import "./chunk-7HBRFY3Z.mjs";
+} from "./chunk-NIX5F4LT.mjs";
+import "./chunk-NGSYOVQ4.mjs";
+import "./chunk-TANCKTDK.mjs";
+import "./chunk-NPSQNCOY.mjs";
+import "./chunk-K7V7X6WU.mjs";
+import "./chunk-7R3EIDGR.mjs";
 export {
   WATCH_USAGE,
   run as default,
   mentions,
   monitorArmed,
+  monitorOwner,
   watchSession
 };

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

@@ -1,26 +1,22 @@
 import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
 import {
   KHALA_AGENT_VERSION
-} from "./chunk-5LIE5GUU.mjs";
+} from "./chunk-ANSR4IAW.mjs";
 import {
   bundle
-} from "./chunk-APMWDF6B.mjs";
-import {
-  StateError,
-  ensureStateDir,
-  readJson,
-  stateRoot
-} from "./chunk-CBPLCCRZ.mjs";
+} from "./chunk-3KDOTR54.mjs";
 import {
   LISTENING_MODES
-} from "./chunk-IQJQ4RF5.mjs";
+} from "./chunk-NGSYOVQ4.mjs";
 import {
   HARNESS_REGISTRY,
   M1_LABEL_MAX_BYTES,
+  StateError,
   array,
   decodeWith,
   displayText,
   elementPath,
+  ensureStateDir,
   fail,
   harnessInfo,
   identifier,
@@ -29,17 +25,23 @@ import {
   object,
   readHarness,
   readHttpUrl,
+  readJson,
   readMatrixUserId,
   readRoomId,
   reserved,
   safeInteger,
+  stateRoot,
   text,
   utcTimestamp,
   utf8Length,
   version
-} from "./chunk-NKX3SLS7.mjs";
+} from "./chunk-NPSQNCOY.mjs";
+import {
+  init_define_KHALA_BUNDLE
+} from "./chunk-7R3EIDGR.mjs";
 
 // src/client.ts
+init_define_KHALA_BUNDLE();
 var KhalaClientError = class extends Error {
   constructor(code, message, extra) {
     super(message ?? code);
@@ -51,7 +53,11 @@ var KhalaClientError = class extends Error {
   code;
 };
 
+// ../contracts/src/m1/local.ts
+init_define_KHALA_BUNDLE();
+
 // ../contracts/src/m1/colors.ts
+init_define_KHALA_BUNDLE();
 var HUMAN_COLOR_IDS = ["red", "orange", "amber", "lime", "green", "teal", "blue", "indigo", "purple", "pink"];
 function isHumanColorId(value) {
   return typeof value === "string" && HUMAN_COLOR_IDS.includes(value);
@@ -73,6 +79,7 @@ function readHumanColorId(input, path2) {
 }
 
 // ../contracts/src/m1/initials.ts
+init_define_KHALA_BUNDLE();
 function normalizeInitials(input) {
   if (typeof input !== "string") return null;
   const nfc = input.normalize("NFC");
@@ -88,6 +95,12 @@ function readHumanInitials(input, path2) {
   return input;
 }
 
+// ../contracts/src/m1/names.ts
+init_define_KHALA_BUNDLE();
+
+// ../contracts/src/m1/participants.ts
+init_define_KHALA_BUNDLE();
+
 // ../contracts/src/m1/names.ts
 var USERNAME_MIN = 2;
 var USERNAME_MAX = 24;
@@ -488,6 +501,7 @@ function decodeChannelSecrets(input) {
 }
 
 // src/local/lifecycle.ts
+init_define_KHALA_BUNDLE();
 import * as fs from "node:fs/promises";
 import { close as closeFd } from "node:fs";
 import path from "node:path";

package/dist/{chunk-CJTCU755.mjs → chunk-FZEH2IXZ.mjs}

@@ -1,19 +1,25 @@
 import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
-import "./chunk-5GLTKWJ5.mjs";
+import "./chunk-SSO5RFOX.mjs";
 import {
   CHANNEL_EVENT_TYPE,
   encodeChannelEvent,
   memberRenameContent
-} from "./chunk-54XFVSEC.mjs";
+} from "./chunk-BV45NK7K.mjs";
 import {
   LISTENING_MODE_COMMAND_TYPE,
   LISTENING_MODE_MEMBER_KEY,
   memberListeningMode
-} from "./chunk-IQJQ4RF5.mjs";
-import "./chunk-NKX3SLS7.mjs";
-import "./chunk-7HBRFY3Z.mjs";
+} from "./chunk-NGSYOVQ4.mjs";
+import {
+  StateError
+} from "./chunk-NPSQNCOY.mjs";
+import {
+  init_define_KHALA_BUNDLE
+} from "./chunk-7R3EIDGR.mjs";
 
 // src/matrix/session.ts
+init_define_KHALA_BUNDLE();
+import { randomUUID } from "node:crypto";
 import { createClient, ClientEvent, RoomEvent, MatrixEventEvent, SyncState, Direction, Method, EventType } from "matrix-js-sdk";
 function message(event) {
   const type = event.getType();
@@ -36,8 +42,10 @@ function message(event) {
 }
 async function createAgentMatrixSession(creds, opts) {
   const started = Date.now();
+  const rejoinTxnId = `khala.rejoin.${randomUUID()}`;
   const log = (line) => opts?.log?.(line);
-  const client = createClient({ baseUrl: creds.homeserver, userId: creds.userId, accessToken: creds.accessToken, deviceId: creds.deviceId });
+  const persistent = opts?.cryptoStore ? await (await import("./chunk-PAJ4JJPV.mjs")).openCryptoStore(opts.cryptoStore.dir, opts.cryptoStore.root, creds) : void 0;
+  const client = createClient({ ...persistent ? { store: persistent.sync } : {}, baseUrl: creds.homeserver, userId: creds.userId, accessToken: creds.accessToken, deviceId: creds.deviceId });
   const handlers = /* @__PURE__ */ new Set();
   const ended = /* @__PURE__ */ new Set();
   const modeHandlers = /* @__PURE__ */ new Set();
@@ -48,8 +56,9 @@ async function createAgentMatrixSession(creds, opts) {
   const cancellations = /* @__PURE__ */ new Set();
   let joinedRoom;
   let stopped = false;
+  let recovering = persistent?.restored ?? false;
   const deliver = (event) => {
-    if (stopped || !liveEvents.has(event)) return;
+    if (stopped || recovering || !liveEvents.has(event)) return;
     const command = event.getType() === LISTENING_MODE_COMMAND_TYPE && !event.isDecryptionFailure() && event.getId() && event.getRoomId() && event.getSender() ? { eventId: event.getId(), roomId: event.getRoomId(), sender: event.getSender(), ts: event.getTs(), content: event.getContent() } : void 0;
     const m = command ?? message(event);
     if (!m) {
@@ -85,7 +94,7 @@ async function createAgentMatrixSession(creds, opts) {
     }
   };
   const timeline = (event, _room, toStart, _removed, data) => {
-    if (stopped || toStart || data?.liveEvent === false) return;
+    if (stopped || toStart || data?.liveEvent === false && !persistent?.restored) return;
     liveEvents.add(event);
     void client.decryptEventIfNeeded(event).then(() => deliver(event), () => log("live_decryption_failed"));
   };
@@ -152,9 +161,35 @@ async function createAgentMatrixSession(creds, opts) {
       check();
     });
   };
-  const stop = async () => {
+  let stopping;
+  let wipe = false;
+  const stop = () => stopping ??= stopSession();
+  const stopSession = async () => {
     if (stopped) return;
     stopped = true;
+    if (wipe && persistent?.forgetIdentity) {
+      try {
+        await persistent.forgetIdentity();
+      } catch {
+        log("crypto_cleanup_failed");
+      }
+    }
+    let syncStopped;
+    if (persistent && client.getSyncState() !== null && client.getSyncState() !== SyncState.Stopped) {
+      syncStopped = new Promise((resolve, reject) => {
+        const done = (state) => {
+          if (state === SyncState.Stopped) finish();
+        };
+        const timer = setTimeout(() => finish(new Error("crypto_sync_stop_timeout")), 1e4);
+        const finish = (error) => {
+          clearTimeout(timer);
+          client.removeListener(ClientEvent.Sync, done);
+          if (error) reject(error);
+          else resolve();
+        };
+        client.on(ClientEvent.Sync, done);
+      });
+    }
     client.stopClient();
     client.removeListener(RoomEvent.Timeline, timeline);
     client.removeListener(MatrixEventEvent.Decrypted, decrypted);
@@ -166,6 +201,14 @@ async function createAgentMatrixSession(creds, opts) {
     handlers.clear();
     modeHandlers.clear();
     ended.clear();
+    if (persistent) {
+      try {
+        await syncStopped;
+        if (wipe) await persistent.wipe();
+      } finally {
+        await persistent.close();
+      }
+    }
   };
   const membershipEnded = (room, membership) => {
     if (stopped || room.roomId !== joinedRoom || !["leave", "ban"].includes(membership)) return;
@@ -174,7 +217,11 @@ async function createAgentMatrixSession(creds, opts) {
   const end = (reason) => {
     if (stopped) return;
     const listeners = [...ended];
-    void stop();
+    wipe = true;
+    void stop().catch(() => {
+      log("crypto_cleanup_failed");
+      console.error("khala: crypto_cleanup_failed");
+    });
     for (const handler of listeners) {
       try {
         handler(reason);
@@ -184,7 +231,14 @@ async function createAgentMatrixSession(creds, opts) {
     }
   };
   try {
-    await client.initRustCrypto({ useIndexedDB: false });
+    if (persistent) await persistent.sync.startup();
+    try {
+      await client.initRustCrypto(persistent ? { useIndexedDB: true, cryptoDatabasePrefix: persistent.prefix } : { useIndexedDB: false });
+    } catch (error) {
+      if (!persistent?.restored || error instanceof StateError && error.code === "unsafe_state_dir") throw error;
+      wipe = true;
+      throw new (await import("./chunk-PAJ4JJPV.mjs")).CryptoStoreCorruptError();
+    }
     const crypto = client.getCrypto();
     if (!crypto) throw new Error("crypto_unavailable");
     log(`crypto_version=${crypto.getVersion()}`);
@@ -227,6 +281,7 @@ async function createAgentMatrixSession(creds, opts) {
   }, ready, timeoutMs, error);
   return {
     userId: creds.userId,
+    ...persistent?.recovered ? { cryptoReset: true } : {},
     onEnded(handler) {
       if (!stopped) ended.add(handler);
       return () => {
@@ -277,16 +332,41 @@ async function createAgentMatrixSession(creds, opts) {
         const owner = ownJoin.getContent()["com.khala.invited_by"];
         if (typeof owner === "string") inviters.set(roomId, owner);
         const event = encodeChannelEvent({ kind: "member", summary: `${ownJoin.getContent().displayname ?? creds.userId} rejoined`, status: "info", source: { system: "khala-agent" } });
-        if (event.ok) await client.sendEvent(roomId, CHANNEL_EVENT_TYPE, event.value, `khala.rejoin.${creds.deviceId}`);
+        if (event.ok) await client.sendEvent(roomId, CHANNEL_EVENT_TYPE, event.value, rejoinTxnId);
       }
       if (membership !== "join" && inviters.has(roomId)) {
         const content = { ...ownJoin.getContent(), membership: "join", "com.khala.invited_by": inviters.get(roomId) };
         await client.sendStateEvent(roomId, EventType.RoomMember, content, creds.userId);
       }
-      joinTimes.set(roomId, membership === "join" ? rejoinedAt : ownJoin.getTs());
+      const joinedAt = persistent?.joinedAt ?? (membership === "join" ? rejoinedAt : ownJoin.getTs());
+      await persistent?.rememberJoin(joinedAt);
+      joinTimes.set(roomId, joinedAt);
+      if (persistent?.restored) {
+        let token = null;
+        const seenTokens = /* @__PURE__ */ new Set();
+        for (; ; ) {
+          if (stopped) throw new Error("session_stopped");
+          const page = await client.createMessagesRequest(roomId, token, 100, Direction.Backward);
+          let reachedJoin = false;
+          for (const raw of page.chunk) {
+            const event = client.getEventMapper()({ ...raw, room_id: roomId });
+            if (event.getTs() < joinedAt) {
+              reachedJoin = true;
+              continue;
+            }
+            liveEvents.add(event);
+            await client.decryptEventIfNeeded(event).catch(() => log("recovery_decryption_failed"));
+          }
+          if (reachedJoin || page.chunk.length === 0 || !page.end) break;
+          if (seenTokens.has(page.end)) throw new Error("recovery_pagination_stalled");
+          seenTokens.add(page.end);
+          token = page.end;
+        }
+      }
+      recovering = false;
       if (!joinedRoom) client.on(RoomEvent.MyMembership, membershipEnded);
       joinedRoom = roomId;
-      for (const event of liveEvents) {
+      for (const event of [...liveEvents].sort((a, b) => a.getTs() - b.getTs())) {
         if (event.getRoomId() === roomId) deliver(event);
       }
     },
@@ -310,7 +390,7 @@ async function createAgentMatrixSession(creds, opts) {
           undecryptable++;
           const eventId = event.getId(), sender = event.getSender();
           if (eventId && sender && eventId !== before) {
-            const body = "[Encrypted message unavailable: this device does not have its key. Messages from before joining may not have been shared.]";
+            const body = "[Encrypted message unavailable: this device does not have its key. Keys may not have been shared for messages sent before joining or while this agent was offline.]";
             messages.push({
               eventId,
               roomId,