@synkro-sh/cli 1.6.9 → 1.6.10

package/dist/bootstrap.js

@@ -3984,23 +3984,13 @@ async function main() {
       }).catch(() => {});
     }
 
-    if (process.env.SYNKRO_TRANSCRIPT_CONSENT === 'no') { outputEmpty(); return; }
-
+    // Transcript consent gates only CLOUD transmission. Local persistence \u2014
+    // this machine's own PGLite \u2014 is the same category as the local telemetry
+    // already captured for every command, so it always runs.
+    const cloudConsent = process.env.SYNKRO_TRANSCRIPT_CONSENT !== 'no';
     const gitRepo = detectRepo(cwd);
-    if (!gitRepo) { outputEmpty(); return; }
-
-    let captureDepth = 'local_only';
-    try {
-      const r = await fetch(GATEWAY_URL + '/api/v1/hook/config', {
-        headers: { Authorization: 'Bearer ' + jwt },
-        signal: AbortSignal.timeout(3000),
-      });
-      const data = await r.json() as any;
-      captureDepth = data.capture_depth || 'local_only';
-    } catch {}
-
-    if (captureDepth === 'local_only') { outputEmpty(); return; }
 
+    // Offset-tracked extraction of new user/assistant turns from the transcript.
     const offsetDir = join(homedir(), '.synkro', '.transcript-offsets');
     mkdirSync(offsetDir, { recursive: true });
     const offsetFile = join(offsetDir, sessionId);
@@ -4035,7 +4025,7 @@ async function main() {
           }).join(' ').slice(0, 8000);
         }
 
-        const msg: any = { message_index: i, type: entry.type, content: text };
+        const msg: any = { message_index: i, type: entry.type, content: text, ts: entry.timestamp || null };
         if (entry.type === 'assistant') {
           const toolCalls = (Array.isArray(content) ? content : [])
             .filter((c: any) => c?.type === 'tool_use')
@@ -4053,16 +4043,39 @@ async function main() {
 
     if (messages.length === 0) { outputEmpty(); return; }
 
-    const syncBody = {
-      repo: gitRepo,
-      sessions: [{ cc_session_id: sessionId, messages }],
-    };
-    fetch(GATEWAY_URL + '/api/v1/cli/sync-transcripts', {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json', Authorization: 'Bearer ' + jwt },
-      body: JSON.stringify(syncBody),
-      signal: AbortSignal.timeout(10000),
-    }).catch(() => {});
+    // Local persist \u2014 always. The conversation timeline lives in PGLite.
+    const mcpPort = process.env.SYNKRO_MCP_PORT || '18931';
+    let mcpToken = '';
+    try { mcpToken = readFileSync(join(homedir(), '.synkro', '.mcp-jwt'), 'utf-8').trim(); } catch {}
+    if (mcpToken) {
+      fetch('http://127.0.0.1:' + mcpPort + '/api/conversation-sync', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json', Authorization: 'Bearer ' + mcpToken },
+        body: JSON.stringify({ session_id: sessionId, repo: gitRepo || '', messages }),
+        signal: AbortSignal.timeout(5000),
+      }).catch(() => {});
+    }
+
+    // Cloud sync \u2014 only when consented and the org isn't local-only.
+    if (cloudConsent && gitRepo) {
+      let captureDepth = 'local_only';
+      try {
+        const r = await fetch(GATEWAY_URL + '/api/v1/hook/config', {
+          headers: { Authorization: 'Bearer ' + jwt },
+          signal: AbortSignal.timeout(3000),
+        });
+        const data = await r.json() as any;
+        captureDepth = data.capture_depth || 'local_only';
+      } catch {}
+      if (captureDepth !== 'local_only') {
+        fetch(GATEWAY_URL + '/api/v1/cli/sync-transcripts', {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json', Authorization: 'Bearer ' + jwt },
+          body: JSON.stringify({ repo: gitRepo, sessions: [{ cc_session_id: sessionId, messages }] }),
+          signal: AbortSignal.timeout(10000),
+        }).catch(() => {});
+      }
+    }
 
     outputEmpty();
   } catch {
@@ -6049,6 +6062,12 @@ async function dockerInstall(opts = {}) {
     ...process.env.SYNKRO_CURSOR_MODEL ? ["-e", `SYNKRO_CURSOR_MODEL=${process.env.SYNKRO_CURSOR_MODEL}`] : [],
     // Connected repo — the server seeds the local app + ruleset named after it.
     ...opts.connectedRepo ? ["-e", `SYNKRO_CONNECTED_REPO=${opts.connectedRepo}`] : [],
+    // Real account identity (from config.env via process.env) — telemetry is
+    // stamped with these instead of a `local-user` placeholder, so the data is
+    // correctly attributed from the first graded command.
+    ...process.env.SYNKRO_ORG_ID ? ["-e", `SYNKRO_ORG_ID=${process.env.SYNKRO_ORG_ID}`] : [],
+    ...process.env.SYNKRO_USER_ID ? ["-e", `SYNKRO_USER_ID=${process.env.SYNKRO_USER_ID}`] : [],
+    ...process.env.SYNKRO_EMAIL ? ["-e", `SYNKRO_EMAIL=${process.env.SYNKRO_EMAIL}`] : [],
     image
   ];
   const run = spawnSync2("docker", args2, { encoding: "utf-8", stdio: "inherit", timeout: 6e4 });
@@ -6271,6 +6290,7 @@ var init_dockerInstall = __esm({
 // cli/commands/install.ts
 var install_exports = {};
 __export(install_exports, {
+  detectGitRepo: () => detectGitRepo2,
   installCommand: () => installCommand,
   parseArgs: () => parseArgs
 });
@@ -6459,7 +6479,7 @@ function writeConfigEnv(opts) {
     `SYNKRO_CREDENTIALS_PATH=${shellQuoteSingle(credsPath)}`,
     `SYNKRO_TIER=${shellQuoteSingle(safeTier)}`,
     `SYNKRO_INFERENCE=${shellQuoteSingle(safeInference)}`,
-    `SYNKRO_VERSION=${shellQuoteSingle("1.6.9")}`
+    `SYNKRO_VERSION=${shellQuoteSingle("1.6.10")}`
   ];
   if (safeSynkroBin) lines.push(`SYNKRO_CLI_BIN=${shellQuoteSingle(safeSynkroBin)}`);
   if (safeUserId) lines.push(`SYNKRO_USER_ID=${shellQuoteSingle(safeUserId)}`);
@@ -6586,6 +6606,11 @@ function assertGatewayAllowed(gatewayUrl) {
   }
 }
 async function installCommand(opts = {}) {
+  if (!detectGitRepo2()) {
+    console.error("Synkro must be installed inside a git repository.");
+    console.error("  `cd` into your project \u2014 a git repo with an `origin` remote \u2014 and re-run `synkro install`.");
+    process.exit(1);
+  }
   const gatewayUrl = opts.gatewayUrl || sanitizeGatewayCandidate(process.env.SYNKRO_GATEWAY_URL) || "https://api.synkro.sh";
   try {
     assertGatewayAllowed(gatewayUrl);
@@ -6925,15 +6950,19 @@ async function installCommand(opts = {}) {
   console.log("\u2713 Synkro installed.");
 }
 function detectGitRepo2() {
-  try {
-    const remoteUrl = execSync5("git remote get-url origin", { encoding: "utf-8", timeout: 5e3 }).trim();
-    const sshMatch = remoteUrl.match(/^git@[^:]+:(.+?)(?:\.git)?$/);
-    const httpMatch = remoteUrl.match(/^https?:\/\/[^/]+\/(.+?)(?:\.git)?$/);
-    const match = sshMatch || httpMatch;
-    return match ? match[1] : null;
-  } catch {
-    return null;
+  const run = (cmd2) => {
+    try {
+      return execSync5(cmd2, { encoding: "utf-8", timeout: 5e3, stdio: ["pipe", "pipe", "pipe"] }).trim();
+    } catch {
+      return "";
+    }
+  };
+  const remoteUrl = run("git remote get-url origin");
+  if (remoteUrl) {
+    return remoteUrl.replace(/^git@[^:]+:/, "").replace(/^https?:\/\/[^/]+\//, "").replace(/\.git$/, "");
   }
+  const root = run("git rev-parse --show-toplevel");
+  return root ? root.split("/").pop() || null : null;
 }
 function getClaudeProjectsFolder() {
   const cwd = process.cwd();
@@ -8861,6 +8890,9 @@ __export(lifecycle_exports, {
   stopCommand: () => stopCommand,
   updateCommand: () => updateCommand
 });
+function resolveConnectedRepo() {
+  return detectGitRepo2() ?? readContainerConfig()?.connectedRepo ?? void 0;
+}
 async function stopCommand() {
   assertDockerAvailable();
   console.log("Synkro: stopping server\n");
@@ -8877,7 +8909,7 @@ async function startCommand(rest = []) {
   if (cfg.explicit) {
     console.log(`Synkro: starting server (${cfg.claudeWorkers} claude + ${cfg.cursorWorkers} cursor)
 `);
-    await dockerUpdate({ claudeWorkers: cfg.claudeWorkers, cursorWorkers: cfg.cursorWorkers });
+    await dockerUpdate({ claudeWorkers: cfg.claudeWorkers, cursorWorkers: cfg.cursorWorkers, connectedRepo: resolveConnectedRepo() });
     const ready = await waitForContainerReady(6e4);
     if (!ready) {
       console.error("\n\u26A0 container did not pass /healthz within 60s");
@@ -8907,7 +8939,7 @@ async function updateCommand() {
   console.log("Synkro: updating to the latest container image");
   console.log(`  preserving pool: ${claudeWorkers} claude + ${cursorWorkers} cursor worker(s)
 `);
-  await dockerUpdate({ claudeWorkers, cursorWorkers, connectedRepo: cfg.connectedRepo });
+  await dockerUpdate({ claudeWorkers, cursorWorkers, connectedRepo: resolveConnectedRepo() });
   const ready = await waitForContainerReady(9e4);
   if (!ready) {
     console.error("\n\u26A0 container did not pass its health check within 90s \u2014 check: docker logs synkro-server");
@@ -8921,7 +8953,7 @@ async function restartCommand(rest = []) {
   if (cfg.explicit) {
     console.log(`Synkro: restarting server (${cfg.claudeWorkers} claude + ${cfg.cursorWorkers} cursor)
 `);
-    await dockerUpdate({ claudeWorkers: cfg.claudeWorkers, cursorWorkers: cfg.cursorWorkers });
+    await dockerUpdate({ claudeWorkers: cfg.claudeWorkers, cursorWorkers: cfg.cursorWorkers, connectedRepo: resolveConnectedRepo() });
     const ready = await waitForContainerReady(6e4);
     if (!ready) {
       console.error("\n\u26A0 container did not pass /healthz within 60s");
@@ -8944,6 +8976,7 @@ var init_lifecycle = __esm({
   "cli/commands/lifecycle.ts"() {
     "use strict";
     init_dockerInstall();
+    init_install();
   }
 });
 
@@ -8971,7 +9004,7 @@ var args = process.argv.slice(2);
 var cmd = args[0] || "";
 var subArgs = args.slice(1);
 function printVersion() {
-  console.log("1.6.9");
+  console.log("1.6.10");
 }
 function printHelp2() {
   console.log(`Synkro CLI \u2014 runtime safety for AI coding agents