pinsay-cli 0.14.1 → 0.14.2

package/README.md

@@ -62,6 +62,10 @@ Full guides: https://pinsay.dev/docs/ · Issues: https://github.com/moamen-ui/pi
 
 ## Changelog
 
+### 0.14.2
+
+- A saved session the server ended early (for example after your role changed) no longer fails with "Your saved key no longer works": the CLI signs in again with the saved key once and retries. Only a key the server rejects still asks you to sign in.
+
 ### 0.14.1
 
 - Delegation is off unless `.pinsay/config.json` has `"delegation": "auto"`: the apply prompt header says `delegation=off` and `apply --mark` with one model no longer prints the "Delegation is on…" warning.

package/dist/cli.js

@@ -392,7 +392,7 @@ var init_build_constants = __esm({
   "src/build-constants.ts"() {
     "use strict";
     BUILD_DEFAULT_SERVER = true ? "https://app.pinsay.dev" : "https://app.pinsay.dev";
-    BUILD_CLI_VERSION = true ? "0.14.1" : "0.0.0-dev";
+    BUILD_CLI_VERSION = true ? "0.14.2" : "0.0.0-dev";
   }
 });
 
@@ -1379,7 +1379,45 @@ function parseRetryAfter(value, now = Date.now()) {
     return void 0;
   return Math.max(1, Math.ceil((at - now) / 1e3));
 }
+function registerRenewableToken(token, renew) {
+  renewers.set(token, renew);
+}
+async function currentToken(token) {
+  let t = token;
+  while (t && replaced.has(t)) {
+    const next = await replaced.get(t).catch(() => void 0);
+    if (!next || next === t)
+      break;
+    t = next;
+  }
+  return t;
+}
+function renewToken(token) {
+  let next = replaced.get(token);
+  if (!next) {
+    const renew = renewers.get(token);
+    if (!renew)
+      return Promise.resolve(void 0);
+    renewers.delete(token);
+    next = renew();
+    replaced.set(token, next);
+  }
+  return next;
+}
 async function api(server, path, options = {}) {
+  const token = await currentToken(options.token);
+  try {
+    return await request(server, path, { ...options, token });
+  } catch (err) {
+    if (!(err instanceof ApiError) || err.code !== 401 || !token)
+      throw err;
+    const fresh = await renewToken(token);
+    if (!fresh || fresh === token)
+      throw err;
+    return request(server, path, { ...options, token: fresh });
+  }
+}
+async function request(server, path, options = {}) {
   const url = `${server.replace(/\/$/, "")}${path}`;
   const headers = { "Accept": "application/json" };
   if (options.token)
@@ -1412,7 +1450,7 @@ async function api(server, path, options = {}) {
   const body = await res.json();
   return body.data !== void 0 ? body.data : body;
 }
-var ApiError, NetworkError, API_TIMEOUT_MS;
+var ApiError, NetworkError, API_TIMEOUT_MS, renewers, replaced;
 var init_api = __esm({
   "src/api.ts"() {
     "use strict";
@@ -1433,6 +1471,8 @@ var init_api = __esm({
       }
     };
     API_TIMEOUT_MS = 3e4;
+    renewers = /* @__PURE__ */ new Map();
+    replaced = /* @__PURE__ */ new Map();
   }
 });
 
@@ -2512,19 +2552,7 @@ function isJwtExpired(token) {
     return false;
   }
 }
-async function resolveToken(server, cwd2, explicitApiKey) {
-  await removeStaleRepoTokenCache(cwd2);
-  const apiKey = explicitApiKey || await readApiKey(cwd2, server);
-  if (!apiKey)
-    return void 0;
-  const cacheFile = tokenCacheFile(server, apiKey);
-  try {
-    const cached = JSON.parse(await fs22.readFile(cacheFile, "utf8"));
-    const token = typeof cached?.token === "string" ? cached.token.trim() : "";
-    if (token && !isJwtExpired(token))
-      return token;
-  } catch {
-  }
+async function exchangeKey2(server, apiKey, cacheFile) {
   try {
     const login = await api(
       server,
@@ -2551,6 +2579,31 @@ async function resolveToken(server, cwd2, explicitApiKey) {
   }
   return void 0;
 }
+async function resolveToken(server, cwd2, explicitApiKey) {
+  await removeStaleRepoTokenCache(cwd2);
+  const apiKey = explicitApiKey || await readApiKey(cwd2, server);
+  if (!apiKey)
+    return void 0;
+  const cacheFile = tokenCacheFile(server, apiKey);
+  const track = (token) => {
+    registerRenewableToken(token, async () => {
+      await fs22.rm(cacheFile, { force: true }).catch(() => {
+      });
+      const fresh2 = await exchangeKey2(server, apiKey, cacheFile);
+      return fresh2 ? track(fresh2) : void 0;
+    });
+    return token;
+  };
+  try {
+    const cached = JSON.parse(await fs22.readFile(cacheFile, "utf8"));
+    const token = typeof cached?.token === "string" ? cached.token.trim() : "";
+    if (token && !isJwtExpired(token))
+      return track(token);
+  } catch {
+  }
+  const fresh = await exchangeKey2(server, apiKey, cacheFile);
+  return fresh ? track(fresh) : void 0;
+}
 var init_auth = __esm({
   "src/auth.ts"() {
     "use strict";
@@ -2701,8 +2754,9 @@ async function download(url, file, expectedSize, opts) {
   if (have && have.isFile() && (expectedSize === null ? have.size > 0 : have.size === expectedSize))
     return null;
   const headers = {};
-  if (opts.token)
-    headers["Authorization"] = `Bearer ${opts.token}`;
+  const token = await currentToken(opts.token);
+  if (token)
+    headers["Authorization"] = `Bearer ${token}`;
   const doFetch = opts.fetchImpl ?? fetch;
   let res;
   try {
@@ -2871,6 +2925,7 @@ var MEDIA_DIR, MEDIA_MAX_AGE_DAYS, DOWNLOAD_TIMEOUT_MS, MAX_MEDIA_BYTES, SAFE_EX
 var init_media = __esm({
   "src/apply/media.ts"() {
     "use strict";
+    init_api();
     init_git_exclude();
     MEDIA_DIR = join22(".pinsay", "media");
     MEDIA_MAX_AGE_DAYS = 7;
@@ -14345,13 +14400,13 @@ var Protocol = class {
     }
     Promise.resolve().then(() => handler(notification)).catch((error) => this._onerror(new Error(`Uncaught error in notification handler: ${error}`)));
   }
-  _onrequest(request) {
+  _onrequest(request2) {
     var _a, _b;
-    const handler = (_a = this._requestHandlers.get(request.method)) !== null && _a !== void 0 ? _a : this.fallbackRequestHandler;
+    const handler = (_a = this._requestHandlers.get(request2.method)) !== null && _a !== void 0 ? _a : this.fallbackRequestHandler;
     if (handler === void 0) {
       (_b = this._transport) === null || _b === void 0 ? void 0 : _b.send({
         jsonrpc: "2.0",
-        id: request.id,
+        id: request2.id,
         error: {
           code: ErrorCode.MethodNotFound,
           message: "Method not found"
@@ -14360,8 +14415,8 @@ var Protocol = class {
       return;
     }
     const abortController = new AbortController();
-    this._requestHandlerAbortControllers.set(request.id, abortController);
-    Promise.resolve().then(() => handler(request, { signal: abortController.signal })).then((result) => {
+    this._requestHandlerAbortControllers.set(request2.id, abortController);
+    Promise.resolve().then(() => handler(request2, { signal: abortController.signal })).then((result) => {
       var _a2;
       if (abortController.signal.aborted) {
         return;
@@ -14369,7 +14424,7 @@ var Protocol = class {
       return (_a2 = this._transport) === null || _a2 === void 0 ? void 0 : _a2.send({
         result,
         jsonrpc: "2.0",
-        id: request.id
+        id: request2.id
       });
     }, (error) => {
       var _a2, _b2;
@@ -14378,14 +14433,14 @@ var Protocol = class {
       }
       return (_a2 = this._transport) === null || _a2 === void 0 ? void 0 : _a2.send({
         jsonrpc: "2.0",
-        id: request.id,
+        id: request2.id,
         error: {
           code: Number.isSafeInteger(error["code"]) ? error["code"] : ErrorCode.InternalError,
           message: (_b2 = error.message) !== null && _b2 !== void 0 ? _b2 : "Internal error"
         }
       });
     }).catch((error) => this._onerror(new Error(`Failed to send response: ${error}`))).finally(() => {
-      this._requestHandlerAbortControllers.delete(request.id);
+      this._requestHandlerAbortControllers.delete(request2.id);
     });
   }
   _onprogress(notification) {
@@ -14428,7 +14483,7 @@ var Protocol = class {
    *
    * Do not use this method to emit notifications! Use notification() instead.
    */
-  request(request, resultSchema, options) {
+  request(request2, resultSchema, options) {
     return new Promise((resolve11, reject) => {
       var _a, _b, _c, _d;
       if (!this._transport) {
@@ -14436,19 +14491,19 @@ var Protocol = class {
         return;
       }
       if (((_a = this._options) === null || _a === void 0 ? void 0 : _a.enforceStrictCapabilities) === true) {
-        this.assertCapabilityForMethod(request.method);
+        this.assertCapabilityForMethod(request2.method);
       }
       (_b = options === null || options === void 0 ? void 0 : options.signal) === null || _b === void 0 ? void 0 : _b.throwIfAborted();
       const messageId = this._requestMessageId++;
       const jsonrpcRequest = {
-        ...request,
+        ...request2,
         jsonrpc: "2.0",
         id: messageId
       };
       if (options === null || options === void 0 ? void 0 : options.onprogress) {
         this._progressHandlers.set(messageId, options.onprogress);
         jsonrpcRequest.params = {
-          ...request.params,
+          ...request2.params,
           _meta: { progressToken: messageId }
         };
       }
@@ -14526,7 +14581,7 @@ var Protocol = class {
   setRequestHandler(requestSchema, handler) {
     const method = requestSchema.shape.method.value;
     this.assertRequestHandlerCapability(method);
-    this._requestHandlers.set(method, (request, extra) => Promise.resolve(handler(requestSchema.parse(request), extra)));
+    this._requestHandlers.set(method, (request2, extra) => Promise.resolve(handler(requestSchema.parse(request2), extra)));
   }
   /**
    * Removes the request handler for the given method.
@@ -14579,7 +14634,7 @@ var Server = class extends Protocol {
     this._serverInfo = _serverInfo;
     this._capabilities = (_a = options === null || options === void 0 ? void 0 : options.capabilities) !== null && _a !== void 0 ? _a : {};
     this._instructions = options === null || options === void 0 ? void 0 : options.instructions;
-    this.setRequestHandler(InitializeRequestSchema, (request) => this._oninitialize(request));
+    this.setRequestHandler(InitializeRequestSchema, (request2) => this._oninitialize(request2));
     this.setNotificationHandler(InitializedNotificationSchema, () => {
       var _a2;
       return (_a2 = this.oninitialized) === null || _a2 === void 0 ? void 0 : _a2.call(this);
@@ -14678,10 +14733,10 @@ var Server = class extends Protocol {
         break;
     }
   }
-  async _oninitialize(request) {
-    const requestedVersion = request.params.protocolVersion;
-    this._clientCapabilities = request.params.capabilities;
-    this._clientVersion = request.params.clientInfo;
+  async _oninitialize(request2) {
+    const requestedVersion = request2.params.protocolVersion;
+    this._clientCapabilities = request2.params.capabilities;
+    this._clientVersion = request2.params.clientInfo;
     return {
       protocolVersion: SUPPORTED_PROTOCOL_VERSIONS.includes(requestedVersion) ? requestedVersion : LATEST_PROTOCOL_VERSION,
       capabilities: this.getCapabilities(),
@@ -15905,9 +15960,9 @@ function createMcpServer(ctx) {
       tools: [...ALL_TOOLS]
     };
   });
-  server.setRequestHandler(CallToolRequestSchema, async (request) => {
-    const name = request.params.name;
-    const args = request.params.arguments || {};
+  server.setRequestHandler(CallToolRequestSchema, async (request2) => {
+    const name = request2.params.name;
+    const args = request2.params.arguments || {};
     try {
       const result = await executeTool(name, args, ctx);
       return {
@@ -15958,8 +16013,8 @@ function createMcpServer(ctx) {
       ]
     };
   });
-  server.setRequestHandler(ReadResourceRequestSchema, async (request) => {
-    const uri = request.params.uri;
+  server.setRequestHandler(ReadResourceRequestSchema, async (request2) => {
+    const uri = request2.params.uri;
     if (uri !== "pinsay://project") {
       throw new Error(`Unknown resource URI: ${uri}`);
     }
@@ -16006,12 +16061,12 @@ function createMcpServer(ctx) {
       ]
     };
   });
-  server.setRequestHandler(GetPromptRequestSchema, async (request) => {
-    const name = request.params.name;
+  server.setRequestHandler(GetPromptRequestSchema, async (request2) => {
+    const name = request2.params.name;
     if (name !== "pinsay_apply_instructions") {
       throw new Error(`Unknown prompt: ${name}`);
     }
-    const env = request.params.arguments?.environment;
+    const env = request2.params.arguments?.environment;
     const clientCtx = {
       server: ctx.server,
       project: ctx.project,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinsay-cli",
-  "version": "0.14.1",
+  "version": "0.14.2",
   "description": "Click-to-comment feedback for your web app: install the widget, then turn pending comments into AI apply prompts.",
   "type": "module",
   "license": "MIT",