@tarquinen/opencode-dcp 1.2.6 → 1.3.0-beta.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 +10 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +12 -1
- package/dist/index.js.map +1 -1
- package/dist/lib/commands/context.d.ts.map +1 -1
- package/dist/lib/commands/context.js +2 -1
- package/dist/lib/commands/context.js.map +1 -1
- package/dist/lib/commands/sweep.d.ts.map +1 -1
- package/dist/lib/commands/sweep.js +3 -2
- package/dist/lib/commands/sweep.js.map +1 -1
- package/dist/lib/config.d.ts +5 -0
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/config.js +33 -65
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/hooks.d.ts.map +1 -1
- package/dist/lib/hooks.js +15 -2
- package/dist/lib/hooks.js.map +1 -1
- package/dist/lib/messages/inject.d.ts.map +1 -1
- package/dist/lib/messages/inject.js +76 -31
- package/dist/lib/messages/inject.js.map +1 -1
- package/dist/lib/messages/prune.d.ts.map +1 -1
- package/dist/lib/messages/prune.js +48 -4
- package/dist/lib/messages/prune.js.map +1 -1
- package/dist/lib/messages/utils.d.ts +3 -0
- package/dist/lib/messages/utils.d.ts.map +1 -1
- package/dist/lib/messages/utils.js +45 -11
- package/dist/lib/messages/utils.js.map +1 -1
- package/dist/lib/prompts/discard-tool-spec.d.ts +1 -1
- package/dist/lib/prompts/discard-tool-spec.d.ts.map +1 -1
- package/dist/lib/prompts/discard-tool-spec.js +17 -40
- package/dist/lib/prompts/discard-tool-spec.js.map +1 -1
- package/dist/lib/prompts/extract-tool-spec.d.ts +1 -1
- package/dist/lib/prompts/extract-tool-spec.d.ts.map +1 -1
- package/dist/lib/prompts/extract-tool-spec.js +22 -47
- package/dist/lib/prompts/extract-tool-spec.js.map +1 -1
- package/dist/lib/prompts/index.d.ts.map +1 -1
- package/dist/lib/prompts/index.js +22 -4
- package/dist/lib/prompts/index.js.map +1 -1
- package/dist/lib/prompts/nudge/all.d.ts +2 -0
- package/dist/lib/prompts/nudge/all.d.ts.map +1 -0
- package/dist/lib/prompts/nudge/all.js +9 -0
- package/dist/lib/prompts/nudge/all.js.map +1 -0
- package/dist/lib/prompts/nudge/discard-extract.d.ts +2 -0
- package/dist/lib/prompts/nudge/discard-extract.d.ts.map +1 -0
- package/dist/lib/prompts/nudge/discard-extract.js +8 -0
- package/dist/lib/prompts/nudge/discard-extract.js.map +1 -0
- package/dist/lib/prompts/nudge/discard-squash.d.ts +2 -0
- package/dist/lib/prompts/nudge/discard-squash.d.ts.map +1 -0
- package/dist/lib/prompts/nudge/discard-squash.js +8 -0
- package/dist/lib/prompts/nudge/discard-squash.js.map +1 -0
- package/dist/lib/prompts/nudge/discard.d.ts +1 -1
- package/dist/lib/prompts/nudge/discard.d.ts.map +1 -1
- package/dist/lib/prompts/nudge/discard.js +5 -7
- package/dist/lib/prompts/nudge/discard.js.map +1 -1
- package/dist/lib/prompts/nudge/extract-squash.d.ts +2 -0
- package/dist/lib/prompts/nudge/extract-squash.d.ts.map +1 -0
- package/dist/lib/prompts/nudge/extract-squash.js +8 -0
- package/dist/lib/prompts/nudge/extract-squash.js.map +1 -0
- package/dist/lib/prompts/nudge/extract.d.ts +1 -1
- package/dist/lib/prompts/nudge/extract.d.ts.map +1 -1
- package/dist/lib/prompts/nudge/extract.js +5 -7
- package/dist/lib/prompts/nudge/extract.js.map +1 -1
- package/dist/lib/prompts/nudge/squash.d.ts +2 -0
- package/dist/lib/prompts/nudge/squash.d.ts.map +1 -0
- package/dist/lib/prompts/nudge/squash.js +8 -0
- package/dist/lib/prompts/nudge/squash.js.map +1 -0
- package/dist/lib/prompts/squash-tool-spec.d.ts +2 -0
- package/dist/lib/prompts/squash-tool-spec.d.ts.map +1 -0
- package/dist/lib/prompts/squash-tool-spec.js +33 -0
- package/dist/lib/prompts/squash-tool-spec.js.map +1 -0
- package/dist/lib/prompts/system/all.d.ts +2 -0
- package/dist/lib/prompts/system/all.d.ts.map +1 -0
- package/dist/lib/prompts/system/all.js +26 -0
- package/dist/lib/prompts/system/all.js.map +1 -0
- package/dist/lib/prompts/system/discard-extract.d.ts +2 -0
- package/dist/lib/prompts/system/discard-extract.d.ts.map +1 -0
- package/dist/lib/prompts/system/discard-extract.js +26 -0
- package/dist/lib/prompts/system/discard-extract.js.map +1 -0
- package/dist/lib/prompts/system/discard-squash.d.ts +2 -0
- package/dist/lib/prompts/system/discard-squash.d.ts.map +1 -0
- package/dist/lib/prompts/system/discard-squash.js +25 -0
- package/dist/lib/prompts/system/discard-squash.js.map +1 -0
- package/dist/lib/prompts/system/discard.d.ts +1 -1
- package/dist/lib/prompts/system/discard.d.ts.map +1 -1
- package/dist/lib/prompts/system/discard.js +18 -43
- package/dist/lib/prompts/system/discard.js.map +1 -1
- package/dist/lib/prompts/system/extract-squash.d.ts +2 -0
- package/dist/lib/prompts/system/extract-squash.d.ts.map +1 -0
- package/dist/lib/prompts/system/extract-squash.js +25 -0
- package/dist/lib/prompts/system/extract-squash.js.map +1 -0
- package/dist/lib/prompts/system/extract.d.ts +1 -1
- package/dist/lib/prompts/system/extract.d.ts.map +1 -1
- package/dist/lib/prompts/system/extract.js +18 -43
- package/dist/lib/prompts/system/extract.js.map +1 -1
- package/dist/lib/prompts/system/squash.d.ts +2 -0
- package/dist/lib/prompts/system/squash.d.ts.map +1 -0
- package/dist/lib/prompts/system/squash.js +27 -0
- package/dist/lib/prompts/system/squash.js.map +1 -0
- package/dist/lib/shared-utils.d.ts +1 -1
- package/dist/lib/shared-utils.d.ts.map +1 -1
- package/dist/lib/shared-utils.js +10 -3
- package/dist/lib/shared-utils.js.map +1 -1
- package/dist/lib/state/persistence.d.ts +2 -1
- 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/state.d.ts +0 -1
- package/dist/lib/state/state.d.ts.map +1 -1
- package/dist/lib/state/state.js +10 -28
- package/dist/lib/state/state.js.map +1 -1
- package/dist/lib/state/tool-cache.d.ts.map +1 -1
- package/dist/lib/state/tool-cache.js +6 -3
- package/dist/lib/state/tool-cache.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 +4 -0
- package/dist/lib/state/utils.d.ts.map +1 -1
- package/dist/lib/state/utils.js +33 -0
- package/dist/lib/state/utils.js.map +1 -1
- package/dist/lib/strategies/index.d.ts +1 -1
- package/dist/lib/strategies/index.d.ts.map +1 -1
- package/dist/lib/strategies/index.js +1 -1
- package/dist/lib/strategies/index.js.map +1 -1
- package/dist/lib/strategies/utils.d.ts +1 -0
- package/dist/lib/strategies/utils.d.ts.map +1 -1
- package/dist/lib/strategies/utils.js +7 -5
- package/dist/lib/strategies/utils.js.map +1 -1
- package/dist/lib/tools/discard.d.ts +4 -0
- package/dist/lib/tools/discard.d.ts.map +1 -0
- package/dist/lib/tools/discard.js +21 -0
- package/dist/lib/tools/discard.js.map +1 -0
- package/dist/lib/tools/extract.d.ts +4 -0
- package/dist/lib/tools/extract.d.ts.map +1 -0
- package/dist/lib/tools/extract.js +30 -0
- package/dist/lib/tools/extract.js.map +1 -0
- package/dist/lib/tools/index.d.ts +5 -0
- package/dist/lib/tools/index.d.ts.map +1 -0
- package/dist/lib/tools/index.js +4 -0
- package/dist/lib/tools/index.js.map +1 -0
- package/dist/lib/tools/prune-shared.d.ts +6 -0
- package/dist/lib/tools/prune-shared.d.ts.map +1 -0
- package/dist/lib/{strategies/tools.js → tools/prune-shared.js} +3 -51
- package/dist/lib/tools/prune-shared.js.map +1 -0
- package/dist/lib/tools/squash.d.ts +4 -0
- package/dist/lib/tools/squash.d.ts.map +1 -0
- package/dist/lib/tools/squash.js +81 -0
- package/dist/lib/tools/squash.js.map +1 -0
- package/dist/lib/{strategies/tools.d.ts → tools/types.d.ts} +1 -4
- package/dist/lib/tools/types.d.ts.map +1 -0
- package/dist/lib/tools/types.js +2 -0
- package/dist/lib/tools/types.js.map +1 -0
- package/dist/lib/tools/utils.d.ts +26 -0
- package/dist/lib/tools/utils.d.ts.map +1 -0
- package/dist/lib/tools/utils.js +121 -0
- package/dist/lib/tools/utils.js.map +1 -0
- package/dist/lib/ui/notification.d.ts +1 -0
- package/dist/lib/ui/notification.d.ts.map +1 -1
- package/dist/lib/ui/notification.js +45 -12
- package/dist/lib/ui/notification.js.map +1 -1
- package/dist/lib/ui/utils.d.ts +2 -6
- package/dist/lib/ui/utils.d.ts.map +1 -1
- package/dist/lib/ui/utils.js +22 -6
- package/dist/lib/ui/utils.js.map +1 -1
- package/package.json +2 -1
- package/dist/lib/prompts/nudge/both.d.ts +0 -2
- package/dist/lib/prompts/nudge/both.d.ts.map +0 -1
- package/dist/lib/prompts/nudge/both.js +0 -11
- package/dist/lib/prompts/nudge/both.js.map +0 -1
- package/dist/lib/prompts/system/both.d.ts +0 -2
- package/dist/lib/prompts/system/both.d.ts.map +0 -1
- package/dist/lib/prompts/system/both.js +0 -61
- package/dist/lib/prompts/system/both.js.map +0 -1
- package/dist/lib/strategies/tools.d.ts.map +0 -1
- package/dist/lib/strategies/tools.js.map +0 -1
|
@@ -1,12 +1,22 @@
|
|
|
1
1
|
import { loadPrompt } from "../prompts";
|
|
2
|
-
import { extractParameterKey, buildToolIdList, createSyntheticAssistantMessage, isIgnoredUserMessage, } from "./utils";
|
|
2
|
+
import { extractParameterKey, buildToolIdList, createSyntheticAssistantMessage, createSyntheticUserMessage, isIgnoredUserMessage, } from "./utils";
|
|
3
3
|
import { getFilePathFromParameters, isProtectedFilePath } from "../protected-file-patterns";
|
|
4
|
-
import { getLastUserMessage } from "../shared-utils";
|
|
4
|
+
import { getLastUserMessage, isMessageCompacted } from "../shared-utils";
|
|
5
5
|
const getNudgeString = (config) => {
|
|
6
6
|
const discardEnabled = config.tools.discard.enabled;
|
|
7
7
|
const extractEnabled = config.tools.extract.enabled;
|
|
8
|
-
|
|
9
|
-
|
|
8
|
+
const squashEnabled = config.tools.squash.enabled;
|
|
9
|
+
if (discardEnabled && extractEnabled && squashEnabled) {
|
|
10
|
+
return loadPrompt(`nudge/nudge-all`);
|
|
11
|
+
}
|
|
12
|
+
else if (discardEnabled && extractEnabled) {
|
|
13
|
+
return loadPrompt(`nudge/nudge-discard-extract`);
|
|
14
|
+
}
|
|
15
|
+
else if (discardEnabled && squashEnabled) {
|
|
16
|
+
return loadPrompt(`nudge/nudge-discard-squash`);
|
|
17
|
+
}
|
|
18
|
+
else if (extractEnabled && squashEnabled) {
|
|
19
|
+
return loadPrompt(`nudge/nudge-extract-squash`);
|
|
10
20
|
}
|
|
11
21
|
else if (discardEnabled) {
|
|
12
22
|
return loadPrompt(`nudge/nudge-discard`);
|
|
@@ -14,28 +24,48 @@ const getNudgeString = (config) => {
|
|
|
14
24
|
else if (extractEnabled) {
|
|
15
25
|
return loadPrompt(`nudge/nudge-extract`);
|
|
16
26
|
}
|
|
27
|
+
else if (squashEnabled) {
|
|
28
|
+
return loadPrompt(`nudge/nudge-squash`);
|
|
29
|
+
}
|
|
17
30
|
return "";
|
|
18
31
|
};
|
|
19
32
|
const wrapPrunableTools = (content) => `<prunable-tools>
|
|
20
|
-
The following tools have been invoked and are available for pruning. This list does not mandate immediate action. Consider your current goals and the resources you need before
|
|
33
|
+
The following tools have been invoked and are available for pruning. This list does not mandate immediate action. Consider your current goals and the resources you need before pruning valuable tool inputs or outputs. Consolidate your prunes for efficiency; it is rarely worth pruning a single tiny tool output. Keep the context free of noise.
|
|
21
34
|
${content}
|
|
22
35
|
</prunable-tools>`;
|
|
23
36
|
const getCooldownMessage = (config) => {
|
|
24
37
|
const discardEnabled = config.tools.discard.enabled;
|
|
25
38
|
const extractEnabled = config.tools.extract.enabled;
|
|
39
|
+
const squashEnabled = config.tools.squash.enabled;
|
|
40
|
+
const enabledTools = [];
|
|
41
|
+
if (discardEnabled)
|
|
42
|
+
enabledTools.push("discard");
|
|
43
|
+
if (extractEnabled)
|
|
44
|
+
enabledTools.push("extract");
|
|
45
|
+
if (squashEnabled)
|
|
46
|
+
enabledTools.push("squash");
|
|
26
47
|
let toolName;
|
|
27
|
-
if (
|
|
28
|
-
toolName = "
|
|
48
|
+
if (enabledTools.length === 0) {
|
|
49
|
+
toolName = "pruning tools";
|
|
29
50
|
}
|
|
30
|
-
else if (
|
|
31
|
-
toolName =
|
|
51
|
+
else if (enabledTools.length === 1) {
|
|
52
|
+
toolName = `${enabledTools[0]} tool`;
|
|
32
53
|
}
|
|
33
54
|
else {
|
|
34
|
-
|
|
55
|
+
const last = enabledTools.pop();
|
|
56
|
+
toolName = `${enabledTools.join(", ")} or ${last} tools`;
|
|
35
57
|
}
|
|
36
|
-
return `<
|
|
58
|
+
return `<context-info>
|
|
37
59
|
Context management was just performed. Do not use the ${toolName} again. A fresh list will be available after your next tool use.
|
|
38
|
-
</
|
|
60
|
+
</context-info>`;
|
|
61
|
+
};
|
|
62
|
+
const buildSquashContext = (state, messages) => {
|
|
63
|
+
const messageCount = messages.filter((msg) => !isMessageCompacted(state, msg)).length;
|
|
64
|
+
return `<squash-context>
|
|
65
|
+
Squash available. Conversation: ${messageCount} messages.
|
|
66
|
+
Squash collapses completed task sequences or exploration phases into summaries.
|
|
67
|
+
Uses text boundaries [startString, endString, topic, summary].
|
|
68
|
+
</squash-context>`;
|
|
39
69
|
};
|
|
40
70
|
const buildPrunableToolsList = (state, config, logger, messages) => {
|
|
41
71
|
const lines = [];
|
|
@@ -73,42 +103,57 @@ const buildPrunableToolsList = (state, config, logger, messages) => {
|
|
|
73
103
|
return wrapPrunableTools(lines.join("\n"));
|
|
74
104
|
};
|
|
75
105
|
export const insertPruneToolContext = (state, config, logger, messages) => {
|
|
76
|
-
|
|
106
|
+
const discardEnabled = config.tools.discard.enabled;
|
|
107
|
+
const extractEnabled = config.tools.extract.enabled;
|
|
108
|
+
const squashEnabled = config.tools.squash.enabled;
|
|
109
|
+
if (!discardEnabled && !extractEnabled && !squashEnabled) {
|
|
77
110
|
return;
|
|
78
111
|
}
|
|
79
|
-
|
|
112
|
+
const discardOrExtractEnabled = discardEnabled || extractEnabled;
|
|
113
|
+
const contentParts = [];
|
|
80
114
|
if (state.lastToolPrune) {
|
|
81
115
|
logger.debug("Last tool was prune - injecting cooldown message");
|
|
82
|
-
|
|
116
|
+
contentParts.push(getCooldownMessage(config));
|
|
83
117
|
}
|
|
84
118
|
else {
|
|
85
|
-
|
|
86
|
-
if (
|
|
87
|
-
|
|
119
|
+
// Inject <prunable-tools> only when discard or extract is enabled
|
|
120
|
+
if (discardOrExtractEnabled) {
|
|
121
|
+
const prunableToolsList = buildPrunableToolsList(state, config, logger, messages);
|
|
122
|
+
if (prunableToolsList) {
|
|
123
|
+
// logger.debug("prunable-tools: \n" + prunableToolsList)
|
|
124
|
+
contentParts.push(prunableToolsList);
|
|
125
|
+
}
|
|
88
126
|
}
|
|
89
|
-
|
|
90
|
-
|
|
127
|
+
// Inject <squash-context> always when squash is enabled (every turn)
|
|
128
|
+
if (squashEnabled) {
|
|
129
|
+
const squashContext = buildSquashContext(state, messages);
|
|
130
|
+
// logger.debug("squash-context: \n" + squashContext)
|
|
131
|
+
contentParts.push(squashContext);
|
|
132
|
+
}
|
|
133
|
+
// Add nudge if threshold reached
|
|
91
134
|
if (config.tools.settings.nudgeEnabled &&
|
|
92
135
|
state.nudgeCounter >= config.tools.settings.nudgeFrequency) {
|
|
93
136
|
logger.info("Inserting prune nudge message");
|
|
94
|
-
|
|
137
|
+
contentParts.push(getNudgeString(config));
|
|
95
138
|
}
|
|
96
|
-
prunableToolsContent = prunableToolsList + nudgeString;
|
|
97
139
|
}
|
|
98
|
-
|
|
99
|
-
if (!lastUserMessage) {
|
|
140
|
+
if (contentParts.length === 0) {
|
|
100
141
|
return;
|
|
101
142
|
}
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
// can't find a good way to do this yet
|
|
106
|
-
const lastMessage = messages[messages.length - 1];
|
|
107
|
-
if (lastMessage?.info?.role === "user" && !isIgnoredUserMessage(lastMessage)) {
|
|
143
|
+
const combinedContent = contentParts.join("\n");
|
|
144
|
+
const lastUserMessage = getLastUserMessage(messages);
|
|
145
|
+
if (!lastUserMessage) {
|
|
108
146
|
return;
|
|
109
147
|
}
|
|
110
148
|
const userInfo = lastUserMessage.info;
|
|
111
149
|
const variant = state.variant ?? userInfo.variant;
|
|
112
|
-
messages.
|
|
150
|
+
const lastMessage = messages[messages.length - 1];
|
|
151
|
+
const isLastMessageUser = lastMessage?.info?.role === "user" && !isIgnoredUserMessage(lastMessage);
|
|
152
|
+
if (isLastMessageUser) {
|
|
153
|
+
messages.push(createSyntheticUserMessage(lastUserMessage, combinedContent, variant));
|
|
154
|
+
}
|
|
155
|
+
else {
|
|
156
|
+
messages.push(createSyntheticAssistantMessage(lastUserMessage, combinedContent, variant));
|
|
157
|
+
}
|
|
113
158
|
};
|
|
114
159
|
//# sourceMappingURL=inject.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inject.js","sourceRoot":"","sources":["../../../lib/messages/inject.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AACvC,OAAO,EACH,mBAAmB,EACnB,eAAe,EACf,+BAA+B,EAC/B,oBAAoB,GACvB,MAAM,SAAS,CAAA;AAChB,OAAO,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA;AAC3F,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"inject.js","sourceRoot":"","sources":["../../../lib/messages/inject.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prune.d.ts","sourceRoot":"","sources":["../../../lib/messages/prune.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AACvD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"prune.d.ts","sourceRoot":"","sources":["../../../lib/messages/prune.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AACvD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAU7C,eAAO,MAAM,KAAK,GACd,OAAO,YAAY,EACnB,QAAQ,MAAM,EACd,QAAQ,YAAY,EACpB,UAAU,SAAS,EAAE,KACtB,IAKF,CAAA"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
-
import { isMessageCompacted } from "../shared-utils";
|
|
1
|
+
import { isMessageCompacted, getLastUserMessage } from "../shared-utils";
|
|
2
|
+
import { createSyntheticUserMessage, SQUASH_SUMMARY_PREFIX } from "./utils";
|
|
2
3
|
const PRUNED_TOOL_OUTPUT_REPLACEMENT = "[Output removed to save context - information superseded or no longer needed]";
|
|
3
4
|
const PRUNED_TOOL_ERROR_INPUT_REPLACEMENT = "[input removed due to failed tool call]";
|
|
4
5
|
const PRUNED_QUESTION_INPUT_REPLACEMENT = "[questions removed - see output for user's answers]";
|
|
5
6
|
export const prune = (state, logger, config, messages) => {
|
|
7
|
+
filterSquashedRanges(state, logger, messages);
|
|
6
8
|
pruneToolOutputs(state, logger, messages);
|
|
7
9
|
pruneToolInputs(state, logger, messages);
|
|
8
10
|
pruneToolErrors(state, logger, messages);
|
|
@@ -12,7 +14,8 @@ const pruneToolOutputs = (state, logger, messages) => {
|
|
|
12
14
|
if (isMessageCompacted(state, msg)) {
|
|
13
15
|
continue;
|
|
14
16
|
}
|
|
15
|
-
|
|
17
|
+
const parts = Array.isArray(msg.parts) ? msg.parts : [];
|
|
18
|
+
for (const part of parts) {
|
|
16
19
|
if (part.type !== "tool") {
|
|
17
20
|
continue;
|
|
18
21
|
}
|
|
@@ -34,7 +37,8 @@ const pruneToolInputs = (state, logger, messages) => {
|
|
|
34
37
|
if (isMessageCompacted(state, msg)) {
|
|
35
38
|
continue;
|
|
36
39
|
}
|
|
37
|
-
|
|
40
|
+
const parts = Array.isArray(msg.parts) ? msg.parts : [];
|
|
41
|
+
for (const part of parts) {
|
|
38
42
|
if (part.type !== "tool") {
|
|
39
43
|
continue;
|
|
40
44
|
}
|
|
@@ -58,7 +62,8 @@ const pruneToolErrors = (state, logger, messages) => {
|
|
|
58
62
|
if (isMessageCompacted(state, msg)) {
|
|
59
63
|
continue;
|
|
60
64
|
}
|
|
61
|
-
|
|
65
|
+
const parts = Array.isArray(msg.parts) ? msg.parts : [];
|
|
66
|
+
for (const part of parts) {
|
|
62
67
|
if (part.type !== "tool") {
|
|
63
68
|
continue;
|
|
64
69
|
}
|
|
@@ -80,4 +85,43 @@ const pruneToolErrors = (state, logger, messages) => {
|
|
|
80
85
|
}
|
|
81
86
|
}
|
|
82
87
|
};
|
|
88
|
+
const filterSquashedRanges = (state, logger, messages) => {
|
|
89
|
+
if (!state.prune.messageIds?.length) {
|
|
90
|
+
return;
|
|
91
|
+
}
|
|
92
|
+
const result = [];
|
|
93
|
+
for (const msg of messages) {
|
|
94
|
+
const msgId = msg.info.id;
|
|
95
|
+
// Check if there's a summary to inject at this anchor point
|
|
96
|
+
const summary = state.squashSummaries?.find((s) => s.anchorMessageId === msgId);
|
|
97
|
+
if (summary) {
|
|
98
|
+
// Find user message for variant and as base for synthetic message
|
|
99
|
+
const msgIndex = messages.indexOf(msg);
|
|
100
|
+
const userMessage = getLastUserMessage(messages, msgIndex);
|
|
101
|
+
if (userMessage) {
|
|
102
|
+
const userInfo = userMessage.info;
|
|
103
|
+
const summaryContent = SQUASH_SUMMARY_PREFIX + summary.summary;
|
|
104
|
+
result.push(createSyntheticUserMessage(userMessage, summaryContent, userInfo.variant));
|
|
105
|
+
logger.info("Injected squash summary", {
|
|
106
|
+
anchorMessageId: msgId,
|
|
107
|
+
summaryLength: summary.summary.length,
|
|
108
|
+
});
|
|
109
|
+
}
|
|
110
|
+
else {
|
|
111
|
+
logger.warn("No user message found for squash summary", {
|
|
112
|
+
anchorMessageId: msgId,
|
|
113
|
+
});
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
// Skip messages that are in the prune list
|
|
117
|
+
if (state.prune.messageIds.includes(msgId)) {
|
|
118
|
+
continue;
|
|
119
|
+
}
|
|
120
|
+
// Normal message, include it
|
|
121
|
+
result.push(msg);
|
|
122
|
+
}
|
|
123
|
+
// Replace messages array contents
|
|
124
|
+
messages.length = 0;
|
|
125
|
+
messages.push(...result);
|
|
126
|
+
};
|
|
83
127
|
//# sourceMappingURL=prune.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prune.js","sourceRoot":"","sources":["../../../lib/messages/prune.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"prune.js","sourceRoot":"","sources":["../../../lib/messages/prune.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { Logger } from "../logger";
|
|
2
2
|
import type { SessionState, WithParts } from "../state";
|
|
3
|
+
export declare const SQUASH_SUMMARY_PREFIX = "[Squashed conversation block]\n\n";
|
|
4
|
+
export declare const createSyntheticUserMessage: (baseMessage: WithParts, content: string, variant?: string) => WithParts;
|
|
3
5
|
export declare const createSyntheticAssistantMessage: (baseMessage: WithParts, content: string, variant?: string) => WithParts;
|
|
4
6
|
/**
|
|
5
7
|
* Extracts a human-readable key from tool metadata for display purposes.
|
|
@@ -7,4 +9,5 @@ export declare const createSyntheticAssistantMessage: (baseMessage: WithParts, c
|
|
|
7
9
|
export declare const extractParameterKey: (tool: string, parameters: any) => string;
|
|
8
10
|
export declare function buildToolIdList(state: SessionState, messages: WithParts[], logger: Logger): string[];
|
|
9
11
|
export declare const isIgnoredUserMessage: (message: WithParts) => boolean;
|
|
12
|
+
export declare const findMessageIndex: (messages: WithParts[], messageId: string) => number;
|
|
10
13
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../lib/messages/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../lib/messages/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAElC,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AAGvD,eAAO,MAAM,qBAAqB,sCAAsC,CAAA;AASxE,eAAO,MAAM,0BAA0B,GACnC,aAAa,SAAS,EACtB,SAAS,MAAM,EACf,UAAU,MAAM,KACjB,SA2BF,CAAA;AAED,eAAO,MAAM,+BAA+B,GACxC,aAAa,SAAS,EACtB,SAAS,MAAM,EACf,UAAU,MAAM,KACjB,SAsDF,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,mBAAmB,GAAI,MAAM,MAAM,EAAE,YAAY,GAAG,KAAG,MAkHnE,CAAA;AAED,wBAAgB,eAAe,CAC3B,KAAK,EAAE,YAAY,EACnB,QAAQ,EAAE,SAAS,EAAE,EACrB,MAAM,EAAE,MAAM,GACf,MAAM,EAAE,CAgBV;AAED,eAAO,MAAM,oBAAoB,GAAI,SAAS,SAAS,KAAG,OAazD,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAI,UAAU,SAAS,EAAE,EAAE,WAAW,MAAM,KAAG,MAE3E,CAAA"}
|
|
@@ -1,16 +1,45 @@
|
|
|
1
|
+
import { ulid } from "ulid";
|
|
1
2
|
import { isMessageCompacted } from "../shared-utils";
|
|
2
|
-
const
|
|
3
|
-
const
|
|
4
|
-
const SYNTHETIC_CALL_ID = "call_01234567890123456789012345";
|
|
3
|
+
export const SQUASH_SUMMARY_PREFIX = "[Squashed conversation block]\n\n";
|
|
4
|
+
const generateUniqueId = (prefix) => `${prefix}_${ulid()}`;
|
|
5
5
|
const isGeminiModel = (modelID) => {
|
|
6
6
|
const lowerModelID = modelID.toLowerCase();
|
|
7
7
|
return lowerModelID.includes("gemini");
|
|
8
8
|
};
|
|
9
|
+
export const createSyntheticUserMessage = (baseMessage, content, variant) => {
|
|
10
|
+
const userInfo = baseMessage.info;
|
|
11
|
+
const now = Date.now();
|
|
12
|
+
const messageId = generateUniqueId("msg");
|
|
13
|
+
const partId = generateUniqueId("prt");
|
|
14
|
+
return {
|
|
15
|
+
info: {
|
|
16
|
+
id: messageId,
|
|
17
|
+
sessionID: userInfo.sessionID,
|
|
18
|
+
role: "user",
|
|
19
|
+
agent: userInfo.agent,
|
|
20
|
+
model: userInfo.model,
|
|
21
|
+
time: { created: now },
|
|
22
|
+
...(variant !== undefined && { variant }),
|
|
23
|
+
},
|
|
24
|
+
parts: [
|
|
25
|
+
{
|
|
26
|
+
id: partId,
|
|
27
|
+
sessionID: userInfo.sessionID,
|
|
28
|
+
messageID: messageId,
|
|
29
|
+
type: "text",
|
|
30
|
+
text: content,
|
|
31
|
+
},
|
|
32
|
+
],
|
|
33
|
+
};
|
|
34
|
+
};
|
|
9
35
|
export const createSyntheticAssistantMessage = (baseMessage, content, variant) => {
|
|
10
36
|
const userInfo = baseMessage.info;
|
|
11
37
|
const now = Date.now();
|
|
38
|
+
const messageId = generateUniqueId("msg");
|
|
39
|
+
const partId = generateUniqueId("prt");
|
|
40
|
+
const callId = generateUniqueId("call");
|
|
12
41
|
const baseInfo = {
|
|
13
|
-
id:
|
|
42
|
+
id: messageId,
|
|
14
43
|
sessionID: userInfo.sessionID,
|
|
15
44
|
role: "assistant",
|
|
16
45
|
agent: userInfo.agent || "code",
|
|
@@ -35,11 +64,11 @@ export const createSyntheticAssistantMessage = (baseMessage, content, variant) =
|
|
|
35
64
|
info: baseInfo,
|
|
36
65
|
parts: [
|
|
37
66
|
{
|
|
38
|
-
id:
|
|
67
|
+
id: partId,
|
|
39
68
|
sessionID: userInfo.sessionID,
|
|
40
|
-
messageID:
|
|
69
|
+
messageID: messageId,
|
|
41
70
|
type: "tool",
|
|
42
|
-
callID:
|
|
71
|
+
callID: callId,
|
|
43
72
|
tool: "context_info",
|
|
44
73
|
state: {
|
|
45
74
|
status: "completed",
|
|
@@ -169,8 +198,9 @@ export function buildToolIdList(state, messages, logger) {
|
|
|
169
198
|
if (isMessageCompacted(state, msg)) {
|
|
170
199
|
continue;
|
|
171
200
|
}
|
|
172
|
-
|
|
173
|
-
|
|
201
|
+
const parts = Array.isArray(msg.parts) ? msg.parts : [];
|
|
202
|
+
if (parts.length > 0) {
|
|
203
|
+
for (const part of parts) {
|
|
174
204
|
if (part.type === "tool" && part.callID && part.tool) {
|
|
175
205
|
toolIds.push(part.callID);
|
|
176
206
|
}
|
|
@@ -180,14 +210,18 @@ export function buildToolIdList(state, messages, logger) {
|
|
|
180
210
|
return toolIds;
|
|
181
211
|
}
|
|
182
212
|
export const isIgnoredUserMessage = (message) => {
|
|
183
|
-
|
|
213
|
+
const parts = Array.isArray(message.parts) ? message.parts : [];
|
|
214
|
+
if (parts.length === 0) {
|
|
184
215
|
return true;
|
|
185
216
|
}
|
|
186
|
-
for (const part of
|
|
217
|
+
for (const part of parts) {
|
|
187
218
|
if (!part.ignored) {
|
|
188
219
|
return false;
|
|
189
220
|
}
|
|
190
221
|
}
|
|
191
222
|
return true;
|
|
192
223
|
};
|
|
224
|
+
export const findMessageIndex = (messages, messageId) => {
|
|
225
|
+
return messages.findIndex((msg) => msg.info.id === messageId);
|
|
226
|
+
};
|
|
193
227
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../lib/messages/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../lib/messages/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const DISCARD_TOOL_SPEC = "
|
|
1
|
+
export declare const DISCARD_TOOL_SPEC = "**Purpose:** Discard tool outputs from context to manage size and reduce noise.\n**IDs:** Use numeric IDs from `<prunable-tools>` (format: `ID: tool, parameter`).\n**Use When:**\n- Noise \u2192 irrelevant, unhelpful, or superseded outputs\n**Do NOT Use When:**\n- Output contains useful information\n- Output needed later (files to edit, implementation context)\n**Best Practices:**\n- Batch multiple items; avoid single small outputs (unless pure noise)\n- Criterion: \"Needed for upcoming task?\" \u2192 keep it\n**Format:**\n- `ids`: string[] \u2014 numeric IDs from prunable list\n**Example:**\nNoise removal:\n ids: [\"5\"]\n Context: Read wrong_file.ts \u2014 not relevant to auth system\n";
|
|
2
2
|
//# sourceMappingURL=discard-tool-spec.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"discard-tool-spec.d.ts","sourceRoot":"","sources":["../../../lib/prompts/discard-tool-spec.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,iBAAiB,
|
|
1
|
+
{"version":3,"file":"discard-tool-spec.d.ts","sourceRoot":"","sources":["../../../lib/prompts/discard-tool-spec.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,iBAAiB,ksBAgB7B,CAAA"}
|
|
@@ -1,41 +1,18 @@
|
|
|
1
|
-
export const DISCARD_TOOL_SPEC =
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
## Best Practices
|
|
19
|
-
- **Strategic Batching:** Don't discard single small tool outputs (like short bash commands) unless they are pure noise. Wait until you have several items to perform high-impact discards.
|
|
20
|
-
- **Think ahead:** Before discarding, ask: "Will I need this output for an upcoming task?" If yes, keep it.
|
|
21
|
-
|
|
22
|
-
## Format
|
|
23
|
-
|
|
24
|
-
- \`ids\`: Array where the first element is the reason, followed by numeric IDs from the \`<prunable-tools>\` list
|
|
25
|
-
|
|
26
|
-
Reasons: \`noise\` | \`completion\`
|
|
27
|
-
|
|
28
|
-
## Example
|
|
29
|
-
|
|
30
|
-
<example_noise>
|
|
31
|
-
Assistant: [Reads 'wrong_file.ts']
|
|
32
|
-
This file isn't relevant to the auth system. I'll remove it to clear the context.
|
|
33
|
-
[Uses discard with ids: ["noise", "5"]]
|
|
34
|
-
</example_noise>
|
|
35
|
-
|
|
36
|
-
<example_completion>
|
|
37
|
-
Assistant: [Runs tests, they pass]
|
|
38
|
-
The tests passed and I don't need to preserve any details. I'll clean up now.
|
|
39
|
-
[Uses discard with ids: ["completion", "20", "21"]]
|
|
40
|
-
</example_completion>`;
|
|
1
|
+
export const DISCARD_TOOL_SPEC = `**Purpose:** Discard tool outputs from context to manage size and reduce noise.
|
|
2
|
+
**IDs:** Use numeric IDs from \`<prunable-tools>\` (format: \`ID: tool, parameter\`).
|
|
3
|
+
**Use When:**
|
|
4
|
+
- Noise → irrelevant, unhelpful, or superseded outputs
|
|
5
|
+
**Do NOT Use When:**
|
|
6
|
+
- Output contains useful information
|
|
7
|
+
- Output needed later (files to edit, implementation context)
|
|
8
|
+
**Best Practices:**
|
|
9
|
+
- Batch multiple items; avoid single small outputs (unless pure noise)
|
|
10
|
+
- Criterion: "Needed for upcoming task?" → keep it
|
|
11
|
+
**Format:**
|
|
12
|
+
- \`ids\`: string[] — numeric IDs from prunable list
|
|
13
|
+
**Example:**
|
|
14
|
+
Noise removal:
|
|
15
|
+
ids: ["5"]
|
|
16
|
+
Context: Read wrong_file.ts — not relevant to auth system
|
|
17
|
+
`;
|
|
41
18
|
//# sourceMappingURL=discard-tool-spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"discard-tool-spec.js","sourceRoot":"","sources":["../../../lib/prompts/discard-tool-spec.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,iBAAiB,GAAG
|
|
1
|
+
{"version":3,"file":"discard-tool-spec.js","sourceRoot":"","sources":["../../../lib/prompts/discard-tool-spec.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,iBAAiB,GAAG;;;;;;;;;;;;;;;;CAgBhC,CAAA"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const EXTRACT_TOOL_SPEC = "
|
|
1
|
+
export declare const EXTRACT_TOOL_SPEC = "**Purpose:** Extract key findings from tool outputs into distilled knowledge; remove raw outputs from context.\n**IDs:** Use numeric IDs from `<prunable-tools>` (format: `ID: tool, parameter`).\n**Use When:**\n- Task complete \u2192 preserve findings\n- Distill context \u2192 keep specifics, drop noise\n**Do NOT Use When:**\n- Need exact syntax (edits/grep) \u2192 keep raw output\n- Planning modifications \u2192 keep read output\n**Best Practices:**\n- Batch multiple items; avoid frequent small extractions\n- Preserve raw output if editing/modifying later\n**Format:**\n- `ids`: string[] \u2014 numeric IDs from prunable list\n- `distillation`: string[] \u2014 positional mapping (distillation[i] for ids[i])\n- Detail level: signatures, logic, constraints, values\n**Example:**\n `ids`: [\"10\", \"11\"]\n `distillation`: [\n \"auth.ts: validateToken(token: string)\u2192User|null. Cache 5min TTL then OIDC. bcrypt 12 rounds. Tokens \u2265128 chars.\",\n \"user.ts: interface User {id: string; email: string; permissions: ('read'|'write'|'admin')[]; status: 'active'|'suspended'}\"\n ]\n";
|
|
2
2
|
//# sourceMappingURL=extract-tool-spec.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extract-tool-spec.d.ts","sourceRoot":"","sources":["../../../lib/prompts/extract-tool-spec.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,iBAAiB,
|
|
1
|
+
{"version":3,"file":"extract-tool-spec.d.ts","sourceRoot":"","sources":["../../../lib/prompts/extract-tool-spec.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,iBAAiB,8lCAqB7B,CAAA"}
|