@iowarp/clio-coder 0.4.0 → 0.4.2

package/dist/{chunk-U77AMWDL.js → chunk-W6NIE6OW.js}

@@ -4,14 +4,14 @@ import {
   normalizeWriteBoundary,
   normalizeWriteBoundaryEntry,
   writeBoundaryCovers
-} from "./chunk-CTJ4RNAA.js";
+} from "./chunk-3F7VUY77.js";
 import {
   asDirectoryPathBoundary,
   pathBoundaryEntryCovers
 } from "./chunk-HHV2GANA.js";
 import {
   atomicWrite
-} from "./chunk-76ONBSIA.js";
+} from "./chunk-MQXIVJ35.js";
 import {
   clioStateDir
 } from "./chunk-BYP5D4HI.js";
@@ -28,7 +28,7 @@ import {
   lstatSync,
   mkdirSync as mkdirSync2,
   readdirSync,
-  readFileSync,
+  readFileSync as readFileSync2,
   realpathSync as realpathSync2,
   renameSync,
   rmdirSync,
@@ -43,11 +43,13 @@ import { join as join2, relative as relative2, resolve as resolve2 } from "node:
 init_esm_shims();
 import { execFileSync } from "node:child_process";
 import { createHash, randomBytes } from "node:crypto";
-import { existsSync, mkdirSync, realpathSync, rmSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, realpathSync, rmSync, writeFileSync } from "node:fs";
 import { isAbsolute, join, relative, resolve, sep } from "node:path";
 var SAFE_RUN_ID = /^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/u;
 var OWNER_FILE_SUFFIX = ".task-owner.json";
-var COMMIT_IDENTITY = "clio-task";
+var TASK_WORKTREE_KIND = "clio-coder-task-worktree";
+var LEGACY_TASK_WORKTREE_KIND = "clio-task-worktree";
+var COMMIT_IDENTITY = "clio-coder-task";
 function gitBytes(root, args) {
   return execFileSync("git", ["-C", root, ...args], {
     stdio: ["ignore", "pipe", "pipe"],
@@ -155,7 +157,7 @@ function createTaskWorktree(root, runId, base) {
   const resolvedBase = base ?? git(canonical, ["rev-parse", "HEAD"]);
   const parent = join(canonical, ".clio-coder", "worktrees");
   const path = join(parent, runId);
-  const branch = `clio/task/${runId}`;
+  const branch = `clio-coder/task/${runId}`;
   mkdirSync(parent, { recursive: true });
   if (!isCanonicalWorktreePathInside(parent, path))
     throw new Error(`task worktree path escapes its parent for run ${runId}`);
@@ -163,7 +165,7 @@ function createTaskWorktree(root, runId, base) {
   const ownerToken = randomBytes(16).toString("hex");
   writeFileSync(
     `${path}${OWNER_FILE_SUFFIX}`,
-    `${JSON.stringify({ version: 1, kind: "clio-task-worktree", root: canonical, runId, branch, base: resolvedBase, ownerToken }, null, 2)}
+    `${JSON.stringify({ version: 1, kind: TASK_WORKTREE_KIND, root: canonical, runId, branch, base: resolvedBase, ownerToken }, null, 2)}
 `,
     { encoding: "utf8", flag: "wx" }
   );
@@ -174,10 +176,21 @@ function assertOwnership(worktree) {
   if (resolve(worktree.path) !== resolve(expected) || !isCanonicalWorktreePathInside(join(worktree.root, ".clio-coder", "worktrees"), worktree.path)) {
     throw new Error(`task worktree ${worktree.runId} has an invalid ownership path`);
   }
-  if (!existsSync(`${worktree.path}${OWNER_FILE_SUFFIX}`))
-    throw new Error(`task worktree ${worktree.runId} has no ownership file`);
+  const ownerPath = `${worktree.path}${OWNER_FILE_SUFFIX}`;
+  if (!existsSync(ownerPath)) throw new Error(`task worktree ${worktree.runId} has no ownership file`);
+  let marker;
+  try {
+    const value = JSON.parse(readFileSync(ownerPath, "utf8"));
+    if (typeof value !== "object" || value === null || Array.isArray(value)) throw new Error("not an object");
+    marker = value;
+  } catch {
+    throw new Error(`task worktree ${worktree.runId} has an invalid ownership file`);
+  }
+  if (marker.version !== 1 || marker.kind !== TASK_WORKTREE_KIND && marker.kind !== LEGACY_TASK_WORKTREE_KIND || marker.root !== worktree.root || marker.runId !== worktree.runId || marker.branch !== worktree.branch || marker.base !== worktree.base || marker.ownerToken !== worktree.ownerToken) {
+    throw new Error(`task worktree ${worktree.runId} ownership facts do not match`);
+  }
 }
-function commitTaskWorktree(worktree, message = `Clio task ${worktree.runId}`) {
+function commitTaskWorktree(worktree, message = `Clio Coder task ${worktree.runId}`) {
   assertOwnership(worktree);
   return commitWorktreePath(worktree.path, COMMIT_IDENTITY, message);
 }
@@ -220,8 +233,9 @@ function cleanupTaskWorktree(worktree, deleteBranch) {
 // src/tools/compete-worktrees.ts
 var COMPETE_PARENT_SEGMENTS = [".clio-coder", "worktrees"];
 var COMPETE_MANIFEST_FILE = ".clio-coder-compete-owner.json";
-var COMPETE_MANIFEST_KIND = "clio-compete-group";
-var COMPETE_COMMIT_IDENTITY = "clio-compete";
+var COMPETE_MANIFEST_KIND = "clio-coder-compete-group";
+var LEGACY_COMPETE_MANIFEST_KIND = "clio-compete-group";
+var COMPETE_COMMIT_IDENTITY = "clio-coder-compete";
 var SAFE_GROUP = /^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/;
 var PROCESS_EXIT_GRACE_MS = 750;
 var PROCESS_POLL_MS = 25;
@@ -243,7 +257,7 @@ function processSnapshot(pid) {
     if (err.code !== "EPERM") return { alive: false, birthToken: null };
   }
   try {
-    const stat = readFileSync(`/proc/${pid}/stat`, "utf8").trim();
+    const stat = readFileSync2(`/proc/${pid}/stat`, "utf8").trim();
     const close = stat.lastIndexOf(")");
     if (close > 0) {
       const fields = stat.slice(close + 1).trim().split(/\s+/u);
@@ -363,7 +377,7 @@ function isCanonicalPathInside(parent, candidate) {
 function manifestFromUnknown(value) {
   if (typeof value !== "object" || value === null || Array.isArray(value)) return null;
   const manifest = value;
-  if (manifest.version !== 2 || manifest.kind !== COMPETE_MANIFEST_KIND || typeof manifest.root !== "string" || typeof manifest.group !== "string" || typeof manifest.token !== "string" || manifest.token.length === 0 || manifest.state !== "active" && manifest.state !== "cleanup-ready" && manifest.state !== "winner-preserved" || typeof manifest.createdAt !== "string" || typeof manifest.updatedAt !== "string") {
+  if (manifest.version !== 2 || manifest.kind !== COMPETE_MANIFEST_KIND && manifest.kind !== LEGACY_COMPETE_MANIFEST_KIND || typeof manifest.root !== "string" || typeof manifest.group !== "string" || typeof manifest.token !== "string" || manifest.token.length === 0 || manifest.state !== "active" && manifest.state !== "cleanup-ready" && manifest.state !== "winner-preserved" || typeof manifest.createdAt !== "string" || typeof manifest.updatedAt !== "string") {
     return null;
   }
   if (!validProcessLease(manifest.owner) || !Array.isArray(manifest.runs) || !manifest.runs.every(validRunLease) || new Set(manifest.runs.map((run) => run.runId)).size !== manifest.runs.length) {
@@ -379,7 +393,7 @@ function readManifest(root, group) {
   const directory = groupDirectory(canonical, group);
   if (!isCanonicalDirectoryAt(directory)) return null;
   try {
-    const parsed = JSON.parse(readFileSync(manifestPath(directory), "utf8"));
+    const parsed = JSON.parse(readFileSync2(manifestPath(directory), "utf8"));
     const manifest = manifestFromUnknown(parsed);
     if (manifest === null || manifest.root !== canonical || manifest.group !== group) return null;
     return manifest;
@@ -426,10 +440,13 @@ function isGitRepository(root) {
     return false;
   }
 }
-function competeBranch(group, index) {
+function competeBranch(group, index, legacy = false) {
   validateGroup(group);
   if (!Number.isInteger(index) || index < 1) throw new Error(`invalid compete candidate index ${index}`);
-  return `clio/compete/${group}/${index}`;
+  return `${legacy ? "clio" : "clio-coder"}/compete/${group}/${index}`;
+}
+function competeBranchMatches(branch, group, index) {
+  return branch === competeBranch(group, index) || branch === competeBranch(group, index, true);
 }
 function claimCompeteGroup(root, group) {
   const canonical = canonicalRoot(root);
@@ -556,7 +573,7 @@ async function createCandidateWorktreeMapped(ownership, index, baseline, mux) {
       branch,
       base: baseline,
       path,
-      label: `clio compete ${ownership.group} candidate ${index}`,
+      label: `clio-coder compete ${ownership.group} candidate ${index}`,
       focus: false
     }).catch(() => null);
     if (created !== null) {
@@ -591,9 +608,13 @@ function registeredWorktreePaths(root) {
 function exactGroupBranches(root, group) {
   return git2(root, ["branch", "--list", "--format=%(refname:short)"]).split("\n").filter((branch) => {
     const parts = branch.split("/");
-    return parts.length === 4 && parts[0] === "clio" && parts[1] === "compete" && parts[2] === group && /^\d+$/.test(parts[3] ?? "");
+    return parts.length === 4 && (parts[0] === "clio-coder" || parts[0] === "clio") && parts[1] === "compete" && parts[2] === group && /^\d+$/.test(parts[3] ?? "");
   });
 }
+function competeBranchForCandidate(root, group, index) {
+  const branches = exactGroupBranches(root, group);
+  return branches.find((branch) => branch === competeBranch(group, index)) ?? branches.find((branch) => branch === competeBranch(group, index, true)) ?? competeBranch(group, index);
+}
 function removeRegisteredWorktree(root, path) {
   try {
     git2(root, ["worktree", "remove", "--force", path]);
@@ -605,8 +626,7 @@ function removeRegisteredWorktree(root, path) {
 function removeCandidateWorktree(ownership, worktree, deleteBranch) {
   assertOwnership2(ownership);
   const expectedPath = join2(ownership.directory, `candidate-${worktree.index}`);
-  const expectedBranch = competeBranch(ownership.group, worktree.index);
-  if (resolve2(worktree.path) !== resolve2(expectedPath) || worktree.branch !== expectedBranch || !isCanonicalPathInside(ownership.directory, worktree.path)) {
+  if (resolve2(worktree.path) !== resolve2(expectedPath) || !competeBranchMatches(worktree.branch, ownership.group, worktree.index) || !isCanonicalPathInside(ownership.directory, worktree.path)) {
     throw new Error(`candidate ${worktree.index} does not belong to compete group ${ownership.group}`);
   }
   removeRegisteredWorktree(ownership.root, worktree.path);
@@ -697,8 +717,8 @@ function settleRecoveredCompeteDecision(root, group, winnerIndex) {
     cleanupWorktreeGroup(ownership);
     return null;
   }
-  const winnerBranch = competeBranch(group, winnerIndex);
   const branches = exactGroupBranches(ownership.root, group);
+  const winnerBranch = competeBranchForCandidate(ownership.root, group, winnerIndex);
   const winnerPath = join2(ownership.directory, `candidate-${winnerIndex}`);
   if (!branches.includes(winnerBranch) || !registeredWorktreePaths(ownership.root).some((path) => resolve2(path) === resolve2(winnerPath))) {
     throw new Error(`recovered winner ${winnerBranch} has no intact candidate worktree`);
@@ -1167,6 +1187,7 @@ export {
   commitCandidateWork,
   candidateDiffStat,
   protectedPathsChangedByCompeteBranch,
+  competeBranchForCandidate,
   removeCandidateWorktreeMapped,
   mergeWinnerBranch,
   cleanupCompeteGroup,
@@ -1178,4 +1199,4 @@ export {
   preflightWriteBoundaries,
   createWriteBoundaryEnforcer
 };
-//# sourceMappingURL=chunk-U77AMWDL.js.map
+//# sourceMappingURL=chunk-W6NIE6OW.js.map

package/dist/{chunk-BBVYXMFO.js → chunk-WNP7O5WZ.js}

@@ -1,7 +1,7 @@
 import { createRequire as __clioCreateRequire } from "node:module"; const require = __clioCreateRequire(import.meta.url);
 import {
   resolveDynamicConfigValue
-} from "./chunk-SST6Z5JA.js";
+} from "./chunk-336NSSKI.js";
 import {
   withStateFileLock,
   withStateFileLockSync
@@ -959,4 +959,4 @@ export {
   authNotRequiredStatus,
   openAuthStorage
 };
-//# sourceMappingURL=chunk-BBVYXMFO.js.map
+//# sourceMappingURL=chunk-WNP7O5WZ.js.map

package/dist/{chunk-QREDIESB.js → chunk-X7IARSHT.js}

@@ -8,16 +8,13 @@ import {
 import {
   isSessionEntry,
   isSessionHeader
-} from "./chunk-RAPCMZL4.js";
+} from "./chunk-FSP7CMNU.js";
 import {
   protectArtifact
-} from "./chunk-GCSMB2KY.js";
+} from "./chunk-IKOZFYBN.js";
 import {
   stripTokenizerSentinels
 } from "./chunk-CFGTUFWB.js";
-import {
-  BusChannels
-} from "./chunk-HLW2MRKE.js";
 import {
   CURRENT_SESSION_FORMAT_VERSION,
   appendSessionFileEntry,
@@ -29,7 +26,10 @@ import {
   readSessionMeta,
   resumeSession,
   sessionPaths
-} from "./chunk-76ONBSIA.js";
+} from "./chunk-MQXIVJ35.js";
+import {
+  BusChannels
+} from "./chunk-F4EKGO4N.js";
 import {
   clioStateDir,
   stateRootRemoved
@@ -1139,7 +1139,7 @@ function createSessionBundle(context) {
         await performCheckpoint(state, "shutdown");
       } catch (err) {
         process.stderr.write(
-          `[clio:session] shutdown checkpoint failed: ${err instanceof Error ? err.message : String(err)}
+          `[clio-coder:session] shutdown checkpoint failed: ${err instanceof Error ? err.message : String(err)}
 `
         );
       }
@@ -1311,6 +1311,12 @@ var SessionDomainModule = {
 };
 
 // src/domains/session/archive-readers.ts
+var ROUTING_NOTICE_CUSTOM_TYPE = "clio-coder.routing-notice";
+var LEGACY_ROUTING_NOTICE_CUSTOM_TYPE = "clio.routing-notice";
+function normalizeReleasedCustomType(entry) {
+  if (entry.kind !== "custom" || entry.customType !== LEGACY_ROUTING_NOTICE_CUSTOM_TYPE) return entry;
+  return { ...entry, customType: ROUTING_NOTICE_CUSTOM_TYPE };
+}
 async function readAuditRows(stateDir) {
   const root = join3(stateDir, "audit");
   let files;
@@ -1415,7 +1421,7 @@ function parseSessionEntries(raw, source) {
     }
     if (isSessionHeader(parsed)) continue;
     if (isSessionEntry(parsed)) {
-      entries.push(parsed);
+      entries.push(normalizeReleasedCustomType(parsed));
       continue;
     }
     errors.push(
@@ -1475,4 +1481,4 @@ export {
   ledgerUsageCalls,
   SessionDomainModule
 };
-//# sourceMappingURL=chunk-QREDIESB.js.map
+//# sourceMappingURL=chunk-X7IARSHT.js.map

package/dist/{chunk-3URVFKWK.js → chunk-XE3PCIXH.js}

@@ -4,14 +4,14 @@ import {
   listChecks,
   runProjectCheck,
   runScriptCheck
-} from "./chunk-YDFRH54B.js";
+} from "./chunk-MCMZMDAC.js";
 import {
   BROWSER_MODES,
   maxOutputArg,
   prepareVerifyArguments,
   timeoutArg,
   verifyToolSurface
-} from "./chunk-HWHKMHUA.js";
+} from "./chunk-7BHIY2MW.js";
 import {
   escapeRegExp
 } from "./chunk-VG7TBQIY.js";
@@ -28,7 +28,7 @@ import {
 import {
   combineSafeOutput,
   runCommandVector
-} from "./chunk-BBVJUZHB.js";
+} from "./chunk-HJWWJ6IL.js";
 import {
   init_esm_shims
 } from "./chunk-3R73A4XB.js";
@@ -390,7 +390,7 @@ function checkClassicJavaScript(source, label) {
   }
 }
 async function checkModuleJavaScript(source, label, options) {
-  const dir = mkdtempSync(path.join(tmpdir(), "clio-frontend-check-"));
+  const dir = mkdtempSync(path.join(tmpdir(), "clio-coder-frontend-check-"));
   const file = path.join(dir, "module.mjs");
   try {
     writeFileSync(file, source, "utf8");
@@ -633,4 +633,4 @@ var verifyTool = {
 export {
   verifyTool
 };
-//# sourceMappingURL=chunk-3URVFKWK.js.map
+//# sourceMappingURL=chunk-XE3PCIXH.js.map

package/dist/{chunk-FEFIFZTL.js → chunk-XGDPUNND.js}

@@ -1,7 +1,7 @@
 import { createRequire as __clioCreateRequire } from "node:module"; const require = __clioCreateRequire(import.meta.url);
 import {
   enabledExtensionResourceRoots
-} from "./chunk-SUW5DORT.js";
+} from "./chunk-HLAFFSEK.js";
 import {
   require_dist
 } from "./chunk-APJ265NV.js";
@@ -120,4 +120,4 @@ export {
   splitYamlFrontmatter,
   stringField
 };
-//# sourceMappingURL=chunk-FEFIFZTL.js.map
+//# sourceMappingURL=chunk-XGDPUNND.js.map

package/dist/{chunk-F4CKPOEQ.js → chunk-XOXV5GKE.js}

@@ -2,12 +2,12 @@ import { createRequire as __clioCreateRequire } from "node:module"; const requir
 import {
   canonicalJson,
   sha256
-} from "./chunk-B7OBL7PK.js";
+} from "./chunk-B74PXLU7.js";
 import {
   addResponseModelIdObservationCount,
   emptyResponseModelIdObservationCounts,
   responseModelIdObservationFromRecord
-} from "./chunk-QREDIESB.js";
+} from "./chunk-X7IARSHT.js";
 import {
   uncachedPrefillTokens
 } from "./chunk-3DPEIQKN.js";
@@ -17,16 +17,16 @@ import {
 import {
   ceilChars,
   extractReasoningTokens
-} from "./chunk-UM7N4G5A.js";
+} from "./chunk-CWVRRIEI.js";
 import {
   settingsPath
-} from "./chunk-VFA6GDY5.js";
+} from "./chunk-34BHNEE3.js";
 import {
   expandConfigPath
-} from "./chunk-SST6Z5JA.js";
+} from "./chunk-336NSSKI.js";
 import {
   isEngineContextOverflow
-} from "./chunk-UOSL25KY.js";
+} from "./chunk-VXMFAE2W.js";
 import {
   init_esm_shims
 } from "./chunk-3R73A4XB.js";
@@ -154,6 +154,50 @@ function extractMessage(err) {
   return "";
 }
 
+// src/interactive/prompt-cache-identity.ts
+init_esm_shims();
+function attachedToolSchemasFromState(tools) {
+  const schemas = [];
+  for (const tool of tools) {
+    if (!tool || typeof tool !== "object" || Array.isArray(tool)) continue;
+    const record = tool;
+    schemas.push({
+      name: typeof record.name === "string" ? record.name : "",
+      description: typeof record.description === "string" ? record.description : "",
+      parameters: record.parameters ?? null
+    });
+  }
+  return schemas;
+}
+function attachedToolSchemaBytes(schemas) {
+  try {
+    const bytes = JSON.stringify(schemas);
+    if (bytes === void 0) throw new Error("JSON.stringify returned undefined");
+    return bytes;
+  } catch (err) {
+    const reason = err instanceof Error ? err.message : String(err);
+    throw new Error(`attached tool schemas are not JSON-serializable: ${reason}`, { cause: err });
+  }
+}
+function mainPromptCacheIdentity(input) {
+  return sha256(
+    canonicalJson({
+      version: 2,
+      targetId: input.targetId,
+      runtimeId: input.runtimeId,
+      wireModelId: input.wireModelId,
+      autonomy: input.autonomy,
+      sessionId: input.sessionId,
+      cwd: input.cwd,
+      workingContextPaths: [...input.workingContextPaths].sort((a, b) => a.localeCompare(b)),
+      contextWindowSource: input.contextWindowSource,
+      promptInputEpoch: input.promptInputEpoch,
+      sessionInputs: input.sessionInputs,
+      attachedToolSchemaBytes: attachedToolSchemaBytes(input.attachedToolSchemas)
+    })
+  );
+}
+
 // src/interactive/chat-loop-messages.ts
 function notConfiguredNotice() {
   return [
@@ -272,18 +316,7 @@ function pendingSkillRequestPreamble(requests) {
   ].join("\n");
 }
 function toolSignatureFromState(tools) {
-  const schemas = [];
-  for (const tool of tools) {
-    if (!tool || typeof tool !== "object" || Array.isArray(tool)) continue;
-    const record = tool;
-    schemas.push({
-      name: typeof record.name === "string" ? record.name : "",
-      description: typeof record.description === "string" ? record.description : "",
-      parameters: record.parameters ?? null
-    });
-  }
-  schemas.sort((a, b) => a.name.localeCompare(b.name));
-  return sha256(canonicalJson(schemas));
+  return sha256(attachedToolSchemaBytes(attachedToolSchemasFromState(tools)));
 }
 function fallbackIdentityPrompt() {
   return [
@@ -907,8 +940,58 @@ function formatDimensionNote(result2) {
 }
 
 // src/core/file-references.ts
-var FILE_REF = /(^|\s)@(\S+)/g;
 var DEFAULT_IMAGE_MAX_BASE64_BYTES = 4.5 * 1024 * 1024;
+function decodeQuotedFileArg(input, start, quote) {
+  let value = "";
+  let escaped = false;
+  for (let index = start; index < input.length; index += 1) {
+    const character = input[index] ?? "";
+    if (escaped) {
+      value += character;
+      escaped = false;
+      continue;
+    }
+    if (character === "\\") {
+      escaped = true;
+      continue;
+    }
+    if (character === quote) return { value, end: index + 1 };
+    value += character;
+  }
+  return null;
+}
+function inlineFileReferences(input) {
+  const references = [];
+  for (let start = 0; start < input.length; start += 1) {
+    if (input[start] !== "@" || start > 0 && !/\s/u.test(input[start - 1] ?? "")) continue;
+    const next = input[start + 1];
+    if (next === '"' || next === "'") {
+      const decoded = decodeQuotedFileArg(input, start + 2, next);
+      if (!decoded || decoded.value.length === 0) continue;
+      references.push({
+        start,
+        end: decoded.end,
+        raw: input.slice(start, decoded.end),
+        fileArg: decoded.value,
+        quoted: true
+      });
+      start = decoded.end - 1;
+      continue;
+    }
+    let end = start + 1;
+    while (end < input.length && !/\s/u.test(input[end] ?? "")) end += 1;
+    if (end === start + 1) continue;
+    references.push({
+      start,
+      end,
+      raw: input.slice(start, end),
+      fileArg: input.slice(start + 1, end),
+      quoted: false
+    });
+    start = end - 1;
+  }
+  return references;
+}
 function renderTextFile(filePath, content) {
   return `<file name="${filePath}">
 ${content}
@@ -1024,29 +1107,25 @@ async function expandInlineFileReferencesAsync(input, options = {}) {
   const referencedPaths = [];
   let text = "";
   let lastIndex = 0;
-  for (const match of input.matchAll(FILE_REF)) {
-    const index = match.index ?? 0;
-    const full = match[0] ?? "";
-    const prefix = match[1] ?? "";
-    const token = match[2] ?? "";
-    text += input.slice(lastIndex, index);
-    const direct = await readFileReferenceAsync(token, {
+  for (const reference of inlineFileReferences(input)) {
+    text += input.slice(lastIndex, reference.start);
+    const direct = await readFileReferenceAsync(reference.fileArg, {
       ...options,
       missing: "leave",
       includeImages: options.includeImages === true
     });
-    if (direct.text !== `@${token}`) {
+    if (direct.text !== `@${reference.fileArg}`) {
       diagnostics.push(...direct.diagnostics);
       images.push(...direct.images);
       referencedPaths.push(...direct.referencedPaths);
-      text += `${prefix}${direct.text}`;
-      lastIndex = index + full.length;
+      text += direct.text;
+      lastIndex = reference.end;
       continue;
     }
-    const { fileArg, suffix } = splitTrailingPunctuation(token);
-    if (fileArg === token) {
-      text += full;
-      lastIndex = index + full.length;
+    const { fileArg, suffix } = reference.quoted ? { fileArg: reference.fileArg, suffix: "" } : splitTrailingPunctuation(reference.fileArg);
+    if (fileArg === reference.fileArg) {
+      text += reference.raw;
+      lastIndex = reference.end;
       continue;
     }
     const stripped = await readFileReferenceAsync(fileArg, {
@@ -1055,15 +1134,15 @@ async function expandInlineFileReferencesAsync(input, options = {}) {
       includeImages: options.includeImages === true
     });
     if (stripped.text === `@${fileArg}`) {
-      text += full;
-      lastIndex = index + full.length;
+      text += reference.raw;
+      lastIndex = reference.end;
       continue;
     }
     diagnostics.push(...stripped.diagnostics);
     images.push(...stripped.images);
     referencedPaths.push(...stripped.referencedPaths);
-    text += `${prefix}${stripped.text}${suffix}`;
-    lastIndex = index + full.length;
+    text += `${stripped.text}${suffix}`;
+    lastIndex = reference.end;
   }
   text += input.slice(lastIndex);
   return { text, images, diagnostics, referencedPaths };
@@ -1071,6 +1150,8 @@ async function expandInlineFileReferencesAsync(input, options = {}) {
 
 export {
   toContextOverflowError,
+  attachedToolSchemasFromState,
+  mainPromptCacheIdentity,
   notConfiguredNotice,
   extractText,
   extractUserText,
@@ -1104,4 +1185,4 @@ export {
   readFileArgsAsync,
   expandInlineFileReferencesAsync
 };
-//# sourceMappingURL=chunk-F4CKPOEQ.js.map
+//# sourceMappingURL=chunk-XOXV5GKE.js.map