@botiverse/oar 0.124.0 → 0.125.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/dist/contracts/context-usage.d.ts +3 -1
- package/dist/contracts/context-usage.d.ts.map +1 -1
- package/dist/contracts/runtime.d.ts +4 -2
- package/dist/contracts/runtime.d.ts.map +1 -1
- package/dist/contracts/runtime.js.map +1 -1
- package/dist/contracts/session-options.d.ts +15 -31
- package/dist/contracts/session-options.d.ts.map +1 -1
- package/dist/runtimes/antigravity/account-usage.d.ts +3 -2
- package/dist/runtimes/antigravity/account-usage.d.ts.map +1 -1
- package/dist/runtimes/antigravity/account-usage.js +10 -6
- package/dist/runtimes/antigravity/account-usage.js.map +1 -1
- package/dist/runtimes/antigravity/account.d.ts +37 -0
- package/dist/runtimes/antigravity/account.d.ts.map +1 -0
- package/dist/runtimes/antigravity/account.js +119 -0
- package/dist/runtimes/antigravity/account.js.map +1 -0
- package/dist/runtimes/antigravity/auth-status.d.ts +9 -0
- package/dist/runtimes/antigravity/auth-status.d.ts.map +1 -0
- package/dist/runtimes/antigravity/auth-status.js +54 -0
- package/dist/runtimes/antigravity/auth-status.js.map +1 -0
- package/dist/runtimes/antigravity/auth.d.ts +2 -6
- package/dist/runtimes/antigravity/auth.d.ts.map +1 -1
- package/dist/runtimes/antigravity/auth.js +10 -50
- package/dist/runtimes/antigravity/auth.js.map +1 -1
- package/dist/runtimes/antigravity/index.d.ts +2 -3
- package/dist/runtimes/antigravity/index.d.ts.map +1 -1
- package/dist/runtimes/antigravity/index.js +2 -3
- package/dist/runtimes/antigravity/index.js.map +1 -1
- package/dist/runtimes/antigravity/logout.d.ts.map +1 -1
- package/dist/runtimes/antigravity/logout.js +2 -0
- package/dist/runtimes/antigravity/logout.js.map +1 -1
- package/dist/runtimes/antigravity/token-email.d.ts +37 -0
- package/dist/runtimes/antigravity/token-email.d.ts.map +1 -0
- package/dist/runtimes/antigravity/token-email.js +155 -0
- package/dist/runtimes/antigravity/token-email.js.map +1 -0
- package/dist/runtimes/claude/index.d.ts +1 -2
- package/dist/runtimes/claude/index.d.ts.map +1 -1
- package/dist/runtimes/claude/launch-args.d.ts +3 -0
- package/dist/runtimes/claude/launch-args.d.ts.map +1 -1
- package/dist/runtimes/claude/launch-args.js +11 -1
- package/dist/runtimes/claude/launch-args.js.map +1 -1
- package/dist/runtimes/claude/launch.d.ts.map +1 -1
- package/dist/runtimes/claude/launch.js +2 -3
- package/dist/runtimes/claude/launch.js.map +1 -1
- package/dist/runtimes/claude/mcp-config.d.ts.map +1 -1
- package/dist/runtimes/claude/mcp-config.js +4 -2
- package/dist/runtimes/claude/mcp-config.js.map +1 -1
- package/dist/runtimes/claude/options.d.ts +1 -0
- package/dist/runtimes/claude/options.d.ts.map +1 -1
- package/dist/runtimes/claude/options.js +2 -0
- package/dist/runtimes/claude/options.js.map +1 -1
- package/dist/runtimes/claude/update.d.ts +17 -9
- package/dist/runtimes/claude/update.d.ts.map +1 -1
- package/dist/runtimes/claude/update.js +151 -34
- package/dist/runtimes/claude/update.js.map +1 -1
- package/dist/runtimes/claude/user-configuration.js +1 -1
- package/dist/runtimes/claude/user-configuration.js.map +1 -1
- package/dist/runtimes/codex/app-server-client.d.ts.map +1 -1
- package/dist/runtimes/codex/app-server-client.js +3 -9
- package/dist/runtimes/codex/app-server-client.js.map +1 -1
- package/dist/runtimes/codex/open-config.d.ts +6 -0
- package/dist/runtimes/codex/open-config.d.ts.map +1 -0
- package/dist/runtimes/codex/open-config.js +28 -0
- package/dist/runtimes/codex/open-config.js.map +1 -0
- package/dist/runtimes/codex/session.js +3 -3
- package/dist/runtimes/codex/session.js.map +1 -1
- package/dist/runtimes/codex/tool-denials.d.ts +0 -3
- package/dist/runtimes/codex/tool-denials.d.ts.map +1 -1
- package/dist/runtimes/codex/tool-denials.js +0 -8
- package/dist/runtimes/codex/tool-denials.js.map +1 -1
- package/dist/runtimes/cursor/model.d.ts.map +1 -1
- package/dist/runtimes/cursor/model.js +1 -0
- package/dist/runtimes/cursor/model.js.map +1 -1
- package/dist/runtimes/devin/options.d.ts.map +1 -1
- package/dist/runtimes/devin/options.js +1 -0
- package/dist/runtimes/devin/options.js.map +1 -1
- package/dist/runtimes/dsh/control.js +3 -3
- package/dist/runtimes/dsh/control.js.map +1 -1
- package/dist/runtimes/dsh/session.d.ts.map +1 -1
- package/dist/runtimes/dsh/session.js +2 -1
- package/dist/runtimes/dsh/session.js.map +1 -1
- package/dist/runtimes/factory/client.d.ts.map +1 -1
- package/dist/runtimes/factory/client.js +3 -9
- package/dist/runtimes/factory/client.js.map +1 -1
- package/dist/runtimes/opencode/inline-prompt-config.d.ts +5 -0
- package/dist/runtimes/opencode/inline-prompt-config.d.ts.map +1 -0
- package/dist/runtimes/opencode/inline-prompt-config.js +82 -0
- package/dist/runtimes/opencode/inline-prompt-config.js.map +1 -0
- package/dist/runtimes/opencode/prompt-config-v2.d.ts.map +1 -1
- package/dist/runtimes/opencode/prompt-config-v2.js +13 -9
- package/dist/runtimes/opencode/prompt-config-v2.js.map +1 -1
- package/dist/runtimes/opencode/prompt-config.d.ts +3 -4
- package/dist/runtimes/opencode/prompt-config.d.ts.map +1 -1
- package/dist/runtimes/opencode/prompt-config.js +27 -25
- package/dist/runtimes/opencode/prompt-config.js.map +1 -1
- package/dist/runtimes/pi/open.d.ts.map +1 -1
- package/dist/runtimes/pi/open.js +3 -1
- package/dist/runtimes/pi/open.js.map +1 -1
- package/dist/runtimes/pi/rpc/control.js +3 -3
- package/dist/runtimes/pi/rpc/control.js.map +1 -1
- package/dist/runtimes/pi/rpc/extension.d.ts.map +1 -1
- package/dist/runtimes/pi/rpc/extension.js +14 -2
- package/dist/runtimes/pi/rpc/extension.js.map +1 -1
- package/dist/runtimes/pi/rpc/open.d.ts.map +1 -1
- package/dist/runtimes/pi/rpc/open.js +5 -2
- package/dist/runtimes/pi/rpc/open.js.map +1 -1
- package/dist/runtimes/pi/rpc/prompt-files.d.ts.map +1 -1
- package/dist/runtimes/pi/rpc/prompt-files.js +9 -4
- package/dist/runtimes/pi/rpc/prompt-files.js.map +1 -1
- package/dist/runtimes/pi/rpc/session.d.ts.map +1 -1
- package/dist/runtimes/pi/rpc/session.js +2 -1
- package/dist/runtimes/pi/rpc/session.js.map +1 -1
- package/dist/runtimes/qoder/projection.js +2 -2
- package/dist/runtimes/qoder/projection.js.map +1 -1
- package/dist/runtimes/qwen/control.d.ts +1 -1
- package/dist/runtimes/qwen/control.d.ts.map +1 -1
- package/dist/runtimes/qwen/control.js +3 -5
- package/dist/runtimes/qwen/control.js.map +1 -1
- package/dist/runtimes/qwen/session.js +1 -1
- package/dist/runtimes/qwen/session.js.map +1 -1
- package/dist/shared/acp/effort.d.ts.map +1 -1
- package/dist/shared/acp/effort.js +5 -0
- package/dist/shared/acp/effort.js.map +1 -1
- package/dist/shared/acp/errors.d.ts +1 -1
- package/dist/shared/acp/errors.d.ts.map +1 -1
- package/dist/shared/acp/errors.js +3 -11
- package/dist/shared/acp/errors.js.map +1 -1
- package/dist/shared/acp/process.d.ts +5 -1
- package/dist/shared/acp/process.d.ts.map +1 -1
- package/dist/shared/acp/process.js +18 -5
- package/dist/shared/acp/process.js.map +1 -1
- package/dist/shared/acp/routing-types.d.ts +3 -1
- package/dist/shared/acp/routing-types.d.ts.map +1 -1
- package/dist/shared/acp/routing.d.ts.map +1 -1
- package/dist/shared/acp/routing.js +5 -3
- package/dist/shared/acp/routing.js.map +1 -1
- package/dist/shared/acp/session.d.ts.map +1 -1
- package/dist/shared/acp/session.js +5 -2
- package/dist/shared/acp/session.js.map +1 -1
- package/dist/shared/acp/shared-session.d.ts.map +1 -1
- package/dist/shared/acp/shared-session.js +17 -5
- package/dist/shared/acp/shared-session.js.map +1 -1
- package/dist/shared/executable/reported-stderr.d.ts +8 -0
- package/dist/shared/executable/reported-stderr.d.ts.map +1 -1
- package/dist/shared/executable/reported-stderr.js +21 -0
- package/dist/shared/executable/reported-stderr.js.map +1 -1
- package/dist/shared/mcp-config-handoff.d.ts +1 -1
- package/dist/shared/mcp-config-handoff.d.ts.map +1 -1
- package/dist/shared/mcp-config-handoff.js +5 -1
- package/dist/shared/mcp-config-handoff.js.map +1 -1
- package/dist/shared/stream-json/compaction.d.ts +0 -1
- package/dist/shared/stream-json/compaction.d.ts.map +1 -1
- package/dist/shared/stream-json/compaction.js +1 -1
- package/dist/shared/stream-json/compaction.js.map +1 -1
- package/dist/shared/stream-json/held-input.d.ts.map +1 -1
- package/dist/shared/stream-json/held-input.js +0 -4
- package/dist/shared/stream-json/held-input.js.map +1 -1
- package/dist/shared/stream-json/input-lifecycle.d.ts.map +1 -1
- package/dist/shared/stream-json/input-lifecycle.js +8 -0
- package/dist/shared/stream-json/input-lifecycle.js.map +1 -1
- package/dist/shared/stream-json/profile.d.ts +0 -2
- package/dist/shared/stream-json/profile.d.ts.map +1 -1
- package/dist/shared/stream-json/projection.js +1 -1
- package/dist/shared/stream-json/projection.js.map +1 -1
- package/dist/shared/stream-json/session.d.ts.map +1 -1
- package/dist/shared/stream-json/session.js +11 -20
- package/dist/shared/stream-json/session.js.map +1 -1
- package/dist/shared/stream-json/state.d.ts +2 -2
- package/dist/shared/stream-json/state.d.ts.map +1 -1
- package/dist/shared/stream-json/state.js.map +1 -1
- package/package.json +2 -1
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { antigravityStateArgs
|
|
1
|
+
import { antigravityStateArgs } from "./state-directory.js";
|
|
2
2
|
import { sessionEnvironment } from "../../shared/environment.js";
|
|
3
|
-
import { runExecutable } from "../../shared/executable/index.js";
|
|
4
|
-
import { withQueryDeadline } from "../../shared/executable/query.js";
|
|
5
|
-
import { antigravityVersionPreflight } from "./version.js";
|
|
6
3
|
import { antigravityNoBrowserEnv } from "./login-browser.js";
|
|
4
|
+
import { clearAntigravityPlanCache } from "./account.js";
|
|
5
|
+
import { readAntigravityAuthStatus } from "./auth-status.js";
|
|
7
6
|
import { errorMessage, LoginSecrets, loginBounds, loginExecutable, spawnLoginProcess, stoppedResult } from "../../shared/login.js";
|
|
7
|
+
export { antigravityAuthStatus, readAntigravityAuthStatus } from "./auth-status.js";
|
|
8
8
|
/*
|
|
9
9
|
* Antigravity's own login (agy 1.5.5, 2026-11-10; experiments and notes in
|
|
10
10
|
* docs/runtimes/antigravity.md#login). `agy acp --login` ("Log in with Google
|
|
@@ -17,54 +17,13 @@ import { errorMessage, LoginSecrets, loginBounds, loginExecutable, spawnLoginPro
|
|
|
17
17
|
* and reads that line from stdin; with none it ends `login cancelled: no
|
|
18
18
|
* authorization code was entered` (exit 1). The CLI decides where the token
|
|
19
19
|
* goes (a 0600 file under `<gemini-directory>/antigravity-cli/`, or a keyring it
|
|
20
|
-
* detects); OAR never
|
|
21
|
-
*
|
|
22
|
-
*
|
|
20
|
+
* detects); OAR never writes it. Status is `agy models`, which refuses with
|
|
21
|
+
* "Please sign in" when there is no login. Logout is agy's ACP `logout`
|
|
22
|
+
* (logout.ts); print mode refuses `/logout`.
|
|
23
23
|
*/
|
|
24
|
-
const SOURCE = "agy models";
|
|
25
24
|
const LOGIN_TIMEOUT_MS = 15 * 60_000;
|
|
26
25
|
const URL_LINE = /^(https:\/\/accounts\.google\.com\/\S+)$/u;
|
|
27
26
|
const PASTE_PROMPT = /Then paste the authorization code\b/u;
|
|
28
|
-
const SIGNED_OUT = /Please sign in\b/iu;
|
|
29
|
-
export async function readAntigravityAuthStatus(installation, options = {}) {
|
|
30
|
-
if (installation.via !== "executable") {
|
|
31
|
-
return { kind: "unknown", detail: "not a machine-installed executable" };
|
|
32
|
-
}
|
|
33
|
-
const env = sessionEnvironment(options.env);
|
|
34
|
-
if (!antigravityUsesDefaultState(env)) {
|
|
35
|
-
return { kind: "unknown", detail: ANTIGRAVITY_STATE_QUERY_UNAVAILABLE };
|
|
36
|
-
}
|
|
37
|
-
const timeoutMs = options.timeoutMs ?? 30_000;
|
|
38
|
-
const version = await antigravityVersionPreflight(installation, env, { timeoutMs, ...(options.signal === undefined ? {} : { signal: options.signal }) });
|
|
39
|
-
if (version.kind === "unsupported") {
|
|
40
|
-
const { kind: _kind, reason, ...versions } = version;
|
|
41
|
-
return { kind: "unknown", ...versions, detail: reason };
|
|
42
|
-
}
|
|
43
|
-
const result = await runExecutable(installation.command, ["models"], {
|
|
44
|
-
env, timeoutMs: version.timeoutMs, ...(options.signal === undefined ? {} : { signal: options.signal }),
|
|
45
|
-
});
|
|
46
|
-
if (result.ok) {
|
|
47
|
-
return { kind: "logged_in", source: SOURCE };
|
|
48
|
-
}
|
|
49
|
-
// Its refusal names the missing login; any other failure (network, a crash) says nothing about it.
|
|
50
|
-
if (result.exitCode === 1 && SIGNED_OUT.test(`${result.stdout}\n${result.stderr}`)) {
|
|
51
|
-
return { kind: "logged_out", source: SOURCE };
|
|
52
|
-
}
|
|
53
|
-
return { kind: "unknown", source: SOURCE, detail: "agy models ended without saying whether it is signed in" };
|
|
54
|
-
}
|
|
55
|
-
/** Whether Antigravity is signed in, by its own model listing (a remote call: not localOnly). */
|
|
56
|
-
export async function antigravityAuthStatus(installation, options = {}) {
|
|
57
|
-
try {
|
|
58
|
-
const status = await withQueryDeadline("Antigravity auth status", options.timeoutMs ?? 30_000, async (signal) => {
|
|
59
|
-
const read = await readAntigravityAuthStatus(installation, { ...options, signal });
|
|
60
|
-
return read;
|
|
61
|
-
}, { kind: "unknown", source: SOURCE, detail: "Antigravity auth status timed out" });
|
|
62
|
-
return status;
|
|
63
|
-
}
|
|
64
|
-
catch {
|
|
65
|
-
return { kind: "unknown", detail: "Antigravity authentication status could not be read" };
|
|
66
|
-
}
|
|
67
|
-
}
|
|
68
27
|
/** The secret query values of a pasted landing URL (`code`, also percent-decoded); none for a bare code. */
|
|
69
28
|
function landingCodes(answer) {
|
|
70
29
|
if (!URL.canParse(answer)) {
|
|
@@ -79,12 +38,13 @@ function landingCodes(answer) {
|
|
|
79
38
|
}
|
|
80
39
|
/** Exit 0 is only agy's word: its status decides, and an unanswered status leaves a login without an account. */
|
|
81
40
|
async function confirmed(installation, signal, env) {
|
|
41
|
+
clearAntigravityPlanCache();
|
|
82
42
|
// The status query after a success is bounded like every runtime's (docs/spec/login.md: up to 20 s).
|
|
83
|
-
const status = signal?.aborted === true ? undefined : await readAntigravityAuthStatus(installation, { env, timeoutMs: 20_000, ...(signal === undefined ? {} : { signal }) });
|
|
43
|
+
const status = signal?.aborted === true ? undefined : await readAntigravityAuthStatus(installation, { env, timeoutMs: 20_000, includeAccount: true, ...(signal === undefined ? {} : { signal }) });
|
|
84
44
|
if (status?.kind === "logged_out") {
|
|
85
45
|
return { kind: "failed", reason: "not_logged_in", detail: "agy acp --login exited 0, yet agy models asks to sign in" };
|
|
86
46
|
}
|
|
87
|
-
return { kind: "logged_in" };
|
|
47
|
+
return { kind: "logged_in", ...(status?.kind === "logged_in" && status.account !== undefined ? { account: status.account } : {}) };
|
|
88
48
|
}
|
|
89
49
|
// oxlint-disable-next-line eslint/max-lines-per-function, eslint/max-statements -- One native flow: relay, ask, write, then settle every ending.
|
|
90
50
|
async function runAntigravityLogin(installation, command, interaction, timeoutMs, options, env) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sources":["../../../src/runtimes/antigravity/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,
|
|
1
|
+
{"version":3,"file":"auth.js","sources":["../../../src/runtimes/antigravity/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAI5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,eAAe,EAAE,iBAAiB,EAAE,aAAa,EAA4D,MAAM,uBAAuB,CAAC;AAE7L,OAAO,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAEpF;;;;;;;;;;;;;;;GAeG;AACH,MAAM,gBAAgB,GAAG,EAAE,GAAG,MAAM,CAAC;AACrC,MAAM,QAAQ,GAAG,2CAA2C,CAAC;AAC7D,MAAM,YAAY,GAAG,sCAAsC,CAAC;AAE5D,4GAA4G;AAC5G,SAAS,YAAY,CAAC,MAAc;IAClC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QAAC,OAAO,EAAE,CAAC;IAAC,CAAC;IACzC,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACvD,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,EAAE,EAAE,CAAC;QAAC,OAAO,EAAE,CAAC;IAAC,CAAC;IAClD,MAAM,GAAG,GAAG,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACnD,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACpE,CAAC;AAOD,iHAAiH;AACjH,KAAK,UAAU,SAAS,CAAC,YAAmC,EAAE,MAA+B,EAAE,GAAwB;IACrH,yBAAyB,EAAE,CAAC;IAC5B,qGAAqG;IACrG,MAAM,MAAM,GAAG,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,yBAAyB,CAAC,YAAY,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;IACnM,IAAI,MAAM,EAAE,IAAI,KAAK,YAAY,EAAE,CAAC;QAClC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,0DAA0D,EAAE,CAAC;IACzH,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,KAAK,WAAW,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;AACrI,CAAC;AAED,iJAAiJ;AACjJ,KAAK,UAAU,mBAAmB,CAAC,YAAmC,EAAE,OAAe,EAAE,WAAqC,EAAE,SAAiB,EAAE,OAAqB,EAAE,GAAsB;IAC9L,MAAM,OAAO,GAAG,IAAI,YAAY,EAAE,CAAC;IACnC,MAAM,kBAAkB,GAAG,OAAO,CAAC,aAAa,EAAU,CAAC;IAC3D,MAAM,IAAI,GAAyF,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;IACzK,6EAA6E;IAC7E,MAAM,KAAK,GAAG,GAAY,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC;IAC1C,IAAI,KAAK,GAAwB,IAAI,CAAC;IACtC,MAAM,iBAAiB,GAAG,CAAC,KAAc,EAAQ,EAAE;QACjD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,kBAAkB,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC3F,CAAC,CAAC;IACF,MAAM,GAAG,GAAG,KAAK,IAAmB,EAAE;QACpC,IAAI,IAAI,CAAC,KAAK,IAAI,KAAK,EAAE,EAAE,CAAC;YAAC,OAAO;QAAC,CAAC;QACtC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,wFAAwF,EAAE,CAAC,CAAC;QAChK,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,WAAW,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,EAAE,CAAC;gBAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;YAAC,CAAC;YACvE,OAAO;QACT,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;QAC3B,IAAI,KAAK,EAAE,EAAE,CAAC;YAAC,OAAO;QAAC,CAAC;QACxB,mFAAmF;QACnF,IAAI,IAAI,KAAK,EAAE,EAAE,CAAC;YAAC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YAAC,MAAM,GAAG,EAAE,CAAC;YAAC,OAAO;QAAC,CAAC;QAC7D,mFAAmF;QACnF,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAClB,mFAAmF;QACnF,KAAK,MAAM,IAAI,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;YAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAAC,CAAC;QAC7D,KAAK,EAAE,KAAK,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC;IACF,IAAI,CAAC;QACH,KAAK,GAAG,iBAAiB,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE;YACxF,MAAM,CAAC,IAAI;gBACT,MAAM,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;gBACrC,IAAI,GAAG,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;oBACvC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;oBACpB,IAAI,CAAC;wBACH,WAAW,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,YAAY,EAAE,kGAAkG,EAAE,CAAC,CAAC;oBACnK,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;oBAAC,CAAC;oBAC7C,OAAO;gBACT,CAAC;gBACD,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;oBAAC,KAAK,GAAG,EAAE,CAAC;oBAAC,OAAO;gBAAC,CAAC;gBACpD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;YACvB,CAAC;YACD,SAAS,CAAC,OAAO,IAAI,IAAI,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBAAC,KAAK,GAAG,EAAE,CAAC;YAAC,CAAC,CAAC,CAAC;SACvE,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;IACjG,CAAC;IACD,MAAM,MAAM,GAAG,WAAW,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC1D,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;YAChC,gFAAgF;YAChF,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAU,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;YAC7D,gFAAgF;YAChF,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,EAAU,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;YAC/D,kBAAkB,CAAC,OAAO;SAC3B,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAAC,MAAM,KAAK,CAAC,MAAM,CAAC;YAAC,OAAO,aAAa,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAAC,CAAC;QAC/G,IAAI,MAAM,CAAC,IAAI,KAAK,oBAAoB,EAAE,CAAC;YAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAAC,MAAM,KAAK,CAAC,MAAM,CAAC;YAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QAAC,CAAC;QAC9K,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;QACxB,IAAI,IAAI,CAAC,QAAQ,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YAAC,OAAO,MAAM,SAAS,CAAC,YAAY,EAAE,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;QAAC,CAAC;QAC/H,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAAC,CAAC;QACxH,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,MAAM,IAAI,SAAS,EAAE,CAAC,CAAC,CAAC,QAAQ,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5G,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,QAAQ,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,gBAAgB,EAAE,MAAM,EAAE,IAAI,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,+BAA+B,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;IAClO,CAAC;YAAS,CAAC;QACT,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,MAAM,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;AACH,CAAC;AAED,6HAA6H;AAC7H,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,YAAmC,EAAE,WAAqC,EAAE,OAAO,GAAiB,EAAE;IAC3I,MAAM,MAAM,GAAG,eAAe,CAAC,YAAY,EAAE,KAAK,EAAE,SAAS,EAAE,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IAChG,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAAC,OAAO,MAAM,CAAC,MAAM,CAAC;IAAC,CAAC;IACxD,IAAI,WAAW,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,EAAE,CAAC;QAAC,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;IAAC,CAAC;IAC3E,IAAI,OAAO,GAAoE,SAAS,CAAC;IACzF,IAAI,OAAO,CAAC,WAAW,KAAK,KAAK,EAAE,CAAC;QAClC,IAAI,CAAC;YAAC,OAAO,GAAG,MAAM,uBAAuB,CAAC,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;QAAC,CAAC;QACjF,MAAM,CAAC;YAAC,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,iCAAiC,EAAE,MAAM,EAAE,qGAAqG,EAAE,CAAC;QAAC,CAAC;IACrM,CAAC;IACD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,YAAY,EAAE,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,SAAS,IAAI,gBAAgB,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,IAAI,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;QAClM,OAAO,MAAM,CAAC;IAChB,CAAC;YAAS,CAAC;QAAC,MAAM,OAAO,EAAE,OAAO,EAAE,CAAC;IAAC,CAAC;AACzC,CAAC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { antigravityAuthStatus, antigravityLogin } from "./auth.js";
|
|
2
1
|
export declare const antigravityRuntime: Omit<{
|
|
3
2
|
readonly id: "antigravity";
|
|
4
3
|
readonly sessionCapabilities: () => {
|
|
@@ -28,9 +27,9 @@ export declare const antigravityRuntime: Omit<{
|
|
|
28
27
|
readonly skills: (installation: import("../../browser.js").AvailableInstallation, options?: import("../../browser.js").InventoryOptions | undefined) => Promise<import("../../browser.js").InventoryResult<import("../../browser.js").SkillEntry>>;
|
|
29
28
|
readonly checkUpdate: import("../../browser.js").UpdateChecker;
|
|
30
29
|
readonly upgrade: import("../../browser.js").Upgrader;
|
|
31
|
-
readonly login:
|
|
30
|
+
readonly login: (installation: import("../../browser.js").AvailableInstallation, interaction: import("../../browser.js").ProviderLoginInteraction, options?: import("../../browser.js").LoginOptions | undefined) => Promise<import("../../browser.js").LoginResult>;
|
|
32
31
|
readonly logout: (installation: import("../../browser.js").AvailableInstallation, options?: import("../../browser.js").LogoutOptions | undefined) => Promise<import("../../browser.js").LogoutResult>;
|
|
33
|
-
readonly authStatus:
|
|
32
|
+
readonly authStatus: (installation: import("../../browser.js").AvailableInstallation, options?: import("../../browser.js").AuthStatusOptions | undefined) => Promise<import("../../browser.js").AuthStatus>;
|
|
34
33
|
readonly accountUsage: (installation: import("../../browser.js").AvailableInstallation, options?: import("../../browser.js").AccountUsageReadOptions | undefined) => Promise<import("../../browser.js").AccountUsageSnapshot>;
|
|
35
34
|
readonly refusedSessionOptions: Readonly<Partial<Record<import("../../contracts/runtime.js").RefusableSessionOption, string>>>;
|
|
36
35
|
readonly mcpToolsListChanged: "none";
|
|
@@ -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":"AAUA,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2BH,CAAC"}
|
|
@@ -6,7 +6,6 @@ import { antigravityInstallation } from "./installation.js";
|
|
|
6
6
|
import { antigravityInstall, antigravityInstallPlan } from "./install.js";
|
|
7
7
|
import { antigravityCheckUpdate, antigravityUpgrade } from "./update.js";
|
|
8
8
|
import { antigravityRefusedSessionOptions } from "./options.js";
|
|
9
|
-
import { antigravityAuthStatus, antigravityLogin } from "./auth.js";
|
|
10
9
|
import { ANTIGRAVITY_MINIMUM_VERSION } from "./version.js";
|
|
11
10
|
export const antigravityRuntime = defineRuntime({
|
|
12
11
|
id: "antigravity",
|
|
@@ -29,9 +28,9 @@ export const antigravityRuntime = defineRuntime({
|
|
|
29
28
|
skills: onFirstCall(async () => { const { antigravitySkills } = await import("./skills.js"); return antigravitySkills; }),
|
|
30
29
|
checkUpdate: antigravityCheckUpdate,
|
|
31
30
|
upgrade: antigravityUpgrade,
|
|
32
|
-
login: antigravityLogin,
|
|
31
|
+
login: onFirstCall(async () => { const { antigravityLogin } = await import("./auth.js"); return antigravityLogin; }),
|
|
33
32
|
logout: onFirstCall(async () => { const { antigravityLogout } = await import("./logout.js"); return antigravityLogout; }),
|
|
34
|
-
authStatus: antigravityAuthStatus,
|
|
33
|
+
authStatus: onFirstCall(async () => { const { antigravityAuthStatus } = await import("./auth-status.js"); return antigravityAuthStatus; }),
|
|
35
34
|
accountUsage: onFirstCall(async () => { const { antigravityAccountUsage } = await import("./account-usage.js"); return antigravityAccountUsage; }),
|
|
36
35
|
refusedSessionOptions: antigravityRefusedSessionOptions,
|
|
37
36
|
mcpToolsListChanged: "none",
|
|
@@ -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,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,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,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACzE,OAAO,EAAE,gCAAgC,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../src/runtimes/antigravity/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logout.d.ts","sources":["../../../src/runtimes/antigravity/logout.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"logout.d.ts","sources":["../../../src/runtimes/antigravity/logout.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAQ5E;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CAAC,YAAY,EAAE,qBAAqB,EAAE,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,YAAY,CAAC,CAc/H"}
|
|
@@ -3,6 +3,7 @@ import { queryAcpAuth } from "../../shared/acp/auth-query.js";
|
|
|
3
3
|
import { sessionEnvironment } from "../../shared/environment.js";
|
|
4
4
|
import { loginExecutable } from "../../shared/login.js";
|
|
5
5
|
import { confirmedLogout, statusAfterLogout } from "../../shared/logout.js";
|
|
6
|
+
import { clearAntigravityPlanCache } from "./account.js";
|
|
6
7
|
import { readAntigravityAuthStatus } from "./auth.js";
|
|
7
8
|
/**
|
|
8
9
|
* Antigravity's own sign-out: ACP `logout` on `agy acp`, which agy 1.5.5
|
|
@@ -20,6 +21,7 @@ export async function antigravityLogout(installation, options = {}) {
|
|
|
20
21
|
return target.result;
|
|
21
22
|
}
|
|
22
23
|
const result = await queryAcpAuth(target.installation.command, { method: "logout" }, "Antigravity", { ...options, args: ["acp", ...antigravityStateArgs(env)], timeoutMs: options.timeoutMs ?? 60_000 }).catch(() => "failed");
|
|
24
|
+
clearAntigravityPlanCache();
|
|
23
25
|
if (result === "unsupported") {
|
|
24
26
|
return { kind: "unsupported", reason: "version_unsupported", detail: "This agy build has no ACP logout" };
|
|
25
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logout.js","sources":["../../../src/runtimes/antigravity/logout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAG5D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAqB,MAAM,wBAAwB,CAAC;AAC/F,OAAO,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAC;AAEtD;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,YAAmC,EAAE,OAAO,GAAkB,EAAE;IACtG,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,MAAM,GAAG,GAAG,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC5C,MAAM,MAAM,GAAG,eAAe,CAAC,YAAY,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;IACpE,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAAC,OAAO,MAAM,CAAC,MAAM,CAAC;IAAC,CAAC;IACxD,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,aAAa,EAAE,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,QAAiB,CAAC,CAAC;IACxO,IAAI,MAAM,KAAK,aAAa,EAAE,CAAC;QAAC,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,EAAE,kCAAkC,EAAE,CAAC;IAAC,CAAC;IAC5I,MAAM,MAAM,GAAiB,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QAChE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,gBAAgB,EAAE,MAAM,EAAE,iCAAiC;KAC3H,CAAC;IACF,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAAC,YAAY,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,iBAAiB,CAAC,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;SACnI,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,SAAkB,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,kDAAkD,EAAE,CAAC,CAAC,CAAC;IACjI,OAAO,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC;AAC3D,CAAC"}
|
|
1
|
+
{"version":3,"file":"logout.js","sources":["../../../src/runtimes/antigravity/logout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAG5D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAqB,MAAM,wBAAwB,CAAC;AAC/F,OAAO,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAC;AAEtD;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,YAAmC,EAAE,OAAO,GAAkB,EAAE;IACtG,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,MAAM,GAAG,GAAG,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC5C,MAAM,MAAM,GAAG,eAAe,CAAC,YAAY,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;IACpE,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAAC,OAAO,MAAM,CAAC,MAAM,CAAC;IAAC,CAAC;IACxD,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,aAAa,EAAE,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,QAAiB,CAAC,CAAC;IACxO,yBAAyB,EAAE,CAAC;IAC5B,IAAI,MAAM,KAAK,aAAa,EAAE,CAAC;QAAC,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,EAAE,kCAAkC,EAAE,CAAC;IAAC,CAAC;IAC5I,MAAM,MAAM,GAAiB,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QAChE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,gBAAgB,EAAE,MAAM,EAAE,iCAAiC;KAC3H,CAAC;IACF,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAAC,YAAY,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,iBAAiB,CAAC,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;SACnI,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,SAAkB,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,kDAAkD,EAAE,CAAC,CAAC,CAAC;IACjI,OAAO,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC;AAC3D,CAAC"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import type { LastAccount } from "../../contracts/login.js";
|
|
2
|
+
/**
|
|
3
|
+
* Read agy's non-credential persisted ACP auth method (`cache/acp-auth-state.json`,
|
|
4
|
+
* `[env]` agy 1.5.13: `{"methodId":"oauth-personal"}`). Returns undefined unless
|
|
5
|
+
* it names a known OAuth method so OAR never probes an unconfigured login path.
|
|
6
|
+
*/
|
|
7
|
+
export declare function readPersistedAcpOAuthMethod(env: Readonly<NodeJS.ProcessEnv>): Promise<string | undefined>;
|
|
8
|
+
export interface AntigravityKeyringProbe {
|
|
9
|
+
readonly platform?: NodeJS.Platform;
|
|
10
|
+
readonly secretServiceReachable?: (env: Readonly<NodeJS.ProcessEnv>) => Promise<boolean>;
|
|
11
|
+
}
|
|
12
|
+
/**
|
|
13
|
+
* Extract the account email from agy's plain-file OAuth token JSON without
|
|
14
|
+
* ever returning or logging credential values:
|
|
15
|
+
* - `[env]` + `[sym]` agy 1.5.13 (`StoredToken.IDTokenEmail`, `json:"id_token_email,omitempty"`):
|
|
16
|
+
* agy extracts `email` from the OIDC `id_token` in `RememberIDToken` and stores `id_token_email`.
|
|
17
|
+
* - Fallback: unverified JWT payload `email` if a raw `id_token` string is present.
|
|
18
|
+
*/
|
|
19
|
+
export declare function projectAntigravityTokenEmail(payload: unknown): string | undefined;
|
|
20
|
+
/**
|
|
21
|
+
* `[sym]` agy 1.5.13 (`compositeTokenStorage.LoadToken` / `LoadStoredToken`):
|
|
22
|
+
* agy reads `KeyringTokenStorage` (`go_keyring`: macOS Keychain, Windows
|
|
23
|
+
* Credential Manager, Linux `org.freedesktop.secrets`) FIRST and falls back to
|
|
24
|
+
* the plain JSON file only when the keyring fails or is empty; `SaveToken`
|
|
25
|
+
* purges the file best-effort after a keyring write. Because a stale plain file
|
|
26
|
+
* could hold an earlier account whenever a keyring backend is reachable, OAR
|
|
27
|
+
* treats the plain file as authoritative ONLY on Linux when Secret Service is
|
|
28
|
+
* proved unreachable (no session bus, or D-Bus confirms `org.freedesktop.secrets`
|
|
29
|
+
* is neither owned nor activatable). On macOS, Windows, and Linux desktops with
|
|
30
|
+
* Secret Service, `email` is omitted so OAR never displays a stale account.
|
|
31
|
+
*/
|
|
32
|
+
export declare function isPlainTokenFileAuthoritative(env: Readonly<NodeJS.ProcessEnv>, probe?: AntigravityKeyringProbe): Promise<boolean>;
|
|
33
|
+
/** Read-only email lookup from agy's plain token file when no OS keyring can shadow it. */
|
|
34
|
+
export declare function readAntigravityTokenEmail(env: Readonly<NodeJS.ProcessEnv>, probe?: AntigravityKeyringProbe): Promise<string | undefined>;
|
|
35
|
+
/** Remembered account from a remaining authoritative plain token file when signed out. */
|
|
36
|
+
export declare function rememberedAntigravityAccount(env: Readonly<NodeJS.ProcessEnv>, probe?: AntigravityKeyringProbe): Promise<LastAccount | undefined>;
|
|
37
|
+
//# sourceMappingURL=token-email.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"token-email.d.ts","sources":["../../../src/runtimes/antigravity/token-email.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAS5D;;;;GAIG;AACH,wBAAsB,2BAA2B,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAS/G;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IACpC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAC1F;AAqBD;;;;;;GAMG;AACH,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAMjF;AA8CD;;;;;;;;;;;GAWG;AACH,wBAAsB,6BAA6B,CACjD,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,EAChC,KAAK,GAAE,uBAA4B,GAClC,OAAO,CAAC,OAAO,CAAC,CAIlB;AAED,2FAA2F;AAC3F,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,EAChC,KAAK,GAAE,uBAA4B,GAClC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAQ7B;AAED,0FAA0F;AAC1F,wBAAsB,4BAA4B,CAChD,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,EAChC,KAAK,GAAE,uBAA4B,GAClC,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAGlC"}
|
|
@@ -0,0 +1,155 @@
|
|
|
1
|
+
import { readFile, stat } from "node:fs/promises";
|
|
2
|
+
import path from "node:path";
|
|
3
|
+
import { environmentHome } from "../../shared/environment-home.js";
|
|
4
|
+
import { environmentValue } from "../../shared/environment.js";
|
|
5
|
+
import { runExecutable } from "../../shared/executable/index.js";
|
|
6
|
+
import { asRecord, parseJson } from "../../shared/json.js";
|
|
7
|
+
const DBUS_TIMEOUT_MS = 1000;
|
|
8
|
+
const OAUTH_METHODS = new Set(["oauth-personal", "oauth-business"]);
|
|
9
|
+
/**
|
|
10
|
+
* Read agy's non-credential persisted ACP auth method (`cache/acp-auth-state.json`,
|
|
11
|
+
* `[env]` agy 1.5.13: `{"methodId":"oauth-personal"}`). Returns undefined unless
|
|
12
|
+
* it names a known OAuth method so OAR never probes an unconfigured login path.
|
|
13
|
+
*/
|
|
14
|
+
export async function readPersistedAcpOAuthMethod(env) {
|
|
15
|
+
const stateFile = path.join(environmentHome(env), ".gemini", "antigravity-cli", "cache", "acp-auth-state.json");
|
|
16
|
+
try {
|
|
17
|
+
const parsed = asRecord(parseJson(await readFile(stateFile, "utf8")));
|
|
18
|
+
const methodId = parsed?.methodId;
|
|
19
|
+
return typeof methodId === "string" && OAUTH_METHODS.has(methodId) ? methodId : undefined;
|
|
20
|
+
}
|
|
21
|
+
catch {
|
|
22
|
+
return undefined;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
function validEmail(value) {
|
|
26
|
+
if (typeof value !== "string") {
|
|
27
|
+
return undefined;
|
|
28
|
+
}
|
|
29
|
+
const trimmed = value.trim();
|
|
30
|
+
return trimmed.includes("@") ? trimmed : undefined;
|
|
31
|
+
}
|
|
32
|
+
/** Decode ONLY the unverified payload segment of a JWT for display email (no crypto, no network). */
|
|
33
|
+
function jwtPayloadEmail(token) {
|
|
34
|
+
if (typeof token !== "string") {
|
|
35
|
+
return undefined;
|
|
36
|
+
}
|
|
37
|
+
const parts = token.split(".");
|
|
38
|
+
if (parts.length !== 3 || parts[1] === undefined || parts[1] === "") {
|
|
39
|
+
return undefined;
|
|
40
|
+
}
|
|
41
|
+
try {
|
|
42
|
+
const decoded = Buffer.from(parts[1], "base64url").toString("utf8");
|
|
43
|
+
return validEmail(asRecord(parseJson(decoded))?.email);
|
|
44
|
+
}
|
|
45
|
+
catch {
|
|
46
|
+
return undefined;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
/**
|
|
50
|
+
* Extract the account email from agy's plain-file OAuth token JSON without
|
|
51
|
+
* ever returning or logging credential values:
|
|
52
|
+
* - `[env]` + `[sym]` agy 1.5.13 (`StoredToken.IDTokenEmail`, `json:"id_token_email,omitempty"`):
|
|
53
|
+
* agy extracts `email` from the OIDC `id_token` in `RememberIDToken` and stores `id_token_email`.
|
|
54
|
+
* - Fallback: unverified JWT payload `email` if a raw `id_token` string is present.
|
|
55
|
+
*/
|
|
56
|
+
export function projectAntigravityTokenEmail(payload) {
|
|
57
|
+
const root = asRecord(payload);
|
|
58
|
+
if (root === null) {
|
|
59
|
+
return undefined;
|
|
60
|
+
}
|
|
61
|
+
return validEmail(root.id_token_email)
|
|
62
|
+
?? jwtPayloadEmail(root.id_token)
|
|
63
|
+
?? jwtPayloadEmail(asRecord(root.token)?.id_token);
|
|
64
|
+
}
|
|
65
|
+
async function hasLinuxSessionBus(env) {
|
|
66
|
+
const address = environmentValue(env, "DBUS_SESSION_BUS_ADDRESS");
|
|
67
|
+
if (address !== undefined && address !== "") {
|
|
68
|
+
return true;
|
|
69
|
+
}
|
|
70
|
+
const runtimeDir = environmentValue(env, "XDG_RUNTIME_DIR")
|
|
71
|
+
?? (typeof process.getuid === "function" ? `/run/user/${String(process.getuid())}` : undefined);
|
|
72
|
+
if (runtimeDir === undefined || runtimeDir === "") {
|
|
73
|
+
return false;
|
|
74
|
+
}
|
|
75
|
+
try {
|
|
76
|
+
await stat(path.join(runtimeDir, "bus"));
|
|
77
|
+
return true;
|
|
78
|
+
}
|
|
79
|
+
catch {
|
|
80
|
+
return false;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
function dbusProbeEnv(env) {
|
|
84
|
+
const minimal = { LC_ALL: "C" };
|
|
85
|
+
for (const key of ["PATH", "DBUS_SESSION_BUS_ADDRESS", "XDG_RUNTIME_DIR"]) {
|
|
86
|
+
const value = environmentValue(env, key);
|
|
87
|
+
if (value !== undefined) {
|
|
88
|
+
minimal[key] = value;
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
return minimal;
|
|
92
|
+
}
|
|
93
|
+
/**
|
|
94
|
+
* Check whether `org.freedesktop.secrets` is owned or activatable on the Linux
|
|
95
|
+
* D-Bus session bus (pure bus daemon introspection, never touches the keyring).
|
|
96
|
+
* Fails closed (`true`) when a bus exists and introspection cannot prove absence.
|
|
97
|
+
*/
|
|
98
|
+
async function linuxSecretServiceReachable(env) {
|
|
99
|
+
if (!(await hasLinuxSessionBus(env))) {
|
|
100
|
+
return false;
|
|
101
|
+
}
|
|
102
|
+
const probeEnv = dbusProbeEnv(env);
|
|
103
|
+
const baseArgs = ["--session", "--print-reply=literal", "--dest=org.freedesktop.DBus", "/org/freedesktop/DBus"];
|
|
104
|
+
try {
|
|
105
|
+
const [owner, activatable] = await Promise.all([
|
|
106
|
+
runExecutable("dbus-send", [...baseArgs, "org.freedesktop.DBus.NameHasOwner", "string:org.freedesktop.secrets"], { env: probeEnv, timeoutMs: DBUS_TIMEOUT_MS }),
|
|
107
|
+
runExecutable("dbus-send", [...baseArgs, "org.freedesktop.DBus.ListActivatableNames"], { env: probeEnv, timeoutMs: DBUS_TIMEOUT_MS }),
|
|
108
|
+
]);
|
|
109
|
+
if (!owner.ok || !activatable.ok) {
|
|
110
|
+
return true;
|
|
111
|
+
}
|
|
112
|
+
return owner.stdout.trim() !== "boolean false" || activatable.stdout.includes("org.freedesktop.secrets");
|
|
113
|
+
}
|
|
114
|
+
catch {
|
|
115
|
+
return true;
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
/**
|
|
119
|
+
* `[sym]` agy 1.5.13 (`compositeTokenStorage.LoadToken` / `LoadStoredToken`):
|
|
120
|
+
* agy reads `KeyringTokenStorage` (`go_keyring`: macOS Keychain, Windows
|
|
121
|
+
* Credential Manager, Linux `org.freedesktop.secrets`) FIRST and falls back to
|
|
122
|
+
* the plain JSON file only when the keyring fails or is empty; `SaveToken`
|
|
123
|
+
* purges the file best-effort after a keyring write. Because a stale plain file
|
|
124
|
+
* could hold an earlier account whenever a keyring backend is reachable, OAR
|
|
125
|
+
* treats the plain file as authoritative ONLY on Linux when Secret Service is
|
|
126
|
+
* proved unreachable (no session bus, or D-Bus confirms `org.freedesktop.secrets`
|
|
127
|
+
* is neither owned nor activatable). On macOS, Windows, and Linux desktops with
|
|
128
|
+
* Secret Service, `email` is omitted so OAR never displays a stale account.
|
|
129
|
+
*/
|
|
130
|
+
export async function isPlainTokenFileAuthoritative(env, probe = {}) {
|
|
131
|
+
const platform = probe.platform ?? process.platform;
|
|
132
|
+
if (platform !== "linux") {
|
|
133
|
+
return false;
|
|
134
|
+
}
|
|
135
|
+
return !(await (probe.secretServiceReachable ?? linuxSecretServiceReachable)(env));
|
|
136
|
+
}
|
|
137
|
+
/** Read-only email lookup from agy's plain token file when no OS keyring can shadow it. */
|
|
138
|
+
export async function readAntigravityTokenEmail(env, probe = {}) {
|
|
139
|
+
if (!(await isPlainTokenFileAuthoritative(env, probe))) {
|
|
140
|
+
return undefined;
|
|
141
|
+
}
|
|
142
|
+
const tokenFile = path.join(environmentHome(env), ".gemini", "antigravity-cli", "antigravity-oauth-token");
|
|
143
|
+
try {
|
|
144
|
+
return projectAntigravityTokenEmail(parseJson(await readFile(tokenFile, "utf8")));
|
|
145
|
+
}
|
|
146
|
+
catch {
|
|
147
|
+
return undefined;
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
/** Remembered account from a remaining authoritative plain token file when signed out. */
|
|
151
|
+
export async function rememberedAntigravityAccount(env, probe = {}) {
|
|
152
|
+
const email = await readAntigravityTokenEmail(env, probe);
|
|
153
|
+
return email === undefined ? undefined : { email };
|
|
154
|
+
}
|
|
155
|
+
//# sourceMappingURL=token-email.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"token-email.js","sources":["../../../src/runtimes/antigravity/token-email.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { claudeAuthStatus, claudeLogin } from "./login.js";
|
|
2
2
|
import { claudeLogout } from "./logout.js";
|
|
3
|
-
import { claudeUpgrade } from "./update.js";
|
|
4
3
|
export declare const claudeRuntime: Omit<{
|
|
5
4
|
readonly id: "claude";
|
|
6
5
|
readonly sessionCapabilities: () => {
|
|
@@ -47,7 +46,7 @@ export declare const claudeRuntime: Omit<{
|
|
|
47
46
|
readonly redeemLimitReset: import("../../browser.js").LimitResetRedeemer;
|
|
48
47
|
readonly listModels: import("../../browser.js").ModelLister;
|
|
49
48
|
readonly checkUpdate: import("../../browser.js").UpdateChecker;
|
|
50
|
-
readonly upgrade:
|
|
49
|
+
readonly upgrade: import("../../browser.js").Upgrader;
|
|
51
50
|
readonly login: typeof claudeLogin;
|
|
52
51
|
readonly logout: typeof claudeLogout;
|
|
53
52
|
readonly authStatus: typeof claudeAuthStatus;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sources":["../../../src/runtimes/claude/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sources":["../../../src/runtimes/claude/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAU3C,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8BE,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { SessionFork } from "../../contracts/session-options.js";
|
|
2
|
+
import type { JsonRecord } from "../../shared/json.js";
|
|
2
3
|
/** Refuse, before claude starts, a `launchArgs` entry that collides with a flag OAR manages. */
|
|
3
4
|
export declare function refuseManagedLaunchArgs(launchArgs: readonly string[] | undefined): void;
|
|
4
5
|
/**
|
|
@@ -7,6 +8,8 @@ export declare function refuseManagedLaunchArgs(launchArgs: readonly string[] |
|
|
|
7
8
|
* fork the flag stays the host's, as before.
|
|
8
9
|
*/
|
|
9
10
|
export declare function refuseForkLaunchArgs(launchArgs: readonly string[] | undefined, fork: SessionFork | undefined): void;
|
|
11
|
+
/** Claude replaces the entire --settings value on repetition, including when it names a file. */
|
|
12
|
+
export declare function claudeSettingsArgs(settings: JsonRecord, launchArgs: readonly string[] | undefined): readonly string[];
|
|
10
13
|
/** Keep explicit native modes noninteractive; omission preserves OAR's default bypass. */
|
|
11
14
|
export declare function claudePermissionArgs(launchArgs: readonly string[] | undefined): readonly string[];
|
|
12
15
|
//# sourceMappingURL=launch-args.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launch-args.d.ts","sources":["../../../src/runtimes/claude/launch-args.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"launch-args.d.ts","sources":["../../../src/runtimes/claude/launch-args.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAuCvD,gGAAgG;AAChG,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,GAAG,IAAI,CAEvF;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,EAAE,IAAI,EAAE,WAAW,GAAG,SAAS,GAAG,IAAI,CAKnH;AAED,iGAAiG;AACjG,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,GAAG,SAAS,MAAM,EAAE,CAMrH;AAED,0FAA0F;AAC1F,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,GAAG,SAAS,MAAM,EAAE,CAoBjG"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { UnsupportedOptionError } from "../../contracts/errors.js";
|
|
2
|
-
import { checkManagedLaunchArgs } from "../../shared/launch-args.js";
|
|
2
|
+
import { checkManagedLaunchArgs, normalizeLaunchFlag } from "../../shared/launch-args.js";
|
|
3
3
|
/**
|
|
4
4
|
* claude flags OAR sets itself, which a host's `launchArgs` would contradict
|
|
5
5
|
* (#336): with `--continue` claude exits next to OAR's `--session-id`; after
|
|
@@ -52,6 +52,16 @@ export function refuseForkLaunchArgs(launchArgs, fork) {
|
|
|
52
52
|
throw new UnsupportedOptionError("launchArgs", "claude launchArgs cannot include --resume-session-at with SessionOptions.fork: use fork.through");
|
|
53
53
|
}
|
|
54
54
|
}
|
|
55
|
+
/** Claude replaces the entire --settings value on repetition, including when it names a file. */
|
|
56
|
+
export function claudeSettingsArgs(settings, launchArgs) {
|
|
57
|
+
if (Object.keys(settings).length === 0) {
|
|
58
|
+
return [];
|
|
59
|
+
}
|
|
60
|
+
if ((launchArgs ?? []).some((arg) => normalizeLaunchFlag(arg) === "--settings")) {
|
|
61
|
+
throw new UnsupportedOptionError("launchArgs", "claude launchArgs cannot include --settings when OAR supplies session settings");
|
|
62
|
+
}
|
|
63
|
+
return ["--settings", JSON.stringify(settings)];
|
|
64
|
+
}
|
|
55
65
|
/** Keep explicit native modes noninteractive; omission preserves OAR's default bypass. */
|
|
56
66
|
export function claudePermissionArgs(launchArgs) {
|
|
57
67
|
const args = launchArgs ?? [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launch-args.js","sources":["../../../src/runtimes/claude/launch-args.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"launch-args.js","sources":["../../../src/runtimes/claude/launch-args.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launch.d.ts","sources":["../../../src/runtimes/claude/launch.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAG/D,OAAO,EAAoB,KAAK,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAkBtF,2CAA2C;AAC3C,MAAM,MAAM,aAAa,GAAG,WAAW,CAAC;AAExC;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,MAAM,CAAC,GAAG,SAAS,MAAM,EAAE,CAKxH;
|
|
1
|
+
{"version":3,"file":"launch.d.ts","sources":["../../../src/runtimes/claude/launch.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAG/D,OAAO,EAAoB,KAAK,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAkBtF,2CAA2C;AAC3C,MAAM,MAAM,aAAa,GAAG,WAAW,CAAC;AAExC;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,MAAM,CAAC,GAAG,SAAS,MAAM,EAAE,CAKxH;AAwCD;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CAgCtH"}
|
|
@@ -2,7 +2,7 @@ import { claudeRefusedSessionOptions } from "./options.js";
|
|
|
2
2
|
/* oxlint-disable import/max-dependencies -- Launch validates native options and owns MCP and prompt-file handoffs. */
|
|
3
3
|
import { claudeUserConfiguration } from "./user-configuration.js";
|
|
4
4
|
import { claudeServiceTierSettings } from "./service-tier.js";
|
|
5
|
-
import { claudePermissionArgs, refuseForkLaunchArgs, refuseManagedLaunchArgs } from "./launch-args.js";
|
|
5
|
+
import { claudePermissionArgs, claudeSettingsArgs, refuseForkLaunchArgs, refuseManagedLaunchArgs } from "./launch-args.js";
|
|
6
6
|
import { resolvedAdditionalDirectories } from "../../shared/additional-directories.js";
|
|
7
7
|
import { spawnLineProcess } from "../../shared/executable/index.js";
|
|
8
8
|
import { givenMcpServers } from "../../shared/mcp-servers.js";
|
|
@@ -34,7 +34,6 @@ export function claudeSessionArgs(sessionId, options) {
|
|
|
34
34
|
function spawnClaude(command, sessionId, options, mcpConfig, tierSettings, nativeArgs) {
|
|
35
35
|
const directories = resolvedAdditionalDirectories(options);
|
|
36
36
|
const configuration = claudeUserConfiguration(options);
|
|
37
|
-
// Claude replaces, rather than merges, repeated --settings arguments.
|
|
38
37
|
const settings = { ...tierSettings, ...configuration.settings };
|
|
39
38
|
return spawnLineProcess(command, [
|
|
40
39
|
"-p",
|
|
@@ -49,7 +48,7 @@ function spawnClaude(command, sessionId, options, mcpConfig, tierSettings, nativ
|
|
|
49
48
|
...((options.resume !== undefined && options.fork === undefined) || options.name === undefined ? [] : ["--name", options.name]),
|
|
50
49
|
...(options.model === undefined ? [] : ["--model", options.model]),
|
|
51
50
|
...(options.effort === undefined ? [] : ["--effort", options.effort]),
|
|
52
|
-
...(
|
|
51
|
+
...claudeSettingsArgs(settings, options.launchArgs),
|
|
53
52
|
...nativeArgs,
|
|
54
53
|
...configuration.args,
|
|
55
54
|
...(options.outputSchema === undefined ? [] : ["--json-schema", JSON.stringify(options.outputSchema)]),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launch.js","sources":["../../../src/runtimes/claude/launch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,cAAc,CAAC;AAC3D,sHAAsH;AACtH,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAG9D,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"launch.js","sources":["../../../src/runtimes/claude/launch.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-config.d.ts","sources":["../../../src/runtimes/claude/mcp-config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mcp-config.d.ts","sources":["../../../src/runtimes/claude/mcp-config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAsD,KAAK,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAkB/H,YAAY,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAE3E,yHAAyH;AACzH,wBAAgB,eAAe,CAAC,OAAO,EAAE,SAAS,SAAS,EAAE,GAAG;IAAE,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAM/G;AAID;;;GAGG;AACH,wBAAsB,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC,CAE9D;AAED,gIAAgI;AAChI,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,SAAS,SAAS,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAKhG"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
+
import { claudeMcpCredentialRefusal } from "./options.js";
|
|
1
2
|
import { handOverMcpConfigFile, sweepAbandonedMcpConfigDirs } from "../../shared/mcp-config-handoff.js";
|
|
2
|
-
import { checkMcpServerNames, isHttpMcpServer } from "../../shared/mcp-servers.js";
|
|
3
|
+
import { checkMcpServerNames, hasMcpCredentials, isHttpMcpServer } from "../../shared/mcp-servers.js";
|
|
3
4
|
/** claude's `--mcp-config` document for the entries: stdio `{type, command, args, env}`, http `{type, url, headers}`. */
|
|
4
5
|
export function claudeMcpConfig(servers) {
|
|
5
6
|
return {
|
|
@@ -19,7 +20,8 @@ export async function sweepAbandonedMcpConfigs() {
|
|
|
19
20
|
/** The handoff for these entries (sweeping as above first). Rejects on an empty or repeated name before anything is created. */
|
|
20
21
|
export async function handOverMcpConfig(servers) {
|
|
21
22
|
checkMcpServerNames(servers);
|
|
22
|
-
const
|
|
23
|
+
const fileRefusal = servers.some((server) => hasMcpCredentials(server)) ? claudeMcpCredentialRefusal : undefined;
|
|
24
|
+
const handoff = await handOverMcpConfigFile(PREFIX, JSON.stringify(claudeMcpConfig(servers)), fileRefusal);
|
|
23
25
|
return handoff;
|
|
24
26
|
}
|
|
25
27
|
//# sourceMappingURL=mcp-config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-config.js","sources":["../../../src/runtimes/claude/mcp-config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mcp-config.js","sources":["../../../src/runtimes/claude/mcp-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAE1D,OAAO,EAAE,qBAAqB,EAAE,2BAA2B,EAAyB,MAAM,oCAAoC,CAAC;AAC/H,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAmBtG,yHAAyH;AACzH,MAAM,UAAU,eAAe,CAAC,OAA6B;IAC3D,OAAO;QACL,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,eAAe,CAAC,MAAM,CAAC;gBAC1F,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE;gBACzG,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,EAAE,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;KACrI,CAAC;AACJ,CAAC;AAED,MAAM,MAAM,GAAG,iBAAiB,CAAC;AAEjC;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB;IAC5C,MAAM,2BAA2B,CAAC,MAAM,CAAC,CAAC;AAC5C,CAAC;AAED,gIAAgI;AAChI,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,OAA6B;IACnE,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAC7B,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,SAAS,CAAC;IACjH,MAAM,OAAO,GAAG,MAAM,qBAAqB,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;IAC3G,OAAO,OAAO,CAAC;AACjB,CAAC"}
|