reasonix 0.3.0-alpha.4 → 0.3.1

package/dist/cli/index.js

@@ -3,6 +3,49 @@
 // src/cli/index.ts
 import { Command } from "commander";
 
+// src/config.ts
+import { chmodSync, mkdirSync, readFileSync, writeFileSync } from "fs";
+import { homedir } from "os";
+import { dirname, join } from "path";
+function defaultConfigPath() {
+  return join(homedir(), ".reasonix", "config.json");
+}
+function readConfig(path = defaultConfigPath()) {
+  try {
+    const raw = readFileSync(path, "utf8");
+    const parsed = JSON.parse(raw);
+    if (parsed && typeof parsed === "object") return parsed;
+  } catch {
+  }
+  return {};
+}
+function writeConfig(cfg, path = defaultConfigPath()) {
+  mkdirSync(dirname(path), { recursive: true });
+  writeFileSync(path, JSON.stringify(cfg, null, 2), "utf8");
+  try {
+    chmodSync(path, 384);
+  } catch {
+  }
+}
+function loadApiKey(path = defaultConfigPath()) {
+  if (process.env.DEEPSEEK_API_KEY) return process.env.DEEPSEEK_API_KEY;
+  return readConfig(path).apiKey;
+}
+function saveApiKey(key, path = defaultConfigPath()) {
+  const cfg = readConfig(path);
+  cfg.apiKey = key.trim();
+  writeConfig(cfg, path);
+}
+function isPlausibleKey(key) {
+  const trimmed = key.trim();
+  return /^sk-[A-Za-z0-9_-]{16,}$/.test(trimmed);
+}
+function redactKey(key) {
+  if (!key) return "";
+  if (key.length <= 12) return "****";
+  return `${key.slice(0, 6)}\u2026${key.slice(-4)}`;
+}
+
 // src/client.ts
 import { createParser } from "eventsource-parser";
 
@@ -409,6 +452,201 @@ function resolveTemperatures(budget, custom) {
   return out;
 }
 
+// src/repair/flatten.ts
+function analyzeSchema(schema) {
+  if (!schema) return { shouldFlatten: false, leafCount: 0, maxDepth: 0 };
+  let leafCount = 0;
+  let maxDepth = 0;
+  walk(schema, 0, (depth, isLeaf) => {
+    if (isLeaf) leafCount++;
+    if (depth > maxDepth) maxDepth = depth;
+  });
+  return {
+    shouldFlatten: leafCount > 10 || maxDepth > 2,
+    leafCount,
+    maxDepth
+  };
+}
+function flattenSchema(schema) {
+  const flatProps = {};
+  const required = [];
+  collect("", schema, flatProps, required, true);
+  return {
+    type: "object",
+    properties: flatProps,
+    required
+  };
+}
+function nestArguments(flatArgs) {
+  const out = {};
+  for (const [key, value] of Object.entries(flatArgs)) {
+    setByPath(out, key.split("."), value);
+  }
+  return out;
+}
+function walk(schema, depth, visit) {
+  if (schema.type === "object" && schema.properties) {
+    for (const child of Object.values(schema.properties)) {
+      walk(child, depth + 1, visit);
+    }
+    return;
+  }
+  if (schema.type === "array" && schema.items) {
+    walk(schema.items, depth + 1, visit);
+    return;
+  }
+  visit(depth, true);
+}
+function collect(prefix, schema, out, required, isRootRequired) {
+  if (schema.type === "object" && schema.properties) {
+    const requiredSet = new Set(schema.required ?? []);
+    for (const [key, child] of Object.entries(schema.properties)) {
+      const nextPrefix = prefix ? `${prefix}.${key}` : key;
+      const childRequired = isRootRequired && requiredSet.has(key);
+      collect(nextPrefix, child, out, required, childRequired);
+    }
+    return;
+  }
+  out[prefix] = schema;
+  if (isRootRequired) required.push(prefix);
+}
+function setByPath(target, path, value) {
+  let cur = target;
+  for (let i = 0; i < path.length - 1; i++) {
+    const key = path[i];
+    if (typeof cur[key] !== "object" || cur[key] === null) cur[key] = {};
+    cur = cur[key];
+  }
+  cur[path[path.length - 1]] = value;
+}
+
+// src/tools.ts
+var ToolRegistry = class {
+  _tools = /* @__PURE__ */ new Map();
+  _autoFlatten;
+  constructor(opts = {}) {
+    this._autoFlatten = opts.autoFlatten !== false;
+  }
+  register(def) {
+    if (!def.name) throw new Error("tool requires a name");
+    const internal = { ...def };
+    if (this._autoFlatten && def.parameters) {
+      const decision = analyzeSchema(def.parameters);
+      if (decision.shouldFlatten) {
+        internal.flatSchema = flattenSchema(def.parameters);
+      }
+    }
+    this._tools.set(def.name, internal);
+    return this;
+  }
+  has(name) {
+    return this._tools.has(name);
+  }
+  get(name) {
+    return this._tools.get(name);
+  }
+  get size() {
+    return this._tools.size;
+  }
+  /** True if a registered tool's schema was flattened for the model. */
+  wasFlattened(name) {
+    return Boolean(this._tools.get(name)?.flatSchema);
+  }
+  specs() {
+    return [...this._tools.values()].map((t) => ({
+      type: "function",
+      function: {
+        name: t.name,
+        description: t.description ?? "",
+        parameters: t.flatSchema ?? t.parameters ?? { type: "object", properties: {} }
+      }
+    }));
+  }
+  async dispatch(name, argumentsRaw) {
+    const tool = this._tools.get(name);
+    if (!tool) {
+      return JSON.stringify({ error: `unknown tool: ${name}` });
+    }
+    let args;
+    try {
+      args = typeof argumentsRaw === "string" ? argumentsRaw.trim() ? JSON.parse(argumentsRaw) ?? {} : {} : argumentsRaw ?? {};
+    } catch (err) {
+      return JSON.stringify({
+        error: `invalid tool arguments JSON: ${err.message}`
+      });
+    }
+    if (tool.flatSchema && args && typeof args === "object" && hasDotKey(args)) {
+      args = nestArguments(args);
+    }
+    try {
+      const result = await tool.fn(args);
+      return typeof result === "string" ? result : JSON.stringify(result);
+    } catch (err) {
+      return JSON.stringify({
+        error: `${err.name}: ${err.message}`
+      });
+    }
+  }
+};
+function hasDotKey(obj) {
+  for (const k of Object.keys(obj)) {
+    if (k.includes(".")) return true;
+  }
+  return false;
+}
+
+// src/mcp/registry.ts
+var DEFAULT_MAX_RESULT_CHARS = 32e3;
+async function bridgeMcpTools(client, opts = {}) {
+  const registry = opts.registry ?? new ToolRegistry({ autoFlatten: opts.autoFlatten });
+  const prefix = opts.namePrefix ?? "";
+  const maxResultChars = opts.maxResultChars ?? DEFAULT_MAX_RESULT_CHARS;
+  const result = { registry, registeredNames: [], skipped: [] };
+  const listed = await client.listTools();
+  for (const mcpTool of listed.tools) {
+    if (!mcpTool.name) {
+      result.skipped.push({ name: "?", reason: "empty tool name" });
+      continue;
+    }
+    const registeredName = `${prefix}${mcpTool.name}`;
+    registry.register({
+      name: registeredName,
+      description: mcpTool.description ?? "",
+      parameters: mcpTool.inputSchema,
+      fn: async (args) => {
+        const toolResult = await client.callTool(mcpTool.name, args);
+        return flattenMcpResult(toolResult, { maxChars: maxResultChars });
+      }
+    });
+    result.registeredNames.push(registeredName);
+  }
+  return result;
+}
+function flattenMcpResult(result, opts = {}) {
+  const parts = result.content.map(blockToString);
+  const joined = parts.join("\n").trim();
+  const prefixed = result.isError ? `ERROR: ${joined || "(no error message from server)"}` : joined;
+  return opts.maxChars ? truncateForModel(prefixed, opts.maxChars) : prefixed;
+}
+function truncateForModel(s, maxChars) {
+  if (s.length <= maxChars) return s;
+  const tailBudget = Math.min(1024, Math.floor(maxChars * 0.1));
+  const headBudget = Math.max(0, maxChars - tailBudget);
+  const head = s.slice(0, headBudget);
+  const tail = s.slice(-tailBudget);
+  const dropped = s.length - head.length - tail.length;
+  return `${head}
+
+[\u2026truncated ${dropped} chars \u2014 raise BridgeOptions.maxResultChars, or call the tool with a narrower scope (filter, head, pagination)\u2026]
+
+${tail}`;
+}
+function blockToString(block) {
+  if (block.type === "text") return block.text;
+  if (block.type === "image") return `[image ${block.mimeType}, ${block.data.length} chars base64]`;
+  return `[unknown block: ${JSON.stringify(block)}]`;
+}
+
 // src/memory.ts
 import { createHash } from "crypto";
 var ImmutablePrefix = class {
@@ -446,6 +684,16 @@ var AppendOnlyLog = class {
   extend(messages) {
     for (const m of messages) this.append(m);
   }
+  /**
+   * Bulk-replace entries. Intentionally named to be hard to reach for —
+   * this is the one mutation path that breaks the log's append-only
+   * spirit, reserved for compaction flows (`/compact`) and recovery
+   * where the caller has consciously decided to drop old history. Any
+   * other use is almost certainly wrong; append() is what you want.
+   */
+  compactInPlace(replacement) {
+    this._entries = [...replacement];
+  }
   get entries() {
     return this._entries;
   }
@@ -660,74 +908,6 @@ function repairTruncatedJson(input) {
   }
 }
 
-// src/repair/flatten.ts
-function analyzeSchema(schema) {
-  if (!schema) return { shouldFlatten: false, leafCount: 0, maxDepth: 0 };
-  let leafCount = 0;
-  let maxDepth = 0;
-  walk(schema, 0, (depth, isLeaf) => {
-    if (isLeaf) leafCount++;
-    if (depth > maxDepth) maxDepth = depth;
-  });
-  return {
-    shouldFlatten: leafCount > 10 || maxDepth > 2,
-    leafCount,
-    maxDepth
-  };
-}
-function flattenSchema(schema) {
-  const flatProps = {};
-  const required = [];
-  collect("", schema, flatProps, required, true);
-  return {
-    type: "object",
-    properties: flatProps,
-    required
-  };
-}
-function nestArguments(flatArgs) {
-  const out = {};
-  for (const [key, value] of Object.entries(flatArgs)) {
-    setByPath(out, key.split("."), value);
-  }
-  return out;
-}
-function walk(schema, depth, visit) {
-  if (schema.type === "object" && schema.properties) {
-    for (const child of Object.values(schema.properties)) {
-      walk(child, depth + 1, visit);
-    }
-    return;
-  }
-  if (schema.type === "array" && schema.items) {
-    walk(schema.items, depth + 1, visit);
-    return;
-  }
-  visit(depth, true);
-}
-function collect(prefix, schema, out, required, isRootRequired) {
-  if (schema.type === "object" && schema.properties) {
-    const requiredSet = new Set(schema.required ?? []);
-    for (const [key, child] of Object.entries(schema.properties)) {
-      const nextPrefix = prefix ? `${prefix}.${key}` : key;
-      const childRequired = isRootRequired && requiredSet.has(key);
-      collect(nextPrefix, child, out, required, childRequired);
-    }
-    return;
-  }
-  out[prefix] = schema;
-  if (isRootRequired) required.push(prefix);
-}
-function setByPath(target, path, value) {
-  let cur = target;
-  for (let i = 0; i < path.length - 1; i++) {
-    const key = path[i];
-    if (typeof cur[key] !== "object" || cur[key] === null) cur[key] = {};
-    cur = cur[key];
-  }
-  cur[path[path.length - 1]] = value;
-}
-
 // src/repair/index.ts
 var ToolCallRepair = class {
   storm;
@@ -786,21 +966,22 @@ function signature2(call) {
 // src/session.ts
 import {
   appendFileSync,
-  chmodSync,
+  chmodSync as chmodSync2,
   existsSync,
-  mkdirSync,
-  readFileSync,
+  mkdirSync as mkdirSync2,
+  readFileSync as readFileSync2,
   readdirSync,
   statSync,
-  unlinkSync
+  unlinkSync,
+  writeFileSync as writeFileSync2
 } from "fs";
-import { homedir } from "os";
-import { dirname, join } from "path";
+import { homedir as homedir2 } from "os";
+import { dirname as dirname2, join as join2 } from "path";
 function sessionsDir() {
-  return join(homedir(), ".reasonix", "sessions");
+  return join2(homedir2(), ".reasonix", "sessions");
 }
 function sessionPath(name) {
-  return join(sessionsDir(), `${sanitizeName(name)}.jsonl`);
+  return join2(sessionsDir(), `${sanitizeName(name)}.jsonl`);
 }
 function sanitizeName(name) {
   const cleaned = name.replace(/[^\w\-\u4e00-\u9fa5]/g, "_").slice(0, 64);
@@ -810,7 +991,7 @@ function loadSessionMessages(name) {
   const path = sessionPath(name);
   if (!existsSync(path)) return [];
   try {
-    const raw = readFileSync(path, "utf8");
+    const raw = readFileSync2(path, "utf8");
     const out = [];
     for (const line of raw.split(/\r?\n/)) {
       const trimmed = line.trim();
@@ -828,11 +1009,11 @@ function loadSessionMessages(name) {
 }
 function appendSessionMessage(name, message) {
   const path = sessionPath(name);
-  mkdirSync(dirname(path), { recursive: true });
+  mkdirSync2(dirname2(path), { recursive: true });
   appendFileSync(path, `${JSON.stringify(message)}
 `, "utf8");
   try {
-    chmodSync(path, 384);
+    chmodSync2(path, 384);
   } catch {
   }
 }
@@ -842,7 +1023,7 @@ function listSessions() {
   try {
     const files = readdirSync(dir).filter((f) => f.endsWith(".jsonl"));
     return files.map((file) => {
-      const path = join(dir, file);
+      const path = join2(dir, file);
       const stat = statSync(path);
       const name = file.replace(/\.jsonl$/, "");
       const messageCount = countLines(path);
@@ -861,9 +1042,20 @@ function deleteSession(name) {
     return false;
   }
 }
+function rewriteSession(name, messages) {
+  const path = sessionPath(name);
+  mkdirSync2(dirname2(path), { recursive: true });
+  const body = messages.map((m) => JSON.stringify(m)).join("\n");
+  writeFileSync2(path, body ? `${body}
+` : "", "utf8");
+  try {
+    chmodSync2(path, 384);
+  } catch {
+  }
+}
 function countLines(path) {
   try {
-    const raw = readFileSync(path, "utf8");
+    const raw = readFileSync2(path, "utf8");
     return raw.split(/\r?\n/).filter((l) => l.trim()).length;
   } catch {
     return 0;
@@ -876,6 +1068,11 @@ var DEEPSEEK_PRICING = {
   "deepseek-reasoner": { inputCacheHit: 0.14, inputCacheMiss: 0.55, output: 2.19 }
 };
 var CLAUDE_SONNET_PRICING = { input: 3, output: 15 };
+var DEEPSEEK_CONTEXT_TOKENS = {
+  "deepseek-chat": 131072,
+  "deepseek-reasoner": 131072
+};
+var DEFAULT_CONTEXT_TOKENS = 131072;
 function costUsd(model, usage) {
   const p = DEEPSEEK_PRICING[model];
   if (!p) return 0;
@@ -919,12 +1116,14 @@ var SessionStats = class {
     return denom > 0 ? hit / denom : 0;
   }
   summary() {
+    const last = this.turns[this.turns.length - 1];
     return {
       turns: this.turns.length,
       totalCostUsd: round(this.totalCost, 6),
       claudeEquivalentUsd: round(this.totalClaudeEquivalent, 6),
       savingsVsClaudePct: round(this.savingsVsClaude * 100, 2),
-      cacheHitRatio: round(this.aggregateCacheHitRatio, 4)
+      cacheHitRatio: round(this.aggregateCacheHitRatio, 4),
+      lastPromptTokens: last?.usage.promptTokens ?? 0
     };
   }
 };
@@ -933,81 +1132,6 @@ function round(n, digits) {
   return Math.round(n * f) / f;
 }
 
-// src/tools.ts
-var ToolRegistry = class {
-  _tools = /* @__PURE__ */ new Map();
-  _autoFlatten;
-  constructor(opts = {}) {
-    this._autoFlatten = opts.autoFlatten !== false;
-  }
-  register(def) {
-    if (!def.name) throw new Error("tool requires a name");
-    const internal = { ...def };
-    if (this._autoFlatten && def.parameters) {
-      const decision = analyzeSchema(def.parameters);
-      if (decision.shouldFlatten) {
-        internal.flatSchema = flattenSchema(def.parameters);
-      }
-    }
-    this._tools.set(def.name, internal);
-    return this;
-  }
-  has(name) {
-    return this._tools.has(name);
-  }
-  get(name) {
-    return this._tools.get(name);
-  }
-  get size() {
-    return this._tools.size;
-  }
-  /** True if a registered tool's schema was flattened for the model. */
-  wasFlattened(name) {
-    return Boolean(this._tools.get(name)?.flatSchema);
-  }
-  specs() {
-    return [...this._tools.values()].map((t) => ({
-      type: "function",
-      function: {
-        name: t.name,
-        description: t.description ?? "",
-        parameters: t.flatSchema ?? t.parameters ?? { type: "object", properties: {} }
-      }
-    }));
-  }
-  async dispatch(name, argumentsRaw) {
-    const tool = this._tools.get(name);
-    if (!tool) {
-      return JSON.stringify({ error: `unknown tool: ${name}` });
-    }
-    let args;
-    try {
-      args = typeof argumentsRaw === "string" ? argumentsRaw.trim() ? JSON.parse(argumentsRaw) ?? {} : {} : argumentsRaw ?? {};
-    } catch (err) {
-      return JSON.stringify({
-        error: `invalid tool arguments JSON: ${err.message}`
-      });
-    }
-    if (tool.flatSchema && args && typeof args === "object" && hasDotKey(args)) {
-      args = nestArguments(args);
-    }
-    try {
-      const result = await tool.fn(args);
-      return typeof result === "string" ? result : JSON.stringify(result);
-    } catch (err) {
-      return JSON.stringify({
-        error: `${err.name}: ${err.message}`
-      });
-    }
-  }
-};
-function hasDotKey(obj) {
-  for (const k of Object.keys(obj)) {
-    if (k.includes(".")) return true;
-  }
-  return false;
-}
-
 // src/loop.ts
 var CacheFirstLoop = class {
   client;
@@ -1036,7 +1160,7 @@ var CacheFirstLoop = class {
     this.prefix = opts.prefix;
     this.tools = opts.tools ?? new ToolRegistry();
     this.model = opts.model ?? "deepseek-chat";
-    this.maxToolIters = opts.maxToolIters ?? 8;
+    this.maxToolIters = opts.maxToolIters ?? 24;
     if (typeof opts.branch === "number") {
       this.branchOptions = { budget: opts.branch };
     } else if (opts.branch && typeof opts.branch === "object") {
@@ -1055,12 +1179,49 @@ var CacheFirstLoop = class {
     this.sessionName = opts.session ?? null;
     if (this.sessionName) {
       const prior = loadSessionMessages(this.sessionName);
-      for (const msg of prior) this.log.append(msg);
-      this.resumedMessageCount = prior.length;
+      const { messages, healedCount, healedFrom } = healLoadedMessages(
+        prior,
+        DEFAULT_MAX_RESULT_CHARS
+      );
+      for (const msg of messages) this.log.append(msg);
+      this.resumedMessageCount = messages.length;
+      if (healedCount > 0) {
+        process.stderr.write(
+          `\u25B8 session "${this.sessionName}": healed ${healedCount} oversized tool result(s) (was ${healedFrom.toLocaleString()} chars total). Old payloads were truncated to fit DeepSeek's context window; the conversation is preserved.
+`
+        );
+      }
     } else {
       this.resumedMessageCount = 0;
     }
   }
+  /**
+   * Shrink the log by re-truncating oversized tool results to a tighter
+   * cap, and persist the result back to disk so the next launch doesn't
+   * re-inherit a fat session file. Returns a summary the TUI can
+   * display.
+   *
+   * Only tool-role messages are touched (same rationale as
+   * {@link healLoadedMessages}). User and assistant messages carry
+   * authored intent we can't mechanically shrink without losing
+   * meaning.
+   */
+  compact(tightCapChars = 4e3) {
+    const before = this.log.toMessages();
+    const { messages, healedCount, healedFrom } = healLoadedMessages(before, tightCapChars);
+    const afterBytes = messages.filter((m) => m.role === "tool").reduce((s, m) => s + (typeof m.content === "string" ? m.content.length : 0), 0);
+    const charsSaved = healedFrom - afterBytes;
+    if (healedCount > 0) {
+      this.log.compactInPlace(messages);
+      if (this.sessionName) {
+        try {
+          rewriteSession(this.sessionName, messages);
+        } catch {
+        }
+      }
+    }
+    return { healedCount, charsSaved };
+  }
   appendAndPersist(message) {
     this.log.append(message);
     if (this.sessionName) {
@@ -1250,7 +1411,7 @@ var CacheFirstLoop = class {
           turn: this._turn,
           role: "error",
           content: "",
-          error: err.message
+          error: formatLoopError(err)
         };
         return;
       }
@@ -1298,7 +1459,38 @@ var CacheFirstLoop = class {
         };
       }
     }
-    yield { turn: this._turn, role: "done", content: "[max_tool_iters reached]" };
+    yield* this.forceSummaryAfterIterLimit();
+  }
+  async *forceSummaryAfterIterLimit() {
+    try {
+      const messages = this.buildMessages(null);
+      const resp = await this.client.chat({
+        model: this.model,
+        messages
+        // no tools → model is forced to answer in text
+      });
+      const summary = resp.content?.trim() || "(model returned no text; try a narrower question or raise --max-tool-iters)";
+      const annotated = `[tool-call budget (${this.maxToolIters}) reached \u2014 forcing summary from what I found]
+
+${summary}`;
+      const summaryStats = this.stats.record(this._turn, this.model, resp.usage ?? new Usage());
+      this.appendAndPersist({ role: "assistant", content: summary });
+      yield {
+        turn: this._turn,
+        role: "assistant_final",
+        content: annotated,
+        stats: summaryStats
+      };
+      yield { turn: this._turn, role: "done", content: summary };
+    } catch (err) {
+      yield {
+        turn: this._turn,
+        role: "error",
+        content: "",
+        error: `tool-call budget (${this.maxToolIters}) reached and the fallback summary call failed: ${err.message}. Run /clear and retry with a narrower question, or pass --max-tool-iters higher.`
+      };
+      yield { turn: this._turn, role: "done", content: "" };
+    }
   }
   async run(userInput, onEvent) {
     let final = "";
@@ -1323,14 +1515,36 @@ function summarizeBranch(chosen, samples) {
     temperatures: samples.map((s) => s.temperature)
   };
 }
+function healLoadedMessages(messages, maxChars) {
+  let healedCount = 0;
+  let healedFrom = 0;
+  const out = messages.map((msg) => {
+    if (msg.role !== "tool") return msg;
+    const content = typeof msg.content === "string" ? msg.content : "";
+    if (content.length <= maxChars) return msg;
+    healedCount += 1;
+    healedFrom += content.length;
+    return { ...msg, content: truncateForModel(content, maxChars) };
+  });
+  return { messages: out, healedCount, healedFrom };
+}
+function formatLoopError(err) {
+  const msg = err.message ?? "";
+  if (msg.includes("maximum context length")) {
+    const reqMatch = msg.match(/requested\s+(\d+)\s+tokens/);
+    const requested = reqMatch ? `${Number(reqMatch[1]).toLocaleString()} tokens` : "too many tokens";
+    return `Context overflow (DeepSeek 400): session history is ${requested}, past the 131,072-token limit. Usually this means a single tool call returned a huge payload. v0.3.0-alpha.6+ caps new tool results at 32k chars, AND auto-heals oversized history on session load \u2014 restart Reasonix and this session should come back trimmed. If it still overflows, run /forget (delete the session) or /clear (drop the displayed history) to start fresh.`;
+  }
+  return msg;
+}
 
 // src/env.ts
-import { readFileSync as readFileSync2 } from "fs";
+import { readFileSync as readFileSync3 } from "fs";
 import { resolve } from "path";
 function loadDotenv(path = ".env") {
   let raw;
   try {
-    raw = readFileSync2(resolve(process.cwd(), path), "utf8");
+    raw = readFileSync3(resolve(process.cwd(), path), "utf8");
   } catch {
     return;
   }
@@ -1349,7 +1563,7 @@ function loadDotenv(path = ".env") {
 }
 
 // src/transcript.ts
-import { createWriteStream, readFileSync as readFileSync3 } from "fs";
+import { createWriteStream, readFileSync as readFileSync4 } from "fs";
 function recordFromLoopEvent(ev, extra) {
   const rec = {
     ts: (/* @__PURE__ */ new Date()).toISOString(),
@@ -1400,7 +1614,7 @@ function openTranscriptFile(path, meta) {
   return stream;
 }
 function readTranscript(path) {
-  const raw = readFileSync3(path, "utf8");
+  const raw = readFileSync4(path, "utf8");
   return parseTranscript(raw);
 }
 function isPlanStateEmptyShape(s) {
@@ -1517,12 +1731,14 @@ function summarizeTurns(turns) {
   }
   const cacheHitRatio = hit + miss > 0 ? hit / (hit + miss) : 0;
   const savingsVsClaude = totalClaude > 0 ? 1 - totalCost / totalClaude : 0;
+  const lastTurn = turns[turns.length - 1];
   return {
     turns: turns.length,
     totalCostUsd: round2(totalCost, 6),
     claudeEquivalentUsd: round2(totalClaude, 6),
     savingsVsClaudePct: round2(savingsVsClaude * 100, 2),
-    cacheHitRatio: round2(cacheHitRatio, 4)
+    cacheHitRatio: round2(cacheHitRatio, 4),
+    lastPromptTokens: lastTurn?.usage.promptTokens ?? 0
   };
 }
 function round2(n, digits) {
@@ -2242,45 +2458,6 @@ var SseTransport = class {
   }
 };
 
-// src/mcp/registry.ts
-async function bridgeMcpTools(client, opts = {}) {
-  const registry = opts.registry ?? new ToolRegistry({ autoFlatten: opts.autoFlatten });
-  const prefix = opts.namePrefix ?? "";
-  const result = { registry, registeredNames: [], skipped: [] };
-  const listed = await client.listTools();
-  for (const mcpTool of listed.tools) {
-    if (!mcpTool.name) {
-      result.skipped.push({ name: "?", reason: "empty tool name" });
-      continue;
-    }
-    const registeredName = `${prefix}${mcpTool.name}`;
-    registry.register({
-      name: registeredName,
-      description: mcpTool.description ?? "",
-      parameters: mcpTool.inputSchema,
-      fn: async (args) => {
-        const toolResult = await client.callTool(mcpTool.name, args);
-        return flattenMcpResult(toolResult);
-      }
-    });
-    result.registeredNames.push(registeredName);
-  }
-  return result;
-}
-function flattenMcpResult(result) {
-  const parts = result.content.map(blockToString);
-  const joined = parts.join("\n").trim();
-  if (result.isError) {
-    return `ERROR: ${joined || "(no error message from server)"}`;
-  }
-  return joined;
-}
-function blockToString(block) {
-  if (block.type === "text") return block.text;
-  if (block.type === "image") return `[image ${block.mimeType}, ${block.data.length} chars base64]`;
-  return `[unknown block: ${JSON.stringify(block)}]`;
-}
-
 // src/mcp/shell-split.ts
 function shellSplit(input) {
   const tokens = [];
@@ -2355,51 +2532,8 @@ function parseMcpSpec(input) {
   return { transport: "stdio", name, command, args };
 }
 
-// src/config.ts
-import { chmodSync as chmodSync2, mkdirSync as mkdirSync2, readFileSync as readFileSync4, writeFileSync } from "fs";
-import { homedir as homedir2 } from "os";
-import { dirname as dirname2, join as join2 } from "path";
-function defaultConfigPath() {
-  return join2(homedir2(), ".reasonix", "config.json");
-}
-function readConfig(path = defaultConfigPath()) {
-  try {
-    const raw = readFileSync4(path, "utf8");
-    const parsed = JSON.parse(raw);
-    if (parsed && typeof parsed === "object") return parsed;
-  } catch {
-  }
-  return {};
-}
-function writeConfig(cfg, path = defaultConfigPath()) {
-  mkdirSync2(dirname2(path), { recursive: true });
-  writeFileSync(path, JSON.stringify(cfg, null, 2), "utf8");
-  try {
-    chmodSync2(path, 384);
-  } catch {
-  }
-}
-function loadApiKey(path = defaultConfigPath()) {
-  if (process.env.DEEPSEEK_API_KEY) return process.env.DEEPSEEK_API_KEY;
-  return readConfig(path).apiKey;
-}
-function saveApiKey(key, path = defaultConfigPath()) {
-  const cfg = readConfig(path);
-  cfg.apiKey = key.trim();
-  writeConfig(cfg, path);
-}
-function isPlausibleKey(key) {
-  const trimmed = key.trim();
-  return /^sk-[A-Za-z0-9_-]{16,}$/.test(trimmed);
-}
-function redactKey(key) {
-  if (!key) return "";
-  if (key.length <= 12) return "****";
-  return `${key.slice(0, 6)}\u2026${key.slice(-4)}`;
-}
-
 // src/index.ts
-var VERSION = "0.3.0-alpha.4";
+var VERSION = "0.3.1";
 
 // src/cli/commands/chat.tsx
 import { render } from "ink";
@@ -2727,7 +2861,15 @@ function StatsPanel({
   const hitPct = (summary.cacheHitRatio * 100).toFixed(1);
   const hitColor = summary.cacheHitRatio >= 0.7 ? "green" : summary.cacheHitRatio >= 0.4 ? "yellow" : "red";
   const branchOn = (branchBudget ?? 1) > 1;
-  return /* @__PURE__ */ React5.createElement(Box5, { borderStyle: "round", borderColor: "cyan", flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React5.createElement(Box5, { justifyContent: "space-between" }, /* @__PURE__ */ React5.createElement(Text5, null, /* @__PURE__ */ React5.createElement(Text5, { color: "cyan", bold: true }, "Reasonix"), /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, " \xB7 model "), /* @__PURE__ */ React5.createElement(Text5, { color: "yellow" }, model), /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, " \xB7 prefix "), /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, prefixHash), harvestOn ? /* @__PURE__ */ React5.createElement(Text5, { color: "magenta" }, " \xB7 harvest") : null, branchOn ? /* @__PURE__ */ React5.createElement(Text5, { color: "blue" }, " \xB7 branch", branchBudget) : null), /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "turns ", summary.turns, " \xB7 type /help")), /* @__PURE__ */ React5.createElement(Box5, { marginTop: 1, gap: 3 }, /* @__PURE__ */ React5.createElement(Text5, null, /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "cache hit "), /* @__PURE__ */ React5.createElement(Text5, { color: hitColor, bold: true }, hitPct, "%")), /* @__PURE__ */ React5.createElement(Text5, null, /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "cost "), /* @__PURE__ */ React5.createElement(Text5, { color: "green" }, "$", summary.totalCostUsd.toFixed(6))), /* @__PURE__ */ React5.createElement(Text5, null, /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "vs Claude "), /* @__PURE__ */ React5.createElement(Text5, null, "$", summary.claudeEquivalentUsd.toFixed(6))), /* @__PURE__ */ React5.createElement(Text5, null, /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "saving "), /* @__PURE__ */ React5.createElement(Text5, { color: "green", bold: true }, summary.savingsVsClaudePct.toFixed(1), "%"))));
+  const ctxMax = DEEPSEEK_CONTEXT_TOKENS[model] ?? DEFAULT_CONTEXT_TOKENS;
+  const ctxRatio = summary.lastPromptTokens / ctxMax;
+  const ctxColor = ctxRatio >= 0.8 ? "red" : ctxRatio >= 0.5 ? "yellow" : void 0;
+  return /* @__PURE__ */ React5.createElement(Box5, { borderStyle: "round", borderColor: "cyan", flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React5.createElement(Box5, { justifyContent: "space-between" }, /* @__PURE__ */ React5.createElement(Text5, null, /* @__PURE__ */ React5.createElement(Text5, { color: "cyan", bold: true }, "Reasonix"), /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, " \xB7 model "), /* @__PURE__ */ React5.createElement(Text5, { color: "yellow" }, model), /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, " \xB7 prefix "), /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, prefixHash), harvestOn ? /* @__PURE__ */ React5.createElement(Text5, { color: "magenta" }, " \xB7 harvest") : null, branchOn ? /* @__PURE__ */ React5.createElement(Text5, { color: "blue" }, " \xB7 branch", branchBudget) : null), /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "turns ", summary.turns, " \xB7 type /help")), /* @__PURE__ */ React5.createElement(Box5, { marginTop: 1, gap: 3 }, /* @__PURE__ */ React5.createElement(Text5, null, /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "cache hit "), /* @__PURE__ */ React5.createElement(Text5, { color: hitColor, bold: true }, hitPct, "%")), /* @__PURE__ */ React5.createElement(Text5, null, /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "cost "), /* @__PURE__ */ React5.createElement(Text5, { color: "green" }, "$", summary.totalCostUsd.toFixed(6))), /* @__PURE__ */ React5.createElement(Text5, null, /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "vs Claude "), /* @__PURE__ */ React5.createElement(Text5, null, "$", summary.claudeEquivalentUsd.toFixed(6))), /* @__PURE__ */ React5.createElement(Text5, null, /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "saving "), /* @__PURE__ */ React5.createElement(Text5, { color: "green", bold: true }, summary.savingsVsClaudePct.toFixed(1), "%")), summary.lastPromptTokens > 0 ? /* @__PURE__ */ React5.createElement(Text5, null, /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, "ctx "), /* @__PURE__ */ React5.createElement(Text5, { color: ctxColor, bold: ctxColor !== void 0 }, formatTokens(summary.lastPromptTokens), "/", formatTokens(ctxMax)), /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, " (", (ctxRatio * 100).toFixed(0), "%)"), ctxRatio >= 0.8 ? /* @__PURE__ */ React5.createElement(Text5, { color: "red", bold: true }, " ", "\xB7 /compact") : null) : null));
+}
+function formatTokens(n) {
+  if (n < 1e3) return String(n);
+  const k = n / 1e3;
+  return k >= 100 ? `${k.toFixed(0)}k` : `${k.toFixed(1)}k`;
 }
 
 // src/cli/ui/slash.ts
@@ -2738,7 +2880,7 @@ function parseSlash(text) {
   if (!cmd) return null;
   return { cmd, args: parts.slice(1) };
 }
-function handleSlash(cmd, args, loop) {
+function handleSlash(cmd, args, loop, ctx = {}) {
   switch (cmd) {
     case "exit":
     case "quit":
@@ -2756,6 +2898,9 @@ function handleSlash(cmd, args, loop) {
           "  /model <id>              deepseek-chat or deepseek-reasoner",
           "  /harvest [on|off]        Pillar 2: structured plan-state extraction",
           "  /branch <N|off>          run N parallel samples (N>=2), pick most confident",
+          "  /mcp                     list MCP servers + tools attached to this session",
+          "  /setup                   (exit + reconfigure) \u2192 run `reasonix setup`",
+          "  /compact [cap]           shrink large tool results in history (default 4k/result)",
           "  /sessions                list saved sessions (current is marked with \u25B8)",
           "  /forget                  delete the current session from disk",
           "  /clear                   clear displayed history (log + session kept)",
@@ -2771,6 +2916,45 @@ function handleSlash(cmd, args, loop) {
           "  reasonix chat --no-session       disable persistence for this run"
         ].join("\n")
       };
+    case "mcp": {
+      const specs = ctx.mcpSpecs ?? [];
+      const toolSpecs = loop.prefix.toolSpecs ?? [];
+      if (specs.length === 0 && toolSpecs.length === 0) {
+        return {
+          info: 'no MCP servers attached. Run `reasonix setup` to pick some, or launch with --mcp "<spec>". `reasonix mcp list` shows the catalog.'
+        };
+      }
+      const lines = [];
+      if (specs.length > 0) {
+        lines.push(`MCP servers (${specs.length}):`);
+        for (const spec of specs) lines.push(`  \xB7 ${spec}`);
+        lines.push("");
+      }
+      if (toolSpecs.length > 0) {
+        lines.push(`Tools in registry (${toolSpecs.length}):`);
+        for (const t of toolSpecs) lines.push(`  \xB7 ${t.function.name}`);
+      }
+      lines.push("");
+      lines.push("To change this set, exit and run `reasonix setup`.");
+      return { info: lines.join("\n") };
+    }
+    case "setup":
+      return {
+        info: "To reconfigure (preset, MCP servers, API key), exit this chat and run `reasonix setup`. Changes take effect on next launch."
+      };
+    case "compact": {
+      const tight = Number.parseInt(args[0] ?? "", 10);
+      const cap = Number.isFinite(tight) && tight >= 500 ? tight : 4e3;
+      const { healedCount, charsSaved } = loop.compact(cap);
+      if (healedCount === 0) {
+        return {
+          info: `\u25B8 nothing to compact \u2014 no tool result in history exceeds ${cap.toLocaleString()} chars.`
+        };
+      }
+      return {
+        info: `\u25B8 compacted ${healedCount} tool result(s), saved ${charsSaved.toLocaleString()} chars (~${Math.round(charsSaved / 4).toLocaleString()} tokens). Session file rewritten.`
+      };
+    }
     case "sessions": {
       const items = listSessions();
       if (items.length === 0) {
@@ -2860,7 +3044,16 @@ function handleSlash(cmd, args, loop) {
 
 // src/cli/ui/App.tsx
 var FLUSH_INTERVAL_MS = 60;
-function App({ model, system, transcript, harvest: harvest2, branch, session, tools }) {
+function App({
+  model,
+  system,
+  transcript,
+  harvest: harvest2,
+  branch,
+  session,
+  tools,
+  mcpSpecs
+}) {
   const { exit } = useApp();
   const [historical, setHistorical] = useState2([]);
   const [streaming, setStreaming] = useState2(null);
@@ -2871,7 +3064,8 @@ function App({ model, system, transcript, harvest: harvest2, branch, session, to
     totalCostUsd: 0,
     claudeEquivalentUsd: 0,
     savingsVsClaudePct: 0,
-    cacheHitRatio: 0
+    cacheHitRatio: 0,
+    lastPromptTokens: 0
   });
   const transcriptRef = useRef(null);
   if (transcript && !transcriptRef.current) {
@@ -2948,7 +3142,7 @@ function App({ model, system, transcript, harvest: harvest2, branch, session, to
       setInput("");
       const slash = parseSlash(text);
       if (slash) {
-        const result = handleSlash(slash.cmd, slash.args, loop);
+        const result = handleSlash(slash.cmd, slash.args, loop, { mcpSpecs });
         if (result.exit) {
           transcriptRef.current?.end();
           exit();
@@ -3059,7 +3253,7 @@ function App({ model, system, transcript, harvest: harvest2, branch, session, to
         setBusy(false);
       }
     },
-    [busy, exit, loop, writeTranscript]
+    [busy, exit, loop, mcpSpecs, writeTranscript]
   );
   return /* @__PURE__ */ React6.createElement(Box6, { flexDirection: "column" }, /* @__PURE__ */ React6.createElement(
     StatsPanel,
@@ -3073,7 +3267,7 @@ function App({ model, system, transcript, harvest: harvest2, branch, session, to
   ), /* @__PURE__ */ React6.createElement(Static, { items: historical }, (item) => /* @__PURE__ */ React6.createElement(EventRow, { key: item.id, event: item })), streaming ? /* @__PURE__ */ React6.createElement(Box6, { marginY: 1 }, /* @__PURE__ */ React6.createElement(EventRow, { event: streaming })) : null, /* @__PURE__ */ React6.createElement(PromptInput, { value: input, onChange: setInput, onSubmit: handleSubmit, disabled: busy }), /* @__PURE__ */ React6.createElement(CommandStrip, null));
 }
 function CommandStrip() {
-  return /* @__PURE__ */ React6.createElement(Box6, { paddingX: 2 }, /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, "/help \xB7 /preset ", "<fast|smart|max>", " \xB7 /sessions \xB7 /model \xB7 /harvest \xB7 /branch \xB7 /clear \xB7 /exit"));
+  return /* @__PURE__ */ React6.createElement(Box6, { paddingX: 2 }, /* @__PURE__ */ React6.createElement(Text6, { dimColor: true }, "/help \xB7 /preset ", "<fast|smart|max>", " \xB7 /mcp \xB7 /compact \xB7 /sessions \xB7 /setup \xB7 /clear \xB7 /exit"));
 }
 function describeRepair(repair) {
   const parts = [];
@@ -3123,7 +3317,7 @@ function Setup({ onReady }) {
 }
 
 // src/cli/commands/chat.tsx
-function Root({ initialKey, tools, ...appProps }) {
+function Root({ initialKey, tools, mcpSpecs, ...appProps }) {
   const [key, setKey] = useState4(initialKey);
   if (!key) {
     return /* @__PURE__ */ React8.createElement(
@@ -3146,22 +3340,25 @@ function Root({ initialKey, tools, ...appProps }) {
       harvest: appProps.harvest,
       branch: appProps.branch,
       session: appProps.session,
-      tools
+      tools,
+      mcpSpecs
     }
   );
 }
 async function chatCommand(opts) {
   loadDotenv();
   const initialKey = loadApiKey();
-  const mcpSpecs = opts.mcp ?? [];
+  const requestedSpecs = opts.mcp ?? [];
   const clients = [];
+  const successfulSpecs = [];
+  const failedSpecs = [];
   let tools;
-  if (mcpSpecs.length > 0) {
+  if (requestedSpecs.length > 0) {
     tools = new ToolRegistry();
-    for (const raw of mcpSpecs) {
+    for (const raw of requestedSpecs) {
       try {
         const spec = parseMcpSpec(raw);
-        const prefix = spec.name ? `${spec.name}_` : mcpSpecs.length === 1 && opts.mcpPrefix ? opts.mcpPrefix : "";
+        const prefix = spec.name ? `${spec.name}_` : requestedSpecs.length === 1 && opts.mcpPrefix ? opts.mcpPrefix : "";
         const transport = spec.transport === "sse" ? new SseTransport({ url: spec.url }) : new StdioTransport({ command: spec.command, args: spec.args });
         const mcp2 = new McpClient({ transport });
         await mcp2.initialize();
@@ -3173,17 +3370,26 @@ async function chatCommand(opts) {
 `
         );
         clients.push(mcp2);
+        successfulSpecs.push(raw);
       } catch (err) {
-        process.stderr.write(`MCP setup failed for "${raw}": ${err.message}
-`);
-        for (const c of clients) await c.close();
-        process.exit(1);
+        const reason = err.message;
+        failedSpecs.push({ spec: raw, reason });
+        process.stderr.write(
+          `\u25B8 MCP setup SKIPPED for "${raw}": ${reason}
+  \u2192 this server will not be available this session. Run \`reasonix setup\` to remove it, or fix the underlying issue (missing npm package, network, etc.).
+`
+        );
       }
     }
+    if (successfulSpecs.length === 0) {
+      tools = void 0;
+    }
   }
-  const { waitUntilExit } = render(/* @__PURE__ */ React8.createElement(Root, { initialKey, tools, ...opts }), {
-    exitOnCtrlC: true
-  });
+  const mcpSpecs = successfulSpecs;
+  const { waitUntilExit } = render(
+    /* @__PURE__ */ React8.createElement(Root, { initialKey, tools, mcpSpecs, ...opts }),
+    { exitOnCtrlC: true }
+  );
   try {
     await waitUntilExit();
   } finally {
@@ -3192,7 +3398,7 @@ async function chatCommand(opts) {
 }
 
 // src/cli/commands/diff.ts
-import { writeFileSync as writeFileSync2 } from "fs";
+import { writeFileSync as writeFileSync3 } from "fs";
 import { basename } from "path";
 import { render as render2 } from "ink";
 import React11 from "react";
@@ -3338,7 +3544,7 @@ async function diffCommand(opts) {
   if (wantMarkdown) {
     console.log(renderSummaryTable(report));
     const md = renderMarkdown(report);
-    writeFileSync2(opts.mdPath, md, "utf8");
+    writeFileSync3(opts.mdPath, md, "utf8");
     console.log(`
 markdown report written to ${opts.mdPath}`);
     return;
@@ -3362,11 +3568,6 @@ var MCP_CATALOG = [
     userArgs: "<dir>",
     note: "the directory is a hard sandbox \u2014 the server refuses access outside it"
   },
-  {
-    name: "fetch",
-    summary: "fetch URLs (markdown-friendly extraction, not a full browser)",
-    package: "@modelcontextprotocol/server-fetch"
-  },
   {
     name: "memory",
     summary: "persistent key-value memory across sessions",
@@ -3378,12 +3579,6 @@ var MCP_CATALOG = [
     package: "@modelcontextprotocol/server-github",
     note: "set GITHUB_PERSONAL_ACCESS_TOKEN in your env before spawning"
   },
-  {
-    name: "sqlite",
-    summary: "read/write a sqlite database file",
-    package: "@modelcontextprotocol/server-sqlite",
-    userArgs: "<db.sqlite>"
-  },
   {
     name: "puppeteer",
     summary: "browser automation \u2014 take screenshots, click, type",
@@ -3465,7 +3660,9 @@ function ReplayApp({ meta, pages }) {
     totalCostUsd: cumStats.totalCostUsd,
     claudeEquivalentUsd: cumStats.claudeEquivalentUsd,
     savingsVsClaudePct: cumStats.savingsVsClaudePct,
-    cacheHitRatio: cumStats.cacheHitRatio
+    cacheHitRatio: cumStats.cacheHitRatio,
+    // Replay is read-only — no live last-turn prompt tokens to show.
+    lastPromptTokens: 0
   };
   const prefixHash = cumStats.prefixHashes.length === 1 ? cumStats.prefixHashes[0].slice(0, 16) : cumStats.prefixHashes.length === 0 ? "(untracked)" : `(churned \xD7${cumStats.prefixHashes.length})`;
   const currentPage = pages[idx];
@@ -3619,15 +3816,16 @@ async function runCommand(opts) {
   loadDotenv();
   const apiKey = await ensureApiKey();
   process.env.DEEPSEEK_API_KEY = apiKey;
-  const mcpSpecs = opts.mcp ?? [];
+  const requestedSpecs = opts.mcp ?? [];
   const clients = [];
   let tools;
-  if (mcpSpecs.length > 0) {
+  let successCount = 0;
+  if (requestedSpecs.length > 0) {
     tools = new ToolRegistry();
-    for (const raw of mcpSpecs) {
+    for (const raw of requestedSpecs) {
       try {
         const spec = parseMcpSpec(raw);
-        const prefix2 = spec.name ? `${spec.name}_` : mcpSpecs.length === 1 && opts.mcpPrefix ? opts.mcpPrefix : "";
+        const prefix2 = spec.name ? `${spec.name}_` : requestedSpecs.length === 1 && opts.mcpPrefix ? opts.mcpPrefix : "";
         const transport = spec.transport === "sse" ? new SseTransport({ url: spec.url }) : new StdioTransport({ command: spec.command, args: spec.args });
         const mcp2 = new McpClient({ transport });
         await mcp2.initialize();
@@ -3638,13 +3836,16 @@ async function runCommand(opts) {
 `
         );
         clients.push(mcp2);
+        successCount++;
       } catch (err) {
-        process.stderr.write(`MCP setup failed for "${raw}": ${err.message}
-`);
-        for (const c of clients) await c.close();
-        process.exit(1);
+        process.stderr.write(
+          `\u25B8 MCP setup SKIPPED for "${raw}": ${err.message}
+  \u2192 run \`reasonix setup\` to remove broken entries from your saved config.
+`
+        );
       }
     }
+    if (successCount === 0) tools = void 0;
   }
   const client = new DeepSeekClient();
   const prefix = new ImmutablePrefix({
@@ -3784,6 +3985,404 @@ function truncate4(s, max) {
   return s.length <= max ? s : `${s.slice(0, max)}\u2026`;
 }
 
+// src/cli/commands/setup.tsx
+import { render as render4 } from "ink";
+import React16 from "react";
+
+// src/cli/ui/Wizard.tsx
+import { Box as Box12, Text as Text12, useApp as useApp5, useInput as useInput4 } from "ink";
+import TextInput3 from "ink-text-input";
+import React15, { useState as useState8 } from "react";
+
+// src/cli/ui/Select.tsx
+import { Box as Box11, Text as Text11, useInput as useInput3 } from "ink";
+import React14, { useState as useState7 } from "react";
+function SingleSelect({
+  items,
+  initialValue,
+  onSubmit,
+  onCancel
+}) {
+  const initialIndex = Math.max(
+    0,
+    items.findIndex((i) => i.value === initialValue && !i.disabled)
+  );
+  const [index, setIndex] = useState7(initialIndex === -1 ? 0 : initialIndex);
+  useInput3((_input, key) => {
+    if (key.upArrow) {
+      setIndex((i) => findNextEnabled(items, i, -1));
+    } else if (key.downArrow) {
+      setIndex((i) => findNextEnabled(items, i, 1));
+    } else if (key.return) {
+      const chosen = items[index];
+      if (chosen && !chosen.disabled) onSubmit(chosen.value);
+    } else if (key.escape && onCancel) {
+      onCancel();
+    }
+  });
+  return /* @__PURE__ */ React14.createElement(Box11, { flexDirection: "column" }, items.map((item, i) => /* @__PURE__ */ React14.createElement(
+    SelectRow,
+    {
+      key: item.value,
+      item,
+      active: i === index,
+      marker: i === index ? "\u25B8" : " "
+    }
+  )));
+}
+function MultiSelect({
+  items,
+  initialSelected = [],
+  onSubmit,
+  onCancel,
+  footer
+}) {
+  const [index, setIndex] = useState7(() => {
+    const first = items.findIndex((i) => !i.disabled);
+    return first === -1 ? 0 : first;
+  });
+  const [selected, setSelected] = useState7(new Set(initialSelected));
+  useInput3((input, key) => {
+    if (key.upArrow) {
+      setIndex((i) => findNextEnabled(items, i, -1));
+    } else if (key.downArrow) {
+      setIndex((i) => findNextEnabled(items, i, 1));
+    } else if (input === " ") {
+      const item = items[index];
+      if (!item || item.disabled) return;
+      setSelected((prev) => {
+        const next = new Set(prev);
+        if (next.has(item.value)) next.delete(item.value);
+        else next.add(item.value);
+        return next;
+      });
+    } else if (key.return) {
+      const ordered = items.filter((i) => selected.has(i.value)).map((i) => i.value);
+      onSubmit(ordered);
+    } else if (key.escape && onCancel) {
+      onCancel();
+    }
+  });
+  return /* @__PURE__ */ React14.createElement(Box11, { flexDirection: "column" }, items.map((item, i) => {
+    const checked = selected.has(item.value);
+    const marker = checked ? "[x]" : "[ ]";
+    return /* @__PURE__ */ React14.createElement(
+      SelectRow,
+      {
+        key: item.value,
+        item,
+        active: i === index,
+        marker: `${i === index ? "\u25B8" : " "} ${marker}`
+      }
+    );
+  }), footer ? /* @__PURE__ */ React14.createElement(Box11, { marginTop: 1 }, /* @__PURE__ */ React14.createElement(Text11, { dimColor: true }, footer)) : null);
+}
+function SelectRow({
+  item,
+  active,
+  marker
+}) {
+  const color = item.disabled ? "gray" : active ? "cyan" : void 0;
+  return /* @__PURE__ */ React14.createElement(Box11, { flexDirection: "column" }, /* @__PURE__ */ React14.createElement(Box11, null, /* @__PURE__ */ React14.createElement(Text11, { color }, marker, " ", item.label)), item.hint ? /* @__PURE__ */ React14.createElement(Box11, { paddingLeft: marker.length + 1 }, /* @__PURE__ */ React14.createElement(Text11, { dimColor: true }, item.hint)) : null);
+}
+function findNextEnabled(items, from, step) {
+  if (items.length === 0) return 0;
+  let i = from;
+  for (let tries = 0; tries < items.length; tries++) {
+    i = (i + step + items.length) % items.length;
+    if (!items[i]?.disabled) return i;
+  }
+  return from;
+}
+
+// src/cli/ui/presets.ts
+var PRESETS = {
+  fast: { model: "deepseek-chat", harvest: false, branch: 1 },
+  smart: { model: "deepseek-reasoner", harvest: true, branch: 1 },
+  max: { model: "deepseek-reasoner", harvest: true, branch: 3 }
+};
+var PRESET_DESCRIPTIONS = {
+  fast: {
+    headline: "deepseek-chat, no reasoning harvest, no branching",
+    cost: "~1\xA2 per 100 turns \xB7 default"
+  },
+  smart: {
+    headline: "deepseek-reasoner + Pillar 2 harvest",
+    cost: "~10\xD7 cost vs fast \xB7 slower \xB7 better on multi-step tasks"
+  },
+  max: {
+    headline: "reasoner + harvest + self-consistency (3 branches)",
+    cost: "~30\xD7 cost vs fast \xB7 slowest \xB7 for hard single-shots"
+  }
+};
+
+// src/cli/ui/Wizard.tsx
+var CATALOG_BY_NAME = new Map(MCP_CATALOG.map((e) => [e.name, e]));
+function Wizard({ onComplete, onCancel, existingApiKey, initial }) {
+  const { exit } = useApp5();
+  const [step, setStep] = useState8(existingApiKey ? "preset" : "apiKey");
+  const [data, setData] = useState8({
+    apiKey: existingApiKey ?? "",
+    preset: initial?.preset ?? "fast",
+    selectedCatalog: deriveInitialCatalog(initial?.mcp ?? []),
+    catalogArgs: {}
+  });
+  const [error, setError] = useState8(null);
+  useInput4((_input, key) => {
+    if (key.escape && step !== "saved" && onCancel) onCancel();
+  });
+  if (step === "apiKey") {
+    return /* @__PURE__ */ React15.createElement(
+      ApiKeyStep,
+      {
+        onSubmit: (key) => {
+          setData((d) => ({ ...d, apiKey: key }));
+          setError(null);
+          setStep("preset");
+        },
+        error,
+        onError: setError
+      }
+    );
+  }
+  if (step === "preset") {
+    return /* @__PURE__ */ React15.createElement(StepFrame, { title: "Pick a preset", step: 1, total: 3 }, /* @__PURE__ */ React15.createElement(
+      SingleSelect,
+      {
+        items: presetItems(),
+        initialValue: data.preset,
+        onSubmit: (preset) => {
+          setData((d) => ({ ...d, preset }));
+          setStep("mcp");
+        }
+      }
+    ), /* @__PURE__ */ React15.createElement(Box12, { marginTop: 1 }, /* @__PURE__ */ React15.createElement(Text12, { dimColor: true }, "\u2191/\u2193 move \xB7 enter confirm \xB7 esc cancel")));
+  }
+  if (step === "mcp") {
+    return /* @__PURE__ */ React15.createElement(StepFrame, { title: "Which MCP servers should Reasonix wire up for you?", step: 2, total: 3 }, /* @__PURE__ */ React15.createElement(
+      MultiSelect,
+      {
+        items: mcpItems(),
+        initialSelected: data.selectedCatalog,
+        onSubmit: (selected) => {
+          setData((d) => ({ ...d, selectedCatalog: selected }));
+          const needsArgs = selected.some((name) => CATALOG_BY_NAME.get(name)?.userArgs);
+          setStep(needsArgs ? "mcpArgs" : "review");
+        },
+        footer: "\u2191/\u2193 move \xB7 space toggle \xB7 enter confirm \xB7 esc cancel \xB7 leave empty to skip"
+      }
+    ));
+  }
+  if (step === "mcpArgs") {
+    const pending = data.selectedCatalog.filter((name) => {
+      const entry2 = CATALOG_BY_NAME.get(name);
+      return entry2?.userArgs && !data.catalogArgs[name];
+    });
+    if (pending.length === 0) {
+      setStep("review");
+      return null;
+    }
+    const currentName = pending[0];
+    const entry = CATALOG_BY_NAME.get(currentName);
+    return /* @__PURE__ */ React15.createElement(
+      McpArgsStep,
+      {
+        entry,
+        error,
+        onSubmit: (value) => {
+          setData((d) => ({
+            ...d,
+            catalogArgs: { ...d.catalogArgs, [currentName]: value }
+          }));
+          setError(null);
+        },
+        onError: setError
+      }
+    );
+  }
+  if (step === "review") {
+    const specs = data.selectedCatalog.map((name) => buildSpec(name, data.catalogArgs));
+    return /* @__PURE__ */ React15.createElement(StepFrame, { title: "Ready to save", step: 3, total: 3 }, /* @__PURE__ */ React15.createElement(Box12, { flexDirection: "column" }, /* @__PURE__ */ React15.createElement(SummaryLine, { label: "API key", value: redactKey(data.apiKey) }), /* @__PURE__ */ React15.createElement(SummaryLine, { label: "Preset", value: data.preset }), /* @__PURE__ */ React15.createElement(
+      SummaryLine,
+      {
+        label: "MCP",
+        value: specs.length === 0 ? "(none)" : `${specs.length} server(s)`
+      }
+    ), specs.map((spec, i) => (
+      // biome-ignore lint/suspicious/noArrayIndexKey: review-only render, order fixed
+      /* @__PURE__ */ React15.createElement(Box12, { key: i, paddingLeft: 14 }, /* @__PURE__ */ React15.createElement(Text12, { dimColor: true }, "\xB7 ", spec))
+    )), /* @__PURE__ */ React15.createElement(Box12, { marginTop: 1 }, /* @__PURE__ */ React15.createElement(Text12, null, "Saves to ", defaultConfigPath())), error ? /* @__PURE__ */ React15.createElement(Box12, { marginTop: 1 }, /* @__PURE__ */ React15.createElement(Text12, { color: "red" }, error)) : null, /* @__PURE__ */ React15.createElement(Box12, { marginTop: 1 }, /* @__PURE__ */ React15.createElement(Text12, { dimColor: true }, "enter save \xB7 esc cancel"))), /* @__PURE__ */ React15.createElement(
+      ReviewConfirm,
+      {
+        onConfirm: () => {
+          try {
+            const specsNow = data.selectedCatalog.map(
+              (name) => buildSpec(name, data.catalogArgs)
+            );
+            const prev = readConfig();
+            const next = {
+              ...prev,
+              apiKey: data.apiKey,
+              preset: data.preset,
+              mcp: specsNow,
+              setupCompleted: true
+            };
+            writeConfig(next);
+            setStep("saved");
+            onComplete(next);
+          } catch (e) {
+            setError(`Could not save config: ${e.message}`);
+          }
+        }
+      }
+    ));
+  }
+  return /* @__PURE__ */ React15.createElement(Box12, { flexDirection: "column", borderStyle: "round", borderColor: "green", paddingX: 1 }, /* @__PURE__ */ React15.createElement(Text12, { bold: true, color: "green" }, "\u25B8 Saved."), /* @__PURE__ */ React15.createElement(Box12, { marginTop: 1 }, /* @__PURE__ */ React15.createElement(Text12, null, "Run `reasonix` any time to start chatting \u2014 your settings are remembered.")), /* @__PURE__ */ React15.createElement(Box12, { marginTop: 1 }, /* @__PURE__ */ React15.createElement(Text12, { dimColor: true }, "Press enter to exit.")), /* @__PURE__ */ React15.createElement(ExitOnEnter, { onExit: exit }));
+}
+function ApiKeyStep({
+  onSubmit,
+  error,
+  onError
+}) {
+  const [value, setValue] = useState8("");
+  return /* @__PURE__ */ React15.createElement(Box12, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 1 }, /* @__PURE__ */ React15.createElement(Text12, { bold: true, color: "cyan" }, "Welcome to Reasonix."), /* @__PURE__ */ React15.createElement(Box12, { marginTop: 1 }, /* @__PURE__ */ React15.createElement(Text12, null, "Paste your DeepSeek API key to get started.")), /* @__PURE__ */ React15.createElement(Text12, { dimColor: true }, "Get one (free credit on signup): https://platform.deepseek.com/api_keys"), /* @__PURE__ */ React15.createElement(Text12, { dimColor: true }, "Saved locally to ", defaultConfigPath()), /* @__PURE__ */ React15.createElement(Box12, { marginTop: 1 }, /* @__PURE__ */ React15.createElement(Text12, { bold: true, color: "cyan" }, "key \u203A "), /* @__PURE__ */ React15.createElement(
+    TextInput3,
+    {
+      value,
+      onChange: setValue,
+      onSubmit: (raw) => {
+        const trimmed = raw.trim();
+        if (!isPlausibleKey(trimmed)) {
+          onError("Doesn't look like a DeepSeek key. They start with 'sk-' and are 30+ chars.");
+          setValue("");
+          return;
+        }
+        onSubmit(trimmed);
+      },
+      mask: "\u2022",
+      placeholder: "sk-..."
+    }
+  )), error ? /* @__PURE__ */ React15.createElement(Box12, { marginTop: 1 }, /* @__PURE__ */ React15.createElement(Text12, { color: "red" }, error)) : value ? /* @__PURE__ */ React15.createElement(Box12, { marginTop: 1 }, /* @__PURE__ */ React15.createElement(Text12, { dimColor: true }, "preview: ", redactKey(value))) : null);
+}
+function McpArgsStep({
+  entry,
+  error,
+  onSubmit,
+  onError
+}) {
+  const [value, setValue] = useState8("");
+  return /* @__PURE__ */ React15.createElement(StepFrame, { title: `Configure ${entry.name}`, step: 2, total: 3 }, /* @__PURE__ */ React15.createElement(Box12, { flexDirection: "column" }, /* @__PURE__ */ React15.createElement(Text12, null, entry.summary), entry.note ? /* @__PURE__ */ React15.createElement(Box12, { marginTop: 1 }, /* @__PURE__ */ React15.createElement(Text12, { dimColor: true }, entry.note)) : null, /* @__PURE__ */ React15.createElement(Box12, { marginTop: 1 }, /* @__PURE__ */ React15.createElement(Text12, null, "Required parameter: "), /* @__PURE__ */ React15.createElement(Text12, { bold: true }, entry.userArgs)), /* @__PURE__ */ React15.createElement(Box12, { marginTop: 1 }, /* @__PURE__ */ React15.createElement(Text12, { bold: true, color: "cyan" }, entry.userArgs, " \u203A "), /* @__PURE__ */ React15.createElement(
+    TextInput3,
+    {
+      value,
+      onChange: setValue,
+      onSubmit: (raw) => {
+        const trimmed = raw.trim();
+        if (!trimmed) {
+          onError(`${entry.name} needs a value \u2014 got an empty string.`);
+          return;
+        }
+        onSubmit(trimmed);
+        setValue("");
+      },
+      placeholder: placeholderFor(entry)
+    }
+  )), error ? /* @__PURE__ */ React15.createElement(Box12, { marginTop: 1 }, /* @__PURE__ */ React15.createElement(Text12, { color: "red" }, error)) : null));
+}
+function ReviewConfirm({ onConfirm }) {
+  useInput4((_i, key) => {
+    if (key.return) onConfirm();
+  });
+  return null;
+}
+function ExitOnEnter({ onExit }) {
+  useInput4((_i, key) => {
+    if (key.return) onExit();
+  });
+  return null;
+}
+function StepFrame({
+  title,
+  step,
+  total,
+  children
+}) {
+  return /* @__PURE__ */ React15.createElement(Box12, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 1 }, /* @__PURE__ */ React15.createElement(Box12, null, /* @__PURE__ */ React15.createElement(Text12, { dimColor: true }, "Step ", step, "/", total, " \xB7", " "), /* @__PURE__ */ React15.createElement(Text12, { bold: true, color: "cyan" }, title)), /* @__PURE__ */ React15.createElement(Box12, { marginTop: 1, flexDirection: "column" }, children));
+}
+function SummaryLine({ label, value }) {
+  return /* @__PURE__ */ React15.createElement(Box12, null, /* @__PURE__ */ React15.createElement(Text12, null, label.padEnd(12)), /* @__PURE__ */ React15.createElement(Text12, { bold: true }, value));
+}
+function presetItems() {
+  return ["fast", "smart", "max"].map((name) => ({
+    value: name,
+    label: `${name} \u2014 ${PRESET_DESCRIPTIONS[name].headline}`,
+    hint: PRESET_DESCRIPTIONS[name].cost
+  }));
+}
+function mcpItems() {
+  return MCP_CATALOG.map((entry) => {
+    const hintParts = [entry.summary];
+    if (entry.userArgs) hintParts.push(`(you'll provide ${entry.userArgs})`);
+    if (entry.note) hintParts.push(entry.note);
+    return {
+      value: entry.name,
+      label: entry.name,
+      hint: hintParts.join(" \xB7 ")
+    };
+  });
+}
+function placeholderFor(entry) {
+  if (entry.name === "filesystem") return "e.g. /tmp/reasonix-sandbox";
+  if (entry.name === "sqlite") return "e.g. ./notes.sqlite";
+  return entry.userArgs ?? "";
+}
+function deriveInitialCatalog(existingSpecs) {
+  const packageToName = new Map(MCP_CATALOG.map((e) => [e.package, e.name]));
+  const out = [];
+  for (const spec of existingSpecs) {
+    for (const [pkg, name] of packageToName) {
+      if (spec.includes(pkg)) {
+        out.push(name);
+        break;
+      }
+    }
+  }
+  return out;
+}
+function buildSpec(name, argsByName) {
+  const entry = CATALOG_BY_NAME.get(name);
+  if (!entry) return name;
+  const userArg = entry.userArgs ? argsByName[name] : void 0;
+  const tail = userArg ? ` ${quoteIfNeeded(userArg)}` : "";
+  return `${entry.name}=npx -y ${entry.package}${tail}`;
+}
+function quoteIfNeeded(s) {
+  return /\s|"/.test(s) ? `"${s.replace(/"/g, '\\"')}"` : s;
+}
+
+// src/cli/commands/setup.tsx
+async function setupCommand(_opts = {}) {
+  loadDotenv();
+  const existingKey = loadApiKey();
+  const existing = readConfig();
+  const { waitUntilExit, unmount } = render4(
+    /* @__PURE__ */ React16.createElement(
+      Wizard,
+      {
+        existingApiKey: existingKey,
+        initial: { preset: existing.preset, mcp: existing.mcp },
+        onComplete: () => {
+        },
+        onCancel: () => {
+          unmount();
+        }
+      }
+    ),
+    { exitOnCtrlC: true }
+  );
+  await waitUntilExit();
+}
+
 // src/cli/commands/stats.ts
 import { existsSync as existsSync2, readFileSync as readFileSync5 } from "fs";
 function statsCommand(opts) {
@@ -3815,72 +4414,131 @@ function versionCommand() {
   console.log(`reasonix ${VERSION}`);
 }
 
+// src/cli/resolve.ts
+function resolveDefaults(flags) {
+  const cfg = flags.noConfig ? {} : readConfig();
+  const preset = pickPreset(flags.preset, cfg.preset);
+  const presetSettings = PRESETS[preset];
+  const model = flags.model ?? presetSettings.model;
+  const harvest2 = flags.harvest === true ? true : presetSettings.harvest;
+  const branchFromFlag = normalizeBranch(flags.branch);
+  const branch = branchFromFlag ?? (presetSettings.branch > 1 ? presetSettings.branch : void 0);
+  const mcp2 = flags.mcp && flags.mcp.length > 0 ? flags.mcp : cfg.mcp ?? [];
+  const session = resolveSession(flags.session, cfg.session);
+  return { model, harvest: harvest2, branch, mcp: mcp2, session };
+}
+function pickPreset(flagPreset, configPreset) {
+  if (flagPreset && isPresetName(flagPreset)) return flagPreset;
+  if (configPreset) return configPreset;
+  return "fast";
+}
+function isPresetName(s) {
+  return s === "fast" || s === "smart" || s === "max";
+}
+function normalizeBranch(raw) {
+  if (raw === void 0) return void 0;
+  if (!Number.isFinite(raw) || raw <= 1) return void 0;
+  return Math.min(raw, 8);
+}
+function resolveSession(flag, configSession) {
+  if (flag === false) return void 0;
+  if (typeof flag === "string" && flag.length > 0) return flag;
+  if (configSession === null) return void 0;
+  if (typeof configSession === "string" && configSession.length > 0) return configSession;
+  return "default";
+}
+
 // src/cli/index.ts
 var DEFAULT_SYSTEM = "You are Reasonix, a helpful DeepSeek-powered assistant. Be concise and accurate. Use tools when available.";
 var program = new Command();
 program.name("reasonix").description("DeepSeek-native agent framework \u2014 built for cache hits and cheap tokens.").version(VERSION);
-program.command("chat").description("Interactive Ink TUI with live cache/cost panel.").option("-m, --model <id>", "DeepSeek model id", "deepseek-chat").option("-s, --system <prompt>", "System prompt (pinned in the immutable prefix)", DEFAULT_SYSTEM).option("--transcript <path>", "Write a JSONL transcript to this path").option(
+program.action(async () => {
+  const cfg = readConfig();
+  if (!cfg.setupCompleted) {
+    await setupCommand({});
+    return;
+  }
+  const defaults = resolveDefaults({});
+  await chatCommand({
+    model: defaults.model,
+    system: DEFAULT_SYSTEM,
+    harvest: defaults.harvest,
+    branch: defaults.branch,
+    session: defaults.session,
+    mcp: defaults.mcp
+  });
+});
+program.command("setup").description("Interactive wizard \u2014 API key, preset, MCP servers. Re-run any time to reconfigure.").action(async () => {
+  await setupCommand({});
+});
+program.command("chat").description("Interactive Ink TUI with live cache/cost panel.").option("-m, --model <id>", "DeepSeek model id (overrides preset)").option("-s, --system <prompt>", "System prompt (pinned in the immutable prefix)", DEFAULT_SYSTEM).option("--transcript <path>", "Write a JSONL transcript to this path").option(
+  "--preset <name>",
+  "Bundle of model + harvest + branch. One of: fast, smart, max. Overrides config.preset."
+).option(
   "--harvest",
-  "Extract typed plan state from R1 reasoning (Pillar 2, adds a cheap V3 call per turn)"
+  "Extract typed plan state from R1 reasoning (Pillar 2). Overrides preset's harvest setting."
 ).option(
   "--branch <n>",
   "Self-consistency: run N parallel samples per turn and pick the most confident (disables streaming; enables harvest)",
   (v) => Number.parseInt(v, 10)
-).option(
-  "--session <name>",
-  "Use a named session (default: 'default'). Resume the same session next time."
-).option("--no-session", "Disable session persistence for this run (ephemeral chat)").option(
+).option("--session <name>", "Use a named session (default: from config, usually 'default').").option("--no-session", "Disable session persistence for this run (ephemeral chat)").option(
   "--mcp <spec>",
-  'MCP server spec; repeatable. Forms: "name=cmd args..." (namespaced, tools get `name_` prefix) or "cmd args..." (anonymous). Example: --mcp "fs=npx -y @scope/fs /tmp" --mcp "gh=npx -y @scope/gh"',
+  'MCP server spec; repeatable. "name=cmd args...", "cmd args...", or a URL (http/https \u2192 SSE transport). Overrides config.mcp when provided.',
   (value, previous = []) => [...previous, value],
   []
 ).option(
   "--mcp-prefix <str>",
   "Global prefix applied to every MCP tool (only honored when no per-spec name is set; avoids collisions with a single anonymous server)"
-).action(async (opts) => {
-  let session;
-  if (opts.session === false) {
-    session = void 0;
-  } else if (typeof opts.session === "string" && opts.session.length > 0) {
-    session = opts.session;
-  } else {
-    session = "default";
-  }
-  await chatCommand({
+).option("--no-config", "Ignore `~/.reasonix/config.json` \u2014 useful for CI or reproducing issues").action(async (opts) => {
+  const defaults = resolveDefaults({
     model: opts.model,
+    harvest: opts.harvest,
+    branch: opts.branch,
+    mcp: opts.mcp,
+    session: opts.session,
+    preset: opts.preset,
+    noConfig: opts.config === false
+  });
+  await chatCommand({
+    model: defaults.model,
     system: opts.system,
     transcript: opts.transcript,
-    harvest: !!opts.harvest,
-    branch: Number.isFinite(opts.branch) && opts.branch > 1 ? opts.branch : void 0,
-    session,
-    mcp: opts.mcp,
+    harvest: defaults.harvest,
+    branch: defaults.branch,
+    session: defaults.session,
+    mcp: defaults.mcp,
     mcpPrefix: opts.mcpPrefix
   });
 });
-program.command("run <task>").description("Run a single task non-interactively, streaming output.").option("-m, --model <id>", "DeepSeek model id", "deepseek-chat").option("-s, --system <prompt>", "System prompt", DEFAULT_SYSTEM).option(
-  "--harvest",
-  "Extract typed plan state from R1 reasoning (Pillar 2, adds a cheap V3 call per turn)"
-).option(
+program.command("run <task>").description("Run a single task non-interactively, streaming output.").option("-m, --model <id>", "DeepSeek model id (overrides preset)").option("-s, --system <prompt>", "System prompt", DEFAULT_SYSTEM).option("--preset <name>", "Bundle of model + harvest + branch: fast | smart | max").option("--harvest", "Extract typed plan state from R1 reasoning (Pillar 2)").option(
   "--branch <n>",
   "Self-consistency: run N parallel samples per turn and pick the most confident",
   (v) => Number.parseInt(v, 10)
 ).option("--transcript <path>", "Write a JSONL transcript to this path for replay/diff").option(
   "--mcp <spec>",
-  'MCP server spec; repeatable. "name=cmd args..." or "cmd args...".',
+  'MCP server spec; repeatable. "name=cmd args...", "cmd args...", or a URL (http/https \u2192 SSE).',
   (value, previous = []) => [...previous, value],
   []
 ).option(
   "--mcp-prefix <str>",
   "Global prefix (only honored when no per-spec name is set; for a single anonymous server)"
-).action(async (task, opts) => {
+).option("--no-config", "Ignore `~/.reasonix/config.json` \u2014 useful for CI or reproducing issues").action(async (task, opts) => {
+  const defaults = resolveDefaults({
+    model: opts.model,
+    harvest: opts.harvest,
+    branch: opts.branch,
+    mcp: opts.mcp,
+    preset: opts.preset,
+    noConfig: opts.config === false
+  });
   await runCommand({
     task,
-    model: opts.model,
+    model: defaults.model,
     system: opts.system,
-    harvest: !!opts.harvest,
-    branch: Number.isFinite(opts.branch) && opts.branch > 1 ? opts.branch : void 0,
+    harvest: defaults.harvest,
+    branch: defaults.branch,
     transcript: opts.transcript,
-    mcp: opts.mcp,
+    mcp: defaults.mcp,
     mcpPrefix: opts.mcpPrefix
   });
 });