reasonix 0.5.4 → 0.5.6

package/dist/cli/index.js

@@ -126,8 +126,8 @@ function computeWait(attempt, initial, cap, retryAfter) {
 }
 function sleep(ms, signal) {
   if (ms <= 0) return Promise.resolve();
-  return new Promise((resolve6, reject) => {
-    const timer = setTimeout(resolve6, ms);
+  return new Promise((resolve7, reject) => {
+    const timer = setTimeout(resolve7, ms);
     if (signal) {
       const onAbort = () => {
         clearTimeout(timer);
@@ -599,7 +599,7 @@ function matchesTool(hook, toolName) {
   }
 }
 function defaultSpawner(input) {
-  return new Promise((resolve6) => {
+  return new Promise((resolve7) => {
     const child = spawn(input.command, {
       cwd: input.cwd,
       shell: true,
@@ -626,7 +626,7 @@ function defaultSpawner(input) {
     });
     child.once("error", (err) => {
       clearTimeout(timer);
-      resolve6({
+      resolve7({
         exitCode: null,
         stdout: stdout2,
         stderr,
@@ -636,7 +636,7 @@ function defaultSpawner(input) {
     });
     child.once("close", (code) => {
       clearTimeout(timer);
-      resolve6({
+      resolve7({
         exitCode: code,
         stdout: stdout2.trim(),
         stderr: stderr.trim(),
@@ -697,7 +697,7 @@ async function runHooks(opts) {
 }
 
 // src/tokenizer.ts
-import { readFileSync as readFileSync3 } from "fs";
+import { existsSync as existsSync2, readFileSync as readFileSync3 } from "fs";
 import { createRequire } from "module";
 import { dirname as dirname2, join as join3 } from "path";
 import { fileURLToPath } from "url";
@@ -725,17 +725,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 = dirname2(fileURLToPath(import.meta.url));
-    return join3(here, "..", "data", "deepseek-tokenizer.json.gz");
+    candidates.push(join3(here, "..", "data", "deepseek-tokenizer.json.gz"));
+    candidates.push(join3(here, "..", "..", "data", "deepseek-tokenizer.json.gz"));
   } catch {
+  }
+  try {
     const req = createRequire(import.meta.url);
-    return join3(
-      dirname2(req.resolve("reasonix/package.json")),
-      "data",
-      "deepseek-tokenizer.json.gz"
+    candidates.push(
+      join3(dirname2(req.resolve("reasonix/package.json")), "data", "deepseek-tokenizer.json.gz")
     );
+  } catch {
   }
+  for (const p of candidates) {
+    if (existsSync2(p)) return p;
+  }
+  return candidates[0] ?? join3(process.cwd(), "data", "deepseek-tokenizer.json.gz");
 }
 function loadTokenizer() {
   if (cached) return cached;
@@ -1565,7 +1572,7 @@ function signature2(call) {
 import {
   appendFileSync,
   chmodSync as chmodSync2,
-  existsSync as existsSync2,
+  existsSync as existsSync3,
   mkdirSync as mkdirSync2,
   readFileSync as readFileSync4,
   readdirSync,
@@ -1587,7 +1594,7 @@ function sanitizeName(name) {
 }
 function loadSessionMessages(name) {
   const path = sessionPath(name);
-  if (!existsSync2(path)) return [];
+  if (!existsSync3(path)) return [];
   try {
     const raw = readFileSync4(path, "utf8");
     const out = [];
@@ -1617,7 +1624,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) => {
@@ -1813,9 +1820,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;
@@ -1825,7 +1832,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.
 `
         );
       }
@@ -2094,8 +2101,8 @@ var CacheFirstLoop = class {
             }
           );
           for (let k = 0; k < budget; k++) {
-            const sample = queue.shift() ?? await new Promise((resolve6) => {
-              waiter = resolve6;
+            const sample = queue.shift() ?? await new Promise((resolve7) => {
+              waiter = resolve7;
             });
             yield {
               turn: this._turn,
@@ -2494,15 +2501,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) {
@@ -2510,8 +2514,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;
@@ -2536,8 +2540,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 ?? "";
@@ -2549,6 +2569,93 @@ function formatLoopError(err) {
   return msg;
 }
 
+// src/at-mentions.ts
+import { existsSync as existsSync4, readFileSync as readFileSync5, 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) => readFileSync5(p, "utf8")
+};
+
 // src/tools/filesystem.ts
 import { promises as fs } from "fs";
 import * as pathMod from "path";
@@ -3359,7 +3466,7 @@ function forkRegistryExcluding(parent, exclude) {
 
 // src/tools/shell.ts
 import { spawn as spawn2 } from "child_process";
-import { existsSync as existsSync3, statSync as statSync2 } from "fs";
+import { existsSync as existsSync5, statSync as statSync3 } from "fs";
 import * as pathMod2 from "path";
 var DEFAULT_TIMEOUT_SEC = 60;
 var DEFAULT_MAX_OUTPUT_CHARS = 32e3;
@@ -3529,7 +3636,7 @@ async function runCommand(cmd, opts) {
   };
   const { bin, args, spawnOverrides } = prepareSpawn(argv);
   const effectiveSpawnOpts = { ...spawnOpts, ...spawnOverrides };
-  return await new Promise((resolve6, reject) => {
+  return await new Promise((resolve7, reject) => {
     let child;
     try {
       child = spawn2(bin, args, effectiveSpawnOpts);
@@ -3562,7 +3669,7 @@ async function runCommand(cmd, opts) {
       const output = buf.length > maxChars ? `${buf.slice(0, maxChars)}
 
 [\u2026 truncated ${buf.length - maxChars} chars \u2026]` : buf;
-      resolve6({ exitCode: code, output, timedOut });
+      resolve7({ exitCode: code, output, timedOut });
     });
   });
 }
@@ -3587,7 +3694,7 @@ function resolveExecutable(cmd, opts = {}) {
 }
 function defaultIsFile(full) {
   try {
-    return existsSync3(full) && statSync2(full).isFile();
+    return existsSync5(full) && statSync3(full).isFile();
   } catch {
     return false;
   }
@@ -3914,12 +4021,12 @@ ${i + 1}. ${r.title}`);
 }
 
 // src/env.ts
-import { readFileSync as readFileSync5 } from "fs";
-import { resolve as resolve3 } from "path";
+import { readFileSync as readFileSync6 } from "fs";
+import { resolve as resolve4 } from "path";
 function loadDotenv(path = ".env") {
   let raw;
   try {
-    raw = readFileSync5(resolve3(process.cwd(), path), "utf8");
+    raw = readFileSync6(resolve4(process.cwd(), path), "utf8");
   } catch {
     return;
   }
@@ -3938,7 +4045,7 @@ function loadDotenv(path = ".env") {
 }
 
 // src/transcript.ts
-import { createWriteStream, readFileSync as readFileSync6 } from "fs";
+import { createWriteStream, readFileSync as readFileSync7 } from "fs";
 function recordFromLoopEvent(ev, extra) {
   const rec = {
     ts: (/* @__PURE__ */ new Date()).toISOString(),
@@ -3989,7 +4096,7 @@ function openTranscriptFile(path, meta) {
   return stream;
 }
 function readTranscript(path) {
-  const raw = readFileSync6(path, "utf8");
+  const raw = readFileSync7(path, "utf8");
   return parseTranscript(raw);
 }
 function isPlanStateEmptyShape(s) {
@@ -4632,7 +4739,7 @@ var McpClient = class {
     const id = this.nextId++;
     const frame = { jsonrpc: "2.0", id, method, params };
     let abortHandler = null;
-    const promise = new Promise((resolve6, reject) => {
+    const promise = new Promise((resolve7, reject) => {
       const timeout = setTimeout(() => {
         this.pending.delete(id);
         if (abortHandler && signal) signal.removeEventListener("abort", abortHandler);
@@ -4641,7 +4748,7 @@ var McpClient = class {
         );
       }, this.requestTimeoutMs);
       this.pending.set(id, {
-        resolve: resolve6,
+        resolve: resolve7,
         reject,
         timeout
       });
@@ -4764,12 +4871,12 @@ var StdioTransport = class {
   }
   async send(message) {
     if (this.closed) throw new Error("MCP transport is closed");
-    return new Promise((resolve6, reject) => {
+    return new Promise((resolve7, reject) => {
       const line = `${JSON.stringify(message)}
 `;
       this.child.stdin.write(line, "utf8", (err) => {
         if (err) reject(err);
-        else resolve6();
+        else resolve7();
       });
     });
   }
@@ -4780,8 +4887,8 @@ var StdioTransport = class {
         continue;
       }
       if (this.closed) return;
-      const next = await new Promise((resolve6) => {
-        this.waiters.push(resolve6);
+      const next = await new Promise((resolve7) => {
+        this.waiters.push(resolve7);
       });
       if (next === null) return;
       yield next;
@@ -4847,8 +4954,8 @@ var SseTransport = class {
   constructor(opts) {
     this.url = opts.url;
     this.headers = opts.headers ?? {};
-    this.endpointReady = new Promise((resolve6, reject) => {
-      this.resolveEndpoint = resolve6;
+    this.endpointReady = new Promise((resolve7, reject) => {
+      this.resolveEndpoint = resolve7;
       this.rejectEndpoint = reject;
     });
     this.endpointReady.catch(() => void 0);
@@ -4875,8 +4982,8 @@ var SseTransport = class {
         continue;
       }
       if (this.closed) return;
-      const next = await new Promise((resolve6) => {
-        this.waiters.push(resolve6);
+      const next = await new Promise((resolve7) => {
+        this.waiters.push(resolve7);
       });
       if (next === null) return;
       yield next;
@@ -5075,8 +5182,8 @@ async function trySection(load) {
 }
 
 // src/code/edit-blocks.ts
-import { existsSync as existsSync4, mkdirSync as mkdirSync3, readFileSync as readFileSync7, unlinkSync as unlinkSync2, writeFileSync as writeFileSync3 } from "fs";
-import { dirname as dirname5, resolve as resolve4 } from "path";
+import { existsSync as existsSync6, mkdirSync as mkdirSync3, readFileSync as readFileSync8, unlinkSync as unlinkSync2, writeFileSync as writeFileSync3 } from "fs";
+import { dirname as dirname5, resolve as resolve5 } 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 = [];
@@ -5094,8 +5201,8 @@ function parseEditBlocks(text) {
   return out;
 }
 function applyEditBlock(block, rootDir) {
-  const absRoot = resolve4(rootDir);
-  const absTarget = resolve4(absRoot, block.path);
+  const absRoot = resolve5(rootDir);
+  const absTarget = resolve5(absRoot, block.path);
   if (absTarget !== absRoot && !absTarget.startsWith(`${absRoot}${sep()}`)) {
     return {
       path: block.path,
@@ -5104,7 +5211,7 @@ function applyEditBlock(block, rootDir) {
     };
   }
   const searchEmpty = block.search.length === 0;
-  const exists = existsSync4(absTarget);
+  const exists = existsSync6(absTarget);
   try {
     if (!exists) {
       if (!searchEmpty) {
@@ -5118,7 +5225,7 @@ function applyEditBlock(block, rootDir) {
       writeFileSync3(absTarget, block.replace, "utf8");
       return { path: block.path, status: "created" };
     }
-    const content = readFileSync7(absTarget, "utf8");
+    const content = readFileSync8(absTarget, "utf8");
     if (searchEmpty) {
       return {
         path: block.path,
@@ -5145,19 +5252,19 @@ function applyEditBlocks(blocks, rootDir) {
   return blocks.map((b) => applyEditBlock(b, rootDir));
 }
 function snapshotBeforeEdits(blocks, rootDir) {
-  const absRoot = resolve4(rootDir);
+  const absRoot = resolve5(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 = resolve4(absRoot, b.path);
-    if (!existsSync4(abs)) {
+    const abs = resolve5(absRoot, b.path);
+    if (!existsSync6(abs)) {
       snapshots.push({ path: b.path, prevContent: null });
       continue;
     }
     try {
-      snapshots.push({ path: b.path, prevContent: readFileSync7(abs, "utf8") });
+      snapshots.push({ path: b.path, prevContent: readFileSync8(abs, "utf8") });
     } catch {
       snapshots.push({ path: b.path, prevContent: null });
     }
@@ -5165,9 +5272,9 @@ function snapshotBeforeEdits(blocks, rootDir) {
   return snapshots;
 }
 function restoreSnapshots(snapshots, rootDir) {
-  const absRoot = resolve4(rootDir);
+  const absRoot = resolve5(rootDir);
   return snapshots.map((snap) => {
-    const abs = resolve4(absRoot, snap.path);
+    const abs = resolve5(absRoot, snap.path);
     if (abs !== absRoot && !abs.startsWith(`${absRoot}${sep()}`)) {
       return {
         path: snap.path,
@@ -5177,7 +5284,7 @@ function restoreSnapshots(snapshots, rootDir) {
     }
     try {
       if (snap.prevContent === null) {
-        if (existsSync4(abs)) unlinkSync2(abs);
+        if (existsSync6(abs)) unlinkSync2(abs);
         return {
           path: snap.path,
           status: "applied",
@@ -5200,7 +5307,7 @@ function sep() {
 }
 
 // src/version.ts
-import { existsSync as existsSync5, mkdirSync as mkdirSync4, readFileSync as readFileSync8, writeFileSync as writeFileSync4 } from "fs";
+import { existsSync as existsSync7, mkdirSync as mkdirSync4, readFileSync as readFileSync9, writeFileSync as writeFileSync4 } from "fs";
 import { homedir as homedir4 } from "os";
 import { dirname as dirname6, join as join6 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
@@ -5212,8 +5319,8 @@ function readPackageVersion() {
     let dir = dirname6(fileURLToPath2(import.meta.url));
     for (let i = 0; i < 6; i++) {
       const p = join6(dir, "package.json");
-      if (existsSync5(p)) {
-        const pkg = JSON.parse(readFileSync8(p, "utf8"));
+      if (existsSync7(p)) {
+        const pkg = JSON.parse(readFileSync9(p, "utf8"));
         if (pkg?.name === "reasonix" && typeof pkg.version === "string") {
           return pkg.version;
         }
@@ -5232,7 +5339,7 @@ function cachePath(homeDirOverride) {
 }
 function readCache(homeDirOverride) {
   try {
-    const raw = readFileSync8(cachePath(homeDirOverride), "utf8");
+    const raw = readFileSync9(cachePath(homeDirOverride), "utf8");
     const parsed = JSON.parse(raw);
     if (parsed && typeof parsed.version === "string" && typeof parsed.checkedAt === "number") {
       return parsed;
@@ -5301,7 +5408,7 @@ function isNpxInstall() {
 }
 
 // src/usage.ts
-import { appendFileSync as appendFileSync2, existsSync as existsSync6, mkdirSync as mkdirSync5, readFileSync as readFileSync9, statSync as statSync3 } from "fs";
+import { appendFileSync as appendFileSync2, existsSync as existsSync8, mkdirSync as mkdirSync5, readFileSync as readFileSync10, statSync as statSync4 } from "fs";
 import { homedir as homedir5 } from "os";
 import { dirname as dirname7, join as join7 } from "path";
 function defaultUsageLogPath(homeDirOverride) {
@@ -5329,10 +5436,10 @@ function appendUsage(input) {
   return record;
 }
 function readUsageLog(path = defaultUsageLogPath()) {
-  if (!existsSync6(path)) return [];
+  if (!existsSync8(path)) return [];
   let raw;
   try {
-    raw = readFileSync9(path, "utf8");
+    raw = readFileSync10(path, "utf8");
   } catch {
     return [];
   }
@@ -5414,9 +5521,9 @@ function aggregateUsage(records, opts = {}) {
   };
 }
 function formatLogSize(path = defaultUsageLogPath()) {
-  if (!existsSync6(path)) return "";
+  if (!existsSync8(path)) return "";
   try {
-    const s = statSync3(path);
+    const s = statSync4(path);
     const bytes = s.size;
     if (bytes < 1024) return `${bytes} B`;
     if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
@@ -5427,7 +5534,7 @@ function formatLogSize(path = defaultUsageLogPath()) {
 }
 
 // src/cli/commands/chat.tsx
-import { existsSync as existsSync8, statSync as statSync5 } from "fs";
+import { existsSync as existsSync10, statSync as statSync6 } from "fs";
 import { render } from "ink";
 import React15, { useState as useState7 } from "react";
 
@@ -5525,8 +5632,8 @@ function PlanStateBlock({ planState }) {
 }
 
 // src/cli/ui/markdown.tsx
-import { readFileSync as readFileSync10, statSync as statSync4 } from "fs";
-import { isAbsolute as isAbsolute3, join as join8 } from "path";
+import { readFileSync as readFileSync11, statSync as statSync5 } from "fs";
+import { isAbsolute as isAbsolute4, join as join8 } from "path";
 import { Box as Box2, Text as Text2 } from "ink";
 import React2 from "react";
 var SUPERSCRIPT = {
@@ -5604,10 +5711,10 @@ function parseCitationUrl(url) {
 function validateCitation(url, projectRoot) {
   const parts = parseCitationUrl(url);
   if (!parts || !parts.path) return { ok: false, reason: "empty path" };
-  const fullPath = isAbsolute3(parts.path) ? parts.path : join8(projectRoot, parts.path);
+  const fullPath = isAbsolute4(parts.path) ? parts.path : join8(projectRoot, parts.path);
   let stat;
   try {
-    stat = statSync4(fullPath);
+    stat = statSync5(fullPath);
   } catch {
     return { ok: false, reason: "file not found" };
   }
@@ -5615,7 +5722,7 @@ function validateCitation(url, projectRoot) {
   if (parts.startLine === void 0) return { ok: true };
   let lineCount;
   try {
-    lineCount = readFileSync10(fullPath, "utf8").split("\n").length;
+    lineCount = readFileSync11(fullPath, "utf8").split("\n").length;
   } catch {
     return { ok: false, reason: "unreadable" };
   }
@@ -6795,7 +6902,7 @@ function formatTokens(n) {
 import { spawnSync } from "child_process";
 
 // src/cli/commands/stats.ts
-import { existsSync as existsSync7, readFileSync as readFileSync11 } from "fs";
+import { existsSync as existsSync9, readFileSync as readFileSync12 } from "fs";
 function statsCommand(opts) {
   if (opts.transcript) {
     transcriptSummary(opts.transcript);
@@ -6804,11 +6911,11 @@ function statsCommand(opts) {
   dashboard(opts);
 }
 function transcriptSummary(path) {
-  if (!existsSync7(path)) {
+  if (!existsSync9(path)) {
     console.error(`no such transcript: ${path}`);
     process.exit(1);
   }
-  const lines = readFileSync11(path, "utf8").split(/\r?\n/).filter(Boolean);
+  const lines = readFileSync12(path, "utf8").split(/\r?\n/).filter(Boolean);
   let assistantTurns = 0;
   let toolCalls = 0;
   let lastTurn = 0;
@@ -8342,8 +8449,26 @@ function App({
         });
       };
       const timer = PLAIN_UI ? null : setInterval(flush, FLUSH_INTERVAL_MS);
+      let modelInput = text;
+      if (codeMode?.rootDir) {
+        const expanded = expandAtMentions(text, codeMode.rootDir);
+        if (expanded.expansions.length > 0) {
+          modelInput = expanded.text;
+          const inlined = expanded.expansions.filter((ex) => ex.ok).map((ex) => `${ex.path} (${(ex.bytes ?? 0).toLocaleString()} bytes)`);
+          const skipped = expanded.expansions.filter((ex) => !ex.ok).map((ex) => `${ex.path} (${ex.skip})`);
+          const parts = [];
+          if (inlined.length > 0) parts.push(`inlined ${inlined.join(", ")}`);
+          if (skipped.length > 0) parts.push(`skipped ${skipped.join(", ")}`);
+          if (parts.length > 0) {
+            setHistorical((prev) => [
+              ...prev,
+              { id: `at-${Date.now()}`, role: "info", text: `\u25B8 @mentions: ${parts.join("; ")}` }
+            ]);
+          }
+        }
+      }
       try {
-        for await (const ev of loop.step(text)) {
+        for await (const ev of loop.step(modelInput)) {
           writeTranscript(ev);
           if (ev.role !== "status") {
             setStatusLine((cur) => cur ? null : cur);
@@ -9058,7 +9183,7 @@ async function chatCommand(opts) {
     const prior = loadSessionMessages(opts.session);
     if (prior.length > 0) {
       const p = sessionPath(opts.session);
-      const mtime = existsSync8(p) ? statSync5(p).mtime : /* @__PURE__ */ new Date();
+      const mtime = existsSync10(p) ? statSync6(p).mtime : /* @__PURE__ */ new Date();
       sessionPreview = { messageCount: prior.length, lastActive: mtime };
     }
   } else if (opts.session && opts.forceNew) {
@@ -9089,10 +9214,10 @@ async function chatCommand(opts) {
 }
 
 // src/cli/commands/code.tsx
-import { basename, resolve as resolve5 } from "path";
+import { basename, resolve as resolve6 } from "path";
 async function codeCommand(opts = {}) {
   const { codeSystemPrompt: codeSystemPrompt2 } = await import("./prompt-75XLIUTO.js");
-  const rootDir = resolve5(opts.dir ?? process.cwd());
+  const rootDir = resolve6(opts.dir ?? process.cwd());
   const session = opts.noSession ? void 0 : `code-${sanitizeName(basename(rootDir))}`;
   const tools = new ToolRegistry();
   registerFilesystemTools(tools, { rootDir });
@@ -10111,13 +10236,13 @@ function planUpdate(input) {
   };
 }
 function defaultSpawn(argv) {
-  return new Promise((resolve6, reject) => {
+  return new Promise((resolve7, reject) => {
     const child = spawn4(argv[0], argv.slice(1), {
       stdio: "inherit",
       shell: process.platform === "win32"
     });
     child.once("error", reject);
-    child.once("exit", (code) => resolve6(code ?? 1));
+    child.once("exit", (code) => resolve7(code ?? 1));
   });
 }
 async function updateCommand(opts = {}) {