opencode-acp 1.18.1-pr.416.174 → 1.18.1-pr.416.176

package/dist/index.js

@@ -3020,8 +3020,8 @@ function saveSessionState(sessionState, logger, sessionName) {
     queue = { pending: [], waiters: [], draining: false };
     saveQueues.set(key, queue);
   }
-  const promise = new Promise((resolve2, reject) => {
-    queue.waiters.push({ resolve: resolve2, reject });
+  const promise = new Promise((resolve3, reject) => {
+    queue.waiters.push({ resolve: resolve3, reject });
   });
   queue.pending.push({
     sessionId: sessionState.sessionId,
@@ -4619,8 +4619,8 @@ function restoreForkCompressionState(state, forkMessages, parent, parentMessages
       effectiveToolIds,
       // [Issue #415] The parent record is raw persisted JSON; legacy
       // 4-digit boundary refs must be normalized like every other ref.
-      startId: migrateMessageRef(block.startId),
-      endId: migrateMessageRef(block.endId)
+      startId: typeof block.startId === "string" ? migrateMessageRef(block.startId) : block.startId,
+      endId: typeof block.endId === "string" ? migrateMessageRef(block.endId) : block.endId
     });
   }
   const activeParentIds = new Set(parent.prune.messages.activeBlockIds);
@@ -9598,6 +9598,102 @@ function extractTextContent(msg) {
   return textParts.join(" ").replace(/\s+/g, " ").trim();
 }
 
+// lib/compress/tofile-target.ts
+import * as fsp from "fs/promises";
+import { homedir as homedir3, tmpdir } from "os";
+import { dirname as dirname2, join as join4, relative, resolve } from "path";
+async function resolveSafeToFileTarget(targetPath, options) {
+  const osTmp = tmpdir();
+  const allowedDirs = options?.allowedDirs ?? [osTmp, join4(homedir3(), ".cache", "opencode")];
+  const dirList = allowedDirs.join(" or ");
+  if (typeof targetPath !== "string" || targetPath.length === 0) {
+    return {
+      ok: false,
+      error: `Error: toFile path must be under ${dirList}. Got: ${targetPath}`
+    };
+  }
+  const resolvedPath = resolve(targetPath);
+  const lexicallyAllowed = allowedDirs.some((dir) => {
+    const rel = relative(resolve(dir), resolvedPath);
+    return rel === "" || !rel.startsWith("..") && !rel.startsWith("/") && !isWinAbsolute(rel);
+  });
+  if (!lexicallyAllowed) {
+    return {
+      ok: false,
+      error: `Error: toFile path must be under ${dirList}. Got: ${targetPath}`
+    };
+  }
+  let realAncestor = null;
+  const tail = [];
+  let current = resolvedPath;
+  while (true) {
+    try {
+      realAncestor = await fsp.realpath(current);
+      break;
+    } catch (err) {
+      const code = err.code;
+      if (code !== "ENOENT" && code !== "ENOTDIR") {
+        return {
+          ok: false,
+          error: `Error: cannot validate toFile path: ${err.message}`
+        };
+      }
+      const parent = dirname2(current);
+      if (parent === current) {
+        return {
+          ok: false,
+          error: `Error: cannot validate toFile path: no existing ancestor found`
+        };
+      }
+      tail.unshift(basename(current));
+      current = parent;
+    }
+  }
+  const physicalPath = tail.length > 0 ? join4(realAncestor, ...tail) : realAncestor;
+  const realAllowedDirs = [];
+  for (const dir of allowedDirs) {
+    try {
+      realAllowedDirs.push(await fsp.realpath(resolve(dir)));
+    } catch {
+    }
+  }
+  const physicallyAllowed = realAllowedDirs.every((dir) => !containsOrIs(join4(dir), physicalPath) === false) && realAllowedDirs.some((dir) => containsOrIs(join4(dir), physicalPath));
+  if (!physicallyAllowed) {
+    return {
+      ok: false,
+      error: `Error: toFile path resolves outside the allowed directories via a symlink. Got: ${targetPath}`
+    };
+  }
+  try {
+    const stat = await fsp.lstat(resolvedPath);
+    if (stat.isSymbolicLink()) {
+      return {
+        ok: false,
+        error: `Error: toFile target exists as a symlink and will not be followed. Got: ${targetPath}`
+      };
+    }
+  } catch (err) {
+    const code = err.code;
+    if (code !== "ENOENT") {
+      return {
+        ok: false,
+        error: `Error: cannot validate toFile path: ${err.message}`
+      };
+    }
+  }
+  return { ok: true, filePath: resolvedPath };
+}
+function isWinAbsolute(p) {
+  return /^[a-zA-Z]:[\\/]/.test(p);
+}
+function basename(p) {
+  return p.split(/[\\/]/).filter(Boolean).pop() ?? p;
+}
+function containsOrIs(root, p) {
+  const rel = relative(root, p);
+  return rel === "" || !rel.startsWith("..") && !rel.startsWith("/") && !isWinAbsolute(rel);
+}
+
 // lib/compress/decompress.ts
 async function prepareDecompressSession(ctx, toolCtx) {
   await toolCtx.ask({
@@ -9631,7 +9727,13 @@ function resolveTargets(args, state, rawMessages, logger) {
   if (mode.mode === "block") {
     return resolveSingleBlockTarget(messagesState, args.blockId);
   }
-  return resolveRangeTarget(state, rawMessages, args.startId, args.endId, logger);
+  return resolveRangeTarget(
+    state,
+    rawMessages,
+    args.startId,
+    args.endId,
+    logger
+  );
 }
 function resolveSingleBlockTarget(messagesState, blockIdArg) {
   const targetBlockId = parseBlockIdArg(blockIdArg);
@@ -9743,11 +9845,21 @@ IMPORTANT:
 - Do NOT call this tool in parallel with compress \u2014 their state mutations may conflict.`;
 function buildSchema2() {
   return {
-    blockId: tool3.schema.string().optional().describe('Block reference to decompress (e.g., "b0", "b2"). Mutually exclusive with startId/endId.'),
-    startId: tool3.schema.string().optional().describe('Range start: message ref (e.g., "m00150") or block ref (e.g., "b2"). Used with endId.'),
-    endId: tool3.schema.string().optional().describe('Range end: message ref (e.g., "m00200") or block ref (e.g., "b5"). Used with startId.'),
-    toFile: tool3.schema.string().optional().describe("If provided, writes restored content to this file path instead of inflating context. Block stays compressed. Path must be under /tmp or ~/.cache/opencode/. Example: '/tmp/block52.txt'"),
-    full: tool3.schema.boolean().optional().describe("If true, restores ALL content down to original messages (multi-level decompress). Default: false \u2014 restores one tier up (e.g., decompressing a T2 block restores T1 summaries, not raw messages). Use full:true only when you need the exact original content and have context budget for it.")
+    blockId: tool3.schema.string().optional().describe(
+      'Block reference to decompress (e.g., "b0", "b2"). Mutually exclusive with startId/endId.'
+    ),
+    startId: tool3.schema.string().optional().describe(
+      'Range start: message ref (e.g., "m00150") or block ref (e.g., "b2"). Used with endId.'
+    ),
+    endId: tool3.schema.string().optional().describe(
+      'Range end: message ref (e.g., "m00200") or block ref (e.g., "b5"). Used with startId.'
+    ),
+    toFile: tool3.schema.string().optional().describe(
+      "If provided, writes restored content to this file path instead of inflating context. Block stays compressed. Path must be under /tmp or ~/.cache/opencode/. Example: '/tmp/block52.txt'"
+    ),
+    full: tool3.schema.boolean().optional().describe(
+      "If true, restores ALL content down to original messages (multi-level decompress). Default: false \u2014 restores one tier up (e.g., decompressing a T2 block restores T1 summaries, not raw messages). Use full:true only when you need the exact original content and have context budget for it."
+    )
   };
 }
 function extractMessageId(m) {
@@ -9771,7 +9883,12 @@ function createDecompressTool(factoryCtx) {
       const contextUsageBefore = effectiveLimitBefore ? Math.round(
         getCurrentTokenUsage(ctx.state, rawMessages) / effectiveLimitBefore.limit * 100
       ) : void 0;
-      const resolved = resolveTargets(args, ctx.state, rawMessages, ctx.logger);
+      const resolved = resolveTargets(
+        args,
+        ctx.state,
+        rawMessages,
+        ctx.logger
+      );
       if (!resolved.ok) {
         return resolved.error;
       }
@@ -9787,19 +9904,9 @@ function createDecompressTool(factoryCtx) {
       }
       if (args.toFile) {
         const targetPath = args.toFile;
-        const os = await import("os");
-        const path = await import("path");
-        const allowedDirs = [
-          os.tmpdir() + "/",
-          path.join(os.homedir(), ".cache", "opencode") + "/"
-        ];
-        const resolvedPath = path.resolve(targetPath);
-        const isAllowed = allowedDirs.some((dir) => {
-          const rel = path.relative(dir, resolvedPath);
-          return rel === "" || !rel.startsWith("..") && !path.isAbsolute(rel);
-        });
-        if (!isAllowed) {
-          return `Error: toFile path must be under ${os.tmpdir()} or ~/.cache/opencode/. Got: ${targetPath}`;
+        const safe = await resolveSafeToFileTarget(targetPath);
+        if (!safe.ok) {
+          return safe.error;
         }
         const msgIdSet = /* @__PURE__ */ new Set();
         for (const block of activeBlocks) {
@@ -9809,9 +9916,16 @@ function createDecompressTool(factoryCtx) {
         }
         const blockMessages = rawMessages.filter((m) => msgIdSet.has(extractMessageId(m)));
         const lines2 = blockMessages.map(extractMessageText2);
-        const { writeFile: writeFile4 } = await import("fs/promises");
         const fileContent = lines2.length > 0 ? lines2.join("\n\n---\n\n") : targets[0]?.blocks[0]?.summary ?? "(no content available)";
-        await writeFile4(targetPath, fileContent, "utf-8");
+        const fsp2 = await import("fs/promises");
+        const { constants } = await import("fs");
+        const flags = constants.O_WRONLY | constants.O_CREAT | constants.O_TRUNC | (process.platform === "win32" ? 0 : constants.O_NOFOLLOW);
+        const handle = await fsp2.open(safe.filePath, flags, 384);
+        try {
+          await handle.writeFile(fileContent, "utf-8");
+        } finally {
+          await handle.close();
+        }
         const displayIds2 = targets.map((t) => `b${t.displayId}`).join(", ");
         return `Block(s) ${displayIds2} content (${blockMessages.length} messages, ${fileContent.length} chars) written to ${targetPath}. Block(s) stay compressed \u2014 context unchanged. Use read tool to access specific parts.`;
       }
@@ -9888,7 +10002,9 @@ function isLiveBlock(block) {
   return block.active && !block.deactivatedByUser && !block.deactivatedByUserDeep;
 }
 function rangeKey(startId, endId) {
-  return `${startId}::${endId}`;
+  const s = typeof startId === "string" ? migrateMessageRef(startId) : startId;
+  const e = typeof endId === "string" ? migrateMessageRef(endId) : endId;
+  return `${s}::${e}`;
 }
 function rewriteCompressInput(part, liveKeys) {
   if (part.type !== "tool") return null;
@@ -10551,10 +10667,10 @@ function hideFailedCompressCalls(messages) {
 
 // lib/logger.ts
 import { writeFile as writeFile2, mkdir as mkdir2 } from "fs/promises";
-import { join as join4 } from "path";
+import { join as join5 } from "path";
 import { existsSync as existsSync4 } from "fs";
-import { homedir as homedir3 } from "os";
-var LOG_VERSION = true ? "1.18.1-pr.416.174" : "dev";
+import { homedir as homedir4 } from "os";
+var LOG_VERSION = true ? "1.18.1-pr.416.176" : "dev";
 var LEVEL_RANK = {
   debug: 10,
   info: 20,
@@ -10574,8 +10690,8 @@ var Logger = class {
   constructor(enabled, level) {
     const resolved = level !== void 0 && LEVEL_RANK[level] !== void 0 ? level : void 0;
     this.level = resolved ?? (enabled ? "debug" : "warn");
-    const configHome = process.env.XDG_CONFIG_HOME || join4(homedir3(), ".config");
-    this.logDir = join4(configHome, "opencode", "logs", "acp");
+    const configHome = process.env.XDG_CONFIG_HOME || join5(homedir4(), ".config");
+    this.logDir = join5(configHome, "opencode", "logs", "acp");
   }
   /** Back-compat view of the old flag: true only at full debug verbosity. */
   get enabled() {
@@ -10637,11 +10753,11 @@ var Logger = class {
       const dataStr = this.formatData(data);
       const logLine = `${timestamp} ${level.padEnd(5)} ${component}: ${message}${dataStr ? " | " + dataStr : ""} | v=${LOG_VERSION}
 `;
-      const dailyLogDir = join4(this.logDir, "daily");
+      const dailyLogDir = join5(this.logDir, "daily");
       if (!existsSync4(dailyLogDir)) {
         await mkdir2(dailyLogDir, { recursive: true });
       }
-      const logFile = join4(dailyLogDir, `${(/* @__PURE__ */ new Date()).toISOString().split("T")[0]}.log`);
+      const logFile = join5(dailyLogDir, `${(/* @__PURE__ */ new Date()).toISOString().split("T")[0]}.log`);
       await writeFile2(logFile, logLine, { flag: "a" });
     } catch (error) {
     }
@@ -10752,7 +10868,7 @@ var Logger = class {
   async saveContext(sessionId, messages) {
     if (this.level !== "debug") return;
     try {
-      const contextDir = join4(this.logDir, "context", sessionId);
+      const contextDir = join5(this.logDir, "context", sessionId);
       if (!existsSync4(contextDir)) {
         await mkdir2(contextDir, { recursive: true });
       }
@@ -10760,9 +10876,9 @@ var Logger = class {
         (msg) => msg.parts && msg.parts.length > 0
       );
       const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-      const contextFile = join4(contextDir, `${timestamp}.json`);
+      const contextFile = join5(contextDir, `${timestamp}.json`);
       await writeFile2(contextFile, JSON.stringify(minimized, null, 2));
-      const versionFile = join4(contextDir, "_version");
+      const versionFile = join5(contextDir, "_version");
       if (!existsSync4(versionFile)) {
         await writeFile2(versionFile, LOG_VERSION);
       }
@@ -10773,8 +10889,8 @@ var Logger = class {
 
 // lib/prompts/store.ts
 import { existsSync as existsSync5, mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2, statSync as statSync2 } from "fs";
-import { join as join5, dirname as dirname2 } from "path";
-import { homedir as homedir4 } from "os";
+import { join as join6, dirname as dirname3 } from "path";
+import { homedir as homedir5 } from "os";
 
 // lib/prompts/system.ts
 var ACP_STATUS_TOOL_LINE_RANGES = `- \`acp_status\` \u2014 Context status with compressible ranges. No args = overview + ranges. \`scope:"uncompressed"\` for range view; add \`view:"messages"\` for per-message listing with \`tool\`/\`sort\` filters. \`scope:"compressed"\` for block details.`;
@@ -11081,7 +11197,7 @@ function createBundledRuntimePrompts(candidatesEnabled) {
 function findOpencodeDir2(startDir) {
   let current = startDir;
   while (current !== "/") {
-    const candidate = join5(current, ".opencode");
+    const candidate = join6(current, ".opencode");
     if (existsSync5(candidate)) {
       try {
         if (statSync2(candidate).isDirectory()) {
@@ -11090,7 +11206,7 @@ function findOpencodeDir2(startDir) {
       } catch {
       }
     }
-    const parent = dirname2(current);
+    const parent = dirname3(current);
     if (parent === current) {
       break;
     }
@@ -11099,13 +11215,13 @@ function findOpencodeDir2(startDir) {
   return null;
 }
 function resolvePromptPaths(workingDirectory) {
-  const configHome = process.env.XDG_CONFIG_HOME || join5(homedir4(), ".config");
-  const globalRoot = join5(configHome, "opencode", "acp-prompts");
-  const defaultsDir = join5(globalRoot, "defaults");
-  const globalOverridesDir = join5(globalRoot, "overrides");
-  const configDirOverridesDir = process.env.OPENCODE_CONFIG_DIR ? join5(process.env.OPENCODE_CONFIG_DIR, "acp-prompts", "overrides") : null;
+  const configHome = process.env.XDG_CONFIG_HOME || join6(homedir5(), ".config");
+  const globalRoot = join6(configHome, "opencode", "acp-prompts");
+  const defaultsDir = join6(globalRoot, "defaults");
+  const globalOverridesDir = join6(globalRoot, "overrides");
+  const configDirOverridesDir = process.env.OPENCODE_CONFIG_DIR ? join6(process.env.OPENCODE_CONFIG_DIR, "acp-prompts", "overrides") : null;
   const opencodeDir = findOpencodeDir2(workingDirectory);
-  const projectOverridesDir = opencodeDir ? join5(opencodeDir, "acp-prompts", "overrides") : null;
+  const projectOverridesDir = opencodeDir ? join6(opencodeDir, "acp-prompts", "overrides") : null;
   return {
     defaultsDir,
     globalOverridesDir,
@@ -11278,16 +11394,16 @@ var PromptStore = class {
     const candidates = [];
     if (this.paths.projectOverridesDir) {
       candidates.push({
-        path: join5(this.paths.projectOverridesDir, fileName)
+        path: join6(this.paths.projectOverridesDir, fileName)
       });
     }
     if (this.paths.configDirOverridesDir) {
       candidates.push({
-        path: join5(this.paths.configDirOverridesDir, fileName)
+        path: join6(this.paths.configDirOverridesDir, fileName)
       });
     }
     candidates.push({
-      path: join5(this.paths.globalOverridesDir, fileName)
+      path: join6(this.paths.globalOverridesDir, fileName)
     });
     return candidates;
   }
@@ -11311,7 +11427,7 @@ var PromptStore = class {
       const managedContent = buildDefaultPromptFileContent(
         bundledEditable || bundledPrompts[definition.runtimeField]
       );
-      const filePath = join5(this.paths.defaultsDir, definition.fileName);
+      const filePath = join6(this.paths.defaultsDir, definition.fileName);
       try {
         const existing = readFileIfExists(filePath);
         if (existing === managedContent) {
@@ -11325,7 +11441,7 @@ var PromptStore = class {
         });
       }
     }
-    const readmePath = join5(this.paths.defaultsDir, DEFAULTS_README_FILE);
+    const readmePath = join6(this.paths.defaultsDir, DEFAULTS_README_FILE);
     const readmeContent = buildDefaultsReadmeContent();
     try {
       const existing = readFileIfExists(readmePath);
@@ -11790,7 +11906,7 @@ ${report}`;
 // lib/commands/export.ts
 import * as fs2 from "fs/promises";
 import { existsSync as existsSync6 } from "fs";
-import { dirname as dirname3, isAbsolute as isAbsolute2, join as join6, resolve } from "path";
+import { dirname as dirname4, isAbsolute as isAbsolute2, join as join7, resolve as resolve2 } from "path";
 var ALL_TIERS = [1, 2, 3];
 var TIER_NAMES = {
   1: "Tier 1 \u2014 Capture",
@@ -11903,7 +12019,7 @@ function parseTiers(raw) {
 }
 function resolveDefaultOutputPath(sessionId, cwd2) {
   const short = (sessionId || "session").slice(0, 8);
-  return join6(cwd2, ".opencode", `acp-export-${short}.md`);
+  return join7(cwd2, ".opencode", `acp-export-${short}.md`);
 }
 function formatTokens2(n) {
   if (!Number.isFinite(n) || n <= 0) return "0";
@@ -12031,9 +12147,9 @@ async function handleExportCommand(ctx, args) {
     return;
   }
   const cwd2 = ctx.workingDirectory || process.cwd();
-  const targetPath = options.outputPath !== "" ? isAbsolute2(options.outputPath) ? options.outputPath : resolve(cwd2, options.outputPath) : resolveDefaultOutputPath(sessionId, cwd2);
+  const targetPath = options.outputPath !== "" ? isAbsolute2(options.outputPath) ? options.outputPath : resolve2(cwd2, options.outputPath) : resolveDefaultOutputPath(sessionId, cwd2);
   try {
-    const dir = dirname3(targetPath);
+    const dir = dirname4(targetPath);
     if (!existsSync6(dir)) {
       await fs2.mkdir(dir, { recursive: true });
     }
@@ -13026,7 +13142,7 @@ function findBiliProxyProviders(provider) {
 
 // lib/update.ts
 import { readFile as readFile2, rm } from "fs/promises";
-import { basename, dirname as dirname4, join as join7 } from "path";
+import { basename as basename2, dirname as dirname5, join as join8 } from "path";
 import { fileURLToPath } from "url";
 var PACKAGE_NAME = "opencode-acp";
 function startAutoUpdate(ctx, enabled, logger) {
@@ -13073,7 +13189,7 @@ async function checkAutoUpdate(signal, logger) {
     logger?.info("Auto-update skipped: package dir not found");
     return { updated: false };
   }
-  const pkg = await readPackageJson(join7(packageDir, "package.json"));
+  const pkg = await readPackageJson(join8(packageDir, "package.json"));
   if (!pkg?.name || !pkg.version) {
     logger?.info("Auto-update skipped: package.json unreadable", { packageDir });
     return { updated: false };
@@ -13112,21 +13228,21 @@ async function checkAutoUpdate(signal, logger) {
   return { updated: true, name: pkg.name, current: pkg.version, latest };
 }
 async function findPackageDir(name) {
-  let dir = dirname4(fileURLToPath(import.meta.url));
+  let dir = dirname5(fileURLToPath(import.meta.url));
   for (; ; ) {
-    const pkg = await readPackageJson(join7(dir, "package.json"));
+    const pkg = await readPackageJson(join8(dir, "package.json"));
     if (pkg?.name === name) return dir;
-    const parent = dirname4(dir);
+    const parent = dirname5(dir);
     if (parent === dir) return void 0;
     dir = parent;
   }
 }
 async function updateTarget(packageDir, name) {
-  const packageParent = dirname4(packageDir);
-  const nodeModulesDir = basename(packageParent).startsWith("@") ? dirname4(packageParent) : packageParent;
-  if (basename(nodeModulesDir) !== "node_modules") return void 0;
-  const wrapperDir = dirname4(nodeModulesDir);
-  const wrapperPkg = await readPackageJson(join7(wrapperDir, "package.json"));
+  const packageParent = dirname5(packageDir);
+  const nodeModulesDir = basename2(packageParent).startsWith("@") ? dirname5(packageParent) : packageParent;
+  if (basename2(nodeModulesDir) !== "node_modules") return void 0;
+  const wrapperDir = dirname5(nodeModulesDir);
+  const wrapperPkg = await readPackageJson(join8(wrapperDir, "package.json"));
   const spec = wrapperSpec(wrapperDir, name) ?? wrapperPkg?.dependencies?.[name];
   if (!spec || !isAutoUpdatableSpec(spec)) return void 0;
   return { removeDir: wrapperDir, spec };
@@ -13134,13 +13250,13 @@ async function updateTarget(packageDir, name) {
 function wrapperSpec(wrapperDir, name) {
   if (name.startsWith("@")) {
     const [scope, pkg] = name.split("/");
-    if (!scope || !pkg || basename(dirname4(wrapperDir)) !== scope) return void 0;
+    if (!scope || !pkg || basename2(dirname5(wrapperDir)) !== scope) return void 0;
     const prefix2 = `${pkg}@`;
-    const base2 = basename(wrapperDir);
+    const base2 = basename2(wrapperDir);
     return base2.startsWith(prefix2) ? base2.slice(prefix2.length) : void 0;
   }
   const prefix = `${name}@`;
-  const base = basename(wrapperDir);
+  const base = basename2(wrapperDir);
   return base.startsWith(prefix) ? base.slice(prefix.length) : void 0;
 }
 function isAutoUpdatableSpec(spec) {
@@ -13238,7 +13354,7 @@ var server = (async (ctx) => {
   }
   const logger = new Logger(config.debug, config.debug ? "debug" : config.logLevel);
   logger.info("ACP plugin initialized", {
-    version: true ? "1.18.1-pr.416.174" : "dev",
+    version: true ? "1.18.1-pr.416.176" : "dev",
     workspace: ctx.directory,
     logLevel: logger.level,
     debug: config.debug,