@synkro-sh/cli 1.10.8 → 1.10.10

package/dist/bootstrap.js

@@ -81,10 +81,10 @@ import { createHash } from "crypto";
 import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
 import { homedir as homedir2, hostname, platform } from "os";
 import { join as join2 } from "path";
-function readConfigValue(key) {
-  if (process.env[key]) return String(process.env[key]).toLowerCase();
+function readConfigValue(key2) {
+  if (process.env[key2]) return String(process.env[key2]).toLowerCase();
   try {
-    const re = key === "SYNKRO_GRADING_MODE" ? /^SYNKRO_GRADING_MODE=['"]?([^'"\n]*)/m : /^SYNKRO_STORAGE_MODE=['"]?([^'"\n]*)/m;
+    const re = key2 === "SYNKRO_GRADING_MODE" ? /^SYNKRO_GRADING_MODE=['"]?([^'"\n]*)/m : /^SYNKRO_STORAGE_MODE=['"]?([^'"\n]*)/m;
     const m = readFileSync2(CONFIG_PATH, "utf-8").match(re);
     return m ? m[1].toLowerCase() : "";
   } catch {
@@ -147,7 +147,7 @@ function getIdentity() {
   if (cached2) return cached2;
   let cliVersion2 = "0.0.0";
   try {
-    cliVersion2 = "1.10.8";
+    cliVersion2 = "1.10.10";
   } catch {
   }
   const creds = loadCredentialsIdentity();
@@ -789,9 +789,9 @@ function sanitize(raw, maxLen = 256) {
 function shellQuoteSingle(value) {
   return `'${value.replace(/'/g, "'\\''")}'`;
 }
-function writeConfigEnvFlag(key, value) {
+function writeConfigEnvFlag(key2, value) {
   const safe = sanitize(value, 8);
-  const line = `${key}=${shellQuoteSingle(safe)}`;
+  const line = `${key2}=${shellQuoteSingle(safe)}`;
   let content = "";
   if (existsSync5(CONFIG_PATH2)) {
     try {
@@ -800,7 +800,7 @@ function writeConfigEnvFlag(key, value) {
       content = "";
     }
   }
-  const re = new RegExp(`^${key}=.*$`, "m");
+  const re = new RegExp(`^${key2}=.*$`, "m");
   if (re.test(content)) {
     content = content.replace(re, line);
   } else {
@@ -1231,15 +1231,15 @@ async function exportEvents(path) {
     writeFileSync4(path, "", "utf-8");
     return;
   }
-  const lines = [];
+  const lines2 = [];
   try {
     const rows = await sql`SELECT * FROM telemetry_events ORDER BY occurred_at ASC`;
     for (const row2 of rows) {
-      lines.push(JSON.stringify(row2));
+      lines2.push(JSON.stringify(row2));
     }
   } catch {
   }
-  writeFileSync4(path, lines.join("\n") + (lines.length > 0 ? "\n" : ""), "utf-8");
+  writeFileSync4(path, lines2.join("\n") + (lines2.length > 0 ? "\n" : ""), "utf-8");
 }
 function pendingFileSize() {
   try {
@@ -1645,10 +1645,9 @@ function installCCHooks(settingsPath, config) {
       {
         type: "command",
         command: config.cvePrecheckScriptPath,
-        // 15s: the on-findings VEX grade fans out across the warm pool; single-package
-        // edits finish in ~5s, but a multi-package edit (many CVEs) can approach ~10s,
-        // so 15 gives comfortable headroom. Only runs when a real vuln is present.
-        timeout: 15
+        // Only a confirmed vulnerable runtime dependency reaches VEX triage. Codex can
+        // take 13-17s for a valid answer, so match the bounded 25s gate plus its margin.
+        timeout: 30
       },
       // skill-judge — its OWN system-message block, parallel with edit-precheck.
       ...config.skillJudgeScriptPath ? [{
@@ -1856,21 +1855,21 @@ function validateHooksPath(path) {
   return resolved;
 }
 function readHooksFile(rawPath) {
-  const safePath = validateHooksPath(rawPath);
+  const safePath2 = validateHooksPath(rawPath);
   try {
-    const raw = readFileSync10(safePath, "utf-8");
+    const raw = readFileSync10(safePath2, "utf-8");
     return JSON.parse(raw);
   } catch (err) {
     if (err?.code === "ENOENT") return { version: 1, hooks: {} };
-    throw new Error(`Failed to parse ${safePath}: ${err.message}`);
+    throw new Error(`Failed to parse ${safePath2}: ${err.message}`);
   }
 }
 function writeHooksFileAtomic(rawPath, data) {
-  const safePath = validateHooksPath(rawPath);
-  mkdirSync5(dirname2(safePath), { recursive: true });
-  const tmpPath = `${safePath}.synkro.tmp`;
+  const safePath2 = validateHooksPath(rawPath);
+  mkdirSync5(dirname2(safePath2), { recursive: true });
+  const tmpPath = `${safePath2}.synkro.tmp`;
   writeFileSync7(tmpPath, JSON.stringify(data, null, 2) + "\n", { encoding: "utf-8", mode: 384 });
-  renameSync4(tmpPath, safePath);
+  renameSync4(tmpPath, safePath2);
 }
 function isSynkroEntry2(entry) {
   if (entry?.[SYNKRO_MARKER2]) return true;
@@ -1972,7 +1971,7 @@ function installCursorHooks(hooksJsonPath, config) {
     matcher: "Write|Edit|StrReplace|MultiEdit|NotebookEdit|edit_file|reapply|edit_notebook|ApplyPatch|apply_patch"
   });
   pushCcHook(h, "preToolUse", config.cvePrecheckScriptPath, {
-    timeout: 10,
+    timeout: 30,
     matcher: "Write|Edit|StrReplace|MultiEdit|NotebookEdit|edit_file|reapply|edit_notebook|ApplyPatch|apply_patch"
   });
   pushCcHook(h, "preToolUse", config.agentJudgeScriptPath, {
@@ -2158,20 +2157,20 @@ function validateHooksPath2(path) {
   return resolved;
 }
 function readHooksFile2(rawPath) {
-  const safePath = validateHooksPath2(rawPath);
-  if (!existsSync12(safePath)) return { hooks: {} };
+  const safePath2 = validateHooksPath2(rawPath);
+  if (!existsSync12(safePath2)) return { hooks: {} };
   try {
-    return JSON.parse(readFileSync11(safePath, "utf-8"));
+    return JSON.parse(readFileSync11(safePath2, "utf-8"));
   } catch (err) {
-    throw new Error(`Failed to parse ${safePath}: ${err.message}`);
+    throw new Error(`Failed to parse ${safePath2}: ${err.message}`);
   }
 }
 function writeHooksFileAtomic2(rawPath, data) {
-  const safePath = validateHooksPath2(rawPath);
-  mkdirSync6(dirname3(safePath), { recursive: true });
-  const tmpPath = `${safePath}.synkro.tmp`;
+  const safePath2 = validateHooksPath2(rawPath);
+  mkdirSync6(dirname3(safePath2), { recursive: true });
+  const tmpPath = `${safePath2}.synkro.tmp`;
   writeFileSync8(tmpPath, JSON.stringify(data, null, 2) + "\n", { encoding: "utf-8", mode: 384 });
-  renameSync5(tmpPath, safePath);
+  renameSync5(tmpPath, safePath2);
 }
 function isSynkroEntry3(entry) {
   if (entry?.[SYNKRO_MARKER3]) return true;
@@ -2204,7 +2203,7 @@ function installCodexHooks(hooksJsonPath, config) {
   push(h, "PreToolUse", [
     cmd(config.editPrecheckScriptPath, 50, "Reviewing edit"),
     cmd(config.cwePrecheckScriptPath, 50),
-    cmd(config.cvePrecheckScriptPath, 15),
+    cmd(config.cvePrecheckScriptPath, 30),
     ...config.skillJudgeScriptPath ? [cmd(config.skillJudgeScriptPath, 50)] : []
   ], M_EDIT);
   push(h, "PostToolUse", [
@@ -2351,7 +2350,7 @@ function buildCodexHookTrustEdits(hooks) {
   return [...edits.values()];
 }
 function queryCodexHookTrust(codexBinary = "codex", cwd = process.cwd(), autoTrust = false) {
-  return new Promise((resolve8) => {
+  return new Promise((resolve9) => {
     let settled = false;
     let stdout = "";
     let pending = "";
@@ -2369,7 +2368,7 @@ function queryCodexHookTrust(codexBinary = "codex", cwd = process.cwd(), autoTru
         child.kill();
       } catch {
       }
-      resolve8(summary);
+      resolve9(summary);
     };
     const timer = setTimeout(() => finish(null), 1e4);
     try {
@@ -2384,9 +2383,9 @@ function queryCodexHookTrust(codexBinary = "codex", cwd = process.cwd(), autoTru
       child.stdout.on("data", (chunk) => {
         stdout += chunk;
         pending += chunk;
-        const lines = pending.split("\n");
-        pending = lines.pop() || "";
-        for (const line of lines) {
+        const lines2 = pending.split("\n");
+        pending = lines2.pop() || "";
+        for (const line of lines2) {
           let message;
           try {
             message = JSON.parse(line);
@@ -2620,11 +2619,11 @@ function writeCodexTomlAtomic(path, content) {
   renameSync6(tmpPath, path);
 }
 function removeCodexManagedBlock(content, path) {
-  const lines = content.split("\n");
+  const lines2 = content.split("\n");
   const out = [];
   let removed = false;
   let inside = false;
-  for (const line of lines) {
+  for (const line of lines2) {
     if (!inside && line.trim() === CODEX_MCP_BEGIN) {
       inside = true;
       removed = true;
@@ -2652,8 +2651,8 @@ function findCodexMcpSection(content) {
     body: content.slice(match.index, next?.index ?? content.length)
   };
 }
-function readTomlString(block, key) {
-  const match = block.match(new RegExp(`^\\s*${key}\\s*=\\s*("(?:[^"\\\\]|\\\\.)*")\\s*$`, "m"));
+function readTomlString(block, key2) {
+  const match = block.match(new RegExp(`^\\s*${key2}\\s*=\\s*("(?:[^"\\\\]|\\\\.)*")\\s*$`, "m"));
   if (!match) return null;
   try {
     return JSON.parse(match[1]);
@@ -5181,7 +5180,7 @@ function createCallbackServer() {
     "Access-Control-Allow-Headers": "Content-Type",
     "Vary": "Origin"
   };
-  return new Promise((resolve8, reject) => {
+  return new Promise((resolve9, reject) => {
     const server = createServer((req, res) => {
       if (req.method === "OPTIONS") {
         const origin = req.headers.origin;
@@ -5270,7 +5269,7 @@ function createCallbackServer() {
         res.end(JSON.stringify({ ok: true }));
         setTimeout(() => {
           server.close();
-          resolve8(authData);
+          resolve9(authData);
         }, 200);
       });
       req.on("error", (e) => {
@@ -5606,7 +5605,7 @@ function detectSubdirRepos() {
   }
 }
 function ask(rl, question) {
-  return new Promise((resolve8) => rl.question(question, resolve8));
+  return new Promise((resolve9) => rl.question(question, resolve9));
 }
 async function linkRepo(repo, linkedNames) {
   try {
@@ -5845,7 +5844,7 @@ async function runClaudeDesktopTap(opts = {}) {
   writeFileSync12(join13(sessionDir, "mcp_patch.py"), MCP_PATCH_PY, "utf-8");
   const runnerPath = join13(sessionDir, "run.sh");
   writeFileSync12(runnerPath, buildRunner(sessionDir), { mode: 493 });
-  await new Promise((resolve8) => {
+  await new Promise((resolve9) => {
     const child = spawn3("bash", [runnerPath], {
       stdio: "inherit",
       env: { ...process.env, SYNKRO_CAPTURE_URL: CAPTURE_URL, SYNKRO_SCAN_URL: SCAN_URL, SYNKRO_SCAN_TURN_URL: SCAN_TURN_URL, SYNKRO_DLP_POLICY_URL: DLP_POLICY_URL, SYNKRO_TURN_VERDICTS_URL: TURN_VERDICTS_URL, SYNKRO_TURN_VERDICT_URL: TURN_VERDICT_URL, SYNKRO_MCP_EVENT_URL: MCP_EVENT_URL, SYNKRO_TAP_TOKEN: token, SYNKRO_TAP_TOKEN_FILE: JWT_PATH, SYNKRO_CD_BACKFILL: opts.backfill ? "1" : "" }
@@ -5861,7 +5860,7 @@ async function runClaudeDesktopTap(opts = {}) {
     child.on("exit", () => {
       process.off("SIGINT", forward);
       process.off("SIGTERM", forward);
-      resolve8();
+      resolve9();
     });
   });
 }
@@ -7034,8 +7033,8 @@ function cursorApiKeyConfigured() {
     return false;
   }
 }
-function writeCursorApiKey(key) {
-  const trimmed = key.trim();
+function writeCursorApiKey(key2) {
+  const trimmed = key2.trim();
   if (!trimmed) return;
   mkdirSync11(CURSOR_CREDS_DIR, { recursive: true });
   chmodSync2(CURSOR_CREDS_DIR, 448);
@@ -7043,15 +7042,15 @@ function writeCursorApiKey(key) {
   chmodSync2(CURSOR_API_KEY_FILE, 384);
 }
 async function validateCursorApiKey() {
-  let key;
+  let key2;
   try {
-    key = readFileSync16(CURSOR_API_KEY_FILE, "utf-8").trim();
+    key2 = readFileSync16(CURSOR_API_KEY_FILE, "utf-8").trim();
   } catch {
     return null;
   }
-  if (!key) return null;
+  if (!key2) return null;
   try {
-    const auth = Buffer.from(`${key}:`).toString("base64");
+    const auth = Buffer.from(`${key2}:`).toString("base64");
     const r = await fetch("https://api.cursor.com/v1/me", {
       headers: { Authorization: `Basic ${auth}` },
       signal: AbortSignal.timeout(8e3)
@@ -7391,15 +7390,15 @@ function parseSynkroToml(raw) {
     }
     const eq = line.indexOf("=");
     if (eq === -1) continue;
-    const key = line.slice(0, eq).trim().replace(/^["']|["']$/g, "");
+    const key2 = 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;
+    if (section) result[section][key2] = value;
+    else result[key2] = value;
   }
   return result;
 }
@@ -7676,7 +7675,7 @@ async function dockerInstall(opts = {}) {
       "SYNKRO_CODEX_MODEL",
       "SYNKRO_CONDUCTOR_MODEL",
       "SYNKRO_ROUTE_MODEL"
-    ].flatMap((key) => process.env[key] ? ["-e", `${key}=${process.env[key]}`] : []),
+    ].flatMap((key2) => process.env[key2] ? ["-e", `${key2}=${process.env[key2]}`] : []),
     // Fix-poll kill switch. Default ON in the image; a benchmark/headless run
     // (e.g. sec-code-bench) sets SYNKRO_FIX_POLL=0 so ask-mode violations skip the
     // interactive AskUserQuestion poll and fall through to generate-the-fix. Only
@@ -7934,7 +7933,7 @@ var init_dockerInstall = __esm({
     HOST_PGLITE_PORT = parseInt(process.env.SYNKRO_HOST_PGLITE_PORT || "15433", 10);
     CONTAINER_NAME = resolveContainerName();
     defaultImageVersion = () => {
-      if (true) return "1.10.8";
+      if (true) return "1.10.10";
       try {
         const pkg = JSON.parse(readFileSync17(new URL("../../package.json", import.meta.url), "utf8"));
         if (pkg.version) return pkg.version;
@@ -7966,7 +7965,7 @@ function captureClaudeSetupToken() {
   const bin = "script";
   const args2 = isMac ? ["-q", tmpFile, "claude", "setup-token"] : ["-qec", "claude setup-token", tmpFile];
   const OAUTH_HINT = 'The browser approval did not return a token. This usually means claude.ai rejected the OAuth request (its "Authorization failed \u2014 Unsupported media type" page), most often because a browser extension (Grammarly, ad/script blockers, AI-assistant toolbars) stripped the request headers, or you approved on the wrong Claude account. Fix: retry in a clean incognito window with extensions disabled, and approve on the Claude account you want the cloud workers to use.';
-  return new Promise((resolve8, reject) => {
+  return new Promise((resolve9, reject) => {
     const proc = nodeSpawn(bin, args2, {
       stdio: "inherit",
       env: { ...process.env, FORCE_COLOR: "3", COLORTERM: "truecolor", TERM: "xterm-256color" }
@@ -8033,7 +8032,7 @@ function captureClaudeSetupToken() {
         reject(new Error(`Captured no setup token from claude setup-token output. ${reason}`));
         return;
       }
-      resolve8(token);
+      resolve9(token);
     });
   });
 }
@@ -8059,13 +8058,13 @@ function findCodexBinary() {
 function runCodexLogin(codexBin, codexHome) {
   mkdirSync13(codexHome, { recursive: true, mode: 448 });
   writeFileSync15(join17(codexHome, "config.toml"), 'cli_auth_credentials_store = "file"\n', { mode: 384 });
-  return new Promise((resolve8, reject) => {
+  return new Promise((resolve9, reject) => {
     const proc = nodeSpawn2(codexBin, ["login"], {
       stdio: "inherit",
       env: { ...process.env, CODEX_HOME: codexHome }
     });
     proc.on("error", (err) => reject(new Error(`failed to spawn codex login: ${err.message}`)));
-    proc.on("close", (code) => code === 0 ? resolve8() : reject(new Error(`codex login exited with code ${code}`)));
+    proc.on("close", (code) => code === 0 ? resolve9() : reject(new Error(`codex login exited with code ${code}`)));
   });
 }
 async function setupCodexCloud(gatewayUrl, bearerToken, onStatus) {
@@ -8477,8 +8476,8 @@ function addUsage(a, b) {
 }
 function parseCodexTranscriptUsage(transcript, options = {}) {
   if (!transcript) return null;
-  const lines = transcript.split("\n");
-  const hasCanonicalAssistant = lines.some((line) => {
+  const lines2 = transcript.split("\n");
+  const hasCanonicalAssistant = lines2.some((line) => {
     try {
       const entry = JSON.parse(line);
       return entry?.type === "event_msg" && entry?.payload?.type === "agent_message";
@@ -8492,8 +8491,8 @@ function parseCodexTranscriptUsage(transcript, options = {}) {
   let previous = { input: 0, output: 0, cacheCreation: 0, cacheRead: 0 };
   let latest = null;
   let sawSnapshot = false;
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i].trim();
+  for (let i = 0; i < lines2.length; i++) {
+    const line = lines2[i].trim();
     if (!line) continue;
     let entry;
     try {
@@ -8675,8 +8674,8 @@ function parseClaudeTranscriptUsage(transcript, fallbackDay = (/* @__PURE__ */ n
       const entryModel = typeof message.model === "string" && message.model ? message.model : "unknown";
       if (entryModel !== "<synthetic>") model = entryModel;
       const day = isoDay(entry.timestamp, fallbackDay);
-      const key = `${day}\0${entryModel}`;
-      const row2 = rollups.get(key) ?? {
+      const key2 = `${day}\0${entryModel}`;
+      const row2 = rollups.get(key2) ?? {
         day,
         model: entryModel,
         turns: 0,
@@ -8690,7 +8689,7 @@ function parseClaudeTranscriptUsage(transcript, fallbackDay = (/* @__PURE__ */ n
       row2.output_tokens += counts.output_tokens;
       row2.cache_creation_input_tokens += counts.cache_creation_input_tokens;
       row2.cache_read_input_tokens += counts.cache_read_input_tokens;
-      rollups.set(key, row2);
+      rollups.set(key2, row2);
       turns += 1;
       usage2.input_tokens += counts.input_tokens;
       usage2.output_tokens += counts.output_tokens;
@@ -8767,20 +8766,20 @@ async function promptAgentSelection(detected) {
   detected.forEach((a, i) => console.log(`  ${i + 1}. ${a.name}`));
   console.log(`  ${detected.length + 1}. Both / all (default)`);
   const rl = createInterface2({ input: process.stdin, output: process.stdout });
-  const ask3 = () => new Promise((resolve8) => {
+  const ask3 = () => new Promise((resolve9) => {
     rl.question(`Pick [1-${detected.length + 1}] (default: all): `, (answer) => {
       const t = answer.trim().toLowerCase();
       if (t === "" || t === String(detected.length + 1) || t === "both" || t === "all") {
         rl.close();
-        return resolve8(detected);
+        return resolve9(detected);
       }
       const n = parseInt(t, 10);
       if (Number.isInteger(n) && n >= 1 && n <= detected.length) {
         rl.close();
-        return resolve8([detected[n - 1]]);
+        return resolve9([detected[n - 1]]);
       }
       console.log("Invalid choice. Try again.");
-      resolve8(ask3());
+      resolve9(ask3());
     });
   });
   return ask3();
@@ -8803,17 +8802,17 @@ async function promptCursorApiKey(opts) {
     return;
   }
   const rl = createInterface2({ input: process.stdin, output: process.stdout });
-  const key = await new Promise((resolve8) => {
+  const key2 = await new Promise((resolve9) => {
     rl.question(
       "Cursor grading needs a Cursor API key (cursor.com \u2192 Settings \u2192 API Keys).\nPaste it now, or press Enter to skip (Cursor workers stay idle until set): ",
       (answer) => {
         rl.close();
-        resolve8(answer.trim());
+        resolve9(answer.trim());
       }
     );
   });
-  if (key) {
-    writeCursorApiKey2(key);
+  if (key2) {
+    writeCursorApiKey2(key2);
     console.log("  \u2713 Cursor API key saved.");
   } else {
     console.log("  \u26A0 Skipped \u2014 Cursor workers will be idle. Re-run install or pass --cursor-api-key=\u2026 later.");
@@ -8823,7 +8822,7 @@ async function promptDeployLocation(current = "local") {
   if (!process.stdin.isTTY) return current;
   const other = current === "cloud" ? "local" : "cloud";
   const rl = createInterface2({ input: process.stdin, output: process.stdout });
-  return new Promise((resolve8) => {
+  return new Promise((resolve9) => {
     rl.question(
       `Where should Synkro run?
   local \u2014 a grading container on this machine (Docker)
@@ -8832,7 +8831,7 @@ Each worker uses the account credentials you authorize. Choose [${current}] / ${
       (answer) => {
         rl.close();
         const a = answer.trim().toLowerCase();
-        resolve8(a === "cloud" ? "cloud" : a === "local" ? "local" : current);
+        resolve9(a === "cloud" ? "cloud" : a === "local" ? "local" : current);
       }
     );
   });
@@ -8986,7 +8985,7 @@ function writeConfigEnv(opts) {
   const safeTier = sanitizeConfigValue(opts.tier ?? "pro", 32);
   const safeInference = sanitizeConfigValue(opts.inference ?? "fast", 16);
   const safeSynkroBin = sanitizeConfigValue(opts.synkroBin ?? "", 1024);
-  const lines = [
+  const lines2 = [
     "# Synkro CLI config (managed by synkro install)",
     "# JWT auth \u2014 the hook scripts read SYNKRO_CREDENTIALS_PATH at runtime",
     "# and send Authorization: Bearer <access_token> on every gateway call.",
@@ -8994,27 +8993,27 @@ function writeConfigEnv(opts) {
     `SYNKRO_CREDENTIALS_PATH=${shellQuoteSingle2(credsPath)}`,
     `SYNKRO_TIER=${shellQuoteSingle2(safeTier)}`,
     `SYNKRO_INFERENCE=${shellQuoteSingle2(safeInference)}`,
-    `SYNKRO_VERSION=${shellQuoteSingle2("1.10.8")}`
+    `SYNKRO_VERSION=${shellQuoteSingle2("1.10.10")}`
   ];
-  if (safeSynkroBin) lines.push(`SYNKRO_CLI_BIN=${shellQuoteSingle2(safeSynkroBin)}`);
-  if (safeUserId) lines.push(`SYNKRO_USER_ID=${shellQuoteSingle2(safeUserId)}`);
-  if (safeOrgId) lines.push(`SYNKRO_ORG_ID=${shellQuoteSingle2(safeOrgId)}`);
-  if (safeEmail) lines.push(`SYNKRO_EMAIL=${shellQuoteSingle2(safeEmail)}`);
+  if (safeSynkroBin) lines2.push(`SYNKRO_CLI_BIN=${shellQuoteSingle2(safeSynkroBin)}`);
+  if (safeUserId) lines2.push(`SYNKRO_USER_ID=${shellQuoteSingle2(safeUserId)}`);
+  if (safeOrgId) lines2.push(`SYNKRO_ORG_ID=${shellQuoteSingle2(safeOrgId)}`);
+  if (safeEmail) lines2.push(`SYNKRO_EMAIL=${shellQuoteSingle2(safeEmail)}`);
   if (opts.transcriptConsent !== void 0) {
-    lines.push(`SYNKRO_TRANSCRIPT_CONSENT=${shellQuoteSingle2(opts.transcriptConsent ? "yes" : "no")}`);
+    lines2.push(`SYNKRO_TRANSCRIPT_CONSENT=${shellQuoteSingle2(opts.transcriptConsent ? "yes" : "no")}`);
   }
-  if (opts.transcriptConsentCC !== void 0) lines.push(`SYNKRO_TRANSCRIPT_CONSENT_CC=${shellQuoteSingle2(opts.transcriptConsentCC ? "yes" : "no")}`);
-  if (opts.transcriptConsentCursor !== void 0) lines.push(`SYNKRO_TRANSCRIPT_CONSENT_CURSOR=${shellQuoteSingle2(opts.transcriptConsentCursor ? "yes" : "no")}`);
-  if (opts.transcriptConsentCodex !== void 0) lines.push(`SYNKRO_TRANSCRIPT_CONSENT_CODEX=${shellQuoteSingle2(opts.transcriptConsentCodex ? "yes" : "no")}`);
-  lines.push(`SYNKRO_LOCAL_INFERENCE=${shellQuoteSingle2(opts.localInference ? "yes" : "no")}`);
+  if (opts.transcriptConsentCC !== void 0) lines2.push(`SYNKRO_TRANSCRIPT_CONSENT_CC=${shellQuoteSingle2(opts.transcriptConsentCC ? "yes" : "no")}`);
+  if (opts.transcriptConsentCursor !== void 0) lines2.push(`SYNKRO_TRANSCRIPT_CONSENT_CURSOR=${shellQuoteSingle2(opts.transcriptConsentCursor ? "yes" : "no")}`);
+  if (opts.transcriptConsentCodex !== void 0) lines2.push(`SYNKRO_TRANSCRIPT_CONSENT_CODEX=${shellQuoteSingle2(opts.transcriptConsentCodex ? "yes" : "no")}`);
+  lines2.push(`SYNKRO_LOCAL_INFERENCE=${shellQuoteSingle2(opts.localInference ? "yes" : "no")}`);
   const safeMode = sanitizeConfigValue(opts.deploymentMode ?? "docker", 16);
-  lines.push(`SYNKRO_DEPLOYMENT_MODE=${shellQuoteSingle2(safeMode)}`);
-  lines.push(`SYNKRO_GRADING_MODE=${shellQuoteSingle2(sanitizeConfigValue(opts.gradingMode ?? "local", 16))}`);
-  lines.push(`SYNKRO_STORAGE_MODE=${shellQuoteSingle2(sanitizeConfigValue(opts.storageMode ?? "local", 16))}`);
-  lines.push(`SYNKRO_DEPLOY_LOCATION=${shellQuoteSingle2(sanitizeConfigValue(opts.deployLocation ?? "local", 16))}`);
-  lines.push(`SYNKRO_HOOK_MODE=${shellQuoteSingle2(sanitizeConfigValue(opts.hookMode ?? "stub", 8))}`);
-  lines.push("");
-  writeFileSync17(CONFIG_PATH4, lines.join("\n"), "utf-8");
+  lines2.push(`SYNKRO_DEPLOYMENT_MODE=${shellQuoteSingle2(safeMode)}`);
+  lines2.push(`SYNKRO_GRADING_MODE=${shellQuoteSingle2(sanitizeConfigValue(opts.gradingMode ?? "local", 16))}`);
+  lines2.push(`SYNKRO_STORAGE_MODE=${shellQuoteSingle2(sanitizeConfigValue(opts.storageMode ?? "local", 16))}`);
+  lines2.push(`SYNKRO_DEPLOY_LOCATION=${shellQuoteSingle2(sanitizeConfigValue(opts.deployLocation ?? "local", 16))}`);
+  lines2.push(`SYNKRO_HOOK_MODE=${shellQuoteSingle2(sanitizeConfigValue(opts.hookMode ?? "stub", 8))}`);
+  lines2.push("");
+  writeFileSync17(CONFIG_PATH4, lines2.join("\n"), "utf-8");
   chmodSync5(CONFIG_PATH4, 384);
 }
 function persistedTranscriptConsent(source) {
@@ -9741,7 +9740,7 @@ async function installCommand(opts = {}) {
   await setTelemetryState({ enabled: true, remoteFlushEnabled: telemetryConsent });
   emit("install", {
     phase: "started",
-    cli_version_to: "1.10.8",
+    cli_version_to: "1.10.10",
     agents_detected: agents.map((a) => a.kind),
     with_github: false,
     with_local_cc: false,
@@ -10303,15 +10302,15 @@ function parseSynkroToml2(raw) {
     }
     const eq = line.indexOf("=");
     if (eq === -1) continue;
-    const key = line.slice(0, eq).trim().replace(/^["']|["']$/g, "");
+    const key2 = 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;
+    if (section) result[section][key2] = value;
+    else result[key2] = value;
   }
   return result;
 }
@@ -10592,8 +10591,8 @@ async function syncSkillFiles() {
       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)`);
+    const lines2 = content.split("\n").length;
+    console.log(`  \u2192 read ${source} (${lines2} lines, ${(content.length / 1024).toFixed(1)} KB)`);
     return { source, content };
   }).filter(Boolean);
   if (tasks.length === 0) return;
@@ -10872,10 +10871,10 @@ function extractSessionInsights(projectsDir) {
     const filePath = join19(projectsDir, file);
     try {
       const content = readFileSync21(filePath, "utf-8");
-      const lines = content.split("\n").filter(Boolean);
-      for (let i = 0; i < lines.length; i++) {
+      const lines2 = content.split("\n").filter(Boolean);
+      for (let i = 0; i < lines2.length; i++) {
         try {
-          const entry = JSON.parse(lines[i]);
+          const entry = JSON.parse(lines2[i]);
           if (entry.type === "user" && typeof entry.message?.content === "string" && entry.message.content.startsWith("This session is being continued")) {
             insights.push({
               session_id: sessionId,
@@ -10888,9 +10887,9 @@ function extractSessionInsights(projectsDir) {
         }
       }
       const userMessages = [];
-      for (let i = lines.length - 1; i >= 0 && userMessages.length < 20; i--) {
+      for (let i = lines2.length - 1; i >= 0 && userMessages.length < 20; i--) {
         try {
-          const entry = JSON.parse(lines[i]);
+          const entry = JSON.parse(lines2[i]);
           if (entry.type === "user") {
             const text = typeof entry.message?.content === "string" ? entry.message.content : Array.isArray(entry.message?.content) ? entry.message.content.map((b) => b.text ?? b).filter((t) => typeof t === "string").join(" ") : null;
             if (text && text.length > 10 && text.length < 2e3 && !text.startsWith("This session is being continued")) {
@@ -10949,13 +10948,13 @@ function extractTextContent(content) {
 function getCodexTranscriptFiles(repo) {
   const sessionsDir = join19(process.env.CODEX_HOME || join19(homedir21(), ".codex"), "sessions");
   if (!existsSync22(sessionsDir)) return [];
-  let relative2 = [];
+  let relative3 = [];
   try {
-    relative2 = readdirSync4(sessionsDir, { recursive: true, encoding: "utf-8" });
+    relative3 = readdirSync4(sessionsDir, { recursive: true, encoding: "utf-8" });
   } catch {
     return [];
   }
-  return relative2.filter((p) => p.endsWith(".jsonl")).map((p) => join19(sessionsDir, p)).filter((filePath) => {
+  return relative3.filter((p) => p.endsWith(".jsonl")).map((p) => join19(sessionsDir, p)).filter((filePath) => {
     try {
       const first = readFileSync21(filePath, "utf-8").split("\n", 1)[0];
       const meta = JSON.parse(first);
@@ -10972,11 +10971,11 @@ function isJsonSyntaxError(error) {
 }
 function parseCodexTranscriptFile(filePath) {
   const transcript = readFileSync21(filePath, "utf-8");
-  const lines = transcript.split("\n");
+  const lines2 = transcript.split("\n");
   const transcriptUsage = parseCodexTranscriptUsage(transcript);
   let sessionId = "";
   let model = "";
-  for (const line of lines) {
+  for (const line of lines2) {
     try {
       const entry = JSON.parse(line);
       if (entry.type === "session_meta") {
@@ -11060,11 +11059,11 @@ function isSafeConvId(id) {
 }
 function parseCursorTranscriptFile(filePath) {
   const content = readFileSync21(filePath, "utf-8");
-  const lines = content.split("\n").filter(Boolean);
+  const lines2 = content.split("\n").filter(Boolean);
   const messages = [];
-  for (let i = 0; i < lines.length; i++) {
+  for (let i = 0; i < lines2.length; i++) {
     try {
-      const entry = JSON.parse(lines[i]);
+      const entry = JSON.parse(lines2[i]);
       const role = entry.role || entry.message?.role;
       if (role !== "user" && role !== "assistant") continue;
       const text = extractTextContent(entry.message?.content ?? entry.content);
@@ -11124,11 +11123,11 @@ async function syncCursorTranscriptsLocal(mcpPort, mcpToken, repo) {
 }
 function parseTranscriptFile(filePath) {
   const content = readFileSync21(filePath, "utf-8");
-  const lines = content.split("\n").filter(Boolean);
+  const lines2 = content.split("\n").filter(Boolean);
   const messages = [];
-  for (let i = 0; i < lines.length; i++) {
+  for (let i = 0; i < lines2.length; i++) {
     try {
-      const entry = JSON.parse(lines[i]);
+      const entry = JSON.parse(lines2[i]);
       if (entry.type !== "user" && entry.type !== "assistant") continue;
       const msg = {
         message_index: i,
@@ -12030,10 +12029,10 @@ function confirmPurge() {
     return Promise.resolve(false);
   }
   const rl = createInterface3({ input: process.stdin, output: process.stdout });
-  return new Promise((resolve8) => {
+  return new Promise((resolve9) => {
     rl.question("   Type 'yes' to wipe everything (anything else cancels): ", (answer) => {
       rl.close();
-      resolve8(answer.trim().toLowerCase() === "yes");
+      resolve9(answer.trim().toLowerCase() === "yes");
     });
   });
 }
@@ -12194,8 +12193,8 @@ function readRecentTurns(n = 20) {
     const size = statSync3(TURN_LOG_PATH).size;
     if (size === 0) return [];
     const text = readFileSync23(TURN_LOG_PATH, "utf-8");
-    const lines = text.split("\n").filter(Boolean);
-    const lastN = lines.slice(-n).reverse();
+    const lines2 = text.split("\n").filter(Boolean);
+    const lastN = lines2.slice(-n).reverse();
     return lastN.map((line) => {
       try {
         return JSON.parse(line);
@@ -12286,7 +12285,7 @@ async function submitToChannel(role, payload, opts = {}) {
   const port = opts.port ?? CHANNEL_PORT;
   const startedAt = Date.now();
   try {
-    const result = await new Promise((resolve8, reject) => {
+    const result = await new Promise((resolve9, reject) => {
       const req = httpRequest({
         host: CHANNEL_HOST,
         port,
@@ -12312,7 +12311,7 @@ async function submitToChannel(role, payload, opts = {}) {
               reject(new LocalCCError(parsed.error));
               return;
             }
-            resolve8(String(parsed.result ?? ""));
+            resolve9(String(parsed.result ?? ""));
           } catch (err) {
             reject(new LocalCCError(`malformed channel response: ${text.slice(0, 200)}`, err));
           }
@@ -12338,14 +12337,14 @@ async function submitToChannel(role, payload, opts = {}) {
   }
 }
 function isChannelAvailable(port = CHANNEL_PORT, timeoutMs = 500) {
-  return new Promise((resolve8) => {
+  return new Promise((resolve9) => {
     const sock = connect(port, CHANNEL_HOST);
     const done = (ok) => {
       try {
         sock.destroy();
       } catch {
       }
-      resolve8(ok);
+      resolve9(ok);
     };
     sock.once("connect", () => done(true));
     sock.once("error", () => done(false));
@@ -12377,10 +12376,10 @@ __export(grade_exports, {
   gradeCommand: () => gradeCommand
 });
 async function readStdin() {
-  return new Promise((resolve8, reject) => {
+  return new Promise((resolve9, reject) => {
     const chunks = [];
     process.stdin.on("data", (c) => chunks.push(c));
-    process.stdin.on("end", () => resolve8(Buffer.concat(chunks).toString("utf-8")));
+    process.stdin.on("end", () => resolve9(Buffer.concat(chunks).toString("utf-8")));
     process.stdin.on("error", reject);
   });
 }
@@ -12467,9 +12466,9 @@ async function fetchOrgRules(gatewayUrl, apiKey) {
 function applyLiteralMatchNegative(rules, file) {
   if (!file.patch) return [];
   const findings = [];
-  const lines = file.patch.split("\n");
+  const lines2 = file.patch.split("\n");
   let currentNewLine = 0;
-  for (const line of lines) {
+  for (const line of lines2) {
     if (line.startsWith("@@")) {
       const m = line.match(/\+(\d+)(?:,\d+)?/);
       if (m) currentNewLine = parseInt(m[1], 10);
@@ -12597,12 +12596,12 @@ async function fetchScanContext(gatewayUrl, apiKey, repo, prNumber, sha) {
 }
 function getFileDiffWithLines(file) {
   if (!file.patch) return { hunks: "", newFileLineMap: /* @__PURE__ */ new Map() };
-  const lines = file.patch.split("\n");
+  const lines2 = file.patch.split("\n");
   const annotated = [];
   const lineMap = /* @__PURE__ */ new Map();
   let currentNewLine = 0;
   let patchIndex = 0;
-  for (const line of lines) {
+  for (const line of lines2) {
     patchIndex++;
     if (line.startsWith("@@")) {
       const match = line.match(/\+(\d+)(?:,\d+)?/);
@@ -12634,7 +12633,7 @@ function spawnClaudeJudge(file, claudeToken, promptHeader) {
 Diff:
 ${hunks}`;
   const fullPrompt = promptHeader + userMessage;
-  return new Promise((resolve8) => {
+  return new Promise((resolve9) => {
     const t0 = Date.now();
     const proc = spawn6(
       "claude",
@@ -12662,7 +12661,7 @@ ${hunks}`;
       const latencyMs = Date.now() - t0;
       if (code !== 0) {
         console.warn(`  claude exited ${code}: ${(stderr || stdout).slice(0, 500)}`);
-        resolve8({ findings: [], latencyMs });
+        resolve9({ findings: [], latencyMs });
         return;
       }
       try {
@@ -12681,10 +12680,10 @@ ${hunks}`;
           description: f.description,
           fix: f.fix
         }));
-        resolve8({ findings, latencyMs });
+        resolve9({ findings, latencyMs });
       } catch (parseErr) {
         console.warn(`  failed to parse claude response: ${stdout.slice(0, 300)}`);
-        resolve8({ findings: [], latencyMs });
+        resolve9({ findings: [], latencyMs });
       }
     });
   });
@@ -12733,7 +12732,7 @@ ${JSON.stringify(findings, null, 2)}
 `;
 }
 function spawnOpusConsolidator(findings, claudeToken) {
-  return new Promise((resolve8) => {
+  return new Promise((resolve9) => {
     const prompt = buildConsolidationPrompt(findings);
     const proc = spawn6(
       "claude",
@@ -12760,7 +12759,7 @@ function spawnOpusConsolidator(findings, claudeToken) {
     proc.on("close", (code) => {
       if (code !== 0) {
         console.warn(`  opus consolidation exited ${code}: ${(stderr || stdout).slice(0, 300)}`);
-        resolve8(fallbackReview(findings));
+        resolve9(fallbackReview(findings));
         return;
       }
       try {
@@ -12781,10 +12780,10 @@ function spawnOpusConsolidator(findings, claudeToken) {
           const order = ["low", "medium", "high", "critical"];
           return order.indexOf(f.severity) > order.indexOf(max) ? f.severity : max;
         }, "low");
-        resolve8({ summary: review.summary || "", comments, severity: maxSeverity });
+        resolve9({ summary: review.summary || "", comments, severity: maxSeverity });
       } catch {
         console.warn(`  failed to parse opus response, using fallback`);
-        resolve8(fallbackReview(findings));
+        resolve9(fallbackReview(findings));
       }
     });
   });
@@ -12792,15 +12791,15 @@ function spawnOpusConsolidator(findings, claudeToken) {
 function fallbackReview(findings) {
   const grouped = /* @__PURE__ */ new Map();
   for (const f of findings) {
-    const key = `${f.file}::${f.category}`;
-    if (!grouped.has(key)) grouped.set(key, []);
-    grouped.get(key).push(f);
+    const key2 = `${f.file}::${f.category}`;
+    if (!grouped.has(key2)) grouped.set(key2, []);
+    grouped.get(key2).push(f);
   }
   const comments = [];
   for (const [, group] of grouped) {
     const first = group[0];
-    const lines = group.map((f) => f.line);
-    const linesStr = lines.length > 1 ? `Lines ${lines.join(", ")}` : `Line ${lines[0]}`;
+    const lines2 = group.map((f) => f.line);
+    const linesStr = lines2.length > 1 ? `Lines ${lines2.join(", ")}` : `Line ${lines2[0]}`;
     const severityEmoji = first.severity === "critical" ? "\u{1F534}" : first.severity === "high" ? "\u{1F7E0}" : first.severity === "medium" ? "\u{1F7E1}" : "\u{1F535}";
     comments.push({
       path: first.file,
@@ -13254,10 +13253,10 @@ function stopTask(channel = CHANNEL_PRIMARY) {
     t = findTask(channel);
   }
 }
-function tailLogs(lines = 80, channel = CHANNEL_PRIMARY) {
+function tailLogs(lines2 = 80, channel = CHANNEL_PRIMARY) {
   const t = findTask(channel);
   if (!t) return `(no ${channel.taskLabel} task)`;
-  const r = spawnSync9("pueue", ["log", "--lines", String(lines), String(t.id)], { encoding: "utf-8" });
+  const r = spawnSync9("pueue", ["log", "--lines", String(lines2), String(t.id)], { encoding: "utf-8" });
   return r.stdout || r.stderr || "(no output)";
 }
 function ensureRunning(opts = {}) {
@@ -13267,14 +13266,14 @@ function ensureRunning(opts = {}) {
   return startTask(opts);
 }
 function probePort(host, port, timeoutMs = 500) {
-  return new Promise((resolve8) => {
+  return new Promise((resolve9) => {
     const sock = connect2(port, host);
     const done = (ok) => {
       try {
         sock.destroy();
       } catch {
       }
-      resolve8(ok);
+      resolve9(ok);
     };
     sock.once("connect", () => done(true));
     sock.once("error", () => done(false));
@@ -13824,7 +13823,7 @@ function cmdLogs(rest) {
     if (!raw) console.log("  " + colorize("(use --raw / -r to see full payloads, --live / -f to follow)", 90));
     return;
   }
-  return new Promise((resolve8) => {
+  return new Promise((resolve9) => {
     console.log("  " + colorize("\u2014 following new turns (Ctrl-C to exit) \u2014", 90));
     const stop = followTurns((t) => {
       console.log("  " + formatTurn(t, raw));
@@ -13832,7 +13831,7 @@ function cmdLogs(rest) {
     const onSigint = () => {
       stop();
       process.removeListener("SIGINT", onSigint);
-      resolve8();
+      resolve9();
     };
     process.on("SIGINT", onSigint);
   });
@@ -14050,7 +14049,7 @@ function extractToolResultText(content, e) {
 function parseSession(file, seenStableIds) {
   const { filePath, sessionId, parentSessionId } = file;
   const transcript = readFileSync27(filePath, "utf-8");
-  const lines = transcript.split("\n").filter(Boolean);
+  const lines2 = transcript.split("\n").filter(Boolean);
   const transcriptUsage = parseClaudeTranscriptUsage(
     transcript,
     statSync4(filePath).mtime.toISOString().slice(0, 10),
@@ -14062,10 +14061,10 @@ function parseSession(file, seenStableIds) {
   const messages = [];
   const actions = [];
   let step = 0;
-  for (let i = 0; i < lines.length; i++) {
+  for (let i = 0; i < lines2.length; i++) {
     let e;
     try {
-      e = JSON.parse(lines[i]);
+      e = JSON.parse(lines2[i]);
     } catch {
       continue;
     }
@@ -14121,9 +14120,9 @@ function parseSession(file, seenStableIds) {
 }
 function ask2(q) {
   const rl = createInterface4({ input: process.stdin, output: process.stdout });
-  return new Promise((resolve8) => rl.question(q, (a) => {
+  return new Promise((resolve9) => rl.question(q, (a) => {
     rl.close();
-    resolve8(/^y(es)?$/i.test(a.trim()));
+    resolve9(/^y(es)?$/i.test(a.trim()));
   }));
 }
 async function importCommand() {
@@ -14261,8 +14260,8 @@ function computeDigest(canonical2) {
 }
 function verifySignature(digest, signatureB64, publicKeyPem) {
   try {
-    const key = crypto.createPublicKey(publicKeyPem);
-    return crypto.verify(null, Buffer.from(digest, "utf8"), key, Buffer.from(signatureB64, "base64"));
+    const key2 = crypto.createPublicKey(publicKeyPem);
+    return crypto.verify(null, Buffer.from(digest, "utf8"), key2, Buffer.from(signatureB64, "base64"));
   } catch {
     return false;
   }
@@ -14654,6 +14653,7 @@ function buildSpawnAgent(opts) {
     ["tmux", "set-option", "-t", session, "-q", "@synkro_harness", opts.harness],
     ["tmux", "set-option", "-t", session, "-q", "@synkro_space", opts.space],
     ["tmux", "set-option", "-t", session, "-q", "@synkro_backend", opts.backend],
+    ["tmux", "set-option", "-t", session, "-q", "@synkro_mode", opts.mode || "native"],
     // Keep the pane visible after exit so the sidebar can render 'done'
     // instead of the agent silently vanishing.
     ["tmux", "set-option", "-t", session, "remain-on-exit", "on"]
@@ -14675,7 +14675,7 @@ function buildAgentSnapshot() {
   return ["sh", "-c", script];
 }
 function parseAgentSnapshot(output) {
-  const lines = String(output || "").split("\n");
+  const lines2 = String(output || "").split("\n");
   const captures = /* @__PURE__ */ new Map();
   const listLines = [];
   let current = null;
@@ -14683,7 +14683,7 @@ function parseAgentSnapshot(output) {
   const flush2 = () => {
     if (current) captures.set(current, chunk.join("\n"));
   };
-  for (const line of lines) {
+  for (const line of lines2) {
     if (line.startsWith("===")) {
       flush2();
       current = line.slice(3).trim();
@@ -14962,12 +14962,12 @@ async function discoverAgents(runner, backend, memory) {
 }
 function offlineAgents(live, records) {
   const alive = new Set(live.map((agent) => agent.session));
-  return records.filter((record) => !alive.has(record.session)).map((record) => ({
-    name: record.name,
-    session: record.session,
-    harness: record.harness,
-    space: record.space,
-    backend: record.backend,
+  return records.filter((record2) => !alive.has(record2.session)).map((record2) => ({
+    name: record2.name,
+    session: record2.session,
+    harness: record2.harness,
+    space: record2.space,
+    backend: record2.backend,
     status: "offline"
   }));
 }
@@ -15004,8 +15004,8 @@ function saveRecords(records) {
   } catch {
   }
 }
-function recordSession(record) {
-  saveRecords([...loadRecords().filter((row2) => row2.session !== record.session), record]);
+function recordSession(record2) {
+  saveRecords([...loadRecords().filter((row2) => row2.session !== record2.session), record2]);
 }
 function forgetSession(session) {
   saveRecords(loadRecords().filter((row2) => row2.session !== session));
@@ -15040,11 +15040,11 @@ function lastAgentFor(space) {
   return loadLastAgents()[String(space || "").replace(/\/+$/, "")] || "";
 }
 function rememberLastAgent(space, session) {
-  const key = String(space || "").replace(/\/+$/, "");
-  if (!key || !session) return;
+  const key2 = String(space || "").replace(/\/+$/, "");
+  if (!key2 || !session) return;
   try {
     mkdirSync21(dirname10(LAST_AGENT_FILE), { recursive: true });
-    writeFileSync24(LAST_AGENT_FILE, JSON.stringify({ ...loadLastAgents(), [key]: session }, null, 2));
+    writeFileSync24(LAST_AGENT_FILE, JSON.stringify({ ...loadLastAgents(), [key2]: session }, null, 2));
   } catch {
   }
 }
@@ -15083,9 +15083,17 @@ var init_manifest = __esm({
 });
 
 // cli/ui/launch.ts
-import { mkdirSync as mkdirSync22, writeFileSync as writeFileSync25 } from "fs";
+import { mkdirSync as mkdirSync22, statSync as statSync5, writeFileSync as writeFileSync25 } from "fs";
 import { homedir as homedir34 } from "os";
 import { join as join34 } from "path";
+function buildStamp(bootPath) {
+  try {
+    const stat = statSync5(bootPath);
+    return String(stat.size) + ":" + String(Math.floor(stat.mtimeMs));
+  } catch {
+    return bootPath;
+  }
+}
 function sidebarColumns(totalColumns) {
   return String(Math.max(20, Math.min(34, Math.round(totalColumns * 0.24))));
 }
@@ -15187,8 +15195,151 @@ async function styleOuterSession(bootPath, repoCwd, sidebarWidth) {
     // Alt+s always returns focus to the sidebar (the leftmost pane).
     ["bind-key", "-n", "M-s", "select-pane", "-L"]
   ];
-  for (const argv of style) await run(HOST, ["tmux", ...argv]);
-  for (const argv of buildClipboardBindings(UI_SESSION)) await run(HOST, argv);
+  for (const argv of style) {
+    if (!(await run(HOST, ["tmux", ...argv])).ok) return false;
+  }
+  for (const argv of buildClipboardBindings(UI_SESSION)) {
+    if (!(await run(HOST, argv)).ok) return false;
+  }
+  return true;
+}
+function parseUiPanes(output) {
+  return String(output || "").split("\n").map((line) => line.split("|")).filter((cols) => cols.length >= 7).map(([window, pane, width, dead, remain, cwd, ...command]) => ({
+    window,
+    pane,
+    width: Number(width) || 0,
+    dead: dead === "1",
+    remain: remain === "on",
+    cwd,
+    command: command.join("|")
+  })).filter((row2) => Boolean(row2.window && row2.pane));
+}
+async function ensureUiCenterPane(options) {
+  const listed = await run(HOST, [
+    "tmux",
+    "list-panes",
+    "-t",
+    options.sidebarPane,
+    "-F",
+    "#{pane_id}|#{pane_dead}|#{remain-on-exit}|#{pane_start_command}"
+  ]);
+  if (!listed.ok) return { ok: false, pane: "", created: false, recovered: false };
+  const rows = listed.stdout.split("\n").map((line) => line.split("|")).filter((cols) => cols.length >= 4).map(([pane, dead, remain, ...command]) => ({
+    pane,
+    dead: dead === "1",
+    remain: remain === "on",
+    command: command.join("|")
+  }));
+  let center = rows.find((row2) => row2.pane !== options.sidebarPane);
+  let created = false;
+  if (!center) {
+    const split = await run(HOST, [
+      "tmux",
+      "split-window",
+      "-h",
+      "-t",
+      options.sidebarPane,
+      "-c",
+      options.cwd,
+      "-P",
+      "-F",
+      "#{pane_id}",
+      "tail -f /dev/null"
+    ]);
+    const pane = split.stdout.trim();
+    if (!split.ok || !pane) return { ok: false, pane: "", created: false, recovered: false };
+    center = { pane, dead: false, remain: false, command: "tail -f /dev/null" };
+    created = true;
+  }
+  const kept = await run(HOST, buildKeepPaneAfterExit(center.pane));
+  if (!kept.ok) return { ok: false, pane: center.pane, created, recovered: false };
+  const recovered = created || center.dead;
+  if (recovered) {
+    const command = options.terminalCommand === void 0 ? makeTerminalCommand(options.bootPath) : options.terminalCommand;
+    const respawn = ["tmux", "respawn-pane", "-k", "-t", center.pane, "-c", options.cwd];
+    if (command) respawn.push(command);
+    const restored = await run(HOST, respawn);
+    if (!restored.ok) return { ok: false, pane: center.pane, created, recovered: false };
+    const spaceName = options.cwd.split("/").filter(Boolean).pop() || "space";
+    const metadata = [
+      ["tmux", "set-option", "-t", center.pane, "-w", "-q", "@synkro_agent", ""],
+      ["tmux", "set-option", "-t", center.pane, "-w", "-q", "@synkro_cwd", options.cwd],
+      ["tmux", "set-option", "-t", center.pane, "-w", "-q", "@synkro_kind", "terminal"],
+      ["tmux", "set-option", "-t", center.pane, "-w", "automatic-rename", "off"],
+      ["tmux", "rename-window", "-t", center.pane, tabTitle("terminal", spaceName)]
+    ];
+    for (const argv of metadata) {
+      if (!(await run(HOST, argv)).ok) return { ok: false, pane: center.pane, created, recovered: false };
+    }
+  }
+  return { ok: true, pane: center.pane, created, recovered };
+}
+async function reconcileUiShell(bootPath, repoCwd, options = {}) {
+  const listed = await run(HOST, [
+    "tmux",
+    "list-panes",
+    "-s",
+    "-t",
+    UI_SESSION,
+    "-F",
+    "#{window_id}|#{pane_id}|#{pane_width}|#{pane_dead}|#{remain-on-exit}|#{@synkro_cwd}|#{pane_start_command}"
+  ]);
+  if (!listed.ok) return { ok: false, changed: false };
+  const panes = parseUiPanes(listed.stdout);
+  const sidebars = panes.filter((row2) => row2.command.includes("--sidebar"));
+  if (sidebars.length === 0) return { ok: false, changed: false };
+  let changed = false;
+  for (const sidebar of sidebars) {
+    const previous = panes.find((row2) => row2.window === sidebar.window && row2.pane !== sidebar.pane);
+    const cwd = sidebar.cwd ? sidebar.cwd.startsWith("/") ? sidebar.cwd : join34(repoCwd, sidebar.cwd) : repoCwd;
+    const center = await ensureUiCenterPane({
+      sidebarPane: sidebar.pane,
+      bootPath,
+      cwd,
+      terminalCommand: options.terminalCommand
+    });
+    if (!center.ok) return { ok: false, changed };
+    if (sidebar.cwd !== cwd) {
+      const migrated2 = await run(HOST, ["tmux", "set-option", "-t", sidebar.window, "-w", "-q", "@synkro_cwd", cwd]);
+      if (!migrated2.ok) return { ok: false, changed };
+      changed = true;
+    }
+    const staleBinding = !sidebar.command.includes("SYNKRO_UI_CENTER=" + center.pane + " ");
+    if (options.refreshSidebars || center.recovered || staleBinding) {
+      const rebound = await run(HOST, [
+        "tmux",
+        "respawn-pane",
+        "-k",
+        "-t",
+        sidebar.pane,
+        sidebarCommand(bootPath, center.pane, repoCwd)
+      ]);
+      if (!rebound.ok) return { ok: false, changed };
+      changed = true;
+    }
+    if (!previous?.remain || center.created || center.recovered) changed = true;
+  }
+  return { ok: true, changed };
+}
+async function refreshUiShell(bootPath, repoCwd, options = {}) {
+  const expected = buildStamp(bootPath);
+  const current = await run(HOST, ["tmux", "show-options", "-t", UI_SESSION, "-v", "@synkro_build"]);
+  const buildChanged = !current.ok || current.stdout.trim() !== expected;
+  if (buildChanged) {
+    const width = await currentWindowColumns(UI_SESSION);
+    if (!await styleOuterSession(bootPath, repoCwd, Number(sidebarColumns(width)))) return false;
+  }
+  const reconciled = await reconcileUiShell(bootPath, repoCwd, {
+    terminalCommand: options.terminalCommand,
+    refreshSidebars: buildChanged
+  });
+  if (!reconciled.ok) return false;
+  if (reconciled.changed && options.persistLayout !== false) await snapshotTabs();
+  if (buildChanged) {
+    const stamped = await run(HOST, ["tmux", "set-option", "-t", UI_SESSION, "-q", "@synkro_build", expected]);
+    if (!stamped.ok) return false;
+  }
+  return true;
 }
 async function buildTab(bootPath, repoCwd, spec) {
   await run(HOST, ["tmux", "set-option", "-g", "history-limit", "50000"]);
@@ -15196,8 +15347,20 @@ async function buildTab(bootPath, repoCwd, spec) {
   if (!await uiSessionExists()) {
     const cols = String(Number(process.stdout.columns || 0) || 220);
     const rows = String(Number(process.stdout.rows || 0) || 55);
-    const create = ["tmux", "new-session", "-d", "-s", UI_SESSION, "-x", cols, "-y", rows, "-c", spec.cwd];
-    if (spec.center) create.push(spec.center);
+    const create = [
+      "tmux",
+      "new-session",
+      "-d",
+      "-s",
+      UI_SESSION,
+      "-x",
+      cols,
+      "-y",
+      rows,
+      "-c",
+      spec.cwd,
+      "tail -f /dev/null"
+    ];
     const made = await run(HOST, create);
     if (!made.ok) {
       throw new Error("tmux new-session failed: " + made.stderr.trim());
@@ -15207,14 +15370,26 @@ async function buildTab(bootPath, repoCwd, spec) {
     const first = await run(HOST, ["tmux", "list-windows", "-t", UI_SESSION, "-F", "#{window_id}"]);
     windowTarget = first.stdout.split("\n")[0]?.trim() || UI_SESSION + ":1";
   } else {
-    const create = ["tmux", "new-window", "-t", UI_SESSION, "-P", "-F", "#{window_id}", "-c", spec.cwd];
-    if (spec.center) create.push(spec.center);
+    const create = [
+      "tmux",
+      "new-window",
+      "-t",
+      UI_SESSION,
+      "-P",
+      "-F",
+      "#{window_id}",
+      "-c",
+      spec.cwd,
+      "tail -f /dev/null"
+    ];
     const created = await run(HOST, create);
     windowTarget = created.stdout.trim();
     if (!created.ok || !windowTarget) return;
   }
   const sidebarCols = sidebarColumns(await currentWindowColumns(windowTarget));
-  await styleOuterSession(bootPath, repoCwd, Number(sidebarCols));
+  if (!await styleOuterSession(bootPath, repoCwd, Number(sidebarCols))) {
+    throw new Error("tmux outer session styling failed");
+  }
   const split = await run(HOST, [
     "tmux",
     "split-window",
@@ -15229,18 +15404,35 @@ async function buildTab(bootPath, repoCwd, spec) {
     "tail -f /dev/null"
   ]);
   const sidebarPane = split.stdout.trim();
+  if (!split.ok || !sidebarPane) throw new Error("tmux sidebar split failed: " + split.stderr.trim());
   const panes = await run(HOST, ["tmux", "list-panes", "-t", windowTarget, "-F", "#{pane_id}"]);
   const centerPane = panes.stdout.split("\n").map((line) => line.trim()).filter(Boolean).find((id) => id !== sidebarPane) || "";
-  await run(HOST, buildKeepPaneAfterExit(centerPane));
+  if (!centerPane) throw new Error("tmux center pane was not created");
+  const kept = await run(HOST, buildKeepPaneAfterExit(centerPane));
+  if (!kept.ok) throw new Error("tmux center durability failed: " + kept.stderr.trim());
   if (spec.agentSession) {
     await run(HOST, ["tmux", "set-option", "-t", windowTarget, "-w", "-q", "@synkro_agent", spec.agentSession]);
   }
   await run(HOST, ["tmux", "set-option", "-t", windowTarget, "-w", "-q", "@synkro_cwd", spec.cwd]);
   await run(HOST, ["tmux", "set-option", "-t", windowTarget, "-w", "-q", "@synkro_kind", spec.kind || "terminal"]);
-  await run(HOST, ["tmux", "respawn-pane", "-k", "-t", sidebarPane, sidebarCommand(bootPath, centerPane, repoCwd)]);
+  const sidebarStarted = await run(HOST, [
+    "tmux",
+    "respawn-pane",
+    "-k",
+    "-t",
+    sidebarPane,
+    sidebarCommand(bootPath, centerPane, repoCwd)
+  ]);
+  if (!sidebarStarted.ok) throw new Error("tmux sidebar start failed: " + sidebarStarted.stderr.trim());
+  const centerStart = ["tmux", "respawn-pane", "-k", "-t", centerPane, "-c", spec.cwd];
+  if (spec.center) centerStart.push(spec.center);
+  const centerStarted = await run(HOST, centerStart);
+  if (!centerStarted.ok) throw new Error("tmux center start failed: " + centerStarted.stderr.trim());
   const title = spec.title || tabTitle("terminal", spec.cwd.split("/").filter(Boolean).pop() || "space");
   await run(HOST, ["tmux", "set-option", "-t", windowTarget, "-w", "automatic-rename", "off"]);
   await run(HOST, ["tmux", "rename-window", "-t", windowTarget, title]);
+  const stamped = await run(HOST, ["tmux", "set-option", "-t", UI_SESSION, "-q", "@synkro_build", buildStamp(bootPath)]);
+  if (!stamped.ok) throw new Error("tmux build stamp failed: " + stamped.stderr.trim());
   await snapshotTabs();
   await run(HOST, ["tmux", "select-pane", "-t", spec.focus === "sidebar" ? sidebarPane : centerPane]);
 }
@@ -15282,6 +15474,10 @@ async function launchUi(bootPath, repoCwd) {
   rememberSpace(repoCwd);
   if (!await uiSessionExists()) {
     await buildTab(bootPath, repoCwd, { cwd: repoCwd, center: makeTerminalCommand(bootPath), focus: "sidebar" });
+  } else {
+    if (!await refreshUiShell(bootPath, repoCwd)) {
+      throw new Error("Synkro UI could not repair its tmux layout");
+    }
   }
   await pruneCollapsedClients();
   return runInherit(process.env.TMUX ? ["tmux", "switch-client", "-t", UI_SESSION] : ["tmux", "attach-session", "-t", UI_SESSION]);
@@ -15338,10 +15534,10 @@ function row(selected, width, content) {
   return STYLE.select + body.split(STYLE.reset).join(STYLE.reset + STYLE.select) + STYLE.reset;
 }
 function stripForPad(text, width) {
-  let visible = 0;
+  let visible2 = 0;
   let out = "";
   let index = 0;
-  while (index < text.length && visible < width) {
+  while (index < text.length && visible2 < width) {
     if (text.startsWith(ESC, index)) {
       const end = text.indexOf("m", index);
       if (end === -1) break;
@@ -15350,13 +15546,13 @@ function stripForPad(text, width) {
     } else {
       out += text[index];
       index += 1;
-      visible += 1;
+      visible2 += 1;
     }
   }
-  return out + " ".repeat(Math.max(0, width - visible));
+  return out + " ".repeat(Math.max(0, width - visible2));
 }
 function visibleLength(text) {
-  let visible = 0;
+  let visible2 = 0;
   let index = 0;
   while (index < text.length) {
     if (text.startsWith(ESC, index)) {
@@ -15364,11 +15560,11 @@ function visibleLength(text) {
       if (end === -1) break;
       index = end + 1;
     } else {
-      visible += 1;
+      visible2 += 1;
       index += 1;
     }
   }
-  return visible;
+  return visible2;
 }
 function splitRow(width, left, right) {
   const gap = Math.max(1, width - 2 - visibleLength(left) - visibleLength(right));
@@ -15380,10 +15576,10 @@ function windowAround(count, selected, capacity) {
   return { start, end: start + capacity };
 }
 function renderCollapsed(state, width, height) {
-  const lines = [];
+  const lines2 = [];
   const targets = [];
   const push2 = (text, target = null) => {
-    lines.push(stripForPad(" " + text, width));
+    lines2.push(stripForPad(" " + text, width));
     targets.push(target);
   };
   push2("");
@@ -15400,16 +15596,16 @@ function renderCollapsed(state, width, height) {
   });
   push2("");
   push2(STYLE.dim + "+" + STYLE.reset, { kind: "new" });
-  while (lines.length < height - 1) push2("");
+  while (lines2.length < height - 1) push2("");
   push2(STYLE.dim + "\u203A\u203A" + STYLE.reset, { kind: "collapse" });
-  return { lines: lines.slice(0, height), targets: targets.slice(0, height) };
+  return { lines: lines2.slice(0, height), targets: targets.slice(0, height) };
 }
 function renderLayout(state, width = 30, height = 40) {
   if (state.collapsed) return renderCollapsed(state, width, height);
-  const lines = [];
+  const lines2 = [];
   const targets = [];
   const push2 = (line, target = null) => {
-    lines.push(line);
+    lines2.push(line);
     targets.push(target);
   };
   const chrome = 8;
@@ -15431,7 +15627,7 @@ function renderLayout(state, width = 30, height = 40) {
     push2(row(selected, width, "  " + STYLE.branch + clip(space.branch, width - 6 - (space.track ? space.track.length + 1 : 0)) + STYLE.reset + drift), target);
   });
   if (state.spaces.length === 0) push2(row(false, width, STYLE.dim + "no spaces found" + STYLE.reset));
-  while (lines.length < 3 + spacesCapacity * 2) push2(pad("", width));
+  while (lines2.length < 3 + spacesCapacity * 2) push2(pad("", width));
   push2("");
   push2(splitRow(width, "new", "menu"), { kind: "new" });
   push2(STYLE.dim + "\u2500".repeat(Math.max(0, width)) + STYLE.reset);
@@ -15476,13 +15672,13 @@ function renderLayout(state, width = 30, height = 40) {
     push2("");
     push2(row(false, width, STYLE.blocked + "\u26D4 needs consent" + STYLE.reset));
     for (const action of actionsForAsk(selectedAgent.ask)) {
-      const key = action === "track" ? "g" : action === "skip" ? "s" : "y";
-      push2(row(false, width, STYLE.dim + "  " + key + " \u2014 " + action + STYLE.reset));
+      const key2 = action === "track" ? "g" : action === "skip" ? "s" : "y";
+      push2(row(false, width, STYLE.dim + "  " + key2 + " \u2014 " + action + STYLE.reset));
     }
   }
-  while (lines.length < height - 1) push2(pad("", width));
+  while (lines2.length < height - 1) push2(pad("", width));
   push2(stripForPad(pad("", width - 3) + STYLE.dim + "\u2039\u2039 " + STYLE.reset, width), { kind: "collapse" });
-  return { lines: lines.slice(0, height), targets: targets.slice(0, height) };
+  return { lines: lines2.slice(0, height), targets: targets.slice(0, height) };
 }
 function nextSelection(state, spaces, agents, delta) {
   const flat = state.section === "spaces" ? state.spaceIndex : spaces + state.agentIndex;
@@ -15631,8 +15827,8 @@ async function spawnAgent(info, request) {
   if (request.backend === "container") {
     cwd = request.cwd.startsWith(CONTAINER_WORK) ? request.cwd : await provisionContainerWorkspace(runner, slug);
   }
-  const command = harnessCommand(request);
-  for (const argv of buildSpawnAgent({ name: slug, cwd, command, harness: request.harness, space: cwd, backend: request.backend })) {
+  const command = request.command || harnessCommand(request);
+  for (const argv of buildSpawnAgent({ name: slug, cwd, command, harness: request.harness, space: cwd, backend: request.backend, mode: request.mode })) {
     const result = await run(runner, argv);
     if (!result.ok && argv[1] === "new-session") {
       return { ok: false, session, error: result.stderr.trim() || "tmux new-session failed" };
@@ -15646,7 +15842,8 @@ async function spawnAgent(info, request) {
     harness: request.harness,
     space: cwd,
     spaceName: request.spaceName,
-    backend: request.backend
+    backend: request.backend,
+    mode: request.mode || "native"
   });
   return { ok: true, session };
 }
@@ -15753,8 +15950,11 @@ var init_awake = __esm({
 function runnerFor(backend) {
   return backend === "container" ? { kind: "container", container: CONTAINER_NAME2 } : { kind: "host" };
 }
+function hasLiveAgentCenter(paneOutput, session) {
+  return String(paneOutput || "").split("\n").map((line) => line.split("|")).some(([dead, ...command]) => dead === "0" && !command.join("|").includes("--sidebar") && command.join("|").includes(session));
+}
 async function runSidebar() {
-  const centerPane = process.env.SYNKRO_UI_CENTER || "";
+  let centerPane = process.env.SYNKRO_UI_CENTER || "";
   const outerSession = process.env.SYNKRO_UI_OUTER || "synkro-ui";
   const bootPath = process.env.SYNKRO_UI_BOOT || process.argv[1];
   const repoCwd = process.env.SYNKRO_UI_REPO || process.cwd();
@@ -15922,53 +16122,114 @@ async function runSidebar() {
     const agent = state.agents[state.agentIndex];
     if (agent) await showAgent(agent);
   }
+  async function resolveCenterPane(cwd) {
+    if (!ownPane || !cwd) return "";
+    const resolved = await ensureUiCenterPane({ sidebarPane: ownPane, bootPath, cwd });
+    if (!resolved.ok) {
+      state.message = "could not restore this tab";
+      return "";
+    }
+    centerPane = resolved.pane;
+    if (resolved.recovered) {
+      state.viewing = "";
+      await snapshotTabs();
+      stripWidth = -1;
+      await syncChipStrip();
+    }
+    return centerPane;
+  }
   async function showWorkspaceTerminal(cwd) {
-    if (!centerPane || !cwd) return;
+    const pane = await resolveCenterPane(cwd);
+    if (!pane) return false;
     const command = makeTerminalCommand(bootPath);
-    const argv = ["tmux", "respawn-pane", "-k", "-t", centerPane, "-c", cwd];
+    const argv = ["tmux", "respawn-pane", "-k", "-t", pane, "-c", cwd];
     if (command) argv.push(command);
     const respawned = await run(host, argv);
     if (!respawned.ok) {
       state.message = "could not restore workspace terminal";
-      return;
+      return false;
     }
     const spaceName = cwd.split("/").filter(Boolean).pop() || "space";
-    await run(host, ["tmux", "set-option", "-t", centerPane, "-w", "-u", "@synkro_agent"]);
-    await run(host, ["tmux", "set-option", "-t", centerPane, "-w", "-q", "@synkro_cwd", cwd]);
-    await run(host, ["tmux", "set-option", "-t", centerPane, "-w", "-q", "@synkro_kind", "terminal"]);
-    await run(host, ["tmux", "rename-window", "-t", centerPane, tabTitle("terminal", spaceName)]);
+    const metadata = [
+      ["tmux", "set-option", "-t", pane, "-w", "-q", "@synkro_agent", ""],
+      ["tmux", "set-option", "-t", pane, "-w", "-q", "@synkro_cwd", cwd],
+      ["tmux", "set-option", "-t", pane, "-w", "-q", "@synkro_kind", "terminal"],
+      ["tmux", "rename-window", "-t", pane, tabTitle("terminal", spaceName)]
+    ];
+    for (const commandArgv of metadata) {
+      if (!(await run(host, commandArgv)).ok) {
+        state.message = "could not update this tab";
+        return false;
+      }
+    }
     state.viewing = "";
     await snapshotTabs();
+    return true;
   }
-  async function showAgent(agent) {
-    if (!centerPane) return;
-    if (agent.status === "offline") {
-      await restoreSelected();
-      return;
-    }
+  async function markAgentViewed(agent) {
     const current = memory.get(agent.session);
     memory.set(agent.session, { hash: current?.hash || "", wasWorking: false, seen: true });
     if (agent.space) rememberLastAgent(await repoOf(agent.space), agent.session);
     state.viewing = agent.session;
+  }
+  async function showAgent(agent) {
+    if (agent.status === "offline") {
+      await restoreSelected();
+      return false;
+    }
     const windows = await run(host, ["tmux", "list-windows", "-t", outerSession, "-F", "#{window_id}|#{@synkro_agent}"]);
     const holder = windows.stdout.split("\n").map((line) => line.split("|")).find((cols) => cols[1] === agent.session);
     if (holder) {
-      await run(host, ["tmux", "select-window", "-t", holder[0]]);
-      state.message = agent.name;
-      return;
+      const holderPanes = await run(host, [
+        "tmux",
+        "list-panes",
+        "-t",
+        holder[0],
+        "-F",
+        "#{pane_dead}|#{pane_start_command}"
+      ]);
+      const liveCenter = holderPanes.ok && hasLiveAgentCenter(holderPanes.stdout, agent.session);
+      if (liveCenter) {
+        const selected = await run(host, ["tmux", "select-window", "-t", holder[0]]);
+        if (selected.ok) {
+          await markAgentViewed(agent);
+          state.message = agent.name;
+          return true;
+        }
+      }
+      await run(host, ["tmux", "set-option", "-t", holder[0], "-w", "-q", "@synkro_agent", ""]);
     }
+    const pane = await resolveCenterPane(agent.space || selectedSpace()?.path || repoCwd);
+    if (!pane) return false;
     await run(runnerFor(agent.backend), buildEnableMouse(agent.session));
     for (const argv of buildClipboardBindings(agent.session)) {
       await run(runnerFor(agent.backend), argv);
     }
     const command = buildCenterAttachCommand(runnerFor(agent.backend), agent.session);
-    await run(host, ["tmux", "respawn-pane", "-k", "-t", centerPane, command]);
+    const attached = await run(host, ["tmux", "respawn-pane", "-k", "-t", pane, command]);
+    if (!attached.ok) {
+      state.message = "could not open " + agent.name;
+      await showWorkspaceTerminal(agent.space || selectedSpace()?.path || repoCwd);
+      return false;
+    }
     const where = agent.space ? agent.space.split("/").filter(Boolean).pop() || "" : "";
-    await run(host, ["tmux", "rename-window", "-t", centerPane, tabTitle(agent.harness, where)]);
-    await run(host, ["tmux", "set-option", "-t", centerPane, "-w", "-q", "@synkro_agent", agent.session]);
-    await run(host, ["tmux", "set-option", "-t", centerPane, "-w", "-q", "@synkro_kind", agent.harness]);
+    const metadata = [
+      ["tmux", "set-option", "-t", pane, "-w", "-q", "@synkro_agent", agent.session],
+      ["tmux", "set-option", "-t", pane, "-w", "-q", "@synkro_cwd", agent.space || repoCwd],
+      ["tmux", "set-option", "-t", pane, "-w", "-q", "@synkro_kind", agent.harness],
+      ["tmux", "rename-window", "-t", pane, tabTitle(agent.harness, where)]
+    ];
+    for (const commandArgv of metadata) {
+      if (!(await run(host, commandArgv)).ok) {
+        state.message = "could not update " + agent.name + " tab";
+        await showWorkspaceTerminal(agent.space || selectedSpace()?.path || repoCwd);
+        return false;
+      }
+    }
+    await markAgentViewed(agent);
     await snapshotTabs();
     state.message = "attached " + agent.name;
+    return true;
   }
   async function confirmKillAgent() {
     const agent = state.agents[state.agentIndex];
@@ -15979,7 +16240,8 @@ async function runSidebar() {
     if (allAgents.some((candidate) => candidate.session === agent.session && candidate.status !== "offline")) return;
     state.message = "closed " + agent.name;
     if (!wasViewing) return;
-    await showWorkspaceTerminal(agent.space || selectedSpace()?.path || repoCwd);
+    const restored = await showWorkspaceTerminal(agent.space || selectedSpace()?.path || repoCwd);
+    if (!restored) return;
     const successor = nextLiveAgent(allAgents, agent.repo || "");
     if (successor) await showAgent(successor);
   }
@@ -16046,45 +16308,45 @@ async function runSidebar() {
     }
     await activate(target);
   }
-  async function handleKey(key) {
-    if (key === "	") state.section = state.section === "spaces" ? "agents" : "spaces";
-    else if (key === "j" || key === CSI + "B") moveSelection(1);
-    else if (key === "k" || key === CSI + "A") moveSelection(-1);
-    else if (key === "\r") {
+  async function handleKey(key2) {
+    if (key2 === "	") state.section = state.section === "spaces" ? "agents" : "spaces";
+    else if (key2 === "j" || key2 === CSI + "B") moveSelection(1);
+    else if (key2 === "k" || key2 === CSI + "A") moveSelection(-1);
+    else if (key2 === "\r") {
       if (state.section === "agents") await attachSelected();
       else await openDialog("new-tab");
-    } else if (key === "n" || key === "T") {
+    } else if (key2 === "n" || key2 === "T") {
       worldChanged = true;
       await openDialog("new-tab");
-    } else if (key === "m") await mainMenu();
-    else if (key === "O") void openDialog("new-workspace");
-    else if (key === "C") {
+    } else if (key2 === "m") await mainMenu();
+    else if (key2 === "O") void openDialog("new-workspace");
+    else if (key2 === "C") {
       worldChanged = true;
       closeSelectedWorkspace();
-    } else if (key === "r") {
+    } else if (key2 === "r") {
       worldChanged = true;
       await restoreSelected();
-    } else if (key === "d") {
+    } else if (key2 === "d") {
       const client = await attachedClient();
       await run(host, client ? ["tmux", "detach-client", "-t", client] : ["tmux", "detach-client"]);
-    } else if (key === "K") await keybindsMenu();
-    else if (key === "G") {
+    } else if (key2 === "K") await keybindsMenu();
+    else if (key2 === "G") {
       state.grouped = !state.grouped;
       applyFilter();
-    } else if (key === "a") {
+    } else if (key2 === "a") {
       state.filter = state.filter === "space" ? "all" : "space";
       applyFilter();
-    } else if (key === "<" || key === ">" || key === "," || key === ".") await toggleCollapsed();
-    else if (key === "x") {
+    } else if (key2 === "<" || key2 === ">" || key2 === "," || key2 === ".") await toggleCollapsed();
+    else if (key2 === "x") {
       worldChanged = true;
       await confirmKillAgent();
-    } else if (key === "i") {
+    } else if (key2 === "i") {
       const agent = state.agents[state.agentIndex];
       if (agent) await run(runnerFor(agent.backend), buildInterrupt(agent.session));
-    } else if (key === "g") await consent("track");
-    else if (key === "s") await consent("skip");
-    else if (key === "y") await consent("stay");
-    else if (key === "q" || key === KEY_CTRL_C) {
+    } else if (key2 === "g") await consent("track");
+    else if (key2 === "s") await consent("skip");
+    else if (key2 === "y") await consent("stay");
+    else if (key2 === "q" || key2 === KEY_CTRL_C) {
       await snapshotTabs();
       releaseAwake();
       await run(host, ["tmux", "kill-session", "-t", outerSession]);
@@ -16206,8 +16468,8 @@ var init_repos = __esm({
 
 // cli/ui/tabs.ts
 import { execSync as execSync7 } from "child_process";
-function isLegacyCodexRenderer(command) {
-  return /(?:^|\s)ui\s+--run\s+codex(?:\s|$)/.test(String(command || "").trim());
+function embeddedSessionCommand(bootPath, harness, cwd) {
+  return ["node", bootPath, "ui", "--run", harness, cwd].map(shellQuote3).join(" ");
 }
 function repoRoot() {
   try {
@@ -16229,6 +16491,29 @@ async function createTab(bootPath, kind, spacePath) {
     });
     return;
   }
+  if (kind === "cursor-synkro" || kind === "codex-synkro") {
+    const harness2 = kind === "codex-synkro" ? "codex" : "cursor";
+    const command = embeddedSessionCommand(bootPath, harness2, spacePath);
+    const spawned2 = await spawnAgent({ runner: HOST2, backend: "host", note: "runtime: host" }, {
+      name: space + "-" + harness2 + "-synkro-" + String(process.pid % 1e4),
+      harness: harness2,
+      spaceName: space,
+      cwd: spacePath,
+      backend: "host",
+      command,
+      mode: "embedded"
+    });
+    if (!spawned2.ok) return;
+    await buildTab(bootPath, repo, {
+      cwd: spacePath,
+      center: buildCenterAttachCommand(HOST2, spawned2.session),
+      title: tabTitle(harness2, space),
+      kind,
+      agentSession: spawned2.session,
+      focus: "center"
+    });
+    return;
+  }
   if (kind === "settings") {
     await buildTab(bootPath, repo, {
       cwd: spacePath,
@@ -16272,43 +16557,26 @@ async function openAgentTab(bootPath, session) {
     "-p",
     "-t",
     session,
-    ["#{@synkro_harness}", "#{@synkro_space}", "#{@synkro_backend}"].join("|")
+    ["#{@synkro_harness}", "#{@synkro_space}", "#{@synkro_backend}", "#{@synkro_mode}"].join("|")
   ]);
-  const [harness, space, backend] = (meta.stdout.trim() || "||").split("|");
+  const [harness, space, backend, mode] = (meta.stdout.trim() || "|||").split("|");
   const containerHosted = backend === "container";
-  let runner = containerHosted ? info.runner : HOST2;
-  let activeSession = session;
+  const runner = mode === "embedded" ? HOST2 : containerHosted ? info.runner : HOST2;
   const spaceName = (space || "").split("/").filter(Boolean).pop() || "space";
-  if (harness === "codex") {
-    const command = await run(HOST2, ["tmux", "display-message", "-p", "-t", session, "#{pane_start_command}"]);
-    if (command.ok && isLegacyCodexRenderer(command.stdout)) {
-      await run(HOST2, buildKillSession(session));
-      const restored = await spawnAgent(info, {
-        name: session.replace(/^synkro-agent-/, ""),
-        harness: "codex",
-        spaceName,
-        cwd: space || repoRoot(),
-        backend: "host",
-        resume: true
-      });
-      if (!restored.ok) return;
-      activeSession = restored.session;
-      runner = HOST2;
-    }
-  }
-  const alive = (await run(runner, ["tmux", "has-session", "-t", activeSession])).ok;
+  const alive = (await run(runner, ["tmux", "has-session", "-t", session])).ok;
   if (!alive) return;
   await buildTab(bootPath, repoRoot(), {
     cwd: space || repoRoot(),
-    center: buildCenterAttachCommand(runner, activeSession),
+    center: buildCenterAttachCommand(runner, session),
     title: tabTitle(harness || "claude", spaceName),
-    kind: harness || "claude",
-    agentSession: activeSession,
+    kind: mode === "embedded" ? (harness || "cursor") + "-synkro" : harness || "claude",
+    agentSession: session,
     focus: "center"
   });
 }
 async function restoreTabs(bootPath, repoCwd) {
   const tabs = loadTabs();
+  const records = loadRecords();
   if (tabs.length === 0) return false;
   const info = await detectContainerBackend();
   const hostSessions = (await run(HOST2, ["tmux", "list-sessions", "-F", "#{session_name}"])).stdout;
@@ -16318,16 +16586,11 @@ async function restoreTabs(bootPath, repoCwd) {
   for (const tab of tabs) {
     const space = tab.cwd.split("/").filter(Boolean).pop() || "space";
     const containerHosted = info.backend === "container" && (await run(info.runner, ["test", "-d", tab.cwd])).ok;
-    const harness = ["claude", "codex", "cursor"].includes(tab.kind) ? tab.kind : "";
-    const sessionRunner = harness === "codex" ? HOST2 : containerHosted ? info.runner : HOST2;
-    let sessionAlive = Boolean(tab.agentSession && alive.has(tab.agentSession));
-    if (sessionAlive && harness === "codex") {
-      const command = await run(HOST2, ["tmux", "display-message", "-p", "-t", tab.agentSession, "#{pane_start_command}"]);
-      if (command.ok && isLegacyCodexRenderer(command.stdout)) {
-        await run(HOST2, buildKillSession(tab.agentSession));
-        sessionAlive = false;
-      }
-    }
+    const embedded = tab.kind === "cursor-synkro" || tab.kind === "codex-synkro";
+    const harness = embedded ? tab.kind.replace("-synkro", "") : ["claude", "codex", "cursor"].includes(tab.kind) ? tab.kind : "";
+    const sessionRunner = embedded || harness === "codex" ? HOST2 : containerHosted ? info.runner : HOST2;
+    const sessionAlive = Boolean(tab.agentSession && alive.has(tab.agentSession));
+    const record2 = records.find((row2) => row2.session === tab.agentSession);
     if (tab.agentSession && sessionAlive) {
       await run(sessionRunner, buildEnableMouse(tab.agentSession));
       for (const argv of buildClipboardBindings(tab.agentSession)) {
@@ -16342,20 +16605,23 @@ async function restoreTabs(bootPath, repoCwd) {
         focus: "center"
       });
     } else if (harness) {
+      const command = embedded ? embeddedSessionCommand(bootPath, harness, tab.cwd) : void 0;
       const spawned = await spawnAgent(info, {
-        name: space + "-" + harness + "-" + String(process.pid % 1e4),
+        name: record2?.name || space + "-" + harness + "-" + String(process.pid % 1e4),
         harness,
         spaceName: space,
         cwd: tab.cwd,
-        backend: harness === "codex" ? "host" : containerHosted ? "container" : "host",
-        resume: true
+        backend: embedded || harness === "codex" ? "host" : containerHosted ? "container" : "host",
+        resume: !embedded,
+        command,
+        mode: embedded ? "embedded" : "native"
       });
-      const restoredInContainer = harness !== "codex" && containerHosted;
+      const restoredInContainer = !embedded && harness !== "codex" && containerHosted;
       await buildTab(bootPath, repoCwd, spawned.ok ? {
         cwd: tab.cwd,
         center: buildCenterAttachCommand(restoredInContainer ? info.runner : HOST2, spawned.session),
         title: tabTitle(harness, space),
-        kind: harness,
+        kind: embedded ? tab.kind : harness,
         agentSession: spawned.session,
         focus: "center"
       } : { cwd: tab.cwd, center: makeTerminalCommand(bootPath), title: tabTitle("terminal", space), kind: "terminal", focus: "center" });
@@ -16387,11 +16653,20 @@ var init_tabs = __esm({
 // cli/ui/dialog.ts
 import { existsSync as existsSync37 } from "fs";
 import { homedir as homedir37 } from "os";
+function providerChoices(harnesses) {
+  return [
+    { value: "terminal", label: TAB_GLYPHS.terminal + "  Terminal" },
+    ...harnesses.map((harness) => ({
+      value: harness === "cursor" || harness === "codex" ? harness + "-synkro" : harness,
+      label: (TAB_GLYPHS[harness] || "") + "  " + (HARNESS_LABELS[harness] || harness)
+    }))
+  ];
+}
 function write(text) {
   process.stdout.write(text);
 }
 function visibleLength2(text) {
-  let visible = 0;
+  let visible2 = 0;
   let index = 0;
   while (index < text.length) {
     if (text.startsWith(CSI2, index)) {
@@ -16399,11 +16674,11 @@ function visibleLength2(text) {
       if (end === -1) break;
       index = end + 1;
     } else {
-      visible += 1;
+      visible2 += 1;
       index += 1;
     }
   }
-  return visible;
+  return visible2;
 }
 function clipPath(text, max) {
   const value = String(text || "");
@@ -16446,34 +16721,34 @@ async function pick(opts) {
   const perItem = opts.choices.some((choice) => choice.detail) ? 2 : 1;
   const visibleItems = Math.max(1, Math.floor(Math.max(2, height - 5) / perItem));
   const firstRow = 4;
-  return new Promise((resolve8) => {
+  return new Promise((resolve9) => {
     const view = () => opts.choices.filter((choice) => matches(choice, filter));
     const draw = () => {
       const shown = view();
       if (selected >= shown.length) selected = Math.max(0, shown.length - 1);
       if (selected < top) top = selected;
       if (selected >= top + visibleItems) top = selected - visibleItems + 1;
-      const lines = [];
-      lines.push(" " + S.title + opts.title + S.reset);
+      const lines2 = [];
+      lines2.push(" " + S.title + opts.title + S.reset);
       const left = filter && !opts.menu ? " " + S.accent + "/ " + S.reset + filter + "\u258C" : " " + S.dim + opts.hint + S.reset;
       const right = opts.menu ? "" : S.dim + String(shown.length) + (shown.length === 1 ? " match" : " matches") + S.reset;
-      lines.push(padRow(left, Math.max(0, width - visibleLength2(right) - 1)) + right);
-      lines.push("");
-      if (shown.length === 0) lines.push(" " + S.dim + (opts.emptyNote || "nothing matches") + S.reset);
+      lines2.push(padRow(left, Math.max(0, width - visibleLength2(right) - 1)) + right);
+      lines2.push("");
+      if (shown.length === 0) lines2.push(" " + S.dim + (opts.emptyNote || "nothing matches") + S.reset);
       shown.slice(top, top + visibleItems).forEach((choice, offset) => {
         const index = top + offset;
         const isSelected = index === selected;
         const marker = isSelected ? S.accent + "\u203A" + S.reset + " " : "  ";
         const note = choice.note ? S.dim + choice.note + S.reset : "";
         const head = " " + marker + S.bold + clip2(choice.label, width - 6 - visibleLength2(note)) + S.reset;
-        lines.push(selectable(padRow(head, Math.max(0, width - visibleLength2(note) - 1)) + note, width, isSelected));
+        lines2.push(selectable(padRow(head, Math.max(0, width - visibleLength2(note) - 1)) + note, width, isSelected));
         if (perItem === 2) {
-          lines.push(selectable("    " + S.muted + clipPath(choice.detail || "", width - 6) + S.reset, width, isSelected));
+          lines2.push(selectable("    " + S.muted + clipPath(choice.detail || "", width - 6) + S.reset, width, isSelected));
         }
       });
-      while (lines.length < height - 1) lines.push("");
-      lines.push(" " + S.dim + opts.footer + S.reset);
-      write(CSI2 + "H" + lines.slice(0, height).map((line) => padRow(line, width)).join("\n"));
+      while (lines2.length < height - 1) lines2.push("");
+      lines2.push(" " + S.dim + opts.footer + S.reset);
+      write(CSI2 + "H" + lines2.slice(0, height).map((line) => padRow(line, width)).join("\n"));
     };
     const rowOfItem = (index) => firstRow + (index - top) * perItem;
     const MOUSE = /\[<(\d+);(\d+);(\d+)([Mm])/g;
@@ -16494,7 +16769,7 @@ async function pick(opts) {
           const hit = shown.findIndex((_, index) => y >= rowOfItem(index) && y < rowOfItem(index) + perItem);
           if (hit >= 0) {
             process.stdin.off("data", onData);
-            resolve8(shown[hit].value);
+            resolve9(shown[hit].value);
             return;
           }
         }
@@ -16502,13 +16777,13 @@ async function pick(opts) {
       if (!sawMouse) {
         if (input === KEY_ESC && !input.includes("[<") || input === KEY_CTRL_C2) {
           process.stdin.off("data", onData);
-          resolve8(null);
+          resolve9(null);
           return;
         }
         if (input === "\r") {
           if (shown.length === 0) return;
           process.stdin.off("data", onData);
-          resolve8(shown[selected].value);
+          resolve9(shown[selected].value);
           return;
         }
         const down = input === CSI2 + "B" || opts.menu && (input === "j" || input === CSI2 + "C");
@@ -16532,9 +16807,9 @@ async function readLine(opts) {
   let value = "";
   let error = "";
   const width = Math.max(20, Number(process.stdout.columns || 80));
-  return new Promise((resolve8) => {
+  return new Promise((resolve9) => {
     const draw = () => {
-      const lines = [
+      const lines2 = [
         " " + S.title + opts.title + S.reset,
         "",
         " " + S.dim + opts.label + S.reset,
@@ -16545,13 +16820,13 @@ async function readLine(opts) {
         "",
         " " + S.dim + opts.footer + S.reset
       ];
-      write(CSI2 + "2J" + CSI2 + "H" + lines.map((line) => padRow(line, width)).join("\n"));
+      write(CSI2 + "2J" + CSI2 + "H" + lines2.map((line) => padRow(line, width)).join("\n"));
     };
     const onData = (chunk) => {
       const input = chunk.toString("utf8");
       if (input === KEY_ESC || input === KEY_CTRL_C2) {
         process.stdin.off("data", onData);
-        resolve8(null);
+        resolve9(null);
         return;
       }
       if (input === "\r") {
@@ -16563,7 +16838,7 @@ async function readLine(opts) {
             return;
           }
           process.stdin.off("data", onData);
-          resolve8(value.trim());
+          resolve9(value.trim());
         })();
         return;
       }
@@ -16823,13 +17098,7 @@ async function runDialog(kind, repoCwd, argA = "", argB = "") {
     process.exit(0);
   }
   const harnesses = await detectHarnesses();
-  const sessions = [
-    { value: "terminal", label: TAB_GLYPHS.terminal + "  Terminal" },
-    ...harnesses.map((harness) => ({
-      value: harness,
-      label: (TAB_GLYPHS[harness] || "") + "  " + (HARNESS_LABELS[harness] || harness)
-    }))
-  ];
+  const sessions = providerChoices(harnesses);
   for (; ; ) {
     const session = await pick({
       menu: true,
@@ -16888,6 +17157,42 @@ var init_dialog = __esm({
   }
 });
 
+// cli/harness/events.ts
+function fixPollIds(raw) {
+  const text = String(raw || "");
+  const ids = [
+    ...Array.from(text.matchAll(FIX_POLL_MARKERS), (match) => match[1]),
+    ...Array.from(text.matchAll(LEGACY_FIX_POLL_MARKERS), (match) => match[1])
+  ];
+  return Array.from(new Set(ids.filter(Boolean)));
+}
+function fixPollId(raw) {
+  return fixPollIds(raw)[0] || "";
+}
+function cleanGuardText(raw) {
+  return String(raw || "").replace(FIX_POLL_MARKERS, "").replace(/\n*\s*SYNKRO FIX POLL[\s\S]*$/i, "").replace(/\n?\d{4}-\d\d-\d\dT[^\n]*\sERROR\s+codex_core::tools::router:[^\n]*/gi, "").replace(/\s*Checking command\s*$/i, "").trim();
+}
+function blockReason(raw) {
+  const text = cleanGuardText(raw);
+  if (!text) return "blocked by policy";
+  const guardAt = text.lastIndexOf("Guard:");
+  if (guardAt >= 0) return text.slice(guardAt + "Guard:".length).trim();
+  const afterTag = text.match(/\[synkro:[^\]]*\]\s*(.+)/is);
+  if (afterTag) return afterTag[1].trim();
+  const afterHook = text.match(/blocked by a hook:\s*(.+)/is);
+  if (afterHook) return afterHook[1].trim();
+  return text;
+}
+var BLOCK_MARKER, FIX_POLL_MARKERS, LEGACY_FIX_POLL_MARKERS;
+var init_events = __esm({
+  "cli/harness/events.ts"() {
+    "use strict";
+    BLOCK_MARKER = /blocked by a hook|\[synkro:/i;
+    FIX_POLL_MARKERS = /\[synkro:fix-poll\s+item_id=\\*["']?([A-Za-z0-9_-]+)\\*["']?\s*\]/gi;
+    LEGACY_FIX_POLL_MARKERS = /SYNKRO FIX POLL\s*\(item_id=([A-Za-z0-9_-]+)\)/gi;
+  }
+});
+
 // cli/harness/render.ts
 function spinnerFrame(tick) {
   return SPINNER[Math.abs(tick) % SPINNER.length];
@@ -16896,15 +17201,27 @@ function terminalText(text) {
   return String(text).replace(/[\u0000-\u001F\u007F-\u009F]/g, "");
 }
 function clip3(text, max) {
-  const value = String(text || "").replace(/\s+/g, " ").trim();
+  const value = cleanOutput(text).replace(/\s+/g, " ").trim();
   if (max <= 1) return value;
   return value.length <= max ? value : value.slice(0, max - 1) + "\u2026";
 }
+function cleanOutput(text) {
+  return String(text || "").replace(/\x1b\][^\x07]*(?:\x07|\x1b\\)/g, "").replace(/\x1b\[[0-?]*[ -\/]*[@-~]/g, "").replace(/[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f]/g, "");
+}
 function seconds(ms) {
   const total = Math.max(0, Math.round(ms / 1e3));
   if (total < 60) return total + "s";
   return Math.floor(total / 60) + "m" + String(total % 60).padStart(2, "0") + "s";
 }
+function blockNextStep(reason) {
+  if (/tracking (?:decision|is required)|task tracking|skip tracking|\bconductor\b/i.test(reason)) {
+    return "Next: reply \u201Ctrack it\u201D to create a task, or \u201Cskip tracking\u201D to continue untracked.";
+  }
+  if (/\bCWE-\d+\b|\bCVE-\d{4}-\d+\b/i.test(reason)) {
+    return "Next: revise the flagged code, then retry. Do not bypass the rule.";
+  }
+  return "Next: resolve the rule above, then retry.";
+}
 function statusLine(opts) {
   const hint = opts.hint ? " \xB7 " + opts.hint : "";
   const body = opts.text + " (" + seconds(opts.elapsedMs) + hint + ")";
@@ -16914,86 +17231,105 @@ function statusLine(opts) {
 function renderEvent(event, width = 100) {
   const body = Math.max(30, width - 4);
   switch (event.type) {
-    // The workspace and both accounts are already in the session header, so
-    // this line carries only what the header could not know before the harness
-    // started: which model answered, and whether a subscription or a key paid.
     case "session-start":
-      return [
-        "",
-        S2.dim + "  " + clip3(event.model, body - 20) + (event.authSource === "login" ? "  \xB7  subscription" : "  \xB7  api key") + S2.reset,
-        ""
-      ];
+      return [];
     case "user-message":
-      return ["", S2.user + "  \u276F " + S2.reset + S2.bold + clip3(event.text, body) + S2.reset, ""];
+      return ["", S2.user + "  \u276F " + S2.reset + S2.bold + clip3(event.text, body) + S2.reset];
     // Live state, not transcript. The runner promotes these to the status line.
     case "thinking":
       return [];
     case "assistant-message": {
-      const lines = wrap(event.text, body - 2);
+      const lines2 = wrap(event.text, body - 2);
       return [
         "",
-        ...lines.map((line, index) => index === 0 ? S2.agent + "  " + BULLET + " " + line + S2.reset : S2.agent + "    " + line + S2.reset),
-        ""
+        ...lines2.map((line, index) => index === 0 ? S2.agent + "  " + BULLET + " " + line + S2.reset : S2.agent + "    " + line + S2.reset)
       ];
     }
     case "tool-start": {
       const label = TOOL_LABEL[event.kind] || TOOL_LABEL.other;
       return [
-        S2.tool + "  " + BULLET + " " + label + S2.reset + S2.dim + "(" + clip3(event.target, body - label.length - 8) + ")" + S2.reset
+        "",
+        S2.panel + S2.tool + "  " + BULLET + " " + label + S2.reset + S2.panel + S2.secondary + "(" + clip3(event.target, body - label.length - 8) + ")" + S2.reset
       ];
     }
     case "tool-end": {
       if (event.blocked) {
+        const reason = cleanGuardText(event.reason);
         return [
-          S2.blocked + "  " + BULLET + " Blocked" + S2.reset + S2.dim + "  " + clip3(terminalText(event.target), body - 14) + S2.reset,
-          ...wrap(terminalText(event.reason), body - 6).map((line, index) => index === 0 ? S2.blocked + "    " + ELBOW + " " + S2.reset + S2.rule + line + S2.reset : S2.rule + "      " + line + S2.reset)
+          S2.panel + S2.blocked + "  \u29C9 Blocked" + S2.reset + S2.panel + S2.secondary + "  " + clip3(terminalText(event.target), body - 21) + S2.reset,
+          ...wrap(terminalText(reason), body - 6).map((line, index) => index === 0 ? S2.blocked + "    " + ELBOW + " " + S2.reset + S2.rule + line + S2.reset : S2.rule + "      " + line + S2.reset),
+          ...wrap(blockNextStep(reason), body - 6).map((line) => S2.secondary + "      " + line + S2.reset)
         ];
       }
+      const timing = event.durationMs == null ? "" : " \xB7 " + seconds(event.durationMs);
       const detail = event.ok ? event.output.trim() ? clip3(terminalText(event.output), body - 10) : "done" : "failed" + (event.exitCode === null ? "" : " (exit " + event.exitCode + ")");
       const tint = event.ok ? S2.ok : S2.blocked;
-      return [tint + "    " + ELBOW + " " + S2.reset + S2.dim + detail + S2.reset];
+      const changes = (event.fileChanges || []).flatMap((change) => wrap(change.path, body - 20).map((line, index) => S2.panel + S2.secondary + (index === 0 ? "      " : "        ") + line + (index === 0 ? "  " + S2.ok + "+" + change.additions + S2.secondary + " " + S2.blocked + "-" + change.deletions : "") + S2.reset));
+      return [
+        S2.panel + tint + "    " + ELBOW + " " + S2.reset + S2.panel + S2.secondary + detail + timing + S2.reset,
+        ...changes
+      ];
     }
     // A clean finish needs no announcement: the prompt returning IS the signal.
     case "turn-end":
       return event.ok ? [] : ["", S2.blocked + "  " + BULLET + " turn ended with an error" + S2.reset, ""];
     case "notice":
-      return [S2.dim + "  " + clip3(event.text, body) + S2.reset];
+      return [S2.secondary + "  " + clip3(event.text, body) + S2.reset];
+    case "plan":
+      return [
+        S2.panel + S2.tool + "  Plan" + S2.reset,
+        ...event.steps.map((row2) => S2.panel + (row2.status === "completed" ? S2.ok + "  \u2713 " : S2.secondary + "  \xB7 ") + clip3(row2.step, body - 4) + S2.reset)
+      ];
+    case "assistant-delta":
+    case "usage":
+      return [];
     default:
       return [];
   }
 }
 function wrap(text, width) {
-  const words = String(text || "").replace(/\s+/g, " ").trim().split(" ").filter(Boolean);
+  const words = cleanOutput(text).replace(/\s+/g, " ").trim().split(" ").filter(Boolean);
   if (words.length === 0) return [];
-  const lines = [];
+  const lines2 = [];
   let line = "";
   for (const word of words) {
     if (!line) line = word;
     else if ((line + " " + word).length <= width) line += " " + word;
     else {
-      lines.push(line);
+      lines2.push(line);
       line = word;
     }
   }
-  if (line) lines.push(line);
-  return lines;
+  if (line) lines2.push(line);
+  return lines2;
 }
-var ESC2, S2, CLEAR_LINE, BULLET, ELBOW, SPINNER, TOOL_LABEL;
+var ESC2, color, S2, CLEAR_LINE, BULLET, ELBOW, SPINNER, TOOL_LABEL;
 var init_render2 = __esm({
   "cli/harness/render.ts"() {
     "use strict";
+    init_events();
     ESC2 = "\x1B[";
+    color = (hex, plane = 38) => {
+      const [r, g, b] = hex.match(/../g).map((part) => Number.parseInt(part, 16));
+      return ESC2 + plane + ";2;" + r + ";" + g + ";" + b + "m";
+    };
     S2 = {
       reset: ESC2 + "0m",
       dim: ESC2 + "2m",
       bold: ESC2 + "1m",
-      user: ESC2 + "38;5;111m",
-      agent: ESC2 + "38;5;252m",
-      think: ESC2 + "38;5;244m",
-      tool: ESC2 + "38;5;180m",
-      ok: ESC2 + "38;5;114m",
-      blocked: ESC2 + "38;5;203m",
-      rule: ESC2 + "38;5;211m"
+      canvas: color("101416", 48),
+      panel: color("171D1F", 48),
+      composer: color("13191B", 48),
+      text: color("C4C8C4"),
+      secondary: color("7F8A86"),
+      border: color("2A3334"),
+      user: color("87A68E"),
+      agent: color("C4C8C4"),
+      think: color("B29A6A"),
+      tool: color("7F9CA5"),
+      ok: color("789B82"),
+      blocked: color("B87474"),
+      rule: color("B87474")
     };
     CLEAR_LINE = "\r" + ESC2 + "2K";
     BULLET = "\u23FA";
@@ -17015,297 +17351,207 @@ var init_render2 = __esm({
 
 // cli/harness/composer.ts
 import { execFileSync as execFileSync5, spawnSync as spawnSync12 } from "child_process";
-import { existsSync as existsSync38, mkdtempSync as mkdtempSync2, rmSync as rmSync7, statSync as statSync5, writeFileSync as writeFileSync27 } from "fs";
+import { existsSync as existsSync38, mkdtempSync as mkdtempSync2, rmSync as rmSync7, statSync as statSync6, writeFileSync as writeFileSync27 } from "fs";
 import { homedir as homedir38, tmpdir } from "os";
 import { basename as basename3, dirname as dirname12, extname, isAbsolute as isAbsolute2, join as join37, resolve as resolve5, sep as sep3 } from "path";
 import { createInterface as createInterface5 } from "readline";
-function markerCarryLength(input, marker) {
-  for (let length = Math.min(input.length, marker.length - 1); length > 0; length -= 1) {
-    if (marker.startsWith(input.slice(-length))) return length;
-  }
-  return 0;
-}
-function normalizePathToken(raw) {
-  let value = raw.trim();
-  if (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'")) {
-    value = value.slice(1, -1);
+var init_composer = __esm({
+  "cli/harness/composer.ts"() {
+    "use strict";
+    init_render2();
   }
-  value = value.replace(/\\([\\ "'()])/g, "$1");
-  if (value === "~") return homedir38();
-  if (value.startsWith("~/")) return join37(homedir38(), value.slice(2));
-  return value;
+});
+
+// cli/harness/changes.ts
+import { lstatSync as lstatSync2, readFileSync as readFileSync33, readlinkSync } from "fs";
+import { resolve as resolve6, relative } from "path";
+function lines(text) {
+  if (!text) return [];
+  const rows = text.replace(/\r\n/g, "\n").split("\n");
+  if (rows[rows.length - 1] === "") rows.pop();
+  return rows;
 }
-function imagePathsInText(text, cwd) {
-  const candidates = String(text || "").match(/"(?:[^"\\]|\\.)*"|'(?:[^'\\]|\\.)*'|(?:\\.|[^\s])+/g) || [];
-  const images = [];
-  for (const candidate of candidates) {
-    const token = normalizePathToken(candidate);
-    if (!IMAGE_EXTENSIONS.has(extname(token).toLowerCase())) continue;
-    const path = isAbsolute2(token) ? token : resolve5(cwd, token);
-    try {
-      if (statSync5(path).isFile() && !images.includes(path)) images.push(path);
-    } catch {
+function lineChangeCounts(before, after) {
+  const a = lines(before);
+  const b = lines(after);
+  if (a.length === 0) return { additions: b.length, deletions: 0 };
+  if (b.length === 0) return { additions: 0, deletions: a.length };
+  const max = a.length + b.length;
+  let frontier = /* @__PURE__ */ new Map([[1, 0]]);
+  for (let distance = 0; distance <= Math.min(max, MAX_DIFF_DISTANCE); distance++) {
+    const next = /* @__PURE__ */ new Map();
+    for (let diagonal = -distance; diagonal <= distance; diagonal += 2) {
+      const down = frontier.get(diagonal + 1) ?? -1;
+      const right = (frontier.get(diagonal - 1) ?? -1) + 1;
+      let x = diagonal === -distance || diagonal !== distance && right < down ? down : right;
+      if (x < 0) x = 0;
+      let y = x - diagonal;
+      while (x < a.length && y < b.length && a[x] === b[y]) {
+        x++;
+        y++;
+      }
+      next.set(diagonal, x);
+      if (x >= a.length && y >= b.length) {
+        return {
+          additions: (distance + b.length - a.length) / 2,
+          deletions: (distance + a.length - b.length) / 2
+        };
+      }
     }
+    frontier = next;
   }
-  return images;
-}
-function codexUserInput(draft) {
-  const input = [];
-  if (draft.text.trim()) input.push({ type: "text", text: draft.text, text_elements: [] });
-  for (const path of draft.images) input.push({ type: "localImage", path });
-  return input;
-}
-function clipboardText() {
-  try {
-    if (process.platform === "darwin") return execFileSync5("pbpaste", [], { encoding: "utf8", timeout: 1500 });
-    const wayland = spawnSync12("wl-paste", ["--no-newline"], { encoding: "utf8", timeout: 1500 });
-    if (wayland.status === 0) return String(wayland.stdout || "");
-    const x11 = spawnSync12("xclip", ["-selection", "clipboard", "-o"], { encoding: "utf8", timeout: 1500 });
-    return x11.status === 0 ? String(x11.stdout || "") : "";
-  } catch {
-    return "";
+  let start = 0;
+  while (start < a.length && start < b.length && a[start] === b[start]) start++;
+  let aEnd = a.length;
+  let bEnd = b.length;
+  while (aEnd > start && bEnd > start && a[aEnd - 1] === b[bEnd - 1]) {
+    aEnd--;
+    bEnd--;
   }
+  return { additions: bEnd - start, deletions: aEnd - start };
 }
-function macClipboardPng(target) {
-  const script = [
-    "on run argv",
-    "set outputPath to item 1 of argv",
-    "set imageData to the clipboard as \xABclass PNGf\xBB",
-    "set outputFile to open for access POSIX file outputPath with write permission",
-    "set eof outputFile to 0",
-    "write imageData to outputFile",
-    "close access outputFile",
-    "end run"
-  ].join("\n");
-  const result = spawnSync12("osascript", ["-e", script, target], { encoding: "utf8", timeout: 3e3 });
-  return result.status === 0 && existsSync38(target);
-}
-function linuxClipboardPng(target) {
-  const wayland = spawnSync12("wl-paste", ["--type", "image/png"], { encoding: null, timeout: 3e3 });
-  if (wayland.status === 0 && Buffer.isBuffer(wayland.stdout) && wayland.stdout.length > 0) {
-    writeFileSync27(target, wayland.stdout);
-    return true;
-  }
-  const x11 = spawnSync12("xclip", ["-selection", "clipboard", "-t", "image/png", "-o"], { encoding: null, timeout: 3e3 });
-  if (x11.status === 0 && Buffer.isBuffer(x11.stdout) && x11.stdout.length > 0) {
-    writeFileSync27(target, x11.stdout);
-    return true;
+function unifiedDiffCounts(diff) {
+  let additions = 0;
+  let deletions = 0;
+  for (const line of String(diff || "").split("\n")) {
+    if (line.startsWith("+++") || line.startsWith("---")) continue;
+    if (line.startsWith("+")) additions++;
+    else if (line.startsWith("-")) deletions++;
   }
-  return false;
+  return { additions, deletions };
+}
+function safePath(cwd, file) {
+  const absolute = resolve6(cwd, file);
+  const rel = relative(cwd, absolute);
+  return rel && rel !== ".." && !rel.startsWith("../") ? rel : null;
 }
-function clipboardImage() {
-  const directory = mkdtempSync2(join37(tmpdir(), "synkro-paste-"));
-  const target = join37(directory, "clipboard.png");
+function worktreeContent(cwd, file) {
+  const rel = safePath(cwd, file);
+  if (!rel) return null;
   try {
-    const copied = process.platform === "darwin" ? macClipboardPng(target) : process.platform === "linux" && linuxClipboardPng(target);
-    if (copied && statSync5(target).size > 0) return target;
+    const absolute = resolve6(cwd, rel);
+    const stat = lstatSync2(absolute);
+    if (stat.isSymbolicLink()) return "symlink:" + readlinkSync(absolute);
+    if (!stat.isFile() || stat.size > MAX_TEXT_BYTES) return null;
+    const content = readFileSync33(absolute);
+    return content.includes(0) ? null : content.toString("utf8");
   } catch {
+    return null;
   }
-  rmSync7(directory, { recursive: true, force: true });
-  return "";
 }
-function cleanupPromptDraft(draft) {
-  for (const path of draft.temporaryImages) {
-    const directory = dirname12(resolve5(path));
-    const temporaryRoot = resolve5(tmpdir()) + sep3;
-    if (!directory.startsWith(temporaryRoot) || !basename3(directory).startsWith("synkro-paste-")) continue;
-    try {
-      rmSync7(directory, { recursive: true, force: true });
-    } catch {
-    }
-  }
+function fileOperation(event) {
+  return (event.type === "tool-start" || event.type === "tool-end") && /^(edit|write|delete)$/.test(event.kind);
 }
-function fallbackPrompt(cwd) {
-  return new Promise((resolveDraft) => {
-    const rl = createInterface5({ input: process.stdin, output: process.stdout });
-    let settled = false;
-    const finish = (value) => {
-      if (settled) return;
-      settled = true;
-      rl.close();
-      resolveDraft(value);
-    };
-    rl.once("close", () => finish(null));
-    rl.once("SIGINT", () => finish(null));
-    rl.question(S2.user + "  \u276F " + S2.reset, (text) => {
-      finish({ text, images: imagePathsInText(text, cwd), temporaryImages: [] });
-    });
-  });
+function eventPaths(cwd, event) {
+  const provided = event.type === "tool-end" ? (event.fileChanges || []).map((change) => change.path) : [];
+  const targets = String(event.target || "").split(/,\s*/);
+  return [...new Set([...provided, ...targets].map((file) => safePath(cwd, file)).filter((file) => Boolean(file)))];
 }
-function readPrompt(cwd) {
-  const input = process.stdin;
-  const output = process.stdout;
-  if (!input.isTTY || !output.isTTY || !input.setRawMode) return fallbackPrompt(cwd);
-  return new Promise((resolveDraft) => {
-    let text = "";
-    let cursor = 0;
-    let stream = "";
-    let pasting = false;
-    let settled = false;
-    const images = [];
-    const temporaryImages = [];
-    const wasRaw = Boolean(input.isRaw);
-    const prompt = S2.user + "  \u276F " + S2.reset;
-    const redraw = () => {
-      const safe = text.replace(/[\u0000-\u0008\u000B-\u001F\u007F-\u009F]/g, "").replace(/[\r\n]+/g, " / ");
-      const attachmentLabel = images.length ? "  [" + images.length + " image" + (images.length === 1 ? "" : "s") + "]" : "";
-      const attachments = attachmentLabel ? S2.dim + attachmentLabel + S2.reset : "";
-      output.write("\r\x1B[2K" + prompt + safe + attachments);
-      const after = text.slice(cursor).replace(/[\r\n]+/g, " / ").length + attachmentLabel.length;
-      if (after > 0) output.write("\x1B[" + after + "D");
-    };
-    const finish = (draft) => {
-      if (settled) return;
-      settled = true;
-      input.off("data", onData);
-      input.setRawMode?.(wasRaw);
-      output.write("\x1B[?2004l\n");
-      if (!draft) cleanupPromptDraft({ temporaryImages });
-      resolveDraft(draft);
-    };
-    const insert = (value) => {
-      text = text.slice(0, cursor) + value + text.slice(cursor);
-      cursor += value.length;
-    };
-    const attachClipboard = () => {
-      const image = clipboardImage();
-      if (image) {
-        images.push(image);
-        temporaryImages.push(image);
-        return;
+function snapshotOperation(cwd, event) {
+  return new Map(eventPaths(cwd, event).map((file) => [file, worktreeContent(cwd, file)]));
+}
+var MAX_TEXT_BYTES, MAX_DIFF_DISTANCE, OperationChangeTracker;
+var init_changes = __esm({
+  "cli/harness/changes.ts"() {
+    "use strict";
+    MAX_TEXT_BYTES = 2 * 1024 * 1024;
+    MAX_DIFF_DISTANCE = 4e3;
+    OperationChangeTracker = class {
+      constructor(cwd, capture) {
+        this.cwd = cwd;
+        this.capture = capture;
       }
-      insert(clipboardText());
-    };
-    const processStream = () => {
-      while (stream && !settled) {
-        if (pasting) {
-          const end = stream.indexOf(PASTE_END);
-          if (end < 0) {
-            const keep = markerCarryLength(stream, PASTE_END);
-            insert(stream.slice(0, stream.length - keep));
-            stream = stream.slice(stream.length - keep);
-            break;
-          }
-          insert(stream.slice(0, end));
-          stream = stream.slice(end + PASTE_END.length);
-          pasting = false;
-          continue;
-        }
-        if (stream.startsWith(PASTE_START)) {
-          stream = stream.slice(PASTE_START.length);
-          pasting = true;
-          continue;
-        }
-        if (PASTE_START.startsWith(stream)) break;
-        if (stream.startsWith("\x1B[D")) {
-          cursor = Math.max(0, cursor - 1);
-          stream = stream.slice(3);
-          continue;
-        }
-        if (stream.startsWith("\x1B[C")) {
-          cursor = Math.min(text.length, cursor + 1);
-          stream = stream.slice(3);
-          continue;
-        }
-        if (stream.startsWith("\x1B[H")) {
-          cursor = 0;
-          stream = stream.slice(3);
-          continue;
-        }
-        if (stream.startsWith("\x1B[F")) {
-          cursor = text.length;
-          stream = stream.slice(3);
-          continue;
-        }
-        if (stream.startsWith("\x1B[A") || stream.startsWith("\x1B[B")) {
-          stream = stream.slice(3);
-          continue;
+      cwd;
+      capture;
+      starts = /* @__PURE__ */ new Map();
+      snapshot(event) {
+        return this.capture ? this.capture() : snapshotOperation(this.cwd, event);
+      }
+      observe(event) {
+        if (event.type === "tool-start") {
+          if (fileOperation(event)) this.starts.set(event.id, this.snapshot(event));
+          return event;
         }
-        if (stream.startsWith("\x1B") && stream.length < 3) break;
-        const char = stream[0];
-        stream = stream.slice(1);
-        if (char === "\r" || char === "\n") {
-          const found = imagePathsInText(text, cwd);
-          for (const path of found) if (!images.includes(path)) images.push(path);
-          finish({ text, images, temporaryImages });
-        } else if (char === "" || char === "" && !text && images.length === 0) {
-          finish(null);
-        } else if (char === "\x7F" || char === "\b") {
-          if (cursor > 0) {
-            text = text.slice(0, cursor - 1) + text.slice(cursor);
-            cursor -= 1;
-          }
-        } else if (char === "") {
-          text = text.slice(cursor);
-          cursor = 0;
-        } else if (char === "") {
-          const before = text.slice(0, cursor).replace(/\s*\S+\s*$/, "");
-          text = before + text.slice(cursor);
-          cursor = before.length;
-        } else if (char === "") {
-          attachClipboard();
-        } else if (char >= " " || char === "	") {
-          insert(char);
+        if (event.type !== "tool-end") return event;
+        const before = this.starts.get(event.id);
+        this.starts.delete(event.id);
+        if (!before) return event;
+        const after = this.snapshot(event);
+        const files = [.../* @__PURE__ */ new Set([...before.keys(), ...after.keys()])].sort();
+        const fileChanges2 = [];
+        for (const file of files) {
+          const oldText = before.get(file);
+          const newText = after.has(file) ? after.get(file) : worktreeContent(this.cwd, file);
+          if (oldText === newText || oldText === null && newText === null) continue;
+          const counts = lineChangeCounts(oldText || "", newText || "");
+          fileChanges2.push({ path: file, ...counts });
         }
+        const provided = event.fileChanges || [];
+        const measured = new Map(fileChanges2.map((change) => [change.path, change]));
+        const merged = provided.map((change) => {
+          const actual = measured.get(change.path) || measured.get(safePath(this.cwd, change.path) || "");
+          if (actual && change.additions === 0 && change.deletions === 0) return actual;
+          return change;
+        });
+        const providedPaths = new Set(provided.flatMap((change) => [change.path, safePath(this.cwd, change.path) || ""]));
+        for (const change of fileChanges2) if (!providedPaths.has(change.path)) merged.push(change);
+        return { ...event, fileChanges: merged.length ? merged : fileChanges2 };
       }
-      if (!settled) redraw();
-    };
-    let queue = Promise.resolve();
-    const onData = (chunk) => {
-      queue = queue.then(() => {
-        stream += chunk.toString("utf8");
-        processStream();
-      });
     };
-    input.setRawMode(true);
-    input.resume();
-    input.on("data", onData);
-    output.write("\x1B[?2004h" + prompt);
-  });
+  }
+});
+
+// cli/codexUsage.ts
+function record(value) {
+  return value != null && typeof value === "object" && !Array.isArray(value) ? value : null;
 }
-var PASTE_START, PASTE_END, IMAGE_EXTENSIONS;
-var init_composer = __esm({
-  "cli/harness/composer.ts"() {
+function finiteNumber(value) {
+  const n = Number(value);
+  return Number.isFinite(n) ? n : null;
+}
+function rateWindow(value) {
+  const row2 = record(value);
+  if (!row2) return null;
+  const usedPercent = finiteNumber(row2.usedPercent);
+  if (usedPercent == null) return null;
+  return {
+    durationMins: finiteNumber(row2.windowDurationMins),
+    usedPercent,
+    resetsAt: finiteNumber(row2.resetsAt)
+  };
+}
+function codexUsageFromRateLimitsResponse(value) {
+  const response = record(value);
+  if (!response) return null;
+  const byLimitId = record(response.rateLimitsByLimitId);
+  const snapshot = record(byLimitId?.codex) || record(response.rateLimits);
+  if (!snapshot) return null;
+  const primary = rateWindow(snapshot.primary);
+  const secondary = rateWindow(snapshot.secondary);
+  const windows = [primary, secondary].filter((w) => w != null);
+  if (windows.length === 0) return null;
+  const fiveHour = windows.find((w) => w.durationMins === 300) || windows.find((w) => w.durationMins != null && w.durationMins <= 360) || (primary?.durationMins == null ? primary : null);
+  const sevenDay = windows.find((w) => w.durationMins === 10080) || windows.find((w) => w.durationMins != null && w.durationMins >= 1440) || (secondary !== fiveHour && secondary?.durationMins == null ? secondary : null);
+  const status = typeof snapshot.rateLimitReachedType === "string" ? snapshot.rateLimitReachedType : snapshot.spendControlReached === true ? "spend_control_reached" : null;
+  return {
+    util5h: fiveHour ? fiveHour.usedPercent / 100 : null,
+    util7d: sevenDay ? sevenDay.usedPercent / 100 : null,
+    reset5h: fiveHour?.resetsAt ?? null,
+    reset7d: sevenDay?.resetsAt ?? null,
+    status,
+    planType: typeof snapshot.planType === "string" ? snapshot.planType : null,
+    limitId: typeof snapshot.limitId === "string" ? snapshot.limitId : null
+  };
+}
+var init_codexUsage = __esm({
+  "cli/codexUsage.ts"() {
     "use strict";
-    init_render2();
-    PASTE_START = "\x1B[200~";
-    PASTE_END = "\x1B[201~";
-    IMAGE_EXTENSIONS = /* @__PURE__ */ new Set([".png", ".jpg", ".jpeg", ".gif", ".webp"]);
   }
 });
 
-// cli/harness/events.ts
-function fixPollId(raw) {
-  const text = String(raw || "");
-  return FIX_POLL_MARKER.exec(text)?.[1] || LEGACY_FIX_POLL_MARKER.exec(text)?.[1] || "";
-}
-function cleanGuardText(raw) {
-  return String(raw || "").replace(FIX_POLL_MARKER, "").replace(/\n*\s*SYNKRO FIX POLL[\s\S]*$/i, "").replace(/\n?\d{4}-\d\d-\d\dT[^\n]*\sERROR\s+codex_core::tools::router:[^\n]*/gi, "").replace(/\s*Checking command\s*$/i, "").trim();
-}
-function blockReason(raw) {
-  const text = cleanGuardText(raw);
-  if (!text) return "blocked by policy";
-  const guardAt = text.lastIndexOf("Guard:");
-  if (guardAt >= 0) return text.slice(guardAt + "Guard:".length).trim();
-  const afterTag = text.match(/\[synkro:[^\]]*\]\s*(.+)/is);
-  if (afterTag) return afterTag[1].trim();
-  const afterHook = text.match(/blocked by a hook:\s*(.+)/is);
-  if (afterHook) return afterHook[1].trim();
-  return text;
-}
-var BLOCK_MARKER, FIX_POLL_MARKER, LEGACY_FIX_POLL_MARKER;
-var init_events = __esm({
-  "cli/harness/events.ts"() {
-    "use strict";
-    BLOCK_MARKER = /blocked by a hook|\[synkro:/i;
-    FIX_POLL_MARKER = /\[synkro:fix-poll\s+item_id=\\?["']?([A-Za-z0-9_-]+)\\?["']?\]/i;
-    LEGACY_FIX_POLL_MARKER = /SYNKRO FIX POLL\s*\(item_id=([A-Za-z0-9_-]+)\)/i;
-  }
-});
-
-// cli/harness/cursor.ts
-function unwrapReplay(text) {
-  return text.replace(/<\/?user_query>/gi, "").trim();
+// cli/harness/cursor.ts
+function unwrapReplay(text) {
+  return text.replace(/<\/?user_query>/gi, "").trim();
 }
 function textOf(message) {
   const content = message?.content;
@@ -17315,10 +17561,10 @@ function textOf(message) {
 }
 function toolPayload(toolCall) {
   if (!toolCall) return { kind: "other", body: {} };
-  for (const [key, kind] of Object.entries(TOOL_KINDS)) {
-    if (toolCall[key]) return { kind, body: toolCall[key] };
+  for (const [key2, kind] of Object.entries(TOOL_KINDS)) {
+    if (toolCall[key2]) return { kind, body: toolCall[key2] };
   }
-  const fallback = Object.keys(toolCall).find((key) => key.endsWith("ToolCall"));
+  const fallback = Object.keys(toolCall).find((key2) => key2.endsWith("ToolCall"));
   return fallback ? { kind: "other", body: toolCall[fallback] } : { kind: "other", body: {} };
 }
 function targetOf(kind, body) {
@@ -17327,7 +17573,25 @@ function targetOf(kind, body) {
   const text = typeof candidate === "string" ? candidate : JSON.stringify(candidate ?? "");
   return text || body?.description || kind;
 }
-function parseCursorLine(line) {
+function completedFileChanges(body) {
+  const success = body?.result?.success || {};
+  const rows = Array.isArray(success.changes) ? success.changes : Array.isArray(success.files) ? success.files : [];
+  return rows.flatMap((change) => {
+    const path = String(change?.path || change?.filePath || change?.file_path || "");
+    if (!path) return [];
+    const diff = String(change?.diff || change?.patch || "");
+    const hasAdditions = change?.additions != null || change?.linesAdded != null;
+    const hasDeletions = change?.deletions != null || change?.linesRemoved != null;
+    if (!diff && !hasAdditions && !hasDeletions) return [];
+    const counted = unifiedDiffCounts(diff);
+    return [{
+      path,
+      additions: hasAdditions ? Number(change?.additions ?? change?.linesAdded) : counted.additions,
+      deletions: hasDeletions ? Number(change?.deletions ?? change?.linesRemoved) : counted.deletions
+    }];
+  });
+}
+function parseCursorLine(line, streamPartial = false) {
   const trimmed = String(line || "").trim();
   if (!trimmed) return [];
   let frame;
@@ -17353,7 +17617,7 @@ function parseCursorLine(line) {
   }
   if (type === "assistant") {
     const text = textOf(frame.message);
-    return text ? [{ type: "assistant-message", text }] : [];
+    return text ? [streamPartial ? { type: "assistant-delta", id: String(frame.model_call_id || ""), text } : { type: "assistant-message", text }] : [];
   }
   if (type === "thinking" && subtype === "delta" && frame.text) {
     return [{ type: "thinking", text: String(frame.text) }];
@@ -17381,8 +17645,10 @@ function parseCursorLine(line) {
         blocked,
         reason: rejected ? blocked ? blockReason(rawReason) : rawReason || "rejected" : "",
         pollId: blocked ? fixPollId(rawReason) : "",
+        pollIds: blocked ? fixPollIds(rawReason) : [],
         exitCode: success ? Number(success.exitCode ?? 0) : null,
-        output: String(success?.stdout || success?.stderr || "")
+        output: String(success?.stdout || success?.stderr || ""),
+        fileChanges: completedFileChanges(body)
       }];
     }
     return [];
@@ -17397,11 +17663,15 @@ function parseCursorLine(line) {
     }];
   }
   if (type === "result") {
-    return [{
-      type: "turn-end",
-      ok: !frame.is_error,
-      text: String(frame.result || "")
-    }];
+    const result = String(frame.result || "");
+    return [
+      ...streamPartial && result ? [{ type: "assistant-message", text: result }] : [],
+      {
+        type: "turn-end",
+        ok: !frame.is_error,
+        text: result
+      }
+    ];
   }
   return [];
 }
@@ -17420,12 +17690,14 @@ function feed(buffer, chunk) {
   const rest = parts.pop() ?? "";
   return { lines: parts, rest };
 }
-function cursorArgs(prompt) {
+function cursorArgs(prompt, resumeId = "") {
   return [
     "-p",
     prompt,
     "--output-format",
     "stream-json",
+    "--stream-partial-output",
+    ...resumeId ? ["--resume", resumeId] : [],
     // --force auto-runs tools but does NOT bypass hooks (verified live), so
     // Synkro's guards still gate every call; --trust loads workspace hooks.
     "--force",
@@ -17437,6 +17709,7 @@ var init_cursor = __esm({
   "cli/harness/cursor.ts"() {
     "use strict";
     init_events();
+    init_changes();
     TOOL_KINDS = {
       shellToolCall: "shell",
       readToolCall: "read",
@@ -17473,6 +17746,7 @@ function createTurnSink(opts) {
   const now = opts.now || (() => Date.now());
   const showPrompt = opts.showPrompt !== false;
   let blocked = 0;
+  let sessionId = "";
   let replaying = false;
   const seen = /* @__PURE__ */ new Set();
   let sawTurnEnd = false;
@@ -17553,6 +17827,7 @@ function createTurnSink(opts) {
   };
   const emit2 = (event) => {
     events.push(event);
+    if (event.type === "session-start" && event.sessionId) sessionId = event.sessionId;
     if (event.type === "tool-end" && event.blocked) blocked += 1;
     opts.onEvent?.(event);
     if (event.type === "notice" && event.kind === "retry") {
@@ -17603,25 +17878,25 @@ function createTurnSink(opts) {
       }
       replaying = true;
     }
-    const key = replayKey(event);
-    if (key) {
-      if (replaying && seen.has(key)) {
+    const key2 = replayKey(event);
+    if (key2) {
+      if (replaying && seen.has(key2)) {
         lastWasAnswer = event.type === "assistant-message";
         settle();
         return;
       }
-      seen.add(key);
+      seen.add(key2);
     }
-    if (key || event.type === "thinking") lastWasAnswer = event.type === "assistant-message";
+    if (key2 || event.type === "thinking") lastWasAnswer = event.type === "assistant-message";
     if (event.type === "turn-end") sawTurnEnd = true;
     if (event.type === "assistant-message") sawAnswer = true;
     emit2(event);
   };
   return {
     chunk(text) {
-      const { lines, rest } = feed(buffer, text);
+      const { lines: lines2, rest } = feed(buffer, text);
       buffer = rest;
-      for (const line of lines) for (const event of parseCursorLine(line)) take(event);
+      for (const line of lines2) for (const event of parseCursorLine(line, opts.streamPartial)) take(event);
     },
     notice(text) {
       emit2({ type: "notice", text });
@@ -17644,7 +17919,7 @@ function createTurnSink(opts) {
         }
       }
       stopStatus();
-      return { events, blocked, exitCode: interrupted ? 130 : sawAnswer ? 0 : exit };
+      return { events, blocked, exitCode: interrupted ? 130 : sawAnswer ? 0 : exit, sessionId };
     }
   };
 }
@@ -17660,10 +17935,11 @@ async function runCursorTurn(opts) {
     animate: Boolean(process.stdout.isTTY),
     showPrompt: opts.showPrompt,
     showHeader: opts.showHeader,
-    onGiveUp: () => stopHarness()
+    onGiveUp: () => stopHarness(),
+    streamPartial: true
   });
-  return new Promise((resolve8) => {
-    const child = spawn9("cursor-agent", cursorArgs(opts.prompt), {
+  return new Promise((resolve9) => {
+    const child = spawn9("cursor-agent", cursorArgs(opts.prompt, opts.resumeId), {
       cwd: opts.cwd,
       stdio: ["ignore", "pipe", "pipe"]
     });
@@ -17691,11 +17967,11 @@ async function runCursorTurn(opts) {
     });
     child.on("close", (code) => {
       opts.signal?.removeEventListener("abort", onAbort);
-      resolve8(sink.finish(code ?? 0, interrupted));
+      resolve9(sink.finish(code ?? 0, interrupted));
     });
     child.on("error", (error) => {
       sink.notice("failed to start cursor-agent: " + String(error));
-      resolve8(sink.finish(1, interrupted));
+      resolve9(sink.finish(1, interrupted));
     });
   });
 }
@@ -17711,360 +17987,562 @@ var init_run = __esm({
 
 // cli/harness/codex.ts
 import { spawn as spawn10 } from "child_process";
-function itemTarget(item) {
-  if (item?.type === "commandExecution") {
-    return { kind: "shell", target: String(item.command || ""), description: "" };
-  }
-  if (item?.type === "fileChange") {
-    const paths = Array.isArray(item.changes) ? item.changes.map((change) => String(change?.path || "")).filter(Boolean) : [];
-    return { kind: "edit", target: paths.join(", ") || "files", description: "" };
-  }
-  if (item?.type === "mcpToolCall") {
-    return { kind: "other", target: String(item.server || "") + "::" + String(item.tool || ""), description: "MCP tool" };
-  }
-  if (item?.type === "dynamicToolCall") {
-    return { kind: "other", target: [item.namespace, item.tool].filter(Boolean).join("::"), description: "tool" };
-  }
-  return { kind: "other", target: String(item?.type || "tool"), description: "" };
+import { createInterface as createInterface6 } from "readline";
+function codexStderrNotice(raw, initialized) {
+  const text = String(raw || "").trim();
+  if (!text || initialized) return "";
+  return /fatal|panic|authentication failed|not logged in/i.test(text) ? text.split("\n")[0].slice(0, 300) : "";
 }
-function itemOutput(item) {
-  if (item?.type === "commandExecution") return String(item.aggregatedOutput || "");
-  if (item?.type === "mcpToolCall") return item.error ? String(item.error?.message || JSON.stringify(item.error)) : item.result ? JSON.stringify(item.result) : "";
-  if (item?.type === "dynamicToolCall") return item.contentItems ? JSON.stringify(item.contentItems) : "";
-  return "";
+function stringify(value) {
+  if (typeof value === "string") return value;
+  try {
+    return JSON.stringify(value);
+  } catch {
+    return String(value ?? "");
+  }
+}
+function toolKind(item) {
+  if (item.type === "commandExecution") return "shell";
+  if (item.type === "fileChange") return "edit";
+  if (item.type === "webSearch") return "search";
+  return "other";
+}
+function toolTarget(item) {
+  if (item.type === "commandExecution") return item.command || "command";
+  if (item.type === "fileChange") return (item.changes || []).map((change) => change.path || change.filePath || "").filter(Boolean).join(", ") || "workspace files";
+  if (item.type === "mcpToolCall") return [item.server, item.tool].filter(Boolean).join(".") || "MCP tool";
+  if (item.type === "dynamicToolCall") return [item.namespace, item.tool].filter(Boolean).join(".") || "tool";
+  return item.query || item.type || "tool";
+}
+function fileChanges(item) {
+  if (item.type !== "fileChange" || !Array.isArray(item.changes)) return [];
+  return item.changes.flatMap((change) => {
+    const path = String(change.path || change.filePath || "");
+    if (!path) return [];
+    const diff = String(change.diff || change.patch || "");
+    const hasAdditions = change.additions != null || change.linesAdded != null;
+    const hasDeletions = change.deletions != null || change.linesRemoved != null;
+    if (!diff && !hasAdditions && !hasDeletions) return [];
+    const counted = unifiedDiffCounts(diff);
+    const additions = hasAdditions ? Number(change.additions ?? change.linesAdded) : counted.additions;
+    const deletions = hasDeletions ? Number(change.deletions ?? change.linesRemoved) : counted.deletions;
+    return [{ path, additions, deletions }];
+  });
 }
-function parseCodexNotification(method, params, startedAt = /* @__PURE__ */ new Map(), approvalReasons = /* @__PURE__ */ new Map()) {
-  if (method === "hook/started" || method === "hook/completed") {
-    const run2 = params?.run || {};
-    if (run2.eventName !== "preToolUse") return [];
-    const asMs = (value) => {
-      const number = Number(value || 0);
-      return number > 0 && number < 1e11 ? number * 1e3 : number;
-    };
-    const started = asMs(run2.startedAt);
-    const priorStart = Number(approvalReasons.get("__pretool_started__") || 0);
-    if (started && (!priorStart || started < priorStart)) approvalReasons.set("__pretool_started__", String(started));
-    if (method === "hook/completed") {
-      const completed = asMs(run2.completedAt) || started + Number(run2.durationMs || 0);
-      const priorCompleted = Number(approvalReasons.get("__pretool_completed__") || 0);
-      if (completed > priorCompleted) approvalReasons.set("__pretool_completed__", String(completed));
-      const entries = Array.isArray(run2.entries) ? run2.entries : [];
-      const pollEntry = entries.find((entry) => fixPollId(String(entry?.text || "")));
-      const blockingEntry = entries.find((entry) => entry?.kind === "stop" || entry?.kind === "error");
-      const text = String(pollEntry?.text || blockingEntry?.text || run2.statusMessage || "");
-      if (text && (run2.status === "blocked" || run2.status === "failed" || BLOCK_MARKER.test(text))) {
-        approvalReasons.set("__latest_hook__", text);
-        approvalReasons.set("__latest_hook_id__", String(run2.id || "synkro-policy-block"));
-        approvalReasons.set("__latest_hook_duration__", String(Number(run2.durationMs || Math.max(0, completed - started))));
-      }
-    }
-    return [];
-  }
-  if (method === "item/started") {
-    const item = params?.item;
-    if (!item?.id) return [];
-    startedAt.set(String(item.id), Number(params.startedAtMs || Date.now()));
-    if (!["commandExecution", "fileChange", "mcpToolCall", "dynamicToolCall"].includes(item.type)) return [];
-    return [{ type: "tool-start", id: String(item.id), ...itemTarget(item) }];
-  }
-  if (method === "item/completed") {
-    const item = params?.item;
-    if (!item?.id) return [];
-    if (item.type === "hookPrompt") {
-      const text = Array.isArray(item.fragments) ? item.fragments.map((fragment) => String(fragment?.text || "")).filter(Boolean).join("\n") : "";
-      if (text) {
-        const start2 = startedAt.get(String(item.id));
-        const completed2 = Number(params.completedAtMs || Date.now());
-        approvalReasons.set("__latest_hook__", text);
-        approvalReasons.set("__latest_hook_id__", String(item.id));
-        approvalReasons.set("__latest_hook_duration__", String(start2 === void 0 ? 0 : Math.max(0, completed2 - start2)));
-      }
-      startedAt.delete(String(item.id));
-      return [];
-    }
-    if (item.type === "agentMessage") {
-      return item.text ? [{ type: "assistant-message", text: String(item.text) }] : [];
-    }
-    if (item.type === "reasoning") {
-      const text = [...item.summary || [], ...item.content || []].join(" ").trim();
-      return text ? [{ type: "thinking", text }] : [];
-    }
-    if (!["commandExecution", "fileChange", "mcpToolCall", "dynamicToolCall"].includes(item.type)) return [];
-    const output = itemOutput(item);
-    const approvalReason = approvalReasons.get(String(item.id)) || "";
-    const hookReason = approvalReasons.get("__latest_hook__") || "";
-    const rawReason = [approvalReason, hookReason, output].filter(Boolean).join("\n");
+function codexAccountUsageEvent(value) {
+  const usage2 = codexUsageFromRateLimitsResponse(value);
+  if (usage2?.util7d == null) return null;
+  return {
+    type: "account-usage",
+    period: "weekly",
+    remainingPercent: Math.max(0, Math.min(100, Math.round((1 - usage2.util7d) * 100))),
+    resetsAt: usage2.reset7d
+  };
+}
+function codexMessageTurnId(message) {
+  return String(message.params?.turnId || message.params?.turn?.id || "");
+}
+function codexMessageIsTurnScoped(message) {
+  const method = String(message.method || "");
+  return method.startsWith("item/") || method === "hook/completed" || method === "turn/plan/updated";
+}
+function codexEvents(message) {
+  const method = String(message.method || "");
+  const params = message.params || {};
+  if (method === "account/rateLimits/updated") {
+    const event = codexAccountUsageEvent(params);
+    return event ? [event] : [];
+  }
+  const item = params.item || {};
+  if (method === "item/agentMessage/delta") return [{ type: "assistant-delta", id: params.itemId || "", text: params.delta || "" }];
+  if (method === "item/reasoning/summaryTextDelta") return [{ type: "thinking", text: params.delta || "Thinking" }];
+  const tools = ["commandExecution", "fileChange", "mcpToolCall", "dynamicToolCall", "webSearch"];
+  if (method === "item/started" && tools.includes(item.type)) {
+    return [{ type: "tool-start", id: item.id || "", kind: toolKind(item), target: toolTarget(item), description: "" }];
+  }
+  if (method === "item/completed" && item.type === "agentMessage") return [{ type: "assistant-message", text: item.text || "" }];
+  if (method === "item/completed" && tools.includes(item.type)) {
+    const raw = stringify(item.aggregatedOutput || item.error?.message || item.result?.content || item.contentItems || "");
     const status = String(item.status || "");
-    const blocked = BLOCK_MARKER.test(rawReason) || /blocked by PreToolUse hook/i.test(rawReason) || Boolean(hookReason) && (status === "failed" || status === "declined");
-    const itemStart = startedAt.get(String(item.id));
-    const hookStart = Number(approvalReasons.get("__pretool_started__") || 0);
-    const start = itemStart === void 0 ? hookStart || void 0 : hookStart ? Math.min(itemStart, hookStart) : itemStart;
-    const completed = Number(params.completedAtMs || Date.now());
-    const durationMs = start === void 0 ? item.durationMs ?? null : Math.max(0, completed - start);
-    startedAt.delete(String(item.id));
-    approvalReasons.delete(String(item.id));
-    approvalReasons.delete("__latest_hook__");
-    approvalReasons.delete("__latest_hook_id__");
-    approvalReasons.delete("__latest_hook_duration__");
-    approvalReasons.delete("__pretool_started__");
-    approvalReasons.delete("__pretool_completed__");
+    const blocked = BLOCK_MARKER.test(raw) || /declined|blocked|denied/.test(status);
+    const ok = !blocked && !/failed|error/.test(status) && (item.exitCode === null || item.exitCode === void 0 || item.exitCode === 0);
     return [{
       type: "tool-end",
-      id: String(item.id),
-      ...itemTarget(item),
-      ok: status === "completed" && Number(item.exitCode ?? 0) === 0,
+      id: item.id || "",
+      kind: toolKind(item),
+      target: toolTarget(item),
+      ok,
       blocked,
-      reason: blocked ? blockReason(rawReason) : "",
-      pollId: blocked ? fixPollId(rawReason) : "",
-      exitCode: item.exitCode === null || item.exitCode === void 0 ? null : Number(item.exitCode),
-      output: blocked ? "" : output,
-      durationMs
+      reason: blocked ? blockReason(raw || status) : "",
+      pollId: blocked ? fixPollId(raw) : "",
+      pollIds: blocked ? fixPollIds(raw) : [],
+      exitCode: typeof item.exitCode === "number" ? item.exitCode : null,
+      output: raw,
+      durationMs: typeof item.durationMs === "number" ? item.durationMs : null,
+      fileChanges: fileChanges(item)
     }];
   }
-  if (method === "turn/completed") {
-    const status = String(params?.turn?.status || "failed");
-    const hookReason = approvalReasons.get("__latest_hook__") || "";
-    const events = [];
-    if (hookReason) {
-      events.push({
-        type: "tool-end",
-        id: approvalReasons.get("__latest_hook_id__") || "synkro-policy-block",
-        kind: "other",
-        target: "policy check",
-        ok: false,
-        blocked: true,
-        reason: blockReason(hookReason),
-        pollId: fixPollId(hookReason),
-        exitCode: null,
-        output: "",
-        durationMs: Number(approvalReasons.get("__latest_hook_duration__") || 0)
-      });
-      approvalReasons.delete("__latest_hook__");
-      approvalReasons.delete("__latest_hook_id__");
-      approvalReasons.delete("__latest_hook_duration__");
-    }
-    approvalReasons.delete("__pretool_started__");
-    approvalReasons.delete("__pretool_completed__");
-    events.push({ type: "turn-end", ok: status === "completed", text: String(params?.turn?.error?.message || "") });
-    return events;
+  if (method === "hook/completed") {
+    const run2 = params.run || {};
+    if (run2.status !== "blocked") return [];
+    const reason = (run2.entries || []).map((entry) => entry.text || "").filter(Boolean).join("\n") || run2.statusMessage || "blocked by policy";
+    return [{
+      type: "tool-end",
+      id: "hook:" + (run2.id || ""),
+      kind: "other",
+      target: run2.eventName || "Guard",
+      ok: false,
+      blocked: true,
+      reason: blockReason(reason),
+      exitCode: null,
+      output: reason,
+      pollId: fixPollId(reason),
+      pollIds: fixPollIds(reason),
+      durationMs: typeof run2.durationMs === "number" ? run2.durationMs : null
+    }];
   }
-  return [];
-}
-function codexStderrNotice(raw, initialized) {
-  const text = String(raw || "").trim();
-  if (!text || initialized) return "";
-  return /fatal|panic|authentication failed|not logged in/i.test(text) ? text.split("\n")[0].slice(0, 300) : "";
-}
-async function askApproval(text) {
-  const input = process.stdin;
-  const output = process.stdout;
-  if (!input.isTTY || !output.isTTY) return false;
-  output.write("\n" + S2.rule + "  Synkro approval required" + S2.reset + "\n  " + text.replace(/[\u0000-\u001F\u007F-\u009F]/g, " ").slice(0, 600) + "\n");
-  output.write(S2.dim + "  Press y to allow once; any other key denies." + S2.reset + "\n");
-  return new Promise((resolve8) => {
-    const wasRaw = Boolean(input.isRaw);
-    const onData = (chunk) => {
-      input.off("data", onData);
-      if (input.setRawMode) input.setRawMode(wasRaw);
-      resolve8(chunk.toString("utf8").toLowerCase() === "y");
-    };
-    if (input.setRawMode) input.setRawMode(true);
-    input.resume();
-    input.on("data", onData);
-  });
-}
-async function runCodexTurn(opts) {
-  const session = new CodexAppSession();
-  try {
-    return await session.turn(opts);
-  } finally {
-    session.close();
+  if (method === "turn/plan/updated") {
+    return [{ type: "plan", steps: (params.plan || []).map((row2) => ({ step: row2.step || "", status: row2.status || "pending" })) }];
+  }
+  if (method === "thread/tokenUsage/updated") {
+    const usage2 = params.tokenUsage || {};
+    const total = usage2.total || usage2.last || {};
+    const used = Number(total.totalTokens ?? total.total_tokens ?? usage2.totalTokens ?? 0);
+    const context = Number(usage2.modelContextWindow ?? usage2.model_context_window ?? 0);
+    return [{ type: "usage", used, contextWindow: context || null }];
   }
+  if (method === "warning" || method === "error") return [{ type: "notice", text: params.message || params.error?.message || "Codex transport warning" }];
+  return [];
 }
-var CodexAppSession;
+var CodexSession;
 var init_codex = __esm({
   "cli/harness/codex.ts"() {
     "use strict";
     init_composer();
     init_events();
+    init_changes();
+    init_codexUsage();
     init_run();
     init_render2();
-    CodexAppSession = class {
+    CodexSession = class {
+      constructor(cwd, resumeId = "") {
+        this.cwd = cwd;
+        this.resumeId = resumeId;
+      }
+      cwd;
+      resumeId;
       child = null;
-      buffer = "";
+      initialized = false;
       nextId = 1;
       pending = /* @__PURE__ */ new Map();
-      initialized = false;
+      onEvent = null;
+      activeTurn = "";
+      turnDone = null;
+      completedTurns = /* @__PURE__ */ new Map();
+      accountUsage = null;
       threadId = "";
-      model = "Codex";
-      cwd = "";
-      active = null;
-      send(message) {
-        this.child?.stdin.write(JSON.stringify({ jsonrpc: "2.0", ...message }) + "\n");
-      }
-      request(method, params) {
+      model = "";
+      request(method, params, timeoutMs = 0) {
+        if (!this.child) return Promise.reject(new Error("Codex app-server is not running"));
         const id = this.nextId++;
-        return new Promise((resolve8, reject) => {
-          this.pending.set(id, { resolve: resolve8, reject });
-          this.send({ id, method, params });
+        this.child.stdin.write(JSON.stringify({ method, id, params }) + "\n");
+        return new Promise((resolve9, reject) => {
+          const timer = timeoutMs > 0 ? setTimeout(() => {
+            this.pending.delete(id);
+            reject(new Error(method + " timed out"));
+          }, timeoutMs) : null;
+          this.pending.set(id, {
+            resolve: (value) => {
+              if (timer) clearTimeout(timer);
+              resolve9(value);
+            },
+            reject: (error) => {
+              if (timer) clearTimeout(timer);
+              reject(error);
+            }
+          });
         });
       }
-      respond(id, result) {
-        this.send({ id, result });
+      notify(method, params = {}) {
+        this.child?.stdin.write(JSON.stringify({ method, params }) + "\n");
       }
-      async handleServerRequest(message) {
-        const method = String(message.method || "");
-        const params = message.params || {};
-        if (params.itemId && params.reason) this.active?.approvalReasons.set(String(params.itemId), String(params.reason));
-        if (method === "item/commandExecution/requestApproval" || method === "item/fileChange/requestApproval") {
-          const summary = String(params.reason || params.command || params.grantRoot || "Allow this action?");
-          const accepted = await askApproval(summary);
-          this.respond(message.id, { decision: accepted ? "accept" : "decline" });
-          return;
-        }
-        if (method === "item/tool/requestUserInput") {
-          const answers = {};
-          for (const question of params.questions || []) answers[String(question.id)] = { answers: [] };
-          this.respond(message.id, { answers });
-          return;
-        }
-        if (method === "mcpServer/elicitation/request") {
-          this.respond(message.id, { action: "decline" });
-          return;
-        }
-        this.respond(message.id, {});
-      }
-      handleLine(line) {
-        let message;
-        try {
-          message = JSON.parse(line);
-        } catch {
+      receive(message) {
+        if (message.id !== void 0 && !message.method) {
+          const pending = this.pending.get(message.id);
+          if (!pending) return;
+          this.pending.delete(message.id);
+          if (message.error) pending.reject(new Error(message.error.message || stringify(message.error)));
+          else pending.resolve(message.result);
           return;
         }
-        if (message.method && message.id !== void 0) {
-          void this.handleServerRequest(message);
+        if (message.id !== void 0 && message.method) {
+          this.child?.stdin.write(JSON.stringify({ id: message.id, result: { decision: "decline" } }) + "\n");
+          this.onEvent?.({ type: "notice", text: "Codex requested an approval the embedded policy did not permit." });
           return;
         }
-        if (message.method) {
-          const active = this.active;
-          if (!active) return;
-          const events = parseCodexNotification(message.method, message.params, active.startedAt, active.approvalReasons);
-          for (const event of events) active.sink.event(event);
-          if (message.method === "turn/started") active.turnId = String(message.params?.turn?.id || "");
-          if (message.method === "turn/completed") {
-            const result = active.sink.finish(message.params?.turn?.status === "completed" ? 0 : 1, active.interrupted);
-            this.active = null;
-            active.resolve(result);
-          }
-          return;
+        const messageTurnId = codexMessageTurnId(message);
+        const staleTurnEvent = codexMessageIsTurnScoped(message) && (!this.activeTurn || messageTurnId && messageTurnId !== this.activeTurn);
+        for (const event of codexEvents(message)) {
+          if (event.type === "account-usage") this.accountUsage = event;
+          if (!staleTurnEvent) this.onEvent?.(event);
         }
-        if (message.id !== void 0) {
-          const pending = this.pending.get(Number(message.id));
-          if (!pending) return;
-          this.pending.delete(Number(message.id));
-          if (message.error) pending.reject(new Error(String(message.error?.message || JSON.stringify(message.error))));
-          else pending.resolve(message.result);
+        if (message.method === "turn/completed" && message.params?.turn?.id === this.activeTurn) {
+          const status = String(message.params.turn.status || "");
+          this.completedTurns.set(message.params.turn.id, status);
+          this.turnDone?.(status);
+        } else if (message.method === "turn/completed" && message.params?.turn?.id) {
+          this.completedTurns.set(message.params.turn.id, String(message.params.turn.status || ""));
         }
       }
-      async start(cwd) {
-        if (this.child) return;
-        this.cwd = cwd;
-        this.child = spawn10("codex", ["app-server"], { cwd, stdio: ["pipe", "pipe", "pipe"] });
-        this.child.stdout.on("data", (chunk) => {
-          this.buffer += chunk.toString("utf8");
-          let newline = this.buffer.indexOf("\n");
-          while (newline !== -1) {
-            const line = this.buffer.slice(0, newline).trim();
-            this.buffer = this.buffer.slice(newline + 1);
-            if (line) this.handleLine(line);
-            newline = this.buffer.indexOf("\n");
+      async start() {
+        this.child = spawn10("codex", ["app-server", "--stdio"], { cwd: this.cwd, stdio: ["pipe", "pipe", "pipe"] });
+        this.child.on("error", (cause) => {
+          const error = cause instanceof Error ? cause : new Error(String(cause));
+          for (const pending of this.pending.values()) pending.reject(error);
+          this.pending.clear();
+          this.turnDone?.("failed");
+        });
+        createInterface6({ input: this.child.stdout }).on("line", (line) => {
+          try {
+            this.receive(JSON.parse(line));
+          } catch {
           }
         });
         this.child.stderr.on("data", (chunk) => {
-          const note = codexStderrNotice(chunk.toString("utf8"), this.initialized);
-          if (note) this.active?.sink.notice(note);
+          const message = codexStderrNotice(String(chunk || ""), this.initialized);
+          if (message) this.onEvent?.({ type: "notice", text: message });
         });
-        this.child.on("close", (code) => {
-          const active = this.active;
-          if (active) {
-            this.active = null;
-            active.resolve(active.sink.finish(code ?? 1, active.interrupted));
-          }
-          for (const pending of this.pending.values()) pending.reject(new Error("codex app-server exited"));
+        this.child.once("exit", (code) => {
+          const error = new Error("Codex app-server exited" + (code === null ? "" : " (" + code + ")"));
+          for (const pending of this.pending.values()) pending.reject(error);
           this.pending.clear();
-          this.child = null;
+          this.turnDone?.("failed");
         });
-        this.child.on("error", (error) => {
-          const failure = new Error("failed to start codex app-server: " + String(error));
-          const active = this.active;
-          if (active) {
-            active.sink.notice(failure.message);
-            this.active = null;
-            active.resolve(active.sink.finish(1, active.interrupted));
-          }
-          for (const pending of this.pending.values()) pending.reject(failure);
-          this.pending.clear();
-        });
-        const initialized = await this.request("initialize", { clientInfo: { name: "synkro-governed", version: "1.0.0" } });
+        await this.request("initialize", { clientInfo: { name: "synkro-terminal", title: "Synkro", version: "1" }, capabilities: { experimentalApi: true } });
+        this.notify("initialized");
         this.initialized = true;
-        this.send({ method: "initialized", params: {} });
-        const started = await this.request("thread/start", {
-          cwd,
-          approvalPolicy: "on-request",
-          approvalsReviewer: "user",
-          sandbox: "workspace-write",
-          ephemeral: false
-        });
-        this.threadId = String(started?.thread?.id || "");
-        this.model = String(started?.model || initialized?.userAgent || "Codex");
-        if (!this.threadId) throw new Error("codex app-server did not return a thread id");
+        try {
+          const event = codexAccountUsageEvent(await this.request("account/rateLimits/read", null, 4e3));
+          if (event) this.accountUsage = event;
+        } catch {
+        }
+        let result;
+        try {
+          result = this.resumeId ? await this.request("thread/resume", { threadId: this.resumeId, cwd: this.cwd, approvalPolicy: "never", sandbox: "workspace-write" }) : await this.request("thread/start", { cwd: this.cwd, approvalPolicy: "never", sandbox: "workspace-write", serviceName: "Synkro" });
+        } catch (error) {
+          if (!this.resumeId) throw error;
+          result = await this.request("thread/start", { cwd: this.cwd, approvalPolicy: "never", sandbox: "workspace-write", serviceName: "Synkro" });
+        }
+        this.threadId = result.thread?.id || "";
+        this.model = result.model || "";
       }
-      async turn(opts) {
-        await this.start(opts.cwd);
-        if (this.active) throw new Error("a Codex turn is already running");
-        const sink = createTurnSink({
-          write: opts.write || ((text) => process.stdout.write(text)),
-          onEvent: opts.onEvent,
-          width: opts.width || Number(process.stdout.columns || 100),
-          animate: false,
-          showPrompt: opts.showPrompt,
-          showHeader: opts.showHeader
-        });
-        sink.event({ type: "session-start", sessionId: this.threadId, model: this.model, cwd: this.cwd, authSource: "login" });
-        sink.event({
-          type: "user-message",
-          text: opts.prompt || (opts.images?.length ? "[" + opts.images.length + " image attached]" : "")
-        });
-        const result = new Promise((resolve8) => {
-          this.active = { sink, resolve: resolve8, startedAt: /* @__PURE__ */ new Map(), approvalReasons: /* @__PURE__ */ new Map(), turnId: "", interrupted: false };
-        });
-        const onAbort = () => {
-          if (!this.active) return;
-          this.active.interrupted = true;
-          if (this.active.turnId) void this.request("turn/interrupt", { threadId: this.threadId, turnId: this.active.turnId }).catch(() => {
-          });
+      async runTurn(prompt, onEvent, signal) {
+        let blocked = 0;
+        let turnId = "";
+        let interrupt = null;
+        this.onEvent = (event) => {
+          if (event.type === "tool-end" && event.blocked) blocked++;
+          onEvent(event);
         };
-        if (opts.signal?.aborted) onAbort();
-        else opts.signal?.addEventListener("abort", onAbort, { once: true });
         try {
-          await this.request("turn/start", {
-            threadId: this.threadId,
-            cwd: opts.cwd,
-            input: codexUserInput({ text: opts.prompt, images: opts.images || [] })
+          onEvent({ type: "session-start", sessionId: this.threadId, model: this.model || "Codex", cwd: this.cwd, authSource: "login" });
+          if (this.accountUsage) onEvent(this.accountUsage);
+          onEvent({ type: "user-message", text: prompt });
+          const response = await this.request("turn/start", { threadId: this.threadId, input: [{ type: "text", text: prompt }] });
+          turnId = response.turn?.id || "";
+          this.activeTurn = turnId;
+          let aborted = false;
+          let interruptSent = false;
+          interrupt = () => {
+            aborted = true;
+            if (interruptSent || !this.activeTurn) return;
+            interruptSent = true;
+            void this.request("turn/interrupt", { threadId: this.threadId, turnId: this.activeTurn }).catch(() => {
+            });
+          };
+          if (signal?.aborted) interrupt();
+          else signal?.addEventListener("abort", interrupt, { once: true });
+          const alreadyDone = this.completedTurns.get(turnId);
+          const status = alreadyDone ?? await new Promise((resolve9) => {
+            this.turnDone = resolve9;
           });
-          return await result;
+          this.completedTurns.delete(turnId);
+          signal?.removeEventListener("abort", interrupt);
+          this.activeTurn = "";
+          this.turnDone = null;
+          this.onEvent = null;
+          onEvent({ type: "turn-end", ok: aborted || /completed/.test(status), text: aborted ? "interrupted" : status });
+          return { exitCode: aborted ? 130 : /completed/.test(status) ? 0 : 1, blocked, sessionId: this.threadId };
         } finally {
-          opts.signal?.removeEventListener("abort", onAbort);
+          if (interrupt) signal?.removeEventListener("abort", interrupt);
+          if (turnId) this.completedTurns.delete(turnId);
+          this.activeTurn = "";
+          this.turnDone = null;
+          this.onEvent = null;
         }
       }
       close() {
-        this.child?.kill();
+        this.child?.kill("SIGTERM");
         this.child = null;
       }
     };
   }
 });
 
+// cli/harness/screen.ts
+var ANSI, REVERSE, STREAM_DRAW_MS, STATUS_TICK_MS, resetDateFormat, visible, pathLabel, SynkroScreen;
+var init_screen = __esm({
+  "cli/harness/screen.ts"() {
+    "use strict";
+    init_render2();
+    init_changes();
+    ANSI = /\x1b\[[0-?]*[ -\/]*[@-~]/g;
+    REVERSE = "\x1B[7m";
+    STREAM_DRAW_MS = 80;
+    STATUS_TICK_MS = 240;
+    resetDateFormat = new Intl.DateTimeFormat("en-US", { month: "short", day: "numeric" });
+    visible = (value) => value.replace(ANSI, "").length;
+    pathLabel = (cwd) => {
+      const parts = cwd.split("/").filter(Boolean);
+      return parts.length > 2 ? "\u2026/" + parts.slice(-2).join("/") : cwd;
+    };
+    SynkroScreen = class {
+      constructor(harness, cwd, write2 = (text) => process.stdout.write(text)) {
+        this.harness = harness;
+        this.cwd = cwd;
+        this.write = write2;
+        this.changes = new OperationChangeTracker(cwd);
+      }
+      harness;
+      cwd;
+      write;
+      transcript = [];
+      draft = "";
+      input = "";
+      selectionAnchor = null;
+      selectionFocus = null;
+      status = "Ready";
+      statusSince = Date.now();
+      tick = 0;
+      used = 0;
+      context = null;
+      weeklyRemaining = null;
+      weeklyResetsAt = null;
+      model = "";
+      timer = null;
+      drawTimer = null;
+      lastDrawAt = 0;
+      scrollOffset = 0;
+      changes;
+      resize = () => this.draw();
+      enter() {
+        this.write("\x1B[?1049h\x1B[?25l\x1B[?1000h\x1B[?1002h\x1B[?1006h");
+        process.stdout.on("resize", this.resize);
+        this.timer = setInterval(() => {
+          if (this.status === "Ready") return;
+          this.tick++;
+          this.queueDraw();
+        }, STATUS_TICK_MS);
+        this.timer.unref();
+        this.draw();
+      }
+      leave() {
+        if (this.timer) clearInterval(this.timer);
+        if (this.drawTimer) clearTimeout(this.drawTimer);
+        process.stdout.removeListener("resize", this.resize);
+        this.write(S2.reset + "\x1B[?1006l\x1B[?1002l\x1B[?1000l\x1B[?25h\x1B[?1049l");
+      }
+      setInput(value) {
+        this.input = cleanOutput(value);
+        this.selectionAnchor = null;
+        this.selectionFocus = null;
+        this.draw();
+      }
+      selectionRange() {
+        if (this.selectionAnchor === null || this.selectionFocus === null || this.selectionAnchor === this.selectionFocus) return null;
+        return [Math.min(this.selectionAnchor, this.selectionFocus), Math.max(this.selectionAnchor, this.selectionFocus)];
+      }
+      clearSelection() {
+        this.selectionAnchor = null;
+        this.selectionFocus = null;
+        this.draw();
+      }
+      scrollBy(lines2) {
+        this.scrollOffset = Math.max(0, this.scrollOffset + lines2);
+        this.draw();
+      }
+      scrollToBottom() {
+        this.scrollOffset = 0;
+        this.draw();
+      }
+      /** Select text using one-based SGR mouse coordinates from the terminal. */
+      selectInputAt(x, y, extend, width = this.width(), height = this.height()) {
+        const rows = this.inputRows(width);
+        const composerLength = rows.length + 2;
+        const viewport = Math.max(3, height - composerLength - 2);
+        const lineIndex = y - (viewport + 2);
+        const row2 = rows[lineIndex];
+        if (!row2) return;
+        const index = Math.min(row2.end, row2.start + Math.max(0, x - 5));
+        if (!extend || this.selectionAnchor === null) this.selectionAnchor = index;
+        this.selectionFocus = index;
+        this.draw();
+      }
+      updateStatus(value) {
+        if (this.status === value) return false;
+        this.status = value;
+        this.statusSince = Date.now();
+        return true;
+      }
+      setStatus(value) {
+        if (this.updateStatus(value)) this.draw();
+      }
+      add(event) {
+        event = this.changes.observe(event);
+        if (event.type === "session-start") {
+          this.model = event.model;
+          this.draw();
+          return;
+        }
+        if (event.type === "assistant-delta") {
+          this.draft += event.text;
+          this.updateStatus("Writing\u2026");
+          this.queueDraw();
+          return;
+        }
+        if (event.type === "assistant-message") this.draft = "";
+        if (event.type === "usage") {
+          this.used = event.used;
+          this.context = event.contextWindow;
+          if (event.model) this.model = event.model;
+          this.draw();
+          return;
+        }
+        if (event.type === "account-usage") {
+          this.weeklyRemaining = event.remainingPercent;
+          this.weeklyResetsAt = event.resetsAt;
+          this.draw();
+          return;
+        }
+        if (event.type === "thinking") {
+          if (this.updateStatus(event.text || "Thinking\u2026")) this.draw();
+          return;
+        }
+        if (event.type === "tool-start") this.updateStatus("Working\u2026");
+        if (event.type === "tool-end") this.updateStatus(event.blocked ? "Guard enforced" : "Working\u2026");
+        if (event.type === "turn-end") this.updateStatus(event.ok ? "Ready" : "Turn ended");
+        const rendered = renderEvent(event, this.width());
+        if (this.scrollOffset > 0) this.scrollOffset += rendered.length;
+        this.transcript.push(...rendered);
+        this.draw();
+      }
+      width() {
+        return Math.max(50, Number(process.stdout.columns || 100));
+      }
+      height() {
+        return Math.max(16, Number(process.stdout.rows || 30));
+      }
+      inputRows(width) {
+        const lineWidth = Math.max(1, Math.max(30, width - 4) - 4);
+        if (!this.input) return [{ text: "", start: 0, end: 0 }];
+        const rows = [];
+        for (let start = 0; start < this.input.length; start += lineWidth) {
+          const text = this.input.slice(start, start + lineWidth);
+          rows.push({ text, start, end: start + text.length });
+        }
+        return rows.slice(-3);
+      }
+      selectedText(row2) {
+        const range = this.selectionRange();
+        if (!range || range[1] <= row2.start || range[0] >= row2.end) return S2.text + row2.text;
+        const from = Math.max(range[0], row2.start) - row2.start;
+        const to = Math.min(range[1], row2.end) - row2.start;
+        return S2.text + row2.text.slice(0, from) + REVERSE + row2.text.slice(from, to) + S2.reset + S2.composer + S2.text + row2.text.slice(to);
+      }
+      frame(width = this.width(), height = this.height()) {
+        const inner = Math.max(30, width - 4);
+        const provider = this.harness === "codex" ? "Codex" : "Cursor";
+        const draft = this.draft ? ["", ...wrap(this.draft, inner - 2).map((line, i) => S2.agent + "  " + (i ? "  " : "\u23FA ") + line + S2.reset)] : [];
+        const status = this.status === "Ready" ? S2.secondary + "  \xB7 Ready" + S2.reset : statusLine({ tick: this.tick, text: this.status, elapsedMs: Date.now() - this.statusSince, width });
+        const rule = S2.border + "  " + "\u2500".repeat(inner) + S2.reset;
+        const inputRows = this.inputRows(width);
+        const composer = [rule, ...inputRows.map((row2, i) => S2.composer + (i ? "    " : S2.user + "  \u276F ") + this.selectedText(row2) + (i === inputRows.length - 1 ? S2.user + " \u258C" : "") + S2.reset), rule];
+        const usedPercent = this.context ? Math.min(100, Math.round(this.used / this.context * 100)) : null;
+        const contextUsage = usedPercent === null ? "\u2014 context" : usedPercent + "% context";
+        const resetDate = this.weeklyResetsAt == null ? "" : "  \xB7  " + resetDateFormat.format(new Date(this.weeklyResetsAt * 1e3));
+        const accountUsage = this.weeklyRemaining === null ? "Weekly \u2014" : "Weekly " + this.weeklyRemaining + "% left" + resetDate;
+        const usage2 = contextUsage + "  \xB7  " + accountUsage;
+        const left = S2.secondary + "  " + pathLabel(this.cwd) + S2.reset + S2.canvas;
+        const badge = S2.panel + S2.secondary + " " + usage2 + " " + S2.reset + S2.canvas;
+        const right = badge + S2.secondary + "  \xB7  " + provider + (this.model ? "  " + cleanOutput(this.model) : "") + "  \xB7  \u29C9 powered by synkro  " + S2.reset + S2.canvas;
+        const footer = left + " ".repeat(Math.max(1, width - visible(left) - visible(right))) + right;
+        const viewport = Math.max(3, height - composer.length - 2);
+        const fullContent = [...this.transcript, ...draft, status];
+        const maxScroll = Math.max(0, fullContent.length - viewport);
+        const effectiveOffset = Math.min(this.scrollOffset, maxScroll);
+        const end = fullContent.length - effectiveOffset;
+        const content = fullContent.slice(Math.max(0, end - viewport), end);
+        while (content.length < viewport) content.unshift("");
+        const rows = [...content, ...composer, footer].slice(0, height);
+        while (rows.length < height) rows.push("");
+        return rows.map((line) => {
+          const fill = line.startsWith(S2.panel) ? S2.panel : line.includes(S2.composer) ? S2.composer : S2.canvas;
+          return S2.canvas + line + fill + " ".repeat(Math.max(0, width - visible(line))) + S2.reset;
+        }).join("\n");
+      }
+      queueDraw() {
+        if (this.drawTimer) return;
+        const delay = Math.max(0, STREAM_DRAW_MS - (Date.now() - this.lastDrawAt));
+        this.drawTimer = setTimeout(() => {
+          this.drawTimer = null;
+          this.draw();
+        }, delay);
+        this.drawTimer.unref?.();
+      }
+      draw() {
+        if (this.drawTimer) {
+          clearTimeout(this.drawTimer);
+          this.drawTimer = null;
+        }
+        this.lastDrawAt = Date.now();
+        this.write("\x1B[H" + this.frame());
+      }
+    };
+  }
+});
+
+// cli/harness/state.ts
+import { mkdirSync as mkdirSync24, readFileSync as readFileSync34, writeFileSync as writeFileSync28 } from "fs";
+import { homedir as homedir39 } from "os";
+import { dirname as dirname13, join as join38 } from "path";
+function load(file = STATE_FILE) {
+  try {
+    const value = JSON.parse(readFileSync34(file, "utf8"));
+    return value && typeof value === "object" && !Array.isArray(value) ? value : {};
+  } catch {
+    return {};
+  }
+}
+function loadSessionId(harness, cwd, file = STATE_FILE) {
+  return load(file)[key(harness, cwd)] || "";
+}
+function saveSessionId(harness, cwd, sessionId, file = STATE_FILE) {
+  if (!sessionId) return;
+  try {
+    mkdirSync24(dirname13(file), { recursive: true });
+    writeFileSync28(file, JSON.stringify({ ...load(file), [key(harness, cwd)]: sessionId }, null, 2));
+  } catch {
+  }
+}
+var STATE_FILE, key;
+var init_state = __esm({
+  "cli/harness/state.ts"() {
+    "use strict";
+    STATE_FILE = join38(homedir39(), ".synkro", "terminal-sessions.json");
+    key = (harness, cwd) => harness + ":" + cwd.replace(/\/+$/, "");
+  }
+});
+
 // cli/harness/fixPoll.ts
 function pollBaseUrl() {
   const port = String(process.env.SYNKRO_MCP_PORT || "18931");
@@ -18079,11 +18557,13 @@ async function loadFixPoll(itemId, fetchImpl = fetch) {
   const body = await response.json();
   const candidates = Array.isArray(body.candidates) ? body.candidates.filter((candidate) => typeof candidate === "string").slice(0, 8) : [];
   if (!candidates.length || body.status !== "pending") return null;
+  const recommendedIdx = Number.isInteger(body.recommended_idx) && body.recommended_idx >= 0 && body.recommended_idx < candidates.length ? body.recommended_idx : -1;
   return {
     itemId,
     filePath: String(body.file_path || ""),
     ruleId: String(body.rule_id || ""),
-    candidates
+    candidates,
+    recommendedIdx
   };
 }
 async function recordFixPoll(itemId, chosenIdx, fetchImpl = fetch) {
@@ -18098,7 +18578,7 @@ function fixPollLines(poll, selected, width = 100) {
   const max = Math.max(32, width - 10);
   const choices = [...poll.candidates, "None of the above"];
   const scope = [poll.ruleId, poll.filePath].filter(Boolean).join("  \xB7  ");
-  const lines = [
+  const lines2 = [
     "",
     S2.bold + S2.rule + "  Synkro needs your decision" + S2.reset,
     ...scope ? [S2.dim + "  " + neutralizeTerminalControls(scope) + S2.reset] : [],
@@ -18106,42 +18586,43 @@ function fixPollLines(poll, selected, width = 100) {
   ];
   choices.forEach((choice, index) => {
     const prefix = index === selected ? S2.user + "  \u276F " : S2.dim + "    ";
-    const text = wrap(index + 1 + ". " + neutralizeTerminalControls(choice), max);
-    lines.push(prefix + (text[0] || "") + S2.reset);
-    for (const continuation of text.slice(1)) lines.push("      " + continuation);
+    const recommendation = index === poll.recommendedIdx ? "Recommended: " : "";
+    const text = wrap(index + 1 + ". " + recommendation + neutralizeTerminalControls(choice), max);
+    lines2.push(prefix + (text[0] || "") + S2.reset);
+    for (const continuation of text.slice(1)) lines2.push("      " + continuation);
   });
-  lines.push("", S2.dim + "  \u2191/\u2193 select  \xB7  Enter confirm  \xB7  1-" + choices.length + " choose" + S2.reset);
-  return lines;
+  lines2.push("", S2.dim + "  \u2191/\u2193 select  \xB7  Enter confirm  \xB7  1-" + choices.length + " choose" + S2.reset);
+  return lines2;
 }
 async function pickFixPoll(poll, io = {}) {
   const input = io.input || process.stdin;
   const output = io.output || process.stdout;
   if (!input.isTTY || !output.isTTY) return -1;
-  let selected = 0;
+  let selected = poll.recommendedIdx >= 0 && poll.recommendedIdx < poll.candidates.length ? poll.recommendedIdx : 0;
   let rendered = 0;
   const draw = () => {
     if (rendered) output.write("\x1B[" + rendered + "A\x1B[J");
-    const lines = fixPollLines(poll, selected, Number(output.columns || 100));
-    output.write(lines.join("\n") + "\n");
-    rendered = lines.length;
+    const lines2 = fixPollLines(poll, selected, Number(output.columns || 100));
+    output.write(lines2.join("\n") + "\n");
+    rendered = lines2.length;
   };
-  const choice = await new Promise((resolve8) => {
+  const choice = await new Promise((resolve9) => {
     const choices = poll.candidates.length + 1;
     const wasRaw = Boolean(input.isRaw);
     const done = (index) => {
       input.off("data", onData);
       if (input.setRawMode) input.setRawMode(wasRaw);
-      resolve8(index === poll.candidates.length ? -1 : index);
+      resolve9(index === poll.candidates.length ? -1 : index);
     };
     const onData = (chunk) => {
-      const key = chunk.toString("utf8");
-      if (key === "") return done(poll.candidates.length);
-      if (key === "\x1B" || key.toLowerCase() === "n") return done(poll.candidates.length);
-      if (key === "\r" || key === "\n") return done(selected);
-      if (key === "\x1B[A" || key === "k") selected = (selected - 1 + choices) % choices;
-      else if (key === "\x1B[B" || key === "j") selected = (selected + 1) % choices;
-      else if (/^[1-9]$/.test(key)) {
-        const index = Number(key) - 1;
+      const key2 = chunk.toString("utf8");
+      if (key2 === "") return done(poll.candidates.length);
+      if (key2 === "\x1B" || key2.toLowerCase() === "n") return done(poll.candidates.length);
+      if (key2 === "\r" || key2 === "\n") return done(selected);
+      if (key2 === "\x1B[A" || key2 === "k") selected = (selected - 1 + choices) % choices;
+      else if (key2 === "\x1B[B" || key2 === "j") selected = (selected + 1) % choices;
+      else if (/^[1-9]$/.test(key2)) {
+        const index = Number(key2) - 1;
         if (index < choices) return done(index);
       } else return;
       draw();
@@ -18154,7 +18635,7 @@ async function pickFixPoll(poll, io = {}) {
   return choice;
 }
 async function resolveFixPolls(events, io = {}) {
-  const ids = Array.from(new Set(events.filter((event) => event.type === "tool-end").map((event) => event.pollId || "").filter(Boolean)));
+  const ids = Array.from(new Set(events.filter((event) => event.type === "tool-end").flatMap((event) => event.pollIds?.length ? event.pollIds : [event.pollId || ""]).filter(Boolean)));
   const recorded = [];
   for (const itemId of ids) {
     const poll = await loadFixPoll(itemId, io.fetchImpl).catch(() => null);
@@ -18173,134 +18654,227 @@ var init_fixPoll = __esm({
   }
 });
 
-// cli/harness/identity.ts
-import { execFileSync as execFileSync6 } from "child_process";
-import { homedir as homedir39 } from "os";
-function shortenPath(path, home = homedir39()) {
-  const value = String(path || "");
-  if (home && value === home) return "~";
-  if (home && value.startsWith(home + "/")) return "~" + value.slice(home.length);
-  return value;
-}
-function parseCursorAccount(output) {
-  const match = String(output || "").match(/logged in as\s+(\S+)/i);
-  return match ? match[1].trim() : "";
+// cli/harness/session.ts
+function deleteSelectedText(value, range) {
+  if (!range) return value.slice(0, -1);
+  return value.slice(0, range[0]) + value.slice(range[1]);
 }
-function cursorAccount() {
-  try {
-    const out = execFileSync6("cursor-agent", ["status"], {
-      encoding: "utf8",
-      timeout: 5e3,
-      stdio: ["ignore", "pipe", "pipe"]
-    });
-    return parseCursorAccount(out);
-  } catch {
-    return "";
+function handleScrollInput(screen, data) {
+  let handled = false;
+  const mousePattern = /\x1b\[<(\d+);\d+;\d+[Mm]/g;
+  let mouse;
+  while ((mouse = mousePattern.exec(data)) !== null) {
+    const button = Number(mouse[1]);
+    if (button === 64 || button === 65) {
+      screen.scrollBy(button === 64 ? 3 : -3);
+      handled = true;
+    }
   }
-}
-function synkroAccount() {
-  let email = "";
-  try {
-    email = String(getUserInfo().email || "");
-  } catch {
-    return { email: "", needsLogin: false };
+  if (data.includes("\x1B[5~")) {
+    screen.scrollBy(10);
+    handled = true;
   }
-  let needsLogin = false;
-  try {
-    needsLogin = isTokenExpired() && !loadCredentials()?.refresh_token;
-  } catch {
+  if (data.includes("\x1B[6~")) {
+    screen.scrollBy(-10);
+    handled = true;
   }
-  return { email, needsLogin };
-}
-function readIdentity(harness) {
-  const synkro = synkroAccount();
-  return {
-    harness: harness === "cursor" ? cursorAccount() : "",
-    synkro: synkro.email,
-    needsLogin: synkro.needsLogin
-  };
+  return handled;
 }
-function identityHeader(opts) {
-  const lines = ["", S2.bold + "  " + shortenPath(opts.cwd, opts.home) + S2.reset];
-  const label = (name, value, note = "") => S2.dim + "  " + name.padEnd(7) + S2.reset + S2.think + value + S2.reset + note;
-  if (opts.identity.harness) lines.push(label(opts.harness, opts.identity.harness));
-  if (opts.identity.synkro) {
-    lines.push(label("synkro", opts.identity.synkro, opts.identity.needsLogin ? S2.blocked + "  \xB7  session ended, run synkro login" + S2.reset : ""));
-  }
-  lines.push("");
-  return lines;
+function printEvent(event) {
+  const lines2 = renderEvent(event, Number(process.stdout.columns || 100));
+  if (lines2.length) process.stdout.write(lines2.join("\n") + "\n");
 }
-var init_identity2 = __esm({
-  "cli/harness/identity.ts"() {
-    "use strict";
-    init_auth();
-    init_render2();
-  }
-});
-
-// cli/harness/session.ts
 async function runOnce(harness, cwd, prompt, echoPrompt = true, showHeader = true, signal) {
-  if (harness !== "cursor" && harness !== "codex") {
+  if (!supported(harness)) {
     process.stdout.write(S2.dim + "  " + harness + " sessions are not embedded yet\n" + S2.reset);
     return 1;
   }
-  const result = harness === "codex" ? await runCodexTurn({ prompt, cwd, showPrompt: echoPrompt, showHeader, signal }) : await runCursorTurn({ prompt, cwd, showPrompt: echoPrompt, showHeader, signal });
-  await resolveFixPolls(result.events);
-  if (result.blocked > 0) {
-    process.stdout.write(
-      S2.blocked + "  " + result.blocked + " action" + (result.blocked === 1 ? "" : "s") + " blocked by policy" + S2.reset + "\n"
-    );
+  const resumeId = loadSessionId(harness, cwd);
+  if (harness === "cursor") {
+    const result = await runCursorTurn({ prompt, cwd, showPrompt: echoPrompt, showHeader, signal, resumeId });
+    saveSessionId(harness, cwd, result.sessionId || "");
+    await resolveFixPolls(result.events);
+    return result.exitCode;
+  }
+  const session = new CodexSession(cwd, resumeId);
+  const events = [];
+  try {
+    await session.start();
+    const result = await session.runTurn(prompt, (event) => {
+      events.push(event);
+      printEvent(event);
+    }, signal);
+    saveSessionId(harness, cwd, result.sessionId);
+    await resolveFixPolls(events);
+    return result.exitCode;
+  } finally {
+    session.close();
   }
-  return result.exitCode;
 }
-async function runGovernedSession(harness, cwd, prompt) {
-  if (prompt) return runOnce(harness, cwd, prompt);
-  process.stdout.write(identityHeader({ cwd, harness, identity: readIdentity(harness) }).join("\n") + "\n");
-  const codex = harness === "codex" ? new CodexAppSession() : null;
-  let turn = null;
-  const interruptTurn = () => {
-    turn?.abort();
+function readPrompt(screen) {
+  return new Promise((resolve9) => {
+    let value = "";
+    const finish = (answer) => {
+      process.stdin.removeListener("data", onData);
+      screen.setInput("");
+      resolve9(answer);
+    };
+    const onData = (chunk) => {
+      const data = chunk.toString("utf8");
+      const scrolled = handleScrollInput(screen, data);
+      const mousePattern = /\x1b\[<(\d+);(\d+);(\d+)([Mm])/g;
+      let mouse;
+      let sawMouse = false;
+      while ((mouse = mousePattern.exec(data)) !== null) {
+        sawMouse = true;
+        const button = Number(mouse[1]);
+        if (button === 0 || button === 32) {
+          screen.selectInputAt(Number(mouse[2]), Number(mouse[3]), button === 32 || mouse[4] === "m");
+        }
+      }
+      if (sawMouse || scrolled) return;
+      const selection = screen.selectionRange();
+      if (data === "\x1B[3~") {
+        value = deleteSelectedText(value, selection);
+        screen.setInput(value);
+        return;
+      }
+      if (data === "\x1B") {
+        if (selection) {
+          value = deleteSelectedText(value, selection);
+          screen.setInput(value);
+        } else finish(null);
+        return;
+      }
+      if (data.startsWith("\x1B")) return;
+      for (const char of data) {
+        if (char === "" || char === "") {
+          finish(null);
+          return;
+        }
+        if (char === "\r" || char === "\n") {
+          finish(value);
+          return;
+        }
+        if (char === "\x7F" || char === "\b") value = deleteSelectedText(value, screen.selectionRange());
+        else if (char === "") value = "";
+        else if (char === "") value = value.replace(/\s*\S+\s*$/, "");
+        else if (char >= " ") {
+          const range = screen.selectionRange();
+          value = range ? value.slice(0, range[0]) + char + value.slice(range[1]) : value + char;
+        }
+        screen.setInput(value);
+      }
+    };
+    process.stdin.on("data", onData);
+    screen.setInput(value);
+  });
+}
+async function cancellable(screen, run2) {
+  const controller = new AbortController();
+  const onData = (chunk) => {
+    const text = chunk.toString("utf8");
+    if (handleScrollInput(screen, text)) return;
+    if (text.includes("") || text === "\x1B") {
+      screen.setStatus("Interrupting\u2026");
+      controller.abort();
+    }
   };
-  process.on("SIGINT", interruptTurn);
-  let first = true;
+  process.stdin.on("data", onData);
+  try {
+    return await run2(controller.signal);
+  } finally {
+    process.stdin.removeListener("data", onData);
+  }
+}
+async function resolveScreenFixPolls(screen, events) {
+  if (!events.some((event) => event.type === "tool-end" && Boolean(event.pollId))) return;
+  screen.leave();
+  try {
+    await resolveFixPolls(events);
+  } finally {
+    screen.enter();
+  }
+}
+async function runSynkroSession(harness, cwd, prompt) {
+  if (prompt) return runOnce(harness, cwd, prompt);
+  if (!supported(harness)) return runOnce(harness, cwd, "");
+  if (!process.stdin.isTTY || !process.stdout.isTTY) {
+    process.stderr.write("synkro terminal requires a TTY\n");
+    return 1;
+  }
+  const screen = new SynkroScreen(harness, cwd);
+  const resumeId = loadSessionId(harness, cwd);
+  let codex = null;
+  process.stdin.setRawMode(true);
+  process.stdin.resume();
+  screen.enter();
   try {
+    if (harness === "codex") {
+      screen.setStatus("Connecting to Codex\u2026");
+      codex = new CodexSession(cwd, resumeId);
+      await codex.start();
+      saveSessionId(harness, cwd, codex.threadId);
+      screen.add({ type: "session-start", sessionId: codex.threadId, model: codex.model || "Codex", cwd, authSource: "login" });
+      screen.setStatus("Ready");
+    }
     for (; ; ) {
-      const draft = await readPrompt(cwd);
-      if (draft === null) break;
-      const line = draft.text.trim();
-      if (!line && draft.images.length === 0) continue;
-      if (draft.images.length === 0 && (line === "exit" || line === "quit")) break;
+      const answer = await readPrompt(screen);
+      if (answer === null) break;
+      const line = answer.trim();
+      if (!line) continue;
+      if (line === "/exit" || line === "/quit" || line === "exit" || line === "quit") break;
+      screen.setStatus("Working\u2026");
+      const events = [];
       try {
-        turn = new AbortController();
-        const cursorPrompt = draft.images.length ? [draft.text, "", "Attached image files:", ...draft.images].join("\n") : draft.text;
-        const result = codex ? await codex.turn({ prompt: draft.text, images: draft.images, cwd, showPrompt: false, showHeader: first, signal: turn.signal }) : await runCursorTurn({ prompt: cursorPrompt, cwd, showPrompt: false, showHeader: first, signal: turn.signal });
-        await resolveFixPolls(result.events);
-        if (result.blocked > 0) {
-          process.stdout.write(
-            S2.blocked + "  " + result.blocked + " action" + (result.blocked === 1 ? "" : "s") + " blocked by policy" + S2.reset + "\n"
-          );
+        if (harness === "cursor") {
+          const result = await cancellable(screen, (signal) => runCursorTurn({
+            prompt: line,
+            cwd,
+            signal,
+            resumeId: loadSessionId(harness, cwd),
+            write: () => {
+            },
+            onEvent: (event) => {
+              events.push(event);
+              screen.add(event);
+            },
+            showHeader: false
+          }));
+          saveSessionId(harness, cwd, result.sessionId || "");
+        } else {
+          const result = await cancellable(screen, (signal) => codex.runTurn(line, (event) => {
+            events.push(event);
+            screen.add(event);
+          }, signal));
+          saveSessionId(harness, cwd, result.sessionId);
         }
-        first = false;
-      } finally {
-        cleanupPromptDraft(draft);
-        turn = null;
+        await resolveScreenFixPolls(screen, events);
+      } catch (error) {
+        screen.add({ type: "notice", text: error instanceof Error ? error.message : String(error) });
+        screen.add({ type: "turn-end", ok: false, text: "" });
       }
+      screen.setStatus("Ready");
     }
+    return 0;
   } finally {
-    process.off("SIGINT", interruptTurn);
     codex?.close();
+    screen.leave();
+    process.stdin.setRawMode(false);
+    process.stdin.pause();
   }
-  return 0;
 }
+var supported;
 var init_session = __esm({
   "cli/harness/session.ts"() {
     "use strict";
-    init_composer();
-    init_run();
     init_codex();
-    init_fixPoll();
-    init_identity2();
+    init_run();
     init_render2();
+    init_screen();
+    init_state();
+    init_fixPoll();
+    supported = (harness) => harness === "cursor" || harness === "codex";
   }
 });
 
@@ -18341,17 +18915,19 @@ async function takeover(kind, cwd) {
   const runner = backend === "container" ? info.runner : HOST3;
   return runInherit(["env", "TMUX=", ...runnerInteractiveArgs(runner, ["tmux", "attach-session", "-t", spawned.session])]);
 }
-async function restoreSession(session) {
-  const record = loadRecords().find((row2) => row2.session === session);
-  if (!record) return;
+async function restoreSession(session, bootPath) {
+  const record2 = loadRecords().find((row2) => row2.session === session);
+  if (!record2) return;
   const info = await detectContainerBackend();
   await spawnAgent(info, {
-    name: record.name,
-    harness: record.harness,
-    spaceName: record.spaceName,
-    cwd: record.space,
-    backend: record.harness === "codex" ? "host" : record.backend,
-    resume: true
+    name: record2.name,
+    harness: record2.harness,
+    spaceName: record2.spaceName,
+    cwd: record2.space,
+    backend: record2.mode === "embedded" ? "host" : record2.backend,
+    resume: record2.mode !== "embedded",
+    mode: record2.mode,
+    command: record2.mode === "embedded" ? embeddedSessionCommand(bootPath, record2.harness, record2.space) : void 0
   });
 }
 async function printStatus() {
@@ -18404,7 +18980,7 @@ async function uiCommand(args2) {
     const harness = args2[runAt + 1] || "cursor";
     const cwd = args2[runAt + 2] || repoRoot();
     const prompt = args2.slice(runAt + 3).join(" ").trim();
-    process.exitCode = await runGovernedSession(harness, cwd, prompt);
+    process.exitCode = await runSynkroSession(harness, cwd, prompt);
     return;
   }
   const takeoverAt = args2.indexOf("--takeover");
@@ -18414,7 +18990,7 @@ async function uiCommand(args2) {
   }
   const restoreAt = args2.indexOf("--restore");
   if (restoreAt !== -1) {
-    await restoreSession(args2[restoreAt + 1] || "");
+    await restoreSession(args2[restoreAt + 1] || "", bootPath);
     return;
   }
   if (args2.includes("--status")) {
@@ -18492,12 +19068,12 @@ __export(linear_exports, {
   formatLinks: () => formatLinks,
   linearCommand: () => linearCommand
 });
-import { readFileSync as readFileSync33 } from "fs";
+import { readFileSync as readFileSync35 } from "fs";
 import { homedir as homedir40 } from "os";
-import { join as join38 } from "path";
+import { join as join39 } from "path";
 function mcpJwt() {
   try {
-    return readFileSync33(join38(SYNKRO_DIR14, ".mcp-jwt"), "utf-8").trim();
+    return readFileSync35(join39(SYNKRO_DIR14, ".mcp-jwt"), "utf-8").trim();
   } catch {
     return "";
   }
@@ -18536,7 +19112,7 @@ var SYNKRO_DIR14, PORT2, BASE;
 var init_linear = __esm({
   "cli/commands/linear.ts"() {
     "use strict";
-    SYNKRO_DIR14 = join38(homedir40(), ".synkro");
+    SYNKRO_DIR14 = join39(homedir40(), ".synkro");
     PORT2 = process.env.SYNKRO_MCP_PORT || "18931";
     BASE = `http://127.0.0.1:${PORT2}`;
   }
@@ -18544,13 +19120,13 @@ var init_linear = __esm({
 
 // cli/scanning/cveReachability.ts
 import { parse } from "@babel/parser";
-import { readFileSync as readFileSync34 } from "fs";
+import { readFileSync as readFileSync36 } from "fs";
 function walk(node, visit) {
   if (!node || typeof node.type !== "string") return;
   visit(node);
-  for (const key of Object.keys(node)) {
-    if (key === "loc" || key === "start" || key === "end" || key === "range" || key === "leadingComments" || key === "trailingComments") continue;
-    const child = node[key];
+  for (const key2 of Object.keys(node)) {
+    if (key2 === "loc" || key2 === "start" || key2 === "end" || key2 === "range" || key2 === "leadingComments" || key2 === "trailingComments") continue;
+    const child = node[key2];
     if (Array.isArray(child)) {
       for (const c of child) if (c && typeof c.type === "string") walk(c, visit);
     } else if (child && typeof child.type === "string") walk(child, visit);
@@ -18685,9 +19261,9 @@ var init_cveReachability = __esm({
 });
 
 // cli/reachability/reachabilityScan.ts
-import { spawnSync as spawnSync13, execFileSync as execFileSync7 } from "child_process";
-import { readFileSync as readFileSync35, writeFileSync as writeFileSync28, existsSync as existsSync39, readdirSync as readdirSync10 } from "fs";
-import { join as join39 } from "path";
+import { spawnSync as spawnSync13, execFileSync as execFileSync6 } from "child_process";
+import { readFileSync as readFileSync37, writeFileSync as writeFileSync29, existsSync as existsSync39, readdirSync as readdirSync10 } from "fs";
+import { join as join40 } from "path";
 import { homedir as homedir41 } from "os";
 import { createRequire } from "module";
 function walkSourceFiles(repoRoot3, maxFiles = 4e3, maxBytes = 5e5) {
@@ -18705,7 +19281,7 @@ function walkSourceFiles(repoRoot3, maxFiles = 4e3, maxBytes = 5e5) {
     }
     for (const e of ents) {
       if (files.length >= maxFiles) break;
-      const full = join39(dir, e.name);
+      const full = join40(dir, e.name);
       if (e.isDirectory()) {
         if (!SKIP2.has(e.name) && !e.name.startsWith(".")) stack.push(full);
         continue;
@@ -18713,7 +19289,7 @@ function walkSourceFiles(repoRoot3, maxFiles = 4e3, maxBytes = 5e5) {
       if (!EXT.test(e.name) || e.name.endsWith(".d.ts")) continue;
       const rel = full.startsWith(repoRoot3 + "/") ? full.slice(repoRoot3.length + 1) : full;
       try {
-        const content = readFileSync35(full, "utf8");
+        const content = readFileSync37(full, "utf8");
         if (content.length <= maxBytes) files.push({ path: rel, content });
       } catch {
       }
@@ -18732,12 +19308,12 @@ function cleanVersion(spec) {
 function gatherManifestVersions(repoRoot3) {
   const out = {};
   const dirs = [repoRoot3];
-  const pkgsDir = join39(repoRoot3, "packages");
+  const pkgsDir = join40(repoRoot3, "packages");
   if (existsSync39(pkgsDir)) {
     try {
       for (const d of readdirSync10(pkgsDir)) {
-        const pd = join39(pkgsDir, d);
-        if (existsSync39(join39(pd, "package.json"))) dirs.push(pd);
+        const pd = join40(pkgsDir, d);
+        if (existsSync39(join40(pd, "package.json"))) dirs.push(pd);
       }
     } catch {
     }
@@ -18746,7 +19322,7 @@ function gatherManifestVersions(repoRoot3) {
   for (const dir of dirs) {
     let pkg;
     try {
-      pkg = JSON.parse(readFileSync35(join39(dir, "package.json"), "utf8"));
+      pkg = JSON.parse(readFileSync37(join40(dir, "package.json"), "utf8"));
     } catch {
       continue;
     }
@@ -18766,28 +19342,28 @@ function findJelly(repoRoot3) {
   try {
     const pkgJson = require2.resolve("@cs-au-dk/jelly/package.json");
     const dir = pkgJson.slice(0, pkgJson.length - "package.json".length);
-    const pkg = JSON.parse(readFileSync35(pkgJson, "utf8"));
+    const pkg = JSON.parse(readFileSync37(pkgJson, "utf8"));
     const bin = typeof pkg.bin === "string" ? pkg.bin : pkg.bin && (pkg.bin.jelly || pkg.bin[Object.keys(pkg.bin)[0]]);
     if (bin) {
-      const p = join39(dir, bin);
+      const p = join40(dir, bin);
       if (existsSync39(p)) return p;
     }
   } catch {
   }
   for (const base of [repoRoot3, process.cwd()]) {
-    const b = join39(base, "node_modules", ".bin", "jelly");
+    const b = join40(base, "node_modules", ".bin", "jelly");
     if (existsSync39(b)) return b;
   }
   return null;
 }
 function findEntries(repoRoot3) {
   const dirs = [repoRoot3];
-  const pkgsDir = join39(repoRoot3, "packages");
+  const pkgsDir = join40(repoRoot3, "packages");
   if (existsSync39(pkgsDir)) {
     try {
       for (const d of readdirSync10(pkgsDir)) {
-        const pd = join39(pkgsDir, d);
-        if (existsSync39(join39(pd, "package.json"))) dirs.push(pd);
+        const pd = join40(pkgsDir, d);
+        if (existsSync39(join40(pd, "package.json"))) dirs.push(pd);
       }
     } catch {
     }
@@ -18795,11 +19371,11 @@ function findEntries(repoRoot3) {
   const entries = [];
   for (const dir of dirs) {
     try {
-      const pkg = JSON.parse(readFileSync35(join39(dir, "package.json"), "utf8"));
+      const pkg = JSON.parse(readFileSync37(join40(dir, "package.json"), "utf8"));
       const cands = [pkg.source, pkg.module, pkg.main, "src/index.ts", "src/index.js", "src/main.ts", "src/server.ts", "index.ts", "index.js"];
       for (const c of cands) {
         if (typeof c !== "string") continue;
-        const f = join39(dir, c);
+        const f = join40(dir, c);
         if (existsSync39(f)) {
           entries.push(f);
           break;
@@ -18812,7 +19388,7 @@ function findEntries(repoRoot3) {
 }
 function currentCommit(repoRoot3) {
   try {
-    return execFileSync7("git", ["rev-parse", "HEAD"], { cwd: repoRoot3, encoding: "utf8" }).trim();
+    return execFileSync6("git", ["rev-parse", "HEAD"], { cwd: repoRoot3, encoding: "utf8" }).trim();
   } catch {
     return "";
   }
@@ -18835,7 +19411,7 @@ function runReachabilityScan(repoRoot3, opts = {}) {
   const commit = currentCommit(repoRoot3);
   if (!opts.force && commit && existsSync39(REACHABILITY_PATH)) {
     try {
-      const prev = JSON.parse(readFileSync35(REACHABILITY_PATH, "utf8"));
+      const prev = JSON.parse(readFileSync37(REACHABILITY_PATH, "utf8"));
       if (prev.commit === commit) return { ok: true, cached: true, packages: Object.keys(prev.packages || {}).length };
     } catch {
     }
@@ -18924,7 +19500,7 @@ function runReachabilityScan(repoRoot3, opts = {}) {
   if (Object.keys(packages).length === 0) return { ok: false, reason: "no package usage found (no jelly output, no AST imports)" };
   const file = { generatedAt: (/* @__PURE__ */ new Date()).toISOString(), commit, tool, packages, versions: gatherManifestVersions(repoRoot3) };
   try {
-    writeFileSync28(REACHABILITY_PATH, JSON.stringify(file, null, 2));
+    writeFileSync29(REACHABILITY_PATH, JSON.stringify(file, null, 2));
   } catch (e) {
     return { ok: false, reason: "write failed: " + String(e.message || e) };
   }
@@ -18936,7 +19512,7 @@ var init_reachabilityScan = __esm({
     "use strict";
     init_cveReachability();
     require2 = createRequire(import.meta.url);
-    REACHABILITY_PATH = join39(homedir41(), ".synkro", "reachability.json");
+    REACHABILITY_PATH = join40(homedir41(), ".synkro", "reachability.json");
   }
 });
 
@@ -18945,15 +19521,15 @@ var reachabilityScan_exports = {};
 __export(reachabilityScan_exports, {
   reachabilityScanCommand: () => reachabilityScanCommand
 });
-import { readFileSync as readFileSync36, existsSync as existsSync40 } from "fs";
-import { join as join40 } from "path";
+import { readFileSync as readFileSync38, existsSync as existsSync40 } from "fs";
+import { join as join41 } from "path";
 import { homedir as homedir42 } from "os";
-import { execFileSync as execFileSync8 } from "child_process";
+import { execFileSync as execFileSync7 } from "child_process";
 function readConfigEnv4() {
-  const p = join40(SYNKRO_DIR15, "config.env");
+  const p = join41(SYNKRO_DIR15, "config.env");
   if (!existsSync40(p)) return {};
   const out = {};
-  for (const line of readFileSync36(p, "utf-8").split("\n")) {
+  for (const line of readFileSync38(p, "utf-8").split("\n")) {
     const t = line.trim();
     if (!t || t.startsWith("#")) continue;
     const eq = t.indexOf("=");
@@ -18963,7 +19539,7 @@ function readConfigEnv4() {
 }
 function repoRoot2() {
   try {
-    return execFileSync8("git", ["rev-parse", "--show-toplevel"], { encoding: "utf-8" }).trim();
+    return execFileSync7("git", ["rev-parse", "--show-toplevel"], { encoding: "utf-8" }).trim();
   } catch {
     return process.cwd();
   }
@@ -18971,7 +19547,7 @@ function repoRoot2() {
 function repoSlug(root) {
   const run2 = (a) => {
     try {
-      return execFileSync8("git", a, { encoding: "utf-8" }).trim();
+      return execFileSync7("git", a, { encoding: "utf-8" }).trim();
     } catch {
       return "";
     }
@@ -18985,11 +19561,11 @@ async function pushToCloud(cfg, repo) {
   while (gwBase.endsWith("/")) gwBase = gwBase.slice(0, -1);
   let jwt2 = "";
   try {
-    jwt2 = readFileSync36(join40(SYNKRO_DIR15, ".mcp-jwt"), "utf-8").trim();
+    jwt2 = readFileSync38(join41(SYNKRO_DIR15, ".mcp-jwt"), "utf-8").trim();
   } catch {
   }
   if (!jwt2 || !existsSync40(REACHABILITY_PATH)) return;
-  const body = readFileSync36(REACHABILITY_PATH, "utf-8");
+  const body = readFileSync38(REACHABILITY_PATH, "utf-8");
   try {
     const resp = await fetch(gwBase + "/api/v1/reachability?repo=" + encodeURIComponent(repo), {
       method: "POST",
@@ -19021,7 +19597,7 @@ var init_reachabilityScan2 = __esm({
   "cli/commands/reachabilityScan.ts"() {
     "use strict";
     init_reachabilityScan();
-    SYNKRO_DIR15 = join40(homedir42(), ".synkro");
+    SYNKRO_DIR15 = join41(homedir42(), ".synkro");
   }
 });
 
@@ -19151,13 +19727,13 @@ var config_exports = {};
 __export(config_exports, {
   configCommand: () => configCommand
 });
-import { readFileSync as readFileSync37, writeFileSync as writeFileSync29, existsSync as existsSync41 } from "fs";
-import { join as join41 } from "path";
+import { readFileSync as readFileSync39, writeFileSync as writeFileSync30, existsSync as existsSync41 } from "fs";
+import { join as join42 } from "path";
 import { homedir as homedir43 } from "os";
 function readConfigEnv5() {
   if (!existsSync41(CONFIG_PATH9)) return {};
   const out = {};
-  for (const line of readFileSync37(CONFIG_PATH9, "utf-8").split("\n")) {
+  for (const line of readFileSync39(CONFIG_PATH9, "utf-8").split("\n")) {
     const t = line.trim();
     if (!t || t.startsWith("#")) continue;
     const eq = t.indexOf("=");
@@ -19165,23 +19741,23 @@ function readConfigEnv5() {
   }
   return out;
 }
-function updateConfigValue(key, value) {
+function updateConfigValue(key2, value) {
   if (!existsSync41(CONFIG_PATH9)) {
     console.error("No config found. Run `synkro install` first.");
     process.exit(1);
   }
-  const lines = readFileSync37(CONFIG_PATH9, "utf-8").split("\n");
-  const pattern = new RegExp(`^${key}=`);
+  const lines2 = readFileSync39(CONFIG_PATH9, "utf-8").split("\n");
+  const pattern = new RegExp(`^${key2}=`);
   let found = false;
-  const updated = lines.map((line) => {
+  const updated = lines2.map((line) => {
     if (pattern.test(line.trim())) {
       found = true;
-      return `${key}='${value}'`;
+      return `${key2}='${value}'`;
     }
     return line;
   });
-  if (!found) updated.splice(updated.length - 1, 0, `${key}='${value}'`);
-  writeFileSync29(CONFIG_PATH9, updated.join("\n"), "utf-8");
+  if (!found) updated.splice(updated.length - 1, 0, `${key2}='${value}'`);
+  writeFileSync30(CONFIG_PATH9, updated.join("\n"), "utf-8");
 }
 function resolveInferenceMode(cfg) {
   if ((cfg.SYNKRO_GRADING_MODE || "local") === "byok") return "byok";
@@ -19339,8 +19915,8 @@ var init_config = __esm({
     "use strict";
     init_stub();
     init_optout();
-    SYNKRO_DIR16 = join41(homedir43(), ".synkro");
-    CONFIG_PATH9 = join41(SYNKRO_DIR16, "config.env");
+    SYNKRO_DIR16 = join42(homedir43(), ".synkro");
+    CONFIG_PATH9 = join42(SYNKRO_DIR16, "config.env");
   }
 });
 
@@ -19349,7 +19925,7 @@ var telemetry_exports2 = {};
 __export(telemetry_exports2, {
   telemetryCommand: () => telemetryCommand
 });
-import { createInterface as createInterface6 } from "readline";
+import { createInterface as createInterface7 } from "readline";
 function parseFlag(args2, name) {
   const prefix = `--${name}=`;
   for (const a of args2) if (a.startsWith(prefix)) return a.slice(prefix.length);
@@ -19430,12 +20006,12 @@ async function runExport(args2) {
 }
 function confirmYesNo(question) {
   if (!process.stdin.isTTY) return Promise.resolve(false);
-  return new Promise((resolve8) => {
-    const rl = createInterface6({ input: process.stdin, output: process.stdout });
+  return new Promise((resolve9) => {
+    const rl = createInterface7({ input: process.stdin, output: process.stdout });
     rl.question(`${question} (y/N): `, (answer) => {
       rl.close();
       const t = answer.trim().toLowerCase();
-      resolve8(t === "y" || t === "yes");
+      resolve9(t === "y" || t === "yes");
     });
   });
 }
@@ -19530,11 +20106,11 @@ Usage:
 
 // cli/inventory/identity.ts
 import { randomUUID as randomUUID5 } from "crypto";
-import { existsSync as existsSync42, mkdirSync as mkdirSync24, readFileSync as readFileSync38, renameSync as renameSync9, writeFileSync as writeFileSync30 } from "fs";
+import { existsSync as existsSync42, mkdirSync as mkdirSync25, readFileSync as readFileSync40, renameSync as renameSync9, writeFileSync as writeFileSync31 } from "fs";
 import { homedir as homedir44 } from "os";
-import { dirname as dirname13, join as join42 } from "path";
+import { dirname as dirname14, join as join43 } from "path";
 function operationalIdentityPath() {
-  return process.env.SYNKRO_OPERATIONAL_IDENTITY_PATH || join42(homedir44(), ".synkro", "installation.json");
+  return process.env.SYNKRO_OPERATIONAL_IDENTITY_PATH || join43(homedir44(), ".synkro", "installation.json");
 }
 function validIdentity(value) {
   if (!value || typeof value !== "object") return false;
@@ -19542,9 +20118,9 @@ function validIdentity(value) {
   return typeof row2.installation_id === "string" && UUID_RE.test(row2.installation_id) && typeof row2.created_at === "string" && Number.isFinite(Date.parse(row2.created_at));
 }
 function writeIdentity(path, identity) {
-  mkdirSync24(dirname13(path), { recursive: true, mode: 448 });
+  mkdirSync25(dirname14(path), { recursive: true, mode: 448 });
   const temp = `${path}.${process.pid}.${randomUUID5()}.tmp`;
-  writeFileSync30(temp, JSON.stringify(identity, null, 2) + "\n", { encoding: "utf8", mode: 384 });
+  writeFileSync31(temp, JSON.stringify(identity, null, 2) + "\n", { encoding: "utf8", mode: 384 });
   renameSync9(temp, path);
 }
 function getOperationalInstallationIdentity(path = operationalIdentityPath()) {
@@ -19552,7 +20128,7 @@ function getOperationalInstallationIdentity(path = operationalIdentityPath()) {
   if (prior) return prior;
   if (existsSync42(path)) {
     try {
-      const parsed = JSON.parse(readFileSync38(path, "utf8"));
+      const parsed = JSON.parse(readFileSync40(path, "utf8"));
       if (validIdentity(parsed)) {
         cached4.set(path, parsed);
         return parsed;
@@ -19566,7 +20142,7 @@ function getOperationalInstallationIdentity(path = operationalIdentityPath()) {
   return identity;
 }
 var UUID_RE, cached4;
-var init_identity3 = __esm({
+var init_identity2 = __esm({
   "cli/inventory/identity.ts"() {
     "use strict";
     UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
@@ -19578,12 +20154,12 @@ var init_identity3 = __esm({
 import { createHash as createHash5 } from "crypto";
 import {
   existsSync as existsSync43,
-  readFileSync as readFileSync39,
+  readFileSync as readFileSync41,
   readdirSync as readdirSync11,
-  statSync as statSync6
+  statSync as statSync7
 } from "fs";
 import { arch, homedir as homedir45, hostname as hostname2, platform as platform6, release as release2 } from "os";
-import { basename as basename4, join as join43, relative, resolve as resolve6 } from "path";
+import { basename as basename4, join as join44, relative as relative2, resolve as resolve7 } from "path";
 import { fileURLToPath } from "url";
 function sha256(value) {
   return createHash5("sha256").update(value).digest("hex");
@@ -19593,7 +20169,7 @@ function pseudonymousHostnameHash(installationId, host) {
 }
 function cliVersion() {
   try {
-    return "1.10.8";
+    return "1.10.10";
   } catch {
     return "0.0.0";
   }
@@ -19601,7 +20177,7 @@ function cliVersion() {
 function readJson(path) {
   try {
     if (!existsSync43(path)) return null;
-    const parsed = JSON.parse(readFileSync39(path, "utf8"));
+    const parsed = JSON.parse(readFileSync41(path, "utf8"));
     return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : null;
   } catch {
     return null;
@@ -19610,7 +20186,7 @@ function readJson(path) {
 function readText(path) {
   try {
     if (!existsSync43(path)) return "";
-    return readFileSync39(path, "utf8");
+    return readFileSync41(path, "utf8");
   } catch {
     return "";
   }
@@ -19696,16 +20272,16 @@ function mcpArtifactsFromJson(harness, config, configScope = "user") {
 }
 function claudeDesktopConfigCandidates(home, targetPlatform) {
   if (targetPlatform === "darwin") {
-    return [join43(home, "Library", "Application Support", "Claude", "claude_desktop_config.json")];
+    return [join44(home, "Library", "Application Support", "Claude", "claude_desktop_config.json")];
   }
   if (targetPlatform === "linux") {
     return [
-      join43(home, ".config", "Claude", "claude_desktop_config.json"),
-      join43(home, ".config", "claude", "claude_desktop_config.json")
+      join44(home, ".config", "Claude", "claude_desktop_config.json"),
+      join44(home, ".config", "claude", "claude_desktop_config.json")
     ];
   }
   if (targetPlatform === "win32" && process.env.APPDATA) {
-    return [join43(process.env.APPDATA, "Claude", "claude_desktop_config.json")];
+    return [join44(process.env.APPDATA, "Claude", "claude_desktop_config.json")];
   }
   return [];
 }
@@ -19713,7 +20289,7 @@ function claudeManagedMcpConfigCandidates(targetPlatform) {
   if (targetPlatform === "darwin") return ["/Library/Application Support/ClaudeCode/managed-mcp.json"];
   if (targetPlatform === "linux") return ["/etc/claude-code/managed-mcp.json"];
   if (targetPlatform === "win32" && process.env.ProgramFiles) {
-    return [join43(process.env.ProgramFiles, "ClaudeCode", "managed-mcp.json")];
+    return [join44(process.env.ProgramFiles, "ClaudeCode", "managed-mcp.json")];
   }
   return [];
 }
@@ -19721,7 +20297,7 @@ function discoveredProjectRoots(claudeState, currentDirectory, explicit = [], cu
   const roots = /* @__PURE__ */ new Set();
   const add = (value) => {
     if (typeof value !== "string" || !value.trim()) return;
-    const path = resolve6(value);
+    const path = resolve7(value);
     if (existsSync43(path)) roots.add(path);
   };
   add(currentDirectory);
@@ -19733,10 +20309,10 @@ function discoveredProjectRoots(claudeState, currentDirectory, explicit = [], cu
   return [...roots];
 }
 function cursorWorkspaceStorageCandidates(home, targetPlatform) {
-  if (targetPlatform === "darwin") return [join43(home, "Library", "Application Support", "Cursor", "User", "workspaceStorage")];
-  if (targetPlatform === "linux") return [join43(home, ".config", "Cursor", "User", "workspaceStorage")];
+  if (targetPlatform === "darwin") return [join44(home, "Library", "Application Support", "Cursor", "User", "workspaceStorage")];
+  if (targetPlatform === "linux") return [join44(home, ".config", "Cursor", "User", "workspaceStorage")];
   if (targetPlatform === "win32" && process.env.APPDATA) {
-    return [join43(process.env.APPDATA, "Cursor", "User", "workspaceStorage")];
+    return [join44(process.env.APPDATA, "Cursor", "User", "workspaceStorage")];
   }
   return [];
 }
@@ -19752,12 +20328,12 @@ function cursorWorkspaceRoots(home, targetPlatform) {
     }
     for (const entry of entries) {
       if (!entry.isDirectory() || entry.isSymbolicLink?.()) continue;
-      const state = readJson(join43(storage, entry.name, "workspace.json"));
+      const state = readJson(join44(storage, entry.name, "workspace.json"));
       const raw = state?.folder;
       if (typeof raw !== "string" || !raw.trim()) continue;
       try {
         const path = raw.startsWith("file:") ? fileURLToPath(raw) : raw;
-        if (existsSync43(path)) roots.add(resolve6(path));
+        if (existsSync43(path)) roots.add(resolve7(path));
       } catch {
       }
     }
@@ -19769,8 +20345,8 @@ function codexMcpArtifacts(content) {
   const sections = [...content.matchAll(/^\s*\[\s*([^\]]+)\s*\]\s*$/gm)];
   for (let index = 0; index < sections.length && artifacts.length < 1e3; index++) {
     const section = sections[index];
-    const key = section[1].trim();
-    const root = key.match(/^mcp_servers\s*\.\s*(?:"((?:[^"\\]|\\.)+)"|'([^']+)'|([A-Za-z0-9_-]+))$/);
+    const key2 = section[1].trim();
+    const root = key2.match(/^mcp_servers\s*\.\s*(?:"((?:[^"\\]|\\.)+)"|'([^']+)'|([A-Za-z0-9_-]+))$/);
     if (!root) continue;
     let name = root[1] || root[2] || root[3];
     if (root[1]) {
@@ -19783,8 +20359,8 @@ function codexMcpArtifacts(content) {
     const start = (section.index ?? 0) + section[0].length;
     const end = sections[index + 1]?.index ?? content.length;
     const block = content.slice(start, end);
-    const stringValue = (key2) => {
-      const found = block.match(new RegExp(`^\\s*${key2}\\s*=\\s*("(?:[^"\\\\]|\\\\.)*")`, "m"));
+    const stringValue = (key3) => {
+      const found = block.match(new RegExp(`^\\s*${key3}\\s*=\\s*("(?:[^"\\\\]|\\\\.)*")`, "m"));
       if (!found) return void 0;
       try {
         return JSON.parse(found[1]);
@@ -19816,9 +20392,9 @@ function flattenHookEntries(value) {
   const out = [];
   for (const entry of value) {
     if (!entry || typeof entry !== "object") continue;
-    const record = entry;
-    if (typeof record.command === "string") out.push(record);
-    if (Array.isArray(record.hooks)) out.push(...flattenHookEntries(record.hooks));
+    const record2 = entry;
+    if (typeof record2.command === "string") out.push(record2);
+    if (Array.isArray(record2.hooks)) out.push(...flattenHookEntries(record2.hooks));
   }
   return out;
 }
@@ -19847,7 +20423,7 @@ function hookArtifacts(harness, config) {
 function parseFrontmatter(content) {
   const match = content.match(/^---\s*\n([\s\S]*?)\n---/);
   if (!match) return {};
-  const value = (key) => match[1].match(new RegExp(`^${key}:\\s*["']?([^"'\\n]+)`, "m"))?.[1]?.trim();
+  const value = (key2) => match[1].match(new RegExp(`^${key2}:\\s*["']?([^"'\\n]+)`, "m"))?.[1]?.trim();
   return { name: value("name"), version: value("version") };
 }
 function skillArtifacts(harness, root) {
@@ -19862,7 +20438,7 @@ function skillArtifacts(harness, root) {
     }
     for (const entry of entries) {
       if (entry.isSymbolicLink?.()) continue;
-      const path = join43(dir, entry.name);
+      const path = join44(dir, entry.name);
       if (entry.isFile() && entry.name === "SKILL.md") manifests.push(path);
       else if (entry.isDirectory()) visit(path);
     }
@@ -19871,8 +20447,8 @@ function skillArtifacts(harness, root) {
   return manifests.map((path) => {
     const content = readText(path);
     const frontmatter = parseFrontmatter(content);
-    const rel = relative(root, path).replaceAll("\\", "/");
-    const name = frontmatter.name || basename4(join43(path, "..")) || "skill";
+    const rel = relative2(root, path).replaceAll("\\", "/");
+    const name = frontmatter.name || basename4(join44(path, "..")) || "skill";
     return {
       harness,
       type: "skill",
@@ -19896,7 +20472,7 @@ function cursorExtensionArtifacts(root) {
   }
   const artifacts = [];
   for (const dir of dirs) {
-    const pkg = readJson(join43(root, dir.name, "package.json"));
+    const pkg = readJson(join44(root, dir.name, "package.json"));
     if (!pkg) continue;
     const publisher = typeof pkg.publisher === "string" ? pkg.publisher : void 0;
     const name = typeof pkg.name === "string" ? pkg.name : dir.name;
@@ -19916,21 +20492,21 @@ function cursorExtensionArtifacts(root) {
   return artifacts;
 }
 function deploymentMode2(home) {
-  const raw = readText(join43(home, ".synkro", "config.env"));
-  const value = (key) => raw.match(new RegExp(`^${key}=['"]?([^'"\\n]*)`, "m"))?.[1]?.toLowerCase();
+  const raw = readText(join44(home, ".synkro", "config.env"));
+  const value = (key2) => raw.match(new RegExp(`^${key2}=['"]?([^'"\\n]*)`, "m"))?.[1]?.toLowerCase();
   if (value("SYNKRO_GRADING_MODE") === "byok") return "byok";
   if (value("SYNKRO_STORAGE_MODE") === "cloud") return "cloud";
   return "local";
 }
 function telemetryHealth(home) {
-  const meta = readJson(join43(home, ".synkro", "telemetry-meta.json"));
+  const meta = readJson(join44(home, ".synkro", "telemetry-meta.json"));
   const health = {};
   if (meta?.last_flush_ok_at && Number.isFinite(Date.parse(meta.last_flush_ok_at))) health.telemetry_last_flush_at = meta.last_flush_ok_at;
   if (meta?.last_flush_error) health.telemetry_last_error = "flush_failed";
-  const queue = join43(home, ".synkro", "telemetry-pending.jsonl");
+  const queue = join44(home, ".synkro", "telemetry-pending.jsonl");
   try {
-    const size = statSync6(queue).size;
-    health.telemetry_backlog = size <= 5 * 1024 * 1024 ? readFileSync39(queue, "utf8").split("\n").filter(Boolean).length : Math.ceil(size / 1024);
+    const size = statSync7(queue).size;
+    health.telemetry_backlog = size <= 5 * 1024 * 1024 ? readFileSync41(queue, "utf8").split("\n").filter(Boolean).length : Math.ceil(size / 1024);
   } catch {
   }
   return health;
@@ -19971,7 +20547,7 @@ function harnessSnapshot(agent) {
   }
   const config = readJson(agent.settingsPath);
   const coverage = inspectCodexHooks(agent.settingsPath);
-  const toml = readText(join43(agent.configDir, "config.toml"));
+  const toml = readText(join44(agent.configDir, "config.toml"));
   const permission = toml.match(/^\s*approval_policy\s*=\s*["']([^"']+)/m)?.[1];
   return {
     row: {
@@ -19992,7 +20568,7 @@ function collectOperationalInventory(options = {}) {
   const detected = options.detectedAgents ?? detectAgents();
   const identity = getOperationalInstallationIdentity(options.identityPath);
   const targetPlatform = options.platformName ?? platform6();
-  const codexHome = options.homeDir ? join43(home, ".codex") : process.env.CODEX_HOME || join43(home, ".codex");
+  const codexHome = options.homeDir ? join44(home, ".codex") : process.env.CODEX_HOME || join44(home, ".codex");
   const harnesses = [];
   const artifacts = [];
   for (const agent of detected) {
@@ -20000,7 +20576,7 @@ function collectOperationalInventory(options = {}) {
     harnesses.push(row2);
     artifacts.push(...hookArtifacts(row2.harness, config));
   }
-  const claudeJson = readJson(join43(home, ".claude.json"));
+  const claudeJson = readJson(join44(home, ".claude.json"));
   artifacts.push(...mcpArtifactsFromJson("claude_code", claudeJson));
   if (claudeJson?.projects && typeof claudeJson.projects === "object") {
     for (const [projectPath, project] of Object.entries(claudeJson.projects)) {
@@ -20008,8 +20584,8 @@ function collectOperationalInventory(options = {}) {
       artifacts.push(...mcpArtifactsFromJson("claude_code", project, `local:${sha256(projectPath).slice(0, 16)}`));
     }
   }
-  artifacts.push(...mcpArtifactsFromJson("cursor", readJson(join43(home, ".cursor", "mcp.json"))));
-  artifacts.push(...codexMcpArtifacts(readText(join43(codexHome, "config.toml"))));
+  artifacts.push(...mcpArtifactsFromJson("cursor", readJson(join44(home, ".cursor", "mcp.json"))));
+  artifacts.push(...codexMcpArtifacts(readText(join44(codexHome, "config.toml"))));
   const projectRoots = discoveredProjectRoots(
     claudeJson,
     options.currentDirectory ?? process.cwd(),
@@ -20020,11 +20596,11 @@ function collectOperationalInventory(options = {}) {
     const scopeHash = sha256(projectRoot).slice(0, 16);
     artifacts.push(...mcpArtifactsFromJson(
       "claude_code",
-      readJson(join43(projectRoot, ".mcp.json")),
+      readJson(join44(projectRoot, ".mcp.json")),
       `project:${scopeHash}`
     ));
-    const cursorProjectConfig = join43(projectRoot, ".cursor", "mcp.json");
-    if (resolve6(cursorProjectConfig) !== resolve6(join43(home, ".cursor", "mcp.json"))) {
+    const cursorProjectConfig = join44(projectRoot, ".cursor", "mcp.json");
+    if (resolve7(cursorProjectConfig) !== resolve7(join44(home, ".cursor", "mcp.json"))) {
       artifacts.push(...mcpArtifactsFromJson(
         "cursor",
         readJson(cursorProjectConfig),
@@ -20046,7 +20622,7 @@ function collectOperationalInventory(options = {}) {
     });
     artifacts.push(...mcpArtifactsFromJson("claude_desktop", desktopConfig));
   }
-  const claudeSettings = readJson(join43(home, ".claude", "settings.json"));
+  const claudeSettings = readJson(join44(home, ".claude", "settings.json"));
   if (claudeSettings?.enabledPlugins && typeof claudeSettings.enabledPlugins === "object") {
     for (const [name, enabled] of Object.entries(claudeSettings.enabledPlugins)) {
       artifacts.push({
@@ -20060,14 +20636,14 @@ function collectOperationalInventory(options = {}) {
       });
     }
   }
-  artifacts.push(...skillArtifacts("claude_code", join43(home, ".claude", "skills")));
-  artifacts.push(...skillArtifacts("cursor", join43(home, ".cursor", "skills")));
-  artifacts.push(...skillArtifacts("codex", join43(codexHome, "skills")));
-  artifacts.push(...cursorExtensionArtifacts(join43(home, ".cursor", "extensions")));
+  artifacts.push(...skillArtifacts("claude_code", join44(home, ".claude", "skills")));
+  artifacts.push(...skillArtifacts("cursor", join44(home, ".cursor", "skills")));
+  artifacts.push(...skillArtifacts("codex", join44(codexHome, "skills")));
+  artifacts.push(...cursorExtensionArtifacts(join44(home, ".cursor", "extensions")));
   const uniqueArtifacts = /* @__PURE__ */ new Map();
   for (const artifact of artifacts) {
-    const key = `${artifact.harness || "global"}:${artifact.type}:${artifact.canonical_id}`;
-    uniqueArtifacts.set(key, artifact);
+    const key2 = `${artifact.harness || "global"}:${artifact.type}:${artifact.canonical_id}`;
+    uniqueArtifacts.set(key2, artifact);
   }
   const codingHarnesses = harnesses.filter((row2) => row2.harness === "claude_code" || row2.harness === "cursor" || row2.harness === "codex");
   const health = telemetryHealth(home) ?? {};
@@ -20100,7 +20676,7 @@ var init_collector = __esm({
     init_ccHookConfig();
     init_cursorHookConfig();
     init_codexHookConfig();
-    init_identity3();
+    init_identity2();
   }
 });
 
@@ -20119,19 +20695,19 @@ import { createHash as createHash6, randomUUID as randomUUID6 } from "crypto";
 import { spawn as spawn11 } from "child_process";
 import {
   existsSync as existsSync44,
-  mkdirSync as mkdirSync25,
-  readFileSync as readFileSync40,
+  mkdirSync as mkdirSync26,
+  readFileSync as readFileSync42,
   renameSync as renameSync10,
-  writeFileSync as writeFileSync31
+  writeFileSync as writeFileSync32
 } from "fs";
 import { homedir as homedir46 } from "os";
-import { dirname as dirname14, join as join44 } from "path";
+import { dirname as dirname15, join as join45 } from "path";
 function syncStatePath() {
-  return process.env.SYNKRO_INVENTORY_SYNC_STATE_PATH || join44(homedir46(), ".synkro", "inventory-sync.json");
+  return process.env.SYNKRO_INVENTORY_SYNC_STATE_PATH || join45(homedir46(), ".synkro", "inventory-sync.json");
 }
 function readState(path = syncStatePath()) {
   try {
-    const parsed = JSON.parse(readFileSync40(path, "utf8"));
+    const parsed = JSON.parse(readFileSync42(path, "utf8"));
     return parsed && typeof parsed === "object" ? parsed : {};
   } catch {
     return {};
@@ -20139,9 +20715,9 @@ function readState(path = syncStatePath()) {
 }
 function writeState(state, path = syncStatePath()) {
   try {
-    mkdirSync25(dirname14(path), { recursive: true, mode: 448 });
+    mkdirSync26(dirname15(path), { recursive: true, mode: 448 });
     const temp = `${path}.${process.pid}.tmp`;
-    writeFileSync31(temp, JSON.stringify(state, null, 2) + "\n", { encoding: "utf8", mode: 384 });
+    writeFileSync32(temp, JSON.stringify(state, null, 2) + "\n", { encoding: "utf8", mode: 384 });
     renameSync10(temp, path);
   } catch {
   }
@@ -20154,18 +20730,18 @@ function shouldSyncInventory(state, now = Date.now(), target) {
   return !Number.isFinite(lastAttempt) || lastAttempt <= 0 || now - lastAttempt >= FAILURE_RETRY_MS;
 }
 function readConfig() {
-  const path = join44(homedir46(), ".synkro", "config.env");
+  const path = join45(homedir46(), ".synkro", "config.env");
   const out = {};
   try {
-    for (const rawLine of readFileSync40(path, "utf8").split("\n")) {
+    for (const rawLine of readFileSync42(path, "utf8").split("\n")) {
       const line = rawLine.trim();
       if (!line || line.startsWith("#")) continue;
       const index = line.indexOf("=");
       if (index <= 0) continue;
-      const key = line.slice(0, index).trim();
+      const key2 = line.slice(0, index).trim();
       let value = line.slice(index + 1).trim();
       if (value.startsWith("'") && value.endsWith("'") || value.startsWith('"') && value.endsWith('"')) value = value.slice(1, -1);
-      out[key] = value;
+      out[key2] = value;
     }
   } catch {
   }
@@ -20196,7 +20772,7 @@ function resolveInventoryGateway(raw) {
 }
 async function loadToken() {
   try {
-    const durable = readFileSync40(join44(homedir46(), ".synkro", ".mcp-jwt"), "utf8").trim();
+    const durable = readFileSync42(join45(homedir46(), ".synkro", ".mcp-jwt"), "utf8").trim();
     if (durable) return durable;
   } catch {
   }
@@ -20212,7 +20788,7 @@ async function loadToken() {
 function stable(value) {
   if (Array.isArray(value)) return value.map(stable);
   if (!value || typeof value !== "object") return value;
-  return Object.fromEntries(Object.entries(value).sort(([a], [b]) => a.localeCompare(b)).map(([key, child]) => [key, stable(child)]));
+  return Object.fromEntries(Object.entries(value).sort(([a], [b]) => a.localeCompare(b)).map(([key2, child]) => [key2, stable(child)]));
 }
 function inventorySnapshotChunks(snapshot, maxBytes = INVENTORY_CHUNK_BYTES) {
   const { collected_at: _heartbeat, ...material } = snapshot;
@@ -20338,23 +20914,23 @@ var init_sync2 = __esm({
 });
 
 // cli/bootstrap.js
-import { readFileSync as readFileSync41, existsSync as existsSync45 } from "fs";
-import { resolve as resolve7 } from "path";
+import { readFileSync as readFileSync43, existsSync as existsSync45 } from "fs";
+import { resolve as resolve8 } from "path";
 process.title = "synkro";
 var envCandidates = [
-  resolve7(process.env.HOME ?? "", ".synkro", "config.env")
+  resolve8(process.env.HOME ?? "", ".synkro", "config.env")
 ];
 for (const envPath of envCandidates) {
   if (!existsSync45(envPath)) continue;
-  const envContent = readFileSync41(envPath, "utf-8");
+  const envContent = readFileSync43(envPath, "utf-8");
   for (const line of envContent.split("\n")) {
     const trimmed = line.trim();
     if (!trimmed || trimmed.startsWith("#")) continue;
     const eqIndex = trimmed.indexOf("=");
     if (eqIndex <= 0) continue;
-    const key = trimmed.slice(0, eqIndex).trim();
+    const key2 = trimmed.slice(0, eqIndex).trim();
     const value = trimmed.slice(eqIndex + 1).trim().replace(/^['"]|['"]$/g, "");
-    if (!process.env[key] && !value.startsWith("op://")) process.env[key] = value;
+    if (!process.env[key2] && !value.startsWith("op://")) process.env[key2] = value;
   }
 }
 var args = process.argv.slice(2);
@@ -20363,7 +20939,7 @@ var subArgs = args.slice(1);
 var isDetachedChild = process.env.SYNKRO_TELEMETRY_DETACHED === "1";
 var FLUSH_SKIP = /* @__PURE__ */ new Set(["grade", "inventory-sync", "version", "--version", "-v", "help", "--help", "-h", ""]);
 function printVersion() {
-  console.log("1.10.8");
+  console.log("1.10.10");
 }
 function printHelp2() {
   console.log(`Synkro CLI \u2014 runtime safety for AI coding agents