opencode-acp 1.14.11 → 1.14.13-dev.1

package/README.md

@@ -298,10 +298,10 @@ Each level overrides the previous, so project settings take priority over global
     },
     // Manual mode: disables autonomous context management,
     // tools only run when explicitly triggered via /acp commands
+    // Allow ACP processing in subagent sessions (default: true)
+    "allowSubAgents": true,
     // Experimental settings
     "experimental": {
-        // Allow ACP processing in subagent sessions
-        "allowSubAgents": false,
         // Enable user-editable prompt overrides under dcp-prompts directories
         // When false (default), prompt override files/directories are ignored
         "customPrompts": false,
@@ -492,6 +492,24 @@ For the complete list with root cause analysis, see the [bug tracker](https://gi
 
 ## Changelog
 
+### v1.14.13-dev.1 — Dev Prerelease (1 PR since v1.14.12)
+
+Dev prerelease covering PR #276. Published to `dev` npm tag for early testing.
+
+**PRs included**:
+- **#276** — Promote `allowSubAgents` from experimental to top-level config field, change default from `false` to `true`. Subagent sessions now get compression by default. Fully backward compatible: old `experimental.allowSubAgents` configs still work (top-level takes priority). Updated all 4 hook sites, schema, config validation, and 6 documentation files. Dual-agent reviewed (Oracle + Explore, both APPROVE).
+
+**Install**: `opencode plugin opencode-acp@dev --global`
+
+### v1.14.12 — Stable Release (1 PR since v1.14.11)
+
+Stable release with the omo-system-reminder filter fix that preserves user content when stripping `<system-reminder>` blocks.
+
+**PRs included**:
+- **#271** — Fix (follow-up to #268): `omo-system-reminder` filter v1.2.0 returned `{ action: "drop" }` for ANY user message containing `<system-reminder>`, losing user text when OMO prepends system-reminder blocks to user messages. Rewrote to v1.3.0: strips `<system-reminder>` blocks + OMO markers, preserves remaining user content via `modify`. Pure OMO messages still return `drop`. Phase 2 `keepLastOnly` now applies the filter's actual decision (drop or modify) to older matches instead of unconditional drop. Recent N matches kept fully untouched (semantically correct). Backward compatible with other 3 `keepLastOnly` filters (they only return `drop`). Dual-agent reviewed (Oracle + Explore, both APPROVE).
+
+**Install**: `opencode plugin opencode-acp@stable --global`
+
 ### v1.14.11 — Stable Release (1 PR since v1.14.10)
 
 Stable release with the omo-system-reminder filter fix and configurable `keepLast`.

package/README.zh-CN.md

@@ -253,10 +253,10 @@ ACP 使用自己的配置文件，按以下顺序搜索：
     },
     // Manual mode: disables autonomous context management,
     // tools only run when explicitly triggered via /acp commands
+    // 允许在子代理会话中运行 ACP（默认：开启）
+    "allowSubAgents": true,
     // Experimental settings
     "experimental": {
-        // Allow ACP processing in subagent sessions
-        "allowSubAgents": false,
         // Enable user-editable prompt overrides under dcp-prompts directories
         // When false (default), prompt override files/directories are ignored
         "customPrompts": false,
@@ -446,6 +446,24 @@ ACP 是 DCP 的直接替代品。迁移步骤：
 
 ## 更新日志
 
+### v1.14.13-dev.1 — Dev 预发布版（v1.14.12 以来 1 个 PR）
+
+Dev 预发布版，包含 PR #276。发布到 `dev` npm tag 供早期测试。
+
+**包含的 PR**：
+- **#276** — 将 `allowSubAgents` 从实验性参数提升为顶级配置字段，默认值从 `false` 改为 `true`。子 Agent 会话默认开启压缩。完全向后兼容：旧的 `experimental.allowSubAgents` 配置仍然有效（顶级优先）。更新了 4 个 hook 调用点、schema、配置校验和 6 个文档文件。双 Agent Review（Oracle + Explore，均 APPROVE）。
+
+**安装**：`opencode plugin opencode-acp@dev --global`
+
+### v1.14.12 — 正式版（v1.14.11 以来 1 个 PR）
+
+正式版发布，包含 omo-system-reminder 过滤器修复——剥离 `<system-reminder>` 块时保留用户正文。
+
+**包含的 PR**：
+- **#271** — 修复（#268 后续）：`omo-system-reminder` 过滤器 v1.2.0 对任何含 `<system-reminder>` 的用户消息直接返回 `drop`，当 OMO 将 system-reminder 块注入到用户消息前面时丢失用户正文。改为 v1.3.0：剥离 `<system-reminder>` 块 + OMO 标记，保留剩余用户内容（`modify`）。纯 OMO 消息仍返回 `drop`。Phase 2 `keepLastOnly` 现在对较旧的匹配应用过滤器实际决策（drop 或 modify），不再无条件丢弃。最近 N 条保持不动（语义正确）。与其他 3 个 `keepLastOnly` 过滤器向后兼容（它们只返回 `drop`）。双 Agent Review（Oracle + Explore，全部 APPROVE）。
+
+**安装**：`opencode plugin opencode-acp@stable --global`
+
 ### v1.14.11 — 正式版（v1.14.10 以来 1 个 PR）
 
 正式版发布，包含 omo-system-reminder 过滤器修复和可配置 `keepLast`。

package/dist/index.js

@@ -869,6 +869,7 @@ var VALID_CONFIG_KEYS = /* @__PURE__ */ new Set([
   "autoUpdate",
   "debug",
   "showUpdateToasts",
+  "allowSubAgents",
   "pruneNotification",
   "pruneNotificationType",
   "experimental",
@@ -953,6 +954,9 @@ function validateConfigTypes(config) {
   if (config.debug !== void 0 && typeof config.debug !== "boolean") {
     errors.push({ key: "debug", expected: "boolean", actual: typeof config.debug });
   }
+  if (config.allowSubAgents !== void 0 && typeof config.allowSubAgents !== "boolean") {
+    errors.push({ key: "allowSubAgents", expected: "boolean", actual: typeof config.allowSubAgents });
+  }
   if (config.pruneNotification !== void 0) {
     const validValues = ["off", "minimal", "detailed"];
     if (!validValues.includes(config.pruneNotification)) {
@@ -1462,6 +1466,7 @@ var defaultConfig = {
   enabled: true,
   autoUpdate: true,
   debug: false,
+  allowSubAgents: true,
   pruneNotification: "off",
   // [FIX #20] Default to toast — chat-mode notifications inject an empty
   // user message that freezes the session on providers that reject empty
@@ -1472,7 +1477,6 @@ var defaultConfig = {
     protectedTools: [...DEFAULT_PROTECTED_TOOLS]
   },
   experimental: {
-    allowSubAgents: false,
     customPrompts: false
   },
   protectedFilePatterns: [],
@@ -1650,7 +1654,6 @@ function mergeCommands(base, override) {
 function mergeExperimental(base, override) {
   if (override === void 0) return base;
   return {
-    allowSubAgents: override.allowSubAgents ?? base.allowSubAgents,
     customPrompts: override.customPrompts ?? base.customPrompts
   };
 }
@@ -1723,6 +1726,7 @@ function mergeLayer(config, data) {
     enabled: data.enabled ?? config.enabled,
     autoUpdate: data.autoUpdate ?? config.autoUpdate,
     debug: data.debug ?? config.debug,
+    allowSubAgents: data.allowSubAgents ?? data.experimental?.allowSubAgents ?? config.allowSubAgents,
     pruneNotification: data.pruneNotification ?? config.pruneNotification,
     pruneNotificationType: data.pruneNotificationType ?? config.pruneNotificationType,
     commands: mergeCommands(config.commands, data.commands),
@@ -8831,7 +8835,7 @@ import { writeFile as writeFile2, mkdir as mkdir2 } from "fs/promises";
 import { join as join3 } from "path";
 import { existsSync as existsSync3 } from "fs";
 import { homedir as homedir3 } from "os";
-var LOG_VERSION = true ? "1.14.11" : "dev";
+var LOG_VERSION = true ? "1.14.13-dev.1" : "dev";
 var Logger = class {
   logDir;
   enabled;
@@ -10021,11 +10025,8 @@ function applyMessageFilters(messages, config, logger, ctx) {
         if (decision.action !== "drop" && decision.action !== "modify") continue;
         if (kept < keepCount) {
           kept++;
-          if (decision.action === "modify" && decision.text !== void 0) {
-            applyDecision(part, decision, filter.name, i, text);
-          }
         } else {
-          applyDecision(part, { action: "drop", reason: `keepLastOnly(${keepCount}): earlier occurrence` }, filter.name, i, text);
+          applyDecision(part, decision, filter.name, i, text);
         }
       }
     }
@@ -10044,10 +10045,13 @@ function applyMessageFilters(messages, config, logger, ctx) {
 // lib/messages/filter/builtin/omo-system-reminder.ts
 var SYSTEM_REMINDER_OPEN = "<system-reminder>";
 var OMO_MARKER = "<!-- OMO_INTERNAL_INITIATOR -->";
+var PAIRED_BLOCK_RE = /<system-reminder>[\s\S]*?<\/system-reminder>\s*<!-- OMO_INTERNAL_INITIATOR -->/g;
+var LONE_REMINDER_RE = /<system-reminder>[\s\S]*?<\/system-reminder>/g;
+var LONE_MARKER_RE = /<!-- OMO_INTERNAL_INITIATOR -->/g;
 var OMO_SYSTEM_REMINDER_FILTER = {
   name: "omo-system-reminder",
-  version: "1.2.0",
-  description: "Keep only the 2 most recent OMO <system-reminder> messages, drop older ones",
+  version: "1.3.0",
+  description: "Keep recent OMO <system-reminder> messages; for older ones, strip blocks but preserve user content",
   keepLastOnly: true,
   keepLast: 2,
   filter(ctx) {
@@ -10055,7 +10059,26 @@ var OMO_SYSTEM_REMINDER_FILTER = {
     if (!ctx.text.includes(SYSTEM_REMINDER_OPEN) && !ctx.text.includes(OMO_MARKER)) {
       return { action: "keep" };
     }
-    return { action: "drop", reason: "OMO system-reminder match (keepLast dedup)" };
+    let modified = ctx.text;
+    let removedBlocks = 0;
+    modified = modified.replace(PAIRED_BLOCK_RE, () => {
+      removedBlocks++;
+      return "";
+    });
+    modified = modified.replace(LONE_REMINDER_RE, () => {
+      removedBlocks++;
+      return "";
+    });
+    modified = modified.replace(LONE_MARKER_RE, "");
+    modified = modified.replace(/\n{3,}/g, "\n\n").trim();
+    if (modified.length === 0) {
+      return { action: "drop", reason: `Pure OMO system-reminder (${removedBlocks} block(s), no user content)` };
+    }
+    return {
+      action: "modify",
+      text: modified,
+      reason: `Stripped ${removedBlocks} OMO system-reminder block(s), preserved user content (${modified.length} chars)`
+    };
   }
 };
 
@@ -10381,7 +10404,7 @@ function createSystemPromptHandler(registry4, logger, config, prompts) {
     if (state && input.model?.limit?.context) {
       state.modelContextLimit = input.model.limit.context;
     }
-    if (!state || state.isSubAgent && !config.experimental.allowSubAgents) {
+    if (!state || state.isSubAgent && !config.allowSubAgents) {
       return;
     }
     const systemText = output.system.join("\n");
@@ -10398,7 +10421,7 @@ function createSystemPromptHandler(registry4, logger, config, prompts) {
     const newPrompt = renderSystemPrompt(
       runtimePrompts,
       buildProtectedToolsExtension(config.compress.protectedTools),
-      state.isSubAgent && config.experimental.allowSubAgents
+      state.isSubAgent && config.allowSubAgents
     );
     if (output.system.length > 0) {
       output.system[output.system.length - 1] += "\n\n" + newPrompt;
@@ -10435,7 +10458,7 @@ function createChatMessageTransformHandler(client, registry4, logger, config, pr
       await updatePerTurnState(state, logger, messages);
     }
     syncCompressPermissionState(state, config, hostPermissions, output.messages);
-    if (state.isSubAgent && !config.experimental.allowSubAgents) {
+    if (state.isSubAgent && !config.allowSubAgents) {
       return;
     }
     stripHallucinations(output.messages);
@@ -10872,7 +10895,7 @@ var server = (async (ctx) => {
         };
       }
       const toolsToAdd = [];
-      if (config.compress.permission !== "deny" && !config.experimental.allowSubAgents) {
+      if (config.compress.permission !== "deny" && !config.allowSubAgents) {
         toolsToAdd.push("compress", "decompress", "search_context", "acp_status");
       }
       if (toolsToAdd.length > 0) {