@infituit/opencode-acp 2.0.0-alpha.4 → 2.0.0-alpha.5
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 +4 -0
- package/dist/{token-utils.d.ts → context-usage.d.ts} +1 -2
- package/dist/context-usage.d.ts.map +1 -0
- package/dist/index.js +7 -73
- package/dist/index.js.map +1 -1
- package/dist/state/index.d.ts +0 -1
- package/dist/state/index.d.ts.map +1 -1
- package/dist/state/state.d.ts.map +1 -1
- package/dist/state/types.d.ts +0 -10
- package/dist/state/types.d.ts.map +1 -1
- package/dist/state/utils.d.ts.map +1 -1
- package/dist/{hooks → v2/hooks}/command.d.ts +4 -4
- package/dist/v2/hooks/command.d.ts.map +1 -0
- package/dist/{hooks → v2/hooks}/event.d.ts +2 -2
- package/dist/v2/hooks/event.d.ts.map +1 -0
- package/dist/v2/hooks/messages.d.ts +10 -0
- package/dist/v2/hooks/messages.d.ts.map +1 -0
- package/dist/{hooks → v2/hooks}/system.d.ts +4 -4
- package/dist/v2/hooks/system.d.ts.map +1 -0
- package/dist/{hooks → v2/hooks}/text.d.ts +2 -2
- package/dist/v2/hooks/text.d.ts.map +1 -0
- package/dist/v2/hooks.d.ts.map +1 -0
- package/package.json +2 -2
- package/dist/hooks/command.d.ts.map +0 -1
- package/dist/hooks/event.d.ts.map +0 -1
- package/dist/hooks/messages.d.ts +0 -10
- package/dist/hooks/messages.d.ts.map +0 -1
- package/dist/hooks/system.d.ts.map +0 -1
- package/dist/hooks/text.d.ts.map +0 -1
- package/dist/hooks.d.ts.map +0 -1
- package/dist/state/tool-cache.d.ts +0 -13
- package/dist/state/tool-cache.d.ts.map +0 -1
- package/dist/token-utils.d.ts.map +0 -1
- /package/dist/{hooks.d.ts → v2/hooks.d.ts} +0 -0
package/README.md
CHANGED
|
@@ -199,6 +199,10 @@ ACP 暴露六个可编辑的 prompt:
|
|
|
199
199
|
|
|
200
200
|
**维护原则:不继承历史债务。** 不会为了维持历史兼容性而保留已知问题或延续不合理设计;必要时接受不兼容变更。
|
|
201
201
|
|
|
202
|
+
## 开发与维护
|
|
203
|
+
|
|
204
|
+
- [依赖管理政策](./docs/developer/dependency-management.md):人工升级、Dependabot 边界、验证与回滚要求。
|
|
205
|
+
|
|
202
206
|
## 许可证
|
|
203
207
|
|
|
204
208
|
本项目采用 AGPL-3.0-or-later 许可证,见 [LICENSE](./LICENSE)。历史作者及第三方组件的版权和许可声明予以保留,见 [LICENSE](./LICENSE) 和 [NOTICE](./NOTICE)。
|
|
@@ -27,7 +27,6 @@ export declare const COMPACTED_TOOL_OUTPUT_PLACEHOLDER = "[Old tool result conte
|
|
|
27
27
|
export declare function extractCompletedToolOutput(part: any): string | undefined;
|
|
28
28
|
export declare function extractToolContent(part: any): string[];
|
|
29
29
|
export declare function countToolTokens(part: any): number;
|
|
30
|
-
export declare function getTotalToolTokens(state: SessionState, toolIds: string[]): number;
|
|
31
30
|
export declare function countMessageTextTokens(msg: WithParts): number;
|
|
32
31
|
export declare function countAllMessageTokens(msg: WithParts): number;
|
|
33
32
|
export declare function countMessageCharacters(msg: WithParts): number;
|
|
@@ -39,4 +38,4 @@ export declare function countMessageCharacters(msg: WithParts): number;
|
|
|
39
38
|
* draft ranges; these counters feed heuristic stats/gates, not billing.
|
|
40
39
|
*/
|
|
41
40
|
export declare function estimateAllMessageTokensFast(msg: WithParts): number;
|
|
42
|
-
//# sourceMappingURL=
|
|
41
|
+
//# sourceMappingURL=context-usage.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"context-usage.d.ts","sourceRoot":"","sources":["../src/context-usage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAEjD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAMjC,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,CA6CvF;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,CA2BxE;AAED,wBAAgB,gBAAgB,CAC5B,KAAK,EAAE,YAAY,EACnB,QAAQ,EAAE,SAAS,EAAE,EACrB,MAAM,EAAE,MAAM,GACf;IACC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;IAC3B,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IACzB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;CAC9B,CAkBA;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAOhD;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAG3D;AAED,eAAO,MAAM,iCAAiC,sCAAsC,CAAA;AAMpF,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,GAAG,GAAG,MAAM,GAAG,SAAS,CAcxE;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,GAAG,GAAG,MAAM,EAAE,CAmBtD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,GAAG,GAAG,MAAM,CAGjD;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM,CAU7D;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM,CAY5D;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM,CAa7D;AAED;;;;;;GAMG;AACH,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM,CAEnE"}
|
package/dist/index.js
CHANGED
|
@@ -2209,7 +2209,7 @@ function resolveToolContext(factoryCtx, sessionID) {
|
|
|
2209
2209
|
};
|
|
2210
2210
|
}
|
|
2211
2211
|
|
|
2212
|
-
// src/
|
|
2212
|
+
// src/context-usage.ts
|
|
2213
2213
|
import * as _anthropicTokenizer from "@anthropic-ai/tokenizer";
|
|
2214
2214
|
|
|
2215
2215
|
// src/messages/shape.ts
|
|
@@ -2353,7 +2353,7 @@ function isProtectedUserMessage(_config, message) {
|
|
|
2353
2353
|
return false;
|
|
2354
2354
|
}
|
|
2355
2355
|
|
|
2356
|
-
// src/
|
|
2356
|
+
// src/context-usage.ts
|
|
2357
2357
|
var anthropicCountTokens = _anthropicTokenizer.countTokens ?? _anthropicTokenizer.default?.countTokens;
|
|
2358
2358
|
function getCurrentTokenUsage(state, messages) {
|
|
2359
2359
|
for (let i = messages.length - 1; i >= 0; i--) {
|
|
@@ -2790,7 +2790,6 @@ function getTierTokenUsage(state) {
|
|
|
2790
2790
|
return { tier1Tokens, tier2Tokens, tier3Tokens };
|
|
2791
2791
|
}
|
|
2792
2792
|
function resetOnCompaction(state) {
|
|
2793
|
-
state.toolParameters.clear();
|
|
2794
2793
|
state.nudges = {
|
|
2795
2794
|
contextLimitAnchors: /* @__PURE__ */ new Set(),
|
|
2796
2795
|
turnNudgeAnchors: /* @__PURE__ */ new Set(),
|
|
@@ -5236,7 +5235,6 @@ function createSessionState() {
|
|
|
5236
5235
|
startsByCallId: /* @__PURE__ */ new Map(),
|
|
5237
5236
|
pendingByCallId: /* @__PURE__ */ new Map()
|
|
5238
5237
|
},
|
|
5239
|
-
toolParameters: /* @__PURE__ */ new Map(),
|
|
5240
5238
|
toolIdList: [],
|
|
5241
5239
|
messageIds: {
|
|
5242
5240
|
byRawId: /* @__PURE__ */ new Map(),
|
|
@@ -5282,7 +5280,6 @@ function resetSessionState(state) {
|
|
|
5282
5280
|
pruneTokenCounter: 0,
|
|
5283
5281
|
totalPruneTokens: 0
|
|
5284
5282
|
};
|
|
5285
|
-
state.toolParameters.clear();
|
|
5286
5283
|
state.toolIdList = [];
|
|
5287
5284
|
state.messageIds = {
|
|
5288
5285
|
byRawId: /* @__PURE__ */ new Map(),
|
|
@@ -5448,67 +5445,6 @@ async function ensureSessionInitialized(client, state, sessionId, logger, messag
|
|
|
5448
5445
|
await saveSessionState(state, logger);
|
|
5449
5446
|
}
|
|
5450
5447
|
|
|
5451
|
-
// src/state/tool-cache.ts
|
|
5452
|
-
var MAX_TOOL_CACHE_SIZE = 1e3;
|
|
5453
|
-
function syncToolCache(state, config, logger, messages) {
|
|
5454
|
-
try {
|
|
5455
|
-
logger.info("Syncing tool parameters from OpenCode messages");
|
|
5456
|
-
let turnCounter = 0;
|
|
5457
|
-
for (const msg of messages) {
|
|
5458
|
-
if (isMessageCompacted(state, msg)) {
|
|
5459
|
-
continue;
|
|
5460
|
-
}
|
|
5461
|
-
const parts = Array.isArray(msg.parts) ? msg.parts : [];
|
|
5462
|
-
for (const part of parts) {
|
|
5463
|
-
if (part.type === "step-start") {
|
|
5464
|
-
turnCounter++;
|
|
5465
|
-
continue;
|
|
5466
|
-
}
|
|
5467
|
-
if (part.type !== "tool" || !part.callID) {
|
|
5468
|
-
continue;
|
|
5469
|
-
}
|
|
5470
|
-
if (state.toolParameters.has(part.callID)) {
|
|
5471
|
-
continue;
|
|
5472
|
-
}
|
|
5473
|
-
const contents = extractToolContent(part);
|
|
5474
|
-
const rawLength = contents.reduce((sum, s) => sum + (s?.length ?? 0), 0);
|
|
5475
|
-
const tokenCount = Math.round(rawLength / 4);
|
|
5476
|
-
state.toolParameters.set(part.callID, {
|
|
5477
|
-
tool: part.tool,
|
|
5478
|
-
parameters: part.state?.input ?? {},
|
|
5479
|
-
status: part.state.status,
|
|
5480
|
-
error: part.state.status === "error" ? part.state.error : void 0,
|
|
5481
|
-
turn: turnCounter,
|
|
5482
|
-
tokenCount
|
|
5483
|
-
});
|
|
5484
|
-
logger.info(
|
|
5485
|
-
`Cached tool id: ${part.callID} (turn ${turnCounter}${tokenCount !== void 0 ? `, ${tokenCount} tokens` : ""})`
|
|
5486
|
-
);
|
|
5487
|
-
}
|
|
5488
|
-
}
|
|
5489
|
-
logger.info(
|
|
5490
|
-
`Synced cache - size: ${state.toolParameters.size}, currentTurn: ${state.currentTurn}`
|
|
5491
|
-
);
|
|
5492
|
-
trimToolParametersCache(state);
|
|
5493
|
-
} catch (error) {
|
|
5494
|
-
logger.warn("Failed to sync tool parameters from OpenCode", {
|
|
5495
|
-
error: error instanceof Error ? error.message : String(error)
|
|
5496
|
-
});
|
|
5497
|
-
}
|
|
5498
|
-
}
|
|
5499
|
-
function trimToolParametersCache(state) {
|
|
5500
|
-
if (state.toolParameters.size <= MAX_TOOL_CACHE_SIZE) {
|
|
5501
|
-
return;
|
|
5502
|
-
}
|
|
5503
|
-
const keysToRemove = Array.from(state.toolParameters.keys()).slice(
|
|
5504
|
-
0,
|
|
5505
|
-
state.toolParameters.size - MAX_TOOL_CACHE_SIZE
|
|
5506
|
-
);
|
|
5507
|
-
for (const key of keysToRemove) {
|
|
5508
|
-
state.toolParameters.delete(key);
|
|
5509
|
-
}
|
|
5510
|
-
}
|
|
5511
|
-
|
|
5512
5448
|
// src/ui/utils.ts
|
|
5513
5449
|
function formatAge(createdAt2) {
|
|
5514
5450
|
const elapsed = Date.now() - createdAt2;
|
|
@@ -11470,7 +11406,7 @@ import { writeFile as writeFile2, mkdir as mkdir2 } from "fs/promises";
|
|
|
11470
11406
|
import { join as join5 } from "path";
|
|
11471
11407
|
import { existsSync as existsSync5 } from "fs";
|
|
11472
11408
|
import { homedir as homedir3 } from "os";
|
|
11473
|
-
var LOG_VERSION = true ? "2.0.0-alpha.
|
|
11409
|
+
var LOG_VERSION = true ? "2.0.0-alpha.5" : "dev";
|
|
11474
11410
|
var LEVEL_RANK = {
|
|
11475
11411
|
debug: 10,
|
|
11476
11412
|
info: 20,
|
|
@@ -12403,7 +12339,7 @@ function renderSystemPrompt(prompts, protectedToolsExtension, subagent) {
|
|
|
12403
12339
|
return [prompts.system.trim(), ...extensions].filter(Boolean).join("\n\n").replace(/\n([ \t]*\n)+/g, "\n\n").trim();
|
|
12404
12340
|
}
|
|
12405
12341
|
|
|
12406
|
-
// src/hooks/system.ts
|
|
12342
|
+
// src/v2/hooks/system.ts
|
|
12407
12343
|
var INTERNAL_AGENT_SIGNATURES = [
|
|
12408
12344
|
"You are a title generator",
|
|
12409
12345
|
"You are a helpful AI assistant tasked with summarizing conversations",
|
|
@@ -13265,7 +13201,7 @@ function runBatchCleanup(state, config, logger, messages) {
|
|
|
13265
13201
|
};
|
|
13266
13202
|
}
|
|
13267
13203
|
|
|
13268
|
-
// src/hooks/messages.ts
|
|
13204
|
+
// src/v2/hooks/messages.ts
|
|
13269
13205
|
var INTERNAL_AGENT_NAMES = /* @__PURE__ */ new Set(["title", "summary", "compaction"]);
|
|
13270
13206
|
function isInternalAgentRequest(messages) {
|
|
13271
13207
|
const lastUserMessage = getLastUserMessage(messages);
|
|
@@ -13425,8 +13361,6 @@ function createChatMessageTransformHandler(client, registry4, logger, config, pr
|
|
|
13425
13361
|
saveSessionState(state, logger).catch(() => {
|
|
13426
13362
|
});
|
|
13427
13363
|
}
|
|
13428
|
-
checkpoint("syncToolCache");
|
|
13429
|
-
syncToolCache(state, config, logger, output.messages);
|
|
13430
13364
|
checkpoint("batchCleanup");
|
|
13431
13365
|
buildToolIdList(state, output.messages);
|
|
13432
13366
|
const batchResult = runBatchCleanup(state, config, logger, output.messages);
|
|
@@ -14047,7 +13981,7 @@ async function sendExportNotice(client, sessionId, ctx, text) {
|
|
|
14047
13981
|
await sendIgnoredMessage(client, sessionId, text, {}, ctx.logger);
|
|
14048
13982
|
}
|
|
14049
13983
|
|
|
14050
|
-
// src/hooks/command.ts
|
|
13984
|
+
// src/v2/hooks/command.ts
|
|
14051
13985
|
function buildHelpText() {
|
|
14052
13986
|
return [
|
|
14053
13987
|
"[ACP] Available commands:",
|
|
@@ -14098,7 +14032,7 @@ function createCommandExecuteHandler(client, registry4, logger, config, workingD
|
|
|
14098
14032
|
};
|
|
14099
14033
|
}
|
|
14100
14034
|
|
|
14101
|
-
// src/hooks/event.ts
|
|
14035
|
+
// src/v2/hooks/event.ts
|
|
14102
14036
|
function createEventHandler(registry4, logger) {
|
|
14103
14037
|
return async (input) => {
|
|
14104
14038
|
if (input.event?.type === "session.idle" || input.event?.type === "session.deleted") {
|