@wspc/cli 0.0.18 → 0.0.20

package/dist/cli.js

@@ -1321,13 +1321,6 @@ var SERVICE_HEADERS = {
   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(/\/+$/, "");
@@ -1338,23 +1331,11 @@ 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;
+function stripKnownBookmarkHeaders(request) {
+  if (!KNOWN_HEADERS.some((header) => request.headers.has(header))) return request;
   const headers = new Headers(request.headers);
   for (const header of KNOWN_HEADERS) {
-    if (header !== keep) headers.delete(header);
+    headers.delete(header);
   }
   return new Request(request, { headers });
 }
@@ -1378,21 +1359,22 @@ function createConsistencyFetch(opts) {
     const request = new Request(input, init);
     const url = new URL(request.url);
     const applies = isUnderApiBase(url, opts.apiBase);
-    let outgoing = request;
-    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);
+    let outgoing = stripKnownBookmarkHeaders(request);
+    const injectedBookmarks = [];
+    if (applies) {
+      const config = await opts.store.read();
+      const bookmarks = config.envs[opts.envName]?.consistency_bookmarks;
+      if (bookmarks) {
+        const headers = new Headers(outgoing.headers);
+        for (const [serviceName, header] of Object.entries(SERVICE_HEADERS)) {
+          const service = serviceName;
+          const bookmark = bookmarks[service];
+          if (!bookmark) continue;
           headers.set(header, bookmark);
+          injectedBookmarks.push([service, bookmark]);
+        }
+        if (injectedBookmarks.length > 0) {
           outgoing = new Request(outgoing, { headers });
-          injectedService = service;
         }
       }
     }
@@ -1402,7 +1384,7 @@ function createConsistencyFetch(opts) {
       const value = response.headers.get(header);
       return value ? [[serviceName, value]] : [];
     });
-    const shouldCheckInvalidBookmark = injectedService !== void 0;
+    const shouldCheckInvalidBookmark = injectedBookmarks.length > 0;
     const invalidBookmark = shouldCheckInvalidBookmark ? await responseHasInvalidBookmark(response) : false;
     if (nextBookmarks.length === 0 && !invalidBookmark) return response;
     await opts.store.update((config) => {
@@ -1412,8 +1394,12 @@ function createConsistencyFetch(opts) {
       for (const [serviceName, value] of nextBookmarks) {
         env.consistency_bookmarks[serviceName] = value;
       }
-      if (invalidBookmark && injectedService) {
-        delete env.consistency_bookmarks[injectedService];
+      if (invalidBookmark) {
+        for (const [service, injectedValue] of injectedBookmarks) {
+          if (env.consistency_bookmarks[service] === injectedValue) {
+            delete env.consistency_bookmarks[service];
+          }
+        }
       }
       if (Object.keys(env.consistency_bookmarks).length === 0) {
         delete env.consistency_bookmarks;
@@ -1424,9 +1410,9 @@ function createConsistencyFetch(opts) {
 }
 
 // src/version.ts
-var VERSION = "0.0.18";
-var SPEC_SHA = "d0ccc741";
-var SPEC_FETCHED_AT = "2026-06-16T16:17:05.958Z";
+var VERSION = "0.0.20";
+var SPEC_SHA = "1b183552";
+var SPEC_FETCHED_AT = "2026-06-17T12:14:35.785Z";
 var API_BASE = "https://api.wspc.ai";
 
 // src/index.ts
@@ -3674,6 +3660,24 @@ async function fetchMe(opts) {
 }
 
 // src/handwritten/auth/login.ts
+function renderDevicePrompt(prompt) {
+  const mins = Math.max(1, Math.round((prompt.expires_in ?? 0) / 60));
+  const lines = ["", `  ${bold("wspc login")}`, ""];
+  if (prompt.verification_uri_complete) {
+    lines.push(`  ${dim("Open this link to sign in (code already filled in):")}`);
+    lines.push(`    ${cyan(prompt.verification_uri_complete)}`);
+    lines.push("");
+    lines.push(`  ${dim(`Or go to ${prompt.verification_uri} and enter:`)}`);
+    lines.push(`    ${bold(prompt.user_code)}`);
+  } else {
+    lines.push(`  ${dim(`Go to ${prompt.verification_uri} and enter:`)}`);
+    lines.push(`    ${bold(prompt.user_code)}`);
+  }
+  lines.push("");
+  lines.push(`  ${dim(`Code expires in ${mins}m \xB7 waiting for approval\u2026`)}`);
+  lines.push("");
+  return lines.join("\n");
+}
 function getOrCreateEnv(c, envName, apiBase) {
   const existing = c.envs[envName];
   if (existing) {
@@ -3716,7 +3720,7 @@ async function runLogin(opts) {
     if (who2.email !== LEGACY_ACCOUNT_KEY) delete env2.accounts[LEGACY_ACCOUNT_KEY];
     c2.current_env = envName;
     await opts.store.write(c2);
-    opts.output.write(`\u2713 logged in (api key) as ${who2.email} \u2192 env "${envName}"`);
+    opts.output.write(`${green("\u2713")} logged in (api key) as ${bold(who2.email)} ${dim(`\u2192 env "${envName}"`)}`);
     return;
   }
   const ensureClient = opts.ensureClient ?? ((env2) => ensureClientId({ store: opts.store, envName: env2, baseUrl: opts.baseUrl }));
@@ -3730,13 +3734,7 @@ async function runLogin(opts) {
     onPrompt: (p) => {
       const prompt = p;
       opts.output.writeJson({ event: "device_code_issued", ...prompt });
-      opts.output.write(`
-=== wspc login ===`);
-      opts.output.write(`verification_uri: ${prompt.verification_uri}`);
-      opts.output.write(`user_code: ${prompt.user_code}`);
-      opts.output.write(`expires_in: ${prompt.expires_in}`);
-      opts.output.write(`=== waiting for approval ===
-`);
+      opts.output.write(renderDevicePrompt(prompt));
     }
   });
   const who = await me({
@@ -3762,7 +3760,7 @@ async function runLogin(opts) {
   c.current_env = envName;
   await opts.store.write(c);
   opts.output.writeJson({ event: "login_success", email: who.email });
-  opts.output.write(`\u2713 logged in as ${who.email} \u2192 env "${envName}"`);
+  opts.output.write(`${green("\u2713")} logged in as ${bold(who.email)} ${dim(`\u2192 env "${envName}"`)}`);
 }
 
 // src/handwritten/commands/login.ts