@straiffi/archon 1.8.12 → 1.8.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/client/assets/{ActivityView-CEETnHri.js → ActivityView-DYDYyqIN.js} +1 -1
- package/dist/client/assets/{GitHubActionsDialog-CjBW65OR.js → GitHubActionsDialog-jhi4GOyV.js} +1 -1
- package/dist/client/assets/{RepositoryGraphDialog-F3C0n89W.js → RepositoryGraphDialog-BZV0vHu6.js} +1 -1
- package/dist/client/assets/{VerificationDialog-DD1CLydA.js → VerificationDialog-Sc6e8AKH.js} +1 -1
- package/dist/client/assets/{architectureDiagram-3BPJPVTR-COl_GdZ6.js → architectureDiagram-3BPJPVTR-DFbki8mi.js} +1 -1
- package/dist/client/assets/{blockDiagram-GPEHLZMM-qojIlH-q.js → blockDiagram-GPEHLZMM-BZFehG8P.js} +1 -1
- package/dist/client/assets/{c4Diagram-AAUBKEIU-DFtG4fMg.js → c4Diagram-AAUBKEIU-FVDXRu1t.js} +1 -1
- package/dist/client/assets/channel-D1kOpezG.js +1 -0
- package/dist/client/assets/{chunk-2J33WTMH-TJkOJXbn.js → chunk-2J33WTMH-4tuVZaT0.js} +1 -1
- package/dist/client/assets/{chunk-3OPIFGDE-CELQ603z.js → chunk-3OPIFGDE-DSn14S35.js} +1 -1
- package/dist/client/assets/{chunk-5ZQYHXKU-BgPEJ16b.js → chunk-5ZQYHXKU-Cwx1KNjg.js} +1 -1
- package/dist/client/assets/{chunk-727SXJPM-Biph-aPf.js → chunk-727SXJPM-Odza4hes.js} +1 -1
- package/dist/client/assets/{chunk-AQP2D5EJ-CPVToZH6.js → chunk-AQP2D5EJ-BmVoQT7M.js} +1 -1
- package/dist/client/assets/{chunk-CSCIHK7Q-BHO9oB4A.js → chunk-CSCIHK7Q-Bg7Ktx0B.js} +1 -1
- package/dist/client/assets/{chunk-KSCS5N6A-B8vatrko.js → chunk-KSCS5N6A-2tnhar2x.js} +1 -1
- package/dist/client/assets/{chunk-L5ZTLDWV-DvzBHR4-.js → chunk-L5ZTLDWV-dAyg8qMJ.js} +1 -1
- package/dist/client/assets/{chunk-LZXEDZCA-Bm8cj-JK.js → chunk-LZXEDZCA-0gElxrlR.js} +2 -2
- package/dist/client/assets/{chunk-ND2GUHAM-BPQZvPl9.js → chunk-ND2GUHAM-Bu-8Lz91.js} +1 -1
- package/dist/client/assets/{chunk-NZK2D7GU-DEQVA6Ya.js → chunk-NZK2D7GU-CInZFdzd.js} +1 -1
- package/dist/client/assets/{chunk-O5CBEL6O-hPGqWilt.js → chunk-O5CBEL6O-rAzpvdNR.js} +1 -1
- package/dist/client/assets/{chunk-WU5MYG2G-D0VvFXkQ.js → chunk-WU5MYG2G-DOOw2vq7.js} +1 -1
- package/dist/client/assets/classDiagram-4FO5ZUOK-C253nwny.js +1 -0
- package/dist/client/assets/classDiagram-v2-Q7XG4LA2-DFgDA23g.js +1 -0
- package/dist/client/assets/{dagre-BM42HDAG-rmJlMuw_.js → dagre-BM42HDAG-Dgua1iuh.js} +1 -1
- package/dist/client/assets/{diagram-2AECGRRQ-BqejYr09.js → diagram-2AECGRRQ-odacwlwu.js} +1 -1
- package/dist/client/assets/{diagram-5GNKFQAL-DGSf1BNT.js → diagram-5GNKFQAL-BiKjFmJ1.js} +1 -1
- package/dist/client/assets/{diagram-KO2AKTUF-e_TRdqvx.js → diagram-KO2AKTUF-CmYcvFri.js} +1 -1
- package/dist/client/assets/{diagram-LMA3HP47-CTSnwgUq.js → diagram-LMA3HP47-ncx0RBuX.js} +1 -1
- package/dist/client/assets/{diagram-OG6HWLK6-mUn9Y0aC.js → diagram-OG6HWLK6-DbchKIzw.js} +1 -1
- package/dist/client/assets/{erDiagram-TEJ5UH35-TmdWUwfA.js → erDiagram-TEJ5UH35-CMnpvRyQ.js} +1 -1
- package/dist/client/assets/{flowDiagram-I6XJVG4X-CoE0KTIp.js → flowDiagram-I6XJVG4X-Bi02_PK5.js} +1 -1
- package/dist/client/assets/{ganttDiagram-6RSMTGT7-FkX1d1D7.js → ganttDiagram-6RSMTGT7-BiS992US.js} +1 -1
- package/dist/client/assets/{gitGraphDiagram-PVQCEYII-CXze3DV2.js → gitGraphDiagram-PVQCEYII-Cc1hrTsT.js} +1 -1
- package/dist/client/assets/index-B1gdJKwK.js +275 -0
- package/dist/client/assets/index-CCQwWUKF.css +2 -0
- package/dist/client/assets/{infoDiagram-5YYISTIA-CO0CivOy.js → infoDiagram-5YYISTIA-BKVfqJCe.js} +1 -1
- package/dist/client/assets/{ishikawaDiagram-YF4QCWOH-pEp8gScG.js → ishikawaDiagram-YF4QCWOH-B-IbFOty.js} +1 -1
- package/dist/client/assets/{journeyDiagram-JHISSGLW-BAnBAX-u.js → journeyDiagram-JHISSGLW-DAZBgAQW.js} +1 -1
- package/dist/client/assets/{kanban-definition-UN3LZRKU-Cqe-m5fR.js → kanban-definition-UN3LZRKU-Bkr_fXev.js} +1 -1
- package/dist/client/assets/{line-CKXoUXdX.js → line-CROuuXDO.js} +1 -1
- package/dist/client/assets/{mermaid-parser.core-7XZHbu9R.js → mermaid-parser.core-DrBw_Rsc.js} +1 -1
- package/dist/client/assets/{mermaid.core-CsF9gbdO.js → mermaid.core-pPd6OYYj.js} +3 -3
- package/dist/client/assets/{mindmap-definition-RKZ34NQL-88fK1Uq_.js → mindmap-definition-RKZ34NQL-BXSd3TZU.js} +1 -1
- package/dist/client/assets/{pieDiagram-4H26LBE5-DHFlSAwL.js → pieDiagram-4H26LBE5-DoT7PIZC.js} +1 -1
- package/dist/client/assets/{quadrantDiagram-W4KKPZXB-D5WyQ5EU.js → quadrantDiagram-W4KKPZXB-ycZkLowm.js} +1 -1
- package/dist/client/assets/{requirementDiagram-4Y6WPE33-DGkMfp_N.js → requirementDiagram-4Y6WPE33-BPkO1yLu.js} +1 -1
- package/dist/client/assets/{sankeyDiagram-5OEKKPKP-loJAHDiT.js → sankeyDiagram-5OEKKPKP-D7AvhhCw.js} +1 -1
- package/dist/client/assets/{sequenceDiagram-3UESZ5HK-xgcwtjyW.js → sequenceDiagram-3UESZ5HK-C982swnH.js} +1 -1
- package/dist/client/assets/{stateDiagram-AJRCARHV-BB95DmQX.js → stateDiagram-AJRCARHV-xvJ3u8lc.js} +1 -1
- package/dist/client/assets/stateDiagram-v2-BHNVJYJU-BKQG8NCn.js +1 -0
- package/dist/client/assets/{timeline-definition-PNZ67QCA-OCHTEVfL.js → timeline-definition-PNZ67QCA-D89qjzb5.js} +1 -1
- package/dist/client/assets/{vennDiagram-CIIHVFJN-Bo_7YNy2.js → vennDiagram-CIIHVFJN-CoKeC__u.js} +1 -1
- package/dist/client/assets/{wardleyDiagram-YWT4CUSO-DquywRz0.js → wardleyDiagram-YWT4CUSO-DKhjzvSE.js} +1 -1
- package/dist/client/assets/{xychartDiagram-2RQKCTM6-BLNrbCwd.js → xychartDiagram-2RQKCTM6-DFn9ass1.js} +1 -1
- package/dist/client/index.html +2 -2
- package/dist/server/db.js +77 -2
- package/dist/server/db.js.map +1 -1
- package/dist/server/index.js +90 -17
- package/dist/server/index.js.map +1 -1
- package/dist/server/lib/agent.js +205 -242
- package/dist/server/lib/agent.js.map +1 -1
- package/dist/server/lib/agentProvider.js +64 -0
- package/dist/server/lib/agentProvider.js.map +1 -0
- package/dist/server/lib/agentRuns.js +1 -0
- package/dist/server/lib/agentRuns.js.map +1 -1
- package/dist/server/lib/automationProgression.js +6 -2
- package/dist/server/lib/automationProgression.js.map +1 -1
- package/dist/server/lib/automationReconciliation.js +20 -0
- package/dist/server/lib/automationReconciliation.js.map +1 -1
- package/dist/server/lib/automationResumeDecision.js +6 -5
- package/dist/server/lib/automationResumeDecision.js.map +1 -1
- package/dist/server/lib/buildCompletionContinuation.js +1 -1
- package/dist/server/lib/buildCompletionContinuation.js.map +1 -1
- package/dist/server/lib/claudeAgentProvider.js +48 -0
- package/dist/server/lib/claudeAgentProvider.js.map +1 -0
- package/dist/server/lib/executionEnvironment.js +20 -0
- package/dist/server/lib/executionEnvironment.js.map +1 -0
- package/dist/server/lib/executionReconciliation.js +43 -4
- package/dist/server/lib/executionReconciliation.js.map +1 -1
- package/dist/server/lib/executionRetry.js +16 -9
- package/dist/server/lib/executionRetry.js.map +1 -1
- package/dist/server/lib/executionRetryPredicates.js +12 -3
- package/dist/server/lib/executionRetryPredicates.js.map +1 -1
- package/dist/server/lib/git.js +4 -4
- package/dist/server/lib/git.js.map +1 -1
- package/dist/server/lib/hostExecutionEnvironment.js +77 -0
- package/dist/server/lib/hostExecutionEnvironment.js.map +1 -0
- package/dist/server/lib/lightweightPrompt.js +17 -54
- package/dist/server/lib/lightweightPrompt.js.map +1 -1
- package/dist/server/lib/opencodeAgentProvider.js +139 -0
- package/dist/server/lib/opencodeAgentProvider.js.map +1 -0
- package/dist/server/lib/opencodeErrors.js +35 -0
- package/dist/server/lib/opencodeErrors.js.map +1 -0
- package/dist/server/lib/opencodePromptOutput.js +112 -0
- package/dist/server/lib/opencodePromptOutput.js.map +1 -0
- package/dist/server/lib/opencodeSessionOperations.js +348 -0
- package/dist/server/lib/opencodeSessionOperations.js.map +1 -0
- package/dist/server/lib/opencodeTaskSessions.js +13 -225
- package/dist/server/lib/opencodeTaskSessions.js.map +1 -1
- package/dist/server/lib/postBuildCheckRuns.js +16 -12
- package/dist/server/lib/postBuildCheckRuns.js.map +1 -1
- package/dist/server/lib/postBuildChecks.js +45 -43
- package/dist/server/lib/postBuildChecks.js.map +1 -1
- package/dist/server/lib/previewProxy.js +36 -4
- package/dist/server/lib/previewProxy.js.map +1 -1
- package/dist/server/lib/projectAutoConfig.js +27 -97
- package/dist/server/lib/projectAutoConfig.js.map +1 -1
- package/dist/server/lib/projects.js +34 -6
- package/dist/server/lib/projects.js.map +1 -1
- package/dist/server/lib/reviewContext.js +10 -5
- package/dist/server/lib/reviewContext.js.map +1 -1
- package/dist/server/lib/reviewFindings.js +201 -27
- package/dist/server/lib/reviewFindings.js.map +1 -1
- package/dist/server/lib/reviewerConfig.js +23 -0
- package/dist/server/lib/reviewerConfig.js.map +1 -0
- package/dist/server/lib/specReviewOperations.js +64 -9
- package/dist/server/lib/specReviewOperations.js.map +1 -1
- package/dist/server/lib/ticketFollowUpOperations.js +28 -0
- package/dist/server/lib/ticketFollowUpOperations.js.map +1 -1
- package/dist/server/lib/tickets.js +15 -0
- package/dist/server/lib/tickets.js.map +1 -1
- package/dist/server/lib/types.js.map +1 -1
- package/dist/server/workers/build.js +8 -1
- package/dist/server/workers/build.js.map +1 -1
- package/dist/server/workers/followUp.js +15 -6
- package/dist/server/workers/followUp.js.map +1 -1
- package/dist/server/workers/plan.js +5 -21
- package/dist/server/workers/plan.js.map +1 -1
- package/dist/server/workers/review.js +176 -70
- package/dist/server/workers/review.js.map +1 -1
- package/dist/server/workers/specReview.js +26 -11
- package/dist/server/workers/specReview.js.map +1 -1
- package/package.json +1 -1
- package/dist/client/assets/channel-DJLjk5--.js +0 -1
- package/dist/client/assets/classDiagram-4FO5ZUOK-aHXCyXE_.js +0 -1
- package/dist/client/assets/classDiagram-v2-Q7XG4LA2-CRPsGis_.js +0 -1
- package/dist/client/assets/index-B9S66NLn.css +0 -2
- package/dist/client/assets/index-CHsj9z-M.js +0 -275
- package/dist/client/assets/stateDiagram-v2-BHNVJYJU-DKhxPOLT.js +0 -1
|
@@ -1,59 +1,22 @@
|
|
|
1
1
|
import { spawn } from 'child_process';
|
|
2
2
|
import { appendClaudeHeadlessPlanPrompt, buildClaudeHeadlessPlanArgs } from './planModeQuestions.js';
|
|
3
3
|
import { createWorkspaceProcessEnvironment } from './workspaceProcessEnvironment.js';
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
return null;
|
|
8
|
-
}
|
|
9
|
-
try {
|
|
10
|
-
return JSON.parse(trimmedLine);
|
|
11
|
-
}
|
|
12
|
-
catch {
|
|
13
|
-
return null;
|
|
14
|
-
}
|
|
15
|
-
};
|
|
16
|
-
const stripSystemReminderBlocks = (output) => {
|
|
17
|
-
return output.replace(/<system-reminder>[\s\S]*?<\/system-reminder>/g, '').trim();
|
|
18
|
-
};
|
|
19
|
-
const extractOpencodeOutput = (output) => {
|
|
20
|
-
const trimmedOutput = output.trim();
|
|
21
|
-
if (!trimmedOutput) {
|
|
22
|
-
return trimmedOutput;
|
|
23
|
-
}
|
|
24
|
-
const finalParts = [];
|
|
25
|
-
const textParts = [];
|
|
26
|
-
let sawStructuredOutput = false;
|
|
27
|
-
for (const line of trimmedOutput.split('\n')) {
|
|
28
|
-
const event = parseOpencodeEvent(line);
|
|
29
|
-
if (!event) {
|
|
30
|
-
continue;
|
|
31
|
-
}
|
|
32
|
-
sawStructuredOutput = true;
|
|
33
|
-
if (event.type === 'text' && event.part?.type === 'text' && event.part.text) {
|
|
34
|
-
textParts.push(event.part.text);
|
|
35
|
-
}
|
|
36
|
-
if (event.type === 'text'
|
|
37
|
-
&& event.part?.type === 'text'
|
|
38
|
-
&& event.part.metadata?.openai?.phase === 'final_answer'
|
|
39
|
-
&& event.part.text) {
|
|
40
|
-
finalParts.push(event.part.text);
|
|
41
|
-
}
|
|
42
|
-
}
|
|
43
|
-
if (finalParts.length > 0) {
|
|
44
|
-
return finalParts.join('\n');
|
|
45
|
-
}
|
|
46
|
-
if (sawStructuredOutput) {
|
|
47
|
-
return textParts.length > 0 ? stripSystemReminderBlocks(textParts.join('\n')) : '';
|
|
48
|
-
}
|
|
49
|
-
return stripSystemReminderBlocks(trimmedOutput);
|
|
50
|
-
};
|
|
4
|
+
import { runOneShotAgent } from './agentProvider.js';
|
|
5
|
+
import { hostExecutionEnvironment } from './hostExecutionEnvironment.js';
|
|
6
|
+
import { opencodeAgentProvider } from './opencodeAgentProvider.js';
|
|
51
7
|
export const runLightweightPrompt = ({ tool, model, variant }, prompt, cwd) => {
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
8
|
+
if (tool === 'opencode') {
|
|
9
|
+
return runOneShotAgent(opencodeAgentProvider, hostExecutionEnvironment, {
|
|
10
|
+
cwd,
|
|
11
|
+
env: createWorkspaceProcessEnvironment(cwd),
|
|
12
|
+
prompt,
|
|
13
|
+
model,
|
|
14
|
+
variant,
|
|
15
|
+
emptyOutputMessage: 'The helper model did not return a usable result.',
|
|
16
|
+
});
|
|
17
|
+
}
|
|
18
|
+
const cmd = 'claude';
|
|
19
|
+
const args = [...buildClaudeHeadlessPlanArgs(), '--print', appendClaudeHeadlessPlanPrompt(prompt)];
|
|
57
20
|
return new Promise((resolve, reject) => {
|
|
58
21
|
const child = spawn(cmd, args, {
|
|
59
22
|
stdio: ['ignore', 'pipe', 'pipe'],
|
|
@@ -66,8 +29,8 @@ export const runLightweightPrompt = ({ tool, model, variant }, prompt, cwd) => {
|
|
|
66
29
|
child.stderr?.on('data', (chunk) => stderrChunks.push(chunk));
|
|
67
30
|
child.on('close', code => {
|
|
68
31
|
const rawOutput = Buffer.concat(stdoutChunks).toString();
|
|
69
|
-
const output = tool === 'opencode' ? extractOpencodeOutput(rawOutput).trim() : rawOutput.trim();
|
|
70
32
|
const errorOutput = Buffer.concat(stderrChunks).toString().trim();
|
|
33
|
+
const output = rawOutput.trim();
|
|
71
34
|
if (code === 0 && output) {
|
|
72
35
|
resolve(output);
|
|
73
36
|
return;
|
|
@@ -80,7 +43,7 @@ export const runLightweightPrompt = ({ tool, model, variant }, prompt, cwd) => {
|
|
|
80
43
|
child.on('error', error => {
|
|
81
44
|
const errorCode = error.code;
|
|
82
45
|
if (errorCode === 'ENOENT') {
|
|
83
|
-
reject(new Error(
|
|
46
|
+
reject(new Error('Claude CLI is not available.'));
|
|
84
47
|
return;
|
|
85
48
|
}
|
|
86
49
|
reject(error instanceof Error ? error : new Error(String(error)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lightweightPrompt.js","sourceRoot":"","sources":["../../../server/lib/lightweightPrompt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AACrC,OAAO,EAAE,8BAA8B,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAA;AAEpG,OAAO,EAAE,iCAAiC,EAAE,MAAM,kCAAkC,CAAA;
|
|
1
|
+
{"version":3,"file":"lightweightPrompt.js","sourceRoot":"","sources":["../../../server/lib/lightweightPrompt.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,139 @@
|
|
|
1
|
+
import { ExecutionEnvironmentFailure } from './executionEnvironment.js';
|
|
2
|
+
import { OpencodeModelResolutionError, parseOpencodeStderrModelResolutionError } from './opencodeErrors.js';
|
|
3
|
+
import { extractOpencodePromptOutput } from './opencodePromptOutput.js';
|
|
4
|
+
import { parseOpencodeError } from './opencodeErrors.js';
|
|
5
|
+
const resolveOption = (value) => (typeof value === 'string' && value.trim() !== '' ? value.trim() : null);
|
|
6
|
+
const buildInvocation = ({ model, variant, planAgent, prompt }) => {
|
|
7
|
+
const resolvedModel = resolveOption(model);
|
|
8
|
+
const resolvedVariant = resolveOption(variant);
|
|
9
|
+
return {
|
|
10
|
+
command: 'opencode',
|
|
11
|
+
args: [
|
|
12
|
+
'run',
|
|
13
|
+
...(planAgent ? ['--agent', 'plan'] : []),
|
|
14
|
+
'--format',
|
|
15
|
+
'json',
|
|
16
|
+
...(resolvedModel ? ['--model', resolvedModel] : []),
|
|
17
|
+
...(resolvedVariant ? ['--variant', resolvedVariant] : []),
|
|
18
|
+
prompt,
|
|
19
|
+
],
|
|
20
|
+
stdio: ['ignore', 'pipe', 'pipe'],
|
|
21
|
+
};
|
|
22
|
+
};
|
|
23
|
+
const buildStreamingInvocation = ({ prompt, model, variant, mode, resumeSessionId, }) => ({
|
|
24
|
+
command: 'opencode',
|
|
25
|
+
args: [
|
|
26
|
+
'run',
|
|
27
|
+
...(mode === 'plan' ? ['--agent', 'plan'] : []),
|
|
28
|
+
'--format',
|
|
29
|
+
'json',
|
|
30
|
+
'--thinking',
|
|
31
|
+
...(resumeSessionId ? ['--session', resumeSessionId] : []),
|
|
32
|
+
...(model ? ['--model', model] : []),
|
|
33
|
+
...(variant ? ['--variant', variant] : []),
|
|
34
|
+
prompt,
|
|
35
|
+
],
|
|
36
|
+
stdio: ['ignore', 'pipe', 'pipe'],
|
|
37
|
+
stdin: null,
|
|
38
|
+
sessionId: null,
|
|
39
|
+
});
|
|
40
|
+
export const buildOpencodeSpecReviewInvocation = ({ prompt, files, model, variant, }) => {
|
|
41
|
+
const resolvedModel = resolveOption(model);
|
|
42
|
+
const resolvedVariant = resolveOption(variant);
|
|
43
|
+
return {
|
|
44
|
+
command: 'opencode',
|
|
45
|
+
args: [
|
|
46
|
+
'run', '--agent', 'plan', '--format', 'json', '--thinking',
|
|
47
|
+
...(resolvedModel ? ['--model', resolvedModel] : []),
|
|
48
|
+
...(resolvedVariant ? ['--variant', resolvedVariant] : []),
|
|
49
|
+
...files.flatMap(filePath => ['--file', filePath]),
|
|
50
|
+
...(files.length > 0 ? ['--'] : []),
|
|
51
|
+
prompt,
|
|
52
|
+
],
|
|
53
|
+
stdio: ['ignore', 'pipe', 'pipe'],
|
|
54
|
+
};
|
|
55
|
+
};
|
|
56
|
+
export const createOpencodeRecoveryTracker = () => {
|
|
57
|
+
let sawError = false;
|
|
58
|
+
let latestEvent = null;
|
|
59
|
+
let recoveredFinalAnswerFragments = [];
|
|
60
|
+
let latestError = null;
|
|
61
|
+
let modelResolutionError = null;
|
|
62
|
+
return {
|
|
63
|
+
consume: events => {
|
|
64
|
+
let shouldResetResponse = false;
|
|
65
|
+
for (const event of events ?? []) {
|
|
66
|
+
latestEvent = event.type;
|
|
67
|
+
if (event.type === 'error') {
|
|
68
|
+
sawError = true;
|
|
69
|
+
latestError = event.error;
|
|
70
|
+
if (event.error?.isModelResolutionError) {
|
|
71
|
+
modelResolutionError = event.error;
|
|
72
|
+
}
|
|
73
|
+
recoveredFinalAnswerFragments = [];
|
|
74
|
+
shouldResetResponse = true;
|
|
75
|
+
continue;
|
|
76
|
+
}
|
|
77
|
+
if (sawError) {
|
|
78
|
+
recoveredFinalAnswerFragments.push(event.text);
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
return shouldResetResponse;
|
|
82
|
+
},
|
|
83
|
+
hasRecoveredFinalAnswer: () => sawError && latestEvent === 'final_answer' && recoveredFinalAnswerFragments.length > 0,
|
|
84
|
+
hasUnrecoveredError: () => latestEvent === 'error',
|
|
85
|
+
getModelResolutionError: () => modelResolutionError,
|
|
86
|
+
getUnrecoveredError: () => latestEvent === 'error' ? latestError : null,
|
|
87
|
+
getRecoveredResponse: () => recoveredFinalAnswerFragments.join('\n\n'),
|
|
88
|
+
};
|
|
89
|
+
};
|
|
90
|
+
export const interpretOpencodeRecoveryEvent = (type, error, text, phase) => {
|
|
91
|
+
if (type === 'error') {
|
|
92
|
+
return { type: 'error', error: parseOpencodeError(error, text) };
|
|
93
|
+
}
|
|
94
|
+
if (type === 'text' && text && phase === 'final_answer') {
|
|
95
|
+
return { type: 'final_answer', text };
|
|
96
|
+
}
|
|
97
|
+
return null;
|
|
98
|
+
};
|
|
99
|
+
export const isSuccessfulOpencodeExit = (code, stderrModelError, recoveryTracker) => !stderrModelError
|
|
100
|
+
&& !recoveryTracker.getModelResolutionError()
|
|
101
|
+
&& !recoveryTracker.hasUnrecoveredError()
|
|
102
|
+
&& (code === 0 || recoveryTracker.hasRecoveredFinalAnswer());
|
|
103
|
+
export const createOpencodeExitError = (message, stderrModelError, recoveryTracker) => {
|
|
104
|
+
const structuredError = recoveryTracker.getModelResolutionError() ?? recoveryTracker.getUnrecoveredError();
|
|
105
|
+
return structuredError?.isModelResolutionError || stderrModelError
|
|
106
|
+
? new OpencodeModelResolutionError(message)
|
|
107
|
+
: new Error(message);
|
|
108
|
+
};
|
|
109
|
+
const interpretOneShotOutput = (stdout, stderr) => {
|
|
110
|
+
const result = extractOpencodePromptOutput(stdout);
|
|
111
|
+
const output = result.output.trim();
|
|
112
|
+
const modelError = result.error?.isModelResolutionError
|
|
113
|
+
? result.error
|
|
114
|
+
: parseOpencodeStderrModelResolutionError(stderr);
|
|
115
|
+
if (result.error || modelError) {
|
|
116
|
+
const message = result.error?.message || modelError?.message || stderr;
|
|
117
|
+
return {
|
|
118
|
+
output,
|
|
119
|
+
error: modelError ? new OpencodeModelResolutionError(message) : new Error(message),
|
|
120
|
+
};
|
|
121
|
+
}
|
|
122
|
+
return { output, error: null };
|
|
123
|
+
};
|
|
124
|
+
const classifyExecutionFailure = (failure) => {
|
|
125
|
+
const unavailable = failure instanceof ExecutionEnvironmentFailure
|
|
126
|
+
? failure.code === 'unavailable-executable'
|
|
127
|
+
: failure?.code === 'ENOENT';
|
|
128
|
+
if (unavailable) {
|
|
129
|
+
return new Error('OpenCode CLI is not available.');
|
|
130
|
+
}
|
|
131
|
+
return failure instanceof Error ? failure : new Error(String(failure));
|
|
132
|
+
};
|
|
133
|
+
export const opencodeAgentProvider = {
|
|
134
|
+
buildInvocation,
|
|
135
|
+
buildStreamingInvocation,
|
|
136
|
+
interpretOneShotOutput,
|
|
137
|
+
classifyExecutionFailure,
|
|
138
|
+
};
|
|
139
|
+
//# sourceMappingURL=opencodeAgentProvider.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"opencodeAgentProvider.js","sourceRoot":"","sources":["../../../server/lib/opencodeAgentProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
const MODEL_RESOLUTION_ERROR_PATTERN = /ProviderModelNotFoundError|Model not found/i;
|
|
2
|
+
export const parseOpencodeError = (error, fallbackText) => {
|
|
3
|
+
if (typeof error === 'string') {
|
|
4
|
+
const message = error.trim() || fallbackText?.trim() || '';
|
|
5
|
+
return message ? { message, isModelResolutionError: MODEL_RESOLUTION_ERROR_PATTERN.test(message) } : null;
|
|
6
|
+
}
|
|
7
|
+
if (error && typeof error === 'object') {
|
|
8
|
+
const name = error.name?.trim() ?? '';
|
|
9
|
+
const providerId = error.data?.providerID?.trim() ?? '';
|
|
10
|
+
const modelId = error.data?.modelID?.trim() ?? '';
|
|
11
|
+
const detail = error.data?.message?.trim() || error.message?.trim() || fallbackText?.trim() || '';
|
|
12
|
+
const modelReference = providerId && modelId ? `${providerId}/${modelId}` : modelId || providerId;
|
|
13
|
+
const message = [name, detail, modelReference].filter(Boolean).join(': ');
|
|
14
|
+
const isModelResolutionError = name === 'ProviderModelNotFoundError'
|
|
15
|
+
|| MODEL_RESOLUTION_ERROR_PATTERN.test(detail);
|
|
16
|
+
return message ? { message, isModelResolutionError } : null;
|
|
17
|
+
}
|
|
18
|
+
const message = fallbackText?.trim() ?? '';
|
|
19
|
+
return message ? { message, isModelResolutionError: false } : null;
|
|
20
|
+
};
|
|
21
|
+
export const parseOpencodeStderrModelResolutionError = (stderr) => {
|
|
22
|
+
const message = stderr.trim();
|
|
23
|
+
if (!message || !MODEL_RESOLUTION_ERROR_PATTERN.test(message)) {
|
|
24
|
+
return null;
|
|
25
|
+
}
|
|
26
|
+
return { message, isModelResolutionError: true };
|
|
27
|
+
};
|
|
28
|
+
export class OpencodeModelResolutionError extends Error {
|
|
29
|
+
constructor(message, options) {
|
|
30
|
+
super(message, options);
|
|
31
|
+
this.name = 'OpencodeModelResolutionError';
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
export const isOpencodeModelResolutionError = (error) => (error instanceof OpencodeModelResolutionError);
|
|
35
|
+
//# sourceMappingURL=opencodeErrors.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"opencodeErrors.js","sourceRoot":"","sources":["../../../server/lib/opencodeErrors.ts"],"names":[],"mappings":"AAgBA,MAAM,8BAA8B,GAAG,6CAA6C,CAAA;AAEpF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,KAAuC,EACvC,YAAqB,EACO,EAAE;IAC9B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,IAAI,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE,CAAA;QAC1D,OAAO,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,sBAAsB,EAAE,8BAA8B,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;IAC3G,CAAC;IAED,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACvC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAA;QACrC,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,CAAA;QACvD,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAA;QACjD,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE,CAAA;QACjG,MAAM,cAAc,GAAG,UAAU,IAAI,OAAO,CAAC,CAAC,CAAC,GAAG,UAAU,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,IAAI,UAAU,CAAA;QACjG,MAAM,OAAO,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACzE,MAAM,sBAAsB,GAAG,IAAI,KAAK,4BAA4B;eAC/D,8BAA8B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAEhD,OAAO,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,sBAAsB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;IAC7D,CAAC;IAED,MAAM,OAAO,GAAG,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE,CAAA;IAC1C,OAAO,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,sBAAsB,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;AACpE,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,uCAAuC,GAAG,CAAC,MAAc,EAA8B,EAAE;IACpG,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,EAAE,CAAA;IAC7B,IAAI,CAAC,OAAO,IAAI,CAAC,8BAA8B,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QAC9D,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,sBAAsB,EAAE,IAAI,EAAE,CAAA;AAClD,CAAC,CAAA;AAED,MAAM,OAAO,4BAA6B,SAAQ,KAAK;IACrD,YAAY,OAAe,EAAE,OAAsB;QACjD,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QACvB,IAAI,CAAC,IAAI,GAAG,8BAA8B,CAAA;IAC5C,CAAC;CACF;AAED,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAAC,KAAc,EAAyC,EAAE,CAAC,CACvG,KAAK,YAAY,4BAA4B,CAC9C,CAAA"}
|
|
@@ -0,0 +1,112 @@
|
|
|
1
|
+
import { parseOpencodeError } from './opencodeErrors.js';
|
|
2
|
+
const stripSystemReminderBlocks = (output) => (output.replace(/<system-reminder>[\s\S]*?<\/system-reminder>/g, '').trim());
|
|
3
|
+
export const extractLeadingOpencodeJsonObjects = (value) => {
|
|
4
|
+
const jsonObjects = [];
|
|
5
|
+
let remaining = value.trim();
|
|
6
|
+
while (remaining.startsWith('{')) {
|
|
7
|
+
let depth = 0;
|
|
8
|
+
let inString = false;
|
|
9
|
+
let escaping = false;
|
|
10
|
+
let endIndex = -1;
|
|
11
|
+
for (let index = 0; index < remaining.length; index += 1) {
|
|
12
|
+
const char = remaining[index];
|
|
13
|
+
if (inString) {
|
|
14
|
+
if (escaping) {
|
|
15
|
+
escaping = false;
|
|
16
|
+
}
|
|
17
|
+
else if (char === '\\') {
|
|
18
|
+
escaping = true;
|
|
19
|
+
}
|
|
20
|
+
else if (char === '"') {
|
|
21
|
+
inString = false;
|
|
22
|
+
}
|
|
23
|
+
continue;
|
|
24
|
+
}
|
|
25
|
+
if (char === '"') {
|
|
26
|
+
inString = true;
|
|
27
|
+
}
|
|
28
|
+
else if (char === '{') {
|
|
29
|
+
depth += 1;
|
|
30
|
+
}
|
|
31
|
+
else if (char === '}') {
|
|
32
|
+
depth -= 1;
|
|
33
|
+
if (depth === 0) {
|
|
34
|
+
endIndex = index + 1;
|
|
35
|
+
break;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
if (endIndex < 0) {
|
|
40
|
+
break;
|
|
41
|
+
}
|
|
42
|
+
jsonObjects.push(remaining.slice(0, endIndex));
|
|
43
|
+
remaining = remaining.slice(endIndex).trim();
|
|
44
|
+
}
|
|
45
|
+
return { jsonObjects, remainder: remaining };
|
|
46
|
+
};
|
|
47
|
+
const parseEvent = (jsonObject) => {
|
|
48
|
+
try {
|
|
49
|
+
return JSON.parse(jsonObject);
|
|
50
|
+
}
|
|
51
|
+
catch {
|
|
52
|
+
return null;
|
|
53
|
+
}
|
|
54
|
+
};
|
|
55
|
+
export const extractOpencodePromptOutput = (rawOutput) => {
|
|
56
|
+
const trimmedOutput = rawOutput.trim();
|
|
57
|
+
if (!trimmedOutput) {
|
|
58
|
+
return { output: '', error: null };
|
|
59
|
+
}
|
|
60
|
+
const textParts = [];
|
|
61
|
+
const finalParts = [];
|
|
62
|
+
const recoveredParts = [];
|
|
63
|
+
let sawStructuredOutput = false;
|
|
64
|
+
let sawError = false;
|
|
65
|
+
let latestError = null;
|
|
66
|
+
let latestRecoveryEvent = null;
|
|
67
|
+
for (const line of trimmedOutput.split('\n')) {
|
|
68
|
+
const { jsonObjects } = extractLeadingOpencodeJsonObjects(line);
|
|
69
|
+
if (jsonObjects.length === 0) {
|
|
70
|
+
continue;
|
|
71
|
+
}
|
|
72
|
+
sawStructuredOutput = true;
|
|
73
|
+
for (const jsonObject of jsonObjects) {
|
|
74
|
+
const event = parseEvent(jsonObject);
|
|
75
|
+
if (!event) {
|
|
76
|
+
continue;
|
|
77
|
+
}
|
|
78
|
+
if (event.type === 'error') {
|
|
79
|
+
sawError = true;
|
|
80
|
+
latestError = parseOpencodeError(event.error, event.part?.text);
|
|
81
|
+
latestRecoveryEvent = 'error';
|
|
82
|
+
recoveredParts.length = 0;
|
|
83
|
+
continue;
|
|
84
|
+
}
|
|
85
|
+
if (event.type !== 'text' || event.part?.type !== 'text' || !event.part.text) {
|
|
86
|
+
continue;
|
|
87
|
+
}
|
|
88
|
+
textParts.push(event.part.text);
|
|
89
|
+
if (event.part.metadata?.openai?.phase === 'final_answer') {
|
|
90
|
+
finalParts.push(event.part.text);
|
|
91
|
+
latestRecoveryEvent = 'final_answer';
|
|
92
|
+
if (sawError) {
|
|
93
|
+
recoveredParts.push(event.part.text);
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
if (latestRecoveryEvent === 'error') {
|
|
99
|
+
return { output: '', error: latestError };
|
|
100
|
+
}
|
|
101
|
+
if (sawError && recoveredParts.length > 0) {
|
|
102
|
+
return { output: recoveredParts.join('\n'), error: null };
|
|
103
|
+
}
|
|
104
|
+
if (finalParts.length > 0) {
|
|
105
|
+
return { output: finalParts.join('\n'), error: null };
|
|
106
|
+
}
|
|
107
|
+
if (sawStructuredOutput) {
|
|
108
|
+
return { output: stripSystemReminderBlocks(textParts.join('\n')), error: null };
|
|
109
|
+
}
|
|
110
|
+
return { output: stripSystemReminderBlocks(trimmedOutput), error: null };
|
|
111
|
+
};
|
|
112
|
+
//# sourceMappingURL=opencodePromptOutput.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"opencodePromptOutput.js","sourceRoot":"","sources":["../../../server/lib/opencodePromptOutput.ts"],"names":[],"mappings":"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"}
|