@synkro-sh/cli 1.6.19 → 1.6.21

package/dist/bootstrap.js

@@ -813,8 +813,32 @@ export function isPathUnder(filePath: string, cwd: string): boolean {
 
 // \u2500\u2500\u2500 Logging \u2500\u2500\u2500
 
+// Hooks must keep stderr quiet for non-error paths. Claude Code's PreToolUse
+// hook protocol surfaces any stderr from a non-blocking hook as a
+// "PreToolUse:Bash hook error" toast \u2014 even though the hook returned a
+// non-blocking status. That toast interleaves with the tool-call header in the
+// terminal and mangles the rendered output. Route routine progress lines to a
+// rolling file under ~/.synkro/ so we keep the diagnostic trail without
+// polluting the agent UI. Stderr is reserved for hard failures (caught at the
+// top-level catch in each hook).
+const HOOK_LOG_PATH = join(HOME, '.synkro', '.hooks.log');
+const HOOK_LOG_MAX_BYTES = 2 * 1024 * 1024;
+
 export function log(msg: string): void {
-  process.stderr.write('[synkro] ' + msg + '\\n');
+  // \`SYNKRO_HOOK_DEBUG=1\` mirrors to stderr \u2014 useful when iterating on hook
+  // logic, off by default so normal sessions don't get toasts.
+  if (process.env.SYNKRO_HOOK_DEBUG === '1') {
+    process.stderr.write('[synkro] ' + msg + '\\n');
+  }
+  try {
+    if (existsSync(HOOK_LOG_PATH)) {
+      const sz = statSync(HOOK_LOG_PATH).size;
+      if (sz > HOOK_LOG_MAX_BYTES) {
+        try { renameSync(HOOK_LOG_PATH, HOOK_LOG_PATH + '.1'); } catch {}
+      }
+    }
+    appendFileSync(HOOK_LOG_PATH, new Date().toISOString() + ' [synkro] ' + msg + '\\n', 'utf-8');
+  } catch {}
 }
 
 // \u2500\u2500\u2500 JWT Management \u2500\u2500\u2500
@@ -950,15 +974,10 @@ export function writeCachedRepo(repo: string): void {
   try { writeFileSync(REPO_CACHE_PATH, repo, 'utf-8'); } catch {}
 }
 
-export function detectRepo(cwd: string, transcriptPath?: string): string {
-  let resolvedCwd = cwd;
-  if (!resolvedCwd && transcriptPath) {
-    const m = transcriptPath.match(/\\/projects\\/(-[^/]+)\\//);
-    if (m) resolvedCwd = '/' + m[1].slice(1).replace(/-/g, '/');
-  }
-  if (!resolvedCwd) resolvedCwd = process.cwd();
+function repoFromGitDir(cwd: string): string {
+  if (!cwd) return '';
   try {
-    const url = execSync('git remote get-url origin 2>/dev/null', { cwd: resolvedCwd, timeout: 3000, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+    const url = execSync('git remote get-url origin 2>/dev/null', { cwd, timeout: 3000, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
     if (url) {
       return url
         .replace(/^git@[^:]+:/, '')
@@ -967,12 +986,76 @@ export function detectRepo(cwd: string, transcriptPath?: string): string {
     }
   } catch {}
   try {
-    const root = execSync('git rev-parse --show-toplevel 2>/dev/null', { cwd: resolvedCwd, timeout: 2000, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+    const root = execSync('git rev-parse --show-toplevel 2>/dev/null', { cwd, timeout: 2000, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
     if (root) return root.split('/').pop() || '';
   } catch {}
   return '';
 }
 
+// Repo resolution order:
+//   1. explicit cwd from the hook payload
+//   2. workspace_roots (Cursor sends this; CC does not)
+//   3. CC transcript-path slug (~/.claude/projects/-Users-m-foo/...)
+//   4. hook process cwd
+//   5. absolute paths parsed out of the command (cat /abs/path, edit /abs/file, etc.)
+// Steps 1-4 try \`git remote get-url origin\` then \`git rev-parse --show-toplevel\`.
+// Step 5 climbs up the parent dirs of each parsed path until one exists, then
+// tries the same git lookups. Returns '' if nothing resolves \u2014 the server then
+// stores 'local' which the UI renders as "\u2014".
+export function detectRepo(
+  cwd: string,
+  transcriptPath?: string,
+  command?: string,
+  workspaceRoots?: string[],
+): string {
+  const candidates: string[] = [];
+  if (cwd) candidates.push(cwd);
+  if (workspaceRoots && Array.isArray(workspaceRoots)) {
+    for (const r of workspaceRoots) {
+      if (typeof r === 'string' && r) candidates.push(r);
+    }
+  }
+  if (transcriptPath) {
+    const ccSlug = transcriptPath.match(/\\/projects\\/(-[^/]+)\\//);
+    if (ccSlug) candidates.push('/' + ccSlug[1].slice(1).replace(/-/g, '/'));
+  }
+  candidates.push(process.cwd());
+
+  const tried = new Set<string>();
+  for (const c of candidates) {
+    if (tried.has(c)) continue;
+    tried.add(c);
+    const repo = repoFromGitDir(c);
+    if (repo) return repo;
+  }
+
+  if (command) {
+    const seen = new Set<string>();
+    const re = /(?:^|[\\s=:"'(\\[])((?:\\/|~\\/)[A-Za-z0-9_.\\-/]+)/g;
+    let m: RegExpExecArray | null;
+    while ((m = re.exec(command)) !== null) {
+      let p = m[1];
+      if (p.startsWith('~/')) p = HOME + p.slice(1);
+      if (seen.has(p)) continue;
+      seen.add(p);
+      let dir = p;
+      for (let i = 0; i < 8; i++) {
+        try {
+          if (existsSync(dir) && statSync(dir).isDirectory()) break;
+        } catch {}
+        const idx = dir.lastIndexOf('/');
+        if (idx <= 0) { dir = ''; break; }
+        dir = dir.slice(0, idx);
+      }
+      if (!dir || tried.has(dir)) continue;
+      tried.add(dir);
+      const repo = repoFromGitDir(dir);
+      if (repo) return repo;
+    }
+  }
+  return '';
+}
+
 // \u2500\u2500\u2500 Channel Health \u2500\u2500\u2500
 
 export async function channelUp(port = 18929): Promise<boolean> {
@@ -1029,6 +1112,22 @@ export interface HookConfig {
   storageMode: string;
 }
 
+/** True when telemetry + rules must stay on-machine (PGLite). Default: local. */
+export function isLocalStorageMode(): boolean {
+  return (process.env.SYNKRO_STORAGE_MODE || 'local') === 'local';
+}
+
+function mapHookRules(raw: unknown[]): Rule[] {
+  return raw.map((r: any) => ({
+    rule_id: r.rule_id || '',
+    text: r.text || '',
+    severity: r.severity || '',
+    category: r.category || '',
+    mode: normalizeMode(r.mode),
+    examples: Array.isArray(r.examples) ? r.examples : undefined,
+  }));
+}
+
 export async function loadConfig(jwt: string, query?: string): Promise<HookConfig> {
   const config: HookConfig = {
     captureDepth: 'local_only',
@@ -1056,15 +1155,7 @@ export async function loadConfig(jwt: string, query?: string): Promise<HookConfi
       const policy = raw.policy || null;
       if (policy) {
         config.policyName = policy.name || '';
-        config.rules = (policy.rules || [])
-          .map((r: any) => ({
-            rule_id: r.rule_id || '',
-            text: r.text || '',
-            severity: r.severity || '',
-            category: r.category || '',
-            mode: normalizeMode(r.mode),
-            examples: Array.isArray(r.examples) ? r.examples : undefined,
-          }));
+        config.rules = mapHookRules(policy.rules || []);
       }
       config.silent = raw.silent === true;
       if (Array.isArray(raw.scan_exemptions)) {
@@ -1076,7 +1167,12 @@ export async function loadConfig(jwt: string, query?: string): Promise<HookConfi
     }
   } catch {}
 
-  // Fallback: fetch from cloud API
+  if (isLocalStorageMode()) {
+    log('hook-config: local PGLite unavailable \u2014 skipping cloud rules fallback');
+    return config;
+  }
+
+  // Cloud storage mode only: bootstrap rules from the gateway.
   try {
     const url = GATEWAY_URL + '/api/v1/hook/config' + (query ? '?' + query : '');
     const resp = await fetch(url, {
@@ -1087,7 +1183,6 @@ export async function loadConfig(jwt: string, query?: string): Promise<HookConfi
     config.captureDepth = data.capture_depth || 'local_only';
     config.tier = data.tier || 'standard';
     config.silent = data.silent_mode === true || data.silent_mode === 'true';
-    // Env var (config.env, the installed choice) wins; server value is fallback.
     if (!process.env.SYNKRO_GRADING_MODE && data.grading_mode) config.gradingMode = data.grading_mode;
     if (!process.env.SYNKRO_STORAGE_MODE && data.storage_mode) config.storageMode = data.storage_mode;
     config.policyName = data.active_policy_name || '';
@@ -1096,17 +1191,7 @@ export async function loadConfig(jwt: string, query?: string): Promise<HookConfi
         .filter((e: any) => e && typeof e.path === 'string')
         .map((e: any) => ({ path: e.path, cwe_id: e.cwe_id || '' }));
     }
-    if (Array.isArray(data.rules)) {
-      config.rules = data.rules
-        .map((r: any) => ({
-          rule_id: r.rule_id || '',
-          text: r.text || '',
-          severity: r.severity || '',
-          category: r.category || '',
-          mode: normalizeMode(r.mode),
-          examples: Array.isArray(r.examples) ? r.examples : undefined,
-        }));
-    }
+    if (Array.isArray(data.rules)) config.rules = mapHookRules(data.rules);
   } catch {}
   return config;
 }
@@ -1206,6 +1291,16 @@ export async function localGradeCwe(prompt: string, agentKind: AgentKind = 'clau
 
 // \u2500\u2500\u2500 Rule Pre-Filter (embedding-based) \u2500\u2500\u2500
 
+/** User message + action for embedding search \u2014 intent surfaces boundary/consent rules the command alone misses. */
+export function ruleFilterText(action: string, userMessage?: string | null): string {
+  const user = (userMessage || '').trim();
+  const act = (action || '').trim();
+  if (!user) return act.slice(0, 4000);
+  if (!act) return user.slice(0, 4000);
+  return (user + '
+' + act).slice(0, 4000);
+}
+
 export async function filterRules(commandText: string, allRules: Rule[]): Promise<Rule[]> {
   if (allRules.length <= 3) return allRules;
   const mcpPort = process.env.SYNKRO_MCP_PORT || '18931';
@@ -1217,9 +1312,11 @@ export async function filterRules(commandText: string, allRules: Rule[]): Promis
       signal: AbortSignal.timeout(500),
     });
     if (!resp.ok) return allRules;
-    const data = await resp.json() as { rules?: Array<{ rule_id: string; similarity?: number }> };
+    const data = await resp.json() as { rules?: Array<Record<string, unknown>> };
     if (!data.rules || data.rules.length === 0) return allRules;
-    const selectedIds = new Set(data.rules.map(r => r.rule_id));
+    // Local PGLite owns the rule set \u2014 trust filter-rules output directly.
+    if (isLocalStorageMode()) return mapHookRules(data.rules);
+    const selectedIds = new Set(data.rules.map(r => String(r.rule_id || '')));
     return allRules.filter(r => selectedIds.has(r.rule_id));
   } catch {
     return allRules;
@@ -1300,7 +1397,12 @@ function isSafeBashSegment(seg: string, repoRoot: string): boolean {
 }
 
 export function isSafeInRepoRead(toolName: string, command: string, repoRoot: string): boolean {
-  if (SAFE_READ_TOOLS.has(toolName)) return true;
+  // Read/Grep/Glob are synthesized into cat/grep/find commands \u2014 validate paths
+  // the same way as bash reads instead of blanket-allowing every tool call.
+  if (SAFE_READ_TOOLS.has(toolName)) {
+    if (!command || !repoRoot) return false;
+    return isSafeBashSegment(command.trim(), repoRoot);
+  }
   if (!SAFE_SHELL_TOOLS.has(toolName)) return false;
   if (!command || !repoRoot) return false;
   const segments = command.split('|');
@@ -1344,10 +1446,18 @@ export async function runInstallScan(command: string, jwt: string): Promise<Inst
   if (!HINTS.some(h => lc.includes(h))) return empty;
 
   try {
+    let clientPackages: Array<{ name: string; version: string; ecosystem: string }> = [];
+    try {
+      const mod = await import(new URL('./installExtractCore.ts', import.meta.url).href);
+      clientPackages = mod.extractDeterministicPkgRequests(command);
+    } catch (err) {
+      log('installExtract client error: ' + String(err));
+    }
+
     const scanResp = await fetch(GATEWAY_URL + '/api/v1/pkg-scan', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json', Authorization: 'Bearer ' + jwt },
-      body: JSON.stringify({ command }),
+      body: JSON.stringify({ command, packages: clientPackages }),
       signal: AbortSignal.timeout(10000),
     }).then(r => r.json()) as any;
     const action = scanResp?.action || 'allow';
@@ -2302,7 +2412,7 @@ import {
   readStdin, extractTranscript, readLastPrompt, findNearestDeps, filePathFromToolInput,
   appendSessionAction, readSessionLog, compressSessionLog, log,
   outputJson, outputEmpty, setupCursorHookSignals, isEditTool, hookSessionId, GATEWAY_URL,
-  logGraderUnavailable, filterRules, normalizeMode,
+  logGraderUnavailable, filterRules, ruleFilterText, normalizeMode,
   type HookConfig, type Rule,
 } from './_synkro-common.ts';
 import { existsSync, readFileSync } from 'node:fs';
@@ -2326,7 +2436,8 @@ async function main() {
     const toolInput = payload.tool_input || {};
     const sessionId = hookSessionId(payload);
     const toolUseId = payload.tool_use_id || '';
-    const cwd = payload.cwd || '';
+    const workspaceRoots = Array.isArray(payload.workspace_roots) ? payload.workspace_roots as string[] : [];
+    const cwd = payload.cwd || workspaceRoots[0] || '';
     const permissionMode = payload.permission_mode || '';
     const transcriptPath = payload.transcript_path || '';
 
@@ -2340,7 +2451,7 @@ async function main() {
 
     appendSessionAction(sessionId, { ts: new Date().toISOString(), tool: toolName || 'Edit', summary: 'editing ' + fileShort, file: filePath });
 
-    const gitRepo = detectRepo(cwd);
+    const gitRepo = detectRepo(cwd, transcriptPath, filePath, workspaceRoots);
 
     let jwt = loadJwt();
     if (!jwt) { outputEmpty(); return; }
@@ -2369,6 +2480,13 @@ async function main() {
     const transcript = extractTranscript(transcriptPath);
     const lastPrompt = readLastPrompt(sessionId);
 
+    // Model detection: prefer transcript (CC), fall back to payload (Cursor)
+    if (!transcript.ccModel) {
+      const rawModel = String(payload.model ?? payload.model_id ?? '');
+      const KNOWN_MODELS = new Set(['gpt-4', 'gpt-4o', 'gpt-4.1', 'gpt-5', 'o1', 'o3', 'o4-mini', 'claude-sonnet-4-5', 'claude-opus-4-5', 'sonnet-4', 'sonnet-4-thinking', 'gemini-2.5-pro', 'gemini-2.5-flash']);
+      transcript.ccModel = rawModel ? (KNOWN_MODELS.has(rawModel) || rawModel.startsWith('claude-') || rawModel.startsWith('gpt-') || rawModel.startsWith('gemini-') || rawModel.startsWith('o1') || rawModel.startsWith('o3') ? rawModel : 'cursor/' + rawModel) : (agentKind === 'cursor' ? 'cursor' : '');
+    }
+
     // Load config and decide route
     const config = await loadConfig(jwt);
     const rt = await route(config);
@@ -2384,7 +2502,10 @@ async function main() {
       const proposedShort = proposed.slice(0, 4000);
       const sessionLog = compressSessionLog(readSessionLog(sessionId));
       const graderContent = 'file=' + filePath + ' content=' + proposedShort;
-      const relevantRules = await filterRules(graderContent, config.rules);
+      const relevantRules = await filterRules(
+        ruleFilterText(graderContent, transcript.userIntent || lastPrompt),
+        config.rules,
+      );
       const graderPrompt = [
         'Working directory: ' + (cwd || '.'),
         'Repo: ' + (gitRepo || 'unknown'),
@@ -2505,7 +2626,7 @@ async function main() {
       outputJson(hookResp);
     }
   } catch (err) {
-    process.stderr.write('[synkro] editGuard error: ' + String(err) + '\\n');
+    log('editGuard error: ' + String(err));
     outputEmpty();
   }
 }
@@ -2645,11 +2766,13 @@ async function main() {
 
     const toolInput = payload.tool_input || {};
     const sessionId = hookSessionId(payload);
-    const cwd = payload.cwd || '';
-    const gitRepo = detectRepo(cwd);
+    const workspaceRoots = Array.isArray(payload.workspace_roots) ? payload.workspace_roots as string[] : [];
+    const cwd = payload.cwd || workspaceRoots[0] || '';
+    const transcriptPath = payload.transcript_path || '';
 
     const filePath = filePathFromToolInput(toolInput);
     if (!filePath) { outputEmpty(); return; }
+    const gitRepo = detectRepo(cwd, transcriptPath, filePath, workspaceRoots);
 
     if (filePath.includes('/.synkro/hooks/')) { outputEmpty(); return; }
 
@@ -2993,7 +3116,7 @@ async function main() {
     const cleanMsg = cweTag + ' ' + fileShort + ' \u2192 clean' + (cweResp?.summary ? ' (cloud)' : '');
     outputJson({ systemMessage: cleanMsg, hookSpecificOutput: { hookEventName: 'PreToolUse', additionalContext: cleanMsg } });
   } catch (err) {
-    process.stderr.write('[synkro] cweGuard error: ' + String(err) + '\n');
+    log('cweGuard error: ' + String(err));
     outputEmpty();
   }
 }
@@ -3036,11 +3159,13 @@ async function main() {
 
     const toolInput = payload.tool_input || {};
     const sessionId = hookSessionId(payload);
-    const cwd = payload.cwd || '';
-    const gitRepo = detectRepo(cwd);
+    const workspaceRoots = Array.isArray(payload.workspace_roots) ? payload.workspace_roots as string[] : [];
+    const cwd = payload.cwd || workspaceRoots[0] || '';
+    const transcriptPath = payload.transcript_path || '';
 
     const filePath = filePathFromToolInput(toolInput);
     if (!filePath) { outputEmpty(); return; }
+    const gitRepo = detectRepo(cwd, transcriptPath, filePath, workspaceRoots);
 
     if (filePath.includes('/.synkro/hooks/')) { outputEmpty(); return; }
 
@@ -3151,7 +3276,7 @@ async function main() {
 
     outputJson({ systemMessage: cveTag + ' ' + fileShort + ' \u2192 clean' });
   } catch (err) {
-    process.stderr.write('[synkro] cveGuard error: ' + String(err) + '\\n');
+    log('cveGuard error: ' + String(err));
     outputEmpty();
   }
 }
@@ -3200,12 +3325,18 @@ async function main() {
     if (!scan.scanned) { outputEmpty(); return; }
 
     const sessionId = hookSessionId(payload);
-    const cwd = payload.cwd || '';
-    const repo = detectRepo(cwd);
+    const workspaceRoots = Array.isArray(payload.workspace_roots) ? payload.workspace_roots as string[] : [];
+    const cwd = payload.cwd || workspaceRoots[0] || '';
+    const transcriptPath = payload.transcript_path || '';
+    const repo = detectRepo(cwd, transcriptPath, command, workspaceRoots);
     const config = await loadConfig(jwt);
     const rt = await route(config);
     const tagStr = tag(rt, config);
 
+    const rawModel = String(payload.model ?? payload.model_id ?? '');
+    const KNOWN_MODELS = new Set(['gpt-4', 'gpt-4o', 'gpt-4.1', 'gpt-5', 'o1', 'o3', 'o4-mini', 'claude-sonnet-4-5', 'claude-opus-4-5', 'sonnet-4', 'sonnet-4-thinking', 'gemini-2.5-pro', 'gemini-2.5-flash']);
+    const model = rawModel ? (KNOWN_MODELS.has(rawModel) || rawModel.startsWith('claude-') || rawModel.startsWith('gpt-') || rawModel.startsWith('gemini-') || rawModel.startsWith('o1') || rawModel.startsWith('o3') ? rawModel : 'cursor/' + rawModel) : '';
+
     if (scan.action === 'block') {
       for (const f of scan.findings) {
         dispatchFinding(jwt, {
@@ -3224,6 +3355,7 @@ async function main() {
         'Bash', repo, sessionId, config.captureDepth, {
           command, reasoning: scan.blockContext.slice(0, 200),
           violatedRules: scan.violatedIds,
+          ccModel: model || undefined,
         });
       const denyReason = '[synkro:installScan] BLOCKED: ' + scan.summary + '\\nDo not retry this install. Suggest a safe version to the user instead.';
       outputJson({
@@ -3239,7 +3371,7 @@ async function main() {
       outputEmpty();
     }
   } catch (err) {
-    process.stderr.write('[synkro] installScan error: ' + String(err) + '\\n');
+    log('installScan error: ' + String(err));
     outputEmpty();
   }
 }
@@ -3253,7 +3385,7 @@ import {
   parseVerdict, dispatchCapture, dispatchFinding, ruleMode, postWithRetry, readStdin,
   extractTranscript, readLastPrompt, appendSessionAction, readSessionLog, compressSessionLog, log,
   outputJson, outputEmpty, setupCursorHookSignals, isShellTool, hookSessionId, GATEWAY_URL,
-  logGraderUnavailable, filterRules, normalizeMode, appendLocalTelemetry, isSafeInRepoRead,
+  logGraderUnavailable, filterRules, ruleFilterText, normalizeMode, appendLocalTelemetry, isSafeInRepoRead,
   hashCommand,
   type HookConfig, type Rule,
 } from './_synkro-common.ts';
@@ -3308,10 +3440,10 @@ async function main() {
     const toolInput = payload.tool_input || {};
     const sessionId = hookSessionId(payload);
     const toolUseId = payload.tool_use_id || '';
-    const cwd = payload.cwd || '';
+    const workspaceRoots = Array.isArray(payload.workspace_roots) ? payload.workspace_roots as string[] : [];
+    const cwd = payload.cwd || workspaceRoots[0] || '';
     const permissionMode = payload.permission_mode || '';
     const transcriptPath = payload.transcript_path || '';
-    const gitRepo = detectRepo(cwd);
     const transcript = extractTranscript(transcriptPath);
 
     let command = '';
@@ -3328,6 +3460,8 @@ async function main() {
     }
     if (!command) { outputEmpty(); return; }
 
+    const gitRepo = detectRepo(cwd, transcriptPath, command, workspaceRoots);
+
     if (isDuplicate(command, sessionId)) {
       log('bashGuard skip (dedup): ' + command.slice(0, 80));
       outputEmpty();
@@ -3404,7 +3538,10 @@ async function main() {
 
     if (rt === 'local') {
       const sessionLog = compressSessionLog(readSessionLog(sessionId));
-      const relevantRules = await filterRules(command, config.rules);
+      const relevantRules = await filterRules(
+        ruleFilterText(command, transcript.userIntent || lastPrompt),
+        config.rules,
+      );
       const graderPrompt = [
         'Working directory: ' + (cwd || '.'),
         'Repo: ' + (gitRepo || 'unknown'),
@@ -3526,7 +3663,7 @@ async function main() {
 
     outputJson(resp.hook_response);
   } catch (err) {
-    process.stderr.write('[synkro] bashGuard error: ' + String(err) + '\\n');
+    log('bashGuard error: ' + String(err));
     outputEmpty();
   }
 }
@@ -3561,16 +3698,18 @@ async function main() {
     const toolInput = payload.tool_input || {};
     const sessionId = hookSessionId(payload);
     const toolUseId = payload.tool_use_id || '';
-    const cwd = payload.cwd || '';
+    const workspaceRoots = Array.isArray(payload.workspace_roots) ? payload.workspace_roots as string[] : [];
+    const cwd = payload.cwd || workspaceRoots[0] || '';
     const permissionMode = payload.permission_mode || '';
     const transcriptPath = payload.transcript_path || '';
-    const gitRepo = detectRepo(cwd);
 
     const prompt = toolInput.prompt || '';
     const description = toolInput.description || '';
     const subagentType = toolInput.subagent_type || 'general-purpose';
     if (!prompt) { outputEmpty(); return; }
 
+    const gitRepo = detectRepo(cwd, transcriptPath, prompt, workspaceRoots);
+
     appendSessionAction(sessionId, { ts: new Date().toISOString(), tool: 'Agent', summary: 'spawn ' + subagentType + ': ' + description.slice(0, 80) });
 
     const promptShort = prompt.slice(0, 80);
@@ -3583,6 +3722,12 @@ async function main() {
     const transcript = extractTranscript(transcriptPath);
     const lastPrompt = readLastPrompt(sessionId);
 
+    if (!transcript.ccModel) {
+      const rawModel = String(payload.model ?? payload.model_id ?? '');
+      const KNOWN_MODELS = new Set(['gpt-4', 'gpt-4o', 'gpt-4.1', 'gpt-5', 'o1', 'o3', 'o4-mini', 'claude-sonnet-4-5', 'claude-opus-4-5', 'sonnet-4', 'sonnet-4-thinking', 'gemini-2.5-pro', 'gemini-2.5-flash']);
+      transcript.ccModel = rawModel ? (KNOWN_MODELS.has(rawModel) || rawModel.startsWith('claude-') || rawModel.startsWith('gpt-') || rawModel.startsWith('gemini-') || rawModel.startsWith('o1') || rawModel.startsWith('o3') ? rawModel : 'cursor/' + rawModel) : (agentKind === 'cursor' ? 'cursor' : '');
+    }
+
     const config = await loadConfig(jwt);
     const rt = await route(config);
     const tagStr = tag(rt, config);
@@ -3695,7 +3840,7 @@ async function main() {
 
     outputJson(resp.hook_response);
   } catch (err) {
-    process.stderr.write('[synkro] agentGuard error: ' + String(err) + '\\n');
+    log('agentGuard error: ' + String(err));
     outputEmpty();
   }
 }
@@ -3771,8 +3916,10 @@ async function main() {
     if (plan.length < 20) { outputEmpty(); return; }
 
     const sessionId = hookSessionId(payload);
-    const cwd = payload.cwd || '';
-    const gitRepo = detectRepo(cwd);
+    const workspaceRoots = Array.isArray(payload.workspace_roots) ? payload.workspace_roots as string[] : [];
+    const cwd = payload.cwd || workspaceRoots[0] || '';
+    const transcriptPath = payload.transcript_path || '';
+    const gitRepo = detectRepo(cwd, transcriptPath, plan, workspaceRoots);
 
     appendSessionAction(sessionId, { ts: new Date().toISOString(), tool: 'ExitPlanMode', summary: 'plan review: ' + plan.slice(0, 80) });
 
@@ -3783,6 +3930,10 @@ async function main() {
     if (!jwt) { outputEmpty(); return; }
     jwt = await ensureFreshJwt(jwt);
 
+    const rawModel = String(payload.model ?? payload.model_id ?? '');
+    const KNOWN_MODELS = new Set(['gpt-4', 'gpt-4o', 'gpt-4.1', 'gpt-5', 'o1', 'o3', 'o4-mini', 'claude-sonnet-4-5', 'claude-opus-4-5', 'sonnet-4', 'sonnet-4-thinking', 'gemini-2.5-pro', 'gemini-2.5-flash']);
+    const ccModel = rawModel ? (KNOWN_MODELS.has(rawModel) || rawModel.startsWith('claude-') || rawModel.startsWith('gpt-') || rawModel.startsWith('gemini-') || rawModel.startsWith('o1') || rawModel.startsWith('o3') ? rawModel : 'cursor/' + rawModel) : (agentKind === 'cursor' ? 'cursor' : '');
+
     const config = await loadConfig(jwt);
     const rt = await route(config);
     const tagStr = tag(rt, config);
@@ -3824,7 +3975,7 @@ async function main() {
         dispatchCapture(jwt, 'plan_review', 'advisory', verdict.severity || 'medium', verdict.category || 'general',
           'ExitPlanMode', gitRepo, sessionId, config.captureDepth, {
             command: planContent, reasoning: verdict.reason || 'check org rules',
-            rulesChecked: config.rules, violatedRules,
+            rulesChecked: config.rules, violatedRules, ccModel: ccModel || undefined,
           });
       } else {
         const reviewMsg = verdict.reason || 'no relevant org rules for this plan';
@@ -3834,7 +3985,7 @@ async function main() {
         dispatchCapture(jwt, 'plan_review', 'clean', 'clean', verdict.category || 'general',
           'ExitPlanMode', gitRepo, sessionId, config.captureDepth, {
             command: planContent, reasoning: reviewMsg,
-            rulesChecked: config.rules, violatedRules: [],
+            rulesChecked: config.rules, violatedRules: [], ccModel: ccModel || undefined,
           });
       }
       return;
@@ -3872,7 +4023,7 @@ async function main() {
       outputJson(hookResp);
     }
   } catch (err) {
-    process.stderr.write('[synkro] planReview error: ' + String(err) + '\\n');
+    log('planReview error: ' + String(err));
     outputEmpty();
   }
 }
@@ -3895,9 +4046,10 @@ async function main() {
     const sessionId = hookSessionId(payload);
     if (!sessionId) { outputEmpty(); return; }
 
-    const cwd = payload.cwd || '';
+    const workspaceRoots = Array.isArray(payload.workspace_roots) ? payload.workspace_roots as string[] : [];
+    const cwd = payload.cwd || workspaceRoots[0] || '';
     const transcriptPath = payload.transcript_path || '';
-    const gitRepo = detectRepo(cwd);
+    const gitRepo = detectRepo(cwd, transcriptPath, '', workspaceRoots);
 
     let jwt = loadJwt();
     if (!jwt) { outputEmpty(); return; }
@@ -3957,7 +4109,7 @@ async function main() {
       outputJson({ systemMessage: tagStr + ' stop \u2192 ' + findings + ' finding(s): ' + autoFixed + ' auto-fixed, ' + open + ' open' });
     }
   } catch (err) {
-    process.stderr.write('[synkro] stopSummary error: ' + String(err) + '\\n');
+    log('stopSummary error: ' + String(err));
     outputEmpty();
   }
 }
@@ -3968,7 +4120,7 @@ main();
 import {
   loadJwt, detectRepo, channelUp, tag, readStdin, writeCachedRepo,
   outputJson, outputEmpty, setupCursorHookSignals, hookSessionId, GATEWAY_URL,
-  type HookConfig,
+  isLocalStorageMode, type HookConfig,
 } from './_synkro-common.ts';
 
 async function main() {
@@ -3978,9 +4130,11 @@ async function main() {
     if (!input.trim()) { outputEmpty(); return; }
 
     const payload = JSON.parse(input);
-    const cwd = payload.cwd || '';
+    const workspaceRoots = Array.isArray(payload.workspace_roots) ? payload.workspace_roots as string[] : [];
+    const cwd = payload.cwd || workspaceRoots[0] || '';
+    const transcriptPath = payload.transcript_path || '';
     const sessionId = hookSessionId(payload);
-    const gitRepo = detectRepo(cwd);
+    const gitRepo = detectRepo(cwd, transcriptPath, '', workspaceRoots);
     if (gitRepo) writeCachedRepo(gitRepo);
 
     let jwt = loadJwt();
@@ -3992,7 +4146,19 @@ async function main() {
     let silent = false;
     let openFindings = 0;
 
-    if (jwt) {
+    if (isLocalStorageMode()) {
+      try {
+        const mcpPort = process.env.SYNKRO_MCP_PORT || '18931';
+        const r = await fetch('http://127.0.0.1:' + mcpPort + '/api/local/hook-config', {
+          signal: AbortSignal.timeout(1500),
+        });
+        if (r.ok) {
+          const data = await r.json() as any;
+          silent = data.silent === true;
+          policyName = data.policy?.name || '';
+        }
+      } catch {}
+    } else if (jwt) {
       try {
         const url = GATEWAY_URL + '/api/v1/hook/config?session_id=' + encodeURIComponent(sessionId || '') + '&repo=' + encodeURIComponent(gitRepo || '');
         const r = await fetch(url, {
@@ -4023,7 +4189,7 @@ async function main() {
       outputJson({ systemMessage: routeLine + '\\n' + tagStr + ' session start \u2192 ' + openFindings + ' open findings in this repo from prior sessions.' });
     }
   } catch (err) {
-    process.stderr.write('[synkro] sessionStart error: ' + String(err) + '\\n');
+    log('sessionStart error: ' + String(err));
     outputEmpty();
   }
 }
@@ -4112,7 +4278,8 @@ async function main() {
     const payload = JSON.parse(input);
     const sessionId = hookSessionId(payload);
     const transcriptPath = payload.transcript_path || '';
-    const cwd = payload.cwd || '';
+    const workspaceRoots = Array.isArray(payload.workspace_roots) ? payload.workspace_roots as string[] : [];
+    const cwd = payload.cwd || workspaceRoots[0] || '';
 
     if (!sessionId || !transcriptPath || !existsSync(transcriptPath)) {
       outputEmpty();
@@ -4148,7 +4315,7 @@ async function main() {
     // 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);
+    const gitRepo = detectRepo(cwd, transcriptPath, '', workspaceRoots);
 
     // Offset-tracked extraction of new user/assistant turns from the transcript.
     const offsetDir = join(homedir(), '.synkro', '.transcript-offsets');
@@ -4296,7 +4463,7 @@ main();
     CURSOR_BASH_JUDGE_TS = `#!/usr/bin/env bun
 import {
   loadJwt, ensureFreshJwt, detectRepo, loadConfig, route, tag, localGrade,
-  parseVerdict, dispatchCapture, dispatchFinding, ruleMode, normalizeMode, filterRules,
+  parseVerdict, dispatchCapture, dispatchFinding, ruleMode, normalizeMode, filterRules, ruleFilterText,
   isSafeInRepoRead, postWithRetry, readStdin, hashCommand,
   extractTranscript, readLastPrompt, readSessionLog, compressSessionLog,
   appendLocalTelemetry, logGraderUnavailable, log, GATEWAY_URL,
@@ -4401,7 +4568,8 @@ async function main() {
     const { command, toolName } = extractCommand(payload);
     if (!command) finishAllow();
 
-    const cwd = typeof payload.cwd === 'string' ? payload.cwd : '';
+    const workspaceRoots = Array.isArray(payload.workspace_roots) ? (payload.workspace_roots as unknown[]).filter((r): r is string => typeof r === 'string') : [];
+    const cwd = typeof payload.cwd === 'string' && payload.cwd ? payload.cwd : (workspaceRoots[0] || '');
     const sessionId = String(payload.conversation_id ?? payload.session_id ?? '');
 
     if (isDuplicate(command, sessionId)) {
@@ -4413,7 +4581,7 @@ async function main() {
     const rawModel = String(payload.model ?? payload.model_id ?? '');
     const KNOWN_MODELS = new Set(['gpt-4', 'gpt-4o', 'gpt-4.1', 'gpt-5', 'o1', 'o3', 'o4-mini', 'claude-sonnet-4-5', 'claude-opus-4-5', 'sonnet-4', 'sonnet-4-thinking', 'gemini-2.5-pro', 'gemini-2.5-flash']);
     const model = rawModel ? (KNOWN_MODELS.has(rawModel) || rawModel.startsWith('claude-') || rawModel.startsWith('gpt-') || rawModel.startsWith('gemini-') || rawModel.startsWith('o1') || rawModel.startsWith('o3') ? rawModel : 'cursor/' + rawModel) : 'cursor';
-    const repo = detectRepo(cwd);
+    const repo = detectRepo(cwd, transcriptPath, command, workspaceRoots);
 
     const cmdShort = command.slice(0, 80);
     log('bashGuard checking: ' + cmdShort);
@@ -4460,7 +4628,10 @@ async function main() {
 
     if (rt === 'local') {
       const sessionLog = compressSessionLog(readSessionLog(sessionId));
-      const relevantRules = await filterRules(command, config.rules);
+      const relevantRules = await filterRules(
+        ruleFilterText(command, transcript.userIntent || lastPrompt),
+        config.rules,
+      );
 
       const graderPrompt = [
         'Working directory: ' + (cwd || '.'),
@@ -4613,9 +4784,15 @@ async function main() {
     const filePath = payload.file_path || payload.path || payload.target_file || '';
     if (!filePath) finish();
 
-    const cwd = payload.cwd || payload.workspace_roots?.[0] || '';
+    const workspaceRoots = Array.isArray(payload.workspace_roots) ? (payload.workspace_roots as unknown[]).filter((r): r is string => typeof r === 'string') : [];
+    const cwd = payload.cwd || workspaceRoots[0] || '';
+    const transcriptPath = typeof payload.transcript_path === 'string' ? payload.transcript_path : '';
     const sessionId = payload.conversation_id || '';
-    const repo = detectRepo(cwd);
+    const repo = detectRepo(cwd, transcriptPath, filePath, workspaceRoots);
+
+    const rawModel = String(payload.model ?? payload.model_id ?? '');
+    const KNOWN_MODELS = new Set(['gpt-4', 'gpt-4o', 'gpt-4.1', 'gpt-5', 'o1', 'o3', 'o4-mini', 'claude-sonnet-4-5', 'claude-opus-4-5', 'sonnet-4', 'sonnet-4-thinking', 'gemini-2.5-pro', 'gemini-2.5-flash']);
+    const model = rawModel ? (KNOWN_MODELS.has(rawModel) || rawModel.startsWith('claude-') || rawModel.startsWith('gpt-') || rawModel.startsWith('gemini-') || rawModel.startsWith('o1') || rawModel.startsWith('o3') ? rawModel : 'cursor/' + rawModel) : 'cursor';
 
     log('editScan ' + basename(filePath));
 
@@ -4655,6 +4832,8 @@ async function main() {
       tool_input: { file_path: filePath, content: fileContent },
       edit_verdict: { ok: true },
       dependencies,
+      cc_model: model,
+      model,
     };
     if (sessionId) captureBody.session_id = sessionId;
     if (cwd) captureBody.cwd = cwd;
@@ -5742,6 +5921,46 @@ function resolveSynkroBin() {
   const resolved = (which2.stdout || "").split("\n")[0].trim();
   return resolved || "synkro";
 }
+function sweepHostPglite() {
+  const ps = spawnSync2("ps", ["-eo", "pid,command"], { encoding: "utf-8", timeout: 5e3 });
+  if (ps.status !== 0) return;
+  const targets = [];
+  for (const line of (ps.stdout || "").split("\n")) {
+    if (!/bun\b/.test(line)) continue;
+    if (!/pglite-(db|bootstrap)\.ts\b/.test(line)) continue;
+    const m = line.trim().match(/^(\d+)\s/);
+    if (!m) continue;
+    const pid = parseInt(m[1], 10);
+    if (pid > 0 && pid !== process.pid) targets.push(pid);
+  }
+  if (targets.length === 0) return;
+  console.log(`  Sweeping ${targets.length} stale host PGLite process(es): ${targets.join(", ")}`);
+  for (const pid of targets) {
+    try {
+      process.kill(pid, "SIGTERM");
+    } catch {
+    }
+  }
+  const deadline = Date.now() + 3e3;
+  while (Date.now() < deadline) {
+    const alive = targets.filter((pid) => {
+      try {
+        process.kill(pid, 0);
+        return true;
+      } catch {
+        return false;
+      }
+    });
+    if (alive.length === 0) return;
+    spawnSync2("sleep", ["0.2"], { timeout: 1e3 });
+  }
+  for (const pid of targets) {
+    try {
+      process.kill(pid, "SIGKILL");
+    } catch {
+    }
+  }
+}
 async function dockerInstall(opts = {}) {
   assertDockerAvailable();
   const image = imageTag();
@@ -5796,6 +6015,7 @@ async function dockerInstall(opts = {}) {
     await dockerSafeStop();
   }
   spawnSync2("docker", ["rm", CONTAINER_NAME], { encoding: "utf-8", timeout: 3e4 });
+  sweepHostPglite();
   const credsDir = claudeCredsHostDir();
   const args2 = [
     "run",
@@ -5810,6 +6030,8 @@ async function dockerInstall(opts = {}) {
     `127.0.0.1:${HOST_GRADER_PORT}:8929`,
     "-p",
     `127.0.0.1:${HOST_CWE_PORT}:8930`,
+    "-p",
+    `127.0.0.1:${HOST_PGLITE_PORT}:5433`,
     "-v",
     `${PGDATA_PATH}:/data/pgdata`,
     "-v",
@@ -5854,7 +6076,7 @@ async function dockerInstall(opts = {}) {
   if (run.status !== 0) {
     throw new DockerInstallError(`docker run failed (image ${image})`);
   }
-  return { image, hostMcpPort: HOST_MCP_PORT, hostGraderPort: HOST_GRADER_PORT, hostCwePort: HOST_CWE_PORT };
+  return { image, hostMcpPort: HOST_MCP_PORT, hostGraderPort: HOST_GRADER_PORT, hostCwePort: HOST_CWE_PORT, hostPglitePort: HOST_PGLITE_PORT };
 }
 async function waitForContainerReady(timeoutMs = 6e4) {
   const start = Date.now();
@@ -6038,7 +6260,7 @@ function checkPgdata() {
   if (!hasPgControl) return { healthy: false, details: "pg_control/global directory missing" };
   return { healthy: true, details: `${entries.length} entries, WAL present, no stale PID` };
 }
-var SYNKRO_DIR2, MCP_JWT_PATH, PGDATA_PATH, CLAUDE_HOST_STATE_DIR, CLAUDE_HOST_STATE_FILE, HOST_MCP_PORT, HOST_GRADER_PORT, HOST_CWE_PORT, CONTAINER_NAME, DEFAULT_IMAGE, DockerInstallError, BACKUP_DIR;
+var SYNKRO_DIR2, MCP_JWT_PATH, PGDATA_PATH, CLAUDE_HOST_STATE_DIR, CLAUDE_HOST_STATE_FILE, HOST_MCP_PORT, HOST_GRADER_PORT, HOST_CWE_PORT, HOST_PGLITE_PORT, CONTAINER_NAME, DEFAULT_IMAGE, DockerInstallError, BACKUP_DIR;
 var init_dockerInstall = __esm({
   "cli/local-cc/dockerInstall.ts"() {
     "use strict";
@@ -6052,6 +6274,7 @@ var init_dockerInstall = __esm({
     HOST_MCP_PORT = parseInt(process.env.SYNKRO_HOST_MCP_PORT || "18931", 10);
     HOST_GRADER_PORT = parseInt(process.env.SYNKRO_HOST_GRADER_PORT || "18929", 10);
     HOST_CWE_PORT = parseInt(process.env.SYNKRO_HOST_CWE_PORT || "18930", 10);
+    HOST_PGLITE_PORT = parseInt(process.env.SYNKRO_HOST_PGLITE_PORT || "15433", 10);
     CONTAINER_NAME = "synkro-server";
     DEFAULT_IMAGE = "ghcr.io/synkro-sh/synkro-server:latest";
     DockerInstallError = class extends Error {
@@ -6076,7 +6299,7 @@ import { createInterface as createInterface2 } from "readline/promises";
 import { stdin as input, stdout as output } from "process";
 import { execSync as execSync4, spawn as nodeSpawn } from "child_process";
 import { existsSync as existsSync8, readFileSync as readFileSync6, unlinkSync as unlinkSync3 } from "fs";
-import { homedir as homedir7, platform as platform4 } from "os";
+import { homedir as homedir7, platform as platform3 } from "os";
 import { join as join7 } from "path";
 import { execFile as execFile2 } from "child_process";
 function readConfig() {
@@ -6119,7 +6342,7 @@ async function prompt(rl, q, opts = {}) {
   return await rl.question(q);
 }
 function openBrowser3(url) {
-  const os = platform4();
+  const os = platform3();
   let bin;
   let args2;
   switch (os) {
@@ -6438,8 +6661,9 @@ __export(install_exports, {
 });
 import { existsSync as existsSync9, mkdirSync as mkdirSync8, writeFileSync as writeFileSync7, chmodSync as chmodSync2, readFileSync as readFileSync7, readdirSync as readdirSync2 } from "fs";
 import { homedir as homedir8 } from "os";
-import { join as join8 } from "path";
-import { execSync as execSync5 } from "child_process";
+import { dirname as dirname5, join as join8 } from "path";
+import { execSync as execSync5, spawnSync as spawnSync3 } from "child_process";
+import { fileURLToPath } from "url";
 import { createInterface as createInterface3 } from "readline";
 function sanitizeGatewayCandidate(raw) {
   if (!raw) return void 0;
@@ -6554,6 +6778,11 @@ function ensureSynkroDir() {
   mkdirSync8(join8(SYNKRO_DIR4, "sessions"), { recursive: true });
 }
 function writeHookScripts() {
+  const installExtractCoreSrc = join8(
+    dirname5(fileURLToPath(import.meta.url)),
+    "../../../api/src/lib/installExtractCore.ts"
+  );
+  const installExtractCorePath = join8(HOOKS_DIR, "installExtractCore.ts");
   const bashScriptPath = join8(HOOKS_DIR, "cc-bash-judge.ts");
   const bashFollowupScriptPath = join8(HOOKS_DIR, "cc-bash-followup.ts");
   const editPrecheckScriptPath = join8(HOOKS_DIR, "cc-edit-precheck.ts");
@@ -6588,6 +6817,18 @@ function writeHookScripts() {
   writeFileSync7(cursorBashJudgePath, CURSOR_BASH_JUDGE_TS, "utf-8");
   writeFileSync7(cursorEditCapturePath, CURSOR_EDIT_CAPTURE_TS, "utf-8");
   writeFileSync7(mcpStdioProxyPath, MCP_STDIO_PROXY_SRC, "utf-8");
+  writeFileSync7(installExtractCorePath, readFileSync7(installExtractCoreSrc, "utf-8"), "utf-8");
+  const hooksPkgPath = join8(HOOKS_DIR, "package.json");
+  writeFileSync7(hooksPkgPath, JSON.stringify({
+    name: "synkro-hooks",
+    private: true,
+    type: "module",
+    dependencies: { "shell-quote": "^1.8.1" }
+  }, null, 2) + "\n");
+  const bunInstall = spawnSync3("bun", ["install"], { cwd: HOOKS_DIR, encoding: "utf-8" });
+  if (bunInstall.status !== 0) {
+    console.warn("  \u26A0 Could not install hook dependencies (shell-quote): " + (bunInstall.stderr || bunInstall.stdout || "").slice(0, 200));
+  }
   chmodSync2(bashScriptPath, 493);
   chmodSync2(bashFollowupScriptPath, 493);
   chmodSync2(editPrecheckScriptPath, 493);
@@ -6605,6 +6846,7 @@ function writeHookScripts() {
   chmodSync2(cursorBashJudgePath, 493);
   chmodSync2(cursorEditCapturePath, 493);
   chmodSync2(mcpStdioProxyPath, 493);
+  chmodSync2(installExtractCorePath, 493);
   return {
     bashScript: bashScriptPath,
     bashFollowupScript: bashFollowupScriptPath,
@@ -6651,7 +6893,7 @@ function writeConfigEnv(opts) {
     `SYNKRO_CREDENTIALS_PATH=${shellQuoteSingle(credsPath)}`,
     `SYNKRO_TIER=${shellQuoteSingle(safeTier)}`,
     `SYNKRO_INFERENCE=${shellQuoteSingle(safeInference)}`,
-    `SYNKRO_VERSION=${shellQuoteSingle("1.6.19")}`
+    `SYNKRO_VERSION=${shellQuoteSingle("1.6.21")}`
   ];
   if (safeSynkroBin) lines.push(`SYNKRO_CLI_BIN=${shellQuoteSingle(safeSynkroBin)}`);
   if (safeUserId) lines.push(`SYNKRO_USER_ID=${shellQuoteSingle(safeUserId)}`);
@@ -7066,9 +7308,9 @@ async function installCommand(opts = {}) {
     const { claudeWorkers, cursorWorkers } = splitWorkers(totalWorkers, providers);
     console.log(`  worker pool: ${claudeWorkers} claude + ${cursorWorkers} cursor`);
     const connectedRepo = detectGitRepo2() || void 0;
-    const { image, hostMcpPort, hostGraderPort, hostCwePort } = await dockerInstall({ claudeWorkers, cursorWorkers, connectedRepo });
+    const { image, hostMcpPort, hostGraderPort, hostCwePort, hostPglitePort } = await dockerInstall({ claudeWorkers, cursorWorkers, connectedRepo });
     console.log(`  \u2713 pulled ${image}`);
-    console.log(`  container started \u2014 MCP=${hostMcpPort} general=${hostGraderPort} CWE=${hostCwePort}`);
+    console.log(`  container started \u2014 MCP=${hostMcpPort} general=${hostGraderPort} CWE=${hostCwePort} pglite=${hostPglitePort}`);
     console.log("  waiting for container to be ready...");
     const ready = await waitForContainerReady(6e4);
     if (ready) {
@@ -7382,7 +7624,7 @@ rl.on('line', async (line) => {
 import { existsSync as existsSync10, mkdirSync as mkdirSync9, writeFileSync as writeFileSync8, readFileSync as readFileSync8, chmodSync as chmodSync3, copyFileSync as copyFileSync2, renameSync as renameSync4, unlinkSync as unlinkSync4, openSync, fsyncSync, closeSync } from "fs";
 import { join as join9 } from "path";
 import { homedir as homedir9 } from "os";
-import { spawnSync as spawnSync3 } from "child_process";
+import { spawnSync as spawnSync4 } from "child_process";
 function writePluginFiles() {
   for (const c of CHANNELS) {
     mkdirSync9(c.sessionDir, { recursive: true });
@@ -7402,7 +7644,7 @@ function writePluginFiles() {
 }
 function runBunInstall() {
   for (const c of CHANNELS) {
-    const r = spawnSync3("bun", ["install", "--silent"], {
+    const r = spawnSync4("bun", ["install", "--silent"], {
       cwd: c.sessionDir,
       encoding: "utf-8",
       timeout: 12e4
@@ -7518,15 +7760,15 @@ function patchClaudeJson() {
   });
 }
 function installLocalCC() {
-  let bunCheck = spawnSync3("bun", ["--version"], { encoding: "utf-8" });
+  let bunCheck = spawnSync4("bun", ["--version"], { encoding: "utf-8" });
   if (bunCheck.status !== 0) {
     if (process.platform === "darwin") {
       console.log("  Installing bun via brew...");
-      const brewR = spawnSync3("brew", ["install", "oven-sh/bun/bun"], { encoding: "utf-8", stdio: "inherit", timeout: 12e4 });
+      const brewR = spawnSync4("brew", ["install", "oven-sh/bun/bun"], { encoding: "utf-8", stdio: "inherit", timeout: 12e4 });
       if (brewR.status !== 0) {
         throw new LocalCCInstallError("bun auto-install failed. Install manually: curl -fsSL https://bun.sh/install | bash");
       }
-      bunCheck = spawnSync3("bun", ["--version"], { encoding: "utf-8" });
+      bunCheck = spawnSync4("bun", ["--version"], { encoding: "utf-8" });
       if (bunCheck.status !== 0) {
         throw new LocalCCInstallError("bun installed but not found on PATH. Restart your terminal and re-run install.");
       }
@@ -7872,7 +8114,7 @@ __export(disconnect_exports, {
 import { existsSync as existsSync11, rmSync, readdirSync as readdirSync3 } from "fs";
 import { homedir as homedir10 } from "os";
 import { join as join10 } from "path";
-import { spawnSync as spawnSync4 } from "child_process";
+import { spawnSync as spawnSync5 } from "child_process";
 import { createInterface as createInterface4 } from "readline";
 async function tearDownLocalCC() {
   const docker = dockerStatus();
@@ -7886,7 +8128,7 @@ async function tearDownLocalCC() {
   console.log("\u2713 removed synkro-server container");
   try {
     const image = imageTag();
-    const r = spawnSync4("docker", ["rmi", "-f", image], { encoding: "utf-8", timeout: 3e4 });
+    const r = spawnSync5("docker", ["rmi", "-f", image], { encoding: "utf-8", timeout: 3e4 });
     console.log(r.status === 0 ? `\u2713 removed Docker image ${image}` : "\xB7 no Docker image to remove");
   } catch {
   }
@@ -7989,7 +8231,7 @@ var init_disconnect = __esm({
 
 // cli/local-cc/turnLog.ts
 import { appendFileSync, existsSync as existsSync12, mkdirSync as mkdirSync10, openSync as openSync2, readFileSync as readFileSync9, readSync, closeSync as closeSync2, statSync as statSync2, watchFile, unwatchFile } from "fs";
-import { dirname as dirname5, join as join11 } from "path";
+import { dirname as dirname6, join as join11 } from "path";
 import { homedir as homedir11 } from "os";
 function truncate(s, max = PREVIEW_MAX) {
   if (s.length <= max) return s;
@@ -8010,7 +8252,7 @@ function extractSeverity(result) {
 }
 function appendTurn(args2) {
   try {
-    mkdirSync10(dirname5(TURN_LOG_PATH), { recursive: true });
+    mkdirSync10(dirname6(TURN_LOG_PATH), { recursive: true });
     const entry = {
       ts: new Date(args2.startedAt).toISOString(),
       role: args2.role,
@@ -8046,7 +8288,7 @@ function readRecentTurns(n = 20) {
 }
 function followTurns(onEntry) {
   try {
-    mkdirSync10(dirname5(TURN_LOG_PATH), { recursive: true });
+    mkdirSync10(dirname6(TURN_LOG_PATH), { recursive: true });
     if (!existsSync12(TURN_LOG_PATH)) {
       appendFileSync(TURN_LOG_PATH, "", "utf-8");
     }
@@ -8258,19 +8500,19 @@ var init_grade = __esm({
 });
 
 // cli/local-cc/pueue.ts
-import { execFileSync, spawnSync as spawnSync5, spawn } from "child_process";
+import { execFileSync, spawnSync as spawnSync6, spawn } from "child_process";
 import { homedir as homedir12 } from "os";
 import { join as join12 } from "path";
 import { connect as connect2 } from "net";
 function pueueAvailable() {
-  const r = spawnSync5("pueue", ["--version"], { encoding: "utf-8" });
+  const r = spawnSync6("pueue", ["--version"], { encoding: "utf-8" });
   if (r.status !== 0) {
     throw new PueueError("pueue CLI not found on PATH. Install pueue (https://github.com/Nukesor/pueue) and start `pueued`.");
   }
 }
 function statusJson() {
   pueueAvailable();
-  const r = spawnSync5("pueue", ["status", "--json"], { encoding: "utf-8" });
+  const r = spawnSync6("pueue", ["status", "--json"], { encoding: "utf-8" });
   if (r.status !== 0) {
     throw new PueueError(`pueue status failed: ${r.stderr || r.stdout || "unknown error"} \u2014 is pueued running?`);
   }
@@ -8315,15 +8557,15 @@ function startTask(opts = {}) {
   let existing = findTask(ch);
   while (existing) {
     if (existing.status === "Running" || existing.status === "Queued") {
-      spawnSync5("tmux", ["kill-session", "-t", `=${ch.tmuxSession}`], { encoding: "utf-8" });
-      spawnSync5("pueue", ["kill", String(existing.id)], { encoding: "utf-8" });
+      spawnSync6("tmux", ["kill-session", "-t", `=${ch.tmuxSession}`], { encoding: "utf-8" });
+      spawnSync6("pueue", ["kill", String(existing.id)], { encoding: "utf-8" });
       for (let i = 0; i < 10; i++) {
         const check = findTask(ch);
         if (!check || check.id !== existing.id || check.status !== "Running" && check.status !== "Queued") break;
-        spawnSync5("sleep", ["0.5"], { encoding: "utf-8" });
+        spawnSync6("sleep", ["0.5"], { encoding: "utf-8" });
       }
     }
-    spawnSync5("pueue", ["remove", String(existing.id)], { encoding: "utf-8" });
+    spawnSync6("pueue", ["remove", String(existing.id)], { encoding: "utf-8" });
     existing = findTask(ch);
   }
   const runScript = join12(cwd, "run-claude.sh");
@@ -8337,7 +8579,7 @@ function startTask(opts = {}) {
     "bash",
     runScript
   ];
-  const r = spawnSync5("pueue", args2, { encoding: "utf-8" });
+  const r = spawnSync6("pueue", args2, { encoding: "utf-8" });
   if (r.status !== 0) {
     throw new PueueError(`pueue add failed: ${r.stderr || r.stdout}`);
   }
@@ -8348,25 +8590,25 @@ function startTask(opts = {}) {
   return created;
 }
 function stopTask(channel = CHANNEL_PRIMARY) {
-  spawnSync5("tmux", ["kill-session", "-t", `=${channel.tmuxSession}`], { encoding: "utf-8" });
+  spawnSync6("tmux", ["kill-session", "-t", `=${channel.tmuxSession}`], { encoding: "utf-8" });
   let t = findTask(channel);
   while (t) {
     if (t.status === "Running" || t.status === "Queued") {
-      spawnSync5("pueue", ["kill", String(t.id)], { encoding: "utf-8" });
+      spawnSync6("pueue", ["kill", String(t.id)], { encoding: "utf-8" });
       for (let i = 0; i < 10; i++) {
         const check = findTask(channel);
         if (!check || check.id !== t.id || check.status !== "Running" && check.status !== "Queued") break;
-        spawnSync5("sleep", ["0.5"], { encoding: "utf-8" });
+        spawnSync6("sleep", ["0.5"], { encoding: "utf-8" });
       }
     }
-    spawnSync5("pueue", ["remove", String(t.id)], { encoding: "utf-8" });
+    spawnSync6("pueue", ["remove", String(t.id)], { encoding: "utf-8" });
     t = findTask(channel);
   }
 }
 function tailLogs(lines = 80, channel = CHANNEL_PRIMARY) {
   const t = findTask(channel);
   if (!t) return `(no ${channel.taskLabel} task)`;
-  const r = spawnSync5("pueue", ["log", "--lines", String(lines), String(t.id)], { encoding: "utf-8" });
+  const r = spawnSync6("pueue", ["log", "--lines", String(lines), String(t.id)], { encoding: "utf-8" });
   return r.stdout || r.stderr || "(no output)";
 }
 function ensureRunning(opts = {}) {
@@ -8391,8 +8633,8 @@ function probePort(host, port, timeoutMs = 500) {
   });
 }
 function tmuxDismissPrompts(tmuxSession = TMUX_SESSION) {
-  spawnSync5("tmux", ["send-keys", "-t", tmuxSession, "1"], { encoding: "utf-8" });
-  spawnSync5("tmux", ["send-keys", "-t", tmuxSession, "Enter"], { encoding: "utf-8" });
+  spawnSync6("tmux", ["send-keys", "-t", tmuxSession, "1"], { encoding: "utf-8" });
+  spawnSync6("tmux", ["send-keys", "-t", tmuxSession, "Enter"], { encoding: "utf-8" });
 }
 async function waitForChannelReady(port, timeoutMs = 6e4, host = "127.0.0.1", tmuxSession = TMUX_SESSION) {
   const deadline = Date.now() + timeoutMs;
@@ -8404,46 +8646,46 @@ async function waitForChannelReady(port, timeoutMs = 6e4, host = "127.0.0.1", tm
   return probePort(host, port);
 }
 function brewInstall(pkg) {
-  const brew = spawnSync5("brew", ["--version"], { encoding: "utf-8" });
+  const brew = spawnSync6("brew", ["--version"], { encoding: "utf-8" });
   if (brew.status !== 0) return false;
   console.log(`  Installing ${pkg} via brew...`);
-  const r = spawnSync5("brew", ["install", pkg], { encoding: "utf-8", stdio: "inherit", timeout: 12e4 });
+  const r = spawnSync6("brew", ["install", pkg], { encoding: "utf-8", stdio: "inherit", timeout: 12e4 });
   return r.status === 0;
 }
 function assertPueueInstalled() {
-  let r = spawnSync5("pueue", ["--version"], { encoding: "utf-8" });
+  let r = spawnSync6("pueue", ["--version"], { encoding: "utf-8" });
   if (r.status !== 0) {
     if (process.platform === "darwin" && brewInstall("pueue")) {
-      r = spawnSync5("pueue", ["--version"], { encoding: "utf-8" });
+      r = spawnSync6("pueue", ["--version"], { encoding: "utf-8" });
       if (r.status !== 0) throw new PueueError("pueue install succeeded but binary not found on PATH.");
     } else {
       throw new PueueError("pueue not found. Install it: brew install pueue (macOS) or https://github.com/Nukesor/pueue");
     }
   }
-  const status = spawnSync5("pueue", ["status", "--json"], { encoding: "utf-8", timeout: 5e3 });
+  const status = spawnSync6("pueue", ["status", "--json"], { encoding: "utf-8", timeout: 5e3 });
   if (status.status !== 0) {
     console.log("  Starting pueued daemon...");
     const child = spawn("pueued", ["-d"], { stdio: "ignore", detached: true });
     child.unref();
-    spawnSync5("sleep", ["1"]);
-    const retry = spawnSync5("pueue", ["status", "--json"], { encoding: "utf-8", timeout: 5e3 });
+    spawnSync6("sleep", ["1"]);
+    const retry = spawnSync6("pueue", ["status", "--json"], { encoding: "utf-8", timeout: 5e3 });
     if (retry.status !== 0) {
       throw new PueueError("pueue daemon not reachable after starting pueued. Check `pueued` manually.");
     }
   }
-  spawnSync5("pueue", ["parallel", "2"], { encoding: "utf-8" });
+  spawnSync6("pueue", ["parallel", "2"], { encoding: "utf-8" });
 }
 function assertClaudeInstalled() {
-  const r = spawnSync5("claude", ["--version"], { encoding: "utf-8" });
+  const r = spawnSync6("claude", ["--version"], { encoding: "utf-8" });
   if (r.status !== 0) {
     throw new PueueError("claude CLI not found on PATH. Install Claude Code first: https://docs.claude.com/claude-code");
   }
 }
 function assertTmuxInstalled() {
-  let r = spawnSync5("tmux", ["-V"], { encoding: "utf-8" });
+  let r = spawnSync6("tmux", ["-V"], { encoding: "utf-8" });
   if (r.status !== 0) {
     if (process.platform === "darwin" && brewInstall("tmux")) {
-      r = spawnSync5("tmux", ["-V"], { encoding: "utf-8" });
+      r = spawnSync6("tmux", ["-V"], { encoding: "utf-8" });
       if (r.status !== 0) throw new PueueError("tmux install succeeded but binary not found on PATH.");
     } else {
       throw new PueueError("tmux not found. Install it: brew install tmux (macOS) or apt install tmux (Linux)");
@@ -8502,7 +8744,7 @@ var localCc_exports = {};
 __export(localCc_exports, {
   localCcCommand: () => localCcCommand
 });
-import { spawnSync as spawnSync6 } from "child_process";
+import { spawnSync as spawnSync7 } from "child_process";
 import { homedir as homedir14 } from "os";
 import { join as join14 } from "path";
 import { readFileSync as fsReadFileSync, existsSync as fsExistsSync } from "fs";
@@ -8683,7 +8925,7 @@ async function cmdStatus() {
   }
   const ch1Up = await isChannelAvailable();
   console.log(`Channel 1 ${CHANNEL_HOST}:${CHANNEL_PORT}: ${ch1Up ? "reachable" : "unreachable"}`);
-  const tmux1 = spawnSync6("tmux", ["has-session", "-t", `=${TMUX_SESSION_NAME}`], { encoding: "utf-8" });
+  const tmux1 = spawnSync7("tmux", ["has-session", "-t", `=${TMUX_SESSION_NAME}`], { encoding: "utf-8" });
   console.log(`tmux '${TMUX_SESSION_NAME}': ${tmux1.status === 0 ? "live" : "absent"}`);
   const t2 = findTask(CHANNEL_SECONDARY);
   if (!t2) {
@@ -8693,7 +8935,7 @@ async function cmdStatus() {
   }
   const ch2Up = await isChannelAvailable(CHANNEL_2_PORT);
   console.log(`Channel 2 ${CHANNEL_HOST}:${CHANNEL_2_PORT}: ${ch2Up ? "reachable" : "unreachable"}`);
-  const tmux2 = spawnSync6("tmux", ["has-session", "-t", `=${TMUX_SESSION_NAME_2}`], { encoding: "utf-8" });
+  const tmux2 = spawnSync7("tmux", ["has-session", "-t", `=${TMUX_SESSION_NAME_2}`], { encoding: "utf-8" });
   console.log(`tmux '${TMUX_SESSION_NAME_2}': ${tmux2.status === 0 ? "live" : "absent"}`);
 }
 async function cmdEnable() {
@@ -8882,7 +9124,7 @@ function cmdLogs(rest) {
       }
       return "200";
     })();
-    spawnSync6("docker", ["logs", "--tail", tailArg, ...followFlag, "synkro-server"], { stdio: "inherit" });
+    spawnSync7("docker", ["logs", "--tail", tailArg, ...followFlag, "synkro-server"], { stdio: "inherit" });
     return;
   }
   for (const arg of rest) {
@@ -8930,7 +9172,7 @@ function cmdLogs(rest) {
 function cmdAttach(rest) {
   assertTmuxInstalled();
   const readonly = rest.some((a) => a === "--readonly" || a === "-r");
-  const has = spawnSync6("tmux", ["has-session", "-t", `=${TMUX_SESSION_NAME}`], { encoding: "utf-8" });
+  const has = spawnSync7("tmux", ["has-session", "-t", `=${TMUX_SESSION_NAME}`], { encoding: "utf-8" });
   if (has.status !== 0) {
     console.error(`No tmux session '${TMUX_SESSION_NAME}' running. Start it with: synkro local-cc start`);
     process.exit(1);
@@ -8943,7 +9185,7 @@ function cmdAttach(rest) {
   console.log("Detach with Ctrl-B then D. (Do not press Ctrl-C \u2014 that would interrupt claude.)");
   console.log();
   const args2 = readonly ? ["attach-session", "-r", "-t", TMUX_SESSION_NAME] : ["attach-session", "-t", TMUX_SESSION_NAME];
-  const r = spawnSync6("tmux", args2, { stdio: "inherit" });
+  const r = spawnSync7("tmux", args2, { stdio: "inherit" });
   process.exit(r.status ?? 0);
 }
 async function cmdTest() {
@@ -9318,7 +9560,7 @@ var args = process.argv.slice(2);
 var cmd = args[0] || "";
 var subArgs = args.slice(1);
 function printVersion() {
-  console.log("1.6.19");
+  console.log("1.6.21");
 }
 function printHelp2() {
   console.log(`Synkro CLI \u2014 runtime safety for AI coding agents