@wspc/cli 0.0.16 → 0.0.17

package/dist/cli.js

@@ -1177,10 +1177,21 @@ var V1_CRED_KEYS = [
   "actor",
   "agent_label"
 ];
+var CONSISTENCY_BOOKMARK_SERVICES = ["auth", "todo", "calendar", "email", "push"];
+function normalizeConsistencyBookmarks(raw) {
+  if (typeof raw !== "object" || raw === null) return void 0;
+  const out = {};
+  const obj = raw;
+  for (const service of CONSISTENCY_BOOKMARK_SERVICES) {
+    if (typeof obj[service] === "string") out[service] = obj[service];
+  }
+  return Object.keys(out).length ? out : void 0;
+}
 function migrateEnv(raw) {
   const api_base = typeof raw.api_base === "string" ? raw.api_base : "";
   const env = { api_base, accounts: {} };
-  if (typeof raw.consistency_bookmark === "string") env.consistency_bookmark = raw.consistency_bookmark;
+  const consistency_bookmarks = normalizeConsistencyBookmarks(raw.consistency_bookmarks);
+  if (consistency_bookmarks) env.consistency_bookmarks = consistency_bookmarks;
   if (typeof raw.client_id === "string") env.client_id = raw.client_id;
   if (raw.accounts && typeof raw.accounts === "object") {
     env.accounts = raw.accounts;
@@ -1302,8 +1313,22 @@ var ConfigStore = class {
 };
 
 // src/handwritten/auth/consistency-fetch.ts
-var HEADER = "x-consistency-bookmark";
 var INVALID_BOOKMARK = "INVALID_CONSISTENCY_BOOKMARK";
+var SERVICE_HEADERS = {
+  auth: "x-cb-auth",
+  todo: "x-cb-todo",
+  calendar: "x-cb-cal",
+  email: "x-cb-email",
+  push: "x-cb-push"
+};
+var SERVICE_PREFIXES = [
+  { service: "auth", prefix: "/auth" },
+  { service: "todo", prefix: "/todo" },
+  { service: "calendar", prefix: "/calendar" },
+  { service: "email", prefix: "/email" },
+  { service: "push", prefix: "/push" }
+];
+var KNOWN_HEADERS = Object.values(SERVICE_HEADERS);
 function normalizeBasePath(pathname) {
   const trimmed = pathname.replace(/\/+$/, "");
   return trimmed === "" ? "/" : trimmed;
@@ -1313,6 +1338,26 @@ function isUnderApiBase(url, apiBase) {
   const basePath = normalizeBasePath(base.pathname);
   return url.origin === base.origin && (basePath === "/" || url.pathname === basePath || url.pathname.startsWith(`${basePath}/`));
 }
+function pathWithinApiBase(url, apiBase) {
+  const basePath = normalizeBasePath(new URL(apiBase).pathname);
+  if (basePath === "/") return url.pathname;
+  if (url.pathname === basePath) return "/";
+  return url.pathname.slice(basePath.length) || "/";
+}
+function pathMatchesPrefix(pathname, prefix) {
+  return pathname === prefix || pathname.startsWith(`${prefix}/`);
+}
+function serviceForPath(pathname) {
+  return SERVICE_PREFIXES.find(({ prefix }) => pathMatchesPrefix(pathname, prefix))?.service;
+}
+function stripKnownBookmarkHeaders(request, keep) {
+  if (!KNOWN_HEADERS.some((header) => header !== keep && request.headers.has(header))) return request;
+  const headers = new Headers(request.headers);
+  for (const header of KNOWN_HEADERS) {
+    if (header !== keep) headers.delete(header);
+  }
+  return new Request(request, { headers });
+}
 function isJsonContentType(contentType) {
   const mediaType = contentType.toLowerCase().split(";")[0]?.trim() ?? "";
   return mediaType === "application/json" || mediaType.endsWith("+json");
@@ -1334,36 +1379,44 @@ function createConsistencyFetch(opts) {
     const url = new URL(request.url);
     const applies = isUnderApiBase(url, opts.apiBase);
     let outgoing = request;
-    let injectedStoredBookmark = false;
-    if (applies && !outgoing.headers.has(HEADER)) {
-      const config = await opts.store.read();
-      const bookmark = config.envs[opts.envName]?.consistency_bookmark;
-      if (bookmark) {
-        const headers = new Headers(outgoing.headers);
-        headers.set(HEADER, bookmark);
-        outgoing = new Request(outgoing, { headers });
-        injectedStoredBookmark = true;
+    let injectedService;
+    const service = applies ? serviceForPath(pathWithinApiBase(url, opts.apiBase)) : void 0;
+    const serviceHeader = service ? SERVICE_HEADERS[service] : void 0;
+    outgoing = stripKnownBookmarkHeaders(outgoing, applies ? serviceHeader : void 0);
+    if (applies && service) {
+      const header = SERVICE_HEADERS[service];
+      if (!outgoing.headers.has(header)) {
+        const config = await opts.store.read();
+        const bookmark = config.envs[opts.envName]?.consistency_bookmarks?.[service];
+        if (bookmark) {
+          const headers = new Headers(outgoing.headers);
+          headers.set(header, bookmark);
+          outgoing = new Request(outgoing, { headers });
+          injectedService = service;
+        }
       }
     }
-    if (!applies && outgoing.headers.has(HEADER)) {
-      const headers = new Headers(outgoing.headers);
-      headers.delete(HEADER);
-      outgoing = new Request(outgoing, { headers });
-    }
     const response = await fetchImpl(outgoing);
     if (!applies) return response;
-    const nextBookmark = response.headers.get(HEADER);
-    const shouldCheckInvalidBookmark = injectedStoredBookmark && !nextBookmark;
+    const nextBookmarks = Object.entries(SERVICE_HEADERS).flatMap(([serviceName, header]) => {
+      const value = response.headers.get(header);
+      return value ? [[serviceName, value]] : [];
+    });
+    const shouldCheckInvalidBookmark = injectedService !== void 0;
     const invalidBookmark = shouldCheckInvalidBookmark ? await responseHasInvalidBookmark(response) : false;
-    const shouldClearBookmark = invalidBookmark;
-    if (!nextBookmark && !shouldClearBookmark) return response;
+    if (nextBookmarks.length === 0 && !invalidBookmark) return response;
     await opts.store.update((config) => {
       const env = config.envs[opts.envName];
       if (!env) return;
-      if (nextBookmark) {
-        env.consistency_bookmark = nextBookmark;
-      } else if (shouldClearBookmark) {
-        delete env.consistency_bookmark;
+      env.consistency_bookmarks ??= {};
+      for (const [serviceName, value] of nextBookmarks) {
+        env.consistency_bookmarks[serviceName] = value;
+      }
+      if (invalidBookmark && injectedService) {
+        delete env.consistency_bookmarks[injectedService];
+      }
+      if (Object.keys(env.consistency_bookmarks).length === 0) {
+        delete env.consistency_bookmarks;
       }
     });
     return response;
@@ -1371,9 +1424,9 @@ function createConsistencyFetch(opts) {
 }
 
 // src/version.ts
-var VERSION = "0.0.16";
-var SPEC_SHA = "b505a817";
-var SPEC_FETCHED_AT = "2026-06-16T07:42:43.911Z";
+var VERSION = "0.0.17";
+var SPEC_SHA = "d0ccc741";
+var SPEC_FETCHED_AT = "2026-06-16T14:51:59.656Z";
 var API_BASE = "https://api.wspc.ai";
 
 // src/index.ts