@finalai/acp-adapter-codex 0.1.2 → 0.2.0
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/README.md +22 -3
- package/dist/modules/app-server.d.mts +1 -0
- package/dist/modules/app-server.mjs +11 -0
- package/dist/modules/app-server.mjs.map +2 -2
- package/dist/modules/cli.mjs +11 -4
- package/dist/modules/cli.mjs.map +2 -2
- package/dist/modules/credentials.d.mts +32 -0
- package/dist/modules/credentials.mjs +78 -0
- package/dist/modules/credentials.mjs.map +7 -0
- package/dist/modules/index.d.mts +1 -0
- package/dist/modules/index.mjs +1 -0
- package/dist/modules/index.mjs.map +2 -2
- package/dist/modules/program.d.mts +3 -1
- package/dist/modules/program.mjs +2 -1
- package/dist/modules/program.mjs.map +2 -2
- package/dist/modules/session.d.mts +3 -1
- package/dist/modules/session.mjs +84 -15
- package/dist/modules/session.mjs.map +2 -2
- package/package.json +3 -2
package/README.md
CHANGED
|
@@ -8,9 +8,28 @@ package it depends on) and is built on `@finalai/acp-session`.
|
|
|
8
8
|
npx @finalai/acp-adapter-codex --permission-mode ask -- codex app-server -c model=gpt-6
|
|
9
9
|
```
|
|
10
10
|
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
11
|
+
Your Codex `config.toml`, `AGENTS.md` and skills stay in effect.
|
|
12
|
+
|
|
13
|
+
## Credentials
|
|
14
|
+
|
|
15
|
+
- Started with a credential broker grant (`FINAL_BROKER_URL`, `FINAL_MODEL_GRANT`,
|
|
16
|
+
`FINAL_HARNESS_SESSION_ID`; see `@finalai/agent-provider/model-credentials`), the adapter
|
|
17
|
+
redeems it for Codex's credential and renews it before it expires. An OpenAI API key (or an
|
|
18
|
+
OpenAI-compatible endpoint and key) is reached through a loopback proxy the adapter runs,
|
|
19
|
+
which sends the current key with each request; the app-server's environment holds only the
|
|
20
|
+
proxy's address and a local key, and never the grant. A ChatGPT subscription is handed to the
|
|
21
|
+
app-server as its login (`account/login/start` with `chatgptAuthTokens`), and fresh tokens
|
|
22
|
+
answer its `account/chatgptAuthTokens/refresh`. When the broker gives no credential, the turn
|
|
23
|
+
ends with the error `credential_unavailable`.
|
|
24
|
+
- A request the vendor refuses with 429 on an API key is reported to the broker and sent once
|
|
25
|
+
more on the next credential it resolves. A turn that ends with the ChatGPT subscription out
|
|
26
|
+
of its usage or rate limit is reported too, and the next turn runs on the next credential
|
|
27
|
+
(the app-server restarts on it). Either is tried first again once its limit resets.
|
|
28
|
+
- Without a grant, with `OPENAI_API_KEY` in the environment the adapter is started with, Codex
|
|
29
|
+
uses that key and `OPENAI_BASE_URL` (default `https://api.openai.com/v1`); without either,
|
|
30
|
+
its own login in `CODEX_HOME`.
|
|
31
|
+
- An app-server command that is not on `PATH` ends each turn with the error
|
|
32
|
+
`harness_not_installed`.
|
|
14
33
|
|
|
15
34
|
## Options
|
|
16
35
|
|
|
@@ -8,4 +8,5 @@ export interface SpawnAppServerArgsIface {
|
|
|
8
8
|
closeGraceMs?: number;
|
|
9
9
|
}
|
|
10
10
|
export type SpawnAppServer = (args: SpawnAppServerArgsIface) => CodexTransportIface;
|
|
11
|
+
export declare const isCodexNotInstalled: (cause: unknown) => boolean;
|
|
11
12
|
export declare const spawnCodexAppServer: SpawnAppServer;
|
|
@@ -1,7 +1,17 @@
|
|
|
1
1
|
import { spawn } from "node:child_process";
|
|
2
2
|
import { createInterface } from "node:readline";
|
|
3
|
+
import { findExecutable } from "@finalai/acp-session/agent/node";
|
|
3
4
|
import { jsonlRecords } from "./jsonl.mjs";
|
|
5
|
+
const notInstalled = /* @__PURE__ */ new WeakSet();
|
|
6
|
+
const isCodexNotInstalled = (cause) => cause instanceof Error && notInstalled.has(cause);
|
|
4
7
|
const spawnCodexAppServer = (args) => {
|
|
8
|
+
if (findExecutable({ command: args.command, env: args.env, cwd: args.cwd }) == null) {
|
|
9
|
+
const missing = new Error(
|
|
10
|
+
`Codex is not installed: ${args.command} was not found on this machine`
|
|
11
|
+
);
|
|
12
|
+
notInstalled.add(missing);
|
|
13
|
+
throw missing;
|
|
14
|
+
}
|
|
5
15
|
const child = spawn(args.command, args.args, {
|
|
6
16
|
cwd: args.cwd,
|
|
7
17
|
env: args.env,
|
|
@@ -64,6 +74,7 @@ const spawnCodexAppServer = (args) => {
|
|
|
64
74
|
};
|
|
65
75
|
};
|
|
66
76
|
export {
|
|
77
|
+
isCodexNotInstalled,
|
|
67
78
|
spawnCodexAppServer
|
|
68
79
|
};
|
|
69
80
|
//# sourceMappingURL=app-server.mjs.map
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/app-server.ts"],
|
|
4
|
-
"sourcesContent": ["import { spawn } from 'node:child_process';\nimport { createInterface } from 'node:readline';\n\nimport type { CodexTransportIface } from \"./json-rpc.mjs\";\nimport { jsonlRecords } from \"./jsonl.mjs\";\n\nexport interface SpawnAppServerArgsIface {\n // The app-server's command line (`codex app-server ...`).\n command: string;\n args: string[];\n cwd: string;\n env: Record<string, string>;\n log: (line: string) => void;\n closeGraceMs?: number;\n}\n\nexport type SpawnAppServer = (args: SpawnAppServerArgsIface) => CodexTransportIface;\n\n// `codex app-server` over stdio; stderr goes to the adapter's log.\nexport const spawnCodexAppServer: SpawnAppServer = (args) => {\n const child = spawn(args.command, args.args, {\n cwd: args.cwd,\n env: args.env,\n stdio: ['pipe', 'pipe', 'pipe'],\n });\n const exited = new Promise<{ code: number | null; signal: string | null }>((resolve) => {\n child.once('close', (code, signal) => resolve({ code, signal }));\n child.once('error', (error) => {\n args.log(`codex app-server failed to start: ${error.message}`);\n resolve({ code: null, signal: null });\n });\n });\n let stdinError: Error | null = null;\n child.stdin.on('error', (error) => {\n stdinError = error;\n child.kill('SIGTERM');\n });\n createInterface({ input: child.stderr }).on('line', (line) => args.log(`codex: ${line}`));\n child.stdout.setEncoding('utf8');\n\n const messages = async function* (): AsyncGenerator<unknown> {\n for await (const line of jsonlRecords(child.stdout)) {\n try {\n yield JSON.parse(line);\n } catch {\n args.log('codex app-server wrote a non-JSON diagnostic line');\n }\n }\n };\n\n let shuttingDown: Promise<void> | null = null;\n const shutdown = (): Promise<void> => {\n if (shuttingDown != null) return shuttingDown;\n shuttingDown = (async () => {\n child.stdin.end();\n const graceMs = args.closeGraceMs ?? 10_000;\n const termTimer = setTimeout(() => child.kill('SIGTERM'), graceMs / 2);\n const killTimer = setTimeout(() => child.kill('SIGKILL'), graceMs);\n try {\n await exited;\n } finally {\n clearTimeout(termTimer);\n clearTimeout(killTimer);\n }\n })();\n return shuttingDown;\n };\n\n return {\n send: (message) => {\n if (stdinError != null) throw stdinError;\n if (!child.stdin.writable) throw new Error('Codex app-server stdin closed');\n child.stdin.write(`${JSON.stringify(message)}\\n`);\n },\n messages: messages(),\n close: () => {\n void shutdown();\n if (child.exitCode == null) child.kill('SIGTERM');\n },\n shutdown,\n exited,\n };\n};\n"],
|
|
5
|
-
"mappings": "AAAA,SAAS,aAAa;AACtB,SAAS,uBAAuB;
|
|
4
|
+
"sourcesContent": ["import { spawn } from 'node:child_process';\nimport { createInterface } from 'node:readline';\n\nimport { findExecutable } from '@finalai/acp-session/agent/node';\n\nimport type { CodexTransportIface } from \"./json-rpc.mjs\";\nimport { jsonlRecords } from \"./jsonl.mjs\";\n\nexport interface SpawnAppServerArgsIface {\n // The app-server's command line (`codex app-server ...`).\n command: string;\n args: string[];\n cwd: string;\n env: Record<string, string>;\n log: (line: string) => void;\n closeGraceMs?: number;\n}\n\nexport type SpawnAppServer = (args: SpawnAppServerArgsIface) => CodexTransportIface;\n\nconst notInstalled = new WeakSet<Error>();\n\n// Whether a spawn failed because the app-server's command is not on this machine.\nexport const isCodexNotInstalled = (cause: unknown): boolean =>\n cause instanceof Error && notInstalled.has(cause);\n\n// `codex app-server` over stdio; stderr goes to the adapter's log. Throws (isCodexNotInstalled)\n// when the command is not there to run.\nexport const spawnCodexAppServer: SpawnAppServer = (args) => {\n if (findExecutable({ command: args.command, env: args.env, cwd: args.cwd }) == null) {\n const missing = new Error(\n `Codex is not installed: ${args.command} was not found on this machine`,\n );\n notInstalled.add(missing);\n throw missing;\n }\n const child = spawn(args.command, args.args, {\n cwd: args.cwd,\n env: args.env,\n stdio: ['pipe', 'pipe', 'pipe'],\n });\n const exited = new Promise<{ code: number | null; signal: string | null }>((resolve) => {\n child.once('close', (code, signal) => resolve({ code, signal }));\n child.once('error', (error) => {\n args.log(`codex app-server failed to start: ${error.message}`);\n resolve({ code: null, signal: null });\n });\n });\n let stdinError: Error | null = null;\n child.stdin.on('error', (error) => {\n stdinError = error;\n child.kill('SIGTERM');\n });\n createInterface({ input: child.stderr }).on('line', (line) => args.log(`codex: ${line}`));\n child.stdout.setEncoding('utf8');\n\n const messages = async function* (): AsyncGenerator<unknown> {\n for await (const line of jsonlRecords(child.stdout)) {\n try {\n yield JSON.parse(line);\n } catch {\n args.log('codex app-server wrote a non-JSON diagnostic line');\n }\n }\n };\n\n let shuttingDown: Promise<void> | null = null;\n const shutdown = (): Promise<void> => {\n if (shuttingDown != null) return shuttingDown;\n shuttingDown = (async () => {\n child.stdin.end();\n const graceMs = args.closeGraceMs ?? 10_000;\n const termTimer = setTimeout(() => child.kill('SIGTERM'), graceMs / 2);\n const killTimer = setTimeout(() => child.kill('SIGKILL'), graceMs);\n try {\n await exited;\n } finally {\n clearTimeout(termTimer);\n clearTimeout(killTimer);\n }\n })();\n return shuttingDown;\n };\n\n return {\n send: (message) => {\n if (stdinError != null) throw stdinError;\n if (!child.stdin.writable) throw new Error('Codex app-server stdin closed');\n child.stdin.write(`${JSON.stringify(message)}\\n`);\n },\n messages: messages(),\n close: () => {\n void shutdown();\n if (child.exitCode == null) child.kill('SIGTERM');\n },\n shutdown,\n exited,\n };\n};\n"],
|
|
5
|
+
"mappings": "AAAA,SAAS,aAAa;AACtB,SAAS,uBAAuB;AAEhC,SAAS,sBAAsB;AAG/B,SAAS,oBAAoB;AAc7B,MAAM,eAAe,oBAAI,QAAe;AAGjC,MAAM,sBAAsB,CAAC,UAClC,iBAAiB,SAAS,aAAa,IAAI,KAAK;AAI3C,MAAM,sBAAsC,CAAC,SAAS;AAC3D,MAAI,eAAe,EAAE,SAAS,KAAK,SAAS,KAAK,KAAK,KAAK,KAAK,KAAK,IAAI,CAAC,KAAK,MAAM;AACnF,UAAM,UAAU,IAAI;AAAA,MAClB,2BAA2B,KAAK,OAAO;AAAA,IACzC;AACA,iBAAa,IAAI,OAAO;AACxB,UAAM;AAAA,EACR;AACA,QAAM,QAAQ,MAAM,KAAK,SAAS,KAAK,MAAM;AAAA,IAC3C,KAAK,KAAK;AAAA,IACV,KAAK,KAAK;AAAA,IACV,OAAO,CAAC,QAAQ,QAAQ,MAAM;AAAA,EAChC,CAAC;AACD,QAAM,SAAS,IAAI,QAAwD,CAAC,YAAY;AACtF,UAAM,KAAK,SAAS,CAAC,MAAM,WAAW,QAAQ,EAAE,MAAM,OAAO,CAAC,CAAC;AAC/D,UAAM,KAAK,SAAS,CAAC,UAAU;AAC7B,WAAK,IAAI,qCAAqC,MAAM,OAAO,EAAE;AAC7D,cAAQ,EAAE,MAAM,MAAM,QAAQ,KAAK,CAAC;AAAA,IACtC,CAAC;AAAA,EACH,CAAC;AACD,MAAI,aAA2B;AAC/B,QAAM,MAAM,GAAG,SAAS,CAAC,UAAU;AACjC,iBAAa;AACb,UAAM,KAAK,SAAS;AAAA,EACtB,CAAC;AACD,kBAAgB,EAAE,OAAO,MAAM,OAAO,CAAC,EAAE,GAAG,QAAQ,CAAC,SAAS,KAAK,IAAI,UAAU,IAAI,EAAE,CAAC;AACxF,QAAM,OAAO,YAAY,MAAM;AAE/B,QAAM,WAAW,mBAA4C;AAC3D,qBAAiB,QAAQ,aAAa,MAAM,MAAM,GAAG;AACnD,UAAI;AACF,cAAM,KAAK,MAAM,IAAI;AAAA,MACvB,QAAQ;AACN,aAAK,IAAI,mDAAmD;AAAA,MAC9D;AAAA,IACF;AAAA,EACF;AAEA,MAAI,eAAqC;AACzC,QAAM,WAAW,MAAqB;AACpC,QAAI,gBAAgB,KAAM,QAAO;AACjC,oBAAgB,YAAY;AAC1B,YAAM,MAAM,IAAI;AAChB,YAAM,UAAU,KAAK,gBAAgB;AACrC,YAAM,YAAY,WAAW,MAAM,MAAM,KAAK,SAAS,GAAG,UAAU,CAAC;AACrE,YAAM,YAAY,WAAW,MAAM,MAAM,KAAK,SAAS,GAAG,OAAO;AACjE,UAAI;AACF,cAAM;AAAA,MACR,UAAE;AACA,qBAAa,SAAS;AACtB,qBAAa,SAAS;AAAA,MACxB;AAAA,IACF,GAAG;AACH,WAAO;AAAA,EACT;AAEA,SAAO;AAAA,IACL,MAAM,CAAC,YAAY;AACjB,UAAI,cAAc,KAAM,OAAM;AAC9B,UAAI,CAAC,MAAM,MAAM,SAAU,OAAM,IAAI,MAAM,+BAA+B;AAC1E,YAAM,MAAM,MAAM,GAAG,KAAK,UAAU,OAAO,CAAC;AAAA,CAAI;AAAA,IAClD;AAAA,IACA,UAAU,SAAS;AAAA,IACnB,OAAO,MAAM;AACX,WAAK,SAAS;AACd,UAAI,MAAM,YAAY,KAAM,OAAM,KAAK,SAAS;AAAA,IAClD;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACF;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/dist/modules/cli.mjs
CHANGED
|
@@ -9,12 +9,16 @@ import {
|
|
|
9
9
|
serveOnStdio
|
|
10
10
|
} from "@finalai/acp-session/agent/node";
|
|
11
11
|
import { approvalPolicyOf } from "./config.mjs";
|
|
12
|
+
import { codexCredentialsFrom } from "./credentials.mjs";
|
|
12
13
|
import { createCodexProgram } from "./program.mjs";
|
|
13
14
|
const USAGE = `Usage: acp-adapter-codex [options] [-- <codex command line>]
|
|
14
15
|
|
|
15
16
|
Serves Codex as an ACP v2 agent on stdin and stdout, through the Codex
|
|
16
|
-
app-server.
|
|
17
|
-
|
|
17
|
+
app-server. Started with a credential broker grant (FINAL_BROKER_URL,
|
|
18
|
+
FINAL_MODEL_GRANT, FINAL_HARNESS_SESSION_ID), it gets Codex's credential from
|
|
19
|
+
the broker and keeps it renewed. Otherwise, with OPENAI_API_KEY in the
|
|
20
|
+
environment Codex uses that key (and OPENAI_BASE_URL when set), and without it
|
|
21
|
+
its own login in CODEX_HOME.
|
|
18
22
|
|
|
19
23
|
--state-dir <dir> where sessions are kept for session/resume
|
|
20
24
|
(default: $ACP_ADAPTER_STATE_DIR or ~/.acp-adapter-codex)
|
|
@@ -45,15 +49,18 @@ if (values.help === true) {
|
|
|
45
49
|
const approvalPolicy = mode == null ? void 0 : approvalPolicyOf(mode) ?? fail(`unknown permission mode ${mode}`);
|
|
46
50
|
const [command, ...args] = positionals;
|
|
47
51
|
const stateDir = values["state-dir"] ?? process.env.ACP_ADAPTER_STATE_DIR ?? join(homedir(), ".acp-adapter-codex");
|
|
52
|
+
const log = (message) => process.stderr.write(`${message}
|
|
53
|
+
`);
|
|
54
|
+
const credentials = codexCredentialsFrom({ env: process.env, log });
|
|
48
55
|
const agent = createAdapterAgent({
|
|
49
56
|
program: createCodexProgram({
|
|
57
|
+
credentials,
|
|
50
58
|
command: command == null ? null : { command, args: args.includes("app-server") ? args : [...args, "app-server"] },
|
|
51
59
|
approvalPolicy
|
|
52
60
|
}),
|
|
53
61
|
store: createFileSessionStore(stateDir),
|
|
54
62
|
attachments: createFileAttachmentStore(stateDir),
|
|
55
|
-
log
|
|
56
|
-
`)
|
|
63
|
+
log
|
|
57
64
|
});
|
|
58
65
|
await serveOnStdio(agent);
|
|
59
66
|
process.exit(0);
|
package/dist/modules/cli.mjs.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/cli.ts"],
|
|
4
|
-
"sourcesContent": ["#!/usr/bin/env node\nimport { homedir } from 'node:os';\nimport { join } from 'node:path';\nimport { parseArgs } from 'node:util';\n\nimport { createAdapterAgent } from '@finalai/acp-session/agent';\nimport {\n createFileAttachmentStore,\n createFileSessionStore,\n serveOnStdio,\n} from '@finalai/acp-session/agent/node';\n\nimport { approvalPolicyOf } from \"./config.mjs\";\nimport { createCodexProgram } from \"./program.mjs\";\n\nconst USAGE = `Usage: acp-adapter-codex [options] [-- <codex command line>]\n\nServes Codex as an ACP v2 agent on stdin and stdout, through the Codex\napp-server.
|
|
5
|
-
"mappings": ";AACA,SAAS,eAAe;AACxB,SAAS,YAAY;AACrB,SAAS,iBAAiB;AAE1B,SAAS,0BAA0B;AACnC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEP,SAAS,wBAAwB;AACjC,SAAS,0BAA0B;AAEnC,MAAM,QAAQ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;
|
|
4
|
+
"sourcesContent": ["#!/usr/bin/env node\nimport { homedir } from 'node:os';\nimport { join } from 'node:path';\nimport { parseArgs } from 'node:util';\n\nimport { createAdapterAgent } from '@finalai/acp-session/agent';\nimport {\n createFileAttachmentStore,\n createFileSessionStore,\n serveOnStdio,\n} from '@finalai/acp-session/agent/node';\n\nimport { approvalPolicyOf } from \"./config.mjs\";\nimport { codexCredentialsFrom } from \"./credentials.mjs\";\nimport { createCodexProgram } from \"./program.mjs\";\n\nconst USAGE = `Usage: acp-adapter-codex [options] [-- <codex command line>]\n\nServes Codex as an ACP v2 agent on stdin and stdout, through the Codex\napp-server. Started with a credential broker grant (FINAL_BROKER_URL,\nFINAL_MODEL_GRANT, FINAL_HARNESS_SESSION_ID), it gets Codex's credential from\nthe broker and keeps it renewed. Otherwise, with OPENAI_API_KEY in the\nenvironment Codex uses that key (and OPENAI_BASE_URL when set), and without it\nits own login in CODEX_HOME.\n\n --state-dir <dir> where sessions are kept for session/resume\n (default: $ACP_ADAPTER_STATE_DIR or ~/.acp-adapter-codex)\n --permission-mode <mode> the approval policy sessions start with: untrusted,\n on-request or never, or ask, review or auto\n -- <command> [args...] the app-server to run, such as\n \\`codex app-server -c model=gpt-6\\`\n (default: the Codex @openai/codex installs)\n`;\n\nconst fail = (message: string): never => {\n process.stderr.write(`error: ${message}\\n\\n${USAGE}`);\n process.exit(2);\n};\n\nconst { values, positionals } = parseArgs({\n allowPositionals: true,\n options: {\n 'state-dir': { type: 'string' },\n 'permission-mode': { type: 'string' },\n help: { type: 'boolean' },\n },\n});\n\nif (values.help === true) {\n process.stdout.write(USAGE);\n} else {\n const mode = values['permission-mode'];\n const approvalPolicy =\n mode == null ? undefined : (approvalPolicyOf(mode) ?? fail(`unknown permission mode ${mode}`));\n const [command, ...args] = positionals;\n const stateDir =\n values['state-dir'] ??\n process.env.ACP_ADAPTER_STATE_DIR ??\n join(homedir(), '.acp-adapter-codex');\n const log = (message: string) => process.stderr.write(`${message}\\n`);\n // Read first, so that nothing the adapter starts inherits the grant.\n const credentials = codexCredentialsFrom({ env: process.env, log });\n const agent = createAdapterAgent({\n program: createCodexProgram({\n credentials,\n command:\n command == null\n ? null\n : { command, args: args.includes('app-server') ? args : [...args, 'app-server'] },\n approvalPolicy,\n }),\n store: createFileSessionStore(stateDir),\n attachments: createFileAttachmentStore(stateDir),\n log,\n });\n await serveOnStdio(agent);\n process.exit(0);\n}\n"],
|
|
5
|
+
"mappings": ";AACA,SAAS,eAAe;AACxB,SAAS,YAAY;AACrB,SAAS,iBAAiB;AAE1B,SAAS,0BAA0B;AACnC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEP,SAAS,wBAAwB;AACjC,SAAS,4BAA4B;AACrC,SAAS,0BAA0B;AAEnC,MAAM,QAAQ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAkBd,MAAM,OAAO,CAAC,YAA2B;AACvC,UAAQ,OAAO,MAAM,UAAU,OAAO;AAAA;AAAA,EAAO,KAAK,EAAE;AACpD,UAAQ,KAAK,CAAC;AAChB;AAEA,MAAM,EAAE,QAAQ,YAAY,IAAI,UAAU;AAAA,EACxC,kBAAkB;AAAA,EAClB,SAAS;AAAA,IACP,aAAa,EAAE,MAAM,SAAS;AAAA,IAC9B,mBAAmB,EAAE,MAAM,SAAS;AAAA,IACpC,MAAM,EAAE,MAAM,UAAU;AAAA,EAC1B;AACF,CAAC;AAED,IAAI,OAAO,SAAS,MAAM;AACxB,UAAQ,OAAO,MAAM,KAAK;AAC5B,OAAO;AACL,QAAM,OAAO,OAAO,iBAAiB;AACrC,QAAM,iBACJ,QAAQ,OAAO,SAAa,iBAAiB,IAAI,KAAK,KAAK,2BAA2B,IAAI,EAAE;AAC9F,QAAM,CAAC,SAAS,GAAG,IAAI,IAAI;AAC3B,QAAM,WACJ,OAAO,WAAW,KAClB,QAAQ,IAAI,yBACZ,KAAK,QAAQ,GAAG,oBAAoB;AACtC,QAAM,MAAM,CAAC,YAAoB,QAAQ,OAAO,MAAM,GAAG,OAAO;AAAA,CAAI;AAEpE,QAAM,cAAc,qBAAqB,EAAE,KAAK,QAAQ,KAAK,IAAI,CAAC;AAClE,QAAM,QAAQ,mBAAmB;AAAA,IAC/B,SAAS,mBAAmB;AAAA,MAC1B;AAAA,MACA,SACE,WAAW,OACP,OACA,EAAE,SAAS,MAAM,KAAK,SAAS,YAAY,IAAI,OAAO,CAAC,GAAG,MAAM,YAAY,EAAE;AAAA,MACpF;AAAA,IACF,CAAC;AAAA,IACD,OAAO,uBAAuB,QAAQ;AAAA,IACtC,aAAa,0BAA0B,QAAQ;AAAA,IAC/C;AAAA,EACF,CAAC;AACD,QAAM,aAAa,KAAK;AACxB,UAAQ,KAAK,CAAC;AAChB;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import type { AtOpenModelCredentialIface } from '@finalai/agent-provider/harness';
|
|
2
|
+
import { type ModelCredentialProxyIface, type ModelCredentialsDepsIface, type ModelUpstreamIface } from '@finalai/agent-provider/model-credentials';
|
|
3
|
+
export declare const OPENAI_API_BASE_URL = "https://api.openai.com/v1";
|
|
4
|
+
export declare const codexUpstreamOf: (credential: AtOpenModelCredentialIface) => ModelUpstreamIface | null;
|
|
5
|
+
export interface ChatgptAuthTokensIface {
|
|
6
|
+
accessToken: string;
|
|
7
|
+
chatgptAccountId: string;
|
|
8
|
+
chatgptPlanType: string | null;
|
|
9
|
+
}
|
|
10
|
+
export declare const chatgptAuthTokensOf: (credential: AtOpenModelCredentialIface | null) => ChatgptAuthTokensIface | null;
|
|
11
|
+
export declare const codexCredentialEnv: (args: {
|
|
12
|
+
credential: AtOpenModelCredentialIface | null;
|
|
13
|
+
proxy: Pick<ModelCredentialProxyIface, "baseUrl" | "localKey">;
|
|
14
|
+
}) => Record<string, string | undefined>;
|
|
15
|
+
export interface CodexCredentialIface {
|
|
16
|
+
env: Record<string, string | undefined>;
|
|
17
|
+
chatgpt: ChatgptAuthTokensIface | null;
|
|
18
|
+
fingerprint: string | null;
|
|
19
|
+
}
|
|
20
|
+
export interface CodexCredentialsIface {
|
|
21
|
+
resolve(): Promise<CodexCredentialIface>;
|
|
22
|
+
refreshChatgpt(): Promise<ChatgptAuthTokensIface | null>;
|
|
23
|
+
chatgptLimited(args: {
|
|
24
|
+
fingerprint: string;
|
|
25
|
+
}): Promise<void>;
|
|
26
|
+
close(): Promise<void>;
|
|
27
|
+
}
|
|
28
|
+
export declare const codexCredentialsFrom: (args: {
|
|
29
|
+
env: Record<string, string | undefined>;
|
|
30
|
+
log: (line: string) => void;
|
|
31
|
+
deps?: Partial<ModelCredentialsDepsIface>;
|
|
32
|
+
}) => CodexCredentialsIface | null;
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
import {
|
|
2
|
+
harnessModelCredentials,
|
|
3
|
+
modelCredentialHeaders,
|
|
4
|
+
takeModelCredentialGrant
|
|
5
|
+
} from "@finalai/agent-provider/model-credentials";
|
|
6
|
+
import * as z from "zod";
|
|
7
|
+
const OPENAI_API_BASE_URL = "https://api.openai.com/v1";
|
|
8
|
+
const CREDENTIAL_ENV = ["OPENAI_API_KEY", "OPENAI_BASE_URL", "CODEX_API_KEY"];
|
|
9
|
+
const codexUpstreamOf = (credential) => {
|
|
10
|
+
if (credential.subscription != null) return null;
|
|
11
|
+
const headers = modelCredentialHeaders(credential);
|
|
12
|
+
return headers == null ? null : { baseUrl: credential.baseUrl ?? OPENAI_API_BASE_URL, headers };
|
|
13
|
+
};
|
|
14
|
+
const chatgptAuthTokensSchema = z.object({
|
|
15
|
+
accessToken: z.string().min(1),
|
|
16
|
+
chatgptAccountId: z.string().min(1),
|
|
17
|
+
chatgptPlanType: z.string().nullish()
|
|
18
|
+
});
|
|
19
|
+
const chatgptAuthTokensOf = (credential) => {
|
|
20
|
+
const subscription = credential?.subscription;
|
|
21
|
+
if (subscription == null || subscription.format !== "chatgpt-auth-tokens") return null;
|
|
22
|
+
let value;
|
|
23
|
+
try {
|
|
24
|
+
value = JSON.parse(subscription.value);
|
|
25
|
+
} catch {
|
|
26
|
+
throw new Error("the ChatGPT subscription credential is not valid JSON");
|
|
27
|
+
}
|
|
28
|
+
const parsed = chatgptAuthTokensSchema.safeParse(value);
|
|
29
|
+
if (!parsed.success) throw new Error("the ChatGPT subscription credential is incomplete");
|
|
30
|
+
return { ...parsed.data, chatgptPlanType: parsed.data.chatgptPlanType ?? null };
|
|
31
|
+
};
|
|
32
|
+
const codexCredentialEnv = (args) => {
|
|
33
|
+
const { credential, proxy } = args;
|
|
34
|
+
if (credential == null) return {};
|
|
35
|
+
const keyed = codexUpstreamOf(credential) != null;
|
|
36
|
+
if (!keyed && chatgptAuthTokensOf(credential) == null) return {};
|
|
37
|
+
const env = Object.fromEntries(
|
|
38
|
+
CREDENTIAL_ENV.map((name) => [name, void 0])
|
|
39
|
+
);
|
|
40
|
+
if (keyed) {
|
|
41
|
+
env.OPENAI_API_KEY = proxy.localKey;
|
|
42
|
+
env.OPENAI_BASE_URL = proxy.baseUrl;
|
|
43
|
+
}
|
|
44
|
+
return env;
|
|
45
|
+
};
|
|
46
|
+
const codexCredentialsFrom = (args) => {
|
|
47
|
+
const grant = takeModelCredentialGrant(args.env);
|
|
48
|
+
if (grant == null) return null;
|
|
49
|
+
const credentials = harnessModelCredentials({
|
|
50
|
+
grant,
|
|
51
|
+
upstreamOf: codexUpstreamOf,
|
|
52
|
+
log: args.log,
|
|
53
|
+
deps: args.deps
|
|
54
|
+
});
|
|
55
|
+
return {
|
|
56
|
+
resolve: async () => {
|
|
57
|
+
const resolved = await credentials.resolve();
|
|
58
|
+
return {
|
|
59
|
+
env: codexCredentialEnv(resolved),
|
|
60
|
+
chatgpt: chatgptAuthTokensOf(resolved.credential),
|
|
61
|
+
fingerprint: resolved.credential?.fingerprint ?? null
|
|
62
|
+
};
|
|
63
|
+
},
|
|
64
|
+
refreshChatgpt: async () => chatgptAuthTokensOf(await credentials.refresh()),
|
|
65
|
+
chatgptLimited: async ({ fingerprint }) => {
|
|
66
|
+
await credentials.exhausted({ fingerprint, retryAfterSeconds: null });
|
|
67
|
+
},
|
|
68
|
+
close: credentials.close
|
|
69
|
+
};
|
|
70
|
+
};
|
|
71
|
+
export {
|
|
72
|
+
OPENAI_API_BASE_URL,
|
|
73
|
+
chatgptAuthTokensOf,
|
|
74
|
+
codexCredentialEnv,
|
|
75
|
+
codexCredentialsFrom,
|
|
76
|
+
codexUpstreamOf
|
|
77
|
+
};
|
|
78
|
+
//# sourceMappingURL=credentials.mjs.map
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../../../src/credentials.ts"],
|
|
4
|
+
"sourcesContent": ["import type { AtOpenModelCredentialIface } from '@finalai/agent-provider/harness';\nimport {\n harnessModelCredentials,\n modelCredentialHeaders,\n takeModelCredentialGrant,\n type ModelCredentialProxyIface,\n type ModelCredentialsDepsIface,\n type ModelUpstreamIface,\n} from '@finalai/agent-provider/model-credentials';\nimport * as z from 'zod';\n\n// The model credential a host gives the adapter as a credential broker grant\n// (`@finalai/agent-provider/model-credentials`): an OpenAI API key, an OpenAI-compatible\n// endpoint with its key, or a ChatGPT subscription. Codex reaches a key through the adapter's\n// loopback proxy, which sends the current key with each request (renewals apply mid-turn and\n// the key never reaches Codex's environment); a ChatGPT subscription is handed to the\n// app-server as its login (`account/login/start`), renewed when it asks.\n\nexport const OPENAI_API_BASE_URL = 'https://api.openai.com/v1';\n\n// What Codex reads a key from; a brokered credential replaces all of them.\nconst CREDENTIAL_ENV = ['OPENAI_API_KEY', 'OPENAI_BASE_URL', 'CODEX_API_KEY'];\n\n// Codex appends `/responses` to the base URL, which is used as the broker gives it.\nexport const codexUpstreamOf = (\n credential: AtOpenModelCredentialIface,\n): ModelUpstreamIface | null => {\n if (credential.subscription != null) return null;\n const headers = modelCredentialHeaders(credential);\n return headers == null ? null : { baseUrl: credential.baseUrl ?? OPENAI_API_BASE_URL, headers };\n};\n\nexport interface ChatgptAuthTokensIface {\n accessToken: string;\n chatgptAccountId: string;\n chatgptPlanType: string | null;\n}\n\nconst chatgptAuthTokensSchema = z.object({\n accessToken: z.string().min(1),\n chatgptAccountId: z.string().min(1),\n chatgptPlanType: z.string().nullish(),\n});\n\n// A ChatGPT subscription's tokens, as the app-server's `chatgptAuthTokens` login takes them.\nexport const chatgptAuthTokensOf = (\n credential: AtOpenModelCredentialIface | null,\n): ChatgptAuthTokensIface | null => {\n const subscription = credential?.subscription;\n if (subscription == null || subscription.format !== 'chatgpt-auth-tokens') return null;\n let value: unknown;\n try {\n value = JSON.parse(subscription.value);\n } catch {\n // The error could quote the credential.\n throw new Error('the ChatGPT subscription credential is not valid JSON');\n }\n const parsed = chatgptAuthTokensSchema.safeParse(value);\n if (!parsed.success) throw new Error('the ChatGPT subscription credential is incomplete');\n return { ...parsed.data, chatgptPlanType: parsed.data.chatgptPlanType ?? null };\n};\n\n// The variables the app-server starts with over the adapter's own (undefined unsets one). A\n// key goes through the proxy; a ChatGPT subscription clears inherited keys so the login is\n// used; anything else leaves Codex its own login.\nexport const codexCredentialEnv = (args: {\n credential: AtOpenModelCredentialIface | null;\n proxy: Pick<ModelCredentialProxyIface, 'baseUrl' | 'localKey'>;\n}): Record<string, string | undefined> => {\n const { credential, proxy } = args;\n if (credential == null) return {};\n const keyed = codexUpstreamOf(credential) != null;\n if (!keyed && chatgptAuthTokensOf(credential) == null) return {};\n const env: Record<string, string | undefined> = Object.fromEntries(\n CREDENTIAL_ENV.map((name) => [name, undefined]),\n );\n if (keyed) {\n env.OPENAI_API_KEY = proxy.localKey;\n env.OPENAI_BASE_URL = proxy.baseUrl;\n }\n return env;\n};\n\n// What the app-server is started with: its credential variables, the ChatGPT login to give it\n// (if any), and the brokered credential's fingerprint (null for none).\nexport interface CodexCredentialIface {\n env: Record<string, string | undefined>;\n chatgpt: ChatgptAuthTokensIface | null;\n fingerprint: string | null;\n}\n\nexport interface CodexCredentialsIface {\n // The credential the app-server starts with; rejects when the broker gives no credential.\n resolve(): Promise<CodexCredentialIface>;\n // Fresh ChatGPT tokens, for the app-server's `account/chatgptAuthTokens/refresh`.\n refreshChatgpt(): Promise<ChatgptAuthTokensIface | null>;\n // A turn on the ChatGPT login with `fingerprint` (the one the app-server was started with)\n // hit its usage or rate limit: the broker skips that subscription until it resets, and the\n // next resolve gives the chain's next source.\n chatgptLimited(args: { fingerprint: string }): Promise<void>;\n close(): Promise<void>;\n}\n\n// The brokered credential named by the adapter's environment, whose grant variables it removes\n// so that Codex never inherits them; null without a grant.\nexport const codexCredentialsFrom = (args: {\n env: Record<string, string | undefined>;\n log: (line: string) => void;\n deps?: Partial<ModelCredentialsDepsIface>;\n}): CodexCredentialsIface | null => {\n const grant = takeModelCredentialGrant(args.env);\n if (grant == null) return null;\n const credentials = harnessModelCredentials({\n grant,\n upstreamOf: codexUpstreamOf,\n log: args.log,\n deps: args.deps,\n });\n return {\n resolve: async () => {\n const resolved = await credentials.resolve();\n return {\n env: codexCredentialEnv(resolved),\n chatgpt: chatgptAuthTokensOf(resolved.credential),\n fingerprint: resolved.credential?.fingerprint ?? null,\n };\n },\n refreshChatgpt: async () => chatgptAuthTokensOf(await credentials.refresh()),\n chatgptLimited: async ({ fingerprint }) => {\n await credentials.exhausted({ fingerprint, retryAfterSeconds: null });\n },\n close: credentials.close,\n };\n};\n"],
|
|
5
|
+
"mappings": "AACA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OAIK;AACP,YAAY,OAAO;AASZ,MAAM,sBAAsB;AAGnC,MAAM,iBAAiB,CAAC,kBAAkB,mBAAmB,eAAe;AAGrE,MAAM,kBAAkB,CAC7B,eAC8B;AAC9B,MAAI,WAAW,gBAAgB,KAAM,QAAO;AAC5C,QAAM,UAAU,uBAAuB,UAAU;AACjD,SAAO,WAAW,OAAO,OAAO,EAAE,SAAS,WAAW,WAAW,qBAAqB,QAAQ;AAChG;AAQA,MAAM,0BAA0B,EAAE,OAAO;AAAA,EACvC,aAAa,EAAE,OAAO,EAAE,IAAI,CAAC;AAAA,EAC7B,kBAAkB,EAAE,OAAO,EAAE,IAAI,CAAC;AAAA,EAClC,iBAAiB,EAAE,OAAO,EAAE,QAAQ;AACtC,CAAC;AAGM,MAAM,sBAAsB,CACjC,eACkC;AAClC,QAAM,eAAe,YAAY;AACjC,MAAI,gBAAgB,QAAQ,aAAa,WAAW,sBAAuB,QAAO;AAClF,MAAI;AACJ,MAAI;AACF,YAAQ,KAAK,MAAM,aAAa,KAAK;AAAA,EACvC,QAAQ;AAEN,UAAM,IAAI,MAAM,uDAAuD;AAAA,EACzE;AACA,QAAM,SAAS,wBAAwB,UAAU,KAAK;AACtD,MAAI,CAAC,OAAO,QAAS,OAAM,IAAI,MAAM,mDAAmD;AACxF,SAAO,EAAE,GAAG,OAAO,MAAM,iBAAiB,OAAO,KAAK,mBAAmB,KAAK;AAChF;AAKO,MAAM,qBAAqB,CAAC,SAGO;AACxC,QAAM,EAAE,YAAY,MAAM,IAAI;AAC9B,MAAI,cAAc,KAAM,QAAO,CAAC;AAChC,QAAM,QAAQ,gBAAgB,UAAU,KAAK;AAC7C,MAAI,CAAC,SAAS,oBAAoB,UAAU,KAAK,KAAM,QAAO,CAAC;AAC/D,QAAM,MAA0C,OAAO;AAAA,IACrD,eAAe,IAAI,CAAC,SAAS,CAAC,MAAM,MAAS,CAAC;AAAA,EAChD;AACA,MAAI,OAAO;AACT,QAAI,iBAAiB,MAAM;AAC3B,QAAI,kBAAkB,MAAM;AAAA,EAC9B;AACA,SAAO;AACT;AAwBO,MAAM,uBAAuB,CAAC,SAID;AAClC,QAAM,QAAQ,yBAAyB,KAAK,GAAG;AAC/C,MAAI,SAAS,KAAM,QAAO;AAC1B,QAAM,cAAc,wBAAwB;AAAA,IAC1C;AAAA,IACA,YAAY;AAAA,IACZ,KAAK,KAAK;AAAA,IACV,MAAM,KAAK;AAAA,EACb,CAAC;AACD,SAAO;AAAA,IACL,SAAS,YAAY;AACnB,YAAM,WAAW,MAAM,YAAY,QAAQ;AAC3C,aAAO;AAAA,QACL,KAAK,mBAAmB,QAAQ;AAAA,QAChC,SAAS,oBAAoB,SAAS,UAAU;AAAA,QAChD,aAAa,SAAS,YAAY,eAAe;AAAA,MACnD;AAAA,IACF;AAAA,IACA,gBAAgB,YAAY,oBAAoB,MAAM,YAAY,QAAQ,CAAC;AAAA,IAC3E,gBAAgB,OAAO,EAAE,YAAY,MAAM;AACzC,YAAM,YAAY,UAAU,EAAE,aAAa,mBAAmB,KAAK,CAAC;AAAA,IACtE;AAAA,IACA,OAAO,YAAY;AAAA,EACrB;AACF;",
|
|
6
|
+
"names": []
|
|
7
|
+
}
|
package/dist/modules/index.d.mts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export * from "./config.mjs";
|
|
2
|
+
export * from "./credentials.mjs";
|
|
2
3
|
export * from "./program.mjs";
|
|
3
4
|
export { spawnCodexAppServer, type SpawnAppServer, type SpawnAppServerArgsIface, } from "./app-server.mjs";
|
|
4
5
|
export { mcpOverrides, openCodexSession, type CodexSessionDepsIface } from "./session.mjs";
|
package/dist/modules/index.mjs
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/index.ts"],
|
|
4
|
-
"sourcesContent": ["export * from \"./config.mjs\";\nexport * from \"./program.mjs\";\nexport {\n spawnCodexAppServer,\n type SpawnAppServer,\n type SpawnAppServerArgsIface,\n} from \"./app-server.mjs\";\nexport { mcpOverrides, openCodexSession, type CodexSessionDepsIface } from \"./session.mjs\";\n"],
|
|
5
|
-
"mappings": "AAAA,cAAc;AACd,cAAc;AACd;AAAA,EACE;AAAA,OAGK;AACP,SAAS,cAAc,wBAAoD;",
|
|
4
|
+
"sourcesContent": ["export * from \"./config.mjs\";\nexport * from \"./credentials.mjs\";\nexport * from \"./program.mjs\";\nexport {\n spawnCodexAppServer,\n type SpawnAppServer,\n type SpawnAppServerArgsIface,\n} from \"./app-server.mjs\";\nexport { mcpOverrides, openCodexSession, type CodexSessionDepsIface } from \"./session.mjs\";\n"],
|
|
5
|
+
"mappings": "AAAA,cAAc;AACd,cAAc;AACd,cAAc;AACd;AAAA,EACE;AAAA,OAGK;AACP,SAAS,cAAc,wBAAoD;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import type { AdapterProgramIface } from '@finalai/acp-session/agent';
|
|
2
2
|
import { type SpawnAppServer } from "./app-server.mjs";
|
|
3
3
|
import { CodexApprovalPolicy } from "./config.mjs";
|
|
4
|
+
import type { CodexCredentialsIface } from "./credentials.mjs";
|
|
4
5
|
export declare const ADAPTER_NAME = "acp-adapter-codex";
|
|
5
|
-
export declare const ADAPTER_VERSION = "0.
|
|
6
|
+
export declare const ADAPTER_VERSION = "0.2.0";
|
|
6
7
|
export interface CodexProgramOptionsIface {
|
|
7
8
|
command?: {
|
|
8
9
|
command: string;
|
|
@@ -10,6 +11,7 @@ export interface CodexProgramOptionsIface {
|
|
|
10
11
|
} | null;
|
|
11
12
|
approvalPolicy?: CodexApprovalPolicy;
|
|
12
13
|
env?: Record<string, string | undefined>;
|
|
14
|
+
credentials?: CodexCredentialsIface | null;
|
|
13
15
|
spawnAppServer?: SpawnAppServer;
|
|
14
16
|
closeGraceMs?: number;
|
|
15
17
|
}
|
package/dist/modules/program.mjs
CHANGED
|
@@ -9,7 +9,7 @@ import {
|
|
|
9
9
|
} from "./config.mjs";
|
|
10
10
|
import { assertDistinctMcpNames, forkCodexThread, openCodexSession } from "./session.mjs";
|
|
11
11
|
const ADAPTER_NAME = "acp-adapter-codex";
|
|
12
|
-
const ADAPTER_VERSION = "0.
|
|
12
|
+
const ADAPTER_VERSION = "0.2.0";
|
|
13
13
|
const bundledCodex = () => {
|
|
14
14
|
const manifest = createRequire(import.meta.url).resolve("@openai/codex/package.json");
|
|
15
15
|
return {
|
|
@@ -24,6 +24,7 @@ const createCodexProgram = (options = {}) => {
|
|
|
24
24
|
command: command.command,
|
|
25
25
|
args: command.args,
|
|
26
26
|
env: options.env ?? process.env,
|
|
27
|
+
credentials: options.credentials ?? null,
|
|
27
28
|
version: ADAPTER_VERSION,
|
|
28
29
|
closeGraceMs: options.closeGraceMs ?? 1e4
|
|
29
30
|
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/program.ts"],
|
|
4
|
-
"sourcesContent": ["import { createRequire } from 'node:module';\nimport { dirname, join } from 'node:path';\n\nimport type { AdapterProgramIface } from '@finalai/acp-session/agent';\n\nimport { spawnCodexAppServer, type SpawnAppServer } from \"./app-server.mjs\";\nimport {\n CodexApprovalPolicy,\n codexConfigOptions,\n codexConfigValue,\n defaultCodexConfig,\n} from \"./config.mjs\";\nimport { assertDistinctMcpNames, forkCodexThread, openCodexSession } from \"./session.mjs\";\n\nexport const ADAPTER_NAME = 'acp-adapter-codex';\nexport const ADAPTER_VERSION = '0.
|
|
5
|
-
"mappings": "AAAA,SAAS,qBAAqB;AAC9B,SAAS,SAAS,YAAY;AAI9B,SAAS,2BAAgD;AACzD;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;
|
|
4
|
+
"sourcesContent": ["import { createRequire } from 'node:module';\nimport { dirname, join } from 'node:path';\n\nimport type { AdapterProgramIface } from '@finalai/acp-session/agent';\n\nimport { spawnCodexAppServer, type SpawnAppServer } from \"./app-server.mjs\";\nimport {\n CodexApprovalPolicy,\n codexConfigOptions,\n codexConfigValue,\n defaultCodexConfig,\n} from \"./config.mjs\";\nimport type { CodexCredentialsIface } from \"./credentials.mjs\";\nimport { assertDistinctMcpNames, forkCodexThread, openCodexSession } from \"./session.mjs\";\n\nexport const ADAPTER_NAME = 'acp-adapter-codex';\nexport const ADAPTER_VERSION = '0.2.0';\n\nexport interface CodexProgramOptionsIface {\n // The app-server's command line (`codex app-server ...`); by default the Codex the\n // `@openai/codex` dependency installs.\n command?: { command: string; args: string[] } | null;\n // The approval policy a new session starts with.\n approvalPolicy?: CodexApprovalPolicy;\n // Environment of the app-server, inference credentials included (OPENAI_API_KEY and\n // OPENAI_BASE_URL, or CODEX_HOME for Codex's own login).\n env?: Record<string, string | undefined>;\n // A brokered model credential (codexCredentialsFrom), applied over `env` for the app-server.\n credentials?: CodexCredentialsIface | null;\n spawnAppServer?: SpawnAppServer;\n closeGraceMs?: number;\n}\n\n// The Codex CLI the dependency installs, run with this Node.\nconst bundledCodex = (): { command: string; args: string[] } => {\n const manifest = createRequire(import.meta.url).resolve('@openai/codex/package.json');\n return {\n command: process.execPath,\n args: [join(dirname(manifest), 'bin', 'codex.js'), 'app-server'],\n };\n};\n\n// The Codex app-server as the native program of an ACP adapter.\nexport const createCodexProgram = (options: CodexProgramOptionsIface = {}): AdapterProgramIface => {\n const command = options.command ?? bundledCodex();\n const deps = {\n spawnAppServer: options.spawnAppServer ?? spawnCodexAppServer,\n command: command.command,\n args: command.args,\n env: options.env ?? process.env,\n credentials: options.credentials ?? null,\n version: ADAPTER_VERSION,\n closeGraceMs: options.closeGraceMs ?? 10_000,\n };\n return {\n info: { name: ADAPTER_NAME, version: ADAPTER_VERSION },\n program: 'codex',\n runtime: { name: ADAPTER_NAME, version: ADAPTER_VERSION },\n fork: true,\n mcp: { http: true, stdio: true, acp: true },\n images: true,\n defaultConfig: () => defaultCodexConfig(options.approvalPolicy),\n configOptions: codexConfigOptions,\n configValue: codexConfigValue,\n checkMcpServers: (servers) =>\n assertDistinctMcpNames(servers.map((server) => String(server.name))),\n forkNative: (args) => forkCodexThread(args, deps),\n open: (args) => openCodexSession(args, deps),\n };\n};\n"],
|
|
5
|
+
"mappings": "AAAA,SAAS,qBAAqB;AAC9B,SAAS,SAAS,YAAY;AAI9B,SAAS,2BAAgD;AACzD;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEP,SAAS,wBAAwB,iBAAiB,wBAAwB;AAEnE,MAAM,eAAe;AACrB,MAAM,kBAAkB;AAkB/B,MAAM,eAAe,MAA2C;AAC9D,QAAM,WAAW,cAAc,YAAY,GAAG,EAAE,QAAQ,4BAA4B;AACpF,SAAO;AAAA,IACL,SAAS,QAAQ;AAAA,IACjB,MAAM,CAAC,KAAK,QAAQ,QAAQ,GAAG,OAAO,UAAU,GAAG,YAAY;AAAA,EACjE;AACF;AAGO,MAAM,qBAAqB,CAAC,UAAoC,CAAC,MAA2B;AACjG,QAAM,UAAU,QAAQ,WAAW,aAAa;AAChD,QAAM,OAAO;AAAA,IACX,gBAAgB,QAAQ,kBAAkB;AAAA,IAC1C,SAAS,QAAQ;AAAA,IACjB,MAAM,QAAQ;AAAA,IACd,KAAK,QAAQ,OAAO,QAAQ;AAAA,IAC5B,aAAa,QAAQ,eAAe;AAAA,IACpC,SAAS;AAAA,IACT,cAAc,QAAQ,gBAAgB;AAAA,EACxC;AACA,SAAO;AAAA,IACL,MAAM,EAAE,MAAM,cAAc,SAAS,gBAAgB;AAAA,IACrD,SAAS;AAAA,IACT,SAAS,EAAE,MAAM,cAAc,SAAS,gBAAgB;AAAA,IACxD,MAAM;AAAA,IACN,KAAK,EAAE,MAAM,MAAM,OAAO,MAAM,KAAK,KAAK;AAAA,IAC1C,QAAQ;AAAA,IACR,eAAe,MAAM,mBAAmB,QAAQ,cAAc;AAAA,IAC9D,eAAe;AAAA,IACf,aAAa;AAAA,IACb,iBAAiB,CAAC,YAChB,uBAAuB,QAAQ,IAAI,CAAC,WAAW,OAAO,OAAO,IAAI,CAAC,CAAC;AAAA,IACrE,YAAY,CAAC,SAAS,gBAAgB,MAAM,IAAI;AAAA,IAChD,MAAM,CAAC,SAAS,iBAAiB,MAAM,IAAI;AAAA,EAC7C;AACF;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import { type McpServerHttp } from '@agentclientprotocol/sdk/experimental/v2';
|
|
2
2
|
import { type JsonObject } from '@finalai/acp-session';
|
|
3
3
|
import type { AdapterOpenArgsIface, AdapterSessionIface } from '@finalai/acp-session/agent';
|
|
4
|
-
import type
|
|
4
|
+
import { type SpawnAppServer } from "./app-server.mjs";
|
|
5
|
+
import type { CodexCredentialsIface } from "./credentials.mjs";
|
|
5
6
|
export interface CodexSessionDepsIface {
|
|
6
7
|
spawnAppServer: SpawnAppServer;
|
|
7
8
|
command: string;
|
|
8
9
|
args: string[];
|
|
9
10
|
env: Record<string, string | undefined>;
|
|
11
|
+
credentials: CodexCredentialsIface | null;
|
|
10
12
|
version: string;
|
|
11
13
|
closeGraceMs: number;
|
|
12
14
|
}
|
package/dist/modules/session.mjs
CHANGED
|
@@ -7,6 +7,7 @@ import {
|
|
|
7
7
|
} from "@finalai/acp-session";
|
|
8
8
|
import { startMcpProxy } from "@finalai/acp-session/agent/node";
|
|
9
9
|
import * as z from "zod";
|
|
10
|
+
import { isCodexNotInstalled } from "./app-server.mjs";
|
|
10
11
|
import {
|
|
11
12
|
CodexApprovalPolicy,
|
|
12
13
|
configFlags,
|
|
@@ -21,6 +22,10 @@ import {
|
|
|
21
22
|
createTranslatorState,
|
|
22
23
|
translateCodexNotification
|
|
23
24
|
} from "./translate.mjs";
|
|
25
|
+
const CHATGPT_LIMIT_ERRORS = /* @__PURE__ */ new Set([
|
|
26
|
+
"usageLimitExceeded",
|
|
27
|
+
"rateLimitExceeded"
|
|
28
|
+
]);
|
|
24
29
|
const threadResponseSchema = z.object({ thread: z.object({ id: z.string().min(1) }) });
|
|
25
30
|
const turnResponseSchema = z.object({ turn: z.object({ id: z.string().min(1) }) });
|
|
26
31
|
const turnSteerResponseSchema = z.object({ turnId: z.string().min(1) });
|
|
@@ -104,24 +109,31 @@ const mcpOverrides = (servers) => {
|
|
|
104
109
|
}
|
|
105
110
|
return overrides;
|
|
106
111
|
};
|
|
107
|
-
const
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
)
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
112
|
+
const envFor = (deps, credentialEnv) => Object.fromEntries(
|
|
113
|
+
Object.entries({ ...deps.env, ...credentialEnv }).flatMap(
|
|
114
|
+
([key, value]) => value == null ? [] : [[key, value]]
|
|
115
|
+
)
|
|
116
|
+
);
|
|
117
|
+
const spawnFor = (deps, where, credentialEnv) => {
|
|
118
|
+
const env = envFor(deps, credentialEnv);
|
|
119
|
+
return deps.spawnAppServer({
|
|
120
|
+
command: deps.command,
|
|
121
|
+
args: [...deps.args, ...configFlags(providerOverrides(env))],
|
|
122
|
+
cwd: where.cwd,
|
|
123
|
+
env,
|
|
124
|
+
log: where.log,
|
|
125
|
+
closeGraceMs: deps.closeGraceMs
|
|
126
|
+
});
|
|
127
|
+
};
|
|
117
128
|
const initializeParams = (version) => ({
|
|
118
129
|
clientInfo: { name: "acp-adapter-codex", title: "ACP adapter for Codex", version },
|
|
119
130
|
capabilities: { experimentalApi: true }
|
|
120
131
|
});
|
|
121
132
|
const forkCodexThread = async (args, deps) => {
|
|
122
133
|
const config = turnConfigOf(args.config);
|
|
134
|
+
const credentialEnv = (await deps.credentials?.resolve())?.env ?? {};
|
|
123
135
|
const peer = createJsonRpcPeer({
|
|
124
|
-
transport: spawnFor(deps, { cwd: args.cwd, log: () => void 0 }),
|
|
136
|
+
transport: spawnFor(deps, { cwd: args.cwd, log: () => void 0 }, credentialEnv),
|
|
125
137
|
onRequest: async ({ method }) => ({
|
|
126
138
|
error: { code: -32601, message: `unsupported request ${method}` }
|
|
127
139
|
}),
|
|
@@ -163,6 +175,9 @@ const openCodexSession = async (args, deps) => {
|
|
|
163
175
|
let peer = null;
|
|
164
176
|
let threadId = args.nativeId;
|
|
165
177
|
let sandbox = null;
|
|
178
|
+
let spawnedCredential = null;
|
|
179
|
+
let spawnedFingerprint = null;
|
|
180
|
+
const credentialKey = (credential) => JSON.stringify({ env: credential.env, account: credential.chatgpt?.chatgptAccountId ?? null });
|
|
166
181
|
let turn = null;
|
|
167
182
|
const early = /* @__PURE__ */ new Map();
|
|
168
183
|
const pending = /* @__PURE__ */ new Set();
|
|
@@ -337,6 +352,16 @@ const openCodexSession = async (args, deps) => {
|
|
|
337
352
|
return askUserInput(params);
|
|
338
353
|
case "item/permissions/requestApproval":
|
|
339
354
|
return { result: await askPermissionProfile(params) };
|
|
355
|
+
// The ChatGPT login was refused or expired: fresh tokens from the broker.
|
|
356
|
+
case "account/chatgptAuthTokens/refresh": {
|
|
357
|
+
let tokens = null;
|
|
358
|
+
try {
|
|
359
|
+
tokens = await deps.credentials?.refreshChatgpt() ?? null;
|
|
360
|
+
} catch (cause) {
|
|
361
|
+
sink.log(`ChatGPT token refresh failed: ${errorMessageOf(cause)}`);
|
|
362
|
+
}
|
|
363
|
+
return tokens == null ? { error: { code: -32e3, message: "no ChatGPT credential to refresh" } } : { result: { ...tokens } };
|
|
364
|
+
}
|
|
340
365
|
default:
|
|
341
366
|
return { error: { code: -32601, message: `unsupported request ${method}` } };
|
|
342
367
|
}
|
|
@@ -359,8 +384,10 @@ const openCodexSession = async (args, deps) => {
|
|
|
359
384
|
sandbox: config.sandbox,
|
|
360
385
|
config: overrides
|
|
361
386
|
});
|
|
362
|
-
const start = async (config) => {
|
|
363
|
-
const transport = spawnFor(deps, { cwd: args.cwd, log: sink.log });
|
|
387
|
+
const start = async (config, credential) => {
|
|
388
|
+
const transport = spawnFor(deps, { cwd: args.cwd, log: sink.log }, credential.env);
|
|
389
|
+
spawnedCredential = credentialKey(credential);
|
|
390
|
+
spawnedFingerprint = credential.fingerprint;
|
|
364
391
|
const next = createJsonRpcPeer({
|
|
365
392
|
transport,
|
|
366
393
|
onRequest: onServerRequest,
|
|
@@ -376,6 +403,11 @@ const openCodexSession = async (args, deps) => {
|
|
|
376
403
|
peer = next;
|
|
377
404
|
await next.request("initialize", initializeParams(deps.version));
|
|
378
405
|
next.notify("initialized");
|
|
406
|
+
if (credential.chatgpt != null)
|
|
407
|
+
await next.request("account/login/start", {
|
|
408
|
+
type: "chatgptAuthTokens",
|
|
409
|
+
...credential.chatgpt
|
|
410
|
+
});
|
|
379
411
|
if (threadId != null) {
|
|
380
412
|
threadResponseSchema.parse(
|
|
381
413
|
await next.request("thread/resume", { ...threadParams(config), threadId })
|
|
@@ -406,8 +438,39 @@ const openCodexSession = async (args, deps) => {
|
|
|
406
438
|
run: async ({ input, signal, config }) => {
|
|
407
439
|
if (signal.aborted) return { stopReason: StopReason.Cancelled, inputUnsent: true };
|
|
408
440
|
const wanted = turnConfigOf(config);
|
|
409
|
-
|
|
410
|
-
|
|
441
|
+
let credential = { env: {}, chatgpt: null, fingerprint: null };
|
|
442
|
+
if (deps.credentials != null) {
|
|
443
|
+
try {
|
|
444
|
+
credential = await deps.credentials.resolve();
|
|
445
|
+
} catch (cause) {
|
|
446
|
+
return {
|
|
447
|
+
stopReason: StopReason.Error,
|
|
448
|
+
providerError: {
|
|
449
|
+
code: "credential_unavailable",
|
|
450
|
+
message: `Codex has no model credential: ${errorMessageOf(cause)}`,
|
|
451
|
+
retryable: true
|
|
452
|
+
}
|
|
453
|
+
};
|
|
454
|
+
}
|
|
455
|
+
}
|
|
456
|
+
if (peer != null && (sandbox !== wanted.sandbox || spawnedCredential !== credentialKey(credential)))
|
|
457
|
+
await stop();
|
|
458
|
+
let current = peer;
|
|
459
|
+
if (current == null) {
|
|
460
|
+
try {
|
|
461
|
+
current = await start(wanted, credential);
|
|
462
|
+
} catch (cause) {
|
|
463
|
+
if (!isCodexNotInstalled(cause)) throw cause;
|
|
464
|
+
return {
|
|
465
|
+
stopReason: StopReason.Error,
|
|
466
|
+
providerError: {
|
|
467
|
+
code: "harness_not_installed",
|
|
468
|
+
message: errorMessageOf(cause),
|
|
469
|
+
retryable: false
|
|
470
|
+
}
|
|
471
|
+
};
|
|
472
|
+
}
|
|
473
|
+
}
|
|
411
474
|
if (signal.aborted) return { stopReason: StopReason.Cancelled, inputUnsent: true };
|
|
412
475
|
const started = {
|
|
413
476
|
id: null,
|
|
@@ -451,6 +514,12 @@ const openCodexSession = async (args, deps) => {
|
|
|
451
514
|
}
|
|
452
515
|
};
|
|
453
516
|
}
|
|
517
|
+
const limitedFingerprint = spawnedFingerprint;
|
|
518
|
+
if (credential.chatgpt != null && limitedFingerprint != null && completion.providerError != null && CHATGPT_LIMIT_ERRORS.has(completion.providerError.code)) {
|
|
519
|
+
await deps.credentials?.chatgptLimited({ fingerprint: limitedFingerprint }).catch(
|
|
520
|
+
(cause) => sink.log(`reporting the ChatGPT limit failed: ${errorMessageOf(cause)}`)
|
|
521
|
+
);
|
|
522
|
+
}
|
|
454
523
|
const end = {
|
|
455
524
|
stopReason: completion.stopReason,
|
|
456
525
|
providerError: completion.providerError,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/session.ts"],
|
|
4
|
-
"sourcesContent": ["import {\n type McpServerHttp,\n type CreateElicitationRequest,\n type ElicitationPropertySchema,\n type RequestPermissionOutcome,\n} from '@agentclientprotocol/sdk/experimental/v2';\nimport {\n jsonObjectSchema,\n jsonValueSchema,\n StopReason,\n type JsonObject,\n type JsonValue,\n} from '@finalai/acp-session';\nimport type {\n AdapterOpenArgsIface,\n AdapterSessionIface,\n AdapterTurnEndIface,\n RenderedPart,\n} from '@finalai/acp-session/agent';\nimport { startMcpProxy } from '@finalai/acp-session/agent/node';\nimport * as z from 'zod';\n\nimport type { SpawnAppServer } from \"./app-server.mjs\";\nimport {\n CodexApprovalPolicy,\n configFlags,\n providerOverrides,\n turnConfigOf,\n type CodexTurnConfigIface,\n} from \"./config.mjs\";\nimport {\n createJsonRpcPeer,\n errorMessageOf,\n type JsonRpcPeerIface,\n type ServerRequestOutcome,\n} from \"./json-rpc.mjs\";\nimport {\n createTranslatorState,\n translateCodexNotification,\n type TurnCompletionIface,\n} from \"./translate.mjs\";\n\n// One ACP session over one `codex app-server` process and one Codex thread. The agent runs one\n// turn at a time: `turn/start`, then the turn's notifications until `turn/completed`. A change\n// of sandbox mode restarts the app-server on the same thread; model, effort and approval\n// policy apply per turn.\n\nexport interface CodexSessionDepsIface {\n spawnAppServer: SpawnAppServer;\n // The app-server's command line (`codex app-server ...`); provider config is appended.\n command: string;\n args: string[];\n env: Record<string, string | undefined>;\n version: string;\n closeGraceMs: number;\n}\n\ntype UserInput = { type: 'text'; text: string; text_elements: [] } | { type: 'image'; url: string };\n\nconst threadResponseSchema = z.object({ thread: z.object({ id: z.string().min(1) }) });\nconst turnResponseSchema = z.object({ turn: z.object({ id: z.string().min(1) }) });\nconst turnSteerResponseSchema = z.object({ turnId: z.string().min(1) });\n\nconst approvalParamsSchema = z.object({\n itemId: z.string().optional(),\n command: z.string().nullish(),\n cwd: z.string().nullish(),\n reason: z.string().nullish(),\n});\n\nconst elicitationParamsSchema = z\n .object({\n mode: z.string().optional(),\n message: z.string().default(''),\n serverName: z.string().optional(),\n })\n .loose();\n\nconst userInputParamsSchema = z.object({\n itemId: z.string(),\n questions: z\n .array(\n z.object({\n id: z.string().min(1),\n header: z.string(),\n question: z.string(),\n isOther: z.boolean().default(false),\n isSecret: z.boolean().default(false),\n options: z.array(z.object({ label: z.string(), description: z.string() })).nullish(),\n }),\n )\n .min(1),\n});\n\nconst permissionProfileParamsSchema = z.object({\n itemId: z.string(),\n reason: z.string().nullish(),\n permissions: z.object({\n network: jsonObjectSchema.nullish(),\n fileSystem: jsonObjectSchema.nullish(),\n }),\n});\n\nconst inputOf = (parts: readonly RenderedPart[]): UserInput[] =>\n parts.map((part) =>\n part.type === 'text'\n ? { type: 'text', text: part.text, text_elements: [] }\n : { type: 'image', url: `data:${part.mimeType};base64,${part.data}` },\n );\n\nconst decisionFor = (outcome: RequestPermissionOutcome): string => {\n if (outcome.outcome !== 'selected' || !('optionId' in outcome)) return 'cancel';\n if (outcome.optionId === 'allow_always') return 'acceptForSession';\n if (outcome.optionId === 'allow_once') return 'accept';\n return 'decline';\n};\n\nconst approvalOptions = [\n { optionId: 'allow_once', name: 'Allow', kind: 'allow_once' as const },\n { optionId: 'allow_always', name: 'Allow for this session', kind: 'allow_always' as const },\n { optionId: 'reject_once', name: 'Reject', kind: 'reject_once' as const },\n];\n\n// `never` would also auto-decline MCP elicitations: the granular policy keeps them asking.\nconst appServerApprovalPolicy = (policy: CodexApprovalPolicy): JsonValue =>\n policy === CodexApprovalPolicy.Never\n ? {\n granular: {\n sandbox_approval: false,\n rules: false,\n skill_approval: false,\n request_permissions: false,\n mcp_elicitations: true,\n },\n }\n : policy;\n\nconst toml = (value: string): string => value.replace(/[^A-Za-z0-9_-]/gu, '_');\n\n// Codex's names for the servers (config keys) must not collide: two servers sharing a key\n// would mix one's URL with the other's headers.\nexport const assertDistinctMcpNames = (names: readonly string[]): void => {\n const seen = new Map<string, string>();\n for (const name of names) {\n const key = toml(name);\n const other = seen.get(key);\n if (other != null)\n throw new Error(`MCP server names collide: ${other} and ${name} are both ${key} to Codex`);\n seen.set(key, name);\n }\n};\n\n// The proxied MCP servers as Codex config overrides (Codex's own MCP client connects to them).\nexport const mcpOverrides = (servers: readonly McpServerHttp[]): JsonObject => {\n assertDistinctMcpNames(servers.map((server) => server.name));\n const overrides: JsonObject = {};\n for (const server of servers) {\n const key = `mcp_servers.${toml(server.name)}`;\n overrides[`${key}.url`] = server.url;\n if ((server.headers ?? []).length > 0) {\n overrides[`${key}.http_headers`] = Object.fromEntries(\n (server.headers ?? []).map((header) => [header.name, header.value]),\n );\n }\n }\n return overrides;\n};\n\n// An app-server for a session's directory, with the adapter's environment and provider config.\nconst spawnFor = (\n deps: CodexSessionDepsIface,\n where: { cwd: string; log: (line: string) => void },\n) =>\n deps.spawnAppServer({\n command: deps.command,\n args: [...deps.args, ...configFlags(providerOverrides(deps.env))],\n cwd: where.cwd,\n env: Object.fromEntries(\n Object.entries(deps.env).flatMap(([key, value]) => (value == null ? [] : [[key, value]])),\n ),\n log: where.log,\n closeGraceMs: deps.closeGraceMs,\n });\n\nconst initializeParams = (version: string): JsonObject => ({\n clientInfo: { name: 'acp-adapter-codex', title: 'ACP adapter for Codex', version },\n capabilities: { experimentalApi: true },\n});\n\n// Forks a Codex thread now, on an app-server of its own, and returns the fork's thread id:\n// the fork holds the thread as it is, whatever runs on it afterwards.\nexport const forkCodexThread = async (\n args: { nativeId: string; cwd: string; config: Record<string, string> },\n deps: CodexSessionDepsIface,\n): Promise<string> => {\n const config = turnConfigOf(args.config);\n const peer = createJsonRpcPeer({\n transport: spawnFor(deps, { cwd: args.cwd, log: () => undefined }),\n onRequest: async ({ method }) => ({\n error: { code: -32601, message: `unsupported request ${method}` },\n }),\n onNotification: () => undefined,\n });\n try {\n await peer.request('initialize', initializeParams(deps.version));\n peer.notify('initialized');\n const forked = threadResponseSchema.parse(\n await peer.request('thread/fork', {\n threadId: args.nativeId,\n cwd: args.cwd,\n model: config.model,\n approvalPolicy: appServerApprovalPolicy(config.approvalPolicy),\n sandbox: config.sandbox,\n }),\n );\n return forked.thread.id;\n } finally {\n await peer.shutdown().catch(() => undefined);\n }\n};\n\ninterface TurnIface {\n id: string | null;\n // Settles with the turn id once turn/start answers (null when it failed).\n started: PromiseWithResolvers<string | null>;\n done: PromiseWithResolvers<TurnCompletionIface | null>;\n settled: boolean;\n signal: AbortSignal;\n}\n\nexport const openCodexSession = async (\n args: AdapterOpenArgsIface,\n deps: CodexSessionDepsIface,\n): Promise<AdapterSessionIface> => {\n const { sink } = args;\n // Checked before the proxy listens, so a refused session starts nothing.\n assertDistinctMcpNames(args.mcpServers.map((server) => String(server.name)));\n const proxy = await startMcpProxy({\n servers: args.mcpServers,\n cwd: args.cwd,\n env: deps.env,\n mcpMessage: sink.mcpMessage,\n log: sink.log,\n });\n // Codex's server names (config keys) \u2192 the session's.\n const serverNames = new Map(proxy.servers.map((server) => [toml(server.name), server.name]));\n const translator = createTranslatorState(args.cwd, ({ server, tool, input }) => {\n const name = serverNames.get(server);\n return name == null\n ? null\n : proxy.takeResult({ server: name, tool: (candidate) => candidate === tool, input });\n });\n const overrides = mcpOverrides(proxy.servers);\n let peer: JsonRpcPeerIface | null = null;\n let threadId: string | null = args.nativeId;\n let sandbox: CodexTurnConfigIface['sandbox'] | null = null;\n let turn: TurnIface | null = null;\n // Completions that arrived before their turn/start answered.\n const early = new Map<string, TurnCompletionIface>();\n const pending = new Set<AbortController>();\n\n const finish = (current: TurnIface, completion: TurnCompletionIface | null) => {\n current.settled = true;\n current.started.resolve(null);\n current.done.resolve(completion);\n };\n\n const withAbort = async <T>(run: (signal: AbortSignal) => Promise<T>): Promise<T> => {\n const controller = new AbortController();\n pending.add(controller);\n try {\n return await run(controller.signal);\n } finally {\n pending.delete(controller);\n }\n };\n\n const askApproval = async (\n method: string,\n params: JsonValue | undefined,\n ): Promise<JsonObject> => {\n const parsed = approvalParamsSchema.safeParse(params);\n const fileChange = method === 'item/fileChange/requestApproval';\n const detail = parsed.success\n ? parsed.data\n : { itemId: undefined, command: null, reason: null };\n const title = fileChange ? 'Apply file changes' : (detail.command ?? 'Run command');\n const outcome = await withAbort((signal) =>\n sink.requestPermission(\n {\n sessionId: args.sessionId,\n title,\n description: detail.reason ?? null,\n subject: {\n type: 'tool_call',\n toolCall: {\n toolCallId: detail.itemId ?? crypto.randomUUID(),\n name: fileChange ? 'apply_patch' : 'exec_command',\n title,\n kind: fileChange ? 'edit' : 'execute',\n status: 'pending',\n rawInput: params ?? null,\n },\n },\n options: approvalOptions,\n },\n signal,\n ),\n );\n return { decision: decisionFor(outcome) };\n };\n\n const forwardElicitation = async (params: JsonValue | undefined): Promise<JsonObject> => {\n const parsed = elicitationParamsSchema.safeParse(params);\n if (!parsed.success) return { action: 'decline', content: null, _meta: null };\n const requestedSchema = z\n .object({ requestedSchema: z.record(z.string(), z.unknown()) })\n .safeParse(parsed.data);\n const url = z.object({ url: z.string(), elicitationId: z.string() }).safeParse(parsed.data);\n let request: CreateElicitationRequest;\n if (parsed.data.mode === 'url' && url.success) {\n request = {\n mode: 'url',\n sessionId: args.sessionId,\n message: parsed.data.message,\n ...url.data,\n };\n } else if (requestedSchema.success) {\n request = {\n mode: 'form',\n sessionId: args.sessionId,\n message: parsed.data.message,\n requestedSchema: requestedSchema.data.requestedSchema,\n };\n } else {\n return { action: 'decline', content: null, _meta: null };\n }\n const response = await withAbort((signal) => sink.elicit(request, signal));\n const accepted = z\n .object({ action: z.string(), content: jsonValueSchema.nullish() })\n .safeParse(response);\n if (!accepted.success) return { action: 'cancel', content: null, _meta: null };\n const action = ['accept', 'decline', 'cancel'].includes(accepted.data.action)\n ? accepted.data.action\n : 'cancel';\n return { action, content: accepted.data.content ?? null, _meta: null };\n };\n\n const askUserInput = async (params: JsonValue | undefined): Promise<ServerRequestOutcome> => {\n const parsed = userInputParamsSchema.safeParse(params);\n if (!parsed.success)\n return { error: { code: -32602, message: 'invalid user input questions' } };\n const questions = parsed.data.questions;\n // ACP's form schema has no secret-input field; never render one as ordinary text.\n if (questions.some((question) => question.isSecret)) {\n return { error: { code: -32000, message: 'secret questions are unavailable over ACP' } };\n }\n const properties = Object.fromEntries(\n questions.map((question): [string, ElicitationPropertySchema] => {\n const labels = question.options?.map((entry) => entry.label) ?? [];\n const property: ElicitationPropertySchema = {\n type: 'string',\n title: question.header,\n description: [\n question.question,\n ...(question.options?.map((entry) => `${entry.label}: ${entry.description}`) ?? []),\n ].join('\\n'),\n };\n if (labels.length > 0 && !question.isOther) property.enum = labels;\n return [question.id, property];\n }),\n );\n const response = await withAbort((signal) =>\n sink.elicit(\n {\n mode: 'form',\n sessionId: args.sessionId,\n message: questions.map((question) => question.question).join('\\n\\n'),\n requestedSchema: {\n type: 'object',\n properties,\n required: questions.map((question) => question.id),\n },\n },\n signal,\n ),\n );\n const accepted = z\n .object({ action: z.literal('accept'), content: z.record(z.string(), z.string()) })\n .safeParse(response);\n if (!accepted.success) return { result: { answers: {} } };\n const content = accepted.data.content;\n return {\n result: {\n answers: Object.fromEntries(\n questions.flatMap((question) => {\n const answer = content[question.id];\n return answer == null ? [] : [[question.id, { answers: [answer] }]];\n }),\n ),\n },\n };\n };\n\n const askPermissionProfile = async (params: JsonValue | undefined): Promise<JsonObject> => {\n const parsed = permissionProfileParamsSchema.safeParse(params);\n if (!parsed.success) return { permissions: {}, scope: 'turn' };\n const title = 'Grant additional permissions';\n const outcome = await withAbort((signal) =>\n sink.requestPermission(\n {\n sessionId: args.sessionId,\n title,\n description: parsed.data.reason ?? null,\n subject: {\n type: 'tool_call',\n toolCall: {\n toolCallId: parsed.data.itemId,\n name: 'request_permissions',\n title,\n kind: 'other',\n status: 'pending',\n rawInput: params ?? null,\n },\n },\n options: approvalOptions,\n },\n signal,\n ),\n );\n const allowed =\n outcome.outcome === 'selected' &&\n 'optionId' in outcome &&\n (outcome.optionId === 'allow_once' || outcome.optionId === 'allow_always');\n if (!allowed) return { permissions: {}, scope: 'turn' };\n return {\n permissions: parsed.data.permissions,\n scope: outcome.optionId === 'allow_always' ? 'session' : 'turn',\n };\n };\n\n const onServerRequest = async ({\n method,\n params,\n }: {\n method: string;\n params: JsonValue | undefined;\n }): Promise<ServerRequestOutcome> => {\n switch (method) {\n case 'item/commandExecution/requestApproval':\n case 'item/fileChange/requestApproval':\n return { result: await askApproval(method, params) };\n case 'mcpServer/elicitation/request':\n return { result: await forwardElicitation(params) };\n case 'item/tool/requestUserInput':\n return askUserInput(params);\n case 'item/permissions/requestApproval':\n return { result: await askPermissionProfile(params) };\n default:\n return { error: { code: -32601, message: `unsupported request ${method}` } };\n }\n };\n\n const onNotification = ({\n method,\n params,\n }: {\n method: string;\n params: JsonValue | undefined;\n }) => {\n const translation = translateCodexNotification(translator, { method, params });\n for (const update of translation.updates) sink.update(update);\n const completed = translation.turnCompleted;\n if (completed == null) return;\n if (turn?.id === completed.turnId) finish(turn, completed);\n else early.set(completed.turnId, completed);\n };\n\n const threadParams = (config: CodexTurnConfigIface) => ({\n cwd: args.cwd,\n model: config.model,\n approvalPolicy: appServerApprovalPolicy(config.approvalPolicy),\n sandbox: config.sandbox,\n config: overrides,\n });\n\n const start = async (config: CodexTurnConfigIface): Promise<JsonRpcPeerIface> => {\n const transport = spawnFor(deps, { cwd: args.cwd, log: sink.log });\n const next = createJsonRpcPeer({\n transport,\n onRequest: onServerRequest,\n onNotification,\n log: sink.log,\n });\n void next.closed.then(() => {\n if (peer !== next) return;\n peer = null;\n for (const controller of pending) controller.abort();\n if (turn != null) finish(turn, null);\n });\n peer = next;\n await next.request('initialize', initializeParams(deps.version));\n next.notify('initialized');\n if (threadId != null) {\n threadResponseSchema.parse(\n await next.request('thread/resume', { ...threadParams(config), threadId }),\n );\n } else if (args.forkOf != null) {\n const forked = threadResponseSchema.parse(\n await next.request('thread/fork', { ...threadParams(config), threadId: args.forkOf }),\n );\n threadId = forked.thread.id;\n sink.nativeIdChanged(threadId);\n } else {\n const started = threadResponseSchema.parse(\n await next.request('thread/start', threadParams(config)),\n );\n threadId = started.thread.id;\n sink.nativeIdChanged(threadId);\n }\n sandbox = config.sandbox;\n return next;\n };\n\n const stop = async () => {\n const current = peer;\n peer = null;\n await current?.shutdown().catch(() => undefined);\n };\n\n return {\n nativeId: () => threadId,\n run: async ({ input, signal, config }) => {\n // A turn cancelled before it starts sends nothing.\n if (signal.aborted) return { stopReason: StopReason.Cancelled, inputUnsent: true };\n const wanted = turnConfigOf(config);\n if (peer != null && sandbox !== wanted.sandbox) await stop();\n const current = peer ?? (await start(wanted));\n // Cancelled while the app-server started: the turn is never submitted.\n if (signal.aborted) return { stopReason: StopReason.Cancelled, inputUnsent: true };\n const started: TurnIface = {\n id: null,\n started: Promise.withResolvers(),\n done: Promise.withResolvers(),\n settled: false,\n signal,\n };\n turn = started;\n const interrupt = () => {\n for (const controller of pending) controller.abort();\n if (started.id == null || threadId == null) return;\n void current\n .request('turn/interrupt', { threadId, turnId: started.id })\n .catch((cause: unknown) => sink.log(`turn/interrupt failed: ${errorMessageOf(cause)}`));\n };\n signal.addEventListener('abort', interrupt, { once: true });\n try {\n const response = turnResponseSchema.parse(\n await current.request('turn/start', {\n threadId,\n input: inputOf(input),\n model: wanted.model,\n effort: wanted.effort,\n approvalPolicy: appServerApprovalPolicy(wanted.approvalPolicy),\n }),\n );\n started.id = response.turn.id;\n started.started.resolve(response.turn.id);\n const finished = early.get(response.turn.id);\n early.delete(response.turn.id);\n if (finished != null) finish(started, finished);\n if (signal.aborted) interrupt();\n const completion = await started.done.promise;\n if (signal.aborted) return { stopReason: StopReason.Cancelled, usage: completion?.usage };\n if (completion == null) {\n return {\n stopReason: StopReason.Error,\n providerError: {\n code: 'app_server_exited',\n message: 'the Codex app-server exited mid-turn',\n retryable: true,\n },\n };\n }\n const end: AdapterTurnEndIface = {\n stopReason: completion.stopReason,\n providerError: completion.providerError,\n usage: completion.usage,\n };\n return end;\n } finally {\n started.settled = true;\n started.started.resolve(null);\n signal.removeEventListener('abort', interrupt);\n if (turn === started) turn = null;\n }\n },\n // turn/steer adds the input to the running turn; Codex answers it before the turn ends.\n inject: async (input) => {\n const current = turn;\n const connection = peer;\n if (current == null || connection == null || threadId == null) return false;\n const turnId = await current.started.promise;\n if (turnId == null || current.settled || current.signal.aborted) return false;\n try {\n turnSteerResponseSchema.parse(\n await connection.request('turn/steer', {\n threadId,\n expectedTurnId: turnId,\n input: inputOf(input),\n }),\n );\n return true;\n } catch (cause) {\n // The turn ended first (or the app-server refused): the prompt queues instead.\n sink.log(`turn/steer failed: ${errorMessageOf(cause)}`);\n return false;\n }\n },\n close: async () => {\n await stop();\n await proxy.close();\n },\n };\n};\n"],
|
|
5
|
-
"mappings": "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",
|
|
4
|
+
"sourcesContent": ["import {\n type McpServerHttp,\n type CreateElicitationRequest,\n type ElicitationPropertySchema,\n type RequestPermissionOutcome,\n} from '@agentclientprotocol/sdk/experimental/v2';\nimport {\n jsonObjectSchema,\n jsonValueSchema,\n StopReason,\n type JsonObject,\n type JsonValue,\n} from '@finalai/acp-session';\nimport type {\n AdapterOpenArgsIface,\n AdapterSessionIface,\n AdapterTurnEndIface,\n RenderedPart,\n} from '@finalai/acp-session/agent';\nimport { startMcpProxy } from '@finalai/acp-session/agent/node';\nimport * as z from 'zod';\n\nimport { isCodexNotInstalled, type SpawnAppServer } from \"./app-server.mjs\";\nimport {\n CodexApprovalPolicy,\n configFlags,\n providerOverrides,\n turnConfigOf,\n type CodexTurnConfigIface,\n} from \"./config.mjs\";\nimport type {\n ChatgptAuthTokensIface,\n CodexCredentialIface,\n CodexCredentialsIface,\n} from \"./credentials.mjs\";\nimport {\n createJsonRpcPeer,\n errorMessageOf,\n type JsonRpcPeerIface,\n type ServerRequestOutcome,\n} from \"./json-rpc.mjs\";\nimport {\n createTranslatorState,\n translateCodexNotification,\n type TurnCompletionIface,\n} from \"./translate.mjs\";\n\n// One ACP session over one `codex app-server` process and one Codex thread. The agent runs one\n// turn at a time: `turn/start`, then the turn's notifications until `turn/completed`. A change\n// of sandbox mode restarts the app-server on the same thread; model, effort and approval\n// policy apply per turn.\n\nexport interface CodexSessionDepsIface {\n spawnAppServer: SpawnAppServer;\n // The app-server's command line (`codex app-server ...`); provider config is appended.\n command: string;\n args: string[];\n env: Record<string, string | undefined>;\n // A brokered model credential, whose variables the app-server gets over `env`.\n credentials: CodexCredentialsIface | null;\n version: string;\n closeGraceMs: number;\n}\n\ntype UserInput = { type: 'text'; text: string; text_elements: [] } | { type: 'image'; url: string };\n\n// Turn errors that say the ChatGPT subscription is out of its usage or rate limit.\nconst CHATGPT_LIMIT_ERRORS: ReadonlySet<string> = new Set([\n 'usageLimitExceeded',\n 'rateLimitExceeded',\n]);\n\nconst threadResponseSchema = z.object({ thread: z.object({ id: z.string().min(1) }) });\nconst turnResponseSchema = z.object({ turn: z.object({ id: z.string().min(1) }) });\nconst turnSteerResponseSchema = z.object({ turnId: z.string().min(1) });\n\nconst approvalParamsSchema = z.object({\n itemId: z.string().optional(),\n command: z.string().nullish(),\n cwd: z.string().nullish(),\n reason: z.string().nullish(),\n});\n\nconst elicitationParamsSchema = z\n .object({\n mode: z.string().optional(),\n message: z.string().default(''),\n serverName: z.string().optional(),\n })\n .loose();\n\nconst userInputParamsSchema = z.object({\n itemId: z.string(),\n questions: z\n .array(\n z.object({\n id: z.string().min(1),\n header: z.string(),\n question: z.string(),\n isOther: z.boolean().default(false),\n isSecret: z.boolean().default(false),\n options: z.array(z.object({ label: z.string(), description: z.string() })).nullish(),\n }),\n )\n .min(1),\n});\n\nconst permissionProfileParamsSchema = z.object({\n itemId: z.string(),\n reason: z.string().nullish(),\n permissions: z.object({\n network: jsonObjectSchema.nullish(),\n fileSystem: jsonObjectSchema.nullish(),\n }),\n});\n\nconst inputOf = (parts: readonly RenderedPart[]): UserInput[] =>\n parts.map((part) =>\n part.type === 'text'\n ? { type: 'text', text: part.text, text_elements: [] }\n : { type: 'image', url: `data:${part.mimeType};base64,${part.data}` },\n );\n\nconst decisionFor = (outcome: RequestPermissionOutcome): string => {\n if (outcome.outcome !== 'selected' || !('optionId' in outcome)) return 'cancel';\n if (outcome.optionId === 'allow_always') return 'acceptForSession';\n if (outcome.optionId === 'allow_once') return 'accept';\n return 'decline';\n};\n\nconst approvalOptions = [\n { optionId: 'allow_once', name: 'Allow', kind: 'allow_once' as const },\n { optionId: 'allow_always', name: 'Allow for this session', kind: 'allow_always' as const },\n { optionId: 'reject_once', name: 'Reject', kind: 'reject_once' as const },\n];\n\n// `never` would also auto-decline MCP elicitations: the granular policy keeps them asking.\nconst appServerApprovalPolicy = (policy: CodexApprovalPolicy): JsonValue =>\n policy === CodexApprovalPolicy.Never\n ? {\n granular: {\n sandbox_approval: false,\n rules: false,\n skill_approval: false,\n request_permissions: false,\n mcp_elicitations: true,\n },\n }\n : policy;\n\nconst toml = (value: string): string => value.replace(/[^A-Za-z0-9_-]/gu, '_');\n\n// Codex's names for the servers (config keys) must not collide: two servers sharing a key\n// would mix one's URL with the other's headers.\nexport const assertDistinctMcpNames = (names: readonly string[]): void => {\n const seen = new Map<string, string>();\n for (const name of names) {\n const key = toml(name);\n const other = seen.get(key);\n if (other != null)\n throw new Error(`MCP server names collide: ${other} and ${name} are both ${key} to Codex`);\n seen.set(key, name);\n }\n};\n\n// The proxied MCP servers as Codex config overrides (Codex's own MCP client connects to them).\nexport const mcpOverrides = (servers: readonly McpServerHttp[]): JsonObject => {\n assertDistinctMcpNames(servers.map((server) => server.name));\n const overrides: JsonObject = {};\n for (const server of servers) {\n const key = `mcp_servers.${toml(server.name)}`;\n overrides[`${key}.url`] = server.url;\n if ((server.headers ?? []).length > 0) {\n overrides[`${key}.http_headers`] = Object.fromEntries(\n (server.headers ?? []).map((header) => [header.name, header.value]),\n );\n }\n }\n return overrides;\n};\n\n// The app-server's environment: the adapter's, with the brokered credential's variables.\nconst envFor = (\n deps: CodexSessionDepsIface,\n credentialEnv: Record<string, string | undefined>,\n): Record<string, string> =>\n Object.fromEntries(\n Object.entries({ ...deps.env, ...credentialEnv }).flatMap(([key, value]) =>\n value == null ? [] : [[key, value]],\n ),\n );\n\n// An app-server for a session's directory, with that environment and its provider config.\nconst spawnFor = (\n deps: CodexSessionDepsIface,\n where: { cwd: string; log: (line: string) => void },\n credentialEnv: Record<string, string | undefined>,\n) => {\n const env = envFor(deps, credentialEnv);\n return deps.spawnAppServer({\n command: deps.command,\n args: [...deps.args, ...configFlags(providerOverrides(env))],\n cwd: where.cwd,\n env,\n log: where.log,\n closeGraceMs: deps.closeGraceMs,\n });\n};\n\nconst initializeParams = (version: string): JsonObject => ({\n clientInfo: { name: 'acp-adapter-codex', title: 'ACP adapter for Codex', version },\n capabilities: { experimentalApi: true },\n});\n\n// Forks a Codex thread now, on an app-server of its own, and returns the fork's thread id:\n// the fork holds the thread as it is, whatever runs on it afterwards.\nexport const forkCodexThread = async (\n args: { nativeId: string; cwd: string; config: Record<string, string> },\n deps: CodexSessionDepsIface,\n): Promise<string> => {\n const config = turnConfigOf(args.config);\n // The fork runs no turn; it takes the provider config its thread runs on.\n const credentialEnv = (await deps.credentials?.resolve())?.env ?? {};\n const peer = createJsonRpcPeer({\n transport: spawnFor(deps, { cwd: args.cwd, log: () => undefined }, credentialEnv),\n onRequest: async ({ method }) => ({\n error: { code: -32601, message: `unsupported request ${method}` },\n }),\n onNotification: () => undefined,\n });\n try {\n await peer.request('initialize', initializeParams(deps.version));\n peer.notify('initialized');\n const forked = threadResponseSchema.parse(\n await peer.request('thread/fork', {\n threadId: args.nativeId,\n cwd: args.cwd,\n model: config.model,\n approvalPolicy: appServerApprovalPolicy(config.approvalPolicy),\n sandbox: config.sandbox,\n }),\n );\n return forked.thread.id;\n } finally {\n await peer.shutdown().catch(() => undefined);\n }\n};\n\ninterface TurnIface {\n id: string | null;\n // Settles with the turn id once turn/start answers (null when it failed).\n started: PromiseWithResolvers<string | null>;\n done: PromiseWithResolvers<TurnCompletionIface | null>;\n settled: boolean;\n signal: AbortSignal;\n}\n\nexport const openCodexSession = async (\n args: AdapterOpenArgsIface,\n deps: CodexSessionDepsIface,\n): Promise<AdapterSessionIface> => {\n const { sink } = args;\n // Checked before the proxy listens, so a refused session starts nothing.\n assertDistinctMcpNames(args.mcpServers.map((server) => String(server.name)));\n const proxy = await startMcpProxy({\n servers: args.mcpServers,\n cwd: args.cwd,\n env: deps.env,\n mcpMessage: sink.mcpMessage,\n log: sink.log,\n });\n // Codex's server names (config keys) \u2192 the session's.\n const serverNames = new Map(proxy.servers.map((server) => [toml(server.name), server.name]));\n const translator = createTranslatorState(args.cwd, ({ server, tool, input }) => {\n const name = serverNames.get(server);\n return name == null\n ? null\n : proxy.takeResult({ server: name, tool: (candidate) => candidate === tool, input });\n });\n const overrides = mcpOverrides(proxy.servers);\n let peer: JsonRpcPeerIface | null = null;\n let threadId: string | null = args.nativeId;\n let sandbox: CodexTurnConfigIface['sandbox'] | null = null;\n // The credential variables and ChatGPT account the running app-server started with; a\n // change restarts it.\n let spawnedCredential: string | null = null;\n // The brokered credential the running app-server was started with.\n let spawnedFingerprint: string | null = null;\n const credentialKey = (credential: {\n env: Record<string, string | undefined>;\n chatgpt: ChatgptAuthTokensIface | null;\n }): string =>\n JSON.stringify({ env: credential.env, account: credential.chatgpt?.chatgptAccountId ?? null });\n let turn: TurnIface | null = null;\n // Completions that arrived before their turn/start answered.\n const early = new Map<string, TurnCompletionIface>();\n const pending = new Set<AbortController>();\n\n const finish = (current: TurnIface, completion: TurnCompletionIface | null) => {\n current.settled = true;\n current.started.resolve(null);\n current.done.resolve(completion);\n };\n\n const withAbort = async <T>(run: (signal: AbortSignal) => Promise<T>): Promise<T> => {\n const controller = new AbortController();\n pending.add(controller);\n try {\n return await run(controller.signal);\n } finally {\n pending.delete(controller);\n }\n };\n\n const askApproval = async (\n method: string,\n params: JsonValue | undefined,\n ): Promise<JsonObject> => {\n const parsed = approvalParamsSchema.safeParse(params);\n const fileChange = method === 'item/fileChange/requestApproval';\n const detail = parsed.success\n ? parsed.data\n : { itemId: undefined, command: null, reason: null };\n const title = fileChange ? 'Apply file changes' : (detail.command ?? 'Run command');\n const outcome = await withAbort((signal) =>\n sink.requestPermission(\n {\n sessionId: args.sessionId,\n title,\n description: detail.reason ?? null,\n subject: {\n type: 'tool_call',\n toolCall: {\n toolCallId: detail.itemId ?? crypto.randomUUID(),\n name: fileChange ? 'apply_patch' : 'exec_command',\n title,\n kind: fileChange ? 'edit' : 'execute',\n status: 'pending',\n rawInput: params ?? null,\n },\n },\n options: approvalOptions,\n },\n signal,\n ),\n );\n return { decision: decisionFor(outcome) };\n };\n\n const forwardElicitation = async (params: JsonValue | undefined): Promise<JsonObject> => {\n const parsed = elicitationParamsSchema.safeParse(params);\n if (!parsed.success) return { action: 'decline', content: null, _meta: null };\n const requestedSchema = z\n .object({ requestedSchema: z.record(z.string(), z.unknown()) })\n .safeParse(parsed.data);\n const url = z.object({ url: z.string(), elicitationId: z.string() }).safeParse(parsed.data);\n let request: CreateElicitationRequest;\n if (parsed.data.mode === 'url' && url.success) {\n request = {\n mode: 'url',\n sessionId: args.sessionId,\n message: parsed.data.message,\n ...url.data,\n };\n } else if (requestedSchema.success) {\n request = {\n mode: 'form',\n sessionId: args.sessionId,\n message: parsed.data.message,\n requestedSchema: requestedSchema.data.requestedSchema,\n };\n } else {\n return { action: 'decline', content: null, _meta: null };\n }\n const response = await withAbort((signal) => sink.elicit(request, signal));\n const accepted = z\n .object({ action: z.string(), content: jsonValueSchema.nullish() })\n .safeParse(response);\n if (!accepted.success) return { action: 'cancel', content: null, _meta: null };\n const action = ['accept', 'decline', 'cancel'].includes(accepted.data.action)\n ? accepted.data.action\n : 'cancel';\n return { action, content: accepted.data.content ?? null, _meta: null };\n };\n\n const askUserInput = async (params: JsonValue | undefined): Promise<ServerRequestOutcome> => {\n const parsed = userInputParamsSchema.safeParse(params);\n if (!parsed.success)\n return { error: { code: -32602, message: 'invalid user input questions' } };\n const questions = parsed.data.questions;\n // ACP's form schema has no secret-input field; never render one as ordinary text.\n if (questions.some((question) => question.isSecret)) {\n return { error: { code: -32000, message: 'secret questions are unavailable over ACP' } };\n }\n const properties = Object.fromEntries(\n questions.map((question): [string, ElicitationPropertySchema] => {\n const labels = question.options?.map((entry) => entry.label) ?? [];\n const property: ElicitationPropertySchema = {\n type: 'string',\n title: question.header,\n description: [\n question.question,\n ...(question.options?.map((entry) => `${entry.label}: ${entry.description}`) ?? []),\n ].join('\\n'),\n };\n if (labels.length > 0 && !question.isOther) property.enum = labels;\n return [question.id, property];\n }),\n );\n const response = await withAbort((signal) =>\n sink.elicit(\n {\n mode: 'form',\n sessionId: args.sessionId,\n message: questions.map((question) => question.question).join('\\n\\n'),\n requestedSchema: {\n type: 'object',\n properties,\n required: questions.map((question) => question.id),\n },\n },\n signal,\n ),\n );\n const accepted = z\n .object({ action: z.literal('accept'), content: z.record(z.string(), z.string()) })\n .safeParse(response);\n if (!accepted.success) return { result: { answers: {} } };\n const content = accepted.data.content;\n return {\n result: {\n answers: Object.fromEntries(\n questions.flatMap((question) => {\n const answer = content[question.id];\n return answer == null ? [] : [[question.id, { answers: [answer] }]];\n }),\n ),\n },\n };\n };\n\n const askPermissionProfile = async (params: JsonValue | undefined): Promise<JsonObject> => {\n const parsed = permissionProfileParamsSchema.safeParse(params);\n if (!parsed.success) return { permissions: {}, scope: 'turn' };\n const title = 'Grant additional permissions';\n const outcome = await withAbort((signal) =>\n sink.requestPermission(\n {\n sessionId: args.sessionId,\n title,\n description: parsed.data.reason ?? null,\n subject: {\n type: 'tool_call',\n toolCall: {\n toolCallId: parsed.data.itemId,\n name: 'request_permissions',\n title,\n kind: 'other',\n status: 'pending',\n rawInput: params ?? null,\n },\n },\n options: approvalOptions,\n },\n signal,\n ),\n );\n const allowed =\n outcome.outcome === 'selected' &&\n 'optionId' in outcome &&\n (outcome.optionId === 'allow_once' || outcome.optionId === 'allow_always');\n if (!allowed) return { permissions: {}, scope: 'turn' };\n return {\n permissions: parsed.data.permissions,\n scope: outcome.optionId === 'allow_always' ? 'session' : 'turn',\n };\n };\n\n const onServerRequest = async ({\n method,\n params,\n }: {\n method: string;\n params: JsonValue | undefined;\n }): Promise<ServerRequestOutcome> => {\n switch (method) {\n case 'item/commandExecution/requestApproval':\n case 'item/fileChange/requestApproval':\n return { result: await askApproval(method, params) };\n case 'mcpServer/elicitation/request':\n return { result: await forwardElicitation(params) };\n case 'item/tool/requestUserInput':\n return askUserInput(params);\n case 'item/permissions/requestApproval':\n return { result: await askPermissionProfile(params) };\n // The ChatGPT login was refused or expired: fresh tokens from the broker.\n case 'account/chatgptAuthTokens/refresh': {\n let tokens: ChatgptAuthTokensIface | null = null;\n try {\n tokens = (await deps.credentials?.refreshChatgpt()) ?? null;\n } catch (cause) {\n sink.log(`ChatGPT token refresh failed: ${errorMessageOf(cause)}`);\n }\n return tokens == null\n ? { error: { code: -32000, message: 'no ChatGPT credential to refresh' } }\n : { result: { ...tokens } };\n }\n default:\n return { error: { code: -32601, message: `unsupported request ${method}` } };\n }\n };\n\n const onNotification = ({\n method,\n params,\n }: {\n method: string;\n params: JsonValue | undefined;\n }) => {\n const translation = translateCodexNotification(translator, { method, params });\n for (const update of translation.updates) sink.update(update);\n const completed = translation.turnCompleted;\n if (completed == null) return;\n if (turn?.id === completed.turnId) finish(turn, completed);\n else early.set(completed.turnId, completed);\n };\n\n const threadParams = (config: CodexTurnConfigIface) => ({\n cwd: args.cwd,\n model: config.model,\n approvalPolicy: appServerApprovalPolicy(config.approvalPolicy),\n sandbox: config.sandbox,\n config: overrides,\n });\n\n const start = async (\n config: CodexTurnConfigIface,\n credential: CodexCredentialIface,\n ): Promise<JsonRpcPeerIface> => {\n const transport = spawnFor(deps, { cwd: args.cwd, log: sink.log }, credential.env);\n spawnedCredential = credentialKey(credential);\n spawnedFingerprint = credential.fingerprint;\n const next = createJsonRpcPeer({\n transport,\n onRequest: onServerRequest,\n onNotification,\n log: sink.log,\n });\n void next.closed.then(() => {\n if (peer !== next) return;\n peer = null;\n for (const controller of pending) controller.abort();\n if (turn != null) finish(turn, null);\n });\n peer = next;\n await next.request('initialize', initializeParams(deps.version));\n next.notify('initialized');\n if (credential.chatgpt != null)\n await next.request('account/login/start', {\n type: 'chatgptAuthTokens',\n ...credential.chatgpt,\n });\n if (threadId != null) {\n threadResponseSchema.parse(\n await next.request('thread/resume', { ...threadParams(config), threadId }),\n );\n } else if (args.forkOf != null) {\n const forked = threadResponseSchema.parse(\n await next.request('thread/fork', { ...threadParams(config), threadId: args.forkOf }),\n );\n threadId = forked.thread.id;\n sink.nativeIdChanged(threadId);\n } else {\n const started = threadResponseSchema.parse(\n await next.request('thread/start', threadParams(config)),\n );\n threadId = started.thread.id;\n sink.nativeIdChanged(threadId);\n }\n sandbox = config.sandbox;\n return next;\n };\n\n const stop = async () => {\n const current = peer;\n peer = null;\n await current?.shutdown().catch(() => undefined);\n };\n\n return {\n nativeId: () => threadId,\n run: async ({ input, signal, config }) => {\n // A turn cancelled before it starts sends nothing.\n if (signal.aborted) return { stopReason: StopReason.Cancelled, inputUnsent: true };\n const wanted = turnConfigOf(config);\n let credential: CodexCredentialIface = { env: {}, chatgpt: null, fingerprint: null };\n if (deps.credentials != null) {\n try {\n credential = await deps.credentials.resolve();\n } catch (cause) {\n return {\n stopReason: StopReason.Error,\n providerError: {\n code: 'credential_unavailable',\n message: `Codex has no model credential: ${errorMessageOf(cause)}`,\n retryable: true,\n },\n };\n }\n }\n if (\n peer != null &&\n (sandbox !== wanted.sandbox || spawnedCredential !== credentialKey(credential))\n )\n await stop();\n let current = peer;\n if (current == null) {\n try {\n current = await start(wanted, credential);\n } catch (cause) {\n if (!isCodexNotInstalled(cause)) throw cause;\n return {\n stopReason: StopReason.Error,\n providerError: {\n code: 'harness_not_installed',\n message: errorMessageOf(cause),\n retryable: false,\n },\n };\n }\n }\n // Cancelled while the app-server started: the turn is never submitted.\n if (signal.aborted) return { stopReason: StopReason.Cancelled, inputUnsent: true };\n const started: TurnIface = {\n id: null,\n started: Promise.withResolvers(),\n done: Promise.withResolvers(),\n settled: false,\n signal,\n };\n turn = started;\n const interrupt = () => {\n for (const controller of pending) controller.abort();\n if (started.id == null || threadId == null) return;\n void current\n .request('turn/interrupt', { threadId, turnId: started.id })\n .catch((cause: unknown) => sink.log(`turn/interrupt failed: ${errorMessageOf(cause)}`));\n };\n signal.addEventListener('abort', interrupt, { once: true });\n try {\n const response = turnResponseSchema.parse(\n await current.request('turn/start', {\n threadId,\n input: inputOf(input),\n model: wanted.model,\n effort: wanted.effort,\n approvalPolicy: appServerApprovalPolicy(wanted.approvalPolicy),\n }),\n );\n started.id = response.turn.id;\n started.started.resolve(response.turn.id);\n const finished = early.get(response.turn.id);\n early.delete(response.turn.id);\n if (finished != null) finish(started, finished);\n if (signal.aborted) interrupt();\n const completion = await started.done.promise;\n if (signal.aborted) return { stopReason: StopReason.Cancelled, usage: completion?.usage };\n if (completion == null) {\n return {\n stopReason: StopReason.Error,\n providerError: {\n code: 'app_server_exited',\n message: 'the Codex app-server exited mid-turn',\n retryable: true,\n },\n };\n }\n // Out of ChatGPT limit: the next turn runs on the chain's next source (a restarted\n // app-server), until the subscription resets.\n const limitedFingerprint = spawnedFingerprint;\n if (\n credential.chatgpt != null &&\n limitedFingerprint != null &&\n completion.providerError != null &&\n CHATGPT_LIMIT_ERRORS.has(completion.providerError.code)\n ) {\n await deps.credentials\n ?.chatgptLimited({ fingerprint: limitedFingerprint })\n .catch((cause: unknown) =>\n sink.log(`reporting the ChatGPT limit failed: ${errorMessageOf(cause)}`),\n );\n }\n const end: AdapterTurnEndIface = {\n stopReason: completion.stopReason,\n providerError: completion.providerError,\n usage: completion.usage,\n };\n return end;\n } finally {\n started.settled = true;\n started.started.resolve(null);\n signal.removeEventListener('abort', interrupt);\n if (turn === started) turn = null;\n }\n },\n // turn/steer adds the input to the running turn; Codex answers it before the turn ends.\n inject: async (input) => {\n const current = turn;\n const connection = peer;\n if (current == null || connection == null || threadId == null) return false;\n const turnId = await current.started.promise;\n if (turnId == null || current.settled || current.signal.aborted) return false;\n try {\n turnSteerResponseSchema.parse(\n await connection.request('turn/steer', {\n threadId,\n expectedTurnId: turnId,\n input: inputOf(input),\n }),\n );\n return true;\n } catch (cause) {\n // The turn ended first (or the app-server refused): the prompt queues instead.\n sink.log(`turn/steer failed: ${errorMessageOf(cause)}`);\n return false;\n }\n },\n close: async () => {\n await stop();\n await proxy.close();\n },\n };\n};\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@finalai/acp-adapter-codex",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.2.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Codex as an ACP v2 agent with Final's ACP extensions, over stdio, on the Codex app-server.",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -32,7 +32,8 @@
|
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@agentclientprotocol/sdk": "1.8.0",
|
|
35
|
-
"@finalai/acp-session": "0.
|
|
35
|
+
"@finalai/acp-session": "0.6.0",
|
|
36
|
+
"@finalai/agent-provider": "0.14.0",
|
|
36
37
|
"@openai/codex": "0.167.0",
|
|
37
38
|
"zod": "4.6.6"
|
|
38
39
|
},
|