repowisestage 0.0.75 → 0.0.77

package/dist/bin/repowise.js

@@ -3133,13 +3133,13 @@ var init_telemetry = __esm({
 // bin/repowise.ts
 import { readFileSync as readFileSync3 } from "fs";
 import { fileURLToPath as fileURLToPath4 } from "url";
-import { dirname as dirname23, join as join63 } from "path";
+import { dirname as dirname24, join as join63 } from "path";
 import { Command } from "commander";
 
 // ../listener/dist/main.js
 init_config_dir();
 import { readFile as readFile14, writeFile as writeFile16, mkdir as mkdir16, stat as fsStat } from "fs/promises";
-import { join as join42, dirname as dirname17 } from "path";
+import { join as join42, dirname as dirname18 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 import lockfile5 from "proper-lockfile";
 
@@ -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;
       }
@@ -6139,6 +6157,93 @@ function createGraphDownloader(options) {
 
 // ../listener/dist/mcp/heartbeat.js
 import { setTimeout as delay2 } from "timers/promises";
+
+// ../listener/dist/mcp/heartbeat-queue.js
+import { promises as fs5 } from "fs";
+import { randomUUID } from "crypto";
+import { dirname as dirname11 } from "path";
+var DEFAULT_MAX_ENTRIES = 336;
+function createFileHeartbeatQueue(opts) {
+  const maxEntries = opts.maxEntries ?? DEFAULT_MAX_ENTRIES;
+  const warn = opts.warn ?? ((m) => console.warn(m));
+  let chain = Promise.resolve();
+  async function read() {
+    let raw;
+    try {
+      raw = await fs5.readFile(opts.path, "utf-8");
+    } catch (err) {
+      if (err.code === "ENOENT")
+        return [];
+      throw err;
+    }
+    const entries = [];
+    for (const line of raw.split("\n")) {
+      const trimmed = line.trim();
+      if (!trimmed)
+        continue;
+      try {
+        const e = JSON.parse(trimmed);
+        if (e && typeof e.id === "string" && e.payload)
+          entries.push(e);
+      } catch {
+      }
+    }
+    return entries;
+  }
+  async function write(entries) {
+    await fs5.mkdir(dirname11(opts.path), { recursive: true });
+    const tmp = `${opts.path}.tmp`;
+    const body = entries.map((e) => JSON.stringify(e)).join("\n") + (entries.length ? "\n" : "");
+    await fs5.writeFile(tmp, body, { mode: 384 });
+    await fs5.rename(tmp, opts.path);
+  }
+  function mutate(fn) {
+    const run = chain.then(async () => {
+      const entries = await read();
+      const { next, result } = fn(entries);
+      await write(next);
+      return result;
+    });
+    chain = run.then(() => void 0, () => void 0);
+    return run;
+  }
+  return {
+    enqueue(payload) {
+      return mutate((entries) => {
+        const next = [...entries, { id: randomUUID(), payload }];
+        while (next.length > maxEntries) {
+          next.shift();
+          warn(`[heartbeat] queue full (${maxEntries.toString()}) \u2014 dropped the oldest un-sent bucket`);
+        }
+        return { next, result: void 0 };
+      });
+    },
+    list() {
+      return chain.then(() => read());
+    },
+    remove(id) {
+      return mutate((entries) => ({ next: entries.filter((e) => e.id !== id), result: void 0 }));
+    }
+  };
+}
+function createInMemoryHeartbeatQueue() {
+  let entries = [];
+  return {
+    enqueue(payload) {
+      entries.push({ id: randomUUID(), payload });
+      return Promise.resolve();
+    },
+    list() {
+      return Promise.resolve([...entries]);
+    },
+    remove(id) {
+      entries = entries.filter((e) => e.id !== id);
+      return Promise.resolve();
+    }
+  };
+}
+
+// ../listener/dist/mcp/heartbeat.js
 var DEFAULT_WINDOW = 60 * 60 * 1e3;
 function emptyStatusCounts() {
   return { ok: 0, error: 0, timeout: 0, rejected: 0 };
@@ -6156,6 +6261,7 @@ function emptyHealthCounters() {
 function createHeartbeatEmitter(opts) {
   const windowMs = opts.windowMs ?? DEFAULT_WINDOW;
   const now = opts.now ?? (() => Date.now());
+  const queue = opts.queue ?? createInMemoryHeartbeatQueue();
   let bucketStart = Math.floor(now() / windowMs) * windowMs;
   let toolCounts = /* @__PURE__ */ new Map();
   let missCounts = /* @__PURE__ */ new Map();
@@ -6190,16 +6296,60 @@ function createHeartbeatEmitter(opts) {
     statusCounts = emptyStatusCounts();
     healthCounters = emptyHealthCounters();
   }
+  const maxUnpersisted = opts.maxUnpersisted ?? 336;
+  const unpersisted = [];
+  let drainChain = Promise.resolve();
+  function rollBucket(nextBucket) {
+    const payload = buildPayload();
+    bucketStart = nextBucket;
+    clearCounters();
+    return payload;
+  }
+  async function persist(payload) {
+    try {
+      await queue.enqueue(payload);
+    } catch {
+      unpersisted.push(payload);
+      while (unpersisted.length > maxUnpersisted) {
+        unpersisted.shift();
+        console.warn("[heartbeat] in-memory hold full \u2014 dropped the oldest un-persisted bucket");
+      }
+    }
+  }
   async function flushIfDue(currentBucket) {
     if (currentBucket === bucketStart)
       return;
-    const payload = buildPayload();
-    bucketStart = currentBucket;
-    clearCounters();
+    await persist(rollBucket(currentBucket));
+  }
+  async function drainOnce() {
+    while (unpersisted.length > 0) {
+      try {
+        await queue.enqueue(unpersisted[0]);
+        unpersisted.shift();
+      } catch {
+        break;
+      }
+    }
+    let pending;
     try {
-      await opts.sink.post(payload);
+      pending = await queue.list();
     } catch {
+      return;
     }
+    pending.sort((a, b) => a.payload.windowStartsAt < b.payload.windowStartsAt ? -1 : a.payload.windowStartsAt > b.payload.windowStartsAt ? 1 : 0);
+    for (const entry of pending) {
+      try {
+        await opts.sink.post(entry.payload);
+      } catch {
+        return;
+      }
+      await queue.remove(entry.id).catch(() => void 0);
+    }
+  }
+  function drain() {
+    const run = drainChain.then(() => drainOnce());
+    drainChain = run.then(() => void 0, () => void 0);
+    return run;
   }
   return {
     record(tool, outcome) {
@@ -6218,16 +6368,15 @@ function createHeartbeatEmitter(opts) {
     async tick(nowOverride) {
       const current = Math.floor((nowOverride ?? now()) / windowMs) * windowMs;
       await flushIfDue(current);
+      await drain();
     },
     async flush() {
-      if (!hasData())
-        return;
-      const payload = buildPayload();
-      clearCounters();
-      try {
-        await opts.sink.post(payload);
-      } catch {
+      if (hasData()) {
+        const payload = buildPayload();
+        clearCounters();
+        await persist(payload);
       }
+      await drain();
     }
   };
 }
@@ -6243,7 +6392,7 @@ async function runHeartbeatLoop(emitter, opts = {}) {
 // ../listener/dist/mcp/log-encryption.js
 import { createCipheriv, createDecipheriv, randomBytes } from "crypto";
 import { mkdir as mkdir11, readFile as readFile11, stat as stat4, writeFile as writeFile12 } from "fs/promises";
-import { dirname as dirname11 } from "path";
+import { dirname as dirname12 } from "path";
 var KEY_BYTES = 32;
 var IV_BYTES = 12;
 var TAG_BYTES = 16;
@@ -6290,7 +6439,7 @@ function createFileKeyStore(keyPath) {
         return parsed;
       }
       const fresh = randomBytes(KEY_BYTES);
-      await mkdir11(dirname11(keyPath), { recursive: true });
+      await mkdir11(dirname12(keyPath), { recursive: true });
       const tmp = `${keyPath}.tmp`;
       await writeFile12(tmp, fresh.toString("base64") + "\n", {
         encoding: "utf-8",
@@ -6332,7 +6481,7 @@ function decryptLine(encoded, key) {
 
 // ../listener/dist/mcp/mcp-logger.js
 import { appendFile, mkdir as mkdir12, stat as stat5, unlink as unlink10, writeFile as writeFile13, readFile as readFile12 } from "fs/promises";
-import { dirname as dirname12 } from "path";
+import { dirname as dirname13 } from "path";
 var DEFAULT_MAX_BYTES = 100 * 1024 * 1024;
 function createMcpLogger(options) {
   const maxBytes = options.maxBytes ?? DEFAULT_MAX_BYTES;
@@ -6355,7 +6504,7 @@ function createMcpLogger(options) {
     await migrateLegacyPlaintext();
     const key = await options.keyStore.getKey();
     const encoded = encryptLine(JSON.stringify(entry), key) + "\n";
-    await mkdir12(dirname12(options.filePath), { recursive: true });
+    await mkdir12(dirname13(options.filePath), { recursive: true });
     await appendFile(options.filePath, encoded, { encoding: "utf-8", mode: 384 });
     try {
       const s = await stat5(options.filePath);
@@ -6387,15 +6536,15 @@ async function rotate(path, size) {
 }
 
 // ../listener/dist/mcp/mcp-log-uploader.js
-import { randomUUID } from "crypto";
+import { randomUUID as randomUUID2 } from "crypto";
 import { readFile as readFile13, writeFile as writeFile14, mkdir as mkdir13 } from "fs/promises";
-import { dirname as dirname13 } from "path";
+import { dirname as dirname14 } from "path";
 var MCP_LOG_UPLOAD_TIMEOUT_MS = 3e4;
-var DEFAULT_MAX_ENTRIES = 5e3;
+var DEFAULT_MAX_ENTRIES2 = 5e3;
 var DEFAULT_MAX_BYTES2 = 1 * 1024 * 1024;
 function createMcpLogUploader(options) {
   const fetchImpl = options.fetchImpl ?? fetch;
-  const maxEntries = options.maxEntriesPerBatch ?? DEFAULT_MAX_ENTRIES;
+  const maxEntries = options.maxEntriesPerBatch ?? DEFAULT_MAX_ENTRIES2;
   const maxBytes = options.maxBytesPerBatch ?? DEFAULT_MAX_BYTES2;
   let consentRevoked = false;
   return {
@@ -6473,7 +6622,7 @@ function createMcpLogUploader(options) {
       const token = await options.getAuthToken();
       let batchId = await readPendingBatch(options.watermarkFilePath);
       if (!batchId) {
-        batchId = randomUUID();
+        batchId = randomUUID2();
         await writePendingBatch(options.watermarkFilePath, batchId);
       }
       const uploadBody = JSON.stringify({
@@ -6542,7 +6691,7 @@ async function readPendingBatch(watermarkPath) {
   }
 }
 async function writePendingBatch(watermarkPath, batchId) {
-  await mkdir13(dirname13(watermarkPath), { recursive: true });
+  await mkdir13(dirname14(watermarkPath), { recursive: true });
   await writeFile14(pendingPath(watermarkPath), batchId, { encoding: "utf-8", mode: 384 });
 }
 async function clearPendingBatch(watermarkPath) {
@@ -6564,7 +6713,7 @@ async function readWatermark(path) {
   }
 }
 async function writeWatermark(path, offset) {
-  await mkdir13(dirname13(path), { recursive: true });
+  await mkdir13(dirname14(path), { recursive: true });
   const tmp = `${path}.tmp`;
   await writeFile14(tmp, offset.toString() + "\n", { encoding: "utf-8", mode: 384 });
   const { rename: rename8 } = await import("fs/promises");
@@ -6584,8 +6733,8 @@ async function isLocallyConsented(flagPath2) {
 init_config_dir();
 import { createServer } from "http";
 import { mkdir as mkdir14, writeFile as writeFile15, unlink as unlink11 } from "fs/promises";
-import { dirname as dirname14, join as join23 } from "path";
-import { createHash as createHash4, randomUUID as randomUUID2 } from "crypto";
+import { dirname as dirname15, join as join23 } from "path";
+import { createHash as createHash4, randomUUID as randomUUID3 } from "crypto";
 
 // ../listener/dist/mcp/sanitize.js
 var MCP_RESPONSE_BYTE_CAP = 200 * 1024;
@@ -7657,7 +7806,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) {
@@ -7697,7 +7859,7 @@ function handleRequest(req, res, options, sessions, secretCtx) {
       if (!body?.repoId)
         return sendJson(res, 400, { error: "missing_repoId" });
       return options.graphCache.acquire(body.repoId).then(() => {
-        const sessionId = randomUUID2();
+        const sessionId = randomUUID3();
         sessions.set(sessionId, { repoId: body.repoId });
         return sendJson(res, 200, { sessionId });
       });
@@ -8190,7 +8352,7 @@ async function readJson(req) {
   }
 }
 async function writeEndpointFile(path, endpoint, secret) {
-  await mkdir14(dirname14(path), { recursive: true });
+  await mkdir14(dirname15(path), { recursive: true });
   await writeFile15(path, formatEndpointFile({ endpoint, secret }), {
     encoding: "utf-8",
     mode: 384
@@ -8272,7 +8434,11 @@ async function startMcp(options) {
       getAuthToken: options.getAuthToken,
       flagFilePath,
       ...options.fetchImpl ? { fetchImpl: options.fetchImpl } : {}
-    })
+    }),
+    // Durable delivery: a rolled bucket is persisted before the POST, so a
+    // transient failure (network / auth gap / 5xx) is retried next tick and
+    // survives a restart instead of dropping the hour's counts.
+    queue: createFileHeartbeatQueue({ path: join24(mcpHome, "heartbeat-queue.jsonl") })
   }) : null;
   const heartbeatAbort = heartbeatEmitter ? new AbortController() : null;
   const server = await startMcpServer({
@@ -8492,10 +8658,10 @@ async function ensureServerConsent(opts) {
     });
     if (!res.ok)
       return;
-    const fs31 = await import("fs/promises");
+    const fs32 = await import("fs/promises");
     const path = await import("path");
-    await fs31.mkdir(path.dirname(opts.markerPath), { recursive: true });
-    await fs31.writeFile(opts.markerPath, (/* @__PURE__ */ new Date()).toISOString() + "\n", {
+    await fs32.mkdir(path.dirname(opts.markerPath), { recursive: true });
+    await fs32.writeFile(opts.markerPath, (/* @__PURE__ */ new Date()).toISOString() + "\n", {
       encoding: "utf-8",
       mode: 384
     });
@@ -8508,12 +8674,15 @@ import { homedir as homedir6 } from "os";
 import { basename as basename3 } from "path";
 
 // ../listener/dist/mcp/auto-config/writers/claude-code.js
-import { promises as fs6 } from "fs";
+import { promises as fs7 } from "fs";
 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";
+import { promises as fs6 } from "fs";
+import { dirname as dirname16 } 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 ?? {} };
@@ -8523,8 +8692,8 @@ async function writeMergedConfig(params) {
   const existing = safeExistingContent(params.path, current);
   if (existing === canonical)
     return "unchanged";
-  await fs5.mkdir(dirname15(params.path), { recursive: true });
-  await fs5.writeFile(params.path, canonical, "utf-8");
+  await fs6.mkdir(dirname16(params.path), { recursive: true });
+  await fs6.writeFile(params.path, canonical, "utf-8");
   return "written";
 }
 async function removeFromConfig(path, serverName) {
@@ -8537,11 +8706,11 @@ async function removeFromConfig(path, serverName) {
   if (Object.keys(servers).length === 0) {
     delete next.mcpServers;
   }
-  await fs5.writeFile(path, canonicalize(next), "utf-8");
+  await fs6.writeFile(path, canonicalize(next), "utf-8");
 }
 async function readConfig(path) {
   try {
-    const raw = await fs5.readFile(path, "utf-8");
+    const raw = await fs6.readFile(path, "utf-8");
     return JSON.parse(raw);
   } catch (err) {
     if (err.code === "ENOENT")
@@ -8596,20 +8765,20 @@ 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}`);
   }
 };
 async function fileExists2(path) {
   try {
-    await fs6.access(path);
+    await fs7.access(path);
     return true;
   } catch {
     return false;
@@ -8620,7 +8789,7 @@ async function hasClaudeBinary(home) {
 }
 
 // ../listener/dist/mcp/auto-config/writers/claude-code-hooks.js
-import { promises as fs7 } from "fs";
+import { promises as fs8 } from "fs";
 import { join as join26 } from "path";
 var claudeCodeHooksWriter = {
   tool: "claude-code-hooks",
@@ -8637,7 +8806,7 @@ var claudeCodeHooksWriter = {
 };
 async function fileExists3(path) {
   try {
-    await fs7.access(path);
+    await fs8.access(path);
     return true;
   } catch {
     return false;
@@ -8645,7 +8814,7 @@ async function fileExists3(path) {
 }
 
 // ../listener/dist/mcp/auto-config/writers/cline.js
-import { promises as fs8 } from "fs";
+import { promises as fs9 } from "fs";
 import { join as join27 } from "path";
 var clineWriter = {
   tool: "cline",
@@ -8657,20 +8826,20 @@ 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}`);
   }
 };
 async function fileExists4(path) {
   try {
-    await fs8.access(path);
+    await fs9.access(path);
     return true;
   } catch {
     return false;
@@ -8678,7 +8847,7 @@ async function fileExists4(path) {
 }
 
 // ../listener/dist/mcp/auto-config/writers/cline-hooks.js
-import { promises as fs9 } from "fs";
+import { promises as fs10 } from "fs";
 import { join as join28 } from "path";
 var SCRIPT_REL = ".clinerules/hooks/UserPromptSubmit";
 var OWNERSHIP_MARKER = "managed by RepoWise";
@@ -8712,8 +8881,8 @@ var clineHooksWriter = {
       await ensureExecutable(path);
       return { status: "unchanged", path };
     }
-    await fs9.mkdir(join28(ctx.repoRoot, ".clinerules", "hooks"), { recursive: true });
-    await fs9.writeFile(path, next, { encoding: "utf-8", mode: 493 });
+    await fs10.mkdir(join28(ctx.repoRoot, ".clinerules", "hooks"), { recursive: true });
+    await fs10.writeFile(path, next, { encoding: "utf-8", mode: 493 });
     await ensureExecutable(path);
     await applyGitignoreChanges(ctx.repoRoot, { add: [SCRIPT_REL] });
     return { status: "written", path };
@@ -8722,23 +8891,23 @@ var clineHooksWriter = {
     const path = join28(ctx.repoRoot, SCRIPT_REL);
     const existing = await readOrNull(path);
     if (existing !== null && existing.includes(OWNERSHIP_MARKER)) {
-      await fs9.unlink(path);
+      await fs10.unlink(path);
     }
     await applyGitignoreChanges(ctx.repoRoot, { remove: [SCRIPT_REL] });
   }
 };
 async function ensureExecutable(path) {
   try {
-    const stat8 = await fs9.stat(path);
+    const stat8 = await fs10.stat(path);
     if ((stat8.mode & 73) === 0) {
-      await fs9.chmod(path, 493);
+      await fs10.chmod(path, 493);
     }
   } catch {
   }
 }
 async function fileExists5(path) {
   try {
-    await fs9.access(path);
+    await fs10.access(path);
     return true;
   } catch {
     return false;
@@ -8746,14 +8915,14 @@ async function fileExists5(path) {
 }
 async function readOrNull(path) {
   try {
-    return await fs9.readFile(path, "utf-8");
+    return await fs10.readFile(path, "utf-8");
   } catch {
     return null;
   }
 }
 
 // ../listener/dist/mcp/auto-config/writers/codex.js
-import { promises as fs10 } from "fs";
+import { promises as fs11 } from "fs";
 import { join as join29 } from "path";
 var codexWriter = {
   tool: "codex",
@@ -8765,20 +8934,20 @@ 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}`);
   }
 };
 async function fileExists6(path) {
   try {
-    await fs10.access(path);
+    await fs11.access(path);
     return true;
   } catch {
     return false;
@@ -8786,7 +8955,7 @@ async function fileExists6(path) {
 }
 
 // ../listener/dist/mcp/auto-config/writers/codex-hooks.js
-import { promises as fs11 } from "fs";
+import { promises as fs12 } from "fs";
 import { join as join30 } from "path";
 var HOOKS_REL = ".codex/hooks.json";
 var codexHooksWriter = {
@@ -8817,8 +8986,8 @@ var codexHooksWriter = {
     if (merged === existing) {
       return { status: "unchanged", path };
     }
-    await fs11.mkdir(join30(ctx.repoRoot, ".codex"), { recursive: true });
-    await fs11.writeFile(path, merged, "utf-8");
+    await fs12.mkdir(join30(ctx.repoRoot, ".codex"), { recursive: true });
+    await fs12.writeFile(path, merged, "utf-8");
     await applyGitignoreChanges(ctx.repoRoot, { add: [HOOKS_REL] });
     return { status: "written", path };
   },
@@ -8828,9 +8997,9 @@ var codexHooksWriter = {
     if (existing !== null) {
       const next = removeCodexHookSettings(existing);
       if (next === null) {
-        await fs11.unlink(path);
+        await fs12.unlink(path);
       } else if (next !== existing) {
-        await fs11.writeFile(path, next, "utf-8");
+        await fs12.writeFile(path, next, "utf-8");
       }
     }
     await applyGitignoreChanges(ctx.repoRoot, { remove: [HOOKS_REL] });
@@ -8838,7 +9007,7 @@ var codexHooksWriter = {
 };
 async function fileExists7(path) {
   try {
-    await fs11.access(path);
+    await fs12.access(path);
     return true;
   } catch {
     return false;
@@ -8846,14 +9015,14 @@ async function fileExists7(path) {
 }
 async function readOrNull2(path) {
   try {
-    return await fs11.readFile(path, "utf-8");
+    return await fs12.readFile(path, "utf-8");
   } catch {
     return null;
   }
 }
 
 // ../listener/dist/mcp/auto-config/writers/copilot.js
-import { promises as fs12 } from "fs";
+import { promises as fs13 } from "fs";
 import { join as join31 } from "path";
 var copilotWriter = {
   tool: "copilot",
@@ -8865,20 +9034,20 @@ 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}`);
   }
 };
 async function fileExists8(path) {
   try {
-    await fs12.access(path);
+    await fs13.access(path);
     return true;
   } catch {
     return false;
@@ -8886,7 +9055,7 @@ async function fileExists8(path) {
 }
 
 // ../listener/dist/mcp/auto-config/writers/copilot-hooks.js
-import { promises as fs13 } from "fs";
+import { promises as fs14 } from "fs";
 import { join as join32 } from "path";
 var HOOKS_REL2 = ".github/hooks/repowise.json";
 var copilotHooksWriter = {
@@ -8915,8 +9084,8 @@ var copilotHooksWriter = {
     if (existing === next) {
       return { status: "unchanged", path };
     }
-    await fs13.mkdir(join32(ctx.repoRoot, ".github", "hooks"), { recursive: true });
-    await fs13.writeFile(path, next, "utf-8");
+    await fs14.mkdir(join32(ctx.repoRoot, ".github", "hooks"), { recursive: true });
+    await fs14.writeFile(path, next, "utf-8");
     const userSelected = ctx.selectedTools?.includes("copilot") ?? false;
     await applyGitignoreChanges(ctx.repoRoot, userSelected ? { remove: [HOOKS_REL2] } : { add: [HOOKS_REL2] });
     return { status: "written", path };
@@ -8924,7 +9093,7 @@ var copilotHooksWriter = {
   async remove(ctx) {
     const path = join32(ctx.repoRoot, HOOKS_REL2);
     if (!await isGitTracked(ctx.repoRoot, HOOKS_REL2)) {
-      await fs13.unlink(path).catch(() => {
+      await fs14.unlink(path).catch(() => {
       });
     }
     await applyGitignoreChanges(ctx.repoRoot, { remove: [HOOKS_REL2] });
@@ -8932,7 +9101,7 @@ var copilotHooksWriter = {
 };
 async function fileExists9(path) {
   try {
-    await fs13.access(path);
+    await fs14.access(path);
     return true;
   } catch {
     return false;
@@ -8940,14 +9109,14 @@ async function fileExists9(path) {
 }
 async function readOrNull3(path) {
   try {
-    return await fs13.readFile(path, "utf-8");
+    return await fs14.readFile(path, "utf-8");
   } catch {
     return null;
   }
 }
 
 // ../listener/dist/mcp/auto-config/writers/cursor.js
-import { promises as fs14 } from "fs";
+import { promises as fs15 } from "fs";
 import { join as join33 } from "path";
 var cursorWriter = {
   tool: "cursor",
@@ -8959,20 +9128,20 @@ 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}`);
   }
 };
 async function fileExists10(path) {
   try {
-    await fs14.access(path);
+    await fs15.access(path);
     return true;
   } catch {
     return false;
@@ -8980,7 +9149,7 @@ async function fileExists10(path) {
 }
 
 // ../listener/dist/mcp/auto-config/writers/gemini-cli.js
-import { promises as fs15 } from "fs";
+import { promises as fs16 } from "fs";
 import { join as join34 } from "path";
 var geminiCliWriter = {
   tool: "gemini-cli",
@@ -8992,20 +9161,20 @@ 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}`);
   }
 };
 async function fileExists11(path) {
   try {
-    await fs15.access(path);
+    await fs16.access(path);
     return true;
   } catch {
     return false;
@@ -9013,7 +9182,7 @@ async function fileExists11(path) {
 }
 
 // ../listener/dist/mcp/auto-config/writers/gemini-hooks.js
-import { promises as fs16 } from "fs";
+import { promises as fs17 } from "fs";
 import { join as join35 } from "path";
 var SETTINGS_REL = ".gemini/settings.json";
 var geminiHooksWriter = {
@@ -9044,8 +9213,8 @@ var geminiHooksWriter = {
     if (merged === existing) {
       return { status: "unchanged", path };
     }
-    await fs16.mkdir(join35(ctx.repoRoot, ".gemini"), { recursive: true });
-    await fs16.writeFile(path, merged, "utf-8");
+    await fs17.mkdir(join35(ctx.repoRoot, ".gemini"), { recursive: true });
+    await fs17.writeFile(path, merged, "utf-8");
     await applyGitignoreChanges(ctx.repoRoot, { add: [SETTINGS_REL] });
     return { status: "written", path };
   },
@@ -9055,9 +9224,9 @@ var geminiHooksWriter = {
     if (existing !== null) {
       const next = removeGeminiHookSettings(existing);
       if (next === null) {
-        await fs16.unlink(path);
+        await fs17.unlink(path);
       } else if (next !== existing) {
-        await fs16.writeFile(path, next, "utf-8");
+        await fs17.writeFile(path, next, "utf-8");
       }
     }
     await applyGitignoreChanges(ctx.repoRoot, { remove: [SETTINGS_REL] });
@@ -9065,7 +9234,7 @@ var geminiHooksWriter = {
 };
 async function fileExists12(path) {
   try {
-    await fs16.access(path);
+    await fs17.access(path);
     return true;
   } catch {
     return false;
@@ -9073,14 +9242,14 @@ async function fileExists12(path) {
 }
 async function readOrNull4(path) {
   try {
-    return await fs16.readFile(path, "utf-8");
+    return await fs17.readFile(path, "utf-8");
   } catch {
     return null;
   }
 }
 
 // ../listener/dist/mcp/auto-config/writers/roo.js
-import { promises as fs17 } from "fs";
+import { promises as fs18 } from "fs";
 import { join as join36 } from "path";
 var rooWriter = {
   tool: "roo",
@@ -9102,7 +9271,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(() => {
       });
@@ -9111,7 +9280,7 @@ var rooWriter = {
 };
 async function fileExists13(path) {
   try {
-    await fs17.access(path);
+    await fs18.access(path);
     return true;
   } catch {
     return false;
@@ -9119,14 +9288,14 @@ async function fileExists13(path) {
 }
 async function readOrNull5(path) {
   try {
-    return await fs17.readFile(path, "utf-8");
+    return await fs18.readFile(path, "utf-8");
   } catch {
     return null;
   }
 }
 
 // ../listener/dist/mcp/auto-config/writers/windsurf.js
-import { promises as fs18 } from "fs";
+import { promises as fs19 } from "fs";
 import { join as join37 } from "path";
 var windsurfWriter = {
   tool: "windsurf",
@@ -9138,20 +9307,20 @@ 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}`);
   }
 };
 async function fileExists14(path) {
   try {
-    await fs18.access(path);
+    await fs19.access(path);
     return true;
   } catch {
     return false;
@@ -9205,7 +9374,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) {
@@ -9225,7 +9395,7 @@ init_installer();
 // ../listener/dist/lsp/warm.js
 init_registry();
 init_lsp_tools();
-import { promises as fs19 } from "fs";
+import { promises as fs20 } from "fs";
 import { join as join38 } from "path";
 async function collectRepresentativeFiles(repoRoot) {
   const reps = /* @__PURE__ */ new Map();
@@ -9236,7 +9406,7 @@ async function collectRepresentativeFiles(repoRoot) {
       return;
     let entries;
     try {
-      entries = await fs19.readdir(dir);
+      entries = await fs20.readdir(dir);
     } catch {
       return;
     }
@@ -9258,7 +9428,7 @@ async function collectRepresentativeFiles(repoRoot) {
   await inspect(repoRoot, "");
   let topEntries = [];
   try {
-    topEntries = await fs19.readdir(repoRoot);
+    topEntries = await fs20.readdir(repoRoot);
   } catch {
     return reps;
   }
@@ -9269,7 +9439,7 @@ async function collectRepresentativeFiles(repoRoot) {
       continue;
     const sub = join38(repoRoot, name);
     try {
-      const stat8 = await fs19.stat(sub);
+      const stat8 = await fs20.stat(sub);
       if (stat8.isDirectory())
         await inspect(sub, name);
     } catch {
@@ -9283,7 +9453,7 @@ async function warmReposLsp(repos, workspaces, lspOverrides, isAvailable) {
     if (!repoRoot)
       continue;
     try {
-      const stat8 = await fs19.stat(repoRoot);
+      const stat8 = await fs20.stat(repoRoot);
       if (!stat8.isDirectory())
         continue;
     } catch {
@@ -9312,7 +9482,7 @@ async function warmReposLsp(repos, workspaces, lspOverrides, isAvailable) {
 
 // ../listener/dist/lib/workspace-prep.js
 init_config_dir();
-import { promises as fs20 } from "fs";
+import { promises as fs21 } from "fs";
 import { spawn as spawn9, execFile as execFile5 } from "child_process";
 import { createWriteStream as createWriteStream2 } from "fs";
 import { join as join39 } from "path";
@@ -9369,7 +9539,7 @@ async function maybeWriteClangdStub(repoRoot, repoId) {
       return;
     let ents;
     try {
-      ents = await fs20.readdir(dir, { withFileTypes: true });
+      ents = await fs21.readdir(dir, { withFileTypes: true });
     } catch {
       return;
     }
@@ -9405,9 +9575,9 @@ async function maybeWriteClangdStub(repoRoot, repoId) {
     };
   });
   const outDir = join39(repoRoot, ".repowise");
-  await fs20.mkdir(outDir, { recursive: true });
+  await fs21.mkdir(outDir, { recursive: true });
   const outPath = join39(outDir, "compile_commands.json");
-  await fs20.writeFile(outPath, JSON.stringify(entries, null, 2));
+  await fs21.writeFile(outPath, JSON.stringify(entries, null, 2));
   const capHit = sources.length >= MAX_STUB_SOURCES;
   console.log(`[workspace-prep] ${repoId}: wrote ${entries.length.toString()}-entry compile_commands stub to .repowise/${capHit ? " (cap reached \u2014 additional sources truncated)" : ""}`);
   return true;
@@ -9415,7 +9585,7 @@ async function maybeWriteClangdStub(repoRoot, repoId) {
 var DEFAULT_TIMEOUT_MS = 10 * 60 * 1e3;
 async function fileExists15(repoRoot, name) {
   try {
-    await fs20.access(join39(repoRoot, name));
+    await fs21.access(join39(repoRoot, name));
     return true;
   } catch {
     return false;
@@ -9426,7 +9596,7 @@ async function detectWorkspaceDeps(repoRoot) {
   if (await fileExists15(repoRoot, "package.json")) {
     let pkgRaw = "";
     try {
-      pkgRaw = await fs20.readFile(join39(repoRoot, "package.json"), "utf8");
+      pkgRaw = await fs21.readFile(join39(repoRoot, "package.json"), "utf8");
     } catch {
     }
     if (pkgRaw) {
@@ -9530,7 +9700,7 @@ async function runWorkspacePreps(opts) {
     return [];
   const safeRepoId = opts.repoId.replace(/[^a-zA-Z0-9_-]/g, "_");
   const logPath2 = join39(getConfigDir(), `install-log.${safeRepoId}.txt`);
-  await fs20.mkdir(getConfigDir(), { recursive: true });
+  await fs21.mkdir(getConfigDir(), { recursive: true });
   const stream = opts.logStream ?? createWriteStream2(logPath2, { flags: "a" });
   stream.on("error", () => {
   });
@@ -9773,7 +9943,7 @@ async function ensureIndexable(indexRoot, language, options = {}) {
 init_src();
 init_registry();
 import { execFile as execFileCb2 } from "child_process";
-import { dirname as dirname16 } from "path";
+import { dirname as dirname17 } from "path";
 import { promisify as promisify5 } from "util";
 init_daemon_path();
 
@@ -10261,7 +10431,7 @@ async function isCommandOnPath4(command) {
       timeout: 5e3,
       env: {
         ...process.env,
-        PATH: buildLspSpawnPath(process.env.PATH, dirname16(process.execPath), managedBinDirs())
+        PATH: buildLspSpawnPath(process.env.PATH, dirname17(process.execPath), managedBinDirs())
       }
     });
     return true;
@@ -10933,11 +11103,11 @@ function resolveAuditRoots() {
     return override.split(":").map((s) => s.trim()).filter(Boolean);
   }
   const out = /* @__PURE__ */ new Set();
-  let dir = dirname17(process.execPath);
+  let dir = dirname18(process.execPath);
   for (let i = 0; i < 8; i += 1) {
     out.add(join42(dir, "node_modules"));
     out.add(join42(dir, "lib", "node_modules"));
-    const parent = dirname17(dir);
+    const parent = dirname18(dir);
     if (parent === dir)
       break;
     dir = parent;
@@ -11003,8 +11173,8 @@ async function waitForCredentials(isRunning2) {
   let changed = false;
   let watcher = null;
   try {
-    const fs31 = await import("fs");
-    watcher = fs31.watch(getConfigDir(), (_event, filename) => {
+    const fs32 = await import("fs");
+    watcher = fs32.watch(getConfigDir(), (_event, filename) => {
       if (!filename || filename === "credentials.json")
         changed = true;
     });
@@ -11030,8 +11200,8 @@ async function waitForCredentialsOrTerminal(isRunning2) {
   let changed = false;
   let watcher = null;
   try {
-    const fs31 = await import("fs");
-    watcher = fs31.watch(getConfigDir(), (_event, filename) => {
+    const fs32 = await import("fs");
+    watcher = fs32.watch(getConfigDir(), (_event, filename) => {
       if (!filename || filename === "credentials.json")
         changed = true;
     });
@@ -11302,6 +11472,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)
@@ -11322,7 +11493,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) {
@@ -11534,7 +11706,7 @@ async function startListener() {
   const packageName = true ? "repowisestage" : "repowise";
   let currentVersion = "";
   try {
-    const selfDir = dirname17(fileURLToPath3(import.meta.url));
+    const selfDir = dirname18(fileURLToPath3(import.meta.url));
     const pkgJsonPath = join42(selfDir, "..", "..", "package.json");
     const pkgJson = JSON.parse(await readFile14(pkgJsonPath, "utf-8"));
     currentVersion = pkgJson.version;
@@ -11744,10 +11916,25 @@ async function startListener() {
     proactiveRefreshTimer.unref();
   }
   let lastCycleAt = Date.now();
+  let endpointResumeFailed = false;
+  let endpointResumeRetries = 0;
   while (running) {
     const wakeDrift = Date.now() - lastCycleAt;
     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;
@@ -12097,7 +12284,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;
@@ -12253,7 +12442,7 @@ async function showWelcome(currentVersion) {
 
 // src/commands/create.ts
 import { mkdirSync as mkdirSync2, writeFileSync as writeFileSync3 } from "fs";
-import { dirname as dirname19, join as join51 } from "path";
+import { dirname as dirname20, join as join51 } from "path";
 init_src();
 import chalk8 from "chalk";
 import ora from "ora";
@@ -12785,7 +12974,7 @@ async function writeToolConfigsForRepo(opts) {
 
 // src/lib/mcp-resolver.ts
 import { basename as basename4, join as join46 } from "path";
-import { promises as fs21 } from "fs";
+import { promises as fs22 } from "fs";
 var MCP_WRITER_TOOLS = /* @__PURE__ */ new Set([
   "claude-code",
   "cursor",
@@ -12826,7 +13015,7 @@ function mcpConfigTargetForTool(tool, opts) {
 async function mcpConfigState(target) {
   let raw;
   try {
-    raw = await fs21.readFile(target.path, "utf-8");
+    raw = await fs22.readFile(target.path, "utf-8");
   } catch {
     return "absent";
   }
@@ -12879,7 +13068,7 @@ function ensureGitignore(repoRoot, entry) {
 // src/lib/graph-cache.ts
 init_config_dir();
 import { mkdirSync, writeFileSync as writeFileSync2, renameSync, unlinkSync } from "fs";
-import { dirname as dirname18, join as join48 } from "path";
+import { dirname as dirname19, join as join48 } from "path";
 var SAFE_REPO_ID = /^[A-Za-z0-9_.-]{1,128}$/;
 function assertSafeRepoId2(repoId) {
   if (!repoId || typeof repoId !== "string" || !SAFE_REPO_ID.test(repoId) || repoId === "." || repoId === ".." || repoId.startsWith(".")) {
@@ -13007,7 +13196,7 @@ async function ensureGraphDownloaded(opts) {
       return { status: "not_found", message: "EMPTY_GRAPH" };
     }
     try {
-      mkdirSync(dirname18(targetPath), { recursive: true });
+      mkdirSync(dirname19(targetPath), { recursive: true });
       const tmp = `${targetPath}.${String(process.pid)}.${Math.random().toString(36).slice(2)}.tmp`;
       try {
         writeFileSync2(tmp, body, { encoding: "utf-8", mode: 384 });
@@ -13625,7 +13814,7 @@ async function promptDepInstallConsent(missing, opts) {
 import chalk6 from "chalk";
 
 // src/lib/dep-installer.ts
-import { promises as fs22 } from "fs";
+import { promises as fs23 } from "fs";
 import { join as join49 } from "path";
 var SUPPORTED_DEP_LANGUAGES = /* @__PURE__ */ new Set([
   "typescript",
@@ -13636,7 +13825,7 @@ var SUPPORTED_DEP_LANGUAGES = /* @__PURE__ */ new Set([
 ]);
 var exists = async (p) => {
   try {
-    await fs22.access(p);
+    await fs23.access(p);
     return true;
   } catch {
     return false;
@@ -13720,13 +13909,13 @@ async function detectMissingDeps(repoRoot, scopedLanguages) {
 // src/lib/dep-installer-runner.ts
 import { spawn as spawn11 } from "child_process";
 import { createWriteStream as createWriteStream3 } from "fs";
-import { promises as fs23 } from "fs";
+import { promises as fs24 } from "fs";
 import { join as join50 } from "path";
 var DEFAULT_INSTALL_TIMEOUT_MS = 10 * 60 * 1e3;
 async function runMissingDepInstalls(opts) {
   const safeRepoId = opts.repoId.replace(/[^a-zA-Z0-9_-]/g, "_");
   const logPath2 = join50(getConfigDir2(), `install-log.${safeRepoId}.txt`);
-  await fs23.mkdir(getConfigDir2(), { recursive: true });
+  await fs24.mkdir(getConfigDir2(), { recursive: true });
   const stream = opts.logStream ?? createWriteStream3(logPath2, { flags: "a" });
   stream.on("error", () => {
   });
@@ -14410,7 +14599,7 @@ async function create() {
             if (response.ok) {
               const content = await response.text();
               const filePath = join51(contextDir, file.fileName);
-              mkdirSync2(dirname19(filePath), { recursive: true });
+              mkdirSync2(dirname20(filePath), { recursive: true });
               writeFileSync3(filePath, content, "utf-8");
               downloadedCount++;
             } else {
@@ -14638,7 +14827,7 @@ Files are stored on our servers (not in git). Retry when online.`
 
 // src/commands/member.ts
 import { mkdirSync as mkdirSync3, writeFileSync as writeFileSync4 } from "fs";
-import { dirname as dirname20, join as join52, resolve, sep } from "path";
+import { dirname as dirname21, join as join52, resolve, sep } from "path";
 import chalk9 from "chalk";
 import ora2 from "ora";
 var DEFAULT_CONTEXT_FOLDER2 = "repowise-context";
@@ -14813,7 +15002,7 @@ async function member() {
         const response = await fetch(presignedUrl);
         if (response.ok) {
           const content = await response.text();
-          mkdirSync3(dirname20(safePath), { recursive: true });
+          mkdirSync3(dirname21(safePath), { recursive: true });
           writeFileSync4(safePath, content, "utf-8");
           downloadedCount++;
         } else {
@@ -14970,7 +15159,7 @@ import chalk10 from "chalk";
 import ora3 from "ora";
 
 // src/lib/tenant-graph-purge.ts
-import { promises as fs24 } from "fs";
+import { promises as fs25 } from "fs";
 import { homedir as homedir8 } from "os";
 import { join as join53 } from "path";
 async function purgeForeignGraphs(validRepoIds, home = homedir8()) {
@@ -14978,7 +15167,7 @@ async function purgeForeignGraphs(validRepoIds, home = homedir8()) {
   const result = { kept: [], removed: [] };
   let entries;
   try {
-    entries = await fs24.readdir(graphsDir);
+    entries = await fs25.readdir(graphsDir);
   } catch (err) {
     if (err.code === "ENOENT") return result;
     throw err;
@@ -14994,13 +15183,13 @@ async function purgeForeignGraphs(validRepoIds, home = homedir8()) {
     }
     const path = join53(graphsDir, entry);
     try {
-      const stat8 = await fs24.lstat(path);
+      const stat8 = await fs25.lstat(path);
       if (stat8.isSymbolicLink()) {
-        await fs24.unlink(path);
+        await fs25.unlink(path);
         result.removed.push(entry);
         continue;
       }
-      await fs24.rm(path, { recursive: true, force: true });
+      await fs25.rm(path, { recursive: true, force: true });
       result.removed.push(entry);
     } catch {
     }
@@ -15200,7 +15389,7 @@ async function status() {
 
 // src/commands/sync.ts
 import { mkdirSync as mkdirSync4, writeFileSync as writeFileSync5 } from "fs";
-import { dirname as dirname21, join as join55 } from "path";
+import { dirname as dirname22, join as join55 } from "path";
 import chalk12 from "chalk";
 import ora4 from "ora";
 var POLL_INTERVAL_MS2 = 3e3;
@@ -15366,7 +15555,7 @@ async function sync() {
           if (response.ok) {
             const content = await response.text();
             const filePath = join55(contextDir, file.fileName);
-            mkdirSync4(dirname21(filePath), { recursive: true });
+            mkdirSync4(dirname22(filePath), { recursive: true });
             writeFileSync5(filePath, content, "utf-8");
             downloadedCount++;
           } else {
@@ -15769,7 +15958,7 @@ async function toolsList() {
 // src/commands/mcp-log.ts
 import { createDecipheriv as createDecipheriv2 } from "crypto";
 import { mkdir as mkdir19, readFile as readFile18, stat as stat7, writeFile as writeFile19 } from "fs/promises";
-import { dirname as dirname22, join as join56 } from "path";
+import { dirname as dirname23, join as join56 } from "path";
 var FLAG_FILE = "mcp-log.flag";
 var LOG_FILE = "mcp-log.jsonl.enc";
 var KEY_FILE = "mcp-log.key";
@@ -15784,7 +15973,7 @@ function logPath() {
 }
 async function writeFlag(flag) {
   const path = flagPath();
-  await mkdir19(dirname22(path), { recursive: true });
+  await mkdir19(dirname23(path), { recursive: true });
   await writeFile19(path, JSON.stringify(flag, null, 2), { encoding: "utf-8", mode: 384 });
 }
 async function mcpLogOn() {
@@ -16049,7 +16238,7 @@ async function mcpLog(subcommand, flags = {}) {
 import chalk15 from "chalk";
 
 // src/lib/graph-loader.ts
-import { promises as fs25 } from "fs";
+import { promises as fs26 } from "fs";
 import { join as join57, resolve as resolve2 } from "path";
 import { gunzipSync } from "zlib";
 var RELATIVE_GRAPH_PATH = "repowise-context/.meta/dependency-graph.json";
@@ -16076,14 +16265,14 @@ async function loadGraph(repoRoot = process.cwd()) {
   let graphPath = null;
   let raw = null;
   try {
-    raw = await fs25.readFile(gzPath);
+    raw = await fs26.readFile(gzPath);
     graphPath = gzPath;
   } catch (err) {
     if (err.code !== "ENOENT") throw err;
   }
   if (!raw) {
     try {
-      raw = await fs25.readFile(plainPath);
+      raw = await fs26.readFile(plainPath);
       graphPath = plainPath;
     } catch (err) {
       if (err.code === "ENOENT") {
@@ -16482,13 +16671,13 @@ function registerQueryCommand(program2) {
 }
 
 // src/commands/uninstall.ts
-import { promises as fs29 } from "fs";
+import { promises as fs30 } from "fs";
 import { homedir as homedir12 } from "os";
 import { join as join61 } from "path";
 import chalk16 from "chalk";
 
 // src/lib/cleanup/marker-blocks.ts
-import { promises as fs26 } from "fs";
+import { promises as fs27 } from "fs";
 import { join as join58 } from "path";
 var MARKER_START = "<!-- repowise-start -->";
 var MARKER_END = "<!-- repowise-end -->";
@@ -16505,7 +16694,7 @@ var CONTEXT_FILES = [
 async function stripMarkerBlock(filePath) {
   let raw;
   try {
-    raw = await fs26.readFile(filePath, "utf-8");
+    raw = await fs27.readFile(filePath, "utf-8");
   } catch (err) {
     if (err.code === "ENOENT")
       return { path: filePath, status: "missing" };
@@ -16520,10 +16709,10 @@ async function stripMarkerBlock(filePath) {
   const after = raw.slice(endIdx + MARKER_END.length).replace(/^\n+/, "");
   const stripped = (before + (before && after ? "\n\n" : "") + after).trim();
   if (stripped.length === 0) {
-    await fs26.unlink(filePath);
+    await fs27.unlink(filePath);
     return { path: filePath, status: "deleted" };
   }
-  await fs26.writeFile(filePath, stripped + "\n", "utf-8");
+  await fs27.writeFile(filePath, stripped + "\n", "utf-8");
   return { path: filePath, status: "stripped" };
 }
 async function stripAllMarkerBlocks(repoRoot) {
@@ -16541,7 +16730,7 @@ async function stripAllMarkerBlocks(repoRoot) {
 }
 
 // src/lib/cleanup/mcp-configs.ts
-import { promises as fs27 } from "fs";
+import { promises as fs28 } from "fs";
 import { join as join59 } from "path";
 function mcpConfigPaths(repoRoot, home) {
   return [
@@ -16559,7 +16748,7 @@ function mcpConfigPaths(repoRoot, home) {
 async function removeRepowiseFromConfig(path, serverName) {
   let raw;
   try {
-    raw = await fs27.readFile(path, "utf-8");
+    raw = await fs28.readFile(path, "utf-8");
   } catch (err) {
     if (err.code === "ENOENT") return { path, status: "not-found" };
     return { path, status: "error", error: err.message };
@@ -16579,7 +16768,7 @@ async function removeRepowiseFromConfig(path, serverName) {
   } else {
     next.mcpServers = servers;
   }
-  await fs27.writeFile(path, JSON.stringify(next, null, 2) + "\n", "utf-8");
+  await fs28.writeFile(path, JSON.stringify(next, null, 2) + "\n", "utf-8");
   return { path, status: "removed" };
 }
 async function removeAllMcpEntries(repoRoot, home, repoId) {
@@ -16592,7 +16781,7 @@ async function removeAllMcpEntries(repoRoot, home, repoId) {
 }
 
 // src/lib/cleanup/local-state.ts
-import { promises as fs28 } from "fs";
+import { promises as fs29 } from "fs";
 import { homedir as homedir11 } from "os";
 import { join as join60, resolve as resolve3 } from "path";
 async function clearLocalState(homeOverride) {
@@ -16602,7 +16791,7 @@ async function clearLocalState(homeOverride) {
     return { path: target, status: "error", error: "refused: not under home" };
   }
   try {
-    await fs28.rm(target, { recursive: true, force: false });
+    await fs29.rm(target, { recursive: true, force: false });
     return { path: target, status: "removed" };
   } catch (err) {
     if (err.code === "ENOENT")
@@ -16641,7 +16830,7 @@ async function uninstall2(opts = {}) {
   else if (svc.error) report.skipped.push({ path: "listener service", reason: svc.error });
   if (tier === "stop") return report;
   try {
-    await fs29.unlink(join61(home, ".repowise", "credentials.json"));
+    await fs30.unlink(join61(home, ".repowise", "credentials.json"));
     report.removed.push("credentials");
   } catch (err) {
     if (err.code !== "ENOENT") {
@@ -16668,7 +16857,7 @@ async function uninstall2(opts = {}) {
   const allPaths = mcpConfigPaths(repoRoot, home);
   for (const p of allPaths) {
     try {
-      await fs29.access(p);
+      await fs30.access(p);
     } catch {
     }
   }
@@ -16680,7 +16869,7 @@ async function uninstall2(opts = {}) {
 }
 async function defaultLoadRepoIds(home) {
   try {
-    const raw = await fs29.readFile(join61(home, ".repowise", "config.json"), "utf-8");
+    const raw = await fs30.readFile(join61(home, ".repowise", "config.json"), "utf-8");
     const parsed = JSON.parse(raw);
     return (parsed.repos ?? []).map((r) => r.repoId);
   } catch {
@@ -16727,7 +16916,7 @@ Done \u2014 ${report.removed.length} removed, ${report.skipped.length} skipped.
 
 // src/commands/mcp-shim.ts
 init_config_dir();
-import { promises as fs30 } from "fs";
+import { promises as fs31 } from "fs";
 import { createInterface as createInterface2 } from "readline";
 import { join as join62 } from "path";
 var DEFAULT_MAX = 200 * 1024;
@@ -16773,8 +16962,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",
@@ -16796,16 +16987,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,
@@ -16816,9 +17015,23 @@ 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();
+    const raw = (await fs31.readFile(path, "utf-8")).trim();
     if (!raw) return null;
     if (raw.startsWith("http://") || raw.startsWith("https://")) {
       return { endpoint: raw.split("\n")[0].trim(), secret: null };
@@ -16839,7 +17052,7 @@ async function readEndpoint(path) {
 async function readAuthState(credsPath) {
   let raw;
   try {
-    raw = await fs30.readFile(credsPath, "utf-8");
+    raw = await fs31.readFile(credsPath, "utf-8");
   } catch (err) {
     if (err.code === "ENOENT") return "logged-out";
     return "unknown";
@@ -16866,7 +17079,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 } }
       }
     };
@@ -17514,7 +17727,7 @@ async function lspOn() {
 
 // bin/repowise.ts
 var __filename = fileURLToPath4(import.meta.url);
-var __dirname = dirname23(__filename);
+var __dirname = dirname24(__filename);
 var pkg = JSON.parse(readFileSync3(join63(__dirname, "..", "..", "package.json"), "utf-8"));
 var program = new Command();
 program.name(getPackageName()).description("AI-optimized codebase context generator").version(pkg.version).hook("preAction", async () => {