@the-open-engine/zeroshot 6.37.0 → 6.38.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/cli/lib/setup-scanner-worker.js +2 -9
- package/lib/agent-cli-provider/adapters/claude-recovery.d.ts.map +1 -1
- package/lib/agent-cli-provider/adapters/claude-recovery.js +17 -3
- package/lib/agent-cli-provider/adapters/claude-recovery.js.map +1 -1
- package/lib/agent-cli-provider/adapters/codex.d.ts.map +1 -1
- package/lib/agent-cli-provider/adapters/codex.js +3 -1
- package/lib/agent-cli-provider/adapters/codex.js.map +1 -1
- package/lib/agent-cli-provider/adapters/index.d.ts.map +1 -1
- package/lib/agent-cli-provider/adapters/index.js +7 -0
- package/lib/agent-cli-provider/adapters/index.js.map +1 -1
- package/lib/agent-cli-provider/adapters/pi.d.ts.map +1 -1
- package/lib/agent-cli-provider/adapters/pi.js +86 -97
- package/lib/agent-cli-provider/adapters/pi.js.map +1 -1
- package/lib/agent-cli-provider/contract-parse.d.ts.map +1 -1
- package/lib/agent-cli-provider/contract-parse.js +5 -1
- package/lib/agent-cli-provider/contract-parse.js.map +1 -1
- package/lib/agent-cli-provider/invoke-evidence.d.ts.map +1 -1
- package/lib/agent-cli-provider/invoke-evidence.js +8 -1
- package/lib/agent-cli-provider/invoke-evidence.js.map +1 -1
- package/lib/agent-cli-provider/pi/credentials.d.ts +2 -0
- package/lib/agent-cli-provider/pi/credentials.d.ts.map +1 -0
- package/lib/agent-cli-provider/pi/credentials.js +51 -0
- package/lib/agent-cli-provider/pi/credentials.js.map +1 -0
- package/lib/agent-cli-provider/pi/events.d.ts +5 -0
- package/lib/agent-cli-provider/pi/events.d.ts.map +1 -0
- package/lib/agent-cli-provider/pi/events.js +124 -0
- package/lib/agent-cli-provider/pi/events.js.map +1 -0
- package/lib/agent-cli-provider/pi/protocol-state.d.ts +6 -0
- package/lib/agent-cli-provider/pi/protocol-state.d.ts.map +1 -0
- package/lib/agent-cli-provider/pi/protocol-state.js +138 -0
- package/lib/agent-cli-provider/pi/protocol-state.js.map +1 -0
- package/lib/agent-cli-provider/pi/release.d.ts +4 -0
- package/lib/agent-cli-provider/pi/release.d.ts.map +1 -0
- package/lib/agent-cli-provider/pi/release.js +7 -0
- package/lib/agent-cli-provider/pi/release.js.map +1 -0
- package/lib/agent-cli-provider/probe-availability.d.ts +5 -0
- package/lib/agent-cli-provider/probe-availability.d.ts.map +1 -0
- package/lib/agent-cli-provider/probe-availability.js +11 -0
- package/lib/agent-cli-provider/probe-availability.js.map +1 -0
- package/lib/agent-cli-provider/provider-registry.d.ts +13 -9
- package/lib/agent-cli-provider/provider-registry.d.ts.map +1 -1
- package/lib/agent-cli-provider/provider-registry.js +42 -8
- package/lib/agent-cli-provider/provider-registry.js.map +1 -1
- package/lib/agent-cli-provider/single-agent-runtime.d.ts.map +1 -1
- package/lib/agent-cli-provider/single-agent-runtime.js +15 -5
- package/lib/agent-cli-provider/single-agent-runtime.js.map +1 -1
- package/lib/agent-cli-provider/types.d.ts +3 -0
- package/lib/agent-cli-provider/types.d.ts.map +1 -1
- package/lib/agent-cli-provider/types.js.map +1 -1
- package/lib/cluster-worker/engine-adapter.js +9 -1
- package/lib/docker-config.js +6 -1
- package/lib/provider-credential-path.js +36 -0
- package/lib/start-cluster.js +8 -0
- package/npm-shrinkwrap.json +2 -2
- package/package.json +1 -1
- package/src/agent/agent-task-executor.js +79 -20
- package/src/agent/output-extraction.js +115 -0
- package/src/agent/pi-terminal-lifecycle.js +242 -0
- package/src/agent/provider-control-plane.js +26 -0
- package/src/agent/provider-terminal-failure.js +49 -24
- package/src/agent-cli-provider/adapters/claude-recovery.ts +15 -2
- package/src/agent-cli-provider/adapters/codex.ts +3 -1
- package/src/agent-cli-provider/adapters/index.ts +6 -0
- package/src/agent-cli-provider/adapters/pi.ts +105 -125
- package/src/agent-cli-provider/contract-parse.ts +8 -1
- package/src/agent-cli-provider/invoke-evidence.ts +11 -1
- package/src/agent-cli-provider/pi/credentials.ts +47 -0
- package/src/agent-cli-provider/pi/events.ts +148 -0
- package/src/agent-cli-provider/pi/protocol-state.ts +163 -0
- package/src/agent-cli-provider/pi/release.ts +4 -0
- package/src/agent-cli-provider/probe-availability.ts +19 -0
- package/src/agent-cli-provider/provider-registry.ts +48 -9
- package/src/agent-cli-provider/single-agent-runtime.ts +27 -6
- package/src/agent-cli-provider/types.ts +3 -0
- package/src/config-validator.js +1 -3
- package/src/isolation-manager.js +43 -29
- package/src/orchestrator.js +33 -1
- package/task-lib/watcher-output-runtime.js +16 -5
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
const fs = require('fs');
|
|
2
|
-
const os = require('os');
|
|
3
|
-
const path = require('path');
|
|
4
2
|
const { parentPort, workerData } = require('worker_threads');
|
|
5
3
|
|
|
6
4
|
const { commandExists, getCommandPath } = require('../../lib/provider-detection');
|
|
5
|
+
const { resolveProviderCredentialPaths } = require('../../lib/provider-credential-path');
|
|
7
6
|
const { getProviderMetadata, resolveProviderCommand } = require('../../lib/provider-names');
|
|
8
7
|
const { execSync } = require('../../src/lib/safe-exec');
|
|
9
8
|
|
|
@@ -41,19 +40,13 @@ function probeIssue() {
|
|
|
41
40
|
return checkGhAuth();
|
|
42
41
|
}
|
|
43
42
|
|
|
44
|
-
function expandCredentialPath(value) {
|
|
45
|
-
if (value === '~') return os.homedir();
|
|
46
|
-
if (value.startsWith('~/')) return path.join(os.homedir(), value.slice(2));
|
|
47
|
-
return value;
|
|
48
|
-
}
|
|
49
|
-
|
|
50
43
|
function hasCredentialEvidence(metadata) {
|
|
51
44
|
const hasEnvironment = metadata.credentialEnvKeys.some((key) => {
|
|
52
45
|
const value = process.env[key];
|
|
53
46
|
return typeof value === 'string' && value.trim().length > 0;
|
|
54
47
|
});
|
|
55
48
|
if (hasEnvironment) return true;
|
|
56
|
-
return metadata.
|
|
49
|
+
return resolveProviderCredentialPaths(metadata).some((item) => fs.existsSync(item));
|
|
57
50
|
}
|
|
58
51
|
|
|
59
52
|
function providerAuthStatus(id, metadata, available) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-recovery.d.ts","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/claude-recovery.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,oBAAoB,yDAAyD,CAAC;AAC3F,eAAO,MAAM,oBAAoB,yBAAyB,CAAC;AAE3D,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC1C,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,wBAAgB,gCAAgC,CAC9C,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,OAAO,GACZ,kBAAkB,GAAG,IAAI,CAG3B;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"claude-recovery.d.ts","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/claude-recovery.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,oBAAoB,yDAAyD,CAAC;AAC3F,eAAO,MAAM,oBAAoB,yBAAyB,CAAC;AAE3D,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC1C,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,wBAAgB,gCAAgC,CAC9C,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,OAAO,GACZ,kBAAkB,GAAG,IAAI,CAG3B;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAIvF;AAED,wBAAgB,+BAA+B,CAC7C,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAChB,wBAAwB,GAAG,IAAI,CAGjC;AAED,wBAAgB,wCAAwC,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAElF"}
|
|
@@ -17,9 +17,11 @@ function detectProviderStreamingModeError(provider, line) {
|
|
|
17
17
|
return detectClaudeStreamingModeError(line);
|
|
18
18
|
}
|
|
19
19
|
function detectProviderFatalError(provider, line) {
|
|
20
|
-
if (
|
|
21
|
-
return
|
|
22
|
-
|
|
20
|
+
if (isClaudeProvider(provider))
|
|
21
|
+
return detectClaudeFatalError(line);
|
|
22
|
+
if (provider.toLowerCase() === 'pi')
|
|
23
|
+
return detectPiFatalError(line);
|
|
24
|
+
return null;
|
|
23
25
|
}
|
|
24
26
|
function recoverProviderStructuredOutput(provider, sessionId) {
|
|
25
27
|
if (!isClaudeProvider(provider))
|
|
@@ -65,6 +67,18 @@ function detectClaudeFatalError(line) {
|
|
|
65
67
|
}
|
|
66
68
|
return null;
|
|
67
69
|
}
|
|
70
|
+
function detectPiFatalError(line) {
|
|
71
|
+
if (typeof line !== 'string')
|
|
72
|
+
return null;
|
|
73
|
+
const message = line.trim();
|
|
74
|
+
if (/\bno api key found\b/i.test(message)) {
|
|
75
|
+
return 'Pi authentication required: run /login';
|
|
76
|
+
}
|
|
77
|
+
if (/\bmodel\b.*\bnot found\b/i.test(message)) {
|
|
78
|
+
return 'Pi model not found: run pi --list-models';
|
|
79
|
+
}
|
|
80
|
+
return null;
|
|
81
|
+
}
|
|
68
82
|
function findSessionJsonlPath(sessionId) {
|
|
69
83
|
const claudeDir = process.env.CLAUDE_CONFIG_DIR || (0, node_path_1.join)((0, node_os_1.homedir)(), '.claude');
|
|
70
84
|
const projectsDir = (0, node_path_1.join)(claudeDir, 'projects');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-recovery.js","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/claude-recovery.ts"],"names":[],"mappings":";;;AAkBA,4EAMC;AAED,
|
|
1
|
+
{"version":3,"file":"claude-recovery.js","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/claude-recovery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/codex.ts"],"names":[],"mappings":"AAGA,OAAO,EASL,KAAK,+BAA+B,EAGrC,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/codex.ts"],"names":[],"mappings":"AAGA,OAAO,EASL,KAAK,+BAA+B,EAGrC,MAAM,UAAU,CAAC;AAsTlB,eAAO,MAAM,YAAY,EAAE,+BAoB1B,CAAC"}
|
|
@@ -142,14 +142,16 @@ function buildCommand(context, options = {}) {
|
|
|
142
142
|
: null;
|
|
143
143
|
addWebSearchArgs(args, options);
|
|
144
144
|
if (resumeSessionId) {
|
|
145
|
+
// Codex 0.147 parses --sandbox on `exec`, not on the `resume` subcommand.
|
|
146
|
+
addAutoApproveArgs(args, options);
|
|
145
147
|
args.push('resume');
|
|
146
148
|
}
|
|
147
149
|
addOutputArgs(args, options);
|
|
148
150
|
addModelArgs(args, options);
|
|
149
151
|
if (!resumeSessionId) {
|
|
150
152
|
addCwdArgs(args, options);
|
|
153
|
+
addAutoApproveArgs(args, options);
|
|
151
154
|
}
|
|
152
|
-
addAutoApproveArgs(args, options);
|
|
153
155
|
addSkipGitArgs(args, options);
|
|
154
156
|
const finalContext = applySchemaArgs(args, cleanup, context, options);
|
|
155
157
|
if (resumeSessionId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/codex.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/codex.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/index.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACV,2BAA2B,EAC3B,WAAW,EACX,mBAAmB,EACnB,iBAAiB,EACjB,cAAc,EACd,UAAU,EACV,WAAW,EACX,eAAe,EACf,UAAU,EACV,iBAAiB,EAClB,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,wBAAwB,EACxB,gCAAgC,EAChC,+BAA+B,EAC/B,wCAAwC,EACxC,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,GAC9B,MAAM,mBAAmB,CAAC;AAgB3B,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM,GAAG,eAAe,CAIpF;AAED,wBAAgB,oBAAoB,IAAI,SAAS,UAAU,EAAE,CAE5D;AAED,wBAAgB,oBAAoB,CAClC,YAAY,EAAE,iBAAiB,GAAG,MAAM,EACxC,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,2BAA2B,GACpC,WAAW,CAUb;AAED,wBAAgB,kBAAkB,CAChC,YAAY,EAAE,iBAAiB,GAAG,MAAM,EACxC,KAAK,EAAE,MAAM,GACZ,SAAS,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/index.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACV,2BAA2B,EAC3B,WAAW,EACX,mBAAmB,EACnB,iBAAiB,EACjB,cAAc,EACd,UAAU,EACV,WAAW,EACX,eAAe,EACf,UAAU,EACV,iBAAiB,EAClB,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,wBAAwB,EACxB,gCAAgC,EAChC,+BAA+B,EAC/B,wCAAwC,EACxC,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,GAC9B,MAAM,mBAAmB,CAAC;AAgB3B,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM,GAAG,eAAe,CAIpF;AAED,wBAAgB,oBAAoB,IAAI,SAAS,UAAU,EAAE,CAE5D;AAED,wBAAgB,oBAAoB,CAClC,YAAY,EAAE,iBAAiB,GAAG,MAAM,EACxC,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,2BAA2B,GACpC,WAAW,CAUb;AAED,wBAAgB,kBAAkB,CAChC,YAAY,EAAE,iBAAiB,GAAG,MAAM,EACxC,KAAK,EAAE,MAAM,GACZ,SAAS,WAAW,EAAE,CAyBxB;AAED,wBAAgB,wBAAwB,CACtC,YAAY,EAAE,iBAAiB,GAAG,MAAM,EACxC,IAAI,EAAE,MAAM,GACX,MAAM,GAAG,IAAI,CAKf;AAED,wBAAgB,gBAAgB,CAC9B,YAAY,EAAE,iBAAiB,GAAG,MAAM,EACxC,KAAK,EAAE,UAAU,EACjB,SAAS,CAAC,EAAE,cAAc,GACzB,iBAAiB,CAEnB;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,iBAAiB,GAAG,MAAM,EACxC,KAAK,EAAE,OAAO,GACb,mBAAmB,CAErB"}
|
|
@@ -62,6 +62,13 @@ function parseProviderChunk(providerName, chunk) {
|
|
|
62
62
|
events.push(event);
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
|
+
const finalEvent = adapter.finishParsing?.(state);
|
|
66
|
+
if (finalEvent) {
|
|
67
|
+
if (isOutputEventArray(finalEvent))
|
|
68
|
+
events.push(...finalEvent);
|
|
69
|
+
else
|
|
70
|
+
events.push(finalEvent);
|
|
71
|
+
}
|
|
65
72
|
return events;
|
|
66
73
|
}
|
|
67
74
|
function extractProviderSessionId(providerName, line) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/index.ts"],"names":[],"mappings":";;;AA6CA,gDAIC;AAED,oDAEC;AAED,oDAcC;AAED,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pi.d.ts","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/pi.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pi.d.ts","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/pi.ts"],"names":[],"mappings":"AAMA,OAAO,EASL,KAAK,eAAe,EAGrB,MAAM,UAAU,CAAC;AA8NlB,eAAO,MAAM,SAAS,EAAE,eAmBvB,CAAC"}
|
|
@@ -3,50 +3,93 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.piAdapter = void 0;
|
|
4
4
|
const schema_1 = require("../schema");
|
|
5
5
|
const contract_errors_1 = require("../contract-errors");
|
|
6
|
-
const assistant_stream_1 = require("../assistant-stream");
|
|
7
6
|
const json_1 = require("../json");
|
|
7
|
+
const credentials_1 = require("../pi/credentials");
|
|
8
|
+
const events_1 = require("../pi/events");
|
|
9
|
+
const release_1 = require("../pi/release");
|
|
8
10
|
const common_1 = require("./common");
|
|
9
11
|
const MODEL_CATALOG = {};
|
|
10
12
|
const LEVEL_MAPPING = {
|
|
11
|
-
level1: { rank: 1, model: null },
|
|
12
|
-
level2: { rank: 2, model: null },
|
|
13
|
-
level3: { rank: 3, model: null },
|
|
13
|
+
level1: { rank: 1, model: null, reasoningEffort: 'low' },
|
|
14
|
+
level2: { rank: 2, model: null, reasoningEffort: 'medium' },
|
|
15
|
+
level3: { rank: 3, model: null, reasoningEffort: 'high' },
|
|
14
16
|
};
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
'turn_start',
|
|
20
|
-
'queue_update',
|
|
21
|
-
'compaction_start',
|
|
22
|
-
'compaction_end',
|
|
23
|
-
'auto_retry_start',
|
|
24
|
-
'auto_retry_end',
|
|
25
|
-
]);
|
|
26
|
-
function detectCliFeatures(helpText) {
|
|
17
|
+
function supportsFlag(help, assumeCurrent, versionMatches, pattern) {
|
|
18
|
+
return versionMatches && (assumeCurrent || pattern.test(help));
|
|
19
|
+
}
|
|
20
|
+
function detectCliFeatures(helpText, versionText) {
|
|
27
21
|
const help = helpText ?? '';
|
|
28
|
-
const
|
|
22
|
+
const versionMatches = (0, common_1.isCliVersionAtLeast)(versionText, release_1.PI_SUPPORTED_VERSION);
|
|
23
|
+
const assumeCurrent = !help && versionMatches;
|
|
29
24
|
return {
|
|
30
25
|
provider: 'pi',
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
26
|
+
versionMatches,
|
|
27
|
+
supportsJsonMode: supportsFlag(help, assumeCurrent, versionMatches, /--mode\b/) &&
|
|
28
|
+
(assumeCurrent || /\bjson\b/.test(help)),
|
|
29
|
+
supportsModel: supportsFlag(help, assumeCurrent, versionMatches, /--model\b/),
|
|
30
|
+
supportsThinking: supportsFlag(help, assumeCurrent, versionMatches, /--thinking\b/),
|
|
31
|
+
supportsNoSession: supportsFlag(help, assumeCurrent, versionMatches, /--no-session\b/),
|
|
32
|
+
supportsNoExtensions: supportsFlag(help, assumeCurrent, versionMatches, /--no-extensions\b/),
|
|
33
|
+
supportsNoSkills: supportsFlag(help, assumeCurrent, versionMatches, /--no-skills\b/),
|
|
34
|
+
supportsNoPromptTemplates: supportsFlag(help, assumeCurrent, versionMatches, /--no-prompt-templates\b/),
|
|
35
|
+
supportsNoContextFiles: supportsFlag(help, assumeCurrent, versionMatches, /--no-context-files\b/),
|
|
36
|
+
supportsNoApprove: supportsFlag(help, assumeCurrent, versionMatches, /--no-approve\b/),
|
|
37
|
+
unknown: !help || !(versionText ?? '').trim(),
|
|
40
38
|
};
|
|
41
39
|
}
|
|
40
|
+
function assertRequiredControls(options) {
|
|
41
|
+
const features = (0, common_1.optionFeatures)(options);
|
|
42
|
+
if (features.versionMatches !== true) {
|
|
43
|
+
throw (0, contract_errors_1.contractError)({
|
|
44
|
+
code: 'invalid-field',
|
|
45
|
+
field: 'options.cliFeatures.versionMatches',
|
|
46
|
+
exitCode: 2,
|
|
47
|
+
message: `Pi ${release_1.PI_SUPPORTED_VERSION} or newer is required for the agent_settled JSON protocol. ` +
|
|
48
|
+
`Upgrade with: npm install -g --ignore-scripts ` +
|
|
49
|
+
`@earendil-works/pi-coding-agent@${release_1.PI_SUPPORTED_VERSION}`,
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
const required = [
|
|
53
|
+
['supportsJsonMode', '--mode json'],
|
|
54
|
+
['supportsNoSession', '--no-session'],
|
|
55
|
+
['supportsNoSkills', '--no-skills'],
|
|
56
|
+
['supportsNoPromptTemplates', '--no-prompt-templates'],
|
|
57
|
+
['supportsNoContextFiles', '--no-context-files'],
|
|
58
|
+
['supportsNoApprove', '--no-approve'],
|
|
59
|
+
];
|
|
60
|
+
for (const [field, flag] of required) {
|
|
61
|
+
if (features[field] !== false)
|
|
62
|
+
continue;
|
|
63
|
+
throw (0, contract_errors_1.contractError)({
|
|
64
|
+
code: 'invalid-field',
|
|
65
|
+
field: `options.cliFeatures.${field}`,
|
|
66
|
+
exitCode: 2,
|
|
67
|
+
message: `Pi ${release_1.PI_SUPPORTED_VERSION}+ support for ${flag} is required for Zeroshot execution.`,
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
if (options.modelSpec?.model && features.supportsModel === false) {
|
|
71
|
+
throw (0, contract_errors_1.contractError)({
|
|
72
|
+
code: 'invalid-field',
|
|
73
|
+
field: 'options.cliFeatures.supportsModel',
|
|
74
|
+
exitCode: 2,
|
|
75
|
+
message: `Pi ${release_1.PI_SUPPORTED_VERSION}+ support for --model is required for explicit model selection.`,
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
if (options.modelSpec?.reasoningEffort && features.supportsThinking === false) {
|
|
79
|
+
throw (0, contract_errors_1.contractError)({
|
|
80
|
+
code: 'invalid-field',
|
|
81
|
+
field: 'options.cliFeatures.supportsThinking',
|
|
82
|
+
exitCode: 2,
|
|
83
|
+
message: `Pi ${release_1.PI_SUPPORTED_VERSION}+ support for --thinking is required for reasoning effort.`,
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
}
|
|
42
87
|
function addRequiredArgs(args, options) {
|
|
43
88
|
const features = (0, common_1.optionFeatures)(options);
|
|
44
89
|
if (features.supportsJsonMode !== false)
|
|
45
90
|
args.push('--mode', 'json');
|
|
46
91
|
if (features.supportsNoSession !== false)
|
|
47
92
|
args.push('--no-session');
|
|
48
|
-
if (features.supportsNoExtensions !== false)
|
|
49
|
-
args.push('--no-extensions');
|
|
50
93
|
if (features.supportsNoSkills !== false)
|
|
51
94
|
args.push('--no-skills');
|
|
52
95
|
if (features.supportsNoPromptTemplates !== false)
|
|
@@ -61,6 +104,9 @@ function addOptionalArgs(args, options) {
|
|
|
61
104
|
if (options.modelSpec?.model && features.supportsModel !== false) {
|
|
62
105
|
args.push('--model', options.modelSpec.model);
|
|
63
106
|
}
|
|
107
|
+
if (options.modelSpec?.reasoningEffort && features.supportsThinking !== false) {
|
|
108
|
+
args.push('--thinking', options.modelSpec.reasoningEffort);
|
|
109
|
+
}
|
|
64
110
|
}
|
|
65
111
|
function failClosedUnsupportedSessionControl(options) {
|
|
66
112
|
const hasResumeSessionId = options.resumeSessionId !== undefined;
|
|
@@ -71,29 +117,28 @@ function failClosedUnsupportedSessionControl(options) {
|
|
|
71
117
|
code: 'invalid-field',
|
|
72
118
|
field,
|
|
73
119
|
exitCode: 2,
|
|
74
|
-
message: 'Pi CLI does not support resume/continue session control
|
|
120
|
+
message: 'Pi CLI does not support resume/continue session control with a task-owned identity boundary.',
|
|
75
121
|
});
|
|
76
122
|
}
|
|
77
123
|
function collectWarnings(options) {
|
|
78
|
-
const features = (0, common_1.optionFeatures)(options);
|
|
79
124
|
const warnings = [];
|
|
80
125
|
if (options.jsonSchema) {
|
|
81
126
|
warnings.push((0, common_1.warning)('pi', 'pi-jsonschema', 'Pi CLI does not support provider-native JSON schema; appending schema instructions to the prompt.'));
|
|
82
127
|
}
|
|
83
|
-
if (features.supportsJsonMode === false) {
|
|
84
|
-
warnings.push((0, common_1.warning)('pi', 'pi-json-mode', 'Pi CLI does not advertise --mode json; continuing anyway.'));
|
|
85
|
-
}
|
|
86
128
|
return warnings;
|
|
87
129
|
}
|
|
88
130
|
function buildCommand(context, options = {}) {
|
|
89
131
|
failClosedUnsupportedSessionControl(options);
|
|
132
|
+
assertRequiredControls(options);
|
|
90
133
|
const finalContext = options.jsonSchema
|
|
91
134
|
? (0, schema_1.appendJsonSchemaPrompt)(context, options.jsonSchema)
|
|
92
135
|
: context;
|
|
93
136
|
const args = [];
|
|
94
137
|
addRequiredArgs(args, options);
|
|
95
138
|
addOptionalArgs(args, options);
|
|
96
|
-
|
|
139
|
+
// Pi has no `--` end-of-options sentinel and interprets leading `-`/`@` positional values as
|
|
140
|
+
// flags or file arguments. A leading space keeps arbitrary Zeroshot context in prompt mode.
|
|
141
|
+
args.push(` ${finalContext}`);
|
|
97
142
|
return (0, common_1.commandSpec)({
|
|
98
143
|
binary: 'pi',
|
|
99
144
|
args,
|
|
@@ -102,65 +147,6 @@ function buildCommand(context, options = {}) {
|
|
|
102
147
|
warnings: collectWarnings(options),
|
|
103
148
|
});
|
|
104
149
|
}
|
|
105
|
-
function createPiState() {
|
|
106
|
-
return {
|
|
107
|
-
...(0, common_1.createParserState)('pi'),
|
|
108
|
-
lastAssistantText: '',
|
|
109
|
-
lastAssistantThinking: '',
|
|
110
|
-
};
|
|
111
|
-
}
|
|
112
|
-
function parsePiTurnEnd(event, state) {
|
|
113
|
-
const message = (0, json_1.getRecord)(event, 'message');
|
|
114
|
-
const events = message === null ? [] : [...(0, assistant_stream_1.emitAssistantSnapshot)(message, state)];
|
|
115
|
-
events.push((0, assistant_stream_1.parseTurnEndResult)(event, { failureMessage: 'Pi turn failed' }));
|
|
116
|
-
return events;
|
|
117
|
-
}
|
|
118
|
-
function parseMessageEvent(type, event, state) {
|
|
119
|
-
if (type === 'message_start') {
|
|
120
|
-
(0, assistant_stream_1.resetAssistantSnapshot)((0, json_1.getRecord)(event, 'message'), state);
|
|
121
|
-
return null;
|
|
122
|
-
}
|
|
123
|
-
if (type === 'message_update') {
|
|
124
|
-
const assistantMessageEvent = (0, json_1.getRecord)(event, 'assistantMessageEvent');
|
|
125
|
-
if (assistantMessageEvent !== null) {
|
|
126
|
-
const assistantEvent = (0, assistant_stream_1.parseAssistantDelta)(assistantMessageEvent, state);
|
|
127
|
-
if (assistantEvent !== null)
|
|
128
|
-
return assistantEvent;
|
|
129
|
-
}
|
|
130
|
-
const message = (0, json_1.getRecord)(event, 'message');
|
|
131
|
-
return message === null ? null : (0, assistant_stream_1.emitAssistantSnapshot)(message, state);
|
|
132
|
-
}
|
|
133
|
-
if (type !== 'message_end')
|
|
134
|
-
return undefined;
|
|
135
|
-
const message = (0, json_1.getRecord)(event, 'message');
|
|
136
|
-
return message === null ? null : (0, assistant_stream_1.emitAssistantSnapshot)(message, state);
|
|
137
|
-
}
|
|
138
|
-
function parseToolEvent(type, event, state) {
|
|
139
|
-
if (type === 'tool_execution_start')
|
|
140
|
-
return (0, assistant_stream_1.parseToolExecutionStart)(event, state);
|
|
141
|
-
if (type === 'tool_execution_update')
|
|
142
|
-
return (0, assistant_stream_1.parseToolExecutionUpdate)(event, state);
|
|
143
|
-
if (type === 'tool_execution_end')
|
|
144
|
-
return (0, assistant_stream_1.parseToolExecutionEnd)(event, state);
|
|
145
|
-
return undefined;
|
|
146
|
-
}
|
|
147
|
-
function parseEvent(line, state) {
|
|
148
|
-
const parsed = (0, json_1.tryParseJson)(line);
|
|
149
|
-
if (!(0, json_1.isRecord)(parsed))
|
|
150
|
-
return null;
|
|
151
|
-
const type = (0, json_1.getString)(parsed, 'type');
|
|
152
|
-
if (type === null || IGNORED_EVENT_TYPES.has(type))
|
|
153
|
-
return null;
|
|
154
|
-
const messageEvent = parseMessageEvent(type, parsed, state);
|
|
155
|
-
if (messageEvent !== undefined)
|
|
156
|
-
return messageEvent;
|
|
157
|
-
const toolEvent = parseToolEvent(type, parsed, state);
|
|
158
|
-
if (toolEvent !== undefined)
|
|
159
|
-
return toolEvent;
|
|
160
|
-
if (type === 'turn_end')
|
|
161
|
-
return parsePiTurnEnd(parsed, state);
|
|
162
|
-
return null;
|
|
163
|
-
}
|
|
164
150
|
function resolveModelSpec(level, overrides) {
|
|
165
151
|
return (0, common_1.resolveModelSpecWithConfig)({
|
|
166
152
|
mapping: LEVEL_MAPPING,
|
|
@@ -190,7 +176,9 @@ function classifyError(error) {
|
|
|
190
176
|
/\b(cancelled|canceled|aborted|interrupted)\b/i,
|
|
191
177
|
/\brun\s*\/login\b/i,
|
|
192
178
|
/\bmissing api key\b/i,
|
|
179
|
+
/\bno api key found\b/i,
|
|
193
180
|
/\bno valid authentication\b/i,
|
|
181
|
+
/\bmodel\b.*\bnot found\b/i,
|
|
194
182
|
/\bunknown option\b/i,
|
|
195
183
|
/\bfailed to load\b/i,
|
|
196
184
|
/\bcannot find module\b/i,
|
|
@@ -201,8 +189,8 @@ exports.piAdapter = {
|
|
|
201
189
|
id: 'pi',
|
|
202
190
|
displayName: 'Pi',
|
|
203
191
|
binary: 'pi',
|
|
204
|
-
adapterVersion: '
|
|
205
|
-
credentialEnvKeys:
|
|
192
|
+
adapterVersion: '2',
|
|
193
|
+
credentialEnvKeys: credentials_1.PI_CREDENTIAL_ENV_KEYS,
|
|
206
194
|
modelCatalog: MODEL_CATALOG,
|
|
207
195
|
levelMapping: LEVEL_MAPPING,
|
|
208
196
|
defaultLevel: 'level2',
|
|
@@ -210,8 +198,9 @@ exports.piAdapter = {
|
|
|
210
198
|
defaultMinLevel: 'level1',
|
|
211
199
|
detectCliFeatures,
|
|
212
200
|
buildCommand,
|
|
213
|
-
parseEvent,
|
|
214
|
-
|
|
201
|
+
parseEvent: events_1.parsePiEvent,
|
|
202
|
+
finishParsing: events_1.finishPiParsing,
|
|
203
|
+
createParserState: events_1.createPiParserState,
|
|
215
204
|
resolveModelSpec,
|
|
216
205
|
validateModelId,
|
|
217
206
|
classifyError,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pi.js","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/pi.ts"],"names":[],"mappings":";;;AAAA,sCAAmD;AACnD,wDAAmD;AACnD,
|
|
1
|
+
{"version":3,"file":"pi.js","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/pi.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contract-parse.d.ts","sourceRoot":"","sources":["../../src/agent-cli-provider/contract-parse.ts"],"names":[],"mappings":"AAGA,OAAO,EAAmB,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACpG,OAAO,EAAsB,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAE1E,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAkD5D,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,eAAe,EACxB,SAAS,EAAE;IACT,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,EAAE,SAAS;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAChF,GACA;IAAE,QAAQ,CAAC,MAAM,EAAE,SAAS,WAAW,EAAE,CAAC;IAAC,QAAQ,CAAC,WAAW,EAAE,SAAS,gBAAgB,EAAE,CAAA;CAAE,
|
|
1
|
+
{"version":3,"file":"contract-parse.d.ts","sourceRoot":"","sources":["../../src/agent-cli-provider/contract-parse.ts"],"names":[],"mappings":"AAGA,OAAO,EAAmB,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACpG,OAAO,EAAsB,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAE1E,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAkD5D,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,eAAe,EACxB,SAAS,EAAE;IACT,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,EAAE,SAAS;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAChF,GACA;IAAE,QAAQ,CAAC,MAAM,EAAE,SAAS,WAAW,EAAE,CAAC;IAAC,QAAQ,CAAC,WAAW,EAAE,SAAS,gBAAgB,EAAE,CAAA;CAAE,CA0BhG;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,WAAW,GAAG,gBAAgB,CAUrE"}
|
|
@@ -48,9 +48,13 @@ function isMalformedJsonCandidate(line) {
|
|
|
48
48
|
}
|
|
49
49
|
function parseOutputEvents(adapter, fragments) {
|
|
50
50
|
const diagnostics = [...collectParseDiagnostics(fragments.sources)];
|
|
51
|
+
const protocolChunk = adapter.id === 'pi'
|
|
52
|
+
? ((fragments.sources.find((source) => source.name === 'stdout') ??
|
|
53
|
+
fragments.sources.find((source) => source.name === 'jsonl'))?.value ?? '')
|
|
54
|
+
: fragments.chunk;
|
|
51
55
|
try {
|
|
52
56
|
return {
|
|
53
|
-
events: (0, adapters_1.parseProviderChunk)(adapter.id,
|
|
57
|
+
events: (0, adapters_1.parseProviderChunk)(adapter.id, protocolChunk),
|
|
54
58
|
diagnostics,
|
|
55
59
|
};
|
|
56
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contract-parse.js","sourceRoot":"","sources":["../../src/agent-cli-provider/contract-parse.ts"],"names":[],"mappings":";;AAwDA,
|
|
1
|
+
{"version":3,"file":"contract-parse.js","sourceRoot":"","sources":["../../src/agent-cli-provider/contract-parse.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invoke-evidence.d.ts","sourceRoot":"","sources":["../../src/agent-cli-provider/invoke-evidence.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,KAAK,EAAE,mBAAmB,EAAE,WAAW,EAAE,eAAe,EAAe,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"invoke-evidence.d.ts","sourceRoot":"","sources":["../../src/agent-cli-provider/invoke-evidence.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,KAAK,EAAE,mBAAmB,EAAE,WAAW,EAAE,eAAe,EAAe,MAAM,SAAS,CAAC;AA8B9F,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE,aAAa,EACrB,MAAM,GAAE,SAAS,WAAW,EAAO,GAClC,mBAAmB,GAAG,IAAI,CAY5B"}
|
|
@@ -15,6 +15,13 @@ function classifyParsedFailure(adapter, events) {
|
|
|
15
15
|
: 'Provider reported a failed result event.',
|
|
16
16
|
});
|
|
17
17
|
}
|
|
18
|
+
function classifyMissingPiSettlement(adapter, events) {
|
|
19
|
+
if (adapter.id !== 'pi' || events.some((event) => event.type === 'result'))
|
|
20
|
+
return null;
|
|
21
|
+
return (0, adapters_1.classifyProviderError)('pi', {
|
|
22
|
+
message: 'Pi JSON stream ended before agent_settled.',
|
|
23
|
+
});
|
|
24
|
+
}
|
|
18
25
|
function providerFailureClassification(adapter, result, events = []) {
|
|
19
26
|
if (result.timedOut) {
|
|
20
27
|
return (0, adapters_1.classifyProviderError)(adapter.id, {
|
|
@@ -22,7 +29,7 @@ function providerFailureClassification(adapter, result, events = []) {
|
|
|
22
29
|
});
|
|
23
30
|
}
|
|
24
31
|
if (result.exitCode === 0 && result.signal === null) {
|
|
25
|
-
return classifyParsedFailure(adapter, events);
|
|
32
|
+
return classifyParsedFailure(adapter, events) ?? classifyMissingPiSettlement(adapter, events);
|
|
26
33
|
}
|
|
27
34
|
return (0, adapters_1.classifyProviderError)(adapter.id, {
|
|
28
35
|
message: result.stderr || result.stdout || `Provider exited with code ${result.exitCode ?? ''}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invoke-evidence.js","sourceRoot":"","sources":["../../src/agent-cli-provider/invoke-evidence.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"invoke-evidence.js","sourceRoot":"","sources":["../../src/agent-cli-provider/invoke-evidence.ts"],"names":[],"mappings":";;AAgCA,sEAgBC;AAhDD,yCAAmD;AAInD,SAAS,mBAAmB,CAAC,KAAkB;IAC7C,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,KAAK,KAAK,CAAC;AAC5D,CAAC;AAED,SAAS,qBAAqB,CAC5B,OAAwB,EACxB,MAA8B;IAE9B,MAAM,YAAY,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACrE,IAAI,YAAY,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IAC5C,OAAO,IAAA,gCAAqB,EAAC,OAAO,CAAC,EAAE,EAAE;QACvC,OAAO,EACL,OAAO,YAAY,CAAC,KAAK,KAAK,QAAQ,IAAI,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE;YACjE,CAAC,CAAC,YAAY,CAAC,KAAK;YACpB,CAAC,CAAC,0CAA0C;KACjD,CAAC,CAAC;AACL,CAAC;AAED,SAAS,2BAA2B,CAClC,OAAwB,EACxB,MAA8B;IAE9B,IAAI,OAAO,CAAC,EAAE,KAAK,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAC;IACxF,OAAO,IAAA,gCAAqB,EAAC,IAAI,EAAE;QACjC,OAAO,EAAE,4CAA4C;KACtD,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,6BAA6B,CAC3C,OAAwB,EACxB,MAAqB,EACrB,SAAiC,EAAE;IAEnC,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpB,OAAO,IAAA,gCAAqB,EAAC,OAAO,CAAC,EAAE,EAAE;YACvC,OAAO,EAAE,4BAA4B,MAAM,CAAC,SAAS,IAAI,SAAS,IAAI;SACvE,CAAC,CAAC;IACL,CAAC;IACD,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,IAAI,MAAM,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;QACpD,OAAO,qBAAqB,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,2BAA2B,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAChG,CAAC;IACD,OAAO,IAAA,gCAAqB,EAAC,OAAO,CAAC,EAAE,EAAE;QACvC,OAAO,EAAE,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,IAAI,6BAA6B,MAAM,CAAC,QAAQ,IAAI,EAAE,EAAE;KAChG,CAAC,CAAC;AACL,CAAC"}
|