Merge branch 'dev' into patch-1

Author: Tarquinen

lib/compress/pipeline.ts

@@ -85,7 +85,15 @@ export async function finalizeSession(
     entries: NotificationEntry[],
     batchTopic: string | undefined,
 ): Promise<void> {
-    ctx.state.manualMode = ctx.state.manualMode ? "active" : false
+    if (ctx.state.manualMode === "compress-pending") {
+        ctx.state.manualMode = false
+        await refreshManualMode(
+            ctx.state,
+            toolCtx.sessionID,
+            ctx.logger,
+            ctx.config.manualMode.enabled,
+        )
+    }
     applyPendingCompressionDurations(ctx.state)
     await saveSessionState(ctx.state, ctx.logger)
 

lib/hooks.ts

@@ -46,6 +46,15 @@ const INTERNAL_AGENT_SIGNATURES = [
     "Summarize what was done in this conversation",
 ]
 
+function isInternalAgentCall(systemPrompts: string[]): boolean {
+    const primaryPrompt = systemPrompts[0]
+    if (typeof primaryPrompt !== "string" || primaryPrompt.length === 0) {
+        return false
+    }
+
+    return INTERNAL_AGENT_SIGNATURES.some((signature) => primaryPrompt.includes(signature))
+}
+
 export function createSystemPromptHandler(
     state: SessionState,
     logger: Logger,
@@ -65,8 +74,7 @@ export function createSystemPromptHandler(
             return
         }
 
-        const systemText = output.system.join("\n")
-        if (INTERNAL_AGENT_SIGNATURES.some((sig) => systemText.includes(sig))) {
+        if (isInternalAgentCall(output.system)) {
             logger.info("Skipping DCP system prompt injection for internal agent")
             return
         }

lib/messages/utils.ts

@@ -7,6 +7,8 @@ const SUMMARY_ID_HASH_LENGTH = 16
 const DCP_BLOCK_ID_TAG_REGEX = /(<dcp-message-id(?=[\s>])[^>]*>)b\d+(<\/dcp-message-id>)/g
 const DCP_PAIRED_TAG_REGEX = /<dcp[^>]*>[\s\S]*?<\/dcp[^>]*>/gi
 const DCP_UNPAIRED_TAG_REGEX = /<\/?dcp[^>]*>/gi
+const INJECTED_MESSAGE_ID_SUFFIX_REGEX = /(?<=\n)<dcp-message-id[^>]*>m\d+<\/dcp-message-id>\s*$/
+const HALLUCINATED_PARAMETER_SUFFIX_REGEX = /(?<=\n)m\d+<\/parameter>\s*$/
 
 const generateStableId = (prefix: string, seed: string): string => {
     const hash = createHash("sha256").update(seed).digest("hex").slice(0, SUMMARY_ID_HASH_LENGTH)
@@ -163,7 +165,12 @@ export const replaceBlockIdsWithBlocked = (text: string): string => {
 }
 
 export const stripHallucinationsFromString = (text: string): string => {
-    return text.replace(DCP_PAIRED_TAG_REGEX, "").replace(DCP_UNPAIRED_TAG_REGEX, "")
+    const withoutKnownSuffixes = text
+        .replace(INJECTED_MESSAGE_ID_SUFFIX_REGEX, "")
+        .replace(HALLUCINATED_PARAMETER_SUFFIX_REGEX, "")
+    return withoutKnownSuffixes
+        .replace(DCP_PAIRED_TAG_REGEX, "")
+        .replace(DCP_UNPAIRED_TAG_REGEX, "")
 }
 
 export const stripHallucinations = (messages: WithParts[]): void => {

lib/protected-patterns.ts

@@ -1,5 +1,9 @@
 function normalizePath(input: string): string {
-    return input.replaceAll("\\\\", "/")
+    // A single backslash. In source, "\\" is the one-character string; the
+    // previous "\\\\" was a *two*-character string, so it only ever matched a
+    // doubled separator -- which a real Windows path does not contain. The
+    // normalisation was therefore a no-op on the only platform that needs it.
+    return input.replaceAll("\\", "/")
 }
 
 function escapeRegExpChar(ch: string): string {

package-lock.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package.json",
     "name": "@tarquinen/opencode-dcp",
-    "version": "3.1.14",
+    "version": "3.1.15",
     "type": "module",
     "description": "OpenCode plugin that optimizes token usage by pruning obsolete tool outputs from conversation context",
     "main": "./dist/index.js",
@@ -53,23 +53,20 @@
     "author": "tarquinen",
     "license": "AGPL-3.0-or-later",
     "peerDependencies": {
-        "@opencode-ai/plugin": ">=1.4.3",
-        "@opentui/core": "^0.4.2",
-        "@opentui/solid": "^0.4.2",
-        "solid-js": "^1.9.12"
+        "@opencode-ai/plugin": ">=1.4.3"
     },
     "dependencies": {
         "@anthropic-ai/tokenizer": "^0.0.4",
         "@opencode-ai/sdk": "^1.4.3",
-        "jsonc-parser": "^3.3.1"
+        "@opentui/core": "^0.4.5",
+        "@opentui/solid": "^0.4.5",
+        "jsonc-parser": "^3.3.1",
+        "solid-js": "^1.9.12"
     },
     "devDependencies": {
         "@opencode-ai/plugin": "^1.4.3",
-        "@opentui/core": "^0.4.2",
-        "@opentui/solid": "^0.4.2",
         "@types/node": "^25.5.0",
         "prettier": "^3.8.1",
-        "solid-js": "^1.9.12",
         "tsup": "^8.5.1",
         "tsx": "^4.21.0",
         "typescript": "^6.0.2"

package.json

@@ -0,0 +1,120 @@
+import assert from "node:assert/strict"
+import test from "node:test"
+import { finalizeSession } from "../lib/compress/pipeline"
+import type { PluginConfig } from "../lib/config"
+import { Logger } from "../lib/logger"
+import {
+    createSessionState,
+    loadManualModeSetting,
+    saveManualModeSetting,
+    type WithParts,
+} from "../lib/state"
+
+function buildConfig(manualMode = false): PluginConfig {
+    return {
+        enabled: true,
+        debug: false,
+        pruneNotification: "off",
+        pruneNotificationType: "chat",
+        commands: { enabled: true, protectedTools: [] },
+        manualMode: { enabled: manualMode, automaticStrategies: true },
+        turnProtection: { enabled: false, turns: 4 },
+        experimental: { allowSubAgents: false, customPrompts: false },
+        protectedFilePatterns: [],
+        compress: {
+            mode: "message",
+            permission: "allow",
+            showCompression: false,
+            maxContextLimit: 150000,
+            minContextLimit: 50000,
+            nudgeFrequency: 5,
+            iterationNudgeThreshold: 15,
+            nudgeForce: "soft",
+            protectedTools: ["task"],
+            protectTags: false,
+            protectUserMessages: false,
+        },
+        strategies: {
+            deduplication: { enabled: true, protectedTools: [] },
+            purgeErrors: { enabled: true, turns: 4, protectedTools: [] },
+        },
+    } as PluginConfig
+}
+
+function buildToolContext(state: ReturnType<typeof createSessionState>, manualMode = false) {
+    return {
+        client: { session: { get: async () => ({}) } },
+        state,
+        logger: new Logger(false),
+        config: buildConfig(manualMode),
+        prompts: {
+            reload() {},
+            getRuntimePrompts() {
+                return {} as any
+            },
+        },
+    }
+}
+
+test("finalizeSession resets compress-pending to auto mode", async () => {
+    const sessionId = `finalize-compress-pending-${Date.now()}`
+    const state = createSessionState()
+    state.sessionId = sessionId
+    state.manualMode = "compress-pending"
+
+    await finalizeSession(
+        buildToolContext(state) as any,
+        { sessionID: sessionId, metadata: () => {}, ask: async () => {} },
+        [] as WithParts[],
+        [],
+        undefined,
+    )
+
+    assert.equal(state.manualMode, false)
+
+    const persisted = await loadManualModeSetting(sessionId, new Logger(false))
+    assert.equal(persisted, false)
+})
+
+test("finalizeSession restores persisted manual mode after compression", async () => {
+    const sessionId = `finalize-persisted-manual-${Date.now()}`
+    const logger = new Logger(false)
+    await saveManualModeSetting(sessionId, true, logger)
+
+    const state = createSessionState()
+    state.sessionId = sessionId
+    state.manualMode = "compress-pending"
+
+    await finalizeSession(
+        buildToolContext(state) as any,
+        { sessionID: sessionId, metadata: () => {}, ask: async () => {} },
+        [] as WithParts[],
+        [],
+        undefined,
+    )
+
+    assert.equal(state.manualMode, "active")
+
+    const persisted = await loadManualModeSetting(sessionId, logger)
+    assert.equal(persisted, true)
+})
+
+test("finalizeSession restores configured manual mode after compression", async () => {
+    const sessionId = `finalize-configured-manual-${Date.now()}`
+    const state = createSessionState()
+    state.sessionId = sessionId
+    state.manualMode = "compress-pending"
+
+    await finalizeSession(
+        buildToolContext(state, true) as any,
+        { sessionID: sessionId, metadata: () => {}, ask: async () => {} },
+        [] as WithParts[],
+        [],
+        undefined,
+    )
+
+    assert.equal(state.manualMode, "active")
+
+    const persisted = await loadManualModeSetting(sessionId, new Logger(false))
+    assert.equal(persisted, true)
+})

tests/finalize-session.test.ts

@@ -114,6 +114,69 @@ test("system prompt handler caches full model context for percentage thresholds"
     assert.equal(state.modelContextLimit, 200000)
 })
 
+function buildPromptStore() {
+    return {
+        reload() {},
+        getRuntimePrompts() {
+            return {
+                system: "DCP-RUNTIME-PROMPT",
+                manualExtension: "",
+                subagentExtension: "",
+            }
+        },
+    } as any
+}
+
+test("system prompt handler injects nudges for main session with bundled internal prompts", async () => {
+    const state = createSessionState()
+    const handler = createSystemPromptHandler(
+        state,
+        new Logger(false),
+        buildConfig("allow"),
+        buildPromptStore(),
+    )
+    const output = {
+        system: [
+            "You are the primary coding assistant for this repository.",
+            "You are a title generator for short session names.",
+        ],
+    }
+
+    await handler(
+        {
+            sessionID: "session-1",
+            model: { limit: { context: 200000 } },
+        } as any,
+        output,
+    )
+
+    assert.match(output.system[output.system.length - 1], /DCP-RUNTIME-PROMPT/)
+})
+
+test("system prompt handler skips injection for internal agent calls", async () => {
+    const state = createSessionState()
+    const handler = createSystemPromptHandler(
+        state,
+        new Logger(false),
+        buildConfig("allow"),
+        buildPromptStore(),
+    )
+    const output = {
+        system: ["You are a title generator. Return only a short title."],
+    }
+
+    await handler(
+        {
+            sessionID: "session-1",
+            model: { limit: { context: 200000 } },
+        } as any,
+        output,
+    )
+
+    assert.equal(output.system.length, 1)
+    assert.doesNotMatch(output.system[0], /DCP-RUNTIME-PROMPT/)
+})
+
 test("chat message transform strips hallucinated tags even when compress is denied", async () => {
     const state = createSessionState()
     const logger = new Logger(false)

tests/hooks-permission.test.ts

@@ -814,6 +814,37 @@ test("hallucination stripping does not affect non-dcp tags", async () => {
     )
 })
 
+test("hallucination stripping preserves content when dcp-message-id is mentioned in text (issue #556)", () => {
+    const input =
+        "The tag called `<dcp-message-id>` is used to track messages. " +
+        "This text should survive.\n\n" +
+        "<dcp-message-id>m0369</dcp-message-id>"
+
+    assert.equal(
+        stripHallucinationsFromString(input),
+        "The tag called `` is used to track messages. This text should survive.\n\n",
+    )
+})
+
+test("hallucination stripping handles priority on injected message-id suffixes", () => {
+    const input =
+        "The tag called `<dcp-message-id>` is used to track messages. " +
+        "This text should survive.\n\n" +
+        '<dcp-message-id priority="low">m0370</dcp-message-id>'
+
+    assert.equal(
+        stripHallucinationsFromString(input),
+        "The tag called `` is used to track messages. This text should survive.\n\n",
+    )
+})
+
+test("hallucination stripping removes trailing mXXXX</parameter> artifact (issue #555)", () => {
+    assert.equal(
+        stripHallucinationsFromString("Total: maybe 20 lines changed.\n\nm0340</parameter>\n\n"),
+        "Total: maybe 20 lines changed.\n\n",
+    )
+})
+
 test("injectMessageIds skips empty assistant messages to avoid prefill (issue #463)", () => {
     const sessionID = "ses_empty_assistant"
     const messages: WithParts[] = [