@freesyntax/notch-cli 0.5.21 → 0.5.23

package/dist/index.js

@@ -1,17 +1,19 @@
 #!/usr/bin/env node
-import "./chunk-OSWUX6TC.js";
+import "./chunk-4HPRBCSY.js";
 import {
   MCPClient,
   buildToolMap,
-  describeTools,
+  describeToolSchemas,
+  disconnectMCPServers,
   drainTailNotifications,
+  initMCPServers,
   listBuiltinAgents,
   nextSubagentId,
   parseMCPConfig,
   pollPendingAgents,
   setCurrentSurface,
   spawnSubagent
-} from "./chunk-TU465P2P.js";
+} from "./chunk-474TAHDN.js";
 import {
   Rollout,
   generateSessionId,
@@ -20,16 +22,21 @@ import {
   readIndex,
   readRollout,
   rebuildMessagesFromRollout
-} from "./chunk-QKM27RHS.js";
+} from "./chunk-6NKRMZTX.js";
 import {
   autoCompress,
   estimateTokens
 } from "./chunk-PKZKVOAN.js";
+import "./chunk-O6AKZ4OH.js";
+import {
+  loadConfig,
+  persistConfigPatch
+} from "./chunk-UHK6SI4H.js";
+import "./chunk-KCAR5DOB.js";
 import {
   ByokMissingApiKeyError,
   ByokMissingBaseUrlError,
   MODEL_CATALOG,
-  MODEL_IDS,
   MissingApiKeyError,
   findByokProvider,
   isByokRef,
@@ -37,10 +44,11 @@ import {
   listByokProviders,
   modelSupportsImages,
   parseByokRef,
-  readOllamaCreds,
+  recordShadowUsage,
   resolveModel,
   validateConfig
-} from "./chunk-443G6HCC.js";
+} from "./chunk-JVFOAPYV.js";
+import "./chunk-GFVLHUSS.js";
 import "./chunk-6CZCFY6H.js";
 import "./chunk-6U3ZAGYA.js";
 import "./chunk-FFB7GK3Y.js";
@@ -57,10 +65,12 @@ import {
   registerCommand
 } from "./chunk-3QUV4JEX.js";
 import {
+  auth_exports,
   clearCredentials,
+  init_auth,
   loadCredentials,
   login
-} from "./chunk-FIFC4V2R.js";
+} from "./chunk-PPEBWOMJ.js";
 import "./chunk-CQMAVWLJ.js";
 import "./chunk-O3WZW7GS.js";
 import "./chunk-YAYPQTOU.js";
@@ -69,6 +79,9 @@ import {
 } from "./chunk-C4CPDDMN.js";
 import "./chunk-W4FAGQFL.js";
 import "./chunk-FAULT7VE.js";
+import {
+  __toCommonJS
+} from "./chunk-KFQGP6VL.js";
 
 // src/index.ts
 import { Command } from "commander";
@@ -77,105 +90,8 @@ import ora7 from "ora";
 import * as readline from "readline";
 import * as nodePath2 from "path";
 
-// src/config.ts
-import fs from "fs/promises";
-import path from "path";
-var DEFAULT_MODEL = {
-  model: "notch-pyre",
-  temperature: 0.3
-};
-var DEFAULTS = {
-  models: { chat: DEFAULT_MODEL },
-  projectRoot: process.cwd(),
-  autoConfirm: false,
-  maxIterations: 25,
-  useRepoMap: true,
-  renderMarkdown: true,
-  enableMemory: true,
-  enableHooks: true,
-  permissionMode: "auto",
-  theme: "default"
-};
-async function loadConfig(overrides = {}) {
-  const config = { ...DEFAULTS, models: { chat: { ...DEFAULT_MODEL } } };
-  const configPath = path.resolve(config.projectRoot, ".notch.json");
-  try {
-    const raw = await fs.readFile(configPath, "utf-8");
-    const fileConfig = JSON.parse(raw);
-    if (fileConfig.model && (isValidModel(fileConfig.model) || isByokRef(fileConfig.model))) {
-      config.models.chat.model = fileConfig.model;
-    }
-    if (fileConfig.baseUrl) config.models.chat.baseUrl = fileConfig.baseUrl;
-    if (fileConfig.apiKey) config.models.chat.apiKey = fileConfig.apiKey;
-    if (fileConfig.byok && typeof fileConfig.byok === "object") {
-      const byok = fileConfig.byok;
-      config.byok = { ...byok };
-      if (byok.provider && findByokProvider(byok.provider === "custom" ? "__custom__" : byok.provider)) {
-        config.models.chat.byokProvider = byok.provider === "custom" ? "__custom__" : byok.provider;
-        if (byok.model) config.models.chat.model = byok.model;
-        if (byok.baseUrl) config.models.chat.baseUrl = byok.baseUrl;
-        if (byok.headers) {
-          config.models.chat.byokHeaders = { ...config.models.chat.byokHeaders, ...byok.headers };
-        }
-        if (byok.apiShape === "openai" || byok.apiShape === "anthropic") {
-          config.models.chat.byokApiShape = byok.apiShape;
-        }
-      }
-    }
-    if (fileConfig.hybrid && typeof fileConfig.hybrid === "object") {
-      const hybrid = fileConfig.hybrid;
-      config.hybrid = hybrid;
-    }
-    if (fileConfig.maxIterations) config.maxIterations = fileConfig.maxIterations;
-    if (fileConfig.useRepoMap !== void 0) config.useRepoMap = fileConfig.useRepoMap;
-    if (fileConfig.temperature !== void 0) config.models.chat.temperature = fileConfig.temperature;
-    if (fileConfig.renderMarkdown !== void 0) config.renderMarkdown = fileConfig.renderMarkdown;
-    if (fileConfig.enableMemory !== void 0) config.enableMemory = fileConfig.enableMemory;
-    if (fileConfig.enableHooks !== void 0) config.enableHooks = fileConfig.enableHooks;
-    if (fileConfig.permissionMode) config.permissionMode = fileConfig.permissionMode;
-    if (fileConfig.shellTimeout) config.shellTimeout = fileConfig.shellTimeout;
-    if (fileConfig.theme) config.theme = fileConfig.theme;
-  } catch {
-  }
-  const activeProviderId = config.models.chat.byokProvider ?? (typeof config.models.chat.model === "string" && isByokRef(config.models.chat.model) ? config.models.chat.model.split(":", 1)[0] : void 0);
-  const isOllamaProvider = activeProviderId === "ollama" || activeProviderId === "ollama-cloud" || activeProviderId === "ollama-anthropic";
-  if (isOllamaProvider) {
-    if (!config.models.chat.apiKey && !process.env.OLLAMA_API_KEY) {
-      const ollamaCreds = await readOllamaCreds();
-      if (ollamaCreds?.apiKey) {
-        config.models.chat.apiKey = ollamaCreds.apiKey;
-      }
-    }
-  } else {
-    const creds = await loadCredentials();
-    if (creds?.token) {
-      config.models.chat.apiKey = creds.token;
-    }
-  }
-  if (process.env.NOTCH_MODEL) {
-    const envModel = process.env.NOTCH_MODEL;
-    if (isValidModel(envModel)) {
-      config.models.chat.model = envModel;
-    } else if (isByokRef(envModel)) {
-      config.models.chat.model = envModel;
-      config.models.chat.byokProvider = void 0;
-    }
-  }
-  if (process.env.NOTCH_BASE_URL) {
-    config.models.chat.baseUrl = process.env.NOTCH_BASE_URL;
-  }
-  if (process.env.NOTCH_API_KEY) {
-    config.models.chat.apiKey = process.env.NOTCH_API_KEY;
-  }
-  if (config.models.chat.temperature !== void 0) {
-    config.models.chat.temperature = Math.max(0, Math.min(2, config.models.chat.temperature));
-  }
-  config.maxIterations = Math.max(1, Math.min(100, config.maxIterations));
-  return { ...config, ...overrides };
-}
-
 // src/ui/image-input.ts
-import { promises as fs2 } from "fs";
+import { promises as fs } from "fs";
 import * as nodePath from "path";
 import * as os from "os";
 function isImageLoadError(r) {
@@ -292,7 +208,7 @@ async function loadFromFile(spec, cwd) {
   const abs = expandUserPath(spec, cwd);
   let stat;
   try {
-    stat = await fs2.stat(abs);
+    stat = await fs.stat(abs);
   } catch (err) {
     return { error: `Image file not found: ${abs} (${err?.code ?? err?.message ?? "unknown error"})` };
   }
@@ -309,7 +225,7 @@ async function loadFromFile(spec, cwd) {
   }
   let buf;
   try {
-    buf = await fs2.readFile(abs);
+    buf = await fs.readFile(abs);
   } catch (err) {
     return { error: `Failed to read ${abs}: ${err?.message ?? String(err)}` };
   }
@@ -386,19 +302,19 @@ function formatAttachmentStatus(att) {
 
 // src/agent/loop.ts
 import { streamText } from "ai";
-import { promises as fs5 } from "fs";
+import { promises as fs4 } from "fs";
 import { execSync } from "child_process";
 
 // src/context/project-instructions.ts
-import fs3 from "fs/promises";
-import path2 from "path";
+import fs2 from "fs/promises";
+import path from "path";
 import os2 from "os";
 var INSTRUCTION_FILES = [".notch.md", "NOTCH.md", ".notch/instructions.md"];
 async function loadProjectInstructions(projectRoot) {
   const sources = [];
   const homeDir = os2.homedir();
   for (const file of INSTRUCTION_FILES) {
-    const globalPath = path2.join(homeDir, file);
+    const globalPath = path.join(homeDir, file);
     const content = await safeRead(globalPath);
     if (content) {
       sources.push({ path: globalPath, content, scope: "global" });
@@ -406,7 +322,7 @@ async function loadProjectInstructions(projectRoot) {
     }
   }
   for (const file of INSTRUCTION_FILES) {
-    const projectPath = path2.join(projectRoot, file);
+    const projectPath = path.join(projectRoot, file);
     const content = await safeRead(projectPath);
     if (content) {
       sources.push({ path: projectPath, content, scope: "project" });
@@ -428,7 +344,7 @@ ${sections.join("\n\n")}`;
 }
 async function safeRead(filePath) {
   try {
-    const content = await fs3.readFile(filePath, "utf-8");
+    const content = await fs2.readFile(filePath, "utf-8");
     return content.trim() || null;
   } catch {
     return null;
@@ -436,19 +352,19 @@ async function safeRead(filePath) {
 }
 
 // src/memory/store.ts
-import fs4 from "fs/promises";
-import path3 from "path";
+import fs3 from "fs/promises";
+import path2 from "path";
 import os3 from "os";
-var MEMORY_DIR = path3.join(os3.homedir(), ".notch", "memory");
-var INDEX_FILE = path3.join(MEMORY_DIR, "MEMORY.md");
+var MEMORY_DIR = path2.join(os3.homedir(), ".notch", "memory");
+var INDEX_FILE = path2.join(MEMORY_DIR, "MEMORY.md");
 async function ensureDir() {
-  await fs4.mkdir(MEMORY_DIR, { recursive: true });
+  await fs3.mkdir(MEMORY_DIR, { recursive: true });
 }
 async function saveMemory(memory) {
   await ensureDir();
   const slug = memory.name.toLowerCase().replace(/[^a-z0-9]+/g, "_").replace(/^_|_$/g, "");
   const filename = `${memory.type}_${slug}.md`;
-  const filePath = path3.join(MEMORY_DIR, filename);
+  const filePath = path2.join(MEMORY_DIR, filename);
   const fileContent = [
     "---",
     `name: ${memory.name}`,
@@ -459,18 +375,18 @@ async function saveMemory(memory) {
     "",
     memory.content
   ].join("\n");
-  await fs4.writeFile(filePath, fileContent, "utf-8");
+  await fs3.writeFile(filePath, fileContent, "utf-8");
   await updateIndex();
   return filename;
 }
 async function loadMemories() {
   await ensureDir();
-  const files = await fs4.readdir(MEMORY_DIR);
+  const files = await fs3.readdir(MEMORY_DIR);
   const memories = [];
   for (const file of files) {
     if (!file.endsWith(".md") || file === "MEMORY.md") continue;
     try {
-      const content = await fs4.readFile(path3.join(MEMORY_DIR, file), "utf-8");
+      const content = await fs3.readFile(path2.join(MEMORY_DIR, file), "utf-8");
       const memory = parseMemoryFile(content, file);
       if (memory) memories.push(memory);
     } catch {
@@ -480,7 +396,7 @@ async function loadMemories() {
 }
 async function deleteMemory(filename) {
   try {
-    await fs4.unlink(path3.join(MEMORY_DIR, filename));
+    await fs3.unlink(path2.join(MEMORY_DIR, filename));
     await updateIndex();
     return true;
   } catch {
@@ -556,7 +472,7 @@ async function updateIndex() {
     }
     lines.push("");
   }
-  await fs4.writeFile(INDEX_FILE, lines.join("\n"), "utf-8");
+  await fs3.writeFile(INDEX_FILE, lines.join("\n"), "utf-8");
 }
 
 // src/agent/prompt-sections.ts
@@ -705,6 +621,304 @@ function microcompact(messages, opts2 = {}) {
   return { messages: out, cleared, savedChars };
 }
 
+// src/agent/correction.ts
+var CORRECTION_PRESETS = {
+  /** No correction — for capable models (Claude, GPT-4, etc.) */
+  disabled: () => ({
+    intentGate: false,
+    maxCorrectionAttempts: 0,
+    useTemplateFormat: false
+  }),
+  /** Light correction — for mid-tier models (Qwen 14B+, Llama 70B) */
+  capable: () => ({
+    intentGate: false,
+    maxCorrectionAttempts: 1,
+    useTemplateFormat: false
+  }),
+  /** Full correction — for small models (7B-14B) */
+  smallModel: () => ({
+    intentGate: true,
+    maxCorrectionAttempts: 2,
+    useTemplateFormat: false
+  }),
+  /** Maximum scaffolding — for tiny models (sub-7B) */
+  tinyModel: () => ({
+    intentGate: true,
+    maxCorrectionAttempts: 3,
+    useTemplateFormat: true
+  })
+};
+var INTENT_GATE_PROMPT = `You are a classifier. Given the user's message and the list of available tools, decide: does this message require calling a tool to answer properly?
+
+Reply with EXACTLY one word: YES or NO
+
+Available tools: {tool_names}
+
+User message: {user_message}`;
+async function intentGate(model, userMessage, toolNames) {
+  const { generateText: generateText3 } = await import("ai");
+  const prompt = INTENT_GATE_PROMPT.replace("{tool_names}", toolNames.join(", ")).replace("{user_message}", userMessage.slice(0, 500));
+  try {
+    const result = await generateText3({
+      model,
+      messages: [{ role: "user", content: prompt }],
+      maxTokens: 10,
+      temperature: 0
+    });
+    const answer = result.text.trim().toUpperCase();
+    if (answer.startsWith("YES")) return "yes";
+    if (answer.startsWith("NO")) return "no";
+    return "unclear";
+  } catch {
+    return "unclear";
+  }
+}
+function looksLikeFailedToolCall(text, toolNames) {
+  if (!text || text.length < 10) return false;
+  let weakSignals = 0;
+  let strongSignals = 0;
+  const lowerText = text.toLowerCase();
+  for (const name of toolNames) {
+    if (lowerText.includes(name.toLowerCase())) {
+      weakSignals++;
+      break;
+    }
+  }
+  const jsonPatterns = [
+    /\{\s*"name"\s*:/,
+    /\{\s*"tool"\s*:/,
+    /\{\s*"function"\s*:/,
+    /"arguments"\s*:\s*\{/,
+    /"parameters"\s*:\s*\{/
+  ];
+  for (const pat of jsonPatterns) {
+    if (pat.test(text)) {
+      strongSignals++;
+      break;
+    }
+  }
+  const intentPatterns = [
+    /\b(?:i'll|let me|i need to|i should|i want to|i will)\s+(?:use|call|invoke|run|execute)\b/i,
+    /\b(?:calling|using|invoking|running)\s+(?:the\s+)?(?:tool|function)\b/i
+  ];
+  for (const pat of intentPatterns) {
+    if (pat.test(text)) {
+      weakSignals++;
+      break;
+    }
+  }
+  const xmlPatterns = [
+    /<tool_call/i,
+    /<function_call/i,
+    /<tool_use/i,
+    /<\|tool▁call\|>/,
+    /<\|plugin\|>/
+  ];
+  for (const pat of xmlPatterns) {
+    if (pat.test(text)) {
+      strongSignals++;
+      break;
+    }
+  }
+  if (/```(?:json|tool)?\s*\n?\s*\{/.test(text)) {
+    weakSignals++;
+  }
+  return strongSignals >= 1 || weakSignals >= 2;
+}
+var CORRECTION_PROMPTS = [
+  // Attempt 1: XML format (most models have seen this in training)
+  `Your previous response tried to call a tool but the format was wrong.
+
+Your output was:
+---
+{raw_output}
+---
+
+To call a tool, you MUST use this exact format:
+<tool_call>
+{"name": "tool_name", "arguments": {"param1": "value1"}}
+</tool_call>
+
+Available tools: {tool_names}
+
+Rewrite your response with the correct tool call format. Output ONLY the tool call, nothing else.`,
+  // Attempt 2: bare JSON (simpler)
+  `Your output was not a valid tool call. Rewrite it as a single JSON object:
+
+{"name": "TOOL_NAME", "arguments": {"key": "value"}}
+
+Available tools: {tool_names}
+Your failed output: {raw_output_short}
+
+Reply with ONLY the JSON object.`,
+  // Attempt 3: ask directly (simplest possible)
+  `Which tool do you want to call? Reply with the tool name and arguments as JSON.
+Tools: {tool_names}
+JSON:`
+];
+async function correctionPass(model, rawOutput, toolNames, conversationMessages, maxAttempts) {
+  const { generateText: generateText3 } = await import("ai");
+  for (let i = 0; i < Math.min(maxAttempts, CORRECTION_PROMPTS.length); i++) {
+    const promptTemplate = CORRECTION_PROMPTS[i];
+    if (!promptTemplate) continue;
+    const prompt = promptTemplate.replace("{raw_output}", rawOutput.slice(0, 1500)).replace("{raw_output_short}", rawOutput.slice(0, 500)).replace("{tool_names}", toolNames.join(", "));
+    try {
+      const result = await generateText3({
+        model,
+        messages: [
+          ...conversationMessages.slice(-4),
+          // keep recent context
+          { role: "user", content: prompt }
+        ],
+        maxTokens: 500,
+        temperature: 0
+      });
+      const parsed = extractToolCallsFromText(result.text, toolNames);
+      if (parsed.length > 0) return parsed;
+    } catch {
+    }
+  }
+  return null;
+}
+function extractTemplateToolCalls(text, toolNames) {
+  const calls = [];
+  const toolNameSet = new Set(toolNames.map((n) => n.toLowerCase()));
+  const lines = text.split("\n");
+  let currentTool = null;
+  let currentArgs = {};
+  for (const line of lines) {
+    const trimmed = line.trim();
+    const toolMatch = trimmed.match(/^TOOL:\s*(.+)$/i);
+    if (toolMatch && toolMatch[1]) {
+      if (currentTool && toolNameSet.has(currentTool.toLowerCase())) {
+        calls.push({
+          id: `correction-${Date.now()}-${calls.length}`,
+          name: currentTool,
+          args: currentArgs
+        });
+      }
+      currentTool = toolMatch[1].trim();
+      currentArgs = {};
+      continue;
+    }
+    const argMatch = trimmed.match(/^ARG_(\w+):\s*(.+)$/i);
+    if (argMatch && currentTool && argMatch[1] && argMatch[2]) {
+      const key = argMatch[1];
+      const rawValue = argMatch[2].trim();
+      currentArgs[key] = coerceValue(rawValue);
+    }
+  }
+  if (currentTool && toolNameSet.has(currentTool.toLowerCase())) {
+    calls.push({
+      id: `correction-${Date.now()}-${calls.length}`,
+      name: currentTool,
+      args: currentArgs
+    });
+  }
+  return calls;
+}
+function coerceValue(raw) {
+  if (raw === "true") return true;
+  if (raw === "false") return false;
+  if (raw === "null") return null;
+  const num = Number(raw);
+  if (!Number.isNaN(num) && raw !== "") return num;
+  if (raw.startsWith("{") && raw.endsWith("}") || raw.startsWith("[") && raw.endsWith("]")) {
+    try {
+      return JSON.parse(raw);
+    } catch {
+    }
+  }
+  return raw;
+}
+function extractToolCallsFromText(text, toolNames) {
+  const toolNameSet = new Set(toolNames.map((n) => n.toLowerCase()));
+  const xmlRegex = /<tool_call>\s*([\s\S]*?)\s*<\/tool_call>/gi;
+  let match2;
+  const xmlCalls = [];
+  while ((match2 = xmlRegex.exec(text)) !== null) {
+    const captured = match2[1];
+    if (captured) {
+      const parsed = tryParseToolJson(captured, toolNameSet);
+      if (parsed) xmlCalls.push(parsed);
+    }
+  }
+  if (xmlCalls.length > 0) return xmlCalls;
+  const codeBlockRegex = /```(?:json|tool)?\s*\n?([\s\S]*?)\n?\s*```/g;
+  const codeCalls = [];
+  while ((match2 = codeBlockRegex.exec(text)) !== null) {
+    const captured = match2[1];
+    if (captured) {
+      const parsed = tryParseToolJson(captured, toolNameSet);
+      if (parsed) codeCalls.push(parsed);
+    }
+  }
+  if (codeCalls.length > 0) return codeCalls;
+  const jsonRegex = /\{[^{}]*"name"\s*:\s*"[^"]+"\s*[,}][\s\S]*?\}/g;
+  const jsonCalls = [];
+  while ((match2 = jsonRegex.exec(text)) !== null) {
+    const parsed = tryParseToolJson(match2[0], toolNameSet);
+    if (parsed) jsonCalls.push(parsed);
+  }
+  if (jsonCalls.length > 0) return jsonCalls;
+  const templateCalls = extractTemplateToolCalls(text, toolNames);
+  if (templateCalls.length > 0) return templateCalls;
+  return [];
+}
+function tryParseToolJson(jsonStr, toolNameSet) {
+  try {
+    const obj = JSON.parse(jsonStr.trim());
+    const name = obj.name ?? obj.tool ?? obj.function;
+    if (!name || typeof name !== "string") return null;
+    if (!toolNameSet.has(name.toLowerCase())) return null;
+    const args = obj.arguments ?? obj.parameters ?? obj.args ?? {};
+    return {
+      id: `correction-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
+      name,
+      args: typeof args === "object" ? args : {}
+    };
+  } catch {
+    return null;
+  }
+}
+var CAPABLE_PATTERNS = [
+  /claude/i,
+  /gpt-4/i,
+  /gpt-3\.5/i,
+  /o[1-4]/i,
+  /gemini-(?:pro|ultra|2)/i,
+  /deepseek-(?:v3|r1)/i
+];
+var SMALL_PATTERNS = [
+  /qwen.*(?:7b|14b|32b)/i,
+  /llama.*(?:8b|13b|70b)/i,
+  /mistral.*(?:7b|8x7b)/i,
+  /gemma.*(?:7b|9b|27b)/i,
+  /codestral/i,
+  /deepseek-coder/i
+];
+var TINY_PATTERNS = [
+  /qwen.*(?:0\.5b|1\.5b|3b|4b)/i,
+  /llama.*(?:1b|3b)/i,
+  /gemma.*(?:2b|4b)/i,
+  /phi.*(?:1|2|3)/i,
+  /tinyllama/i,
+  /stablelm/i
+];
+function autoDetectPreset(modelId) {
+  if (!modelId) return CORRECTION_PRESETS.capable();
+  for (const pat of CAPABLE_PATTERNS) {
+    if (pat.test(modelId)) return CORRECTION_PRESETS.disabled();
+  }
+  for (const pat of TINY_PATTERNS) {
+    if (pat.test(modelId)) return CORRECTION_PRESETS.tinyModel();
+  }
+  for (const pat of SMALL_PATTERNS) {
+    if (pat.test(modelId)) return CORRECTION_PRESETS.smallModel();
+  }
+  return CORRECTION_PRESETS.capable();
+}
+
 // src/agent/loop.ts
 function getErrorSignature(toolName, result) {
   return {
@@ -731,7 +945,18 @@ async function runAgentLoop(messages, config) {
   let wasCompressed = false;
   const recentErrors = [];
   const MAX_REPEATED_ERRORS = 3;
+  const correctionCfg = config.correction ?? autoDetectPreset(config.modelId ?? "");
+  let totalCorrectionAttempts = 0;
+  let intentResult = "unclear";
   let history = [...messages];
+  const toolNames = Object.keys(tools);
+  const templateFormatHint = correctionCfg.useTemplateFormat && toolNames.length > 0 ? [
+    "",
+    "If native tool calling fails, use this fallback format with no extra prose:",
+    "TOOL: <tool name>",
+    "ARG_<argument_name>: <argument value>",
+    `Available tool names: ${toolNames.join(", ")}`
+  ].join("\n") : "";
   await config.toolContext.runHook?.("pre-compact", { messageCount: history.length });
   history = await autoCompress(history, config.model, contextWindow, () => {
     wasCompressed = true;
@@ -740,6 +965,13 @@ async function runAgentLoop(messages, config) {
   if (wasCompressed) {
     await config.toolContext.runHook?.("post-compact", { messageCount: history.length });
   }
+  if (correctionCfg.intentGate && toolNames.length > 0) {
+    const lastUserMsg = [...history].reverse().find((m) => m.role === "user");
+    const userText = typeof lastUserMsg?.content === "string" ? lastUserMsg.content : "";
+    if (userText) {
+      intentResult = await intentGate(config.model, userText, toolNames);
+    }
+  }
   while (iterations < maxIter) {
     iterations++;
     const mc = microcompact(history, { keepLastN: 6, threshold: 50 });
@@ -753,7 +985,7 @@ async function runAgentLoop(messages, config) {
     let streamUsage = null;
     const result = streamText({
       model: config.model,
-      system: config.systemPrompt,
+      system: `${config.systemPrompt}${templateFormatHint}`,
       messages: history,
       tools,
       maxSteps: 1
@@ -792,8 +1024,67 @@ async function runAgentLoop(messages, config) {
     if (streamUsage) {
       totalPromptTokens += streamUsage.promptTokens ?? 0;
       totalCompletionTokens += streamUsage.completionTokens ?? 0;
+      void recordShadowUsage(
+        config.model,
+        streamUsage
+      );
     }
     totalToolCalls += toolCalls.length;
+    if (toolCalls.length === 0 && fullText && correctionCfg.maxCorrectionAttempts > 0 && toolNames.length > 0) {
+      const directExtracted = extractToolCallsFromText(fullText, toolNames);
+      const templateExtracted = correctionCfg.useTemplateFormat ? extractTemplateToolCalls(fullText, toolNames) : [];
+      const shouldCorrect = looksLikeFailedToolCall(fullText, toolNames) || directExtracted.length > 0 || templateExtracted.length > 0 || intentResult === "yes" && totalToolCalls === 0;
+      if (shouldCorrect) {
+        const corrected = directExtracted.length > 0 ? directExtracted : templateExtracted.length > 0 ? templateExtracted : await correctionPass(
+          config.model,
+          fullText,
+          toolNames,
+          history,
+          correctionCfg.maxCorrectionAttempts
+        );
+        totalCorrectionAttempts++;
+        if (corrected && corrected.length > 0) {
+          config.onCorrection?.(totalCorrectionAttempts, true);
+          for (const tc of corrected) {
+            toolCalls.push({
+              toolCallId: tc.id,
+              toolName: tc.name,
+              args: tc.args
+            });
+          }
+          totalToolCalls += corrected.length;
+          for (const tc of corrected) {
+            const toolDef = tools[tc.name];
+            if (!toolDef) {
+              toolResults.push({
+                toolCallId: tc.id,
+                result: { content: `Tool "${tc.name}" not found.`, isError: true }
+              });
+              continue;
+            }
+            try {
+              const result2 = await toolDef.execute(tc.args);
+              toolResults.push({ toolCallId: tc.id, result: result2 });
+              config.onToolCall?.(tc.name, tc.args);
+              config.onToolResult?.(
+                tc.name,
+                result2?.content ?? String(result2),
+                result2?.isError ?? false
+              );
+            } catch (err) {
+              const msg = err instanceof Error ? err.message : String(err);
+              toolResults.push({
+                toolCallId: tc.id,
+                result: { content: `Error: ${msg}`, isError: true }
+              });
+              config.onToolResult?.(tc.name, `Error: ${msg}`, true);
+            }
+          }
+        } else {
+          config.onCorrection?.(totalCorrectionAttempts, false);
+        }
+      }
+    }
     if (toolCalls.length > 0) {
       let hasRepeatedError = false;
       for (const tr of toolResults) {
@@ -859,6 +1150,7 @@ async function runAgentLoop(messages, config) {
       iterations,
       toolCallCount: totalToolCalls,
       compressed: wasCompressed,
+      correctionAttempts: totalCorrectionAttempts,
       usage: {
         promptTokens: totalPromptTokens,
         completionTokens: totalCompletionTokens,
@@ -874,6 +1166,7 @@ async function runAgentLoop(messages, config) {
     iterations,
     toolCallCount: totalToolCalls,
     compressed: wasCompressed,
+    correctionAttempts: totalCorrectionAttempts,
     usage: {
       promptTokens: totalPromptTokens,
       completionTokens: totalCompletionTokens,
@@ -881,7 +1174,7 @@ async function runAgentLoop(messages, config) {
     }
   };
 }
-async function buildSystemPrompt(projectRoot, _modelId) {
+async function buildSystemPrompt(projectRoot, _modelId, toolContext) {
   const sections = [
     // =========================================================
     // CACHEABLE PREFIX — stable across turns, sessions, users.
@@ -892,7 +1185,7 @@ async function buildSystemPrompt(projectRoot, _modelId) {
       () => [
         "You are Notch, an expert AI coding assistant built by Driftrail.",
         "You help developers write, debug, refactor, and understand code.",
-        "You have access to tools for reading/writing files, running shell commands, searching code, and git operations."
+        "You have access to the tools listed in the Tool Schemas section."
       ].join("\n")
     ),
     safeSection(
@@ -928,8 +1221,11 @@ async function buildSystemPrompt(projectRoot, _modelId) {
         "- When the user asks for a fix, fix the root cause, not the symptom."
       ].join("\n")
     ),
-    safeSection("tools-list", () => `## Available Tools
-${describeTools()}`),
+    DANGEROUS_uncachedSystemPromptSection(
+      "tool-schemas",
+      () => describeToolSchemas(toolContext),
+      "The active tool set depends on coordinator mode, MCP servers, plugins, and permissions for this session."
+    ),
     safeSection("builtin-agents", () => {
       try {
         const agents = listBuiltinAgents();
@@ -954,7 +1250,7 @@ ${describeTools()}`),
         lines.push(`- Platform: ${process.platform}`);
         lines.push(`- Current date (UTC): ${(/* @__PURE__ */ new Date()).toISOString().slice(0, 10)}`);
         try {
-          const entries = await fs5.readdir(projectRoot);
+          const entries = await fs4.readdir(projectRoot);
           const preview = entries.filter((e) => !e.startsWith(".")).slice(0, 30).join(", ");
           if (preview) lines.push(`- Top-level entries: ${preview}`);
         } catch {
@@ -1009,8 +1305,8 @@ ${memoryStr}`, {
 }
 
 // src/agent/checkpoints.ts
-import fs6 from "fs/promises";
-import path4 from "path";
+import fs5 from "fs/promises";
+import path3 from "path";
 var CheckpointManager = class {
   checkpoints = [];
   nextId = 1;
@@ -1019,7 +1315,7 @@ var CheckpointManager = class {
   async recordBefore(filePath) {
     if (this.pendingFiles.has(filePath)) return;
     try {
-      const content = await fs6.readFile(filePath, "utf-8");
+      const content = await fs5.readFile(filePath, "utf-8");
       this.pendingFiles.set(filePath, content);
     } catch {
       this.pendingFiles.set(filePath, null);
@@ -1031,7 +1327,7 @@ var CheckpointManager = class {
     for (const [filePath, before] of this.pendingFiles) {
       let after = null;
       try {
-        after = await fs6.readFile(filePath, "utf-8");
+        after = await fs5.readFile(filePath, "utf-8");
       } catch {
       }
       files.push({ path: filePath, before, after });
@@ -1053,12 +1349,12 @@ var CheckpointManager = class {
     for (const snap of checkpoint.files) {
       if (snap.before === null) {
         try {
-          await fs6.unlink(snap.path);
+          await fs5.unlink(snap.path);
         } catch {
         }
       } else {
-        await fs6.mkdir(path4.dirname(snap.path), { recursive: true });
-        await fs6.writeFile(snap.path, snap.before, "utf-8");
+        await fs5.mkdir(path3.dirname(snap.path), { recursive: true });
+        await fs5.writeFile(snap.path, snap.before, "utf-8");
       }
     }
     return checkpoint;
@@ -1090,8 +1386,8 @@ var CheckpointManager = class {
         }
       }
     }
-    return Array.from(fileMap.entries()).map(([path21, { before, after }]) => ({
-      path: path21,
+    return Array.from(fileMap.entries()).map(([path20, { before, after }]) => ({
+      path: path20,
       before,
       after
     }));
@@ -1489,14 +1785,14 @@ var CostTracker = class {
 };
 
 // src/agent/ralph.ts
-import fs8 from "fs/promises";
-import path6 from "path";
+import fs7 from "fs/promises";
+import path5 from "path";
 import chalk4 from "chalk";
 import { generateText as generateText2, streamText as streamText2 } from "ai";
 
 // src/context/repo-map.ts
-import fs7 from "fs/promises";
-import path5 from "path";
+import fs6 from "fs/promises";
+import path4 from "path";
 import { glob } from "glob";
 var PATTERNS = {
   ts: [
@@ -1527,7 +1823,7 @@ var PATTERNS = {
 };
 var IMPORT_PATTERN = /(?:import|from)\s+['"]([^'"]+)['"]/g;
 function getPatterns(filePath) {
-  const ext2 = path5.extname(filePath).slice(1);
+  const ext2 = path4.extname(filePath).slice(1);
   if (["ts", "tsx", "mts", "cts"].includes(ext2)) return PATTERNS.ts;
   if (["js", "jsx", "mjs", "cjs"].includes(ext2)) return PATTERNS.js;
   if (ext2 === "py") return PATTERNS.py;
@@ -1607,9 +1903,9 @@ async function buildRepoMap(root) {
   const entries = [];
   files.sort((a, b) => a.split("/").length - b.split("/").length || a.localeCompare(b));
   for (const file of files.slice(0, 300)) {
-    const fullPath = path5.resolve(root, file);
+    const fullPath = path4.resolve(root, file);
     try {
-      const content = await fs7.readFile(fullPath, "utf-8");
+      const content = await fs6.readFile(fullPath, "utf-8");
       const lines = content.split("\n").length;
       const patterns = getPatterns(file);
       const symbols = extractSymbols(content, patterns);
@@ -1711,11 +2007,11 @@ ${repoContext || "(empty project)"}`;
 async function savePlan(plan, cwd) {
   plan.updated = (/* @__PURE__ */ new Date()).toISOString();
   plan.completedCount = plan.tasks.filter((t) => t.status === "done").length;
-  await fs8.writeFile(path6.join(cwd, PLAN_FILE), JSON.stringify(plan, null, 2), "utf-8");
+  await fs7.writeFile(path5.join(cwd, PLAN_FILE), JSON.stringify(plan, null, 2), "utf-8");
 }
 async function loadPlan(cwd) {
   try {
-    const raw = await fs8.readFile(path6.join(cwd, PLAN_FILE), "utf-8");
+    const raw = await fs7.readFile(path5.join(cwd, PLAN_FILE), "utf-8");
     return JSON.parse(raw);
   } catch {
     return null;
@@ -1723,7 +2019,7 @@ async function loadPlan(cwd) {
 }
 async function deletePlan(cwd) {
   try {
-    await fs8.unlink(path6.join(cwd, PLAN_FILE));
+    await fs7.unlink(path5.join(cwd, PLAN_FILE));
   } catch {
   }
 }
@@ -1758,8 +2054,7 @@ ${toolContext.cwd}
 ## Repository
 ${repoContext}
 
-## Available Tools
-${describeTools()}
+${describeToolSchemas(toolContext)}
 
 ## Instructions
 1. Read relevant files to understand the current state
@@ -1906,8 +2201,8 @@ function formatRalphStatus(plan) {
 }
 
 // src/context/references.ts
-import fs9 from "fs/promises";
-import path7 from "path";
+import fs8 from "fs/promises";
+import path6 from "path";
 import { glob as glob2 } from "glob";
 async function resolveReferences(input, cwd) {
   const references = [];
@@ -1950,9 +2245,9 @@ ${truncated}
   return sections.join("\n\n") + "\n\n";
 }
 async function resolveFile(ref, cwd) {
-  const filePath = path7.isAbsolute(ref) ? ref : path7.resolve(cwd, ref);
+  const filePath = path6.isAbsolute(ref) ? ref : path6.resolve(cwd, ref);
   try {
-    const content = await fs9.readFile(filePath, "utf-8");
+    const content = await fs8.readFile(filePath, "utf-8");
     const lines = content.split("\n");
     const numbered = lines.map((line, i) => `${String(i + 1).padStart(4)} | ${line}`).join("\n");
     return {
@@ -2677,17 +2972,17 @@ function formatTokens(n) {
 }
 
 // src/ui/update-checker.ts
-import fs10 from "fs/promises";
-import path8 from "path";
+import fs9 from "fs/promises";
+import path7 from "path";
 import os4 from "os";
 import { execSync as execSync2, spawnSync } from "child_process";
 var PACKAGE_NAME = "@freesyntax/notch-cli";
 var CHECK_INTERVAL_HOURS = 4;
 var CHECK_INTERVAL_MS = CHECK_INTERVAL_HOURS * 60 * 60 * 1e3;
-var NOTCH_DIR = path8.join(os4.homedir(), ".notch");
-var CACHE_FILE = path8.join(NOTCH_DIR, "update-check.json");
-var LOG_FILE = path8.join(NOTCH_DIR, "update-log.txt");
-var CONFIG_FILE = path8.join(NOTCH_DIR, "config.json");
+var NOTCH_DIR = path7.join(os4.homedir(), ".notch");
+var CACHE_FILE = path7.join(NOTCH_DIR, "update-check.json");
+var LOG_FILE = path7.join(NOTCH_DIR, "update-log.txt");
+var CONFIG_FILE = path7.join(NOTCH_DIR, "config.json");
 var MAX_LOG_LINES = 500;
 var REGISTRY_BASE = "https://registry.npmjs.org";
 var FETCH_TIMEOUT_MS2 = 5e3;
@@ -2822,7 +3117,7 @@ async function saveChannel(channel) {
 }
 async function readUserConfig() {
   try {
-    const raw = await fs10.readFile(CONFIG_FILE, "utf-8");
+    const raw = await fs9.readFile(CONFIG_FILE, "utf-8");
     const parsed = JSON.parse(raw);
     return typeof parsed === "object" && parsed ? parsed : null;
   } catch {
@@ -2831,7 +3126,7 @@ async function readUserConfig() {
 }
 async function loadCache() {
   try {
-    const raw = await fs10.readFile(CACHE_FILE, "utf-8");
+    const raw = await fs9.readFile(CACHE_FILE, "utf-8");
     const parsed = JSON.parse(raw);
     if (parsed && typeof parsed === "object" && typeof parsed.lastCheck === "number" && (parsed.latestVersion === null || typeof parsed.latestVersion === "string")) {
       const channel = isValidChannel(parsed.channel) ? parsed.channel : "latest";
@@ -2858,7 +3153,7 @@ async function detectInstallLocation() {
   if (!entry) return "unknown";
   let entryReal;
   try {
-    entryReal = await fs10.realpath(entry);
+    entryReal = await fs9.realpath(entry);
   } catch {
     entryReal = entry;
   }
@@ -2867,11 +3162,11 @@ async function detectInstallLocation() {
     return "global";
   }
   let dir = process.cwd();
-  const root = path8.parse(dir).root;
+  const root = path7.parse(dir).root;
   while (dir !== root) {
-    const localNM = path8.join(dir, "node_modules");
+    const localNM = path7.join(dir, "node_modules");
     if (pathIsInside(entryReal, localNM)) return "local";
-    const parent = path8.dirname(dir);
+    const parent = path7.dirname(dir);
     if (parent === dir) break;
     dir = parent;
   }
@@ -2881,8 +3176,8 @@ async function detectInstallLocation() {
 }
 function pathIsInside(child, parent) {
   if (!child || !parent) return false;
-  const rel = path8.relative(path8.resolve(parent), path8.resolve(child));
-  return !!rel && !rel.startsWith("..") && !path8.isAbsolute(rel);
+  const rel = path7.relative(path7.resolve(parent), path7.resolve(child));
+  return !!rel && !rel.startsWith("..") && !path7.isAbsolute(rel);
 }
 async function tryExec(cmd) {
   try {
@@ -2940,7 +3235,7 @@ function splitPre(v) {
   return [v.slice(0, i), v.slice(i + 1)];
 }
 async function ensureNotchDir() {
-  await fs10.mkdir(NOTCH_DIR, { recursive: true });
+  await fs9.mkdir(NOTCH_DIR, { recursive: true });
 }
 async function appendLog(message) {
   const line = `[${(/* @__PURE__ */ new Date()).toISOString()}] ${message}`;
@@ -2951,7 +3246,7 @@ async function appendLogRaw(line) {
     await ensureNotchDir();
     let existing = "";
     try {
-      existing = await fs10.readFile(LOG_FILE, "utf-8");
+      existing = await fs9.readFile(LOG_FILE, "utf-8");
     } catch {
       existing = "";
     }
@@ -2964,16 +3259,16 @@ async function appendLogRaw(line) {
 }
 async function atomicWrite(file, contents) {
   const tmp = `${file}.tmp-${process.pid}-${Date.now()}`;
-  await fs10.writeFile(tmp, contents, "utf-8");
+  await fs9.writeFile(tmp, contents, "utf-8");
   try {
-    await fs10.rename(tmp, file);
+    await fs9.rename(tmp, file);
   } catch (err) {
     try {
-      await fs10.copyFile(tmp, file);
-      await fs10.unlink(tmp).catch(() => {
+      await fs9.copyFile(tmp, file);
+      await fs9.unlink(tmp).catch(() => {
       });
     } catch {
-      await fs10.unlink(tmp).catch(() => {
+      await fs9.unlink(tmp).catch(() => {
       });
       throw err;
     }
@@ -2995,16 +3290,16 @@ function indent(block, spaces = 2) {
 // src/commands/update.ts
 import chalk7 from "chalk";
 import { createRequire } from "module";
-import path9 from "path";
+import path8 from "path";
 import { fileURLToPath } from "url";
 var _require = createRequire(import.meta.url);
 function resolveVersion() {
   try {
     const entry = process.argv[1];
-    let dir = entry ? path9.dirname(entry) : fileURLToPath(new URL(".", import.meta.url));
-    const root = path9.parse(dir).root;
+    let dir = entry ? path8.dirname(entry) : fileURLToPath(new URL(".", import.meta.url));
+    const root = path8.parse(dir).root;
     while (dir && dir !== root) {
-      const candidate = path9.join(dir, "package.json");
+      const candidate = path8.join(dir, "package.json");
       try {
         const pkg = _require(candidate);
         if (pkg && pkg.name === PACKAGE_NAME && typeof pkg.version === "string") {
@@ -3012,7 +3307,7 @@ function resolveVersion() {
         }
       } catch {
       }
-      const parent = path9.dirname(dir);
+      const parent = path8.dirname(dir);
       if (parent === dir) break;
       dir = parent;
     }
@@ -3134,8 +3429,8 @@ async function runUpdateCli(argv) {
 }
 
 // src/permissions/index.ts
-import fs11 from "fs/promises";
-import path11 from "path";
+import fs10 from "fs/promises";
+import path10 from "path";
 import os5 from "os";
 
 // node_modules/balanced-match/dist/esm/index.js
@@ -4196,11 +4491,11 @@ var qmarksTestNoExtDot = ([$0]) => {
   return (f) => f.length === len && f !== "." && f !== "..";
 };
 var defaultPlatform = typeof process === "object" && process ? typeof process.env === "object" && process.env && process.env.__MINIMATCH_TESTING_PLATFORM__ || process.platform : "posix";
-var path10 = {
+var path9 = {
   win32: { sep: "\\" },
   posix: { sep: "/" }
 };
-var sep = defaultPlatform === "win32" ? path10.win32.sep : path10.posix.sep;
+var sep = defaultPlatform === "win32" ? path9.win32.sep : path9.posix.sep;
 minimatch.sep = sep;
 var GLOBSTAR = /* @__PURE__ */ Symbol("globstar **");
 minimatch.GLOBSTAR = GLOBSTAR;
@@ -4997,11 +5292,11 @@ var DEFAULT_PERMISSIONS = {
   denyWriteGlobs: [...DEFAULT_DENY_WRITE_GLOBS]
 };
 async function loadPermissions(projectRoot) {
-  const projectPath = path11.join(projectRoot, ".notch.json");
-  const globalPath = path11.join(os5.homedir(), ".notch", "permissions.json");
+  const projectPath = path10.join(projectRoot, ".notch.json");
+  const globalPath = path10.join(os5.homedir(), ".notch", "permissions.json");
   let config = { ...DEFAULT_PERMISSIONS };
   try {
-    const raw = await fs11.readFile(globalPath, "utf-8");
+    const raw = await fs10.readFile(globalPath, "utf-8");
     const parsed = JSON.parse(raw);
     if (parsed.permissions) {
       config = mergePermissions(config, parsed.permissions);
@@ -5009,7 +5304,7 @@ async function loadPermissions(projectRoot) {
   } catch {
   }
   try {
-    const raw = await fs11.readFile(projectPath, "utf-8");
+    const raw = await fs10.readFile(projectPath, "utf-8");
     const parsed = JSON.parse(raw);
     if (parsed.permissions) {
       config = mergePermissions(config, parsed.permissions);
@@ -5149,17 +5444,17 @@ function mergePermissions(base, override) {
 
 // src/hooks/index.ts
 import { execSync as execSync3 } from "child_process";
-import fs12 from "fs/promises";
+import fs11 from "fs/promises";
 import { watch } from "fs";
-import path12 from "path";
+import path11 from "path";
 import os6 from "os";
 import crypto from "crypto";
-var TRUST_STORE_PATH = path12.join(os6.homedir(), ".notch", "trusted-projects.json");
+var TRUST_STORE_PATH = path11.join(os6.homedir(), ".notch", "trusted-projects.json");
 async function isTrustedProject(projectRoot, raw) {
   const fingerprint = crypto.createHash("sha256").update(raw).digest("hex");
-  const key = path12.resolve(projectRoot);
+  const key = path11.resolve(projectRoot);
   try {
-    const store = JSON.parse(await fs12.readFile(TRUST_STORE_PATH, "utf-8"));
+    const store = JSON.parse(await fs11.readFile(TRUST_STORE_PATH, "utf-8"));
     return store[key] === fingerprint;
   } catch {
     return false;
@@ -5167,30 +5462,30 @@ async function isTrustedProject(projectRoot, raw) {
 }
 async function trustProject(projectRoot, raw) {
   const fingerprint = crypto.createHash("sha256").update(raw).digest("hex");
-  const key = path12.resolve(projectRoot);
+  const key = path11.resolve(projectRoot);
   let store = {};
   try {
-    store = JSON.parse(await fs12.readFile(TRUST_STORE_PATH, "utf-8"));
+    store = JSON.parse(await fs11.readFile(TRUST_STORE_PATH, "utf-8"));
   } catch {
   }
   store[key] = fingerprint;
-  await fs12.mkdir(path12.dirname(TRUST_STORE_PATH), { recursive: true });
-  await fs12.writeFile(TRUST_STORE_PATH, JSON.stringify(store, null, 2));
+  await fs11.mkdir(path11.dirname(TRUST_STORE_PATH), { recursive: true });
+  await fs11.writeFile(TRUST_STORE_PATH, JSON.stringify(store, null, 2));
 }
 async function loadHooks(projectRoot, promptTrust) {
   const hooks = [];
-  const globalPath = path12.join(os6.homedir(), ".notch", "hooks.json");
+  const globalPath = path11.join(os6.homedir(), ".notch", "hooks.json");
   try {
-    const raw = await fs12.readFile(globalPath, "utf-8");
+    const raw = await fs11.readFile(globalPath, "utf-8");
     const parsed = JSON.parse(raw);
     if (Array.isArray(parsed.hooks)) {
       hooks.push(...parsed.hooks);
     }
   } catch {
   }
-  const projectPath = path12.join(projectRoot, ".notch.json");
+  const projectPath = path11.join(projectRoot, ".notch.json");
   try {
-    const raw = await fs12.readFile(projectPath, "utf-8");
+    const raw = await fs11.readFile(projectPath, "utf-8");
     const parsed = JSON.parse(raw);
     if (Array.isArray(parsed.hooks) && parsed.hooks.length > 0) {
       const alreadyTrusted = await isTrustedProject(projectRoot, raw);
@@ -5285,7 +5580,7 @@ function startFileWatcher(projectRoot, hookConfig, onHookResult) {
       if (existing) clearTimeout(existing);
       pending.set(filename, setTimeout(async () => {
         pending.delete(filename);
-        const filePath = path12.join(projectRoot, filename);
+        const filePath = path11.join(projectRoot, filename);
         const context = { cwd: projectRoot, file: filePath };
         const { results } = await runHooks(hookConfig, "file-changed", context);
         onHookResult?.("file-changed", results);
@@ -5305,8 +5600,8 @@ function startFileWatcher(projectRoot, hookConfig, onHookResult) {
 }
 
 // src/session/index.ts
-import fs13 from "fs/promises";
-import path13 from "path";
+import fs12 from "fs/promises";
+import path12 from "path";
 import os7 from "os";
 
 // src/session/fork.ts
@@ -5316,13 +5611,13 @@ import fsp from "fs/promises";
 import fsp2 from "fs/promises";
 
 // src/session/index.ts
-var SESSION_DIR = path13.join(os7.homedir(), ".notch", "sessions");
+var SESSION_DIR = path12.join(os7.homedir(), ".notch", "sessions");
 var MAX_SESSIONS = 20;
 async function ensureDir2() {
-  await fs13.mkdir(SESSION_DIR, { recursive: true });
+  await fs12.mkdir(SESSION_DIR, { recursive: true });
 }
 function sessionPath(id) {
-  return path13.join(SESSION_DIR, `${id}.json`);
+  return path12.join(SESSION_DIR, `${id}.json`);
 }
 function generateId() {
   const now = /* @__PURE__ */ new Date();
@@ -5349,13 +5644,13 @@ async function saveSession(messages, project, model, existingId) {
     },
     messages
   };
-  await fs13.writeFile(sessionPath(id), JSON.stringify(session, null, 2), "utf-8");
+  await fs12.writeFile(sessionPath(id), JSON.stringify(session, null, 2), "utf-8");
   await pruneOldSessions();
   return id;
 }
 async function loadSession(id) {
   try {
-    const raw = await fs13.readFile(sessionPath(id), "utf-8");
+    const raw = await fs12.readFile(sessionPath(id), "utf-8");
     return JSON.parse(raw);
   } catch {
     return null;
@@ -5363,12 +5658,12 @@ async function loadSession(id) {
 }
 async function listSessions() {
   await ensureDir2();
-  const files = await fs13.readdir(SESSION_DIR);
+  const files = await fs12.readdir(SESSION_DIR);
   const sessions = [];
   for (const file of files) {
     if (!file.endsWith(".json")) continue;
     try {
-      const raw = await fs13.readFile(path13.join(SESSION_DIR, file), "utf-8");
+      const raw = await fs12.readFile(path12.join(SESSION_DIR, file), "utf-8");
       const session = JSON.parse(raw);
       sessions.push(session.meta);
     } catch {
@@ -5384,7 +5679,7 @@ async function loadLastSession(project) {
 }
 async function deleteSession(id) {
   try {
-    await fs13.unlink(sessionPath(id));
+    await fs12.unlink(sessionPath(id));
     return true;
   } catch {
     return false;
@@ -5438,17 +5733,17 @@ async function exportSession(messages, outputPath, meta) {
       lines.push("");
     }
   }
-  await fs13.writeFile(outputPath, lines.join("\n"), "utf-8");
+  await fs12.writeFile(outputPath, lines.join("\n"), "utf-8");
   return outputPath;
 }
 
 // src/init.ts
-import fs14 from "fs/promises";
-import path14 from "path";
+import fs13 from "fs/promises";
+import path13 from "path";
 import chalk8 from "chalk";
 async function fileExists(p) {
   try {
-    await fs14.access(p);
+    await fs13.access(p);
     return true;
   } catch {
     return false;
@@ -5456,18 +5751,18 @@ async function fileExists(p) {
 }
 async function writeIfMissing(p, content, ctx) {
   if (await fileExists(p)) {
-    ctx.log(chalk8.gray(`  Skipped ${path14.relative(ctx.projectRoot, p)} (already exists)`));
+    ctx.log(chalk8.gray(`  Skipped ${path13.relative(ctx.projectRoot, p)} (already exists)`));
     return false;
   }
-  await fs14.mkdir(path14.dirname(p), { recursive: true });
-  await fs14.writeFile(p, content, "utf-8");
-  ctx.log(chalk8.green(`  Created ${path14.relative(ctx.projectRoot, p)}`));
+  await fs13.mkdir(path13.dirname(p), { recursive: true });
+  await fs13.writeFile(p, content, "utf-8");
+  ctx.log(chalk8.green(`  Created ${path13.relative(ctx.projectRoot, p)}`));
   return true;
 }
 async function patchJson(p, patch, ctx) {
   let current = {};
   if (await fileExists(p)) {
-    const raw = await fs14.readFile(p, "utf-8");
+    const raw = await fs13.readFile(p, "utf-8");
     try {
       current = JSON.parse(raw);
     } catch {
@@ -5475,35 +5770,35 @@ async function patchJson(p, patch, ctx) {
     }
   }
   const next = patch(current);
-  await fs14.writeFile(p, JSON.stringify(next, null, 2) + "\n", "utf-8");
-  ctx.log(chalk8.green(`  Patched ${path14.relative(ctx.projectRoot, p)}`));
+  await fs13.writeFile(p, JSON.stringify(next, null, 2) + "\n", "utf-8");
+  ctx.log(chalk8.green(`  Patched ${path13.relative(ctx.projectRoot, p)}`));
 }
 async function ensureGitignoreEntries(p, entries, sectionTitle, ctx) {
   if (!await fileExists(p)) return;
-  const current = await fs14.readFile(p, "utf-8");
+  const current = await fs13.readFile(p, "utf-8");
   const missing = entries.filter((e) => !current.includes(e));
   if (missing.length === 0) return;
   const append = `
 # ${sectionTitle}
 ` + missing.join("\n") + "\n";
-  await fs14.appendFile(p, append, "utf-8");
+  await fs13.appendFile(p, append, "utf-8");
   ctx.log(chalk8.green(`  Updated .gitignore (+${missing.length})`));
 }
 var DEFAULT_CONFIG = {
-  model: "notch-pyre",
+  model: "openrouter/anthropic/claude-sonnet-4-6",
   temperature: 0.3,
   maxIterations: 25,
   useRepoMap: true,
   renderMarkdown: true,
   permissionMode: "auto",
-  // BYOK (Bring-Your-Own-Key) passthrough — disabled by default.
-  // Uncomment `byok` below (and remove the "_" prefix) to route every
+  // Provider passthrough — disabled by default.
+  // Uncomment `provider` below (and remove the "_" prefix) to route every
   // request to an OpenAI-compatible endpoint (OpenAI / Anthropic /
-  // OpenRouter / Together / Fireworks / Groq / Ollama / vLLM / LM Studio
+  // OpenRouter / Google / DeepSeek / Together / Fireworks / Groq / Ollama / vLLM / LM Studio
   // / custom). Providers read their key from the corresponding env var —
   // e.g. OPENROUTER_API_KEY, ANTHROPIC_API_KEY, OPENAI_API_KEY.
   // Run `notch --list-providers` to see all built-in ids.
-  _byokExample: {
+  _providerExample: {
     provider: "openrouter",
     model: "anthropic/claude-sonnet-4-6"
   }
@@ -5536,17 +5831,17 @@ var baseInstaller = {
   required: true,
   async run(ctx) {
     await writeIfMissing(
-      path14.join(ctx.projectRoot, ".notch.json"),
+      path13.join(ctx.projectRoot, ".notch.json"),
       JSON.stringify(DEFAULT_CONFIG, null, 2) + "\n",
       ctx
     );
     await writeIfMissing(
-      path14.join(ctx.projectRoot, ".notch.md"),
+      path13.join(ctx.projectRoot, ".notch.md"),
       DEFAULT_INSTRUCTIONS,
       ctx
     );
     await ensureGitignoreEntries(
-      path14.join(ctx.projectRoot, ".gitignore"),
+      path13.join(ctx.projectRoot, ".gitignore"),
       [".notch.json"],
       "Notch CLI",
       ctx
@@ -5559,7 +5854,7 @@ var mcpInstaller = {
   description: "Add the mcpServers block to .notch.json (example: github)",
   async run(ctx) {
     await patchJson(
-      path14.join(ctx.projectRoot, ".notch.json"),
+      path13.join(ctx.projectRoot, ".notch.json"),
       (cur) => ({
         ...cur,
         mcpServers: cur.mcpServers ?? {
@@ -5580,7 +5875,7 @@ var hooksInstaller = {
   description: "Add hooks array scaffold to .notch.json",
   async run(ctx) {
     await patchJson(
-      path14.join(ctx.projectRoot, ".notch.json"),
+      path13.join(ctx.projectRoot, ".notch.json"),
       (cur) => ({
         ...cur,
         hooks: cur.hooks ?? [
@@ -5596,10 +5891,10 @@ var vestaInstaller = {
   label: "Vesta agents",
   description: "Scaffold .notch/agents/ directory for Vesta agent configs",
   async run(ctx) {
-    const dir = path14.join(ctx.projectRoot, ".notch", "agents");
-    await fs14.mkdir(dir, { recursive: true });
+    const dir = path13.join(ctx.projectRoot, ".notch", "agents");
+    await fs13.mkdir(dir, { recursive: true });
     await writeIfMissing(
-      path14.join(dir, "README.md"),
+      path13.join(dir, "README.md"),
       `# Vesta Agents
 
 Drop agent JSON/TOML configs in this directory. Notch will load them at startup.
@@ -5614,7 +5909,7 @@ var oneSecInstaller = {
   description: "Enable 1-SEC opt-in and add the block to .notch.json",
   async run(ctx) {
     await patchJson(
-      path14.join(ctx.projectRoot, ".notch.json"),
+      path13.join(ctx.projectRoot, ".notch.json"),
       (cur) => ({
         ...cur,
         security: cur.security ?? {
@@ -5633,7 +5928,7 @@ var telemetryInstaller = {
   description: "Enable opt-in anonymous usage stats",
   async run(ctx) {
     await patchJson(
-      path14.join(ctx.projectRoot, ".notch.json"),
+      path13.join(ctx.projectRoot, ".notch.json"),
       (cur) => ({ ...cur, telemetry: { enabled: true, anonymous: true } }),
       ctx
     );
@@ -5645,7 +5940,7 @@ var agentsMdInstaller = {
   description: "Industry-standard agent instructions file (shared with Codex, Cursor, etc.)",
   async run(ctx) {
     await writeIfMissing(
-      path14.join(ctx.projectRoot, "AGENTS.md"),
+      path13.join(ctx.projectRoot, "AGENTS.md"),
       `# Agent Instructions
 
 Shared instructions for AI coding agents working in this repo.
@@ -5753,6 +6048,9 @@ async function initProject(projectRoot, opts2 = {}) {
 `));
 }
 
+// src/index.ts
+init_auth();
+
 // src/tools/diff-preview.ts
 function unifiedDiff(oldContent, newContent, filePath) {
   const t = theme();
@@ -5889,9 +6187,9 @@ var JsonEmitter = class {
 };
 
 // src/ui/output-schema.ts
-import fs15 from "fs/promises";
+import fs14 from "fs/promises";
 async function loadOutputSchema(filePath) {
-  const raw = await fs15.readFile(filePath, "utf-8");
+  const raw = await fs14.readFile(filePath, "utf-8");
   const schema = JSON.parse(raw);
   return { schema, raw };
 }
@@ -6108,8 +6406,8 @@ function isCoordinatorModeEnv() {
 
 // src/commands/doctor.ts
 import { execSync as execSync4 } from "child_process";
-import fs16 from "fs/promises";
-import path15 from "path";
+import fs15 from "fs/promises";
+import path14 from "path";
 import os8 from "os";
 import chalk9 from "chalk";
 async function runDiagnostics(cwd) {
@@ -6151,26 +6449,26 @@ async function runDiagnostics(cwd) {
     results.push({ name: "Config", status: "fail", message: `Could not load: ${err.message}` });
   }
   try {
-    await fs16.access(path15.join(cwd, ".notch.json"));
+    await fs15.access(path14.join(cwd, ".notch.json"));
     results.push({ name: ".notch.json", status: "ok", message: "Found" });
   } catch {
     results.push({ name: ".notch.json", status: "warn", message: "Not found. Run: notch init" });
   }
-  const notchDir = path15.join(os8.homedir(), ".notch");
+  const notchDir = path14.join(os8.homedir(), ".notch");
   try {
-    await fs16.access(notchDir);
+    await fs15.access(notchDir);
     results.push({ name: "~/.notch/", status: "ok", message: "Exists" });
   } catch {
     results.push({ name: "~/.notch/", status: "warn", message: "Not found (will be created on first use)" });
   }
   try {
-    await fs16.access(path15.join(cwd, ".notch.md"));
+    await fs15.access(path14.join(cwd, ".notch.md"));
     results.push({ name: ".notch.md", status: "ok", message: "Found" });
   } catch {
     results.push({ name: ".notch.md", status: "warn", message: "Not found. Run: notch init" });
   }
   try {
-    const configRaw = await fs16.readFile(path15.join(cwd, ".notch.json"), "utf-8").catch(() => "{}");
+    const configRaw = await fs15.readFile(path14.join(cwd, ".notch.json"), "utf-8").catch(() => "{}");
     const mcpConfigs = parseMCPConfig(JSON.parse(configRaw));
     const serverNames = Object.keys(mcpConfigs);
     if (serverNames.length === 0) {
@@ -6191,8 +6489,8 @@ async function runDiagnostics(cwd) {
     results.push({ name: "MCP Servers", status: "ok", message: "No config to check" });
   }
   try {
-    const sessionsDir = path15.join(notchDir, "sessions");
-    const entries = await fs16.readdir(sessionsDir).catch(() => []);
+    const sessionsDir = path14.join(notchDir, "sessions");
+    const entries = await fs15.readdir(sessionsDir).catch(() => []);
     results.push({ name: "Sessions", status: "ok", message: `${entries.length} saved` });
   } catch {
     results.push({ name: "Sessions", status: "ok", message: "0 saved" });
@@ -6594,11 +6892,11 @@ Read the file first, then make the change. Only modify this one file.`
 
 // src/commands/plugin.ts
 import { execSync as execSync7, execFileSync as execFileSync2 } from "child_process";
-import fs17 from "fs/promises";
-import path16 from "path";
+import fs16 from "fs/promises";
+import path15 from "path";
 import os9 from "os";
 import chalk15 from "chalk";
-var GLOBAL_PLUGINS_DIR = path16.join(os9.homedir(), ".notch", "plugins");
+var GLOBAL_PLUGINS_DIR = path15.join(os9.homedir(), ".notch", "plugins");
 registerCommand("/plugin", async (args, ctx) => {
   const parts = args.split(/\s+/);
   const subcommand = parts[0] || "list";
@@ -6634,8 +6932,8 @@ registerCommand("/plugin", async (args, ctx) => {
         console.log(chalk15.gray("  Usage: /plugin install <npm-package-or-git-url>\n"));
         return;
       }
-      await fs17.mkdir(GLOBAL_PLUGINS_DIR, { recursive: true });
-      const pluginDir = path16.join(GLOBAL_PLUGINS_DIR, path16.basename(target).replace(/\.git$/, ""));
+      await fs16.mkdir(GLOBAL_PLUGINS_DIR, { recursive: true });
+      const pluginDir = path15.join(GLOBAL_PLUGINS_DIR, path15.basename(target).replace(/\.git$/, ""));
       console.log(chalk15.gray(`  Installing ${target}...`));
       try {
         if (target.includes("/") && !target.startsWith("@")) {
@@ -6645,7 +6943,7 @@ registerCommand("/plugin", async (args, ctx) => {
             stdio: "pipe"
           });
         } else {
-          await fs17.mkdir(pluginDir, { recursive: true });
+          await fs16.mkdir(pluginDir, { recursive: true });
           execFileSync2("npm", ["init", "-y"], {
             cwd: pluginDir,
             encoding: "utf-8",
@@ -6660,7 +6958,7 @@ registerCommand("/plugin", async (args, ctx) => {
           });
         }
         try {
-          const pkgExists = await fs17.access(path16.join(pluginDir, "package.json")).then(() => true).catch(() => false);
+          const pkgExists = await fs16.access(path15.join(pluginDir, "package.json")).then(() => true).catch(() => false);
           if (pkgExists) {
             execSync7("npm install --production", {
               cwd: pluginDir,
@@ -6686,10 +6984,10 @@ registerCommand("/plugin", async (args, ctx) => {
         console.log(chalk15.gray("  Usage: /plugin remove <plugin-name>\n"));
         return;
       }
-      const pluginDir = path16.join(GLOBAL_PLUGINS_DIR, target);
+      const pluginDir = path15.join(GLOBAL_PLUGINS_DIR, target);
       try {
-        await fs17.access(pluginDir);
-        await fs17.rm(pluginDir, { recursive: true, force: true });
+        await fs16.access(pluginDir);
+        await fs16.rm(pluginDir, { recursive: true, force: true });
         console.log(chalk15.green(`  \u2713 Removed ${target}`));
         console.log(chalk15.gray("  Restart notch to apply.\n"));
       } catch {
@@ -7301,10 +7599,10 @@ import ora4 from "ora";
 
 // src/skills/registry.ts
 import { createHash } from "crypto";
-import fs18 from "fs";
+import fs17 from "fs";
 import fsp3 from "fs/promises";
 import os10 from "os";
-import path17 from "path";
+import path16 from "path";
 var registry = /* @__PURE__ */ new Map();
 var loadPromises = /* @__PURE__ */ new Map();
 var extractedDirs = /* @__PURE__ */ new Set();
@@ -7342,14 +7640,14 @@ async function performLoad(skill) {
 function getExtractDir(skill) {
   const filesJson = skill.files ? JSON.stringify(skill.files) : "";
   const sha8 = createHash("sha256").update(filesJson).digest("hex").slice(0, 8);
-  return path17.join(os10.tmpdir(), "notch-skills", `${skill.id}-${sha8}`);
+  return path16.join(os10.tmpdir(), "notch-skills", `${skill.id}-${sha8}`);
 }
 async function extractFiles(dir, files) {
   await fsp3.mkdir(dir, { recursive: true, mode: 448 });
   const byParent = /* @__PURE__ */ new Map();
   for (const [relPath, content] of Object.entries(files)) {
     const target = resolveSafePath(dir, relPath);
-    const parent = path17.dirname(target);
+    const parent = path16.dirname(target);
     const group = byParent.get(parent);
     if (group) group.push([target, content]);
     else byParent.set(parent, [[target, content]]);
@@ -7366,17 +7664,17 @@ async function extractFiles(dir, files) {
   );
 }
 function resolveSafePath(baseDir, relPath) {
-  const normalized = path17.normalize(relPath);
+  const normalized = path16.normalize(relPath);
   const parts = normalized.split(/[\\/]/);
-  if (path17.isAbsolute(normalized) || parts.includes("..")) {
+  if (path16.isAbsolute(normalized) || parts.includes("..")) {
     throw new Error(`skill file path escapes skill dir: ${relPath}`);
   }
-  return path17.join(baseDir, normalized);
+  return path16.join(baseDir, normalized);
 }
 function cleanupSkills() {
   for (const dir of extractedDirs) {
     try {
-      fs18.rmSync(dir, { recursive: true, force: true });
+      fs17.rmSync(dir, { recursive: true, force: true });
     } catch {
     }
   }
@@ -7562,6 +7860,7 @@ registerCommand("/microcompact", async (args, ctx) => {
 import { exec, execSync as execSync11 } from "child_process";
 import chalk27 from "chalk";
 import ora5 from "ora";
+init_auth();
 var PLATFORM_URL = "https://freesyntax.dev";
 function openBrowser(url) {
   let cmd;
@@ -7693,6 +7992,7 @@ registerCommand("/cloud", async (args, ctx) => {
 import { exec as exec2 } from "child_process";
 import chalk28 from "chalk";
 import ora6 from "ora";
+init_auth();
 var PLATFORM_URL2 = "https://freesyntax.dev";
 function openBrowser2(url) {
   let cmd;
@@ -7775,8 +8075,8 @@ registerCommand("/agent-builder", async (args, _ctx) => {
 });
 
 // src/ui/completions.ts
-import fs19 from "fs";
-import path18 from "path";
+import fs18 from "fs";
+import path17 from "path";
 var COMMANDS = [
   "/help",
   "/quit",
@@ -7848,8 +8148,7 @@ function buildCompleter(cwd) {
     }
     if (line.startsWith("/model ")) {
       const partial = line.slice(7);
-      const modelNames = MODEL_IDS.map((id) => id.replace("notch-", ""));
-      const allNames = [...MODEL_IDS, ...modelNames];
+      const allNames = listByokProviders().filter((p) => p.defaultModel).map((p) => `${p.id}/${p.defaultModel}`);
       const matches = allNames.filter((m) => m.startsWith(partial));
       return [matches.map((m) => `/model ${m}`), line];
     }
@@ -7869,15 +8168,15 @@ function buildCompleter(cwd) {
 }
 function completeFilePath(partial, cwd) {
   try {
-    const dir = partial.includes("/") ? path18.resolve(cwd, path18.dirname(partial)) : cwd;
-    const prefix = partial.includes("/") ? path18.basename(partial) : partial;
-    const entries = fs19.readdirSync(dir, { withFileTypes: true });
+    const dir = partial.includes("/") ? path17.resolve(cwd, path17.dirname(partial)) : cwd;
+    const prefix = partial.includes("/") ? path17.basename(partial) : partial;
+    const entries = fs18.readdirSync(dir, { withFileTypes: true });
     const matches = [];
     for (const entry of entries) {
       if (entry.name.startsWith(".")) continue;
       if (entry.name === "node_modules" || entry.name === ".git") continue;
       if (entry.name.startsWith(prefix)) {
-        const relative = partial.includes("/") ? path18.dirname(partial) + "/" + entry.name : entry.name;
+        const relative = partial.includes("/") ? path17.dirname(partial) + "/" + entry.name : entry.name;
         if (entry.isDirectory()) {
           matches.push(relative + "/");
         } else {
@@ -7901,6 +8200,8 @@ var SLASH_COMMANDS = [
   // Model & Status
   { name: "/model", description: "Switch or list models", category: "Model" },
   { name: "/status", description: "Check API endpoint health", category: "Model" },
+  { name: "/providers", description: "List model providers", category: "Model" },
+  { name: "/sync-keys", description: "Pull provider keys from freesyntax.dev", category: "Model" },
   // Session
   { name: "/save", description: "Save current session", category: "Session" },
   { name: "/sessions", description: "List saved sessions", category: "Session" },
@@ -8158,22 +8459,22 @@ function rewritePromptLine(rl) {
 }
 
 // src/services/autoDream/gate.ts
-import fs20 from "fs/promises";
-import path19 from "path";
+import fs19 from "fs/promises";
+import path18 from "path";
 import os11 from "os";
-var NOTCH_DIR2 = path19.join(os11.homedir(), ".notch");
-var SESSION_DIR2 = path19.join(NOTCH_DIR2, "sessions");
-var STATE_FILE = path19.join(NOTCH_DIR2, "dream-state.json");
-var LOCK_FILE = path19.join(NOTCH_DIR2, ".dream.lock");
+var NOTCH_DIR2 = path18.join(os11.homedir(), ".notch");
+var SESSION_DIR2 = path18.join(NOTCH_DIR2, "sessions");
+var STATE_FILE = path18.join(NOTCH_DIR2, "dream-state.json");
+var LOCK_FILE = path18.join(NOTCH_DIR2, ".dream.lock");
 var DEFAULT_MIN_HOURS = 24;
 var DEFAULT_MIN_SESSIONS = 5;
 var MS_PER_HOUR = 36e5;
 async function ensureNotchDir2() {
-  await fs20.mkdir(NOTCH_DIR2, { recursive: true });
+  await fs19.mkdir(NOTCH_DIR2, { recursive: true });
 }
 async function readState() {
   try {
-    const raw = await fs20.readFile(STATE_FILE, "utf-8");
+    const raw = await fs19.readFile(STATE_FILE, "utf-8");
     const parsed = JSON.parse(raw);
     if (typeof parsed?.lastRunAt !== "number" || !Number.isFinite(parsed.lastRunAt)) {
       return null;
@@ -8185,7 +8486,7 @@ async function readState() {
 }
 async function writeState(state) {
   await ensureNotchDir2();
-  await fs20.writeFile(STATE_FILE, JSON.stringify(state, null, 2), "utf-8");
+  await fs19.writeFile(STATE_FILE, JSON.stringify(state, null, 2), "utf-8");
 }
 async function shouldDream(_cwd, opts2 = {}) {
   const minHours = opts2.minHours ?? DEFAULT_MIN_HOURS;
@@ -8201,7 +8502,7 @@ async function shouldDream(_cwd, opts2 = {}) {
   }
   let sessionFiles = [];
   try {
-    sessionFiles = await fs20.readdir(SESSION_DIR2);
+    sessionFiles = await fs19.readdir(SESSION_DIR2);
   } catch {
     return { should: false, reason: "session-gate: no session directory yet" };
   }
@@ -8209,7 +8510,7 @@ async function shouldDream(_cwd, opts2 = {}) {
   for (const name of sessionFiles) {
     if (!name.endsWith(".json") && !name.endsWith(".jsonl")) continue;
     try {
-      const stat = await fs20.stat(path19.join(SESSION_DIR2, name));
+      const stat = await fs19.stat(path18.join(SESSION_DIR2, name));
       if (stat.mtimeMs > lastAt) touchedCount++;
     } catch {
     }
@@ -8222,7 +8523,7 @@ async function shouldDream(_cwd, opts2 = {}) {
   }
   try {
     await ensureNotchDir2();
-    const handle = await fs20.open(LOCK_FILE, "wx");
+    const handle = await fs19.open(LOCK_FILE, "wx");
     try {
       await handle.writeFile(String(process.pid), "utf-8");
     } finally {
@@ -8245,7 +8546,7 @@ async function shouldDream(_cwd, opts2 = {}) {
 }
 async function releaseDreamLock() {
   try {
-    await fs20.unlink(LOCK_FILE);
+    await fs19.unlink(LOCK_FILE);
   } catch {
   }
 }
@@ -8262,10 +8563,10 @@ async function recordDreamRun() {
 }
 
 // src/services/autoDream/consolidationPrompt.ts
-import path20 from "path";
+import path19 from "path";
 import os12 from "os";
-var MEMORY_DIR2 = path20.join(os12.homedir(), ".notch", "memory");
-var SESSION_DIR3 = path20.join(os12.homedir(), ".notch", "sessions");
+var MEMORY_DIR2 = path19.join(os12.homedir(), ".notch", "memory");
+var SESSION_DIR3 = path19.join(os12.homedir(), ".notch", "sessions");
 var INDEX_FILE2 = "MEMORY.md";
 var MAX_INDEX_LINES = 200;
 var MAX_INDEX_BYTES = 25 * 1024;
@@ -8427,21 +8728,25 @@ function isDisabled() {
 }
 
 // src/index.ts
-import fs21 from "fs/promises";
+import fs20 from "fs/promises";
 import { createRequire as createRequire2 } from "module";
 var _require2 = createRequire2(import.meta.url);
 var VERSION = _require2("../package.json").version;
-var modelChoices = MODEL_IDS.join(", ");
 if (process.argv[2] === "update") {
   await runUpdateCli(process.argv.slice(3));
   process.exit(process.exitCode ?? 0);
 }
 if (process.argv[2] === "ollama") {
-  const { runOllamaCli } = await import("./ollama-launch-2ASVER3S.js");
+  const { runOllamaCli } = await import("./ollama-launch-3IKB2A3Z.js");
   const code = await runOllamaCli(process.argv.slice(3), process.cwd());
   process.exit(code);
 }
-var program = new Command().name("notch").description("Notch CLI \u2014 AI-powered coding assistant by Driftrail").version(VERSION).argument("[prompt...]", "One-shot prompt (runs once and exits)").option(`-m, --model <model>`, `Notch model (${modelChoices}) or BYOK ref like openrouter:anthropic/claude-sonnet-4-6`).option("--base-url <url>", "Override the backend base URL (Notch or BYOK)").option("--api-key <key>", "API key for the backend (prefer the env var: NOTCH_API_KEY / OPENAI_API_KEY / ANTHROPIC_API_KEY / OPENROUTER_API_KEY / ...)").option("--provider <id>", "BYOK provider id (openai, anthropic, openrouter, together, fireworks, groq, ollama, lmstudio, vllm, custom). Run --list-providers to see them all.").option("--list-providers", "List built-in BYOK providers and their API-key env vars, then exit").option("--no-repo-map", "Disable automatic repository mapping").option("--no-markdown", "Disable markdown rendering in output").option("--max-iterations <n>", "Max tool-call rounds per turn", "25").option("-y, --yes", "Auto-confirm destructive actions").option("--trust", "Trust mode \u2014 auto-allow all tool calls").option("--theme <theme>", `UI color theme (${THEME_IDS.join(", ")})`).option("--resume", "Resume the last session for this project").option("--session <id>", "Resume a specific session by ID").option("--cwd <dir>", "Set working directory").option("--json", "Emit JSONL event stream on stdout (headless/CI mode)").option("--output-schema <file>", "Path to JSON Schema constraining the final structured output").option("--output-last-message <file>", "Write the final assistant message to this file on exit").option("--guardian", "Enable Guardian: independent Solace-Lite risk scoring before every prompt-level tool call").option("--coordinator", "Coordinator mode: top-level agent can only spawn/continue/stop workers (plus read/grep/glob). All real work is delegated.").option("--no-auto-dream", "Disable the background memory-consolidation daemon (default: enabled in REPL)").option("--no-update", "Disable the background update check on launch (equivalent to NOTCH_AUTO_UPDATE=0)").option("--update-channel <name>", "npm dist-tag to follow for updates (latest | next | beta)").option(
+if (process.argv[2] === "config") {
+  const { runConfigCli } = await import("./config-set-5F4VK7IT.js");
+  const code = await runConfigCli(process.argv.slice(3), process.cwd());
+  process.exit(code);
+}
+var program = new Command().name("notch").description("Notch CLI \u2014 AI-powered coding assistant by Driftrail").version(VERSION).argument("[prompt...]", "One-shot prompt (runs once and exits)").option("-m, --model <model>", "Model id, preferably provider/model (for example openrouter/anthropic/claude-sonnet-4-6)").option("--base-url <url>", "Override the provider base URL (for custom OpenAI-compatible endpoints)").option("--api-key <key>", "API key for the active provider (prefer provider env vars such as OPENROUTER_API_KEY)").option("--provider <id>", "Provider id (openai, anthropic, openrouter, google, deepseek, together, fireworks, groq, ollama, lmstudio, vllm, custom).").option("--list-providers", "List built-in providers and their API-key env vars, then exit").option("--no-repo-map", "Disable automatic repository mapping").option("--no-markdown", "Disable markdown rendering in output").option("--max-iterations <n>", "Max tool-call rounds per turn", "25").option("-y, --yes", "Auto-confirm destructive actions").option("--trust", "Trust mode \u2014 auto-allow all tool calls").option("--theme <theme>", `UI color theme (${THEME_IDS.join(", ")})`).option("--resume", "Resume the last session for this project").option("--session <id>", "Resume a specific session by ID").option("--cwd <dir>", "Set working directory").option("--json", "Emit JSONL event stream on stdout (headless/CI mode)").option("--output-schema <file>", "Path to JSON Schema constraining the final structured output").option("--output-last-message <file>", "Write the final assistant message to this file on exit").option("--guardian", "Enable Guardian risk scoring when a provider-backed guardian model is configured").option("--coordinator", "Coordinator mode: top-level agent can only spawn/continue/stop workers (plus read/grep/glob). All real work is delegated.").option("--no-auto-dream", "Disable the background memory-consolidation daemon (default: enabled in REPL)").option("--no-update", "Disable the background update check on launch (equivalent to NOTCH_AUTO_UPDATE=0)").option("--update-channel <name>", "npm dist-tag to follow for updates (latest | next | beta)").option(
   "--image <path>",
   "Attach an image (file path, URL, or data URL). Repeatable.",
   (val, prev) => prev ? [...prev, val] : [val],
@@ -8451,22 +8756,29 @@ var opts = program.opts();
 var promptArgs = program.args;
 function printByokProviderList() {
   const t = theme();
-  console.log(t.dim("\n  BYOK providers (point --provider at any of these):\n"));
-  const header = `  ${"id".padEnd(12)} ${"label".padEnd(20)} ${"env var".padEnd(22)} default model`;
+  console.log(t.dim("\n  Model providers (point --provider at any of these):\n"));
+  const providers = listByokProviders();
+  const idWidth = Math.max(12, ...providers.map((p) => p.id.length));
+  const labelWidth = Math.max(20, ...providers.map((p) => p.label.length));
+  const envWidth = Math.max(22, ...providers.map((p) => (p.apiKeyEnv || "(none)").length));
+  const keyWidth = 7;
+  const header = `  ${"id".padEnd(idWidth)} ${"label".padEnd(labelWidth)} ${"env var".padEnd(envWidth)} ${"key".padEnd(keyWidth)} default model`;
   console.log(t.dim(header));
   console.log(t.dim(`  ${"-".repeat(header.length - 2)}`));
-  for (const p of listByokProviders()) {
-    const keyPresent = p.apiKeyEnv ? process.env[p.apiKeyEnv] ? t.success("\u2713") : t.dim("\u2717") : t.dim("\u2013");
+  for (const p of providers) {
+    const keyLabel = p.apiKeyEnv ? process.env[p.apiKeyEnv] ? "set" : p.fallbackApiKey ? "local" : "missing" : "none";
+    const paddedKey = keyLabel.padEnd(keyWidth);
+    const keyPresent = keyLabel === "set" ? t.success(paddedKey) : keyLabel === "missing" ? t.dim(paddedKey) : t.dim(paddedKey);
     const envDisplay = p.apiKeyEnv || "(none)";
     console.log(
-      `  ${t.brand(p.id.padEnd(12))} ${p.label.padEnd(20)} ${envDisplay.padEnd(20)} ${keyPresent}  ${t.dim(p.defaultModel || "\u2014")}`
+      `  ${t.brand(p.id.padEnd(idWidth))} ${p.label.padEnd(labelWidth)} ${envDisplay.padEnd(envWidth)} ${keyPresent} ${t.dim(p.defaultModel || "\u2014")}`
     );
   }
   console.log("");
   console.log(t.dim("  Use it like:"));
   console.log(t.dim("    export OPENROUTER_API_KEY=sk-or-..."));
-  console.log(t.dim("    notch --provider openrouter --model anthropic/claude-opus-4-7"));
-  console.log(t.dim("    notch --model openrouter:anthropic/claude-opus-4-7   # equivalent"));
+  console.log(t.dim("    notch --provider openrouter --model anthropic/claude-sonnet-4-6"));
+  console.log(t.dim("    notch --model openrouter/anthropic/claude-sonnet-4-6   # equivalent"));
   console.log(t.dim("    notch --provider custom --base-url http://localhost:8000/v1 --model my-model"));
   console.log("");
 }
@@ -8483,13 +8795,14 @@ async function persistByokChoice(projectRoot, providerId, defaultModel) {
     const p = nodePath2.resolve(projectRoot, ".notch.json");
     let current = {};
     try {
-      const raw = await fs21.readFile(p, "utf-8");
+      const raw = await fs20.readFile(p, "utf-8");
       current = JSON.parse(raw);
     } catch {
     }
     const idToPersist = providerId === "__custom__" ? "custom" : providerId;
-    current.byok = { provider: idToPersist, model: defaultModel };
-    await fs21.writeFile(p, JSON.stringify(current, null, 2) + "\n", "utf-8");
+    current.provider = { provider: idToPersist, model: defaultModel };
+    delete current.byok;
+    await fs20.writeFile(p, JSON.stringify(current, null, 2) + "\n", "utf-8");
   } catch {
   }
 }
@@ -8502,14 +8815,12 @@ function interactiveModelPicker(activeModel) {
   return new Promise((resolve3) => {
     const t = theme();
     const rows = [];
-    rows.push({ kind: "notch-header" });
-    for (const id of MODEL_IDS) rows.push({ kind: "notch", id });
     rows.push({ kind: "byok-header" });
     for (const p of listByokProviders()) rows.push({ kind: "byok", provider: p });
-    const selectableIndexes = rows.map((r, i) => r.kind === "notch" || r.kind === "byok" ? i : -1).filter((i) => i >= 0);
+    const selectableIndexes = rows.map((r, i) => r.kind === "byok" ? i : -1).filter((i) => i >= 0);
     let cursor = selectableIndexes.find((i) => {
       const r = rows[i];
-      return r && r.kind === "notch" && r.id === activeModel;
+      return r && r.kind === "byok" && typeof activeModel === "string" && isByokRef(activeModel) && parseByokRef(activeModel).provider === r.provider.id;
     }) ?? selectableIndexes[0] ?? 0;
     const rowCount = rows.length;
     const headerLines = 2;
@@ -8526,35 +8837,31 @@ function interactiveModelPicker(activeModel) {
       console.log(t.dim("  Select a model (\u2191\u2193 to move, Enter to select, Esc to cancel)\n"));
       for (let i = 0; i < rows.length; i++) {
         const row = rows[i];
-        if (row.kind === "notch-header") {
-          console.log(`  ${t.dim("\u2500\u2500\u2500 Notch models (default) \u2500\u2500\u2500")}`);
-          continue;
-        }
         if (row.kind === "byok-header") {
-          console.log(`  ${t.dim("\u2500\u2500\u2500 BYOK providers (your own API key) \u2500\u2500\u2500")}`);
+          console.log(`  ${t.dim("--- Providers ---")}`);
           continue;
         }
         const isSelected = i === cursor;
         const pointer = isSelected ? t.brand("\u276F") : " ";
-        if (row.kind === "notch") {
-          const info = MODEL_CATALOG[row.id];
-          const isCurrent = row.id === activeModel;
-          const dot = isCurrent ? t.success("\u25CF") : " ";
-          const label = isSelected ? t.bold(info.label) : t.dim(info.label);
-          const size = t.dim(info.size);
-          const gpu = t.dim(info.gpu);
-          const ctx = t.dim(`${(info.contextWindow / 1024).toFixed(0)}K`);
-          console.log(`  ${pointer} ${dot} ${t.brand(row.id.replace("notch-", "").padEnd(12))} ${label.padEnd(20)} ${size.padEnd(6)} ${gpu.padEnd(12)} ${ctx}`);
-        } else {
-          const p = row.provider;
-          const isCurrent = typeof activeModel === "string" && isByokRef(activeModel) ? parseByokRef(activeModel).provider === p.id : false;
-          const dot = isCurrent ? t.success("\u25CF") : " ";
-          const keyPresent = p.apiKeyEnv ? process.env[p.apiKeyEnv] ? t.success("\u2713") : t.dim("\u2717") : t.dim("\u2013");
-          const label = isSelected ? t.bold(p.label) : t.dim(p.label);
-          const envDisplay = t.dim((p.apiKeyEnv || "local").padEnd(22));
-          const defModel = t.dim(p.defaultModel ? p.defaultModel.slice(0, 34) : "\u2014");
-          console.log(`  ${pointer} ${dot} ${t.brand(p.id.padEnd(12))} ${label.padEnd(20)} ${envDisplay} ${keyPresent}  ${defModel}`);
+        const p = row.provider;
+        const isCurrent = typeof activeModel === "string" && isByokRef(activeModel) ? parseByokRef(activeModel).provider === p.id : false;
+        const dot = isCurrent ? t.success("\u25CF") : " ";
+        const envHit = p.apiKeyEnv ? Boolean(process.env[p.apiKeyEnv]) : false;
+        let syncHit = false;
+        if (!envHit) {
+          try {
+            const { loadSyncedByokKeysSync } = (init_auth(), __toCommonJS(auth_exports));
+            const synced = loadSyncedByokKeysSync();
+            const fromSync = synced?.keys[p.id];
+            syncHit = typeof fromSync === "string" && fromSync.length > 0;
+          } catch {
+          }
         }
+        const keyPresent = p.apiKeyEnv ? envHit ? t.success("\u2713") : syncHit ? t.brand("\u2713") : t.dim("\u2717") : t.dim("\u2013");
+        const label = isSelected ? t.bold(p.label) : t.dim(p.label);
+        const envDisplay = t.dim((p.apiKeyEnv || "local").padEnd(22));
+        const defModel = t.dim(p.defaultModel ? p.defaultModel.slice(0, 34) : "\u2014");
+        console.log(`  ${pointer} ${dot} ${t.brand(p.id.padEnd(12))} ${label.padEnd(20)} ${envDisplay} ${keyPresent}  ${defModel}`);
       }
     };
     const render = (first) => {
@@ -8580,16 +8887,12 @@ function interactiveModelPicker(activeModel) {
       } else if (s === "\r" || s === "\n") {
         const row = rows[cursor];
         cleanup();
-        if (!row || row.kind !== "notch" && row.kind !== "byok") {
+        if (!row || row.kind !== "byok") {
           resolve3(null);
           return;
         }
-        if (row.kind === "notch") {
-          resolve3({ kind: "notch", id: row.id });
-        } else {
-          const modelRef = `${row.provider.id}:${row.provider.defaultModel}`;
-          resolve3({ kind: "byok", provider: row.provider, modelRef });
-        }
+        const modelRef = `${row.provider.id}/${row.provider.defaultModel}`;
+        resolve3({ kind: "byok", provider: row.provider, modelRef });
       } else if (s === "\x1B" || s === "") {
         cleanup();
         resolve3(null);
@@ -8606,10 +8909,11 @@ function interactiveModelPicker(activeModel) {
 function printHelp() {
   console.log(chalk30.gray(`
   Commands:
-    /model              \u2014 Show available models (Notch + BYOK)
-    /model <name>       \u2014 Switch model: /model pyre  OR  /model openrouter:anthropic/claude-sonnet-4-6
-    /providers          \u2014 List built-in BYOK providers and whether their keys are set
-    /status             \u2014 Check backend health (Notch API or BYOK endpoint)
+    /model              \u2014 Pick a provider and default model
+    /model <ref>        \u2014 Switch model: /model openrouter/anthropic/claude-sonnet-4-6
+    /sync-keys          \u2014 Pull provider keys you added on freesyntax.dev
+    /providers          \u2014 List built-in providers and whether their keys are set
+    /status             \u2014 Check active provider health
     /undo               \u2014 Undo last file changes
     /usage              \u2014 Show token usage + context meter
     /cost               \u2014 Show estimated session cost
@@ -8632,6 +8936,7 @@ function printHelp() {
     /memory search <q>  \u2014 Search memories
     /memory clear       \u2014 Delete all memories
     /permissions        \u2014 Show current permission config
+    /yolo               \u2014 Toggle YOLO mode: auto-allow all tool calls (persists)
 
   Ralph Wiggum Mode (autonomous):
     /ralph plan <goal>  \u2014 Generate task plan for a goal
@@ -8708,12 +9013,62 @@ async function main() {
       const creds = await login();
       console.log(chalk30.green(`
   \u2713 Signed in as ${creds.email}`));
-      console.log(chalk30.gray(`  API key stored in ${(await import("./auth-JQX6MHJG.js")).getCredentialsPath()}
-`));
+      console.log(chalk30.gray(`  API key stored in ${(await import("./auth-UAMMP5IJ.js")).getCredentialsPath()}`));
+      try {
+        const { syncByokKeys } = await import("./auth-UAMMP5IJ.js");
+        const synced = await syncByokKeys(creds.token);
+        const providerCount = Object.keys(synced.keys).length;
+        if (providerCount > 0) {
+          console.log(chalk30.gray(
+            `  Synced ${providerCount} provider key(s) from freesyntax.dev \u2192 ${(await import("./auth-UAMMP5IJ.js")).getByokSyncPath()}`
+          ));
+        } else {
+          console.log(chalk30.gray(
+            `  No provider keys on your profile yet \u2014 add them at freesyntax.dev/settings/keys then run ${chalk30.white("notch sync-keys")}.`
+          ));
+        }
+      } catch (syncErr) {
+        console.log(chalk30.yellow(
+          `  (provider key sync skipped: ${syncErr.message.slice(0, 120)})`
+        ));
+      }
+      console.log("");
     } catch (err) {
       spinner.stop();
       console.error(chalk30.red(`
   Login failed: ${err.message}
+`));
+      process.exit(1);
+    }
+    return;
+  }
+  if (promptArgs[0] === "sync-keys") {
+    const creds = await loadCredentials();
+    if (!creds) {
+      console.log(chalk30.gray("\n  Not signed in. Run: notch login\n"));
+      return;
+    }
+    const spinner = ora7("Pulling provider keys from freesyntax.dev...").start();
+    try {
+      const { syncByokKeys, getByokSyncPath } = await import("./auth-UAMMP5IJ.js");
+      const synced = await syncByokKeys(creds.token);
+      spinner.stop();
+      const providers = Object.keys(synced.keys);
+      if (providers.length === 0) {
+        console.log(chalk30.gray(`
+  No provider keys on your profile yet.`));
+        console.log(chalk30.gray(`  Add them at ${chalk30.white("https://freesyntax.dev/settings/keys")} then rerun.
+`));
+      } else {
+        console.log(chalk30.green(`
+  \u2713 Synced ${providers.length} provider key(s): ${providers.join(", ")}`));
+        console.log(chalk30.gray(`  Cached at ${getByokSyncPath()}
+`));
+      }
+    } catch (err) {
+      spinner.stop();
+      console.error(chalk30.red(`
+  Key sync failed: ${err.message}
 `));
       process.exit(1);
     }
@@ -8746,7 +9101,7 @@ async function main() {
     return;
   }
   if (promptArgs[0] === "mcp-serve" || promptArgs[0] === "mcp-server") {
-    const { runMcpServer } = await import("./server-7UQKCB2Z.js");
+    const { runMcpServer } = await import("./server-GMF4WV67.js");
     await runMcpServer({
       cwd: opts.cwd ?? process.cwd(),
       version: VERSION,
@@ -8785,7 +9140,7 @@ async function main() {
     const providerId = opts.provider === "custom" ? "__custom__" : opts.provider;
     const byokInfo = findByokProvider(providerId);
     if (!byokInfo) {
-      console.error(chalk30.red(`  Unknown BYOK provider: ${opts.provider}`));
+      console.error(chalk30.red(`  Unknown provider: ${opts.provider}`));
       console.error(chalk30.gray(`  Run  notch --list-providers  to see built-ins, or pass --provider custom --base-url <url>.`));
       process.exit(1);
     }
@@ -8802,7 +9157,7 @@ async function main() {
     } else if (isByokRef(opts.model)) {
       const { provider } = parseByokRef(opts.model);
       if (!findByokProvider(provider)) {
-        console.error(chalk30.red(`  Unknown BYOK provider in ref: ${provider}`));
+        console.error(chalk30.red(`  Unknown provider in model ref: ${provider}`));
         console.error(chalk30.gray(`  Run  notch --list-providers  to see built-ins.`));
         process.exit(1);
       }
@@ -8810,8 +9165,8 @@ async function main() {
       config.models.chat.byokProvider = void 0;
     } else {
       console.error(chalk30.red(`  Unknown model: ${opts.model}`));
-      console.error(chalk30.gray(`  Notch models: ${modelChoices}`));
-      console.error(chalk30.gray(`  For BYOK use "<provider>:<model>" (e.g. openrouter:anthropic/claude-sonnet-4-6), or run  notch --list-providers .`));
+      console.error(chalk30.gray("  Use provider/model, for example openrouter/anthropic/claude-sonnet-4-6."));
+      console.error(chalk30.gray("  Run  notch --list-providers  to see built-ins."));
       process.exit(1);
     }
   }
@@ -8865,7 +9220,7 @@ async function main() {
     if (err instanceof ByokMissingApiKeyError) {
       printWordmark(VERSION);
       const p = err.provider;
-      console.log(`  To use ${p.label} (BYOK) you need an API key.`);
+      console.log(`  To use ${p.label} you need an API key.`);
       console.log("");
       if (p.apiKeyEnv) {
         console.log("  \x1B[1mOption 1:\x1B[0m Set the env var");
@@ -8892,9 +9247,9 @@ async function main() {
       console.log("  \x1B[1mOption 3:\x1B[0m Pass it inline");
       console.log("    \x1B[33m$ notch --api-key your-key-here\x1B[0m");
       console.log("");
-      console.log("  \x1B[1mOr:\x1B[0m Bring your own key (OpenAI, Anthropic, OpenRouter, ...)");
+      console.log("  \x1B[1mOr:\x1B[0m Use any provider key (OpenAI, Anthropic, OpenRouter, ...)");
       console.log("    \x1B[33m$ notch --list-providers\x1B[0m");
-      console.log("    \x1B[33m$ notch --provider openrouter --model anthropic/claude-opus-4-7\x1B[0m");
+      console.log("    \x1B[33m$ notch --model openrouter/anthropic/claude-sonnet-4-6\x1B[0m");
       console.log("");
       console.log("  Get your Notch key at: \x1B[4mhttps://freesyntax.dev/settings\x1B[0m");
       console.log("");
@@ -8905,7 +9260,7 @@ async function main() {
   const info = activeByok ? {
     id: activeModelId,
     label: `${activeByok.label}`,
-    size: "BYOK",
+    size: "provider",
     gpu: activeByok.id,
     contextWindow: 128e3,
     maxOutputTokens: 8192,
@@ -8955,14 +9310,18 @@ async function main() {
     }).catch(() => {
     });
   }
+  const startupPermissive = config.permissionMode === "trust" || !!config.autoConfirm || !!opts.yes;
   const hookTrustPrompt = async (commands) => {
+    if (startupPermissive) return true;
+    if (!process.stdin.isTTY) return true;
     console.warn(chalk30.yellow("\n\u26A0  This project contains hooks in .notch.json that will run shell commands:"));
     commands.forEach((cmd) => console.warn(chalk30.gray(`   \u2022 ${cmd}`)));
     const rl2 = readline.createInterface({ input: process.stdin, output: process.stdout });
     return new Promise((resolve3) => {
-      rl2.question(chalk30.yellow("\nAllow these hooks for this project? [y/N] "), (answer) => {
+      rl2.question(chalk30.yellow("\nAllow these hooks for this project? [Y/n] "), (answer) => {
         rl2.close();
-        resolve3(answer.trim().toLowerCase() === "y");
+        const norm = answer.trim().toLowerCase();
+        resolve3(norm !== "n" && norm !== "no");
       });
     });
   };
@@ -8981,7 +9340,6 @@ async function main() {
       spinner.warn("Could not build repo map");
     }
   }
-  const baseSystemPrompt = await buildSystemPrompt(config.projectRoot, activeModelId);
   let outputSchema = null;
   if (opts.outputSchema) {
     try {
@@ -8996,19 +9354,6 @@ async function main() {
     }
   }
   const coordinatorMode = !!opts.coordinator || isCoordinatorModeEnv();
-  const systemPrompt = coordinatorMode ? [
-    COORDINATOR_SYSTEM_PROMPT,
-    repoMapStr ? `
-## Repository Map
-${repoMapStr}` : "",
-    outputSchema ? schemaInstructions(outputSchema) : ""
-  ].join("") : [
-    baseSystemPrompt,
-    repoMapStr ? `
-## Repository Map
-${repoMapStr}` : "",
-    outputSchema ? schemaInstructions(outputSchema) : ""
-  ].join("");
   if (coordinatorMode && !jsonMode) {
     console.log(
       chalk30.green(
@@ -9026,7 +9371,7 @@ ${repoMapStr}` : "",
   const permissionSessionId = `s_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 6)}`;
   const checkpoints = new CheckpointManager();
   const usage2 = new UsageTracker();
-  const { OllamaCloudUsageTracker } = await import("./ollama-usage-2WPCZJJI.js");
+  const { OllamaCloudUsageTracker } = await import("./ollama-usage-3PROM2WC.js");
   const cloudUsage = new OllamaCloudUsageTracker();
   let sessionId;
   let activePlan = null;
@@ -9034,19 +9379,11 @@ ${repoMapStr}` : "",
   const branches = /* @__PURE__ */ new Map();
   let currentBranch = "main";
   const costTracker = new CostTracker();
-  const mcpClients = [];
   try {
-    const configRaw = await fs21.readFile(nodePath2.resolve(config.projectRoot, ".notch.json"), "utf-8").catch(() => "{}");
-    const mcpConfigs = parseMCPConfig(JSON.parse(configRaw));
-    for (const [name, mcpConfig] of Object.entries(mcpConfigs)) {
-      try {
-        const client = new MCPClient(mcpConfig, name);
-        await client.connect();
-        mcpClients.push(client);
-        console.log(chalk30.green(`  MCP: Connected to ${name} (${client.tools.length} tools)`));
-      } catch (err) {
-        console.log(chalk30.yellow(`  MCP: Could not connect to ${name}: ${err.message}`));
-      }
+    const configRaw = await fs20.readFile(nodePath2.resolve(config.projectRoot, ".notch.json"), "utf-8").catch(() => "{}");
+    const toolCount = await initMCPServers(JSON.parse(configRaw));
+    if (toolCount > 0) {
+      console.log(chalk30.green(`  MCP: Connected (${toolCount} tools)`));
     }
   } catch {
   }
@@ -9064,13 +9401,16 @@ ${repoMapStr}` : "",
   if (opts.guardian) {
     try {
       guardianModel = resolveModel({
-        model: "notch-solace-lite",
+        model: process.env.NOTCH_GUARDIAN_MODEL ?? config.models.chat.model,
         apiKey: config.models.chat.apiKey,
         baseUrl: process.env.NOTCH_GUARDIAN_BASE_URL,
-        headers: config.models.chat.headers
+        headers: config.models.chat.headers,
+        byokProvider: config.models.chat.byokProvider,
+        byokHeaders: config.models.chat.byokHeaders,
+        byokApiShape: config.models.chat.byokApiShape
       });
       if (!jsonMode) {
-        console.log(chalk30.green("  Guardian: enabled (notch-solace-lite)"));
+        console.log(chalk30.green(`  Guardian: enabled (${process.env.NOTCH_GUARDIAN_MODEL ?? config.models.chat.model})`));
       }
     } catch (err) {
       if (!jsonMode) {
@@ -9079,15 +9419,18 @@ ${repoMapStr}` : "",
       guardianModel = void 0;
     }
   }
+  const isPermissive = () => config.permissionMode === "trust" || config.autoConfirm;
   const toolCtx = {
     cwd: config.projectRoot,
-    requireConfirm: config.permissionMode !== "trust" && !config.autoConfirm,
+    requireConfirm: !isPermissive(),
     confirm: async (message) => {
+      if (isPermissive()) return true;
       const rl2 = readline.createInterface({ input: process.stdin, output: process.stdout });
       return new Promise((resolve3) => {
-        rl2.question(`${message} (y/N) `, (answer) => {
+        rl2.question(`${message} (Y/n) `, (answer) => {
           rl2.close();
-          resolve3(answer.toLowerCase() === "y" || answer.toLowerCase() === "yes");
+          const norm = answer.trim().toLowerCase();
+          resolve3(norm !== "n" && norm !== "no");
         });
       });
     },
@@ -9112,6 +9455,28 @@ ${repoMapStr}` : "",
       }
     }
   };
+  const baseSystemPrompt = await buildSystemPrompt(config.projectRoot, activeModelId, toolCtx);
+  const systemPrompt = coordinatorMode ? [
+    COORDINATOR_SYSTEM_PROMPT,
+    "\n\n",
+    baseSystemPrompt,
+    repoMapStr ? `
+
+## Repository Map
+${repoMapStr}` : "",
+    outputSchema ? `
+
+${schemaInstructions(outputSchema)}` : ""
+  ].join("") : [
+    baseSystemPrompt,
+    repoMapStr ? `
+
+## Repository Map
+${repoMapStr}` : "",
+    outputSchema ? `
+
+${schemaInstructions(outputSchema)}` : ""
+  ].join("");
   await toolCtx.runHook?.("session-start", {});
   const stopFileWatcher = startFileWatcher(config.projectRoot, hookConfig, (event, results) => {
     for (const r of results) {
@@ -9183,9 +9548,10 @@ Analyze the above input.`;
       attachments.push(res);
     }
     if (attachments.length > 0 && !modelSupportsImages(activeModelId)) {
-      const msg = `Selected model "${activeModelId}" may not support images. Switch with --model or --provider.`;
-      if (jsonMode) events.emit({ type: "warning", message: msg });
-      else console.warn(chalk30.yellow(`  ${msg}`));
+      const msg = `Selected model "${activeModelId}" does not support image attachments. Switch to a vision-capable model.`;
+      if (jsonMode) events.emit({ type: "error", message: msg });
+      else console.error(chalk30.red(`  ${msg}`));
+      process.exit(1);
     }
     if (attachments.length > 0) {
       const imageBlocks = attachments.map(imageToContentBlock);
@@ -9305,7 +9671,7 @@ Analyze the above input.`;
       }
       if (opts.outputLastMessage) {
         try {
-          await fs21.writeFile(opts.outputLastMessage, response.text, "utf-8");
+          await fs20.writeFile(opts.outputLastMessage, response.text, "utf-8");
         } catch (err) {
           if (jsonMode) events.emit({ type: "error", message: `Failed to write --output-last-message: ${err.message}` });
         }
@@ -9393,11 +9759,9 @@ Analyze the above input.`;
         } catch {
         }
       }
-      for (const client of mcpClients) {
-        try {
-          await client.disconnect();
-        } catch {
-        }
+      try {
+        disconnectMCPServers();
+      } catch {
       }
       slashMenu.cleanup();
       stopActiveLoop();
@@ -9424,24 +9788,6 @@ Analyze the above input.`;
       const picked = await interactiveModelPicker(activeModelId);
       if (!picked) {
         console.log(chalk30.gray("  Cancelled\n"));
-      } else if (picked.kind === "notch") {
-        if (picked.id === activeModelId) {
-          console.log(chalk30.gray(`  Already using ${MODEL_CATALOG[picked.id].label}
-`));
-        } else {
-          activeModelId = picked.id;
-          config.models.chat.model = activeModelId;
-          config.models.chat.byokProvider = void 0;
-          try {
-            model = resolveModel(config.models.chat);
-            const switchedInfo = MODEL_CATALOG[picked.id];
-            console.log(chalk30.green(`  \u2713 Switched to ${switchedInfo.label} (${switchedInfo.id})
-`));
-          } catch (e) {
-            console.log(chalk30.red(`  Failed to switch: ${e.message}
-`));
-          }
-        }
       } else {
         activeModelId = picked.modelRef;
         config.models.chat.model = picked.modelRef;
@@ -9465,12 +9811,12 @@ Analyze the above input.`;
       rl.prompt();
       return;
     }
-    if (input.startsWith("/model ")) {
+    if (input.startsWith("/model ") && !input.startsWith("/model download")) {
       const arg = input.replace("/model ", "").trim();
       if (isByokRef(arg)) {
         const { provider } = parseByokRef(arg);
         if (!findByokProvider(provider)) {
-          console.log(chalk30.red(`  Unknown BYOK provider: ${provider}`));
+          console.log(chalk30.red(`  Unknown provider: ${provider}`));
           console.log(chalk30.gray(`  Run /providers to list built-ins.`));
           rl.prompt();
           return;
@@ -9489,6 +9835,29 @@ Analyze the above input.`;
 `));
           } else {
             console.log(chalk30.red(`  Failed to switch: ${e.message}
+`));
+          }
+        }
+        rl.prompt();
+        return;
+      }
+      const currentProvider = activeByokProvider(config.models.chat);
+      if (currentProvider) {
+        const providerId = currentProvider.id === "__custom__" ? "custom" : currentProvider.id;
+        const modelRef = `${providerId}/${arg}`;
+        activeModelId = modelRef;
+        config.models.chat.model = modelRef;
+        config.models.chat.byokProvider = void 0;
+        try {
+          model = resolveModel(config.models.chat);
+          console.log(chalk30.green(`  Switched to ${currentProvider.label} (${modelRef})
+`));
+        } catch (e) {
+          if (e instanceof ByokMissingApiKeyError) {
+            console.log(chalk30.yellow(`  \u26A0  ${e.message}
+`));
+          } else {
+            console.log(chalk30.red(`  Failed to switch: ${e.message}
 `));
           }
         }
@@ -9501,8 +9870,8 @@ Analyze the above input.`;
       }
       if (!isValidModel(newModel)) {
         console.log(chalk30.red(`  Unknown model: ${arg}`));
-        console.log(chalk30.gray(`  Notch models: ${modelChoices}`));
-        console.log(chalk30.gray(`  For BYOK use "<provider>:<model>" (e.g. openrouter:anthropic/claude-sonnet-4-6). Run /providers to list built-ins.`));
+        console.log(chalk30.gray("  Use provider/model, for example openrouter/anthropic/claude-sonnet-4-6."));
+        console.log(chalk30.gray("  Run /providers to list built-ins."));
         rl.prompt();
         return;
       }
@@ -9516,6 +9885,60 @@ Analyze the above input.`;
       rl.prompt();
       return;
     }
+    if (input.startsWith("/model download")) {
+      console.log(chalk30.gray("  Direct weight downloads are no longer part of the model picker."));
+      console.log(chalk30.gray("  Run a local provider instead, then select it with /model ollama/<model>, /model lmstudio/<model>, or /model custom/<model>.\n"));
+      rl.prompt();
+      return;
+    }
+    if (input === "/downloads") {
+      const { listDownloads } = await import("./model-download-KCQJCEPW.js");
+      const active = listDownloads();
+      if (active.length === 0) {
+        console.log(chalk30.gray("  No local downloads started this session.\n"));
+      } else {
+        console.log(chalk30.gray("\n  Model              State       Last line"));
+        for (const h of active) {
+          const state = h.result == null ? chalk30.yellow("running") : h.result.code === 0 ? chalk30.green("done") : chalk30.red("error");
+          const info2 = MODEL_CATALOG[h.modelId];
+          const label = (info2?.label ?? h.modelId).padEnd(18);
+          const tail2 = (h.lastLine || "").slice(0, 80);
+          console.log(`  ${label} ${state.padEnd(20)} ${chalk30.gray(tail2)}`);
+        }
+        console.log("");
+      }
+      rl.prompt();
+      return;
+    }
+    if (input === "/sync-keys") {
+      const { loadCredentials: loadCredentials2, syncByokKeys, getByokSyncPath } = await import("./auth-UAMMP5IJ.js");
+      const creds = await loadCredentials2();
+      if (!creds) {
+        console.log(chalk30.gray("  Not signed in. Run:  notch login\n"));
+        rl.prompt();
+        return;
+      }
+      const spinner2 = ora7("Pulling provider keys from freesyntax.dev...").start();
+      try {
+        const synced = await syncByokKeys(creds.token);
+        spinner2.stop();
+        const providers = Object.keys(synced.keys);
+        if (providers.length === 0) {
+          console.log(chalk30.gray(`  No provider keys on your profile yet. Add them at https://freesyntax.dev/settings/keys.
+`));
+        } else {
+          console.log(chalk30.green(`  \u2713 Synced ${providers.length} key(s): ${providers.join(", ")}`));
+          console.log(chalk30.gray(`    Cached at ${getByokSyncPath()}
+`));
+        }
+      } catch (err) {
+        spinner2.stop();
+        console.log(chalk30.red(`  Sync failed: ${err.message}
+`));
+      }
+      rl.prompt();
+      return;
+    }
     if (input === "/providers") {
       printByokProviderList();
       rl.prompt();
@@ -9586,7 +10009,7 @@ Analyze the above input.`;
       return;
     }
     if (input === "/compact") {
-      const { autoCompress: autoCompress2 } = await import("./compression-SQAIQ2UU.js");
+      const { autoCompress: autoCompress2 } = await import("./compression-YJLWEHCC.js");
       const before = messages.length;
       const compressed = await autoCompress2(messages, model, activeContextWindow(config.models.chat));
       messages.length = 0;
@@ -9889,6 +10312,29 @@ Analyze the above input.`;
     }
     if (input === "/permissions") {
       console.log(formatPermissions(permissions));
+      const mode = config.permissionMode === "trust" ? "trust (YOLO)" : config.permissionMode;
+      console.log(chalk30.gray(`  Mode: ${mode}${config.autoConfirm ? " (autoConfirm)" : ""}`));
+      console.log(chalk30.gray("  Toggle YOLO with /yolo (persists to .notch.json)."));
+      console.log("");
+      rl.prompt();
+      return;
+    }
+    if (input === "/yolo" || input === "/yes" || input === "/trust" || input === "/strict" || input === "/autoaccept" || input === "/auto") {
+      const turnOn = input === "/yolo" ? config.permissionMode !== "trust" : input === "/yes" || input === "/trust" || input === "/autoaccept" || input === "/auto";
+      config.permissionMode = turnOn ? "trust" : "auto";
+      config.autoConfirm = turnOn;
+      toolCtx.checkPermission = turnOn ? () => "allow" : (toolName, args) => checkPermission(permissions, toolName, args);
+      toolCtx.requireConfirm = !turnOn;
+      toolCtx.autoConfirm = turnOn;
+      try {
+        await persistConfigPatch(config.projectRoot, {
+          permissionMode: config.permissionMode,
+          autoConfirm: config.autoConfirm || void 0
+        });
+        console.log(turnOn ? chalk30.red(`  \u{1F525} YOLO mode ON \u2014 all tool calls auto-allowed, no prompts. Saved to .notch.json.`) : chalk30.cyan(`  Strict mode ON \u2014 prompts restored. Saved to .notch.json.`));
+      } catch (err) {
+        console.log(chalk30.yellow(`  Mode set for this session but persist failed: ${err?.message ?? err}`));
+      }
       console.log("");
       rl.prompt();
       return;
@@ -10082,9 +10528,10 @@ Analyze the above input.`;
     if (replAttachments.length > 0 && !modelSupportsImages(activeModelId)) {
       console.warn(
         chalk30.yellow(
-          `  \u26A0 ${activeModelId} may not support images. Switch with /model.`
+          `  \u26A0 ${activeModelId} does not support image attachments. Switch with /model; skipping image(s).`
         )
       );
+      replAttachments.length = 0;
     }
     const textForRefs = imgRefs.cleanedText || (replAttachments.length > 0 ? "Describe the attached image(s)." : "");
     const { cleanInput, references } = await resolveReferences(textForRefs, config.projectRoot);
@@ -10093,6 +10540,10 @@ Analyze the above input.`;
     if (references.length > 0) {
       console.log(chalk30.gray(`  Injected ${references.length} reference(s)`));
     }
+    if (!finalPrompt.trim() && replAttachments.length === 0) {
+      console.warn(chalk30.yellow("  Add a message, or switch to a vision-capable model before sending only images."));
+      return;
+    }
     if (replAttachments.length > 0) {
       const imageBlocks = replAttachments.map(imageToContentBlock);
       messages.push({
@@ -10268,7 +10719,6 @@ async function handleRalphSubcommand(args, cliOpts) {
   const config = await loadConfig(cliOpts.cwd ? { projectRoot: cliOpts.cwd } : {});
   if (cliOpts.model) config.models.chat.model = cliOpts.model;
   const model = resolveModel(config.models.chat);
-  const systemPrompt = await buildSystemPrompt(config.projectRoot, config.models.chat.model);
   const toolCtx = {
     cwd: config.projectRoot,
     requireConfirm: false,