@p4r4d0xb0x/opencode-dcp 3.0.5 → 3.1.12
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 +31 -26
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +7909 -76
- package/dist/index.js.map +1 -1
- package/dist/lib/commands/compression-targets.d.ts +14 -0
- package/dist/lib/commands/compression-targets.d.ts.map +1 -0
- package/dist/lib/commands/context.d.ts.map +1 -1
- package/dist/lib/commands/decompress.d.ts.map +1 -1
- package/dist/lib/commands/index.d.ts +8 -0
- package/dist/lib/commands/index.d.ts.map +1 -0
- package/dist/lib/commands/manual.d.ts +1 -0
- package/dist/lib/commands/manual.d.ts.map +1 -1
- package/dist/lib/commands/recompress.d.ts.map +1 -1
- package/dist/lib/commands/stats.d.ts.map +1 -1
- package/dist/lib/commands/sweep.d.ts.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/message-utils.d.ts +8 -0
- package/dist/lib/compress/message-utils.d.ts.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/pipeline.d.ts +29 -0
- package/dist/lib/compress/pipeline.d.ts.map +1 -0
- package/dist/lib/compress/protected-content.d.ts +7 -0
- package/dist/lib/compress/protected-content.d.ts.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.d.ts +4 -0
- package/dist/lib/compress/range.d.ts.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/state.d.ts +9 -0
- package/dist/lib/compress/state.d.ts.map +1 -0
- package/dist/lib/compress/timing.d.ts +18 -0
- package/dist/lib/compress/timing.d.ts.map +1 -0
- package/dist/lib/compress/types.d.ts +94 -0
- package/dist/lib/compress/types.d.ts.map +1 -0
- package/dist/lib/{shared-utils.d.ts → compress-permission.d.ts} +2 -4
- package/dist/lib/compress-permission.d.ts.map +1 -0
- package/dist/lib/config.d.ts +7 -7
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/hooks.d.ts +4 -1
- package/dist/lib/hooks.d.ts.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/messages/index.d.ts +2 -0
- package/dist/lib/messages/index.d.ts.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/utils.d.ts +2 -3
- package/dist/lib/messages/inject/utils.d.ts.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/prune.d.ts.map +1 -1
- package/dist/lib/messages/query.d.ts +7 -0
- package/dist/lib/messages/query.d.ts.map +1 -0
- package/dist/lib/messages/shape.d.ts +5 -0
- package/dist/lib/messages/shape.d.ts.map +1 -0
- package/dist/lib/messages/utils.d.ts +10 -4
- package/dist/lib/messages/utils.d.ts.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-range.d.ts +2 -0
- package/dist/lib/prompts/compress-range.d.ts.map +1 -0
- package/dist/lib/prompts/context-limit-nudge.d.ts +1 -1
- package/dist/lib/prompts/context-limit-nudge.d.ts.map +1 -1
- package/dist/lib/prompts/extensions/nudge.d.ts +5 -0
- package/dist/lib/prompts/extensions/nudge.d.ts.map +1 -0
- package/dist/lib/prompts/extensions/system.d.ts +4 -0
- package/dist/lib/prompts/extensions/system.d.ts.map +1 -0
- package/dist/lib/prompts/extensions/tool.d.ts +3 -0
- package/dist/lib/prompts/extensions/tool.d.ts.map +1 -0
- package/dist/lib/prompts/index.d.ts +2 -1
- package/dist/lib/prompts/index.d.ts.map +1 -1
- package/dist/lib/prompts/iteration-nudge.d.ts +1 -1
- package/dist/lib/prompts/iteration-nudge.d.ts.map +1 -1
- package/dist/lib/prompts/store.d.ts +5 -4
- package/dist/lib/prompts/store.d.ts.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/turn-nudge.d.ts +1 -1
- package/dist/lib/prompts/turn-nudge.d.ts.map +1 -1
- package/dist/lib/state/index.d.ts +1 -0
- package/dist/lib/state/index.d.ts.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/state.d.ts.map +1 -1
- package/dist/lib/state/types.d.ts +10 -1
- package/dist/lib/state/types.d.ts.map +1 -1
- package/dist/lib/state/utils.d.ts +9 -5
- package/dist/lib/state/utils.d.ts.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/utils.d.ts → token-utils.d.ts} +6 -8
- package/dist/lib/token-utils.d.ts.map +1 -0
- package/dist/lib/ui/notification.d.ts +8 -1
- package/dist/lib/ui/notification.d.ts.map +1 -1
- package/dist/lib/ui/utils.d.ts +1 -1
- package/dist/lib/ui/utils.d.ts.map +1 -1
- package/dist/lib/update.d.ts +22 -0
- package/dist/lib/update.d.ts.map +1 -0
- package/package.json +26 -15
- package/dist/lib/auth.js +0 -32
- package/dist/lib/auth.js.map +0 -1
- package/dist/lib/commands/context.js +0 -241
- package/dist/lib/commands/context.js.map +0 -1
- package/dist/lib/commands/decompress.js +0 -159
- package/dist/lib/commands/decompress.js.map +0 -1
- package/dist/lib/commands/help.js +0 -52
- package/dist/lib/commands/help.js.map +0 -1
- package/dist/lib/commands/manual.js +0 -48
- package/dist/lib/commands/manual.js.map +0 -1
- package/dist/lib/commands/recompress.js +0 -137
- package/dist/lib/commands/recompress.js.map +0 -1
- package/dist/lib/commands/stats.js +0 -62
- package/dist/lib/commands/stats.js.map +0 -1
- package/dist/lib/commands/sweep.js +0 -194
- package/dist/lib/commands/sweep.js.map +0 -1
- package/dist/lib/config.js +0 -766
- package/dist/lib/config.js.map +0 -1
- package/dist/lib/hooks.js +0 -195
- package/dist/lib/hooks.js.map +0 -1
- package/dist/lib/host-permissions.js +0 -58
- package/dist/lib/host-permissions.js.map +0 -1
- package/dist/lib/logger.js +0 -204
- package/dist/lib/logger.js.map +0 -1
- package/dist/lib/message-ids.js +0 -112
- package/dist/lib/message-ids.js.map +0 -1
- package/dist/lib/messages/index.js +0 -7
- package/dist/lib/messages/index.js.map +0 -1
- package/dist/lib/messages/inject/inject.js +0 -131
- package/dist/lib/messages/inject/inject.js.map +0 -1
- package/dist/lib/messages/inject/subagent-results.js +0 -58
- package/dist/lib/messages/inject/subagent-results.js.map +0 -1
- package/dist/lib/messages/inject/utils.js +0 -198
- package/dist/lib/messages/inject/utils.js.map +0 -1
- package/dist/lib/messages/prune.js +0 -177
- package/dist/lib/messages/prune.js.map +0 -1
- package/dist/lib/messages/reasoning-strip.js +0 -33
- package/dist/lib/messages/reasoning-strip.js.map +0 -1
- package/dist/lib/messages/sync.js +0 -93
- package/dist/lib/messages/sync.js.map +0 -1
- package/dist/lib/messages/utils.js +0 -118
- package/dist/lib/messages/utils.js.map +0 -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 +0 -85
- package/dist/lib/prompts/compress.js.map +0 -1
- package/dist/lib/prompts/context-limit-nudge.js +0 -25
- package/dist/lib/prompts/context-limit-nudge.js.map +0 -1
- package/dist/lib/prompts/index.js +0 -19
- package/dist/lib/prompts/index.js.map +0 -1
- package/dist/lib/prompts/internal-overlays.d.ts +0 -5
- package/dist/lib/prompts/internal-overlays.d.ts.map +0 -1
- package/dist/lib/prompts/internal-overlays.js +0 -43
- package/dist/lib/prompts/internal-overlays.js.map +0 -1
- package/dist/lib/prompts/iteration-nudge.js +0 -9
- package/dist/lib/prompts/iteration-nudge.js.map +0 -1
- package/dist/lib/prompts/store.js +0 -346
- package/dist/lib/prompts/store.js.map +0 -1
- package/dist/lib/prompts/system.js +0 -30
- package/dist/lib/prompts/system.js.map +0 -1
- package/dist/lib/prompts/turn-nudge.js +0 -12
- package/dist/lib/prompts/turn-nudge.js.map +0 -1
- package/dist/lib/protected-patterns.js +0 -107
- package/dist/lib/protected-patterns.js.map +0 -1
- package/dist/lib/shared-utils.d.ts.map +0 -1
- package/dist/lib/shared-utils.js +0 -30
- package/dist/lib/shared-utils.js.map +0 -1
- package/dist/lib/state/index.js +0 -4
- package/dist/lib/state/index.js.map +0 -1
- package/dist/lib/state/persistence.js +0 -174
- package/dist/lib/state/persistence.js.map +0 -1
- package/dist/lib/state/state.js +0 -134
- package/dist/lib/state/state.js.map +0 -1
- package/dist/lib/state/tool-cache.js +0 -69
- package/dist/lib/state/tool-cache.js.map +0 -1
- package/dist/lib/state/types.js +0 -2
- package/dist/lib/state/types.js.map +0 -1
- package/dist/lib/state/utils.js +0 -196
- package/dist/lib/state/utils.js.map +0 -1
- package/dist/lib/strategies/deduplication.js +0 -100
- package/dist/lib/strategies/deduplication.js.map +0 -1
- package/dist/lib/strategies/index.js +0 -4
- package/dist/lib/strategies/index.js.map +0 -1
- package/dist/lib/strategies/purge-errors.js +0 -62
- package/dist/lib/strategies/purge-errors.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/strategies/utils.d.ts.map +0 -1
- package/dist/lib/strategies/utils.js +0 -128
- package/dist/lib/strategies/utils.js.map +0 -1
- package/dist/lib/subagents/subagent-results.js +0 -52
- package/dist/lib/subagents/subagent-results.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/types.js +0 -2
- package/dist/lib/tools/types.js.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/ui/notification.js +0 -182
- package/dist/lib/ui/notification.js.map +0 -1
- package/dist/lib/ui/utils.js +0 -255
- package/dist/lib/ui/utils.js.map +0 -1
|
@@ -1,174 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* State persistence module for DCP plugin.
|
|
3
|
-
* Persists pruned tool IDs across sessions so they survive OpenCode restarts.
|
|
4
|
-
* Storage location: ~/.local/share/opencode/storage/plugin/dcp/{sessionId}.json
|
|
5
|
-
*/
|
|
6
|
-
import * as fs from "fs/promises";
|
|
7
|
-
import { existsSync } from "fs";
|
|
8
|
-
import { homedir } from "os";
|
|
9
|
-
import { join } from "path";
|
|
10
|
-
const STORAGE_DIR = join(process.env.XDG_DATA_HOME || join(homedir(), ".local", "share"), "opencode", "storage", "plugin", "dcp");
|
|
11
|
-
async function ensureStorageDir() {
|
|
12
|
-
if (!existsSync(STORAGE_DIR)) {
|
|
13
|
-
await fs.mkdir(STORAGE_DIR, { recursive: true });
|
|
14
|
-
}
|
|
15
|
-
}
|
|
16
|
-
function getSessionFilePath(sessionId) {
|
|
17
|
-
return join(STORAGE_DIR, `${sessionId}.json`);
|
|
18
|
-
}
|
|
19
|
-
export async function saveSessionState(sessionState, logger, sessionName) {
|
|
20
|
-
try {
|
|
21
|
-
if (!sessionState.sessionId) {
|
|
22
|
-
return;
|
|
23
|
-
}
|
|
24
|
-
await ensureStorageDir();
|
|
25
|
-
const state = {
|
|
26
|
-
sessionName: sessionName,
|
|
27
|
-
prune: {
|
|
28
|
-
tools: Object.fromEntries(sessionState.prune.tools),
|
|
29
|
-
messages: {
|
|
30
|
-
byMessageId: Object.fromEntries(sessionState.prune.messages.byMessageId),
|
|
31
|
-
blocksById: Object.fromEntries(Array.from(sessionState.prune.messages.blocksById.entries()).map(([blockId, block]) => [String(blockId), block])),
|
|
32
|
-
activeBlockIds: Array.from(sessionState.prune.messages.activeBlockIds),
|
|
33
|
-
activeByAnchorMessageId: Object.fromEntries(sessionState.prune.messages.activeByAnchorMessageId),
|
|
34
|
-
nextBlockId: sessionState.prune.messages.nextBlockId,
|
|
35
|
-
},
|
|
36
|
-
},
|
|
37
|
-
nudges: {
|
|
38
|
-
contextLimitAnchors: Array.from(sessionState.nudges.contextLimitAnchors),
|
|
39
|
-
turnNudgeAnchors: Array.from(sessionState.nudges.turnNudgeAnchors),
|
|
40
|
-
iterationNudgeAnchors: Array.from(sessionState.nudges.iterationNudgeAnchors),
|
|
41
|
-
},
|
|
42
|
-
stats: sessionState.stats,
|
|
43
|
-
lastUpdated: new Date().toISOString(),
|
|
44
|
-
};
|
|
45
|
-
const filePath = getSessionFilePath(sessionState.sessionId);
|
|
46
|
-
const content = JSON.stringify(state, null, 2);
|
|
47
|
-
await fs.writeFile(filePath, content, "utf-8");
|
|
48
|
-
logger.info("Saved session state to disk", {
|
|
49
|
-
sessionId: sessionState.sessionId,
|
|
50
|
-
totalTokensSaved: state.stats.totalPruneTokens,
|
|
51
|
-
});
|
|
52
|
-
}
|
|
53
|
-
catch (error) {
|
|
54
|
-
logger.error("Failed to save session state", {
|
|
55
|
-
sessionId: sessionState.sessionId,
|
|
56
|
-
error: error?.message,
|
|
57
|
-
});
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
export async function loadSessionState(sessionId, logger) {
|
|
61
|
-
try {
|
|
62
|
-
const filePath = getSessionFilePath(sessionId);
|
|
63
|
-
if (!existsSync(filePath)) {
|
|
64
|
-
return null;
|
|
65
|
-
}
|
|
66
|
-
const content = await fs.readFile(filePath, "utf-8");
|
|
67
|
-
const state = JSON.parse(content);
|
|
68
|
-
const hasPruneTools = state?.prune?.tools && typeof state.prune.tools === "object";
|
|
69
|
-
const hasPruneMessages = state?.prune?.messages && typeof state.prune.messages === "object";
|
|
70
|
-
const hasNudgeFormat = state?.nudges && typeof state.nudges === "object";
|
|
71
|
-
if (!state ||
|
|
72
|
-
!state.prune ||
|
|
73
|
-
!hasPruneTools ||
|
|
74
|
-
!hasPruneMessages ||
|
|
75
|
-
!state.stats ||
|
|
76
|
-
!hasNudgeFormat) {
|
|
77
|
-
logger.warn("Invalid session state file, ignoring", {
|
|
78
|
-
sessionId: sessionId,
|
|
79
|
-
});
|
|
80
|
-
return null;
|
|
81
|
-
}
|
|
82
|
-
const rawContextLimitAnchors = Array.isArray(state.nudges.contextLimitAnchors)
|
|
83
|
-
? state.nudges.contextLimitAnchors
|
|
84
|
-
: [];
|
|
85
|
-
const validAnchors = rawContextLimitAnchors.filter((entry) => typeof entry === "string");
|
|
86
|
-
const dedupedAnchors = [...new Set(validAnchors)];
|
|
87
|
-
if (validAnchors.length !== rawContextLimitAnchors.length) {
|
|
88
|
-
logger.warn("Filtered out malformed contextLimitAnchors entries", {
|
|
89
|
-
sessionId: sessionId,
|
|
90
|
-
original: rawContextLimitAnchors.length,
|
|
91
|
-
valid: validAnchors.length,
|
|
92
|
-
});
|
|
93
|
-
}
|
|
94
|
-
state.nudges.contextLimitAnchors = dedupedAnchors;
|
|
95
|
-
const rawTurnNudgeAnchors = Array.isArray(state.nudges.turnNudgeAnchors)
|
|
96
|
-
? state.nudges.turnNudgeAnchors
|
|
97
|
-
: [];
|
|
98
|
-
const validSoftAnchors = rawTurnNudgeAnchors.filter((entry) => typeof entry === "string");
|
|
99
|
-
const dedupedSoftAnchors = [...new Set(validSoftAnchors)];
|
|
100
|
-
if (validSoftAnchors.length !== rawTurnNudgeAnchors.length) {
|
|
101
|
-
logger.warn("Filtered out malformed turnNudgeAnchors entries", {
|
|
102
|
-
sessionId: sessionId,
|
|
103
|
-
original: rawTurnNudgeAnchors.length,
|
|
104
|
-
valid: validSoftAnchors.length,
|
|
105
|
-
});
|
|
106
|
-
}
|
|
107
|
-
state.nudges.turnNudgeAnchors = dedupedSoftAnchors;
|
|
108
|
-
const rawIterationNudgeAnchors = Array.isArray(state.nudges.iterationNudgeAnchors)
|
|
109
|
-
? state.nudges.iterationNudgeAnchors
|
|
110
|
-
: [];
|
|
111
|
-
const validIterationAnchors = rawIterationNudgeAnchors.filter((entry) => typeof entry === "string");
|
|
112
|
-
const dedupedIterationAnchors = [...new Set(validIterationAnchors)];
|
|
113
|
-
if (validIterationAnchors.length !== rawIterationNudgeAnchors.length) {
|
|
114
|
-
logger.warn("Filtered out malformed iterationNudgeAnchors entries", {
|
|
115
|
-
sessionId: sessionId,
|
|
116
|
-
original: rawIterationNudgeAnchors.length,
|
|
117
|
-
valid: validIterationAnchors.length,
|
|
118
|
-
});
|
|
119
|
-
}
|
|
120
|
-
state.nudges.iterationNudgeAnchors = dedupedIterationAnchors;
|
|
121
|
-
logger.info("Loaded session state from disk", {
|
|
122
|
-
sessionId: sessionId,
|
|
123
|
-
});
|
|
124
|
-
return state;
|
|
125
|
-
}
|
|
126
|
-
catch (error) {
|
|
127
|
-
logger.warn("Failed to load session state", {
|
|
128
|
-
sessionId: sessionId,
|
|
129
|
-
error: error?.message,
|
|
130
|
-
});
|
|
131
|
-
return null;
|
|
132
|
-
}
|
|
133
|
-
}
|
|
134
|
-
export async function loadAllSessionStats(logger) {
|
|
135
|
-
const result = {
|
|
136
|
-
totalTokens: 0,
|
|
137
|
-
totalTools: 0,
|
|
138
|
-
totalMessages: 0,
|
|
139
|
-
sessionCount: 0,
|
|
140
|
-
};
|
|
141
|
-
try {
|
|
142
|
-
if (!existsSync(STORAGE_DIR)) {
|
|
143
|
-
return result;
|
|
144
|
-
}
|
|
145
|
-
const files = await fs.readdir(STORAGE_DIR);
|
|
146
|
-
const jsonFiles = files.filter((f) => f.endsWith(".json"));
|
|
147
|
-
for (const file of jsonFiles) {
|
|
148
|
-
try {
|
|
149
|
-
const filePath = join(STORAGE_DIR, file);
|
|
150
|
-
const content = await fs.readFile(filePath, "utf-8");
|
|
151
|
-
const state = JSON.parse(content);
|
|
152
|
-
if (state?.stats?.totalPruneTokens && state?.prune) {
|
|
153
|
-
result.totalTokens += state.stats.totalPruneTokens;
|
|
154
|
-
result.totalTools += state.prune.tools
|
|
155
|
-
? Object.keys(state.prune.tools).length
|
|
156
|
-
: 0;
|
|
157
|
-
result.totalMessages += state.prune.messages?.byMessageId
|
|
158
|
-
? Object.keys(state.prune.messages.byMessageId).length
|
|
159
|
-
: 0;
|
|
160
|
-
result.sessionCount++;
|
|
161
|
-
}
|
|
162
|
-
}
|
|
163
|
-
catch {
|
|
164
|
-
// Skip invalid files
|
|
165
|
-
}
|
|
166
|
-
}
|
|
167
|
-
logger.debug("Loaded all-time stats", result);
|
|
168
|
-
}
|
|
169
|
-
catch (error) {
|
|
170
|
-
logger.warn("Failed to load all-time stats", { error: error?.message });
|
|
171
|
-
}
|
|
172
|
-
return result;
|
|
173
|
-
}
|
|
174
|
-
//# sourceMappingURL=persistence.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"persistence.js","sourceRoot":"","sources":["../../../lib/state/persistence.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/state/state.js
DELETED
|
@@ -1,134 +0,0 @@
|
|
|
1
|
-
import { loadSessionState, saveSessionState } from "./persistence";
|
|
2
|
-
import { isSubAgentSession, findLastCompactionTimestamp, countTurns, resetOnCompaction, createPruneMessagesState, loadPruneMessagesState, loadPruneMap, collectTurnNudgeAnchors, } from "./utils";
|
|
3
|
-
import { getLastUserMessage } from "../shared-utils";
|
|
4
|
-
export const checkSession = async (client, state, logger, messages, manualModeDefault) => {
|
|
5
|
-
const lastUserMessage = getLastUserMessage(messages);
|
|
6
|
-
if (!lastUserMessage) {
|
|
7
|
-
return;
|
|
8
|
-
}
|
|
9
|
-
const lastSessionId = lastUserMessage.info.sessionID;
|
|
10
|
-
if (state.sessionId === null || state.sessionId !== lastSessionId) {
|
|
11
|
-
logger.info(`Session changed: ${state.sessionId} -> ${lastSessionId}`);
|
|
12
|
-
try {
|
|
13
|
-
await ensureSessionInitialized(client, state, lastSessionId, logger, messages, manualModeDefault);
|
|
14
|
-
}
|
|
15
|
-
catch (err) {
|
|
16
|
-
logger.error("Failed to initialize session state", { error: err.message });
|
|
17
|
-
}
|
|
18
|
-
}
|
|
19
|
-
const lastCompactionTimestamp = findLastCompactionTimestamp(messages);
|
|
20
|
-
if (lastCompactionTimestamp > state.lastCompaction) {
|
|
21
|
-
state.lastCompaction = lastCompactionTimestamp;
|
|
22
|
-
resetOnCompaction(state);
|
|
23
|
-
logger.info("Detected compaction - reset stale state", {
|
|
24
|
-
timestamp: lastCompactionTimestamp,
|
|
25
|
-
});
|
|
26
|
-
saveSessionState(state, logger).catch((error) => {
|
|
27
|
-
logger.warn("Failed to persist state reset after compaction", {
|
|
28
|
-
error: error instanceof Error ? error.message : String(error),
|
|
29
|
-
});
|
|
30
|
-
});
|
|
31
|
-
}
|
|
32
|
-
state.currentTurn = countTurns(state, messages);
|
|
33
|
-
};
|
|
34
|
-
export function createSessionState() {
|
|
35
|
-
return {
|
|
36
|
-
sessionId: null,
|
|
37
|
-
isSubAgent: false,
|
|
38
|
-
manualMode: false,
|
|
39
|
-
compressPermission: undefined,
|
|
40
|
-
pendingManualTrigger: null,
|
|
41
|
-
prune: {
|
|
42
|
-
tools: new Map(),
|
|
43
|
-
messages: createPruneMessagesState(),
|
|
44
|
-
},
|
|
45
|
-
nudges: {
|
|
46
|
-
contextLimitAnchors: new Set(),
|
|
47
|
-
turnNudgeAnchors: new Set(),
|
|
48
|
-
iterationNudgeAnchors: new Set(),
|
|
49
|
-
},
|
|
50
|
-
stats: {
|
|
51
|
-
pruneTokenCounter: 0,
|
|
52
|
-
totalPruneTokens: 0,
|
|
53
|
-
},
|
|
54
|
-
toolParameters: new Map(),
|
|
55
|
-
subAgentResultCache: new Map(),
|
|
56
|
-
toolIdList: [],
|
|
57
|
-
messageIds: {
|
|
58
|
-
byRawId: new Map(),
|
|
59
|
-
byRef: new Map(),
|
|
60
|
-
nextRef: 1,
|
|
61
|
-
},
|
|
62
|
-
lastCompaction: 0,
|
|
63
|
-
currentTurn: 0,
|
|
64
|
-
variant: undefined,
|
|
65
|
-
modelContextLimit: undefined,
|
|
66
|
-
systemPromptTokens: undefined,
|
|
67
|
-
};
|
|
68
|
-
}
|
|
69
|
-
export function resetSessionState(state) {
|
|
70
|
-
state.sessionId = null;
|
|
71
|
-
state.isSubAgent = false;
|
|
72
|
-
state.manualMode = false;
|
|
73
|
-
state.compressPermission = undefined;
|
|
74
|
-
state.pendingManualTrigger = null;
|
|
75
|
-
state.prune = {
|
|
76
|
-
tools: new Map(),
|
|
77
|
-
messages: createPruneMessagesState(),
|
|
78
|
-
};
|
|
79
|
-
state.nudges = {
|
|
80
|
-
contextLimitAnchors: new Set(),
|
|
81
|
-
turnNudgeAnchors: new Set(),
|
|
82
|
-
iterationNudgeAnchors: new Set(),
|
|
83
|
-
};
|
|
84
|
-
state.stats = {
|
|
85
|
-
pruneTokenCounter: 0,
|
|
86
|
-
totalPruneTokens: 0,
|
|
87
|
-
};
|
|
88
|
-
state.toolParameters.clear();
|
|
89
|
-
state.subAgentResultCache.clear();
|
|
90
|
-
state.toolIdList = [];
|
|
91
|
-
state.messageIds = {
|
|
92
|
-
byRawId: new Map(),
|
|
93
|
-
byRef: new Map(),
|
|
94
|
-
nextRef: 1,
|
|
95
|
-
};
|
|
96
|
-
state.lastCompaction = 0;
|
|
97
|
-
state.currentTurn = 0;
|
|
98
|
-
state.variant = undefined;
|
|
99
|
-
state.modelContextLimit = undefined;
|
|
100
|
-
state.systemPromptTokens = undefined;
|
|
101
|
-
}
|
|
102
|
-
export async function ensureSessionInitialized(client, state, sessionId, logger, messages, manualModeEnabled) {
|
|
103
|
-
if (state.sessionId === sessionId) {
|
|
104
|
-
return;
|
|
105
|
-
}
|
|
106
|
-
// logger.info("session ID = " + sessionId)
|
|
107
|
-
// logger.info("Initializing session state", { sessionId: sessionId })
|
|
108
|
-
resetSessionState(state);
|
|
109
|
-
state.manualMode = manualModeEnabled ? "active" : false;
|
|
110
|
-
state.sessionId = sessionId;
|
|
111
|
-
const isSubAgent = await isSubAgentSession(client, sessionId);
|
|
112
|
-
state.isSubAgent = isSubAgent;
|
|
113
|
-
// logger.info("isSubAgent = " + isSubAgent)
|
|
114
|
-
state.lastCompaction = findLastCompactionTimestamp(messages);
|
|
115
|
-
state.currentTurn = countTurns(state, messages);
|
|
116
|
-
state.nudges.turnNudgeAnchors = collectTurnNudgeAnchors(messages);
|
|
117
|
-
const persisted = await loadSessionState(sessionId, logger);
|
|
118
|
-
if (persisted === null) {
|
|
119
|
-
return;
|
|
120
|
-
}
|
|
121
|
-
state.prune.tools = loadPruneMap(persisted.prune.tools);
|
|
122
|
-
state.prune.messages = loadPruneMessagesState(persisted.prune.messages);
|
|
123
|
-
state.nudges.contextLimitAnchors = new Set(persisted.nudges.contextLimitAnchors || []);
|
|
124
|
-
state.nudges.turnNudgeAnchors = new Set([
|
|
125
|
-
...state.nudges.turnNudgeAnchors,
|
|
126
|
-
...(persisted.nudges.turnNudgeAnchors || []),
|
|
127
|
-
]);
|
|
128
|
-
state.nudges.iterationNudgeAnchors = new Set(persisted.nudges.iterationNudgeAnchors || []);
|
|
129
|
-
state.stats = {
|
|
130
|
-
pruneTokenCounter: persisted.stats?.pruneTokenCounter || 0,
|
|
131
|
-
totalPruneTokens: persisted.stats?.totalPruneTokens || 0,
|
|
132
|
-
};
|
|
133
|
-
}
|
|
134
|
-
//# sourceMappingURL=state.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../lib/state/state.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,69 +0,0 @@
|
|
|
1
|
-
import { isMessageCompacted } from "../shared-utils";
|
|
2
|
-
import { countToolTokens } from "../strategies/utils";
|
|
3
|
-
const MAX_TOOL_CACHE_SIZE = 1000;
|
|
4
|
-
/**
|
|
5
|
-
* Sync tool parameters from session messages.
|
|
6
|
-
*/
|
|
7
|
-
export function syncToolCache(state, config, logger, messages) {
|
|
8
|
-
try {
|
|
9
|
-
logger.info("Syncing tool parameters from OpenCode messages");
|
|
10
|
-
let turnCounter = 0;
|
|
11
|
-
for (const msg of messages) {
|
|
12
|
-
if (isMessageCompacted(state, msg)) {
|
|
13
|
-
continue;
|
|
14
|
-
}
|
|
15
|
-
const parts = Array.isArray(msg.parts) ? msg.parts : [];
|
|
16
|
-
for (const part of parts) {
|
|
17
|
-
if (part.type === "step-start") {
|
|
18
|
-
turnCounter++;
|
|
19
|
-
continue;
|
|
20
|
-
}
|
|
21
|
-
if (part.type !== "tool" || !part.callID) {
|
|
22
|
-
continue;
|
|
23
|
-
}
|
|
24
|
-
const turnProtectionEnabled = config.turnProtection.enabled;
|
|
25
|
-
const turnProtectionTurns = config.turnProtection.turns;
|
|
26
|
-
const isProtectedByTurn = turnProtectionEnabled &&
|
|
27
|
-
turnProtectionTurns > 0 &&
|
|
28
|
-
state.currentTurn - turnCounter < turnProtectionTurns;
|
|
29
|
-
if (state.toolParameters.has(part.callID)) {
|
|
30
|
-
continue;
|
|
31
|
-
}
|
|
32
|
-
if (isProtectedByTurn) {
|
|
33
|
-
continue;
|
|
34
|
-
}
|
|
35
|
-
const tokenCount = countToolTokens(part);
|
|
36
|
-
state.toolParameters.set(part.callID, {
|
|
37
|
-
tool: part.tool,
|
|
38
|
-
parameters: part.state?.input ?? {},
|
|
39
|
-
status: part.state.status,
|
|
40
|
-
error: part.state.status === "error" ? part.state.error : undefined,
|
|
41
|
-
turn: turnCounter,
|
|
42
|
-
tokenCount,
|
|
43
|
-
});
|
|
44
|
-
logger.info(`Cached tool id: ${part.callID} (turn ${turnCounter}${tokenCount !== undefined ? `, ${tokenCount} tokens` : ""})`);
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
logger.info(`Synced cache - size: ${state.toolParameters.size}, currentTurn: ${state.currentTurn}`);
|
|
48
|
-
trimToolParametersCache(state);
|
|
49
|
-
}
|
|
50
|
-
catch (error) {
|
|
51
|
-
logger.warn("Failed to sync tool parameters from OpenCode", {
|
|
52
|
-
error: error instanceof Error ? error.message : String(error),
|
|
53
|
-
});
|
|
54
|
-
}
|
|
55
|
-
}
|
|
56
|
-
/**
|
|
57
|
-
* Trim the tool parameters cache to prevent unbounded memory growth.
|
|
58
|
-
* Uses FIFO eviction - removes oldest entries first.
|
|
59
|
-
*/
|
|
60
|
-
export function trimToolParametersCache(state) {
|
|
61
|
-
if (state.toolParameters.size <= MAX_TOOL_CACHE_SIZE) {
|
|
62
|
-
return;
|
|
63
|
-
}
|
|
64
|
-
const keysToRemove = Array.from(state.toolParameters.keys()).slice(0, state.toolParameters.size - MAX_TOOL_CACHE_SIZE);
|
|
65
|
-
for (const key of keysToRemove) {
|
|
66
|
-
state.toolParameters.delete(key);
|
|
67
|
-
}
|
|
68
|
-
}
|
|
69
|
-
//# sourceMappingURL=tool-cache.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"tool-cache.js","sourceRoot":"","sources":["../../../lib/state/tool-cache.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/state/types.js
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../lib/state/types.ts"],"names":[],"mappings":""}
|
package/dist/lib/state/utils.js
DELETED
|
@@ -1,196 +0,0 @@
|
|
|
1
|
-
import { isMessageCompacted } from "../shared-utils";
|
|
2
|
-
import { isIgnoredUserMessage } from "../messages/utils";
|
|
3
|
-
export async function isSubAgentSession(client, sessionID) {
|
|
4
|
-
try {
|
|
5
|
-
const result = await client.session.get({ path: { id: sessionID } });
|
|
6
|
-
return !!result.data?.parentID;
|
|
7
|
-
}
|
|
8
|
-
catch (error) {
|
|
9
|
-
return false;
|
|
10
|
-
}
|
|
11
|
-
}
|
|
12
|
-
export function findLastCompactionTimestamp(messages) {
|
|
13
|
-
for (let i = messages.length - 1; i >= 0; i--) {
|
|
14
|
-
const msg = messages[i];
|
|
15
|
-
if (msg.info.role === "assistant" && msg.info.summary === true) {
|
|
16
|
-
return msg.info.time.created;
|
|
17
|
-
}
|
|
18
|
-
}
|
|
19
|
-
return 0;
|
|
20
|
-
}
|
|
21
|
-
export function countTurns(state, messages) {
|
|
22
|
-
let turnCount = 0;
|
|
23
|
-
for (const msg of messages) {
|
|
24
|
-
if (isMessageCompacted(state, msg)) {
|
|
25
|
-
continue;
|
|
26
|
-
}
|
|
27
|
-
const parts = Array.isArray(msg.parts) ? msg.parts : [];
|
|
28
|
-
for (const part of parts) {
|
|
29
|
-
if (part.type === "step-start") {
|
|
30
|
-
turnCount++;
|
|
31
|
-
}
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
|
-
return turnCount;
|
|
35
|
-
}
|
|
36
|
-
export function loadPruneMap(obj) {
|
|
37
|
-
if (!obj || typeof obj !== "object") {
|
|
38
|
-
return new Map();
|
|
39
|
-
}
|
|
40
|
-
const entries = Object.entries(obj).filter((entry) => typeof entry[0] === "string" && typeof entry[1] === "number");
|
|
41
|
-
return new Map(entries);
|
|
42
|
-
}
|
|
43
|
-
export function createPruneMessagesState() {
|
|
44
|
-
return {
|
|
45
|
-
byMessageId: new Map(),
|
|
46
|
-
blocksById: new Map(),
|
|
47
|
-
activeBlockIds: new Set(),
|
|
48
|
-
activeByAnchorMessageId: new Map(),
|
|
49
|
-
nextBlockId: 1,
|
|
50
|
-
};
|
|
51
|
-
}
|
|
52
|
-
export function loadPruneMessagesState(persisted) {
|
|
53
|
-
const state = createPruneMessagesState();
|
|
54
|
-
if (!persisted || typeof persisted !== "object") {
|
|
55
|
-
return state;
|
|
56
|
-
}
|
|
57
|
-
if (typeof persisted.nextBlockId === "number" && Number.isInteger(persisted.nextBlockId)) {
|
|
58
|
-
state.nextBlockId = Math.max(1, persisted.nextBlockId);
|
|
59
|
-
}
|
|
60
|
-
if (persisted.byMessageId && typeof persisted.byMessageId === "object") {
|
|
61
|
-
for (const [messageId, entry] of Object.entries(persisted.byMessageId)) {
|
|
62
|
-
if (!entry || typeof entry !== "object") {
|
|
63
|
-
continue;
|
|
64
|
-
}
|
|
65
|
-
const tokenCount = typeof entry.tokenCount === "number" ? entry.tokenCount : 0;
|
|
66
|
-
const allBlockIds = Array.isArray(entry.allBlockIds)
|
|
67
|
-
? [
|
|
68
|
-
...new Set(entry.allBlockIds.filter((id) => Number.isInteger(id) && id > 0)),
|
|
69
|
-
]
|
|
70
|
-
: [];
|
|
71
|
-
const activeBlockIds = Array.isArray(entry.activeBlockIds)
|
|
72
|
-
? [
|
|
73
|
-
...new Set(entry.activeBlockIds.filter((id) => Number.isInteger(id) && id > 0)),
|
|
74
|
-
]
|
|
75
|
-
: [];
|
|
76
|
-
state.byMessageId.set(messageId, {
|
|
77
|
-
tokenCount,
|
|
78
|
-
allBlockIds,
|
|
79
|
-
activeBlockIds,
|
|
80
|
-
});
|
|
81
|
-
}
|
|
82
|
-
}
|
|
83
|
-
if (persisted.blocksById && typeof persisted.blocksById === "object") {
|
|
84
|
-
for (const [blockIdStr, block] of Object.entries(persisted.blocksById)) {
|
|
85
|
-
const blockId = Number.parseInt(blockIdStr, 10);
|
|
86
|
-
if (!Number.isInteger(blockId) || blockId < 1 || !block || typeof block !== "object") {
|
|
87
|
-
continue;
|
|
88
|
-
}
|
|
89
|
-
const toNumberArray = (value) => Array.isArray(value)
|
|
90
|
-
? [
|
|
91
|
-
...new Set(value.filter((item) => Number.isInteger(item) && item > 0)),
|
|
92
|
-
]
|
|
93
|
-
: [];
|
|
94
|
-
const toStringArray = (value) => Array.isArray(value)
|
|
95
|
-
? [...new Set(value.filter((item) => typeof item === "string"))]
|
|
96
|
-
: [];
|
|
97
|
-
state.blocksById.set(blockId, {
|
|
98
|
-
blockId,
|
|
99
|
-
active: block.active === true,
|
|
100
|
-
deactivatedByUser: block.deactivatedByUser === true,
|
|
101
|
-
compressedTokens: typeof block.compressedTokens === "number" &&
|
|
102
|
-
Number.isFinite(block.compressedTokens)
|
|
103
|
-
? Math.max(0, block.compressedTokens)
|
|
104
|
-
: 0,
|
|
105
|
-
topic: typeof block.topic === "string" ? block.topic : "",
|
|
106
|
-
startId: typeof block.startId === "string" ? block.startId : "",
|
|
107
|
-
endId: typeof block.endId === "string" ? block.endId : "",
|
|
108
|
-
anchorMessageId: typeof block.anchorMessageId === "string" ? block.anchorMessageId : "",
|
|
109
|
-
compressMessageId: typeof block.compressMessageId === "string" ? block.compressMessageId : "",
|
|
110
|
-
includedBlockIds: toNumberArray(block.includedBlockIds),
|
|
111
|
-
consumedBlockIds: toNumberArray(block.consumedBlockIds),
|
|
112
|
-
parentBlockIds: toNumberArray(block.parentBlockIds),
|
|
113
|
-
directMessageIds: toStringArray(block.directMessageIds),
|
|
114
|
-
directToolIds: toStringArray(block.directToolIds),
|
|
115
|
-
effectiveMessageIds: toStringArray(block.effectiveMessageIds),
|
|
116
|
-
effectiveToolIds: toStringArray(block.effectiveToolIds),
|
|
117
|
-
createdAt: typeof block.createdAt === "number" ? block.createdAt : 0,
|
|
118
|
-
deactivatedAt: typeof block.deactivatedAt === "number" ? block.deactivatedAt : undefined,
|
|
119
|
-
deactivatedByBlockId: typeof block.deactivatedByBlockId === "number" &&
|
|
120
|
-
Number.isInteger(block.deactivatedByBlockId)
|
|
121
|
-
? block.deactivatedByBlockId
|
|
122
|
-
: undefined,
|
|
123
|
-
summary: typeof block.summary === "string" ? block.summary : "",
|
|
124
|
-
});
|
|
125
|
-
}
|
|
126
|
-
}
|
|
127
|
-
if (Array.isArray(persisted.activeBlockIds)) {
|
|
128
|
-
for (const blockId of persisted.activeBlockIds) {
|
|
129
|
-
if (!Number.isInteger(blockId) || blockId < 1) {
|
|
130
|
-
continue;
|
|
131
|
-
}
|
|
132
|
-
state.activeBlockIds.add(blockId);
|
|
133
|
-
}
|
|
134
|
-
}
|
|
135
|
-
if (persisted.activeByAnchorMessageId &&
|
|
136
|
-
typeof persisted.activeByAnchorMessageId === "object") {
|
|
137
|
-
for (const [anchorMessageId, blockId] of Object.entries(persisted.activeByAnchorMessageId)) {
|
|
138
|
-
if (typeof blockId !== "number" || !Number.isInteger(blockId) || blockId < 1) {
|
|
139
|
-
continue;
|
|
140
|
-
}
|
|
141
|
-
state.activeByAnchorMessageId.set(anchorMessageId, blockId);
|
|
142
|
-
}
|
|
143
|
-
}
|
|
144
|
-
for (const [blockId, block] of state.blocksById) {
|
|
145
|
-
if (block.active) {
|
|
146
|
-
state.activeBlockIds.add(blockId);
|
|
147
|
-
if (block.anchorMessageId) {
|
|
148
|
-
state.activeByAnchorMessageId.set(block.anchorMessageId, blockId);
|
|
149
|
-
}
|
|
150
|
-
}
|
|
151
|
-
if (blockId >= state.nextBlockId) {
|
|
152
|
-
state.nextBlockId = blockId + 1;
|
|
153
|
-
}
|
|
154
|
-
}
|
|
155
|
-
return state;
|
|
156
|
-
}
|
|
157
|
-
function hasCompletedCompress(message) {
|
|
158
|
-
if (message.info.role !== "assistant") {
|
|
159
|
-
return false;
|
|
160
|
-
}
|
|
161
|
-
const parts = Array.isArray(message.parts) ? message.parts : [];
|
|
162
|
-
return parts.some((part) => part.type === "tool" && part.tool === "compress" && part.state?.status === "completed");
|
|
163
|
-
}
|
|
164
|
-
export function collectTurnNudgeAnchors(messages) {
|
|
165
|
-
const anchors = new Set();
|
|
166
|
-
let pendingUserMessageId = null;
|
|
167
|
-
for (let i = messages.length - 1; i >= 0; i--) {
|
|
168
|
-
const message = messages[i];
|
|
169
|
-
if (hasCompletedCompress(message)) {
|
|
170
|
-
break;
|
|
171
|
-
}
|
|
172
|
-
if (message.info.role === "user") {
|
|
173
|
-
if (!isIgnoredUserMessage(message)) {
|
|
174
|
-
pendingUserMessageId = message.info.id;
|
|
175
|
-
}
|
|
176
|
-
continue;
|
|
177
|
-
}
|
|
178
|
-
if (message.info.role === "assistant" && pendingUserMessageId) {
|
|
179
|
-
anchors.add(message.info.id);
|
|
180
|
-
anchors.add(pendingUserMessageId);
|
|
181
|
-
pendingUserMessageId = null;
|
|
182
|
-
}
|
|
183
|
-
}
|
|
184
|
-
return anchors;
|
|
185
|
-
}
|
|
186
|
-
export function resetOnCompaction(state) {
|
|
187
|
-
state.toolParameters.clear();
|
|
188
|
-
state.prune.tools = new Map();
|
|
189
|
-
state.prune.messages = createPruneMessagesState();
|
|
190
|
-
state.nudges = {
|
|
191
|
-
contextLimitAnchors: new Set(),
|
|
192
|
-
turnNudgeAnchors: new Set(),
|
|
193
|
-
iterationNudgeAnchors: new Set(),
|
|
194
|
-
};
|
|
195
|
-
}
|
|
196
|
-
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../lib/state/utils.ts"],"names":[],"mappings":"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"}
|