@synkro-sh/cli 1.3.10 → 1.3.12

package/dist/bootstrap.js

@@ -1,12 +1,6 @@
 #!/usr/bin/env node
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined") return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
 var __esm = (fn, res) => function __init() {
   return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
 };
@@ -2645,7 +2639,7 @@ var init_githubSetup = __esm({
 });
 
 // cli/commands/repoConnect.ts
-import { execSync as execSync2 } from "child_process";
+import { execSync as execSync2, execFileSync } from "child_process";
 import { createServer as createServer2 } from "http";
 import { createInterface } from "readline";
 function detectGitRepo() {
@@ -2718,11 +2712,10 @@ function waitForGithubToken() {
   });
 }
 function openBrowser2(url) {
-  const { execFile: execFile2 } = __require("child_process");
   const plat = process.platform;
-  if (plat === "darwin") execFile2("open", [url]);
-  else if (plat === "win32") execFile2("cmd", ["/c", "start", "", url]);
-  else execFile2("xdg-open", [url]);
+  if (plat === "darwin") execFileSync("open", [url], { stdio: "ignore" });
+  else if (plat === "win32") execFileSync("cmd", ["/c", "start", "", url], { stdio: "ignore" });
+  else execFileSync("xdg-open", [url], { stdio: "ignore" });
 }
 async function connectGithubAndSelectRepos() {
   const url = `${SYNKRO_WEB_AUTH_URL2}/cli-github?port=${GITHUB_PORT}`;
@@ -2873,7 +2866,13 @@ function readConfig() {
     const t = line.trim();
     if (!t || t.startsWith("#")) continue;
     const eq = t.indexOf("=");
-    if (eq > 0) out[t.slice(0, eq).trim()] = t.slice(eq + 1).trim();
+    if (eq > 0) {
+      let val = t.slice(eq + 1).trim();
+      if (val.startsWith("'") && val.endsWith("'") || val.startsWith('"') && val.endsWith('"')) {
+        val = val.slice(1, -1);
+      }
+      out[t.slice(0, eq).trim()] = val;
+    }
   }
   return out;
 }
@@ -2945,31 +2944,93 @@ async function setupGithubCommand(opts = {}) {
   const rl = createInterface2({ input, output });
   let ghToken = opts.githubToken || "";
   if (!ghToken) {
-    console.log("Synkro PR scan setup\n");
-    console.log("Requirements:");
-    console.log("  \u2022 A GitHub personal access token with `repo` scope");
-    console.log("    (create at https://github.com/settings/tokens?type=beta)\n");
-    ghToken = (await prompt(rl, "GitHub token (paste): ", { silent: true })).trim();
-  }
-  if (!ghToken || !ghToken.startsWith("ghp_") && !ghToken.startsWith("github_pat_")) {
-    console.error("Invalid GitHub token format. Expected ghp_... or github_pat_...");
+    try {
+      const connResp = await fetch(`${gatewayUrl}/api/integrations/github/token`, {
+        headers: { "Authorization": `Bearer ${jwt2}` }
+      });
+      if (connResp.ok) {
+        const data = await connResp.json();
+        ghToken = data.token;
+        console.log("  \u2713 Using existing GitHub connection");
+      }
+    } catch {
+    }
+  }
+  if (!ghToken) {
+    console.log("Opening browser for GitHub authorization...");
+    const RAW_WEB_AUTH_URL3 = process.env.SYNKRO_WEB_AUTH_URL;
+    const webAuthUrl = RAW_WEB_AUTH_URL3 && /^https?:\/\//.test(RAW_WEB_AUTH_URL3) ? RAW_WEB_AUTH_URL3 : "https://app.synkro.sh";
+    openBrowser2(`${webAuthUrl}/cli-github?port=8101`);
+    console.log("Waiting for GitHub authorization...");
+    try {
+      ghToken = await waitForGithubToken();
+      console.log("  \u2713 GitHub authorized");
+    } catch (err) {
+      console.error(`GitHub authorization failed: ${err.message}`);
+      rl.close();
+      process.exit(1);
+    }
+  }
+  if (!ghToken) {
+    console.error("No GitHub token available.");
     rl.close();
     process.exit(1);
   }
   let claudeToken = opts.claudeOauthToken || "";
   if (!claudeToken && !opts.skipClaudeToken) {
     try {
-      const { execSync: execSync5 } = await import("child_process");
+      const { execSync: execSyncImport } = await import("child_process");
+      const { tmpdir } = await import("os");
+      const tmpFile = join5(tmpdir(), `synkro-claude-token-${Date.now()}.txt`);
       console.log("\nGenerating Claude Code OAuth token \u2014 complete the browser auth...");
-      const tokenOutput = execSync5("claude setup-token", {
-        encoding: "utf-8",
-        timeout: 12e4,
-        stdio: ["inherit", "pipe", "inherit"]
-      }).trim();
-      const tokenLine = tokenOutput.split("\n").find((l) => l.includes("sk-ant-oat01-"));
-      claudeToken = tokenLine?.match(/(sk-ant-oat01-[A-Za-z0-9_-]+)/)?.[1] || "";
+      try {
+        if (process.platform === "darwin" || process.platform === "linux") {
+          execSyncImport(`script -q ${tmpFile} claude setup-token`, {
+            timeout: 12e4,
+            stdio: "inherit"
+          });
+        } else {
+          execSyncImport(`claude setup-token > "${tmpFile}" 2>&1`, {
+            timeout: 12e4,
+            stdio: "inherit",
+            shell: true
+          });
+        }
+        const { readFileSync: readSync, unlinkSync: unlinkSync3 } = await import("fs");
+        const rawOutput = readSync(tmpFile, "utf-8");
+        try {
+          unlinkSync3(tmpFile);
+        } catch {
+        }
+        const cleaned = rawOutput.replace(/\x1b\[[0-9;]*[A-Za-z]/g, "").replace(/\][^\x07\x1b]*(?:\x07|\x1b\\)/g, "").replace(/[\r\n]+/g, " ");
+        const match = cleaned.match(/(sk-ant-oat01-[A-Za-z0-9_-]{50,})/);
+        claudeToken = match?.[1] || "";
+      } catch {
+        try {
+          const { unlinkSync: unlinkSync3 } = await import("fs");
+          unlinkSync3(tmpFile);
+        } catch {
+        }
+      }
       if (claudeToken) {
-        console.log("  \u2713 Captured Claude Code OAuth token.\n");
+        console.log("  \u2713 Captured Claude Code OAuth token.");
+        process.stdout.write("  Verifying token... ");
+        try {
+          const { execSync: verifyExec } = await import("child_process");
+          const result = verifyExec('claude --print "respond with just ok"', {
+            encoding: "utf-8",
+            timeout: 3e4,
+            env: { ...process.env, CLAUDE_CODE_OAUTH_TOKEN: claudeToken },
+            stdio: ["pipe", "pipe", "pipe"]
+          }).trim().toLowerCase();
+          if (result.includes("ok")) {
+            console.log("\u2713 inference works.\n");
+          } else {
+            console.log("\u26A0 unexpected response, token may not work.\n");
+          }
+        } catch {
+          console.log("\u26A0 verification failed, token may not work.\n");
+        }
       } else {
         console.warn("  \u26A0 Could not capture token. PR scans will use BYOK inference only.\n");
       }
@@ -2984,30 +3045,57 @@ async function setupGithubCommand(opts = {}) {
     rl.close();
     process.exit(1);
   }
-  console.log(`
+  let selected;
+  if (opts.nonInteractive) {
+    let currentFullName = null;
+    try {
+      const { execSync: gs } = await import("child_process");
+      const remoteUrl = gs("git remote get-url origin", { encoding: "utf-8", timeout: 5e3 }).trim();
+      const m = remoteUrl.match(/(?:github\.com)[:/](.+?)(?:\.git)?$/);
+      if (m) currentFullName = m[1];
+    } catch {
+    }
+    if (currentFullName) {
+      const match = repos.find((r) => r.full_name === currentFullName);
+      if (match) {
+        selected = [match];
+        console.log(`  Auto-selected current repo: ${match.full_name}`);
+      } else {
+        console.error(`Current repo "${currentFullName}" not found in accessible repos.`);
+        rl.close();
+        process.exit(1);
+      }
+    } else {
+      console.error("Not in a GitHub repo. Cannot auto-select in non-interactive mode.");
+      rl.close();
+      process.exit(1);
+    }
+  } else {
+    console.log(`
 Found ${repos.length} accessible repo(s):
 `);
-  repos.slice(0, 100).forEach((r, i) => {
-    console.log(`  ${String(i + 1).padStart(3)}.  ${r.full_name}`);
-  });
-  console.log();
-  const selectionRaw = await prompt(rl, "Select repos to enable (comma-separated numbers, e.g. 1,3,5): ");
-  const selectedIdx = selectionRaw.split(",").map((s) => parseInt(s.trim(), 10) - 1).filter((n) => !isNaN(n) && n >= 0 && n < repos.length);
-  if (selectedIdx.length === 0) {
-    console.error("No valid selections.");
-    rl.close();
-    process.exit(1);
-  }
-  const selected = selectedIdx.map((i) => repos[i]);
-  console.log(`
+    repos.slice(0, 100).forEach((r, i) => {
+      console.log(`  ${String(i + 1).padStart(3)}.  ${r.full_name}`);
+    });
+    console.log();
+    const selectionRaw = await prompt(rl, "Select repos to enable (comma-separated numbers, e.g. 1,3,5): ");
+    const selectedIdx = selectionRaw.split(",").map((s) => parseInt(s.trim(), 10) - 1).filter((n) => !isNaN(n) && n >= 0 && n < repos.length);
+    if (selectedIdx.length === 0) {
+      console.error("No valid selections.");
+      rl.close();
+      process.exit(1);
+    }
+    selected = selectedIdx.map((i) => repos[i]);
+    console.log(`
 Will push secrets to ${selected.length} repo(s):`);
-  for (const r of selected) console.log(`  \u2022 ${r.full_name}`);
-  console.log();
-  const confirm = (await prompt(rl, "Continue? (yes/no): ")).trim().toLowerCase();
-  if (confirm !== "yes" && confirm !== "y") {
-    console.log("Cancelled.");
-    rl.close();
-    process.exit(0);
+    for (const r of selected) console.log(`  \u2022 ${r.full_name}`);
+    console.log();
+    const confirm = (await prompt(rl, "Continue? (yes/no): ")).trim().toLowerCase();
+    if (confirm !== "yes" && confirm !== "y") {
+      console.log("Cancelled.");
+      rl.close();
+      process.exit(0);
+    }
   }
   rl.close();
   console.log();
@@ -3052,6 +3140,7 @@ var init_setupGithub = __esm({
     "use strict";
     init_githubSetup();
     init_stub();
+    init_repoConnect();
     SYNKRO_DIR = join5(homedir4(), ".synkro");
     CONFIG_PATH = join5(SYNKRO_DIR, "config.env");
   }
@@ -3174,7 +3263,7 @@ function writeConfigEnv(opts) {
     `SYNKRO_GATEWAY_URL=${shellQuoteSingle(safeGateway)}`,
     `SYNKRO_CREDENTIALS_PATH=${shellQuoteSingle(credsPath)}`,
     `SYNKRO_TIER=${shellQuoteSingle(safeTier)}`,
-    `SYNKRO_VERSION=${shellQuoteSingle("1.3.10")}`
+    `SYNKRO_VERSION=${shellQuoteSingle("1.3.12")}`
   ];
   if (safeUserId) lines.push(`SYNKRO_USER_ID=${shellQuoteSingle(safeUserId)}`);
   if (safeOrgId) lines.push(`SYNKRO_ORG_ID=${shellQuoteSingle(safeOrgId)}`);
@@ -3420,7 +3509,7 @@ async function installCommand(opts = {}) {
     let ghConnected = false;
     let ghLogin = "";
     try {
-      const resp = await fetch(`${gatewayUrl}/api/v1/integrations/github/connect`, {
+      const resp = await fetch(`${gatewayUrl}/api/integrations/github/connect`, {
         headers: { "Authorization": `Bearer ${token}` }
       });
       if (resp.ok) {
@@ -3450,7 +3539,7 @@ async function installCommand(opts = {}) {
       }
       if (choice === "1") {
         try {
-          await setupGithubCommand({ githubToken: opts.githubToken });
+          await setupGithubCommand({ githubToken: opts.githubToken, nonInteractive: opts.nonInteractive });
         } catch (err) {
           console.warn(`  \u26A0 GitHub setup failed: ${err.message}`);
           console.warn("  Run `synkro-cli setup-github` to retry.\n");
@@ -3512,7 +3601,7 @@ async function installCommand(opts = {}) {
           }
         }
         try {
-          await setupGithubCommand({ skipClaudeToken: true, githubToken: opts.githubToken });
+          await setupGithubCommand({ skipClaudeToken: true, githubToken: opts.githubToken, nonInteractive: opts.nonInteractive });
         } catch (err) {
           console.warn(`  \u26A0 GitHub setup failed: ${err.message}`);
           console.warn("  Run `synkro-cli setup-github` to retry.\n");