opencastle 0.34.2 → 0.34.3
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/cli/run/adapters/claude.d.ts.map +1 -1
- package/dist/cli/run/adapters/claude.js +43 -5
- package/dist/cli/run/adapters/claude.js.map +1 -1
- package/dist/cli/run/adapters/claude.test.js +85 -0
- package/dist/cli/run/adapters/claude.test.js.map +1 -1
- package/dist/cli/run/adapters/copilot.d.ts.map +1 -1
- package/dist/cli/run/adapters/copilot.js +43 -5
- package/dist/cli/run/adapters/copilot.js.map +1 -1
- package/dist/cli/run/adapters/copilot.test.js +85 -0
- package/dist/cli/run/adapters/copilot.test.js.map +1 -1
- package/dist/cli/run/adapters/cursor.d.ts.map +1 -1
- package/dist/cli/run/adapters/cursor.js +43 -5
- package/dist/cli/run/adapters/cursor.js.map +1 -1
- package/dist/cli/run/adapters/cursor.test.js +85 -0
- package/dist/cli/run/adapters/cursor.test.js.map +1 -1
- package/dist/cli/run/adapters/opencode.d.ts.map +1 -1
- package/dist/cli/run/adapters/opencode.js +44 -6
- package/dist/cli/run/adapters/opencode.js.map +1 -1
- package/dist/cli/run/adapters/opencode.test.js +86 -0
- package/dist/cli/run/adapters/opencode.test.js.map +1 -1
- package/package.json +1 -1
- package/src/cli/run/adapters/claude.test.ts +85 -0
- package/src/cli/run/adapters/claude.ts +41 -7
- package/src/cli/run/adapters/copilot.test.ts +85 -0
- package/src/cli/run/adapters/copilot.ts +41 -7
- package/src/cli/run/adapters/cursor.test.ts +85 -0
- package/src/cli/run/adapters/cursor.ts +41 -7
- package/src/cli/run/adapters/opencode.test.ts +86 -0
- package/src/cli/run/adapters/opencode.ts +42 -8
- package/src/dashboard/dist/data/convoys/demo-api-v2.json +9 -9
- package/src/dashboard/dist/data/convoys/demo-auth-revamp.json +4 -4
- package/src/dashboard/dist/data/convoys/demo-dashboard-ui.json +12 -12
- package/src/dashboard/dist/data/convoys/demo-data-pipeline.json +3 -3
- package/src/dashboard/dist/data/convoys/demo-deploy-ci.json +1 -1
- package/src/dashboard/dist/data/convoys/demo-docs-update.json +3 -3
- package/src/dashboard/dist/data/convoys/demo-perf-opt.json +10 -10
- package/src/dashboard/node_modules/.vite/deps/_metadata.json +6 -6
- package/src/dashboard/public/data/convoys/demo-api-v2.json +9 -9
- package/src/dashboard/public/data/convoys/demo-auth-revamp.json +4 -4
- package/src/dashboard/public/data/convoys/demo-dashboard-ui.json +12 -12
- package/src/dashboard/public/data/convoys/demo-data-pipeline.json +3 -3
- package/src/dashboard/public/data/convoys/demo-deploy-ci.json +1 -1
- package/src/dashboard/public/data/convoys/demo-docs-update.json +3 -3
- package/src/dashboard/public/data/convoys/demo-perf-opt.json +10 -10
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cursor.js","sourceRoot":"","sources":["../../../../src/cli/run/adapters/cursor.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cursor.js","sourceRoot":"","sources":["../../../../src/cli/run/adapters/cursor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAC1C,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAGhC,mBAAmB;AACnB,MAAM,CAAC,MAAM,IAAI,GAAG,QAAQ,CAAA;AAE5B,MAAM,UAAU,yBAAyB,KAAc,OAAO,KAAK,CAAA,CAAC,CAAC;AACrE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW;IAC/B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;QACzD,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAA;QAC/C,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAA;IACxC,CAAC,CAAC,CAAA;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,IAAU,EAAE,UAA0B,EAAE;IACpE,IAAI,MAAM,GAAG,aAAa,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,MAAM,EAAE,CAAA;IAEtD,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxC,MAAM,IAAI,gCAAgC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAA;IACnE,CAAC;IAED,MAAM,IAAI,GAAG;QACX,IAAI;QACJ,MAAM;QACN,SAAS;QACT,iBAAiB;QACjB,MAAM;KACP,CAAA;IAED,MAAM,GAAG,GAAG,OAAO,EAAE,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAA;IACzC,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC,CAAA;IACzC,IAAI,SAAS,GAAG,KAAK,CAAA;IAErB,IAAI,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,CAAC;QAC/B,MAAM,OAAO,GAA4C,EAAE,CAAA;QAC3D,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACxC,MAAM,KAAK,GAA4B,EAAE,CAAA;YACzC,IAAI,MAAM,CAAC,OAAO;gBAAE,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAA;YAClD,IAAI,MAAM,CAAC,IAAI;gBAAE,KAAK,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAA;YACzC,IAAI,MAAM,CAAC,GAAG;gBAAE,KAAK,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAA;YACtC,IAAI,MAAM,CAAC,MAAM;gBAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAA;YACtD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAA;QAC9B,CAAC;QACD,aAAa,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,CAAA;QACpF,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,WAAW,CAAC,CAAA;QACtC,SAAS,GAAG,IAAI,CAAA;IAClB,CAAC;IAED,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;QAC5B,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;IAC7B,CAAC;IAED,IAAI,CAAC;QACL,OAAO,MAAM,IAAI,OAAO,CAAgB,CAAC,OAAO,EAAE,EAAE;YAClD,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE;gBAChC,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;gBACjC,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE;gBACvB,GAAG;aACJ,CAAC,CAAA;YAEF,IAAI,MAAM,GAAG,EAAE,CAAA;YACf,IAAI,MAAM,GAAG,EAAE,CAAA;YAEf,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;gBACvC,MAAM,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAA;gBAC1B,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;oBACpB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;gBAC7B,CAAC;YACH,CAAC,CAAC,CAAA;YAEF,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;gBACvC,MAAM,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAA;gBAC1B,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;oBACpB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;gBAC7B,CAAC;YACH,CAAC,CAAC,CAAA;YAEF,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;gBACxB,IAAI,UAAU,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;gBAC5D,IAAI,KAA6B,CAAA;gBACjC,IAAI,CAAC;oBACH,4CAA4C;oBAC5C,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAA4B,CAAA;oBAC5D,IAAI,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;wBACtC,UAAU,GAAG,MAAM,CAAC,MAAM,CAAA;oBAC5B,CAAC;oBACD,MAAM,CAAC,GAAG,MAAM,EAAE,KAA2C,CAAA;oBAC7D,IAAI,CAAC,EAAE,CAAC;wBACN,MAAM,YAAY,GAAG,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,aAAa,CAAuB,CAAA;wBAC9E,MAAM,gBAAgB,GAAG,CAAC,CAAC,CAAC,aAAa,IAAI,CAAC,CAAC,iBAAiB,CAAuB,CAAA;wBACvF,MAAM,KAAK,GAAG,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,CAAC,CAAC,IAAI,SAAS,CAAA;wBAC1E,KAAK,GAAG,EAAE,aAAa,EAAE,YAAY,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,YAAY,EAAE,KAAK,EAAE,CAAA;oBACnG,CAAC;gBACH,CAAC;gBAAC,MAAM,CAAC;oBACP,mDAAmD;oBACnD,uDAAuD;oBACvD,oEAAoE;oBACpE,uEAAuE;oBACvE,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;oBAChC,IAAI,oBAAwC,CAAA;oBAC5C,KAAK,MAAM,OAAO,IAAI,KAAK,EAAE,CAAC;wBAC5B,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,EAAE,CAAA;wBAC3B,IAAI,CAAC,IAAI;4BAAE,SAAQ;wBACnB,IAAI,CAAC;4BACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAA4B,CAAA;4BAC1D,+CAA+C;4BAC/C,IAAI,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gCACvD,UAAU,GAAG,MAAM,CAAC,MAAM,CAAA;gCAC1B,MAAM,CAAC,GAAG,MAAM,EAAE,KAA2C,CAAA;gCAC7D,IAAI,CAAC,EAAE,CAAC;oCACN,MAAM,YAAY,GAAG,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,aAAa,CAAuB,CAAA;oCAC9E,MAAM,gBAAgB,GAAG,CAAC,CAAC,CAAC,aAAa,IAAI,CAAC,CAAC,iBAAiB,CAAuB,CAAA;oCACvF,MAAM,KAAK,GAAG,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,CAAC,CAAC,IAAI,SAAS,CAAA;oCAC1E,KAAK,GAAG,EAAE,aAAa,EAAE,YAAY,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,YAAY,EAAE,KAAK,EAAE,CAAA;gCACnG,CAAC;gCACD,oBAAoB,GAAG,SAAS,CAAA,CAAC,+BAA+B;gCAChE,MAAK;4BACP,CAAC;4BACD,yDAAyD;4BACzD,IAAI,MAAM,CAAC,IAAI,KAAK,mBAAmB,EAAE,CAAC;gCACxC,MAAM,IAAI,GAAG,MAAM,CAAC,IAA2C,CAAA;gCAC/D,IAAI,IAAI,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;oCAC7C,oBAAoB,GAAG,IAAI,CAAC,OAAO,CAAA;gCACrC,CAAC;4BACH,CAAC;wBACH,CAAC;wBAAC,MAAM,CAAC,CAAC,yBAAyB,CAAC,CAAC;oBACvC,CAAC;oBACD,IAAI,oBAAoB,KAAK,SAAS,EAAE,CAAC;wBACvC,UAAU,GAAG,oBAAoB,CAAA;oBACnC,CAAC;gBACH,CAAC;gBACD,OAAO,CAAC;oBACN,OAAO,EAAE,IAAI,KAAK,CAAC;oBACnB,MAAM,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC;oBACpC,QAAQ,EAAE,IAAI,IAAI,CAAC,CAAC;oBACpB,KAAK;iBACN,CAAC,CAAA;YACJ,CAAC,CAAC,CAAA;YAEF,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;gBACvB,OAAO,CAAC;oBACN,OAAO,EAAE,KAAK;oBACd,MAAM,EAAE,qCAAqC,GAAG,CAAC,OAAO,EAAE;oBAC1D,QAAQ,EAAE,CAAC,CAAC;iBACb,CAAC,CAAA;YACJ,CAAC,CAAC,CAAA;YAEF,+CAA+C;YAC/C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAA;QACtB,CAAC,CAAC,CAAA;IACF,CAAC;YAAS,CAAC;QACT,IAAI,SAAS,EAAE,CAAC;YACd,IAAI,CAAC;gBAAC,UAAU,CAAC,WAAW,CAAC,CAAA;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,IAAI,CAAC,IAAU;IAC7B,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;QAC3C,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAC7B,UAAU,CAAC,GAAG,EAAE;YACd,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;gBAC3C,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YAC/B,CAAC;QACH,CAAC,EAAE,IAAI,CAAC,CAAA;IACV,CAAC;AACH,CAAC"}
|
|
@@ -140,5 +140,90 @@ describe('cursor adapter — MCP support', () => {
|
|
|
140
140
|
expect(capturedArgs).toContain('--approve-mcps');
|
|
141
141
|
expect(existsSync(join(tmpDir, 'mcp.json'))).toBe(false);
|
|
142
142
|
});
|
|
143
|
+
it('extracts result from single-line JSON output', async () => {
|
|
144
|
+
mockSpawn.mockImplementation((cmd) => {
|
|
145
|
+
if (cmd === 'which')
|
|
146
|
+
return makeMockProc(0, '');
|
|
147
|
+
return makeMockProc(0, '{"result":"# My PRD\\n\\nThe actual content"}');
|
|
148
|
+
});
|
|
149
|
+
const { execute } = await import('./cursor.js');
|
|
150
|
+
const result = await execute(makeTask(), { cwd: tmpDir });
|
|
151
|
+
expect(result.output).toBe('# My PRD\n\nThe actual content');
|
|
152
|
+
});
|
|
153
|
+
it('extracts result from JSONL output (last line has result)', async () => {
|
|
154
|
+
const jsonl = [
|
|
155
|
+
'{"type":"progress","content":"thinking..."}',
|
|
156
|
+
'{"type":"tool_use","tool":"read_file","args":{}}',
|
|
157
|
+
'{"type":"result","result":"# My PRD\\n\\nThe actual markdown content","usage":{"input_tokens":500,"output_tokens":1000}}',
|
|
158
|
+
].join('\n');
|
|
159
|
+
mockSpawn.mockImplementation((cmd) => {
|
|
160
|
+
if (cmd === 'which')
|
|
161
|
+
return makeMockProc(0, '');
|
|
162
|
+
return makeMockProc(0, jsonl);
|
|
163
|
+
});
|
|
164
|
+
const { execute } = await import('./cursor.js');
|
|
165
|
+
const result = await execute(makeTask(), { cwd: tmpDir });
|
|
166
|
+
expect(result.output).toBe('# My PRD\n\nThe actual markdown content');
|
|
167
|
+
expect(result.usage?.prompt_tokens).toBe(500);
|
|
168
|
+
expect(result.usage?.completion_tokens).toBe(1000);
|
|
169
|
+
});
|
|
170
|
+
it('scans JSONL and finds result line among non-result lines', async () => {
|
|
171
|
+
const jsonl = [
|
|
172
|
+
'{"type":"progress","content":"thinking..."}',
|
|
173
|
+
'{"type":"tool_use","tool":"edit","args":{}}',
|
|
174
|
+
'{"type":"result","result":"# Final Content","usage":{"input_tokens":100,"output_tokens":200}}',
|
|
175
|
+
'{"type":"done"}',
|
|
176
|
+
].join('\n');
|
|
177
|
+
mockSpawn.mockImplementation((cmd) => {
|
|
178
|
+
if (cmd === 'which')
|
|
179
|
+
return makeMockProc(0, '');
|
|
180
|
+
return makeMockProc(0, jsonl);
|
|
181
|
+
});
|
|
182
|
+
const { execute } = await import('./cursor.js');
|
|
183
|
+
const result = await execute(makeTask(), { cwd: tmpDir });
|
|
184
|
+
expect(result.output).toBe('# Final Content');
|
|
185
|
+
});
|
|
186
|
+
it('extracts content from Copilot-style assistant.message JSONL', async () => {
|
|
187
|
+
const jsonl = [
|
|
188
|
+
'{"type":"session.tools_updated","data":{"model":"claude-sonnet-4.6"}}',
|
|
189
|
+
'{"type":"user.message","data":{"content":"Generate a PRD"}}',
|
|
190
|
+
'{"type":"assistant.message","data":{"content":"# My PRD\\n\\nThe generated content","outputTokens":50}}',
|
|
191
|
+
'{"type":"assistant.turn_end","data":{"turnId":"0"}}',
|
|
192
|
+
'{"type":"result","sessionId":"abc","exitCode":0,"usage":{"premiumRequests":1}}',
|
|
193
|
+
].join('\n');
|
|
194
|
+
mockSpawn.mockImplementation((cmd) => {
|
|
195
|
+
if (cmd === 'which')
|
|
196
|
+
return makeMockProc(0, '');
|
|
197
|
+
return makeMockProc(0, jsonl);
|
|
198
|
+
});
|
|
199
|
+
const { execute } = await import('./cursor.js');
|
|
200
|
+
const result = await execute(makeTask(), { cwd: tmpDir });
|
|
201
|
+
expect(result.output).toBe('# My PRD\n\nThe generated content');
|
|
202
|
+
});
|
|
203
|
+
it('uses last assistant.message when multiple turns exist', async () => {
|
|
204
|
+
const jsonl = [
|
|
205
|
+
'{"type":"assistant.message","data":{"content":"Let me check..."}}',
|
|
206
|
+
'{"type":"assistant.message","data":{"content":"# Final PRD\\n\\nComplete document"}}',
|
|
207
|
+
'{"type":"result","sessionId":"abc","exitCode":0}',
|
|
208
|
+
].join('\n');
|
|
209
|
+
mockSpawn.mockImplementation((cmd) => {
|
|
210
|
+
if (cmd === 'which')
|
|
211
|
+
return makeMockProc(0, '');
|
|
212
|
+
return makeMockProc(0, jsonl);
|
|
213
|
+
});
|
|
214
|
+
const { execute } = await import('./cursor.js');
|
|
215
|
+
const result = await execute(makeTask(), { cwd: tmpDir });
|
|
216
|
+
expect(result.output).toBe('# Final PRD\n\nComplete document');
|
|
217
|
+
});
|
|
218
|
+
it('falls back to raw output when JSON has no result field', async () => {
|
|
219
|
+
mockSpawn.mockImplementation((cmd) => {
|
|
220
|
+
if (cmd === 'which')
|
|
221
|
+
return makeMockProc(0, '');
|
|
222
|
+
return makeMockProc(0, '{"status":"ok","data":"something"}');
|
|
223
|
+
});
|
|
224
|
+
const { execute } = await import('./cursor.js');
|
|
225
|
+
const result = await execute(makeTask(), { cwd: tmpDir });
|
|
226
|
+
expect(result.output).toBe('{"status":"ok","data":"something"}');
|
|
227
|
+
});
|
|
143
228
|
});
|
|
144
229
|
//# sourceMappingURL=cursor.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cursor.test.js","sourceRoot":"","sources":["../../../../src/cli/run/adapters/cursor.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cursor.test.js","sourceRoot":"","sources":["../../../../src/cli/run/adapters/cursor.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opencode.d.ts","sourceRoot":"","sources":["../../../../src/cli/run/adapters/opencode.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,aAAa,EAAc,MAAM,gBAAgB,CAAA;AAErF,mBAAmB;AACnB,eAAO,MAAM,IAAI,aAAa,CAAA;AAE9B,wBAAgB,yBAAyB,IAAI,OAAO,CAAiB;AACrE;;GAEG;AACH,wBAAsB,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,CAMpD;AAED;;GAEG;AACH,wBAAsB,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"opencode.d.ts","sourceRoot":"","sources":["../../../../src/cli/run/adapters/opencode.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,aAAa,EAAc,MAAM,gBAAgB,CAAA;AAErF,mBAAmB;AACnB,eAAO,MAAM,IAAI,aAAa,CAAA;AAE9B,wBAAgB,yBAAyB,IAAI,OAAO,CAAiB;AACrE;;GAEG;AACH,wBAAsB,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,CAMpD;AAED;;GAEG;AACH,wBAAsB,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,aAAa,CAAC,CAuI9F;AAED;;GAEG;AACH,wBAAgB,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CASrC"}
|
|
@@ -22,7 +22,7 @@ export async function execute(task, options = {}) {
|
|
|
22
22
|
if (task.files && task.files.length > 0) {
|
|
23
23
|
prompt += `\n\nOnly modify files under: ${task.files.join(', ')}`;
|
|
24
24
|
}
|
|
25
|
-
const args = ['
|
|
25
|
+
const args = ['run', prompt, '--format', 'json'];
|
|
26
26
|
const cwd = options?.cwd ?? process.cwd();
|
|
27
27
|
const mcpJsonPath = join(cwd, 'mcp.json');
|
|
28
28
|
let wroteJson = false;
|
|
@@ -72,11 +72,10 @@ export async function execute(task, options = {}) {
|
|
|
72
72
|
let textOutput = [stdout, stderr].filter(Boolean).join('\n');
|
|
73
73
|
let usage;
|
|
74
74
|
try {
|
|
75
|
+
// Try single JSON object first (claude CLI)
|
|
75
76
|
const parsed = JSON.parse(stdout);
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
if (typeof result === 'string') {
|
|
79
|
-
textOutput = result;
|
|
77
|
+
if (typeof parsed.result === 'string') {
|
|
78
|
+
textOutput = parsed.result;
|
|
80
79
|
}
|
|
81
80
|
const u = parsed?.usage;
|
|
82
81
|
if (u) {
|
|
@@ -86,7 +85,46 @@ export async function execute(task, options = {}) {
|
|
|
86
85
|
usage = { prompt_tokens: promptTokens, completion_tokens: completionTokens, total_tokens: total };
|
|
87
86
|
}
|
|
88
87
|
}
|
|
89
|
-
catch {
|
|
88
|
+
catch {
|
|
89
|
+
// Fallback: parse JSONL (one JSON object per line)
|
|
90
|
+
// Claude CLI uses {"result": "text"}, Copilot CLI uses
|
|
91
|
+
// {"type":"assistant.message","data":{"content":"text"}} for the AI
|
|
92
|
+
// response and a separate {"type":"result"} line for session metadata.
|
|
93
|
+
const lines = stdout.split('\n');
|
|
94
|
+
let lastAssistantContent;
|
|
95
|
+
for (const rawLine of lines) {
|
|
96
|
+
const line = rawLine.trim();
|
|
97
|
+
if (!line)
|
|
98
|
+
continue;
|
|
99
|
+
try {
|
|
100
|
+
const parsed = JSON.parse(line);
|
|
101
|
+
// Claude-style: result text in the result line
|
|
102
|
+
if (typeof parsed.result === 'string' && parsed.result) {
|
|
103
|
+
textOutput = parsed.result;
|
|
104
|
+
const u = parsed?.usage;
|
|
105
|
+
if (u) {
|
|
106
|
+
const promptTokens = (u.input_tokens ?? u.prompt_tokens);
|
|
107
|
+
const completionTokens = (u.output_tokens ?? u.completion_tokens);
|
|
108
|
+
const total = ((promptTokens ?? 0) + (completionTokens ?? 0)) || undefined;
|
|
109
|
+
usage = { prompt_tokens: promptTokens, completion_tokens: completionTokens, total_tokens: total };
|
|
110
|
+
}
|
|
111
|
+
lastAssistantContent = undefined; // prefer explicit result field
|
|
112
|
+
break;
|
|
113
|
+
}
|
|
114
|
+
// Copilot-style: AI response in assistant.message events
|
|
115
|
+
if (parsed.type === 'assistant.message') {
|
|
116
|
+
const data = parsed.data;
|
|
117
|
+
if (data && typeof data.content === 'string') {
|
|
118
|
+
lastAssistantContent = data.content;
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
catch { /* skip non-JSON lines */ }
|
|
123
|
+
}
|
|
124
|
+
if (lastAssistantContent !== undefined) {
|
|
125
|
+
textOutput = lastAssistantContent;
|
|
126
|
+
}
|
|
127
|
+
}
|
|
90
128
|
resolve({
|
|
91
129
|
success: code === 0,
|
|
92
130
|
output: textOutput.slice(0, 500_000),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opencode.js","sourceRoot":"","sources":["../../../../src/cli/run/adapters/opencode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAC1C,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAGhC,mBAAmB;AACnB,MAAM,CAAC,MAAM,IAAI,GAAG,UAAU,CAAA;AAE9B,MAAM,UAAU,yBAAyB,KAAc,OAAO,KAAK,CAAA,CAAC,CAAC;AACrE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW;IAC/B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,UAAU,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;QAC5D,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAA;QAC/C,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAA;IACxC,CAAC,CAAC,CAAA;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,IAAU,EAAE,UAA0B,EAAE;IACpE,IAAI,MAAM,GAAG,aAAa,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,MAAM,EAAE,CAAA;IAEtD,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxC,MAAM,IAAI,gCAAgC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAA;IACnE,CAAC;IAED,MAAM,IAAI,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"opencode.js","sourceRoot":"","sources":["../../../../src/cli/run/adapters/opencode.ts"],"names":[],"mappings":"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"}
|
|
@@ -113,6 +113,7 @@ describe('opencode adapter — MCP support', () => {
|
|
|
113
113
|
});
|
|
114
114
|
const { execute } = await import('./opencode.js');
|
|
115
115
|
await execute(makeTask(), { cwd: tmpDir });
|
|
116
|
+
expect(capturedArgs).toContain('run');
|
|
116
117
|
expect(capturedArgs).not.toContain('--mcp-config');
|
|
117
118
|
});
|
|
118
119
|
it('passes --approve-mcps when mcp_approve_all is true', async () => {
|
|
@@ -139,5 +140,90 @@ describe('opencode adapter — MCP support', () => {
|
|
|
139
140
|
await execute(makeTask(), { cwd: tmpDir });
|
|
140
141
|
expect(capturedArgs).not.toContain('--approve-mcps');
|
|
141
142
|
});
|
|
143
|
+
it('extracts result from single-line JSON output', async () => {
|
|
144
|
+
mockSpawn.mockImplementation((cmd) => {
|
|
145
|
+
if (cmd === 'which')
|
|
146
|
+
return makeMockProc(0, '');
|
|
147
|
+
return makeMockProc(0, '{"result":"# My PRD\\n\\nThe actual content"}');
|
|
148
|
+
});
|
|
149
|
+
const { execute } = await import('./opencode.js');
|
|
150
|
+
const result = await execute(makeTask(), { cwd: tmpDir });
|
|
151
|
+
expect(result.output).toBe('# My PRD\n\nThe actual content');
|
|
152
|
+
});
|
|
153
|
+
it('extracts result from JSONL output (last line has result)', async () => {
|
|
154
|
+
const jsonl = [
|
|
155
|
+
'{"type":"progress","content":"thinking..."}',
|
|
156
|
+
'{"type":"tool_use","tool":"read_file","args":{}}',
|
|
157
|
+
'{"type":"result","result":"# My PRD\\n\\nThe actual markdown content","usage":{"input_tokens":500,"output_tokens":1000}}',
|
|
158
|
+
].join('\n');
|
|
159
|
+
mockSpawn.mockImplementation((cmd) => {
|
|
160
|
+
if (cmd === 'which')
|
|
161
|
+
return makeMockProc(0, '');
|
|
162
|
+
return makeMockProc(0, jsonl);
|
|
163
|
+
});
|
|
164
|
+
const { execute } = await import('./opencode.js');
|
|
165
|
+
const result = await execute(makeTask(), { cwd: tmpDir });
|
|
166
|
+
expect(result.output).toBe('# My PRD\n\nThe actual markdown content');
|
|
167
|
+
expect(result.usage?.prompt_tokens).toBe(500);
|
|
168
|
+
expect(result.usage?.completion_tokens).toBe(1000);
|
|
169
|
+
});
|
|
170
|
+
it('scans JSONL and finds result line among non-result lines', async () => {
|
|
171
|
+
const jsonl = [
|
|
172
|
+
'{"type":"progress","content":"thinking..."}',
|
|
173
|
+
'{"type":"tool_use","tool":"edit","args":{}}',
|
|
174
|
+
'{"type":"result","result":"# Final Content","usage":{"input_tokens":100,"output_tokens":200}}',
|
|
175
|
+
'{"type":"done"}',
|
|
176
|
+
].join('\n');
|
|
177
|
+
mockSpawn.mockImplementation((cmd) => {
|
|
178
|
+
if (cmd === 'which')
|
|
179
|
+
return makeMockProc(0, '');
|
|
180
|
+
return makeMockProc(0, jsonl);
|
|
181
|
+
});
|
|
182
|
+
const { execute } = await import('./opencode.js');
|
|
183
|
+
const result = await execute(makeTask(), { cwd: tmpDir });
|
|
184
|
+
expect(result.output).toBe('# Final Content');
|
|
185
|
+
});
|
|
186
|
+
it('extracts content from Copilot-style assistant.message JSONL', async () => {
|
|
187
|
+
const jsonl = [
|
|
188
|
+
'{"type":"session.tools_updated","data":{"model":"claude-sonnet-4.6"}}',
|
|
189
|
+
'{"type":"user.message","data":{"content":"Generate a PRD"}}',
|
|
190
|
+
'{"type":"assistant.message","data":{"content":"# My PRD\\n\\nThe generated content","outputTokens":50}}',
|
|
191
|
+
'{"type":"assistant.turn_end","data":{"turnId":"0"}}',
|
|
192
|
+
'{"type":"result","sessionId":"abc","exitCode":0,"usage":{"premiumRequests":1}}',
|
|
193
|
+
].join('\n');
|
|
194
|
+
mockSpawn.mockImplementation((cmd) => {
|
|
195
|
+
if (cmd === 'which')
|
|
196
|
+
return makeMockProc(0, '');
|
|
197
|
+
return makeMockProc(0, jsonl);
|
|
198
|
+
});
|
|
199
|
+
const { execute } = await import('./opencode.js');
|
|
200
|
+
const result = await execute(makeTask(), { cwd: tmpDir });
|
|
201
|
+
expect(result.output).toBe('# My PRD\n\nThe generated content');
|
|
202
|
+
});
|
|
203
|
+
it('uses last assistant.message when multiple turns exist', async () => {
|
|
204
|
+
const jsonl = [
|
|
205
|
+
'{"type":"assistant.message","data":{"content":"Let me check..."}}',
|
|
206
|
+
'{"type":"assistant.message","data":{"content":"# Final PRD\\n\\nComplete document"}}',
|
|
207
|
+
'{"type":"result","sessionId":"abc","exitCode":0}',
|
|
208
|
+
].join('\n');
|
|
209
|
+
mockSpawn.mockImplementation((cmd) => {
|
|
210
|
+
if (cmd === 'which')
|
|
211
|
+
return makeMockProc(0, '');
|
|
212
|
+
return makeMockProc(0, jsonl);
|
|
213
|
+
});
|
|
214
|
+
const { execute } = await import('./opencode.js');
|
|
215
|
+
const result = await execute(makeTask(), { cwd: tmpDir });
|
|
216
|
+
expect(result.output).toBe('# Final PRD\n\nComplete document');
|
|
217
|
+
});
|
|
218
|
+
it('falls back to raw output when JSON has no result field', async () => {
|
|
219
|
+
mockSpawn.mockImplementation((cmd) => {
|
|
220
|
+
if (cmd === 'which')
|
|
221
|
+
return makeMockProc(0, '');
|
|
222
|
+
return makeMockProc(0, '{"status":"ok","data":"something"}');
|
|
223
|
+
});
|
|
224
|
+
const { execute } = await import('./opencode.js');
|
|
225
|
+
const result = await execute(makeTask(), { cwd: tmpDir });
|
|
226
|
+
expect(result.output).toBe('{"status":"ok","data":"something"}');
|
|
227
|
+
});
|
|
142
228
|
});
|
|
143
229
|
//# sourceMappingURL=opencode.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opencode.test.js","sourceRoot":"","sources":["../../../../src/cli/run/adapters/opencode.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"opencode.test.js","sourceRoot":"","sources":["../../../../src/cli/run/adapters/opencode.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -231,4 +231,89 @@ describe('claude adapter — CLI mode', () => {
|
|
|
231
231
|
token: 'abc',
|
|
232
232
|
})
|
|
233
233
|
})
|
|
234
|
+
|
|
235
|
+
it('extracts result from single-line JSON output', async () => {
|
|
236
|
+
mockSpawn.mockImplementation((cmd: string) => {
|
|
237
|
+
if (cmd === 'which') return makeMockProc(0, '')
|
|
238
|
+
return makeMockProc(0, '{"result":"# My PRD\\n\\nThe actual content"}')
|
|
239
|
+
})
|
|
240
|
+
const { executeViaCli } = await import('./claude.js')
|
|
241
|
+
const result = await executeViaCli(makeTask(), { cwd: tmpDir })
|
|
242
|
+
expect(result.output).toBe('# My PRD\n\nThe actual content')
|
|
243
|
+
})
|
|
244
|
+
|
|
245
|
+
it('extracts result from JSONL output (last line has result)', async () => {
|
|
246
|
+
const jsonl = [
|
|
247
|
+
'{"type":"progress","content":"thinking..."}',
|
|
248
|
+
'{"type":"tool_use","tool":"read_file","args":{}}',
|
|
249
|
+
'{"type":"result","result":"# My PRD\\n\\nThe actual markdown content","usage":{"input_tokens":500,"output_tokens":1000}}',
|
|
250
|
+
].join('\n')
|
|
251
|
+
mockSpawn.mockImplementation((cmd: string) => {
|
|
252
|
+
if (cmd === 'which') return makeMockProc(0, '')
|
|
253
|
+
return makeMockProc(0, jsonl)
|
|
254
|
+
})
|
|
255
|
+
const { executeViaCli } = await import('./claude.js')
|
|
256
|
+
const result = await executeViaCli(makeTask(), { cwd: tmpDir })
|
|
257
|
+
expect(result.output).toBe('# My PRD\n\nThe actual markdown content')
|
|
258
|
+
expect(result.usage?.prompt_tokens).toBe(500)
|
|
259
|
+
expect(result.usage?.completion_tokens).toBe(1000)
|
|
260
|
+
})
|
|
261
|
+
|
|
262
|
+
it('scans JSONL and finds result line among non-result lines', async () => {
|
|
263
|
+
const jsonl = [
|
|
264
|
+
'{"type":"progress","content":"thinking..."}',
|
|
265
|
+
'{"type":"tool_use","tool":"edit","args":{}}',
|
|
266
|
+
'{"type":"result","result":"# Final Content","usage":{"input_tokens":100,"output_tokens":200}}',
|
|
267
|
+
'{"type":"done"}',
|
|
268
|
+
].join('\n')
|
|
269
|
+
mockSpawn.mockImplementation((cmd: string) => {
|
|
270
|
+
if (cmd === 'which') return makeMockProc(0, '')
|
|
271
|
+
return makeMockProc(0, jsonl)
|
|
272
|
+
})
|
|
273
|
+
const { executeViaCli } = await import('./claude.js')
|
|
274
|
+
const result = await executeViaCli(makeTask(), { cwd: tmpDir })
|
|
275
|
+
expect(result.output).toBe('# Final Content')
|
|
276
|
+
})
|
|
277
|
+
|
|
278
|
+
it('extracts content from Copilot-style assistant.message JSONL', async () => {
|
|
279
|
+
const jsonl = [
|
|
280
|
+
'{"type":"session.tools_updated","data":{"model":"claude-sonnet-4.6"}}',
|
|
281
|
+
'{"type":"user.message","data":{"content":"Generate a PRD"}}',
|
|
282
|
+
'{"type":"assistant.message","data":{"content":"# My PRD\\n\\nThe generated content","outputTokens":50}}',
|
|
283
|
+
'{"type":"assistant.turn_end","data":{"turnId":"0"}}',
|
|
284
|
+
'{"type":"result","sessionId":"abc","exitCode":0,"usage":{"premiumRequests":1}}',
|
|
285
|
+
].join('\n')
|
|
286
|
+
mockSpawn.mockImplementation((cmd: string) => {
|
|
287
|
+
if (cmd === 'which') return makeMockProc(0, '')
|
|
288
|
+
return makeMockProc(0, jsonl)
|
|
289
|
+
})
|
|
290
|
+
const { executeViaCli } = await import('./claude.js')
|
|
291
|
+
const result = await executeViaCli(makeTask(), { cwd: tmpDir })
|
|
292
|
+
expect(result.output).toBe('# My PRD\n\nThe generated content')
|
|
293
|
+
})
|
|
294
|
+
|
|
295
|
+
it('uses last assistant.message when multiple turns exist', async () => {
|
|
296
|
+
const jsonl = [
|
|
297
|
+
'{"type":"assistant.message","data":{"content":"Let me check..."}}',
|
|
298
|
+
'{"type":"assistant.message","data":{"content":"# Final PRD\\n\\nComplete document"}}',
|
|
299
|
+
'{"type":"result","sessionId":"abc","exitCode":0}',
|
|
300
|
+
].join('\n')
|
|
301
|
+
mockSpawn.mockImplementation((cmd: string) => {
|
|
302
|
+
if (cmd === 'which') return makeMockProc(0, '')
|
|
303
|
+
return makeMockProc(0, jsonl)
|
|
304
|
+
})
|
|
305
|
+
const { executeViaCli } = await import('./claude.js')
|
|
306
|
+
const result = await executeViaCli(makeTask(), { cwd: tmpDir })
|
|
307
|
+
expect(result.output).toBe('# Final PRD\n\nComplete document')
|
|
308
|
+
})
|
|
309
|
+
|
|
310
|
+
it('falls back to raw output when JSON has no result field', async () => {
|
|
311
|
+
mockSpawn.mockImplementation((cmd: string) => {
|
|
312
|
+
if (cmd === 'which') return makeMockProc(0, '')
|
|
313
|
+
return makeMockProc(0, '{"status":"ok","data":"something"}')
|
|
314
|
+
})
|
|
315
|
+
const { executeViaCli } = await import('./claude.js')
|
|
316
|
+
const result = await executeViaCli(makeTask(), { cwd: tmpDir })
|
|
317
|
+
expect(result.output).toBe('{"status":"ok","data":"something"}')
|
|
318
|
+
})
|
|
234
319
|
})
|
|
@@ -222,14 +222,11 @@ export async function executeViaCli(task: Task, options: ExecuteOptions = {}): P
|
|
|
222
222
|
let textOutput = [stdout, stderr].filter(Boolean).join('\n')
|
|
223
223
|
let usage: TokenUsage | undefined
|
|
224
224
|
try {
|
|
225
|
+
// Try single JSON object first (claude CLI)
|
|
225
226
|
const parsedJson = JSON.parse(stdout) as Record<string, unknown>
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
const result = parsedJson.result as string | undefined
|
|
229
|
-
if (typeof result === 'string') {
|
|
230
|
-
textOutput = result
|
|
227
|
+
if (typeof parsedJson.result === 'string') {
|
|
228
|
+
textOutput = parsedJson.result
|
|
231
229
|
}
|
|
232
|
-
|
|
233
230
|
const u = parsedJson?.usage as Record<string, number> | undefined
|
|
234
231
|
if (u) {
|
|
235
232
|
const promptTokens = (u.input_tokens ?? u.prompt_tokens) as number | undefined
|
|
@@ -237,7 +234,44 @@ export async function executeViaCli(task: Task, options: ExecuteOptions = {}): P
|
|
|
237
234
|
const total = ((promptTokens ?? 0) + (completionTokens ?? 0)) || undefined
|
|
238
235
|
usage = { prompt_tokens: promptTokens, completion_tokens: completionTokens, total_tokens: total }
|
|
239
236
|
}
|
|
240
|
-
} catch {
|
|
237
|
+
} catch {
|
|
238
|
+
// Fallback: parse JSONL (one JSON object per line)
|
|
239
|
+
// Claude CLI uses {"result": "text"}, Copilot CLI uses
|
|
240
|
+
// {"type":"assistant.message","data":{"content":"text"}} for the AI
|
|
241
|
+
// response and a separate {"type":"result"} line for session metadata.
|
|
242
|
+
const lines = stdout.split('\n')
|
|
243
|
+
let lastAssistantContent: string | undefined
|
|
244
|
+
for (const rawLine of lines) {
|
|
245
|
+
const line = rawLine.trim()
|
|
246
|
+
if (!line) continue
|
|
247
|
+
try {
|
|
248
|
+
const parsed = JSON.parse(line) as Record<string, unknown>
|
|
249
|
+
// Claude-style: result text in the result line
|
|
250
|
+
if (typeof parsed.result === 'string' && parsed.result) {
|
|
251
|
+
textOutput = parsed.result
|
|
252
|
+
const u = parsed?.usage as Record<string, number> | undefined
|
|
253
|
+
if (u) {
|
|
254
|
+
const promptTokens = (u.input_tokens ?? u.prompt_tokens) as number | undefined
|
|
255
|
+
const completionTokens = (u.output_tokens ?? u.completion_tokens) as number | undefined
|
|
256
|
+
const total = ((promptTokens ?? 0) + (completionTokens ?? 0)) || undefined
|
|
257
|
+
usage = { prompt_tokens: promptTokens, completion_tokens: completionTokens, total_tokens: total }
|
|
258
|
+
}
|
|
259
|
+
lastAssistantContent = undefined // prefer explicit result field
|
|
260
|
+
break
|
|
261
|
+
}
|
|
262
|
+
// Copilot-style: AI response in assistant.message events
|
|
263
|
+
if (parsed.type === 'assistant.message') {
|
|
264
|
+
const data = parsed.data as Record<string, unknown> | undefined
|
|
265
|
+
if (data && typeof data.content === 'string') {
|
|
266
|
+
lastAssistantContent = data.content
|
|
267
|
+
}
|
|
268
|
+
}
|
|
269
|
+
} catch { /* skip non-JSON lines */ }
|
|
270
|
+
}
|
|
271
|
+
if (lastAssistantContent !== undefined) {
|
|
272
|
+
textOutput = lastAssistantContent
|
|
273
|
+
}
|
|
274
|
+
}
|
|
241
275
|
resolve({
|
|
242
276
|
success: code === 0,
|
|
243
277
|
output: textOutput.slice(0, 500_000),
|