agent-tower 0.5.3-beta.6 → 0.5.3-beta.7
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/app.d.ts.map +1 -1
- package/dist/app.js +13 -0
- package/dist/app.js.map +1 -1
- package/dist/cli.js +26 -3
- package/dist/cli.js.map +1 -1
- package/dist/executors/__tests__/base.executor.test.js +83 -8
- package/dist/executors/__tests__/base.executor.test.js.map +1 -1
- package/dist/executors/__tests__/claude-code.executor.test.d.ts +2 -0
- package/dist/executors/__tests__/claude-code.executor.test.d.ts.map +1 -0
- package/dist/executors/__tests__/claude-code.executor.test.js +72 -0
- package/dist/executors/__tests__/claude-code.executor.test.js.map +1 -0
- package/dist/executors/__tests__/providers-availability.test.d.ts +2 -0
- package/dist/executors/__tests__/providers-availability.test.d.ts.map +1 -0
- package/dist/executors/__tests__/providers-availability.test.js +92 -0
- package/dist/executors/__tests__/providers-availability.test.js.map +1 -0
- package/dist/executors/__tests__/stdin-prompt.executors.test.d.ts +2 -0
- package/dist/executors/__tests__/stdin-prompt.executors.test.d.ts.map +1 -0
- package/dist/executors/__tests__/stdin-prompt.executors.test.js +177 -0
- package/dist/executors/__tests__/stdin-prompt.executors.test.js.map +1 -0
- package/dist/executors/base.executor.d.ts.map +1 -1
- package/dist/executors/base.executor.js +131 -33
- package/dist/executors/base.executor.js.map +1 -1
- package/dist/executors/claude-code.executor.d.ts.map +1 -1
- package/dist/executors/claude-code.executor.js +22 -52
- package/dist/executors/claude-code.executor.js.map +1 -1
- package/dist/executors/codex.executor.js +4 -4
- package/dist/executors/codex.executor.js.map +1 -1
- package/dist/executors/cursor-agent.executor.d.ts.map +1 -1
- package/dist/executors/cursor-agent.executor.js +4 -6
- package/dist/executors/cursor-agent.executor.js.map +1 -1
- package/dist/executors/gemini-cli.executor.d.ts.map +1 -1
- package/dist/executors/gemini-cli.executor.js +9 -8
- package/dist/executors/gemini-cli.executor.js.map +1 -1
- package/dist/executors/image-utils.d.ts.map +1 -1
- package/dist/executors/image-utils.js +4 -22
- package/dist/executors/image-utils.js.map +1 -1
- package/dist/index.js +37 -2
- package/dist/index.js.map +1 -1
- package/dist/pipeline/agent-pipeline.d.ts.map +1 -1
- package/dist/pipeline/agent-pipeline.js +27 -2
- package/dist/pipeline/agent-pipeline.js.map +1 -1
- package/dist/services/__tests__/conversation.service.test.js +63 -0
- package/dist/services/__tests__/conversation.service.test.js.map +1 -1
- package/dist/services/conversation.service.d.ts.map +1 -1
- package/dist/services/conversation.service.js +17 -1
- package/dist/services/conversation.service.js.map +1 -1
- package/dist/services/session-manager.d.ts +9 -8
- package/dist/services/session-manager.d.ts.map +1 -1
- package/dist/services/session-manager.js +129 -16
- package/dist/services/session-manager.js.map +1 -1
- package/dist/services/task.service.d.ts +2 -2
- package/dist/services/terminal-manager.d.ts.map +1 -1
- package/dist/services/terminal-manager.js +39 -7
- package/dist/services/terminal-manager.js.map +1 -1
- package/dist/services/workspace.service.d.ts +7 -7
- package/dist/utils/error-log.d.ts +20 -0
- package/dist/utils/error-log.d.ts.map +1 -0
- package/dist/utils/error-log.js +176 -0
- package/dist/utils/error-log.js.map +1 -0
- package/dist/utils/error-log.test.d.ts +2 -0
- package/dist/utils/error-log.test.d.ts.map +1 -0
- package/dist/utils/error-log.test.js +233 -0
- package/dist/utils/error-log.test.js.map +1 -0
- package/dist/utils/prisma-cli-env.d.ts +3 -0
- package/dist/utils/prisma-cli-env.d.ts.map +1 -0
- package/dist/utils/prisma-cli-env.js +15 -0
- package/dist/utils/prisma-cli-env.js.map +1 -0
- package/dist/utils/prisma-cli-env.test.d.ts +2 -0
- package/dist/utils/prisma-cli-env.test.d.ts.map +1 -0
- package/dist/utils/prisma-cli-env.test.js +34 -0
- package/dist/utils/prisma-cli-env.test.js.map +1 -0
- package/dist/utils/process-launch.d.ts +4 -0
- package/dist/utils/process-launch.d.ts.map +1 -1
- package/dist/utils/process-launch.js +99 -15
- package/dist/utils/process-launch.js.map +1 -1
- package/dist/utils/process-launch.test.js +120 -3
- package/dist/utils/process-launch.test.js.map +1 -1
- package/dist/web/assets/{AgentDemoPage-BqUFGORQ.js → AgentDemoPage-C3_t3lf0.js} +1 -1
- package/dist/web/assets/{AgentLogo-O_lfAIQi.js → AgentLogo-BiGSdOLM.js} +1 -1
- package/dist/web/assets/ConversationPage-D3BaVRNK.js +3 -0
- package/dist/web/assets/CreateTaskInput-C6ZA8Cnu.js +2 -0
- package/dist/web/assets/{DemoPage-DohwggTK.js → DemoPage-BGdrlCk3.js} +1 -1
- package/dist/web/assets/{GeneralSettingsPage-BqSO35vU.js → GeneralSettingsPage-DRP9x8ha.js} +1 -1
- package/dist/web/assets/{Icons-B5Qr68Dp.js → Icons-U8HyAFg8.js} +1 -1
- package/dist/web/assets/{LoadingPreviewPage-DBVTXpq2.js → LoadingPreviewPage-BR3n6lWz.js} +1 -1
- package/dist/web/assets/{McpSettingsPage-B4hjk8Q6.js → McpSettingsPage-BQ4HNeR-.js} +1 -1
- package/dist/web/assets/{MemberAvatar-DmWOKCwf.js → MemberAvatar-BjHhs0Hs.js} +1 -1
- package/dist/web/assets/{NotificationSettingsPage-DiUyq7V-.js → NotificationSettingsPage-nAYf_v-C.js} +1 -1
- package/dist/web/assets/{ProfileSettingsPage-BcUtq3sY.js → ProfileSettingsPage-CvVvZlDS.js} +1 -1
- package/dist/web/assets/{ProjectKanbanPage-G5OQeJvU.css → ProjectKanbanPage-DcpNTP1B.css} +1 -1
- package/dist/web/assets/{ProjectKanbanPage-klp2fAN1.js → ProjectKanbanPage-DpWuiq4x.js} +34 -34
- package/dist/web/assets/{ProjectSettingsPage-D2gQsbTJ.js → ProjectSettingsPage-B1V5vUQk.js} +1 -1
- package/dist/web/assets/{ProviderSettingsPage-CX8WeQ3x.js → ProviderSettingsPage-CXq-sGzZ.js} +1 -1
- package/dist/web/assets/{SettingsMasterDetail-BtiI8TDc.js → SettingsMasterDetail-BOKbstXF.js} +1 -1
- package/dist/web/assets/{TeamSettingsPage-CZgtzFUH.js → TeamSettingsPage-DFx7ZKTf.js} +1 -1
- package/dist/web/assets/{arc-BP5t0cJz.js → arc-D4qG1SmX.js} +1 -1
- package/dist/web/assets/{architectureDiagram-3BPJPVTR-B4nGdxyB.js → architectureDiagram-3BPJPVTR-C1KQ-nPu.js} +1 -1
- package/dist/web/assets/{arrow-left-CH7x-bnE.js → arrow-left-DKU68PPE.js} +1 -1
- package/dist/web/assets/{blockDiagram-GPEHLZMM-C0obS1hu.js → blockDiagram-GPEHLZMM-CHBz_0R-.js} +1 -1
- package/dist/web/assets/{c4Diagram-AAUBKEIU-DLOq2msX.js → c4Diagram-AAUBKEIU-spmGspVf.js} +1 -1
- package/dist/web/assets/channel-BzXNFc3j.js +1 -0
- package/dist/web/assets/check-ugjfD3Li.js +1 -0
- package/dist/web/assets/{chevron-down-CBY3fFTT.js → chevron-down-Bqq-PI_B.js} +1 -1
- package/dist/web/assets/{chevron-right-DZo7j27r.js → chevron-right-K0xCrJxO.js} +1 -1
- package/dist/web/assets/{chevron-up-721LBv_e.js → chevron-up-Rnt9gnA4.js} +1 -1
- package/dist/web/assets/{chunk-2J33WTMH-C07Su0AF.js → chunk-2J33WTMH-BoBYuHA8.js} +1 -1
- package/dist/web/assets/{chunk-4BX2VUAB-DAdn-ED3.js → chunk-4BX2VUAB-Bmb_y0KF.js} +1 -1
- package/dist/web/assets/{chunk-55IACEB6-BL4-BcAX.js → chunk-55IACEB6-B_KS5xlb.js} +1 -1
- package/dist/web/assets/{chunk-727SXJPM-BmmMDMNV.js → chunk-727SXJPM-DI9KppWM.js} +1 -1
- package/dist/web/assets/{chunk-AQP2D5EJ-CeLsYTvJ.js → chunk-AQP2D5EJ-C3F0DJdJ.js} +1 -1
- package/dist/web/assets/{chunk-FMBD7UC4-Bs7S01MB.js → chunk-FMBD7UC4-C6-Jfc2f.js} +1 -1
- package/dist/web/assets/{chunk-ND2GUHAM-uqytV5JO.js → chunk-ND2GUHAM-Crt5iCMS.js} +1 -1
- package/dist/web/assets/{chunk-QZHKN3VN-DGM3LKCe.js → chunk-QZHKN3VN-CSYfO5_E.js} +1 -1
- package/dist/web/assets/{circle-alert-Dkp6R_Ml.js → circle-alert-BA6H1Efg.js} +1 -1
- package/dist/web/assets/classDiagram-4FO5ZUOK-DWVhCasm.js +1 -0
- package/dist/web/assets/classDiagram-v2-Q7XG4LA2-DWVhCasm.js +1 -0
- package/dist/web/assets/{code-block-OCS4YCEC-C_fs5i5h.js → code-block-OCS4YCEC-BNCfYHwe.js} +1 -1
- package/dist/web/assets/{confirm-dialog-IGqDL03n.js → confirm-dialog-xFGalfma.js} +1 -1
- package/dist/web/assets/{cose-bilkent-S5V4N54A-2VABc7UM.js → cose-bilkent-S5V4N54A-CsfM-xa6.js} +1 -1
- package/dist/web/assets/{dagre-BM42HDAG-D0-HOAOA.js → dagre-BM42HDAG-a0_McFXq.js} +1 -1
- package/dist/web/assets/{diagram-2AECGRRQ-Cyt7AAOQ.js → diagram-2AECGRRQ-Dc-ZrrCl.js} +1 -1
- package/dist/web/assets/{diagram-5GNKFQAL-BBv9SoKB.js → diagram-5GNKFQAL-CVTae_wQ.js} +1 -1
- package/dist/web/assets/{diagram-KO2AKTUF-DV5NTHkX.js → diagram-KO2AKTUF-DkfB2YqP.js} +1 -1
- package/dist/web/assets/{diagram-LMA3HP47-eNPojcJF.js → diagram-LMA3HP47-k45WlYTa.js} +1 -1
- package/dist/web/assets/{diagram-OG6HWLK6-DYNkChUG.js → diagram-OG6HWLK6-D6oP9231.js} +1 -1
- package/dist/web/assets/{erDiagram-TEJ5UH35-ZXZ2vyVY.js → erDiagram-TEJ5UH35-DCsStITe.js} +1 -1
- package/dist/web/assets/{flowDiagram-I6XJVG4X-E8oqHUJx.js → flowDiagram-I6XJVG4X-BpnMpo54.js} +1 -1
- package/dist/web/assets/{folder-BxT7ExMF.js → folder-aqzIYw0B.js} +1 -1
- package/dist/web/assets/{folder-picker-57gIIPSi.js → folder-picker-CFznZBP-.js} +1 -1
- package/dist/web/assets/{ganttDiagram-6RSMTGT7-CEAjt7Nr.js → ganttDiagram-6RSMTGT7-CzoF4UuV.js} +1 -1
- package/dist/web/assets/{gitGraphDiagram-PVQCEYII-3dNQBESX.js → gitGraphDiagram-PVQCEYII-AlRFGn3n.js} +1 -1
- package/dist/web/assets/{index-B2TV-FU2.js → index-BMsh00ht.js} +20 -20
- package/dist/web/assets/{index-DhYpUXuu.js → index-BvCxcy2E.js} +4 -4
- package/dist/web/assets/index-CMlcurFO.css +1 -0
- package/dist/web/assets/{infoDiagram-5YYISTIA-DkDDpqvX.js → infoDiagram-5YYISTIA-DYmUMa5y.js} +1 -1
- package/dist/web/assets/{input-CupQF5Np.js → input-BOQDrqKN.js} +1 -1
- package/dist/web/assets/{ishikawaDiagram-YF4QCWOH-BSm79ZFA.js → ishikawaDiagram-YF4QCWOH-BbR4k44d.js} +1 -1
- package/dist/web/assets/{journeyDiagram-JHISSGLW-BCP6kLky.js → journeyDiagram-JHISSGLW-B3BgsbGr.js} +1 -1
- package/dist/web/assets/{kanban-definition-UN3LZRKU-jzLQwKw3.js → kanban-definition-UN3LZRKU-CAw6dg5S.js} +1 -1
- package/dist/web/assets/{layers-CCP9NEZU.js → layers-CHCOcaOD.js} +1 -1
- package/dist/web/assets/{linear-DWq5jvYH.js → linear-DuhwDM_T.js} +1 -1
- package/dist/web/assets/{loader-circle-RvIxJahM.js → loader-circle-ZTtR7VFf.js} +1 -1
- package/dist/web/assets/{mermaid-NOHMQCX5-v8DEF9xx.js → mermaid-NOHMQCX5-BfcG134x.js} +3 -3
- package/dist/web/assets/{message-square-tSoG7yGO.js → message-square-8nr39Elw.js} +1 -1
- package/dist/web/assets/{mindmap-definition-RKZ34NQL-C5FxGBPQ.js → mindmap-definition-RKZ34NQL-Dn4_OJVF.js} +1 -1
- package/dist/web/assets/{modal-Dc2shjmi.js → modal-Ct5Hq4HV.js} +1 -1
- package/dist/web/assets/{pencil-BOmVWDhP.js → pencil-CHhoqtja.js} +1 -1
- package/dist/web/assets/{pieDiagram-4H26LBE5-CmWVRs82.js → pieDiagram-4H26LBE5-BazLj2iZ.js} +1 -1
- package/dist/web/assets/{quadrantDiagram-W4KKPZXB-B4s3NNDO.js → quadrantDiagram-W4KKPZXB-By8b3yLK.js} +1 -1
- package/dist/web/assets/{requirementDiagram-4Y6WPE33-C2KmzOV2.js → requirementDiagram-4Y6WPE33-Y8tQe-HW.js} +1 -1
- package/dist/web/assets/{rotate-ccw-BJfFrvl2.js → rotate-ccw-DacB7Wa2.js} +1 -1
- package/dist/web/assets/{sankeyDiagram-5OEKKPKP-CJbPnzq8.js → sankeyDiagram-5OEKKPKP-CsWPn5i_.js} +1 -1
- package/dist/web/assets/select-BAGWw5mB.js +1 -0
- package/dist/web/assets/{sequenceDiagram-3UESZ5HK-BFea2ow4.js → sequenceDiagram-3UESZ5HK-CRYTLL5B.js} +1 -1
- package/dist/web/assets/{stateDiagram-AJRCARHV-osdtBRSX.js → stateDiagram-AJRCARHV-CRAWuvD-.js} +1 -1
- package/dist/web/assets/stateDiagram-v2-BHNVJYJU-DLPzRpsU.js +1 -0
- package/dist/web/assets/{switch-C6O0UllM.js → switch-DEDPfm5p.js} +1 -1
- package/dist/web/assets/{terminal-BKrr_mRJ.js → terminal-D9ZyN65O.js} +1 -1
- package/dist/web/assets/{textarea-Cj61Z7ha.js → textarea-Bwf5qeVw.js} +1 -1
- package/dist/web/assets/{timeline-definition-PNZ67QCA-BlXV0jf2.js → timeline-definition-PNZ67QCA-CNyG_LiR.js} +1 -1
- package/dist/web/assets/{trash-2-D2zJVeEr.js → trash-2-CAJaQyy-.js} +1 -1
- package/dist/web/assets/{upload-Q5mYpwnh.js → upload-CvRhSiH5.js} +1 -1
- package/dist/web/assets/{use-profiles-BSYIQUHp.js → use-profiles-CXwrOP0r.js} +1 -1
- package/dist/web/assets/{use-providers-Ct5qGj1d.js → use-providers-cM1M1P2G.js} +1 -1
- package/dist/web/assets/{useNormalizedLogs-DqPhzW9t.js → useNormalizedLogs-Bpa12fkI.js} +1 -1
- package/dist/web/assets/{vennDiagram-CIIHVFJN-CCuhn7zI.js → vennDiagram-CIIHVFJN-Ccs0W2eH.js} +1 -1
- package/dist/web/assets/{wardley-L42UT6IY-Xu-SY-Xt.js → wardley-L42UT6IY-DZ98ClK4.js} +1 -1
- package/dist/web/assets/{wardleyDiagram-YWT4CUSO-BDVBG-Eu.js → wardleyDiagram-YWT4CUSO-CFZaMuWx.js} +1 -1
- package/dist/web/assets/{xychartDiagram-2RQKCTM6-DC5IWyMr.js → xychartDiagram-2RQKCTM6-DupmVBai.js} +1 -1
- package/dist/web/index.html +2 -2
- package/node_modules/@prisma/client/.prisma/client/edge.js +4 -3
- package/node_modules/@prisma/client/.prisma/client/index.js +4 -3
- package/package.json +1 -1
- package/dist/web/assets/ConversationPage-t8BHC8qL.js +0 -3
- package/dist/web/assets/CreateTaskInput-D5aroK_o.js +0 -2
- package/dist/web/assets/channel-ByQ8jatA.js +0 -1
- package/dist/web/assets/check-EXzHBr5H.js +0 -1
- package/dist/web/assets/classDiagram-4FO5ZUOK-BTR6CDm1.js +0 -1
- package/dist/web/assets/classDiagram-v2-Q7XG4LA2-BTR6CDm1.js +0 -1
- package/dist/web/assets/index-D1vY2KQU.css +0 -1
- package/dist/web/assets/select-C_UWYFsQ.js +0 -1
- package/dist/web/assets/stateDiagram-v2-BHNVJYJU-ChsboHHf.js +0 -1
|
@@ -0,0 +1,177 @@
|
|
|
1
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
|
2
|
+
import { rmSync } from 'node:fs';
|
|
3
|
+
import os from 'node:os';
|
|
4
|
+
import path from 'node:path';
|
|
5
|
+
import { AgentType } from '../../types/index.js';
|
|
6
|
+
import { ExecutionEnv } from '../execution-env.js';
|
|
7
|
+
import { CodexExecutor } from '../codex.executor.js';
|
|
8
|
+
import { ClaudeCodeExecutor } from '../claude-code.executor.js';
|
|
9
|
+
import { CursorAgentExecutor } from '../cursor-agent.executor.js';
|
|
10
|
+
import { GeminiCliExecutor } from '../gemini-cli.executor.js';
|
|
11
|
+
const spawnMock = vi.hoisted(() => vi.fn());
|
|
12
|
+
const whichMock = vi.hoisted(() => vi.fn(async (command) => `/mock/bin/${command}`));
|
|
13
|
+
vi.mock('@shitiandmw/node-pty', () => ({
|
|
14
|
+
spawn: spawnMock,
|
|
15
|
+
}));
|
|
16
|
+
vi.mock('../../utils/index.js', async (importOriginal) => {
|
|
17
|
+
const actual = await importOriginal();
|
|
18
|
+
return {
|
|
19
|
+
...actual,
|
|
20
|
+
which: whichMock,
|
|
21
|
+
};
|
|
22
|
+
});
|
|
23
|
+
const LONG_PROMPT_MARKER = 'WINDOWS_LONG_PROMPT_MARKER';
|
|
24
|
+
function longPrompt() {
|
|
25
|
+
return `${LONG_PROMPT_MARKER}\n${'x'.repeat(32_000)}`;
|
|
26
|
+
}
|
|
27
|
+
function makePty() {
|
|
28
|
+
return {
|
|
29
|
+
pid: 12345,
|
|
30
|
+
onData: vi.fn(() => ({ dispose: vi.fn() })),
|
|
31
|
+
onExit: vi.fn(() => ({ dispose: vi.fn() })),
|
|
32
|
+
kill: vi.fn(),
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
function stdinFilesFromSpawnCalls() {
|
|
36
|
+
const files = [];
|
|
37
|
+
for (const call of spawnMock.mock.calls) {
|
|
38
|
+
const args = call[1];
|
|
39
|
+
const modeIndex = args?.indexOf('pipe-file') ?? -1;
|
|
40
|
+
if (args && modeIndex >= 0 && args[modeIndex + 2]) {
|
|
41
|
+
files.push(args[modeIndex + 2]);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
return files;
|
|
45
|
+
}
|
|
46
|
+
function cleanupStdinFiles(files) {
|
|
47
|
+
for (const file of files) {
|
|
48
|
+
if (path.basename(file).startsWith('agent-tower-stdin-')) {
|
|
49
|
+
rmSync(file, { force: true });
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
function lastWrapperArgs() {
|
|
54
|
+
const args = spawnMock.mock.calls.at(-1)?.[1];
|
|
55
|
+
if (!args) {
|
|
56
|
+
throw new Error('Expected pty.spawn to be called');
|
|
57
|
+
}
|
|
58
|
+
return args;
|
|
59
|
+
}
|
|
60
|
+
function childArgsFromPipeInvocation(args) {
|
|
61
|
+
const modeIndex = args.indexOf('pipe-file');
|
|
62
|
+
expect(modeIndex).toBeGreaterThanOrEqual(0);
|
|
63
|
+
const programPath = args[modeIndex + 1];
|
|
64
|
+
const stdinFile = args[modeIndex + 2];
|
|
65
|
+
expect(programPath).toMatch(/^\/mock\/bin\//);
|
|
66
|
+
expect(path.basename(stdinFile ?? '')).toMatch(/^agent-tower-stdin-/);
|
|
67
|
+
return args.slice(modeIndex + 3);
|
|
68
|
+
}
|
|
69
|
+
function expectPromptOnlyInStdin() {
|
|
70
|
+
const args = lastWrapperArgs();
|
|
71
|
+
expect(JSON.stringify(args)).not.toContain(LONG_PROMPT_MARKER);
|
|
72
|
+
return childArgsFromPipeInvocation(args);
|
|
73
|
+
}
|
|
74
|
+
const spawnConfig = {
|
|
75
|
+
workingDir: os.tmpdir(),
|
|
76
|
+
prompt: longPrompt(),
|
|
77
|
+
env: ExecutionEnv.default(os.tmpdir()),
|
|
78
|
+
};
|
|
79
|
+
describe('executor prompt stdin transport', () => {
|
|
80
|
+
const originalPath = process.env.PATH;
|
|
81
|
+
beforeEach(() => {
|
|
82
|
+
spawnMock.mockReset();
|
|
83
|
+
spawnMock.mockReturnValue(makePty());
|
|
84
|
+
whichMock.mockClear();
|
|
85
|
+
process.env.PATH = '/nonexistent-agent-tower-test-path';
|
|
86
|
+
vi.spyOn(process.stdout, 'write').mockImplementation(() => true);
|
|
87
|
+
});
|
|
88
|
+
afterEach(() => {
|
|
89
|
+
const stdinFiles = stdinFilesFromSpawnCalls();
|
|
90
|
+
vi.restoreAllMocks();
|
|
91
|
+
process.env.PATH = originalPath;
|
|
92
|
+
cleanupStdinFiles(stdinFiles);
|
|
93
|
+
});
|
|
94
|
+
it('Codex initial and resume prompts use stdin with dash placeholder', async () => {
|
|
95
|
+
const executor = new CodexExecutor();
|
|
96
|
+
await executor.spawn(spawnConfig);
|
|
97
|
+
const initialChildArgs = expectPromptOnlyInStdin();
|
|
98
|
+
expect(initialChildArgs).toContain('exec');
|
|
99
|
+
expect(initialChildArgs).toContain('--json');
|
|
100
|
+
expect(initialChildArgs.at(-1)).toBe('-');
|
|
101
|
+
await executor.spawnFollowUp(spawnConfig, 'codex-session-1');
|
|
102
|
+
const followUpChildArgs = expectPromptOnlyInStdin();
|
|
103
|
+
expect(followUpChildArgs).toEqual(expect.arrayContaining([
|
|
104
|
+
'exec',
|
|
105
|
+
'resume',
|
|
106
|
+
'codex-session-1',
|
|
107
|
+
'-',
|
|
108
|
+
]));
|
|
109
|
+
expect(followUpChildArgs.at(-1)).toBe('-');
|
|
110
|
+
});
|
|
111
|
+
it('Claude Code sends ordinary text prompts through stream-json stdin', async () => {
|
|
112
|
+
const executor = new ClaudeCodeExecutor();
|
|
113
|
+
await executor.spawn(spawnConfig);
|
|
114
|
+
const childArgs = expectPromptOnlyInStdin();
|
|
115
|
+
expect(childArgs).toEqual(expect.arrayContaining([
|
|
116
|
+
'-p',
|
|
117
|
+
'--output-format=stream-json',
|
|
118
|
+
'--input-format=stream-json',
|
|
119
|
+
]));
|
|
120
|
+
expect(childArgs).not.toContain(spawnConfig.prompt);
|
|
121
|
+
});
|
|
122
|
+
it('Cursor Agent uses print/headless stdin without a positional prompt', async () => {
|
|
123
|
+
const executor = new CursorAgentExecutor();
|
|
124
|
+
await executor.spawn(spawnConfig);
|
|
125
|
+
const childArgs = expectPromptOnlyInStdin();
|
|
126
|
+
expect(childArgs).toEqual(expect.arrayContaining([
|
|
127
|
+
'--print',
|
|
128
|
+
'--output-format=stream-json',
|
|
129
|
+
]));
|
|
130
|
+
expect(childArgs).not.toContain(spawnConfig.prompt);
|
|
131
|
+
});
|
|
132
|
+
it('Gemini CLI uses non-interactive stdin and does not start ACP mode', async () => {
|
|
133
|
+
const executor = new GeminiCliExecutor({ model: 'gemini-test' });
|
|
134
|
+
await executor.spawn(spawnConfig);
|
|
135
|
+
const childArgs = expectPromptOnlyInStdin();
|
|
136
|
+
expect(childArgs).toEqual(expect.arrayContaining([
|
|
137
|
+
'-y',
|
|
138
|
+
'@google/gemini-cli@0.23.0',
|
|
139
|
+
'--model',
|
|
140
|
+
'gemini-test',
|
|
141
|
+
'--output-format=stream-json',
|
|
142
|
+
'-p',
|
|
143
|
+
'',
|
|
144
|
+
]));
|
|
145
|
+
const promptArgIndex = childArgs.indexOf('-p');
|
|
146
|
+
expect(promptArgIndex).toBeGreaterThanOrEqual(0);
|
|
147
|
+
expect(childArgs[promptArgIndex + 1]).toBe('');
|
|
148
|
+
expect(childArgs).not.toContain('--experimental-acp');
|
|
149
|
+
expect(childArgs).not.toContain(spawnConfig.prompt);
|
|
150
|
+
});
|
|
151
|
+
it('Gemini follow-up keeps prompt out of args and passes resume selector', async () => {
|
|
152
|
+
const executor = new GeminiCliExecutor();
|
|
153
|
+
await executor.spawnFollowUp(spawnConfig, 'latest');
|
|
154
|
+
const childArgs = expectPromptOnlyInStdin();
|
|
155
|
+
expect(childArgs).toEqual(expect.arrayContaining([
|
|
156
|
+
'--output-format=stream-json',
|
|
157
|
+
'-p',
|
|
158
|
+
'',
|
|
159
|
+
'--resume',
|
|
160
|
+
'latest',
|
|
161
|
+
]));
|
|
162
|
+
const promptArgIndex = childArgs.indexOf('-p');
|
|
163
|
+
expect(promptArgIndex).toBeGreaterThanOrEqual(0);
|
|
164
|
+
expect(childArgs[promptArgIndex + 1]).toBe('');
|
|
165
|
+
expect(childArgs).not.toContain('--experimental-acp');
|
|
166
|
+
expect(childArgs).not.toContain(spawnConfig.prompt);
|
|
167
|
+
});
|
|
168
|
+
});
|
|
169
|
+
describe('executor type smoke', () => {
|
|
170
|
+
it('keeps the tested executors aligned with expected agent types', () => {
|
|
171
|
+
expect(new CodexExecutor().agentType).toBe(AgentType.CODEX);
|
|
172
|
+
expect(new ClaudeCodeExecutor().agentType).toBe(AgentType.CLAUDE_CODE);
|
|
173
|
+
expect(new CursorAgentExecutor().agentType).toBe(AgentType.CURSOR_AGENT);
|
|
174
|
+
expect(new GeminiCliExecutor().agentType).toBe(AgentType.GEMINI_CLI);
|
|
175
|
+
});
|
|
176
|
+
});
|
|
177
|
+
//# sourceMappingURL=stdin-prompt.executors.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stdin-prompt.executors.test.js","sourceRoot":"","sources":["../../../src/executors/__tests__/stdin-prompt.executors.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D,MAAM,SAAS,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AAC5C,MAAM,SAAS,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,OAAe,EAAE,EAAE,CAAC,aAAa,OAAO,EAAE,CAAC,CAAC,CAAC;AAE7F,EAAE,CAAC,IAAI,CAAC,sBAAsB,EAAE,GAAG,EAAE,CAAC,CAAC;IACrC,KAAK,EAAE,SAAS;CACjB,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,sBAAsB,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IACvD,MAAM,MAAM,GAAG,MAAM,cAAc,EAAyC,CAAC;IAC7E,OAAO;QACL,GAAG,MAAM;QACT,KAAK,EAAE,SAAS;KACjB,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,kBAAkB,GAAG,4BAA4B,CAAC;AAExD,SAAS,UAAU;IACjB,OAAO,GAAG,kBAAkB,KAAK,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;AACxD,CAAC;AAED,SAAS,OAAO;IACd,OAAO;QACL,GAAG,EAAE,KAAK;QACV,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAC3C,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAC3C,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE;KACd,CAAC;AACJ,CAAC;AAED,SAAS,wBAAwB;IAC/B,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,IAAI,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QACxC,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAyB,CAAC;QAC7C,MAAM,SAAS,GAAG,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;QACnD,IAAI,IAAI,IAAI,SAAS,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,EAAE,CAAC;YAClD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAe;IACxC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,oBAAoB,CAAC,EAAE,CAAC;YACzD,MAAM,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,eAAe;IACtB,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAyB,CAAC;IACtE,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACrD,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,2BAA2B,CAAC,IAAc;IACjD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC5C,MAAM,CAAC,SAAS,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;IAC5C,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;IACxC,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;IACtC,MAAM,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC9C,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;IACtE,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;AACnC,CAAC;AAED,SAAS,uBAAuB;IAC9B,MAAM,IAAI,GAAG,eAAe,EAAE,CAAC;IAC/B,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;IAC/D,OAAO,2BAA2B,CAAC,IAAI,CAAC,CAAC;AAC3C,CAAC;AAED,MAAM,WAAW,GAAG;IAClB,UAAU,EAAE,EAAE,CAAC,MAAM,EAAE;IACvB,MAAM,EAAE,UAAU,EAAE;IACpB,GAAG,EAAE,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC;CACvC,CAAC;AAEF,QAAQ,CAAC,iCAAiC,EAAE,GAAG,EAAE;IAC/C,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;IAEtC,UAAU,CAAC,GAAG,EAAE;QACd,SAAS,CAAC,SAAS,EAAE,CAAC;QACtB,SAAS,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QACrC,SAAS,CAAC,SAAS,EAAE,CAAC;QACtB,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,oCAAoC,CAAC;QACxD,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,UAAU,GAAG,wBAAwB,EAAE,CAAC;QAC9C,EAAE,CAAC,eAAe,EAAE,CAAC;QACrB,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,YAAY,CAAC;QAChC,iBAAiB,CAAC,UAAU,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kEAAkE,EAAE,KAAK,IAAI,EAAE;QAChF,MAAM,QAAQ,GAAG,IAAI,aAAa,EAAE,CAAC;QAErC,MAAM,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAClC,MAAM,gBAAgB,GAAG,uBAAuB,EAAE,CAAC;QACnD,MAAM,CAAC,gBAAgB,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC3C,MAAM,CAAC,gBAAgB,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC7C,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE1C,MAAM,QAAQ,CAAC,aAAa,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;QAC7D,MAAM,iBAAiB,GAAG,uBAAuB,EAAE,CAAC;QACpD,MAAM,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC;YACvD,MAAM;YACN,QAAQ;YACR,iBAAiB;YACjB,GAAG;SACJ,CAAC,CAAC,CAAC;QACJ,MAAM,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mEAAmE,EAAE,KAAK,IAAI,EAAE;QACjF,MAAM,QAAQ,GAAG,IAAI,kBAAkB,EAAE,CAAC;QAE1C,MAAM,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAClC,MAAM,SAAS,GAAG,uBAAuB,EAAE,CAAC;QAE5C,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC;YAC/C,IAAI;YACJ,6BAA6B;YAC7B,4BAA4B;SAC7B,CAAC,CAAC,CAAC;QACJ,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oEAAoE,EAAE,KAAK,IAAI,EAAE;QAClF,MAAM,QAAQ,GAAG,IAAI,mBAAmB,EAAE,CAAC;QAE3C,MAAM,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAClC,MAAM,SAAS,GAAG,uBAAuB,EAAE,CAAC;QAE5C,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC;YAC/C,SAAS;YACT,6BAA6B;SAC9B,CAAC,CAAC,CAAC;QACJ,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mEAAmE,EAAE,KAAK,IAAI,EAAE;QACjF,MAAM,QAAQ,GAAG,IAAI,iBAAiB,CAAC,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,CAAC;QAEjE,MAAM,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAClC,MAAM,SAAS,GAAG,uBAAuB,EAAE,CAAC;QAE5C,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC;YAC/C,IAAI;YACJ,2BAA2B;YAC3B,SAAS;YACT,aAAa;YACb,6BAA6B;YAC7B,IAAI;YACJ,EAAE;SACH,CAAC,CAAC,CAAC;QACJ,MAAM,cAAc,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,CAAC,cAAc,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;QACjD,MAAM,CAAC,SAAS,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC/C,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;QACtD,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sEAAsE,EAAE,KAAK,IAAI,EAAE;QACpF,MAAM,QAAQ,GAAG,IAAI,iBAAiB,EAAE,CAAC;QAEzC,MAAM,QAAQ,CAAC,aAAa,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QACpD,MAAM,SAAS,GAAG,uBAAuB,EAAE,CAAC;QAE5C,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC;YAC/C,6BAA6B;YAC7B,IAAI;YACJ,EAAE;YACF,UAAU;YACV,QAAQ;SACT,CAAC,CAAC,CAAC;QACJ,MAAM,cAAc,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,CAAC,cAAc,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;QACjD,MAAM,CAAC,SAAS,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC/C,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;QACtD,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,EAAE,CAAC,8DAA8D,EAAE,GAAG,EAAE;QACtE,MAAM,CAAC,IAAI,aAAa,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC5D,MAAM,CAAC,IAAI,kBAAkB,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QACvE,MAAM,CAAC,IAAI,mBAAmB,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QACzE,MAAM,CAAC,IAAI,iBAAiB,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.executor.d.ts","sourceRoot":"","sources":["../../src/executors/base.executor.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"base.executor.d.ts","sourceRoot":"","sources":["../../src/executors/base.executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,11 +5,22 @@
|
|
|
5
5
|
import * as pty from '@shitiandmw/node-pty';
|
|
6
6
|
import { EventEmitter } from 'events';
|
|
7
7
|
import { appendFileSync } from 'node:fs';
|
|
8
|
+
import * as fs from 'node:fs/promises';
|
|
9
|
+
import * as os from 'node:os';
|
|
10
|
+
import * as path from 'node:path';
|
|
11
|
+
import { createHash, randomUUID } from 'node:crypto';
|
|
8
12
|
import { resolveCommandParts } from './command-builder.js';
|
|
9
13
|
import { stripAnsiSequences } from '../output/utils/ansi.js';
|
|
10
|
-
import { buildPtyCommand, buildPtyCommandWithStdin, getPtyLogFilePath, } from '../utils/process-launch.js';
|
|
14
|
+
import { buildPtyCommand, buildPtyCommandWithStdin, buildPtyWrapperEnv, getPtyLogFilePath, } from '../utils/process-launch.js';
|
|
15
|
+
import { writeErrorLog } from '../utils/error-log.js';
|
|
11
16
|
const PTY_LOG_FILE = getPtyLogFilePath();
|
|
12
17
|
const OUTPUT_BUFFER_LIMIT = 8000;
|
|
18
|
+
const REDACT_VALUE_AFTER_ARGS = new Set([
|
|
19
|
+
'-p',
|
|
20
|
+
'--prompt',
|
|
21
|
+
'--append-system-prompt',
|
|
22
|
+
'--settings',
|
|
23
|
+
]);
|
|
13
24
|
function ptyLog(pid, msg) {
|
|
14
25
|
const line = `[${new Date().toISOString()}][pid=${pid}] ${msg}\n`;
|
|
15
26
|
process.stdout.write(line);
|
|
@@ -18,6 +29,37 @@ function ptyLog(pid, msg) {
|
|
|
18
29
|
}
|
|
19
30
|
catch { /* ignore */ }
|
|
20
31
|
}
|
|
32
|
+
function hashForLog(value) {
|
|
33
|
+
return createHash('sha256').update(value).digest('hex').slice(0, 12);
|
|
34
|
+
}
|
|
35
|
+
function summarizeStdinForLog(stdinData) {
|
|
36
|
+
return `length=${Buffer.byteLength(stdinData, 'utf8')} sha256=${hashForLog(stdinData)}`;
|
|
37
|
+
}
|
|
38
|
+
function redactArgsForLog(args) {
|
|
39
|
+
const redacted = [];
|
|
40
|
+
let redactNext = false;
|
|
41
|
+
for (const arg of args) {
|
|
42
|
+
if (redactNext) {
|
|
43
|
+
redacted.push('<redacted>');
|
|
44
|
+
redactNext = false;
|
|
45
|
+
continue;
|
|
46
|
+
}
|
|
47
|
+
const equalsIndex = arg.indexOf('=');
|
|
48
|
+
const key = equalsIndex === -1 ? arg : arg.slice(0, equalsIndex);
|
|
49
|
+
if (REDACT_VALUE_AFTER_ARGS.has(key)) {
|
|
50
|
+
if (equalsIndex === -1) {
|
|
51
|
+
redacted.push(arg);
|
|
52
|
+
redactNext = true;
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
redacted.push(`${key}=<redacted>`);
|
|
56
|
+
}
|
|
57
|
+
continue;
|
|
58
|
+
}
|
|
59
|
+
redacted.push(arg);
|
|
60
|
+
}
|
|
61
|
+
return redacted.join(' ');
|
|
62
|
+
}
|
|
21
63
|
/**
|
|
22
64
|
* 取消令牌 - 用于优雅关闭
|
|
23
65
|
*/
|
|
@@ -104,23 +146,42 @@ export class BaseExecutor {
|
|
|
104
146
|
const fullArgs = [...args, config.prompt];
|
|
105
147
|
const invocation = buildPtyCommand(programPath, fullArgs);
|
|
106
148
|
const fullEnv = env.getFullEnv();
|
|
107
|
-
|
|
149
|
+
const wrapperEnv = buildPtyWrapperEnv(fullEnv);
|
|
150
|
+
ptyLog(0, `Spawning: ${programPath} ${redactArgsForLog(fullArgs.slice(0, -1))} ... <prompt>`);
|
|
108
151
|
ptyLog(0, `ENV ANTHROPIC_BASE_URL=${fullEnv.ANTHROPIC_BASE_URL || '(not set)'}`);
|
|
109
|
-
ptyLog(0, `ENV ANTHROPIC_API_KEY=${fullEnv.ANTHROPIC_API_KEY ?
|
|
110
|
-
ptyLog(0, `ENV ANTHROPIC_AUTH_TOKEN=${fullEnv.ANTHROPIC_AUTH_TOKEN ?
|
|
152
|
+
ptyLog(0, `ENV ANTHROPIC_API_KEY=${fullEnv.ANTHROPIC_API_KEY ? '(set)' : '(not set)'}`);
|
|
153
|
+
ptyLog(0, `ENV ANTHROPIC_AUTH_TOKEN=${fullEnv.ANTHROPIC_AUTH_TOKEN ? '(set)' : '(not set)'}`);
|
|
111
154
|
// On Windows, ConPTY auto-wraps at the column limit by inserting real
|
|
112
155
|
// \r\n into the data stream, which breaks JSON parsing. Use very wide
|
|
113
156
|
// columns to prevent this. Unix PTYs don't inject line breaks, so the
|
|
114
157
|
// default 120 is fine there and avoids changing behaviour for CLI tools
|
|
115
158
|
// that respect terminal width.
|
|
116
159
|
const ptyCols = process.platform === 'win32' ? 16384 : 120;
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
160
|
+
let shell;
|
|
161
|
+
try {
|
|
162
|
+
shell = pty.spawn(invocation.command, invocation.args, {
|
|
163
|
+
name: 'xterm-256color',
|
|
164
|
+
cols: ptyCols,
|
|
165
|
+
rows: 30,
|
|
166
|
+
cwd: config.workingDir,
|
|
167
|
+
env: wrapperEnv,
|
|
168
|
+
});
|
|
169
|
+
}
|
|
170
|
+
catch (error) {
|
|
171
|
+
writeErrorLog({
|
|
172
|
+
level: 'error',
|
|
173
|
+
source: 'executor.spawn',
|
|
174
|
+
message: `Failed to spawn ${this.displayName}`,
|
|
175
|
+
error,
|
|
176
|
+
metadata: {
|
|
177
|
+
agentType: this.agentType,
|
|
178
|
+
displayName: this.displayName,
|
|
179
|
+
programPath,
|
|
180
|
+
workingDir: config.workingDir,
|
|
181
|
+
},
|
|
182
|
+
});
|
|
183
|
+
throw error;
|
|
184
|
+
}
|
|
124
185
|
ptyLog(shell.pid, `Process spawned`);
|
|
125
186
|
// 收集并实时记录 PTY 输出(写入系统临时目录日志方便诊断)
|
|
126
187
|
let outputBuffer = '';
|
|
@@ -141,6 +202,20 @@ export class BaseExecutor {
|
|
|
141
202
|
if (cleaned) {
|
|
142
203
|
ptyLog(shell.pid, `full output: ${cleaned.slice(0, 1000)}`);
|
|
143
204
|
}
|
|
205
|
+
writeErrorLog({
|
|
206
|
+
level: 'warn',
|
|
207
|
+
source: 'executor.exit',
|
|
208
|
+
message: `${this.displayName} exited with non-zero code ${exitCode}`,
|
|
209
|
+
metadata: {
|
|
210
|
+
agentType: this.agentType,
|
|
211
|
+
displayName: this.displayName,
|
|
212
|
+
pid: shell.pid,
|
|
213
|
+
exitCode,
|
|
214
|
+
signal,
|
|
215
|
+
workingDir: config.workingDir,
|
|
216
|
+
output: cleaned ? cleaned.slice(0, 2000) : undefined,
|
|
217
|
+
},
|
|
218
|
+
});
|
|
144
219
|
}
|
|
145
220
|
});
|
|
146
221
|
// 监听取消信号
|
|
@@ -166,51 +241,60 @@ export class BaseExecutor {
|
|
|
166
241
|
const cancel = new CancellationToken();
|
|
167
242
|
// 不添加 prompt 到参数列表,因为会通过 stdin 发送
|
|
168
243
|
const fullArgs = [...args];
|
|
169
|
-
console.log('[BaseExecutor] Spawning with stdin (via temp file)');
|
|
170
|
-
console.log('[BaseExecutor] Program:', programPath);
|
|
171
|
-
console.log('[BaseExecutor] Args:', fullArgs.join(' '));
|
|
172
|
-
console.log('[BaseExecutor] Stdin data length:', stdinData.length);
|
|
173
|
-
console.log('[BaseExecutor] Stdin data preview:', stdinData.substring(0, 500));
|
|
174
244
|
// 使用临时文件传递 stdin 数据,避免命令行参数长度限制
|
|
175
|
-
const
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
const tmpFile = path.join(os.tmpdir(), `agent-tower-stdin-${Date.now()}.json`);
|
|
179
|
-
await fs.writeFile(tmpFile, stdinData, 'utf-8');
|
|
180
|
-
console.log('[BaseExecutor] Wrote stdin data to temp file:', tmpFile);
|
|
245
|
+
const tmpFile = path.join(os.tmpdir(), `agent-tower-stdin-${Date.now()}-${randomUUID()}.txt`);
|
|
246
|
+
await fs.writeFile(tmpFile, stdinData, { encoding: 'utf-8', mode: 0o600 });
|
|
247
|
+
ptyLog(0, `Spawning with stdin: ${programPath} ${redactArgsForLog(fullArgs)} <stdin ${summarizeStdinForLog(stdinData)} file=${path.basename(tmpFile)}>`);
|
|
181
248
|
const invocation = buildPtyCommandWithStdin(programPath, fullArgs, tmpFile);
|
|
249
|
+
const fullEnv = env.getFullEnv();
|
|
250
|
+
const wrapperEnv = buildPtyWrapperEnv(fullEnv);
|
|
251
|
+
ptyLog(0, `ENV ANTHROPIC_BASE_URL=${fullEnv.ANTHROPIC_BASE_URL || '(not set)'}`);
|
|
252
|
+
ptyLog(0, `ENV ANTHROPIC_API_KEY=${fullEnv.ANTHROPIC_API_KEY ? '(set)' : '(not set)'}`);
|
|
253
|
+
ptyLog(0, `ENV ANTHROPIC_AUTH_TOKEN=${fullEnv.ANTHROPIC_AUTH_TOKEN ? '(set)' : '(not set)'}`);
|
|
182
254
|
let shell;
|
|
183
255
|
let offData;
|
|
184
256
|
let offExit;
|
|
185
257
|
try {
|
|
258
|
+
const ptyCols = process.platform === 'win32' ? 16384 : 120;
|
|
186
259
|
shell = pty.spawn(invocation.command, invocation.args, {
|
|
187
260
|
name: 'xterm-256color',
|
|
188
|
-
cols:
|
|
261
|
+
cols: ptyCols,
|
|
189
262
|
rows: 30,
|
|
190
263
|
cwd: config.workingDir,
|
|
191
|
-
env:
|
|
264
|
+
env: wrapperEnv,
|
|
192
265
|
});
|
|
193
266
|
const spawnedShell = shell;
|
|
194
|
-
|
|
195
|
-
// 添加调试输出监听
|
|
267
|
+
ptyLog(spawnedShell.pid, `Process spawned with stdin`);
|
|
196
268
|
let outputBuffer = '';
|
|
197
269
|
offData = spawnedShell.onData((data) => {
|
|
198
270
|
if (outputBuffer.length < OUTPUT_BUFFER_LIMIT) {
|
|
199
271
|
outputBuffer += data;
|
|
200
272
|
}
|
|
201
|
-
|
|
202
|
-
if (
|
|
203
|
-
|
|
273
|
+
const byteLength = Buffer.byteLength(data, 'utf8');
|
|
274
|
+
if (byteLength > 0) {
|
|
275
|
+
ptyLog(spawnedShell.pid, `PTY> <${byteLength} bytes>`);
|
|
204
276
|
}
|
|
205
277
|
});
|
|
206
278
|
// 监听退出事件
|
|
207
279
|
offExit = spawnedShell.onExit(({ exitCode, signal }) => {
|
|
208
280
|
offData?.dispose();
|
|
209
281
|
offExit?.dispose();
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
282
|
+
ptyLog(spawnedShell.pid, `PTY exited code=${exitCode} signal=${signal} outputLength=${outputBuffer.length}`);
|
|
283
|
+
if (exitCode !== 0) {
|
|
284
|
+
writeErrorLog({
|
|
285
|
+
level: 'warn',
|
|
286
|
+
source: 'executor.exit',
|
|
287
|
+
message: `${this.displayName} exited with non-zero code ${exitCode}`,
|
|
288
|
+
metadata: {
|
|
289
|
+
agentType: this.agentType,
|
|
290
|
+
displayName: this.displayName,
|
|
291
|
+
pid: spawnedShell.pid,
|
|
292
|
+
exitCode,
|
|
293
|
+
signal,
|
|
294
|
+
workingDir: config.workingDir,
|
|
295
|
+
outputLength: outputBuffer.length,
|
|
296
|
+
},
|
|
297
|
+
});
|
|
214
298
|
}
|
|
215
299
|
});
|
|
216
300
|
// 监听取消信号
|
|
@@ -224,6 +308,20 @@ export class BaseExecutor {
|
|
|
224
308
|
};
|
|
225
309
|
}
|
|
226
310
|
catch (error) {
|
|
311
|
+
writeErrorLog({
|
|
312
|
+
level: 'error',
|
|
313
|
+
source: 'executor.spawnWithStdin',
|
|
314
|
+
message: `Failed to spawn ${this.displayName} with stdin`,
|
|
315
|
+
error,
|
|
316
|
+
metadata: {
|
|
317
|
+
agentType: this.agentType,
|
|
318
|
+
displayName: this.displayName,
|
|
319
|
+
programPath,
|
|
320
|
+
workingDir: config.workingDir,
|
|
321
|
+
stdinLength: Buffer.byteLength(stdinData, 'utf8'),
|
|
322
|
+
stdinSha256: hashForLog(stdinData),
|
|
323
|
+
},
|
|
324
|
+
});
|
|
227
325
|
offData?.dispose();
|
|
228
326
|
offExit?.dispose();
|
|
229
327
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.executor.js","sourceRoot":"","sources":["../../src/executors/base.executor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"base.executor.js","sourceRoot":"","sources":["../../src/executors/base.executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-code.executor.d.ts","sourceRoot":"","sources":["../../src/executors/claude-code.executor.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"claude-code.executor.d.ts","sourceRoot":"","sources":["../../src/executors/claude-code.executor.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,eAAe,EACf,mBAAmB,EACnB,YAAY,EACb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,cAAc,EAEd,YAAY,EACb,MAAM,sBAAsB,CAAC;AAI9B;;GAEG;AACH,oBAAY,cAAc;IACxB,kBAAkB;IAClB,OAAO,YAAY;IACnB,kCAAkC;IAClC,IAAI,SAAS;IACb,sBAAsB;IACtB,iBAAiB,sBAAsB;CACxC;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,qBAAqB;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,8BAA8B;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,WAAW;IACX,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,WAAW;IACX,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iDAAiD;IACjD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa;IACb,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,iBAAiB;IACjB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW;IACX,GAAG,CAAC,EAAE,YAAY,CAAC;IACnB,wCAAwC;IACxC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAYD,qBAAa,kBAAmB,SAAQ,YAAY;IAClD,QAAQ,CAAC,SAAS,yBAAyB;IAC3C,QAAQ,CAAC,WAAW,iBAAiB;IAErC,OAAO,CAAC,MAAM,CAAmB;gBAErB,MAAM,GAAE,gBAAqB;IAMzC;;OAEG;IACG,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAsBtD;;OAEG;IACH,eAAe,IAAI,eAAe,EAAE;IAIpC;;OAEG;IACH,uBAAuB,IAAI,MAAM,GAAG,IAAI;IAIxC;;OAEG;IACH,iBAAiB,IAAI,cAAc;IAUnC;;;;;;OAMG;IACH,OAAO,CAAC,qBAAqB;IA6B7B;;OAEG;IACH,SAAS,CAAC,mBAAmB,IAAI,cAAc;IAqD/C;;;OAGG;IACH,SAAS,CAAC,gCAAgC,IAAI,cAAc;IAqD5D;;OAEG;IACG,KAAK,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,YAAY,CAAC;IAa/D;;OAEG;IACG,aAAa,CACjB,MAAM,EAAE,mBAAmB,EAC3B,SAAS,EAAE,MAAM,EACjB,gBAAgB,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,YAAY,CAAC;IAiBxB;;;OAGG;IACH,OAAO,CAAC,aAAa;CAGtB"}
|
|
@@ -6,9 +6,9 @@ import * as fs from 'fs';
|
|
|
6
6
|
import * as path from 'path';
|
|
7
7
|
import * as os from 'os';
|
|
8
8
|
import { AgentType } from '../types/index.js';
|
|
9
|
-
import { which } from '../utils/index.js';
|
|
10
9
|
import { BaseExecutor, AgentCapability, } from './base.executor.js';
|
|
11
|
-
import { CommandBuilder, applyOverrides } from './command-builder.js';
|
|
10
|
+
import { CommandBuilder, applyOverrides, } from './command-builder.js';
|
|
11
|
+
import { which } from '../utils/index.js';
|
|
12
12
|
import { parsePromptWithImages, buildUserMessageNDJSON } from './image-utils.js';
|
|
13
13
|
/**
|
|
14
14
|
* Claude Code 权限模式
|
|
@@ -45,6 +45,13 @@ export class ClaudeCodeExecutor extends BaseExecutor {
|
|
|
45
45
|
*/
|
|
46
46
|
async getAvailabilityInfo() {
|
|
47
47
|
const authFilePath = path.join(os.homedir(), '.claude.json');
|
|
48
|
+
const claudePath = await which('claude');
|
|
49
|
+
if (!claudePath) {
|
|
50
|
+
return {
|
|
51
|
+
type: 'NOT_FOUND',
|
|
52
|
+
error: 'Claude Code CLI executable not found in PATH',
|
|
53
|
+
};
|
|
54
|
+
}
|
|
48
55
|
try {
|
|
49
56
|
const stats = fs.statSync(authFilePath);
|
|
50
57
|
const timestamp = Math.floor(stats.mtimeMs / 1000);
|
|
@@ -54,12 +61,7 @@ export class ClaudeCodeExecutor extends BaseExecutor {
|
|
|
54
61
|
};
|
|
55
62
|
}
|
|
56
63
|
catch {
|
|
57
|
-
|
|
58
|
-
const claudePath = await which('claude');
|
|
59
|
-
if (claudePath) {
|
|
60
|
-
return { type: 'INSTALLATION_FOUND' };
|
|
61
|
-
}
|
|
62
|
-
return { type: 'NOT_FOUND', error: 'Claude Code CLI not installed' };
|
|
64
|
+
return { type: 'INSTALLATION_FOUND' };
|
|
63
65
|
}
|
|
64
66
|
}
|
|
65
67
|
/**
|
|
@@ -217,25 +219,11 @@ export class ClaudeCodeExecutor extends BaseExecutor {
|
|
|
217
219
|
// 组合 prompt
|
|
218
220
|
const prompt = this.combinePrompt(config.prompt);
|
|
219
221
|
console.log('[ClaudeCodeExecutor] spawn - prompt length:', prompt.length);
|
|
220
|
-
console.log('[ClaudeCodeExecutor] spawn - prompt preview:', prompt.substring(0, 200));
|
|
221
|
-
// 检测是否包含图片
|
|
222
222
|
const parsedPrompt = await parsePromptWithImages(prompt);
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
const commandParts = commandBuilder.buildInitial();
|
|
228
|
-
const userMessage = buildUserMessageNDJSON(parsedPrompt.contentBlocks);
|
|
229
|
-
return this.spawnWithStdin(config, commandParts, userMessage);
|
|
230
|
-
}
|
|
231
|
-
else {
|
|
232
|
-
console.log('[ClaudeCodeExecutor] ℹ️ No images detected, using normal text format');
|
|
233
|
-
// 保持原有方式
|
|
234
|
-
const commandBuilder = this.buildCommandBuilder();
|
|
235
|
-
const commandParts = commandBuilder.buildInitial();
|
|
236
|
-
const newConfig = { ...config, prompt };
|
|
237
|
-
return this.spawnInternal(newConfig, commandParts);
|
|
238
|
-
}
|
|
223
|
+
const commandBuilder = this.buildCommandBuilderForStreamJson();
|
|
224
|
+
const commandParts = commandBuilder.buildInitial();
|
|
225
|
+
const userMessage = buildUserMessageNDJSON(parsedPrompt.contentBlocks);
|
|
226
|
+
return this.spawnWithStdin(config, commandParts, userMessage);
|
|
239
227
|
}
|
|
240
228
|
/**
|
|
241
229
|
* 继续现有会话
|
|
@@ -244,33 +232,15 @@ export class ClaudeCodeExecutor extends BaseExecutor {
|
|
|
244
232
|
// 组合 prompt
|
|
245
233
|
const prompt = this.combinePrompt(config.prompt);
|
|
246
234
|
console.log('[ClaudeCodeExecutor] spawnFollowUp - prompt length:', prompt.length);
|
|
247
|
-
console.log('[ClaudeCodeExecutor] spawnFollowUp - prompt preview:', prompt.substring(0, 200));
|
|
248
|
-
// 检测是否包含图片
|
|
249
235
|
const parsedPrompt = await parsePromptWithImages(prompt);
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
const commandParts = commandBuilder.buildFollowUp(additionalArgs);
|
|
259
|
-
const userMessage = buildUserMessageNDJSON(parsedPrompt.contentBlocks);
|
|
260
|
-
return this.spawnWithStdin(config, commandParts, userMessage);
|
|
261
|
-
}
|
|
262
|
-
else {
|
|
263
|
-
console.log('[ClaudeCodeExecutor] ℹ️ No images detected in follow-up, using normal text format');
|
|
264
|
-
// 保持原有方式
|
|
265
|
-
const commandBuilder = this.buildCommandBuilder();
|
|
266
|
-
const additionalArgs = ['--resume', sessionId];
|
|
267
|
-
if (resetToMessageId) {
|
|
268
|
-
additionalArgs.push('--resume-session-at', resetToMessageId);
|
|
269
|
-
}
|
|
270
|
-
const commandParts = commandBuilder.buildFollowUp(additionalArgs);
|
|
271
|
-
const newConfig = { ...config, prompt };
|
|
272
|
-
return this.spawnInternal(newConfig, commandParts);
|
|
273
|
-
}
|
|
236
|
+
const commandBuilder = this.buildCommandBuilderForStreamJson();
|
|
237
|
+
const additionalArgs = ['--resume', sessionId];
|
|
238
|
+
if (resetToMessageId) {
|
|
239
|
+
additionalArgs.push('--resume-session-at', resetToMessageId);
|
|
240
|
+
}
|
|
241
|
+
const commandParts = commandBuilder.buildFollowUp(additionalArgs);
|
|
242
|
+
const userMessage = buildUserMessageNDJSON(parsedPrompt.contentBlocks);
|
|
243
|
+
return this.spawnWithStdin(config, commandParts, userMessage);
|
|
274
244
|
}
|
|
275
245
|
/**
|
|
276
246
|
* 组合 prompt
|