@synkro-sh/cli 1.6.32 → 1.6.33

package/dist/bootstrap.js

@@ -1144,6 +1144,7 @@ export function findGitRoot(cwd: string): string {
 
 export interface SynkroFileConfig {
   version: number;
+  harness: ('claude-code' | 'cursor')[];
   grader: { pool: 'auto' | 'claude' | 'cursor'; mode?: string };
   ruleset: string;
   scanning: { cwe: boolean; cve: boolean };
@@ -1151,6 +1152,7 @@ export interface SynkroFileConfig {
 
 const SYNKRO_FILE_DEFAULTS: SynkroFileConfig = {
   version: 1,
+  harness: ['claude-code', 'cursor'],
   grader: { pool: 'auto' },
   ruleset: 'default',
   scanning: { cwe: true, cve: true },
@@ -1166,8 +1168,13 @@ export function loadSynkroFile(cwd?: string): SynkroFileConfig {
   try {
     if (!existsSync(fp)) { _synkroFileCache = SYNKRO_FILE_DEFAULTS; return _synkroFileCache; }
     const parsed = JSON.parse(readFileSync(fp, 'utf-8'));
+    const validHarness = ['claude-code', 'cursor'] as const;
+    const harness = Array.isArray(parsed.harness)
+      ? parsed.harness.filter((h: string) => validHarness.includes(h as any))
+      : ['claude-code', 'cursor'];
     _synkroFileCache = {
       version: parsed.version || 1,
+      harness: harness.length > 0 ? harness : ['claude-code', 'cursor'],
       grader: {
         pool: ['auto', 'claude', 'cursor'].includes(parsed.grader?.pool) ? parsed.grader.pool : 'auto',
         mode: ['local', 'byok'].includes(parsed.grader?.mode) ? parsed.grader.mode : undefined,
@@ -7865,7 +7872,9 @@ var install_exports = {};
 __export(install_exports, {
   detectGitRepo: () => detectGitRepo2,
   installCommand: () => installCommand,
-  parseArgs: () => parseArgs
+  parseArgs: () => parseArgs,
+  reconcileHarness: () => reconcileHarness,
+  writeHookScripts: () => writeHookScripts
 });
 import { existsSync as existsSync9, mkdirSync as mkdirSync8, writeFileSync as writeFileSync7, chmodSync as chmodSync2, readFileSync as readFileSync8, readdirSync as readdirSync3 } from "fs";
 import { homedir as homedir8 } from "os";
@@ -8113,7 +8122,7 @@ function writeConfigEnv(opts) {
     `SYNKRO_CREDENTIALS_PATH=${shellQuoteSingle(credsPath)}`,
     `SYNKRO_TIER=${shellQuoteSingle(safeTier)}`,
     `SYNKRO_INFERENCE=${shellQuoteSingle(safeInference)}`,
-    `SYNKRO_VERSION=${shellQuoteSingle("1.6.32")}`
+    `SYNKRO_VERSION=${shellQuoteSingle("1.6.33")}`
   ];
   if (safeSynkroBin) lines.push(`SYNKRO_CLI_BIN=${shellQuoteSingle(safeSynkroBin)}`);
   if (safeUserId) lines.push(`SYNKRO_USER_ID=${shellQuoteSingle(safeUserId)}`);
@@ -8648,10 +8657,18 @@ function writeSynkroFileIfMissing(opts) {
       return;
     }
     let pool = "auto";
-    if (opts.hasClaudeCode && !opts.hasCursor) pool = "claude";
-    else if (opts.hasCursor && !opts.hasClaudeCode) pool = "cursor";
+    const harness = [];
+    if (opts.hasClaudeCode) {
+      harness.push("claude-code");
+      if (!opts.hasCursor) pool = "claude";
+    }
+    if (opts.hasCursor) {
+      harness.push("cursor");
+      if (!opts.hasClaudeCode) pool = "cursor";
+    }
     const config = {
       version: 1,
+      harness,
       grader: {
         pool,
         mode: opts.gradingMode === "byok" ? "byok" : "local"
@@ -8677,6 +8694,109 @@ function readSynkroFilePool2() {
   }
   return "auto";
 }
+function readFullSynkroFile() {
+  try {
+    const root = execSync6("git rev-parse --show-toplevel", { encoding: "utf-8", timeout: 3e3, stdio: ["pipe", "pipe", "pipe"] }).trim();
+    if (!root) return null;
+    const fp = join8(root, ".synkro");
+    if (!existsSync9(fp)) return null;
+    const parsed = JSON.parse(readFileSync8(fp, "utf-8"));
+    const valid = ["claude-code", "cursor"];
+    const harness = Array.isArray(parsed.harness) ? parsed.harness.filter((h) => valid.includes(h)) : ["claude-code", "cursor"];
+    return {
+      harness: harness.length > 0 ? harness : ["claude-code", "cursor"],
+      grader: {
+        pool: ["auto", "claude", "cursor"].includes(parsed.grader?.pool) ? parsed.grader.pool : "auto",
+        mode: ["local", "byok"].includes(parsed.grader?.mode) ? parsed.grader.mode : "local"
+      },
+      ruleset: parsed.ruleset || "default",
+      scanning: { cwe: parsed.scanning?.cwe !== false, cve: parsed.scanning?.cve !== false }
+    };
+  } catch {
+    return null;
+  }
+}
+function reconcileHarness() {
+  const sf = readFullSynkroFile();
+  if (!sf) {
+    console.log("No .synkro file found in repo root \u2014 skipping harness reconciliation.");
+    return null;
+  }
+  const wantCC = sf.harness.includes("claude-code");
+  const wantCursor = sf.harness.includes("cursor");
+  console.log(`.synkro: harness=[${sf.harness.join(", ")}] pool=${sf.grader.pool} mode=${sf.grader.mode}`);
+  const scripts = writeHookScripts();
+  console.log("Wrote hook scripts to ~/.synkro/hooks/");
+  const ccSettings = join8(homedir8(), ".claude", "settings.json");
+  if (wantCC) {
+    installCCHooks(ccSettings, {
+      bashJudgeScriptPath: scripts.bashScript,
+      bashFollowupScriptPath: scripts.bashFollowupScript,
+      editPrecheckScriptPath: scripts.editPrecheckScript,
+      cwePrecheckScriptPath: scripts.cwePrecheckScript,
+      cvePrecheckScriptPath: scripts.cvePrecheckScript,
+      planJudgeScriptPath: scripts.planJudgeScript,
+      agentJudgeScriptPath: scripts.agentJudgeScript,
+      stopSummaryScriptPath: scripts.stopSummaryScript,
+      sessionStartScriptPath: scripts.sessionStartScript,
+      transcriptSyncScriptPath: scripts.transcriptSyncScript,
+      userPromptSubmitScriptPath: scripts.userPromptSubmitScript,
+      installScanScriptPath: scripts.installScanScript
+    });
+    console.log("  \u2713 Claude Code hooks registered");
+    try {
+      const mcpJwt = readFileSync8(join8(SYNKRO_DIR4, ".mcp-jwt"), "utf-8").trim();
+      if (mcpJwt) {
+        installMcpConfig({ gatewayUrl: "", bearerToken: mcpJwt, local: true });
+        console.log("  \u2713 Claude Code MCP registered");
+      }
+    } catch {
+    }
+  } else {
+    if (uninstallCCHooks(ccSettings)) console.log("  \u2717 Claude Code hooks removed");
+    if (uninstallMcpConfig()) console.log("  \u2717 Claude Code MCP removed");
+  }
+  const cursorHooks = join8(homedir8(), ".cursor", "hooks.json");
+  if (wantCursor) {
+    installCursorHooks(cursorHooks, {
+      bashJudgeScriptPath: scripts.cursorBashJudgeScript,
+      editCaptureScriptPath: scripts.cursorEditCaptureScript,
+      agentCaptureScriptPath: scripts.cursorAgentCaptureScript,
+      bashFollowupScriptPath: scripts.bashFollowupScript,
+      editPrecheckScriptPath: scripts.editPrecheckScript,
+      cwePrecheckScriptPath: scripts.cwePrecheckScript,
+      cvePrecheckScriptPath: scripts.cvePrecheckScript,
+      planJudgeScriptPath: scripts.planJudgeScript,
+      agentJudgeScriptPath: scripts.agentJudgeScript,
+      stopSummaryScriptPath: scripts.stopSummaryScript,
+      sessionStartScriptPath: scripts.sessionStartScript,
+      userPromptSubmitScriptPath: scripts.userPromptSubmitScript,
+      transcriptSyncScriptPath: scripts.transcriptSyncScript,
+      installScanScriptPath: scripts.installScanScript
+    });
+    console.log("  \u2713 Cursor hooks registered");
+    try {
+      installCursorMcpConfig({ gatewayUrl: "", bearerToken: "", local: true });
+      console.log("  \u2713 Cursor MCP registered");
+    } catch {
+    }
+  } else {
+    if (uninstallCursorHooks(cursorHooks)) console.log("  \u2717 Cursor hooks removed");
+    if (uninstallCursorMcpConfig()) console.log("  \u2717 Cursor MCP removed");
+  }
+  const total = parseInt(process.env.SYNKRO_WORKERS_PER_POOL || "8", 10);
+  const providers = [];
+  if (sf.grader.pool === "cursor") {
+    providers.push("cursor");
+  } else if (sf.grader.pool === "claude") {
+    providers.push("claude_code");
+  } else {
+    if (wantCC) providers.push("claude_code");
+    if (wantCursor) providers.push("cursor");
+  }
+  if (providers.length === 0) providers.push("claude_code");
+  return splitWorkers(total, providers);
+}
 function detectGitRepo2() {
   const run = (cmd2) => {
     try {
@@ -10400,7 +10520,19 @@ function cmdStop() {
 }
 async function cmdRestart(rest = []) {
   if (inDockerMode()) {
-    const { claudeWorkers, cursorWorkers } = resolveWorkerConfig(rest);
+    const { explicit } = resolveWorkerConfig(rest);
+    let claudeWorkers;
+    let cursorWorkers;
+    if (explicit) {
+      ({ claudeWorkers, cursorWorkers } = resolveWorkerConfig(rest));
+    } else {
+      const reconciled = reconcileHarness();
+      if (reconciled) {
+        ({ claudeWorkers, cursorWorkers } = reconciled);
+      } else {
+        ({ claudeWorkers, cursorWorkers } = resolveWorkerConfig(rest));
+      }
+    }
     console.log(`Restarting synkro-server container (${claudeWorkers} claude + ${cursorWorkers} cursor, pulling latest image)...`);
     await dockerUpdate({ claudeWorkers, cursorWorkers });
     const ready = await waitForContainerReady(6e4);
@@ -10644,6 +10776,7 @@ var init_localCc = __esm({
     init_settings();
     init_macKeychain();
     init_dockerInstall();
+    init_install();
     init_client();
     init_stub();
     SYNKRO_CONFIG_PATH = join14(homedir14(), ".synkro", "config.env");
@@ -10922,7 +11055,7 @@ var args = process.argv.slice(2);
 var cmd = args[0] || "";
 var subArgs = args.slice(1);
 function printVersion() {
-  console.log("1.6.32");
+  console.log("1.6.33");
 }
 function printHelp2() {
   console.log(`Synkro CLI \u2014 runtime safety for AI coding agents