@botiverse/oar 0.96.0 → 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 +6 -4
- 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 +6 -7
- 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/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/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/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
|
@@ -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"}
|
|
@@ -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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-control.js","sources":["../../../src/runtimes/codex/rpc-control.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,uBAAuB,EAAiC,MAAM,8CAA8C,CAAC;AACtH,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAQlE,OAAO,EAAE,QAAQ,EAAmB,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"rpc-control.js","sources":["../../../src/runtimes/codex/rpc-control.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sources":["../../../src/runtimes/codex/session.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAuD,YAAY,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sources":["../../../src/runtimes/codex/session.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAuD,YAAY,EAAE,MAAM,4BAA4B,CAAC;AA6BpH,eAAO,MAAM,YAAY,EAAE,YAqQzB,CAAC"}
|
|
@@ -15,7 +15,8 @@ import { startAppServerClient } from "./app-server-client.js";
|
|
|
15
15
|
import { CODEX_SETTINGS_REPORT_MS, codexOpenReadback, codexResumeEffortRefusal, codexThreadName, codexThreadOpen } from "./open.js";
|
|
16
16
|
import { foldCodexNotification, initialCodexProjection } from "./projection.js";
|
|
17
17
|
import { prepareCodexToolDenials } from "./tool-denials.js";
|
|
18
|
-
import { missingDirectoryError, nameThread, openThread, rpcControl } from "./rpc-control.js";
|
|
18
|
+
import { missingDirectoryError, nameThread, openThread, rpcControl, updateThreadEffort } from "./rpc-control.js";
|
|
19
|
+
import { codexControlRefusal, codexVersion } from "./refusal.js";
|
|
19
20
|
import { codexServerRequests } from "./runtime-requests.js";
|
|
20
21
|
import { codexTurnProcesses, refuseSharedTurnProcesses } from "./turn-processes.js";
|
|
21
22
|
export const codexSession = withSessionCredentials(async (installation, options, credentials, context) => {
|
|
@@ -38,10 +39,11 @@ export const codexSession = withSessionCredentials(async (installation, options,
|
|
|
38
39
|
cleanup.reason = reason;
|
|
39
40
|
} });
|
|
40
41
|
try {
|
|
41
|
-
|
|
42
|
+
// The running binary's own version; the probed one when codex names none.
|
|
43
|
+
const version = codexVersion(await client.request("initialize", {
|
|
42
44
|
clientInfo: { name: "oar", version: "0.0.0" },
|
|
43
45
|
capabilities: { experimentalApi: true },
|
|
44
|
-
});
|
|
46
|
+
})) ?? installation.version ?? null;
|
|
45
47
|
client.notify("initialized", {});
|
|
46
48
|
if (options.goals === true) {
|
|
47
49
|
await confirmCodexGoals(client);
|
|
@@ -61,7 +63,7 @@ export const codexSession = withSessionCredentials(async (installation, options,
|
|
|
61
63
|
const started = await openThread(openMethod, async () => {
|
|
62
64
|
const reply = await client.request(openMethod, filteredOpenParams, markOpen);
|
|
63
65
|
return reply;
|
|
64
|
-
}, options.serviceTier, options.resume);
|
|
66
|
+
}, { version, serviceTier: options.serviceTier, resumeId: options.resume });
|
|
65
67
|
const threadId = asRecord(started.thread)?.id;
|
|
66
68
|
if (typeof threadId !== "string") {
|
|
67
69
|
throw new TypeError("codex thread start/resume returned no thread id");
|
|
@@ -162,11 +164,15 @@ export const codexSession = withSessionCredentials(async (installation, options,
|
|
|
162
164
|
const timer = setTimeout(() => {
|
|
163
165
|
resolve(null);
|
|
164
166
|
}, CODEX_SETTINGS_REPORT_MS);
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
167
|
+
let refusal = null;
|
|
168
|
+
try {
|
|
169
|
+
const update = await updateThreadEffort(client, threadId, requested, version);
|
|
170
|
+
refusal = codexResumeEffortRefusal(requested, update, update === null ? await reported : null);
|
|
171
|
+
}
|
|
172
|
+
finally {
|
|
173
|
+
clearTimeout(timer);
|
|
174
|
+
settingsWaiter = null;
|
|
175
|
+
}
|
|
170
176
|
if (refusal !== null) {
|
|
171
177
|
throw new Error(refusal);
|
|
172
178
|
}
|
|
@@ -197,9 +203,9 @@ export const codexSession = withSessionCredentials(async (installation, options,
|
|
|
197
203
|
state.codexTurnId = turnId;
|
|
198
204
|
return { kind: "accepted", native: reply };
|
|
199
205
|
},
|
|
200
|
-
onError: (message) => {
|
|
206
|
+
onError: (message, native) => {
|
|
201
207
|
state.active = null;
|
|
202
|
-
return
|
|
208
|
+
return codexControlRefusal(message, native);
|
|
203
209
|
},
|
|
204
210
|
});
|
|
205
211
|
const steerPlan = (input, inputOptions) => {
|
|
@@ -215,7 +221,7 @@ export const codexSession = withSessionCredentials(async (installation, options,
|
|
|
215
221
|
}
|
|
216
222
|
return { kind: "accepted", native: reply };
|
|
217
223
|
},
|
|
218
|
-
onError: (message) => (
|
|
224
|
+
onError: (message, native) => codexControlRefusal(`not_steerable: ${message}`, native),
|
|
219
225
|
};
|
|
220
226
|
};
|
|
221
227
|
const queuePlan = (input, inputOptions) => ({
|
|
@@ -225,7 +231,7 @@ export const codexSession = withSessionCredentials(async (installation, options,
|
|
|
225
231
|
method: "thread/queue/add",
|
|
226
232
|
params: () => ({ threadId, input: codexUserInput(input, inputOptions?.images), clientUserMessageId: inputOptions?.inputId ?? randomUUID() }),
|
|
227
233
|
onReply: (reply) => ({ kind: "accepted", native: reply }),
|
|
228
|
-
onError: (message) => (
|
|
234
|
+
onError: (message, native) => codexControlRefusal(message, native),
|
|
229
235
|
});
|
|
230
236
|
// An early or late interrupt can be refused; turn/completed is the outcome.
|
|
231
237
|
const abortPlan = () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sources":["../../../src/runtimes/codex/session.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"session.js","sources":["../../../src/runtimes/codex/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { AuthStatus, AuthStatusReader } from "../../contracts/login.js";
|
|
2
2
|
import { type CursorAuth, type CursorSdk } from "./sdk.js";
|
|
3
3
|
/**
|
|
4
|
-
* `Cursor.auth.status()` (SDK 1.
|
|
4
|
+
* `Cursor.auth.status()` (SDK 1.3.1) reads the stored login
|
|
5
5
|
* (`~/.cursor/sdk/auth.json`) and answers `{ status: "logged-out" }`, also
|
|
6
6
|
* for a key past its expiry, or `{ status: "logged-in", backendUrl, email?,
|
|
7
7
|
* apiKeyExpiresAtMs? }`; it never returns the key. `CURSOR_API_KEY` is not
|
|
@@ -10,7 +10,7 @@ function text(value) {
|
|
|
10
10
|
return typeof value === "string" && value.trim() !== "" ? value.trim() : undefined;
|
|
11
11
|
}
|
|
12
12
|
/**
|
|
13
|
-
* `Cursor.auth.status()` (SDK 1.
|
|
13
|
+
* `Cursor.auth.status()` (SDK 1.3.1) reads the stored login
|
|
14
14
|
* (`~/.cursor/sdk/auth.json`) and answers `{ status: "logged-out" }`, also
|
|
15
15
|
* for a key past its expiry, or `{ status: "logged-in", backendUrl, email?,
|
|
16
16
|
* apiKeyExpiresAtMs? }`; it never returns the key. `CURSOR_API_KEY` is not
|
|
@@ -74,7 +74,7 @@ export function cursorAuthStatusWith(load) {
|
|
|
74
74
|
}
|
|
75
75
|
const { auth } = sdk.Cursor;
|
|
76
76
|
if (auth === undefined) {
|
|
77
|
-
return { kind: "unknown", detail: "this @cursor/sdk has no Cursor.auth; OAR needs 1.
|
|
77
|
+
return { kind: "unknown", detail: "this @cursor/sdk has no Cursor.auth; OAR needs 1.3.1" };
|
|
78
78
|
}
|
|
79
79
|
const status = await readCursorAuthStatus(auth, options.timeoutMs);
|
|
80
80
|
return status;
|
|
@@ -2,7 +2,7 @@ import { type Runtime } from "../../contracts/runtime.js";
|
|
|
2
2
|
import { type CursorSdk } from "./sdk.js";
|
|
3
3
|
export interface CursorRuntimeOptions {
|
|
4
4
|
/**
|
|
5
|
-
* Loads `@cursor/sdk` 1.
|
|
5
|
+
* Loads `@cursor/sdk` 1.3.1, which the host installs (an optional peer
|
|
6
6
|
* dependency of OAR): `() => import("@cursor/sdk")`. Written in the host's
|
|
7
7
|
* own code, the import fails the host's compile when the package is
|
|
8
8
|
* missing, checks the SDK's types against `CursorSdk`, and is visible to
|
|
@@ -154,7 +154,7 @@ export function cursorLoginWith(load) {
|
|
|
154
154
|
const { auth } = sdk.Cursor;
|
|
155
155
|
const Store = sdk.FileCredentialStore;
|
|
156
156
|
if (auth === undefined || Store === undefined) {
|
|
157
|
-
return { kind: "unsupported", reason: "version_unsupported", detail: "@cursor/sdk 1.
|
|
157
|
+
return { kind: "unsupported", reason: "version_unsupported", detail: "@cursor/sdk 1.3.1 is required; this one has no Cursor.auth" };
|
|
158
158
|
}
|
|
159
159
|
// The caller may have aborted while the SDK loaded.
|
|
160
160
|
if (aborted()) {
|
|
@@ -51,7 +51,7 @@ export function cursorLogoutWith(load) {
|
|
|
51
51
|
}
|
|
52
52
|
const { auth } = sdk.Cursor;
|
|
53
53
|
if (auth?.logout === undefined) {
|
|
54
|
-
return { kind: "unsupported", reason: "version_unsupported", detail: "@cursor/sdk 1.
|
|
54
|
+
return { kind: "unsupported", reason: "version_unsupported", detail: "@cursor/sdk 1.3.1 is required; this one has no Cursor.auth.logout" };
|
|
55
55
|
}
|
|
56
56
|
// With no store: the SDK's own default, the file `status()` reads.
|
|
57
57
|
const native = await sdkLogout(async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deliver-interrupt.d.ts","sources":["../../src/shared/deliver-interrupt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAyC,cAAc,EAAE,aAAa,EAA2B,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAGtK,KAAK,gBAAgB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,CAAC,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AACtG,KAAK,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE;IAAE,MAAM,EAAE,UAAU,CAAA;CAAE,CAAC,EAAE,SAAS,CAAC,GAAG;IACnF,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAAC,QAAQ,CAAC,cAAc,EAAE,SAAS,MAAM,EAAE,CAAC;CAC1G,CAAC;AAGF,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,cAAc,GAAG,SAAS,CAAiC;AAE/G,wBAAsB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAQtH;AAOD,+GAA+G;AAC/G,cAAM,cAAc;IAmBN,OAAO,CAAC,QAAQ,CAAC,OAAO;IAAW,OAAO,CAAC,QAAQ,CAAC,OAAO;IAlBvE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAwC;IACnE,QAAQ,CAAC,IAAI,uBAA2B;IACxC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiC;IACvD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqB;IAC3C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiC;IACxD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAsG;IAClI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAa;IAClC,OAAO,CAAC,KAAK,CAA4C;IACzD,OAAO,CAAC,QAAQ,CAAY;IAC5B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAE/B,YAA6B,OAAO,EAAE,OAAO,EAAmB,OAAO,EAAE,gBAAgB,EASxF;IAED,SAAS,IAAI,OAAO,CAA6B;IAE3C,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAyB3E;IAED,OAAO,CAAC,KAAK;IAab,OAAO,CAAC,QAAQ;IAehB,OAAO,CAAC,OAAO;YAQD,IAAI;YAuBJ,eAAe;IAiB7B,OAAO,CAAC,QAAQ;IAEhB,OAAO,CAAC,OAAO;
|
|
1
|
+
{"version":3,"file":"deliver-interrupt.d.ts","sources":["../../src/shared/deliver-interrupt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAyC,cAAc,EAAE,aAAa,EAA2B,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAGtK,KAAK,gBAAgB,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,CAAC,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AACtG,KAAK,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE;IAAE,MAAM,EAAE,UAAU,CAAA;CAAE,CAAC,EAAE,SAAS,CAAC,GAAG;IACnF,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAAC,QAAQ,CAAC,cAAc,EAAE,SAAS,MAAM,EAAE,CAAC;CAC1G,CAAC;AAGF,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,cAAc,GAAG,SAAS,CAAiC;AAE/G,wBAAsB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAQtH;AAOD,+GAA+G;AAC/G,cAAM,cAAc;IAmBN,OAAO,CAAC,QAAQ,CAAC,OAAO;IAAW,OAAO,CAAC,QAAQ,CAAC,OAAO;IAlBvE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAwC;IACnE,QAAQ,CAAC,IAAI,uBAA2B;IACxC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiC;IACvD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqB;IAC3C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiC;IACxD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAsG;IAClI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAa;IAClC,OAAO,CAAC,KAAK,CAA4C;IACzD,OAAO,CAAC,QAAQ,CAAY;IAC5B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAE/B,YAA6B,OAAO,EAAE,OAAO,EAAmB,OAAO,EAAE,gBAAgB,EASxF;IAED,SAAS,IAAI,OAAO,CAA6B;IAE3C,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAyB3E;IAED,OAAO,CAAC,KAAK;IAab,OAAO,CAAC,QAAQ;IAehB,OAAO,CAAC,OAAO;YAQD,IAAI;YAuBJ,eAAe;IAiB7B,OAAO,CAAC,QAAQ;IAEhB,OAAO,CAAC,OAAO;IAKf,OAAO,CAAC,MAAM;CAMf"}
|
|
@@ -188,7 +188,8 @@ class InterruptBatch {
|
|
|
188
188
|
}
|
|
189
189
|
hasEnded() { return this.nativeEnd; }
|
|
190
190
|
failure(code, reason, ids, result) {
|
|
191
|
-
|
|
191
|
+
const failure = result?.kind === "rejected" ? result.failure : undefined;
|
|
192
|
+
return { landed: "rejected", code, reason, ...(failure === undefined ? {} : { failure }), undeliveredInputIds: ids, ...(result === undefined ? {} : { result }) };
|
|
192
193
|
}
|
|
193
194
|
finish(result) {
|
|
194
195
|
clearTimeout(this.timer);
|