@the-open-engine/zeroshot 6.4.0 → 6.5.0
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/commands/providers.js +11 -5
- package/cli/index.js +79 -16
- package/cli/lib/first-run.js +14 -3
- package/docker/zeroshot-cluster/Dockerfile +11 -1
- package/lib/agent-cli-provider/acp-stdio-runner.d.ts +4 -0
- package/lib/agent-cli-provider/acp-stdio-runner.d.ts.map +1 -0
- package/lib/agent-cli-provider/acp-stdio-runner.js +259 -0
- package/lib/agent-cli-provider/acp-stdio-runner.js.map +1 -0
- package/lib/agent-cli-provider/adapters/acp.d.ts +23 -0
- package/lib/agent-cli-provider/adapters/acp.d.ts.map +1 -0
- package/lib/agent-cli-provider/adapters/acp.js +373 -0
- package/lib/agent-cli-provider/adapters/acp.js.map +1 -0
- package/lib/agent-cli-provider/adapters/claude.d.ts.map +1 -1
- package/lib/agent-cli-provider/adapters/claude.js +2 -29
- package/lib/agent-cli-provider/adapters/claude.js.map +1 -1
- package/lib/agent-cli-provider/adapters/copilot-parser.d.ts +3 -0
- package/lib/agent-cli-provider/adapters/copilot-parser.d.ts.map +1 -0
- package/lib/agent-cli-provider/adapters/copilot-parser.js +154 -0
- package/lib/agent-cli-provider/adapters/copilot-parser.js.map +1 -0
- package/lib/agent-cli-provider/adapters/copilot.d.ts +3 -0
- package/lib/agent-cli-provider/adapters/copilot.d.ts.map +1 -0
- package/lib/agent-cli-provider/adapters/copilot.js +176 -0
- package/lib/agent-cli-provider/adapters/copilot.js.map +1 -0
- package/lib/agent-cli-provider/adapters/gateway.d.ts +6 -0
- package/lib/agent-cli-provider/adapters/gateway.d.ts.map +1 -0
- package/lib/agent-cli-provider/adapters/gateway.js +161 -0
- package/lib/agent-cli-provider/adapters/gateway.js.map +1 -0
- package/lib/agent-cli-provider/adapters/gemini.d.ts.map +1 -1
- package/lib/agent-cli-provider/adapters/gemini.js +9 -2
- package/lib/agent-cli-provider/adapters/gemini.js.map +1 -1
- package/lib/agent-cli-provider/adapters/index.d.ts.map +1 -1
- package/lib/agent-cli-provider/adapters/index.js +6 -34
- package/lib/agent-cli-provider/adapters/index.js.map +1 -1
- package/lib/agent-cli-provider/adapters/opencode.d.ts.map +1 -1
- package/lib/agent-cli-provider/adapters/opencode.js +5 -1
- package/lib/agent-cli-provider/adapters/opencode.js.map +1 -1
- package/lib/agent-cli-provider/adapters/pi.d.ts +3 -0
- package/lib/agent-cli-provider/adapters/pi.d.ts.map +1 -0
- package/lib/agent-cli-provider/adapters/pi.js +331 -0
- package/lib/agent-cli-provider/adapters/pi.js.map +1 -0
- package/lib/agent-cli-provider/claude-command.d.ts +6 -0
- package/lib/agent-cli-provider/claude-command.d.ts.map +1 -0
- package/lib/agent-cli-provider/claude-command.js +43 -0
- package/lib/agent-cli-provider/claude-command.js.map +1 -0
- package/lib/agent-cli-provider/contract-actions.d.ts.map +1 -1
- package/lib/agent-cli-provider/contract-actions.js +13 -17
- package/lib/agent-cli-provider/contract-actions.js.map +1 -1
- package/lib/agent-cli-provider/contract-invoke.d.ts.map +1 -1
- package/lib/agent-cli-provider/contract-invoke.js +10 -3
- package/lib/agent-cli-provider/contract-invoke.js.map +1 -1
- package/lib/agent-cli-provider/contract-options.d.ts.map +1 -1
- package/lib/agent-cli-provider/contract-options.js +57 -2
- package/lib/agent-cli-provider/contract-options.js.map +1 -1
- package/lib/agent-cli-provider/contract-support.d.ts +1 -0
- package/lib/agent-cli-provider/contract-support.d.ts.map +1 -1
- package/lib/agent-cli-provider/contract-support.js +25 -3
- package/lib/agent-cli-provider/contract-support.js.map +1 -1
- package/lib/agent-cli-provider/errors.d.ts +1 -0
- package/lib/agent-cli-provider/errors.d.ts.map +1 -1
- package/lib/agent-cli-provider/errors.js +14 -5
- package/lib/agent-cli-provider/errors.js.map +1 -1
- package/lib/agent-cli-provider/gateway-client.d.ts +32 -0
- package/lib/agent-cli-provider/gateway-client.d.ts.map +1 -0
- package/lib/agent-cli-provider/gateway-client.js +135 -0
- package/lib/agent-cli-provider/gateway-client.js.map +1 -0
- package/lib/agent-cli-provider/gateway-runner.d.ts +9 -0
- package/lib/agent-cli-provider/gateway-runner.d.ts.map +1 -0
- package/lib/agent-cli-provider/gateway-runner.js +294 -0
- package/lib/agent-cli-provider/gateway-runner.js.map +1 -0
- package/lib/agent-cli-provider/gateway-tools.d.ts +14 -0
- package/lib/agent-cli-provider/gateway-tools.d.ts.map +1 -0
- package/lib/agent-cli-provider/gateway-tools.js +495 -0
- package/lib/agent-cli-provider/gateway-tools.js.map +1 -0
- package/lib/agent-cli-provider/index.d.ts +3 -2
- package/lib/agent-cli-provider/index.d.ts.map +1 -1
- package/lib/agent-cli-provider/index.js +14 -1
- package/lib/agent-cli-provider/index.js.map +1 -1
- package/lib/agent-cli-provider/invoke-evidence.d.ts +2 -2
- package/lib/agent-cli-provider/invoke-evidence.d.ts.map +1 -1
- package/lib/agent-cli-provider/invoke-evidence.js +17 -3
- package/lib/agent-cli-provider/invoke-evidence.js.map +1 -1
- package/lib/agent-cli-provider/provider-registry.d.ts +437 -0
- package/lib/agent-cli-provider/provider-registry.d.ts.map +1 -0
- package/lib/agent-cli-provider/provider-registry.js +411 -0
- package/lib/agent-cli-provider/provider-registry.js.map +1 -0
- package/lib/agent-cli-provider/single-agent-runtime.d.ts +7 -0
- package/lib/agent-cli-provider/single-agent-runtime.d.ts.map +1 -1
- package/lib/agent-cli-provider/single-agent-runtime.js +139 -19
- package/lib/agent-cli-provider/single-agent-runtime.js.map +1 -1
- package/lib/agent-cli-provider/types.d.ts +106 -4
- package/lib/agent-cli-provider/types.d.ts.map +1 -1
- package/lib/agent-cli-provider/types.js.map +1 -1
- package/lib/docker-config.js +24 -13
- package/lib/provider-defaults.js +15 -4
- package/lib/provider-detection.js +2 -0
- package/lib/provider-names.js +32 -12
- package/lib/repo-settings.js +15 -1
- package/lib/settings/claude-auth.js +3 -6
- package/lib/settings.js +17 -2
- package/lib/setup-apply.js +300 -0
- package/lib/setup-journal.js +109 -0
- package/lib/setup-plan.js +406 -0
- package/lib/setup-undo.js +88 -0
- package/lib/start-cluster.js +12 -1
- package/lib/stream-json-parser.js +7 -5
- package/package.json +29 -1
- package/scripts/live-provider-smoke.js +221 -0
- package/src/agent/agent-lifecycle.js +5 -4
- package/src/agent/agent-quality-gate-schema.js +2 -2
- package/src/agent/agent-task-executor.js +41 -2
- package/src/agent-cli-provider/acp-stdio-runner.ts +314 -0
- package/src/agent-cli-provider/adapters/acp.ts +493 -0
- package/src/agent-cli-provider/adapters/claude.ts +2 -32
- package/src/agent-cli-provider/adapters/copilot-parser.ts +166 -0
- package/src/agent-cli-provider/adapters/copilot.ts +231 -0
- package/src/agent-cli-provider/adapters/gateway.ts +186 -0
- package/src/agent-cli-provider/adapters/gemini.ts +9 -2
- package/src/agent-cli-provider/adapters/index.ts +5 -36
- package/src/agent-cli-provider/adapters/opencode.ts +4 -1
- package/src/agent-cli-provider/adapters/pi.ts +410 -0
- package/src/agent-cli-provider/claude-command.ts +47 -0
- package/src/agent-cli-provider/contract-actions.ts +14 -17
- package/src/agent-cli-provider/contract-invoke.ts +12 -3
- package/src/agent-cli-provider/contract-options.ts +72 -3
- package/src/agent-cli-provider/contract-support.ts +30 -3
- package/src/agent-cli-provider/errors.ts +14 -4
- package/src/agent-cli-provider/gateway-client.ts +170 -0
- package/src/agent-cli-provider/gateway-runner.ts +353 -0
- package/src/agent-cli-provider/gateway-tools.ts +616 -0
- package/src/agent-cli-provider/index.ts +28 -0
- package/src/agent-cli-provider/invoke-evidence.ts +24 -3
- package/src/agent-cli-provider/provider-registry.ts +515 -0
- package/src/agent-cli-provider/single-agent-runtime.ts +192 -18
- package/src/agent-cli-provider/types.ts +145 -4
- package/src/config-validator.js +33 -15
- package/src/isolation-manager.js +124 -19
- package/src/orchestrator.js +23 -10
- package/src/preflight.js +83 -30
- package/src/providers/capabilities.js +15 -42
- package/src/providers/index.js +52 -72
- package/src/worktree-claude-config.js +17 -0
- package/task-lib/commands/run.js +1 -0
- package/task-lib/provider-helper-runtime.js +11 -0
- package/task-lib/runner.js +7 -0
|
@@ -4,6 +4,7 @@ exports.requestOptions = requestOptions;
|
|
|
4
4
|
const json_1 = require("./json");
|
|
5
5
|
const contract_errors_1 = require("./contract-errors");
|
|
6
6
|
const contract_env_1 = require("./contract-env");
|
|
7
|
+
const gateway_tools_1 = require("./gateway-tools");
|
|
7
8
|
const OUTPUT_FORMATS = ['text', 'json', 'stream-json'];
|
|
8
9
|
const MODEL_LEVELS = ['level1', 'level2', 'level3'];
|
|
9
10
|
const REASONING_EFFORTS = ['low', 'medium', 'high', 'xhigh'];
|
|
@@ -17,12 +18,44 @@ const CLI_FEATURE_FIELDS = [
|
|
|
17
18
|
'supportsModel',
|
|
18
19
|
'supportsJson',
|
|
19
20
|
'supportsOutputSchema',
|
|
21
|
+
'supportsDir',
|
|
20
22
|
'supportsCwd',
|
|
21
23
|
'supportsConfigOverride',
|
|
22
24
|
'supportsSkipGitRepoCheck',
|
|
23
25
|
'supportsVariant',
|
|
26
|
+
'supportsJsonMode',
|
|
27
|
+
'supportsNoSession',
|
|
28
|
+
'supportsNoExtensions',
|
|
29
|
+
'supportsNoSkills',
|
|
30
|
+
'supportsNoPromptTemplates',
|
|
31
|
+
'supportsNoContextFiles',
|
|
32
|
+
'supportsNoApprove',
|
|
33
|
+
'supportsJsonOutput',
|
|
34
|
+
'supportsAllowAll',
|
|
35
|
+
'supportsNoAskUser',
|
|
36
|
+
'supportsAddDir',
|
|
37
|
+
'supportsMcpConfig',
|
|
38
|
+
'supportsBundledRunner',
|
|
39
|
+
'supportsAcpStdio',
|
|
40
|
+
'supportsPromptImages',
|
|
41
|
+
'supportsLoadSession',
|
|
42
|
+
'supportsSessionCancel',
|
|
43
|
+
'supportsSessionSetModel',
|
|
44
|
+
'supportsSessionSetMode',
|
|
45
|
+
'supportsRemoteTransport',
|
|
46
|
+
'supportsCustomTransport',
|
|
47
|
+
'supportsPermissionRequests',
|
|
48
|
+
'supportsFsTools',
|
|
49
|
+
'supportsTerminalTools',
|
|
24
50
|
'unknown',
|
|
25
51
|
];
|
|
52
|
+
const FALSE_ONLY_CLI_FEATURE_FIELDS = new Set([
|
|
53
|
+
'supportsRemoteTransport',
|
|
54
|
+
'supportsCustomTransport',
|
|
55
|
+
'supportsPermissionRequests',
|
|
56
|
+
'supportsFsTools',
|
|
57
|
+
'supportsTerminalTools',
|
|
58
|
+
]);
|
|
26
59
|
function requestOptions(value) {
|
|
27
60
|
if (value === undefined)
|
|
28
61
|
return {};
|
|
@@ -72,6 +105,22 @@ function optionalBooleanValue(value, field) {
|
|
|
72
105
|
return value;
|
|
73
106
|
(0, contract_errors_1.invalidField)(field, `${field} must be a boolean.`);
|
|
74
107
|
}
|
|
108
|
+
function optionalMcpConfig(value) {
|
|
109
|
+
if (value === undefined)
|
|
110
|
+
return undefined;
|
|
111
|
+
if (!Array.isArray(value)) {
|
|
112
|
+
(0, contract_errors_1.invalidField)('options.mcpConfig', 'options.mcpConfig must be an array of strings.');
|
|
113
|
+
}
|
|
114
|
+
return value.map((item, index) => {
|
|
115
|
+
if (typeof item !== 'string') {
|
|
116
|
+
(0, contract_errors_1.invalidField)(`options.mcpConfig[${index}]`, `options.mcpConfig[${index}] must be a string.`);
|
|
117
|
+
}
|
|
118
|
+
if (item.trim().length === 0) {
|
|
119
|
+
(0, contract_errors_1.invalidField)(`options.mcpConfig[${index}]`, `options.mcpConfig[${index}] must be a non-empty string.`);
|
|
120
|
+
}
|
|
121
|
+
return item;
|
|
122
|
+
});
|
|
123
|
+
}
|
|
75
124
|
function optionalEnumValue(value, field, allowed) {
|
|
76
125
|
if (value === undefined)
|
|
77
126
|
return undefined;
|
|
@@ -108,8 +157,12 @@ function optionalCliFeatures(value) {
|
|
|
108
157
|
const result = {};
|
|
109
158
|
for (const field of CLI_FEATURE_FIELDS) {
|
|
110
159
|
const item = optionalBooleanValue(value[field], `options.cliFeatures.${field}`);
|
|
111
|
-
if (item
|
|
112
|
-
|
|
160
|
+
if (item === undefined)
|
|
161
|
+
continue;
|
|
162
|
+
if (item && FALSE_ONLY_CLI_FEATURE_FIELDS.has(field)) {
|
|
163
|
+
(0, contract_errors_1.invalidField)(`options.cliFeatures.${field}`, `options.cliFeatures.${field} must be false when provided.`);
|
|
164
|
+
}
|
|
165
|
+
result[field] = item;
|
|
113
166
|
}
|
|
114
167
|
return result;
|
|
115
168
|
}
|
|
@@ -123,7 +176,9 @@ function normalizeBuildOptions(value) {
|
|
|
123
176
|
addDefined(result, 'resumeSessionId', optionalStringValue(value.resumeSessionId, 'options.resumeSessionId'));
|
|
124
177
|
addDefined(result, 'continueSession', optionalBooleanValue(value.continueSession, 'options.continueSession'));
|
|
125
178
|
addDefined(result, 'cliFeatures', optionalCliFeatures(value.cliFeatures));
|
|
179
|
+
addDefined(result, 'mcpConfig', optionalMcpConfig(value.mcpConfig));
|
|
126
180
|
addDefined(result, 'strictSchema', optionalBooleanValue(value.strictSchema, 'options.strictSchema'));
|
|
181
|
+
addDefined(result, 'gateway', (0, gateway_tools_1.normalizeGatewayBuildOptions)(value.gateway, 'options.gateway', optionalStringValue(value.cwd, 'options.cwd') ?? process.cwd()));
|
|
127
182
|
if (Object.prototype.hasOwnProperty.call(value, 'authEnv')) {
|
|
128
183
|
result.authEnv = (0, contract_env_1.stringRecord)(value.authEnv, 'options.authEnv');
|
|
129
184
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contract-options.js","sourceRoot":"","sources":["../../src/agent-cli-provider/contract-options.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"contract-options.js","sourceRoot":"","sources":["../../src/agent-cli-provider/contract-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ export declare function buildCommandSpec(request: RequestData): {
|
|
|
12
12
|
readonly adapter: ProviderAdapter;
|
|
13
13
|
readonly commandSpec: CommandSpec;
|
|
14
14
|
readonly options: BuildProviderCommandOptions;
|
|
15
|
+
readonly context: string;
|
|
15
16
|
};
|
|
16
17
|
export declare function schemaMode(options: BuildProviderCommandOptions): string;
|
|
17
18
|
export declare function validateRequest(input: string, schemaVersion: 1): RequestData;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contract-support.d.ts","sourceRoot":"","sources":["../../src/agent-cli-provider/contract-support.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,2BAA2B,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AACzF,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,cAAc,EACd,cAAc,EACd,cAAc,GACf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,qBAAqB,EACrB,iBAAiB,EACjB,aAAa,EACb,oBAAoB,EACpB,qBAAqB,EACrB,YAAY,GACb,MAAM,gBAAgB,CAAC;AAIxB,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CAChD;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,eAAe,CAmB3E;
|
|
1
|
+
{"version":3,"file":"contract-support.d.ts","sourceRoot":"","sources":["../../src/agent-cli-provider/contract-support.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,2BAA2B,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AACzF,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,cAAc,EACd,cAAc,EACd,cAAc,GACf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,qBAAqB,EACrB,iBAAiB,EACjB,aAAa,EACb,oBAAoB,EACpB,qBAAqB,EACrB,YAAY,GACb,MAAM,gBAAgB,CAAC;AAIxB,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CAChD;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,eAAe,CAmB3E;AA8CD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,WAAW,GAAG;IACtD,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAClC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,QAAQ,CAAC,OAAO,EAAE,2BAA2B,CAAC;IAC9C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B,CAeA;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,2BAA2B,GAAG,MAAM,CAGvE;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,GAAG,WAAW,CAU5E"}
|
|
@@ -37,23 +37,44 @@ function adapterForProvider(provider) {
|
|
|
37
37
|
try {
|
|
38
38
|
return (0, adapters_1.getProviderAdapter)(provider);
|
|
39
39
|
}
|
|
40
|
-
catch {
|
|
40
|
+
catch (error) {
|
|
41
41
|
throw (0, contract_errors_2.contractError)({
|
|
42
42
|
code: 'unknown-provider',
|
|
43
|
-
message: `Unknown provider: ${provider}.`,
|
|
43
|
+
message: error instanceof Error ? error.message : `Unknown provider: ${provider}.`,
|
|
44
44
|
exitCode: 4,
|
|
45
45
|
field: 'provider',
|
|
46
46
|
});
|
|
47
47
|
}
|
|
48
48
|
}
|
|
49
49
|
function mergeCommandSpec(commandSpec, env) {
|
|
50
|
-
const
|
|
50
|
+
const overriddenKey = findReservedCommandEnvKey(commandSpec.env, env);
|
|
51
|
+
if (overriddenKey !== null) {
|
|
52
|
+
throw (0, contract_errors_2.contractError)({
|
|
53
|
+
code: 'forbidden-field',
|
|
54
|
+
message: `env.${overriddenKey.requestKey} is not accepted by provider executable requests; provider adapters own ${overriddenKey.commandKey} and other runner control/auth environment variables.`,
|
|
55
|
+
exitCode: 2,
|
|
56
|
+
field: `env.${overriddenKey.requestKey}`,
|
|
57
|
+
});
|
|
58
|
+
}
|
|
59
|
+
const mergedEnv = { ...env, ...commandSpec.env };
|
|
51
60
|
return {
|
|
52
61
|
...commandSpec,
|
|
53
62
|
env: mergedEnv,
|
|
54
63
|
redactions: (0, redaction_1.mergeRedactions)(commandSpec.redactions, (0, contract_env_2.envRedactions)(mergedEnv)),
|
|
55
64
|
};
|
|
56
65
|
}
|
|
66
|
+
function findReservedCommandEnvKey(commandEnv, requestedEnv) {
|
|
67
|
+
const commandEnvKeys = new Map();
|
|
68
|
+
for (const key of Object.keys(commandEnv)) {
|
|
69
|
+
commandEnvKeys.set(key.toLowerCase(), key);
|
|
70
|
+
}
|
|
71
|
+
for (const key of Object.keys(requestedEnv)) {
|
|
72
|
+
const commandKey = commandEnvKeys.get(key.toLowerCase());
|
|
73
|
+
if (commandKey !== undefined)
|
|
74
|
+
return { requestKey: key, commandKey };
|
|
75
|
+
}
|
|
76
|
+
return null;
|
|
77
|
+
}
|
|
57
78
|
function buildOptions(request) {
|
|
58
79
|
const options = (0, contract_options_1.requestOptions)(request.raw.options);
|
|
59
80
|
const cwd = (0, contract_errors_2.optionalString)(request.raw, 'cwd');
|
|
@@ -72,6 +93,7 @@ function buildCommandSpec(request) {
|
|
|
72
93
|
});
|
|
73
94
|
return {
|
|
74
95
|
adapter: prepared.adapter,
|
|
96
|
+
context,
|
|
75
97
|
options: prepared.options,
|
|
76
98
|
commandSpec: mergeCommandSpec(prepared.commandSpec, request.env),
|
|
77
99
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contract-support.js","sourceRoot":"","sources":["../../src/agent-cli-provider/contract-support.ts"],"names":[],"mappings":";;;AA+BA,gDAmBC;
|
|
1
|
+
{"version":3,"file":"contract-support.js","sourceRoot":"","sources":["../../src/agent-cli-provider/contract-support.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { ErrorClassification } from './types';
|
|
2
|
+
export declare function extractErrorStatus(error: unknown): number | null;
|
|
2
3
|
export declare function baseRetryableErrorPatterns(): readonly RegExp[];
|
|
3
4
|
export declare function basePermanentErrorPatterns(): readonly RegExp[];
|
|
4
5
|
export declare function classifyErrorWithPatterns(error: unknown, retryablePatterns: readonly RegExp[], permanentPatterns: readonly RegExp[]): ErrorClassification;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/agent-cli-provider/errors.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/agent-cli-provider/errors.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AA0CnD,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAWhE;AAcD,wBAAgB,0BAA0B,IAAI,SAAS,MAAM,EAAE,CAE9D;AAED,wBAAgB,0BAA0B,IAAI,SAAS,MAAM,EAAE,CAE9D;AAED,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,OAAO,EACd,iBAAiB,EAAE,SAAS,MAAM,EAAE,EACpC,iBAAiB,EAAE,SAAS,MAAM,EAAE,GACnC,mBAAmB,CAUrB"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.extractErrorStatus = extractErrorStatus;
|
|
3
4
|
exports.baseRetryableErrorPatterns = baseRetryableErrorPatterns;
|
|
4
5
|
exports.basePermanentErrorPatterns = basePermanentErrorPatterns;
|
|
5
6
|
exports.classifyErrorWithPatterns = classifyErrorWithPatterns;
|
|
@@ -35,16 +36,24 @@ const BASE_PERMANENT_PATTERNS = [
|
|
|
35
36
|
/context length exceeded/i,
|
|
36
37
|
/insufficient quota/i,
|
|
37
38
|
];
|
|
38
|
-
function
|
|
39
|
+
function statusFromMessage(message) {
|
|
40
|
+
const match = /\b(?:status(?: code)?|http)\s+(?<status>\d{3})\b/i.exec(message);
|
|
41
|
+
if (!match?.groups?.status)
|
|
42
|
+
return null;
|
|
43
|
+
const status = Number.parseInt(match.groups.status, 10);
|
|
44
|
+
return Number.isInteger(status) ? status : null;
|
|
45
|
+
}
|
|
46
|
+
function extractErrorStatus(error) {
|
|
39
47
|
if (!(0, json_1.isRecord)(error))
|
|
40
48
|
return null;
|
|
41
49
|
const directStatus = (0, json_1.getNumber)(error, 'status') ?? (0, json_1.getNumber)(error, 'statusCode');
|
|
42
50
|
if (directStatus !== null)
|
|
43
51
|
return directStatus;
|
|
44
52
|
const response = (0, json_1.getRecord)(error, 'response');
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
53
|
+
const responseStatus = response === null ? null : (0, json_1.getNumber)(response, 'status') ?? (0, json_1.getNumber)(response, 'statusCode');
|
|
54
|
+
if (responseStatus !== null)
|
|
55
|
+
return responseStatus;
|
|
56
|
+
return statusFromMessage((0, json_1.unknownToMessage)(error));
|
|
48
57
|
}
|
|
49
58
|
function getCode(error) {
|
|
50
59
|
if (!(0, json_1.isRecord)(error))
|
|
@@ -65,7 +74,7 @@ function basePermanentErrorPatterns() {
|
|
|
65
74
|
return BASE_PERMANENT_PATTERNS;
|
|
66
75
|
}
|
|
67
76
|
function classifyErrorWithPatterns(error, retryablePatterns, permanentPatterns) {
|
|
68
|
-
const statusClassification = classifyStatus(
|
|
77
|
+
const statusClassification = classifyStatus(extractErrorStatus(error));
|
|
69
78
|
if (statusClassification !== null)
|
|
70
79
|
return statusClassification;
|
|
71
80
|
const codeClassification = classifyCode(getCode(error));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/agent-cli-provider/errors.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/agent-cli-provider/errors.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
export interface GatewayChatToolDefinition {
|
|
2
|
+
readonly type: 'function';
|
|
3
|
+
readonly function: {
|
|
4
|
+
readonly name: string;
|
|
5
|
+
readonly description: string;
|
|
6
|
+
readonly parameters: Record<string, unknown>;
|
|
7
|
+
};
|
|
8
|
+
}
|
|
9
|
+
export interface GatewayToolCall {
|
|
10
|
+
readonly id: string;
|
|
11
|
+
readonly name: string;
|
|
12
|
+
readonly argumentsText: string;
|
|
13
|
+
}
|
|
14
|
+
export interface GatewayChatMessage {
|
|
15
|
+
readonly role: 'system' | 'user' | 'assistant' | 'tool';
|
|
16
|
+
readonly content: string;
|
|
17
|
+
readonly toolCalls?: readonly GatewayToolCall[];
|
|
18
|
+
readonly toolCallId?: string;
|
|
19
|
+
}
|
|
20
|
+
export interface GatewayChatResponse {
|
|
21
|
+
readonly text: string;
|
|
22
|
+
readonly toolCalls: readonly GatewayToolCall[];
|
|
23
|
+
}
|
|
24
|
+
export declare function createGatewayChatCompletion(input: {
|
|
25
|
+
readonly baseUrl: string;
|
|
26
|
+
readonly apiKey: string;
|
|
27
|
+
readonly headers: Readonly<Record<string, string>>;
|
|
28
|
+
readonly model: string;
|
|
29
|
+
readonly messages: readonly GatewayChatMessage[];
|
|
30
|
+
readonly tools: readonly GatewayChatToolDefinition[];
|
|
31
|
+
}): Promise<GatewayChatResponse>;
|
|
32
|
+
//# sourceMappingURL=gateway-client.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"gateway-client.d.ts","sourceRoot":"","sources":["../../src/agent-cli-provider/gateway-client.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAE;QACjB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;QAC7B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAC9C,CAAC;CACH;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;CAChC;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,GAAG,WAAW,GAAG,MAAM,CAAC;IACxD,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,eAAe,EAAE,CAAC;IAChD,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,SAAS,eAAe,EAAE,CAAC;CAChD;AAYD,wBAAsB,2BAA2B,CAAC,KAAK,EAAE;IACvD,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACnD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,QAAQ,EAAE,SAAS,kBAAkB,EAAE,CAAC;IACjD,QAAQ,CAAC,KAAK,EAAE,SAAS,yBAAyB,EAAE,CAAC;CACtD,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAuC/B"}
|
|
@@ -0,0 +1,135 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createGatewayChatCompletion = createGatewayChatCompletion;
|
|
4
|
+
const json_1 = require("./json");
|
|
5
|
+
class GatewayHttpError extends Error {
|
|
6
|
+
status;
|
|
7
|
+
constructor(status, message) {
|
|
8
|
+
super(message);
|
|
9
|
+
this.name = 'GatewayHttpError';
|
|
10
|
+
this.status = status;
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
async function createGatewayChatCompletion(input) {
|
|
14
|
+
const response = await fetch(`${input.baseUrl}/chat/completions`, {
|
|
15
|
+
method: 'POST',
|
|
16
|
+
headers: {
|
|
17
|
+
'Content-Type': 'application/json',
|
|
18
|
+
Authorization: `Bearer ${input.apiKey}`,
|
|
19
|
+
...input.headers,
|
|
20
|
+
},
|
|
21
|
+
body: JSON.stringify({
|
|
22
|
+
model: input.model,
|
|
23
|
+
messages: input.messages.map((message) => serializeMessage(message)),
|
|
24
|
+
tools: input.tools,
|
|
25
|
+
tool_choice: 'auto',
|
|
26
|
+
temperature: 0,
|
|
27
|
+
}),
|
|
28
|
+
});
|
|
29
|
+
const bodyText = await response.text();
|
|
30
|
+
const parsed = tryParseJson(bodyText);
|
|
31
|
+
if (!response.ok) {
|
|
32
|
+
throw httpError(response.status, parsed ?? bodyText);
|
|
33
|
+
}
|
|
34
|
+
if (!(0, json_1.isRecord)(parsed)) {
|
|
35
|
+
throw new Error('Gateway returned a non-JSON response.');
|
|
36
|
+
}
|
|
37
|
+
const choice = (0, json_1.getArray)(parsed, 'choices')[0];
|
|
38
|
+
if (!(0, json_1.isRecord)(choice)) {
|
|
39
|
+
throw new Error('Gateway response did not include choices[0].');
|
|
40
|
+
}
|
|
41
|
+
const message = (0, json_1.getRecord)(choice, 'message');
|
|
42
|
+
if (message === null) {
|
|
43
|
+
throw new Error('Gateway response did not include choices[0].message.');
|
|
44
|
+
}
|
|
45
|
+
return {
|
|
46
|
+
text: getGatewayMessageText(message),
|
|
47
|
+
toolCalls: getGatewayToolCalls(message),
|
|
48
|
+
};
|
|
49
|
+
}
|
|
50
|
+
function serializeMessage(message) {
|
|
51
|
+
if (message.role === 'assistant' && message.toolCalls && message.toolCalls.length > 0) {
|
|
52
|
+
return {
|
|
53
|
+
role: 'assistant',
|
|
54
|
+
content: message.content,
|
|
55
|
+
tool_calls: message.toolCalls.map((toolCall) => ({
|
|
56
|
+
id: toolCall.id,
|
|
57
|
+
type: 'function',
|
|
58
|
+
function: {
|
|
59
|
+
name: toolCall.name,
|
|
60
|
+
arguments: toolCall.argumentsText,
|
|
61
|
+
},
|
|
62
|
+
})),
|
|
63
|
+
};
|
|
64
|
+
}
|
|
65
|
+
if (message.role === 'tool') {
|
|
66
|
+
return {
|
|
67
|
+
role: 'tool',
|
|
68
|
+
tool_call_id: message.toolCallId,
|
|
69
|
+
content: message.content,
|
|
70
|
+
};
|
|
71
|
+
}
|
|
72
|
+
return {
|
|
73
|
+
role: message.role,
|
|
74
|
+
content: message.content,
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
function getGatewayMessageText(message) {
|
|
78
|
+
const content = message.content;
|
|
79
|
+
if (typeof content === 'string')
|
|
80
|
+
return content;
|
|
81
|
+
if (!Array.isArray(content))
|
|
82
|
+
return '';
|
|
83
|
+
let text = '';
|
|
84
|
+
for (const item of content) {
|
|
85
|
+
if (!(0, json_1.isRecord)(item))
|
|
86
|
+
continue;
|
|
87
|
+
const type = (0, json_1.getString)(item, 'type');
|
|
88
|
+
if (type === 'text') {
|
|
89
|
+
text += (0, json_1.getString)(item, 'text') ?? '';
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
return text;
|
|
93
|
+
}
|
|
94
|
+
function getGatewayToolCalls(message) {
|
|
95
|
+
const result = [];
|
|
96
|
+
for (const item of (0, json_1.getArray)(message, 'tool_calls')) {
|
|
97
|
+
if (!(0, json_1.isRecord)(item))
|
|
98
|
+
continue;
|
|
99
|
+
const id = (0, json_1.getString)(item, 'id');
|
|
100
|
+
const fn = (0, json_1.getRecord)(item, 'function');
|
|
101
|
+
const name = fn === null ? null : (0, json_1.getString)(fn, 'name');
|
|
102
|
+
const argumentsText = fn === null ? null : (0, json_1.getString)(fn, 'arguments');
|
|
103
|
+
if (!id || !name || argumentsText === null)
|
|
104
|
+
continue;
|
|
105
|
+
result.push({ id, name, argumentsText });
|
|
106
|
+
}
|
|
107
|
+
return result;
|
|
108
|
+
}
|
|
109
|
+
function httpError(status, body) {
|
|
110
|
+
return new GatewayHttpError(status, buildGatewayErrorMessage(status, body));
|
|
111
|
+
}
|
|
112
|
+
function buildGatewayErrorMessage(status, body) {
|
|
113
|
+
if ((0, json_1.isRecord)(body)) {
|
|
114
|
+
const nested = (0, json_1.getRecord)(body, 'error');
|
|
115
|
+
if (nested) {
|
|
116
|
+
const message = (0, json_1.getString)(nested, 'message');
|
|
117
|
+
if (message)
|
|
118
|
+
return `Gateway request failed with status ${status}: ${message}`;
|
|
119
|
+
return `Gateway request failed with status ${status}: ${(0, json_1.unknownToMessage)(nested)}`;
|
|
120
|
+
}
|
|
121
|
+
const message = (0, json_1.getString)(body, 'message');
|
|
122
|
+
if (message)
|
|
123
|
+
return `Gateway request failed with status ${status}: ${message}`;
|
|
124
|
+
}
|
|
125
|
+
return `Gateway request failed with status ${status}: ${(0, json_1.unknownToMessage)(body)}`;
|
|
126
|
+
}
|
|
127
|
+
function tryParseJson(value) {
|
|
128
|
+
try {
|
|
129
|
+
return JSON.parse(value);
|
|
130
|
+
}
|
|
131
|
+
catch {
|
|
132
|
+
return null;
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
//# sourceMappingURL=gateway-client.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"gateway-client.js","sourceRoot":"","sources":["../../src/agent-cli-provider/gateway-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { GatewayBuildOptions, OutputEvent } from './types';
|
|
2
|
+
export interface GatewayRunnerRequest {
|
|
3
|
+
readonly context: string;
|
|
4
|
+
readonly gateway: GatewayBuildOptions;
|
|
5
|
+
readonly cwd: string;
|
|
6
|
+
}
|
|
7
|
+
export declare function runGatewayRequest(request: GatewayRunnerRequest): Promise<readonly OutputEvent[]>;
|
|
8
|
+
export declare function gatewayRunnerRequestFromEnv(env?: NodeJS.ProcessEnv): GatewayRunnerRequest;
|
|
9
|
+
//# sourceMappingURL=gateway-runner.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"gateway-runner.d.ts","sourceRoot":"","sources":["../../src/agent-cli-provider/gateway-runner.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,mBAAmB,EAAqB,WAAW,EAA+B,MAAM,SAAS,CAAC;AAIhH,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,mBAAmB,CAAC;IACtC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;CACtB;AAyDD,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,SAAS,WAAW,EAAE,CAAC,CAetG;AAED,wBAAgB,2BAA2B,CACzC,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,oBAAoB,CA6BtB"}
|