@tarquinen/opencode-dcp 2.2.0-beta0 → 2.2.1-beta0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +92 -84
- package/dist/lib/hooks.d.ts.map +1 -1
- package/dist/lib/hooks.js +3 -7
- package/dist/lib/hooks.js.map +1 -1
- package/dist/lib/messages/utils.js +1 -1
- package/dist/lib/messages/utils.js.map +1 -1
- package/dist/lib/tools/compress.d.ts.map +1 -1
- package/dist/lib/tools/compress.js +8 -1
- package/dist/lib/tools/compress.js.map +1 -1
- package/dist/lib/ui/notification.d.ts.map +1 -1
- package/dist/lib/ui/notification.js +0 -7
- package/dist/lib/ui/notification.js.map +1 -1
- package/package.json +1 -1
- package/dist/lib/compress-logger.d.ts +0 -15
- package/dist/lib/compress-logger.d.ts.map +0 -1
- package/dist/lib/compress-logger.js +0 -132
- package/dist/lib/compress-logger.js.map +0 -1
package/README.md
CHANGED
|
@@ -22,6 +22,11 @@ Using `@latest` ensures you always get the newest version automatically when Ope
|
|
|
22
22
|
|
|
23
23
|
Restart OpenCode. The plugin will automatically start optimizing your sessions.
|
|
24
24
|
|
|
25
|
+
## Beta Notice (v2.2.0-beta0)
|
|
26
|
+
|
|
27
|
+
- Strategy shift to a single user-facing context tool: `compress`.
|
|
28
|
+
- Context management is now less surgical and more focused on preserving high-signal work grouped by task.
|
|
29
|
+
|
|
25
30
|
## How Pruning Works
|
|
26
31
|
|
|
27
32
|
DCP uses one user-facing tool and strategies to reduce context size:
|
|
@@ -69,90 +74,93 @@ DCP uses its own config file:
|
|
|
69
74
|
- Custom config directory: `$OPENCODE_CONFIG_DIR/dcp.jsonc` (or `dcp.json`), if `OPENCODE_CONFIG_DIR` is set
|
|
70
75
|
- Project: `.opencode/dcp.jsonc` (or `dcp.json`) in your project's `.opencode` directory
|
|
71
76
|
|
|
72
|
-
>
|
|
73
|
-
>
|
|
74
|
-
|
|
75
|
-
>
|
|
76
|
-
>
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
>
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
77
|
+
> [!IMPORTANT]
|
|
78
|
+
> Defaults are applied automatically. Expand this if you want to review or override settings.
|
|
79
|
+
|
|
80
|
+
<details>
|
|
81
|
+
<summary><strong>Default Configuration</strong> (click to expand)</summary>
|
|
82
|
+
|
|
83
|
+
```jsonc
|
|
84
|
+
{
|
|
85
|
+
"$schema": "https://raw.githubusercontent.com/Opencode-DCP/opencode-dynamic-context-pruning/master/dcp.schema.json",
|
|
86
|
+
// Enable or disable the plugin
|
|
87
|
+
"enabled": true,
|
|
88
|
+
// Enable debug logging to ~/.config/opencode/logs/dcp/
|
|
89
|
+
"debug": false,
|
|
90
|
+
// Notification display: "off", "minimal", or "detailed"
|
|
91
|
+
"pruneNotification": "detailed",
|
|
92
|
+
// Notification type: "chat" (in-conversation) or "toast" (system toast)
|
|
93
|
+
"pruneNotificationType": "chat",
|
|
94
|
+
// Slash commands configuration
|
|
95
|
+
"commands": {
|
|
96
|
+
"enabled": true,
|
|
97
|
+
// Additional tools to protect from pruning via commands (e.g., /dcp sweep)
|
|
98
|
+
"protectedTools": [],
|
|
99
|
+
},
|
|
100
|
+
// Manual mode: disables autonomous context management,
|
|
101
|
+
// tools only run when explicitly triggered via /dcp commands
|
|
102
|
+
"manualMode": {
|
|
103
|
+
"enabled": false,
|
|
104
|
+
// When true, automatic strategies (deduplication, supersedeWrites, purgeErrors)
|
|
105
|
+
// still run even in manual mode
|
|
106
|
+
"automaticStrategies": true,
|
|
107
|
+
},
|
|
108
|
+
// Protect from pruning for <turns> message turns past tool invocation
|
|
109
|
+
"turnProtection": {
|
|
110
|
+
"enabled": false,
|
|
111
|
+
"turns": 4,
|
|
112
|
+
},
|
|
113
|
+
// Protect file operations from pruning via glob patterns
|
|
114
|
+
// Patterns match tool parameters.filePath (e.g. read/write/edit)
|
|
115
|
+
"protectedFilePatterns": [],
|
|
116
|
+
// Unified context compression tool and behavior settings
|
|
117
|
+
"compress": {
|
|
118
|
+
// Permission mode: "allow" (no prompt), "ask" (prompt), "deny" (tool not registered)
|
|
119
|
+
"permission": "allow",
|
|
120
|
+
// Show summary content in a chat notification
|
|
121
|
+
"showCompression": false,
|
|
122
|
+
// Token limit at which the model compresses session context
|
|
123
|
+
// to keep the model in the "smart zone" (not a hard limit)
|
|
124
|
+
// Accepts: number or "X%" (percentage of model's context window)
|
|
125
|
+
"contextLimit": 100000,
|
|
126
|
+
// Optional per-model overrides by exact providerID/modelID
|
|
127
|
+
// Accepts: number or "X%"
|
|
128
|
+
// Example:
|
|
129
|
+
// "modelLimits": {
|
|
130
|
+
// "openai/gpt-5": 120000,
|
|
131
|
+
// "anthropic/claude-3-7-sonnet": "80%"
|
|
132
|
+
// },
|
|
133
|
+
// How often the context-limit nudge fires (1 = every fetch, 5 = every 5th)
|
|
134
|
+
"nudgeFrequency": 5,
|
|
135
|
+
// Start iteration nudges after this many messages
|
|
136
|
+
// have occurred since the last user message
|
|
137
|
+
"iterationNudgeThreshold": 15,
|
|
138
|
+
},
|
|
139
|
+
// Automatic pruning strategies
|
|
140
|
+
"strategies": {
|
|
141
|
+
// Remove duplicate tool calls (same tool with same arguments)
|
|
142
|
+
"deduplication": {
|
|
143
|
+
"enabled": true,
|
|
144
|
+
// Additional tools to protect from pruning
|
|
145
|
+
"protectedTools": [],
|
|
146
|
+
},
|
|
147
|
+
// Prune write tool inputs when the file has been subsequently read
|
|
148
|
+
"supersedeWrites": {
|
|
149
|
+
"enabled": true,
|
|
150
|
+
},
|
|
151
|
+
// Prune tool inputs for errored tools after X turns
|
|
152
|
+
"purgeErrors": {
|
|
153
|
+
"enabled": true,
|
|
154
|
+
// Number of turns before errored tool inputs are pruned
|
|
155
|
+
"turns": 4,
|
|
156
|
+
// Additional tools to protect from pruning
|
|
157
|
+
"protectedTools": [],
|
|
158
|
+
},
|
|
159
|
+
},
|
|
160
|
+
}
|
|
161
|
+
```
|
|
162
|
+
|
|
163
|
+
</details>
|
|
156
164
|
|
|
157
165
|
### Commands
|
|
158
166
|
|
package/dist/lib/hooks.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../lib/hooks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../lib/hooks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AA0D5C,wBAAgB,yBAAyB,CACrC,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,YAAY,IAGhB,OAAO;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE;QAAE,KAAK,EAAE;YAAE,OAAO,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAA;CAAE,EACpE,QAAQ;IAAE,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,mBAuBnC;AAED,wBAAgB,iCAAiC,CAC7C,MAAM,EAAE,GAAG,EACX,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,YAAY,IAEN,OAAO,EAAE,EAAE,QAAQ;IAAE,QAAQ,EAAE,SAAS,EAAE,CAAA;CAAE,mBAqB7D;AAED,wBAAgB,2BAA2B,CACvC,MAAM,EAAE,GAAG,EACX,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,YAAY,EACpB,gBAAgB,EAAE,MAAM,IAGpB,OAAO;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,EAChE,QAAQ;IAAE,KAAK,EAAE,GAAG,EAAE,CAAA;CAAE,mBAkF/B;AAED,wBAAgB,yBAAyB,KAEjC,QAAQ;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAChE,QAAQ;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,mBAO/B"}
|
package/dist/lib/hooks.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { assignMessageRefs } from "./message-ids";
|
|
2
2
|
import { syncToolCache } from "./state/tool-cache";
|
|
3
|
-
import { deduplicate, supersedeWrites, purgeErrors } from "./strategies";
|
|
4
3
|
import { prune, insertCompressNudges, insertMessageIds } from "./messages";
|
|
5
4
|
import { buildToolIdList, isIgnoredUserMessage, stripHallucinations } from "./messages/utils";
|
|
6
5
|
import { checkSession } from "./state";
|
|
@@ -20,7 +19,7 @@ const INTERNAL_AGENT_SIGNATURES = [
|
|
|
20
19
|
const DCP_MESSAGE_ID_TAG_REGEX = /<dcp-message-id>(?:m\d+|b\d+)<\/dcp-message-id>/g;
|
|
21
20
|
const TURN_NUDGE_BLOCK_REGEX = /<instruction\s+name=turn_nudge\b[^>]*>[\s\S]*?<\/instruction>/g;
|
|
22
21
|
const ITERATION_NUDGE_BLOCK_REGEX = /<instruction\s+name=iteration_nudge\b[^>]*>[\s\S]*?<\/instruction>/g;
|
|
23
|
-
function
|
|
22
|
+
function applyManualPrompt(state, messages, logger) {
|
|
24
23
|
const pending = state.pendingManualTrigger;
|
|
25
24
|
if (!pending) {
|
|
26
25
|
return;
|
|
@@ -40,7 +39,7 @@ function applyPendingManualTriggerPrompt(state, messages, logger) {
|
|
|
40
39
|
}
|
|
41
40
|
part.text = pending.prompt;
|
|
42
41
|
state.pendingManualTrigger = null;
|
|
43
|
-
logger.debug("Applied
|
|
42
|
+
logger.debug("Applied manual prompt", { sessionId: pending.sessionId });
|
|
44
43
|
return;
|
|
45
44
|
}
|
|
46
45
|
}
|
|
@@ -77,13 +76,10 @@ export function createChatMessageTransformHandler(client, state, logger, config)
|
|
|
77
76
|
assignMessageRefs(state, output.messages);
|
|
78
77
|
syncToolCache(state, config, logger, output.messages);
|
|
79
78
|
buildToolIdList(state, output.messages);
|
|
80
|
-
deduplicate(state, logger, config, output.messages);
|
|
81
|
-
supersedeWrites(state, logger, config, output.messages);
|
|
82
|
-
purgeErrors(state, logger, config, output.messages);
|
|
83
79
|
prune(state, logger, config, output.messages);
|
|
84
80
|
insertCompressNudges(state, config, logger, output.messages);
|
|
85
81
|
insertMessageIds(state, config, output.messages);
|
|
86
|
-
|
|
82
|
+
applyManualPrompt(state, output.messages, logger);
|
|
87
83
|
if (state.sessionId) {
|
|
88
84
|
await logger.saveContext(state.sessionId, output.messages);
|
|
89
85
|
}
|
package/dist/lib/hooks.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../../lib/hooks.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../../lib/hooks.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ const isGeminiModel = (modelID) => {
|
|
|
14
14
|
};
|
|
15
15
|
export const rejectsTextParts = (modelID) => {
|
|
16
16
|
const lowerModelID = modelID.toLowerCase();
|
|
17
|
-
return lowerModelID.includes("claude");
|
|
17
|
+
return lowerModelID.includes("claude") || lowerModelID.includes("deepseek");
|
|
18
18
|
};
|
|
19
19
|
export const createSyntheticUserMessage = (baseMessage, content, variant, stableSeed) => {
|
|
20
20
|
const userInfo = baseMessage.info;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../lib/messages/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAIpD,MAAM,sBAAsB,GAAG,EAAE,CAAA;AACjC,MAAM,wBAAwB,GAAG,kDAAkD,CAAA;AACnF,MAAM,sBAAsB,GAAG,gEAAgE,CAAA;AAC/F,MAAM,2BAA2B,GAC7B,qEAAqE,CAAA;AAEzE,MAAM,gBAAgB,GAAG,CAAC,MAAc,EAAE,IAAY,EAAU,EAAE;IAC9D,MAAM,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,sBAAsB,CAAC,CAAA;IAC7F,OAAO,GAAG,MAAM,IAAI,IAAI,EAAE,CAAA;AAC9B,CAAC,CAAA;AAED,MAAM,aAAa,GAAG,CAAC,OAAe,EAAW,EAAE;IAC/C,MAAM,YAAY,GAAG,OAAO,CAAC,WAAW,EAAE,CAAA;IAC1C,OAAO,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;AAC1C,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,OAAe,EAAW,EAAE;IACzD,MAAM,YAAY,GAAG,OAAO,CAAC,WAAW,EAAE,CAAA;IAC1C,OAAO,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../lib/messages/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compress.d.ts","sourceRoot":"","sources":["../../../lib/tools/compress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAC1C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"compress.d.ts","sourceRoot":"","sources":["../../../lib/tools/compress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAC1C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAyB1C,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,WAAW,GAAG,UAAU,CAAC,OAAO,IAAI,CAAC,CA4H5E"}
|
|
@@ -2,7 +2,9 @@ import { tool } from "@opencode-ai/plugin";
|
|
|
2
2
|
import { COMPRESS_TOOL_SPEC } from "../prompts";
|
|
3
3
|
import { ensureSessionInitialized } from "../state";
|
|
4
4
|
import { wrapCompressedSummary, allocateBlockId, applyCompressionState, buildSearchContext, fetchSessionMessages, COMPRESSED_BLOCK_HEADER, injectBlockPlaceholders, parseBlockPlaceholders, resolveAnchorMessageId, resolveBoundaryIds, resolveRange, validateCompressArgs, validateSummaryPlaceholders, } from "./compress-utils";
|
|
5
|
+
import { isIgnoredUserMessage } from "../messages/utils";
|
|
5
6
|
import { getCurrentParams, getCurrentTokenUsage, countTokens } from "../strategies/utils";
|
|
7
|
+
import { deduplicate, purgeErrors } from "../strategies";
|
|
6
8
|
import { saveSessionState } from "../state/persistence";
|
|
7
9
|
import { sendCompressNotification } from "../ui/notification";
|
|
8
10
|
export function createCompressTool(ctx) {
|
|
@@ -40,6 +42,9 @@ export function createCompressTool(ctx) {
|
|
|
40
42
|
});
|
|
41
43
|
const rawMessages = await fetchSessionMessages(ctx.client, toolCtx.sessionID);
|
|
42
44
|
await ensureSessionInitialized(ctx.client, ctx.state, toolCtx.sessionID, ctx.logger, rawMessages, ctx.config.manualMode.enabled);
|
|
45
|
+
deduplicate(ctx.state, ctx.logger, ctx.config, rawMessages);
|
|
46
|
+
// supersedeWrites(ctx.state, ctx.logger, ctx.config, rawMessages)
|
|
47
|
+
purgeErrors(ctx.state, ctx.logger, ctx.config, rawMessages);
|
|
43
48
|
const searchContext = buildSearchContext(ctx.state, rawMessages);
|
|
44
49
|
const { startReference, endReference } = resolveBoundaryIds(searchContext, ctx.state, compressArgs.content.startId, compressArgs.content.endId);
|
|
45
50
|
const range = resolveRange(searchContext, startReference, endReference);
|
|
@@ -54,7 +59,9 @@ export function createCompressTool(ctx) {
|
|
|
54
59
|
await saveSessionState(ctx.state, ctx.logger);
|
|
55
60
|
const params = getCurrentParams(ctx.state, rawMessages, ctx.logger);
|
|
56
61
|
const totalSessionTokens = getCurrentTokenUsage(rawMessages);
|
|
57
|
-
const sessionMessageIds = rawMessages
|
|
62
|
+
const sessionMessageIds = rawMessages
|
|
63
|
+
.filter((msg) => !(msg.info.role === "user" && isIgnoredUserMessage(msg)))
|
|
64
|
+
.map((msg) => msg.info.id);
|
|
58
65
|
await sendCompressNotification(ctx.client, ctx.logger, ctx.config, ctx.state, toolCtx.sessionID, range.toolIds, applied.messageIds, compressArgs.topic, injected.expandedSummary, summaryTokens, totalSessionTokens, applied.compressedTokens, sessionMessageIds, rawMessages.length, params);
|
|
59
66
|
return `Compressed ${applied.messageIds.length} messages into ${COMPRESSED_BLOCK_HEADER}.`;
|
|
60
67
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compress.js","sourceRoot":"","sources":["../../../lib/tools/compress.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"compress.js","sourceRoot":"","sources":["../../../lib/tools/compress.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notification.d.ts","sourceRoot":"","sources":["../../../lib/ui/notification.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAO5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"notification.d.ts","sourceRoot":"","sources":["../../../lib/ui/notification.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAO5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAExC,MAAM,MAAM,WAAW,GAAG,YAAY,GAAG,OAAO,GAAG,YAAY,CAAA;AAC/D,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,CAI3D,CAAA;AAmED,wBAAsB,uBAAuB,CACzC,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,YAAY,EACnB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EAAE,EACtB,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,EAC7C,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,MAAM,EAAE,GAAG,EACX,gBAAgB,EAAE,MAAM,GACzB,OAAO,CAAC,OAAO,CAAC,CAiClB;AAED,wBAAsB,wBAAwB,CAC1C,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,YAAY,EACnB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,MAAM,EAAE,EACpB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,EACrB,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,MAAM,EACxB,iBAAiB,EAAE,MAAM,EAAE,EAC3B,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,GAAG,GACZ,OAAO,CAAC,OAAO,CAAC,CA4DlB;AAED,wBAAsB,kBAAkB,CACpC,MAAM,EAAE,GAAG,EACX,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CAiCf"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { formatPrunedItemsList, formatSessionMap, formatStatsHeader, formatTokenCount, } from "./utils";
|
|
2
|
-
import { clog, C } from "../compress-logger";
|
|
3
2
|
export const PRUNE_REASON_LABELS = {
|
|
4
3
|
completion: "Task Complete",
|
|
5
4
|
noise: "Noise Removal",
|
|
@@ -90,12 +89,6 @@ export async function sendCompressNotification(client, logger, config, state, se
|
|
|
90
89
|
else {
|
|
91
90
|
message = formatStatsHeader(state.stats.totalPruneTokens, state.stats.pruneTokenCounter);
|
|
92
91
|
const pruneTokenCounterStr = `~${formatTokenCount(compressedTokens)}`;
|
|
93
|
-
clog.info(C.COMPRESS, `sendCompressNotification inputs`, {
|
|
94
|
-
summaryTokens,
|
|
95
|
-
totalSessionTokens,
|
|
96
|
-
compressedTokens,
|
|
97
|
-
ratio: totalSessionTokens > 0 ? (compressedTokens / totalSessionTokens).toFixed(4) : "N/A",
|
|
98
|
-
});
|
|
99
92
|
const progressBar = formatSessionMap(sessionMessageIds, state.prune.messages, 50);
|
|
100
93
|
const reduction = totalSessionTokens > 0 ? Math.round((compressedTokens / totalSessionTokens) * 100) : 0;
|
|
101
94
|
message += `\n\n${progressBar}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notification.js","sourceRoot":"","sources":["../../../lib/ui/notification.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,qBAAqB,EACrB,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,GACnB,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"notification.js","sourceRoot":"","sources":["../../../lib/ui/notification.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"$schema": "https://json.schemastore.org/package.json",
|
|
3
3
|
"name": "@tarquinen/opencode-dcp",
|
|
4
|
-
"version": "2.2.
|
|
4
|
+
"version": "2.2.1-beta0",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"description": "OpenCode plugin that optimizes token usage by pruning obsolete tool outputs from conversation context",
|
|
7
7
|
"main": "./dist/index.js",
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
declare function flush(): Promise<void>;
|
|
2
|
-
export declare const clog: {
|
|
3
|
-
debug: (category: string, message: string, data?: unknown) => void;
|
|
4
|
-
info: (category: string, message: string, data?: unknown) => void;
|
|
5
|
-
warn: (category: string, message: string, data?: unknown) => void;
|
|
6
|
-
error: (category: string, message: string, data?: unknown) => void;
|
|
7
|
-
flush: typeof flush;
|
|
8
|
-
};
|
|
9
|
-
export declare const C: {
|
|
10
|
-
readonly COMPRESS: "COMPRESS";
|
|
11
|
-
readonly BOUNDARY: "BOUNDARY";
|
|
12
|
-
readonly STATE: "STATE";
|
|
13
|
-
};
|
|
14
|
-
export {};
|
|
15
|
-
//# sourceMappingURL=compress-logger.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"compress-logger.d.ts","sourceRoot":"","sources":["../../lib/compress-logger.ts"],"names":[],"mappings":"AAgCA,iBAAe,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAWpC;AAkFD,eAAO,MAAM,IAAI;sBACK,MAAM,WAAW,MAAM,SAAS,OAAO;qBAExC,MAAM,WAAW,MAAM,SAAS,OAAO;qBAEvC,MAAM,WAAW,MAAM,SAAS,OAAO;sBAEtC,MAAM,WAAW,MAAM,SAAS,OAAO;;CAG5D,CAAA;AAED,eAAO,MAAM,CAAC;;;;CAIJ,CAAA"}
|
|
@@ -1,132 +0,0 @@
|
|
|
1
|
-
import * as fs from "fs";
|
|
2
|
-
import * as path from "path";
|
|
3
|
-
// =============================================================================
|
|
4
|
-
// Dedicated compress diagnostics logger for DCP
|
|
5
|
-
// Buffered async file writes, always-on when compress is invoked
|
|
6
|
-
// Logs to .logs/dcp-compress.log relative to cwd
|
|
7
|
-
// =============================================================================
|
|
8
|
-
const LOG_DIR = path.join(process.cwd(), ".logs");
|
|
9
|
-
const LOG_FILE = path.join(LOG_DIR, "dcp-compress.log");
|
|
10
|
-
const WRITE_INTERVAL_MS = 100;
|
|
11
|
-
const MAX_DATA_CHARS = 20000;
|
|
12
|
-
let buffer = [];
|
|
13
|
-
let scheduled = false;
|
|
14
|
-
let initialized = false;
|
|
15
|
-
function init() {
|
|
16
|
-
if (initialized)
|
|
17
|
-
return true;
|
|
18
|
-
try {
|
|
19
|
-
if (!fs.existsSync(LOG_DIR)) {
|
|
20
|
-
fs.mkdirSync(LOG_DIR, { recursive: true });
|
|
21
|
-
}
|
|
22
|
-
fs.writeFileSync(LOG_FILE, "");
|
|
23
|
-
initialized = true;
|
|
24
|
-
return true;
|
|
25
|
-
}
|
|
26
|
-
catch {
|
|
27
|
-
return false;
|
|
28
|
-
}
|
|
29
|
-
}
|
|
30
|
-
async function flush() {
|
|
31
|
-
if (buffer.length === 0) {
|
|
32
|
-
scheduled = false;
|
|
33
|
-
return;
|
|
34
|
-
}
|
|
35
|
-
const chunk = buffer.join("");
|
|
36
|
-
buffer = [];
|
|
37
|
-
scheduled = false;
|
|
38
|
-
try {
|
|
39
|
-
await fs.promises.appendFile(LOG_FILE, chunk);
|
|
40
|
-
}
|
|
41
|
-
catch { }
|
|
42
|
-
}
|
|
43
|
-
function schedule() {
|
|
44
|
-
if (!scheduled) {
|
|
45
|
-
scheduled = true;
|
|
46
|
-
setTimeout(flush, WRITE_INTERVAL_MS);
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
function truncate(str, max) {
|
|
50
|
-
if (str.length <= max)
|
|
51
|
-
return str;
|
|
52
|
-
return `${str.substring(0, max)}...`;
|
|
53
|
-
}
|
|
54
|
-
function formatNumber(n) {
|
|
55
|
-
return n.toLocaleString("en-US");
|
|
56
|
-
}
|
|
57
|
-
function indent(lines, spaces) {
|
|
58
|
-
const prefix = " ".repeat(spaces);
|
|
59
|
-
return lines
|
|
60
|
-
.split("\n")
|
|
61
|
-
.map((line) => (line ? prefix + line : ""))
|
|
62
|
-
.join("\n");
|
|
63
|
-
}
|
|
64
|
-
function formatValue(value, depth = 0) {
|
|
65
|
-
if (value === null)
|
|
66
|
-
return "null";
|
|
67
|
-
if (value === undefined)
|
|
68
|
-
return "undefined";
|
|
69
|
-
if (typeof value === "boolean")
|
|
70
|
-
return value ? "true" : "false";
|
|
71
|
-
if (typeof value === "number")
|
|
72
|
-
return formatNumber(value);
|
|
73
|
-
if (typeof value === "string") {
|
|
74
|
-
if (value.length > 120) {
|
|
75
|
-
return `"${truncate(value, 120)}"`;
|
|
76
|
-
}
|
|
77
|
-
return `"${value}"`;
|
|
78
|
-
}
|
|
79
|
-
if (Array.isArray(value)) {
|
|
80
|
-
if (value.length === 0)
|
|
81
|
-
return "[]";
|
|
82
|
-
if (depth > 3) {
|
|
83
|
-
return `[${value.length} items]`;
|
|
84
|
-
}
|
|
85
|
-
const items = value
|
|
86
|
-
.slice(0, 10)
|
|
87
|
-
.map((v) => `- ${formatValue(v, depth + 1)}`)
|
|
88
|
-
.join("\n");
|
|
89
|
-
const omitted = value.length > 10 ? `\n... (${value.length - 10} more)` : "";
|
|
90
|
-
return `\n${indent(items, 2)}${omitted}`;
|
|
91
|
-
}
|
|
92
|
-
if (typeof value === "object") {
|
|
93
|
-
const entries = Object.entries(value);
|
|
94
|
-
if (entries.length === 0)
|
|
95
|
-
return "{}";
|
|
96
|
-
if (depth > 3) {
|
|
97
|
-
return `{${entries.length} keys}`;
|
|
98
|
-
}
|
|
99
|
-
const lines = entries
|
|
100
|
-
.slice(0, 15)
|
|
101
|
-
.map(([k, v]) => `${k}: ${formatValue(v, depth + 1)}`)
|
|
102
|
-
.join("\n");
|
|
103
|
-
const omitted = entries.length > 15 ? `\n... (${entries.length - 15} more)` : "";
|
|
104
|
-
return `\n${indent(lines, 2)}${omitted}`;
|
|
105
|
-
}
|
|
106
|
-
return String(value);
|
|
107
|
-
}
|
|
108
|
-
function write(level, category, message, data) {
|
|
109
|
-
if (!init())
|
|
110
|
-
return;
|
|
111
|
-
const ts = new Date().toISOString();
|
|
112
|
-
let output = `[${ts}] [${level}] [${category}]\n${indent(message, 2)}`;
|
|
113
|
-
if (data !== undefined) {
|
|
114
|
-
const formatted = formatValue(data);
|
|
115
|
-
output += `\n${indent(formatted, 2)}`;
|
|
116
|
-
}
|
|
117
|
-
buffer.push(`${output}\n\n`);
|
|
118
|
-
schedule();
|
|
119
|
-
}
|
|
120
|
-
export const clog = {
|
|
121
|
-
debug: (category, message, data) => write("DEBUG", category, message, data),
|
|
122
|
-
info: (category, message, data) => write("INFO", category, message, data),
|
|
123
|
-
warn: (category, message, data) => write("WARN", category, message, data),
|
|
124
|
-
error: (category, message, data) => write("ERROR", category, message, data),
|
|
125
|
-
flush,
|
|
126
|
-
};
|
|
127
|
-
export const C = {
|
|
128
|
-
COMPRESS: "COMPRESS",
|
|
129
|
-
BOUNDARY: "BOUNDARY",
|
|
130
|
-
STATE: "STATE",
|
|
131
|
-
};
|
|
132
|
-
//# sourceMappingURL=compress-logger.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"compress-logger.js","sourceRoot":"","sources":["../../lib/compress-logger.ts"],"names":[],"mappings":"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"}
|