@tarquinen/opencode-dcp 3.0.4 → 3.1.0
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 +22 -17
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +11 -9
- package/dist/index.js.map +1 -1
- package/dist/lib/commands/compression-targets.d.ts +13 -0
- package/dist/lib/commands/compression-targets.d.ts.map +1 -0
- package/dist/lib/commands/compression-targets.js +97 -0
- package/dist/lib/commands/compression-targets.js.map +1 -0
- package/dist/lib/commands/context.js +1 -1
- package/dist/lib/commands/context.js.map +1 -1
- package/dist/lib/commands/decompress.d.ts.map +1 -1
- package/dist/lib/commands/decompress.js +43 -28
- package/dist/lib/commands/decompress.js.map +1 -1
- package/dist/lib/commands/manual.d.ts.map +1 -1
- package/dist/lib/commands/manual.js +6 -6
- package/dist/lib/commands/manual.js.map +1 -1
- package/dist/lib/commands/recompress.d.ts.map +1 -1
- package/dist/lib/commands/recompress.js +34 -31
- package/dist/lib/commands/recompress.js.map +1 -1
- package/dist/lib/compress/index.d.ts +4 -0
- package/dist/lib/compress/index.d.ts.map +1 -0
- package/dist/lib/compress/index.js +3 -0
- package/dist/lib/compress/index.js.map +1 -0
- package/dist/lib/compress/message-utils.d.ts +8 -0
- package/dist/lib/compress/message-utils.d.ts.map +1 -0
- package/dist/lib/compress/message-utils.js +123 -0
- package/dist/lib/compress/message-utils.js.map +1 -0
- package/dist/lib/compress/message.d.ts +4 -0
- package/dist/lib/compress/message.d.ts.map +1 -0
- package/dist/lib/compress/message.js +78 -0
- package/dist/lib/compress/message.js.map +1 -0
- package/dist/lib/compress/pipeline.d.ts +29 -0
- package/dist/lib/compress/pipeline.d.ts.map +1 -0
- package/dist/lib/compress/pipeline.js +40 -0
- package/dist/lib/compress/pipeline.js.map +1 -0
- package/dist/lib/compress/protected-content.d.ts +5 -0
- package/dist/lib/compress/protected-content.d.ts.map +1 -0
- package/dist/lib/compress/protected-content.js +106 -0
- package/dist/lib/compress/protected-content.js.map +1 -0
- package/dist/lib/compress/range-utils.d.ts +10 -0
- package/dist/lib/compress/range-utils.d.ts.map +1 -0
- package/dist/lib/compress/range-utils.js +199 -0
- package/dist/lib/compress/range-utils.js.map +1 -0
- package/dist/lib/compress/range.d.ts +4 -0
- package/dist/lib/compress/range.d.ts.map +1 -0
- package/dist/lib/compress/range.js +86 -0
- package/dist/lib/compress/range.js.map +1 -0
- package/dist/lib/compress/search.d.ts +11 -0
- package/dist/lib/compress/search.d.ts.map +1 -0
- package/dist/lib/compress/search.js +204 -0
- package/dist/lib/compress/search.js.map +1 -0
- package/dist/lib/compress/state.d.ts +8 -0
- package/dist/lib/compress/state.d.ts.map +1 -0
- package/dist/lib/compress/state.js +197 -0
- package/dist/lib/compress/state.js.map +1 -0
- package/dist/lib/compress/types.d.ts +92 -0
- package/dist/lib/compress/types.d.ts.map +1 -0
- package/dist/lib/{tools → compress}/types.js.map +1 -1
- package/dist/lib/config.d.ts +5 -7
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/config.js +24 -30
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/hooks.d.ts.map +1 -1
- package/dist/lib/hooks.js +6 -8
- package/dist/lib/hooks.js.map +1 -1
- package/dist/lib/message-ids.d.ts +1 -1
- package/dist/lib/message-ids.d.ts.map +1 -1
- package/dist/lib/message-ids.js +19 -3
- package/dist/lib/message-ids.js.map +1 -1
- package/dist/lib/messages/inject/inject.d.ts +3 -2
- package/dist/lib/messages/inject/inject.d.ts.map +1 -1
- package/dist/lib/messages/inject/inject.js +31 -10
- package/dist/lib/messages/inject/inject.js.map +1 -1
- package/dist/lib/messages/inject/utils.d.ts +2 -2
- package/dist/lib/messages/inject/utils.d.ts.map +1 -1
- package/dist/lib/messages/inject/utils.js +102 -42
- package/dist/lib/messages/inject/utils.js.map +1 -1
- package/dist/lib/messages/priority.d.ts +13 -0
- package/dist/lib/messages/priority.d.ts.map +1 -0
- package/dist/lib/messages/priority.js +65 -0
- package/dist/lib/messages/priority.js.map +1 -0
- package/dist/lib/messages/prune.js +6 -4
- package/dist/lib/messages/prune.js.map +1 -1
- package/dist/lib/messages/utils.d.ts +9 -2
- package/dist/lib/messages/utils.d.ts.map +1 -1
- package/dist/lib/messages/utils.js +41 -9
- package/dist/lib/messages/utils.js.map +1 -1
- package/dist/lib/prompts/compress-message.d.ts +2 -0
- package/dist/lib/prompts/compress-message.d.ts.map +1 -0
- package/dist/lib/prompts/compress-message.js +44 -0
- package/dist/lib/prompts/compress-message.js.map +1 -0
- package/dist/lib/prompts/compress-range.d.ts +2 -0
- package/dist/lib/prompts/compress-range.d.ts.map +1 -0
- package/dist/lib/prompts/{compress.js → compress-range.js} +5 -29
- package/dist/lib/prompts/compress-range.js.map +1 -0
- package/dist/lib/prompts/internal-overlays.d.ts +2 -2
- package/dist/lib/prompts/internal-overlays.d.ts.map +1 -1
- package/dist/lib/prompts/internal-overlays.js +17 -11
- package/dist/lib/prompts/internal-overlays.js.map +1 -1
- package/dist/lib/prompts/message-priority-guidance.d.ts +2 -0
- package/dist/lib/prompts/message-priority-guidance.d.ts.map +1 -0
- package/dist/lib/prompts/message-priority-guidance.js +9 -0
- package/dist/lib/prompts/message-priority-guidance.js.map +1 -0
- package/dist/lib/prompts/store.d.ts +3 -2
- package/dist/lib/prompts/store.d.ts.map +1 -1
- package/dist/lib/prompts/store.js +24 -12
- package/dist/lib/prompts/store.js.map +1 -1
- package/dist/lib/prompts/system.d.ts +1 -1
- package/dist/lib/prompts/system.d.ts.map +1 -1
- package/dist/lib/prompts/system.js +26 -9
- package/dist/lib/prompts/system.js.map +1 -1
- package/dist/lib/shared-utils.d.ts +1 -0
- package/dist/lib/shared-utils.d.ts.map +1 -1
- package/dist/lib/shared-utils.js +7 -0
- package/dist/lib/shared-utils.js.map +1 -1
- package/dist/lib/state/persistence.d.ts +1 -0
- package/dist/lib/state/persistence.d.ts.map +1 -1
- package/dist/lib/state/persistence.js +1 -0
- package/dist/lib/state/persistence.js.map +1 -1
- package/dist/lib/state/types.d.ts +6 -0
- package/dist/lib/state/types.d.ts.map +1 -1
- package/dist/lib/state/utils.d.ts +1 -0
- package/dist/lib/state/utils.d.ts.map +1 -1
- package/dist/lib/state/utils.js +31 -9
- package/dist/lib/state/utils.js.map +1 -1
- package/dist/lib/strategies/index.d.ts +0 -1
- package/dist/lib/strategies/index.d.ts.map +1 -1
- package/dist/lib/strategies/index.js +0 -1
- package/dist/lib/strategies/index.js.map +1 -1
- package/dist/lib/strategies/utils.d.ts +1 -5
- package/dist/lib/strategies/utils.d.ts.map +1 -1
- package/dist/lib/strategies/utils.js +24 -28
- package/dist/lib/strategies/utils.js.map +1 -1
- package/dist/lib/ui/notification.d.ts +8 -1
- package/dist/lib/ui/notification.d.ts.map +1 -1
- package/dist/lib/ui/notification.js +66 -13
- package/dist/lib/ui/notification.js.map +1 -1
- package/package.json +1 -1
- package/dist/lib/prompts/compress.d.ts +0 -2
- package/dist/lib/prompts/compress.d.ts.map +0 -1
- package/dist/lib/prompts/compress.js.map +0 -1
- package/dist/lib/strategies/supersede-writes.d.ts +0 -13
- package/dist/lib/strategies/supersede-writes.d.ts.map +0 -1
- package/dist/lib/strategies/supersede-writes.js +0 -94
- package/dist/lib/strategies/supersede-writes.js.map +0 -1
- package/dist/lib/tools/compress.d.ts +0 -4
- package/dist/lib/tools/compress.d.ts.map +0 -1
- package/dist/lib/tools/compress.js +0 -110
- package/dist/lib/tools/compress.js.map +0 -1
- package/dist/lib/tools/index.d.ts +0 -3
- package/dist/lib/tools/index.d.ts.map +0 -1
- package/dist/lib/tools/index.js +0 -2
- package/dist/lib/tools/index.js.map +0 -1
- package/dist/lib/tools/types.d.ts +0 -13
- package/dist/lib/tools/types.d.ts.map +0 -1
- package/dist/lib/tools/utils.d.ts +0 -80
- package/dist/lib/tools/utils.d.ts.map +0 -1
- package/dist/lib/tools/utils.js +0 -675
- package/dist/lib/tools/utils.js.map +0 -1
- /package/dist/lib/{tools → compress}/types.js +0 -0
package/dist/lib/hooks.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { assignMessageRefs } from "./message-ids";
|
|
2
|
+
import { buildPriorityMap } from "./messages/priority";
|
|
2
3
|
import { syncToolCache } from "./state/tool-cache";
|
|
3
4
|
import { prune, syncCompressionBlocks, injectCompressNudges, injectMessageIds, injectExtendedSubAgentResults, stripStaleMetadata, } from "./messages";
|
|
4
|
-
import { buildToolIdList, isIgnoredUserMessage, stripHallucinations } from "./messages/utils";
|
|
5
|
+
import { buildToolIdList, isIgnoredUserMessage, stripHallucinations, stripHallucinationsFromString, } from "./messages/utils";
|
|
5
6
|
import { checkSession } from "./state";
|
|
6
7
|
import { renderSystemPrompt } from "./prompts";
|
|
7
8
|
import { handleStatsCommand } from "./commands/stats";
|
|
@@ -19,8 +20,6 @@ const INTERNAL_AGENT_SIGNATURES = [
|
|
|
19
20
|
"You are a helpful AI assistant tasked with summarizing conversations",
|
|
20
21
|
"Summarize what was done in this conversation",
|
|
21
22
|
];
|
|
22
|
-
const DCP_MESSAGE_ID_TAG_REGEX = /<dcp-message-id>(?:m\d+|b\d+)<\/dcp-message-id>/g;
|
|
23
|
-
const DCP_SYSTEM_REMINDER_REGEX = /<dcp-system-reminder\b[^>]*>[\s\S]*?<\/dcp-system-reminder>/g;
|
|
24
23
|
function applyManualPrompt(state, messages, logger) {
|
|
25
24
|
const pending = state.pendingManualTrigger;
|
|
26
25
|
if (!pending) {
|
|
@@ -93,9 +92,10 @@ export function createChatMessageTransformHandler(client, state, logger, config,
|
|
|
93
92
|
buildToolIdList(state, output.messages);
|
|
94
93
|
prune(state, logger, config, output.messages);
|
|
95
94
|
await injectExtendedSubAgentResults(client, state, logger, output.messages, config.experimental.allowSubAgents);
|
|
95
|
+
const compressionPriorities = buildPriorityMap(config, state, output.messages);
|
|
96
96
|
prompts.reload();
|
|
97
|
-
injectCompressNudges(state, config, logger, output.messages, prompts.getRuntimePrompts());
|
|
98
|
-
injectMessageIds(state, config, output.messages);
|
|
97
|
+
injectCompressNudges(state, config, logger, output.messages, prompts.getRuntimePrompts(), compressionPriorities);
|
|
98
|
+
injectMessageIds(state, config, output.messages, compressionPriorities);
|
|
99
99
|
applyManualPrompt(state, output.messages, logger);
|
|
100
100
|
stripStaleMetadata(output.messages);
|
|
101
101
|
if (state.sessionId) {
|
|
@@ -187,9 +187,7 @@ export function createCommandExecuteHandler(client, state, logger, config, worki
|
|
|
187
187
|
}
|
|
188
188
|
export function createTextCompleteHandler() {
|
|
189
189
|
return async (_input, output) => {
|
|
190
|
-
output.text = output.text
|
|
191
|
-
.replace(DCP_SYSTEM_REMINDER_REGEX, "")
|
|
192
|
-
.replace(DCP_MESSAGE_ID_TAG_REGEX, "");
|
|
190
|
+
output.text = stripHallucinationsFromString(output.text);
|
|
193
191
|
};
|
|
194
192
|
}
|
|
195
193
|
//# sourceMappingURL=hooks.js.map
|
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,EACH,KAAK,EACL,qBAAqB,EACrB,oBAAoB,EACpB,gBAAgB,EAChB,6BAA6B,EAC7B,kBAAkB,GACrB,MAAM,YAAY,CAAA;AACnB,OAAO,
|
|
1
|
+
{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../../lib/hooks.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,6 @@ export declare function formatBlockRef(blockId: number): string;
|
|
|
14
14
|
export declare function parseMessageRef(ref: string): number | null;
|
|
15
15
|
export declare function parseBlockRef(ref: string): number | null;
|
|
16
16
|
export declare function parseBoundaryId(id: string): ParsedBoundaryId | null;
|
|
17
|
-
export declare function formatMessageIdTag(ref: string): string;
|
|
17
|
+
export declare function formatMessageIdTag(ref: string, attributes?: Record<string, string | undefined>): string;
|
|
18
18
|
export declare function assignMessageRefs(state: SessionState, messages: WithParts[]): number;
|
|
19
19
|
//# sourceMappingURL=message-ids.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-ids.d.ts","sourceRoot":"","sources":["../../lib/message-ids.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAStD,eAAO,MAAM,qBAAqB,OAAO,CAAA;AAEzC,MAAM,MAAM,gBAAgB,GACtB;IACI,IAAI,EAAE,SAAS,CAAA;IACf,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,CAAA;CAChB,GACD;IACI,IAAI,EAAE,kBAAkB,CAAA;IACxB,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,MAAM,CAAA;CAClB,CAAA;AAEP,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAWtD;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAKtD;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAc1D;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQxD;AAED,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAqBnE;
|
|
1
|
+
{"version":3,"file":"message-ids.d.ts","sourceRoot":"","sources":["../../lib/message-ids.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAStD,eAAO,MAAM,qBAAqB,OAAO,CAAA;AAEzC,MAAM,MAAM,gBAAgB,GACtB;IACI,IAAI,EAAE,SAAS,CAAA;IACf,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,CAAA;CAChB,GACD;IACI,IAAI,EAAE,kBAAkB,CAAA;IACxB,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,MAAM,CAAA;CAClB,CAAA;AAEP,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAWtD;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAKtD;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAc1D;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQxD;AAED,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAqBnE;AAUD,wBAAgB,kBAAkB,CAC9B,GAAG,EAAE,MAAM,EACX,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAChD,MAAM,CAaR;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,CAkCpF"}
|
package/dist/lib/message-ids.js
CHANGED
|
@@ -63,14 +63,30 @@ export function parseBoundaryId(id) {
|
|
|
63
63
|
}
|
|
64
64
|
return null;
|
|
65
65
|
}
|
|
66
|
-
|
|
67
|
-
return
|
|
66
|
+
function escapeXmlAttribute(value) {
|
|
67
|
+
return value
|
|
68
|
+
.replace(/&/g, "&")
|
|
69
|
+
.replace(/"/g, """)
|
|
70
|
+
.replace(/</g, "<")
|
|
71
|
+
.replace(/>/g, ">");
|
|
72
|
+
}
|
|
73
|
+
export function formatMessageIdTag(ref, attributes) {
|
|
74
|
+
const serializedAttributes = Object.entries(attributes || {})
|
|
75
|
+
.sort(([left], [right]) => left.localeCompare(right))
|
|
76
|
+
.map(([name, value]) => {
|
|
77
|
+
if (name.trim().length === 0 || typeof value !== "string" || value.length === 0) {
|
|
78
|
+
return "";
|
|
79
|
+
}
|
|
80
|
+
return ` ${name}="${escapeXmlAttribute(value)}"`;
|
|
81
|
+
})
|
|
82
|
+
.join("");
|
|
83
|
+
return `\n<${MESSAGE_ID_TAG_NAME}${serializedAttributes}>${ref}</${MESSAGE_ID_TAG_NAME}>`;
|
|
68
84
|
}
|
|
69
85
|
export function assignMessageRefs(state, messages) {
|
|
70
86
|
let assigned = 0;
|
|
71
87
|
let skippedSubAgentPrompt = false;
|
|
72
88
|
for (const message of messages) {
|
|
73
|
-
if (
|
|
89
|
+
if (isIgnoredUserMessage(message)) {
|
|
74
90
|
continue;
|
|
75
91
|
}
|
|
76
92
|
if (state.isSubAgent && !skippedSubAgentPrompt && message.info.role === "user") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-ids.js","sourceRoot":"","sources":["../../lib/message-ids.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"message-ids.js","sourceRoot":"","sources":["../../lib/message-ids.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import type { SessionState, WithParts } from "../../state";
|
|
|
2
2
|
import type { Logger } from "../../logger";
|
|
3
3
|
import type { PluginConfig } from "../../config";
|
|
4
4
|
import type { RuntimePrompts } from "../../prompts/store";
|
|
5
|
-
|
|
6
|
-
export declare const
|
|
5
|
+
import type { CompressionPriorityMap } from "../priority";
|
|
6
|
+
export declare const injectCompressNudges: (state: SessionState, config: PluginConfig, logger: Logger, messages: WithParts[], prompts: RuntimePrompts, compressionPriorities?: CompressionPriorityMap) => void;
|
|
7
|
+
export declare const injectMessageIds: (state: SessionState, config: PluginConfig, messages: WithParts[], compressionPriorities?: CompressionPriorityMap) => void;
|
|
7
8
|
//# sourceMappingURL=inject.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inject.d.ts","sourceRoot":"","sources":["../../../../lib/messages/inject/inject.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAChD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"inject.d.ts","sourceRoot":"","sources":["../../../../lib/messages/inject/inject.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAChD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEzD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAA;AAqBzD,eAAO,MAAM,oBAAoB,GAC7B,OAAO,YAAY,EACnB,QAAQ,YAAY,EACpB,QAAQ,MAAM,EACd,UAAU,SAAS,EAAE,EACrB,SAAS,cAAc,EACvB,wBAAwB,sBAAsB,KAC/C,IAuGF,CAAA;AAED,eAAO,MAAM,gBAAgB,GACzB,OAAO,YAAY,EACnB,QAAQ,YAAY,EACpB,UAAU,SAAS,EAAE,EACrB,wBAAwB,sBAAsB,KAC/C,IAkEF,CAAA"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { formatMessageIdTag } from "../../message-ids";
|
|
2
|
-
import { compressPermission, getLastUserMessage } from "../../shared-utils";
|
|
2
|
+
import { compressPermission, getLastUserMessage, messageHasCompress } from "../../shared-utils";
|
|
3
3
|
import { saveSessionState } from "../../state/persistence";
|
|
4
|
-
import {
|
|
5
|
-
import { addAnchor, applyAnchoredNudges, countMessagesAfterIndex, findLastNonIgnoredMessage, getIterationNudgeThreshold, getNudgeFrequency, getModelInfo, isContextOverLimits,
|
|
6
|
-
export const injectCompressNudges = (state, config, logger, messages, prompts) => {
|
|
4
|
+
import { appendToTextPart, appendToToolPart, createSyntheticTextPart, isIgnoredUserMessage, isProtectedUserMessage, } from "../utils";
|
|
5
|
+
import { addAnchor, applyAnchoredNudges, countMessagesAfterIndex, findLastNonIgnoredMessage, getIterationNudgeThreshold, getNudgeFrequency, getModelInfo, isContextOverLimits, } from "./utils";
|
|
6
|
+
export const injectCompressNudges = (state, config, logger, messages, prompts, compressionPriorities) => {
|
|
7
7
|
if (compressPermission(state, config) === "deny") {
|
|
8
8
|
return;
|
|
9
9
|
}
|
|
@@ -67,33 +67,54 @@ export const injectCompressNudges = (state, config, logger, messages, prompts) =
|
|
|
67
67
|
}
|
|
68
68
|
}
|
|
69
69
|
}
|
|
70
|
-
applyAnchoredNudges(state, config, messages, prompts);
|
|
70
|
+
applyAnchoredNudges(state, config, messages, prompts, compressionPriorities);
|
|
71
71
|
if (anchorsChanged) {
|
|
72
72
|
void saveSessionState(state, logger);
|
|
73
73
|
}
|
|
74
74
|
};
|
|
75
|
-
export const injectMessageIds = (state, config, messages) => {
|
|
75
|
+
export const injectMessageIds = (state, config, messages, compressionPriorities) => {
|
|
76
76
|
if (compressPermission(state, config) === "deny") {
|
|
77
77
|
return;
|
|
78
78
|
}
|
|
79
79
|
for (const message of messages) {
|
|
80
|
-
if (
|
|
80
|
+
if (isIgnoredUserMessage(message)) {
|
|
81
81
|
continue;
|
|
82
82
|
}
|
|
83
83
|
const messageRef = state.messageIds.byRawId.get(message.info.id);
|
|
84
84
|
if (!messageRef) {
|
|
85
85
|
continue;
|
|
86
86
|
}
|
|
87
|
-
const
|
|
87
|
+
const isBlockedMessage = isProtectedUserMessage(config, message);
|
|
88
|
+
const priority = config.compress.mode === "message" && !isBlockedMessage
|
|
89
|
+
? compressionPriorities?.get(message.info.id)?.priority
|
|
90
|
+
: undefined;
|
|
91
|
+
const tag = formatMessageIdTag(isBlockedMessage ? "BLOCKED" : messageRef, priority ? { priority } : undefined);
|
|
88
92
|
if (message.info.role === "user") {
|
|
93
|
+
let injected = false;
|
|
94
|
+
for (const part of message.parts) {
|
|
95
|
+
if (part.type === "text") {
|
|
96
|
+
injected = appendToTextPart(part, tag) || injected;
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
if (injected) {
|
|
100
|
+
continue;
|
|
101
|
+
}
|
|
89
102
|
message.parts.push(createSyntheticTextPart(message, tag));
|
|
90
103
|
continue;
|
|
91
104
|
}
|
|
92
105
|
if (message.info.role !== "assistant") {
|
|
93
106
|
continue;
|
|
94
107
|
}
|
|
95
|
-
|
|
96
|
-
|
|
108
|
+
let injected = false;
|
|
109
|
+
for (const part of message.parts) {
|
|
110
|
+
if (part.type === "text") {
|
|
111
|
+
injected = appendToTextPart(part, tag) || injected;
|
|
112
|
+
}
|
|
113
|
+
else if (part.type === "tool") {
|
|
114
|
+
injected = appendToToolPart(part, tag) || injected;
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
if (injected) {
|
|
97
118
|
continue;
|
|
98
119
|
}
|
|
99
120
|
const syntheticPart = createSyntheticTextPart(message, tag);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inject.js","sourceRoot":"","sources":["../../../../lib/messages/inject/inject.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"inject.js","sourceRoot":"","sources":["../../../../lib/messages/inject/inject.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { SessionState, WithParts } from "../../state";
|
|
2
2
|
import type { PluginConfig } from "../../config";
|
|
3
3
|
import type { RuntimePrompts } from "../../prompts/store";
|
|
4
|
+
import { type CompressionPriorityMap } from "../priority";
|
|
4
5
|
export interface LastUserModelContext {
|
|
5
6
|
providerId: string | undefined;
|
|
6
7
|
modelId: string | undefined;
|
|
@@ -13,7 +14,6 @@ export declare function getNudgeFrequency(config: PluginConfig): number;
|
|
|
13
14
|
export declare function getIterationNudgeThreshold(config: PluginConfig): number;
|
|
14
15
|
export declare function findLastNonIgnoredMessage(messages: WithParts[]): LastNonIgnoredMessage | null;
|
|
15
16
|
export declare function countMessagesAfterIndex(messages: WithParts[], index: number): number;
|
|
16
|
-
export declare function messageHasCompress(message: WithParts): boolean;
|
|
17
17
|
export declare function getModelInfo(messages: WithParts[]): LastUserModelContext;
|
|
18
18
|
export declare function isContextOverLimits(config: PluginConfig, state: SessionState, providerId: string | undefined, modelId: string | undefined, messages: WithParts[]): {
|
|
19
19
|
overMaxLimit: boolean;
|
|
@@ -21,5 +21,5 @@ export declare function isContextOverLimits(config: PluginConfig, state: Session
|
|
|
21
21
|
};
|
|
22
22
|
export declare function addAnchor(anchorMessageIds: Set<string>, anchorMessageId: string, anchorMessageIndex: number, messages: WithParts[], interval: number): boolean;
|
|
23
23
|
export declare function buildCompressedBlockGuidance(state: SessionState): string;
|
|
24
|
-
export declare function applyAnchoredNudges(state: SessionState, config: PluginConfig, messages: WithParts[], prompts: RuntimePrompts): void;
|
|
24
|
+
export declare function applyAnchoredNudges(state: SessionState, config: PluginConfig, messages: WithParts[], prompts: RuntimePrompts, compressionPriorities?: CompressionPriorityMap): void;
|
|
25
25
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../lib/messages/inject/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../lib/messages/inject/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAEhD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEzD,OAAO,EACH,KAAK,sBAAsB,EAG9B,MAAM,aAAa,CAAA;AAOpB,MAAM,WAAW,oBAAoB;IACjC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;CAC9B;AAED,MAAM,WAAW,qBAAqB;IAClC,OAAO,EAAE,SAAS,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;CAChB;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAE9D;AAED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAEvE;AAED,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,qBAAqB,GAAG,IAAI,CAU7F;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAYpF;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,oBAAoB,CAcxE;AA8DD,wBAAgB,mBAAmB,CAC/B,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,YAAY,EACnB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,QAAQ,EAAE,SAAS,EAAE;;;EA0BxB;AAED,wBAAgB,SAAS,CACrB,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,EAC7B,eAAe,EAAE,MAAM,EACvB,kBAAkB,EAAE,MAAM,EAC1B,QAAQ,EAAE,SAAS,EAAE,EACrB,QAAQ,EAAE,MAAM,GACjB,OAAO,CAsBT;AAED,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,YAAY,GAAG,MAAM,CAaxE;AAwID,wBAAgB,mBAAmB,CAC/B,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,YAAY,EACpB,QAAQ,EAAE,SAAS,EAAE,EACrB,OAAO,EAAE,cAAc,EACvB,qBAAqB,CAAC,EAAE,sBAAsB,GAC/C,IAAI,CA4CN"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { renderMessagePriorityGuidance } from "../../prompts/message-priority-guidance";
|
|
2
|
+
import { listPriorityRefsBeforeIndex, } from "../priority";
|
|
3
|
+
import { appendToLastTextPart, createSyntheticTextPart, isIgnoredUserMessage } from "../utils";
|
|
2
4
|
import { getLastUserMessage } from "../../shared-utils";
|
|
3
5
|
import { getCurrentTokenUsage } from "../../strategies/utils";
|
|
6
|
+
const MESSAGE_MODE_NUDGE_PRIORITY = "high";
|
|
4
7
|
export function getNudgeFrequency(config) {
|
|
5
8
|
return Math.max(1, Math.floor(config.compress.nudgeFrequency || 1));
|
|
6
9
|
}
|
|
@@ -10,7 +13,7 @@ export function getIterationNudgeThreshold(config) {
|
|
|
10
13
|
export function findLastNonIgnoredMessage(messages) {
|
|
11
14
|
for (let i = messages.length - 1; i >= 0; i--) {
|
|
12
15
|
const message = messages[i];
|
|
13
|
-
if (
|
|
16
|
+
if (isIgnoredUserMessage(message)) {
|
|
14
17
|
continue;
|
|
15
18
|
}
|
|
16
19
|
return { message, index: i };
|
|
@@ -21,17 +24,13 @@ export function countMessagesAfterIndex(messages, index) {
|
|
|
21
24
|
let count = 0;
|
|
22
25
|
for (let i = index + 1; i < messages.length; i++) {
|
|
23
26
|
const message = messages[i];
|
|
24
|
-
if (
|
|
27
|
+
if (isIgnoredUserMessage(message)) {
|
|
25
28
|
continue;
|
|
26
29
|
}
|
|
27
30
|
count++;
|
|
28
31
|
}
|
|
29
32
|
return count;
|
|
30
33
|
}
|
|
31
|
-
export function messageHasCompress(message) {
|
|
32
|
-
const parts = Array.isArray(message.parts) ? message.parts : [];
|
|
33
|
-
return parts.some((part) => part.type === "tool" && part.state.status === "completed" && part.tool === "compress");
|
|
34
|
-
}
|
|
35
34
|
export function getModelInfo(messages) {
|
|
36
35
|
const lastUserMessage = getLastUserMessage(messages);
|
|
37
36
|
if (!lastUserMessage) {
|
|
@@ -76,10 +75,27 @@ function resolveContextTokenLimit(config, state, providerId, modelId, threshold)
|
|
|
76
75
|
const globalLimit = threshold === "max" ? config.compress.maxContextLimit : config.compress.minContextLimit;
|
|
77
76
|
return parseLimitValue(globalLimit);
|
|
78
77
|
}
|
|
78
|
+
function getActiveSummaryTokenUsage(state) {
|
|
79
|
+
let total = 0;
|
|
80
|
+
for (const blockId of state.prune.messages.activeBlockIds) {
|
|
81
|
+
const block = state.prune.messages.blocksById.get(blockId);
|
|
82
|
+
if (!block || !block.active) {
|
|
83
|
+
continue;
|
|
84
|
+
}
|
|
85
|
+
total += block.summaryTokens;
|
|
86
|
+
}
|
|
87
|
+
return total;
|
|
88
|
+
}
|
|
79
89
|
export function isContextOverLimits(config, state, providerId, modelId, messages) {
|
|
80
|
-
const
|
|
90
|
+
const summaryTokenExtension = config.compress.summaryBuffer
|
|
91
|
+
? getActiveSummaryTokenUsage(state)
|
|
92
|
+
: 0;
|
|
93
|
+
const resolvedMaxContextLimit = resolveContextTokenLimit(config, state, providerId, modelId, "max");
|
|
94
|
+
const maxContextLimit = resolvedMaxContextLimit === undefined
|
|
95
|
+
? undefined
|
|
96
|
+
: resolvedMaxContextLimit + summaryTokenExtension;
|
|
81
97
|
const minContextLimit = resolveContextTokenLimit(config, state, providerId, modelId, "min");
|
|
82
|
-
const currentTokens = getCurrentTokenUsage(messages);
|
|
98
|
+
const currentTokens = getCurrentTokenUsage(state, messages);
|
|
83
99
|
const overMaxLimit = maxContextLimit === undefined ? false : currentTokens > maxContextLimit;
|
|
84
100
|
const overMinLimit = minContextLimit === undefined ? true : currentTokens >= minContextLimit;
|
|
85
101
|
return {
|
|
@@ -119,50 +135,67 @@ export function buildCompressedBlockGuidance(state) {
|
|
|
119
135
|
"- If your selected compression range includes any listed block, include each required placeholder exactly once in the summary using \`(bN)\`.",
|
|
120
136
|
].join("\n");
|
|
121
137
|
}
|
|
122
|
-
function appendGuidanceToDcpTag(
|
|
138
|
+
function appendGuidanceToDcpTag(nudgeText, guidance) {
|
|
139
|
+
if (!guidance.trim()) {
|
|
140
|
+
return nudgeText;
|
|
141
|
+
}
|
|
123
142
|
const closeTag = "</dcp-system-reminder>";
|
|
124
|
-
const closeTagIndex =
|
|
143
|
+
const closeTagIndex = nudgeText.lastIndexOf(closeTag);
|
|
125
144
|
if (closeTagIndex === -1) {
|
|
126
|
-
return
|
|
145
|
+
return nudgeText;
|
|
127
146
|
}
|
|
128
|
-
const beforeClose =
|
|
129
|
-
const afterClose =
|
|
147
|
+
const beforeClose = nudgeText.slice(0, closeTagIndex).trimEnd();
|
|
148
|
+
const afterClose = nudgeText.slice(closeTagIndex);
|
|
130
149
|
return `${beforeClose}\n\n${guidance}\n${afterClose}`;
|
|
131
150
|
}
|
|
132
|
-
function
|
|
133
|
-
if (
|
|
151
|
+
function buildMessagePriorityGuidance(messages, compressionPriorities, anchorIndex, priority) {
|
|
152
|
+
if (!compressionPriorities || compressionPriorities.size === 0) {
|
|
153
|
+
return "";
|
|
154
|
+
}
|
|
155
|
+
const refs = listPriorityRefsBeforeIndex(messages, compressionPriorities, anchorIndex, priority);
|
|
156
|
+
const priorityLabel = `${priority[0].toUpperCase()}${priority.slice(1)}`;
|
|
157
|
+
return renderMessagePriorityGuidance(priorityLabel, refs);
|
|
158
|
+
}
|
|
159
|
+
function injectAnchoredNudge(message, nudgeText) {
|
|
160
|
+
if (!nudgeText.trim()) {
|
|
134
161
|
return;
|
|
135
162
|
}
|
|
163
|
+
if (appendToLastTextPart(message, nudgeText)) {
|
|
164
|
+
return;
|
|
165
|
+
}
|
|
166
|
+
if (message.info.role === "user") {
|
|
167
|
+
message.parts.push(createSyntheticTextPart(message, nudgeText));
|
|
168
|
+
return;
|
|
169
|
+
}
|
|
170
|
+
if (message.info.role !== "assistant") {
|
|
171
|
+
return;
|
|
172
|
+
}
|
|
173
|
+
const syntheticPart = createSyntheticTextPart(message, nudgeText);
|
|
174
|
+
const firstToolIndex = message.parts.findIndex((p) => p.type === "tool");
|
|
175
|
+
if (firstToolIndex === -1) {
|
|
176
|
+
message.parts.push(syntheticPart);
|
|
177
|
+
}
|
|
178
|
+
else {
|
|
179
|
+
message.parts.splice(firstToolIndex, 0, syntheticPart);
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
function collectAnchoredMessages(anchorMessageIds, messages) {
|
|
183
|
+
const anchoredMessages = [];
|
|
136
184
|
for (const anchorMessageId of anchorMessageIds) {
|
|
137
|
-
const
|
|
138
|
-
if (
|
|
185
|
+
const index = messages.findIndex((message) => message.info.id === anchorMessageId);
|
|
186
|
+
if (index === -1) {
|
|
139
187
|
continue;
|
|
140
188
|
}
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
}
|
|
146
|
-
if (message.info.role !== "assistant") {
|
|
147
|
-
continue;
|
|
148
|
-
}
|
|
149
|
-
const syntheticPart = createSyntheticTextPart(message, hintText);
|
|
150
|
-
const firstToolIndex = message.parts.findIndex((p) => p.type === "tool");
|
|
151
|
-
if (firstToolIndex === -1) {
|
|
152
|
-
message.parts.push(syntheticPart);
|
|
153
|
-
}
|
|
154
|
-
else {
|
|
155
|
-
message.parts.splice(firstToolIndex, 0, syntheticPart);
|
|
156
|
-
}
|
|
189
|
+
anchoredMessages.push({
|
|
190
|
+
message: messages[index],
|
|
191
|
+
index,
|
|
192
|
+
});
|
|
157
193
|
}
|
|
194
|
+
return anchoredMessages;
|
|
158
195
|
}
|
|
159
|
-
|
|
160
|
-
const compressedBlockGuidance = buildCompressedBlockGuidance(state);
|
|
161
|
-
const contextLimitNudge = appendGuidanceToDcpTag(prompts.contextLimitNudge, compressedBlockGuidance);
|
|
162
|
-
applyAnchoredNudge(state.nudges.contextLimitAnchors, messages, contextLimitNudge);
|
|
196
|
+
function collectTurnNudgeAnchors(state, config, messages) {
|
|
163
197
|
const turnNudgeAnchors = new Set();
|
|
164
198
|
const targetRole = config.compress.nudgeForce === "strong" ? "user" : "assistant";
|
|
165
|
-
const turnNudge = appendGuidanceToDcpTag(prompts.turnNudge, compressedBlockGuidance);
|
|
166
199
|
for (const message of messages) {
|
|
167
200
|
if (!state.nudges.turnNudgeAnchors.has(message.info.id))
|
|
168
201
|
continue;
|
|
@@ -170,8 +203,35 @@ export function applyAnchoredNudges(state, config, messages, prompts) {
|
|
|
170
203
|
turnNudgeAnchors.add(message.info.id);
|
|
171
204
|
}
|
|
172
205
|
}
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
206
|
+
return turnNudgeAnchors;
|
|
207
|
+
}
|
|
208
|
+
function applyRangeModeAnchoredNudge(anchorMessageIds, messages, baseNudgeText, compressedBlockGuidance) {
|
|
209
|
+
const nudgeText = appendGuidanceToDcpTag(baseNudgeText, compressedBlockGuidance);
|
|
210
|
+
if (!nudgeText.trim()) {
|
|
211
|
+
return;
|
|
212
|
+
}
|
|
213
|
+
for (const { message } of collectAnchoredMessages(anchorMessageIds, messages)) {
|
|
214
|
+
injectAnchoredNudge(message, nudgeText);
|
|
215
|
+
}
|
|
216
|
+
}
|
|
217
|
+
function applyMessageModeAnchoredNudge(anchorMessageIds, messages, baseNudgeText, compressionPriorities) {
|
|
218
|
+
for (const { message, index } of collectAnchoredMessages(anchorMessageIds, messages)) {
|
|
219
|
+
const priorityGuidance = buildMessagePriorityGuidance(messages, compressionPriorities, index, MESSAGE_MODE_NUDGE_PRIORITY);
|
|
220
|
+
const nudgeText = appendGuidanceToDcpTag(baseNudgeText, priorityGuidance);
|
|
221
|
+
injectAnchoredNudge(message, nudgeText);
|
|
222
|
+
}
|
|
223
|
+
}
|
|
224
|
+
export function applyAnchoredNudges(state, config, messages, prompts, compressionPriorities) {
|
|
225
|
+
const turnNudgeAnchors = collectTurnNudgeAnchors(state, config, messages);
|
|
226
|
+
if (config.compress.mode === "message") {
|
|
227
|
+
applyMessageModeAnchoredNudge(state.nudges.contextLimitAnchors, messages, prompts.contextLimitNudge, compressionPriorities);
|
|
228
|
+
applyMessageModeAnchoredNudge(turnNudgeAnchors, messages, prompts.turnNudge, compressionPriorities);
|
|
229
|
+
applyMessageModeAnchoredNudge(state.nudges.iterationNudgeAnchors, messages, prompts.iterationNudge, compressionPriorities);
|
|
230
|
+
return;
|
|
231
|
+
}
|
|
232
|
+
const compressedBlockGuidance = buildCompressedBlockGuidance(state);
|
|
233
|
+
applyRangeModeAnchoredNudge(state.nudges.contextLimitAnchors, messages, prompts.contextLimitNudge, compressedBlockGuidance);
|
|
234
|
+
applyRangeModeAnchoredNudge(turnNudgeAnchors, messages, prompts.turnNudge, compressedBlockGuidance);
|
|
235
|
+
applyRangeModeAnchoredNudge(state.nudges.iterationNudgeAnchors, messages, prompts.iterationNudge, compressedBlockGuidance);
|
|
176
236
|
}
|
|
177
237
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../lib/messages/inject/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../lib/messages/inject/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import type { PluginConfig } from "../config";
|
|
2
|
+
import type { SessionState, WithParts } from "../state";
|
|
3
|
+
export type MessagePriority = "low" | "medium" | "high";
|
|
4
|
+
export interface CompressionPriorityEntry {
|
|
5
|
+
ref: string;
|
|
6
|
+
tokenCount: number;
|
|
7
|
+
priority: MessagePriority;
|
|
8
|
+
}
|
|
9
|
+
export type CompressionPriorityMap = Map<string, CompressionPriorityEntry>;
|
|
10
|
+
export declare function buildPriorityMap(config: PluginConfig, state: SessionState, messages: WithParts[]): CompressionPriorityMap;
|
|
11
|
+
export declare function classifyMessagePriority(tokenCount: number): MessagePriority;
|
|
12
|
+
export declare function listPriorityRefsBeforeIndex(messages: WithParts[], priorities: CompressionPriorityMap, anchorIndex: number, priority: MessagePriority): string[];
|
|
13
|
+
//# sourceMappingURL=priority.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"priority.d.ts","sourceRoot":"","sources":["../../../lib/messages/priority.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAG7C,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AAMvD,MAAM,MAAM,eAAe,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAA;AAEvD,MAAM,WAAW,wBAAwB;IACrC,GAAG,EAAE,MAAM,CAAA;IACX,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,eAAe,CAAA;CAC5B;AAED,MAAM,MAAM,sBAAsB,GAAG,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAA;AAE1E,wBAAgB,gBAAgB,CAC5B,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,YAAY,EACnB,QAAQ,EAAE,SAAS,EAAE,GACtB,sBAAsB,CAsCxB;AAED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,eAAe,CAU3E;AAED,wBAAgB,2BAA2B,CACvC,QAAQ,EAAE,SAAS,EAAE,EACrB,UAAU,EAAE,sBAAsB,EAClC,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,eAAe,GAC1B,MAAM,EAAE,CAqBV"}
|