opencode-acp 1.0.0 → 1.1.0

package/dist/index.js

@@ -1,5 +1,5 @@
 // lib/config.ts
-import { readFileSync, writeFileSync, existsSync, mkdirSync, statSync } from "fs";
+import { readFileSync, writeFileSync, existsSync, mkdirSync, statSync, copyFileSync } from "fs";
 import { join, dirname } from "path";
 import { homedir } from "os";
 
@@ -862,20 +862,7 @@ var ParseErrorCode;
   ParseErrorCode2[ParseErrorCode2["InvalidCharacter"] = 16] = "InvalidCharacter";
 })(ParseErrorCode || (ParseErrorCode = {}));
 
-// lib/config.ts
-var DEFAULT_PROTECTED_TOOLS = [
-  "task",
-  "skill",
-  "todowrite",
-  "todoread",
-  "compress",
-  "batch",
-  "plan_enter",
-  "plan_exit",
-  "write",
-  "edit"
-];
-var COMPRESS_DEFAULT_PROTECTED_TOOLS = ["task", "skill", "todowrite", "todoread"];
+// lib/config-validation.ts
 var VALID_CONFIG_KEYS = /* @__PURE__ */ new Set([
   "$schema",
   "enabled",
@@ -1267,7 +1254,7 @@ function validateConfigTypes(config) {
       }
       if (gc.majorGcThresholdPercent !== void 0) {
         const isValidNumber = typeof gc.majorGcThresholdPercent === "number";
-        const isPercentString = typeof gc.majorGcThresholdPercent === "string" && gc.majorGcThresholdPercent.endsWith("%");
+        const isPercentString = typeof gc.majorGcThresholdPercent === "string" && /^\d+(?:\.\d+)?%$/.test(gc.majorGcThresholdPercent);
         if (!isValidNumber && !isPercentString) {
           errors.push({
             key: "gc.majorGcThresholdPercent",
@@ -1279,54 +1266,97 @@ function validateConfigTypes(config) {
     }
   }
   const strategies = config.strategies;
-  if (strategies) {
-    if (strategies.deduplication?.enabled !== void 0 && typeof strategies.deduplication.enabled !== "boolean") {
-      errors.push({
-        key: "strategies.deduplication.enabled",
-        expected: "boolean",
-        actual: typeof strategies.deduplication.enabled
-      });
-    }
-    if (strategies.deduplication?.protectedTools !== void 0 && !Array.isArray(strategies.deduplication.protectedTools)) {
+  if (strategies !== void 0) {
+    if (typeof strategies !== "object" || strategies === null || Array.isArray(strategies)) {
       errors.push({
-        key: "strategies.deduplication.protectedTools",
-        expected: "string[]",
-        actual: typeof strategies.deduplication.protectedTools
+        key: "strategies",
+        expected: "object",
+        actual: typeof strategies
       });
-    }
-    if (strategies.purgeErrors) {
-      if (strategies.purgeErrors.enabled !== void 0 && typeof strategies.purgeErrors.enabled !== "boolean") {
-        errors.push({
-          key: "strategies.purgeErrors.enabled",
-          expected: "boolean",
-          actual: typeof strategies.purgeErrors.enabled
-        });
-      }
-      if (strategies.purgeErrors.turns !== void 0 && typeof strategies.purgeErrors.turns !== "number") {
-        errors.push({
-          key: "strategies.purgeErrors.turns",
-          expected: "number",
-          actual: typeof strategies.purgeErrors.turns
-        });
-      }
-      if (typeof strategies.purgeErrors.turns === "number" && strategies.purgeErrors.turns < 1) {
-        errors.push({
-          key: "strategies.purgeErrors.turns",
-          expected: "positive number (>= 1)",
-          actual: `${strategies.purgeErrors.turns} (will be clamped to 1)`
-        });
+    } else {
+      const dedup = strategies.deduplication;
+      if (dedup !== void 0) {
+        if (typeof dedup !== "object" || dedup === null || Array.isArray(dedup)) {
+          errors.push({
+            key: "strategies.deduplication",
+            expected: "object",
+            actual: typeof dedup
+          });
+        } else {
+          if (dedup.enabled !== void 0 && typeof dedup.enabled !== "boolean") {
+            errors.push({
+              key: "strategies.deduplication.enabled",
+              expected: "boolean",
+              actual: typeof dedup.enabled
+            });
+          }
+          if (dedup.protectedTools !== void 0 && !Array.isArray(dedup.protectedTools)) {
+            errors.push({
+              key: "strategies.deduplication.protectedTools",
+              expected: "string[]",
+              actual: typeof dedup.protectedTools
+            });
+          }
+        }
       }
-      if (strategies.purgeErrors.protectedTools !== void 0 && !Array.isArray(strategies.purgeErrors.protectedTools)) {
-        errors.push({
-          key: "strategies.purgeErrors.protectedTools",
-          expected: "string[]",
-          actual: typeof strategies.purgeErrors.protectedTools
-        });
+      const purge = strategies.purgeErrors;
+      if (purge !== void 0) {
+        if (typeof purge !== "object" || purge === null || Array.isArray(purge)) {
+          errors.push({
+            key: "strategies.purgeErrors",
+            expected: "object",
+            actual: typeof purge
+          });
+        } else {
+          if (purge.enabled !== void 0 && typeof purge.enabled !== "boolean") {
+            errors.push({
+              key: "strategies.purgeErrors.enabled",
+              expected: "boolean",
+              actual: typeof purge.enabled
+            });
+          }
+          if (purge.turns !== void 0 && typeof purge.turns !== "number") {
+            errors.push({
+              key: "strategies.purgeErrors.turns",
+              expected: "number",
+              actual: typeof purge.turns
+            });
+          }
+          if (typeof purge.turns === "number" && purge.turns < 1) {
+            errors.push({
+              key: "strategies.purgeErrors.turns",
+              expected: "positive number (>= 1)",
+              actual: `${purge.turns} (will be clamped to 1)`
+            });
+          }
+          if (purge.protectedTools !== void 0 && !Array.isArray(purge.protectedTools)) {
+            errors.push({
+              key: "strategies.purgeErrors.protectedTools",
+              expected: "string[]",
+              actual: typeof purge.protectedTools
+            });
+          }
+        }
       }
     }
   }
   return errors;
 }
+
+// lib/config.ts
+var DEFAULT_PROTECTED_TOOLS = [
+  "task",
+  "skill",
+  "todowrite",
+  "todoread",
+  "compress",
+  "batch",
+  "plan_enter",
+  "plan_exit",
+  "write",
+  "edit"
+];
+var COMPRESS_DEFAULT_PROTECTED_TOOLS = ["task", "skill", "todowrite", "todoread"];
 function showConfigWarnings(ctx, configPath, configData, isProject) {
   const invalidKeys = getInvalidConfigKeys(configData);
   const typeErrors = validateConfigTypes(configData);
@@ -1389,10 +1419,10 @@ var defaultConfig = {
   compress: {
     mode: "range",
     permission: "allow",
-    showCompression: false,
+    showCompression: true,
     summaryBuffer: true,
-    maxContextLimit: 1e5,
-    minContextLimit: 5e4,
+    maxContextLimit: "55%",
+    minContextLimit: "45%",
     nudgeFrequency: 5,
     iterationNudgeThreshold: 15,
     nudgeForce: "soft",
@@ -1416,12 +1446,14 @@ var defaultConfig = {
     promotionThreshold: 5,
     maxBlockAge: 15,
     maxOldGenSummaryLength: 3e3,
-    majorGcThresholdPercent: "55%"
+    majorGcThresholdPercent: "100%"
   }
 };
 var GLOBAL_CONFIG_DIR = process.env.XDG_CONFIG_HOME ? join(process.env.XDG_CONFIG_HOME, "opencode") : join(homedir(), ".config", "opencode");
-var GLOBAL_CONFIG_PATH_JSONC = join(GLOBAL_CONFIG_DIR, "dcp.jsonc");
-var GLOBAL_CONFIG_PATH_JSON = join(GLOBAL_CONFIG_DIR, "dcp.json");
+var GLOBAL_CONFIG_PATH_JSONC = join(GLOBAL_CONFIG_DIR, "acp.jsonc");
+var GLOBAL_CONFIG_PATH_JSON = join(GLOBAL_CONFIG_DIR, "acp.json");
+var LEGACY_GLOBAL_CONFIG_PATH_JSONC = join(GLOBAL_CONFIG_DIR, "dcp.jsonc");
+var LEGACY_GLOBAL_CONFIG_PATH_JSON = join(GLOBAL_CONFIG_DIR, "dcp.json");
 function findOpencodeDir(startDir) {
   let current = startDir;
   while (current !== "/") {
@@ -1438,21 +1470,25 @@ function findOpencodeDir(startDir) {
   return null;
 }
 function getConfigPaths(ctx) {
-  const global = existsSync(GLOBAL_CONFIG_PATH_JSONC) ? GLOBAL_CONFIG_PATH_JSONC : existsSync(GLOBAL_CONFIG_PATH_JSON) ? GLOBAL_CONFIG_PATH_JSON : null;
+  const global = existsSync(GLOBAL_CONFIG_PATH_JSONC) ? GLOBAL_CONFIG_PATH_JSONC : existsSync(GLOBAL_CONFIG_PATH_JSON) ? GLOBAL_CONFIG_PATH_JSON : existsSync(LEGACY_GLOBAL_CONFIG_PATH_JSONC) ? LEGACY_GLOBAL_CONFIG_PATH_JSONC : existsSync(LEGACY_GLOBAL_CONFIG_PATH_JSON) ? LEGACY_GLOBAL_CONFIG_PATH_JSON : null;
   let configDir = null;
   const opencodeConfigDir = process.env.OPENCODE_CONFIG_DIR;
   if (opencodeConfigDir) {
-    const configJsonc = join(opencodeConfigDir, "dcp.jsonc");
-    const configJson = join(opencodeConfigDir, "dcp.json");
-    configDir = existsSync(configJsonc) ? configJsonc : existsSync(configJson) ? configJson : null;
+    const configJsonc = join(opencodeConfigDir, "acp.jsonc");
+    const configJson = join(opencodeConfigDir, "acp.json");
+    const legacyJsonc = join(opencodeConfigDir, "dcp.jsonc");
+    const legacyJson = join(opencodeConfigDir, "dcp.json");
+    configDir = existsSync(configJsonc) ? configJsonc : existsSync(configJson) ? configJson : existsSync(legacyJsonc) ? legacyJsonc : existsSync(legacyJson) ? legacyJson : null;
   }
   let project = null;
   if (ctx?.directory) {
     const opencodeDir = findOpencodeDir(ctx.directory);
     if (opencodeDir) {
-      const projectJsonc = join(opencodeDir, "dcp.jsonc");
-      const projectJson = join(opencodeDir, "dcp.json");
-      project = existsSync(projectJsonc) ? projectJsonc : existsSync(projectJson) ? projectJson : null;
+      const projectJsonc = join(opencodeDir, "acp.jsonc");
+      const projectJson = join(opencodeDir, "acp.json");
+      const legacyJsonc = join(opencodeDir, "dcp.jsonc");
+      const legacyJson = join(opencodeDir, "dcp.json");
+      project = existsSync(projectJsonc) ? projectJsonc : existsSync(projectJson) ? projectJson : existsSync(legacyJsonc) ? legacyJsonc : existsSync(legacyJson) ? legacyJson : null;
     }
   }
   return { global, configDir, project };
@@ -1461,11 +1497,21 @@ function createDefaultConfig() {
   if (!existsSync(GLOBAL_CONFIG_DIR)) {
     mkdirSync(GLOBAL_CONFIG_DIR, { recursive: true });
   }
-  const configContent = `{
+  if (!existsSync(GLOBAL_CONFIG_PATH_JSONC)) {
+    if (existsSync(LEGACY_GLOBAL_CONFIG_PATH_JSONC)) {
+      copyFileSync(LEGACY_GLOBAL_CONFIG_PATH_JSONC, GLOBAL_CONFIG_PATH_JSONC);
+      console.log("[ACP] Migrated config from dcp.jsonc to acp.jsonc");
+    } else if (existsSync(LEGACY_GLOBAL_CONFIG_PATH_JSON)) {
+      copyFileSync(LEGACY_GLOBAL_CONFIG_PATH_JSON, GLOBAL_CONFIG_PATH_JSONC);
+      console.log("[ACP] Migrated config from dcp.json to acp.jsonc");
+    } else {
+      const configContent = `{
   "$schema": "https://raw.githubusercontent.com/Opencode-DCP/opencode-dynamic-context-pruning/master/dcp.schema.json"
 }
 `;
-  writeFileSync(GLOBAL_CONFIG_PATH_JSONC, configContent, "utf-8");
+      writeFileSync(GLOBAL_CONFIG_PATH_JSONC, configContent, "utf-8");
+    }
+  }
 }
 function loadConfigFile(configPath) {
   let fileContent = "";
@@ -1627,7 +1673,21 @@ function scheduleParseWarning(ctx, title, message) {
 function getConfig(ctx) {
   let config = deepCloneConfig(defaultConfig);
   const configPaths = getConfigPaths(ctx);
-  if (!configPaths.global) {
+  if (!existsSync(GLOBAL_CONFIG_PATH_JSONC) && !existsSync(GLOBAL_CONFIG_PATH_JSON)) {
+    if (existsSync(GLOBAL_CONFIG_DIR) || existsSync(LEGACY_GLOBAL_CONFIG_PATH_JSONC) || existsSync(LEGACY_GLOBAL_CONFIG_PATH_JSON)) {
+      if (!existsSync(GLOBAL_CONFIG_DIR)) {
+        mkdirSync(GLOBAL_CONFIG_DIR, { recursive: true });
+      }
+      if (existsSync(LEGACY_GLOBAL_CONFIG_PATH_JSONC)) {
+        copyFileSync(LEGACY_GLOBAL_CONFIG_PATH_JSONC, GLOBAL_CONFIG_PATH_JSONC);
+        console.log("[ACP] Migrated config from dcp.jsonc to acp.jsonc");
+      } else if (existsSync(LEGACY_GLOBAL_CONFIG_PATH_JSON)) {
+        copyFileSync(LEGACY_GLOBAL_CONFIG_PATH_JSON, GLOBAL_CONFIG_PATH_JSONC);
+        console.log("[ACP] Migrated config from dcp.json to acp.jsonc");
+      }
+    }
+  }
+  if (!configPaths.global && !existsSync(GLOBAL_CONFIG_PATH_JSONC)) {
     createDefaultConfig();
   }
   const layers = [
@@ -1871,8 +1931,8 @@ THE FORMAT OF COMPRESS
   topic: string,           // Short label (3-5 words) - e.g., "Auth System Exploration"
   content: [               // One or more ranges to compress
     {
-      startId: string,     // Boundary ID at range start: mNNNN or bN
-      endId: string,       // Boundary ID at range end: mNNNN or bN
+      startId: string,     // Boundary ID at range start: mNNNNN or bN
+      endId: string,       // Boundary ID at range end: mNNNNN or bN
       summary: string      // Complete technical summary replacing all content in range
     }
   ]
@@ -1886,7 +1946,7 @@ THE FORMAT OF COMPRESS
   topic: string,           // Short label (3-5 words) for the overall batch
   content: [               // One or more messages to compress independently
     {
-      messageId: string,   // Raw message ID only: mNNNN (ignore metadata attributes like priority)
+      messageId: string,   // Raw message ID only: mNNNNN (ignore metadata attributes like priority)
       topic: string,       // Short label (3-5 words) for this one message summary
       summary: string      // Complete technical summary replacing that one message
     }
@@ -1895,16 +1955,16 @@ THE FORMAT OF COMPRESS
 \`\`\``;
 
 // lib/message-ids.ts
-var MESSAGE_REF_REGEX = /^m(\d{4})$/;
+var MESSAGE_REF_REGEX = /^m(\d{4,5})$/;
 var BLOCK_REF_REGEX = /^b([1-9]\d*)$/;
 var MESSAGE_ID_TAG_NAME = "dcp-message-id";
-var MESSAGE_REF_WIDTH = 4;
+var MESSAGE_REF_WIDTH = 5;
 var MESSAGE_REF_MIN_INDEX = 1;
-var MESSAGE_REF_MAX_INDEX = 9999;
+var MESSAGE_REF_MAX_INDEX = 99999;
 function formatMessageRef(index) {
   if (!Number.isInteger(index) || index < MESSAGE_REF_MIN_INDEX || index > MESSAGE_REF_MAX_INDEX) {
     throw new Error(
-      `Message ID index out of bounds: ${index}. Supported range is 0-${MESSAGE_REF_MAX_INDEX}.`
+      `Message ID index out of bounds: ${index}. Supported range is ${MESSAGE_REF_MIN_INDEX}-${MESSAGE_REF_MAX_INDEX}.`
     );
   }
   return `m${index.toString().padStart(MESSAGE_REF_WIDTH, "0")}`;
@@ -2059,10 +2119,10 @@ function resolveBoundaryIds(context, state, startId, endId) {
   const parsedStartId = parseBoundaryId(startId);
   const parsedEndId = parseBoundaryId(endId);
   if (parsedStartId === null) {
-    issues.push("startId is invalid. Use an injected message ID (mNNNN) or block ID (bN).");
+    issues.push("startId is invalid. Use an injected message ID (mNNNNN) or block ID (bN).");
   }
   if (parsedEndId === null) {
-    issues.push("endId is invalid. Use an injected message ID (mNNNN) or block ID (bN).");
+    issues.push("endId is invalid. Use an injected message ID (mNNNNN) or block ID (bN).");
   }
   if (issues.length > 0) {
     throw new Error(
@@ -2517,16 +2577,16 @@ var ISSUE_TEMPLATES = {
     "refer to protected messages and cannot be compressed."
   ],
   "invalid-format": [
-    "is invalid. Use an injected raw message ID of the form mNNNN.",
-    "are invalid. Use injected raw message IDs of the form mNNNN."
+    "is invalid. Use an injected raw message ID of the form mNNNNN.",
+    "are invalid. Use injected raw message IDs of the form mNNNNN."
   ],
   "block-id": [
-    "is invalid here. Block IDs like bN are not allowed; use an mNNNN message ID instead.",
-    "are invalid here. Block IDs like bN are not allowed; use mNNNN message IDs instead."
+    "is invalid here. Block IDs like bN are not allowed; use an mNNNNN message ID instead.",
+    "are invalid here. Block IDs like bN are not allowed; use mNNNNN message IDs instead."
   ],
   "not-in-context": [
-    "is not available in the current conversation context. Choose an injected mNNNN ID visible in context.",
-    "are not available in the current conversation context. Choose injected mNNNN IDs visible in context."
+    "is not available in the current conversation context. Choose an injected mNNNNN ID visible in context.",
+    "are not available in the current conversation context. Choose injected mNNNNN IDs visible in context."
   ],
   protected: [
     "refers to a protected message and cannot be compressed.",
@@ -2893,6 +2953,11 @@ function resetOnCompaction(state) {
     turnNudgeAnchors: /* @__PURE__ */ new Set(),
     iterationNudgeAnchors: /* @__PURE__ */ new Set()
   };
+  state.messageIds = {
+    byRawId: /* @__PURE__ */ new Map(),
+    byRef: /* @__PURE__ */ new Map(),
+    nextRef: 1
+  };
 }
 
 // lib/state/persistence.ts
@@ -2910,19 +2975,19 @@ var STORAGE_DIR = join2(
   "plugin",
   "acp"
 );
-function migrateFromLegacyIfNeeded() {
+function migrateFromLegacyIfNeeded(logger) {
   if (existsSyncSync(STORAGE_DIR)) return;
   if (!existsSyncSync(LEGACY_STORAGE_DIR)) return;
   try {
     cpSync(LEGACY_STORAGE_DIR, STORAGE_DIR, { recursive: true });
-    console.log(`[ACP] Migrated storage from ${LEGACY_STORAGE_DIR} \u2192 ${STORAGE_DIR}`);
+    logger.info(`[ACP] Migrated storage from ${LEGACY_STORAGE_DIR} \u2192 ${STORAGE_DIR}`);
   } catch (e) {
-    console.warn(`[ACP] Storage migration failed: ${e.message}`);
+    logger.warn(`[ACP] Storage migration failed: ${e.message}`);
   }
 }
-async function ensureStorageDir() {
+async function ensureStorageDir(logger) {
   if (!existsSync2(STORAGE_DIR)) {
-    migrateFromLegacyIfNeeded();
+    migrateFromLegacyIfNeeded(logger);
     await fs.mkdir(STORAGE_DIR, { recursive: true });
   }
 }
@@ -2930,7 +2995,7 @@ function getSessionFilePath(sessionId) {
   return join2(STORAGE_DIR, `${sessionId}.json`);
 }
 async function writePersistedSessionState(sessionId, state, logger) {
-  await ensureStorageDir();
+  await ensureStorageDir(logger);
   const filePath = getSessionFilePath(sessionId);
   const content = JSON.stringify(state, null, 2);
   await fs.writeFile(filePath, content, "utf-8");
@@ -3265,6 +3330,17 @@ async function ensureSessionInitialized(client, state, sessionId, logger, messag
         state.messageIds.byRef.delete(ref);
       }
     }
+    for (const [rawId, oldRef] of state.messageIds.byRawId) {
+      const parsed = parseMessageRef(oldRef);
+      if (parsed !== null) {
+        const newRef = formatMessageRef(parsed);
+        if (newRef !== oldRef) {
+          state.messageIds.byRawId.set(rawId, newRef);
+          state.messageIds.byRef.delete(oldRef);
+          state.messageIds.byRef.set(newRef, rawId);
+        }
+      }
+    }
   }
   if (persistedAny._persistedLastCompaction !== void 0) {
     state.lastCompaction = Math.max(state.lastCompaction, persistedAny._persistedLastCompaction);
@@ -4254,7 +4330,7 @@ function buildSchema() {
     ),
     content: tool.schema.array(
       tool.schema.object({
-        messageId: tool.schema.string().describe("Raw message ID to compress (e.g. m0001)"),
+        messageId: tool.schema.string().describe("Raw message ID to compress (e.g. m00001)"),
         topic: tool.schema.string().describe("Short label (3-5 words) for this one message summary"),
         summary: tool.schema.string().describe("Complete technical summary replacing that one message")
       })
@@ -4491,9 +4567,9 @@ function buildSchema2() {
     content: tool2.schema.array(
       tool2.schema.object({
         startId: tool2.schema.string().describe(
-          "Message or block ID marking the beginning of range (e.g. m0001, b2)"
+          "Message or block ID marking the beginning of range (e.g. m00001, b2)"
         ),
-        endId: tool2.schema.string().describe("Message or block ID marking the end of range (e.g. m0012, b5)"),
+        endId: tool2.schema.string().describe("Message or block ID marking the end of range (e.g. m00012, b5)"),
         summary: tool2.schema.string().describe("Complete technical summary replacing all content in range")
       })
     ).describe(
@@ -4888,7 +4964,7 @@ var Logger = class {
 };
 
 // lib/prompts/store.ts
-import { existsSync as existsSync4, mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2, statSync as statSync2 } from "fs";
+import { existsSync as existsSync4, mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2, statSync as statSync2, cpSync as cpSync2 } from "fs";
 import { join as join4, dirname as dirname2 } from "path";
 import { homedir as homedir4 } from "os";
 
@@ -4948,7 +5024,7 @@ Compressed block sections in context are clearly marked with a header:
 
 - \`[Compressed conversation section]\`
 
-Compressed block IDs always use the \`bN\` form (never \`mNNNN\`) and are represented in the same XML metadata tag format.
+Compressed block IDs always use the \`bN\` form (never \`mNNNNN\`) and are represented in the same XML metadata tag format.
 
 Rules:
 
@@ -4971,7 +5047,7 @@ When you use compressed block placeholders, write the surrounding summary text s
 BOUNDARY IDS
 You specify boundaries by ID using the injected IDs visible in the conversation:
 
-- \`mNNNN\` IDs identify raw messages
+- \`mNNNNN\` IDs identify raw messages
 - \`bN\` IDs identify previously compressed blocks
 
 Each message has an ID inside XML metadata tags like \`<dcp-message-id>...</dcp-message-id>\`.
@@ -5006,11 +5082,11 @@ If a message contains no significant technical decisions, code changes, or user
 MESSAGE IDS
 You specify individual raw messages by ID using the injected IDs visible in the conversation:
 
-- \`mNNNN\` IDs identify raw messages
+- \`mNNNNN\` IDs identify raw messages
 
 Each message has an ID inside XML metadata tags like \`<dcp-message-id priority="high">m0007</dcp-message-id>\`.
 The same ID tag appears in every tool output of the message it belongs to \u2014 each unique ID identifies one complete message.
-Treat these tags as message metadata only, not as content to summarize. Use only the inner \`mNNNN\` value as the \`messageId\`.
+Treat these tags as message metadata only, not as content to summarize. Use only the inner \`mNNNNN\` value as the \`messageId\`.
 The \`priority\` attribute indicates relative context cost. You MUST compress high-priority messages when their full text is no longer necessary for the active task.
 If prior compress-tool results are present, always compress and summarize them minimally only as part of a broader compression pass. Do not invoke the compress tool solely to re-compress an earlier compression result.
 Messages marked as \`<dcp-message-id>BLOCKED</dcp-message-id>\` cannot be compressed.
@@ -5018,8 +5094,8 @@ Messages marked as \`<dcp-message-id>BLOCKED</dcp-message-id>\` cannot be compre
 Rules:
 
 - Pick each \`messageId\` directly from injected IDs visible in context.
-- Only use raw message IDs of the form \`mNNNN\`.
-- Ignore XML attributes such as \`priority\` when copying the ID; use only the inner \`mNNNN\` value.
+- Only use raw message IDs of the form \`mNNNNN\`.
+- Ignore XML attributes such as \`priority\` when copying the ID; use only the inner \`mNNNNN\` value.
 - Do not invent IDs. Use only IDs that are present in context.
 
 BATCHING
@@ -5228,12 +5304,21 @@ function findOpencodeDir2(startDir) {
 }
 function resolvePromptPaths(workingDirectory) {
   const configHome = process.env.XDG_CONFIG_HOME || join4(homedir4(), ".config");
-  const globalRoot = join4(configHome, "opencode", "dcp-prompts");
+  const globalRoot = join4(configHome, "opencode", "acp-prompts");
+  const legacyGlobalRoot = join4(configHome, "opencode", "dcp-prompts");
+  if (!existsSync4(globalRoot) && existsSync4(legacyGlobalRoot)) {
+    try {
+      cpSync2(legacyGlobalRoot, globalRoot, { recursive: true });
+      console.log("[ACP] Migrated prompts from dcp-prompts to acp-prompts");
+    } catch (e) {
+      console.warn(`[ACP] Prompts migration failed: ${e.message}`);
+    }
+  }
   const defaultsDir = join4(globalRoot, "defaults");
   const globalOverridesDir = join4(globalRoot, "overrides");
-  const configDirOverridesDir = process.env.OPENCODE_CONFIG_DIR ? join4(process.env.OPENCODE_CONFIG_DIR, "dcp-prompts", "overrides") : null;
+  const configDirOverridesDir = process.env.OPENCODE_CONFIG_DIR ? join4(process.env.OPENCODE_CONFIG_DIR, "acp-prompts", "overrides") : null;
   const opencodeDir = findOpencodeDir2(workingDirectory);
-  const projectOverridesDir = opencodeDir ? join4(opencodeDir, "dcp-prompts", "overrides") : null;
+  const projectOverridesDir = opencodeDir ? join4(opencodeDir, "acp-prompts", "overrides") : null;
   return {
     defaultsDir,
     globalOverridesDir,
@@ -5319,9 +5404,9 @@ function buildDefaultsReadmeContent() {
   );
   lines.push("");
   lines.push("Override precedence (highest first):");
-  lines.push("1. `.opencode/dcp-prompts/overrides/` (project)");
-  lines.push("2. `$OPENCODE_CONFIG_DIR/dcp-prompts/overrides/` (config dir)");
-  lines.push("3. `~/.config/opencode/dcp-prompts/overrides/` (global)");
+  lines.push("1. `.opencode/acp-prompts/overrides/` (project)");
+  lines.push("2. `$OPENCODE_CONFIG_DIR/acp-prompts/overrides/` (config dir)");
+  lines.push("3. `~/.config/opencode/acp-prompts/overrides/` (global)");
   lines.push("");
   lines.push("## Prompt Files");
   lines.push("");