@synkro-sh/cli 1.6.68 → 1.6.70

package/dist/bootstrap.js

@@ -1622,7 +1622,12 @@ export function tag(rt: string, config: HookConfig, grader?: string): string {
   if (config.silent) return '[synkro:silent]';
   const rs = config.policyName || 'all';
   const g = grader ? ':' + (grader === 'claude_code' ? 'claude' : grader) : '';
-  return '[synkro:' + rt + ':' + rs + g + ']';
+  // route() collapses cloud-container to 'local' for BRANCH selection (the local
+  // path emits the rich systemMessage), but the grade actually ran on the hosted
+  // container. Surface the real location so a cloud grade reads [synkro:cloud:\u2026],
+  // and 'local' is reserved for an actual on-device channel grade.
+  const loc = (rt === 'local' && process.env.SYNKRO_DEPLOY_LOCATION === 'cloud') ? 'cloud' : rt;
+  return '[synkro:' + loc + ':' + rs + g + ']';
 }
 
 // \u2500\u2500\u2500 Local Grading (direct channel call) \u2500\u2500\u2500
@@ -6420,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));
@@ -6479,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 || '');
@@ -10331,7 +10384,7 @@ function writeConfigEnv(opts) {
     `SYNKRO_CREDENTIALS_PATH=${shellQuoteSingle(credsPath)}`,
     `SYNKRO_TIER=${shellQuoteSingle(safeTier)}`,
     `SYNKRO_INFERENCE=${shellQuoteSingle(safeInference)}`,
-    `SYNKRO_VERSION=${shellQuoteSingle("1.6.68")}`
+    `SYNKRO_VERSION=${shellQuoteSingle("1.6.70")}`
   ];
   if (safeSynkroBin) lines.push(`SYNKRO_CLI_BIN=${shellQuoteSingle(safeSynkroBin)}`);
   if (safeUserId) lines.push(`SYNKRO_USER_ID=${shellQuoteSingle(safeUserId)}`);
@@ -10880,7 +10933,13 @@ async function installCommand(opts = {}) {
   }
   const transcriptConsent = transcriptCC || transcriptCursor;
   ensureSynkroDir();
-  const hookMode = opts.hookMode || resolvePersistedHookMode();
+  let hookMode = opts.hookMode || resolvePersistedHookMode();
+  if (target === "cloud-container" && hookMode === "stub") {
+    if (opts.hookMode === "stub") {
+      console.log("  \u24D8 Cloud mode needs full hooks (stub hooks require a local container) \u2014 using full.\n");
+    }
+    hookMode = "full";
+  }
   const scripts = writeHookScripts(hookMode);
   console.log("Wrote hook scripts to ~/.synkro/hooks/\n");
   for (const mode of ["edit", "bash"]) {
@@ -13919,7 +13978,7 @@ var args = process.argv.slice(2);
 var cmd = args[0] || "";
 var subArgs = args.slice(1);
 function printVersion() {
-  console.log("1.6.68");
+  console.log("1.6.70");
 }
 function printHelp2() {
   console.log(`Synkro CLI \u2014 runtime safety for AI coding agents