@wspc/cli 0.0.15 → 0.0.16

package/dist/cli.js

@@ -1248,6 +1248,49 @@ var ConfigStore = class {
     }
     await fs.writeFile(this.configFile, JSON.stringify(config, null, 2) + "\n", { mode: 384 });
   }
+  /**
+   * Read-modify-write the config under a cross-process file lock. The mutator
+   * runs against a FRESH read taken inside the lock and edits it in place, so
+   * two writers (e.g. token refresh and the consistency-bookmark writeback)
+   * can't clobber each other from stale snapshots — the bug that revoked whole
+   * refresh-token families when several CLI sessions ran concurrently.
+   */
+  async update(mutate) {
+    await this.withLock(async () => {
+      const config = await this.read();
+      mutate(config);
+      await this.write(config);
+    });
+  }
+  async withLock(fn) {
+    await fs.mkdir(this.configDir, { recursive: true, mode: 448 });
+    const lockFile = this.configFile + ".lock";
+    const STALE_MS = 1e4;
+    const RETRY_MS = 25;
+    const MAX_WAIT_MS = 5e3;
+    let waited = 0;
+    for (; ; ) {
+      try {
+        const fh = await fs.open(lockFile, "wx");
+        await fh.close();
+        break;
+      } catch (e) {
+        if (e.code !== "EEXIST") throw e;
+        const age = await fs.stat(lockFile).then((s) => Date.now() - s.mtimeMs).catch(() => Infinity);
+        if (age > STALE_MS || waited >= MAX_WAIT_MS) {
+          await fs.rm(lockFile, { force: true });
+          continue;
+        }
+        await new Promise((r) => setTimeout(r, RETRY_MS));
+        waited += RETRY_MS;
+      }
+    }
+    try {
+      return await fn();
+    } finally {
+      await fs.rm(lockFile, { force: true });
+    }
+  }
   async currentEnv() {
     const c = await this.read();
     const name = c.current_env;
@@ -1293,8 +1336,8 @@ function createConsistencyFetch(opts) {
     let outgoing = request;
     let injectedStoredBookmark = false;
     if (applies && !outgoing.headers.has(HEADER)) {
-      const config2 = await opts.store.read();
-      const bookmark = config2.envs[opts.envName]?.consistency_bookmark;
+      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);
@@ -1314,23 +1357,23 @@ function createConsistencyFetch(opts) {
     const invalidBookmark = shouldCheckInvalidBookmark ? await responseHasInvalidBookmark(response) : false;
     const shouldClearBookmark = invalidBookmark;
     if (!nextBookmark && !shouldClearBookmark) return response;
-    const config = await opts.store.read();
-    const env = config.envs[opts.envName];
-    if (!env) return response;
-    if (nextBookmark) {
-      env.consistency_bookmark = nextBookmark;
-    } else if (shouldClearBookmark) {
-      delete env.consistency_bookmark;
-    }
-    await opts.store.write(config);
+    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;
+      }
+    });
     return response;
   };
 }
 
 // src/version.ts
-var VERSION = "0.0.15";
-var SPEC_SHA = "dac502bc";
-var SPEC_FETCHED_AT = "2026-06-15T16:41:41.264Z";
+var VERSION = "0.0.16";
+var SPEC_SHA = "b505a817";
+var SPEC_FETCHED_AT = "2026-06-16T07:42:43.911Z";
 var API_BASE = "https://api.wspc.ai";
 
 // src/index.ts
@@ -1343,6 +1386,17 @@ var WspcAuthExpiredError = class extends Error {
 };
 
 // src/handwritten/auth/sdk-auth.ts
+var USER_AGENT = `@wspc/cli/${VERSION}`;
+async function expiredMessage(res) {
+  try {
+    const body = await res.clone().json();
+    if (!body.error) return void 0;
+    const detail = body.error_description ? `: ${body.error_description}` : "";
+    return `wspc token refresh failed (${body.error}${detail}); re-authenticate via \`wspc login\``;
+  } catch {
+    return void 0;
+  }
+}
 function createAuthInterceptor(mode) {
   if ("apiKey" in mode) {
     const apiKey = mode.apiKey;
@@ -1350,6 +1404,7 @@ function createAuthInterceptor(mode) {
     return {
       async onRequest(req) {
         req.headers.set("authorization", `Bearer ${apiKey}`);
+        req.headers.set("user-agent", USER_AGENT);
         return req;
       },
       async execute(req) {
@@ -1365,6 +1420,7 @@ function createAuthInterceptor(mode) {
   return {
     async onRequest(req) {
       req.headers.set("authorization", `Bearer ${accessToken}`);
+      req.headers.set("user-agent", USER_AGENT);
       return req;
     },
     async execute(req) {
@@ -1372,7 +1428,10 @@ function createAuthInterceptor(mode) {
       if (first.status !== 401) return first;
       const refreshRes = await fetchImpl(`${mode.baseUrl}/auth/oauth/token`, {
         method: "POST",
-        headers: { "content-type": "application/x-www-form-urlencoded" },
+        headers: {
+          "content-type": "application/x-www-form-urlencoded",
+          "user-agent": USER_AGENT
+        },
         body: new URLSearchParams({
           grant_type: "refresh_token",
           refresh_token: refreshToken,
@@ -1380,7 +1439,7 @@ function createAuthInterceptor(mode) {
         })
       });
       if (!refreshRes.ok) {
-        throw new WspcAuthExpiredError();
+        throw new WspcAuthExpiredError(await expiredMessage(refreshRes));
       }
       const tokens = await refreshRes.json();
       accessToken = tokens.access_token;
@@ -1450,13 +1509,13 @@ function buildInterceptor(store, resolved, fetchImpl) {
     clientId,
     fetchImpl,
     onTokenRefresh: async ({ accessToken, refreshToken, expiresAt }) => {
-      const cfg = await store.read();
-      const a = cfg.envs[envName]?.accounts?.[email];
-      if (!a) return;
-      a.access_token = accessToken;
-      a.refresh_token = refreshToken;
-      a.access_token_expires_at = expiresAt;
-      await store.write(cfg);
+      await store.update((cfg) => {
+        const a = cfg.envs[envName]?.accounts?.[email];
+        if (!a) return;
+        a.access_token = accessToken;
+        a.refresh_token = refreshToken;
+        a.access_token_expires_at = expiresAt;
+      });
     }
   });
 }