@dsh-cc/acp 0.9.3 → 0.9.5-rc.1
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.i18n.yaml +2 -2
- package/README.md +1 -1
- package/README.zh.md +1 -1
- package/lib/codec.js +1 -1
- package/lib/content.d.ts +1 -1
- package/lib/content.js +2 -2
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +24 -29
- package/lib/index.js.map +1 -1
- package/lib/mcp.js +1 -1
- package/lib/model-control.d.ts +19 -28
- package/lib/model-control.d.ts.map +1 -1
- package/lib/model-control.js +39 -53
- package/lib/model-control.js.map +1 -1
- package/lib/preset-roster.d.ts +38 -0
- package/lib/preset-roster.d.ts.map +1 -0
- package/lib/preset-roster.js +49 -0
- package/lib/preset-roster.js.map +1 -0
- package/lib/session.d.ts +17 -18
- package/lib/session.d.ts.map +1 -1
- package/lib/session.js +39 -55
- package/lib/session.js.map +1 -1
- package/lib/updates.js +1 -1
- package/lib/version.d.ts +9 -9
- package/lib/version.d.ts.map +1 -1
- package/lib/version.js +9 -26
- package/lib/version.js.map +1 -1
- package/package.json +14 -12
package/README.i18n.yaml
CHANGED
|
@@ -2,5 +2,5 @@
|
|
|
2
2
|
# side as of the last confirmed-consistent state. Both languages carry equal authority;
|
|
3
3
|
# after editing either side, bring the other along and re-record with:
|
|
4
4
|
# pnpm check:readme --write
|
|
5
|
-
README.md:
|
|
6
|
-
README.zh.md:
|
|
5
|
+
README.md: 7f334de6061f3cfa105e26cee520aed974c8ecb9
|
|
6
|
+
README.zh.md: 27e6b4abbe92de0fb646348e4ed1ed33fbe00cf5
|
package/README.md
CHANGED
|
@@ -2,4 +2,4 @@
|
|
|
2
2
|
|
|
3
3
|
English | [中文](README.zh.md)
|
|
4
4
|
|
|
5
|
-
Agent Client Protocol (ACP, v1) server that lets an ACP client (e.g. Zed) drive dsh-cc agents over JSON-RPC on stdio. This package is a verbatim vendor of `@deepseek-ai/dsh-acp` (`packages/acp/acp`, deepseek-harness, MIT — see `LICENSE-harness`), pinned at `
|
|
5
|
+
Agent Client Protocol (ACP, v1) server that lets an ACP client (e.g. Zed) drive dsh-cc agents over JSON-RPC on stdio. This package is a verbatim vendor of `@deepseek-ai/dsh-acp` (`packages/acp/acp`, deepseek-harness, MIT — see `LICENSE-harness`), pinned at `2f97f60455605e915b8176d9170cae337bfedcc6` (@deepseek-ai/dsh-acp 0.2.2-rc.1); every ported file carries a provenance header and CC-specific divergences must be recorded in `DIVERGENCE.md`. The vendoring and extension plan is described in `docs/plans/2026-10-09-acp-m2-own-plugin.md`.
|
package/README.zh.md
CHANGED
|
@@ -2,4 +2,4 @@
|
|
|
2
2
|
|
|
3
3
|
[English](README.md) | 中文
|
|
4
4
|
|
|
5
|
-
Agent Client Protocol(ACP,v1)服务器,让 ACP 客户端(如 Zed)通过 stdio 上的 JSON-RPC 驱动 dsh-cc agent。本包是 `@deepseek-ai/dsh-acp`(deepseek-harness 的 `packages/acp/acp`,MIT — 见 `LICENSE-harness`)的逐字 vendor,固定于 `
|
|
5
|
+
Agent Client Protocol(ACP,v1)服务器,让 ACP 客户端(如 Zed)通过 stdio 上的 JSON-RPC 驱动 dsh-cc agent。本包是 `@deepseek-ai/dsh-acp`(deepseek-harness 的 `packages/acp/acp`,MIT — 见 `LICENSE-harness`)的逐字 vendor,固定于 `2f97f60455605e915b8176d9170cae337bfedcc6`(@deepseek-ai/dsh-acp 0.2.2-rc.1);每个移植文件都带出处头,CC 侧的分歧必须记录在 `DIVERGENCE.md`。vendor 与扩展计划见 `docs/plans/2026-10-09-acp-m2-own-plugin.md`。
|
package/lib/codec.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// Vendored from @deepseek-ai/dsh-acp (packages/acp/acp/src/codec.ts)
|
|
2
|
-
// Source ref:
|
|
2
|
+
// Source ref: 2f97f60455605e915b8176d9170cae337bfedcc6 (deepseek-harness, MIT — see LICENSE-harness)
|
|
3
3
|
// Copied 2026-10-09. Structural fixes flow from upstream during harness
|
|
4
4
|
// migrations; CC-specific divergences must be recorded in DIVERGENCE.md.
|
|
5
5
|
/**
|
package/lib/content.d.ts
CHANGED
|
@@ -31,7 +31,7 @@ export declare function supportsAcpImagePrompts(ctx: Context, provider: string |
|
|
|
31
31
|
* writing; cancellation after a successful content-addressed write may leave an
|
|
32
32
|
* unreachable object but never queues a late user message.
|
|
33
33
|
* @param ctx - bridge context carrying attachment and model services.
|
|
34
|
-
* @param route -
|
|
34
|
+
* @param route - Agent model selection current at prompt admission.
|
|
35
35
|
* @param prompt - untrusted ACP prompt blocks in wire order.
|
|
36
36
|
* @param imageEnabled - capability result advertised during initialization.
|
|
37
37
|
* @param signal - admission cancellation signal.
|
package/lib/content.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// Vendored from @deepseek-ai/dsh-acp (packages/acp/acp/src/content.ts)
|
|
2
|
-
// Source ref:
|
|
2
|
+
// Source ref: 2f97f60455605e915b8176d9170cae337bfedcc6 (deepseek-harness, MIT — see LICENSE-harness)
|
|
3
3
|
// Copied 2026-10-09. Structural fixes flow from upstream during harness
|
|
4
4
|
// migrations; CC-specific divergences must be recorded in DIVERGENCE.md.
|
|
5
5
|
/** ACP wire-content admission and projection owned by the ACP adapter. @module */
|
|
@@ -99,7 +99,7 @@ function resourceLinkText(block) {
|
|
|
99
99
|
* writing; cancellation after a successful content-addressed write may leave an
|
|
100
100
|
* unreachable object but never queues a late user message.
|
|
101
101
|
* @param ctx - bridge context carrying attachment and model services.
|
|
102
|
-
* @param route -
|
|
102
|
+
* @param route - Agent model selection current at prompt admission.
|
|
103
103
|
* @param prompt - untrusted ACP prompt blocks in wire order.
|
|
104
104
|
* @param imageEnabled - capability result advertised during initialization.
|
|
105
105
|
* @param signal - admission cancellation signal.
|
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAMlD,OAAO,MAAM,MAAM,0BAA0B,CAAA;AAG7C,OAAO,EAyBL,KAAK,MAAM,EACZ,MAAM,0BAA0B,CAAA;AAmBjC,eAAO,MAAM,IAAI,WAAW,CAAA;AAC5B,kEAAkE;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAMlD,OAAO,MAAM,MAAM,0BAA0B,CAAA;AAG7C,OAAO,EAyBL,KAAK,MAAM,EACZ,MAAM,0BAA0B,CAAA;AAmBjC,eAAO,MAAM,IAAI,WAAW,CAAA;AAC5B,kEAAkE;AAQlE,eAAO,MAAM,MAAM,UAAsD,CAAA;AAYzE,mFAAmF;AACnF,MAAM,WAAW,SAAS;IACxB,yCAAyC;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,qCAAqC;IACrC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,6DAA6D;IAC7D,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,2DAA2D;IAC3D,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,8DAA8D;IAC9D,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,eAAO,MAAM,MAAM,EAAE,MAAM,CAAC,SAAS,CAKnC,CAAA;AAEF;;;;GAIG;AACH,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI,CAwX3D"}
|
package/lib/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// Vendored from @deepseek-ai/dsh-acp (packages/acp/acp/src/index.ts)
|
|
2
|
-
// Source ref:
|
|
2
|
+
// Source ref: 2f97f60455605e915b8176d9170cae337bfedcc6 (deepseek-harness, MIT — see LICENSE-harness)
|
|
3
3
|
// Copied 2026-10-09. Structural fixes flow from upstream during harness
|
|
4
4
|
// migrations; CC-specific divergences must be recorded in DIVERGENCE.md.
|
|
5
5
|
/**
|
|
@@ -26,15 +26,18 @@ import { AcpMcpConfigError } from "./mcp.js";
|
|
|
26
26
|
import { AcpModelConfigError } from "./model-control.js";
|
|
27
27
|
import { AcpSession } from "./session.js";
|
|
28
28
|
import { installAgentLifecycleListeners } from "./lifecycle.js";
|
|
29
|
+
import { presetRosterResolver, settleComposition } from "./preset-roster.js";
|
|
29
30
|
import { readOwnVersion } from "./version.js";
|
|
30
31
|
const DEFAULT_SESSION_LIST_PAGE_SIZE = 100;
|
|
31
32
|
export const name = 'acp-cc';
|
|
32
33
|
/** Core services required by the standard automation controls. */
|
|
33
34
|
// Inject deliberately mirrors the upstream set WITHOUT 'agentPresets':
|
|
34
|
-
//
|
|
35
|
-
// re-
|
|
36
|
-
//
|
|
37
|
-
//
|
|
35
|
+
// inject couples this plugin's fiber lifecycle to the registry's, so a
|
|
36
|
+
// registry fiber restart would re-apply acp-cc and drop every live ACP
|
|
37
|
+
// session (the sessions map is apply-scoped). The roster is resolved per
|
|
38
|
+
// use instead (src/preset-roster.ts, issue #380). The 2026-10-09
|
|
39
|
+
// double-registration claim predates the PR-B module-split fix and does
|
|
40
|
+
// not reproduce; the lifecycle coupling is the standing rationale.
|
|
38
41
|
export const inject = ['agents', 'llm', 'sessionPersistence', 'sessions'];
|
|
39
42
|
/** Preserve invalid-parameter detail in the SDK wire error message. */
|
|
40
43
|
function invalidParams(detail) {
|
|
@@ -59,16 +62,11 @@ export function apply(ctx, config) {
|
|
|
59
62
|
// ACP handlers execute outside this plugin's injection scope, so capture the
|
|
60
63
|
// injected service during apply rather than reading it lazily in a callback.
|
|
61
64
|
const persistence = ctx.sessionPersistence;
|
|
62
|
-
//
|
|
63
|
-
//
|
|
64
|
-
//
|
|
65
|
-
//
|
|
66
|
-
|
|
67
|
-
const roster = ctx.get('agentPresets');
|
|
68
|
-
if (roster === undefined) {
|
|
69
|
-
throw new Error('acp-cc requires an agent-preset registry in the composition (the cc-acp profile provides it via @dsh-cc/bundle-acp row B)');
|
|
70
|
-
}
|
|
71
|
-
const presets = roster;
|
|
65
|
+
// Issue #380: the roster is resolved per use (preset-roster.ts), never
|
|
66
|
+
// captured at apply time — the loader mounts group siblings concurrently
|
|
67
|
+
// and an eager read raced the registry's async Service.init, killing the
|
|
68
|
+
// ACP lane on a lost race. The join runs behind the admission gate below.
|
|
69
|
+
const resolvePresets = presetRosterResolver(ctx, internalError);
|
|
72
70
|
// §5.2 revised (live acceptance 2026-10-09): join stamped agents via the
|
|
73
71
|
// serial `agent/created` event + registry select() instead of mounting in
|
|
74
72
|
// the create setup. Guards: only agents whose frozen session header
|
|
@@ -85,6 +83,7 @@ export function apply(ctx, config) {
|
|
|
85
83
|
const stamped = agent?.session?.header?.agentPreset;
|
|
86
84
|
if (typeof stamped !== 'string' || stamped === '' || agent?.ctx === undefined)
|
|
87
85
|
return undefined;
|
|
86
|
+
const presets = resolvePresets();
|
|
88
87
|
if (presets.composedPreset(agent.ctx) !== undefined)
|
|
89
88
|
return undefined;
|
|
90
89
|
return presets
|
|
@@ -110,6 +109,10 @@ export function apply(ctx, config) {
|
|
|
110
109
|
if (closed)
|
|
111
110
|
throw internalError('the ACP bridge has been disposed');
|
|
112
111
|
};
|
|
112
|
+
// Issue #380: session admission waits for the loader tree to settle
|
|
113
|
+
// (preset-roster.ts) so the per-use roster read observes the registry's
|
|
114
|
+
// final state even when a client races past an early initialize.
|
|
115
|
+
const settle = settleComposition(ctx);
|
|
113
116
|
const requireSession = (sessionId) => {
|
|
114
117
|
const record = sessions.get(sessionId);
|
|
115
118
|
if (record === undefined)
|
|
@@ -186,9 +189,11 @@ export function apply(ctx, config) {
|
|
|
186
189
|
async newSession(params, signal) {
|
|
187
190
|
assertOpen();
|
|
188
191
|
validateWorkspaceParams(params);
|
|
192
|
+
await settle();
|
|
189
193
|
const sessionId = brandString(randomUUID());
|
|
190
|
-
// The preset composition itself happens
|
|
191
|
-
//
|
|
194
|
+
// The preset composition itself happens on the serial `agent/created`
|
|
195
|
+
// join above (§5.2); the create path only stamps the requested identity
|
|
196
|
+
// into the frozen session header.
|
|
192
197
|
let record;
|
|
193
198
|
try {
|
|
194
199
|
record = await AcpSession.create(ctx, {
|
|
@@ -196,9 +201,7 @@ export function apply(ctx, config) {
|
|
|
196
201
|
cwd: params.cwd,
|
|
197
202
|
mcpServers: params.mcpServers,
|
|
198
203
|
agentOptions: agentOptions(config),
|
|
199
|
-
fallbackSelection: initialSelection(config),
|
|
200
204
|
presetId,
|
|
201
|
-
presets,
|
|
202
205
|
signal,
|
|
203
206
|
notify,
|
|
204
207
|
});
|
|
@@ -231,6 +234,7 @@ export function apply(ctx, config) {
|
|
|
231
234
|
async resumeSession(params, signal) {
|
|
232
235
|
assertOpen();
|
|
233
236
|
validateWorkspaceParams(params);
|
|
237
|
+
await settle();
|
|
234
238
|
const sessionId = brandString(params.sessionId);
|
|
235
239
|
if (sessions.has(sessionId) || activating.has(sessionId) || ctx.sessions.get(sessionId) !== undefined) {
|
|
236
240
|
throw invalidParams(`session is already active: ${sessionId}`);
|
|
@@ -238,7 +242,7 @@ export function apply(ctx, config) {
|
|
|
238
242
|
activating.add(sessionId);
|
|
239
243
|
return (async () => {
|
|
240
244
|
const persisted = (await persistence.stat(sessionId, { signal }))?.header;
|
|
241
|
-
if (persisted === undefined || persisted.origin === 'subagent'
|
|
245
|
+
if (persisted === undefined || persisted.origin === 'subagent') {
|
|
242
246
|
throw invalidParams(`session is not resumable: ${sessionId}`);
|
|
243
247
|
}
|
|
244
248
|
if (!await sameDirectory(persisted.cwd, params.cwd)) {
|
|
@@ -251,8 +255,6 @@ export function apply(ctx, config) {
|
|
|
251
255
|
cwd: params.cwd,
|
|
252
256
|
mcpServers: params.mcpServers ?? [],
|
|
253
257
|
agentOptions: agentOptions(config),
|
|
254
|
-
fallbackSelection: initialSelection(config),
|
|
255
|
-
presets,
|
|
256
258
|
signal,
|
|
257
259
|
notify,
|
|
258
260
|
});
|
|
@@ -302,7 +304,6 @@ export function apply(ctx, config) {
|
|
|
302
304
|
|| activating.has(header.id)
|
|
303
305
|
|| ctx.sessions.get(header.id) !== undefined
|
|
304
306
|
|| header.origin === 'subagent'
|
|
305
|
-
|| header.parentSession !== undefined
|
|
306
307
|
|| header.cwd === undefined
|
|
307
308
|
|| !isAbsolute(header.cwd))
|
|
308
309
|
return undefined;
|
|
@@ -432,12 +433,6 @@ function agentOptions(config) {
|
|
|
432
433
|
...config.model !== undefined ? { model: config.model } : {},
|
|
433
434
|
};
|
|
434
435
|
}
|
|
435
|
-
/** Initial session selection when both deployment fields are present. */
|
|
436
|
-
function initialSelection(config) {
|
|
437
|
-
return config.provider === undefined || config.model === undefined
|
|
438
|
-
? undefined
|
|
439
|
-
: { provider: config.provider, model: config.model };
|
|
440
|
-
}
|
|
441
436
|
/** Resolve and validate the deployment-owned session page limit. */
|
|
442
437
|
function resolveSessionListPageSize(value) {
|
|
443
438
|
const resolved = value ?? DEFAULT_SESSION_LIST_PAGE_SIZE;
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,qGAAqG;AACrG,wEAAwE;AACxE,yEAAyE;AACzE;;;;;;;;;GASG;AAGH,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAC/C,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAChD,OAAO,MAAM,MAAM,0BAA0B,CAAA;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EACL,KAAK,IAAI,iBAAiB,EAC1B,OAAO,EACP,YAAY,EACZ,gBAAgB,EAChB,YAAY,GAqBb,MAAM,0BAA0B,CAAA;AASjC,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAA;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAA;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,8BAA8B,EAAE,MAAM,gBAAgB,CAAA;AAC/D,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAE7C,MAAM,8BAA8B,GAAG,GAAG,CAAA;AAE1C,MAAM,CAAC,MAAM,IAAI,GAAG,QAAQ,CAAA;AAC5B,kEAAkE;AAClE,uEAAuE;AACvE,uEAAuE;AACvE,uEAAuE;AACvE,yEAAyE;AACzE,iEAAiE;AACjE,wEAAwE;AACxE,mEAAmE;AACnE,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,oBAAoB,EAAE,UAAU,CAAC,CAAA;AAEzE,uEAAuE;AACvE,SAAS,aAAa,CAAC,MAAc;IACnC,OAAO,YAAY,CAAC,aAAa,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;AACtD,CAAC;AAED,8FAA8F;AAC9F,SAAS,aAAa,CAAC,MAAc;IACnC,OAAO,YAAY,CAAC,aAAa,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;AACtD,CAAC;AAgBD,MAAM,CAAC,MAAM,MAAM,GAAsB,MAAM,CAAC,MAAM,CAAC;IACrD,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE;IACzB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE;IACtB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;IACvC,mBAAmB,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,8BAA8B,CAAC;CACrF,CAAC,CAAA;AAEF;;;;GAIG;AACH,MAAM,UAAU,KAAK,CAAC,GAAY,EAAE,MAAiB;IACnD,6EAA6E;IAC7E,6EAA6E;IAC7E,MAAM,WAAW,GAAG,GAAG,CAAC,kBAAkB,CAAA;IAC1C,uEAAuE;IACvE,yEAAyE;IACzE,yEAAyE;IACzE,0EAA0E;IAC1E,MAAM,cAAc,GAAG,oBAAoB,CAAC,GAAG,EAAE,aAAa,CAAC,CAAA;IAC/D,yEAAyE;IACzE,0EAA0E;IAC1E,oEAAoE;IACpE,2EAA2E;IAC3E,sEAAsE;IACtE,kEAAkE;IAClE,2EAA2E;IAC3E,sEAAsE;IACtE,kCAAkC;IAClC,GAAG,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,OAA4B,EAAE,EAAE;QACvD,MAAM,KAAK,GAAG,OAAO,EAAE,KAEV,CAAA;QACb,kEAAkE;QAClE,wEAAwE;QACxE,MAAM,OAAO,GAAG,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,CAAA;QACnD,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,EAAE,IAAI,KAAK,EAAE,GAAG,KAAK,SAAS;YAAE,OAAO,SAAS,CAAA;QAC/F,MAAM,OAAO,GAAG,cAAc,EAAE,CAAA;QAChC,IAAI,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,SAAS;YAAE,OAAO,SAAS,CAAA;QACrE,OAAO,OAAO;aACX,MAAM,CAAC,KAAc,EAAE,OAAO,CAAC;aAC/B,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;aACrB,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;YACxB,MAAM,IAAI,KAAK,CACb,gCAAgC,OAAO,KAAK,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CACrG,CAAA;QACH,CAAC,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IACF,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,IAAI,CAAA;IACxC,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAA;IACzB,MAAM,mBAAmB,GAAG,0BAA0B,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAA;IAClF,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAyB,CAAA;IACjD,MAAM,UAAU,GAAG,IAAI,GAAG,EAAa,CAAA;IACvC,IAAI,MAAM,GAAG,KAAK,CAAA;IAClB,IAAI,kBAAkB,GAAG,KAAK,CAAA;IAE9B,gFAAgF;IAChF,MAAM,WAAW,GAAG,CAAC,KAAwC,EAA0B,EAAE;QACvF,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAC7C,OAAO,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAA;IAC1D,CAAC,CAAA;IAED,MAAM,UAAU,GAAG,GAAS,EAAE;QAC5B,IAAI,MAAM;YAAE,MAAM,aAAa,CAAC,kCAAkC,CAAC,CAAA;IACrE,CAAC,CAAA;IAED,oEAAoE;IACpE,wEAAwE;IACxE,iEAAiE;IACjE,MAAM,MAAM,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAA;IAErC,MAAM,cAAc,GAAG,CAAC,SAAoB,EAAc,EAAE;QAC1D,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;QACtC,IAAI,MAAM,KAAK,SAAS;YAAE,MAAM,aAAa,CAAC,oBAAoB,SAAS,EAAE,CAAC,CAAA;QAC9E,OAAO,MAAM,CAAA;IACf,CAAC,CAAA;IAED,gFAAgF;IAChF,MAAM,MAAM,GAAG,KAAK,EAAE,YAAiC,EAAiB,EAAE;QACxE,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;YAChE,+HAA+H;QAC/H,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,MAAM,CAAC,IAAI,CAAC,+BAA+B,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QAC7D,CAAC;QACD,oBAAoB;IACtB,CAAC,CAAA;IAED,GAAG,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;QACzC,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAC9C,IAAI,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,KAAK,IAAI;YAAE,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IAClF,CAAC,CAAC,CAAA;IAEF,GAAG,CAAC,EAAE,CAAC,qBAAqB,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE;QACzD,WAAW,CAAC,KAAK,CAAC,EAAE,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;IACnD,CAAC,CAAC,CAAA;IAEF,8BAA8B,CAAC,GAAG,EAAE,WAAW,CAAC,CAAA;IAEhD,GAAG,CAAC,EAAE,CAAC,sBAAsB,EAAE,GAAG,EAAE;QAClC,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,MAAM,EAAE;YAAE,MAAM,CAAC,eAAe,EAAE,CAAA;IAClE,CAAC,CAAC,CAAA;IAEF,2EAA2E;IAC3E,+EAA+E;IAC/E,iDAAiD;IACjD,GAAG,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;QAC3C,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QACzC,IAAI,MAAM,KAAK,SAAS,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS;YAAE,OAAO,IAAI,EAAE,CAAA;QACvE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;QAC7B,OAAO,MAAM,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;YACrC,MAAM,MAAM,GAA6B;gBACvC,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;gBAClC,QAAQ,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE;gBAChC,OAAO,EAAE;oBACP,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE;oBAClE,EAAE,QAAQ,EAAE,aAAa,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,aAAa,EAAE;iBACjE;aACF,CAAA;YACD,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAA;QACvE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;YACtB,IAAI,OAAO,CAAC,OAAO,KAAK,WAAW;gBAAE,OAAO,WAAW,CAAA;YACvD,OAAO,OAAO,CAAC,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,UAAU,CAAA;QACxE,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,MAAM,cAAc,GAAG;QACrB,KAAK,CAAC,UAAU,CAAC,OAA0B;YACzC,oEAAoE;YACpE,mEAAmE;YACnE,kBAAkB,GAAG,MAAM,uBAAuB,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;YACtF,OAAO;gBACL,eAAe,EAAE,gBAAgB;gBACjC,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,cAAc,EAAE,EAAE;gBAC9D,iBAAiB,EAAE;oBACjB,eAAe,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;oBAC/B,kBAAkB,EAAE,EAAE,KAAK,EAAE,kBAAkB,EAAE,KAAK,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE;oBACvF,mBAAmB,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;iBACzD;gBACD,WAAW,EAAE,EAAE;aAChB,CAAA;QACH,CAAC;QAED,YAAY,CAAC,OAA4B;YACvC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;QAC1B,CAAC;QAED,KAAK,CAAC,UAAU,CAAC,MAAyB,EAAE,MAAmB;YAC7D,UAAU,EAAE,CAAA;YACZ,uBAAuB,CAAC,MAAM,CAAC,CAAA;YAC/B,MAAM,MAAM,EAAE,CAAA;YACd,MAAM,SAAS,GAAG,WAAW,CAAY,UAAU,EAAE,CAAC,CAAA;YACtD,sEAAsE;YACtE,wEAAwE;YACxE,kCAAkC;YAClC,IAAI,MAAkB,CAAA;YACtB,IAAI,CAAC;gBACH,MAAM,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,GAAG,EAAE;oBACpC,SAAS;oBACT,GAAG,EAAE,MAAM,CAAC,GAAG;oBACf,UAAU,EAAE,MAAM,CAAC,UAAU;oBAC7B,YAAY,EAAE,YAAY,CAAC,MAAM,CAAC;oBAClC,QAAQ;oBACR,MAAM;oBACN,MAAM;iBACP,CAAC,CAAA;YACJ,CAAC;YAAC,OAAO,KAAc,EAAE,CAAC;gBACxB,IAAI,KAAK,YAAY,iBAAiB;oBAAE,MAAM,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;gBAC1E,MAAM,KAAK,CAAA;YACb,CAAC;YACD,0EAA0E;YAC1E,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,MAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAA;gBAC1D,MAAM,aAAa,CAAC,sCAAsC,CAAC,CAAA;YAC7D,CAAC;YACD,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;YAC/B,IAAI,CAAC;gBACH,MAAM,aAAa,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;gBACxD,UAAU,EAAE,CAAA;gBACZ,yEAAyE;gBACzE,MAAM,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;gBAC9C,UAAU,EAAE,CAAA;gBACZ,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,CAAA;YACrC,CAAC;YAAC,OAAO,KAAc,EAAE,CAAC;gBACxB,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;gBAC1B,MAAM,MAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAA;gBACnD,MAAM,KAAK,CAAA;YACb,CAAC;QACH,CAAC;QAED,KAAK,CAAC,aAAa,CAAC,MAA4B,EAAE,MAAmB;YACnE,UAAU,EAAE,CAAA;YACZ,uBAAuB,CAAC,MAAM,CAAC,CAAA;YAC/B,MAAM,MAAM,EAAE,CAAA;YACd,MAAM,SAAS,GAAG,WAAW,CAAY,MAAM,CAAC,SAAS,CAAC,CAAA;YAC1D,IAAI,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,SAAS,EAAE,CAAC;gBACtG,MAAM,aAAa,CAAC,8BAA8B,SAAS,EAAE,CAAC,CAAA;YAChE,CAAC;YACD,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;YACzB,OAAO,CAAC,KAAK,IAAoC,EAAE;gBACjD,MAAM,SAAS,GAAG,CAAC,MAAM,WAAW,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,CAAA;gBACzE,IAAI,SAAS,KAAK,SAAS,IAAI,SAAS,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;oBAC/D,MAAM,aAAa,CAAC,6BAA6B,SAAS,EAAE,CAAC,CAAA;gBAC/D,CAAC;gBACD,IAAI,CAAC,MAAM,aAAa,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;oBACpD,MAAM,aAAa,CAAC,+BAA+B,MAAM,CAAC,GAAG,EAAE,CAAC,CAAA;gBAClE,CAAC;gBACD,IAAI,MAAkB,CAAA;gBACtB,IAAI,CAAC;oBACH,MAAM,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,GAAG,EAAE;wBACpC,SAAS;wBACT,GAAG,EAAE,MAAM,CAAC,GAAG;wBACf,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,EAAE;wBACnC,YAAY,EAAE,YAAY,CAAC,MAAM,CAAC;wBAClC,MAAM;wBACN,MAAM;qBACP,CAAC,CAAA;gBACJ,CAAC;gBAAC,OAAO,KAAc,EAAE,CAAC;oBACxB,IAAI,KAAK,YAAY,iBAAiB;wBAAE,MAAM,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;oBAC1E,MAAM,KAAK,CAAA;gBACb,CAAC;gBACD,gHAAgH;gBAChH,IAAI,CAAC,MAAM,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;oBACtE,MAAM,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAA;oBACjD,MAAM,aAAa,CAAC,+BAA+B,MAAM,CAAC,GAAG,EAAE,CAAC,CAAA;gBAClE,CAAC;gBACD,oBAAoB;gBACpB,0EAA0E;gBAC1E,IAAI,MAAM,EAAE,CAAC;oBACX,MAAM,MAAM,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAA;oBAC7D,MAAM,aAAa,CAAC,yCAAyC,CAAC,CAAA;gBAChE,CAAC;gBACD,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;gBAC/B,IAAI,CAAC;oBACH,OAAO,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAA;gBAC9D,CAAC;gBAAC,OAAO,KAAc,EAAE,CAAC;oBACxB,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;oBAC1B,MAAM,MAAM,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAA;oBAC5D,MAAM,KAAK,CAAA;gBACb,CAAC;YACH,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA,CAAC,CAAC,CAAC,CAAA;QACtD,CAAC;QAED,KAAK,CAAC,YAAY,CAAC,MAA2B,EAAE,MAAmB;YACjE,UAAU,EAAE,CAAA;YACZ,IAAI,MAAM,CAAC,GAAG,KAAK,SAAS,IAAI,MAAM,CAAC,GAAG,KAAK,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC/E,MAAM,aAAa,CAAC,iCAAiC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAA;YACpE,CAAC;YACD,IAAI,MAAqC,CAAA;YACzC,IAAI,CAAC;gBACH,MAAM,GAAG,uBAAuB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;YACjD,CAAC;YAAC,OAAO,KAAc,EAAE,CAAC;gBACxB,MAAM,aAAa,CAAE,KAAe,CAAC,OAAO,CAAC,CAAA;YAC/C,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;YACjD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;gBACjE,IACE,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;uBAClB,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;uBACzB,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,SAAS;uBACzC,MAAM,CAAC,MAAM,KAAK,UAAU;uBAC5B,MAAM,CAAC,GAAG,KAAK,SAAS;uBACxB,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC;oBAC5B,OAAO,SAAS,CAAA;gBAClB,IAAI,MAAM,CAAC,GAAG,KAAK,SAAS,IAAI,MAAM,CAAC,GAAG,KAAK,IAAI,IAAI,CAAC,MAAM,aAAa,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;oBACpG,OAAO,SAAS,CAAA;gBAClB,CAAC;gBACD,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,CAAA;YAC/E,CAAC,CAAC,CAAC,CAAA;YACH,MAAM,OAAO,GAAG,QAAQ;iBACrB,MAAM,CAAC,CAAC,KAAK,EAAsC,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC;iBAC1E,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,iBAAiB,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAA;YAChH,MAAM,SAAS,GAAG,MAAM,KAAK,SAAS;gBACpC,CAAC,CAAC,OAAO;gBACT,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,wBAAwB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAA;YACpE,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,mBAAmB,CAAC,CAAA;YACpD,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YACrE,OAAO;gBACL,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;gBAChE,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,uBAAuB,CAAC,IAAI,CAAC,EAAE;aAC3E,CAAA;QACH,CAAC;QAED,KAAK,CAAC,sBAAsB,CAC1B,MAAqC,EACrC,MAAmB;YAEnB,UAAU,EAAE,CAAA;YACZ,MAAM,MAAM,GAAG,cAAc,CAAC,WAAW,CAAY,MAAM,CAAC,SAAS,CAAC,CAAC,CAAA;YACvE,IAAI,CAAC;gBACH,OAAO,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,CAAA;YACzF,CAAC;YAAC,OAAO,KAAc,EAAE,CAAC;gBACxB,IAAI,KAAK,YAAY,mBAAmB;oBAAE,MAAM,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;gBAC5E,MAAM,KAAK,CAAA;YACb,CAAC;QACH,CAAC;QAED,KAAK,CAAC,YAAY,CAAC,MAA2B;YAC5C,UAAU,EAAE,CAAA;YACZ,MAAM,SAAS,GAAG,WAAW,CAAY,MAAM,CAAC,SAAS,CAAC,CAAA;YAC1D,MAAM,MAAM,GAAG,cAAc,CAAC,SAAS,CAAC,CAAA;YACxC,IAAI,CAAC;gBACH,MAAM,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAA;YAC1C,CAAC;YAAC,OAAO,KAAc,EAAE,CAAC;gBACxB,MAAM,aAAa,CAAC,yBAAyB,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;YACnE,CAAC;oBAAS,CAAC;gBACT,IAAI,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,MAAM;oBAAE,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;YACpE,CAAC;YACD,OAAO,EAAE,CAAA;QACX,CAAC;QAED,KAAK,CAAC,MAAM,CAAC,MAAqB,EAAE,aAA0B;YAC5D,UAAU,EAAE,CAAA;YACZ,MAAM,MAAM,GAAG,cAAc,CAAC,WAAW,CAAY,MAAM,CAAC,SAAS,CAAC,CAAC,CAAA;YACvE,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,kBAAkB,EAAE,aAAa,CAAC,CAAA;QACjE,CAAC;QAED,MAAM,CAAC,MAA0B;YAC/B,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAY,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,CAAA;YAChE,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;QAC1B,CAAC;KACF,CAAA;IAED,8EAA8E;IAC9E,MAAM,MAAM,GAAW,MAAM,CAAC,MAAM,IAAI,YAAY,CAClD,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAA+B,EAC5D,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAA+B,CAC5D,CAAA;IACD,MAAM,GAAG,GAAG,iBAAiB,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;SAC9C,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,cAAc,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;SACtF,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;QAC1D,MAAM,cAAc,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;QACzC,OAAO,EAAE,CAAA;IACX,CAAC,CAAC;SACD,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,cAAc,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SACvG,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,cAAc,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SAC1G,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,cAAc,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SAC7G,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,cAAc,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;SAC3F,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,cAAc,CAAC,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SAC/H,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SACtG,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;IAC9F,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACtC,MAAM,IAAI,GAAiB,UAAU,CAAC,MAAM,CAAA;IAE5C,IAAI,SAAoC,CAAA;IACxC,MAAM,OAAO,GAAG,GAAkB,EAAE;QAClC,IAAI,SAAS,KAAK,SAAS;YAAE,OAAO,SAAS,CAAA;QAC7C,MAAM,GAAG,IAAI,CAAA;QACb,MAAM,OAAO,GAAG,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAA;QACtC,gFAAgF;QAChF,qEAAqE;QACrE,SAAS,GAAG,CAAC,KAAK,IAAI,EAAE;YACtB,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAA;YACtG,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC7B,+GAA+G;gBAC/G,IAAI,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,MAAM;oBAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;YAChG,CAAC;YACD,MAAM,QAAQ,GAAc,EAAE,CAAA;YAC9B,KAAK,MAAM,MAAM,IAAI,SAAS,EAAE,CAAC;gBAC/B,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU;oBAAE,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,MAAiB,CAAC,CAAA;YAC3E,CAAC;YACD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxB,qEAAqE;gBACrE,sEAAsE;gBACtE,kEAAkE;gBAClE,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;gBACtE,MAAM,IAAI,cAAc,CACtB,QAAQ,EACR,iCAAiC,QAAQ,CAAC,MAAM,gBAAgB,MAAM,EAAE,CACzE,CAAA;YACH,CAAC;QACH,CAAC,CAAC,EAAE,CAAA;QACJ,OAAO,SAAS,CAAA;IAClB,CAAC,CAAA;IAED,6EAA6E;IAC7E,KAAK,UAAU,CAAC,MAAM;SACnB,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;QACxB,MAAM,CAAC,IAAI,CAAC,yCAAyC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IACvE,CAAC,CAAC;SACD,IAAI,CAAC,OAAO,CAAC;SACb,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;QACxB,MAAM,CAAC,IAAI,CAAC,0CAA0C,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IACxE,CAAC,CAAC,CAAA;IACJ,oBAAoB;IAEpB,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAA;AAC7C,CAAC;AAED;;;;GAIG;AACH,SAAS,YAAY,CAAC,MAAiB;IACrC,OAAO;QACL,GAAG,MAAM,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE;QACrE,GAAG,MAAM,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE;KAC7D,CAAA;AACH,CAAC;AAOD,oEAAoE;AACpE,SAAS,0BAA0B,CAAC,KAAyB;IAC3D,MAAM,QAAQ,GAAG,KAAK,IAAI,8BAA8B,CAAA;IACxD,+GAA+G;IAC/G,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,QAAQ,GAAG,CAAC,EAAE,CAAC;QACpD,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAA;IAC7E,CAAC;IACD,oBAAoB;IACpB,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED,mFAAmF;AACnF,SAAS,uBAAuB,CAAC,KAAgC;IAC/D,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,SAAS,CAAA;IAC3D,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;IACtF,IAAI,CAAC;QACH,MAAM,OAAO,GAAY,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;QACrF,MAAM,SAAS,GAAY,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;QAC1E,MAAM,SAAS,GAAY,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;QAC1E,IACE,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;eACpB,OAAO,CAAC,MAAM,KAAK,CAAC;eACpB,OAAO,SAAS,KAAK,QAAQ;eAC7B,CAAC,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC;eAChC,SAAS,GAAG,CAAC;eACb,OAAO,SAAS,KAAK,QAAQ;eAC7B,SAAS,CAAC,MAAM,KAAK,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAA;QAC1C,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA;QACpF,IAAI,SAAS,KAAK,KAAK;YAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;QAChE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,CAAA;IACjC,CAAC;IAAC,OAAO,cAAc,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;IACnD,CAAC;AACH,CAAC;AAED,6EAA6E;AAC7E,SAAS,uBAAuB,CAAC,KAAwB;IACvD,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA;AACtG,CAAC;AAED,2EAA2E;AAC3E,SAAS,wBAAwB,CAAC,KAAwB,EAAE,MAAyB;IACnF,OAAO,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS;WACpC,CAAC,KAAK,CAAC,SAAS,KAAK,MAAM,CAAC,SAAS,IAAI,iBAAiB,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;AACzG,CAAC;AAED,uFAAuF;AACvF,SAAS,iBAAiB,CAAC,IAAY,EAAE,KAAa;IACpD,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;AAC9D,CAAC;AAED,iEAAiE;AACjE,SAAS,uBAAuB,CAAC,MAAgE;IAC/F,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC;QAAE,MAAM,aAAa,CAAC,iCAAiC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAA;IAC/F,IACE,MAAM,CAAC,qBAAqB,KAAK,SAAS;WACvC,MAAM,CAAC,qBAAqB,KAAK,IAAI;WACrC,MAAM,CAAC,qBAAqB,CAAC,MAAM,GAAG,CAAC,EAC1C,CAAC;QACD,MAAM,aAAa,CAAC,wCAAwC,CAAC,CAAA;IAC/D,CAAC;AACH,CAAC;AAED,qFAAqF;AACrF,KAAK,UAAU,aAAa,CAAC,IAAwB,EAAE,KAAa;IAClE,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,KAAK,CAAA;IACpC,IAAI,CAAC;QACH,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAClF,OAAO,QAAQ,KAAK,SAAS,CAAA;IAC/B,CAAC;IAAC,OAAO,iBAAiB,EAAE,CAAC;QAC3B,OAAO,OAAO,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,KAAK,CAAC,CAAA;IACzC,CAAC;AACH,CAAC"}
|
package/lib/mcp.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// Vendored from @deepseek-ai/dsh-acp (packages/acp/acp/src/mcp.ts)
|
|
2
|
-
// Source ref:
|
|
2
|
+
// Source ref: 2f97f60455605e915b8176d9170cae337bfedcc6 (deepseek-harness, MIT — see LICENSE-harness)
|
|
3
3
|
// Copied 2026-10-09. Structural fixes flow from upstream during harness
|
|
4
4
|
// migrations; CC-specific divergences must be recorded in DIVERGENCE.md.
|
|
5
5
|
/** Standard ACP MCP-server declarations translated into Agent-scoped DSH MCP clients. */
|
package/lib/model-control.d.ts
CHANGED
|
@@ -1,43 +1,34 @@
|
|
|
1
1
|
/** Standard ACP session configuration over one Agent's model selection. */
|
|
2
2
|
import type { Context } from '@deepseek-ai/cordis';
|
|
3
3
|
import type { SessionConfigOption } from '@agentclientprotocol/sdk';
|
|
4
|
-
import { type
|
|
4
|
+
import { type Model } from '@deepseek-ai/dsh-agent';
|
|
5
5
|
import { type LlmRuntime } from '@deepseek-ai/dsh-llm';
|
|
6
|
+
/**
|
|
7
|
+
* Compose one ACP session's model-control listeners in the unpublished Agent
|
|
8
|
+
* scope: the harness switch-notice listener plus, co-located immediately after
|
|
9
|
+
* it, the moa notice sanitizer (D4a / effective-model-truth §5.1 — the
|
|
10
|
+
* later-with-prepend registration makes the sanitizer the OUTERMOST
|
|
11
|
+
* `agent/pre-step` listener, publishing the frozen per-step selection before
|
|
12
|
+
* the inner chain runs). Same co-location rule as the TUI's
|
|
13
|
+
* `model-selection-wiring.ts`; side-effect-free when moa is unmounted.
|
|
14
|
+
* @param agentCtx - unpublished Agent scope that consumes this selection.
|
|
15
|
+
*/
|
|
16
|
+
export declare function installModelControl(agentCtx: Context): void;
|
|
6
17
|
/** Caller-correctable session configuration failure. */
|
|
7
18
|
export declare class AcpModelConfigError extends Error {
|
|
8
19
|
constructor(message: string);
|
|
9
20
|
}
|
|
10
|
-
/**
|
|
21
|
+
/**
|
|
22
|
+
* Project and mutate one Agent's provider/model/reasoning selection through ACP
|
|
23
|
+
* config options. The Session's recorded model selection is the only state; a
|
|
24
|
+
* change applies from the Agent's next model step.
|
|
25
|
+
*/
|
|
11
26
|
export declare class AcpModelControl {
|
|
12
27
|
private readonly llm;
|
|
13
|
-
|
|
14
|
-
readonly selection: ModelSelectionRef;
|
|
28
|
+
private readonly model;
|
|
15
29
|
private tail;
|
|
16
|
-
private selected;
|
|
17
|
-
private turnSelection;
|
|
18
30
|
private hasResolvedState;
|
|
19
|
-
constructor(llm: LlmRuntime,
|
|
20
|
-
/**
|
|
21
|
-
* Install request/prompt consistency listeners in the unpublished Agent scope.
|
|
22
|
-
* @param agentCtx - Agent scope that consumes this selection.
|
|
23
|
-
*/
|
|
24
|
-
install(agentCtx: Context): void;
|
|
25
|
-
/**
|
|
26
|
-
* Snapshot the selection attached to the next accepted ACP prompt.
|
|
27
|
-
* @returns a detached future selection, or undefined when listeners supply the route.
|
|
28
|
-
*/
|
|
29
|
-
snapshot(): ModelSelection | undefined;
|
|
30
|
-
/**
|
|
31
|
-
* Pin one admitted ACP message's selection for every step in its turn.
|
|
32
|
-
* @param turn - admitted Agent turn.
|
|
33
|
-
* @param selection - exact prompt-admission selection.
|
|
34
|
-
*/
|
|
35
|
-
pinTurn(turn: number, selection: ModelSelection): void;
|
|
36
|
-
/**
|
|
37
|
-
* Release only the exact completed turn's routing override.
|
|
38
|
-
* @param turn - completed Agent turn.
|
|
39
|
-
*/
|
|
40
|
-
releaseTurn(turn: number): void;
|
|
31
|
+
constructor(llm: LlmRuntime, model: Model);
|
|
41
32
|
/**
|
|
42
33
|
* Return the complete standard config-option state after prior mutations settle.
|
|
43
34
|
* @param signal - optional catalog and exact-model cancellation.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-control.d.ts","sourceRoot":"","sources":["../src/model-control.ts"],"names":[],"mappings":"AAIA,2EAA2E;AAE3E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,mBAAmB,EAAwB,MAAM,0BAA0B,CAAA;AACzF,OAAO,EAAyB,KAAK,
|
|
1
|
+
{"version":3,"file":"model-control.d.ts","sourceRoot":"","sources":["../src/model-control.ts"],"names":[],"mappings":"AAIA,2EAA2E;AAE3E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,mBAAmB,EAAwB,MAAM,0BAA0B,CAAA;AACzF,OAAO,EAAyB,KAAK,KAAK,EAAuB,MAAM,wBAAwB,CAAA;AAC/F,OAAO,EAAyC,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAuB7F;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAG3D;AAED,wDAAwD;AACxD,qBAAa,mBAAoB,SAAQ,KAAK;gBAChC,OAAO,EAAE,MAAM;CAI5B;AAED;;;;GAIG;AACH,qBAAa,eAAe;IAKxB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,KAAK;IALxB,OAAO,CAAC,IAAI,CAAoB;IAChC,OAAO,CAAC,gBAAgB,CAAQ;gBAGb,GAAG,EAAE,UAAU,EACf,KAAK,EAAE,KAAK;IAG/B;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAI7D;;;;;;OAMG;IACH,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAwC3F,yFAAyF;IACzF,OAAO,CAAC,SAAS;IAMjB,uEAAuE;YACzD,KAAK;IA+EnB,4EAA4E;YAC9D,gBAAgB;CAQ/B"}
|
package/lib/model-control.js
CHANGED
|
@@ -1,15 +1,34 @@
|
|
|
1
1
|
// Vendored from @deepseek-ai/dsh-acp (packages/acp/acp/src/model-control.ts)
|
|
2
|
-
// Source ref:
|
|
2
|
+
// Source ref: 2f97f60455605e915b8176d9170cae337bfedcc6 (deepseek-harness, MIT — see LICENSE-harness)
|
|
3
3
|
// Copied 2026-10-09. Structural fixes flow from upstream during harness
|
|
4
4
|
// migrations; CC-specific divergences must be recorded in DIVERGENCE.md.
|
|
5
5
|
/** Standard ACP session configuration over one Agent's model selection. */
|
|
6
6
|
import { installModelSelection } from '@deepseek-ai/dsh-agent';
|
|
7
7
|
import { ReasoningEffortId } from '@deepseek-ai/dsh-llm';
|
|
8
|
+
// CC-only delta (D4c, harness-0.2.2 migration): an ACP config-set model change
|
|
9
|
+
// is an explicit USER write — notify moa exactly like the TUI `/model` path so
|
|
10
|
+
// arming disarms (or re-arms on the boot pair) consistently across entry points.
|
|
11
|
+
import { noteUserSelection } from '@dsh-cc/moa';
|
|
12
|
+
// CC-only delta (D4a): the co-located model-selection notice sanitizer.
|
|
8
13
|
import { installModelSelectionSanitizer } from '@dsh-cc/moa/sanitizer';
|
|
9
14
|
const MODEL_CONFIG_ID = 'model';
|
|
10
15
|
const REASONING_CONFIG_ID = 'reasoning_effort';
|
|
11
16
|
// DSH reasoning effort ids are non-empty, so the empty opaque ACP value is a disjoint provider-default choice.
|
|
12
17
|
const PROVIDER_DEFAULT_REASONING_VALUE = '';
|
|
18
|
+
/**
|
|
19
|
+
* Compose one ACP session's model-control listeners in the unpublished Agent
|
|
20
|
+
* scope: the harness switch-notice listener plus, co-located immediately after
|
|
21
|
+
* it, the moa notice sanitizer (D4a / effective-model-truth §5.1 — the
|
|
22
|
+
* later-with-prepend registration makes the sanitizer the OUTERMOST
|
|
23
|
+
* `agent/pre-step` listener, publishing the frozen per-step selection before
|
|
24
|
+
* the inner chain runs). Same co-location rule as the TUI's
|
|
25
|
+
* `model-selection-wiring.ts`; side-effect-free when moa is unmounted.
|
|
26
|
+
* @param agentCtx - unpublished Agent scope that consumes this selection.
|
|
27
|
+
*/
|
|
28
|
+
export function installModelControl(agentCtx) {
|
|
29
|
+
installModelSelection(agentCtx);
|
|
30
|
+
installModelSelectionSanitizer(agentCtx);
|
|
31
|
+
}
|
|
13
32
|
/** Caller-correctable session configuration failure. */
|
|
14
33
|
export class AcpModelConfigError extends Error {
|
|
15
34
|
constructor(message) {
|
|
@@ -17,59 +36,19 @@ export class AcpModelConfigError extends Error {
|
|
|
17
36
|
this.name = 'AcpModelConfigError';
|
|
18
37
|
}
|
|
19
38
|
}
|
|
20
|
-
/**
|
|
39
|
+
/**
|
|
40
|
+
* Project and mutate one Agent's provider/model/reasoning selection through ACP
|
|
41
|
+
* config options. The Session's recorded model selection is the only state; a
|
|
42
|
+
* change applies from the Agent's next model step.
|
|
43
|
+
*/
|
|
21
44
|
export class AcpModelControl {
|
|
22
45
|
llm;
|
|
23
|
-
|
|
24
|
-
selection;
|
|
46
|
+
model;
|
|
25
47
|
tail = Promise.resolve();
|
|
26
|
-
selected;
|
|
27
|
-
turnSelection;
|
|
28
48
|
hasResolvedState = false;
|
|
29
|
-
constructor(llm,
|
|
49
|
+
constructor(llm, model) {
|
|
30
50
|
this.llm = llm;
|
|
31
|
-
this.
|
|
32
|
-
const getCurrent = () => this.turnSelection?.selection ?? this.selected;
|
|
33
|
-
const setCurrent = (value) => { this.selected = value; };
|
|
34
|
-
this.selection = {
|
|
35
|
-
get current() { return getCurrent(); },
|
|
36
|
-
set current(value) { setCurrent(value); },
|
|
37
|
-
assembled: undefined,
|
|
38
|
-
};
|
|
39
|
-
}
|
|
40
|
-
/**
|
|
41
|
-
* Install request/prompt consistency listeners in the unpublished Agent scope.
|
|
42
|
-
* @param agentCtx - Agent scope that consumes this selection.
|
|
43
|
-
*/
|
|
44
|
-
install(agentCtx) {
|
|
45
|
-
installModelSelection(agentCtx, this.selection);
|
|
46
|
-
// Co-located sanitizer (effective-model-truth §5.1): later-with-prepend →
|
|
47
|
-
// outermost agent/pre-step listener; drops phantom model-selection notices
|
|
48
|
-
// while moa overlays the boot selection.
|
|
49
|
-
installModelSelectionSanitizer(agentCtx, this.selection);
|
|
50
|
-
}
|
|
51
|
-
/**
|
|
52
|
-
* Snapshot the selection attached to the next accepted ACP prompt.
|
|
53
|
-
* @returns a detached future selection, or undefined when listeners supply the route.
|
|
54
|
-
*/
|
|
55
|
-
snapshot() {
|
|
56
|
-
return this.selected === undefined ? undefined : { ...this.selected };
|
|
57
|
-
}
|
|
58
|
-
/**
|
|
59
|
-
* Pin one admitted ACP message's selection for every step in its turn.
|
|
60
|
-
* @param turn - admitted Agent turn.
|
|
61
|
-
* @param selection - exact prompt-admission selection.
|
|
62
|
-
*/
|
|
63
|
-
pinTurn(turn, selection) {
|
|
64
|
-
this.turnSelection = { turn, selection: { ...selection } };
|
|
65
|
-
}
|
|
66
|
-
/**
|
|
67
|
-
* Release only the exact completed turn's routing override.
|
|
68
|
-
* @param turn - completed Agent turn.
|
|
69
|
-
*/
|
|
70
|
-
releaseTurn(turn) {
|
|
71
|
-
if (this.turnSelection?.turn === turn)
|
|
72
|
-
this.turnSelection = undefined;
|
|
51
|
+
this.model = model;
|
|
73
52
|
}
|
|
74
53
|
/**
|
|
75
54
|
* Return the complete standard config-option state after prior mutations settle.
|
|
@@ -90,7 +69,7 @@ export class AcpModelControl {
|
|
|
90
69
|
return this.serialize(async () => {
|
|
91
70
|
if (typeof value !== 'string')
|
|
92
71
|
throw new AcpModelConfigError(`${configId} requires a select value`);
|
|
93
|
-
const current = this.
|
|
72
|
+
const current = this.model.current();
|
|
94
73
|
if (current === undefined)
|
|
95
74
|
throw new AcpModelConfigError('this session has no model selection');
|
|
96
75
|
if (configId === MODEL_CONFIG_ID) {
|
|
@@ -99,7 +78,9 @@ export class AcpModelControl {
|
|
|
99
78
|
if (selected === undefined)
|
|
100
79
|
throw new AcpModelConfigError(`unknown model option: ${value}`);
|
|
101
80
|
await this.resolveSelection(selected, signal);
|
|
102
|
-
this.selected
|
|
81
|
+
this.model.select(selected);
|
|
82
|
+
// D4c: notify moa with the exact recorded write (provider/model pair).
|
|
83
|
+
noteUserSelection(selected);
|
|
103
84
|
}
|
|
104
85
|
else if (configId === REASONING_CONFIG_ID) {
|
|
105
86
|
const info = await this.llm.resolveModelInfo(current.provider, current.model, signal);
|
|
@@ -109,11 +90,16 @@ export class AcpModelControl {
|
|
|
109
90
|
|| (!providerDefault && !info.reasoning.efforts.some(effort => effort.id === value))) {
|
|
110
91
|
throw new AcpModelConfigError(`unknown reasoning effort for ${current.provider}/${current.model}: ${value}`);
|
|
111
92
|
}
|
|
112
|
-
|
|
93
|
+
const effortSelection = await this.resolveSelection({
|
|
113
94
|
provider: current.provider,
|
|
114
95
|
model: current.model,
|
|
115
96
|
...providerDefault ? {} : { reasoningEffort: ReasoningEffortId(value) },
|
|
116
97
|
}, signal);
|
|
98
|
+
this.model.select(effortSelection);
|
|
99
|
+
// D4c: an effort change is a USER write carrying the current pair too
|
|
100
|
+
// (the driver's `/effort` path does the same — stale effort otherwise
|
|
101
|
+
// survives a FailOpenServe restore).
|
|
102
|
+
noteUserSelection(effortSelection);
|
|
117
103
|
}
|
|
118
104
|
else {
|
|
119
105
|
throw new AcpModelConfigError(`unknown session config option: ${configId}`);
|
|
@@ -129,7 +115,7 @@ export class AcpModelControl {
|
|
|
129
115
|
}
|
|
130
116
|
/** Build detached model choices and the dependent reasoning option. */
|
|
131
117
|
async state(signal) {
|
|
132
|
-
const selected = this.
|
|
118
|
+
const selected = this.model.current();
|
|
133
119
|
if (selected === undefined)
|
|
134
120
|
return { choices: new Map(), options: [] };
|
|
135
121
|
let resolved;
|
package/lib/model-control.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-control.js","sourceRoot":"","sources":["../src/model-control.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,qGAAqG;AACrG,wEAAwE;AACxE,yEAAyE;AACzE,2EAA2E;AAI3E,OAAO,EAAE,qBAAqB,
|
|
1
|
+
{"version":3,"file":"model-control.js","sourceRoot":"","sources":["../src/model-control.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import type { Context } from '@deepseek-ai/cordis';
|
|
2
|
+
import type { RequestError } from '@agentclientprotocol/sdk';
|
|
3
|
+
import type { AcpPresetsService } from './session.ts';
|
|
4
|
+
/**
|
|
5
|
+
* Build the per-use roster resolver for the agent-preset registry.
|
|
6
|
+
*
|
|
7
|
+
* The registry is a LOADER GROUP SIBLING of this plugin: `EntryGroup.update`
|
|
8
|
+
* mounts the profile's rows concurrently (`Promise.all`), and strict
|
|
9
|
+
* `ctx.get` reads a LOADING sibling as `undefined` — an eager apply-time read
|
|
10
|
+
* raced the registry's async `Service.init` and killed the whole ACP lane
|
|
11
|
+
* whenever it lost (issue #380). Resolving per use — behind the admission
|
|
12
|
+
* gate from {@link settleComposition} — observes the registry's final state
|
|
13
|
+
* and survives a registry restart without re-applying this plugin.
|
|
14
|
+
*
|
|
15
|
+
* The service is deliberately NOT inject-declared: inject couples this
|
|
16
|
+
* plugin's fiber lifecycle to the registry's, and a registry restart would
|
|
17
|
+
* re-apply us and drop every live ACP session.
|
|
18
|
+
* @param ctx - Plugin context whose scope reads the roster service.
|
|
19
|
+
* @param internalError - Wrapper preserving the diagnostic on the wire
|
|
20
|
+
* (plain `Error`s are masked by the SDK's generic internal error).
|
|
21
|
+
* @returns A resolver throwing a wire-preserving error when the registry is
|
|
22
|
+
* absent — a mis-composed profile fails its first session admission loudly.
|
|
23
|
+
*/
|
|
24
|
+
export declare function presetRosterResolver(ctx: Context, internalError: (detail: string) => RequestError): () => AcpPresetsService;
|
|
25
|
+
/**
|
|
26
|
+
* Wait for the loader tree to settle before admitting a session.
|
|
27
|
+
*
|
|
28
|
+
* `app.connect` runs at the end of `apply` while `boot()` is still inside
|
|
29
|
+
* `loader.await()`, so an early `initialize` round trip does not prove tree
|
|
30
|
+
* settlement — a client can race its first `session/new` past a LOADING
|
|
31
|
+
* registry. Awaiting the loader here uses the same settlement primitive
|
|
32
|
+
* `boot()` itself uses, with no new timeout budget. Absent in the in-process
|
|
33
|
+
* test rig (no loader service) the gate is a no-op.
|
|
34
|
+
* @param ctx - Plugin context whose scope reads the loader service.
|
|
35
|
+
* @returns A function that settles before a session admission proceeds.
|
|
36
|
+
*/
|
|
37
|
+
export declare function settleComposition(ctx: Context): () => Promise<void>;
|
|
38
|
+
//# sourceMappingURL=preset-roster.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"preset-roster.d.ts","sourceRoot":"","sources":["../src/preset-roster.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAErD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,OAAO,EACZ,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,YAAY,GAC9C,MAAM,iBAAiB,CAUzB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAKnE"}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Build the per-use roster resolver for the agent-preset registry.
|
|
3
|
+
*
|
|
4
|
+
* The registry is a LOADER GROUP SIBLING of this plugin: `EntryGroup.update`
|
|
5
|
+
* mounts the profile's rows concurrently (`Promise.all`), and strict
|
|
6
|
+
* `ctx.get` reads a LOADING sibling as `undefined` — an eager apply-time read
|
|
7
|
+
* raced the registry's async `Service.init` and killed the whole ACP lane
|
|
8
|
+
* whenever it lost (issue #380). Resolving per use — behind the admission
|
|
9
|
+
* gate from {@link settleComposition} — observes the registry's final state
|
|
10
|
+
* and survives a registry restart without re-applying this plugin.
|
|
11
|
+
*
|
|
12
|
+
* The service is deliberately NOT inject-declared: inject couples this
|
|
13
|
+
* plugin's fiber lifecycle to the registry's, and a registry restart would
|
|
14
|
+
* re-apply us and drop every live ACP session.
|
|
15
|
+
* @param ctx - Plugin context whose scope reads the roster service.
|
|
16
|
+
* @param internalError - Wrapper preserving the diagnostic on the wire
|
|
17
|
+
* (plain `Error`s are masked by the SDK's generic internal error).
|
|
18
|
+
* @returns A resolver throwing a wire-preserving error when the registry is
|
|
19
|
+
* absent — a mis-composed profile fails its first session admission loudly.
|
|
20
|
+
*/
|
|
21
|
+
export function presetRosterResolver(ctx, internalError) {
|
|
22
|
+
return () => {
|
|
23
|
+
const roster = ctx.get('agentPresets');
|
|
24
|
+
if (roster === undefined) {
|
|
25
|
+
throw internalError('acp-cc requires an agent-preset registry in the composition (the cc-acp profile provides it via @dsh-cc/bundle-acp row B)');
|
|
26
|
+
}
|
|
27
|
+
return roster;
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
* Wait for the loader tree to settle before admitting a session.
|
|
32
|
+
*
|
|
33
|
+
* `app.connect` runs at the end of `apply` while `boot()` is still inside
|
|
34
|
+
* `loader.await()`, so an early `initialize` round trip does not prove tree
|
|
35
|
+
* settlement — a client can race its first `session/new` past a LOADING
|
|
36
|
+
* registry. Awaiting the loader here uses the same settlement primitive
|
|
37
|
+
* `boot()` itself uses, with no new timeout budget. Absent in the in-process
|
|
38
|
+
* test rig (no loader service) the gate is a no-op.
|
|
39
|
+
* @param ctx - Plugin context whose scope reads the loader service.
|
|
40
|
+
* @returns A function that settles before a session admission proceeds.
|
|
41
|
+
*/
|
|
42
|
+
export function settleComposition(ctx) {
|
|
43
|
+
return async () => {
|
|
44
|
+
const loader = ctx.get('loader');
|
|
45
|
+
if (loader !== undefined)
|
|
46
|
+
await loader.await();
|
|
47
|
+
};
|
|
48
|
+
}
|
|
49
|
+
//# sourceMappingURL=preset-roster.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"preset-roster.js","sourceRoot":"","sources":["../src/preset-roster.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,UAAU,oBAAoB,CAClC,GAAY,EACZ,aAA+C;IAE/C,OAAO,GAAG,EAAE;QACV,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;QACtC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,aAAa,CACjB,2HAA2H,CAC5H,CAAA;QACH,CAAC;QACD,OAAO,MAAM,CAAA;IACf,CAAC,CAAA;AACH,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,iBAAiB,CAAC,GAAY;IAC5C,OAAO,KAAK,IAAI,EAAE;QAChB,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,QAAQ,CAA2C,CAAA;QAC1E,IAAI,MAAM,KAAK,SAAS;YAAE,MAAM,MAAM,CAAC,KAAK,EAAE,CAAA;IAChD,CAAC,CAAA;AACH,CAAC"}
|
package/lib/session.d.ts
CHANGED
|
@@ -1,27 +1,25 @@
|
|
|
1
1
|
/** One standard ACP session's Agent, configuration, prompt, update, and teardown lifecycle. */
|
|
2
2
|
import type { Context } from '@deepseek-ai/cordis';
|
|
3
3
|
import { type McpServer, type PromptRequest, type PromptResponse, type SessionConfigOption, type SessionNotification } from '@agentclientprotocol/sdk';
|
|
4
|
-
import type { Agent, AgentOptions, AgentStatus
|
|
4
|
+
import type { Agent, AgentOptions, AgentStatus } from '@deepseek-ai/dsh-agent';
|
|
5
5
|
import { type UserMessage } from '@deepseek-ai/dsh-llm';
|
|
6
6
|
import { type Session, type SessionEvent, type SessionId } from '@deepseek-ai/dsh-session';
|
|
7
|
-
/** The preset-registry seam composed into every ACP session (§5.2). */
|
|
8
|
-
export interface AcpPresetsService {
|
|
9
|
-
mount(agentCtx: Context, presetId?: string): Promise<unknown>;
|
|
10
|
-
/** Compose a preset into a published agent, appending `agent-preset/selected`. */
|
|
11
|
-
select(agent: Agent, presetId: string): Promise<string>;
|
|
12
|
-
/** The preset a live agent already uses, if bound. */
|
|
13
|
-
composedPreset(ctx: Context): string | undefined;
|
|
14
|
-
}
|
|
15
7
|
/** Inputs shared by fresh and resumed ACP session construction. */
|
|
16
8
|
interface AcpSessionBuildOptions {
|
|
17
9
|
cwd: string;
|
|
18
10
|
mcpServers: readonly McpServer[];
|
|
19
11
|
agentOptions: AgentOptions;
|
|
20
|
-
fallbackSelection: ModelSelection | undefined;
|
|
21
|
-
presets: AcpPresetsService;
|
|
22
12
|
signal: AbortSignal;
|
|
23
13
|
notify: (notification: SessionNotification) => Promise<void>;
|
|
24
14
|
}
|
|
15
|
+
/** The preset-registry seam composed into every ACP session (§5.2). */
|
|
16
|
+
export interface AcpPresetsService {
|
|
17
|
+
mount(agentCtx: Context, presetId?: string): Promise<unknown>;
|
|
18
|
+
/** Compose a preset into a published agent, appending `agent-preset/selected`. */
|
|
19
|
+
select(agent: Agent, presetId: string): Promise<string>;
|
|
20
|
+
/** The preset a live agent already uses, if bound. */
|
|
21
|
+
composedPreset(ctx: Context): string | undefined;
|
|
22
|
+
}
|
|
25
23
|
/** Fresh ACP session construction inputs. */
|
|
26
24
|
export interface CreateAcpSessionOptions extends AcpSessionBuildOptions {
|
|
27
25
|
sessionId: SessionId;
|
|
@@ -33,9 +31,9 @@ export interface ResumeAcpSessionOptions extends AcpSessionBuildOptions {
|
|
|
33
31
|
sessionId: SessionId;
|
|
34
32
|
}
|
|
35
33
|
/**
|
|
36
|
-
* Per-session ACP module. It owns the unpublished Agent composition,
|
|
37
|
-
*
|
|
38
|
-
* quiescent teardown.
|
|
34
|
+
* Per-session ACP module. It owns the unpublished Agent composition, model
|
|
35
|
+
* configuration view, one-prompt admission slot, ordered standard updates,
|
|
36
|
+
* and memoized quiescent teardown.
|
|
39
37
|
*/
|
|
40
38
|
export declare class AcpSession {
|
|
41
39
|
private readonly ctx;
|
|
@@ -46,7 +44,6 @@ export declare class AcpSession {
|
|
|
46
44
|
private outputTail;
|
|
47
45
|
private inflight;
|
|
48
46
|
private closing;
|
|
49
|
-
private readonly pendingSelections;
|
|
50
47
|
private constructor();
|
|
51
48
|
private readonly disposeAgent;
|
|
52
49
|
/**
|
|
@@ -58,8 +55,10 @@ export declare class AcpSession {
|
|
|
58
55
|
static create(ctx: Context, options: CreateAcpSessionOptions): Promise<AcpSession>;
|
|
59
56
|
/**
|
|
60
57
|
* Restore a persisted Agent and compose the request's fresh MCP connections.
|
|
58
|
+
* The Session's recorded model selection survives; deployment options supply
|
|
59
|
+
* the route only when the Session records neither a selection nor a request.
|
|
61
60
|
* @param ctx - ACP plugin context with Agent, LLM, and persistence services.
|
|
62
|
-
* @param options - persisted identity, workspace,
|
|
61
|
+
* @param options - persisted identity, workspace, initial route, MCP, and notifier.
|
|
63
62
|
* @returns the restored per-session module.
|
|
64
63
|
*/
|
|
65
64
|
static resume(ctx: Context, options: ResumeAcpSessionOptions): Promise<AcpSession>;
|
|
@@ -82,7 +81,7 @@ export declare class AcpSession {
|
|
|
82
81
|
*/
|
|
83
82
|
configOptions(signal?: AbortSignal): Promise<SessionConfigOption[]>;
|
|
84
83
|
/**
|
|
85
|
-
* Apply one standard configuration option
|
|
84
|
+
* Apply one standard configuration option from the next model step.
|
|
86
85
|
* @param configId - advertised standard option id.
|
|
87
86
|
* @param value - selected standard option value.
|
|
88
87
|
* @param signal - optional request cancellation.
|
|
@@ -108,7 +107,7 @@ export declare class AcpSession {
|
|
|
108
107
|
*/
|
|
109
108
|
onSessionEvent(session: Session, event: SessionEvent): void;
|
|
110
109
|
/**
|
|
111
|
-
* Correlate an accepted user message with its Agent turn
|
|
110
|
+
* Correlate an accepted user message with its Agent turn.
|
|
112
111
|
* @param message - claimed durable inbox message.
|
|
113
112
|
* @param turn - allocated Agent turn.
|
|
114
113
|
*/
|
package/lib/session.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"AAIA,+FAA+F;AAE/F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAEL,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EAEzB,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAK,EAAE,KAAK,EAAe,YAAY,EAAE,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"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"}
|
package/lib/session.js
CHANGED
|
@@ -1,15 +1,21 @@
|
|
|
1
1
|
// Vendored from @deepseek-ai/dsh-acp (packages/acp/acp/src/session.ts)
|
|
2
|
-
// Source ref:
|
|
2
|
+
// Source ref: 2f97f60455605e915b8176d9170cae337bfedcc6 (deepseek-harness, MIT — see LICENSE-harness)
|
|
3
3
|
// Copied 2026-10-09. Structural fixes flow from upstream during harness
|
|
4
4
|
// migrations; CC-specific divergences must be recorded in DIVERGENCE.md.
|
|
5
5
|
/** One standard ACP session's Agent, configuration, prompt, update, and teardown lifecycle. */
|
|
6
6
|
import { RequestError, } from '@agentclientprotocol/sdk';
|
|
7
|
+
// CC-only deltas (D4a/D4b): the model-control install helper (switch notice +
|
|
8
|
+
// co-located notice sanitizer) and the moa pre-admission routing hook. Both are
|
|
9
|
+
// side-effect-free when moa is unmounted (the sanitizer's runtime-state
|
|
10
|
+
// accessors are inert, the router's admission entry is absent), so a moa-less
|
|
11
|
+
// deployment is byte-equivalent.
|
|
12
|
+
import { routeBeforeAdmission } from '@dsh-cc/moa';
|
|
7
13
|
import { awaitQuiescence, noteAgentError, requestPromptCancellation, settleCancelledOnStatus } from "./cancellation-status.js";
|
|
8
14
|
import { createUserMessage, errorChain } from '@deepseek-ai/dsh-llm';
|
|
9
15
|
import { AcpContentError, admitAcpPrompt } from "./content.js";
|
|
10
16
|
import { turnEndToStopReason } from "./codec.js";
|
|
11
17
|
import { mountAcpMcpServers } from "./mcp.js";
|
|
12
|
-
import { AcpModelControl } from "./model-control.js";
|
|
18
|
+
import { AcpModelControl, installModelControl } from "./model-control.js";
|
|
13
19
|
import { assistantUpdates, toolCallUpdate, toolResultUpdate } from "./updates.js";
|
|
14
20
|
/** Standard invalid-parameter failure with protocol-safe detail. */
|
|
15
21
|
function invalidParams(detail) {
|
|
@@ -19,22 +25,22 @@ function invalidParams(detail) {
|
|
|
19
25
|
function internalError(detail) {
|
|
20
26
|
return RequestError.internalError(undefined, detail);
|
|
21
27
|
}
|
|
22
|
-
/**
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
28
|
+
/**
|
|
29
|
+
* Install switch notices and mount the requested MCP clients in the unpublished Agent scope.
|
|
30
|
+
* @param agentCtx - unpublished Agent scope.
|
|
31
|
+
* @param options - workspace and MCP servers requested for the session.
|
|
32
|
+
*/
|
|
33
|
+
async function composeAgent(agentCtx, options) {
|
|
34
|
+
// CC-only delta (D4a): the model-control install is a co-located helper —
|
|
35
|
+
// the harness switch-notice listener plus the moa notice sanitizer — so the
|
|
36
|
+
// §5.1 co-location rule lives next to the selection seam it guards.
|
|
37
|
+
installModelControl(agentCtx);
|
|
38
|
+
await mountAcpMcpServers(agentCtx, options.mcpServers, options.cwd);
|
|
33
39
|
}
|
|
34
40
|
/**
|
|
35
|
-
* Per-session ACP module. It owns the unpublished Agent composition,
|
|
36
|
-
*
|
|
37
|
-
* quiescent teardown.
|
|
41
|
+
* Per-session ACP module. It owns the unpublished Agent composition, model
|
|
42
|
+
* configuration view, one-prompt admission slot, ordered standard updates,
|
|
43
|
+
* and memoized quiescent teardown.
|
|
38
44
|
*/
|
|
39
45
|
export class AcpSession {
|
|
40
46
|
ctx;
|
|
@@ -45,12 +51,11 @@ export class AcpSession {
|
|
|
45
51
|
outputTail = Promise.resolve();
|
|
46
52
|
inflight;
|
|
47
53
|
closing;
|
|
48
|
-
|
|
49
|
-
constructor(ctx, handle, modelControl, notify) {
|
|
54
|
+
constructor(ctx, handle, notify) {
|
|
50
55
|
this.ctx = ctx;
|
|
51
56
|
this.notify = notify;
|
|
52
57
|
this.agent = handle.agent;
|
|
53
|
-
this.modelControl =
|
|
58
|
+
this.modelControl = new AcpModelControl(ctx.llm, handle.agent.model);
|
|
54
59
|
this.disposeAgent = () => handle.dispose();
|
|
55
60
|
}
|
|
56
61
|
disposeAgent;
|
|
@@ -61,48 +66,32 @@ export class AcpSession {
|
|
|
61
66
|
* @returns the fully composed per-session module.
|
|
62
67
|
*/
|
|
63
68
|
static async create(ctx, options) {
|
|
64
|
-
const modelControl = new AcpModelControl(ctx.llm, options.fallbackSelection);
|
|
65
69
|
const handle = await ctx.agents.create({
|
|
66
70
|
sessionId: options.sessionId,
|
|
67
71
|
// §5.2: the frozen create header records the composed preset identity.
|
|
68
72
|
meta: { cwd: options.cwd, agentPreset: options.presetId },
|
|
69
73
|
agentOptions: options.agentOptions,
|
|
70
74
|
signal: options.signal,
|
|
71
|
-
setup:
|
|
72
|
-
// §5.2 revised 2026-10-09: the preset join runs on agent/created via
|
|
73
|
-
// select() (index.ts); setup order: model control, then MCP (last).
|
|
74
|
-
modelControl.install(agentCtx);
|
|
75
|
-
await mountAcpMcpServers(agentCtx, options.mcpServers, options.cwd);
|
|
76
|
-
},
|
|
75
|
+
setup: agentCtx => composeAgent(agentCtx, options),
|
|
77
76
|
});
|
|
78
|
-
return new AcpSession(ctx, handle,
|
|
77
|
+
return new AcpSession(ctx, handle, options.notify);
|
|
79
78
|
}
|
|
80
79
|
/**
|
|
81
80
|
* Restore a persisted Agent and compose the request's fresh MCP connections.
|
|
81
|
+
* The Session's recorded model selection survives; deployment options supply
|
|
82
|
+
* the route only when the Session records neither a selection nor a request.
|
|
82
83
|
* @param ctx - ACP plugin context with Agent, LLM, and persistence services.
|
|
83
|
-
* @param options - persisted identity, workspace,
|
|
84
|
+
* @param options - persisted identity, workspace, initial route, MCP, and notifier.
|
|
84
85
|
* @returns the restored per-session module.
|
|
85
86
|
*/
|
|
86
87
|
static async resume(ctx, options) {
|
|
87
|
-
let modelControl;
|
|
88
88
|
const handle = await ctx.agents.resume({
|
|
89
89
|
resumeSessionId: options.sessionId,
|
|
90
90
|
agentOptions: options.agentOptions,
|
|
91
91
|
signal: options.signal,
|
|
92
|
-
setup:
|
|
93
|
-
// §5.2: resume's preset join also runs on agent/created (index.ts).
|
|
94
|
-
modelControl = new AcpModelControl(ctx.llm, selectionFor(agent.session.requestHeader(), options.fallbackSelection));
|
|
95
|
-
modelControl.install(agentCtx);
|
|
96
|
-
await mountAcpMcpServers(agentCtx, options.mcpServers, options.cwd);
|
|
97
|
-
},
|
|
92
|
+
setup: agentCtx => composeAgent(agentCtx, options),
|
|
98
93
|
});
|
|
99
|
-
|
|
100
|
-
if (modelControl === undefined) {
|
|
101
|
-
await handle.dispose();
|
|
102
|
-
throw internalError('session/resume did not compose model selection');
|
|
103
|
-
}
|
|
104
|
-
/* v8 ignore stop */
|
|
105
|
-
return new AcpSession(ctx, handle, modelControl, options.notify);
|
|
94
|
+
return new AcpSession(ctx, handle, options.notify);
|
|
106
95
|
}
|
|
107
96
|
/**
|
|
108
97
|
* Whether this module owns an exact Agent reference.
|
|
@@ -130,7 +119,7 @@ export class AcpSession {
|
|
|
130
119
|
return this.modelControl.options(signal);
|
|
131
120
|
}
|
|
132
121
|
/**
|
|
133
|
-
* Apply one standard configuration option
|
|
122
|
+
* Apply one standard configuration option from the next model step.
|
|
134
123
|
* @param configId - advertised standard option id.
|
|
135
124
|
* @param value - selected standard option value.
|
|
136
125
|
* @param signal - optional request cancellation.
|
|
@@ -204,7 +193,7 @@ export class AcpSession {
|
|
|
204
193
|
onRequestAbort();
|
|
205
194
|
try {
|
|
206
195
|
let admissionFailure;
|
|
207
|
-
const promptSelection = this.
|
|
196
|
+
const promptSelection = this.agent.model.current();
|
|
208
197
|
try {
|
|
209
198
|
if (this.ctx.agents.get(this.agent.id) !== this.agent) {
|
|
210
199
|
throw internalError('prompt was not queued: the agent was disposed outside the bridge');
|
|
@@ -220,14 +209,16 @@ export class AcpSession {
|
|
|
220
209
|
});
|
|
221
210
|
inflight.messageId = message.id;
|
|
222
211
|
inflight.messageQueued = true;
|
|
223
|
-
|
|
224
|
-
|
|
212
|
+
// CC-only delta (D4b / D3.2): moa's pre-admission classification runs on
|
|
213
|
+
// the EXACT admitted UserMessage, before the prompt splice — an ACP turn
|
|
214
|
+
// therefore routes through the same entry-point seam the TUI uses.
|
|
215
|
+
// Inert when moa is unmounted or disarmed.
|
|
216
|
+
await routeBeforeAdmission(this.agent, message);
|
|
225
217
|
try {
|
|
226
218
|
this.agent.followup(message);
|
|
227
219
|
}
|
|
228
220
|
catch (error) {
|
|
229
221
|
inflight.messageQueued = false;
|
|
230
|
-
this.pendingSelections.delete(message.id);
|
|
231
222
|
throw error;
|
|
232
223
|
}
|
|
233
224
|
}
|
|
@@ -322,22 +313,16 @@ export class AcpSession {
|
|
|
322
313
|
inflight.endReason = event.data.reason;
|
|
323
314
|
inflight.agentError = undefined;
|
|
324
315
|
}
|
|
325
|
-
if (event.type === 'turn/end')
|
|
326
|
-
this.modelControl.releaseTurn(event.data.turn);
|
|
327
316
|
}
|
|
328
317
|
}
|
|
329
318
|
/**
|
|
330
|
-
* Correlate an accepted user message with its Agent turn
|
|
319
|
+
* Correlate an accepted user message with its Agent turn.
|
|
331
320
|
* @param message - claimed durable inbox message.
|
|
332
321
|
* @param turn - allocated Agent turn.
|
|
333
322
|
*/
|
|
334
323
|
onInboxClaimed(message, turn) {
|
|
335
324
|
if (this.inflight !== undefined && this.inflight.messageId === message.id)
|
|
336
325
|
this.inflight.turn = turn;
|
|
337
|
-
const selection = this.pendingSelections.get(message.id);
|
|
338
|
-
this.pendingSelections.delete(message.id);
|
|
339
|
-
if (selection !== undefined)
|
|
340
|
-
this.modelControl.pinTurn(turn, selection);
|
|
341
326
|
}
|
|
342
327
|
/**
|
|
343
328
|
* Correlate an Agent interval failure with the active ACP prompt.
|
|
@@ -405,7 +390,6 @@ export class AcpSession {
|
|
|
405
390
|
catch (error) {
|
|
406
391
|
failures.push(error);
|
|
407
392
|
}
|
|
408
|
-
this.pendingSelections.clear();
|
|
409
393
|
if (failures.length === 1)
|
|
410
394
|
throw failures[0];
|
|
411
395
|
/* v8 ignore start -- independent teardown failures can aggregate only under multiple simultaneous provider faults. */
|
package/lib/session.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"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"}
|
package/lib/updates.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// Vendored from @deepseek-ai/dsh-acp (packages/acp/acp/src/updates.ts)
|
|
2
|
-
// Source ref:
|
|
2
|
+
// Source ref: 2f97f60455605e915b8176d9170cae337bfedcc6 (deepseek-harness, MIT — see LICENSE-harness)
|
|
3
3
|
// Copied 2026-10-09. Structural fixes flow from upstream during harness
|
|
4
4
|
// migrations; CC-specific divergences must be recorded in DIVERGENCE.md.
|
|
5
5
|
/** Standard ACP updates derived from committed DSH session events. */
|
package/lib/version.d.ts
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
3
|
-
*
|
|
2
|
+
* Own-version reader for the ACP session surface.
|
|
3
|
+
*
|
|
4
|
+
* The implementation lives in `@dsh-cc/version-info` (one owner, one
|
|
5
|
+
* `FALLBACK_VERSION` for `scripts/release.mjs`). The earlier local copy drifted
|
|
6
|
+
* four releases behind `package.json` because the release script never rewrote
|
|
7
|
+
* it; the shared constant is now the only one, so that class of drift cannot
|
|
8
|
+
* recur.
|
|
9
|
+
*
|
|
4
10
|
* @module @dsh-cc/acp/version
|
|
5
11
|
*/
|
|
6
|
-
|
|
7
|
-
export declare const FALLBACK_VERSION = "0.9.0-rc.3";
|
|
8
|
-
/**
|
|
9
|
-
* Read this plugin's own version from its `package.json`.
|
|
10
|
-
* @returns the package version string.
|
|
11
|
-
*/
|
|
12
|
-
export declare function readOwnVersion(): Promise<string>;
|
|
12
|
+
export { FALLBACK_VERSION, readOwnVersion } from '@dsh-cc/version-info';
|
|
13
13
|
//# sourceMappingURL=version.d.ts.map
|
package/lib/version.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA"}
|
package/lib/version.js
CHANGED
|
@@ -1,30 +1,13 @@
|
|
|
1
|
-
// Divergence: readOwnVersion pattern ported from @dsh-cc/command-version
|
|
2
|
-
// (packages/interaction/command-version/src/version.ts) for §5.3 branding.
|
|
3
1
|
/**
|
|
4
|
-
*
|
|
5
|
-
*
|
|
2
|
+
* Own-version reader for the ACP session surface.
|
|
3
|
+
*
|
|
4
|
+
* The implementation lives in `@dsh-cc/version-info` (one owner, one
|
|
5
|
+
* `FALLBACK_VERSION` for `scripts/release.mjs`). The earlier local copy drifted
|
|
6
|
+
* four releases behind `package.json` because the release script never rewrote
|
|
7
|
+
* it; the shared constant is now the only one, so that class of drift cannot
|
|
8
|
+
* recur.
|
|
9
|
+
*
|
|
6
10
|
* @module @dsh-cc/acp/version
|
|
7
11
|
*/
|
|
8
|
-
|
|
9
|
-
import { dirname, join } from 'node:path';
|
|
10
|
-
import { fileURLToPath } from 'node:url';
|
|
11
|
-
/** Compile-time fallback, kept in sync with package.json `version`. */
|
|
12
|
-
export const FALLBACK_VERSION = '0.9.0-rc.3';
|
|
13
|
-
/**
|
|
14
|
-
* Read this plugin's own version from its `package.json`.
|
|
15
|
-
* @returns the package version string.
|
|
16
|
-
*/
|
|
17
|
-
export async function readOwnVersion() {
|
|
18
|
-
try {
|
|
19
|
-
const here = dirname(fileURLToPath(import.meta.url));
|
|
20
|
-
const raw = await readFile(join(here, '..', 'package.json'), 'utf8');
|
|
21
|
-
const parsed = JSON.parse(raw);
|
|
22
|
-
if (typeof parsed.version === 'string' && parsed.version.length > 0)
|
|
23
|
-
return parsed.version;
|
|
24
|
-
}
|
|
25
|
-
catch {
|
|
26
|
-
// Fall through to the constant.
|
|
27
|
-
}
|
|
28
|
-
return FALLBACK_VERSION;
|
|
29
|
-
}
|
|
12
|
+
export { FALLBACK_VERSION, readOwnVersion } from '@dsh-cc/version-info';
|
|
30
13
|
//# sourceMappingURL=version.js.map
|
package/lib/version.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dsh-cc/acp",
|
|
3
3
|
"description": "Agent Client Protocol server for driving dsh-cc agents over JSON-RPC stdio (vendored from @deepseek-ai/dsh-acp)",
|
|
4
|
-
"version": "0.9.
|
|
4
|
+
"version": "0.9.5-rc.1",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
7
7
|
"url": "git+https://github.com/dsh-cc/dsh-cc.git",
|
|
@@ -25,19 +25,20 @@
|
|
|
25
25
|
"license": "Apache-2.0",
|
|
26
26
|
"dependencies": {
|
|
27
27
|
"@agentclientprotocol/sdk": "1.4.0",
|
|
28
|
-
"@dsh-cc/moa": "^0.9.
|
|
28
|
+
"@dsh-cc/moa": "^0.9.5-rc.1",
|
|
29
|
+
"@dsh-cc/version-info": "^0.9.5-rc.1"
|
|
29
30
|
},
|
|
30
31
|
"peerDependencies": {
|
|
31
32
|
"@deepseek-ai/cordis": ">=0.2.0-rc.2",
|
|
32
|
-
"@deepseek-ai/dsh-agent": ">=0.2.
|
|
33
|
-
"@deepseek-ai/dsh-attachment": ">=0.2.
|
|
34
|
-
"@deepseek-ai/dsh-brand": ">=0.2.
|
|
35
|
-
"@deepseek-ai/dsh-llm": ">=0.2.
|
|
36
|
-
"@deepseek-ai/dsh-mcp-client": ">=0.2.
|
|
37
|
-
"@deepseek-ai/dsh-session": ">=0.2.
|
|
38
|
-
"@deepseek-ai/dsh-session-persistence": ">=0.2.
|
|
39
|
-
"@deepseek-ai/dsh-token-meter": ">=0.2.
|
|
40
|
-
"@deepseek-ai/dsh-user-approval": ">=0.2.
|
|
33
|
+
"@deepseek-ai/dsh-agent": ">=0.2.2-rc.1",
|
|
34
|
+
"@deepseek-ai/dsh-attachment": ">=0.2.2-rc.1",
|
|
35
|
+
"@deepseek-ai/dsh-brand": ">=0.2.2-rc.1",
|
|
36
|
+
"@deepseek-ai/dsh-llm": ">=0.2.2-rc.1",
|
|
37
|
+
"@deepseek-ai/dsh-mcp-client": ">=0.2.2-rc.1",
|
|
38
|
+
"@deepseek-ai/dsh-session": ">=0.2.2-rc.1",
|
|
39
|
+
"@deepseek-ai/dsh-session-persistence": ">=0.2.2-rc.1",
|
|
40
|
+
"@deepseek-ai/dsh-token-meter": ">=0.2.2-rc.1",
|
|
41
|
+
"@deepseek-ai/dsh-user-approval": ">=0.2.2-rc.1",
|
|
41
42
|
"@deepseek-ai/schemastery": ">=0.2.0-rc.2"
|
|
42
43
|
},
|
|
43
44
|
"peerDependenciesMeta": {
|
|
@@ -61,8 +62,9 @@
|
|
|
61
62
|
"@deepseek-ai/dsh-session-persistence-jsonl": "link:../../../../deepseek-harness/packages/session/session-persistence-jsonl",
|
|
62
63
|
"@deepseek-ai/dsh-session-projection": "link:../../../../deepseek-harness/packages/session/session-projection",
|
|
63
64
|
"@deepseek-ai/dsh-subagent": "link:../../../../deepseek-harness/packages/subagent/subagent",
|
|
64
|
-
"@deepseek-ai/dsh-tools": "link:../../../../deepseek-harness/packages/core/tools",
|
|
65
65
|
"@deepseek-ai/dsh-token-meter": "link:../../../../deepseek-harness/packages/llm/token-meter",
|
|
66
|
+
"@deepseek-ai/dsh-tool-testkit": "link:../../../../deepseek-harness/packages/test-support/tool-testkit",
|
|
67
|
+
"@deepseek-ai/dsh-tools": "link:../../../../deepseek-harness/packages/core/tools",
|
|
66
68
|
"@deepseek-ai/dsh-user-approval": "link:../../../../deepseek-harness/packages/interaction/user-approval",
|
|
67
69
|
"@deepseek-ai/schemastery": "link:../../../../deepseek-harness/vendor/schemastery",
|
|
68
70
|
"@modelcontextprotocol/node": "2.0.0",
|