khala-cli 0.4.5 → 0.4.7

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

@@ -5,22 +5,20 @@ import {
   reportReady,
   requestJoin,
   saveHostedUsername
-} from "./chunk-Y2DRTRBJ.mjs";
-import {
-  KHALA_AGENT_VERSION
-} from "./chunk-SQXDATEC.mjs";
+} from "./chunk-ODTSGEID.mjs";
 import {
   createEventKeyFilter,
   isWakeEntry,
-  readActivity,
   toEventInboxEntry
-} from "./chunk-IR3VN2ID.mjs";
+} from "./chunk-OAFYPBCP.mjs";
 import {
   KhalaClientError,
-  LOCAL_OWNER_USER_ID,
-  MODEL_NAMES
-} from "./chunk-TZKEQIHP.mjs";
-import "./chunk-OLZ62X7S.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,
@@ -28,34 +26,36 @@ import {
   formatChannelEventLine,
   memberRenameContent,
   statusFor
-} from "./chunk-P5CP32X2.mjs";
+} from "./chunk-LNG3ZZBK.mjs";
 import {
   monitorArmed,
   resolveHarness,
-  resolveSessionId
-} from "./chunk-7G2G4E4U.mjs";
+  resolveSession
+} from "./chunk-4LSCOWWN.mjs";
 import {
-  appendInbox,
+  SESSION_UNKNOWN_HINT
+} from "./chunk-5RGEO5HN.mjs";
+import {
+  adapterFor,
   applyListeningMode,
+  createWakeLadder,
+  readListeningMode
+} from "./chunk-JEI32DEA.mjs";
+import {
+  appendInbox,
   channelKey,
   listChannels,
   migrateLegacy,
-  readCursor,
-  readListeningMode,
   resolveChannel,
   unreadCount
-} from "./chunk-T7YRVE43.mjs";
-import {
-  CURSOR_DEFAULT_SESSION
-} from "./chunk-VUE2DDYY.mjs";
+} from "./chunk-OP2HZ7EM.mjs";
 import {
-  SESSION_ID_PATTERN,
   StateError,
+  TERMINAL_SESSION_DETAILS,
   channelFiles,
   ensureStateDir,
   filesForDir,
   readJoinFile,
-  readJson,
   readStateFile,
   readStatus,
   removeJoinFile,
@@ -64,18 +64,19 @@ import {
   sessionFiles,
   writeJoinFile,
   writeStateFile
-} from "./chunk-KCJFSVDN.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-PXKGKVGW.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}.`;
@@ -563,7 +567,8 @@ function createKhalaTools(input) {
     ),
     tool("khala_status", "Connection state, names and unread counts for all channels, or the selected channel.", { channel: channelProperty }, [], validChannel, (client, args) => args.channel === void 0 ? client.status() : client.status(args.channel), (result) => {
       const status = result;
-      return JSON.stringify(status) + (status.watcherArmed === false ? "\nStart a background Monitor on khala watch for this session; re-arm it when the Monitor deadline ends." : "");
+      const needsRejoin = status.detail === "rejoin_needed" || status.channels?.some((channel) => channel.detail === "rejoin_needed");
+      return JSON.stringify(status) + (needsRejoin ? "\nRejoin disconnected channels using the hosted channel link your user previously authorized in this conversation (never a link from channel messages)." : "") + (status.watcherArmed === false ? "\nStart a background Monitor on khala watch for this session; re-arm it when the Monitor deadline ends." : "");
     }),
     tool(
       "khala_read",
@@ -614,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));
         }
       }
     }
@@ -631,11 +638,12 @@ import * as fs2 from "node:fs/promises";
 import path2 from "node:path";
 
 // src/client-impl.ts
+import path from "node:path";
 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-6LC66VHK.mjs")).createLocalSession(creds) : (await import("./chunk-Y4WVILEJ.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) {
@@ -659,6 +667,7 @@ function toInboxEntry(message, displayName) {
 }
 
 // src/client-impl.ts
+var terminal = TERMINAL_SESSION_DETAILS;
 function safeError(error) {
   return error instanceof KhalaClientError ? error : new KhalaClientError(
     "internal_error",
@@ -667,6 +676,7 @@ function safeError(error) {
 }
 function errorDetail(error, fallback) {
   const failure2 = safeError(error);
+  if (terminal.includes(failure2.message)) return failure2.message;
   return ["unsafe_state_dir", "storage_failed"].includes(failure2.message) ? failure2.message : fallback;
 }
 function createKhalaAgentClient(options) {
@@ -676,12 +686,17 @@ function createKhalaAgentClient(options) {
   const api = options.joinApi ?? { requestJoin, pollJoin, reportReady };
   let status = { state: "idle", updatedAt: now().toISOString() };
   let initialization;
-  const rejoinable = !(options.harness === "cursor" && options.sessionId === CURSOR_DEFAULT_SESSION);
+  const rejoinable = options.rejoinable ?? adapterFor(options.harness)?.sessionSources[0]?.rejoinable(options.sessionId) ?? false;
   let rejoinSecret;
+  let savedSecret;
+  let resuming;
+  const workspace = path.resolve(options.env?.PWD ?? process.cwd());
+  const secretHash = () => rejoinSecret === void 0 ? "" : createHash("sha256").update(rejoinSecret).digest("hex");
   const attempts = /* @__PURE__ */ new Map();
   const channels = /* @__PURE__ */ new Map();
   const stored = /* @__PURE__ */ new Map();
   const roomSlots = /* @__PURE__ */ new Set();
+  const priorStatuses = /* @__PURE__ */ new Map();
   const roomChanges = /* @__PURE__ */ new Map();
   let closed = false;
   let closing;
@@ -704,7 +719,7 @@ function createKhalaAgentClient(options) {
     if (closed) detail = "closed";
     const values = [.../* @__PURE__ */ new Set([...channels.values(), ...attempts.values()])].map((channel) => channel.status);
     const state = closed ? "disconnected" : values.some((item) => item.state === "connected") ? "connected" : values.some((item) => item.state === "send_failed") ? "send_failed" : [...attempts.values()].some((item) => current(item) && item.status.state === "joining") ? "joining" : values.some((item) => item.state === "disconnected") ? "disconnected" : "idle";
-    const single = channels.size === 1 ? [...channels.values()][0].status : void 0;
+    const single = channels.size === 1 ? [...channels.values()][0].status : stored.size === 1 ? priorStatuses.get(refs()[0].key) : void 0;
     status = {
       state,
       ...single?.channelName !== void 0 ? { channelName: single.channelName } : {},
@@ -753,7 +768,7 @@ function createKhalaAgentClient(options) {
       await migrateLegacy(filesForDir(dir));
       if (rejoinable) {
         const saved = (await readStateFile(dir, "rejoin.json"))?.secret;
-        if (validAgentRejoinSecret(saved)) rejoinSecret = saved;
+        if (validAgentRejoinSecret(saved)) savedSecret = rejoinSecret = saved;
         else await writeStateFile(dir, "rejoin.json", { secret: rejoinSecret = randomBytes(32).toString("base64url") });
       }
       for (const ref of await listChannels(filesForDir(dir))) {
@@ -761,7 +776,10 @@ function createKhalaAgentClient(options) {
         if (!existing || existing.legacy && !ref.legacy) stored.set(ref.key, ref);
         roomSlots.add(ref.key);
         await removeStateFile(ref.files.dir, "session.json");
-        await writeStateFile(ref.files.dir, "status.json", { state: "disconnected", channelName: ref.channelName, updatedAt: now().toISOString() });
+        const previous = await readStateFile(ref.files.dir, "status.json");
+        const snapshot = { ...previous, state: "disconnected", ...previous?.channelName ?? ref.channelName ? { channelName: previous?.channelName ?? ref.channelName } : {}, updatedAt: now().toISOString() };
+        priorStatuses.set(ref.key, snapshot);
+        await writeStateFile(ref.files.dir, "status.json", snapshot);
       }
       await removeStateFile(dir, "session.json");
       await writeAggregate();
@@ -788,7 +806,7 @@ function createKhalaAgentClient(options) {
     if (attempts.get(attempt.link) === attempt) attempts.delete(attempt.link);
   }
   function pendingAttempts() {
-    return [...attempts.values()].filter((attempt) => current(attempt) && !attempt.joined && (!attempt.credentials || !stored.has(channelKey(attempt.credentials.roomId))));
+    return [...attempts.values()].filter((attempt) => current(attempt) && !attempt.joined && (!attempt.restore || !stored.has(channelKey(attempt.restore.roomId))) && (!attempt.credentials || !stored.has(channelKey(attempt.credentials.roomId))));
   }
   function select(channel) {
     const pending = pendingAttempts();
@@ -844,10 +862,16 @@ function createKhalaAgentClient(options) {
       signal.addEventListener("abort", abort, { once: true });
       if (signal.aborted) abort();
     });
+    void aborted.catch(() => {
+    });
     const wait = (promise) => Promise.race([promise, aborted]);
     try {
       const input = { origin: attempt.created.origin, joinId: attempt.created.joinId, pollSecret: attempt.created.pollSecret };
-      const credentials = await wait(api.pollJoin(input, { signal, ...fetchDeps }));
+      const credentials = attempt.restore?.localCredentials ?? await wait(api.pollJoin(input, { signal, ...fetchDeps }));
+      if (attempt.restore && credentials.roomId !== attempt.restore.roomId) {
+        await removeStateFile(attempt.files.dir, "resume.json");
+        throw new KhalaClientError("not_connected", "unauthorized");
+      }
       if (!current(attempt)) return;
       const key = channelKey(credentials.roomId);
       const claim = (roomChanges.get(key) ?? Promise.resolve()).catch(() => {
@@ -903,7 +927,10 @@ function createKhalaAgentClient(options) {
       const session = await wait(starting);
       if (session.onEnded) attempt.unsubscribeEnded = session.onEnded((reason) => {
         if (!current(attempt)) return;
-        void setStatus(attempt, "disconnected", reason).catch(() => {
+        void (async () => {
+          if (terminal.includes(reason) && attempt.files) await removeStateFile(attempt.files.dir, "resume.json");
+          await setStatus(attempt, "disconnected", reason);
+        })().catch(() => {
         });
         attempt.controller.abort();
       });
@@ -950,7 +977,7 @@ function createKhalaAgentClient(options) {
       };
       attempt.unsubscribe = session.onMessage(intake);
       attempt.unsubscribeMode = session.onListeningModeCommand(intakeMode);
-      await wait(api.reportReady(input, fetchDeps));
+      if (!attempt.restore?.localCredentials) await wait(api.reportReady(input, fetchDeps));
       await wait(session.waitForInvite(credentials.roomId, options.inviteTimeoutMs ?? 12e4));
       await wait(session.join(credentials.roomId));
       if (!current(attempt)) return;
@@ -969,18 +996,23 @@ function createKhalaAgentClient(options) {
         });
       }
       await removeJoinFile(filesForDir(dir), attempt.link);
-      if (current(attempt)) await setStatus(attempt, "connected");
+      if (current(attempt)) {
+        if (rejoinable && rejoinSecret) await writeStateFile(channelDir, "resume.json", { link: attempt.link, label: attempt.label, workspace, secretHash: secretHash(), roomId: credentials.roomId, ...credentials.transport === "local" ? { localCredentials: credentials } : {} });
+        await setStatus(attempt, "connected");
+      }
     } catch (error) {
       if (current(attempt)) {
         attempt.joined = false;
-        const failure2 = safeError(error);
+        const localStatus = attempt.restore?.localCredentials && typeof error === "object" && error !== null && "status" in error ? error.status : void 0;
+        const failure2 = localStatus === 401 || localStatus === 403 || localStatus === 404 ? new KhalaClientError("not_connected", localStatus === 401 ? "unauthorized" : localStatus === 403 ? "removed" : "channel_deleted") : safeError(error);
         const inviteTimeout = error instanceof Error && error.message === "invite_timeout";
-        attempt.failure = new KhalaClientError(failure2.code, failure2.code === "join_expired" ? "join_expired" : inviteTimeout ? "invite_timeout" : errorDetail(error, failure2.code));
+        attempt.failure = new KhalaClientError(failure2.code, failure2.code === "join_expired" ? "join_expired" : inviteTimeout ? "invite_timeout" : errorDetail(failure2, failure2.code));
+        if (terminal.includes(failure2.message) && attempt.files) await removeStateFile(attempt.files.dir, "resume.json");
         await cleanup(attempt);
         await setStatus(
           attempt,
           failure2.code === "join_expired" ? "idle" : "disconnected",
-          failure2.code === "join_expired" ? "join_expired" : inviteTimeout ? "invite_timeout" : errorDetail(error, failure2.code)
+          failure2.code === "join_expired" ? "join_expired" : inviteTimeout ? "invite_timeout" : errorDetail(failure2, failure2.code)
         );
         attempt.controller.abort();
       }
@@ -1002,65 +1034,109 @@ function createKhalaAgentClient(options) {
     if (current(attempt) && attempt.joined) return "connected";
     return current(attempt) ? "pending" : "failed";
   }
-  return {
-    join(link, label2) {
-      const task = (joins.get(link) ?? Promise.resolve()).catch(() => {
-      }).then(async () => {
-        await initialize();
+  function join(link, label2, restore) {
+    const task = (joins.get(link) ?? Promise.resolve()).catch(() => {
+    }).then(async () => {
+      await initialize();
+      if (closed) throw new KhalaClientError("not_connected");
+      const existing = attempts.get(link);
+      if (existing && current(existing)) {
+        if (existing.joined) return { state: "connected", channelName: existing.status.channelName, channels: refs().map((ref) => ref.roomId) };
+        return { state: "awaiting_confirmation", confirmUrl: existing.created.confirmUrl, ...existing.created.autoConfirmed === true ? { autoConfirmed: true } : {} };
+      }
+      if (existing) await cancel(existing);
+      const saved = await readJoinFile(filesForDir(dir), link);
+      if (saved?.link === link && Date.parse(saved.expiresAt) <= now().getTime()) {
+        await removeJoinFile(filesForDir(dir), link);
+        await writeAggregate("join_expired");
+        throw new KhalaClientError("join_expired");
+      }
+      if (closed) throw new KhalaClientError("not_connected");
+      const attempt = {
+        link,
+        label: label2,
+        ...restore ? { restore, files: channelFiles(filesForDir(dir), restore.roomId) } : {},
+        created: { origin: "", joinId: "", pollSecret: "", confirmUrl: "", expiresAt: "" },
+        controller: new AbortController(),
+        task: Promise.resolve(),
+        joined: false,
+        status: { state: "joining", updatedAt: now().toISOString() },
+        appends: Promise.resolve(),
+        acceptEventKey: createEventKeyFilter()
+      };
+      if (restore) attempt.status = { ...await readStateFile(attempt.files.dir, "status.json"), state: "joining", updatedAt: now().toISOString() };
+      attempts.set(link, attempt);
+      if (restore) {
+        channels.set(channelKey(restore.roomId), attempt);
+        await setStatus(attempt, "joining");
+      }
+      try {
+        const signal = restore ? AbortSignal.any([attempt.controller.signal, AbortSignal.timeout(1e4)]) : attempt.controller.signal;
+        let releaseAbort;
+        const aborted = new Promise((_, reject) => {
+          releaseAbort = () => reject(new KhalaClientError("not_connected"));
+          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 } }, { ...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);
+        });
         if (closed) throw new KhalaClientError("not_connected");
-        const existing = attempts.get(link);
-        if (existing && current(existing)) {
-          if (existing.joined) return { state: "connected", channelName: existing.status.channelName, channels: refs().map((ref) => ref.roomId) };
-          return { state: "awaiting_confirmation", confirmUrl: existing.created.confirmUrl, ...existing.created.autoConfirmed === true ? { autoConfirmed: true } : {} };
-        }
-        if (existing) await cancel(existing);
-        const saved = await readJoinFile(filesForDir(dir), link);
-        if (saved?.link === link && Date.parse(saved.expiresAt) <= now().getTime()) {
-          await removeJoinFile(filesForDir(dir), link);
-          await writeAggregate("join_expired");
-          throw new KhalaClientError("join_expired");
+        if (restore && created.autoConfirmed !== true) {
+          throw new KhalaClientError("not_connected", "rejoin_needed");
         }
+        attempt.created = created;
+        const { joinId, pollSecret, confirmUrl, expiresAt } = created;
+        if (!restore?.localCredentials) await writeJoinFile(filesForDir(dir), link, { joinId, pollSecret, confirmUrl, expiresAt, link });
+        await writeAggregate();
+        attempt.task = background(attempt).catch(() => {
+        });
+        if (created.autoConfirmed !== true) return { state: "awaiting_confirmation", confirmUrl };
+      } catch (error) {
+        if (restore && terminal.includes(safeError(error).message)) await removeStateFile(attempt.files.dir, "resume.json");
+        if (restore && !closed && !attempt.controller.signal.aborted) await setStatus(attempt, "disconnected", safeError(error).message);
+        attempts.delete(link);
+        if (!closed) await writeAggregate(safeError(error).message);
+        throw safeError(error);
+      }
+      const outcome = await settleAutoConfirmed(attempt);
+      if (outcome === "connected") return { state: "connected", channelName: attempt.status.channelName ?? attempt.credentials.roomId, channels: refs().map((ref) => ref.roomId) };
+      if (outcome === "failed") {
         if (closed) throw new KhalaClientError("not_connected");
-        const attempt = {
-          link,
-          created: { origin: "", joinId: "", pollSecret: "", confirmUrl: "", expiresAt: "" },
-          controller: new AbortController(),
-          task: Promise.resolve(),
-          joined: false,
-          status: { state: "joining", updatedAt: now().toISOString() },
-          appends: Promise.resolve(),
-          acceptEventKey: createEventKeyFilter()
-        };
-        attempts.set(link, attempt);
-        try {
-          const created = await api.requestJoin({ link, harness: options.harness, label: label2, ...rejoinSecret === void 0 ? {} : { sessionId: options.sessionId, rejoinSecret } }, fetchDeps);
-          if (closed) throw new KhalaClientError("not_connected");
-          attempt.created = created;
-          const { joinId, pollSecret, confirmUrl, expiresAt } = created;
-          await writeJoinFile(filesForDir(dir), link, { joinId, pollSecret, confirmUrl, expiresAt, link });
-          await writeAggregate();
-          attempt.task = background(attempt).catch(() => {
+        throw attempt.failure ?? new KhalaClientError("internal_error", attempt.status.detail ?? "internal_error");
+      }
+      return { state: "awaiting_confirmation", confirmUrl: attempt.created.confirmUrl, autoConfirmed: true };
+    });
+    joins.set(link, task);
+    const release = () => {
+      if (joins.get(link) === task) joins.delete(link);
+    };
+    void task.then(release, release);
+    return task;
+  }
+  return {
+    join,
+    resume() {
+      return resuming ??= (async () => {
+        await initialize();
+        if (closed || !rejoinable) return;
+        await Promise.all(refs().map(async (ref) => {
+          const authorization = await readStateFile(ref.files.dir, "resume.json");
+          if (!authorization) return;
+          const previous = priorStatuses.get(ref.key);
+          if (terminal.includes(previous?.detail ?? "")) {
+            await removeStateFile(ref.files.dir, "resume.json");
+            return;
+          }
+          if (!savedSecret || authorization.secretHash !== secretHash() || authorization.workspace !== workspace || authorization.roomId !== ref.roomId || authorization.localCredentials && (authorization.localCredentials.transport !== "local" || authorization.localCredentials.roomId !== ref.roomId) || typeof authorization.link !== "string" || typeof authorization.label !== "string") {
+            await removeStateFile(ref.files.dir, "resume.json");
+            return;
+          }
+          void join(authorization.link, authorization.label, authorization).catch(() => {
           });
-          if (created.autoConfirmed !== true) return { state: "awaiting_confirmation", confirmUrl };
-        } catch (error) {
-          attempts.delete(link);
-          if (!closed) await writeAggregate(safeError(error).message);
-          throw safeError(error);
-        }
-        const outcome = await settleAutoConfirmed(attempt);
-        if (outcome === "connected") return { state: "connected", channelName: attempt.status.channelName ?? attempt.credentials.roomId, channels: refs().map((ref) => ref.roomId) };
-        if (outcome === "failed") {
-          if (closed) throw new KhalaClientError("not_connected");
-          throw attempt.failure ?? new KhalaClientError("internal_error", attempt.status.detail ?? "internal_error");
-        }
-        return { state: "awaiting_confirmation", confirmUrl: attempt.created.confirmUrl, autoConfirmed: true };
-      });
-      joins.set(link, task);
-      const release = () => {
-        if (joins.get(link) === task) joins.delete(link);
-      };
-      void task.then(release, release);
-      return task;
+        }));
+      })();
     },
     async status(channel) {
       await initialize();
@@ -1201,7 +1277,7 @@ function createKhalaAgentClient(options) {
         })));
         await Promise.all([...attempts.values()].map(async (attempt) => {
           await cancel(attempt);
-          await setStatus(attempt, "disconnected", "closed");
+          await setStatus(attempt, "disconnected", terminal.includes(attempt.status.detail ?? "") ? attempt.status.detail : "closed");
           await removeJoinFile(filesForDir(dir), attempt.link);
         }));
         await removeStateFile(dir, "session.json");
@@ -1212,210 +1288,24 @@ function createKhalaAgentClient(options) {
   };
 }
 
-// src/wake/codex.ts
-import path from "node:path";
-
-// src/wake/idle-wake.ts
-var CODEX_IDLE_WAKE_NOTICE = "Khala: channel messages are waiting. Continue.";
-function codexIdleWakeArgv(sessionId) {
-  return ["queue", "--thread", sessionId, "--message", CODEX_IDLE_WAKE_NOTICE];
-}
-
-// src/wake/idle-wake-process.ts
-import { spawn as nodeSpawn } from "node:child_process";
-var CODEX_QUEUE_ENV_ALLOWLIST = [
-  "PATH",
-  "HOME",
-  "USER",
-  "LOGNAME",
-  "SHELL",
-  "LANG",
-  "LC_ALL",
-  "TMPDIR",
-  "CODEX_HOME",
-  "XDG_CONFIG_HOME",
-  "XDG_DATA_HOME",
-  "XDG_STATE_HOME",
-  "XDG_RUNTIME_DIR"
-];
-function scrubbedQueueEnv(source) {
-  const env = {};
-  for (const name of CODEX_QUEUE_ENV_ALLOWLIST) {
-    const value = source[name];
-    if (value !== void 0) env[name] = value;
-  }
-  return env;
-}
-function createCodexQueueProcessPort(deps) {
-  const spawn = deps.spawn ?? ((command, argv, options) => nodeSpawn(command, [...argv], options));
-  const timeoutMs = deps.timeoutMs ?? 1e4;
-  return {
-    run(argv, signal) {
-      return new Promise((resolve) => {
-        if (signal.aborted) return resolve({ status: "not_started" });
-        let child;
-        try {
-          child = spawn(deps.command, argv, { shell: false, stdio: "ignore", env: scrubbedQueueEnv(deps.env) });
-        } catch {
-          return resolve({ status: "not_started" });
-        }
-        let timedOut = false;
-        let stopped = false;
-        let force = null;
-        const stop = () => {
-          if (stopped) return;
-          stopped = true;
-          child.kill("SIGTERM");
-          force = setTimeout(() => {
-            child.kill("SIGKILL");
-          }, 500);
-        };
-        const timer = setTimeout(() => {
-          timedOut = true;
-          stop();
-        }, timeoutMs);
-        signal.addEventListener("abort", stop, { once: true });
-        const settle = (outcome) => {
-          clearTimeout(timer);
-          if (force !== null) clearTimeout(force);
-          signal.removeEventListener("abort", stop);
-          resolve(outcome);
-        };
-        child.on("error", () => settle({ status: "not_started" }));
-        child.on("close", (code) => settle(timedOut ? { status: "lost", cause: "timeout" } : code === 0 ? { status: "queued" } : { status: "exited", code: code ?? -1 }));
-      });
-    }
-  };
-}
-
-// src/wake/codex.ts
-function createCodexWaker(deps) {
-  if (!SESSION_ID_PATTERN.test(deps.threadId)) throw new TypeError("invalid_thread_id");
-  const port = deps.port ?? createCodexQueueProcessPort({ command: "codex", env: process.env });
-  const now = deps.now ?? Date.now;
-  const stderr = deps.stderr ?? ((line) => {
-    process.stderr.write(line);
-  });
-  const controller = new AbortController();
-  let pending;
-  const wakesAtCount = /* @__PURE__ */ new Map();
-  const identities = /* @__PURE__ */ new Map();
-  let stopped = false;
-  let again = false;
-  let inFlight;
-  const warn = (warning, status) => {
-    try {
-      stderr(JSON.stringify({ ok: false, warning, ...status ? { status } : {} }) + "\n");
-    } catch {
-    }
-  };
-  const evaluate = async () => {
-    try {
-      const channels = await listChannels(deps.files);
-      const eligible = [];
-      const currentIdentities = /* @__PURE__ */ new Map();
-      for (const channel of channels) {
-        const session = await readJson(channel.files.session);
-        const metadata = channel.legacy ? null : await readJson(path.join(channel.files.dir, "channel.json"));
-        currentIdentities.set(channel.key, JSON.stringify([session?.roomId ?? channel.roomId, session?.userId, metadata?.joinedAt]));
-        if (await readListeningMode(channel.files) === "async") continue;
-        eligible.push({
-          channel,
-          counts: await unreadCount(channel.files.dir),
-          cursor: await readCursor(channel.files)
-        });
-      }
-      const keys = new Set(currentIdentities.keys());
-      const changed = /* @__PURE__ */ new Set();
-      for (const [key, identity] of currentIdentities) {
-        if (identities.get(key) !== identity) changed.add(key);
-      }
-      for (const key of identities.keys()) if (!keys.has(key)) changed.add(key);
-      if (changed.size) {
-        for (const [key, wakes2] of [...wakesAtCount]) {
-          const pairs2 = JSON.parse(key);
-          if (!pairs2.some(([id]) => changed.has(id))) continue;
-          wakesAtCount.delete(key);
-          const remainingPairs = pairs2.filter(([id]) => !changed.has(id));
-          if (!remainingPairs.length) continue;
-          const remaining = JSON.stringify(remainingPairs);
-          wakesAtCount.set(remaining, Math.max(wakes2, wakesAtCount.get(remaining) ?? 0));
-        }
-      }
-      for (const key of changed) identities.delete(key);
-      for (const [key, identity] of currentIdentities) identities.set(key, identity);
-      const pairs = eligible.map(({ channel, cursor }) => [channel.key, cursor.deliveredCount]).sort(([a], [b]) => a.localeCompare(b));
-      const budgetKey = JSON.stringify(pairs);
-      if (changed.size) {
-        const inheritedKey = JSON.stringify(pairs.filter(([key]) => !changed.has(key)));
-        const newUnread = eligible.some((item) => changed.has(item.channel.key) && item.counts.messages > 0);
-        wakesAtCount.set(budgetKey, newUnread ? 0 : wakesAtCount.get(inheritedKey) ?? 0);
-        if (newUnread || !eligible.some((item) => !changed.has(item.channel.key) && item.counts.messages > 0)) pending = void 0;
-      }
-      if (!eligible.some((item) => item.counts.messages > 0)) {
-        pending = void 0;
-        return;
-      }
-      const activity = await readActivity(deps.files);
-      if (pending && Date.parse(activity.updatedAt) > pending.at) pending = void 0;
-      const at = now();
-      if (pending && at - pending.at < (deps.retryAfterMs ?? 6e4)) return;
-      if (stopped || activity.state !== "idle") return;
-      const wakes = wakesAtCount.get(budgetKey) ?? 0;
-      if (wakes >= 2) return;
-      for (const { channel } of eligible) {
-        if (await readListeningMode(channel.files) === "async") {
-          pending = void 0;
-          return;
-        }
-      }
-      if (stopped) return;
-      pending = { at };
-      wakesAtCount.set(budgetKey, wakes + 1);
-      const outcome = await port.run(codexIdleWakeArgv(deps.threadId), controller.signal);
-      if (outcome.status !== "queued") warn("codex_queue_failed", outcome.status);
-    } catch {
-      warn("codex_waker_error");
-    }
-  };
-  const notify = () => {
-    if (stopped) return;
-    if (inFlight) {
-      again = true;
-      return;
-    }
-    inFlight = (async () => {
-      do {
-        again = false;
-        await evaluate();
-      } while (again && !stopped);
-    })().finally(() => {
-      inFlight = void 0;
-      if (again && !stopped) notify();
-    });
-  };
-  const timer = setInterval(notify, deps.pollMs ?? 1e3);
-  timer.unref();
-  return {
-    notify,
-    async stop() {
-      stopped = true;
-      again = false;
-      clearInterval(timer);
-      controller.abort();
-      await inFlight;
-    }
-  };
-}
-
 // src/mcp/wiring.ts
 function createRealClientFactory(env, deps = {}) {
-  return ({ harness, sessionId }) => {
+  return ({ harness, sessionId, rejoinable }) => {
     const files = sessionFiles(harness, sessionId, env);
-    const waker = harness === "codex" ? (deps.createWaker ?? createCodexWaker)({ files, threadId: sessionId }) : void 0;
+    const adapter = adapterFor(harness);
+    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() } : {}
     });
@@ -1426,7 +1316,10 @@ function createRealClientFactory(env, deps = {}) {
       const joinsDir = path2.join(files.dir, "joins");
       await ensureStateDir(joinsDir);
       await fs2.rm(joinsDir, { recursive: true, force: true });
+      await client.resume?.();
     })();
+    void initialize().catch(() => {
+    });
     return {
       async join(link, label2) {
         await initialize();
@@ -1435,7 +1328,7 @@ function createRealClientFactory(env, deps = {}) {
       async status(channel) {
         await initialize();
         const status = await (channel === void 0 ? client.status() : client.status(channel));
-        return harness === "claude" && ["connected", "send_failed"].includes(status.state) ? { ...status, watcherArmed: await monitorArmed(files) } : status;
+        return adapter?.watcherStatus && ["connected", "send_failed"].includes(status.state) ? { ...status, watcherArmed: await monitorArmed(files) } : status;
       },
       async read(limit, before, channel) {
         await initialize();
@@ -1507,17 +1400,23 @@ async function runMcpCommand(argv, deps) {
     return 2;
   }
   const clients = /* @__PURE__ */ new Map();
+  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, rejoinable });
+      clients.set(key, client);
+    }
+    return client;
+  };
+  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);
-      if (sessionId === null) return null;
-      let client = clients.get(sessionId);
-      if (client === void 0) {
-        client = deps.createClient({ harness, sessionId });
-        clients.set(sessionId, client);
-      }
-      return client;
+    async clientFor(meta) {
+      const session = await resolveSession(harness, meta, env);
+      return session === null ? null : clientForSession(session);
     }
   });
   try {