agent-tower 0.2.4 → 0.2.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli.js +3 -2
- package/dist/cli.js.map +1 -1
- package/dist/executors/__tests__/providers.test.d.ts +2 -0
- package/dist/executors/__tests__/providers.test.d.ts.map +1 -0
- package/dist/executors/__tests__/providers.test.js +129 -0
- package/dist/executors/__tests__/providers.test.js.map +1 -0
- package/dist/executors/base.executor.d.ts.map +1 -1
- package/dist/executors/base.executor.js +7 -11
- package/dist/executors/base.executor.js.map +1 -1
- package/dist/executors/claude-code.executor.d.ts +2 -2
- package/dist/executors/claude-code.executor.d.ts.map +1 -1
- package/dist/executors/claude-code.executor.js +1 -1
- package/dist/executors/claude-code.executor.js.map +1 -1
- package/dist/executors/codex.executor.d.ts +9 -1
- package/dist/executors/codex.executor.d.ts.map +1 -1
- package/dist/executors/codex.executor.js +102 -13
- package/dist/executors/codex.executor.js.map +1 -1
- package/dist/executors/default-profiles.json +2 -1
- package/dist/executors/default-providers.json +2 -1
- package/dist/executors/image-utils.d.ts +8 -0
- package/dist/executors/image-utils.d.ts.map +1 -1
- package/dist/executors/image-utils.js +25 -0
- package/dist/executors/image-utils.js.map +1 -1
- package/dist/executors/index.d.ts +1 -1
- package/dist/executors/index.d.ts.map +1 -1
- package/dist/executors/index.js +23 -5
- package/dist/executors/index.js.map +1 -1
- package/dist/executors/providers.d.ts +7 -2
- package/dist/executors/providers.d.ts.map +1 -1
- package/dist/executors/providers.js +120 -1
- package/dist/executors/providers.js.map +1 -1
- package/dist/index.js +3 -2
- package/dist/index.js.map +1 -1
- package/dist/output/codex-parser.d.ts +22 -3
- package/dist/output/codex-parser.d.ts.map +1 -1
- package/dist/output/codex-parser.js +106 -11
- package/dist/output/codex-parser.js.map +1 -1
- package/dist/routes/providers.d.ts +3 -0
- package/dist/routes/providers.d.ts.map +1 -1
- package/dist/routes/providers.js +70 -3
- package/dist/routes/providers.js.map +1 -1
- package/dist/routes/workspaces.d.ts.map +1 -1
- package/dist/routes/workspaces.js +1 -0
- package/dist/routes/workspaces.js.map +1 -1
- package/dist/services/terminal-manager.d.ts +1 -1
- package/dist/services/terminal-manager.d.ts.map +1 -1
- package/dist/services/terminal-manager.js +4 -3
- package/dist/services/terminal-manager.js.map +1 -1
- package/dist/utils/index.d.ts.map +1 -1
- package/dist/utils/index.js +2 -2
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/process-launch.d.ts +11 -0
- package/dist/utils/process-launch.d.ts.map +1 -0
- package/dist/utils/process-launch.js +119 -0
- package/dist/utils/process-launch.js.map +1 -0
- package/dist/utils/process-launch.test.d.ts +2 -0
- package/dist/utils/process-launch.test.d.ts.map +1 -0
- package/dist/utils/process-launch.test.js +52 -0
- package/dist/utils/process-launch.test.js.map +1 -0
- package/dist/web/assets/{AgentDemoPage-DbReHEIF.js → AgentDemoPage-DSyU6XMx.js} +1 -1
- package/dist/web/assets/{DemoPage-U0U06JBX.js → DemoPage-BxYQv1Wa.js} +1 -1
- package/dist/web/assets/{NotificationSettingsPage-CdbIEiFm.js → NotificationSettingsPage-mln4lAxn.js} +1 -1
- package/dist/web/assets/{ProfileSettingsPage-DXdb0LKC.js → ProfileSettingsPage-CS-WK307.js} +1 -1
- package/dist/web/assets/{ProjectKanbanPage-DmTUqq3c.js → ProjectKanbanPage-Bz0Q0ZZy.js} +3 -3
- package/dist/web/assets/{ProjectSettingsPage-X9m7tZ5R.js → ProjectSettingsPage-CBnahNua.js} +1 -1
- package/dist/web/assets/ProviderSettingsPage-D-Lrg1Sj.js +54 -0
- package/dist/web/assets/{api-client-DEke6rQ4.js → api-client-iFY2ykuZ.js} +1 -1
- package/dist/web/assets/{chevron-down-CpFVmwPg.js → chevron-down-CxTrrnvp.js} +1 -1
- package/dist/web/assets/{circle-alert-Gs_wxunt.js → circle-alert-CHDHEO67.js} +1 -1
- package/dist/web/assets/{circle-check-BPbbKebL.js → circle-check-uswR_cEa.js} +1 -1
- package/dist/web/assets/{code-block-OCS4YCEC-B9uttJeR.js → code-block-OCS4YCEC-VVSDpKw-.js} +1 -1
- package/dist/web/assets/{folder-picker-q3bDqZNK.js → folder-picker-DshGpYNS.js} +1 -1
- package/dist/web/assets/index-Br9066ZX.css +1 -0
- package/dist/web/assets/{index-yP6NT0d4.js → index-hdGFeHu1.js} +2 -2
- package/dist/web/assets/{loader-circle-BPfuUlPS.js → loader-circle-BYF33K7x.js} +1 -1
- package/dist/web/assets/{mermaid-NOHMQCX5-tkavilGV.js → mermaid-NOHMQCX5-CQLrOBEw.js} +3 -3
- package/dist/web/assets/{modal-Cm1qLsdb.js → modal-BCL0660p.js} +1 -1
- package/dist/web/assets/{pencil-BJvmRaTF.js → pencil-SJi1qbh9.js} +1 -1
- package/dist/web/assets/{query-keys-DfqkAgsV.js → query-keys-B2VhRmAm.js} +1 -1
- package/dist/web/assets/{select-Dchwldvd.js → select-WuDnj3zN.js} +1 -1
- package/dist/web/assets/{use-profiles-DVKFw38N.js → use-profiles-DYTDOkn8.js} +1 -1
- package/dist/web/assets/{use-projects-CYLR7Ikg.js → use-projects-BLI6qXx-.js} +1 -1
- package/dist/web/assets/use-providers-C1i5uxRH.js +1 -0
- package/dist/web/assets/{x-C1fyolLz.js → x-Bn5zgMLL.js} +1 -1
- package/dist/web/index.html +2 -2
- package/node_modules/@agent-tower/shared/dist/types.d.ts +29 -2
- package/node_modules/@agent-tower/shared/dist/types.d.ts.map +1 -1
- package/node_modules/@agent-tower/shared/dist/types.js.map +1 -1
- package/package.json +2 -1
- package/dist/web/assets/ProviderSettingsPage-rrgndhUT.js +0 -1
- package/dist/web/assets/index-Bdp1rkP7.css +0 -1
- package/dist/web/assets/use-providers-Ce2CzdA7.js +0 -1
package/dist/cli.js
CHANGED
|
@@ -12,6 +12,7 @@ import { homedir } from 'node:os';
|
|
|
12
12
|
import path from 'node:path';
|
|
13
13
|
import { execFileSync } from 'node:child_process';
|
|
14
14
|
import { fileURLToPath } from 'node:url';
|
|
15
|
+
import { getBundledPrismaCommand } from './utils/process-launch.js';
|
|
15
16
|
const __dirname = path.dirname(fileURLToPath(import.meta.url));
|
|
16
17
|
const DEFAULT_PORT = 12580;
|
|
17
18
|
const DEFAULT_DATA_DIR = path.join(homedir(), '.agent-tower');
|
|
@@ -76,9 +77,9 @@ function printVersion() {
|
|
|
76
77
|
}
|
|
77
78
|
/** 确保数据库 schema 与当前版本一致 */
|
|
78
79
|
function ensureDatabase(dbPath, schemaPath) {
|
|
79
|
-
const
|
|
80
|
+
const prisma = getBundledPrismaCommand(__dirname);
|
|
80
81
|
try {
|
|
81
|
-
execFileSync(
|
|
82
|
+
execFileSync(prisma.command, [...prisma.args, 'db', 'push', '--skip-generate', `--schema=${schemaPath}`], {
|
|
82
83
|
stdio: 'pipe',
|
|
83
84
|
env: { ...process.env, AGENT_TOWER_DATABASE_URL: `file:${dbPath}` },
|
|
84
85
|
});
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AACA;;;;;;;GAOG;AACH,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACzF,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"providers.test.d.ts","sourceRoot":"","sources":["../../../src/executors/__tests__/providers.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,129 @@
|
|
|
1
|
+
import * as fs from 'node:fs';
|
|
2
|
+
import * as os from 'node:os';
|
|
3
|
+
import * as path from 'node:path';
|
|
4
|
+
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
|
|
5
|
+
import { AgentType } from '../../types/index.js';
|
|
6
|
+
import { createProviderBackup, getAllProviders, importProvidersFromBackup, previewProviderImport, reloadProviders, } from '../providers.js';
|
|
7
|
+
const originalDataDir = process.env.AGENT_TOWER_DATA_DIR;
|
|
8
|
+
let tempDataDir = '';
|
|
9
|
+
function writeUserProviders(providers) {
|
|
10
|
+
fs.writeFileSync(path.join(tempDataDir, 'providers.json'), JSON.stringify({ providers }, null, 2), 'utf-8');
|
|
11
|
+
}
|
|
12
|
+
describe('providers backup/import', () => {
|
|
13
|
+
beforeEach(() => {
|
|
14
|
+
tempDataDir = fs.mkdtempSync(path.join(os.tmpdir(), 'agent-tower-providers-'));
|
|
15
|
+
process.env.AGENT_TOWER_DATA_DIR = tempDataDir;
|
|
16
|
+
reloadProviders();
|
|
17
|
+
});
|
|
18
|
+
afterEach(() => {
|
|
19
|
+
if (originalDataDir === undefined) {
|
|
20
|
+
delete process.env.AGENT_TOWER_DATA_DIR;
|
|
21
|
+
}
|
|
22
|
+
else {
|
|
23
|
+
process.env.AGENT_TOWER_DATA_DIR = originalDataDir;
|
|
24
|
+
}
|
|
25
|
+
if (tempDataDir) {
|
|
26
|
+
fs.rmSync(tempDataDir, { recursive: true, force: true });
|
|
27
|
+
}
|
|
28
|
+
reloadProviders();
|
|
29
|
+
});
|
|
30
|
+
it('exports only user-level provider data', () => {
|
|
31
|
+
writeUserProviders([
|
|
32
|
+
{
|
|
33
|
+
id: 'codex-default',
|
|
34
|
+
name: 'Codex Proxy',
|
|
35
|
+
agentType: AgentType.CODEX,
|
|
36
|
+
env: { OPENAI_API_KEY: 'sk-proxy' },
|
|
37
|
+
config: { fullAuto: false, model: 'gpt-5.3-codex' },
|
|
38
|
+
settings: 'model = "gpt-5.3-codex"',
|
|
39
|
+
isDefault: true,
|
|
40
|
+
},
|
|
41
|
+
{
|
|
42
|
+
id: 'custom-codex',
|
|
43
|
+
name: 'Codex Local',
|
|
44
|
+
agentType: AgentType.CODEX,
|
|
45
|
+
env: { OPENAI_API_KEY: 'sk-local' },
|
|
46
|
+
config: { fullAuto: true },
|
|
47
|
+
isDefault: false,
|
|
48
|
+
createdAt: '2026-03-23T00:00:00.000Z',
|
|
49
|
+
},
|
|
50
|
+
]);
|
|
51
|
+
reloadProviders();
|
|
52
|
+
const backup = createProviderBackup();
|
|
53
|
+
expect(backup.kind).toBe('provider-backup');
|
|
54
|
+
expect(backup.providers.map(provider => provider.id)).toEqual(['codex-default', 'custom-codex']);
|
|
55
|
+
expect(backup.providers.every(provider => provider.builtIn === undefined)).toBe(true);
|
|
56
|
+
});
|
|
57
|
+
it('previews and imports create/overwrite/skip actions correctly', () => {
|
|
58
|
+
writeUserProviders([
|
|
59
|
+
{
|
|
60
|
+
id: 'same-provider',
|
|
61
|
+
name: 'Same Provider',
|
|
62
|
+
agentType: AgentType.CODEX,
|
|
63
|
+
env: { OPENAI_API_KEY: 'same-key' },
|
|
64
|
+
config: { fullAuto: true },
|
|
65
|
+
isDefault: false,
|
|
66
|
+
createdAt: '2026-03-20T00:00:00.000Z',
|
|
67
|
+
},
|
|
68
|
+
{
|
|
69
|
+
id: 'overwrite-provider',
|
|
70
|
+
name: 'Claude Old',
|
|
71
|
+
agentType: AgentType.CLAUDE_CODE,
|
|
72
|
+
env: { ANTHROPIC_API_KEY: 'old-key' },
|
|
73
|
+
config: { dangerouslySkipPermissions: true },
|
|
74
|
+
isDefault: false,
|
|
75
|
+
},
|
|
76
|
+
]);
|
|
77
|
+
reloadProviders();
|
|
78
|
+
const backup = {
|
|
79
|
+
version: 1,
|
|
80
|
+
kind: 'provider-backup',
|
|
81
|
+
exportedAt: '2026-03-23T10:00:00.000Z',
|
|
82
|
+
mode: 'full',
|
|
83
|
+
providers: [
|
|
84
|
+
{
|
|
85
|
+
id: 'same-provider',
|
|
86
|
+
name: 'Same Provider',
|
|
87
|
+
agentType: AgentType.CODEX,
|
|
88
|
+
env: { OPENAI_API_KEY: 'same-key' },
|
|
89
|
+
config: { fullAuto: true },
|
|
90
|
+
isDefault: false,
|
|
91
|
+
},
|
|
92
|
+
{
|
|
93
|
+
id: 'overwrite-provider',
|
|
94
|
+
name: 'Claude New',
|
|
95
|
+
agentType: AgentType.CLAUDE_CODE,
|
|
96
|
+
env: { ANTHROPIC_API_KEY: 'new-key' },
|
|
97
|
+
config: { dangerouslySkipPermissions: false },
|
|
98
|
+
isDefault: true,
|
|
99
|
+
},
|
|
100
|
+
{
|
|
101
|
+
id: 'new-provider',
|
|
102
|
+
name: 'Gemini Team',
|
|
103
|
+
agentType: AgentType.GEMINI_CLI,
|
|
104
|
+
env: { GEMINI_API_KEY: 'new-provider-key' },
|
|
105
|
+
config: { yolo: false },
|
|
106
|
+
isDefault: false,
|
|
107
|
+
createdAt: '2026-03-23T11:00:00.000Z',
|
|
108
|
+
},
|
|
109
|
+
],
|
|
110
|
+
};
|
|
111
|
+
const preview = previewProviderImport(backup);
|
|
112
|
+
expect(preview.summary).toEqual({
|
|
113
|
+
create: 1,
|
|
114
|
+
overwrite: 1,
|
|
115
|
+
skip: 1,
|
|
116
|
+
});
|
|
117
|
+
const result = importProvidersFromBackup(backup);
|
|
118
|
+
expect(result.summary).toEqual(preview.summary);
|
|
119
|
+
const providers = getAllProviders();
|
|
120
|
+
expect(providers.find(provider => provider.id === 'new-provider')?.name).toBe('Gemini Team');
|
|
121
|
+
expect(providers.find(provider => provider.id === 'overwrite-provider')?.env).toEqual({
|
|
122
|
+
ANTHROPIC_API_KEY: 'new-key',
|
|
123
|
+
});
|
|
124
|
+
expect(providers.find(provider => provider.id === 'overwrite-provider')?.isDefault).toBe(true);
|
|
125
|
+
expect(providers.find(provider => provider.id === 'claude-code-default')?.isDefault).toBe(false);
|
|
126
|
+
expect(providers.find(provider => provider.id === 'same-provider')?.name).toBe('Same Provider');
|
|
127
|
+
});
|
|
128
|
+
});
|
|
129
|
+
//# sourceMappingURL=providers.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"providers.test.js","sourceRoot":"","sources":["../../../src/executors/__tests__/providers.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,UAAU,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,YAAY,EAAuB,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"base.executor.d.ts","sourceRoot":"","sources":["../../src/executors/base.executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,8 @@ import { EventEmitter } from 'events';
|
|
|
7
7
|
import { appendFileSync } from 'node:fs';
|
|
8
8
|
import { resolveCommandParts } from './command-builder.js';
|
|
9
9
|
import { stripAnsiSequences } from '../output/utils/ansi.js';
|
|
10
|
-
|
|
10
|
+
import { buildPtyCommand, buildPtyCommandWithStdin, getPtyLogFilePath, } from '../utils/process-launch.js';
|
|
11
|
+
const PTY_LOG_FILE = getPtyLogFilePath();
|
|
11
12
|
function ptyLog(pid, msg) {
|
|
12
13
|
const line = `[${new Date().toISOString()}][pid=${pid}] ${msg}\n`;
|
|
13
14
|
process.stdout.write(line);
|
|
@@ -100,17 +101,13 @@ export class BaseExecutor {
|
|
|
100
101
|
const cancel = new CancellationToken();
|
|
101
102
|
// 添加 prompt 到参数列表
|
|
102
103
|
const fullArgs = [...args, config.prompt];
|
|
103
|
-
|
|
104
|
-
// node-pty 直接 spawn Node.js 脚本会失败 (posix_spawnp failed)
|
|
105
|
-
const shellArgs = [programPath, ...fullArgs].map(arg =>
|
|
106
|
-
// 转义单引号
|
|
107
|
-
`'${arg.replace(/'/g, "'\\''")}'`).join(' ');
|
|
104
|
+
const invocation = buildPtyCommand(programPath, fullArgs);
|
|
108
105
|
const fullEnv = env.getFullEnv();
|
|
109
106
|
ptyLog(0, `Spawning: ${programPath} ${fullArgs.slice(0, -1).join(' ')} ... <prompt>`);
|
|
110
107
|
ptyLog(0, `ENV ANTHROPIC_BASE_URL=${fullEnv.ANTHROPIC_BASE_URL || '(not set)'}`);
|
|
111
108
|
ptyLog(0, `ENV ANTHROPIC_API_KEY=${fullEnv.ANTHROPIC_API_KEY ? fullEnv.ANTHROPIC_API_KEY.slice(0, 12) + '...' : '(not set)'}`);
|
|
112
109
|
ptyLog(0, `ENV ANTHROPIC_AUTH_TOKEN=${fullEnv.ANTHROPIC_AUTH_TOKEN ? fullEnv.ANTHROPIC_AUTH_TOKEN.slice(0, 12) + '...' : '(not set)'}`);
|
|
113
|
-
const shell = pty.spawn(
|
|
110
|
+
const shell = pty.spawn(invocation.command, invocation.args, {
|
|
114
111
|
name: 'xterm-256color',
|
|
115
112
|
cols: 120,
|
|
116
113
|
rows: 30,
|
|
@@ -118,7 +115,7 @@ export class BaseExecutor {
|
|
|
118
115
|
env: fullEnv,
|
|
119
116
|
});
|
|
120
117
|
ptyLog(shell.pid, `Process spawned`);
|
|
121
|
-
// 收集并实时记录 PTY
|
|
118
|
+
// 收集并实时记录 PTY 输出（写入系统临时目录日志方便诊断）
|
|
122
119
|
let outputBuffer = '';
|
|
123
120
|
const offData = shell.onData((data) => {
|
|
124
121
|
if (outputBuffer.length < 8000) {
|
|
@@ -174,9 +171,8 @@ export class BaseExecutor {
|
|
|
174
171
|
const tmpFile = path.join(os.tmpdir(), `agent-tower-stdin-${Date.now()}.json`);
|
|
175
172
|
await fs.writeFile(tmpFile, stdinData, 'utf-8');
|
|
176
173
|
console.log('[BaseExecutor] Wrote stdin data to temp file:', tmpFile);
|
|
177
|
-
|
|
178
|
-
const
|
|
179
|
-
const shell = pty.spawn('/bin/bash', ['-c', shellCommand], {
|
|
174
|
+
const invocation = buildPtyCommandWithStdin(programPath, fullArgs, tmpFile);
|
|
175
|
+
const shell = pty.spawn(invocation.command, invocation.args, {
|
|
180
176
|
name: 'xterm-256color',
|
|
181
177
|
cols: 120,
|
|
182
178
|
rows: 30,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.executor.js","sourceRoot":"","sources":["../../src/executors/base.executor.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAEhC,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAGzC,OAAO,EAA8C,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AACvG,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"base.executor.js","sourceRoot":"","sources":["../../src/executors/base.executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,8 +36,8 @@ export interface ClaudeCodeConfig {
|
|
|
36
36
|
disableApiKey?: boolean;
|
|
37
37
|
/** 命令覆盖 */
|
|
38
38
|
cmd?: CmdOverrides;
|
|
39
|
-
/** CLI
|
|
40
|
-
settings?:
|
|
39
|
+
/** CLI 原生配置 JSON 字符串，直接传给 --settings */
|
|
40
|
+
settings?: string;
|
|
41
41
|
}
|
|
42
42
|
export declare class ClaudeCodeExecutor extends BaseExecutor {
|
|
43
43
|
readonly agentType = AgentType.CLAUDE_CODE;
|
|
@@ -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;AAE9C,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,eAAe,EACf,mBAAmB,EACnB,YAAY,EACb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAkB,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpF;;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,aAAa;IACb,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,iBAAiB;IACjB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW;IACX,GAAG,CAAC,EAAE,YAAY,CAAC;IACnB
|
|
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;AAE9C,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,eAAe,EACf,mBAAmB,EACnB,YAAY,EACb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAkB,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpF;;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,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;IAoBtD;;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;IAgD/C;;;OAGG;IACH,SAAS,CAAC,gCAAgC,IAAI,cAAc;IAgD5D;;OAEG;IACG,KAAK,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,YAAY,CAAC;IA2B/D;;OAEG;IACG,aAAa,CACjB,MAAM,EAAE,mBAAmB,EAC3B,SAAS,EAAE,MAAM,EACjB,gBAAgB,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,YAAY,CAAC;IAmCxB;;;OAGG;IACH,OAAO,CAAC,aAAa;CAGtB"}
|
|
@@ -106,7 +106,7 @@ export class ClaudeCodeExecutor extends BaseExecutor {
|
|
|
106
106
|
}
|
|
107
107
|
if (this.config.settings) {
|
|
108
108
|
// 有 settings 时：以 settings 为基础，将 ANTHROPIC_* env 合并进去
|
|
109
|
-
const settings =
|
|
109
|
+
const settings = JSON.parse(this.config.settings);
|
|
110
110
|
if (Object.keys(anthropicEnv).length > 0) {
|
|
111
111
|
const existingEnv = settings.env ?? {};
|
|
112
112
|
settings.env = { ...existingEnv, ...anthropicEnv };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-code.executor.js","sourceRoot":"","sources":["../../src/executors/claude-code.executor.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"claude-code.executor.js","sourceRoot":"","sources":["../../src/executors/claude-code.executor.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAa,KAAK,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EACL,YAAY,EAEZ,eAAe,GAGhB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,cAAc,EAAgB,MAAM,sBAAsB,CAAC;AACpF,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAEjF;;GAEG;AACH,MAAM,CAAN,IAAY,cAOX;AAPD,WAAY,cAAc;IACxB,kBAAkB;IAClB,qCAAmB,CAAA;IACnB,kCAAkC;IAClC,+BAAa,CAAA;IACb,sBAAsB;IACtB,yDAAuC,CAAA;AACzC,CAAC,EAPW,cAAc,KAAd,cAAc,QAOzB;AA0BD;;GAEG;AACH,SAAS,cAAc,CAAC,SAAkB;IACxC,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,mDAAmD,CAAC;IAC7D,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,OAAO,kBAAmB,SAAQ,YAAY;IACzC,SAAS,GAAG,SAAS,CAAC,WAAW,CAAC;IAClC,WAAW,GAAG,aAAa,CAAC;IAE7B,MAAM,CAAmB;IAEjC,YAAY,SAA2B,EAAE;QACvC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,GAAG,CAAC;IACjC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,mBAAmB;QACvB,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,cAAc,CAAC,CAAC;QAE7D,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YACxC,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;YACnD,OAAO;gBACL,IAAI,EAAE,gBAAgB;gBACtB,iBAAiB,EAAE,SAAS;aAC7B,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,iBAAiB;YACjB,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,CAAC;YACzC,IAAI,UAAU,EAAE,CAAC;gBACf,OAAO,EAAE,IAAI,EAAE,oBAAoB,EAAE,CAAC;YACxC,CAAC;YACD,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,+BAA+B,EAAE,CAAC;QACvE,CAAC;IACH,CAAC;IAED;;OAEG;IACH,eAAe;QACb,OAAO,CAAC,eAAe,CAAC,YAAY,EAAE,eAAe,CAAC,aAAa,CAAC,CAAC;IACvE,CAAC;IAED;;OAEG;IACH,uBAAuB;QACrB,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,cAAc,CAAC,CAAC;IACjD,CAAC;IAED;;OAEG;IACH,iBAAiB;QACf,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACrB,OAAO,cAAc,CAAC,IAAI,CAAC;QAC7B,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YAC1B,OAAO,cAAc,CAAC,iBAAiB,CAAC;QAC1C,CAAC;QACD,OAAO,cAAc,CAAC,iBAAiB,CAAC;IAC1C,CAAC;IAED;;;;;;OAMG;IACK,qBAAqB;QAC3B,uCAAuC;QACvC,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,EAAE,GAAG,CAAC;QAC5C,MAAM,YAAY,GAA2B,EAAE,CAAC;QAChD,IAAI,YAAY,EAAE,CAAC;YACjB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;gBACxD,IAAI,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;oBACjC,YAAY,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;gBAC5B,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YACzB,qDAAqD;YACrD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAA4B,CAAC;YAC7E,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACzC,MAAM,WAAW,GAAI,QAAQ,CAAC,GAA8B,IAAI,EAAE,CAAC;gBACnE,QAAQ,CAAC,GAAG,GAAG,EAAE,GAAG,WAAW,EAAE,GAAG,YAAY,EAAE,CAAC;YACrD,CAAC;YACD,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;QAClD,CAAC;QAED,4CAA4C;QAC5C,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3C,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC;IAC/D,CAAC;IAED;;OAEG;IACO,mBAAmB;QAC3B,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,IAAI,KAAK,CAAC;QACxD,IAAI,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC;QAE5D,OAAO;QACP,OAAO,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAE1B,SAAS;QACT,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC;QACvC,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,KAAK,CAAC;QAEjD,IAAI,IAAI,IAAI,SAAS,EAAE,CAAC;YACtB,OAAO,CAAC,YAAY,CAAC,CAAC,gCAAgC,CAAC,CAAC,CAAC;YACzD,OAAO,CAAC,YAAY,CAAC,CAAC,qBAAqB,cAAc,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC;QAClF,CAAC;QAED,SAAS;QACT,IAAI,IAAI,CAAC,MAAM,CAAC,0BAA0B,EAAE,CAAC;YAC3C,OAAO,CAAC,YAAY,CAAC,CAAC,gCAAgC,CAAC,CAAC,CAAC;QAC3D,CAAC;QAED,OAAO;QACP,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YACtB,OAAO,CAAC,YAAY,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACvD,CAAC;QAED,8DAA8D;QAC9D,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC;QAEnD,+BAA+B;QAC/B,OAAO,CAAC,YAAY,CAAC;YACnB,WAAW;YACX,6BAA6B;YAC7B,4BAA4B;YAC5B,4BAA4B;YAC5B,wBAAwB;YACxB,mCAAmC;SACpC,CAAC,CAAC;QAEH,SAAS;QACT,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;YAC7B,OAAO,CAAC,YAAY,CAAC,CAAC,wBAAwB,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;QAC7E,CAAC;QAED,OAAO;QACP,OAAO,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IACpD,CAAC;IAED;;;OAGG;IACO,gCAAgC;QACxC,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,IAAI,KAAK,CAAC;QACxD,IAAI,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC;QAE5D,qBAAqB;QACrB,OAAO,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAE1B,SAAS;QACT,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC;QACvC,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,KAAK,CAAC;QAEjD,IAAI,IAAI,IAAI,SAAS,EAAE,CAAC;YACtB,OAAO,CAAC,YAAY,CAAC,CAAC,gCAAgC,CAAC,CAAC,CAAC;YACzD,OAAO,CAAC,YAAY,CAAC,CAAC,qBAAqB,cAAc,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC;QAClF,CAAC;QAED,SAAS;QACT,IAAI,IAAI,CAAC,MAAM,CAAC,0BAA0B,EAAE,CAAC;YAC3C,OAAO,CAAC,YAAY,CAAC,CAAC,gCAAgC,CAAC,CAAC,CAAC;QAC3D,CAAC;QAED,OAAO;QACP,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YACtB,OAAO,CAAC,YAAY,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACvD,CAAC;QAED,8DAA8D;QAC9D,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC;QAEnD,+BAA+B;QAC/B,OAAO,CAAC,YAAY,CAAC;YACnB,WAAW;YACX,6BAA6B;YAC7B,4BAA4B;YAC5B,4BAA4B;YAC5B,wBAAwB;YACxB,mCAAmC;SACpC,CAAC,CAAC;QAEH,SAAS;QACT,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;YAC7B,OAAO,CAAC,YAAY,CAAC,CAAC,wBAAwB,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;QAC7E,CAAC;QAED,OAAO;QACP,OAAO,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IACpD,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAK,CAAC,MAA2B;QACrC,YAAY;QACZ,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAEjD,OAAO,CAAC,GAAG,CAAC,6CAA6C,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAC1E,OAAO,CAAC,GAAG,CAAC,8CAA8C,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;QAEtF,WAAW;QACX,MAAM,YAAY,GAAG,MAAM,qBAAqB,CAAC,MAAM,CAAC,CAAC;QAEzD,IAAI,YAAY,CAAC,SAAS,EAAE,CAAC;YAC3B,OAAO,CAAC,GAAG,CAAC,2EAA2E,CAAC,CAAC;YACzF,qBAAqB;YACrB,MAAM,cAAc,GAAG,IAAI,CAAC,gCAAgC,EAAE,CAAC;YAC/D,MAAM,YAAY,GAAG,cAAc,CAAC,YAAY,EAAE,CAAC;YACnD,MAAM,WAAW,GAAG,sBAAsB,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;YACvE,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;QAChE,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,uEAAuE,CAAC,CAAC;YACrF,SAAS;YACT,MAAM,cAAc,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAClD,MAAM,YAAY,GAAG,cAAc,CAAC,YAAY,EAAE,CAAC;YACnD,MAAM,SAAS,GAAG,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,CAAC;YACxC,OAAO,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,aAAa,CACjB,MAA2B,EAC3B,SAAiB,EACjB,gBAAyB;QAEzB,YAAY;QACZ,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAEjD,OAAO,CAAC,GAAG,CAAC,qDAAqD,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAClF,OAAO,CAAC,GAAG,CAAC,sDAAsD,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;QAE9F,WAAW;QACX,MAAM,YAAY,GAAG,MAAM,qBAAqB,CAAC,MAAM,CAAC,CAAC;QAEzD,IAAI,YAAY,CAAC,SAAS,EAAE,CAAC;YAC3B,OAAO,CAAC,GAAG,CAAC,8EAA8E,CAAC,CAAC;YAC5F,qBAAqB;YACrB,MAAM,cAAc,GAAG,IAAI,CAAC,gCAAgC,EAAE,CAAC;YAC/D,MAAM,cAAc,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;YAC/C,IAAI,gBAAgB,EAAE,CAAC;gBACrB,cAAc,CAAC,IAAI,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,CAAC;YAC/D,CAAC;YACD,MAAM,YAAY,GAAG,cAAc,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;YAClE,MAAM,WAAW,GAAG,sBAAsB,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;YACvE,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;QAChE,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,oFAAoF,CAAC,CAAC;YAClG,SAAS;YACT,MAAM,cAAc,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAClD,MAAM,cAAc,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;YAC/C,IAAI,gBAAgB,EAAE,CAAC;gBACrB,cAAc,CAAC,IAAI,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,CAAC;YAC/D,CAAC;YACD,MAAM,YAAY,GAAG,cAAc,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;YAClE,MAAM,SAAS,GAAG,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,CAAC;YACxC,OAAO,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;IAED;;;OAGG;IACK,aAAa,CAAC,MAAc;QAClC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF"}
|
|
@@ -17,10 +17,14 @@ export interface CodexConfig {
|
|
|
17
17
|
sandbox?: string;
|
|
18
18
|
/** 审批策略 (untrusted, on-request, never, reject) */
|
|
19
19
|
approvalPolicy?: string;
|
|
20
|
-
/**
|
|
20
|
+
/** 兼容旧配置：全自动模式，相当于 on-request + workspace-write */
|
|
21
21
|
fullAuto?: boolean;
|
|
22
22
|
/** 启用实时网络搜索 */
|
|
23
23
|
liveSearch?: boolean;
|
|
24
|
+
/** 配置 profile 名称，对应 ~/.codex/config.toml 中的 [profiles.xxx] */
|
|
25
|
+
profile?: string;
|
|
26
|
+
/** CLI 原生配置 (TOML 格式字符串)，通过 -c 参数注入 */
|
|
27
|
+
settings?: string;
|
|
24
28
|
/** 命令覆盖 */
|
|
25
29
|
cmd?: CmdOverrides;
|
|
26
30
|
}
|
|
@@ -41,6 +45,10 @@ export declare class CodexExecutor extends BaseExecutor {
|
|
|
41
45
|
* 获取默认 MCP 配置路径
|
|
42
46
|
*/
|
|
43
47
|
getDefaultMcpConfigPath(): string | null;
|
|
48
|
+
/**
|
|
49
|
+
* 构建 TOML 配置覆盖参数（--profile 和 -c）
|
|
50
|
+
*/
|
|
51
|
+
private buildConfigOverrides;
|
|
44
52
|
/**
|
|
45
53
|
* 构建命令
|
|
46
54
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.executor.d.ts","sourceRoot":"","sources":["../../src/executors/codex.executor.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"codex.executor.d.ts","sourceRoot":"","sources":["../../src/executors/codex.executor.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,eAAe,EACf,mBAAmB,EACnB,YAAY,EACb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAkB,YAAY,EAAE,MAAM,sBAAsB,CAAC;AA4CpF;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,qBAAqB;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mEAAmE;IACnE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4DAA4D;IAC5D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,kDAAkD;IAClD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,mDAAmD;IACnD,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,eAAe;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,8DAA8D;IAC9D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,uCAAuC;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW;IACX,GAAG,CAAC,EAAE,YAAY,CAAC;CACpB;AASD,qBAAa,aAAc,SAAQ,YAAY;IAC7C,QAAQ,CAAC,SAAS,mBAAmB;IACrC,QAAQ,CAAC,WAAW,WAAW;IAE/B,OAAO,CAAC,MAAM,CAAc;gBAEhB,MAAM,GAAE,WAAgB;IAMpC;;OAEG;IACG,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAqCtD;;OAEG;IACH,eAAe,IAAI,eAAe,EAAE;IAIpC;;OAEG;IACH,uBAAuB,IAAI,MAAM,GAAG,IAAI;IAIxC;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAmB5B;;OAEG;IACH,SAAS,CAAC,mBAAmB,IAAI,cAAc;IAsC/C;;OAEG;IACG,KAAK,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,YAAY,CAAC;IAyB/D;;OAEG;IACG,aAAa,CACjB,MAAM,EAAE,mBAAmB,EAC3B,SAAS,EAAE,MAAM,EACjB,gBAAgB,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,YAAY,CAAC;IAgCxB;;OAEG;IACH,OAAO,CAAC,aAAa;CAMtB"}
|
|
@@ -5,10 +5,54 @@
|
|
|
5
5
|
import * as fs from 'fs';
|
|
6
6
|
import * as path from 'path';
|
|
7
7
|
import * as os from 'os';
|
|
8
|
+
import { parse as parseToml } from 'smol-toml';
|
|
8
9
|
import { AgentType } from '../types/index.js';
|
|
9
10
|
import { which } from '../utils/index.js';
|
|
10
11
|
import { BaseExecutor, AgentCapability, } from './base.executor.js';
|
|
11
12
|
import { CommandBuilder, applyOverrides } from './command-builder.js';
|
|
13
|
+
import { extractImagePaths } from './image-utils.js';
|
|
14
|
+
/**
|
|
15
|
+
* 将嵌套对象展平为 dotted path 键值对（递归到标量叶子）
|
|
16
|
+
* { model_providers: { azure: { name: "A", query_params: { "api-version": "v1" } } } }
|
|
17
|
+
* → [
|
|
18
|
+
* ["model_providers.azure.name", "A"],
|
|
19
|
+
* ["model_providers.azure.query_params.api-version", "v1"],
|
|
20
|
+
* ]
|
|
21
|
+
*/
|
|
22
|
+
function flattenObject(obj, prefix = '') {
|
|
23
|
+
const entries = [];
|
|
24
|
+
for (const [key, value] of Object.entries(obj)) {
|
|
25
|
+
const fullPath = prefix ? `${prefix}.${key}` : key;
|
|
26
|
+
if (value !== null && typeof value === 'object' && !Array.isArray(value) && !(value instanceof Date)) {
|
|
27
|
+
entries.push(...flattenObject(value, fullPath));
|
|
28
|
+
}
|
|
29
|
+
else {
|
|
30
|
+
entries.push([fullPath, value]);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
return entries;
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* 将 JS 值转为 TOML 字面量字符串（用于 -c 参数）
|
|
37
|
+
* 对象转为 TOML inline table: { key = "value", key2 = 123 }
|
|
38
|
+
*/
|
|
39
|
+
function toTomlLiteral(value) {
|
|
40
|
+
if (typeof value === 'string')
|
|
41
|
+
return `"${value}"`;
|
|
42
|
+
if (typeof value === 'boolean' || typeof value === 'number')
|
|
43
|
+
return String(value);
|
|
44
|
+
if (Array.isArray(value)) {
|
|
45
|
+
return `[${value.map(v => toTomlLiteral(v)).join(', ')}]`;
|
|
46
|
+
}
|
|
47
|
+
if (value !== null && typeof value === 'object') {
|
|
48
|
+
// TOML inline table: { key = "value", key2 = 123 }
|
|
49
|
+
const pairs = Object.entries(value)
|
|
50
|
+
.map(([k, v]) => `${k} = ${toTomlLiteral(v)}`)
|
|
51
|
+
.join(', ');
|
|
52
|
+
return `{${pairs}}`;
|
|
53
|
+
}
|
|
54
|
+
return String(value);
|
|
55
|
+
}
|
|
12
56
|
/**
|
|
13
57
|
* 获取基础命令
|
|
14
58
|
*/
|
|
@@ -36,9 +80,9 @@ export class CodexExecutor extends BaseExecutor {
|
|
|
36
80
|
// 检查配置文件是否存在
|
|
37
81
|
const configPath = path.join(os.homedir(), '.codex', 'config.toml');
|
|
38
82
|
const authPath = path.join(os.homedir(), '.codex', 'auth.json');
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
83
|
+
// 检查认证文件
|
|
84
|
+
if (fs.existsSync(authPath)) {
|
|
85
|
+
try {
|
|
42
86
|
const stats = fs.statSync(authPath);
|
|
43
87
|
const timestamp = Math.floor(stats.mtimeMs / 1000);
|
|
44
88
|
return {
|
|
@@ -46,15 +90,19 @@ export class CodexExecutor extends BaseExecutor {
|
|
|
46
90
|
lastAuthTimestamp: timestamp,
|
|
47
91
|
};
|
|
48
92
|
}
|
|
49
|
-
|
|
50
|
-
if (fs.existsSync(configPath)) {
|
|
93
|
+
catch {
|
|
51
94
|
return { type: 'INSTALLATION_FOUND' };
|
|
52
95
|
}
|
|
53
|
-
return { type: 'NOT_FOUND', error: 'Codex CLI not authenticated' };
|
|
54
96
|
}
|
|
55
|
-
|
|
56
|
-
|
|
97
|
+
// 仅当 provider 显式依赖 profile 时，才要求本地 config.toml 存在。
|
|
98
|
+
// 其他场景下，Codex 也可能通过 provider 的 settings/env 在运行时注入配置。
|
|
99
|
+
if (this.config.profile && !fs.existsSync(configPath)) {
|
|
100
|
+
return {
|
|
101
|
+
type: 'NOT_FOUND',
|
|
102
|
+
error: 'Codex profile requires ~/.codex/config.toml',
|
|
103
|
+
};
|
|
57
104
|
}
|
|
105
|
+
return { type: 'INSTALLATION_FOUND' };
|
|
58
106
|
}
|
|
59
107
|
/**
|
|
60
108
|
* 获取 Agent 能力
|
|
@@ -68,11 +116,34 @@ export class CodexExecutor extends BaseExecutor {
|
|
|
68
116
|
getDefaultMcpConfigPath() {
|
|
69
117
|
return path.join(os.homedir(), '.codex', 'config.toml');
|
|
70
118
|
}
|
|
119
|
+
/**
|
|
120
|
+
* 构建 TOML 配置覆盖参数（--profile 和 -c）
|
|
121
|
+
*/
|
|
122
|
+
buildConfigOverrides() {
|
|
123
|
+
const args = [];
|
|
124
|
+
// --profile
|
|
125
|
+
if (this.config.profile) {
|
|
126
|
+
args.push('--profile', this.config.profile);
|
|
127
|
+
}
|
|
128
|
+
// settings (TOML) → -c 参数
|
|
129
|
+
if (this.config.settings) {
|
|
130
|
+
const parsed = parseToml(this.config.settings);
|
|
131
|
+
for (const [key, value] of flattenObject(parsed)) {
|
|
132
|
+
args.push('-c', `${key}=${toTomlLiteral(value)}`);
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
return args;
|
|
136
|
+
}
|
|
71
137
|
/**
|
|
72
138
|
* 构建命令
|
|
73
139
|
*/
|
|
74
140
|
buildCommandBuilder() {
|
|
75
141
|
let builder = CommandBuilder.new(getBaseCommand());
|
|
142
|
+
// 配置覆盖（--profile、-c 参数）— 放在最前面
|
|
143
|
+
const configArgs = this.buildConfigOverrides();
|
|
144
|
+
if (configArgs.length > 0) {
|
|
145
|
+
builder.extendParams(configArgs);
|
|
146
|
+
}
|
|
76
147
|
// 模型选择
|
|
77
148
|
if (this.config.model) {
|
|
78
149
|
builder.extendParams(['--model', this.config.model]);
|
|
@@ -102,11 +173,20 @@ export class CodexExecutor extends BaseExecutor {
|
|
|
102
173
|
async spawn(config) {
|
|
103
174
|
const commandBuilder = this.buildCommandBuilder();
|
|
104
175
|
// Codex 使用 exec 子命令进行非交互式执行
|
|
105
|
-
commandBuilder.extendParams(['exec', '--json', '--
|
|
106
|
-
const commandParts = commandBuilder.buildInitial();
|
|
176
|
+
commandBuilder.extendParams(['exec', '--json', '--skip-git-repo-check']);
|
|
107
177
|
// 组合 prompt
|
|
108
178
|
const prompt = this.combinePrompt(config.prompt);
|
|
109
|
-
|
|
179
|
+
// 检测并提取图片路径（-i <FILE>... 是 variadic 参数，会贪婪消费后续参数，
|
|
180
|
+
// 必须用 -- 分隔，防止 prompt 被当成文件路径）
|
|
181
|
+
const { textPrompt, imagePaths } = await extractImagePaths(prompt);
|
|
182
|
+
for (const imgPath of imagePaths) {
|
|
183
|
+
commandBuilder.extendParams(['-i', imgPath]);
|
|
184
|
+
}
|
|
185
|
+
if (imagePaths.length > 0) {
|
|
186
|
+
commandBuilder.extendParams(['--']);
|
|
187
|
+
}
|
|
188
|
+
const commandParts = commandBuilder.buildInitial();
|
|
189
|
+
const newConfig = { ...config, prompt: textPrompt };
|
|
110
190
|
return this.spawnInternal(newConfig, commandParts);
|
|
111
191
|
}
|
|
112
192
|
/**
|
|
@@ -121,10 +201,19 @@ export class CodexExecutor extends BaseExecutor {
|
|
|
121
201
|
}
|
|
122
202
|
// 注意：Codex 的 exec resume 不支持 --from 参数
|
|
123
203
|
// resetToMessageId 参数暂时忽略
|
|
124
|
-
const commandParts = commandBuilder.buildFollowUp(additionalArgs);
|
|
125
204
|
// 组合 prompt
|
|
126
205
|
const prompt = this.combinePrompt(config.prompt);
|
|
127
|
-
|
|
206
|
+
// 检测并提取图片路径（-i <FILE>... 是 variadic 参数，会贪婪消费后续参数，
|
|
207
|
+
// 必须用 -- 分隔，防止 prompt 被当成文件路径）
|
|
208
|
+
const { textPrompt, imagePaths } = await extractImagePaths(prompt);
|
|
209
|
+
for (const imgPath of imagePaths) {
|
|
210
|
+
additionalArgs.push('-i', imgPath);
|
|
211
|
+
}
|
|
212
|
+
if (imagePaths.length > 0) {
|
|
213
|
+
additionalArgs.push('--');
|
|
214
|
+
}
|
|
215
|
+
const commandParts = commandBuilder.buildFollowUp(additionalArgs);
|
|
216
|
+
const newConfig = { ...config, prompt: textPrompt };
|
|
128
217
|
return this.spawnInternal(newConfig, commandParts);
|
|
129
218
|
}
|
|
130
219
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.executor.js","sourceRoot":"","sources":["../../src/executors/codex.executor.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EACL,YAAY,EAEZ,eAAe,GAGhB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,cAAc,EAAgB,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"codex.executor.js","sourceRoot":"","sources":["../../src/executors/codex.executor.ts"],"names":[],"mappings":"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"}
|