repowisestage 0.0.74 → 0.0.76

package/dist/bin/repowise.js

@@ -4535,21 +4535,38 @@ async function storeCredentials(credentials) {
   }
 }
 var refreshInFlight = null;
+var refreshInFlightToken = null;
+var terminalRefreshTokens = /* @__PURE__ */ new Set();
+var lastSeenRefreshToken = null;
 async function getValidCredentials(options) {
   const creds = await getStoredCredentials();
   if (!creds) {
     lastRefreshOutcome = "no-creds";
     return null;
   }
+  if (creds.refreshToken !== lastSeenRefreshToken) {
+    terminalRefreshTokens.clear();
+    lastSeenRefreshToken = creds.refreshToken;
+  }
   const now = Date.now();
   const needsRefresh = options?.forceRefresh || now > creds.expiresAt - 5 * 60 * 1e3;
   if (!needsRefresh) {
     lastRefreshOutcome = "success";
     return creds;
   }
-  if (!refreshInFlight) {
-    refreshInFlight = doRefresh(creds).finally(() => {
-      refreshInFlight = null;
+  if (terminalRefreshTokens.has(creds.refreshToken)) {
+    lastRefreshOutcome = "terminal";
+    return null;
+  }
+  if (!refreshInFlight || refreshInFlightToken !== creds.refreshToken) {
+    const inflight = doRefresh(creds);
+    refreshInFlight = inflight;
+    refreshInFlightToken = creds.refreshToken;
+    void inflight.finally(() => {
+      if (refreshInFlight === inflight) {
+        refreshInFlight = null;
+        refreshInFlightToken = null;
+      }
     });
   }
   return refreshInFlight;
@@ -4566,6 +4583,7 @@ async function doRefresh(creds) {
       const message = err instanceof Error ? err.message : String(err);
       if (kind === "terminal") {
         lastRefreshOutcome = "terminal";
+        terminalRefreshTokens.add(creds.refreshToken);
         console.warn(`Token refresh rejected (terminal): ${message}`);
         return null;
       }
@@ -7657,7 +7675,20 @@ async function startMcpServer(options) {
           throw err;
       }
     },
-    resumeEndpoint: () => writeEndpointFile(endpointFilePath, endpoint, secretState.value.current)
+    resumeEndpoint: async () => {
+      let lastErr;
+      for (let attempt = 1; attempt <= 3; attempt++) {
+        try {
+          await writeEndpointFile(endpointFilePath, endpoint, secretState.value.current);
+          return;
+        } catch (err) {
+          lastErr = err;
+          if (attempt < 3)
+            await new Promise((r) => setTimeout(r, 100 * attempt));
+        }
+      }
+      throw lastErr;
+    }
   };
 }
 function handleRequest(req, res, options, sessions, secretCtx) {
@@ -8514,6 +8545,9 @@ import { join as join25 } from "path";
 // ../listener/dist/mcp/auto-config/markers.js
 import { promises as fs5 } from "fs";
 import { dirname as dirname15 } from "path";
+function repoWiseServerName(ctx) {
+  return `RepoWise MCP for ${ctx.repoName}${ctx.envSuffix ?? ""}`;
+}
 async function writeMergedConfig(params) {
   const current = await readConfig(params.path);
   const servers = { ...current.mcpServers ?? {} };
@@ -8596,14 +8630,14 @@ var claudeCodeWriter = {
     await removeFromConfig(path, `repowise-${ctx.repoId}`);
     const status2 = await writeMergedConfig({
       path,
-      serverName: `RepoWise MCP for ${ctx.repoName}`,
+      serverName: repoWiseServerName(ctx),
       spec: { command: ctx.shimCmd, args: ["mcp-shim", "--repo-id", ctx.repoId] }
     });
     return { status: status2, path };
   },
   async remove(ctx) {
     const path = join25(ctx.repoRoot, ".mcp.json");
-    await removeFromConfig(path, `RepoWise MCP for ${ctx.repoName}`);
+    await removeFromConfig(path, repoWiseServerName(ctx));
     await removeFromConfig(path, `repowise-${ctx.repoId}`);
   }
 };
@@ -8657,14 +8691,14 @@ var clineWriter = {
     await removeFromConfig(path, `repowise-${ctx.repoId}`);
     const status2 = await writeMergedConfig({
       path,
-      serverName: `RepoWise MCP for ${ctx.repoName}`,
+      serverName: repoWiseServerName(ctx),
       spec: { command: ctx.shimCmd, args: ["mcp-shim", "--repo-id", ctx.repoId] }
     });
     return { status: status2, path };
   },
   async remove(ctx) {
     const path = join27(ctx.home, ".cline", "mcp.json");
-    await removeFromConfig(path, `RepoWise MCP for ${ctx.repoName}`);
+    await removeFromConfig(path, repoWiseServerName(ctx));
     await removeFromConfig(path, `repowise-${ctx.repoId}`);
   }
 };
@@ -8765,14 +8799,14 @@ var codexWriter = {
     await removeFromConfig(path, `repowise-${ctx.repoId}`);
     const status2 = await writeMergedConfig({
       path,
-      serverName: `RepoWise MCP for ${ctx.repoName}`,
+      serverName: repoWiseServerName(ctx),
       spec: { command: ctx.shimCmd, args: ["mcp-shim", "--repo-id", ctx.repoId] }
     });
     return { status: status2, path };
   },
   async remove(ctx) {
     const path = join29(ctx.home, ".codex", "mcp.json");
-    await removeFromConfig(path, `RepoWise MCP for ${ctx.repoName}`);
+    await removeFromConfig(path, repoWiseServerName(ctx));
     await removeFromConfig(path, `repowise-${ctx.repoId}`);
   }
 };
@@ -8865,14 +8899,14 @@ var copilotWriter = {
     await removeFromConfig(path, `repowise-${ctx.repoId}`);
     const status2 = await writeMergedConfig({
       path,
-      serverName: `RepoWise MCP for ${ctx.repoName}`,
+      serverName: repoWiseServerName(ctx),
       spec: { command: ctx.shimCmd, args: ["mcp-shim", "--repo-id", ctx.repoId] }
     });
     return { status: status2, path };
   },
   async remove(ctx) {
     const path = join31(ctx.repoRoot, ".vscode", "mcp.json");
-    await removeFromConfig(path, `RepoWise MCP for ${ctx.repoName}`);
+    await removeFromConfig(path, repoWiseServerName(ctx));
     await removeFromConfig(path, `repowise-${ctx.repoId}`);
   }
 };
@@ -8959,14 +8993,14 @@ var cursorWriter = {
     await removeFromConfig(path, `repowise-${ctx.repoId}`);
     const status2 = await writeMergedConfig({
       path,
-      serverName: `RepoWise MCP for ${ctx.repoName}`,
+      serverName: repoWiseServerName(ctx),
       spec: { command: ctx.shimCmd, args: ["mcp-shim", "--repo-id", ctx.repoId] }
     });
     return { status: status2, path };
   },
   async remove(ctx) {
     const path = join33(ctx.repoRoot, ".cursor", "mcp.json");
-    await removeFromConfig(path, `RepoWise MCP for ${ctx.repoName}`);
+    await removeFromConfig(path, repoWiseServerName(ctx));
     await removeFromConfig(path, `repowise-${ctx.repoId}`);
   }
 };
@@ -8992,14 +9026,14 @@ var geminiCliWriter = {
     await removeFromConfig(path, `repowise-${ctx.repoId}`);
     const status2 = await writeMergedConfig({
       path,
-      serverName: `RepoWise MCP for ${ctx.repoName}`,
+      serverName: repoWiseServerName(ctx),
       spec: { command: ctx.shimCmd, args: ["mcp-shim", "--repo-id", ctx.repoId] }
     });
     return { status: status2, path };
   },
   async remove(ctx) {
     const path = join34(ctx.home, ".gemini", "settings.json");
-    await removeFromConfig(path, `RepoWise MCP for ${ctx.repoName}`);
+    await removeFromConfig(path, repoWiseServerName(ctx));
     await removeFromConfig(path, `repowise-${ctx.repoId}`);
   }
 };
@@ -9102,7 +9136,7 @@ var rooWriter = {
     const homeConfig = join36(ctx.home, ".roo", "mcp.json");
     const homeSettings = join36(ctx.home, ".roo", "settings.json");
     for (const path of [repoConfig, homeConfig, homeSettings]) {
-      await removeFromConfig(path, `RepoWise MCP for ${ctx.repoName}`).catch(() => {
+      await removeFromConfig(path, repoWiseServerName(ctx)).catch(() => {
       });
       await removeFromConfig(path, `repowise-${ctx.repoId}`).catch(() => {
       });
@@ -9138,14 +9172,14 @@ var windsurfWriter = {
     await removeFromConfig(path, `repowise-${ctx.repoId}`);
     const status2 = await writeMergedConfig({
       path,
-      serverName: `RepoWise MCP for ${ctx.repoName}`,
+      serverName: repoWiseServerName(ctx),
       spec: { command: ctx.shimCmd, args: ["mcp-shim", "--repo-id", ctx.repoId] }
     });
     return { status: status2, path };
   },
   async remove(ctx) {
     const path = join37(ctx.home, ".codeium", "windsurf", "mcp_config.json");
-    await removeFromConfig(path, `RepoWise MCP for ${ctx.repoName}`);
+    await removeFromConfig(path, repoWiseServerName(ctx));
     await removeFromConfig(path, `repowise-${ctx.repoId}`);
   }
 };
@@ -9205,7 +9239,8 @@ async function runAutoConfig(opts) {
         home,
         contextFolder: opts.contextFolder,
         selectedTools: opts.selectedTools,
-        variant: opts.variant
+        variant: opts.variant,
+        envSuffix: opts.envSuffix
       });
       results.push({ tool: writer.tool, detected: true, outcome });
     } catch (err) {
@@ -11064,6 +11099,14 @@ function decodeEmailFromIdToken(idToken) {
     return null;
   }
 }
+async function maybeRefreshOnWake(wakeDrift, pollIntervalMs) {
+  if (wakeDrift <= pollIntervalMs + 6e4)
+    return false;
+  console.log(`[wake] ~${Math.round(wakeDrift / 1e3).toString()}s gap detected (likely sleep) \u2014 verifying token (refresh only if stale)`);
+  await getValidCredentials().catch(() => {
+  });
+  return true;
+}
 async function handleSyncCompleted(notif, ctx) {
   if (!notif.commitSha) {
     console.warn(`sync.completed for ${notif.repoId} has no commitSha`);
@@ -11294,6 +11337,7 @@ function mcpAiToolsKey(aiTools) {
 }
 async function reconcileMcpConfigs(repos, packageName) {
   const shimCmd = packageName;
+  const envSuffix = getConfigDir().endsWith("-staging") ? " (staging)" : "";
   const { contextFolder, aiTools, graphOnly } = await readRawToolConfig();
   for (const repo of repos) {
     if (!repo.localPath)
@@ -11314,7 +11358,8 @@ async function reconcileMcpConfigs(repos, packageName) {
         shimCmd,
         contextFolder,
         selectedTools: aiTools,
-        variant
+        variant,
+        envSuffix
       });
       const written = results.filter((r) => r.detected && r.outcome?.status === "written");
       if (written.length > 0) {
@@ -11736,14 +11781,25 @@ async function startListener() {
     proactiveRefreshTimer.unref();
   }
   let lastCycleAt = Date.now();
+  let endpointResumeFailed = false;
+  let endpointResumeRetries = 0;
   while (running) {
     const wakeDrift = Date.now() - lastCycleAt;
-    if (wakeDrift > pollIntervalMs + 6e4) {
-      console.log(`[wake] ~${Math.round(wakeDrift / 1e3).toString()}s gap detected (likely sleep) \u2014 refreshing credentials`);
-      await getValidCredentials({ forceRefresh: true }).catch(() => {
-      });
-    }
+    await maybeRefreshOnWake(wakeDrift, pollIntervalMs);
     lastCycleAt = Date.now();
+    if (endpointResumeFailed) {
+      try {
+        await mcpRuntime?.server?.resumeEndpoint();
+        endpointResumeFailed = false;
+        endpointResumeRetries = 0;
+        console.log("[mcp] endpoint file restored on retry");
+      } catch {
+        endpointResumeRetries++;
+        if (endpointResumeRetries % 12 === 0) {
+          console.warn(`[mcp] endpoint file still not restored after ${endpointResumeRetries.toString()} retries \u2014 MCP remains unreachable`);
+        }
+      }
+    }
     let anyAuthError = null;
     let authErrorGroup = null;
     let minPollInterval = pollIntervalMs;
@@ -12093,7 +12149,9 @@ async function startListener() {
         try {
           await mcpRuntime?.server?.resumeEndpoint();
         } catch (err) {
-          console.warn("[mcp] resumeEndpoint failed:", err instanceof Error ? err.message : String(err));
+          console.warn("[mcp] resumeEndpoint failed (will retry each poll cycle):", err instanceof Error ? err.message : String(err));
+          endpointResumeFailed = true;
+          endpointResumeRetries = 0;
         }
       }
       continue;
@@ -16769,8 +16827,10 @@ async function mcpShim(opts) {
       const message = authState === "logged-out" ? (
         // Agent-directed: the calling LLM can run this itself for a smoother UX
         // (it auto-opens the browser; the user still completes sign-in). The
-        // command is a fixed, argument-free string (nothing injectable).
-        "RepoWise isn't authenticated (this is rare \u2014 the session lasts about a year). To fix it, run the shell command `repowise login` on the user's behalf \u2014 it opens a browser for them to sign in and blocks until they finish. Run it once, wait for it to complete, then retry this request. Do not repeat the command."
+        // command is a fixed, argument-free string (nothing injectable). Use the
+        // build-flavor binary (`repowise` vs `repowisestage`) so staging users
+        // get the command that matches their install.
+        `RepoWise isn't authenticated (this is rare \u2014 the session lasts about a year). To fix it, run the shell command \`${getPackageName()} login\` on the user's behalf \u2014 it opens a browser for them to sign in and blocks until they finish. Run it once, wait for it to complete, then retry this request. Do not repeat the command.`
       ) : "listener endpoint unavailable \u2014 is the listener running?";
       writeJson(stdout, {
         jsonrpc: "2.0",
@@ -16792,16 +16852,24 @@ async function mcpShim(opts) {
       );
       writeJson(stdout, response);
     } catch (err) {
-      stderr.write(`mcp-shim: ${err.message}
-`);
       const name = err.name;
       const detail = err.message;
       const isTimeout = name === "TimeoutError" || name === "AbortError" || /timeout|aborted|abort/i.test(detail);
+      if (!isTimeout && isConnectionError(err)) {
+        stderr.write(
+          `mcp-shim: listener unreachable (${detail}) \u2014 exiting so the client respawns a fresh shim.
+`,
+          () => process.exit(1)
+        );
+        return;
+      }
+      stderr.write(`mcp-shim: ${detail}
+`);
       writeJson(stdout, {
         jsonrpc: "2.0",
         error: isTimeout ? {
           code: -32001,
-          message: "RepoWise listener did not respond in time \u2014 it may be stuck. Restart it with `repowise restart`, then retry.",
+          message: `RepoWise listener did not respond in time \u2014 it may be stuck. Restart it with \`${getPackageName()} restart\`, then retry.`,
           data: { detail }
         } : {
           code: -32001,
@@ -16812,6 +16880,20 @@ async function mcpShim(opts) {
     }
   }
 }
+function isConnectionError(err) {
+  const CONN_CODES = /* @__PURE__ */ new Set([
+    "ECONNREFUSED",
+    "ECONNRESET",
+    "EHOSTUNREACH",
+    "ENETUNREACH",
+    "ECONNABORTED"
+  ]);
+  const e = err;
+  if (e && typeof e.code === "string" && CONN_CODES.has(e.code)) return true;
+  if (e && e.cause && typeof e.cause.code === "string" && CONN_CODES.has(e.cause.code)) return true;
+  const msg = err instanceof Error ? err.message : String(err);
+  return /ECONNREFUSED|ECONNRESET|EHOSTUNREACH|ENETUNREACH|fetch failed|socket hang up/i.test(msg);
+}
 async function readEndpoint(path) {
   try {
     const raw = (await fs30.readFile(path, "utf-8")).trim();
@@ -16862,7 +16944,7 @@ async function routeMessage(endpoint, repoId, message, postJson, getJson, header
       id: rpcId,
       result: {
         protocolVersion: "2024-11-05",
-        serverInfo: { name: "repowise", version: "0.0.0" },
+        serverInfo: { name: getPackageName(), version: "0.0.0" },
         capabilities: { tools: { listChanged: false } }
       }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "repowisestage",
-  "version": "0.0.74",
+  "version": "0.0.76",
   "type": "module",
   "description": "AI-optimized codebase context generator",
   "bin": {