@the-open-engine/zeroshot 6.15.0 → 6.16.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/README.md +10 -7
- package/cli/commands/providers.js +1 -0
- package/cli/index.js +45 -4
- package/lib/agent-cli-provider/adapters/codex.d.ts.map +1 -1
- package/lib/agent-cli-provider/adapters/codex.js +14 -2
- package/lib/agent-cli-provider/adapters/codex.js.map +1 -1
- package/lib/agent-cli-provider/adapters/common.d.ts +1 -0
- package/lib/agent-cli-provider/adapters/common.d.ts.map +1 -1
- package/lib/agent-cli-provider/adapters/common.js +14 -0
- package/lib/agent-cli-provider/adapters/common.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 -1
- 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 +52 -3
- package/lib/agent-cli-provider/adapters/opencode.js.map +1 -1
- package/lib/agent-cli-provider/contract-actions.d.ts.map +1 -1
- package/lib/agent-cli-provider/contract-actions.js +19 -8
- package/lib/agent-cli-provider/contract-actions.js.map +1 -1
- package/lib/agent-cli-provider/contract-fallback.d.ts.map +1 -1
- package/lib/agent-cli-provider/contract-fallback.js +9 -0
- package/lib/agent-cli-provider/contract-fallback.js.map +1 -1
- package/lib/agent-cli-provider/contract-options.d.ts.map +1 -1
- package/lib/agent-cli-provider/contract-options.js +2 -0
- package/lib/agent-cli-provider/contract-options.js.map +1 -1
- package/lib/agent-cli-provider/errors.d.ts +7 -0
- package/lib/agent-cli-provider/errors.d.ts.map +1 -1
- package/lib/agent-cli-provider/errors.js +14 -0
- package/lib/agent-cli-provider/errors.js.map +1 -1
- package/lib/agent-cli-provider/index.d.ts +1 -1
- package/lib/agent-cli-provider/index.d.ts.map +1 -1
- package/lib/agent-cli-provider/index.js.map +1 -1
- package/lib/agent-cli-provider/provider-registry.d.ts +20 -3
- package/lib/agent-cli-provider/provider-registry.d.ts.map +1 -1
- package/lib/agent-cli-provider/provider-registry.js +15 -2
- package/lib/agent-cli-provider/provider-registry.js.map +1 -1
- package/lib/agent-cli-provider/single-agent-runtime.d.ts +14 -2
- package/lib/agent-cli-provider/single-agent-runtime.d.ts.map +1 -1
- package/lib/agent-cli-provider/single-agent-runtime.js +97 -22
- package/lib/agent-cli-provider/single-agent-runtime.js.map +1 -1
- package/lib/agent-cli-provider/types.d.ts +11 -1
- package/lib/agent-cli-provider/types.d.ts.map +1 -1
- package/lib/agent-cli-provider/types.js.map +1 -1
- package/package.json +1 -1
- package/src/agent/agent-lifecycle.js +52 -1
- package/src/agent/agent-task-executor.js +8 -3
- package/src/agent-cli-provider/adapters/codex.ts +23 -2
- package/src/agent-cli-provider/adapters/common.ts +14 -0
- package/src/agent-cli-provider/adapters/index.ts +16 -2
- package/src/agent-cli-provider/adapters/opencode.ts +60 -4
- package/src/agent-cli-provider/contract-actions.ts +20 -9
- package/src/agent-cli-provider/contract-fallback.ts +9 -0
- package/src/agent-cli-provider/contract-options.ts +2 -0
- package/src/agent-cli-provider/errors.ts +14 -0
- package/src/agent-cli-provider/index.ts +1 -0
- package/src/agent-cli-provider/provider-registry.ts +20 -2
- package/src/agent-cli-provider/single-agent-runtime.ts +144 -24
- package/src/agent-cli-provider/types.ts +12 -1
- package/src/claude-task-runner.js +11 -0
- package/src/orchestrator.js +8 -3
- package/src/providers/index.js +6 -0
- package/src/task-run-model-args.js +58 -40
- package/src/task-spawn-cleanup-ownership.js +3 -0
- package/src/task-startup-error.js +68 -0
package/README.md
CHANGED
|
@@ -26,6 +26,15 @@
|
|
|
26
26
|
|
|
27
27
|
Zeroshot is an open-source, multi-agent orchestration engine for autonomous software engineering. It drives a coding agent you already run (Claude Code, OpenAI Codex, Gemini CLI, or OpenCode) through an **executor-verifier loop**: an agent writes the change, then an _independent_ verifier that never saw how it was made approves it, or hands back a reproducible failure. The loop runs until the change is verified.
|
|
28
28
|
|
|
29
|
+
<div align="center">
|
|
30
|
+
<picture>
|
|
31
|
+
<source media="(prefers-color-scheme: dark)" srcset="docs/assets/zeroshot-architecture-dark.webp">
|
|
32
|
+
<img alt="One Zeroshot run drawn as a graph: an issue enters, a junior conductor escalates to a senior one, the config router sizes the cluster, a planner and worker execute, two stages of validators judge the result, the run is rejected once and approved on the second pass, and every event is appended to the ledger" src="docs/assets/zeroshot-architecture-light.webp" width="100%">
|
|
33
|
+
</picture>
|
|
34
|
+
<br>
|
|
35
|
+
<em>One run, drawn as it happens. The conductor escalates to a senior model, the router sizes the cluster, and the change is rejected once before it is approved.</em>
|
|
36
|
+
</div>
|
|
37
|
+
|
|
29
38
|
## Install
|
|
30
39
|
|
|
31
40
|
<!-- install-placeholder -->
|
|
@@ -39,7 +48,7 @@ Requires **Node ≥ 18** and at least one provider CLI (Claude Code, Codex, Gemi
|
|
|
39
48
|
<div align="center">
|
|
40
49
|
<img src="docs/assets/zeroshot-demo.gif" alt="Zeroshot resolving an issue through the executor-verifier loop" width="760">
|
|
41
50
|
<br>
|
|
42
|
-
<em>
|
|
51
|
+
<em>And here it is actually running. Unattended, 100× speed · 90-minute run · 5 iterations to approval.</em>
|
|
43
52
|
</div>
|
|
44
53
|
|
|
45
54
|
## How it works
|
|
@@ -48,12 +57,6 @@ Zeroshot separates the agent that **writes** the code from the agent that **judg
|
|
|
48
57
|
|
|
49
58
|
A conductor sizes the workflow to the task. An executor (an AI coding agent) implements the change in an isolated workspace (git worktree or Docker). Then an **independent verifier** inspects the result without ever seeing the executor's context or history, so it cannot approve its own reasoning. The verifier returns `APPROVED`, or `REJECTED` with an actionable, reproducible failure, and the loop repeats until the change is verified or hands back a concrete reason it isn't. Every step is written to a crash-safe SQLite ledger, so a run survives a reboot and resumes where it stopped.
|
|
50
59
|
|
|
51
|
-
```text
|
|
52
|
-
task --> plan --> implement --> verify --> APPROVED --> done
|
|
53
|
-
^ |
|
|
54
|
-
+- REJECTED -+ (reproducible failure)
|
|
55
|
-
```
|
|
56
|
-
|
|
57
60
|
Bring your own provider and your own backend. Zeroshot orchestrates the agents that write your code; it doesn't store your keys or replace your models.
|
|
58
61
|
|
|
59
62
|
## How is this different from a single coding agent?
|
|
@@ -138,6 +138,7 @@ async function setupCommand(args) {
|
|
|
138
138
|
mutateSettings((settings) => {
|
|
139
139
|
settings.providerSettings = settings.providerSettings || {};
|
|
140
140
|
settings.providerSettings[provider] = {
|
|
141
|
+
...(settings.providerSettings[provider] || {}),
|
|
141
142
|
maxLevel: levelKeys[maxIdx - 1],
|
|
142
143
|
minLevel: levelKeys[minIdx - 1],
|
|
143
144
|
defaultLevel: levelKeys[defaultIdxNum - 1],
|
package/cli/index.js
CHANGED
|
@@ -49,7 +49,13 @@ const {
|
|
|
49
49
|
DEFAULT_SETTINGS,
|
|
50
50
|
settingsFileExists,
|
|
51
51
|
} = require('../lib/settings');
|
|
52
|
-
const {
|
|
52
|
+
const {
|
|
53
|
+
VALID_PROVIDERS,
|
|
54
|
+
getProviderMetadata,
|
|
55
|
+
normalizeProviderName,
|
|
56
|
+
resolveProviderCommand,
|
|
57
|
+
} = require('../lib/provider-names');
|
|
58
|
+
const { commandExists } = require('../lib/provider-detection');
|
|
53
59
|
const { getProvider, parseProviderChunk } = require('../src/providers');
|
|
54
60
|
const { readClustersFileSync } = require('../lib/clusters-registry');
|
|
55
61
|
const { MOUNT_PRESETS, resolveEnvs } = require('../lib/docker-config');
|
|
@@ -69,6 +75,10 @@ const {
|
|
|
69
75
|
startClusterFromText,
|
|
70
76
|
} = require('../lib/start-cluster');
|
|
71
77
|
const { requirePreflight } = require('../src/preflight');
|
|
78
|
+
const {
|
|
79
|
+
createUnsupportedProviderCapabilityError,
|
|
80
|
+
serializeTaskStartupError,
|
|
81
|
+
} = require('../src/task-startup-error');
|
|
72
82
|
const { providersCommand, setDefaultCommand, setupCommand } = require('./commands/providers');
|
|
73
83
|
const { runInspectCommand } = require('./commands/inspect');
|
|
74
84
|
const { runCmdproof } = require('./commands/cmdproof');
|
|
@@ -2835,6 +2845,24 @@ for (const mode of ['prove', 'verify', 'check']) {
|
|
|
2835
2845
|
});
|
|
2836
2846
|
}
|
|
2837
2847
|
|
|
2848
|
+
function assertRequestedWebSearchCliAvailable(
|
|
2849
|
+
provider,
|
|
2850
|
+
settings,
|
|
2851
|
+
exists = commandExists
|
|
2852
|
+
) {
|
|
2853
|
+
const metadata = getProviderMetadata(provider);
|
|
2854
|
+
if (!metadata.settingsFields.includes('webSearch')) return;
|
|
2855
|
+
if (settings.providerSettings?.[provider]?.webSearch !== true) return;
|
|
2856
|
+
const { command } = resolveProviderCommand(provider);
|
|
2857
|
+
if (exists(command)) return;
|
|
2858
|
+
throw createUnsupportedProviderCapabilityError(
|
|
2859
|
+
provider,
|
|
2860
|
+
'webSearch',
|
|
2861
|
+
`${metadata.displayName} web search was requested, but the ${command} CLI is not installed. ` +
|
|
2862
|
+
`${metadata.installInstructions}. Install it or set providerSettings.${provider}.webSearch to false.`
|
|
2863
|
+
);
|
|
2864
|
+
}
|
|
2865
|
+
|
|
2838
2866
|
taskCmd
|
|
2839
2867
|
.command('run <prompt>')
|
|
2840
2868
|
.description('Run a single-agent background task')
|
|
@@ -2842,9 +2870,18 @@ taskCmd
|
|
|
2842
2870
|
.option('--provider <provider>', `Provider to use (${PROVIDER_CHOICES})`)
|
|
2843
2871
|
.option('--model <model>', 'Model id override for the provider')
|
|
2844
2872
|
.option('--model-level <level>', 'Model level override (level1, level2, level3)')
|
|
2845
|
-
.option(
|
|
2846
|
-
|
|
2847
|
-
|
|
2873
|
+
.option(
|
|
2874
|
+
'--reasoning-effort <effort>',
|
|
2875
|
+
'Reasoning effort override (low, medium, high, xhigh, max)'
|
|
2876
|
+
)
|
|
2877
|
+
.option(
|
|
2878
|
+
'-r, --resume <sessionId>',
|
|
2879
|
+
'Resume a specific provider session (Claude, Codex, or OpenCode)'
|
|
2880
|
+
)
|
|
2881
|
+
.option(
|
|
2882
|
+
'-c, --continue',
|
|
2883
|
+
'Continue the most recent provider session (Claude or OpenCode)'
|
|
2884
|
+
)
|
|
2848
2885
|
.option(
|
|
2849
2886
|
'-o, --output-format <format>',
|
|
2850
2887
|
'Output format: stream-json (default), text, json',
|
|
@@ -2866,6 +2903,7 @@ taskCmd
|
|
|
2866
2903
|
const providerOverride = normalizeProviderName(
|
|
2867
2904
|
options.provider || process.env.ZEROSHOT_PROVIDER || settings.defaultProvider
|
|
2868
2905
|
);
|
|
2906
|
+
assertRequestedWebSearchCliAvailable(providerOverride, settings);
|
|
2869
2907
|
await requirePreflight({
|
|
2870
2908
|
requireGh: false, // gh not needed for plain tasks
|
|
2871
2909
|
requireDocker: false, // Docker not needed for plain tasks
|
|
@@ -2878,6 +2916,8 @@ taskCmd
|
|
|
2878
2916
|
await runTask(prompt, options);
|
|
2879
2917
|
} catch (error) {
|
|
2880
2918
|
console.error('Error:', error.message);
|
|
2919
|
+
const startupEnvelope = serializeTaskStartupError(error);
|
|
2920
|
+
if (startupEnvelope) fs.writeSync(process.stderr.fd, `${startupEnvelope}\n`);
|
|
2881
2921
|
process.exit(1);
|
|
2882
2922
|
}
|
|
2883
2923
|
});
|
|
@@ -6010,6 +6050,7 @@ if (require.main === module) {
|
|
|
6010
6050
|
}
|
|
6011
6051
|
|
|
6012
6052
|
module.exports = {
|
|
6053
|
+
assertRequestedWebSearchCliAvailable,
|
|
6013
6054
|
applyModelOverrideToConfig,
|
|
6014
6055
|
inspectAgentAttachment,
|
|
6015
6056
|
printAttachableAgentList,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/codex.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/codex.ts"],"names":[],"mappings":"AAGA,OAAO,EASL,KAAK,eAAe,EAGrB,MAAM,UAAU,CAAC;AA8PlB,eAAO,MAAM,YAAY,EAAE,eAmB1B,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.codexAdapter = void 0;
|
|
4
|
+
const errors_1 = require("../errors");
|
|
4
5
|
const json_1 = require("../json");
|
|
5
6
|
const schema_1 = require("../schema");
|
|
6
7
|
const common_1 = require("./common");
|
|
@@ -24,19 +25,21 @@ const LEVEL_MAPPING = {
|
|
|
24
25
|
function supports(help, pattern) {
|
|
25
26
|
return help ? pattern.test(help) : true;
|
|
26
27
|
}
|
|
27
|
-
function detectCliFeatures(helpText) {
|
|
28
|
+
function detectCliFeatures(helpText, versionText) {
|
|
28
29
|
const help = helpText ?? '';
|
|
29
30
|
const unknown = !help;
|
|
31
|
+
const supportsConfigOverride = supports(help, /--config\b/);
|
|
30
32
|
return {
|
|
31
33
|
provider: 'codex',
|
|
32
34
|
supportsJson: supports(help, /--json\b/),
|
|
33
35
|
supportsOutputSchema: supports(help, /--output-schema\b/),
|
|
34
36
|
supportsAutoApprove: supports(help, /--dangerously-bypass-approvals-and-sandbox\b/),
|
|
35
37
|
supportsCwd: supports(help, /\s-C\b/) || supports(help, /--cwd\b/),
|
|
36
|
-
supportsConfigOverride
|
|
38
|
+
supportsConfigOverride,
|
|
37
39
|
supportsModel: supports(help, /\s-m\b/) || supports(help, /--model\b/),
|
|
38
40
|
supportsSkipGitRepoCheck: supports(help, /--skip-git-repo-check\b/),
|
|
39
41
|
supportsResume: supports(help, /\bresume\b/),
|
|
42
|
+
supportsWebSearch: !unknown && supportsConfigOverride && (0, common_1.isCliVersionAtLeast)(versionText, '0.146.0'),
|
|
40
43
|
unknown,
|
|
41
44
|
};
|
|
42
45
|
}
|
|
@@ -111,6 +114,14 @@ function collectWarnings(options) {
|
|
|
111
114
|
}
|
|
112
115
|
return warnings;
|
|
113
116
|
}
|
|
117
|
+
function addWebSearchArgs(args, options) {
|
|
118
|
+
if (options.webSearch !== true)
|
|
119
|
+
return;
|
|
120
|
+
if ((0, common_1.optionFeatures)(options).supportsWebSearch !== true) {
|
|
121
|
+
throw new errors_1.UnsupportedProviderCapabilityError('codex', 'webSearch', 'Codex web search requires nonempty `codex exec --help` support for `--config` and a parseable Codex CLI version >= 0.146.0. Update @openai/codex or set providerSettings.codex.webSearch to false.');
|
|
122
|
+
}
|
|
123
|
+
args.push('--config', 'web_search="live"');
|
|
124
|
+
}
|
|
114
125
|
function buildCommand(context, options = {}) {
|
|
115
126
|
if (options.resumeSessionId && (0, common_1.optionFeatures)(options).supportsResume === false) {
|
|
116
127
|
throw new Error('Codex CLI cannot safely run continuation context because this installation lacks exec resume.');
|
|
@@ -120,6 +131,7 @@ function buildCommand(context, options = {}) {
|
|
|
120
131
|
const resumeSessionId = options.resumeSessionId && (0, common_1.optionFeatures)(options).supportsResume !== false
|
|
121
132
|
? options.resumeSessionId
|
|
122
133
|
: null;
|
|
134
|
+
addWebSearchArgs(args, options);
|
|
123
135
|
if (resumeSessionId) {
|
|
124
136
|
args.push('resume');
|
|
125
137
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/codex.ts"],"names":[],"mappings":";;;AAAA,kCAA4D;AAC5D,sCAAgF;AAchF,
|
|
1
|
+
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/codex.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,5 +24,6 @@ export declare function resolveModelSpecWithConfig(config: ModelResolutionConfig
|
|
|
24
24
|
export declare function validateModelIdFromCatalog(provider: ProviderId, catalog: Readonly<Record<string, ModelCatalogEntry>>, modelId: string | null | undefined): string | null | undefined;
|
|
25
25
|
export declare function classifyBaseProviderError(error: unknown, retryablePatterns: readonly RegExp[], permanentPatterns: readonly RegExp[]): ErrorClassification;
|
|
26
26
|
export declare function optionFeatures(options: BuildProviderCommandOptions | undefined): CliFeatureOverrides;
|
|
27
|
+
export declare function isCliVersionAtLeast(versionText: string | null | undefined, floor: string): boolean;
|
|
27
28
|
export {};
|
|
28
29
|
//# sourceMappingURL=common.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/common.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,KAAK,2BAA2B,EAChC,KAAK,mBAAmB,EACxB,KAAK,eAAe,EACpB,KAAK,WAAW,EAChB,KAAK,mBAAmB,EACxB,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACtB,KAAK,UAAU,EACf,KAAK,UAAU,EACf,KAAK,mBAAmB,EACxB,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACtB,KAAK,eAAe,EACrB,MAAM,UAAU,CAAC;AAElB,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,UAAU,GAAG,mBAAmB,CAK3E;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE;IACjC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAChD,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,QAAQ,CAAC,eAAe,CAAC,EAAE,SAAS,eAAe,EAAE,CAAC;IACtD,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,eAAe,EAAE,CAAC;IAC/C,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;CACpD,GAAG,WAAW,CAYd;AAED,wBAAgB,OAAO,CAAC,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,eAAe,CAE5F;AAED,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,UAAU,EACpB,OAAO,EAAE,2BAA2B,GACnC,eAAe,EAAE,CASnB;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,SAAS,iBAAiB,EAAE,CAEjG;AAED,UAAU,qBAAqB;IAC7B,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC;IAC/D,QAAQ,CAAC,YAAY,EAAE,UAAU,CAAC;IAClC,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,cAAc,GAAG,SAAS,CAAC;IAC/C,QAAQ,CAAC,eAAe,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,KAAK,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CAC7F;AAED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,qBAAqB,GAAG,iBAAiB,CAU3F;AAED,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,UAAU,EACpB,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,EACpD,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GACjC,MAAM,GAAG,IAAI,GAAG,SAAS,CAO3B;AAED,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,OAAO,EACd,iBAAiB,EAAE,SAAS,MAAM,EAAE,EACpC,iBAAiB,EAAE,SAAS,MAAM,EAAE,GACnC,mBAAmB,CAMrB;AAED,wBAAgB,cAAc,CAC5B,OAAO,EAAE,2BAA2B,GAAG,SAAS,GAC/C,mBAAmB,CAErB"}
|
|
1
|
+
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/common.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,KAAK,2BAA2B,EAChC,KAAK,mBAAmB,EACxB,KAAK,eAAe,EACpB,KAAK,WAAW,EAChB,KAAK,mBAAmB,EACxB,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACtB,KAAK,UAAU,EACf,KAAK,UAAU,EACf,KAAK,mBAAmB,EACxB,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACtB,KAAK,eAAe,EACrB,MAAM,UAAU,CAAC;AAElB,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,UAAU,GAAG,mBAAmB,CAK3E;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE;IACjC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAChD,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,QAAQ,CAAC,eAAe,CAAC,EAAE,SAAS,eAAe,EAAE,CAAC;IACtD,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,eAAe,EAAE,CAAC;IAC/C,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;CACpD,GAAG,WAAW,CAYd;AAED,wBAAgB,OAAO,CAAC,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,eAAe,CAE5F;AAED,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,UAAU,EACpB,OAAO,EAAE,2BAA2B,GACnC,eAAe,EAAE,CASnB;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,SAAS,iBAAiB,EAAE,CAEjG;AAED,UAAU,qBAAqB;IAC7B,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC;IAC/D,QAAQ,CAAC,YAAY,EAAE,UAAU,CAAC;IAClC,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,cAAc,GAAG,SAAS,CAAC;IAC/C,QAAQ,CAAC,eAAe,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,KAAK,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CAC7F;AAED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,qBAAqB,GAAG,iBAAiB,CAU3F;AAED,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,UAAU,EACpB,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,EACpD,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GACjC,MAAM,GAAG,IAAI,GAAG,SAAS,CAO3B;AAED,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,OAAO,EACd,iBAAiB,EAAE,SAAS,MAAM,EAAE,EACpC,iBAAiB,EAAE,SAAS,MAAM,EAAE,GACnC,mBAAmB,CAMrB;AAED,wBAAgB,cAAc,CAC5B,OAAO,EAAE,2BAA2B,GAAG,SAAS,GAC/C,mBAAmB,CAErB;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAYlG"}
|
|
@@ -9,6 +9,7 @@ exports.resolveModelSpecWithConfig = resolveModelSpecWithConfig;
|
|
|
9
9
|
exports.validateModelIdFromCatalog = validateModelIdFromCatalog;
|
|
10
10
|
exports.classifyBaseProviderError = classifyBaseProviderError;
|
|
11
11
|
exports.optionFeatures = optionFeatures;
|
|
12
|
+
exports.isCliVersionAtLeast = isCliVersionAtLeast;
|
|
12
13
|
const errors_1 = require("../errors");
|
|
13
14
|
const types_1 = require("../types");
|
|
14
15
|
function createParserState(provider) {
|
|
@@ -69,4 +70,17 @@ function classifyBaseProviderError(error, retryablePatterns, permanentPatterns)
|
|
|
69
70
|
function optionFeatures(options) {
|
|
70
71
|
return options?.cliFeatures ?? {};
|
|
71
72
|
}
|
|
73
|
+
function isCliVersionAtLeast(versionText, floor) {
|
|
74
|
+
const actualMatch = /(?:^|[^\w.])v?(\d+)\.(\d+)\.(\d+)(?![\w.-])/.exec(versionText ?? '');
|
|
75
|
+
const floorMatch = /^(\d+)\.(\d+)\.(\d+)$/.exec(floor);
|
|
76
|
+
if (!actualMatch || !floorMatch)
|
|
77
|
+
return false;
|
|
78
|
+
for (let index = 1; index <= 3; index += 1) {
|
|
79
|
+
const actual = Number(actualMatch[index]);
|
|
80
|
+
const minimum = Number(floorMatch[index]);
|
|
81
|
+
if (actual !== minimum)
|
|
82
|
+
return actual > minimum;
|
|
83
|
+
}
|
|
84
|
+
return true;
|
|
85
|
+
}
|
|
72
86
|
//# sourceMappingURL=common.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/common.ts"],"names":[],"mappings":";;AAuBA,8CAKC;AAED,kCAqBC;AAED,0BAEC;AAED,8EAYC;AAED,sCAEC;AAUD,gEAUC;AAED,gEAWC;AAED,8DAUC;AAED,wCAIC;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/common.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":"
|
|
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,CAmBxB;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"}
|
|
@@ -9,6 +9,7 @@ exports.extractProviderSessionId = extractProviderSessionId;
|
|
|
9
9
|
exports.resolveModelSpec = resolveModelSpec;
|
|
10
10
|
exports.classifyProviderError = classifyProviderError;
|
|
11
11
|
const log_prefix_1 = require("../log-prefix");
|
|
12
|
+
const errors_1 = require("../errors");
|
|
12
13
|
const provider_registry_1 = require("../provider-registry");
|
|
13
14
|
var claude_recovery_1 = require("./claude-recovery");
|
|
14
15
|
Object.defineProperty(exports, "NO_MESSAGES_RETURNED", { enumerable: true, get: function () { return claude_recovery_1.NO_MESSAGES_RETURNED; } });
|
|
@@ -36,7 +37,11 @@ function listProviderAdapters() {
|
|
|
36
37
|
return provider_registry_1.providerIds;
|
|
37
38
|
}
|
|
38
39
|
function buildProviderCommand(providerName, context, options) {
|
|
39
|
-
|
|
40
|
+
const adapter = getProviderAdapter(providerName);
|
|
41
|
+
if (options?.webSearch !== undefined && !(0, provider_registry_1.supportsProviderCapability)(adapter.id, 'webSearch')) {
|
|
42
|
+
throw new errors_1.UnsupportedProviderCapabilityError(adapter.id, 'webSearch', `Provider ${adapter.id} does not expose provider-controlled native web search; remove options.webSearch.`);
|
|
43
|
+
}
|
|
44
|
+
return adapter.buildCommand(context, options);
|
|
40
45
|
}
|
|
41
46
|
function parseProviderChunk(providerName, chunk) {
|
|
42
47
|
const adapter = getProviderAdapter(providerName || 'claude');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/index.ts"],"names":[],"mappings":";;;
|
|
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":"opencode.d.ts","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/opencode.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"opencode.d.ts","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/opencode.ts"],"names":[],"mappings":"AAWA,OAAO,EAML,KAAK,eAAe,EAErB,MAAM,UAAU,CAAC;AAqPlB,eAAO,MAAM,eAAe,EAAE,eA0B7B,CAAC"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.opencodeAdapter = void 0;
|
|
4
|
+
const contract_errors_1 = require("../contract-errors");
|
|
5
|
+
const errors_1 = require("../errors");
|
|
4
6
|
const schema_1 = require("../schema");
|
|
5
7
|
const json_1 = require("../json");
|
|
6
8
|
const common_1 = require("./common");
|
|
7
9
|
const opencode_models_1 = require("./opencode-models");
|
|
8
|
-
function detectCliFeatures(helpText) {
|
|
10
|
+
function detectCliFeatures(helpText, versionText) {
|
|
9
11
|
const help = helpText ?? '';
|
|
10
12
|
const unknown = !help;
|
|
11
13
|
return {
|
|
@@ -16,6 +18,8 @@ function detectCliFeatures(helpText) {
|
|
|
16
18
|
supportsDir: unknown ? false : /--dir\b/.test(help),
|
|
17
19
|
supportsCwd: unknown ? false : /--cwd\b/.test(help),
|
|
18
20
|
supportsAutoApprove: false,
|
|
21
|
+
supportsResume: !unknown && /--session\b/.test(help) && /--continue\b/.test(help),
|
|
22
|
+
supportsWebSearch: (0, common_1.isCliVersionAtLeast)(versionText, '1.0.137'),
|
|
19
23
|
unknown,
|
|
20
24
|
};
|
|
21
25
|
}
|
|
@@ -43,23 +47,67 @@ function addOpencodeOptionalArgs(args, options) {
|
|
|
43
47
|
}
|
|
44
48
|
function collectOpencodeWarnings(options) {
|
|
45
49
|
const features = (0, common_1.optionFeatures)(options);
|
|
46
|
-
const warnings =
|
|
50
|
+
const warnings = [];
|
|
47
51
|
if (options.modelSpec?.reasoningEffort && features.supportsVariant === false) {
|
|
48
52
|
warnings.push((0, common_1.warning)('opencode', 'opencode-variant', 'Opencode CLI does not support --variant; skipping reasoningEffort.'));
|
|
49
53
|
}
|
|
50
54
|
return warnings;
|
|
51
55
|
}
|
|
56
|
+
function addSessionArgs(args, options) {
|
|
57
|
+
const hasResumeSessionId = options.resumeSessionId !== undefined;
|
|
58
|
+
if (!hasResumeSessionId && !options.continueSession)
|
|
59
|
+
return;
|
|
60
|
+
const field = hasResumeSessionId ? 'options.resumeSessionId' : 'options.continueSession';
|
|
61
|
+
if (hasResumeSessionId && options.resumeSessionId?.trim().length === 0) {
|
|
62
|
+
throw (0, contract_errors_1.contractError)({
|
|
63
|
+
code: 'invalid-field',
|
|
64
|
+
field,
|
|
65
|
+
exitCode: 2,
|
|
66
|
+
message: 'options.resumeSessionId must be a non-empty OpenCode session ID.',
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
if ((0, common_1.optionFeatures)(options).supportsResume === false) {
|
|
70
|
+
throw (0, contract_errors_1.contractError)({
|
|
71
|
+
code: 'invalid-field',
|
|
72
|
+
field,
|
|
73
|
+
exitCode: 2,
|
|
74
|
+
message: 'OpenCode CLI cannot safely run continuation context because this installation lacks run --session/--continue.',
|
|
75
|
+
});
|
|
76
|
+
}
|
|
77
|
+
if (options.resumeSessionId) {
|
|
78
|
+
args.push('--session', options.resumeSessionId);
|
|
79
|
+
}
|
|
80
|
+
else {
|
|
81
|
+
args.push('--continue');
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
function webSearchEnv(options) {
|
|
85
|
+
if (options.webSearch !== true)
|
|
86
|
+
return {};
|
|
87
|
+
if ((0, common_1.optionFeatures)(options).supportsWebSearch !== true) {
|
|
88
|
+
throw new errors_1.UnsupportedProviderCapabilityError('opencode', 'webSearch', 'OpenCode web search requires a parseable OpenCode CLI version >= 1.0.137. Update OpenCode or set providerSettings.opencode.webSearch to false.');
|
|
89
|
+
}
|
|
90
|
+
return { OPENCODE_ENABLE_EXA: '1' };
|
|
91
|
+
}
|
|
92
|
+
function extractSessionId(line) {
|
|
93
|
+
const event = (0, json_1.tryParseJson)(line.trim());
|
|
94
|
+
if (!(0, json_1.isRecord)(event))
|
|
95
|
+
return null;
|
|
96
|
+
const sessionId = (0, json_1.getString)(event, 'sessionID') ?? (0, json_1.getString)(event, 'sessionId');
|
|
97
|
+
return sessionId?.trim() || null;
|
|
98
|
+
}
|
|
52
99
|
function buildCommand(context, options = {}) {
|
|
53
100
|
const finalContext = options.jsonSchema
|
|
54
101
|
? (0, schema_1.appendJsonSchemaPrompt)(context, options.jsonSchema)
|
|
55
102
|
: context;
|
|
56
103
|
const args = ['run'];
|
|
57
104
|
addOpencodeOptionalArgs(args, options);
|
|
105
|
+
addSessionArgs(args, options);
|
|
58
106
|
args.push(finalContext);
|
|
59
107
|
return (0, common_1.commandSpec)({
|
|
60
108
|
binary: 'opencode',
|
|
61
109
|
args,
|
|
62
|
-
env:
|
|
110
|
+
env: webSearchEnv(options),
|
|
63
111
|
...(options.cwd === undefined ? {} : { cwd: options.cwd }),
|
|
64
112
|
warnings: collectOpencodeWarnings(options),
|
|
65
113
|
});
|
|
@@ -173,6 +221,7 @@ exports.opencodeAdapter = {
|
|
|
173
221
|
defaultMinLevel: 'level1',
|
|
174
222
|
detectCliFeatures,
|
|
175
223
|
buildCommand,
|
|
224
|
+
extractSessionId,
|
|
176
225
|
parseEvent,
|
|
177
226
|
createParserState: () => (0, common_1.createParserState)('opencode'),
|
|
178
227
|
resolveModelSpec: opencode_models_1.resolveModelSpec,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opencode.js","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/opencode.ts"],"names":[],"mappings":";;;AAAA,sCAAmD;AACnD,kCAOiB;AAUjB,qCAOkB;AAClB,uDAM2B;AAE3B,SAAS,iBAAiB,
|
|
1
|
+
{"version":3,"file":"opencode.js","sourceRoot":"","sources":["../../../src/agent-cli-provider/adapters/opencode.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contract-actions.d.ts","sourceRoot":"","sources":["../../src/agent-cli-provider/contract-actions.ts"],"names":[],"mappings":"AAGA,OAAO,EAGL,KAAK,gBAAgB,EAEtB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAIL,KAAK,WAAW,EACjB,MAAM,oBAAoB,CAAC;AAK5B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"contract-actions.d.ts","sourceRoot":"","sources":["../../src/agent-cli-provider/contract-actions.ts"],"names":[],"mappings":"AAGA,OAAO,EAGL,KAAK,gBAAgB,EAEtB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAIL,KAAK,WAAW,EACjB,MAAM,oBAAoB,CAAC;AAK5B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAiHtD,wBAAgB,eAAe,CAC7B,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,aAAa,GACpB,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAoB9C"}
|
|
@@ -13,6 +13,10 @@ const single_agent_runtime_1 = require("./single-agent-runtime");
|
|
|
13
13
|
const json_1 = require("./json");
|
|
14
14
|
function runBuildCommand(request) {
|
|
15
15
|
const { adapter, commandSpec, options } = (0, contract_support_1.buildCommandSpec)(request);
|
|
16
|
+
const webSearch = {
|
|
17
|
+
requested: options.webSearch === true,
|
|
18
|
+
effective: options.webSearch === true && options.cliFeatures?.supportsWebSearch === true,
|
|
19
|
+
};
|
|
16
20
|
return (0, contract_envelope_1.successEnvelope)({
|
|
17
21
|
command: request.command ?? 'build-command',
|
|
18
22
|
adapter,
|
|
@@ -21,21 +25,27 @@ function runBuildCommand(request) {
|
|
|
21
25
|
evidence: {
|
|
22
26
|
outputFormat: options.outputFormat ?? null,
|
|
23
27
|
schemaMode: (0, contract_support_1.schemaMode)(options),
|
|
28
|
+
configuration: { webSearch },
|
|
24
29
|
},
|
|
25
30
|
result: {
|
|
26
31
|
commandSpec,
|
|
27
32
|
outputFormat: options.outputFormat ?? null,
|
|
28
33
|
schemaMode: (0, contract_support_1.schemaMode)(options),
|
|
34
|
+
configuration: { webSearch },
|
|
29
35
|
},
|
|
30
36
|
});
|
|
31
37
|
}
|
|
32
38
|
function runProbe(request) {
|
|
33
39
|
const adapter = (0, contract_support_1.adapterForProvider)(request.provider);
|
|
34
40
|
const helpText = typeof request.raw.helpText === 'string' ? request.raw.helpText : null;
|
|
35
|
-
const
|
|
36
|
-
const
|
|
37
|
-
? adapter.
|
|
38
|
-
:
|
|
41
|
+
const versionText = typeof request.raw.versionText === 'string' ? request.raw.versionText : '';
|
|
42
|
+
const runtimeProbe = helpText === null
|
|
43
|
+
? (0, single_agent_runtime_1.probeRuntimeProviderCli)(adapter.id)
|
|
44
|
+
: (0, single_agent_runtime_1.probeRuntimeProviderCli)(adapter.id, {
|
|
45
|
+
available: true,
|
|
46
|
+
helpText,
|
|
47
|
+
versionText,
|
|
48
|
+
});
|
|
39
49
|
return (0, contract_envelope_1.successEnvelope)({
|
|
40
50
|
command: request.command ?? 'probe',
|
|
41
51
|
adapter,
|
|
@@ -48,10 +58,11 @@ function runProbe(request) {
|
|
|
48
58
|
},
|
|
49
59
|
contractVersion: contract_envelope_1.providerExecutableSchemaVersion,
|
|
50
60
|
adapterVersion: adapter.adapterVersion,
|
|
51
|
-
available: runtimeProbe
|
|
52
|
-
helpText: runtimeProbe
|
|
53
|
-
versionText: runtimeProbe
|
|
54
|
-
capabilities,
|
|
61
|
+
available: runtimeProbe.available,
|
|
62
|
+
helpText: runtimeProbe.helpText,
|
|
63
|
+
versionText: runtimeProbe.versionText,
|
|
64
|
+
capabilities: runtimeProbe.capabilities,
|
|
65
|
+
configuration: runtimeProbe.configuration,
|
|
55
66
|
credentials: adapter.credentialEnvKeys.map((key) => ({
|
|
56
67
|
key,
|
|
57
68
|
present: Boolean(request.env[key] ?? process.env[key]),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contract-actions.js","sourceRoot":"","sources":["../../src/agent-cli-provider/contract-actions.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"contract-actions.js","sourceRoot":"","sources":["../../src/agent-cli-provider/contract-actions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contract-fallback.d.ts","sourceRoot":"","sources":["../../src/agent-cli-provider/contract-fallback.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAiB,MAAM,mBAAmB,CAAC;AACxE,OAAO,EAGL,KAAK,gBAAgB,EACtB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"contract-fallback.d.ts","sourceRoot":"","sources":["../../src/agent-cli-provider/contract-fallback.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAiB,MAAM,mBAAmB,CAAC;AACxE,OAAO,EAGL,KAAK,gBAAgB,EACtB,MAAM,qBAAqB,CAAC;AAK7B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEtD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW,CAe9D;AAiDD,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG,oBAAoB,CAe5E;AAED,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,WAAW,EACrB,YAAY,EAAE,oBAAoB,GACjC,gBAAgB,CAuBlB"}
|
|
@@ -7,6 +7,7 @@ const adapters_1 = require("./adapters");
|
|
|
7
7
|
const contract_env_1 = require("./contract-env");
|
|
8
8
|
const contract_errors_1 = require("./contract-errors");
|
|
9
9
|
const contract_envelope_1 = require("./contract-envelope");
|
|
10
|
+
const errors_1 = require("./errors");
|
|
10
11
|
const json_1 = require("./json");
|
|
11
12
|
const redaction_1 = require("./redaction");
|
|
12
13
|
function requestEnvelopeData(input) {
|
|
@@ -65,6 +66,14 @@ function errorObject(requestError) {
|
|
|
65
66
|
function requestErrorFromUnknown(error) {
|
|
66
67
|
if (error instanceof contract_errors_1.ContractRequestError)
|
|
67
68
|
return error;
|
|
69
|
+
if (error instanceof errors_1.UnsupportedProviderCapabilityError) {
|
|
70
|
+
return (0, contract_errors_1.contractError)({
|
|
71
|
+
code: error.code,
|
|
72
|
+
message: error.message,
|
|
73
|
+
exitCode: 4,
|
|
74
|
+
field: 'options.webSearch',
|
|
75
|
+
});
|
|
76
|
+
}
|
|
68
77
|
return (0, contract_errors_1.contractError)({
|
|
69
78
|
code: 'internal-error',
|
|
70
79
|
message: (0, json_1.unknownToMessage)(error),
|