@synkro-sh/cli 1.6.52 → 1.6.53

package/dist/bootstrap.js

@@ -193,6 +193,19 @@ function installCCHooks(settingsPath, config) {
     ],
     [SYNKRO_MARKER]: true
   });
+  if (config.taskActivateIntentScriptPath) {
+    settings.hooks.PreToolUse.push({
+      matcher: "mcp__synkro-guardrails__activate_standard",
+      hooks: [
+        {
+          type: "command",
+          command: config.taskActivateIntentScriptPath,
+          timeout: 5
+        }
+      ],
+      [SYNKRO_MARKER]: true
+    });
+  }
   settings.hooks.PostToolUse.push({
     matcher: "Bash",
     hooks: [
@@ -807,7 +820,7 @@ synkro_post_with_retry() {
 function stubHook(surface, optsLiteral) {
   return "#!/usr/bin/env bun\nimport { runStub } from './_synkro-stub-common.ts';\nrunStub(" + JSON.stringify(surface) + ", " + optsLiteral + ");\n";
 }
-var SYNKRO_COMMON_TS, EDIT_PRECHECK_TS, CWE_PRECHECK_TS, CVE_PRECHECK_TS, INSTALL_SCAN_TS, BASH_JUDGE_TS, AGENT_JUDGE_TS, PLAN_JUDGE_TS, STOP_SUMMARY_TS, SESSION_START_TS, BASH_FOLLOWUP_TS, TRANSCRIPT_SYNC_TS, USER_PROMPT_SUBMIT_TS, CURSOR_BASH_JUDGE_TS, CURSOR_EDIT_CAPTURE_TS, CURSOR_AGENT_CAPTURE_TS, STUB_COMMON_TS, STUB_EDIT_PRECHECK_TS, STUB_CWE_PRECHECK_TS, STUB_CVE_PRECHECK_TS, STUB_BASH_JUDGE_TS, STUB_INSTALL_SCAN_TS, STUB_AGENT_JUDGE_TS, STUB_PLAN_JUDGE_TS, STUB_STOP_SUMMARY_TS, STUB_SESSION_START_TS, STUB_TRANSCRIPT_SYNC_TS, STUB_USER_PROMPT_SUBMIT_TS, STUB_BASH_FOLLOWUP_TS, STUB_CURSOR_BASH_JUDGE_TS, STUB_CURSOR_EDIT_CAPTURE_TS, STUB_CURSOR_AGENT_CAPTURE_TS;
+var SYNKRO_COMMON_TS, EDIT_PRECHECK_TS, CWE_PRECHECK_TS, CVE_PRECHECK_TS, INSTALL_SCAN_TS, BASH_JUDGE_TS, AGENT_JUDGE_TS, PLAN_JUDGE_TS, STOP_SUMMARY_TS, SESSION_START_TS, BASH_FOLLOWUP_TS, TRANSCRIPT_SYNC_TS, USER_PROMPT_SUBMIT_TS, CURSOR_BASH_JUDGE_TS, CURSOR_EDIT_CAPTURE_TS, CURSOR_AGENT_CAPTURE_TS, STUB_COMMON_TS, STUB_EDIT_PRECHECK_TS, STUB_CWE_PRECHECK_TS, STUB_CVE_PRECHECK_TS, STUB_BASH_JUDGE_TS, STUB_INSTALL_SCAN_TS, STUB_AGENT_JUDGE_TS, STUB_PLAN_JUDGE_TS, STUB_STOP_SUMMARY_TS, STUB_SESSION_START_TS, STUB_TRANSCRIPT_SYNC_TS, STUB_USER_PROMPT_SUBMIT_TS, STUB_BASH_FOLLOWUP_TS, STUB_TASK_ACTIVATE_INTENT_TS, STUB_CURSOR_BASH_JUDGE_TS, STUB_CURSOR_EDIT_CAPTURE_TS, STUB_CURSOR_AGENT_CAPTURE_TS;
 var init_hookScriptsTs = __esm({
   "cli/installer/hookScriptsTs.ts"() {
     "use strict";
@@ -1167,7 +1180,7 @@ export function findGitRoot(cwd: string): string {
   } catch { return ''; }
 }
 
-// \u2500\u2500\u2500 .synkro file \u2500\u2500\u2500
+// \u2500\u2500\u2500 synkro.toml file \u2500\u2500\u2500
 
 export interface SynkroFileConfig {
   version: number;
@@ -1189,51 +1202,49 @@ const SYNKRO_FILE_DEFAULTS: SynkroFileConfig = {
   scanning: { cwe: true, cve: true },
 };
 
-function parseSynkroYaml(raw: string): Record<string, any> {
+// Coerce a single TOML value token to JS.
+function parseTomlValue(raw: string): any {
+  const v = raw.trim();
+  if (v.startsWith('[') && v.endsWith(']')) {
+    const inner = v.slice(1, -1).trim();
+    if (!inner) return [];
+    return inner.split(',').map((s: string) => parseTomlValue(s)).filter((s: any) => s !== '');
+  }
+  if ((v.startsWith('"') && v.endsWith('"')) || (v.startsWith("'") && v.endsWith("'"))) return v.slice(1, -1);
+  if (v === 'true') return true;
+  if (v === 'false') return false;
+  if (/^-?\\d+$/.test(v)) return parseInt(v, 10);
+  return v;
+}
+
+// Minimal TOML reader for synkro.toml's fixed schema (top-level scalars/arrays
+// + [grader]/[scanning] tables). Dependency-free \u2014 this runs inside the
+// materialized _synkro-common.ts which has no node_modules. Returns the same
+// nested-object shape the old YAML parser did.
+function parseSynkroToml(raw: string): Record<string, any> {
   const result: Record<string, any> = {};
-  const lines = raw.split('\\n');
-  let currentKey = '';
-  let currentObj: Record<string, any> | null = null;
-  let currentArr: string[] | null = null;
-
-  for (const line of lines) {
-    if (!line.trim() || line.trim().startsWith('#')) continue;
-
-    if (line.match(/^\\S/) && line.includes(':')) {
-      if (currentObj && currentKey) result[currentKey] = currentObj;
-      if (currentArr && currentKey) result[currentKey] = currentArr;
-      currentObj = null;
-      currentArr = null;
-
-      const colonIdx = line.indexOf(':');
-      const key = line.slice(0, colonIdx).trim();
-      const val = line.slice(colonIdx + 1).trim();
-      currentKey = key;
-
-      if (val) {
-        if (val === '[]') result[key] = [];
-        else if (val === 'true') result[key] = true;
-        else if (val === 'false') result[key] = false;
-        else if (/^\\d+$/.test(val)) result[key] = parseInt(val, 10);
-        else result[key] = val;
-        currentKey = '';
-      }
-    } else if (line.match(/^  - /)) {
-      if (!currentArr) currentArr = [];
-      currentArr.push(line.replace(/^  - /, '').trim());
-    } else if (line.match(/^  \\S/) && line.includes(':')) {
-      if (!currentObj) currentObj = {};
-      const colonIdx = line.indexOf(':');
-      const k = line.slice(0, colonIdx).trim();
-      const v = line.slice(colonIdx + 1).trim();
-      if (v === 'true') currentObj[k] = true;
-      else if (v === 'false') currentObj[k] = false;
-      else if (/^\\d+$/.test(v)) currentObj[k] = parseInt(v, 10);
-      else currentObj[k] = v;
-    }
-  }
-  if (currentObj && currentKey) result[currentKey] = currentObj;
-  if (currentArr && currentKey) result[currentKey] = currentArr;
+  let section: string | null = null;
+  for (const rawLine of raw.split('\\n')) {
+    const line = rawLine.trim();
+    if (!line || line.startsWith('#')) continue;
+    const sec = line.match(/^\\[([^\\]]+)\\]$/);
+    if (sec) {
+      section = sec[1].trim();
+      if (!result[section]) result[section] = {};
+      continue;
+    }
+    const eq = line.indexOf('=');
+    if (eq === -1) continue;
+    const key = line.slice(0, eq).trim().replace(/^["']|["']$/g, '');
+    let valRaw = line.slice(eq + 1).trim();
+    if (!valRaw.startsWith('"') && !valRaw.startsWith("'") && !valRaw.startsWith('[')) {
+      const h = valRaw.indexOf('#');
+      if (h !== -1) valRaw = valRaw.slice(0, h).trim();
+    }
+    const value = parseTomlValue(valRaw);
+    if (section) (result[section] as Record<string, any>)[key] = value;
+    else result[key] = value;
+  }
   return result;
 }
 
@@ -1266,11 +1277,11 @@ export function loadSynkroFile(cwd?: string): SynkroFileConfig {
   if (_synkroFileCache) return _synkroFileCache;
   const root = cwd ? findGitRoot(cwd) : '';
   if (!root) { _synkroFileCache = SYNKRO_FILE_DEFAULTS; return _synkroFileCache; }
-  const fp = root + '/.synkro';
+  const fp = root + '/synkro.toml';
   try {
     if (!existsSync(fp)) { _synkroFileCache = SYNKRO_FILE_DEFAULTS; return _synkroFileCache; }
     const raw = readFileSync(fp, 'utf-8');
-    const parsed = raw.trimStart().startsWith('{') ? JSON.parse(raw) : parseSynkroYaml(raw);
+    const parsed = parseSynkroToml(raw);
     const validHarness = ['claude-code', 'cursor'] as const;
     const harness = Array.isArray(parsed.harness)
       ? parsed.harness.filter((h: string) => validHarness.includes(h as any))
@@ -1309,13 +1320,13 @@ export function effectiveGraderPool(synkroFile: SynkroFileConfig, hookAgentKind:
   return 'cursor';
 }
 
-// \u2500\u2500\u2500 .synkro presence (per-repo onboarding) \u2500\u2500\u2500
-// A repo is "onboarded" to Synkro when it has a .synkro file at its git root.
-// The hooks are installed globally, so they fire in every repo \u2014 including ones
-// the user never set up. Without a .synkro there, grading is SKIPPED gracefully
-// rather than attempting a grade that surfaces a confusing "grader unavailable"
-// error: the tool call passes through and we show a one-time hint pointing at
-// "synkro install".
+// \u2500\u2500\u2500 synkro.toml presence (per-repo onboarding) \u2500\u2500\u2500
+// A repo is "onboarded" to Synkro when it has a synkro.toml file at its git
+// root. The hooks are installed globally, so they fire in every repo \u2014
+// including ones the user never set up. Without a synkro.toml there, grading is
+// SKIPPED gracefully rather than attempting a grade that surfaces a confusing
+// "grader unavailable" error: the tool call passes through and we show a
+// one-time hint pointing at "synkro install".
 export function synkroFilePresent(cwd?: string): boolean {
   try {
     const root = cwd ? findGitRoot(cwd) : '';
@@ -1325,18 +1336,17 @@ export function synkroFilePresent(cwd?: string): boolean {
     // under ~), never treat it as onboarded \u2014 otherwise grading fires in every
     // directory under home.
     if (root === HOME) return false;
-    // A repo is onboarded ONLY via a regular .synkro FILE at its root. statSync +
-    // isFile is required because existsSync also matches a DIRECTORY named
-    // .synkro (exactly what ~/.synkro is) \u2014 the root cause of grading running in
-    // repos that have no .synkro file.
-    return statSync(root + '/.synkro').isFile();
+    // A repo is onboarded ONLY via a regular synkro.toml FILE at its root.
+    // statSync + isFile guards against a directory of that name being mistaken
+    // for config.
+    return statSync(root + '/synkro.toml').isFile();
   } catch { return false; }
 }
 
 const NO_SYNKRO_HINT_DIR = join(HOME, '.synkro', '.no-synkro-hint');
 
 // Returns the onboarding hint the FIRST time a session touches a repo with no
-// .synkro file, then null on subsequent calls so it doesn't repeat on every
+// synkro.toml file, then null on subsequent calls so it doesn't repeat on every
 // tool call. Caller passes null straight through to outputEmpty().
 export function noSynkroSkipMessage(sessionId: string): string | null {
   try {
@@ -1348,7 +1358,7 @@ export function noSynkroSkipMessage(sessionId: string): string | null {
   } catch {
     // best-effort dedup \u2014 if the marker can't be written, still show the hint
   }
-  return '[synkro] No .synkro config in this repo \u2014 grading skipped. Run \`synkro install\` here to enable Synkro.';
+  return '[synkro] No synkro.toml config in this repo \u2014 grading skipped. Run \`synkro install\` here to enable Synkro.';
 }
 
 // \u2500\u2500\u2500 Channel Health \u2500\u2500\u2500
@@ -2056,6 +2066,7 @@ export function dispatchCapture(
     ccModel?: string;
     linesAdded?: number;
     linesRemoved?: number;
+    codeChange?: string;
   },
 ): void {
   // Fire-and-forget
@@ -2091,6 +2102,7 @@ export function dispatchCapture(
     if (opts.recentUserMessages) localBody.recent_user_messages = opts.recentUserMessages;
     if (opts.linesAdded != null) localBody.lines_added = opts.linesAdded;
     if (opts.linesRemoved != null) localBody.lines_removed = opts.linesRemoved;
+    if (opts.codeChange) localBody.code_change = opts.codeChange;
   }
   appendLocalTelemetry(localBody);
 
@@ -2102,6 +2114,9 @@ export function dispatchCapture(
     if (opts.rulesChecked) body.rules_checked = opts.rulesChecked;
     if (opts.violatedRules) body.violated_rules = opts.violatedRules;
     if (opts.recentUserMessages) body.recent_user_messages = opts.recentUserMessages;
+    if (opts.linesAdded != null) body.lines_added = opts.linesAdded;
+    if (opts.linesRemoved != null) body.lines_removed = opts.linesRemoved;
+    if (opts.codeChange) body.code_change = opts.codeChange;
   }
   shipCloud(jwt, '/api/v1/hook/capture', body);
 }
@@ -3142,6 +3157,8 @@ export type ScanFindingInput = {
   aliases?: string[];
   references?: Array<{ type: string; url: string }>;
   cwe_name?: string;
+  code_snippet?: string;
+  offending_lines?: string;
 };
 
 /** Persist open scan_findings rows for a block and flush the telemetry spool. */
@@ -3159,12 +3176,39 @@ export function emitBlockScanFindings(
       file_path: ctx.file_path,
       repo: ctx.repo,
       status: 'open',
+      // These are BLOCK findings \u2014 Synkro denied the action, nothing landed.
+      // prevented \u2192 recorded as auto-resolved on the server.
+      prevented: true,
       ...f,
     }, captureDepth);
   }
   if (rows.length > 0) drainSpool().catch(() => {});
 }
 
+/**
+ * Derive a 1-based file line range ("42" or "42-45") for a grader-reported
+ * offending snippet by locating it verbatim in the reconstructed file. Mirrors
+ * the container scanner's locateSnippetLines so cloud + local storage record
+ * the same lines. Returns undefined when the snippet can't be located.
+ */
+export function cweSnippetLines(haystack: string, snippet?: string): string | undefined {
+  if (!haystack || !snippet) return undefined;
+  const trimmed = snippet.replace(/^\\n+|\\n+$/g, '');
+  if (!trimmed) return undefined;
+  let idx = haystack.indexOf(trimmed);
+  let spanLines = trimmed.split('\\n').length;
+  if (idx < 0) {
+    const firstLine = trimmed.split('\\n').map((l) => l.trim()).find(Boolean);
+    if (!firstLine) return undefined;
+    idx = haystack.indexOf(firstLine);
+    if (idx < 0) return undefined;
+    spanLines = 1;
+  }
+  const startLine = haystack.slice(0, idx).split('\\n').length;
+  const endLine = startLine + spanLines - 1;
+  return endLine > startLine ? startLine + '-' + endLine : String(startLine);
+}
+
 export function dispatchFinding(
   jwt: string,
   finding: {
@@ -3183,6 +3227,9 @@ export function dispatchFinding(
     aliases?: string[];
     references?: Array<{ type: string; url: string }>;
     cwe_name?: string;
+    code_snippet?: string;
+    offending_lines?: string;
+    prevented?: boolean;
   },
   captureDepth: string,
 ): void {
@@ -3209,6 +3256,9 @@ export function dispatchFinding(
     cwe_name: finding.cwe_name,
     detail: finding.detail,
     description: finding.description,
+    code_snippet: finding.code_snippet,
+    offending_lines: finding.offending_lines,
+    prevented: finding.prevented,
   };
   shipCloud(jwt, '/api/v1/hook/finding', cloudBody);
 }
@@ -3339,7 +3389,7 @@ export function graderUnavailableMessage(hook: string, target: string, errorMess
   }
   if (isGraderNotConfigured(errorMessage)) {
     const agent = agentKind === 'cursor' ? 'Cursor' : 'Claude Code';
-    return hook + ' ' + target + ' \u2192 local grader not configured for ' + agent + '. Add this agent to your .synkro file and run \`synkro install\`.';
+    return hook + ' ' + target + ' \u2192 local grader not configured for ' + agent + '. Add this agent to your synkro.toml file and run \`synkro install\`.';
   }
   return hook + ' ' + target + ' \u2192 local grader unavailable, skipped';
 }
@@ -3689,7 +3739,7 @@ import {
   loadJwt, ensureFreshJwt, detectRepo, loadConfig, cweRoute, tag,
   localGradeCwe, parseVerdict, reconstructContent, readStdin, log,
   outputJson, outputEmpty, setupCursorHookSignals, installHookWatchdog, isEditTool, isShellTool, isCursorHookFormat,
-  extractShellCodeWrites, hookSessionId, filePathFromToolInput, emitBlockScanFindings, dispatchFinding, dispatchCapture, GATEWAY_URL,
+  extractShellCodeWrites, hookSessionId, filePathFromToolInput, emitBlockScanFindings, cweSnippetLines, dispatchFinding, dispatchCapture, GATEWAY_URL,
   logGraderUnavailable, graderUnavailableMessage, resolveTranscriptPath, isCursorInvokingCcHook,
   loadSynkroFile, effectiveGraderPool, synkroFilePresent, noSynkroSkipMessage,
 } from './_synkro-common.ts';
@@ -3725,6 +3775,8 @@ interface CweScanTarget {
   cweDiffSection: string;
   toolName: string;
   toolInput: any;
+  /** Full reconstructed file (or written content) — used to locate snippet line ranges. */
+  proposed: string;
 }
 
 const JS_DANGEROUS_MODULES = new Set([
@@ -3867,6 +3919,7 @@ async function main() {
           cweDiffSection: '',
           toolName: toolName || 'Shell',
           toolInput: {},
+          proposed: w.content,
         });
       }
       if (targets.length === 0) { outputEmpty(); return; }
@@ -3901,7 +3954,7 @@ async function main() {
         cweContent = proposed.slice(0, 4000);
       }
 
-      targets.push({ filePath, cweContent, cweDiffSection, toolName, toolInput });
+      targets.push({ filePath, cweContent, cweDiffSection, toolName, toolInput, proposed });
     } else {
       outputEmpty();
       return;
@@ -3927,6 +3980,7 @@ async function main() {
       const cweDiffSection = scan.cweDiffSection;
       const scanToolName = scan.toolName;
       const scanToolInput = scan.toolInput;
+      const proposedFull = scan.proposed || scan.cweContent;
       const gitRepo = detectRepo(cwd, transcriptPath, filePath, workspaceRoots);
       const fileShort = basename(filePath);
       const fileExt = extname(filePath).toLowerCase();
@@ -4012,12 +4066,15 @@ async function main() {
           { session_id: sessionId, file_path: filePath, repo: gitRepo || undefined },
           activeCweIds.map((cweId) => {
             const f = findings.find((x: any) => x.cwe === cweId);
+            const snippet = f?.code_snippet || undefined;
             return {
               finding_type: 'cwe' as const,
               finding_id: cweId,
               severity: f?.severity || 'high',
               detail: f?.reason || 'code weakness detected',
               cwe_name: f?.name || undefined,
+              code_snippet: snippet,
+              offending_lines: cweSnippetLines(proposedFull, snippet),
             };
           }),
           {
@@ -4147,6 +4204,7 @@ async function main() {
 
       const cweIds: string[] = [];
       const fixes: Record<string, string> = {};
+      const snippets: Record<string, string> = {};
       let mergedReason = '';
       let mergedSeverity = '';
       let mergedCategory = '';
@@ -4169,6 +4227,19 @@ async function main() {
           for (let i = 0; i < Math.min(respIds.length, fMatches.length); i++) {
             if (!fixes[respIds[i]]) fixes[respIds[i]] = fMatches[i].replace(/<\/?suggested_fix>/g, '').trim();
           }
+          // Per-<violation> pass for the verbatim snippet (code may contain '<'),
+          // paired with its rule_id so each finding carries its own offending code.
+          const vBlocks = gradeResp.match(/<violation>[\s\S]*?<\/violation>/g) || [];
+          for (const block of vBlocks.slice(0, 8)) {
+            const bId = block.match(/<rule_id>([^<]+)<\/rule_id>/)?.[1];
+            if (!bId) continue;
+            const id = bId.trim().replace(/^cwe-/i, 'CWE-');
+            const snM = block.match(/<code_snippet>([\s\S]*?)<\/code_snippet>/);
+            if (snM && !snippets[id]) {
+              const snip = snM[1].replace(/^\n+|\n+$/g, '');
+              if (snip.trim()) snippets[id] = snip;
+            }
+          }
         }
       }
 
@@ -4203,13 +4274,18 @@ async function main() {
           jwt,
           config.captureDepth,
           { session_id: sessionId, file_path: filePath, repo: gitRepo || undefined },
-          activeCweIds.map((cweId) => ({
-            finding_type: 'cwe' as const,
-            finding_id: cweId,
-            severity: verdict.severity || 'high',
-            detail: verdict.reason || 'code weakness detected',
-            cwe_name: cweNameMap.get(cweId.toUpperCase()) || undefined,
-          })),
+          activeCweIds.map((cweId) => {
+            const snippet = snippets[cweId] || undefined;
+            return {
+              finding_type: 'cwe' as const,
+              finding_id: cweId,
+              severity: verdict.severity || 'high',
+              detail: verdict.reason || 'code weakness detected',
+              cwe_name: cweNameMap.get(cweId.toUpperCase()) || undefined,
+              code_snippet: snippet,
+              offending_lines: cweSnippetLines(proposedFull, snippet),
+            };
+          }),
           {
             finding_type: 'cwe',
             finding_id: activeCweIds[0] || 'CWE-UNKNOWN',
@@ -5830,7 +5906,7 @@ async function main() {
     const model = rawModel ? (rawModel.startsWith('cursor/') ? rawModel : 'cursor/' + rawModel) : 'cursor';
     const repo = detectRepo(cwd, transcriptPath, command, workspaceRoots);
 
-    // No .synkro at the resolved repo root \u2192 Synkro is dormant here; allow
+    // No synkro.toml at the resolved repo root \u2192 Synkro is dormant here; allow
     // without grading. Keyed off the validated detectRepo() root, not raw cwd.
     if (!repo || !synkroFilePresent(repo)) finishAllow();
 
@@ -6043,7 +6119,7 @@ async function main() {
     const filePath = String(payload.file_path || payload.path || payload.target_file || '');
     if (!filePath) finish();
 
-    // No .synkro at the resolved repo root \u2192 Synkro is dormant here; skip capture.
+    // No synkro.toml at the resolved repo root \u2192 Synkro is dormant here; skip capture.
     const _root = detectRepo((typeof payload.cwd === 'string' && payload.cwd) || dirname(filePath), '', filePath, []);
     if (!_root || !isPathUnder(filePath, _root) || !synkroFilePresent(_root)) finish();
 
@@ -6222,7 +6298,7 @@ function gitRoot(cwd: string): string {
   } catch { return ''; }
 }
 
-// Once-per-session onboarding hint for repos with no .synkro file.
+// Once-per-session onboarding hint for repos with no synkro.toml file.
 function noSynkroHint(sessionId: string): string | null {
   const dir = join(HOME, '.synkro', '.no-synkro-hint');
   try {
@@ -6232,7 +6308,7 @@ function noSynkroHint(sessionId: string): string | null {
     if (existsSync(marker)) return null;
     writeFileSync(marker, '', { flag: 'w' });
   } catch {}
-  return '[synkro] No .synkro config in this repo — grading skipped. Run synkro install here to enable Synkro.';
+  return '[synkro] No synkro.toml config in this repo — grading skipped. Run synkro install here to enable Synkro.';
 }
 
 function filePathFromToolInput(ti: any): string {
@@ -6263,13 +6339,13 @@ export async function runStub(surface: string, opts: StubOpts = {}): Promise<voi
     const sessionId = String(payload.session_id || payload.conversation_id || '');
     const root = gitRoot(cwd);
 
-    // Dormancy: a repo is onboarded only if it has a .synkro FILE at its git
+    // Dormancy: a repo is onboarded only if it has a synkro.toml FILE at its git
     // root. Guard root !== HOME — ~/.synkro is the config DIRECTORY, so without
-    // this a home-rooted cwd (dotfiles in git, non-git dir under home) would
-    // "find" the config dir and look onboarded.
+    // this a home-rooted cwd (dotfiles in git, non-git dir under home) could
+    // look onboarded.
     let synkroFileText = '';
-    if (root && root !== HOME && existsSync(join(root, '.synkro'))) {
-      try { synkroFileText = readFileSync(join(root, '.synkro'), 'utf-8'); } catch {}
+    if (root && root !== HOME && existsSync(join(root, 'synkro.toml'))) {
+      try { synkroFileText = readFileSync(join(root, 'synkro.toml'), 'utf-8'); } catch {}
     }
     if (!synkroFileText) {
       if (opts.telemetry) { out(failOpen(harness)); return; }
@@ -6303,16 +6379,32 @@ export async function runStub(surface: string, opts: StubOpts = {}): Promise<voi
       envelope.planText = String(ti.plan || ti.content || payload.plan || '');
     }
 
-    const timeoutMs = opts.telemetry ? 6000 : 28000;
+    // bash-followup is telemetry, but it can carry the INLINE "task complete ✓ N/N"
+    // result (the server waits up to 30s for the completion grade), so it needs a
+    // wait above that budget — not the 6s telemetry default — or the stub abandons
+    // the request before the result lands and the completion shows up a hook late.
+    const timeoutMs = surface === 'bash-followup' ? 32000 : (opts.telemetry ? 6000 : 28000);
     const url = 'http://127.0.0.1:' + PORT + '/api/scan/' + surface + (harness === 'cursor' ? '?harness=cursor' : '');
-    const resp = await fetch(url, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json', Authorization: 'Bearer ' + loadMcpJwt() },
-      body: JSON.stringify(envelope),
-      signal: AbortSignal.timeout(timeoutMs),
-    });
-    const text = await resp.text();
-    out(resp.ok ? (text.trim() || failOpen(harness)) : failOpen(harness));
+    const body = JSON.stringify(envelope);
+    const headers = { 'Content-Type': 'application/json', Authorization: 'Bearer ' + loadMcpJwt() };
+    // Telemetry hooks (bash-followup, transcript-sync, session telemetry) IGNORE the
+    // response and the server processes them DETACHED, so delivery RELIABILITY beats
+    // latency: retry a few times with backoff. Right after a server restart the
+    // event loop can be briefly busy / not-yet-listening and a single POST silently
+    // drops the event (this was the followup flakiness). Double-delivery is safe here
+    // — the server side is idempotent-ish (completion in-flight guard, dup evidence
+    // is harmless). Blocking hooks make ONE attempt: their response IS the verdict
+    // and a retry would double-grade. Normal case: first attempt wins, no delay.
+    const attempts = opts.telemetry ? 3 : 1;
+    let text = '';
+    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)));
+    }
+    out(text || failOpen(harness));
   } catch {
     out(failOpen(harness));
   }
@@ -6325,11 +6417,30 @@ export async function runStub(surface: string, opts: StubOpts = {}): Promise<voi
     STUB_INSTALL_SCAN_TS = stubHook("install-scan", "{ needsTranscript: true }");
     STUB_AGENT_JUDGE_TS = stubHook("agent-judge", "{ needsTranscript: true }");
     STUB_PLAN_JUDGE_TS = stubHook("plan-judge", "{ needsPlan: true }");
-    STUB_STOP_SUMMARY_TS = stubHook("stop-summary", "{ needsTranscript: true, fullTranscript: true, telemetry: true }");
+    STUB_STOP_SUMMARY_TS = stubHook("stop-summary", "{ needsTranscript: true, fullTranscript: true }");
     STUB_SESSION_START_TS = stubHook("session-start", "{ telemetry: true }");
     STUB_TRANSCRIPT_SYNC_TS = stubHook("transcript-sync", "{ needsTranscript: true, fullTranscript: true, telemetry: true }");
     STUB_USER_PROMPT_SUBMIT_TS = stubHook("prompt-submit", "{ telemetry: true }");
     STUB_BASH_FOLLOWUP_TS = stubHook("bash-followup", "{ telemetry: true }");
+    STUB_TASK_ACTIVATE_INTENT_TS = `#!/usr/bin/env bun
+import { readFileSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+const PORT = process.env.SYNKRO_MCP_PORT || '18931';
+function mcpJwt(): string { try { return readFileSync(join(homedir(), '.synkro', '.mcp-jwt'), 'utf-8').trim(); } catch { return ''; } }
+const chunks: Buffer[] = [];
+for await (const chunk of process.stdin) chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+try {
+  const payload = JSON.parse(Buffer.concat(chunks).toString('utf-8') || '{}');
+  await fetch('http://127.0.0.1:' + PORT + '/api/local/task-activate-intent', {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json', Authorization: 'Bearer ' + mcpJwt() },
+    body: JSON.stringify({ session_id: payload.session_id, tool_input: payload.tool_input }),
+    signal: AbortSignal.timeout(5000),
+  });
+} catch {}
+process.stdout.write('{}\\n');
+`;
     STUB_CURSOR_BASH_JUDGE_TS = stubHook("bash-judge", "{ needsTranscript: true, harness: 'cursor' }");
     STUB_CURSOR_EDIT_CAPTURE_TS = stubHook("edit-precheck", "{ needsFile: true, needsTranscript: true, harness: 'cursor' }");
     STUB_CURSOR_AGENT_CAPTURE_TS = stubHook("agent-judge", "{ needsTranscript: true, harness: 'cursor' }");
@@ -7476,7 +7587,7 @@ function resolveGraderPool(parsed) {
       if (np === "claude_code") counts.claude_code = Math.max(0, Math.floor(v));
       else if (np === "cursor") counts.cursor = Math.max(0, Math.floor(v));
       else if (flagUnknown) {
-        warnings.push(`.synkro: ${where}.${k} is not a known provider (use claude-code or cursor) \u2014 ignored`);
+        warnings.push(`synkro.toml: ${where}.${k} is not a known provider (use claude-code or cursor) \u2014 ignored`);
       }
     }
   };
@@ -7487,7 +7598,7 @@ function resolveGraderPool(parsed) {
   if (rawPool != null && rawPool !== "auto") {
     const np = normalizeProvider(String(rawPool));
     if (np) pool = np;
-    else warnings.push(`.synkro: grader.pool="${rawPool}" is not recognized (use auto | claude-code | cursor) \u2014 falling back to auto`);
+    else warnings.push(`synkro.toml: grader.pool="${rawPool}" is not recognized (use auto | claude-code | cursor) \u2014 falling back to auto`);
   }
   if (counts.claude_code != null || counts.cursor != null) {
     return { claudeWorkers: counts.claude_code, cursorWorkers: counts.cursor, pool, warnings };
@@ -7497,57 +7608,52 @@ function resolveGraderPool(parsed) {
 function poolLabel(pool) {
   return pool === "claude_code" ? "claude-code" : pool;
 }
-function parseSynkroYaml(raw) {
+function parseTomlValue(raw) {
+  const v = raw.trim();
+  if (v.startsWith("[") && v.endsWith("]")) {
+    const inner = v.slice(1, -1).trim();
+    if (!inner) return [];
+    return inner.split(",").map((s) => parseTomlValue(s)).filter((s) => s !== "");
+  }
+  if (v.startsWith('"') && v.endsWith('"') || v.startsWith("'") && v.endsWith("'")) return v.slice(1, -1);
+  if (v === "true") return true;
+  if (v === "false") return false;
+  if (/^-?\d+$/.test(v)) return parseInt(v, 10);
+  return v;
+}
+function parseSynkroToml(raw) {
   const result = {};
-  const lines = raw.split("\n");
-  let currentKey = "";
-  let currentObj = null;
-  let currentArr = null;
-  for (const line of lines) {
-    if (!line.trim() || line.trim().startsWith("#")) continue;
-    if (/^\S/.test(line) && line.includes(":")) {
-      if (currentObj && currentKey) result[currentKey] = currentObj;
-      if (currentArr && currentKey) result[currentKey] = currentArr;
-      currentObj = null;
-      currentArr = null;
-      const ci = line.indexOf(":");
-      const key = line.slice(0, ci).trim();
-      const val = line.slice(ci + 1).trim();
-      currentKey = key;
-      if (val) {
-        if (val === "[]") result[key] = [];
-        else if (val === "true") result[key] = true;
-        else if (val === "false") result[key] = false;
-        else if (/^\d+$/.test(val)) result[key] = parseInt(val, 10);
-        else result[key] = val;
-        currentKey = "";
-      }
-    } else if (/^  - /.test(line)) {
-      if (!currentArr) currentArr = [];
-      currentArr.push(line.replace(/^  - /, "").trim());
-    } else if (/^  \S/.test(line) && line.includes(":")) {
-      if (!currentObj) currentObj = {};
-      const ci = line.indexOf(":");
-      const k = line.slice(0, ci).trim();
-      const v = line.slice(ci + 1).trim();
-      if (v === "true") currentObj[k] = true;
-      else if (v === "false") currentObj[k] = false;
-      else if (/^\d+$/.test(v)) currentObj[k] = parseInt(v, 10);
-      else currentObj[k] = v;
-    }
-  }
-  if (currentObj && currentKey) result[currentKey] = currentObj;
-  if (currentArr && currentKey) result[currentKey] = currentArr;
+  let section = null;
+  for (const rawLine of raw.split("\n")) {
+    const line = rawLine.trim();
+    if (!line || line.startsWith("#")) continue;
+    const sec = line.match(/^\[([^\]]+)\]$/);
+    if (sec) {
+      section = sec[1].trim();
+      if (!result[section]) result[section] = {};
+      continue;
+    }
+    const eq = line.indexOf("=");
+    if (eq === -1) continue;
+    const key = line.slice(0, eq).trim().replace(/^["']|["']$/g, "");
+    let valRaw = line.slice(eq + 1).trim();
+    if (!valRaw.startsWith('"') && !valRaw.startsWith("'") && !valRaw.startsWith("[")) {
+      const h = valRaw.indexOf("#");
+      if (h !== -1) valRaw = valRaw.slice(0, h).trim();
+    }
+    const value = parseTomlValue(valRaw);
+    if (section) result[section][key] = value;
+    else result[key] = value;
+  }
   return result;
 }
 function readSynkroFileConfig() {
   try {
     const root = execSync4("git rev-parse --show-toplevel 2>/dev/null", { encoding: "utf-8", timeout: 3e3, stdio: ["pipe", "pipe", "pipe"] }).trim();
     if (!root) return { pool: "auto", warnings: [] };
-    const fp = join6(root, ".synkro");
+    const fp = join6(root, "synkro.toml");
     if (!existsSync8(fp)) return { pool: "auto", warnings: [] };
-    const raw = readFileSync6(fp, "utf-8");
-    const parsed = raw.trimStart().startsWith("{") ? JSON.parse(raw) : parseSynkroYaml(raw);
+    const parsed = parseSynkroToml(readFileSync6(fp, "utf-8"));
     return resolveGraderPool(parsed);
   } catch {
   }
@@ -8580,6 +8686,7 @@ function writeHookScripts(mode = "stub") {
   const cursorEditCapturePath = join8(HOOKS_DIR, "cursor-edit-capture.ts");
   const cursorAgentCapturePath = join8(HOOKS_DIR, "cursor-agent-capture.ts");
   const mcpStdioProxyPath = join8(HOOKS_DIR, "mcp-stdio-proxy.ts");
+  const taskActivateIntentScriptPath = join8(HOOKS_DIR, "cc-task-activate-intent.ts");
   if (mode === "stub") {
     const stubCommonPath = join8(HOOKS_DIR, "_synkro-stub-common.ts");
     const stubFiles = [
@@ -8596,6 +8703,7 @@ function writeHookScripts(mode = "stub") {
       [transcriptSyncScriptPath, STUB_TRANSCRIPT_SYNC_TS],
       [userPromptSubmitScriptPath, STUB_USER_PROMPT_SUBMIT_TS],
       [installScanScriptPath, STUB_INSTALL_SCAN_TS],
+      [taskActivateIntentScriptPath, STUB_TASK_ACTIVATE_INTENT_TS],
       [cursorBashJudgePath, STUB_CURSOR_BASH_JUDGE_TS],
       [cursorEditCapturePath, STUB_CURSOR_EDIT_CAPTURE_TS],
       [cursorAgentCapturePath, STUB_CURSOR_AGENT_CAPTURE_TS]
@@ -8627,7 +8735,8 @@ function writeHookScripts(mode = "stub") {
       installScanScript: installScanScriptPath,
       cursorBashJudgeScript: cursorBashJudgePath,
       cursorEditCaptureScript: cursorEditCapturePath,
-      cursorAgentCaptureScript: cursorAgentCapturePath
+      cursorAgentCaptureScript: cursorAgentCapturePath,
+      taskActivateIntentScript: taskActivateIntentScriptPath
     };
   }
   writeFileSync7(bashScriptPath, BASH_JUDGE_TS, "utf-8");
@@ -8649,6 +8758,7 @@ function writeHookScripts(mode = "stub") {
   writeFileSync7(cursorAgentCapturePath, CURSOR_AGENT_CAPTURE_TS, "utf-8");
   writeFileSync7(mcpStdioProxyPath, MCP_STDIO_PROXY_SRC, "utf-8");
   writeFileSync7(installExtractCorePath, "/**\n * Deterministic install-command extraction \u2014 no LLM, no network.\n * Shared by the API pkg-scan route and the hook scripts (copied to ~/.synkro/hooks/).\n */\nimport { parse as shellParse } from 'shell-quote';\n\nexport interface DeterministicPkgRequest {\n  name: string;\n  version: string;\n  ecosystem: string;\n}\n\ninterface RawInstall {\n  ecosystem: string;\n  name: string;\n  versionSpec: string | null;\n  source: 'registry' | 'git' | 'local' | 'url' | 'unknown';\n}\n\nconst SEPARATOR_OPS = new Set(['&&', '||', ';', '|', '&', '\\n']);\n\n/** Split a shell command into command segments (each an argv string array). */\nexport function segmentCommand(command: string): string[][] {\n  let tokens: unknown[];\n  try {\n    tokens = shellParse(command) as unknown[];\n  } catch {\n    return [command.split(/\\s+/).filter(Boolean)];\n  }\n  const segments: string[][] = [];\n  let current: string[] = [];\n  for (const tok of tokens) {\n    if (typeof tok === 'string') {\n      current.push(tok);\n      continue;\n    }\n    if (tok && typeof tok === 'object') {\n      const op = (tok as { op?: string }).op;\n      const pattern = (tok as { pattern?: string }).pattern;\n      if (op && SEPARATOR_OPS.has(op)) {\n        if (current.length) segments.push(current);\n        current = [];\n      } else if (typeof pattern === 'string') {\n        current.push(pattern);\n      }\n    }\n  }\n  if (current.length) segments.push(current);\n  return segments;\n}\n\nconst PM_TABLE: Record<string, { subs: Set<string>; ecosystem: string }> = {\n  npm:      { subs: new Set(['install', 'i', 'add', 'ci']),  ecosystem: 'npm' },\n  pnpm:     { subs: new Set(['add', 'install', 'i', 'dlx']), ecosystem: 'npm' },\n  yarn:     { subs: new Set(['add', 'install']),             ecosystem: 'npm' },\n  bun:      { subs: new Set(['add', 'install', 'i']),        ecosystem: 'npm' },\n  pip:      { subs: new Set(['install']),                    ecosystem: 'PyPI' },\n  pip3:     { subs: new Set(['install']),                    ecosystem: 'PyPI' },\n  cargo:    { subs: new Set(['add', 'install']),             ecosystem: 'crates.io' },\n  go:       { subs: new Set(['get', 'install']),             ecosystem: 'Go' },\n  gem:      { subs: new Set(['install']),                    ecosystem: 'RubyGems' },\n  composer: { subs: new Set(['require']),                    ecosystem: 'Packagist' },\n};\nconst SYSTEM_PMS = new Set(['apt', 'apt-get', 'apk', 'brew', 'dnf', 'yum', 'pacman']);\nconst SYSTEM_SUBS = new Set(['install', 'add']);\n\nconst WRAPPERS = new Set(['sudo', 'doas', 'command', 'env', 'xargs', 'nice', 'time']);\nconst VALUE_FLAGS = new Set([\n  '--filter', '-F', '-C', '--dir', '--prefix', '--registry', '--tag', '--features',\n  '-v', '--version', '--index-url', '--extra-index-url', '--target', '-t',\n]);\n\nfunction basename(p: string): string {\n  const i = p.lastIndexOf('/');\n  return i >= 0 ? p.slice(i + 1) : p;\n}\n\nfunction stripPrefixes(argv: string[]): string[] {\n  let i = 0;\n  while (i < argv.length) {\n    const t = argv[i];\n    if (WRAPPERS.has(basename(t).toLowerCase())) { i++; continue; }\n    if (/^[A-Za-z_][A-Za-z0-9_]*=/.test(t)) { i++; continue; }\n    break;\n  }\n  return argv.slice(i);\n}\n\nfunction looksLikePath(tok: string): boolean {\n  return tok === '.' || tok === '..' || /^\\.{0,2}\\//.test(tok) || tok.startsWith('~/') || tok.startsWith('file:');\n}\n\n/** Shell redirect fragments (e.g. `2>&1` \u2192 argv `2`, `1`) \u2014 not package names. */\nfunction isRedirectFragment(tok: string): boolean {\n  if (/^\\d+$/.test(tok)) return true;\n  if (/^[<>]|[<>]$/.test(tok)) return true;\n  if (tok === '&' || tok === '|') return true;\n  if (/^\\d*[<>]/.test(tok)) return true;\n  return false;\n}\n\nfunction parsePackageToken(tok: string, ecosystem: string): RawInstall | null {\n  if (/^(https?:)?\\/\\//.test(tok) || tok.startsWith('git+') || tok.startsWith('git:')) {\n    return { ecosystem, name: tok, versionSpec: null, source: tok.includes('git') ? 'git' : 'url' };\n  }\n  if (looksLikePath(tok)) {\n    return { ecosystem, name: basename(tok.replace(/\\/+$/, '')) || tok, versionSpec: null, source: 'local' };\n  }\n  if (ecosystem === 'PyPI') {\n    const noExtras = tok.replace(/\\[[^\\]]*\\]/g, '');\n    const m = noExtras.match(/^([A-Za-z0-9_.-]+)\\s*([=~!<>].*)?$/);\n    if (!m) return null;\n    return { ecosystem, name: m[1], versionSpec: m[2] ? m[2].trim() : null, source: 'registry' };\n  }\n  if (ecosystem === 'Packagist') {\n    // composer uses vendor/package:version-constraint (e.g. monolog/monolog:1.0.0).\n    // Split on the first ':' after the vendor/ slash; never on the '/'.\n    const ci = tok.indexOf(':');\n    if (ci > 0) return { ecosystem, name: tok.slice(0, ci), versionSpec: tok.slice(ci + 1) || null, source: 'registry' };\n    return { ecosystem, name: tok, versionSpec: null, source: 'registry' };\n  }\n  const at = tok.lastIndexOf('@');\n  if (at > 0) {\n    return { ecosystem, name: tok.slice(0, at), versionSpec: tok.slice(at + 1) || null, source: 'registry' };\n  }\n  return { ecosystem, name: tok, versionSpec: null, source: 'registry' };\n}\n\n/** Deterministic extraction for a single command segment. */\nexport function extractSegment(rawArgv: string[]): RawInstall[] {\n  let argv = stripPrefixes(rawArgv);\n  if (argv.length < 2) return [];\n  let bin = basename(argv[0]).toLowerCase();\n\n  if (bin === 'uv' && argv[1] === 'pip') { argv = argv.slice(1); bin = 'pip'; }\n  if ((bin === 'python' || bin === 'python3') && argv.includes('-m')) {\n    const mi = argv.indexOf('-m');\n    if (argv[mi + 1] === 'pip') { argv = ['pip', ...argv.slice(mi + 2)]; bin = 'pip'; }\n  }\n\n  const isSystem = SYSTEM_PMS.has(bin);\n  const entry = PM_TABLE[bin];\n  if (!entry && !isSystem) return [];\n  const ecosystem = entry ? entry.ecosystem : 'system';\n  const subs = entry ? entry.subs : SYSTEM_SUBS;\n\n  let subIdx = -1;\n  for (let i = 1; i < argv.length; i++) {\n    if (subs.has(argv[i].toLowerCase())) { subIdx = i; break; }\n  }\n  if (subIdx === -1) return [];\n\n  const installs: RawInstall[] = [];\n  // gem pins the version with a separate `-v`/`--version` flag rather than an\n  // inline spec; capture it and apply to the package(s) in this segment.\n  let flagVersion: string | null = null;\n  for (let i = subIdx + 1; i < argv.length; i++) {\n    const tok = argv[i];\n    if (isRedirectFragment(tok)) break;\n    if (tok.startsWith('-')) {\n      const lower = tok.toLowerCase();\n      if (ecosystem === 'RubyGems' && (lower === '-v' || lower === '--version')) {\n        flagVersion = (argv[i + 1] || '').replace(/^[v=\\s]+/, '') || null;\n        i++;\n        continue;\n      }\n      if (VALUE_FLAGS.has(tok)) i++;\n      continue;\n    }\n    const parsed = parsePackageToken(tok, ecosystem);\n    if (parsed) installs.push(parsed);\n  }\n  if (flagVersion) {\n    for (const ins of installs) {\n      if (ins.source === 'registry' && !ins.versionSpec) ins.versionSpec = flagVersion;\n    }\n  }\n  return installs;\n}\n\nconst ECO_TO_OSV: Record<string, string | null> = {\n  npm: 'npm',\n  pypi: 'PyPI', PyPI: 'PyPI',\n  cargo: 'crates.io', 'crates.io': 'crates.io',\n  go: 'Go', Go: 'Go',\n  rubygems: 'RubyGems', RubyGems: 'RubyGems',\n  packagist: 'Packagist', Packagist: 'Packagist',\n  maven: 'Maven', Maven: 'Maven',\n  nuget: 'NuGet', NuGet: 'NuGet',\n  apt: null, brew: null, system: null, other: null,\n};\n\nfunction normalizeName(name: string, osvEco: string): string {\n  const n = name.trim();\n  if (osvEco === 'npm') return n.toLowerCase();\n  if (osvEco === 'PyPI') return n.toLowerCase().replace(/[-_.]+/g, '-');\n  return n;\n}\n\nfunction concretePin(spec: string | null): string | null {\n  if (!spec) return null;\n  const c = spec.trim().replace(/^[v=\\s]+/, '');\n  if (c.toLowerCase() === 'latest' || c === '') return null;\n  if (/[\\^~><|*\\sx]/i.test(c)) return null;\n  return /^\\d[\\w.\\-+]*$/.test(c) ? c : null;\n}\n\nconst PKG_JSON_DEP_FIELDS = ['dependencies', 'devDependencies', 'peerDependencies', 'optionalDependencies'];\n\nfunction safeParseObject(text: string): Record<string, any> | null {\n  try {\n    const v = JSON.parse(text);\n    return v && typeof v === 'object' && !Array.isArray(v) ? v : null;\n  } catch {\n    return null;\n  }\n}\n\n/**\n * Diff two package.json contents and return the registry packages that are\n * newly added or whose version spec changed in the new content. The caller\n * scans these against the vuln DB before letting the edit land \u2014 so a bare\n * `pnpm install` afterwards has nothing left to vet. Non-registry sources\n * (file:, link:, workspace:, git, http, relative paths) are skipped.\n */\nexport function extractPackageJsonDelta(oldText: string, newText: string): DeterministicPkgRequest[] {\n  const newJson = safeParseObject(newText);\n  if (!newJson) return [];\n  const oldJson = safeParseObject(oldText) || {};\n\n  const out = new Map<string, DeterministicPkgRequest>();\n  for (const field of PKG_JSON_DEP_FIELDS) {\n    const oldDeps = (oldJson[field] && typeof oldJson[field] === 'object') ? oldJson[field] : {};\n    const newDeps = (newJson[field] && typeof newJson[field] === 'object') ? newJson[field] : {};\n    for (const [rawName, version] of Object.entries(newDeps)) {\n      if (typeof version !== 'string') continue;\n      if (oldDeps[rawName] === version) continue;\n      const spec = version.trim();\n      if (\n        spec.startsWith('file:') || spec.startsWith('link:') ||\n        spec.startsWith('http') || spec.startsWith('git') ||\n        spec.startsWith('workspace:') || spec.startsWith('catalog:') ||\n        spec.startsWith('npm:') ||\n        spec.startsWith('./') || spec.startsWith('../') ||\n        spec === '' || spec === '*'\n      ) continue;\n      const name = rawName.toLowerCase();\n      out.set(name, {\n        name,\n        version: concretePin(spec) ?? '*',\n        ecosystem: 'npm',\n      });\n    }\n  }\n  return [...out.values()];\n}\n\n/**\n * Parse registry installs from a shell command without LLM/network.\n * Unpinned versions use '*' so OSV scans the full advisory history.\n */\nexport function extractDeterministicPkgRequests(command: string): DeterministicPkgRequest[] {\n  const merged = new Map<string, DeterministicPkgRequest>();\n  for (const r of segmentCommand(command).flatMap(extractSegment)) {\n    if (r.source !== 'registry') continue;\n    const osvEco = ECO_TO_OSV[r.ecosystem] ?? ECO_TO_OSV[r.ecosystem.toLowerCase()] ?? null;\n    if (!osvEco) continue;\n    const name = normalizeName(r.name, osvEco);\n    if (!name) continue;\n    const key = osvEco + '|' + name.toLowerCase();\n    const version = concretePin(r.versionSpec) ?? '*';\n    const prev = merged.get(key);\n    if (!prev || (prev.version === '*' && version !== '*')) {\n      merged.set(key, { name, version, ecosystem: osvEco });\n    }\n  }\n  return [...merged.values()];\n}\n", "utf-8");
+  writeFileSync7(taskActivateIntentScriptPath, STUB_TASK_ACTIVATE_INTENT_TS, "utf-8");
   chmodSync2(bashScriptPath, 493);
   chmodSync2(bashFollowupScriptPath, 493);
   chmodSync2(editPrecheckScriptPath, 493);
@@ -8668,6 +8778,7 @@ function writeHookScripts(mode = "stub") {
   chmodSync2(cursorAgentCapturePath, 493);
   chmodSync2(mcpStdioProxyPath, 493);
   chmodSync2(installExtractCorePath, 493);
+  chmodSync2(taskActivateIntentScriptPath, 493);
   try {
     unlinkSync4(join8(HOOKS_DIR, "_synkro-stub-common.ts"));
   } catch {
@@ -8687,7 +8798,8 @@ function writeHookScripts(mode = "stub") {
     installScanScript: installScanScriptPath,
     cursorBashJudgeScript: cursorBashJudgePath,
     cursorEditCaptureScript: cursorEditCapturePath,
-    cursorAgentCaptureScript: cursorAgentCapturePath
+    cursorAgentCaptureScript: cursorAgentCapturePath,
+    taskActivateIntentScript: taskActivateIntentScriptPath
   };
 }
 function sanitizeConfigValue(raw, maxLen = 256) {
@@ -8719,7 +8831,7 @@ function writeConfigEnv(opts) {
     `SYNKRO_CREDENTIALS_PATH=${shellQuoteSingle(credsPath)}`,
     `SYNKRO_TIER=${shellQuoteSingle(safeTier)}`,
     `SYNKRO_INFERENCE=${shellQuoteSingle(safeInference)}`,
-    `SYNKRO_VERSION=${shellQuoteSingle("1.6.52")}`
+    `SYNKRO_VERSION=${shellQuoteSingle("1.6.53")}`
   ];
   if (safeSynkroBin) lines.push(`SYNKRO_CLI_BIN=${shellQuoteSingle(safeSynkroBin)}`);
   if (safeUserId) lines.push(`SYNKRO_USER_ID=${shellQuoteSingle(safeUserId)}`);
@@ -8997,6 +9109,7 @@ async function installCommand(opts = {}) {
         transcriptSyncScriptPath: scripts.transcriptSyncScript,
         userPromptSubmitScriptPath: scripts.userPromptSubmitScript,
         installScanScriptPath: scripts.installScanScript,
+        taskActivateIntentScriptPath: scripts.taskActivateIntentScript,
         skipTranscriptSync: !transcriptConsent
       });
       console.log(`Configured ${agent.name} hooks at ${agent.settingsPath}`);
@@ -9175,7 +9288,7 @@ async function installCommand(opts = {}) {
         claudeWorkers = 0;
         cursorWorkers = 8;
       }
-      console.log(`  .synkro: explicit workers \u2014 ${claudeWorkers} claude + ${cursorWorkers} cursor`);
+      console.log(`  synkro.toml: explicit workers \u2014 ${claudeWorkers} claude + ${cursorWorkers} cursor`);
     } else {
       const totalWorkers = parseInt(process.env.SYNKRO_WORKERS_PER_POOL || "8", 10);
       const synkroFilePool = sf?.grader?.pool || "auto";
@@ -9189,7 +9302,7 @@ async function installCommand(opts = {}) {
         if (hasCursor) providers.push("cursor");
       }
       ({ claudeWorkers, cursorWorkers } = splitWorkers(totalWorkers, providers));
-      if (synkroFilePool !== "auto") console.log(`  .synkro: grader pool set to ${poolLabel(synkroFilePool)}`);
+      if (synkroFilePool !== "auto") console.log(`  synkro.toml: grader pool set to ${poolLabel(synkroFilePool)}`);
     }
     console.log(`  worker pool: ${claudeWorkers} claude + ${cursorWorkers} cursor`);
     const connectedRepo = detectGitRepo2() || void 0;
@@ -9320,65 +9433,58 @@ async function installCommand(opts = {}) {
   }
   console.log("\u2713 Synkro installed.");
 }
-function parseSynkroYaml2(raw) {
+function parseTomlValue2(raw) {
+  const v = raw.trim();
+  if (v.startsWith("[") && v.endsWith("]")) {
+    const inner = v.slice(1, -1).trim();
+    if (!inner) return [];
+    return inner.split(",").map((s) => parseTomlValue2(s)).filter((s) => s !== "");
+  }
+  if (v.startsWith('"') && v.endsWith('"') || v.startsWith("'") && v.endsWith("'")) return v.slice(1, -1);
+  if (v === "true") return true;
+  if (v === "false") return false;
+  if (/^-?\d+$/.test(v)) return parseInt(v, 10);
+  return v;
+}
+function parseSynkroToml2(raw) {
   const result = {};
-  const lines = raw.split("\n");
-  let currentKey = "";
-  let currentObj = null;
-  let currentArr = null;
-  for (const line of lines) {
-    if (!line.trim() || line.trim().startsWith("#")) continue;
-    if (/^\S/.test(line) && line.includes(":")) {
-      if (currentObj && currentKey) result[currentKey] = currentObj;
-      if (currentArr && currentKey) result[currentKey] = currentArr;
-      currentObj = null;
-      currentArr = null;
-      const colonIdx = line.indexOf(":");
-      const key = line.slice(0, colonIdx).trim();
-      const val = line.slice(colonIdx + 1).trim();
-      currentKey = key;
-      if (val) {
-        if (val === "[]") result[key] = [];
-        else if (val === "true") result[key] = true;
-        else if (val === "false") result[key] = false;
-        else if (/^\d+$/.test(val)) result[key] = parseInt(val, 10);
-        else result[key] = val;
-        currentKey = "";
-      }
-    } else if (/^  - /.test(line)) {
-      if (!currentArr) currentArr = [];
-      currentArr.push(line.replace(/^  - /, "").trim());
-    } else if (/^  \S/.test(line) && line.includes(":")) {
-      if (!currentObj) currentObj = {};
-      const colonIdx = line.indexOf(":");
-      const k = line.slice(0, colonIdx).trim();
-      const v = line.slice(colonIdx + 1).trim();
-      if (v === "true") currentObj[k] = true;
-      else if (v === "false") currentObj[k] = false;
-      else if (/^\d+$/.test(v)) currentObj[k] = parseInt(v, 10);
-      else currentObj[k] = v;
-    }
-  }
-  if (currentObj && currentKey) result[currentKey] = currentObj;
-  if (currentArr && currentKey) result[currentKey] = currentArr;
+  let section = null;
+  for (const rawLine of raw.split("\n")) {
+    const line = rawLine.trim();
+    if (!line || line.startsWith("#")) continue;
+    const sec = line.match(/^\[([^\]]+)\]$/);
+    if (sec) {
+      section = sec[1].trim();
+      if (!result[section]) result[section] = {};
+      continue;
+    }
+    const eq = line.indexOf("=");
+    if (eq === -1) continue;
+    const key = line.slice(0, eq).trim().replace(/^["']|["']$/g, "");
+    let valRaw = line.slice(eq + 1).trim();
+    if (!valRaw.startsWith('"') && !valRaw.startsWith("'") && !valRaw.startsWith("[")) {
+      const h = valRaw.indexOf("#");
+      if (h !== -1) valRaw = valRaw.slice(0, h).trim();
+    }
+    const value = parseTomlValue2(valRaw);
+    if (section) result[section][key] = value;
+    else result[key] = value;
+  }
   return result;
 }
-function parseSynkroFileRaw(content) {
-  return content.trimStart().startsWith("{") ? JSON.parse(content) : parseSynkroYaml2(content);
-}
 function writeSynkroFileIfMissing(opts) {
   try {
     const root = execSync6("git rev-parse --show-toplevel", { encoding: "utf-8", timeout: 3e3, stdio: ["pipe", "pipe", "pipe"] }).trim();
     if (!root) return;
     if (root === homedir8()) return;
-    const fp = join8(root, ".synkro");
+    const fp = join8(root, "synkro.toml");
     let hasFile = false;
     try {
       hasFile = statSync2(fp).isFile();
     } catch {
     }
     if (hasFile) {
-      console.log(`  .synkro: ${fp} (existing, respected)`);
+      console.log(`  synkro.toml: ${fp} (existing, respected)`);
       return;
     }
     let pool = "auto";
@@ -9392,27 +9498,26 @@ function writeSynkroFileIfMissing(opts) {
       if (!opts.hasClaudeCode) pool = "cursor";
     }
     const mode = opts.gradingMode === "byok" ? "byok" : "local";
-    const yaml = [
-      "version: 1",
+    const toml = [
+      "version = 1",
       "",
-      "harness:",
-      ...harness.map((h) => `  - ${h}`),
+      `harness = [${harness.map((h) => `"${h}"`).join(", ")}]`,
       "",
-      "grader:",
-      `  pool: ${pool}`,
-      `  mode: ${mode}`,
+      'ruleset = "default"',
       "",
-      "ruleset: default",
+      "skills = []",
       "",
-      "skills: []",
+      "[grader]",
+      `pool = "${pool}"`,
+      `mode = "${mode}"`,
       "",
-      "scanning:",
-      "  cwe: true",
-      "  cve: true",
+      "[scanning]",
+      "cwe = true",
+      "cve = true",
       ""
     ].join("\n");
-    writeFileSync7(fp, yaml, "utf-8");
-    console.log(`  .synkro: wrote ${fp} (pool=${pool}, mode=${mode})`);
+    writeFileSync7(fp, toml, "utf-8");
+    console.log(`  synkro.toml: wrote ${fp} (pool=${pool}, mode=${mode})`);
   } catch {
   }
 }
@@ -9420,9 +9525,9 @@ 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");
+    const fp = join8(root, "synkro.toml");
     if (!existsSync10(fp)) return null;
-    const parsed = parseSynkroFileRaw(readFileSync8(fp, "utf-8"));
+    const parsed = parseSynkroToml2(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"];
     const resolved = resolveGraderPool(parsed);
@@ -9455,7 +9560,7 @@ function reconcileHarness() {
   const wantCC = sf.harness.includes("claude-code");
   const wantCursor = sf.harness.includes("cursor");
   for (const w of sf.warnings) console.warn(`  \u26A0 ${w}`);
-  console.log(`.synkro: harness=[${sf.harness.join(", ")}] pool=${poolLabel(sf.grader.pool)} mode=${sf.grader.mode}`);
+  console.log(`synkro.toml: harness=[${sf.harness.join(", ")}] pool=${poolLabel(sf.grader.pool)} mode=${sf.grader.mode}`);
   const scripts = writeHookScripts(resolvePersistedHookMode());
   console.log("Wrote hook scripts to ~/.synkro/hooks/");
   const ccSettings = join8(homedir8(), ".claude", "settings.json");
@@ -9472,7 +9577,8 @@ function reconcileHarness() {
       sessionStartScriptPath: scripts.sessionStartScript,
       transcriptSyncScriptPath: scripts.transcriptSyncScript,
       userPromptSubmitScriptPath: scripts.userPromptSubmitScript,
-      installScanScriptPath: scripts.installScanScript
+      installScanScriptPath: scripts.installScanScript,
+      taskActivateIntentScriptPath: scripts.taskActivateIntentScript
     });
     console.log("  \u2713 Claude Code hooks registered");
     try {
@@ -9542,27 +9648,29 @@ async function syncSkillFiles() {
   const tasks = resolved.map((fp) => {
     const content = readFileSync8(fp, "utf-8");
     const source = `skill:${fp.split("/").pop()}`;
-    if (!content.trim()) return null;
+    if (!content.trim()) {
+      console.log(`  \u2298 skill ${source}: empty file, skipped`);
+      return null;
+    }
+    const lines = content.split("\n").length;
+    console.log(`  \u2192 read ${source} (${lines} lines, ${(content.length / 1024).toFixed(1)} KB)`);
     return { source, content };
   }).filter(Boolean);
   if (tasks.length === 0) return;
-  const results = await Promise.allSettled(tasks.map(async ({ source, content }) => {
-    const resp = await fetch(`http://127.0.0.1:${mcpPort}/api/local/skills/sync`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ source, content }),
-      signal: AbortSignal.timeout(65e3)
-    });
-    if (!resp.ok) throw new Error(`${resp.status}`);
-    const result = await resp.json();
-    return { source, ...result };
-  }));
-  for (const r of results) {
-    if (r.status === "fulfilled") {
-      const { source, created, message } = r.value;
-      console.log(created > 0 ? `  \u2713 skill ${source}: ${created} new rules added` : `  \u2713 skill ${source}: ${message || "up to date"}`);
-    } else {
-      console.warn(`  \u26A0 skill sync failed: ${r.reason}`);
+  console.log(`  indexing ${tasks.length} skill file${tasks.length === 1 ? "" : "s"} \u2014 comparing against existing ruleset (this may take a few seconds)...`);
+  for (const { source, content } of tasks) {
+    try {
+      const resp = await fetch(`http://127.0.0.1:${mcpPort}/api/local/skills/sync`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ source, content }),
+        signal: AbortSignal.timeout(65e3)
+      });
+      if (!resp.ok) throw new Error(`${resp.status}`);
+      const { created, message } = await resp.json();
+      console.log(created > 0 ? `  \u2713 skill ${source}: ${created} new rule${created === 1 ? "" : "s"} added to index` : `  \u2713 skill ${source}: ${message || "up to date"} \u2014 index unchanged`);
+    } catch (e) {
+      console.warn(`  \u26A0 skill ${source}: sync failed (${e instanceof Error ? e.message : String(e)})`);
     }
   }
 }
@@ -9909,37 +10017,101 @@ const TOKEN_PATH = join(HOME, '.synkro', '.mcp-jwt');
 const PORT = parseInt(process.env.SYNKRO_MCP_PORT || '18931', 10);
 const URL = \`http://127.0.0.1:\${PORT}\`;
 
-let token = '';
-try { token = readFileSync(TOKEN_PATH, 'utf-8').trim(); } catch {}
+// Re-read the JWT on EVERY request, not once at spawn: a \`synkro restart\` rotates
+// the token, and a proxy that cached the old one would 401 every call until it
+// was respawned (a manual /mcp).
+function loadToken() {
+  try { return readFileSync(TOKEN_PATH, 'utf-8').trim(); } catch { return ''; }
+}
+function write(obj) { try { process.stdout.write(JSON.stringify(obj) + '\\n'); } catch {} }
+
+// Answer \`initialize\` LOCALLY without touching the backend. Claude Code latches an
+// MCP server as failed \u2014 forcing a manual /mcp \u2014 only when the child process exits
+// or the initialize handshake fails. A \`synkro restart\` takes the backend down for
+// ~30-60s, so if CC (re)connects in that window a forwarded initialize would fail
+// and the server would be dead until /mcp. Replying here makes the handshake
+// succeed unconditionally; tools/list and tools/call still hit the backend.
+function localInitialize(msg) {
+  return {
+    jsonrpc: '2.0',
+    id: msg.id,
+    result: {
+      protocolVersion: (msg && msg.params && msg.params.protocolVersion) || '2024-11-05',
+      capabilities: { tools: {} },
+      serverInfo: { name: 'synkro-guardrails-local', version: '1.0.0' },
+    },
+  };
+}
+
+// Cap a single JSON-RPC line. This proxy only carries small tool-call envelopes;
+// refusing oversized input keeps a malicious or runaway client from buffering
+// unbounded memory (CWE-400).
+const MAX_LINE_BYTES = 4 * 1024 * 1024;
 
 const rl = createInterface({ input: process.stdin, terminal: false });
 
 rl.on('line', async (line) => {
   if (!line.trim()) return;
+  if (line.length > MAX_LINE_BYTES) return;
   let msg;
   try { msg = JSON.parse(line); } catch { return; }
-  if (!msg.id && msg.method?.startsWith('notifications/')) return;
+  // Notifications carry no id and need no reply.
+  if (msg.id == null && typeof msg.method === 'string' && msg.method.startsWith('notifications/')) return;
 
-  try {
-    const resp = await fetch(URL, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        'Authorization': \`Bearer \${token}\`,
-      },
-      body: line,
-      signal: AbortSignal.timeout(30000),
-    });
-    if (resp.status === 204) return;
-    const body = await resp.text();
-    process.stdout.write(body + '\\n');
-  } catch (err) {
-    if (msg.id != null) {
-      process.stdout.write(JSON.stringify({
-        jsonrpc: '2.0',
-        id: msg.id,
-        error: { code: -32603, message: 'MCP proxy: HTTP server unreachable' },
-      }) + '\\n');
+  // initialize: try the backend briefly for the real instructions, but ALWAYS
+  // fall back to a local reply so the handshake can never block or fail.
+  if (msg.method === 'initialize') {
+    try {
+      const resp = await fetch(URL, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json', 'Authorization': \`Bearer \${loadToken()}\` },
+        body: line,
+        signal: AbortSignal.timeout(2500),
+      });
+      if (resp.ok) { process.stdout.write((await resp.text()) + '\\n'); return; }
+    } catch {}
+    write(localInitialize(msg));
+    return;
+  }
+
+  // tool calls: forward, allowing a generous per-attempt window for slow calls
+  // (create + decompose). If the backend is UNREACHABLE (mid-restart), retry only
+  // briefly, then return a CLEAN JSON-RPC error and move on. Never hold the request
+  // open for tens of seconds \u2014 a stdio request held that long wedges CC's MCP
+  // client and every later call queues behind it. A returned error keeps the
+  // client responsive and the server connected; the agent just retries.
+  const REFUSED_BUDGET_MS = 4000;
+  const deadline = Date.now() + REFUSED_BUDGET_MS;
+  let attempt = 0;
+  while (true) {
+    try {
+      const resp = await fetch(URL, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json', 'Authorization': \`Bearer \${loadToken()}\` },
+        body: line,
+        signal: AbortSignal.timeout(30000),
+      });
+      if (resp.status === 204) return;
+      process.stdout.write((await resp.text()) + '\\n');
+      return;
+    } catch (err) {
+      // A 30s timeout means the backend was UP but slow \u2014 don't spin. ECONNREFUSED /
+      // fetch failed means it's unreachable \u2192 retry briefly within the budget.
+      const name = err && err.name;
+      const isTimeout = name === 'TimeoutError' || name === 'AbortError';
+      if (!isTimeout && Date.now() < deadline) {
+        attempt++;
+        await new Promise((r) => setTimeout(r, Math.min(500, 150 * attempt)));
+        continue;
+      }
+      if (msg.id != null) {
+        write({
+          jsonrpc: '2.0',
+          id: msg.id,
+          error: { code: -32603, message: 'Synkro MCP backend unavailable (container may be restarting) \u2014 retry in a moment' },
+        });
+      }
+      return;
     }
   }
 });
@@ -11909,7 +12081,7 @@ var args = process.argv.slice(2);
 var cmd = args[0] || "";
 var subArgs = args.slice(1);
 function printVersion() {
-  console.log("1.6.52");
+  console.log("1.6.53");
 }
 function printHelp2() {
   console.log(`Synkro CLI \u2014 runtime safety for AI coding agents