agent-shim 8.13.0 → 8.14.0

package/dist/cli.cjs

@@ -61710,7 +61710,7 @@ function registerIdentityCommand(program2, deps) {
 // package.json
 var package_default = {
   name: "agent-shim",
-  version: "8.13.0",
+  version: "8.14.0",
   description: "A profile manager and launcher for Claude Code that lets one person run multiple logins from one machine while controlling what gets shared between them.",
   license: "MIT",
   author: "Joseph Mearman <joseph@mearman.co.uk>",
@@ -71793,31 +71793,54 @@ function credentialOfJson(parsed) {
     anthropicClientPlatform: typeof anthropicClientPlatform === "string" ? anthropicClientPlatform : void 0
   };
 }
+function sequenceNumOfJson(value2) {
+  return typeof value2 === "number" && Number.isInteger(value2) && value2 >= 0 ? value2 : void 0;
+}
 function createRcCredentialStore(fs19, dir) {
   fs19.mkdirPrivate(dir);
   const fileFor = (sessionId) => import_node_path32.default.join(dir, `${sessionId}.json`);
+  const readParsed = (sessionId) => {
+    const raw = fs19.readFileUtf8(fileFor(sessionId));
+    if (raw === void 0) {
+      return void 0;
+    }
+    let parsed;
+    try {
+      parsed = JSON.parse(raw);
+    } catch {
+      return void 0;
+    }
+    return isRecord4(parsed) ? parsed : void 0;
+  };
   return {
     read: (sessionId) => {
       if (!isSafeSessionId(sessionId)) {
         return void 0;
       }
-      const raw = fs19.readFileUtf8(fileFor(sessionId));
-      if (raw === void 0) {
-        return void 0;
+      return credentialOfJson(readParsed(sessionId));
+    },
+    write: (sessionId, credential) => {
+      if (!isSafeSessionId(sessionId)) {
+        return;
       }
-      let parsed;
-      try {
-        parsed = JSON.parse(raw);
-      } catch {
+      const cursor3 = sequenceNumOfJson(readParsed(sessionId)?.highestSequenceNum);
+      const record2 = { ...credential, ...cursor3 === void 0 ? {} : { highestSequenceNum: cursor3 } };
+      fs19.writeFilePrivate(fileFor(sessionId), `${JSON.stringify(record2, null, 2)}
+`);
+    },
+    readCursor: (sessionId) => {
+      if (!isSafeSessionId(sessionId)) {
         return void 0;
       }
-      return credentialOfJson(parsed);
+      return sequenceNumOfJson(readParsed(sessionId)?.highestSequenceNum);
     },
-    write: (sessionId, credential) => {
+    writeCursor: (sessionId, highestSequenceNum) => {
       if (!isSafeSessionId(sessionId)) {
         return;
       }
-      fs19.writeFilePrivate(fileFor(sessionId), `${JSON.stringify(credential, null, 2)}
+      const credential = credentialOfJson(readParsed(sessionId));
+      const record2 = credential === void 0 ? { highestSequenceNum } : { ...credential, highestSequenceNum };
+      fs19.writeFilePrivate(fileFor(sessionId), `${JSON.stringify(record2, null, 2)}
 `);
     },
     remove: (sessionId) => {
@@ -72643,6 +72666,18 @@ function createRcEventFanout() {
 }
 function createRcStreamHub(deps) {
   const attachments = /* @__PURE__ */ new Map();
+  const lastSavedSequenceNums = /* @__PURE__ */ new Map();
+  const persistCursor = (sessionId) => {
+    if (deps.saveSequenceNum === void 0) {
+      return;
+    }
+    const cursor3 = deps.sequenceNumOf(sessionId);
+    if (cursor3 === void 0 || cursor3 === lastSavedSequenceNums.get(sessionId)) {
+      return;
+    }
+    deps.saveSequenceNum(sessionId, cursor3);
+    lastSavedSequenceNums.set(sessionId, cursor3);
+  };
   const birth = (sessionId) => {
     const controller = new AbortController();
     let stopped = false;
@@ -72679,7 +72714,7 @@ function createRcStreamHub(deps) {
     if (!isSuccessful3(presence.status)) {
       throw new Error(`the presence call answered HTTP ${String(presence.status)}: ${presence.body}`);
     }
-    const cursor3 = deps.sequenceNumOf(attachment.sessionId);
+    const cursor3 = deps.sequenceNumOf(attachment.sessionId) ?? deps.storedSequenceNumOf?.(attachment.sessionId);
     const resume = cursor3 === void 0 ? void 0 : { fromSequenceNum: cursor3 };
     const answer = await deps.dial.openStream(attachment.sessionId, headers, resume, attachment.controller.signal);
     if (answer.status === HTTP_STATUS.unauthorized) {
@@ -72713,6 +72748,7 @@ function createRcStreamHub(deps) {
       const credential = deps.credentialOf(attachment.sessionId);
       if (!live || credential?.authorization === void 0) {
         deps.log?.(`rc stream ${attachment.sessionId}: the attachment ended (${live ? "the session's client credential is no longer known" : "the tracker gave up on the session"})`);
+        persistCursor(attachment.sessionId);
         if (attachments.get(attachment.sessionId) === attachment) {
           attachments.delete(attachment.sessionId);
         }
@@ -72722,6 +72758,7 @@ function createRcStreamHub(deps) {
       try {
         outcome = await attempt(attachment, credential);
       } catch (error62) {
+        persistCursor(attachment.sessionId);
         if (attachment.isStopped()) {
           return;
         }
@@ -72734,6 +72771,7 @@ function createRcStreamHub(deps) {
         return;
       }
       if (outcome === "dropped") {
+        persistCursor(attachment.sessionId);
         deps.log?.(`rc stream ${attachment.sessionId}: the stream ended of its own accord, reconnecting`);
         retriedUnauthorized = false;
         continue;
@@ -72772,6 +72810,7 @@ function createRcStreamHub(deps) {
     },
     close: () => {
       for (const attachment of attachments.values()) {
+        persistCursor(attachment.sessionId);
         attachment.stop();
       }
       attachments.clear();
@@ -73107,7 +73146,8 @@ function realFrontDoorSupervisorPorts(paths) {
     credentialRecord: () => readRcSelfHostRecord(realFarmFs, paths.frontdoorDir),
     log
   }) : void 0;
-  const rcTracker = createRcSessionTracker({ now: () => Date.now(), idleMs: RC_IDLE_EXPIRY_MS, credentialStore: createRcCredentialStore(realFarmFs, paths.frontdoorRcCredentialsDir) });
+  const rcCredentialStore = createRcCredentialStore(realFarmFs, paths.frontdoorRcCredentialsDir);
+  const rcTracker = createRcSessionTracker({ now: () => Date.now(), idleMs: RC_IDLE_EXPIRY_MS, credentialStore: rcCredentialStore });
   const rcFanout = createRcEventFanout();
   const rcHub = createRcStreamHub({
     now: () => Date.now(),
@@ -73115,6 +73155,8 @@ function realFrontDoorSupervisorPorts(paths) {
     trackedSessions: () => rcTracker.list().map((session) => session.id),
     fileStreamEvent: rcTracker.fileStreamEvent,
     sequenceNumOf: rcTracker.sequenceNumOf,
+    storedSequenceNumOf: rcCredentialStore.readCursor,
+    saveSequenceNum: rcCredentialStore.writeCursor,
     dial: rcSelfHost ? lateRcStreamDial(rcSelfHostDialTarget) : realRcStreamDial(),
     fanout: rcFanout,
     newClientId: import_node_crypto12.randomUUID,

package/dist/index.cjs

@@ -4941,31 +4941,54 @@ function credentialOfJson(parsed) {
     anthropicClientPlatform: typeof anthropicClientPlatform === "string" ? anthropicClientPlatform : void 0
   };
 }
+function sequenceNumOfJson(value) {
+  return typeof value === "number" && Number.isInteger(value) && value >= 0 ? value : void 0;
+}
 function createRcCredentialStore(fs12, dir) {
   fs12.mkdirPrivate(dir);
   const fileFor = (sessionId) => import_node_path9.default.join(dir, `${sessionId}.json`);
+  const readParsed = (sessionId) => {
+    const raw = fs12.readFileUtf8(fileFor(sessionId));
+    if (raw === void 0) {
+      return void 0;
+    }
+    let parsed;
+    try {
+      parsed = JSON.parse(raw);
+    } catch {
+      return void 0;
+    }
+    return isRecord3(parsed) ? parsed : void 0;
+  };
   return {
     read: (sessionId) => {
       if (!isSafeSessionId(sessionId)) {
         return void 0;
       }
-      const raw = fs12.readFileUtf8(fileFor(sessionId));
-      if (raw === void 0) {
-        return void 0;
+      return credentialOfJson(readParsed(sessionId));
+    },
+    write: (sessionId, credential) => {
+      if (!isSafeSessionId(sessionId)) {
+        return;
       }
-      let parsed;
-      try {
-        parsed = JSON.parse(raw);
-      } catch {
+      const cursor = sequenceNumOfJson(readParsed(sessionId)?.highestSequenceNum);
+      const record = { ...credential, ...cursor === void 0 ? {} : { highestSequenceNum: cursor } };
+      fs12.writeFilePrivate(fileFor(sessionId), `${JSON.stringify(record, null, 2)}
+`);
+    },
+    readCursor: (sessionId) => {
+      if (!isSafeSessionId(sessionId)) {
         return void 0;
       }
-      return credentialOfJson(parsed);
+      return sequenceNumOfJson(readParsed(sessionId)?.highestSequenceNum);
     },
-    write: (sessionId, credential) => {
+    writeCursor: (sessionId, highestSequenceNum) => {
       if (!isSafeSessionId(sessionId)) {
         return;
       }
-      fs12.writeFilePrivate(fileFor(sessionId), `${JSON.stringify(credential, null, 2)}
+      const credential = credentialOfJson(readParsed(sessionId));
+      const record = credential === void 0 ? { highestSequenceNum } : { ...credential, highestSequenceNum };
+      fs12.writeFilePrivate(fileFor(sessionId), `${JSON.stringify(record, null, 2)}
 `);
     },
     remove: (sessionId) => {
@@ -5300,6 +5323,18 @@ function createRcEventFanout() {
 }
 function createRcStreamHub(deps) {
   const attachments = /* @__PURE__ */ new Map();
+  const lastSavedSequenceNums = /* @__PURE__ */ new Map();
+  const persistCursor = (sessionId) => {
+    if (deps.saveSequenceNum === void 0) {
+      return;
+    }
+    const cursor = deps.sequenceNumOf(sessionId);
+    if (cursor === void 0 || cursor === lastSavedSequenceNums.get(sessionId)) {
+      return;
+    }
+    deps.saveSequenceNum(sessionId, cursor);
+    lastSavedSequenceNums.set(sessionId, cursor);
+  };
   const birth = (sessionId) => {
     const controller = new AbortController();
     let stopped = false;
@@ -5336,7 +5371,7 @@ function createRcStreamHub(deps) {
     if (!isSuccessful3(presence.status)) {
       throw new Error(`the presence call answered HTTP ${String(presence.status)}: ${presence.body}`);
     }
-    const cursor = deps.sequenceNumOf(attachment.sessionId);
+    const cursor = deps.sequenceNumOf(attachment.sessionId) ?? deps.storedSequenceNumOf?.(attachment.sessionId);
     const resume = cursor === void 0 ? void 0 : { fromSequenceNum: cursor };
     const answer = await deps.dial.openStream(attachment.sessionId, headers, resume, attachment.controller.signal);
     if (answer.status === HTTP_STATUS.unauthorized) {
@@ -5370,6 +5405,7 @@ function createRcStreamHub(deps) {
       const credential = deps.credentialOf(attachment.sessionId);
       if (!live || credential?.authorization === void 0) {
         deps.log?.(`rc stream ${attachment.sessionId}: the attachment ended (${live ? "the session's client credential is no longer known" : "the tracker gave up on the session"})`);
+        persistCursor(attachment.sessionId);
         if (attachments.get(attachment.sessionId) === attachment) {
           attachments.delete(attachment.sessionId);
         }
@@ -5379,6 +5415,7 @@ function createRcStreamHub(deps) {
       try {
         outcome = await attempt(attachment, credential);
       } catch (error) {
+        persistCursor(attachment.sessionId);
         if (attachment.isStopped()) {
           return;
         }
@@ -5391,6 +5428,7 @@ function createRcStreamHub(deps) {
         return;
       }
       if (outcome === "dropped") {
+        persistCursor(attachment.sessionId);
         deps.log?.(`rc stream ${attachment.sessionId}: the stream ended of its own accord, reconnecting`);
         retriedUnauthorized = false;
         continue;
@@ -5429,6 +5467,7 @@ function createRcStreamHub(deps) {
     },
     close: () => {
       for (const attachment of attachments.values()) {
+        persistCursor(attachment.sessionId);
         attachment.stop();
       }
       attachments.clear();

package/dist/index.mjs

@@ -4711,31 +4711,54 @@ function credentialOfJson(parsed) {
     anthropicClientPlatform: typeof anthropicClientPlatform === "string" ? anthropicClientPlatform : void 0
   };
 }
+function sequenceNumOfJson(value) {
+  return typeof value === "number" && Number.isInteger(value) && value >= 0 ? value : void 0;
+}
 function createRcCredentialStore(fs12, dir) {
   fs12.mkdirPrivate(dir);
   const fileFor = (sessionId) => path9.join(dir, `${sessionId}.json`);
+  const readParsed = (sessionId) => {
+    const raw = fs12.readFileUtf8(fileFor(sessionId));
+    if (raw === void 0) {
+      return void 0;
+    }
+    let parsed;
+    try {
+      parsed = JSON.parse(raw);
+    } catch {
+      return void 0;
+    }
+    return isRecord3(parsed) ? parsed : void 0;
+  };
   return {
     read: (sessionId) => {
       if (!isSafeSessionId(sessionId)) {
         return void 0;
       }
-      const raw = fs12.readFileUtf8(fileFor(sessionId));
-      if (raw === void 0) {
-        return void 0;
+      return credentialOfJson(readParsed(sessionId));
+    },
+    write: (sessionId, credential) => {
+      if (!isSafeSessionId(sessionId)) {
+        return;
       }
-      let parsed;
-      try {
-        parsed = JSON.parse(raw);
-      } catch {
+      const cursor = sequenceNumOfJson(readParsed(sessionId)?.highestSequenceNum);
+      const record = { ...credential, ...cursor === void 0 ? {} : { highestSequenceNum: cursor } };
+      fs12.writeFilePrivate(fileFor(sessionId), `${JSON.stringify(record, null, 2)}
+`);
+    },
+    readCursor: (sessionId) => {
+      if (!isSafeSessionId(sessionId)) {
         return void 0;
       }
-      return credentialOfJson(parsed);
+      return sequenceNumOfJson(readParsed(sessionId)?.highestSequenceNum);
     },
-    write: (sessionId, credential) => {
+    writeCursor: (sessionId, highestSequenceNum) => {
       if (!isSafeSessionId(sessionId)) {
         return;
       }
-      fs12.writeFilePrivate(fileFor(sessionId), `${JSON.stringify(credential, null, 2)}
+      const credential = credentialOfJson(readParsed(sessionId));
+      const record = credential === void 0 ? { highestSequenceNum } : { ...credential, highestSequenceNum };
+      fs12.writeFilePrivate(fileFor(sessionId), `${JSON.stringify(record, null, 2)}
 `);
     },
     remove: (sessionId) => {
@@ -5070,6 +5093,18 @@ function createRcEventFanout() {
 }
 function createRcStreamHub(deps) {
   const attachments = /* @__PURE__ */ new Map();
+  const lastSavedSequenceNums = /* @__PURE__ */ new Map();
+  const persistCursor = (sessionId) => {
+    if (deps.saveSequenceNum === void 0) {
+      return;
+    }
+    const cursor = deps.sequenceNumOf(sessionId);
+    if (cursor === void 0 || cursor === lastSavedSequenceNums.get(sessionId)) {
+      return;
+    }
+    deps.saveSequenceNum(sessionId, cursor);
+    lastSavedSequenceNums.set(sessionId, cursor);
+  };
   const birth = (sessionId) => {
     const controller = new AbortController();
     let stopped = false;
@@ -5106,7 +5141,7 @@ function createRcStreamHub(deps) {
     if (!isSuccessful3(presence.status)) {
       throw new Error(`the presence call answered HTTP ${String(presence.status)}: ${presence.body}`);
     }
-    const cursor = deps.sequenceNumOf(attachment.sessionId);
+    const cursor = deps.sequenceNumOf(attachment.sessionId) ?? deps.storedSequenceNumOf?.(attachment.sessionId);
     const resume = cursor === void 0 ? void 0 : { fromSequenceNum: cursor };
     const answer = await deps.dial.openStream(attachment.sessionId, headers, resume, attachment.controller.signal);
     if (answer.status === HTTP_STATUS.unauthorized) {
@@ -5140,6 +5175,7 @@ function createRcStreamHub(deps) {
       const credential = deps.credentialOf(attachment.sessionId);
       if (!live || credential?.authorization === void 0) {
         deps.log?.(`rc stream ${attachment.sessionId}: the attachment ended (${live ? "the session's client credential is no longer known" : "the tracker gave up on the session"})`);
+        persistCursor(attachment.sessionId);
         if (attachments.get(attachment.sessionId) === attachment) {
           attachments.delete(attachment.sessionId);
         }
@@ -5149,6 +5185,7 @@ function createRcStreamHub(deps) {
       try {
         outcome = await attempt(attachment, credential);
       } catch (error) {
+        persistCursor(attachment.sessionId);
         if (attachment.isStopped()) {
           return;
         }
@@ -5161,6 +5198,7 @@ function createRcStreamHub(deps) {
         return;
       }
       if (outcome === "dropped") {
+        persistCursor(attachment.sessionId);
         deps.log?.(`rc stream ${attachment.sessionId}: the stream ended of its own accord, reconnecting`);
         retriedUnauthorized = false;
         continue;
@@ -5199,6 +5237,7 @@ function createRcStreamHub(deps) {
     },
     close: () => {
       for (const attachment of attachments.values()) {
+        persistCursor(attachment.sessionId);
         attachment.stop();
       }
       attachments.clear();

package/dist/types/index.d.ts

@@ -1648,18 +1648,22 @@ declare function realConnectCertStore(paths: {
 }): ConnectCertStore;
 
 /**
- * The persisted half of the tracker's client credential: the OAuth-kind bearer and protocol headers a Remote Control session's client-half calls were last observed with, written per session id so a later door generation can still attach to a session whose create crossed an earlier one.
+ * The persisted half of the tracker's client credential and of its sequence cursor: the OAuth-kind bearer and protocol headers a Remote Control session's client-half calls were last observed with, and the highest sequence number the door's stream attachment had confirmed when its last attachment boundary passed, written per session id so a later door generation can still attach to a session whose create crossed an earlier one and resume its read stream from where the last generation left off.
  *
- * The tracker holds the credential in memory only, and the worker's recurring calls carry the worker JWT rather than the OAuth bearer, so a door that starts after the session's create (an idle shutdown and restart, a release upgrade, a reboot) would never learn it: nothing the door can observe re-states it until some client-half call happens to cross. Since the session outlives any one door process, the credential must outlive the process too. It is the same secret the identity's own store already holds on the same machine, so persisting it adds a second copy inside the same trust boundary, at the same owner-only protection: one JSON file per session, mode 0600, under the door's own front-door directory.
+ * The tracker holds both in memory only, and the worker's recurring calls carry the worker JWT rather than the OAuth bearer, so a door that starts after the session's create (an idle shutdown and restart, a release upgrade, a reboot) would never learn the credential: nothing the door can observe re-states it until some client-half call happens to cross. Since the session outlives any one door process, the credential must outlive the process too, and so must the cursor, or every restarted generation would re-read the stream from its head. The credential is the same secret the identity's own store already holds on the same machine, so persisting it adds a second copy inside the same trust boundary, at the same owner-only protection: one JSON file per session, mode 0600, under the door's own front-door directory, with the cursor (no secret, but the same file and the same lifecycle) beside it. The native client does exactly this: its `bridge-session` transcript entry carries `lastSequenceNum` beside the session id.
  *
- * A file is removed when the tracker observes the session closing (the conflict header, or an accepted archive). Nothing else removes it: the tracker's idle sweep is not a close (a quiet session is not a dead one, and a resumed session must re-attach), and the credential's own expiry is the protocol's to judge, as a 401 on the dial the hub already retries and backs off from. A session that ends without an observable close leaves its file behind, overwritten only if the same id is ever observed again.
+ * Each half is written at its own boundaries (the credential whenever an OAuth-kind bearer is observed, the cursor when the stream hub's attachment reaches a boundary), so each write preserves the other half, and neither is written per stream event. A file is removed when the tracker observes the session closing (the conflict header, or an accepted archive). Nothing else removes it: the tracker's idle sweep is not a close (a quiet session is not a dead one, and a resumed session must re-attach), and the credential's own expiry is the protocol's to judge, as a 401 on the dial the hub already retries and backs off from. A session that ends without an observable close leaves its file behind, overwritten only if the same id is ever observed again.
  */
 interface RcCredentialStore {
     /** The session's last observed client credential, or undefined when none was ever persisted for it (or what was persisted does not parse). */
     readonly read: (sessionId: string) => RcObservedCredential | undefined;
-    /** Persists the session's client credential, replacing whatever was held for it. */
+    /** Persists the session's client credential, replacing whatever was held for it and keeping the session's persisted cursor. */
     readonly write: (sessionId: string, credential: RcObservedCredential) => void;
-    /** Forgets the session's persisted credential, succeeding silently when none was held. */
+    /** The session's persisted sequence cursor, or undefined when none was ever persisted for it (or what was persisted is not a usable number). */
+    readonly readCursor: (sessionId: string) => number | undefined;
+    /** Persists the session's sequence cursor, keeping whatever credential the same file holds. */
+    readonly writeCursor: (sessionId: string, highestSequenceNum: number) => void;
+    /** Forgets the session's persisted record, credential and cursor together, succeeding silently when none was held. */
     readonly remove: (sessionId: string) => void;
 }
 /** Creates the credential store over one directory: one owner-only JSON file per session id. */
@@ -2061,6 +2065,10 @@ interface RcStreamHubDeps {
     readonly fileStreamEvent: (sessionId: string, event: RcStreamEnvelope) => void;
     /** Reads the session's sequence cursor: the highest number the door has seen, from the stream or from its own confirmed writes. */
     readonly sequenceNumOf: (sessionId: string) => number | undefined;
+    /** Reads the session's persisted sequence cursor, consulted only when the tracker's in-memory cursor is undefined at attach time (a door generation that started after the session's traffic, the same fresh-generation case the persisted credential solves for attaching at all), so that generation's first stream resumes where the last one left off instead of at the stream's head. */
+    readonly storedSequenceNumOf?: (sessionId: string) => number | undefined;
+    /** Persists the session's sequence cursor at an attachment boundary (a stream drop, a failed attempt, the attachment's end), never per stream event: the native client persists its own cursor at bridge-session boundaries, and so does this. */
+    readonly saveSequenceNum?: (sessionId: string, sequenceNum: number) => void;
     readonly dial: RcStreamDial;
     readonly fanout: RcEventFanout;
     /** Mints the stable client id one session's attachment announces: a v4 UUID or better in production. Stable means it survives reconnects, so the host sees one client, not a new one per drop. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-shim",
-  "version": "8.13.0",
+  "version": "8.14.0",
   "description": "A profile manager and launcher for Claude Code that lets one person run multiple logins from one machine while controlling what gets shared between them.",
   "license": "MIT",
   "author": "Joseph Mearman <joseph@mearman.co.uk>",