agent-tower 0.6.0-beta.15 → 0.6.0-beta.16
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/runtime/__tests__/codex-runtime-resolution.test.d.ts +2 -0
- package/dist/runtime/__tests__/codex-runtime-resolution.test.d.ts.map +1 -0
- package/dist/runtime/__tests__/codex-runtime-resolution.test.js +107 -0
- package/dist/runtime/__tests__/codex-runtime-resolution.test.js.map +1 -0
- package/dist/runtime/acp/agents/codex.js +15 -12
- package/dist/runtime/acp/agents/codex.js.map +1 -1
- package/package.json +2 -2
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codex-runtime-resolution.test.d.ts","sourceRoot":"","sources":["../../../src/runtime/__tests__/codex-runtime-resolution.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
import path from 'node:path';
|
|
2
|
+
import { AgentType, RuntimeType } from '@agent-tower/shared';
|
|
3
|
+
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
|
4
|
+
import { ExecutionEnv } from '../../executors/execution-env.js';
|
|
5
|
+
import { which } from '../../utils/index.js';
|
|
6
|
+
import { codexAcpAgentDefinition } from '../acp/agents/codex.js';
|
|
7
|
+
import { resolveBundledCodexEntrypoint } from '../acp/agents/executable-resolution.js';
|
|
8
|
+
vi.mock('../../utils/index.js', () => ({ which: vi.fn() }));
|
|
9
|
+
vi.mock('../acp/agents/executable-resolution.js', () => ({
|
|
10
|
+
resolveBundledCodexEntrypoint: vi.fn(),
|
|
11
|
+
}));
|
|
12
|
+
const systemDirectory = path.join(path.parse(process.cwd()).root, 'system tools', 'bin');
|
|
13
|
+
const systemCodex = path.join(systemDirectory, process.platform === 'win32' ? 'codex.cmd' : 'codex');
|
|
14
|
+
const bundledCodex = path.join(process.cwd(), 'node_modules', '@openai', 'codex', 'bin', 'codex.js');
|
|
15
|
+
function setup(environment = {}) {
|
|
16
|
+
const provider = {
|
|
17
|
+
id: 'codex-system-first',
|
|
18
|
+
name: 'Codex ACP',
|
|
19
|
+
agentType: AgentType.CODEX,
|
|
20
|
+
runtimeType: RuntimeType.ACP,
|
|
21
|
+
env: { PATH: systemDirectory, ...environment },
|
|
22
|
+
config: {},
|
|
23
|
+
isDefault: false,
|
|
24
|
+
};
|
|
25
|
+
const profile = codexAcpAgentDefinition.projectProvider(provider, provider.env);
|
|
26
|
+
const input = {
|
|
27
|
+
towerSessionId: 'codex-system-first',
|
|
28
|
+
agentType: AgentType.CODEX,
|
|
29
|
+
runtimeType: RuntimeType.ACP,
|
|
30
|
+
variant: 'DEFAULT',
|
|
31
|
+
workingDir: process.cwd(),
|
|
32
|
+
env: ExecutionEnv.default(process.cwd()),
|
|
33
|
+
};
|
|
34
|
+
return { provider, profile, input };
|
|
35
|
+
}
|
|
36
|
+
beforeEach(() => {
|
|
37
|
+
vi.resetAllMocks();
|
|
38
|
+
vi.mocked(which).mockResolvedValue(null);
|
|
39
|
+
vi.mocked(resolveBundledCodexEntrypoint).mockReturnValue(bundledCodex);
|
|
40
|
+
});
|
|
41
|
+
describe('Codex ACP runtime resolution', () => {
|
|
42
|
+
it('automatically prefers system Codex without requiring configuration', async () => {
|
|
43
|
+
vi.mocked(which).mockResolvedValue(systemCodex);
|
|
44
|
+
const { provider, profile, input } = setup();
|
|
45
|
+
const launch = await codexAcpAgentDefinition.resolveLaunch(input, profile);
|
|
46
|
+
expect(launch.command).toBe(process.execPath);
|
|
47
|
+
expect(launch.env.CODEX_PATH).toBe(systemCodex);
|
|
48
|
+
expect(launch.env.DISABLE_MCP_CONFIG_FILTERING).toBe('true');
|
|
49
|
+
expect(launch.env.ELECTRON_RUN_AS_NODE).toBe('1');
|
|
50
|
+
expect(await codexAcpAgentDefinition.checkAvailability(provider)).toEqual({ type: 'INSTALLATION_FOUND' });
|
|
51
|
+
expect(which).toHaveBeenCalledWith('codex', { env: expect.objectContaining({ PATH: systemDirectory }) });
|
|
52
|
+
expect(resolveBundledCodexEntrypoint).not.toHaveBeenCalled();
|
|
53
|
+
expect(profile.environment).not.toHaveProperty('CODEX_PATH');
|
|
54
|
+
});
|
|
55
|
+
it('uses bundled Codex when no system installation is found', async () => {
|
|
56
|
+
const { provider, profile, input } = setup();
|
|
57
|
+
const launch = await codexAcpAgentDefinition.resolveLaunch(input, profile);
|
|
58
|
+
expect(launch.env).not.toHaveProperty('CODEX_PATH');
|
|
59
|
+
expect(resolveBundledCodexEntrypoint).toHaveBeenCalledOnce();
|
|
60
|
+
expect(await codexAcpAgentDefinition.checkAvailability(provider)).toEqual({ type: 'INSTALLATION_FOUND' });
|
|
61
|
+
});
|
|
62
|
+
it.each([systemCodex, null])('replaces inherited CODEX_PATH with the automatically selected runtime: %s', async (detectedCodex) => {
|
|
63
|
+
vi.mocked(which).mockResolvedValue(detectedCodex);
|
|
64
|
+
const { profile, input } = setup({ CODEX_PATH: process.execPath });
|
|
65
|
+
const launch = await codexAcpAgentDefinition.resolveLaunch(input, profile);
|
|
66
|
+
expect(launch.env.CODEX_PATH).toBe(detectedCodex ?? undefined);
|
|
67
|
+
expect(profile.environment.CODEX_PATH).toBe(process.execPath);
|
|
68
|
+
});
|
|
69
|
+
it('still launches system Codex when the bundled runtime is unavailable', async () => {
|
|
70
|
+
vi.mocked(which).mockResolvedValue(systemCodex);
|
|
71
|
+
vi.mocked(resolveBundledCodexEntrypoint).mockReturnValue(undefined);
|
|
72
|
+
const { provider, profile, input } = setup();
|
|
73
|
+
const launch = await codexAcpAgentDefinition.resolveLaunch(input, profile);
|
|
74
|
+
expect(launch.env.CODEX_PATH).toBe(systemCodex);
|
|
75
|
+
expect(await codexAcpAgentDefinition.checkAvailability(provider)).toEqual({ type: 'INSTALLATION_FOUND' });
|
|
76
|
+
expect(resolveBundledCodexEntrypoint).not.toHaveBeenCalled();
|
|
77
|
+
});
|
|
78
|
+
it('fails consistently when neither runtime is available', async () => {
|
|
79
|
+
vi.mocked(resolveBundledCodexEntrypoint).mockReturnValue(undefined);
|
|
80
|
+
const { provider, profile, input } = setup();
|
|
81
|
+
await expect(codexAcpAgentDefinition.resolveLaunch(input, profile)).rejects.toMatchObject({
|
|
82
|
+
code: 'missing_codex',
|
|
83
|
+
stage: 'dependency_check',
|
|
84
|
+
});
|
|
85
|
+
expect(await codexAcpAgentDefinition.checkAvailability(provider)).toMatchObject({ type: 'NOT_FOUND' });
|
|
86
|
+
});
|
|
87
|
+
it.each(['PATH', 'Path'])('excludes project package bins and relative paths from %s lookup without changing the agent environment', async (pathKey) => {
|
|
88
|
+
const environment = {
|
|
89
|
+
[pathKey]: [
|
|
90
|
+
path.join(process.cwd(), 'node_modules', '.bin'),
|
|
91
|
+
path.join(process.cwd(), 'node_modules', '.pnpm', 'node_modules', '.bin'),
|
|
92
|
+
'.',
|
|
93
|
+
'',
|
|
94
|
+
'relative-bin',
|
|
95
|
+
systemDirectory,
|
|
96
|
+
].join(path.delimiter),
|
|
97
|
+
};
|
|
98
|
+
const { profile, input } = setup();
|
|
99
|
+
profile.environment = environment;
|
|
100
|
+
vi.mocked(which).mockResolvedValue(systemCodex);
|
|
101
|
+
const launch = await codexAcpAgentDefinition.resolveLaunch(input, profile);
|
|
102
|
+
expect(which).toHaveBeenCalledWith('codex', { env: { [pathKey]: systemDirectory } });
|
|
103
|
+
expect(launch.env[pathKey]).toBe(environment[pathKey]);
|
|
104
|
+
expect(profile.environment).toEqual(environment);
|
|
105
|
+
});
|
|
106
|
+
});
|
|
107
|
+
//# sourceMappingURL=codex-runtime-resolution.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codex-runtime-resolution.test.js","sourceRoot":"","sources":["../../../src/runtime/__tests__/codex-runtime-resolution.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import { which } from '../../../utils/index.js';
|
|
|
6
6
|
import { AgentRuntimeError } from '../../errors.js';
|
|
7
7
|
import { projectCodexAcpProvider } from '../codex-provider-config.js';
|
|
8
8
|
import { codexAcpMaxStdoutFrameBytes, normalizeCodexAcpStdoutFrame, } from './codex-frame-normalizer.js';
|
|
9
|
-
import {
|
|
9
|
+
import { resolveBundledCodexEntrypoint } from './executable-resolution.js';
|
|
10
10
|
const require = createRequire(import.meta.url);
|
|
11
11
|
export const codexAcpAgentDefinition = {
|
|
12
12
|
agentType: AgentType.CODEX,
|
|
@@ -41,9 +41,9 @@ export const codexAcpAgentDefinition = {
|
|
|
41
41
|
catch (error) {
|
|
42
42
|
throw new AgentRuntimeError('missing_adapter', 'dependency_check', 'Codex ACP adapter was not found', false, { cause: error });
|
|
43
43
|
}
|
|
44
|
-
const codexPath = await
|
|
44
|
+
const codexPath = await resolveSystemCodex(profile.environment);
|
|
45
45
|
if (!codexPath && !resolveBundledCodexEntrypoint()) {
|
|
46
|
-
throw new AgentRuntimeError('missing_codex', 'dependency_check', '
|
|
46
|
+
throw new AgentRuntimeError('missing_codex', 'dependency_check', 'Neither system nor bundled Codex Runtime was found', false);
|
|
47
47
|
}
|
|
48
48
|
const environment = { ...profile.environment };
|
|
49
49
|
if (codexPath)
|
|
@@ -70,10 +70,10 @@ export const codexAcpAgentDefinition = {
|
|
|
70
70
|
return { type: 'NOT_FOUND', error: 'Codex ACP adapter is not installed' };
|
|
71
71
|
}
|
|
72
72
|
const environment = { ...process.env, ...provider.env };
|
|
73
|
-
const available = await
|
|
73
|
+
const available = await resolveSystemCodex(environment) || resolveBundledCodexEntrypoint();
|
|
74
74
|
return available
|
|
75
75
|
? { type: 'INSTALLATION_FOUND' }
|
|
76
|
-
: { type: 'NOT_FOUND', error: '
|
|
76
|
+
: { type: 'NOT_FOUND', error: 'Neither system nor bundled Codex Runtime was found' };
|
|
77
77
|
},
|
|
78
78
|
async configureSession(context, sessionId, response, profile) {
|
|
79
79
|
if (profile.permissionMode === 'UNRESTRICTED' && response.modes?.currentModeId !== 'agent-full-access') {
|
|
@@ -102,13 +102,16 @@ export const codexAcpAgentDefinition = {
|
|
|
102
102
|
});
|
|
103
103
|
},
|
|
104
104
|
};
|
|
105
|
-
async function
|
|
106
|
-
const
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
105
|
+
async function resolveSystemCodex(environment) {
|
|
106
|
+
const searchEnvironment = { ...environment };
|
|
107
|
+
for (const key of Object.keys(searchEnvironment)) {
|
|
108
|
+
if (key.toUpperCase() !== 'PATH')
|
|
109
|
+
continue;
|
|
110
|
+
searchEnvironment[key] = searchEnvironment[key]
|
|
111
|
+
?.split(path.delimiter)
|
|
112
|
+
.filter(directory => path.isAbsolute(directory) && !/[\\/]node_modules[\\/]\.bin(?:[\\/]|$)/i.test(directory))
|
|
113
|
+
.join(path.delimiter);
|
|
111
114
|
}
|
|
112
|
-
return await which(
|
|
115
|
+
return await which('codex', { env: searchEnvironment }) ?? undefined;
|
|
113
116
|
}
|
|
114
117
|
//# sourceMappingURL=codex.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../../../../src/runtime/acp/agents/codex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EACL,2BAA2B,EAC3B,4BAA4B,GAC7B,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../../../../src/runtime/acp/agents/codex.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "agent-tower",
|
|
3
|
-
"version": "0.6.0-beta.
|
|
3
|
+
"version": "0.6.0-beta.16",
|
|
4
4
|
"description": "AI Agent Task Management Dashboard",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@agent-tower/shared": "0.1.0",
|
|
35
35
|
"@agentclientprotocol/claude-agent-acp": "0.59.0",
|
|
36
|
-
"@agentclientprotocol/codex-acp": "1.
|
|
36
|
+
"@agentclientprotocol/codex-acp": "1.10.0",
|
|
37
37
|
"@agentclientprotocol/sdk": "1.2.1",
|
|
38
38
|
"@earendil-works/pi-coding-agent": "0.82.1",
|
|
39
39
|
"@fastify/cookie": "^9.4.0",
|