@botiverse/oar 0.95.1 → 0.97.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 +64 -44
- package/dist/contracts/context-usage.d.ts +7 -0
- package/dist/contracts/context-usage.d.ts.map +1 -0
- package/dist/contracts/context-usage.js +2 -0
- package/dist/contracts/context-usage.js.map +1 -0
- package/dist/contracts/control.d.ts +4 -1
- package/dist/contracts/control.d.ts.map +1 -1
- package/dist/contracts/deliver.d.ts +3 -1
- package/dist/contracts/deliver.d.ts.map +1 -1
- package/dist/contracts/index.d.ts +1 -1
- package/dist/contracts/index.d.ts.map +1 -1
- package/dist/contracts/index.js.map +1 -1
- package/dist/contracts/records.d.ts +8 -9
- package/dist/contracts/records.d.ts.map +1 -1
- package/dist/contracts/runtime-failure-error.d.ts +9 -3
- package/dist/contracts/runtime-failure-error.d.ts.map +1 -1
- package/dist/contracts/runtime-failure-error.js +0 -9
- package/dist/contracts/runtime-failure-error.js.map +1 -1
- package/dist/contracts/session.d.ts +3 -1
- package/dist/contracts/session.d.ts.map +1 -1
- package/dist/runtimes/antigravity/auth.d.ts +11 -0
- package/dist/runtimes/antigravity/auth.d.ts.map +1 -0
- package/dist/runtimes/antigravity/auth.js +207 -0
- package/dist/runtimes/antigravity/auth.js.map +1 -0
- package/dist/runtimes/antigravity/index.d.ts +3 -0
- package/dist/runtimes/antigravity/index.d.ts.map +1 -1
- package/dist/runtimes/antigravity/index.js +4 -0
- package/dist/runtimes/antigravity/index.js.map +1 -1
- package/dist/runtimes/antigravity/login-browser.d.ts +14 -0
- package/dist/runtimes/antigravity/login-browser.d.ts.map +1 -0
- package/dist/runtimes/antigravity/login-browser.js +30 -0
- package/dist/runtimes/antigravity/login-browser.js.map +1 -0
- package/dist/runtimes/codex/installation.d.ts +8 -0
- package/dist/runtimes/codex/installation.d.ts.map +1 -1
- package/dist/runtimes/codex/installation.js +22 -1
- package/dist/runtimes/codex/installation.js.map +1 -1
- package/dist/runtimes/codex/refusal.d.ts +33 -0
- package/dist/runtimes/codex/refusal.d.ts.map +1 -0
- package/dist/runtimes/codex/refusal.js +90 -0
- package/dist/runtimes/codex/refusal.js.map +1 -0
- package/dist/runtimes/codex/rpc-control.d.ts +13 -1
- package/dist/runtimes/codex/rpc-control.d.ts.map +1 -1
- package/dist/runtimes/codex/rpc-control.js +23 -2
- package/dist/runtimes/codex/rpc-control.js.map +1 -1
- package/dist/runtimes/codex/session.d.ts.map +1 -1
- package/dist/runtimes/codex/session.js +19 -13
- package/dist/runtimes/codex/session.js.map +1 -1
- package/dist/runtimes/cursor/auth-status.d.ts +1 -1
- package/dist/runtimes/cursor/auth-status.js +2 -2
- package/dist/runtimes/cursor/index.d.ts +1 -1
- package/dist/runtimes/cursor/login.js +1 -1
- package/dist/runtimes/cursor/logout.js +1 -1
- package/dist/runtimes/grok/failure.d.ts.map +1 -1
- package/dist/runtimes/grok/failure.js +35 -6
- package/dist/runtimes/grok/failure.js.map +1 -1
- package/dist/runtimes/grok/native-turns.d.ts +13 -0
- package/dist/runtimes/grok/native-turns.d.ts.map +1 -0
- package/dist/runtimes/grok/native-turns.js +49 -0
- package/dist/runtimes/grok/native-turns.js.map +1 -0
- package/dist/runtimes/grok/session.d.ts.map +1 -1
- package/dist/runtimes/grok/session.js +12 -6
- package/dist/runtimes/grok/session.js.map +1 -1
- package/dist/runtimes/grok/spontaneous-usage.d.ts +6 -5
- package/dist/runtimes/grok/spontaneous-usage.d.ts.map +1 -1
- package/dist/runtimes/grok/spontaneous-usage.js +7 -6
- package/dist/runtimes/grok/spontaneous-usage.js.map +1 -1
- package/dist/runtimes/opencode/failure.d.ts +3 -0
- package/dist/runtimes/opencode/failure.d.ts.map +1 -0
- package/dist/runtimes/opencode/failure.js +29 -0
- package/dist/runtimes/opencode/failure.js.map +1 -0
- package/dist/runtimes/opencode/session.d.ts.map +1 -1
- package/dist/runtimes/opencode/session.js +2 -0
- package/dist/runtimes/opencode/session.js.map +1 -1
- package/dist/shared/acp/native-turns.d.ts +37 -0
- package/dist/shared/acp/native-turns.d.ts.map +1 -0
- package/dist/shared/acp/native-turns.js +107 -0
- package/dist/shared/acp/native-turns.js.map +1 -0
- package/dist/shared/acp/profile.d.ts +44 -2
- package/dist/shared/acp/profile.d.ts.map +1 -1
- package/dist/shared/acp/profile.js.map +1 -1
- package/dist/shared/acp/records.d.ts +4 -1
- package/dist/shared/acp/records.d.ts.map +1 -1
- package/dist/shared/acp/records.js +2 -2
- package/dist/shared/acp/records.js.map +1 -1
- package/dist/shared/acp/session-state.d.ts +22 -0
- package/dist/shared/acp/session-state.d.ts.map +1 -0
- package/dist/shared/acp/session-state.js +39 -0
- package/dist/shared/acp/session-state.js.map +1 -0
- package/dist/shared/acp/session.d.ts +3 -17
- package/dist/shared/acp/session.d.ts.map +1 -1
- package/dist/shared/acp/session.js +25 -43
- package/dist/shared/acp/session.js.map +1 -1
- package/dist/shared/acp/steer-request.d.ts +12 -0
- package/dist/shared/acp/steer-request.d.ts.map +1 -0
- package/dist/shared/acp/steer-request.js +56 -0
- package/dist/shared/acp/steer-request.js.map +1 -0
- package/dist/shared/acp/token-usage.d.ts +1 -1
- package/dist/shared/acp/token-usage.d.ts.map +1 -1
- package/dist/shared/acp/token-usage.js +2 -2
- package/dist/shared/acp/token-usage.js.map +1 -1
- package/dist/shared/acp/turns.d.ts +6 -2
- package/dist/shared/acp/turns.d.ts.map +1 -1
- package/dist/shared/acp/turns.js +4 -3
- package/dist/shared/acp/turns.js.map +1 -1
- package/dist/shared/deliver-interrupt.d.ts.map +1 -1
- package/dist/shared/deliver-interrupt.js +2 -1
- package/dist/shared/deliver-interrupt.js.map +1 -1
- package/dist/shared/deliver.d.ts +5 -1
- package/dist/shared/deliver.d.ts.map +1 -1
- package/dist/shared/deliver.js +5 -1
- package/dist/shared/deliver.js.map +1 -1
- package/dist/shared/record-retention.d.ts.map +1 -1
- package/dist/shared/record-retention.js +3 -1
- package/dist/shared/record-retention.js.map +1 -1
- package/dist/shared/seal-session.d.ts.map +1 -1
- package/dist/shared/seal-session.js +3 -2
- package/dist/shared/seal-session.js.map +1 -1
- package/package.json +3 -3
|
@@ -0,0 +1,207 @@
|
|
|
1
|
+
import { sessionEnvironment } from "../../shared/environment.js";
|
|
2
|
+
import { runExecutable } from "../../shared/executable/index.js";
|
|
3
|
+
import { withQueryDeadline } from "../../shared/executable/query.js";
|
|
4
|
+
import { antigravityNoBrowserEnv } from "./login-browser.js";
|
|
5
|
+
import { errorMessage, LoginSecrets, loginBounds, loginExecutable, spawnLoginProcess, stoppedResult } from "../../shared/login.js";
|
|
6
|
+
/*
|
|
7
|
+
* Antigravity's own login (agy 1.5.5, 2026-11-10; experiments and notes in
|
|
8
|
+
* docs/runtimes/antigravity.md#login). `agy acp --login` ("Log in with Google
|
|
9
|
+
* interactively, then exit") prints
|
|
10
|
+
*
|
|
11
|
+
* Open this link in a browser to log in with Google:
|
|
12
|
+
* https://accounts.google.com/o/oauth2/auth?...
|
|
13
|
+
* Then paste the authorization code, or the full URL of the page you land on, and press Enter:
|
|
14
|
+
*
|
|
15
|
+
* and reads that line from stdin; with none it ends `login cancelled: no
|
|
16
|
+
* authorization code was entered` (exit 1). The CLI decides where the token
|
|
17
|
+
* goes (a 0600 file under `$GEMINI_HOME/antigravity-cli/`, or a keyring it
|
|
18
|
+
* detects); OAR never reads or writes it. Status is `agy models`, which
|
|
19
|
+
* refuses with "Please sign in" when there is no login. There is no logout:
|
|
20
|
+
* the CLI refuses `/logout` outside its interactive UI ("it clears stored
|
|
21
|
+
* credentials"), so the runtime has no `logout` member.
|
|
22
|
+
*/
|
|
23
|
+
const SOURCE = "agy models";
|
|
24
|
+
const LOGIN_TIMEOUT_MS = 15 * 60_000;
|
|
25
|
+
const URL_LINE = /^(https:\/\/accounts\.google\.com\/\S+)$/u;
|
|
26
|
+
const PASTE_PROMPT = /Then paste the authorization code\b/u;
|
|
27
|
+
const SIGNED_OUT = /Please sign in\b/iu;
|
|
28
|
+
export async function readAntigravityAuthStatus(installation, options = {}) {
|
|
29
|
+
if (installation.via !== "executable") {
|
|
30
|
+
return { kind: "unknown", detail: "not a machine-installed executable" };
|
|
31
|
+
}
|
|
32
|
+
const result = await runExecutable(installation.command, ["models"], {
|
|
33
|
+
env: sessionEnvironment(options.env), timeoutMs: options.timeoutMs ?? 30_000, ...(options.signal === undefined ? {} : { signal: options.signal }),
|
|
34
|
+
});
|
|
35
|
+
if (result.ok) {
|
|
36
|
+
return { kind: "logged_in", source: SOURCE };
|
|
37
|
+
}
|
|
38
|
+
// Its refusal names the missing login; any other failure (network, a crash) says nothing about it.
|
|
39
|
+
if (result.exitCode === 1 && SIGNED_OUT.test(`${result.stdout}\n${result.stderr}`)) {
|
|
40
|
+
return { kind: "logged_out", source: SOURCE };
|
|
41
|
+
}
|
|
42
|
+
return { kind: "unknown", source: SOURCE, detail: "agy models ended without saying whether it is signed in" };
|
|
43
|
+
}
|
|
44
|
+
/** Whether Antigravity is signed in, by its own model listing (a remote call: not localOnly). */
|
|
45
|
+
export async function antigravityAuthStatus(installation, options = {}) {
|
|
46
|
+
const status = await withQueryDeadline("Antigravity auth status", options.timeoutMs ?? 30_000, async (signal) => {
|
|
47
|
+
const read = await readAntigravityAuthStatus(installation, { ...options, signal });
|
|
48
|
+
return read;
|
|
49
|
+
}, { kind: "unknown", source: SOURCE, detail: "Antigravity auth status timed out" });
|
|
50
|
+
return status;
|
|
51
|
+
}
|
|
52
|
+
/** The secret query values of a pasted landing URL (`code`, also percent-decoded); none for a bare code. */
|
|
53
|
+
function landingCodes(answer) {
|
|
54
|
+
if (!URL.canParse(answer)) {
|
|
55
|
+
return [];
|
|
56
|
+
}
|
|
57
|
+
const value = new URL(answer).searchParams.get("code");
|
|
58
|
+
if (value === null || value === "") {
|
|
59
|
+
return [];
|
|
60
|
+
}
|
|
61
|
+
const raw = /[?&]code=([^&#]*)/u.exec(answer)?.[1];
|
|
62
|
+
return [...new Set([value, ...(raw === undefined ? [] : [raw])])];
|
|
63
|
+
}
|
|
64
|
+
/** Exit 0 is only agy's word: its status decides, and an unanswered status leaves a login without an account. */
|
|
65
|
+
async function confirmed(installation, signal, env) {
|
|
66
|
+
// The status query after a success is bounded like every runtime's (docs/spec/login.md: up to 20 s).
|
|
67
|
+
const status = signal?.aborted === true ? undefined : await readAntigravityAuthStatus(installation, { env, timeoutMs: 20_000, ...(signal === undefined ? {} : { signal }) });
|
|
68
|
+
if (status?.kind === "logged_out") {
|
|
69
|
+
return { kind: "failed", reason: "not_logged_in", detail: "agy acp --login exited 0, yet agy models asks to sign in" };
|
|
70
|
+
}
|
|
71
|
+
return { kind: "logged_in" };
|
|
72
|
+
}
|
|
73
|
+
// oxlint-disable-next-line eslint/max-lines-per-function, eslint/max-statements -- One native flow: relay, ask, write, then settle every ending.
|
|
74
|
+
async function runAntigravityLogin(installation, command, interaction, timeoutMs, options, env) {
|
|
75
|
+
const secrets = new LoginSecrets();
|
|
76
|
+
const interactionFailure = Promise.withResolvers();
|
|
77
|
+
const flow = { urlSent: false, asked: false, settled: false, lastLine: undefined };
|
|
78
|
+
/** Read after a wait: the login may have ended while the caller answered. */
|
|
79
|
+
const ended = () => flow.settled;
|
|
80
|
+
let child = null;
|
|
81
|
+
const interactionFailed = (error) => {
|
|
82
|
+
flow.settled = true;
|
|
83
|
+
interactionFailure.resolve({ kind: "interaction_failed", message: errorMessage(error) });
|
|
84
|
+
};
|
|
85
|
+
const ask = async () => {
|
|
86
|
+
if (flow.asked || ended()) {
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
89
|
+
flow.asked = true;
|
|
90
|
+
let answer = "";
|
|
91
|
+
try {
|
|
92
|
+
answer = await interaction.prompt({ kind: "manual_code", message: "Paste the authorization code, or the full URL of the page you land on after signing in" });
|
|
93
|
+
}
|
|
94
|
+
catch (error) {
|
|
95
|
+
if (interaction.signal?.aborted !== true) {
|
|
96
|
+
interactionFailed(error);
|
|
97
|
+
}
|
|
98
|
+
return;
|
|
99
|
+
}
|
|
100
|
+
const code = answer.trim();
|
|
101
|
+
if (ended()) {
|
|
102
|
+
return;
|
|
103
|
+
}
|
|
104
|
+
// agy waits on an empty line (live 1.5.5): ask again rather than leave it waiting.
|
|
105
|
+
if (code === "") {
|
|
106
|
+
flow.asked = false;
|
|
107
|
+
await ask();
|
|
108
|
+
return;
|
|
109
|
+
}
|
|
110
|
+
// The code (or a landing URL carrying it) is the secret; only agy's stdin sees it.
|
|
111
|
+
secrets.add(code);
|
|
112
|
+
// A pasted landing URL carries the code as a query value; agy may echo that alone.
|
|
113
|
+
for (const part of landingCodes(code)) {
|
|
114
|
+
secrets.add(part);
|
|
115
|
+
}
|
|
116
|
+
child?.write(`${code}\n`);
|
|
117
|
+
};
|
|
118
|
+
try {
|
|
119
|
+
child = spawnLoginProcess(command, ["acp", "--login"], env, {
|
|
120
|
+
onLine(line) {
|
|
121
|
+
const url = URL_LINE.exec(line)?.[1];
|
|
122
|
+
if (url !== undefined && !flow.urlSent) {
|
|
123
|
+
flow.urlSent = true;
|
|
124
|
+
try {
|
|
125
|
+
interaction.onEvent({ kind: "auth_url", url, instructions: "Open this URL and sign in with Google, then paste the code the page shows (or its full address)." });
|
|
126
|
+
}
|
|
127
|
+
catch (error) {
|
|
128
|
+
interactionFailed(error);
|
|
129
|
+
}
|
|
130
|
+
return;
|
|
131
|
+
}
|
|
132
|
+
if (PASTE_PROMPT.test(line)) {
|
|
133
|
+
void ask();
|
|
134
|
+
return;
|
|
135
|
+
}
|
|
136
|
+
flow.lastLine = line;
|
|
137
|
+
},
|
|
138
|
+
onPartial(partial) { if (PASTE_PROMPT.test(partial)) {
|
|
139
|
+
void ask();
|
|
140
|
+
} },
|
|
141
|
+
});
|
|
142
|
+
}
|
|
143
|
+
catch (error) {
|
|
144
|
+
return { kind: "failed", reason: "process_failed", detail: secrets.line(errorMessage(error)) };
|
|
145
|
+
}
|
|
146
|
+
const bounds = loginBounds(interaction.signal, timeoutMs);
|
|
147
|
+
try {
|
|
148
|
+
const ending = await Promise.race([
|
|
149
|
+
// oxlint-disable-next-line promise/prefer-await-to-then -- racing three endings
|
|
150
|
+
child.exited.then((exit) => ({ kind: "exit", exit })),
|
|
151
|
+
// oxlint-disable-next-line promise/prefer-await-to-then -- racing three endings
|
|
152
|
+
bounds.stopped.then((stop) => ({ kind: "stop", stop })),
|
|
153
|
+
interactionFailure.promise,
|
|
154
|
+
]);
|
|
155
|
+
flow.settled = true;
|
|
156
|
+
if (ending.kind === "stop") {
|
|
157
|
+
child.stop();
|
|
158
|
+
await child.exited;
|
|
159
|
+
return stoppedResult(ending.stop, timeoutMs);
|
|
160
|
+
}
|
|
161
|
+
if (ending.kind === "interaction_failed") {
|
|
162
|
+
child.stop();
|
|
163
|
+
await child.exited;
|
|
164
|
+
return { kind: "failed", reason: "interaction_failed", detail: secrets.line(ending.message) };
|
|
165
|
+
}
|
|
166
|
+
const { exit } = ending;
|
|
167
|
+
if (exit.exitCode === 0 && exit.error === undefined) {
|
|
168
|
+
return await confirmed(installation, interaction.signal, options.env);
|
|
169
|
+
}
|
|
170
|
+
if (exit.error !== undefined) {
|
|
171
|
+
return { kind: "failed", reason: "process_failed", detail: secrets.line(exit.error) };
|
|
172
|
+
}
|
|
173
|
+
const how = exit.exitCode === null ? `signal ${exit.signal ?? "unknown"}` : `code ${String(exit.exitCode)}`;
|
|
174
|
+
return { kind: "failed", reason: exit.exitCode === 1 && flow.lastLine !== undefined ? "rejected" : "process_failed", detail: flow.lastLine === undefined ? `agy acp --login exited with ${how}` : secrets.line(flow.lastLine) };
|
|
175
|
+
}
|
|
176
|
+
finally {
|
|
177
|
+
flow.settled = true;
|
|
178
|
+
bounds.dispose();
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
/** Signs Antigravity in with its own `agy acp --login`, relaying the Google URL and writing the pasted code to its stdin. */
|
|
182
|
+
export async function antigravityLogin(installation, interaction, options = {}) {
|
|
183
|
+
const target = loginExecutable(installation, "agy", undefined, sessionEnvironment(options.env));
|
|
184
|
+
if (target.kind === "settled") {
|
|
185
|
+
return target.result;
|
|
186
|
+
}
|
|
187
|
+
if (interaction.signal?.aborted === true) {
|
|
188
|
+
return { kind: "cancelled" };
|
|
189
|
+
}
|
|
190
|
+
let browser = undefined;
|
|
191
|
+
if (options.openBrowser === false) {
|
|
192
|
+
try {
|
|
193
|
+
browser = await antigravityNoBrowserEnv(sessionEnvironment(options.env));
|
|
194
|
+
}
|
|
195
|
+
catch {
|
|
196
|
+
return { kind: "unsupported", reason: "browser_suppression_unavailable", detail: "agy opens its own browser and this machine cannot replace its launcher; allow local browser opening" };
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
try {
|
|
200
|
+
const result = await runAntigravityLogin(installation, target.installation.command, interaction, options.timeoutMs ?? LOGIN_TIMEOUT_MS, options, browser?.env ?? sessionEnvironment(options.env));
|
|
201
|
+
return result;
|
|
202
|
+
}
|
|
203
|
+
finally {
|
|
204
|
+
await browser?.dispose();
|
|
205
|
+
}
|
|
206
|
+
}
|
|
207
|
+
//# sourceMappingURL=auth.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth.js","sources":["../../../src/runtimes/antigravity/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { antigravityAuthStatus, antigravityLogin } from "./auth.js";
|
|
1
2
|
export declare const antigravityRuntime: Omit<{
|
|
2
3
|
readonly id: "antigravity";
|
|
3
4
|
readonly manualCompaction: {
|
|
@@ -14,6 +15,8 @@ export declare const antigravityRuntime: Omit<{
|
|
|
14
15
|
readonly session: (installation: import("../../browser.js").AvailableInstallation, options: import("../../browser.js").SessionOptions, context?: import("../../browser.js").SessionOpenContext | undefined) => Promise<import("../../browser.js").Session>;
|
|
15
16
|
readonly listModels: (installation: import("../../browser.js").AvailableInstallation, options?: import("../../browser.js").ListModelsOptions | undefined) => Promise<import("../../browser.js").ListModelsResult>;
|
|
16
17
|
readonly checkUpdate: import("../../browser.js").UpdateChecker;
|
|
18
|
+
readonly login: typeof antigravityLogin;
|
|
19
|
+
readonly authStatus: typeof antigravityAuthStatus;
|
|
17
20
|
readonly refusedSessionOptions: Readonly<Partial<Record<import("../../contracts/runtime.js").RefusableSessionOption, string>>>;
|
|
18
21
|
readonly mcpToolsListChanged: "none";
|
|
19
22
|
}, "execution" | "placement" | "session" | "withPlacement"> & import("../../contracts/runtime.js").Runtime;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sources":["../../../src/runtimes/antigravity/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sources":["../../../src/runtimes/antigravity/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAEpE,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;0GAqBH,CAAC"}
|
|
@@ -5,6 +5,7 @@ import { antigravityInstallation } from "./installation.js";
|
|
|
5
5
|
import { antigravityInstall, antigravityInstallPlan } from "./install.js";
|
|
6
6
|
import { antigravityCheckUpdate } from "./update.js";
|
|
7
7
|
import { antigravityRefusedSessionOptions } from "./options.js";
|
|
8
|
+
import { antigravityAuthStatus, antigravityLogin } from "./auth.js";
|
|
8
9
|
export const antigravityRuntime = defineRuntime({
|
|
9
10
|
id: "antigravity",
|
|
10
11
|
manualCompaction: { kind: "unsupported", reason: "The CLI advertises /compact, but no structured completion and attribution contract has been verified." },
|
|
@@ -21,6 +22,9 @@ export const antigravityRuntime = defineRuntime({
|
|
|
21
22
|
return antigravityListModels;
|
|
22
23
|
}),
|
|
23
24
|
checkUpdate: antigravityCheckUpdate,
|
|
25
|
+
// No logout: the CLI refuses /logout outside its interactive UI (auth.ts).
|
|
26
|
+
login: antigravityLogin,
|
|
27
|
+
authStatus: antigravityAuthStatus,
|
|
24
28
|
refusedSessionOptions: antigravityRefusedSessionOptions,
|
|
25
29
|
mcpToolsListChanged: "none",
|
|
26
30
|
}, { execution: "process" });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../../src/runtimes/antigravity/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,gCAAgC,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../src/runtimes/antigravity/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,gCAAgC,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAEpE,MAAM,CAAC,MAAM,kBAAkB,GAAG,aAAa,CAAC;IAC9C,EAAE,EAAE,aAAa;IACjB,gBAAgB,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,uGAAuG,EAAE;IAC1J,KAAK,EAAE,aAAa,CAAC,WAAW;IAChC,YAAY,EAAE,uBAAuB;IACrC,WAAW,EAAE,sBAAsB;IACnC,OAAO,EAAE,kBAAkB;IAC3B,OAAO,EAAE,WAAW,CAAC,KAAK,IAAI,EAAE;QAC9B,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC;QAC5D,OAAO,kBAAkB,CAAC;IAC5B,CAAC,CAAC;IACF,UAAU,EAAE,WAAW,CAAC,KAAK,IAAI,EAAE;QACjC,MAAM,EAAE,qBAAqB,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;QACnE,OAAO,qBAAqB,CAAC;IAC/B,CAAC,CAAC;IACF,WAAW,EAAE,sBAAsB;IACnC,2EAA2E;IAC3E,KAAK,EAAE,gBAAgB;IACvB,UAAU,EAAE,qBAAqB;IACjC,qBAAqB,EAAE,gCAAgC;IACvD,mBAAmB,EAAE,MAAM;CAC5B,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* agy 1.5.5 ignores BROWSER and starts the platform launcher itself. On Linux
|
|
3
|
+
* it finds `xdg-open` on PATH (live control), so for `openBrowser: false` the
|
|
4
|
+
* login child gets a PATH whose first directory holds a launcher that does
|
|
5
|
+
* nothing (as Kimi's login does); macOS `open` is treated alike. On Windows it
|
|
6
|
+
* runs `%SYSTEMROOT%\System32\rundll32.exe` by absolute path (Otter, static
|
|
7
|
+
* reading of the official binary), which no PATH entry can replace, and
|
|
8
|
+
* changing SYSTEMROOT would change far more than the browser: refused.
|
|
9
|
+
*/
|
|
10
|
+
export declare function antigravityNoBrowserEnv(env: NodeJS.ProcessEnv): Promise<{
|
|
11
|
+
readonly env: NodeJS.ProcessEnv;
|
|
12
|
+
dispose(): Promise<void>;
|
|
13
|
+
}>;
|
|
14
|
+
//# sourceMappingURL=login-browser.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"login-browser.d.ts","sources":["../../../src/runtimes/antigravity/login-browser.ts"],"names":[],"mappings":"AAKA;;;;;;;;GAQG;AACH,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC;IAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC,CAS5I"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { mkdtemp, rm, writeFile } from "node:fs/promises";
|
|
2
|
+
import { tmpdir } from "node:os";
|
|
3
|
+
import path from "node:path";
|
|
4
|
+
import { environmentValue, sessionEnvironment } from "../../shared/environment.js";
|
|
5
|
+
/**
|
|
6
|
+
* agy 1.5.5 ignores BROWSER and starts the platform launcher itself. On Linux
|
|
7
|
+
* it finds `xdg-open` on PATH (live control), so for `openBrowser: false` the
|
|
8
|
+
* login child gets a PATH whose first directory holds a launcher that does
|
|
9
|
+
* nothing (as Kimi's login does); macOS `open` is treated alike. On Windows it
|
|
10
|
+
* runs `%SYSTEMROOT%\System32\rundll32.exe` by absolute path (Otter, static
|
|
11
|
+
* reading of the official binary), which no PATH entry can replace, and
|
|
12
|
+
* changing SYSTEMROOT would change far more than the browser: refused.
|
|
13
|
+
*/
|
|
14
|
+
export async function antigravityNoBrowserEnv(env) {
|
|
15
|
+
if (!["linux", "darwin"].includes(process.platform)) {
|
|
16
|
+
throw new Error("Antigravity browser suppression is unavailable on this platform");
|
|
17
|
+
}
|
|
18
|
+
const directory = await mkdtemp(path.join(tmpdir(), "oar-agy-browser-"));
|
|
19
|
+
const dispose = async () => { await rm(directory, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 }); };
|
|
20
|
+
try {
|
|
21
|
+
await writeFile(path.join(directory, process.platform === "darwin" ? "open" : "xdg-open"), "#!/bin/sh\nexit 0\n", { mode: 0o700, flag: "wx" });
|
|
22
|
+
const value = environmentValue(env, "PATH");
|
|
23
|
+
return { env: sessionEnvironment({ PATH: directory + (value === undefined || value === "" ? "" : path.delimiter + value) }, env), dispose };
|
|
24
|
+
}
|
|
25
|
+
catch (error) {
|
|
26
|
+
await dispose();
|
|
27
|
+
throw error;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
//# sourceMappingURL=login-browser.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"login-browser.js","sources":["../../../src/runtimes/antigravity/login-browser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEnF;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,GAAsB;IAClE,IAAI,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QAAC,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;IAAC,CAAC;IAC5I,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,kBAAkB,CAAC,CAAC,CAAC;IACzE,MAAM,OAAO,GAAG,KAAK,IAAmB,EAAE,GAAG,MAAM,EAAE,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACvI,IAAI,CAAC;QACH,MAAM,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,qBAAqB,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/I,MAAM,KAAK,GAAG,gBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC5C,OAAO,EAAE,GAAG,EAAE,kBAAkB,CAAC,EAAE,IAAI,EAAE,SAAS,GAAG,CAAC,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,CAAC;IAC9I,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAAC,MAAM,OAAO,EAAE,CAAC;QAAC,MAAM,KAAK,CAAC;IAAC,CAAC;AACnD,CAAC"}
|
|
@@ -7,6 +7,14 @@
|
|
|
7
7
|
* by default `~/.local/bin/codex`, a link into
|
|
8
8
|
* `$CODEX_HOME/packages/standalone/current`), which it adds to PATH only in
|
|
9
9
|
* shell profiles.
|
|
10
|
+
*
|
|
11
|
+
* On Windows (none of them on PATH): npm's global `codex.cmd` shim in its
|
|
12
|
+
* default prefix (`%APPDATA%\npm`; OAR runs the shim's Node script without
|
|
13
|
+
* cmd.exe, windows-shim.ts), then the Codex Desktop app's CLI
|
|
14
|
+
* (`%LOCALAPPDATA%\Programs\OpenAI\Codex\bin\codex.exe`, or without
|
|
15
|
+
* `Programs` for a per-user install). Locations as Raft's own Codex driver
|
|
16
|
+
* resolves them; the `codex-command-runner` sandbox helper beside them is
|
|
17
|
+
* never a candidate.
|
|
10
18
|
*/
|
|
11
19
|
export declare function codexInstalledExecutableCandidates(platform?: NodeJS.Platform, home?: string, env?: Readonly<NodeJS.ProcessEnv>): readonly string[];
|
|
12
20
|
export declare const codexInstallation: import("../../browser.js").InstallationProbe;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installation.d.ts","sources":["../../../src/runtimes/codex/installation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"installation.d.ts","sources":["../../../src/runtimes/codex/installation.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,kCAAkC,CAChD,QAAQ,GAAE,MAAM,CAAC,QAA2B,EAC5C,IAAI,GAAE,MAAkB,EACxB,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAe,GAC7C,SAAS,MAAM,EAAE,CA2BnB;AAGD,eAAO,MAAM,iBAAiB,8CAK7B,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { environmentHome } from "../../shared/environment-home.js";
|
|
2
|
+
import { environmentValue } from "../../shared/environment.js";
|
|
2
3
|
import { homedir } from "node:os";
|
|
3
4
|
import path from "node:path";
|
|
4
5
|
import { executableInstallation } from "../../shared/installation.js";
|
|
@@ -11,10 +12,30 @@ import { executableInstallation } from "../../shared/installation.js";
|
|
|
11
12
|
* by default `~/.local/bin/codex`, a link into
|
|
12
13
|
* `$CODEX_HOME/packages/standalone/current`), which it adds to PATH only in
|
|
13
14
|
* shell profiles.
|
|
15
|
+
*
|
|
16
|
+
* On Windows (none of them on PATH): npm's global `codex.cmd` shim in its
|
|
17
|
+
* default prefix (`%APPDATA%\npm`; OAR runs the shim's Node script without
|
|
18
|
+
* cmd.exe, windows-shim.ts), then the Codex Desktop app's CLI
|
|
19
|
+
* (`%LOCALAPPDATA%\Programs\OpenAI\Codex\bin\codex.exe`, or without
|
|
20
|
+
* `Programs` for a per-user install). Locations as Raft's own Codex driver
|
|
21
|
+
* resolves them; the `codex-command-runner` sandbox helper beside them is
|
|
22
|
+
* never a candidate.
|
|
14
23
|
*/
|
|
15
24
|
export function codexInstalledExecutableCandidates(platform = process.platform, home = homedir(), env = process.env) {
|
|
16
25
|
if (platform === "win32") {
|
|
17
|
-
|
|
26
|
+
const win = path.win32;
|
|
27
|
+
// Windows variable names are case-insensitive (`AppData` is `APPDATA`).
|
|
28
|
+
const folder = (name, fallback) => {
|
|
29
|
+
const value = environmentValue(env, name, platform);
|
|
30
|
+
return value === undefined || value === "" ? fallback : value;
|
|
31
|
+
};
|
|
32
|
+
const roaming = folder("APPDATA", win.join(home, "AppData", "Roaming"));
|
|
33
|
+
const local = folder("LOCALAPPDATA", win.join(home, "AppData", "Local"));
|
|
34
|
+
return [
|
|
35
|
+
win.join(roaming, "npm", "codex.cmd"),
|
|
36
|
+
win.join(local, "Programs", "OpenAI", "Codex", "bin", "codex.exe"),
|
|
37
|
+
win.join(local, "OpenAI", "Codex", "bin", "codex.exe"),
|
|
38
|
+
];
|
|
18
39
|
}
|
|
19
40
|
const paths = path.posix;
|
|
20
41
|
const bundles = platform === "darwin"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installation.js","sources":["../../../src/runtimes/codex/installation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAEtE
|
|
1
|
+
{"version":3,"file":"installation.js","sources":["../../../src/runtimes/codex/installation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAEtE;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,kCAAkC,CAChD,QAAQ,GAAoB,OAAO,CAAC,QAAQ,EAC5C,IAAI,GAAW,OAAO,EAAE,EACxB,GAAG,GAAgC,OAAO,CAAC,GAAG;IAE9C,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;QACzB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC;QACvB,wEAAwE;QACxE,MAAM,MAAM,GAAG,CAAC,IAAY,EAAE,QAAgB,EAAU,EAAE;YACxD,MAAM,KAAK,GAAG,gBAAgB,CAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;YACpD,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC;QAChE,CAAC,CAAC;QACF,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;QACxE,MAAM,KAAK,GAAG,MAAM,CAAC,cAAc,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;QACzE,OAAO;YACL,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC;YACrC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC;YAClE,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC;SACvD,CAAC;IACJ,CAAC;IACD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;IACzB,MAAM,OAAO,GAAG,QAAQ,KAAK,QAAQ;QACnC,CAAC,CAAC;YACE,oDAAoD;YACpD,kDAAkD;YAClD,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,EAAE,aAAa,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,CAAC;YACjF,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,EAAE,WAAW,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,CAAC;SAChF;QACH,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,UAAU,GAAG,GAAG,CAAC,iBAAiB,KAAK,SAAS,IAAI,GAAG,CAAC,iBAAiB,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC,CAAC;IAC3I,OAAO,CAAC,GAAG,OAAO,EAAE,GAAG,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;AACjF,CAAC;AAED,sFAAsF;AACtF,MAAM,CAAC,MAAM,iBAAiB,GAAG,sBAAsB,CACrD,eAAe,EACf,OAAO,EACP,CAAC,GAAG,EAAE,EAAE,CAAC,kCAAkC,CAAC,OAAO,CAAC,QAAQ,EAAE,eAAe,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,EACxF,CAAC,YAAY,EAAE,QAAQ,CAAC,CACzB,CAAC"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { RuntimeFailureError } from "../../contracts/runtime-failure-error.js";
|
|
2
|
+
import type { ResponseBody } from "../../contracts/session.js";
|
|
3
|
+
import { type JsonRecord } from "../../shared/json.js";
|
|
4
|
+
/** The version in codex's `initialize` `userAgent` (`<client>/<version> (...)`), or null. */
|
|
5
|
+
export declare function codexVersion(reply: JsonRecord): string | null;
|
|
6
|
+
/**
|
|
7
|
+
* The typed error for a request codex refused while OAR opened the session, or
|
|
8
|
+
* null to keep the plain one. An older codex refuses a method it does not know
|
|
9
|
+
* with -32600 `Invalid request: unknown variant \`<method>\`, expected one of
|
|
10
|
+
* ...`, and a service tier before 0.129.0 with -32600 `Invalid request: unknown
|
|
11
|
+
* variant \`default\`, expected \`fast\` or \`flex\``: both are
|
|
12
|
+
* `runtime_outdated`. An unreadable `config.toml` is -32600 `failed to load
|
|
13
|
+
* configuration: <path>:<line>:<column>: <detail>` on thread/start and
|
|
14
|
+
* thread/resume (codex starts on its defaults and refuses only there):
|
|
15
|
+
* `runtime_config_invalid`, with codex's words.
|
|
16
|
+
*/
|
|
17
|
+
export declare function codexOpenFailure(method: string, native: JsonRecord | null, context: {
|
|
18
|
+
readonly version: string | null;
|
|
19
|
+
readonly serviceTier?: string | undefined;
|
|
20
|
+
}): RuntimeFailureError | null;
|
|
21
|
+
/**
|
|
22
|
+
* A control (turn/start, turn/steer, thread/queue/add) codex refused, as
|
|
23
|
+
* the rejection to record. `thread not found: <id>` (-32600) means this
|
|
24
|
+
* process no longer has the session: `session_not_found`. Otherwise
|
|
25
|
+
* `runtime_refused`, with a `failure` where codex's code or data says one:
|
|
26
|
+
* -32602 with `data.input_error_code: "input_too_large"` (its input limit),
|
|
27
|
+
* -32001 (its request queue is full: `overloaded`), and -32600 for an
|
|
28
|
+
* unreadable configuration or a model provider the thread cannot use
|
|
29
|
+
* (`data.type: modelProvider...`): `invalid_request`. Any other refusal keeps
|
|
30
|
+
* codex's words without a class.
|
|
31
|
+
*/
|
|
32
|
+
export declare function codexControlRefusal(reason: string, native: JsonRecord | undefined): ResponseBody;
|
|
33
|
+
//# sourceMappingURL=refusal.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"refusal.d.ts","sources":["../../../src/runtimes/codex/refusal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,KAAK,EAAgB,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC7E,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAUjE,6FAA6F;AAC7F,wBAAgB,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAI7D;AAmBD;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,IAAI,EAAE,OAAO,EAAE;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GAAG,mBAAmB,GAAG,IAAI,CAgB/L;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,SAAS,GAAG,YAAY,CAUhG"}
|
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
import { RuntimeFailureError } from "../../contracts/runtime-failure-error.js";
|
|
2
|
+
import { asRecord } from "../../shared/json.js";
|
|
3
|
+
/*
|
|
4
|
+
* Codex's refusals in its own words and codes, read into OAR's types
|
|
5
|
+
* (docs/runtimes/codex.md#refusals). Observed on codex-cli 0.118.0 to 0.135.0
|
|
6
|
+
* and 0.154.0 driving `codex app-server` directly; the turn/start paths are
|
|
7
|
+
* from the 0.167.0 source (app-server/src/request_processors/turn_processor.rs,
|
|
8
|
+
* error_code.rs, config_errors.rs).
|
|
9
|
+
*/
|
|
10
|
+
/** The version in codex's `initialize` `userAgent` (`<client>/<version> (...)`), or null. */
|
|
11
|
+
export function codexVersion(reply) {
|
|
12
|
+
const agent = reply.userAgent;
|
|
13
|
+
const version = typeof agent === "string" ? /^[^/\s]+\/(\d+\.\d+\.\d+\S*)/u.exec(agent)?.[1] : undefined;
|
|
14
|
+
return version ?? null;
|
|
15
|
+
}
|
|
16
|
+
/** What OAR needs from codex that an older release lacks, and the first release that has it. */
|
|
17
|
+
const NEEDS = {
|
|
18
|
+
"thread/settings/update": { since: "0.133.0", purpose: "to set the effort of a resumed thread" },
|
|
19
|
+
};
|
|
20
|
+
/** Service tiers codex accepts from 0.129.0; earlier releases know only `fast` and `flex`. */
|
|
21
|
+
const TIERS_SINCE_0_129 = new Set(["default", "priority"]);
|
|
22
|
+
function nativeMessage(native) {
|
|
23
|
+
return native?.code === -32_600 && typeof native.message === "string" ? native.message : null;
|
|
24
|
+
}
|
|
25
|
+
function outdated(version, what, since, cause) {
|
|
26
|
+
return new RuntimeFailureError("invalid_request", `Codex ${version ?? "(version unreported)"} ${what}; update Codex to ${since} or newer`, { code: "runtime_outdated", cause });
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* The typed error for a request codex refused while OAR opened the session, or
|
|
30
|
+
* null to keep the plain one. An older codex refuses a method it does not know
|
|
31
|
+
* with -32600 `Invalid request: unknown variant \`<method>\`, expected one of
|
|
32
|
+
* ...`, and a service tier before 0.129.0 with -32600 `Invalid request: unknown
|
|
33
|
+
* variant \`default\`, expected \`fast\` or \`flex\``: both are
|
|
34
|
+
* `runtime_outdated`. An unreadable `config.toml` is -32600 `failed to load
|
|
35
|
+
* configuration: <path>:<line>:<column>: <detail>` on thread/start and
|
|
36
|
+
* thread/resume (codex starts on its defaults and refuses only there):
|
|
37
|
+
* `runtime_config_invalid`, with codex's words.
|
|
38
|
+
*/
|
|
39
|
+
export function codexOpenFailure(method, native, context) {
|
|
40
|
+
const message = nativeMessage(native);
|
|
41
|
+
if (native === null || message === null) {
|
|
42
|
+
return null;
|
|
43
|
+
}
|
|
44
|
+
const cause = { method, native };
|
|
45
|
+
const need = Object.hasOwn(NEEDS, method) ? NEEDS[method] : undefined;
|
|
46
|
+
if (need !== undefined && message.startsWith(`Invalid request: unknown variant \`${method}\``)) {
|
|
47
|
+
return outdated(context.version, `does not know ${method}, which OAR needs ${need.purpose}`, need.since, cause);
|
|
48
|
+
}
|
|
49
|
+
const tier = context.serviceTier;
|
|
50
|
+
if (tier !== undefined && TIERS_SINCE_0_129.has(tier) && message.startsWith(`Invalid request: unknown variant \`${tier}\`, expected \`fast\` or \`flex\``)) {
|
|
51
|
+
return outdated(context.version, `does not accept serviceTier ${tier} (it accepts fast and flex)`, "0.129.0", cause);
|
|
52
|
+
}
|
|
53
|
+
if (message.startsWith("failed to load configuration: ")) {
|
|
54
|
+
return new RuntimeFailureError("invalid_request", `codex ${method} failed: ${message}`, { code: "runtime_config_invalid", cause });
|
|
55
|
+
}
|
|
56
|
+
return null;
|
|
57
|
+
}
|
|
58
|
+
/**
|
|
59
|
+
* A control (turn/start, turn/steer, thread/queue/add) codex refused, as
|
|
60
|
+
* the rejection to record. `thread not found: <id>` (-32600) means this
|
|
61
|
+
* process no longer has the session: `session_not_found`. Otherwise
|
|
62
|
+
* `runtime_refused`, with a `failure` where codex's code or data says one:
|
|
63
|
+
* -32602 with `data.input_error_code: "input_too_large"` (its input limit),
|
|
64
|
+
* -32001 (its request queue is full: `overloaded`), and -32600 for an
|
|
65
|
+
* unreadable configuration or a model provider the thread cannot use
|
|
66
|
+
* (`data.type: modelProvider...`): `invalid_request`. Any other refusal keeps
|
|
67
|
+
* codex's words without a class.
|
|
68
|
+
*/
|
|
69
|
+
export function codexControlRefusal(reason, native) {
|
|
70
|
+
const record = native ?? null;
|
|
71
|
+
const base = { kind: "rejected", reason, ...(native === undefined ? {} : { native }) };
|
|
72
|
+
const message = typeof record?.message === "string" ? record.message : "";
|
|
73
|
+
const data = asRecord(record?.data);
|
|
74
|
+
if (record?.code === -32_600 && message.startsWith("thread not found: ")) {
|
|
75
|
+
return { ...base, code: "session_not_found" };
|
|
76
|
+
}
|
|
77
|
+
const failure = controlFailure(record?.code, message, data);
|
|
78
|
+
return { ...base, code: "runtime_refused", ...(failure === null ? {} : { failure }) };
|
|
79
|
+
}
|
|
80
|
+
function controlFailure(code, message, data) {
|
|
81
|
+
if (code === -32_602 && data?.input_error_code === "input_too_large") {
|
|
82
|
+
return "input_too_large";
|
|
83
|
+
}
|
|
84
|
+
if (code === -32_001) {
|
|
85
|
+
return "overloaded";
|
|
86
|
+
}
|
|
87
|
+
const provider = typeof data?.type === "string" && data.type.startsWith("modelProvider");
|
|
88
|
+
return code === -32_600 && (message.startsWith("failed to load configuration: ") || provider) ? "invalid_request" : null;
|
|
89
|
+
}
|
|
90
|
+
//# sourceMappingURL=refusal.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"refusal.js","sources":["../../../src/runtimes/codex/refusal.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,7 +32,19 @@ export declare function rpcControl(kernel: SessionKernel, client: AppServerClien
|
|
|
32
32
|
* must say `thread/resume`: "no rollout found for thread id …" alone does
|
|
33
33
|
* not). The session opener owns process cleanup on every failure.
|
|
34
34
|
*/
|
|
35
|
-
export declare function openThread(method: "thread/start" | "thread/resume", send: () => Promise<JsonRecord>,
|
|
35
|
+
export declare function openThread(method: "thread/start" | "thread/resume", send: () => Promise<JsonRecord>, context: {
|
|
36
|
+
readonly version: string | null;
|
|
37
|
+
readonly serviceTier?: string | undefined;
|
|
38
|
+
readonly resumeId?: string | undefined;
|
|
39
|
+
}): Promise<JsonRecord>;
|
|
40
|
+
/**
|
|
41
|
+
* A resume's `thread/settings/update {effort}`: null when codex took it, its
|
|
42
|
+
* error otherwise. A codex that does not know the method (before 0.133.0)
|
|
43
|
+
* fails the open as `runtime_outdated`.
|
|
44
|
+
*/
|
|
45
|
+
export declare function updateThreadEffort(client: AppServerClient, threadId: string, effort: string, version: string | null): Promise<{
|
|
46
|
+
readonly error: string;
|
|
47
|
+
} | null>;
|
|
36
48
|
/**
|
|
37
49
|
* SessionOptions.name (#368) on the opened thread, when there is one to set
|
|
38
50
|
* (open.ts `codexThreadName`). The name is display only, so codex refusing it
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-control.d.ts","sources":["../../../src/runtimes/codex/rpc-control.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,aAAa,EACb,WAAW,EACX,aAAa,EACb,YAAY,EAEb,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"rpc-control.d.ts","sources":["../../../src/runtimes/codex/rpc-control.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,aAAa,EACb,WAAW,EACX,aAAa,EACb,YAAY,EAEb,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG9D,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,kJAAkJ;IAClJ,QAAQ,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,YAAY,GAAG,IAAI,CAAC;IAC/D,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,UAAU,CAAC;IAClC,QAAQ,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,YAAY,CAAC;IACtD,QAAQ,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,UAAU,KAAK,YAAY,CAAC;IACzE,2HAA2H;IAC3H,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC;IACtD,gFAAgF;IAChF,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;CACnD;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,UAAU,CAC9B,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,aAAa,CAAC,CAsCxB;AAmCD;;;;GAIG;AACH,wBAAsB,UAAU,CAC9B,MAAM,EAAE,cAAc,GAAG,eAAe,EACxC,IAAI,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,EAC/B,OAAO,EAAE;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GAC9H,OAAO,CAAC,UAAU,CAAC,CAerB;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CAStK;AAED;;;;;GAKG;AACH,wBAAsB,UAAU,CAAC,MAAM,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,SAAS,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAevJ;AAED,iGAAiG;AACjG,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAI1E"}
|
|
@@ -3,6 +3,7 @@ import { SessionNotFoundError } from "../../contracts/session-not-found-error.js
|
|
|
3
3
|
import { SessionUnavailableError } from "../../contracts/session-unavailable-error.js";
|
|
4
4
|
import { emptyInputRefusal } from "../../shared/control-input.js";
|
|
5
5
|
import { asRecord } from "../../shared/json.js";
|
|
6
|
+
import { codexOpenFailure } from "./refusal.js";
|
|
6
7
|
/**
|
|
7
8
|
* A control action backed by one app-server RPC: record the request; when the
|
|
8
9
|
* stream already says the runtime is unreachable (`kernel.unreachable()`:
|
|
@@ -99,13 +100,15 @@ function resumeError(method, resumeId, cause, message) {
|
|
|
99
100
|
* must say `thread/resume`: "no rollout found for thread id …" alone does
|
|
100
101
|
* not). The session opener owns process cleanup on every failure.
|
|
101
102
|
*/
|
|
102
|
-
export async function openThread(method, send,
|
|
103
|
+
export async function openThread(method, send, context) {
|
|
104
|
+
const { serviceTier, resumeId } = context;
|
|
103
105
|
try {
|
|
104
106
|
return await send();
|
|
105
107
|
}
|
|
106
108
|
catch (error) {
|
|
107
109
|
const message = error instanceof Error ? error.message : String(error);
|
|
108
|
-
const
|
|
110
|
+
const cause = asRecord(error instanceof Error ? error.cause : undefined);
|
|
111
|
+
const typed = resumeError(method, resumeId, cause, message) ?? codexOpenFailure(method, cause?.method === method ? asRecord(cause.native) : null, context);
|
|
109
112
|
if (typed !== null) {
|
|
110
113
|
throw typed;
|
|
111
114
|
}
|
|
@@ -114,6 +117,24 @@ export async function openThread(method, send, serviceTier, resumeId) {
|
|
|
114
117
|
throw new Error(`codex ${method} failed: ${detail}`, { cause: error instanceof Error ? error.cause ?? error : error });
|
|
115
118
|
}
|
|
116
119
|
}
|
|
120
|
+
/**
|
|
121
|
+
* A resume's `thread/settings/update {effort}`: null when codex took it, its
|
|
122
|
+
* error otherwise. A codex that does not know the method (before 0.133.0)
|
|
123
|
+
* fails the open as `runtime_outdated`.
|
|
124
|
+
*/
|
|
125
|
+
export async function updateThreadEffort(client, threadId, effort, version) {
|
|
126
|
+
try {
|
|
127
|
+
await client.request("thread/settings/update", { threadId, effort });
|
|
128
|
+
return null;
|
|
129
|
+
}
|
|
130
|
+
catch (error) {
|
|
131
|
+
const outdated = codexOpenFailure("thread/settings/update", asRecord(asRecord(error instanceof Error ? error.cause : undefined)?.native), { version });
|
|
132
|
+
if (outdated !== null) {
|
|
133
|
+
throw outdated;
|
|
134
|
+
}
|
|
135
|
+
return { error: error instanceof Error ? error.message : String(error) };
|
|
136
|
+
}
|
|
137
|
+
}
|
|
117
138
|
/**
|
|
118
139
|
* SessionOptions.name (#368) on the opened thread, when there is one to set
|
|
119
140
|
* (open.ts `codexThreadName`). The name is display only, so codex refusing it
|