@defai.digital/provider-adapters 13.2.5 → 13.2.6
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/LICENSE +2 -1
- package/dist/cli-adapter.d.ts.map +1 -1
- package/dist/cli-adapter.js +68 -3
- package/dist/cli-adapter.js.map +1 -1
- package/dist/error-classifier.d.ts.map +1 -1
- package/dist/error-classifier.js +4 -0
- package/dist/error-classifier.js.map +1 -1
- package/dist/providers/opencode.d.ts +3 -0
- package/dist/providers/opencode.d.ts.map +1 -1
- package/dist/providers/opencode.js +7 -4
- package/dist/providers/opencode.js.map +1 -1
- package/package.json +4 -4
package/LICENSE
CHANGED
|
@@ -7,7 +7,8 @@ This license does NOT apply to:
|
|
|
7
7
|
- AutomatosX Pro Edition (proprietary software - separate EULA)
|
|
8
8
|
- AutomatosX Enterprise Edition (proprietary software - separate agreement)
|
|
9
9
|
|
|
10
|
-
For commercial editions, see
|
|
10
|
+
For commercial editions, see:
|
|
11
|
+
https://github.com/defai-digital/AutomatosX/blob/main/COMMERCIAL-LICENSE.md
|
|
11
12
|
|
|
12
13
|
===============================================================================
|
|
13
14
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-adapter.d.ts","sourceRoot":"","sources":["../src/cli-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EACV,WAAW,EACX,iBAAiB,EAKlB,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"cli-adapter.d.ts","sourceRoot":"","sources":["../src/cli-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EACV,WAAW,EACX,iBAAiB,EAKlB,MAAM,YAAY,CAAC;AA2DpB;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,iBAAiB,GAAG,WAAW,CA+JvE;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,SAAS,iBAAiB,EAAE,GACpC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAQ1B"}
|
package/dist/cli-adapter.js
CHANGED
|
@@ -8,6 +8,55 @@
|
|
|
8
8
|
import { spawnCLI, isCommandAvailable, getCommandVersion, buildPromptFromMessages } from './process-manager.js';
|
|
9
9
|
import { parseOutput, extractOrEstimateTokenUsage } from './output-parser.js';
|
|
10
10
|
import { classifyError, classifySpawnResult } from './error-classifier.js';
|
|
11
|
+
/**
|
|
12
|
+
* Extracts error message from JSON error response in stdout
|
|
13
|
+
* Handles formats like OpenCode: {"type":"error","error":{"data":{"message":"..."}}}
|
|
14
|
+
*
|
|
15
|
+
* @param stdout - Raw stdout from CLI process
|
|
16
|
+
* @returns Error message if found, null otherwise
|
|
17
|
+
*/
|
|
18
|
+
function extractJsonErrorFromStdout(stdout) {
|
|
19
|
+
if (stdout.length === 0) {
|
|
20
|
+
return null;
|
|
21
|
+
}
|
|
22
|
+
try {
|
|
23
|
+
// Try to parse as JSON (may be one line or multiple lines)
|
|
24
|
+
const lines = stdout.trim().split('\n');
|
|
25
|
+
for (const line of lines) {
|
|
26
|
+
const trimmed = line.trim();
|
|
27
|
+
if (trimmed.length === 0 || !trimmed.startsWith('{')) {
|
|
28
|
+
continue;
|
|
29
|
+
}
|
|
30
|
+
const data = JSON.parse(trimmed);
|
|
31
|
+
// Check for type: "error" format (OpenCode style)
|
|
32
|
+
if (data.type === 'error') {
|
|
33
|
+
const error = data.error;
|
|
34
|
+
if (error !== undefined) {
|
|
35
|
+
// Try error.data.message first
|
|
36
|
+
const errorData = error.data;
|
|
37
|
+
if (errorData?.message !== undefined && typeof errorData.message === 'string') {
|
|
38
|
+
return errorData.message;
|
|
39
|
+
}
|
|
40
|
+
// Try error.message
|
|
41
|
+
if (typeof error.message === 'string') {
|
|
42
|
+
return error.message;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
// Check for direct error field
|
|
47
|
+
if (typeof data.error === 'string') {
|
|
48
|
+
return data.error;
|
|
49
|
+
}
|
|
50
|
+
if (typeof data.message === 'string' && data.type === 'error') {
|
|
51
|
+
return data.message;
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
catch {
|
|
56
|
+
// Not valid JSON, ignore
|
|
57
|
+
}
|
|
58
|
+
return null;
|
|
59
|
+
}
|
|
11
60
|
/**
|
|
12
61
|
* Creates a CLI-based LLM provider adapter
|
|
13
62
|
*
|
|
@@ -40,8 +89,26 @@ export function createCLIAdapter(config) {
|
|
|
40
89
|
timeout: request.timeout ?? config.timeout,
|
|
41
90
|
});
|
|
42
91
|
const latencyMs = Date.now() - startTime;
|
|
92
|
+
// Parse output first - we may have valid output even if process timed out
|
|
93
|
+
const parsed = parseOutput(result.stdout, config.outputFormat);
|
|
94
|
+
// Check for JSON error response in stdout (e.g., OpenCode returns errors as JSON)
|
|
95
|
+
// Format: {"type":"error","error":{"name":"...","data":{"message":"..."}}}
|
|
96
|
+
const stdoutErrorMessage = extractJsonErrorFromStdout(result.stdout);
|
|
43
97
|
// Check for errors (non-zero exit code or timeout)
|
|
44
|
-
if (
|
|
98
|
+
// BUT: if we got valid output and the process timed out (common with CLIs that don't exit cleanly),
|
|
99
|
+
// treat it as success. The timeout killed the process after it produced output.
|
|
100
|
+
const hasValidOutput = parsed.content.length > 0;
|
|
101
|
+
const processTimedOutWithOutput = result.timedOut && hasValidOutput;
|
|
102
|
+
if ((result.exitCode !== 0 || result.timedOut) && !processTimedOutWithOutput) {
|
|
103
|
+
// If we have a JSON error from stdout, use that instead of stderr
|
|
104
|
+
if (stdoutErrorMessage !== null) {
|
|
105
|
+
return {
|
|
106
|
+
success: false,
|
|
107
|
+
requestId: request.requestId,
|
|
108
|
+
error: classifyError(stdoutErrorMessage),
|
|
109
|
+
latencyMs,
|
|
110
|
+
};
|
|
111
|
+
}
|
|
45
112
|
const error = classifySpawnResult(result);
|
|
46
113
|
return {
|
|
47
114
|
success: false,
|
|
@@ -50,8 +117,6 @@ export function createCLIAdapter(config) {
|
|
|
50
117
|
latencyMs,
|
|
51
118
|
};
|
|
52
119
|
}
|
|
53
|
-
// Parse output
|
|
54
|
-
const parsed = parseOutput(result.stdout, config.outputFormat);
|
|
55
120
|
// Extract or estimate token usage
|
|
56
121
|
const usage = extractOrEstimateTokenUsage(parsed.metadata, prompt, parsed.content);
|
|
57
122
|
return {
|
package/dist/cli-adapter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-adapter.js","sourceRoot":"","sources":["../src/cli-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAUH,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAChH,OAAO,EAAE,WAAW,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE3E;;;;;GAKG;AACH,MAAM,UAAU,gBAAgB,CAAC,MAAyB;IACxD,OAAO;QACL,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,MAAM;QAEN;;WAEG;QACH,KAAK,CAAC,QAAQ,CAAC,OAA0B;YACvC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAE7B,IAAI,CAAC;gBACH,6BAA6B;gBAC7B,MAAM,MAAM,GAAG,uBAAuB,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;gBAE/E,wDAAwD;gBACxD,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,KAAK,KAAK,CAAC;gBACjD,MAAM,IAAI,GAAG,WAAW;oBACtB,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAE,4BAA4B;oBACxD,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAS,uBAAuB;gBAErD,oBAAoB;gBACpB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC;oBAC5B,OAAO,EAAE,MAAM,CAAC,OAAO;oBACvB,IAAI;oBACJ,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EAAG,wCAAwC;oBAC3E,GAAG,EAAE,MAAM,CAAC,GAAG;oBACf,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO;iBAC3C,CAAC,CAAC;gBAEH,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;gBAEzC,mDAAmD;gBACnD,
|
|
1
|
+
{"version":3,"file":"cli-adapter.js","sourceRoot":"","sources":["../src/cli-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-classifier.d.ts","sourceRoot":"","sources":["../src/error-classifier.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAiB,WAAW,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"error-classifier.d.ts","sourceRoot":"","sources":["../src/error-classifier.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAiB,WAAW,EAAE,MAAM,YAAY,CAAC;AAyH9E;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,eAAe,CAa7D;AAcD;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,WAAW,GAAG,eAAe,CA0BxE;AA+ED;;GAEG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAE3D;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAE9D"}
|
package/dist/error-classifier.js
CHANGED
|
@@ -21,6 +21,8 @@ const ERROR_PATTERNS = {
|
|
|
21
21
|
/RESOURCE_EXHAUSTED/i,
|
|
22
22
|
/credit.?limit/i,
|
|
23
23
|
/usage.?limit/i,
|
|
24
|
+
/CreditsError/i, // OpenCode: no credits/payment method
|
|
25
|
+
/No.?payment.?method/i, // OpenCode: billing not configured
|
|
24
26
|
],
|
|
25
27
|
// Rate limit - retry with backoff
|
|
26
28
|
rate_limit: [
|
|
@@ -93,6 +95,8 @@ const ERROR_PATTERNS = {
|
|
|
93
95
|
/missing.?config/i,
|
|
94
96
|
/invalid.?config/i,
|
|
95
97
|
/cli.?not.?installed/i,
|
|
98
|
+
/0\s*credentials/i, // OpenCode: "0 credentials" means no auth configured
|
|
99
|
+
/no.?credentials/i,
|
|
96
100
|
],
|
|
97
101
|
// Unknown - default
|
|
98
102
|
unknown: [],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-classifier.js","sourceRoot":"","sources":["../src/error-classifier.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH;;;GAGG;AACH,MAAM,cAAc,GAA6C;IAC/D,mDAAmD;IACnD,KAAK,EAAE;QACL,sBAAsB;QACtB,kBAAkB;QAClB,uBAAuB;QACvB,qBAAqB;QACrB,gBAAgB;QAChB,eAAe;
|
|
1
|
+
{"version":3,"file":"error-classifier.js","sourceRoot":"","sources":["../src/error-classifier.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,9 @@ import type { CLIProviderConfig } from '../types.js';
|
|
|
13
13
|
*
|
|
14
14
|
* Design: AutomatosX does NOT manage credentials or model selection.
|
|
15
15
|
* The OpenCode CLI handles all authentication and uses its configured default model.
|
|
16
|
+
*
|
|
17
|
+
* PREREQUISITES: Run `opencode auth login` to configure credentials before use.
|
|
18
|
+
* Without credentials, the CLI will hang indefinitely.
|
|
16
19
|
*/
|
|
17
20
|
export declare const opencodeConfig: CLIProviderConfig;
|
|
18
21
|
//# sourceMappingURL=opencode.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opencode.d.ts","sourceRoot":"","sources":["../../src/providers/opencode.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAErD
|
|
1
|
+
{"version":3,"file":"opencode.d.ts","sourceRoot":"","sources":["../../src/providers/opencode.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAErD;;;;;;;;GAQG;AACH,eAAO,MAAM,cAAc,EAAE,iBAsB5B,CAAC"}
|
|
@@ -7,18 +7,21 @@
|
|
|
7
7
|
*
|
|
8
8
|
* @see https://github.com/opencode-ai/opencode
|
|
9
9
|
*/
|
|
10
|
-
import {
|
|
10
|
+
import { TIMEOUT_PROVIDER_SHORT } from '@defai.digital/contracts';
|
|
11
11
|
/**
|
|
12
12
|
* OpenCode provider configuration
|
|
13
13
|
*
|
|
14
14
|
* Design: AutomatosX does NOT manage credentials or model selection.
|
|
15
15
|
* The OpenCode CLI handles all authentication and uses its configured default model.
|
|
16
|
+
*
|
|
17
|
+
* PREREQUISITES: Run `opencode auth login` to configure credentials before use.
|
|
18
|
+
* Without credentials, the CLI will hang indefinitely.
|
|
16
19
|
*/
|
|
17
20
|
export const opencodeConfig = {
|
|
18
21
|
providerId: 'opencode',
|
|
19
22
|
command: 'opencode',
|
|
20
|
-
args: ['run', '--format', 'json'], // Use 'run'
|
|
21
|
-
promptStyle: '
|
|
23
|
+
args: ['run', '--format', 'json'], // Use 'run' with JSON format
|
|
24
|
+
promptStyle: 'stdin', // Pass prompt via stdin - more reliable for long prompts
|
|
22
25
|
env: {
|
|
23
26
|
// Non-interactive mode flags
|
|
24
27
|
TERM: 'dumb',
|
|
@@ -26,7 +29,7 @@ export const opencodeConfig = {
|
|
|
26
29
|
CI: 'true',
|
|
27
30
|
},
|
|
28
31
|
outputFormat: 'stream-json',
|
|
29
|
-
timeout:
|
|
32
|
+
timeout: TIMEOUT_PROVIDER_SHORT, // Shorter timeout - fails faster if no credentials
|
|
30
33
|
models: [
|
|
31
34
|
{
|
|
32
35
|
modelId: 'default',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opencode.js","sourceRoot":"","sources":["../../src/providers/opencode.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"opencode.js","sourceRoot":"","sources":["../../src/providers/opencode.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAGlE;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,cAAc,GAAsB;IAC/C,UAAU,EAAE,UAAU;IACtB,OAAO,EAAE,UAAU;IACnB,IAAI,EAAE,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC,EAAG,6BAA6B;IACjE,WAAW,EAAE,OAAO,EAAG,yDAAyD;IAChF,GAAG,EAAE;QACH,6BAA6B;QAC7B,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,GAAG;QACb,EAAE,EAAE,MAAM;KACX;IACD,YAAY,EAAE,aAAa;IAC3B,OAAO,EAAE,sBAAsB,EAAG,mDAAmD;IACrF,MAAM,EAAE;QACN;YACE,OAAO,EAAE,SAAS;YAClB,IAAI,EAAE,kBAAkB;YACxB,aAAa,EAAE,MAAM;YACrB,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;YAC9B,SAAS,EAAE,IAAI;SAChB;KACF;CACF,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@defai.digital/provider-adapters",
|
|
3
|
-
"version": "13.2.
|
|
3
|
+
"version": "13.2.6",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"author": "DEFAI Private Limited",
|
|
@@ -29,9 +29,9 @@
|
|
|
29
29
|
"access": "public"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@defai.digital/
|
|
33
|
-
"@defai.digital/
|
|
34
|
-
"@defai.digital/routing-engine": "13.2.
|
|
32
|
+
"@defai.digital/contracts": "13.2.6",
|
|
33
|
+
"@defai.digital/resilience-domain": "13.2.6",
|
|
34
|
+
"@defai.digital/routing-engine": "13.2.6"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
37
|
"typescript": "^5.7.2"
|