reasonix 0.5.4 → 0.5.6

package/dist/index.js

@@ -47,8 +47,8 @@ function computeWait(attempt, initial, cap, retryAfter) {
 }
 function sleep(ms, signal) {
   if (ms <= 0) return Promise.resolve();
-  return new Promise((resolve7, reject) => {
-    const timer = setTimeout(resolve7, ms);
+  return new Promise((resolve8, reject) => {
+    const timer = setTimeout(resolve8, ms);
     if (signal) {
       const onAbort = () => {
         clearTimeout(timer);
@@ -520,7 +520,7 @@ function matchesTool(hook, toolName) {
   }
 }
 function defaultSpawner(input) {
-  return new Promise((resolve7) => {
+  return new Promise((resolve8) => {
     const child = spawn(input.command, {
       cwd: input.cwd,
       shell: true,
@@ -547,7 +547,7 @@ function defaultSpawner(input) {
     });
     child.once("error", (err) => {
       clearTimeout(timer);
-      resolve7({
+      resolve8({
         exitCode: null,
         stdout,
         stderr,
@@ -557,7 +557,7 @@ function defaultSpawner(input) {
     });
     child.once("close", (code) => {
       clearTimeout(timer);
-      resolve7({
+      resolve8({
         exitCode: code,
         stdout: stdout.trim(),
         stderr: stderr.trim(),
@@ -618,7 +618,7 @@ async function runHooks(opts) {
 }
 
 // src/tokenizer.ts
-import { readFileSync as readFileSync2 } from "fs";
+import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
 import { createRequire } from "module";
 import { dirname, join as join2 } from "path";
 import { fileURLToPath } from "url";
@@ -646,17 +646,24 @@ function buildByteToChar() {
 var cached = null;
 function resolveDataPath() {
   if (process.env.REASONIX_TOKENIZER_PATH) return process.env.REASONIX_TOKENIZER_PATH;
+  const candidates = [];
   try {
     const here = dirname(fileURLToPath(import.meta.url));
-    return join2(here, "..", "data", "deepseek-tokenizer.json.gz");
+    candidates.push(join2(here, "..", "data", "deepseek-tokenizer.json.gz"));
+    candidates.push(join2(here, "..", "..", "data", "deepseek-tokenizer.json.gz"));
   } catch {
+  }
+  try {
     const req = createRequire(import.meta.url);
-    return join2(
-      dirname(req.resolve("reasonix/package.json")),
-      "data",
-      "deepseek-tokenizer.json.gz"
+    candidates.push(
+      join2(dirname(req.resolve("reasonix/package.json")), "data", "deepseek-tokenizer.json.gz")
     );
+  } catch {
   }
+  for (const p of candidates) {
+    if (existsSync2(p)) return p;
+  }
+  return candidates[0] ?? join2(process.cwd(), "data", "deepseek-tokenizer.json.gz");
 }
 function loadTokenizer() {
   if (cached) return cached;
@@ -1486,7 +1493,7 @@ function signature2(call) {
 import {
   appendFileSync,
   chmodSync,
-  existsSync as existsSync2,
+  existsSync as existsSync3,
   mkdirSync,
   readFileSync as readFileSync3,
   readdirSync,
@@ -1508,7 +1515,7 @@ function sanitizeName(name) {
 }
 function loadSessionMessages(name) {
   const path = sessionPath(name);
-  if (!existsSync2(path)) return [];
+  if (!existsSync3(path)) return [];
   try {
     const raw = readFileSync3(path, "utf8");
     const out = [];
@@ -1538,7 +1545,7 @@ function appendSessionMessage(name, message) {
 }
 function listSessions() {
   const dir = sessionsDir();
-  if (!existsSync2(dir)) return [];
+  if (!existsSync3(dir)) return [];
   try {
     const files = readdirSync(dir).filter((f) => f.endsWith(".jsonl"));
     return files.map((file) => {
@@ -1734,9 +1741,9 @@ var CacheFirstLoop = class {
     this.sessionName = opts.session ?? null;
     if (this.sessionName) {
       const prior = loadSessionMessages(this.sessionName);
-      const { messages, healedCount, healedFrom } = healLoadedMessages(
+      const { messages, healedCount, tokensSaved } = healLoadedMessagesByTokens(
         prior,
-        DEFAULT_MAX_RESULT_CHARS
+        DEFAULT_MAX_RESULT_TOKENS
       );
       for (const msg of messages) this.log.append(msg);
       this.resumedMessageCount = messages.length;
@@ -1746,7 +1753,7 @@ var CacheFirstLoop = class {
         } catch {
         }
         process.stderr.write(
-          `\u25B8 session "${this.sessionName}": healed ${healedCount} entr${healedCount === 1 ? "y" : "ies"}${healedFrom > 0 ? ` (was ${healedFrom.toLocaleString()} chars oversized)` : " (dropped dangling tool_calls tail)"}. Rewrote session file.
+          `\u25B8 session "${this.sessionName}": healed ${healedCount} entr${healedCount === 1 ? "y" : "ies"}${tokensSaved > 0 ? ` (shrunk ${tokensSaved.toLocaleString()} tokens of oversized tool output)` : " (dropped dangling tool_calls tail)"}. Rewrote session file.
 `
         );
       }
@@ -2015,8 +2022,8 @@ var CacheFirstLoop = class {
             }
           );
           for (let k = 0; k < budget; k++) {
-            const sample = queue.shift() ?? await new Promise((resolve7) => {
-              waiter = resolve7;
+            const sample = queue.shift() ?? await new Promise((resolve8) => {
+              waiter = resolve8;
             });
             yield {
               turn: this._turn,
@@ -2415,15 +2422,12 @@ function shrinkOversizedToolResultsByTokens(messages, maxTokens) {
   });
   return { messages: out, healedCount, tokensSaved, charsSaved };
 }
-function healLoadedMessages(messages, maxChars) {
-  const shrunk = shrinkOversizedToolResults(messages, maxChars);
-  let healedCount = shrunk.healedCount;
+function fixToolCallPairing(messages) {
   const out = [];
-  const openCallIds = /* @__PURE__ */ new Set();
   let droppedAssistantCalls = 0;
   let droppedStrayTools = 0;
-  for (let i = 0; i < shrunk.messages.length; i++) {
-    const msg = shrunk.messages[i];
+  for (let i = 0; i < messages.length; i++) {
+    const msg = messages[i];
     if (msg.role === "assistant" && Array.isArray(msg.tool_calls) && msg.tool_calls.length > 0) {
       const needed = /* @__PURE__ */ new Set();
       for (const call of msg.tool_calls) {
@@ -2431,8 +2435,8 @@ function healLoadedMessages(messages, maxChars) {
       }
       const candidates = [];
       let j = i + 1;
-      while (j < shrunk.messages.length && needed.size > 0) {
-        const nxt = shrunk.messages[j];
+      while (j < messages.length && needed.size > 0) {
+        const nxt = messages[j];
         if (nxt.role !== "tool") break;
         const id = nxt.tool_call_id ?? "";
         if (!needed.has(id)) break;
@@ -2457,8 +2461,24 @@ function healLoadedMessages(messages, maxChars) {
     }
     out.push(msg);
   }
-  healedCount += droppedAssistantCalls + droppedStrayTools;
-  return { messages: out, healedCount, healedFrom: shrunk.healedFrom };
+  return { messages: out, droppedAssistantCalls, droppedStrayTools };
+}
+function healLoadedMessages(messages, maxChars) {
+  const shrunk = shrinkOversizedToolResults(messages, maxChars);
+  const paired = fixToolCallPairing(shrunk.messages);
+  const healedCount = shrunk.healedCount + paired.droppedAssistantCalls + paired.droppedStrayTools;
+  return { messages: paired.messages, healedCount, healedFrom: shrunk.healedFrom };
+}
+function healLoadedMessagesByTokens(messages, maxTokens) {
+  const shrunk = shrinkOversizedToolResultsByTokens(messages, maxTokens);
+  const paired = fixToolCallPairing(shrunk.messages);
+  const healedCount = shrunk.healedCount + paired.droppedAssistantCalls + paired.droppedStrayTools;
+  return {
+    messages: paired.messages,
+    healedCount,
+    tokensSaved: shrunk.tokensSaved,
+    charsSaved: shrunk.charsSaved
+  };
 }
 function formatLoopError(err) {
   const msg = err.message ?? "";
@@ -2470,17 +2490,104 @@ function formatLoopError(err) {
   return msg;
 }
 
+// src/at-mentions.ts
+import { existsSync as existsSync4, readFileSync as readFileSync4, statSync as statSync2 } from "fs";
+import { isAbsolute, relative, resolve } from "path";
+var DEFAULT_AT_MENTION_MAX_BYTES = 64 * 1024;
+var AT_MENTION_PATTERN = /(?<=^|\s)@([a-zA-Z0-9_./\\-]+)/g;
+function expandAtMentions(text, rootDir, opts = {}) {
+  const maxBytes = opts.maxBytes ?? DEFAULT_AT_MENTION_MAX_BYTES;
+  const fs2 = opts.fs ?? defaultFs;
+  const root = resolve(rootDir);
+  const seen = /* @__PURE__ */ new Map();
+  const expansions = [];
+  for (const match of text.matchAll(AT_MENTION_PATTERN)) {
+    const rawPath = match[1] ?? "";
+    const cleaned = rawPath.replace(/\.+$/, "");
+    if (!cleaned) continue;
+    const token = `@${cleaned}`;
+    if (seen.has(token)) continue;
+    const expansion = resolveMention(cleaned, root, maxBytes, fs2);
+    seen.set(token, expansion);
+    expansions.push(expansion);
+  }
+  if (expansions.length === 0) return { text, expansions };
+  const blocks = [];
+  for (const ex of expansions) {
+    if (ex.ok) {
+      const content = readSafe(root, ex.path, fs2);
+      blocks.push(`<file path="${ex.path}">
+${content}
+</file>`);
+    } else {
+      blocks.push(`<file path="${ex.path}" skipped="${ex.skip}" />`);
+    }
+  }
+  const augmented = `${text}
+
+[Referenced files]
+${blocks.join("\n\n")}`;
+  return { text: augmented, expansions };
+}
+function resolveMention(rawPath, root, maxBytes, fs2) {
+  if (isAbsolute(rawPath)) {
+    return { token: `@${rawPath}`, path: rawPath, ok: false, skip: "escape" };
+  }
+  const resolved = resolve(root, rawPath);
+  const rel = relative(root, resolved);
+  if (rel.startsWith("..") || isAbsolute(rel)) {
+    return { token: `@${rawPath}`, path: rawPath, ok: false, skip: "escape" };
+  }
+  if (!fs2.exists(resolved)) {
+    return { token: `@${rawPath}`, path: rawPath, ok: false, skip: "missing" };
+  }
+  if (!fs2.isFile(resolved)) {
+    return { token: `@${rawPath}`, path: rawPath, ok: false, skip: "not-file" };
+  }
+  const size = fs2.size(resolved);
+  if (size > maxBytes) {
+    return { token: `@${rawPath}`, path: rawPath, ok: false, skip: "too-large", bytes: size };
+  }
+  return { token: `@${rawPath}`, path: rawPath, ok: true, bytes: size };
+}
+function readSafe(root, rawPath, fs2) {
+  const resolved = resolve(root, rawPath);
+  try {
+    return fs2.read(resolved);
+  } catch {
+    return "(read failed)";
+  }
+}
+var defaultFs = {
+  exists: (p) => existsSync4(p),
+  isFile: (p) => {
+    try {
+      return statSync2(p).isFile();
+    } catch {
+      return false;
+    }
+  },
+  size: (p) => {
+    try {
+      return statSync2(p).size;
+    } catch {
+      return 0;
+    }
+  },
+  read: (p) => readFileSync4(p, "utf8")
+};
+
 // src/project-memory.ts
-import { existsSync as existsSync3, readFileSync as readFileSync4 } from "fs";
+import { existsSync as existsSync5, readFileSync as readFileSync5 } from "fs";
 import { join as join4 } from "path";
 var PROJECT_MEMORY_FILE = "REASONIX.md";
 var PROJECT_MEMORY_MAX_CHARS = 8e3;
 function readProjectMemory(rootDir) {
   const path = join4(rootDir, PROJECT_MEMORY_FILE);
-  if (!existsSync3(path)) return null;
+  if (!existsSync5(path)) return null;
   let raw;
   try {
-    raw = readFileSync4(path, "utf8");
+    raw = readFileSync5(path, "utf8");
   } catch {
     return null;
   }
@@ -2516,20 +2623,20 @@ ${mem.content}
 // src/user-memory.ts
 import { createHash as createHash2 } from "crypto";
 import {
-  existsSync as existsSync5,
+  existsSync as existsSync7,
   mkdirSync as mkdirSync2,
-  readFileSync as readFileSync6,
+  readFileSync as readFileSync7,
   readdirSync as readdirSync3,
   unlinkSync as unlinkSync2,
   writeFileSync as writeFileSync2
 } from "fs";
 import { homedir as homedir4 } from "os";
-import { join as join6, resolve as resolve2 } from "path";
+import { join as join6, resolve as resolve3 } from "path";
 
 // src/skills.ts
-import { existsSync as existsSync4, readFileSync as readFileSync5, readdirSync as readdirSync2, statSync as statSync2 } from "fs";
+import { existsSync as existsSync6, readFileSync as readFileSync6, readdirSync as readdirSync2, statSync as statSync3 } from "fs";
 import { homedir as homedir3 } from "os";
-import { join as join5, resolve } from "path";
+import { join as join5, resolve as resolve2 } from "path";
 var SKILLS_DIRNAME = "skills";
 var SKILL_FILE = "SKILL.md";
 var SKILLS_INDEX_MAX_CHARS = 4e3;
@@ -2560,7 +2667,7 @@ var SkillStore = class {
   disableBuiltins;
   constructor(opts = {}) {
     this.homeDir = opts.homeDir ?? homedir3();
-    this.projectRoot = opts.projectRoot ? resolve(opts.projectRoot) : void 0;
+    this.projectRoot = opts.projectRoot ? resolve2(opts.projectRoot) : void 0;
     this.disableBuiltins = opts.disableBuiltins === true;
   }
   /** True iff this store was configured with a project root. */
@@ -2591,7 +2698,7 @@ var SkillStore = class {
   list() {
     const byName = /* @__PURE__ */ new Map();
     for (const { dir, scope } of this.roots()) {
-      if (!existsSync4(dir)) continue;
+      if (!existsSync6(dir)) continue;
       let entries;
       try {
         entries = readdirSync2(dir, { withFileTypes: true });
@@ -2615,13 +2722,13 @@ var SkillStore = class {
   read(name) {
     if (!isValidSkillName(name)) return null;
     for (const { dir, scope } of this.roots()) {
-      if (!existsSync4(dir)) continue;
+      if (!existsSync6(dir)) continue;
       const dirCandidate = join5(dir, name, SKILL_FILE);
-      if (existsSync4(dirCandidate) && statSync2(dirCandidate).isFile()) {
+      if (existsSync6(dirCandidate) && statSync3(dirCandidate).isFile()) {
         return this.parse(dirCandidate, name, scope);
       }
       const flatCandidate = join5(dir, `${name}.md`);
-      if (existsSync4(flatCandidate) && statSync2(flatCandidate).isFile()) {
+      if (existsSync6(flatCandidate) && statSync3(flatCandidate).isFile()) {
         return this.parse(flatCandidate, name, scope);
       }
     }
@@ -2636,7 +2743,7 @@ var SkillStore = class {
     if (entry.isDirectory()) {
       if (!isValidSkillName(entry.name)) return null;
       const file = join5(dir, entry.name, SKILL_FILE);
-      if (!existsSync4(file)) return null;
+      if (!existsSync6(file)) return null;
       return this.parse(file, entry.name, scope);
     }
     if (entry.isFile() && entry.name.endsWith(".md")) {
@@ -2649,7 +2756,7 @@ var SkillStore = class {
   parse(path, stem, scope) {
     let raw;
     try {
-      raw = readFileSync5(path, "utf8");
+      raw = readFileSync6(path, "utf8");
     } catch {
       return null;
     }
@@ -2776,7 +2883,7 @@ function sanitizeMemoryName(raw) {
   return trimmed;
 }
 function projectHash(rootDir) {
-  const abs = resolve2(rootDir);
+  const abs = resolve3(rootDir);
   return createHash2("sha1").update(abs).digest("hex").slice(0, 16);
 }
 function scopeDir(opts) {
@@ -2789,7 +2896,7 @@ function scopeDir(opts) {
   return join6(opts.homeDir, USER_MEMORY_DIR, projectHash(opts.projectRoot));
 }
 function ensureDir(p) {
-  if (!existsSync5(p)) mkdirSync2(p, { recursive: true });
+  if (!existsSync7(p)) mkdirSync2(p, { recursive: true });
 }
 function parseFrontmatter2(raw) {
   const lines = raw.split(/\r?\n/);
@@ -2835,7 +2942,7 @@ var MemoryStore = class {
   projectRoot;
   constructor(opts = {}) {
     this.homeDir = opts.homeDir ?? join6(homedir4(), ".reasonix");
-    this.projectRoot = opts.projectRoot ? resolve2(opts.projectRoot) : void 0;
+    this.projectRoot = opts.projectRoot ? resolve3(opts.projectRoot) : void 0;
   }
   /** Directory this store writes `scope` files into, creating it if needed. */
   dir(scope) {
@@ -2861,10 +2968,10 @@ var MemoryStore = class {
       scopeDir({ homeDir: this.homeDir, scope, projectRoot: this.projectRoot }),
       MEMORY_INDEX_FILE
     );
-    if (!existsSync5(file)) return null;
+    if (!existsSync7(file)) return null;
     let raw;
     try {
-      raw = readFileSync6(file, "utf8");
+      raw = readFileSync7(file, "utf8");
     } catch {
       return null;
     }
@@ -2879,10 +2986,10 @@ var MemoryStore = class {
   /** Read one memory file's body (frontmatter stripped). Throws if missing. */
   read(scope, name) {
     const file = this.pathFor(scope, name);
-    if (!existsSync5(file)) {
+    if (!existsSync7(file)) {
       throw new Error(`memory not found: scope=${scope} name=${name}`);
     }
-    const raw = readFileSync6(file, "utf8");
+    const raw = readFileSync7(file, "utf8");
     const { data, body } = parseFrontmatter2(raw);
     return {
       name: data.name ?? name,
@@ -2903,7 +3010,7 @@ var MemoryStore = class {
     const scopes = this.projectRoot ? ["global", "project"] : ["global"];
     for (const scope of scopes) {
       const dir = scopeDir({ homeDir: this.homeDir, scope, projectRoot: this.projectRoot });
-      if (!existsSync5(dir)) continue;
+      if (!existsSync7(dir)) continue;
       let entries;
       try {
         entries = readdirSync3(dir);
@@ -2957,7 +3064,7 @@ var MemoryStore = class {
       throw new Error("cannot delete project-scoped memory: no projectRoot configured");
     }
     const file = this.pathFor(scope, rawName);
-    if (!existsSync5(file)) return false;
+    if (!existsSync7(file)) return false;
     unlinkSync2(file);
     this.regenerateIndex(scope);
     return true;
@@ -2970,7 +3077,7 @@ var MemoryStore = class {
    */
   regenerateIndex(scope) {
     const dir = scopeDir({ homeDir: this.homeDir, scope, projectRoot: this.projectRoot });
-    if (!existsSync5(dir)) return;
+    if (!existsSync7(dir)) return;
     let files;
     try {
       files = readdirSync3(dir);
@@ -2980,7 +3087,7 @@ var MemoryStore = class {
     const mdFiles = files.filter((f) => f !== MEMORY_INDEX_FILE && f.endsWith(".md")).sort((a, b) => a.localeCompare(b));
     const indexPath = join6(dir, MEMORY_INDEX_FILE);
     if (mdFiles.length === 0) {
-      if (existsSync5(indexPath)) unlinkSync2(indexPath);
+      if (existsSync7(indexPath)) unlinkSync2(indexPath);
       return;
     }
     const lines = [];
@@ -3914,7 +4021,7 @@ function forkRegistryExcluding(parent, exclude) {
 
 // src/tools/shell.ts
 import { spawn as spawn2 } from "child_process";
-import { existsSync as existsSync6, statSync as statSync3 } from "fs";
+import { existsSync as existsSync8, statSync as statSync4 } from "fs";
 import * as pathMod2 from "path";
 var DEFAULT_TIMEOUT_SEC = 60;
 var DEFAULT_MAX_OUTPUT_CHARS = 32e3;
@@ -4084,7 +4191,7 @@ async function runCommand(cmd, opts) {
   };
   const { bin, args, spawnOverrides } = prepareSpawn(argv);
   const effectiveSpawnOpts = { ...spawnOpts, ...spawnOverrides };
-  return await new Promise((resolve7, reject) => {
+  return await new Promise((resolve8, reject) => {
     let child;
     try {
       child = spawn2(bin, args, effectiveSpawnOpts);
@@ -4117,7 +4224,7 @@ async function runCommand(cmd, opts) {
       const output = buf.length > maxChars ? `${buf.slice(0, maxChars)}
 
 [\u2026 truncated ${buf.length - maxChars} chars \u2026]` : buf;
-      resolve7({ exitCode: code, output, timedOut });
+      resolve8({ exitCode: code, output, timedOut });
     });
   });
 }
@@ -4142,7 +4249,7 @@ function resolveExecutable(cmd, opts = {}) {
 }
 function defaultIsFile(full) {
   try {
-    return existsSync6(full) && statSync3(full).isFile();
+    return existsSync8(full) && statSync4(full).isFile();
   } catch {
     return false;
   }
@@ -4469,12 +4576,12 @@ ${i + 1}. ${r.title}`);
 }
 
 // src/env.ts
-import { readFileSync as readFileSync7 } from "fs";
-import { resolve as resolve5 } from "path";
+import { readFileSync as readFileSync8 } from "fs";
+import { resolve as resolve6 } from "path";
 function loadDotenv(path = ".env") {
   let raw;
   try {
-    raw = readFileSync7(resolve5(process.cwd(), path), "utf8");
+    raw = readFileSync8(resolve6(process.cwd(), path), "utf8");
   } catch {
     return;
   }
@@ -4493,7 +4600,7 @@ function loadDotenv(path = ".env") {
 }
 
 // src/transcript.ts
-import { createWriteStream, readFileSync as readFileSync8 } from "fs";
+import { createWriteStream, readFileSync as readFileSync9 } from "fs";
 function recordFromLoopEvent(ev, extra) {
   const rec = {
     ts: (/* @__PURE__ */ new Date()).toISOString(),
@@ -4544,7 +4651,7 @@ function openTranscriptFile(path, meta) {
   return stream;
 }
 function readTranscript(path) {
-  const raw = readFileSync8(path, "utf8");
+  const raw = readFileSync9(path, "utf8");
   return parseTranscript(raw);
 }
 function isPlanStateEmptyShape(s) {
@@ -5156,7 +5263,7 @@ var McpClient = class {
     const id = this.nextId++;
     const frame = { jsonrpc: "2.0", id, method, params };
     let abortHandler = null;
-    const promise = new Promise((resolve7, reject) => {
+    const promise = new Promise((resolve8, reject) => {
       const timeout = setTimeout(() => {
         this.pending.delete(id);
         if (abortHandler && signal) signal.removeEventListener("abort", abortHandler);
@@ -5165,7 +5272,7 @@ var McpClient = class {
         );
       }, this.requestTimeoutMs);
       this.pending.set(id, {
-        resolve: resolve7,
+        resolve: resolve8,
         reject,
         timeout
       });
@@ -5288,12 +5395,12 @@ var StdioTransport = class {
   }
   async send(message) {
     if (this.closed) throw new Error("MCP transport is closed");
-    return new Promise((resolve7, reject) => {
+    return new Promise((resolve8, reject) => {
       const line = `${JSON.stringify(message)}
 `;
       this.child.stdin.write(line, "utf8", (err) => {
         if (err) reject(err);
-        else resolve7();
+        else resolve8();
       });
     });
   }
@@ -5304,8 +5411,8 @@ var StdioTransport = class {
         continue;
       }
       if (this.closed) return;
-      const next = await new Promise((resolve7) => {
-        this.waiters.push(resolve7);
+      const next = await new Promise((resolve8) => {
+        this.waiters.push(resolve8);
       });
       if (next === null) return;
       yield next;
@@ -5371,8 +5478,8 @@ var SseTransport = class {
   constructor(opts) {
     this.url = opts.url;
     this.headers = opts.headers ?? {};
-    this.endpointReady = new Promise((resolve7, reject) => {
-      this.resolveEndpoint = resolve7;
+    this.endpointReady = new Promise((resolve8, reject) => {
+      this.resolveEndpoint = resolve8;
       this.rejectEndpoint = reject;
     });
     this.endpointReady.catch(() => void 0);
@@ -5399,8 +5506,8 @@ var SseTransport = class {
         continue;
       }
       if (this.closed) return;
-      const next = await new Promise((resolve7) => {
-        this.waiters.push(resolve7);
+      const next = await new Promise((resolve8) => {
+        this.waiters.push(resolve8);
       });
       if (next === null) return;
       yield next;
@@ -5599,8 +5706,8 @@ async function trySection(load) {
 }
 
 // src/code/edit-blocks.ts
-import { existsSync as existsSync7, mkdirSync as mkdirSync3, readFileSync as readFileSync9, unlinkSync as unlinkSync3, writeFileSync as writeFileSync3 } from "fs";
-import { dirname as dirname4, resolve as resolve6 } from "path";
+import { existsSync as existsSync9, mkdirSync as mkdirSync3, readFileSync as readFileSync10, unlinkSync as unlinkSync3, writeFileSync as writeFileSync3 } from "fs";
+import { dirname as dirname4, resolve as resolve7 } from "path";
 var BLOCK_RE = /^(\S[^\n]*)\n<{7} SEARCH\n([\s\S]*?)\n?={7}\n([\s\S]*?)\n?>{7} REPLACE/gm;
 function parseEditBlocks(text) {
   const out = [];
@@ -5618,8 +5725,8 @@ function parseEditBlocks(text) {
   return out;
 }
 function applyEditBlock(block, rootDir) {
-  const absRoot = resolve6(rootDir);
-  const absTarget = resolve6(absRoot, block.path);
+  const absRoot = resolve7(rootDir);
+  const absTarget = resolve7(absRoot, block.path);
   if (absTarget !== absRoot && !absTarget.startsWith(`${absRoot}${sep()}`)) {
     return {
       path: block.path,
@@ -5628,7 +5735,7 @@ function applyEditBlock(block, rootDir) {
     };
   }
   const searchEmpty = block.search.length === 0;
-  const exists = existsSync7(absTarget);
+  const exists = existsSync9(absTarget);
   try {
     if (!exists) {
       if (!searchEmpty) {
@@ -5642,7 +5749,7 @@ function applyEditBlock(block, rootDir) {
       writeFileSync3(absTarget, block.replace, "utf8");
       return { path: block.path, status: "created" };
     }
-    const content = readFileSync9(absTarget, "utf8");
+    const content = readFileSync10(absTarget, "utf8");
     if (searchEmpty) {
       return {
         path: block.path,
@@ -5669,19 +5776,19 @@ function applyEditBlocks(blocks, rootDir) {
   return blocks.map((b) => applyEditBlock(b, rootDir));
 }
 function snapshotBeforeEdits(blocks, rootDir) {
-  const absRoot = resolve6(rootDir);
+  const absRoot = resolve7(rootDir);
   const seen = /* @__PURE__ */ new Set();
   const snapshots = [];
   for (const b of blocks) {
     if (seen.has(b.path)) continue;
     seen.add(b.path);
-    const abs = resolve6(absRoot, b.path);
-    if (!existsSync7(abs)) {
+    const abs = resolve7(absRoot, b.path);
+    if (!existsSync9(abs)) {
       snapshots.push({ path: b.path, prevContent: null });
       continue;
     }
     try {
-      snapshots.push({ path: b.path, prevContent: readFileSync9(abs, "utf8") });
+      snapshots.push({ path: b.path, prevContent: readFileSync10(abs, "utf8") });
     } catch {
       snapshots.push({ path: b.path, prevContent: null });
     }
@@ -5689,9 +5796,9 @@ function snapshotBeforeEdits(blocks, rootDir) {
   return snapshots;
 }
 function restoreSnapshots(snapshots, rootDir) {
-  const absRoot = resolve6(rootDir);
+  const absRoot = resolve7(rootDir);
   return snapshots.map((snap) => {
-    const abs = resolve6(absRoot, snap.path);
+    const abs = resolve7(absRoot, snap.path);
     if (abs !== absRoot && !abs.startsWith(`${absRoot}${sep()}`)) {
       return {
         path: snap.path,
@@ -5701,7 +5808,7 @@ function restoreSnapshots(snapshots, rootDir) {
     }
     try {
       if (snap.prevContent === null) {
-        if (existsSync7(abs)) unlinkSync3(abs);
+        if (existsSync9(abs)) unlinkSync3(abs);
         return {
           path: snap.path,
           status: "applied",
@@ -5724,7 +5831,7 @@ function sep() {
 }
 
 // src/code/prompt.ts
-import { existsSync as existsSync8, readFileSync as readFileSync10 } from "fs";
+import { existsSync as existsSync10, readFileSync as readFileSync11 } from "fs";
 import { join as join8 } from "path";
 var CODE_SYSTEM_PROMPT = `You are Reasonix Code, a coding assistant. You have filesystem tools (read_file, write_file, list_directory, search_files, etc.) rooted at the user's working directory.
 
@@ -5847,10 +5954,10 @@ Two different rules depending on which tool:
 function codeSystemPrompt(rootDir) {
   const withMemory = applyMemoryStack(CODE_SYSTEM_PROMPT, rootDir);
   const gitignorePath = join8(rootDir, ".gitignore");
-  if (!existsSync8(gitignorePath)) return withMemory;
+  if (!existsSync10(gitignorePath)) return withMemory;
   let content;
   try {
-    content = readFileSync10(gitignorePath, "utf8");
+    content = readFileSync11(gitignorePath, "utf8");
   } catch {
     return withMemory;
   }
@@ -5870,7 +5977,7 @@ ${truncated}
 }
 
 // src/config.ts
-import { chmodSync as chmodSync2, mkdirSync as mkdirSync4, readFileSync as readFileSync11, writeFileSync as writeFileSync4 } from "fs";
+import { chmodSync as chmodSync2, mkdirSync as mkdirSync4, readFileSync as readFileSync12, writeFileSync as writeFileSync4 } from "fs";
 import { homedir as homedir5 } from "os";
 import { dirname as dirname5, join as join9 } from "path";
 function defaultConfigPath() {
@@ -5878,7 +5985,7 @@ function defaultConfigPath() {
 }
 function readConfig(path = defaultConfigPath()) {
   try {
-    const raw = readFileSync11(path, "utf8");
+    const raw = readFileSync12(path, "utf8");
     const parsed = JSON.parse(raw);
     if (parsed && typeof parsed === "object") return parsed;
   } catch {
@@ -5913,7 +6020,7 @@ function redactKey(key) {
 }
 
 // src/version.ts
-import { existsSync as existsSync9, mkdirSync as mkdirSync5, readFileSync as readFileSync12, writeFileSync as writeFileSync5 } from "fs";
+import { existsSync as existsSync11, mkdirSync as mkdirSync5, readFileSync as readFileSync13, writeFileSync as writeFileSync5 } from "fs";
 import { homedir as homedir6 } from "os";
 import { dirname as dirname6, join as join10 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
@@ -5925,8 +6032,8 @@ function readPackageVersion() {
     let dir = dirname6(fileURLToPath2(import.meta.url));
     for (let i = 0; i < 6; i++) {
       const p = join10(dir, "package.json");
-      if (existsSync9(p)) {
-        const pkg = JSON.parse(readFileSync12(p, "utf8"));
+      if (existsSync11(p)) {
+        const pkg = JSON.parse(readFileSync13(p, "utf8"));
         if (pkg?.name === "reasonix" && typeof pkg.version === "string") {
           return pkg.version;
         }
@@ -5945,7 +6052,7 @@ function cachePath(homeDirOverride) {
 }
 function readCache(homeDirOverride) {
   try {
-    const raw = readFileSync12(cachePath(homeDirOverride), "utf8");
+    const raw = readFileSync13(cachePath(homeDirOverride), "utf8");
     const parsed = JSON.parse(raw);
     if (parsed && typeof parsed.version === "string" && typeof parsed.checkedAt === "number") {
       return parsed;
@@ -6014,7 +6121,7 @@ function isNpxInstall() {
 }
 
 // src/usage.ts
-import { appendFileSync as appendFileSync2, existsSync as existsSync10, mkdirSync as mkdirSync6, readFileSync as readFileSync13, statSync as statSync4 } from "fs";
+import { appendFileSync as appendFileSync2, existsSync as existsSync12, mkdirSync as mkdirSync6, readFileSync as readFileSync14, statSync as statSync5 } from "fs";
 import { homedir as homedir7 } from "os";
 import { dirname as dirname7, join as join11 } from "path";
 function defaultUsageLogPath(homeDirOverride) {
@@ -6042,10 +6149,10 @@ function appendUsage(input) {
   return record;
 }
 function readUsageLog(path = defaultUsageLogPath()) {
-  if (!existsSync10(path)) return [];
+  if (!existsSync12(path)) return [];
   let raw;
   try {
-    raw = readFileSync13(path, "utf8");
+    raw = readFileSync14(path, "utf8");
   } catch {
     return [];
   }
@@ -6127,9 +6234,9 @@ function aggregateUsage(records, opts = {}) {
   };
 }
 function formatLogSize(path = defaultUsageLogPath()) {
-  if (!existsSync10(path)) return "";
+  if (!existsSync12(path)) return "";
   try {
-    const s = statSync4(path);
+    const s = statSync5(path);
     const bytes = s.size;
     if (bytes < 1024) return `${bytes} B`;
     if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
@@ -6139,9 +6246,11 @@ function formatLogSize(path = defaultUsageLogPath()) {
   }
 }
 export {
+  AT_MENTION_PATTERN,
   AppendOnlyLog,
   CODE_SYSTEM_PROMPT,
   CacheFirstLoop,
+  DEFAULT_AT_MENTION_MAX_BYTES,
   DEFAULT_MAX_RESULT_CHARS,
   DEFAULT_MAX_RESULT_TOKENS,
   DeepSeekClient,
@@ -6196,7 +6305,9 @@ export {
   detectShellOperator,
   diffTranscripts,
   emptyPlanState,
+  expandAtMentions,
   fetchWithRetry,
+  fixToolCallPairing,
   flattenMcpResult,
   flattenSchema,
   forkRegistryExcluding,
@@ -6209,6 +6320,7 @@ export {
   globalSettingsPath,
   harvest,
   healLoadedMessages,
+  healLoadedMessagesByTokens,
   htmlToText,
   injectPowerShellUtf8,
   inputCostUsd,