@synkro-sh/cli 1.6.69 → 1.6.71

package/dist/bootstrap.js

@@ -6425,6 +6425,50 @@ function loadMcpJwt(): string {
   try { return readFileSync(join(HOME, '.synkro', '.mcp-jwt'), 'utf-8').trim(); } catch { return ''; }
 }
 
+let _cfgCache: Record<string, string> | null = null;
+function cfgVal(key: string): string {
+  if (process.env[key]) return process.env[key] as string;
+  if (!_cfgCache) {
+    _cfgCache = {};
+    try {
+      const txt = readFileSync(join(HOME, '.synkro', 'config.env'), 'utf-8');
+      for (const line of txt.split('\n')) {
+        const mm = line.match(/^([A-Z0-9_]+)=['"]?(.*?)['"]?\s*$/);
+        if (mm) _cfgCache[mm[1]] = mm[2];
+      }
+    } catch {}
+  }
+  return _cfgCache[key] || '';
+}
+function deployIsCloud(): boolean { return cfgVal('SYNKRO_DEPLOY_LOCATION') === 'cloud'; }
+
+// Cloud MCP gate: in cloud mode the local server (:18931) isn't running, so the
+// gate asks the org policy directly (api /api/mcp/gate, authed by .mcp-jwt).
+// Fail-open by contract — any error or non-block verdict allows the call.
+async function cloudMcpGate(payload: any, harness: string): Promise<string> {
+  try {
+    const toolName = String(payload.tool_name || payload.tool || '');
+    const parts = toolName.split('__');
+    const server = (parts.length >= 3 && parts[0] === 'mcp') ? parts[1] : '';
+    if (!server) return failOpen(harness);
+    const base = (cfgVal('SYNKRO_GATEWAY_URL') || 'https://api.synkro.sh').replace(/\/+$/, '');
+    const resp = await fetch(base + '/api/mcp/gate', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json', Authorization: 'Bearer ' + loadMcpJwt() },
+      body: JSON.stringify({ server: server, tool: parts.slice(2).join('__') }),
+      signal: AbortSignal.timeout(5000),
+    });
+    if (!resp.ok) return failOpen(harness);
+    const d = await resp.json() as any;
+    if (d && d.decision === 'block') {
+      const reason = String(d.reason || ('MCP server "' + server + '" blocked by policy'));
+      if (harness === 'cursor') return JSON.stringify({ permission: 'deny', user_message: reason });
+      return JSON.stringify({ systemMessage: '[synkro:cloud:mcp] ' + reason, hookSpecificOutput: { hookEventName: 'PreToolUse', permissionDecision: 'deny', permissionDecisionReason: reason, additionalContext: reason } });
+    }
+    return failOpen(harness);
+  } catch { return failOpen(harness); }
+}
+
 async function readStdin(): Promise<string> {
   const chunks: Buffer[] = [];
   for await (const chunk of process.stdin) chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
@@ -6484,6 +6528,10 @@ export async function runStub(surface: string, opts: StubOpts = {}): Promise<voi
     if (!input.trim()) { out(failOpen(harness)); return; }
     const payload = JSON.parse(input);
 
+    // Cloud MCP enforcement: the gate can't reach the local server, so decide
+    // against the org policy directly. Fail-open inside cloudMcpGate.
+    if (surface === 'mcp-gate' && deployIsCloud()) { out(await cloudMcpGate(payload, harness)); return; }
+
     const workspaceRoots = Array.isArray(payload.workspace_roots) ? payload.workspace_roots : [];
     const cwd = (typeof payload.cwd === 'string' && payload.cwd) || workspaceRoots[0] || '';
     const sessionId = String(payload.session_id || payload.conversation_id || '');
@@ -9639,11 +9687,12 @@ function captureClaudeSetupToken() {
         reject(new Error(`claude setup-token exited with code ${code}`));
         return;
       }
+      const stripToToken = (s) => s.replace(/\x1B\[[0-9;?]*[a-zA-Z]/g, "").replace(/\x1B\][^\x07]*\x07/g, "").replace(/[\s\x00-\x1F\x7F]/g, "");
       const yellowRe = /\x1B\[38;2;255;193;7m([^\x1B]*)/g;
       let yellow = "";
       let m;
       while ((m = yellowRe.exec(raw)) !== null) yellow += m[1];
-      const yMatch = yellow.replace(/\s/g, "").match(/sk-ant-oat01-[A-Za-z0-9_-]+/);
+      const yToken = stripToToken(yellow);
       let lineMatch = "";
       const clean = raw.replace(/\x1B\[[0-9;?]*[a-zA-Z]/g, "").replace(/\x1B\][^\x07]*\x07/g, "");
       const lines = clean.split("\n").map((l) => l.trim());
@@ -9655,13 +9704,13 @@ function captureClaudeSetupToken() {
         lineMatch = tok;
         break;
       }
-      const candidates = [yMatch ? yMatch[0] : "", lineMatch].filter((t) => /^sk-ant-oat01-[A-Za-z0-9_-]{20,}$/.test(t));
-      const best = candidates.sort((a, b) => b.length - a.length)[0];
-      if (!best) {
-        reject(new Error(`Could not find token in claude setup-token output (file=${raw.length}b, yellow=${yellow.length}b)`));
+      const valid = (t) => /^sk-ant-oat01-[A-Za-z0-9_-]{40,}$/.test(t);
+      const token = valid(yToken) ? yToken : valid(lineMatch) ? lineMatch : "";
+      if (!token) {
+        reject(new Error(`Could not capture a full token from claude setup-token output (file=${raw.length}b, yellow=${yellow.length}b, yToken=${yToken.length}b)`));
         return;
       }
-      resolve4(best);
+      resolve4(token);
     });
   });
 }
@@ -10005,6 +10054,7 @@ var init_setupGithub = __esm({
 var install_exports = {};
 __export(install_exports, {
   detectGitRepo: () => detectGitRepo2,
+  getOrMintCloudToken: () => getOrMintCloudToken,
   installCommand: () => installCommand,
   parseArgs: () => parseArgs,
   reconcileDeployLocation: () => reconcileDeployLocation,
@@ -10336,7 +10386,7 @@ function writeConfigEnv(opts) {
     `SYNKRO_CREDENTIALS_PATH=${shellQuoteSingle(credsPath)}`,
     `SYNKRO_TIER=${shellQuoteSingle(safeTier)}`,
     `SYNKRO_INFERENCE=${shellQuoteSingle(safeInference)}`,
-    `SYNKRO_VERSION=${shellQuoteSingle("1.6.69")}`
+    `SYNKRO_VERSION=${shellQuoteSingle("1.6.71")}`
   ];
   if (safeSynkroBin) lines.push(`SYNKRO_CLI_BIN=${shellQuoteSingle(safeSynkroBin)}`);
   if (safeUserId) lines.push(`SYNKRO_USER_ID=${shellQuoteSingle(safeUserId)}`);
@@ -10356,6 +10406,38 @@ function writeConfigEnv(opts) {
   writeFileSync8(CONFIG_PATH2, lines.join("\n"), "utf-8");
   chmodSync2(CONFIG_PATH2, 384);
 }
+function jwtExpired(token) {
+  try {
+    const p = JSON.parse(Buffer.from(token.split(".")[1], "base64url").toString("utf-8"));
+    if (!p?.exp) return true;
+    return Date.now() > p.exp * 1e3 - 5 * 60 * 1e3;
+  } catch {
+    return true;
+  }
+}
+async function getOrMintCloudToken(gatewayUrl) {
+  assertGatewayAllowed(gatewayUrl);
+  let stored = "";
+  try {
+    stored = readFileSync10(CLOUD_JWT_PATH, "utf-8").trim();
+  } catch {
+  }
+  if (stored && !jwtExpired(stored)) return stored;
+  await refreshToken().catch(() => false);
+  const jwt2 = getAccessToken();
+  if (!jwt2) throw new Error("Not authenticated \u2014 run `synkro login`");
+  const resp = await fetch(`${gatewayUrl}/api/v1/cli/cloud-token`, {
+    method: "POST",
+    headers: { Authorization: `Bearer ${jwt2}`, "Content-Type": "application/json" }
+  });
+  if (!resp.ok) {
+    const t = await resp.text().catch(() => "");
+    throw new Error(`cloud-token mint failed (${resp.status}): ${t.slice(0, 200)}`);
+  }
+  const { token } = await resp.json();
+  writeFileSync8(CLOUD_JWT_PATH, token + "\n", { mode: 384 });
+  return token;
+}
 async function provisionCloudContainer(opts) {
   let setupToken;
   try {
@@ -10382,10 +10464,16 @@ async function provisionCloudContainer(opts) {
     } catch {
     }
   }
+  let cloudJwt = opts.jwt;
+  try {
+    cloudJwt = await getOrMintCloudToken(opts.gatewayUrl);
+  } catch (e) {
+    console.warn(`  (cloud token unavailable, using session token: ${e.message})`);
+  }
   try {
     const resp = await fetch(`${opts.gatewayUrl}/api/v1/cli/cloud-provision`, {
       method: "POST",
-      headers: { "Authorization": `Bearer ${opts.jwt}`, "Content-Type": "application/json" },
+      headers: { "Authorization": `Bearer ${cloudJwt}`, "Content-Type": "application/json" },
       body: JSON.stringify({
         org_id: opts.orgId,
         user_id: opts.userId,
@@ -11823,7 +11911,7 @@ async function syncTranscriptsBulk(gatewayUrl, token, repo) {
   }
   return { sessions: totalSessions, messages: totalMessages };
 }
-var SYNKRO_DIR5, HOOKS_DIR, BIN_DIR, CONFIG_PATH2, MCP_STDIO_PROXY_SRC, OFFSETS_DIR;
+var SYNKRO_DIR5, HOOKS_DIR, BIN_DIR, CONFIG_PATH2, MCP_STDIO_PROXY_SRC, OFFSETS_DIR, CLOUD_JWT_PATH;
 var init_install = __esm({
   "cli/commands/install.ts"() {
     "use strict";
@@ -11957,6 +12045,7 @@ rl.on('line', async (line) => {
 });
 `;
     OFFSETS_DIR = join10(SYNKRO_DIR5, ".transcript-offsets");
+    CLOUD_JWT_PATH = join10(SYNKRO_DIR5, ".cloud-jwt");
   }
 });
 
@@ -13930,7 +14019,7 @@ var args = process.argv.slice(2);
 var cmd = args[0] || "";
 var subArgs = args.slice(1);
 function printVersion() {
-  console.log("1.6.69");
+  console.log("1.6.71");
 }
 function printHelp2() {
   console.log(`Synkro CLI \u2014 runtime safety for AI coding agents