@synkro-sh/cli 1.9.0 → 1.10.3

package/dist/bootstrap.js

@@ -147,7 +147,7 @@ function getIdentity() {
   if (cached2) return cached2;
   let cliVersion2 = "0.0.0";
   try {
-    cliVersion2 = "1.9.0";
+    cliVersion2 = "1.10.3";
   } catch {
   }
   const creds = loadCredentialsIdentity();
@@ -740,11 +740,19 @@ async function insertEvents(sql, rows, mirroredIds) {
 async function drainToPglite() {
   const queued = readQueue().rows;
   if (queued.length === 0) return { ok: true, ingested: 0, pending: 0, reason: "no_pending" };
-  const rows = queued.length > MIRROR_MAX_PER_DRAIN ? queued.slice(-MIRROR_MAX_PER_DRAIN) : queued;
+  const bounded = queued.length > MIRROR_MAX_PER_DRAIN ? queued.slice(-MIRROR_MAX_PER_DRAIN) : queued;
+  const candidates = bounded.filter((r) => !mirroredMemo.has(r.client_event_id));
+  if (candidates.length === 0) return { ok: true, ingested: 0, pending: queued.length, reason: "no_pending" };
   const sql = await connectDb();
   if (!sql) return { ok: false, ingested: 0, pending: queued.length, reason: "db_unavailable" };
   try {
-    const ingested = await insertEvents(sql, rows);
+    const ids = candidates.map((r) => r.client_event_id);
+    const present = await sql`
+      SELECT client_event_id FROM telemetry_events WHERE client_event_id = ANY(${ids})`;
+    if (mirroredMemo.size > MIRRORED_MEMO_CAP) mirroredMemo.clear();
+    for (const row2 of present) mirroredMemo.add(row2.client_event_id);
+    const fresh = candidates.filter((r) => !mirroredMemo.has(r.client_event_id));
+    const ingested = fresh.length ? await insertEvents(sql, fresh, mirroredMemo) : 0;
     patchMetaCache({ last_drained_at: (/* @__PURE__ */ new Date()).toISOString() });
     return { ok: true, ingested, pending: queued.length };
   } catch (err) {
@@ -752,7 +760,7 @@ async function drainToPglite() {
     return { ok: false, ingested: 0, pending: queued.length, reason: "error", error: msg };
   }
 }
-var SYNKRO_DIR3, QUEUE_LOCK, PROCESSING_PATH, CHUNK, MIRROR_MAX_PER_DRAIN, STALE_LOCK_MS, MAX_QUEUE_ROWS;
+var SYNKRO_DIR3, QUEUE_LOCK, PROCESSING_PATH, CHUNK, MIRROR_MAX_PER_DRAIN, STALE_LOCK_MS, MAX_QUEUE_ROWS, mirroredMemo, MIRRORED_MEMO_CAP;
 var init_drain = __esm({
   "cli/telemetry/drain.ts"() {
     "use strict";
@@ -766,6 +774,8 @@ var init_drain = __esm({
     MIRROR_MAX_PER_DRAIN = 5e3;
     STALE_LOCK_MS = 6e4;
     MAX_QUEUE_ROWS = 5e4;
+    mirroredMemo = /* @__PURE__ */ new Set();
+    MIRRORED_MEMO_CAP = 5e4;
   }
 });
 
@@ -1684,6 +1694,18 @@ function installCCHooks(settingsPath, config) {
       [SYNKRO_MARKER]: true
     });
   }
+  if (config.mcpFollowupScriptPath) {
+    settings.hooks.PostToolUse.push({
+      matcher: "mcp__.*",
+      hooks: [
+        {
+          type: "command",
+          command: config.mcpFollowupScriptPath
+        }
+      ],
+      [SYNKRO_MARKER]: true
+    });
+  }
   if (config.taskActivateIntentScriptPath) {
     settings.hooks.PreToolUse.push({
       matcher: "mcp__synkro[-_]guardrails__activate_standard",
@@ -1730,7 +1752,12 @@ function installCCHooks(settingsPath, config) {
       {
         type: "command",
         command: config.userPromptSubmitScriptPath,
-        timeout: 5
+        // 15s, not 5: the stub is fire-and-forget (no server round-trip on the
+        // interactive path), so the budget only covers LOCAL work — but the SCM
+        // reconcile runs git twice, and on a large dirty checkout with worktrees
+        // and file churn that alone can spike past 5s. A trip here discards the
+        // whole hook output, so size the budget to the slow-git tail.
+        timeout: 15
       }
     ],
     [SYNKRO_MARKER]: true
@@ -2893,12 +2920,12 @@ var init_skillParser = __esm({
 function stubHook(surface, optsLiteral) {
   return "#!/usr/bin/env bun\nimport { runStub } from './_synkro-stub-common.ts';\nrunStub(" + JSON.stringify(surface) + ", " + optsLiteral + ");\n";
 }
-var STUB_COMMON_TS, STUB_EDIT_PRECHECK_TS, STUB_EDIT_FOLLOWUP_TS, STUB_CWE_PRECHECK_TS, STUB_CVE_PRECHECK_TS, STUB_BASH_JUDGE_TS, STUB_SKILL_JUDGE_TS, STUB_INSTALL_SCAN_TS, STUB_AGENT_JUDGE_TS, STUB_MCP_GATE_TS, STUB_PLAN_JUDGE_TS, STUB_STOP_SUMMARY_TS, STUB_SESSION_START_TS, STUB_TRANSCRIPT_SYNC_TS, STUB_CODEX_CWE_STOP_TS, STUB_CODEX_CVE_STOP_TS, STUB_SUBAGENT_START_TS, STUB_SUBAGENT_STOP_TS, STUB_USER_PROMPT_SUBMIT_TS, STUB_BASH_FOLLOWUP_TS, STUB_PROMPT_ROUTE_TS, STUB_TASK_ACTIVATE_INTENT_TS, STUB_CURSOR_BASH_JUDGE_TS, STUB_CURSOR_SKILL_JUDGE_TS, STUB_CURSOR_EDIT_CAPTURE_TS, STUB_CURSOR_AGENT_CAPTURE_TS;
+var STUB_COMMON_TS, STUB_EDIT_PRECHECK_TS, STUB_EDIT_FOLLOWUP_TS, STUB_CWE_PRECHECK_TS, STUB_CVE_PRECHECK_TS, STUB_BASH_JUDGE_TS, STUB_SKILL_JUDGE_TS, STUB_INSTALL_SCAN_TS, STUB_AGENT_JUDGE_TS, STUB_MCP_GATE_TS, STUB_MCP_FOLLOWUP_TS, STUB_PLAN_JUDGE_TS, STUB_STOP_SUMMARY_TS, STUB_SESSION_START_TS, STUB_TRANSCRIPT_SYNC_TS, STUB_CODEX_CWE_STOP_TS, STUB_CODEX_CVE_STOP_TS, STUB_SUBAGENT_START_TS, STUB_SUBAGENT_STOP_TS, STUB_USER_PROMPT_SUBMIT_TS, STUB_BASH_FOLLOWUP_TS, STUB_PROMPT_ROUTE_TS, STUB_TASK_ACTIVATE_INTENT_TS, STUB_CURSOR_BASH_JUDGE_TS, STUB_CURSOR_SKILL_JUDGE_TS, STUB_CURSOR_EDIT_CAPTURE_TS, STUB_CURSOR_AGENT_CAPTURE_TS;
 var init_hookScriptsTs = __esm({
   "cli/installer/hookScriptsTs.ts"() {
     "use strict";
     STUB_COMMON_TS = String.raw`import { existsSync, readFileSync, readdirSync, mkdirSync, writeFileSync, appendFileSync, statSync, realpathSync, openSync, readSync, closeSync, unlinkSync } from 'node:fs';
-import { execFileSync, execSync } from 'node:child_process';
+import { execFileSync, execSync, spawn } from 'node:child_process';
 import { homedir } from 'node:os';
 import { basename, dirname, join, resolve, relative, isAbsolute } from 'node:path';
 import { randomUUID, createHash } from 'node:crypto';
@@ -3674,6 +3701,26 @@ function taskScmWorkspaceInstruction(harness: string, sessionId: string, workspa
     + 'The Codex Environment panel must show that worktree and branch before retrying the blocked action. ' + requirement;
 }
 
+// CC validates hookSpecificOutput.hookEventName against the event that actually fired.
+// Server responses and the SCM-context injection historically stamped 'PreToolUse'
+// unconditionally; on any other surface CC rejects the whole output ("expected
+// 'UserPromptSubmit' but got 'PreToolUse'") and the hook's work is discarded. The
+// payload's hook_event_name is the ground truth, so re-stamp at the last mile.
+// Only CC-shaped responses carry hookSpecificOutput, so no harness check is needed.
+function withActualHookEvent(responseText: string, payload: any): string {
+  const actual = String((payload && (payload.hook_event_name || payload.hookEventName)) || '');
+  if (!actual) return responseText;
+  try {
+    const response = JSON.parse(responseText || '{}');
+    const hso = response && response.hookSpecificOutput;
+    if (hso && typeof hso === 'object' && hso.hookEventName !== actual) {
+      hso.hookEventName = actual;
+      return JSON.stringify(response);
+    }
+  } catch { /* non-JSON hook output - leave untouched */ }
+  return responseText;
+}
+
 function withTaskScmContext(responseText: string, harness: string, context: string): string {
   if (!context) return responseText;
   try {
@@ -4592,12 +4639,30 @@ export async function runStub(surface: string, opts: StubOpts = {}): Promise<voi
     // Dropping an occasional prompt tick is harmless; stalling the user is not.
     const attempts = (opts.telemetry && surface !== 'prompt-submit') ? 3 : 1;
     let text = '';
-    for (let i = 0; i < attempts; i++) {
+    if (surface === 'prompt-submit' && process.env.SYNKRO_PROMPT_SUBMIT_SYNC !== '1') {
+      // Fire-and-forget: prompt-submit's reply carries no verdict (telemetry-class,
+      // response ignored) and the SCM workspace context is computed host-side, so
+      // the server round-trip must never hold the user's KEYSTROKE hostage to DB
+      // tail latency — a busy single-threaded PGLite stretch was tripping the 5s
+      // hook budget on every prompt. A detached child delivers the envelope with
+      // retries the interactive path could never afford; delivery reliability goes
+      // UP versus the old single attempt racing a 5s clock.
       try {
-        const resp = await fetch(url, { method: 'POST', headers, body, signal: AbortSignal.timeout(timeoutMs) });
-        if (resp.ok) { text = (await resp.text()).trim(); break; }
-      } catch (e) { /* connection refused / timeout → retry below */ }
-      if (i < attempts - 1) await new Promise((r) => setTimeout(r, 500 * (i + 1)));
+        const spoolDir = join(HOME, '.synkro', 'prompt-spool');
+        mkdirSync(spoolDir, { recursive: true });
+        const spoolPath = join(spoolDir, randomUUID() + '.json');
+        writeFileSync(spoolPath, body);
+        const child = spawn(process.execPath, [import.meta.path, '--deliver-spool', spoolPath], { detached: true, stdio: 'ignore' });
+        child.unref();
+      } catch { /* best-effort - the prompt must never block on delivery */ }
+    } else {
+      for (let i = 0; i < attempts; i++) {
+        try {
+          const resp = await fetch(url, { method: 'POST', headers, body, signal: AbortSignal.timeout(timeoutMs) });
+          if (resp.ok) { text = (await resp.text()).trim(); break; }
+        } catch (e) { /* connection refused / timeout → retry below */ }
+        if (i < attempts - 1) await new Promise((r) => setTimeout(r, 500 * (i + 1)));
+      }
     }
     const rawResponseText = text || failOpen(harness);
     // A completion-report sync can arm the push after the pre-scan reconciliation ran.
@@ -4606,15 +4671,19 @@ export async function runStub(surface: string, opts: StubOpts = {}): Promise<voi
     const contractResponseText = opts.stopContract && harness === 'codex'
       ? codexStopResponse(rawResponseText)
       : rawResponseText;
-    // Only the first hook of this tool call carries the workspace context; the other
-    // surfaces of the same call would otherwise repeat it verbatim 2-4 times.
-    let scmContext = scm.context && firstHookForToolCall(sessionId, payload) ? scm.context : '';
+    // The informational workspace banner rides prompt-submit ONLY. Tool-call and stop
+    // surfaces stay quiet: a pending workspace question already blocks the next
+    // substantive tool with taskScmBlockResponse (which carries the full instructions
+    // itself), and the server still receives scm.context via the envelope's
+    // taskWorkspaceContext on every surface — so nothing enforcement- or data-bearing
+    // is lost by silencing the per-tool-call and per-stop repeats.
+    let scmContext = scm.context && surface === 'prompt-submit' && firstHookForToolCall(sessionId, payload) ? scm.context : '';
     // Say plainly that work is continuing outside the task worktree by the user's choice,
     // so the state is never mistaken for a binding that silently failed.
     if (scmContext && scmTaskId && taskWorkspaceStayRecorded(scmTaskId)) {
       scmContext += ' workspace=staying-here-by-user-choice';
     }
-    const responseText = withTaskScmContext(contractResponseText, harness, scmContext);
+    const responseText = withActualHookEvent(withTaskScmContext(contractResponseText, harness, scmContext), payload);
     out(responseText);
     emitStubTelemetry(surface, harness, telemPayload, responseText, Date.now() - startedAt, telemCwd, telemSessionId);
   } catch (err) {
@@ -4847,6 +4916,31 @@ function emitStubTelemetry(
     }, opts);
   }
 }
+
+// ─── Detached prompt-submit delivery child ──────────────────────────────────
+// The interactive parent spools the envelope and exits immediately; this child
+// (spawned detached from runStub's prompt-submit path) delivers it with retries
+// and a budget the 5s hook clock could never allow. Runs only when this file is
+// executed directly with --deliver-spool; a plain import never reaches it.
+async function deliverSpooledEnvelope(path: string): Promise<void> {
+  let body = '';
+  try { body = readFileSync(path, 'utf-8'); } catch { return; }
+  const url = 'http://127.0.0.1:' + PORT + '/api/scan/prompt-submit';
+  const headers = { 'Content-Type': 'application/json', Authorization: 'Bearer ' + loadMcpJwt() };
+  for (let i = 0; i < 3; i++) {
+    try {
+      const resp = await fetch(url, { method: 'POST', headers, body, signal: AbortSignal.timeout(20000) });
+      if (resp.ok) break;
+    } catch { /* server busy or restarting - retry below */ }
+    if (i < 2) await new Promise((r) => setTimeout(r, 2000 * (i + 1)));
+  }
+  try { unlinkSync(path); } catch { /* already collected */ }
+}
+
+if (import.meta.main && process.argv[2] === '--deliver-spool' && process.argv[3]) {
+  await deliverSpooledEnvelope(process.argv[3]);
+  process.exit(0);
+}
 `;
     STUB_EDIT_PRECHECK_TS = stubHook("edit-precheck", "{ needsFile: true, needsTranscript: true }");
     STUB_EDIT_FOLLOWUP_TS = stubHook("edit-followup", "{ needsFile: true, needsTranscript: true, postEdit: true }");
@@ -4857,6 +4951,7 @@ function emitStubTelemetry(
     STUB_INSTALL_SCAN_TS = stubHook("install-scan", "{ needsTranscript: true }");
     STUB_AGENT_JUDGE_TS = stubHook("agent-judge", "{ needsTranscript: true }");
     STUB_MCP_GATE_TS = stubHook("mcp-gate", "{ needsTranscript: true }");
+    STUB_MCP_FOLLOWUP_TS = stubHook("mcp-followup", "{ telemetry: true }");
     STUB_PLAN_JUDGE_TS = stubHook("plan-judge", "{ needsPlan: true }");
     STUB_STOP_SUMMARY_TS = stubHook("stop-summary", "{ needsTranscript: true, fullTranscript: true }");
     STUB_SESSION_START_TS = stubHook("session-start", "{ telemetry: true }");
@@ -7745,7 +7840,7 @@ var init_dockerInstall = __esm({
     HOST_PGLITE_PORT = parseInt(process.env.SYNKRO_HOST_PGLITE_PORT || "15433", 10);
     CONTAINER_NAME = resolveContainerName();
     defaultImageVersion = () => {
-      if (true) return "1.9.0";
+      if (true) return "1.10.3";
       try {
         const pkg = JSON.parse(readFileSync17(new URL("../../package.json", import.meta.url), "utf8"));
         if (pkg.version) return pkg.version;
@@ -8705,6 +8800,7 @@ function writeHookScripts() {
   const mcpStdioProxyPath = join19(HOOKS_DIR, "mcp-stdio-proxy.ts");
   const taskActivateIntentScriptPath = join19(HOOKS_DIR, "cc-task-activate-intent.ts");
   const mcpGateScriptPath = join19(HOOKS_DIR, "cc-mcp-gate.ts");
+  const mcpFollowupScriptPath = join19(HOOKS_DIR, "cc-mcp-followup.ts");
   const stubCommonPath = join19(HOOKS_DIR, "_synkro-stub-common.ts");
   const stubFiles = [
     [stubCommonPath, STUB_COMMON_TS],
@@ -8730,6 +8826,7 @@ function writeHookScripts() {
     [installScanScriptPath, STUB_INSTALL_SCAN_TS],
     [taskActivateIntentScriptPath, STUB_TASK_ACTIVATE_INTENT_TS],
     [mcpGateScriptPath, STUB_MCP_GATE_TS],
+    [mcpFollowupScriptPath, STUB_MCP_FOLLOWUP_TS],
     [cursorBashJudgePath, STUB_CURSOR_BASH_JUDGE_TS],
     [cursorEditCapturePath, STUB_CURSOR_EDIT_CAPTURE_TS],
     [cursorAgentCapturePath, STUB_CURSOR_AGENT_CAPTURE_TS]
@@ -8770,7 +8867,8 @@ function writeHookScripts() {
     cursorEditCaptureScript: cursorEditCapturePath,
     cursorAgentCaptureScript: cursorAgentCapturePath,
     taskActivateIntentScript: taskActivateIntentScriptPath,
-    mcpGateScript: mcpGateScriptPath
+    mcpGateScript: mcpGateScriptPath,
+    mcpFollowupScript: mcpFollowupScriptPath
   };
 }
 function sanitizeConfigValue(raw, maxLen = 256) {
@@ -8802,7 +8900,7 @@ function writeConfigEnv(opts) {
     `SYNKRO_CREDENTIALS_PATH=${shellQuoteSingle2(credsPath)}`,
     `SYNKRO_TIER=${shellQuoteSingle2(safeTier)}`,
     `SYNKRO_INFERENCE=${shellQuoteSingle2(safeInference)}`,
-    `SYNKRO_VERSION=${shellQuoteSingle2("1.9.0")}`
+    `SYNKRO_VERSION=${shellQuoteSingle2("1.10.3")}`
   ];
   if (safeSynkroBin) lines.push(`SYNKRO_CLI_BIN=${shellQuoteSingle2(safeSynkroBin)}`);
   if (safeUserId) lines.push(`SYNKRO_USER_ID=${shellQuoteSingle2(safeUserId)}`);
@@ -9549,7 +9647,7 @@ async function installCommand(opts = {}) {
   await setTelemetryState({ enabled: true, remoteFlushEnabled: telemetryConsent });
   emit("install", {
     phase: "started",
-    cli_version_to: "1.9.0",
+    cli_version_to: "1.10.3",
     agents_detected: agents.map((a) => a.kind),
     with_github: false,
     with_local_cc: false,
@@ -9593,6 +9691,7 @@ async function installCommand(opts = {}) {
         installScanScriptPath: scripts.installScanScript,
         taskActivateIntentScriptPath: scripts.taskActivateIntentScript,
         mcpGateScriptPath: scripts.mcpGateScript,
+        mcpFollowupScriptPath: scripts.mcpFollowupScript,
         skipTranscriptSync: !transcriptCC
       });
       console.log(`Configured ${agent.name} hooks at ${agent.settingsPath}`);
@@ -16272,7 +16371,7 @@ function pseudonymousHostnameHash(installationId, host) {
 }
 function cliVersion() {
   try {
-    return "1.9.0";
+    return "1.10.3";
   } catch {
     return "0.0.0";
   }
@@ -17041,7 +17140,7 @@ var subArgs = args.slice(1);
 var isDetachedChild = process.env.SYNKRO_TELEMETRY_DETACHED === "1";
 var FLUSH_SKIP = /* @__PURE__ */ new Set(["grade", "inventory-sync", "version", "--version", "-v", "help", "--help", "-h", ""]);
 function printVersion() {
-  console.log("1.9.0");
+  console.log("1.10.3");
 }
 function printHelp2() {
   console.log(`Synkro CLI \u2014 runtime safety for AI coding agents