@xenosystem/acp-agent 0.2.1 → 0.2.3
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/dist/acpAgentServer.d.ts +1 -0
- package/dist/acpAgentServer.d.ts.map +1 -1
- package/dist/acpAgentServer.js +108 -3
- package/dist/acpAgentServer.js.map +1 -1
- package/dist/cli.js +22 -1
- package/dist/cli.js.map +1 -1
- package/dist/config/providerPolicySchema.d.ts.map +1 -1
- package/dist/config/providerPolicySchema.js +3 -1
- package/dist/config/providerPolicySchema.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/providers/claudeLocalProvider.d.ts +3 -1
- package/dist/providers/claudeLocalProvider.d.ts.map +1 -1
- package/dist/providers/claudeLocalProvider.js +48 -5
- package/dist/providers/claudeLocalProvider.js.map +1 -1
- package/dist/providers/claudeStreamJsonParser.d.ts +36 -0
- package/dist/providers/claudeStreamJsonParser.d.ts.map +1 -1
- package/dist/providers/claudeStreamJsonParser.js +117 -3
- package/dist/providers/claudeStreamJsonParser.js.map +1 -1
- package/dist/providers/codexExecJsonParser.d.ts +2 -0
- package/dist/providers/codexExecJsonParser.d.ts.map +1 -1
- package/dist/providers/codexExecJsonParser.js +26 -3
- package/dist/providers/codexExecJsonParser.js.map +1 -1
- package/dist/providers/codexLocalProvider.d.ts +4 -1
- package/dist/providers/codexLocalProvider.d.ts.map +1 -1
- package/dist/providers/codexLocalProvider.js +74 -10
- package/dist/providers/codexLocalProvider.js.map +1 -1
- package/dist/providers/fixtureProvider.d.ts.map +1 -1
- package/dist/providers/fixtureProvider.js +69 -0
- package/dist/providers/fixtureProvider.js.map +1 -1
- package/dist/providers/providerEvents.d.ts +29 -0
- package/dist/providers/providerEvents.d.ts.map +1 -1
- package/dist/providers/providerEvents.js +15 -1
- package/dist/providers/providerEvents.js.map +1 -1
- package/dist/providers/providerRegistry.d.ts +24 -1
- package/dist/providers/providerRegistry.d.ts.map +1 -1
- package/dist/providers/providerRegistry.js +314 -1
- package/dist/providers/providerRegistry.js.map +1 -1
- package/dist/providers/providerTypes.d.ts +96 -1
- package/dist/providers/providerTypes.d.ts.map +1 -1
- package/dist/providers/residentContextTokens.d.ts +41 -0
- package/dist/providers/residentContextTokens.d.ts.map +1 -0
- package/dist/providers/residentContextTokens.js +55 -0
- package/dist/providers/residentContextTokens.js.map +1 -0
- package/dist/providers/xenoLocalProvider.d.ts.map +1 -1
- package/dist/providers/xenoLocalProvider.js +23 -0
- package/dist/providers/xenoLocalProvider.js.map +1 -1
- package/dist/providers/xenoSdkProvider.d.ts.map +1 -1
- package/dist/providers/xenoSdkProvider.js +23 -0
- package/dist/providers/xenoSdkProvider.js.map +1 -1
- package/dist/security/authPolicy.d.ts.map +1 -1
- package/dist/security/authPolicy.js +4 -1
- package/dist/security/authPolicy.js.map +1 -1
- package/dist/security/secretBinding.d.ts.map +1 -1
- package/dist/security/secretBinding.js +3 -1
- package/dist/security/secretBinding.js.map +1 -1
- package/dist/security/securityTypes.d.ts +13 -1
- package/dist/security/securityTypes.d.ts.map +1 -1
- package/dist/security/securityTypes.js +13 -0
- package/dist/security/securityTypes.js.map +1 -1
- package/dist/types.d.ts +9 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +3 -3
- package/dist/fixtureProvider.d.ts +0 -13
- package/dist/fixtureProvider.d.ts.map +0 -1
- package/dist/fixtureProvider.js +0 -86
- package/dist/fixtureProvider.js.map +0 -1
- package/dist/hosted/xeno-agents-client.d.ts +0 -306
- package/dist/hosted/xeno-agents-client.d.ts.map +0 -1
- package/dist/hosted/xeno-agents-client.js +0 -520
- package/dist/hosted/xeno-agents-client.js.map +0 -1
- package/dist/providers/xenoAgentsApiEventMapper.d.ts +0 -52
- package/dist/providers/xenoAgentsApiEventMapper.d.ts.map +0 -1
- package/dist/providers/xenoAgentsApiEventMapper.js +0 -152
- package/dist/providers/xenoAgentsApiEventMapper.js.map +0 -1
- package/dist/providers/xenoAgentsApiProvider.d.ts +0 -60
- package/dist/providers/xenoAgentsApiProvider.d.ts.map +0 -1
- package/dist/providers/xenoAgentsApiProvider.js +0 -302
- package/dist/providers/xenoAgentsApiProvider.js.map +0 -1
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,EACL,0BAA0B,EAC1B,yBAAyB,EACzB,aAAa,EACb,4BAA4B,EAC5B,sCAAsC,EACtC,qBAAqB,EACrB,aAAa,EACb,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,GACvB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,KAAK,WAAW,EAAE,KAAK,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAC7G,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACtF,YAAY,EAAE,aAAa,EAAE,gBAAgB,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGpG,OAAO,EACL,gBAAgB,EAChB,qBAAqB,EACrB,4BAA4B,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,EACL,0BAA0B,EAC1B,yBAAyB,EACzB,aAAa,EACb,4BAA4B,EAC5B,sCAAsC,EACtC,qBAAqB,EACrB,aAAa,EACb,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,GACvB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,KAAK,WAAW,EAAE,KAAK,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAC7G,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACtF,YAAY,EAAE,aAAa,EAAE,gBAAgB,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGpG,OAAO,EACL,gBAAgB,EAChB,qBAAqB,EACrB,4BAA4B,EAC5B,kCAAkC,EAClC,qCAAqC,EACrC,uBAAuB,EACvB,sBAAsB,EACtB,yBAAyB,EACzB,6BAA6B,EAC7B,eAAe,EACf,gCAAgC,EAChC,gCAAgC,GACjC,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,6BAA6B,EAC7B,yBAAyB,EACzB,qBAAqB,EACrB,mBAAmB,EACnB,6BAA6B,EAC7B,oBAAoB,EACpB,8BAA8B,EAC9B,KAAK,wBAAwB,EAC7B,KAAK,uBAAuB,GAC7B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EACtB,KAAK,wBAAwB,GAC9B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,+BAA+B,EAC/B,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,yBAAyB,EACzB,mBAAmB,EACnB,uBAAuB,EACvB,aAAa,EACb,uBAAuB,EACvB,qBAAqB,EACrB,KAAK,aAAa,GACnB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,WAAW,EACX,sBAAsB,EACtB,qBAAqB,EACrB,uBAAuB,EACvB,sBAAsB,EACtB,mBAAmB,EACnB,qBAAqB,EACrB,wBAAwB,GACzB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,YAAY,EAAE,aAAa,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AACpG,OAAO,EACL,2BAA2B,EAC3B,kBAAkB,EAClB,gBAAgB,EAChB,uBAAuB,EACvB,eAAe,EACf,+BAA+B,EAC/B,yBAAyB,EACzB,+BAA+B,EAC/B,+BAA+B,EAC/B,KAAK,kBAAkB,GACxB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,qBAAqB,EACrB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,GACxB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EACL,4BAA4B,EAC5B,2BAA2B,EAC3B,kBAAkB,EAClB,KAAK,+BAA+B,EACpC,KAAK,wCAAwC,EAC7C,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,GACvB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,qBAAqB,EACrB,cAAc,EACd,8BAA8B,EAC9B,wBAAwB,EACxB,8BAA8B,EAC9B,8BAA8B,EAC9B,KAAK,iBAAiB,GACvB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAClF,OAAO,EACL,sBAAsB,EACtB,KAAK,oBAAoB,EACzB,KAAK,YAAY,GAClB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,wBAAwB,EACxB,kBAAkB,EAClB,eAAe,EACf,KAAK,aAAa,EAClB,KAAK,iBAAiB,GACvB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,aAAa,EACb,0BAA0B,EAC1B,yBAAyB,EACzB,sBAAsB,EACtB,wBAAwB,EACxB,oBAAoB,EACpB,sBAAsB,EACtB,qBAAqB,EACrB,4BAA4B,EAC5B,2BAA2B,EAC3B,qBAAqB,EACrB,kCAAkC,EAClC,KAAK,6BAA6B,EAClC,KAAK,iBAAiB,GACvB,MAAM,+BAA+B,CAAC;AACvC,YAAY,EACV,wBAAwB,EACxB,wBAAwB,EACxB,4BAA4B,EAC5B,2BAA2B,EAC3B,gCAAgC,EAChC,sCAAsC,EACtC,mCAAmC,EACnC,gCAAgC,EAChC,yBAAyB,EACzB,6BAA6B,EAC7B,6BAA6B,EAC7B,kBAAkB,EAClB,eAAe,EACf,qBAAqB,EACrB,sBAAsB,EACtB,kCAAkC,EAClC,mCAAmC,EACnC,2CAA2C,EAC3C,4CAA4C,EAC5C,mBAAmB,EACnB,eAAe,EACf,qBAAqB,EACrB,oBAAoB,EACpB,qBAAqB,EACrB,YAAY,EACZ,gBAAgB,EAChB,mBAAmB,EACnB,sBAAsB,EACtB,4BAA4B,EAC5B,4BAA4B,EAC5B,yBAAyB,EACzB,wBAAwB,EACxB,UAAU,GACX,MAAM,8BAA8B,CAAC;AAGtC,OAAO,EACL,sBAAsB,EACtB,aAAa,GACd,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,0BAA0B,EAC1B,uBAAuB,EACvB,mBAAmB,EACnB,cAAc,GACf,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,8BAA8B,EAC9B,aAAa,EACb,YAAY,EACZ,aAAa,EACb,WAAW,EACX,aAAa,EACb,qBAAqB,EACrB,gBAAgB,GACjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACxH,OAAO,EAAE,uBAAuB,EAAE,KAAK,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACrG,OAAO,EACL,gBAAgB,EAChB,4BAA4B,EAC5B,uBAAuB,EACvB,KAAK,WAAW,EAChB,KAAK,kBAAkB,EACvB,KAAK,sBAAsB,EAC3B,KAAK,oBAAoB,EACzB,KAAK,gBAAgB,GACtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,wBAAwB,EACxB,qBAAqB,EACrB,KAAK,aAAa,EAClB,KAAK,mBAAmB,GACzB,MAAM,6BAA6B,CAAC;AAGrC,OAAO,EACL,wBAAwB,EACxB,cAAc,EACd,uBAAuB,EACvB,UAAU,EACV,KAAK,kBAAkB,GACxB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,4BAA4B,EAC5B,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,EACxB,KAAK,sBAAsB,GAC5B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAC5F,OAAO,EACL,qBAAqB,EACrB,oBAAoB,GACrB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACL,iBAAiB,EACjB,KAAK,sBAAsB,EAC3B,KAAK,iBAAiB,GACvB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACL,qBAAqB,EACrB,oBAAoB,EACpB,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,GACvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,KAAK,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAG7F,OAAO,EACL,4BAA4B,EAC5B,KAAK,oBAAoB,EACzB,KAAK,iBAAiB,GACvB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,KAAK,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACjF,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAC;AACnF,YAAY,EACV,sBAAsB,EACtB,cAAc,EACd,qBAAqB,EACrB,sBAAsB,EACtB,gBAAgB,EAChB,cAAc,EACd,mBAAmB,EACnB,cAAc,EACd,iBAAiB,EACjB,SAAS,EACT,eAAe,EACf,cAAc,EACd,mBAAmB,EACnB,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,yBAAyB,GAC1B,MAAM,mCAAmC,CAAC;AAC3C,YAAY,EACV,kBAAkB,EAClB,oBAAoB,EACpB,kBAAkB,EAClB,uBAAuB,EACvB,sBAAsB,EACtB,sBAAsB,EACtB,wBAAwB,EACxB,uBAAuB,EACvB,YAAY,GACb,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EACL,+BAA+B,EAC/B,KAAK,yBAAyB,EAC9B,KAAK,iBAAiB,GACvB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EACL,6BAA6B,EAC7B,iBAAiB,EACjB,KAAK,8BAA8B,GACpC,MAAM,wCAAwC,CAAC;AAChD,OAAO,EACL,gBAAgB,EAChB,UAAU,EACV,mBAAmB,EACnB,KAAK,uBAAuB,GAC7B,MAAM,yCAAyC,CAAC;AACjD,OAAO,EACL,mBAAmB,EACnB,oBAAoB,EACpB,eAAe,EACf,KAAK,iBAAiB,GACvB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,EACL,uBAAuB,EACvB,4BAA4B,EAC5B,uBAAuB,GACxB,MAAM,yCAAyC,CAAC;AACjD,OAAO,EACL,oBAAoB,EACpB,KAAK,wBAAwB,GAC9B,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,8BAA8B,EAC9B,KAAK,qBAAqB,EAC1B,KAAK,qBAAqB,EAC1B,KAAK,qBAAqB,EAC1B,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,EACzB,KAAK,yBAAyB,EAC9B,KAAK,wBAAwB,EAC7B,KAAK,0BAA0B,EAC/B,KAAK,0BAA0B,GAChC,MAAM,mCAAmC,CAAC;AAI3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AACnG,OAAO,EAAE,gBAAgB,EAAE,KAAK,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAC9F,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AAClF,OAAO,EAAE,mBAAmB,EAAE,KAAK,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAChG,OAAO,EACL,2BAA2B,EAC3B,eAAe,EACf,yBAAyB,GAC1B,MAAM,mCAAmC,CAAC;AAC3C,YAAY,EACV,oBAAoB,EACpB,oBAAoB,EACpB,yBAAyB,EACzB,kBAAkB,EAClB,sBAAsB,EACtB,mBAAmB,GACpB,MAAM,mCAAmC,CAAC;AAG3C,OAAO,EACL,gCAAgC,EAChC,2BAA2B,EAC3B,0BAA0B,EAC1B,sBAAsB,EACtB,KAAK,6BAA6B,GACnC,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EACL,4BAA4B,EAC5B,4BAA4B,EAC5B,KAAK,oBAAoB,EACzB,KAAK,uBAAuB,EAC5B,KAAK,wBAAwB,EAC7B,KAAK,yBAAyB,EAC9B,KAAK,2BAA2B,GACjC,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,qBAAqB,EACrB,sBAAsB,EACtB,oBAAoB,EACpB,yBAAyB,EACzB,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,GAC9B,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EACL,oBAAoB,EACpB,6BAA6B,EAC7B,qBAAqB,EACrB,oBAAoB,EACpB,2BAA2B,EAC3B,+BAA+B,EAC/B,KAAK,4BAA4B,EACjC,KAAK,oBAAoB,GAC1B,MAAM,qCAAqC,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -18,7 +18,7 @@ export { createStdioServer, logStderr } from "./stdioJsonRpc.js";
|
|
|
18
18
|
export { AcpError, JSONRPC } from "./errors.js";
|
|
19
19
|
export { VERSION, AGENT_NAME, AGENT_TITLE, ACP_PROTOCOL_VERSION } from "./version.js";
|
|
20
20
|
// Provider-adapter foundation (XACP-005)
|
|
21
|
-
export { ProviderRegistry, createDefaultRegistry, createPlaceholderDefinitions, } from "./providers/providerRegistry.js";
|
|
21
|
+
export { ProviderRegistry, createDefaultRegistry, createPlaceholderDefinitions, resolveProviderSessionCapabilities, resolveProviderResumeCompatibilityKey, validateNativeSessionId, isValidNativeSessionId, validateNativeLauncherCwd, validateNativeLauncherRequest, validateModelId, validateConfigurationFingerprint, validateSessionCapabilityContext, } from "./providers/providerRegistry.js";
|
|
22
22
|
export { buildProviderDiscoverySummary, defaultOnlyModelDiscovery, isSafeProviderModelId, providerDisplayName, resolveProviderModelDiscovery, staticModelDiscovery, validateProviderModelSelection, } from "./providers/providerDiscovery.js";
|
|
23
23
|
export { discoverCodexCliModels, parseCodexModelCatalog, } from "./providers/codexModelCatalog.js";
|
|
24
24
|
export { createFixtureProviderDefinition, FIXTURE_CAPABILITIES, FIXTURE_FINAL_TEXT, } from "./providers/fixtureProvider.js";
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,0BAA0B;AAC1B,OAAO,EACL,0BAA0B,EAC1B,yBAAyB,EACzB,aAAa,EACb,4BAA4B,EAC5B,sCAAsC,EACtC,qBAAqB,EACrB,aAAa,GAGd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAqB,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAA8C,MAAM,mBAAmB,CAAC;AAC7G,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAGtF,yCAAyC;AACzC,OAAO,EACL,gBAAgB,EAChB,qBAAqB,EACrB,4BAA4B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,0BAA0B;AAC1B,OAAO,EACL,0BAA0B,EAC1B,yBAAyB,EACzB,aAAa,EACb,4BAA4B,EAC5B,sCAAsC,EACtC,qBAAqB,EACrB,aAAa,GAGd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAqB,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAA8C,MAAM,mBAAmB,CAAC;AAC7G,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAGtF,yCAAyC;AACzC,OAAO,EACL,gBAAgB,EAChB,qBAAqB,EACrB,4BAA4B,EAC5B,kCAAkC,EAClC,qCAAqC,EACrC,uBAAuB,EACvB,sBAAsB,EACtB,yBAAyB,EACzB,6BAA6B,EAC7B,eAAe,EACf,gCAAgC,EAChC,gCAAgC,GACjC,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,6BAA6B,EAC7B,yBAAyB,EACzB,qBAAqB,EACrB,mBAAmB,EACnB,6BAA6B,EAC7B,oBAAoB,EACpB,8BAA8B,GAG/B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,sBAAsB,EACtB,sBAAsB,GAEvB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,+BAA+B,EAC/B,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,yBAAyB,EACzB,mBAAmB,EACnB,uBAAuB,EACvB,aAAa,EACb,uBAAuB,EACvB,qBAAqB,GAEtB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,WAAW,EACX,sBAAsB,EACtB,qBAAqB,EACrB,uBAAuB,EACvB,sBAAsB,EACtB,mBAAmB,EACnB,qBAAqB,EACrB,wBAAwB,GACzB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAE7E,OAAO,EACL,2BAA2B,EAC3B,kBAAkB,EAClB,gBAAgB,EAChB,uBAAuB,EACvB,eAAe,EACf,+BAA+B,EAC/B,yBAAyB,EACzB,+BAA+B,EAC/B,+BAA+B,GAEhC,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,qBAAqB,GAGtB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EACL,4BAA4B,EAC5B,2BAA2B,EAC3B,kBAAkB,GAMnB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,qBAAqB,EACrB,cAAc,EACd,8BAA8B,EAC9B,wBAAwB,EACxB,8BAA8B,EAC9B,8BAA8B,GAE/B,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EACL,sBAAsB,GAGvB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,wBAAwB,EACxB,kBAAkB,EAClB,eAAe,GAGhB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,aAAa,EACb,0BAA0B,EAC1B,yBAAyB,EACzB,sBAAsB,EACtB,wBAAwB,EACxB,oBAAoB,EACpB,sBAAsB,EACtB,qBAAqB,EACrB,4BAA4B,EAC5B,2BAA2B,EAC3B,qBAAqB,EACrB,kCAAkC,GAGnC,MAAM,+BAA+B,CAAC;AAqCvC,8CAA8C;AAC9C,OAAO,EACL,sBAAsB,EACtB,aAAa,GACd,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,0BAA0B,EAC1B,uBAAuB,EACvB,mBAAmB,EACnB,cAAc,GACf,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,8BAA8B,EAC9B,aAAa,EACb,YAAY,EACZ,aAAa,EACb,WAAW,EACX,aAAa,EACb,qBAAqB,EACrB,gBAAgB,GACjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACxH,OAAO,EAAE,uBAAuB,EAA2B,MAAM,mCAAmC,CAAC;AACrG,OAAO,EACL,gBAAgB,EAChB,4BAA4B,EAC5B,uBAAuB,GAMxB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,wBAAwB,EACxB,qBAAqB,GAGtB,MAAM,6BAA6B,CAAC;AAErC,uDAAuD;AACvD,OAAO,EACL,wBAAwB,EACxB,cAAc,EACd,uBAAuB,EACvB,UAAU,GAEX,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,4BAA4B,GAI7B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAC5F,OAAO,EACL,qBAAqB,EACrB,oBAAoB,GACrB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACL,iBAAiB,GAGlB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACL,qBAAqB,EACrB,oBAAoB,GAGrB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAqB,MAAM,uCAAuC,CAAC;AAE7F,8CAA8C;AAC9C,OAAO,EACL,4BAA4B,GAG7B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,YAAY,EAAyB,MAAM,4BAA4B,CAAC;AACjF,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAC;AAgCnF,2FAA2F;AAC3F,yFAAyF;AACzF,OAAO,EACL,+BAA+B,GAGhC,MAAM,wCAAwC,CAAC;AAChD,OAAO,EACL,6BAA6B,EAC7B,iBAAiB,GAElB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EACL,gBAAgB,EAChB,UAAU,EACV,mBAAmB,GAEpB,MAAM,yCAAyC,CAAC;AACjD,OAAO,EACL,mBAAmB,EACnB,oBAAoB,EACpB,eAAe,GAEhB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,EACL,uBAAuB,EACvB,4BAA4B,EAC5B,uBAAuB,GACxB,MAAM,yCAAyC,CAAC;AACjD,OAAO,EACL,oBAAoB,GAErB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,8BAA8B,GAU/B,MAAM,mCAAmC,CAAC;AAE3C,6FAA6F;AAC7F,qGAAqG;AACrG,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AACnG,OAAO,EAAE,gBAAgB,EAA4B,MAAM,kCAAkC,CAAC;AAC9F,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AAClF,OAAO,EAAE,mBAAmB,EAAgC,MAAM,6BAA6B,CAAC;AAChG,OAAO,EACL,2BAA2B,EAC3B,eAAe,EACf,yBAAyB,GAC1B,MAAM,mCAAmC,CAAC;AAU3C,0DAA0D;AAC1D,OAAO,EACL,gCAAgC,EAChC,2BAA2B,EAC3B,0BAA0B,EAC1B,sBAAsB,GAEvB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EACL,4BAA4B,EAC5B,4BAA4B,GAM7B,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,qBAAqB,EACrB,sBAAsB,EACtB,oBAAoB,EACpB,yBAAyB,GAG1B,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EACL,oBAAoB,EACpB,6BAA6B,EAC7B,qBAAqB,EACrB,oBAAoB,EACpB,2BAA2B,EAC3B,+BAA+B,GAGhC,MAAM,qCAAqC,CAAC"}
|
|
@@ -64,5 +64,7 @@ export interface ClaudeLocalOptions {
|
|
|
64
64
|
* adapter. `authRequirement`/`networkRequirement` are `required` (truthful), so the safety gate
|
|
65
65
|
* returns `requires_approval` — it never runs without a current, hash-pinned local approval.
|
|
66
66
|
*/
|
|
67
|
-
export declare function createClaudeLocalDefinition(
|
|
67
|
+
export declare function createClaudeLocalDefinition(options?: {
|
|
68
|
+
executable?: string;
|
|
69
|
+
}): ProviderDefinition;
|
|
68
70
|
//# sourceMappingURL=claudeLocalProvider.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claudeLocalProvider.d.ts","sourceRoot":"","sources":["../../src/providers/claudeLocalProvider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAOH,OAAO,KAAK,EACV,qBAAqB,EACrB,kBAAkB,
|
|
1
|
+
{"version":3,"file":"claudeLocalProvider.d.ts","sourceRoot":"","sources":["../../src/providers/claudeLocalProvider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAOH,OAAO,KAAK,EACV,qBAAqB,EACrB,kBAAkB,EAIlB,qBAAqB,EAOtB,MAAM,oBAAoB,CAAC;AAK5B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEzE,eAAO,MAAM,eAAe,iBAAiB,CAAC;AAE9C,+EAA+E;AAC/E,eAAO,MAAM,+BAA+B,WAAW,CAAC;AAExD,eAAO,MAAM,yBAAyB,EAAE,qBAYvC,CAAC;AAYF,8FAA8F;AAC9F,eAAO,MAAM,+BAA+B,6JAclC,CAAC;AAEX,8FAA8F;AAC9F,eAAO,MAAM,+BAA+B,+GAOlC,CAAC;AAEX,8EAA8E;AAC9E,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,qBAAqB,CAAC,QAAQ,CAAC,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAQvG;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,MAAM,EAClB,IAAI,GAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,eAAe,CAAC,EAAE,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAAO,GACjJ;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,CAiBxC;AAED,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAKpE;AAED,MAAM,WAAW,kBAAkB;IACjC,wFAAwF;IACxF,WAAW,CAAC,EAAE,gBAAgB,CAAC;IAC/B,6FAA6F;IAC7F,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,4FAA4F;IAC5F,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,8FAA8F;IAC9F,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAkFD;;;;GAIG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,kBAAkB,CAqEjG"}
|
|
@@ -23,6 +23,7 @@ import { runAdapterPrompt } from "../adapters/adapterProcessHarness.js";
|
|
|
23
23
|
import { parseClaudeStreamJson } from "./claudeStreamJsonParser.js";
|
|
24
24
|
import { ProviderConfigurationError } from "./providerErrors.js";
|
|
25
25
|
import { staticModelDiscovery } from "./providerDiscovery.js";
|
|
26
|
+
import { validateNativeLauncherRequest, validateSessionCapabilityContext, } from "./providerRegistry.js";
|
|
26
27
|
export const CLAUDE_LOCAL_ID = "claude-local";
|
|
27
28
|
/** Default executable name (resolved on PATH by the supervisor's resolver). */
|
|
28
29
|
export const CLAUDE_LOCAL_DEFAULT_EXECUTABLE = "claude";
|
|
@@ -115,14 +116,20 @@ class ClaudeLocalRuntime {
|
|
|
115
116
|
promptCount = 0;
|
|
116
117
|
nativeSessionIds = new Map();
|
|
117
118
|
completedSessions = new Set();
|
|
119
|
+
seededSessions = new Set();
|
|
118
120
|
constructor(definition, config) {
|
|
119
121
|
this.definition = definition;
|
|
120
122
|
this.options = (config?.options ?? {});
|
|
121
123
|
}
|
|
122
124
|
initialize() { }
|
|
123
|
-
createSession() {
|
|
125
|
+
createSession(options) {
|
|
124
126
|
this.sessionSeq += 1;
|
|
125
|
-
|
|
127
|
+
const sessionId = options?.sessionId ?? `${CLAUDE_LOCAL_ID}-session-${this.sessionSeq}`;
|
|
128
|
+
if (options?.nativeSessionId) {
|
|
129
|
+
this.nativeSessionIds.set(sessionId, options.nativeSessionId);
|
|
130
|
+
this.seededSessions.add(sessionId);
|
|
131
|
+
}
|
|
132
|
+
return { sessionId, createdAt: `s${this.sessionSeq}` };
|
|
126
133
|
}
|
|
127
134
|
cancel() {
|
|
128
135
|
/* cancellation flows via the prompt AbortSignal into the supervisor */
|
|
@@ -131,6 +138,10 @@ class ClaudeLocalRuntime {
|
|
|
131
138
|
diagnostics() {
|
|
132
139
|
return { provider: this.definition.id, sessionsCreated: this.sessionSeq, promptsRun: this.promptCount };
|
|
133
140
|
}
|
|
141
|
+
withNativeSession(sessionId, result) {
|
|
142
|
+
const nativeSessionId = this.nativeSessionIds.get(sessionId);
|
|
143
|
+
return nativeSessionId ? { ...result, nativeSessionId } : result;
|
|
144
|
+
}
|
|
134
145
|
async prompt(request, ctx) {
|
|
135
146
|
this.promptCount += 1;
|
|
136
147
|
if (!this.options.runnability) {
|
|
@@ -142,7 +153,8 @@ class ClaudeLocalRuntime {
|
|
|
142
153
|
const promptText = renderPromptText(request.prompt, request.systemPrompt) || "Reply concisely.";
|
|
143
154
|
const nativeSessionId = this.nativeSessionIds.get(request.sessionId) ?? randomUUID();
|
|
144
155
|
this.nativeSessionIds.set(request.sessionId, nativeSessionId);
|
|
145
|
-
const shouldResume = this.
|
|
156
|
+
const shouldResume = this.seededSessions.has(request.sessionId) ||
|
|
157
|
+
this.completedSessions.has(request.sessionId);
|
|
146
158
|
const command = claudeLocalCommand(promptText, {
|
|
147
159
|
...(this.options.executable ? { executable: this.options.executable } : {}),
|
|
148
160
|
...(this.options.argsPrefix ? { argsPrefix: this.options.argsPrefix } : {}),
|
|
@@ -168,7 +180,7 @@ class ClaudeLocalRuntime {
|
|
|
168
180
|
});
|
|
169
181
|
if (harness.result.disposition === "completed")
|
|
170
182
|
this.completedSessions.add(request.sessionId);
|
|
171
|
-
return harness.result;
|
|
183
|
+
return this.withNativeSession(request.sessionId, harness.result);
|
|
172
184
|
}
|
|
173
185
|
}
|
|
174
186
|
/**
|
|
@@ -176,7 +188,7 @@ class ClaudeLocalRuntime {
|
|
|
176
188
|
* adapter. `authRequirement`/`networkRequirement` are `required` (truthful), so the safety gate
|
|
177
189
|
* returns `requires_approval` — it never runs without a current, hash-pinned local approval.
|
|
178
190
|
*/
|
|
179
|
-
export function createClaudeLocalDefinition() {
|
|
191
|
+
export function createClaudeLocalDefinition(options) {
|
|
180
192
|
const definition = {
|
|
181
193
|
id: CLAUDE_LOCAL_ID,
|
|
182
194
|
displayName: "Claude CLI",
|
|
@@ -208,6 +220,37 @@ export function createClaudeLocalDefinition() {
|
|
|
208
220
|
note: "XACP-021 XENO-authored adapter around the installed Claude CLI; NOT official Claude ACP; NOT third-party certified.",
|
|
209
221
|
},
|
|
210
222
|
modelDiscovery: CLAUDE_LOCAL_MODEL_DISCOVERY,
|
|
223
|
+
sessionCapabilities: {
|
|
224
|
+
chatExecution: { status: "available", source: "provider" },
|
|
225
|
+
durableResume: { status: "available", source: "provider" },
|
|
226
|
+
nativeTuiAttach: { status: "available", source: "host" },
|
|
227
|
+
reconciliation: {
|
|
228
|
+
status: "unsupported",
|
|
229
|
+
source: "policy",
|
|
230
|
+
reason: "Structured reconciliation adapter is not yet implemented",
|
|
231
|
+
},
|
|
232
|
+
modelSwitchInPlace: {
|
|
233
|
+
status: "unsupported",
|
|
234
|
+
source: "policy",
|
|
235
|
+
reason: "Claude CLI requires a separate session per model selection",
|
|
236
|
+
},
|
|
237
|
+
},
|
|
238
|
+
resolveResumeCompatibilityKey(context) {
|
|
239
|
+
const validated = validateSessionCapabilityContext(context);
|
|
240
|
+
return `${CLAUDE_LOCAL_ID}:${validated.modelId}:${validated.configurationFingerprint}`;
|
|
241
|
+
},
|
|
242
|
+
createNativeLauncher(request) {
|
|
243
|
+
const validated = validateNativeLauncherRequest(request);
|
|
244
|
+
const defaultExecutable = process.platform === "win32" ? "claude.cmd" : CLAUDE_LOCAL_DEFAULT_EXECUTABLE;
|
|
245
|
+
const executable = options?.executable ?? defaultExecutable;
|
|
246
|
+
return {
|
|
247
|
+
kind: "native-tui",
|
|
248
|
+
providerId: CLAUDE_LOCAL_ID,
|
|
249
|
+
executable,
|
|
250
|
+
args: ["--resume", validated.nativeSessionId],
|
|
251
|
+
...(validated.cwd ? { cwd: validated.cwd } : {}),
|
|
252
|
+
};
|
|
253
|
+
},
|
|
211
254
|
createRuntime(config) {
|
|
212
255
|
return new ClaudeLocalRuntime(definition, config);
|
|
213
256
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claudeLocalProvider.js","sourceRoot":"","sources":["../../src/providers/claudeLocalProvider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"claudeLocalProvider.js","sourceRoot":"","sources":["../../src/providers/claudeLocalProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,12 +22,48 @@
|
|
|
22
22
|
*/
|
|
23
23
|
import { type ProviderEvent } from "./providerEvents.js";
|
|
24
24
|
import type { ProviderErrorCode } from "./providerErrors.js";
|
|
25
|
+
/**
|
|
26
|
+
* A compaction the AGENT performed on itself, as Claude Code reports it.
|
|
27
|
+
*
|
|
28
|
+
* 🔴 XENO SPAWN §2.1's boundary signal, for a lane that had none. `context.history.compacted`
|
|
29
|
+
* exists only on our own SDK lane, so on the ACP lane a canvas watches resident tokens fall with no
|
|
30
|
+
* explanation — and "the agent was compacted" versus "the agent finished a big turn" are opposite
|
|
31
|
+
* answers to whether the user should still trust what it knows.
|
|
32
|
+
*
|
|
33
|
+
* ⚠️ THE WIRE KEY IS `compact_metadata`, SNAKE_CASE — the on-disk transcript writes
|
|
34
|
+
* `compactMetadata`. Verified by reading the shipped Claude Code 2.1.238 binary, which carries an
|
|
35
|
+
* `[sdkMessageAdapter]` that logs "Dropping compact_boundary frame without compact_metadata" and a
|
|
36
|
+
* builder mapping `compact_metadata` to the camelCase internal shape. A parser written from the
|
|
37
|
+
* on-disk format reads `undefined` here and reports a boundary that cost nothing.
|
|
38
|
+
*
|
|
39
|
+
* ⚠️ NOTE THE INVERSION from our own event: Claude reports what it KEPT (`preservedMessages`),
|
|
40
|
+
* ours reports what it REMOVED. A projection that assumes one shape mis-renders the other lane.
|
|
41
|
+
*/
|
|
42
|
+
export interface ClaudeCompactionBoundary {
|
|
43
|
+
trigger?: string;
|
|
44
|
+
preTokens?: number;
|
|
45
|
+
postTokens?: number;
|
|
46
|
+
/** Cumulative for the WHOLE session, so a total is the LAST value and never a sum. */
|
|
47
|
+
cumulativeDroppedTokens?: number;
|
|
48
|
+
durationMs?: number;
|
|
49
|
+
/** How many messages survived — the inverse of our `removedMessageIds`. */
|
|
50
|
+
preservedMessageCount?: number;
|
|
51
|
+
}
|
|
25
52
|
export interface ClaudeParseResult {
|
|
26
53
|
events: ProviderEvent[];
|
|
27
54
|
terminal: "completed" | "failed" | null;
|
|
28
55
|
failureCode?: ProviderErrorCode;
|
|
29
56
|
failureMessage?: string;
|
|
30
57
|
diagnosticsCount: number;
|
|
58
|
+
/**
|
|
59
|
+
* ⚠️ CARRIED, NOT YET MAPPED TO ACP — and the reason is a contract, not an oversight.
|
|
60
|
+
* `ProviderEventKind` is FROZEN at v1 (XACP-012) and has no compaction member, and ACP itself has
|
|
61
|
+
* no compaction vocabulary at all, so a real timeline boundary on this lane needs a new event
|
|
62
|
+
* kind plus a `_meta["xeno.dev"]` session update — a deliberate v2 change, not a quiet edit.
|
|
63
|
+
* Until then the numbers are surfaced as a `diagnostic` so they are at least observable rather
|
|
64
|
+
* than discarded, which is what happened to every `type: "system"` frame before this.
|
|
65
|
+
*/
|
|
66
|
+
compactions: ClaudeCompactionBoundary[];
|
|
31
67
|
}
|
|
32
68
|
export interface ClaudeParseContext {
|
|
33
69
|
providerId: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claudeStreamJsonParser.d.ts","sourceRoot":"","sources":["../../src/providers/claudeStreamJsonParser.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAsB,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"claudeStreamJsonParser.d.ts","sourceRoot":"","sources":["../../src/providers/claudeStreamJsonParser.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAsB,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAE7E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7D;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,WAAW,wBAAwB;IACvC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,sFAAsF;IACtF,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,2EAA2E;IAC3E,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,QAAQ,EAAE,WAAW,GAAG,QAAQ,GAAG,IAAI,CAAC;IACxC,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAChC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB;;;;;;;OAOG;IACH,WAAW,EAAE,wBAAwB,EAAE,CAAC;CACzC;AAED,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,MAAM,CAAC;CACnB;AAsED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,kBAAkB,GAAG,iBAAiB,CA0KhG"}
|
|
@@ -21,9 +21,76 @@
|
|
|
21
21
|
* secret) is passed through unredacted; provider error/diagnostic strings are not echoed.
|
|
22
22
|
*/
|
|
23
23
|
import { createEventFactory } from "./providerEvents.js";
|
|
24
|
+
import { residentContextTokens as sharedResidentContextTokens } from "./residentContextTokens.js";
|
|
25
|
+
const num = (value) => typeof value === "number" && Number.isFinite(value) ? value : undefined;
|
|
26
|
+
/**
|
|
27
|
+
* Read a compaction boundary out of a `type: "system"` frame, or return undefined.
|
|
28
|
+
*
|
|
29
|
+
* ⚠️ Gated on `subtype === "compact_boundary"`, never on the presence of the metadata key alone.
|
|
30
|
+
* Some other system frame carrying a similarly named field must not contribute a token figure to a
|
|
31
|
+
* session headline — the numbers are quoted, so a wrong one is worse than a missing one.
|
|
32
|
+
*/
|
|
33
|
+
function readCompactionBoundary(frame) {
|
|
34
|
+
if (frame.subtype !== "compact_boundary")
|
|
35
|
+
return undefined;
|
|
36
|
+
// 🔴 SNAKE_CASE on the wire. The on-disk transcript uses `compactMetadata`; accepting both is
|
|
37
|
+
// deliberate, because the same boundary is read from two sources with two spellings and a parser
|
|
38
|
+
// that knows one silently reports a free compaction from the other.
|
|
39
|
+
const raw = (frame.compact_metadata ?? frame.compactMetadata);
|
|
40
|
+
if (!raw || typeof raw !== "object") {
|
|
41
|
+
// A boundary with no metadata is still a boundary. Reporting nothing here would lose the fact
|
|
42
|
+
// that a compaction happened at all, which is worse than losing its size.
|
|
43
|
+
return {};
|
|
44
|
+
}
|
|
45
|
+
const preserved = raw.preservedMessages ?? raw.preserved_messages;
|
|
46
|
+
const uuids = preserved?.uuids;
|
|
47
|
+
return {
|
|
48
|
+
...(typeof raw.trigger === "string" ? { trigger: raw.trigger } : {}),
|
|
49
|
+
...(num(raw.preTokens ?? raw.pre_tokens) === undefined ? {} : { preTokens: num(raw.preTokens ?? raw.pre_tokens) }),
|
|
50
|
+
...(num(raw.postTokens ?? raw.post_tokens) === undefined ? {} : { postTokens: num(raw.postTokens ?? raw.post_tokens) }),
|
|
51
|
+
...(num(raw.cumulativeDroppedTokens ?? raw.cumulative_dropped_tokens) === undefined
|
|
52
|
+
? {}
|
|
53
|
+
: { cumulativeDroppedTokens: num(raw.cumulativeDroppedTokens ?? raw.cumulative_dropped_tokens) }),
|
|
54
|
+
...(num(raw.durationMs ?? raw.duration_ms) === undefined ? {} : { durationMs: num(raw.durationMs ?? raw.duration_ms) }),
|
|
55
|
+
...(Array.isArray(uuids) ? { preservedMessageCount: uuids.length } : {}),
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
/**
|
|
59
|
+
* How many tokens are RESIDENT in the agent's context — XENO SPAWN §2.1's numerator.
|
|
60
|
+
*
|
|
61
|
+
* 🔴 THE PREVIOUS FORMULA WAS `input_tokens + output_tokens`, AND CACHING MAKES THAT NEARLY ZERO.
|
|
62
|
+
* Measured on a real Claude Code session: `input_tokens: 2`, `cache_creation_input_tokens: 4042`,
|
|
63
|
+
* `cache_read_input_tokens: 983343`, `output_tokens: 2369`. The old formula reported **2,371** for a
|
|
64
|
+
* context holding **987,387** — a 416x undercount, not a rounding error.
|
|
65
|
+
*
|
|
66
|
+
* ⚠️ This is a NEW shape of the trap the spec already documents, and it fails the OTHER WAY.
|
|
67
|
+
* §15 step 3 warns that a cumulative billing counter climbs without bound and can never fall. With
|
|
68
|
+
* prompt caching the same class of mistake COLLAPSES toward zero instead, because virtually the
|
|
69
|
+
* whole prompt is served from cache and never appears in `input_tokens`. Opposite direction, one
|
|
70
|
+
* root cause: reading a billing field as a measure of context.
|
|
71
|
+
*
|
|
72
|
+
* 🔴 OUTPUT IS EXCLUDED ON PURPOSE. The reply does join the conversation — and on the NEXT request
|
|
73
|
+
* it arrives inside `cache_read_input_tokens`. Adding it here counts it twice across consecutive
|
|
74
|
+
* readings, and a numerator that double-counts drifts upward exactly like the counter this is
|
|
75
|
+
* replacing. What is measured here is the prompt the model actually held.
|
|
76
|
+
*/
|
|
77
|
+
function residentContextTokens(usage) {
|
|
78
|
+
// ⚠️ The rule moved to `residentContextTokens.ts` so the Codex lane could stop carrying a
|
|
79
|
+
// different one. The reasoning above is why it reads this way; the sharing is why it stays true
|
|
80
|
+
// on both lanes. This wrapper is kept so the call sites below read unchanged.
|
|
81
|
+
return sharedResidentContextTokens(usage);
|
|
82
|
+
}
|
|
83
|
+
function describeCompaction(boundary) {
|
|
84
|
+
const span = boundary.preTokens !== undefined && boundary.postTokens !== undefined
|
|
85
|
+
? `${boundary.preTokens} -> ${boundary.postTokens} tokens`
|
|
86
|
+
: "size not reported";
|
|
87
|
+
return `context compacted (${boundary.trigger ?? "trigger unknown"}, ${span})`;
|
|
88
|
+
}
|
|
24
89
|
export function parseClaudeStreamJson(stdout, ctx) {
|
|
25
90
|
const factory = createEventFactory(ctx);
|
|
26
91
|
const events = [];
|
|
92
|
+
const compactions = [];
|
|
93
|
+
let unattachedBoundary;
|
|
27
94
|
let terminal = null;
|
|
28
95
|
let failureCode;
|
|
29
96
|
let failureMessage;
|
|
@@ -117,16 +184,62 @@ export function parseClaudeStreamJson(stdout, ctx) {
|
|
|
117
184
|
}
|
|
118
185
|
else {
|
|
119
186
|
const usage = (j.usage ?? {});
|
|
120
|
-
const used = (
|
|
187
|
+
const used = residentContextTokens(usage);
|
|
121
188
|
completePendingTools();
|
|
122
|
-
|
|
189
|
+
/**
|
|
190
|
+
* 🔴 THE BOUNDARY RIDES WITH THE READING IT EXPLAINS. `used` FALLS across a compaction,
|
|
191
|
+
* and a consumer seeing only the fall cannot tell "the agent was compacted" from "the
|
|
192
|
+
* agent finished a big turn" — opposite answers to whether its knowledge is still
|
|
193
|
+
* trustworthy. Delivering them as one message removes the correlation problem instead of
|
|
194
|
+
* asking every consumer to solve it by timestamp.
|
|
195
|
+
*
|
|
196
|
+
* ⚠️ The LAST boundary, not all of them. `cumulativeDroppedTokens` is already cumulative
|
|
197
|
+
* for the session, so the most recent frame carries the running total; emitting a list
|
|
198
|
+
* would invite a consumer to sum them and multiply-count every earlier compaction.
|
|
199
|
+
*/
|
|
200
|
+
/**
|
|
201
|
+
* 🔴 ATTACHED ONCE. A boundary explains ONE drop in resident tokens; riding it on a
|
|
202
|
+
* second usage event would have the projection record one compaction as TWO eras —
|
|
203
|
+
* inventing a compaction that never happened, on a product whose entire claim is showing
|
|
204
|
+
* what an agent actually lost.
|
|
205
|
+
*
|
|
206
|
+
* ⚠️ Found by feeding the parser two `result` frames. A `-p` run emits one, so this is a
|
|
207
|
+
* defensive fix rather than an observed failure — but "the producer only does it once"
|
|
208
|
+
* is a property of today's caller, not of this function.
|
|
209
|
+
*/
|
|
210
|
+
const boundary = unattachedBoundary;
|
|
211
|
+
unattachedBoundary = undefined;
|
|
212
|
+
events.push(factory.next("usage", {
|
|
213
|
+
used,
|
|
214
|
+
size: 0,
|
|
215
|
+
...(boundary ? { compaction: boundary } : {}),
|
|
216
|
+
}));
|
|
123
217
|
terminal = "completed";
|
|
124
218
|
events.push(factory.next("completed", { disposition: "completed" }));
|
|
125
219
|
}
|
|
126
220
|
break;
|
|
127
221
|
}
|
|
222
|
+
case "system": {
|
|
223
|
+
/**
|
|
224
|
+
* 🔴 ONE system frame is not informational: the compaction boundary.
|
|
225
|
+
*
|
|
226
|
+
* Every `type: "system"` message used to be counted and dropped, which meant the ONE signal
|
|
227
|
+
* SPAWN §2.1 exists for — how much of the session the agent can no longer see — was thrown
|
|
228
|
+
* away for every third-party agent we drive. The rest genuinely are diagnostics.
|
|
229
|
+
*/
|
|
230
|
+
const boundary = readCompactionBoundary(j);
|
|
231
|
+
if (boundary) {
|
|
232
|
+
compactions.push(boundary);
|
|
233
|
+
// The newest boundary supersedes any earlier one still waiting: two compactions before a
|
|
234
|
+
// single usage reading means the later one describes the state that reading reports.
|
|
235
|
+
unattachedBoundary = boundary;
|
|
236
|
+
events.push(factory.next("diagnostic", { message: describeCompaction(boundary) }));
|
|
237
|
+
break;
|
|
238
|
+
}
|
|
239
|
+
diagnosticsCount += 1;
|
|
240
|
+
break;
|
|
241
|
+
}
|
|
128
242
|
// Informational events — surfaced as diagnostics, not ACP updates.
|
|
129
|
-
case "system":
|
|
130
243
|
case "rate_limit_event":
|
|
131
244
|
diagnosticsCount += 1;
|
|
132
245
|
break;
|
|
@@ -136,6 +249,7 @@ export function parseClaudeStreamJson(stdout, ctx) {
|
|
|
136
249
|
}
|
|
137
250
|
return {
|
|
138
251
|
events,
|
|
252
|
+
compactions,
|
|
139
253
|
terminal,
|
|
140
254
|
...(failureCode ? { failureCode } : {}),
|
|
141
255
|
...(failureMessage ? { failureMessage } : {}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claudeStreamJsonParser.js","sourceRoot":"","sources":["../../src/providers/claudeStreamJsonParser.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAE,kBAAkB,EAAsB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"claudeStreamJsonParser.js","sourceRoot":"","sources":["../../src/providers/claudeStreamJsonParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,6 +27,8 @@ export interface CodexParseResult {
|
|
|
27
27
|
failureMessage?: string;
|
|
28
28
|
diagnosticsCount: number;
|
|
29
29
|
hostRequest?: CodexHostRequest;
|
|
30
|
+
/** Native Codex thread identifier emitted by `thread.started`. */
|
|
31
|
+
threadId?: string;
|
|
30
32
|
}
|
|
31
33
|
export interface CodexParseContext {
|
|
32
34
|
providerId: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codexExecJsonParser.d.ts","sourceRoot":"","sources":["../../src/providers/codexExecJsonParser.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAsB,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"codexExecJsonParser.d.ts","sourceRoot":"","sources":["../../src/providers/codexExecJsonParser.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAsB,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAE7E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAG7D,eAAO,MAAM,2BAA2B,wBAAwB,CAAC;AACjE,eAAO,MAAM,4BAA4B,yBAAyB,CAAC;AAEnE,MAAM,WAAW,+BAA+B;IAC9C,MAAM,EAAE,kBAAkB,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,wCAAwC;IACvD,MAAM,EAAE,4BAA4B,CAAC;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,gBAAgB,GAAG,+BAA+B,GAAG,wCAAwC,CAAC;AAE1G,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,QAAQ,EAAE,WAAW,GAAG,QAAQ,GAAG,IAAI,CAAC;IACxC,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAChC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,gBAAgB,CAAC;IAC/B,kEAAkE;IAClE,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,MAAM,CAAC;CACnB;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,iBAAiB,GAAG,gBAAgB,CAkK3F"}
|
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
* error text is not echoed, and model output text passes through.
|
|
8
8
|
*/
|
|
9
9
|
import { createEventFactory } from "./providerEvents.js";
|
|
10
|
+
import { residentContextTokens } from "./residentContextTokens.js";
|
|
10
11
|
import { isAbsolute } from "node:path";
|
|
11
12
|
export const CODEX_HOST_REQUEST_OPEN_TAG = "<xeno_host_request>";
|
|
12
13
|
export const CODEX_HOST_REQUEST_CLOSE_TAG = "</xeno_host_request>";
|
|
@@ -19,6 +20,7 @@ export function parseCodexExecJson(stdout, ctx) {
|
|
|
19
20
|
let diagnosticsCount = 0;
|
|
20
21
|
let previousAgentMessageText = "";
|
|
21
22
|
let hostRequest;
|
|
23
|
+
let threadId;
|
|
22
24
|
for (const rawLine of stdout.split("\n")) {
|
|
23
25
|
const line = rawLine.trim();
|
|
24
26
|
if (!line)
|
|
@@ -75,7 +77,13 @@ export function parseCodexExecJson(stdout, ctx) {
|
|
|
75
77
|
}
|
|
76
78
|
case "turn.completed": {
|
|
77
79
|
const usage = (j.usage ?? {});
|
|
78
|
-
|
|
80
|
+
/**
|
|
81
|
+
* 🔴 RESIDENT, not consumed. This read `input_tokens + output_tokens` — the exact formula
|
|
82
|
+
* `claudeStreamJsonParser` documents at length as the previous, WRONG one. The reply is
|
|
83
|
+
* already inside the next turn's `input_tokens`, so adding it here reports the current
|
|
84
|
+
* turn's output twice, on every reading. See `residentContextTokens.ts`.
|
|
85
|
+
*/
|
|
86
|
+
const used = residentContextTokens(usage);
|
|
79
87
|
events.push(factory.next("usage", { used, size: 0 }));
|
|
80
88
|
terminal = "completed";
|
|
81
89
|
events.push(factory.next("completed", { disposition: "completed" }));
|
|
@@ -124,7 +132,9 @@ export function parseCodexExecJson(stdout, ctx) {
|
|
|
124
132
|
break;
|
|
125
133
|
}
|
|
126
134
|
case "usage": {
|
|
127
|
-
|
|
135
|
+
// ⚠️ An agent that reports `used` itself is trusted; the fallback derives it the same way
|
|
136
|
+
// the branch above does, so the two cannot disagree about what "used" means.
|
|
137
|
+
const used = Number(j.used) || residentContextTokens(j);
|
|
128
138
|
events.push(factory.next("usage", { used, size: Number(j.size) || 0 }));
|
|
129
139
|
break;
|
|
130
140
|
}
|
|
@@ -151,7 +161,19 @@ export function parseCodexExecJson(stdout, ctx) {
|
|
|
151
161
|
events.push(factory.next("failed", { disposition: "failed", code: failureCode, message: failureMessage }));
|
|
152
162
|
break;
|
|
153
163
|
}
|
|
154
|
-
case "thread.started":
|
|
164
|
+
case "thread.started": {
|
|
165
|
+
const candidate = typeof j.thread_id === "string" ? j.thread_id.trim() : "";
|
|
166
|
+
if (candidate && candidate.length <= 256 && /^[A-Za-z0-9][A-Za-z0-9._:-]*$/.test(candidate)) {
|
|
167
|
+
if (!threadId)
|
|
168
|
+
threadId = candidate;
|
|
169
|
+
else if (threadId !== candidate)
|
|
170
|
+
diagnosticsCount += 1;
|
|
171
|
+
}
|
|
172
|
+
else {
|
|
173
|
+
diagnosticsCount += 1;
|
|
174
|
+
}
|
|
175
|
+
break;
|
|
176
|
+
}
|
|
155
177
|
case "turn.started":
|
|
156
178
|
case "session":
|
|
157
179
|
case "debug":
|
|
@@ -167,6 +189,7 @@ export function parseCodexExecJson(stdout, ctx) {
|
|
|
167
189
|
...(failureCode ? { failureCode } : {}),
|
|
168
190
|
...(failureMessage ? { failureMessage } : {}),
|
|
169
191
|
...(hostRequest ? { hostRequest } : {}),
|
|
192
|
+
...(threadId ? { threadId } : {}),
|
|
170
193
|
diagnosticsCount,
|
|
171
194
|
};
|
|
172
195
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codexExecJsonParser.js","sourceRoot":"","sources":["../../src/providers/codexExecJsonParser.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"codexExecJsonParser.js","sourceRoot":"","sources":["../../src/providers/codexExecJsonParser.ts"],"names":[],"mappings":"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"}
|