@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
|
@@ -8,7 +8,9 @@ export interface ContextUsage {
|
|
|
8
8
|
* Whether `Session.contextUsage()` reliably reports trustworthy `tokens` and
|
|
9
9
|
* `contextWindow` by the end of each normally completed root turn (fresh and
|
|
10
10
|
* resumed sessions alike; aborted turns are not promised, and earlier readings
|
|
11
|
-
* are a bonus).
|
|
11
|
+
* are a bonus). A turn that compacted may end with `tokens: null`: the context
|
|
12
|
+
* is unknown until the next model response, as `ContextUsage` says, so a
|
|
13
|
+
* compaction-only turn (a manual compact) never reports it.
|
|
12
14
|
*/
|
|
13
15
|
export interface ContextUsageCapability {
|
|
14
16
|
readonly tokens: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-usage.d.ts","sources":["../../src/contracts/context-usage.ts"],"names":[],"mappings":"AAAA,iNAAiN;AACjN,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,QAAQ,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC;AAED
|
|
1
|
+
{"version":3,"file":"context-usage.d.ts","sources":["../../src/contracts/context-usage.ts"],"names":[],"mappings":"AAAA,iNAAiN;AACjN,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,QAAQ,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;CACjC"}
|
|
@@ -17,7 +17,9 @@ import type { StartSession } from "./session.js";
|
|
|
17
17
|
* identifies a value of an option a host can know in advance: an
|
|
18
18
|
* `mcpServers` entry carrying a credential (a non-empty `env` on a stdio
|
|
19
19
|
* entry, non-empty `headers` on an http one), which every `serveMcpTools`
|
|
20
|
-
* entry does.
|
|
20
|
+
* entry does. Declare it when isolation through the first turn is unverified or fails
|
|
21
|
+
* (docs/spec/runtime-matrix.md#refused-session-options).
|
|
22
|
+
* `userConfiguration` refuses any nonempty exclusion;
|
|
21
23
|
* `partialUserConfiguration` refuses a nonempty proper subset;
|
|
22
24
|
* `"include"` and omission keep native behavior. `fork` is any
|
|
23
25
|
* `SessionOptions.fork`, with or without `through`.
|
|
@@ -46,7 +48,7 @@ export interface SessionCapabilityDeclaration {
|
|
|
46
48
|
readonly manualCompaction?: ManualCompaction;
|
|
47
49
|
/** Whether native automatic compaction reports `compaction_started` / `compaction_ended`; absent when unmeasured. */
|
|
48
50
|
readonly compactionEvents?: CompactionEvents;
|
|
49
|
-
/** Whether `Session.contextUsage()` reports
|
|
51
|
+
/** Whether `Session.contextUsage()` reports `tokens` and `contextWindow` by the end of a completed turn (exceptions on `ContextUsageCapability`); absent when unmeasured. */
|
|
50
52
|
readonly contextUsage?: ContextUsageCapability;
|
|
51
53
|
/** Verified session MCP transports (`[]` when MCP is refused; absent when unverified or handshake-only). */
|
|
52
54
|
readonly mcpTransports?: readonly McpTransport[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.d.ts","sources":["../../src/contracts/runtime.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACtG,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChF,OAAO,KAAK,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAClF,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC3E,OAAO,KAAK,EAAmB,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAC1E,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEzE,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,uBAAuB,EAAoB,MAAM,gBAAgB,CAAC;AACvG,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD
|
|
1
|
+
{"version":3,"file":"runtime.d.ts","sources":["../../src/contracts/runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.js","sources":["../../src/contracts/runtime.ts"],"names":[],"mappings":"AAOA,yIAAyI;AACzI,OAAO,EAAuD,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"runtime.js","sources":["../../src/contracts/runtime.ts"],"names":[],"mappings":"AAOA,yIAAyI;AACzI,OAAO,EAAuD,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AA0OvG,KAAK,UAAU,WAAW;IACxB,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;IACxB,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,IAAI,EAAE,uBAAuB;QAC7B,MAAM,EAAE,+DAA+D;KACxE,CAAC;AACJ,CAAC;AAKD,MAAM,UAAU,aAAa,CAAoC,OAAU,EAAE,OAAO,GAA4B,EAAE;IAChH,2HAA2H;IAC3H,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;QAAC,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAAC,CAAC;IACzI,MAAM,MAAM,GAAG,CAAC,SAA2B,EAAqB,EAAE,CAAC,CACjE;QACE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW;QACvF,GAAG,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,SAAS;QAC1F,oGAAoG;QACpG,+GAA+G;QAC/G,mBAAmB,CAAuC,YAAmC;YAC3F,OAAO,sBAAsB,CAAC,IAAI,IAAI,OAAO,EAAE,OAAO,CAAC,mBAAmB,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;QACpG,CAAC;QACD,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,IAAI;QACpC,aAAa,EAAE,MAAM;QACrB,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC;KAC/D,CACF,CAAC;IACF,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AAID,SAAS,sBAAsB,CAAC,OAA2B,EAAE,QAAsC;IACjG,MAAM,OAAO,GAAG,EAAE,GAAG,OAAO,CAAC,qBAAqB,EAAE,GAAG,QAAQ,CAAC,qBAAqB,EAAE,CAAC;IACxF,MAAM,gBAAgB,GAAG,QAAQ,CAAC,gBAAgB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAC/E,OAAO;QACL,GAAG,QAAQ;QACX,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,qBAAqB,EAAE,OAAO,EAAE,CAAC;QAChF,GAAG,CAAC,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,CAAC;KAChE,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,4BAA4B,CAAC,OAAkE,EAAE,YAAmC;IAClJ,OAAO,sBAAsB,CAAC,OAAO,EAAE,OAAO,CAAC,mBAAmB,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;AAC5F,CAAC"}
|
|
@@ -217,53 +217,37 @@ export interface SessionOptions {
|
|
|
217
217
|
* the saved value only until compaction, then uses the new-session default.
|
|
218
218
|
* Codex replaces immediately and retains the saved value when omitted.
|
|
219
219
|
* See Runtime.resumedSessionOptions for measured timing and omission behavior.
|
|
220
|
-
* Refused by cursor, kimi, antigravity
|
|
220
|
+
* Refused by cursor, kimi, antigravity and pi-durable with
|
|
221
221
|
* UnsupportedOptionError; see Runtime.refusedSessionOptions and the runtime
|
|
222
222
|
* matrix for version/value-specific refusals.
|
|
223
223
|
*/
|
|
224
224
|
readonly systemPrompt?: string;
|
|
225
225
|
/**
|
|
226
|
-
*
|
|
226
|
+
* Append after the included native configuration and harness instructions, preserving both.
|
|
227
227
|
* On Claude and Codex resume a different value takes effect after native
|
|
228
228
|
* compaction. Omitting it retains the saved value only until compaction,
|
|
229
229
|
* then uses the new-session default. Supply the current Claude/Codex prompt
|
|
230
230
|
* on every open to retain it after compaction. Other runtimes' measured timing and
|
|
231
231
|
* omission behavior are declared in Runtime.resumedSessionOptions; absence
|
|
232
|
-
* means untested. Refused by cursor, kimi
|
|
232
|
+
* means untested. Refused by cursor, kimi and codebuddy with
|
|
233
233
|
* UnsupportedOptionError; antigravity also refuses when its server does not
|
|
234
234
|
* advertise append support. Grok append-only resume must omit this option to
|
|
235
235
|
* retain the saved value; changing it requires systemPrompt as well.
|
|
236
236
|
*/
|
|
237
237
|
readonly appendSystemPrompt?: string;
|
|
238
238
|
/**
|
|
239
|
-
* MCP servers
|
|
240
|
-
*
|
|
241
|
-
*
|
|
242
|
-
*
|
|
243
|
-
*
|
|
244
|
-
*
|
|
245
|
-
*
|
|
246
|
-
* `
|
|
247
|
-
*
|
|
248
|
-
*
|
|
249
|
-
*
|
|
250
|
-
*
|
|
251
|
-
* on a name another extension registered; dsh refuses a native namespace collision; the others: the session's
|
|
252
|
-
* replaces it), measured on each runtime page. A stdio server
|
|
253
|
-
* gets `env` on top of what the runtime passes it (claude and pi: the whole
|
|
254
|
-
* environment, `SessionOptions.env` included; codex: an allowlist such as
|
|
255
|
-
* `HOME` and `PATH`). Names are unique within the list, and none is
|
|
256
|
-
* `__proto__`, `__defineGetter__`, `__defineSetter__`, `__lookupGetter__` or
|
|
257
|
-
* `__lookupSetter__`, which some runtimes drop without a word
|
|
258
|
-
* (`UnsupportedOptionError` on every runtime, #395). Refused when
|
|
259
|
-
* non-empty by cursor: `session()` rejects with `UnsupportedOptionError`
|
|
260
|
-
* (`Runtime.refusedSessionOptions`,
|
|
261
|
-
* docs/spec/runtime-matrix.md#refused-session-options), as it does for a
|
|
262
|
-
* transport a runtime cannot attach (http on an ACP agent whose
|
|
263
|
-
* `initialize` declares no `mcpCapabilities.http`) and for an entry with
|
|
264
|
-
* `env` or `headers` on antigravity, which would write them to its disk, or
|
|
265
|
-
* on dsh, whose persistence boundary is unverified (declared as
|
|
266
|
-
* `refusedSessionOptions.mcpServerCredentials`).
|
|
239
|
+
* Attach these MCP servers for this session. Supply them again on resume.
|
|
240
|
+
* The runtime keeps servers from included configuration sources. Its native
|
|
241
|
+
* rules determine how name collisions resolve and which environment a stdio
|
|
242
|
+
* server inherits before its entry's `env` is applied.
|
|
243
|
+
* Names must be unique. Reserved JavaScript object accessor names and
|
|
244
|
+
* `__proto__` are refused with `UnsupportedOptionError`.
|
|
245
|
+
* Check the installation's MCP transports and refused session options before
|
|
246
|
+
* attaching servers. `refusedSessionOptions.mcpServerCredentials` covers
|
|
247
|
+
* entries with nonempty stdio `env` or HTTP `headers`, including bearer
|
|
248
|
+
* tokens from `serveMcpTools`. An unsupported entry rejects the open with
|
|
249
|
+
* `UnsupportedOptionError` on `mcpServers`.
|
|
250
|
+
* See docs/spec/runtime-matrix.md#refused-session-options.
|
|
267
251
|
*/
|
|
268
252
|
readonly mcpServers?: readonly McpServer[];
|
|
269
253
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-options.d.ts","sources":["../../src/contracts/session-options.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,yBAAyB,GAAG,UAAU,GAAG,KAAK,GAAG,cAAc,CAAC;AAC5E,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,MAAM,CAAC;AAE5C;;;;;;;;;;;;;GAaG;AACH,MAAM,MAAM,SAAS,GACjB;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;CAAE,GACvI;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;CAAE,CAAC;AAEhI;;;;;;;;;GASG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;;;;;GAMG;AACH,MAAM,WAAW,cAAc;IAC7B;;;;;;OAMG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC;;;;;OAKG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IACzB;;;;;;;;;;;;;;;;;;OAkBG;IACH,QAAQ,CAAC,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAC3C,qaAAqa;IACra,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,qBAAqB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACnD,2EAA2E;IAC3E,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB;;;;;;;;;;;;;;;;;;OAkBG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC1D;;;;;;;;;OASG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB;;;;;;;;;OASG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB;;;;;;;;;;;;;;;;;OAiBG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC;IAC5B;;;;;;;;OAQG;IACH,QAAQ,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC;IACvD;;;;;;;;OAQG;IACH,QAAQ,CAAC,iBAAiB,CAAC,EAAE,SAAS,GAAG,SAAS,GAAG;QAAE,QAAQ,CAAC,OAAO,EAAE,SAAS,yBAAyB,EAAE,CAAA;KAAE,CAAC;IAChH;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAC/B;;;;;;;;;;;OAWG;IACH,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IACrC
|
|
1
|
+
{"version":3,"file":"session-options.d.ts","sources":["../../src/contracts/session-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { AccountUsageReader, AccountUsageSnapshot } from "../../contracts/account-usage.js";
|
|
2
|
+
import type { LoginAccount } from "../../contracts/login.js";
|
|
2
3
|
/** agy's `/credits` JSON reply: the AI credits left, or null when it does not say. */
|
|
3
4
|
export declare function projectAntigravityCredits(payload: unknown): number | null;
|
|
4
5
|
/**
|
|
@@ -8,7 +9,7 @@ export declare function projectAntigravityCredits(payload: unknown): number | nu
|
|
|
8
9
|
* quota where the account turned them on. Credits not read (undefined, or
|
|
9
10
|
* null when agy did not say) leave it false.
|
|
10
11
|
*/
|
|
11
|
-
export declare function projectAntigravityUsage(payload: unknown, remainingCredits?: number | null): AccountUsageSnapshot;
|
|
12
|
-
/** Quota through agy's own `/usage` answer, after its login check; no
|
|
12
|
+
export declare function projectAntigravityUsage(payload: unknown, remainingCredits?: number | null, account?: Pick<LoginAccount, "email" | "plan">): AccountUsageSnapshot;
|
|
13
|
+
/** Quota through agy's own `/usage` answer, after its login check; no HTTP call of OAR's. */
|
|
13
14
|
export declare const antigravityAccountUsage: AccountUsageReader;
|
|
14
15
|
//# sourceMappingURL=account-usage.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account-usage.d.ts","sources":["../../../src/runtimes/antigravity/account-usage.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,oBAAoB,EAAsB,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"account-usage.d.ts","sources":["../../../src/runtimes/antigravity/account-usage.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,oBAAoB,EAAsB,MAAM,kCAAkC,CAAC;AACrH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AA2E7D,sFAAsF;AACtF,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAKzE;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,OAAO,EAChB,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,EAChC,OAAO,CAAC,EAAE,IAAI,CAAC,YAAY,EAAE,OAAO,GAAG,MAAM,CAAC,GAC7C,oBAAoB,CAUtB;AAED,6FAA6F;AAC7F,eAAO,MAAM,uBAAuB,EAAE,kBAsCrC,CAAC"}
|
|
@@ -93,14 +93,18 @@ export function projectAntigravityCredits(payload) {
|
|
|
93
93
|
* quota where the account turned them on. Credits not read (undefined, or
|
|
94
94
|
* null when agy did not say) leave it false.
|
|
95
95
|
*/
|
|
96
|
-
export function projectAntigravityUsage(payload, remainingCredits) {
|
|
96
|
+
export function projectAntigravityUsage(payload, remainingCredits, account) {
|
|
97
97
|
const reading = readUsage(payload);
|
|
98
|
+
const plan = account?.plan?.trim();
|
|
99
|
+
const email = account?.email?.trim();
|
|
98
100
|
return {
|
|
99
101
|
kind: "available", rateLimited: reading.everyGroupExhausted && remainingCredits === 0, windows: reading.windows,
|
|
102
|
+
...(plan === undefined || plan === "" ? {} : { plan }),
|
|
103
|
+
...(email === undefined || email === "" ? {} : { email }),
|
|
100
104
|
...(remainingCredits === undefined || remainingCredits === null ? {} : { credits: { available: remainingCredits > 0, balance: String(remainingCredits) } }),
|
|
101
105
|
};
|
|
102
106
|
}
|
|
103
|
-
/** Quota through agy's own `/usage` answer, after its login check; no
|
|
107
|
+
/** Quota through agy's own `/usage` answer, after its login check; no HTTP call of OAR's. */
|
|
104
108
|
export const antigravityAccountUsage = async (installation, options = {}) => {
|
|
105
109
|
if (installation.via !== "executable") {
|
|
106
110
|
return { kind: "unsupported", reason: "unsupported_installation" };
|
|
@@ -112,14 +116,14 @@ export const antigravityAccountUsage = async (installation, options = {}) => {
|
|
|
112
116
|
const timeoutMs = options.timeoutMs ?? 30_000;
|
|
113
117
|
const deadline = Date.now() + timeoutMs;
|
|
114
118
|
const snapshot = await withQueryDeadline(USAGE, timeoutMs, async (signal) => {
|
|
115
|
-
const status = await readAntigravityAuthStatus(installation, { ...(options.env === undefined ? {} : { env: options.env }), timeoutMs: remainingMs(deadline, USAGE), signal });
|
|
119
|
+
const status = await readAntigravityAuthStatus(installation, { ...(options.env === undefined ? {} : { env: options.env }), timeoutMs: remainingMs(deadline, USAGE), includeAccount: true, signal });
|
|
116
120
|
if (status.kind === "unknown" && status.code === "version_unsupported") {
|
|
117
121
|
return { kind: "unsupported", reason: "version_unsupported",
|
|
118
122
|
...(status.installedVersion === undefined ? {} : { installedVersion: status.installedVersion }),
|
|
119
123
|
...(status.requiredVersion === undefined ? {} : { requiredVersion: status.requiredVersion }) };
|
|
120
124
|
}
|
|
121
125
|
if (status.kind === "logged_out") {
|
|
122
|
-
return { kind: "reauth_required", reason: "not_authenticated" };
|
|
126
|
+
return { kind: "reauth_required", reason: "not_authenticated", ...(status.lastAccount === undefined ? {} : { lastAccount: status.lastAccount }) };
|
|
123
127
|
}
|
|
124
128
|
// Without a confirmed login, /usage could start agy's interactive login and wait.
|
|
125
129
|
if (status.kind !== "logged_in") {
|
|
@@ -134,13 +138,13 @@ export const antigravityAccountUsage = async (installation, options = {}) => {
|
|
|
134
138
|
}
|
|
135
139
|
// Credits matter only when no group has quota left; read them then.
|
|
136
140
|
if (!readUsage(reply).everyGroupExhausted) {
|
|
137
|
-
return projectAntigravityUsage(reply);
|
|
141
|
+
return projectAntigravityUsage(reply, undefined, status.account);
|
|
138
142
|
}
|
|
139
143
|
const credits = await runExecutable(installation.command, ["-p", "/credits", "--output-format", "json"], {
|
|
140
144
|
env, timeoutMs: remainingMs(deadline, USAGE), signal,
|
|
141
145
|
});
|
|
142
146
|
const creditsReply = parseJson(credits.stdout.trim());
|
|
143
|
-
return projectAntigravityUsage(reply, projectAntigravityCredits(creditsReply));
|
|
147
|
+
return projectAntigravityUsage(reply, projectAntigravityCredits(creditsReply), status.account);
|
|
144
148
|
});
|
|
145
149
|
return snapshot;
|
|
146
150
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account-usage.js","sources":["../../../src/runtimes/antigravity/account-usage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"account-usage.js","sources":["../../../src/runtimes/antigravity/account-usage.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import type { LoginAccount } from "../../contracts/login.js";
|
|
2
|
+
/** Clear cached Antigravity plan tiers (called on login/logout and in tests). */
|
|
3
|
+
export declare function clearAntigravityPlanCache(): void;
|
|
4
|
+
/**
|
|
5
|
+
* Extract the non-empty plan/tier name from agy's ACP `authenticate` or
|
|
6
|
+
* `session/new` `_meta.antigravity.tier` envelope (`[env]` agy 1.5.13:
|
|
7
|
+
* `{ _meta: { antigravity: { tier: { name: "Google AI Ultra", id: "g1-ultra-tier", upgradeUri: "" } } } }`).
|
|
8
|
+
*/
|
|
9
|
+
export declare function projectAntigravityTier(payload: unknown): string | undefined;
|
|
10
|
+
/**
|
|
11
|
+
* Defense-in-depth child environment for agy's silent ACP tier read:
|
|
12
|
+
* `[sym]` + `[env]` agy 1.5.13 `google3/third_party/jetski/cli/acp/auth/auth.browserUnavailableReason`
|
|
13
|
+
* checks `SSH_CONNECTION`, `SSH_CLIENT`, and `SSH_TTY` (then `DISPLAY` and
|
|
14
|
+
* `WAYLAND_DISPLAY` on Linux) before opening a browser, returning JSON-RPC
|
|
15
|
+
* `-32603` immediately if silent auth cannot satisfy the requested method.
|
|
16
|
+
* This is a backstop only; callers must confirm sign-in with `agy models`,
|
|
17
|
+
* match the persisted method from `cache/acp-auth-state.json`, and enforce a
|
|
18
|
+
* short deadline that kills the child process.
|
|
19
|
+
*/
|
|
20
|
+
export declare function antigravitySilentAuthEnv(env: Readonly<NodeJS.ProcessEnv>): NodeJS.ProcessEnv;
|
|
21
|
+
/**
|
|
22
|
+
* Best-effort read of Antigravity's subscription tier name via ACP `authenticate`
|
|
23
|
+
* on a fresh `agy acp` process (no `--process-per-session`, no `session/new`).
|
|
24
|
+
* Caches positive readings briefly per `(command, home, methodId, email)` so
|
|
25
|
+
* repeated status polls do not spawn `agy acp` every time.
|
|
26
|
+
*/
|
|
27
|
+
export declare function readAntigravityPlan(command: string, env: Readonly<NodeJS.ProcessEnv>, options: {
|
|
28
|
+
readonly timeoutMs: number;
|
|
29
|
+
readonly signal?: AbortSignal;
|
|
30
|
+
readonly email?: string;
|
|
31
|
+
}): Promise<string | undefined>;
|
|
32
|
+
/** Combine read-only plain-file email (when authoritative) and silent ACP tier into `LoginAccount`. */
|
|
33
|
+
export declare function readAntigravityAccount(command: string, env: Readonly<NodeJS.ProcessEnv>, options: {
|
|
34
|
+
readonly timeoutMs: number;
|
|
35
|
+
readonly signal?: AbortSignal;
|
|
36
|
+
}): Promise<LoginAccount | undefined>;
|
|
37
|
+
//# sourceMappingURL=account.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"account.d.ts","sources":["../../../src/runtimes/antigravity/account.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAgB7D,iFAAiF;AACjF,wBAAgB,yBAAyB,IAAI,IAAI,CAEhD;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAI3E;AAED;;;;;;;;;GASG;AACH,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,UAAU,CAU5F;AA0BD;;;;;GAKG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,EAChC,OAAO,EAAE;IAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAC9F,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CA8B7B;AAED,uGAAuG;AACvG,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,EAChC,OAAO,EAAE;IAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAA;CAAE,GACrE,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAQnC"}
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
import { client, methods, PROTOCOL_VERSION } from "@agentclientprotocol/sdk";
|
|
2
|
+
import { environmentHome } from "../../shared/environment-home.js";
|
|
3
|
+
import { environmentValue, sessionEnvironment } from "../../shared/environment.js";
|
|
4
|
+
import { withQueryDeadline } from "../../shared/executable/query.js";
|
|
5
|
+
import { asRecord, asRecordList } from "../../shared/json.js";
|
|
6
|
+
import { startAcpProcess } from "../../shared/acp/process.js";
|
|
7
|
+
import { antigravityStateArgs } from "./state-directory.js";
|
|
8
|
+
import { readAntigravityTokenEmail, readPersistedAcpOAuthMethod } from "./token-email.js";
|
|
9
|
+
const PLAN_QUERY = "Antigravity plan query";
|
|
10
|
+
const PLAN_TIMEOUT_MS = 5000;
|
|
11
|
+
const PLAN_CACHE_TTL_MS = 5 * 60_000;
|
|
12
|
+
const META_KEY = "_meta";
|
|
13
|
+
const planCache = new Map();
|
|
14
|
+
/** Clear cached Antigravity plan tiers (called on login/logout and in tests). */
|
|
15
|
+
export function clearAntigravityPlanCache() {
|
|
16
|
+
planCache.clear();
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* Extract the non-empty plan/tier name from agy's ACP `authenticate` or
|
|
20
|
+
* `session/new` `_meta.antigravity.tier` envelope (`[env]` agy 1.5.13:
|
|
21
|
+
* `{ _meta: { antigravity: { tier: { name: "Google AI Ultra", id: "g1-ultra-tier", upgradeUri: "" } } } }`).
|
|
22
|
+
*/
|
|
23
|
+
export function projectAntigravityTier(payload) {
|
|
24
|
+
const meta = asRecord(asRecord(payload)?.[META_KEY]);
|
|
25
|
+
const tier = asRecord(asRecord(meta?.antigravity)?.tier);
|
|
26
|
+
return typeof tier?.name === "string" && tier.name.trim() !== "" ? tier.name.trim() : undefined;
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* Defense-in-depth child environment for agy's silent ACP tier read:
|
|
30
|
+
* `[sym]` + `[env]` agy 1.5.13 `google3/third_party/jetski/cli/acp/auth/auth.browserUnavailableReason`
|
|
31
|
+
* checks `SSH_CONNECTION`, `SSH_CLIENT`, and `SSH_TTY` (then `DISPLAY` and
|
|
32
|
+
* `WAYLAND_DISPLAY` on Linux) before opening a browser, returning JSON-RPC
|
|
33
|
+
* `-32603` immediately if silent auth cannot satisfy the requested method.
|
|
34
|
+
* This is a backstop only; callers must confirm sign-in with `agy models`,
|
|
35
|
+
* match the persisted method from `cache/acp-auth-state.json`, and enforce a
|
|
36
|
+
* short deadline that kills the child process.
|
|
37
|
+
*/
|
|
38
|
+
export function antigravitySilentAuthEnv(env) {
|
|
39
|
+
const existingSsh = environmentValue(env, "SSH_CONNECTION");
|
|
40
|
+
return sessionEnvironment({
|
|
41
|
+
SSH_CONNECTION: existingSsh !== undefined && existingSsh !== "" ? existingSsh : "1",
|
|
42
|
+
DISPLAY: null,
|
|
43
|
+
WAYLAND_DISPLAY: null,
|
|
44
|
+
}, env);
|
|
45
|
+
}
|
|
46
|
+
async function requestTier(process, methodId, signal) {
|
|
47
|
+
await process.spawned;
|
|
48
|
+
signal.throwIfAborted();
|
|
49
|
+
const initialized = await process.connection.agent.request(methods.agent.initialize, {
|
|
50
|
+
protocolVersion: PROTOCOL_VERSION,
|
|
51
|
+
clientCapabilities: { fs: { readTextFile: false, writeTextFile: false }, terminal: false },
|
|
52
|
+
clientInfo: { name: "oar", version: "0.0.0" },
|
|
53
|
+
});
|
|
54
|
+
signal.throwIfAborted();
|
|
55
|
+
const root = asRecord(initialized);
|
|
56
|
+
const antigravityCaps = asRecord(asRecord(asRecord(root?.agentCapabilities)?.[META_KEY])?.antigravity);
|
|
57
|
+
if (antigravityCaps?.tier !== true) {
|
|
58
|
+
return undefined;
|
|
59
|
+
}
|
|
60
|
+
if (!asRecordList(root?.authMethods).some((entry) => entry.id === methodId)) {
|
|
61
|
+
return undefined;
|
|
62
|
+
}
|
|
63
|
+
// `[sym]` + `[env]` agy 1.5.13: `authenticate` calls `trySilentConsumer` -> `fetchTier`
|
|
64
|
+
// (`GetUserTier` + `GetLoadCodeAssistResponse`, no `SaveUserTier`, no model session, no quota);
|
|
65
|
+
// live strace/stat confirmed `antigravity-oauth-token` is opened read-only after `agy models`.
|
|
66
|
+
const reply = await process.connection.agent.request("authenticate", { methodId });
|
|
67
|
+
return projectAntigravityTier(reply);
|
|
68
|
+
}
|
|
69
|
+
/**
|
|
70
|
+
* Best-effort read of Antigravity's subscription tier name via ACP `authenticate`
|
|
71
|
+
* on a fresh `agy acp` process (no `--process-per-session`, no `session/new`).
|
|
72
|
+
* Caches positive readings briefly per `(command, home, methodId, email)` so
|
|
73
|
+
* repeated status polls do not spawn `agy acp` every time.
|
|
74
|
+
*/
|
|
75
|
+
export async function readAntigravityPlan(command, env, options) {
|
|
76
|
+
const budgetMs = Math.min(options.timeoutMs, PLAN_TIMEOUT_MS);
|
|
77
|
+
if (budgetMs <= 0 || options.signal?.aborted === true) {
|
|
78
|
+
return undefined;
|
|
79
|
+
}
|
|
80
|
+
const methodId = await readPersistedAcpOAuthMethod(env);
|
|
81
|
+
if (methodId === undefined) {
|
|
82
|
+
return undefined;
|
|
83
|
+
}
|
|
84
|
+
const cacheKey = `${command}\0${environmentHome(env)}\0${methodId}\0${options.email ?? ""}`;
|
|
85
|
+
const cached = planCache.get(cacheKey);
|
|
86
|
+
if (cached !== undefined && cached.expiresAt > Date.now()) {
|
|
87
|
+
return cached.plan;
|
|
88
|
+
}
|
|
89
|
+
const resolved = await withQueryDeadline(PLAN_QUERY, budgetMs, async (signal, own) => {
|
|
90
|
+
try {
|
|
91
|
+
const runtime = own(startAcpProcess(command, ["acp", ...antigravityStateArgs(env)], client({ name: "oar" }), {
|
|
92
|
+
env: antigravitySilentAuthEnv(env),
|
|
93
|
+
inheritStderr: false,
|
|
94
|
+
redact: () => "Antigravity tier query failed",
|
|
95
|
+
}));
|
|
96
|
+
return (await requestTier(runtime, methodId, signal)) ?? null;
|
|
97
|
+
}
|
|
98
|
+
catch {
|
|
99
|
+
return null;
|
|
100
|
+
}
|
|
101
|
+
}, null, options.signal);
|
|
102
|
+
if (resolved !== null) {
|
|
103
|
+
planCache.set(cacheKey, { plan: resolved, expiresAt: Date.now() + PLAN_CACHE_TTL_MS });
|
|
104
|
+
}
|
|
105
|
+
return resolved ?? undefined;
|
|
106
|
+
}
|
|
107
|
+
/** Combine read-only plain-file email (when authoritative) and silent ACP tier into `LoginAccount`. */
|
|
108
|
+
export async function readAntigravityAccount(command, env, options) {
|
|
109
|
+
const email = await readAntigravityTokenEmail(env);
|
|
110
|
+
const plan = await readAntigravityPlan(command, env, { ...options, ...(email === undefined ? {} : { email }) });
|
|
111
|
+
if (email === undefined && plan === undefined) {
|
|
112
|
+
return undefined;
|
|
113
|
+
}
|
|
114
|
+
return {
|
|
115
|
+
...(email === undefined ? {} : { email }),
|
|
116
|
+
...(plan === undefined ? {} : { plan }),
|
|
117
|
+
};
|
|
118
|
+
}
|
|
119
|
+
//# sourceMappingURL=account.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"account.js","sources":["../../../src/runtimes/antigravity/account.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { AvailableInstallation } from "../../contracts/installation.js";
|
|
2
|
+
import type { AuthStatus, AuthStatusOptions } from "../../contracts/login.js";
|
|
3
|
+
export declare function readAntigravityAuthStatus(installation: AvailableInstallation, options?: AuthStatusOptions & {
|
|
4
|
+
readonly signal?: AbortSignal;
|
|
5
|
+
readonly includeAccount?: boolean;
|
|
6
|
+
}): Promise<AuthStatus>;
|
|
7
|
+
/** Whether Antigravity is signed in, by its own model listing (a remote call: not localOnly). */
|
|
8
|
+
export declare function antigravityAuthStatus(installation: AvailableInstallation, options?: AuthStatusOptions): Promise<AuthStatus>;
|
|
9
|
+
//# sourceMappingURL=auth-status.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth-status.d.ts","sources":["../../../src/runtimes/antigravity/auth-status.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAY9E,wBAAsB,yBAAyB,CAC7C,YAAY,EAAE,qBAAqB,EACnC,OAAO,GAAE,iBAAiB,GAAG;IAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,CAAA;CAAO,GACrG,OAAO,CAAC,UAAU,CAAC,CA0BrB;AAED,iGAAiG;AACjG,wBAAsB,qBAAqB,CAAC,YAAY,EAAE,qBAAqB,EAAE,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,UAAU,CAAC,CAUrI"}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import { sessionEnvironment } from "../../shared/environment.js";
|
|
2
|
+
import { runExecutable } from "../../shared/executable/index.js";
|
|
3
|
+
import { withQueryDeadline } from "../../shared/executable/query.js";
|
|
4
|
+
import { readAntigravityAccount } from "./account.js";
|
|
5
|
+
import { rememberedAntigravityAccount } from "./token-email.js";
|
|
6
|
+
import { antigravityUsesDefaultState, ANTIGRAVITY_STATE_QUERY_UNAVAILABLE } from "./state-directory.js";
|
|
7
|
+
import { antigravityVersionPreflight } from "./version.js";
|
|
8
|
+
const SOURCE = "agy models";
|
|
9
|
+
const SIGNED_OUT = /Please sign in\b/iu;
|
|
10
|
+
export async function readAntigravityAuthStatus(installation, options = {}) {
|
|
11
|
+
if (installation.via !== "executable") {
|
|
12
|
+
return { kind: "unknown", detail: "not a machine-installed executable" };
|
|
13
|
+
}
|
|
14
|
+
const env = sessionEnvironment(options.env);
|
|
15
|
+
if (!antigravityUsesDefaultState(env)) {
|
|
16
|
+
return { kind: "unknown", detail: ANTIGRAVITY_STATE_QUERY_UNAVAILABLE };
|
|
17
|
+
}
|
|
18
|
+
const timeoutMs = options.timeoutMs ?? 30_000;
|
|
19
|
+
const deadline = Date.now() + timeoutMs;
|
|
20
|
+
const version = await antigravityVersionPreflight(installation, env, { timeoutMs, ...(options.signal === undefined ? {} : { signal: options.signal }) });
|
|
21
|
+
if (version.kind === "unsupported") {
|
|
22
|
+
const { kind: _kind, reason, ...versions } = version;
|
|
23
|
+
return { kind: "unknown", ...versions, detail: reason };
|
|
24
|
+
}
|
|
25
|
+
const result = await runExecutable(installation.command, ["models"], {
|
|
26
|
+
env, timeoutMs: version.timeoutMs, ...(options.signal === undefined ? {} : { signal: options.signal }),
|
|
27
|
+
});
|
|
28
|
+
if (result.ok) {
|
|
29
|
+
const account = options.includeAccount === true
|
|
30
|
+
? await readAntigravityAccount(installation.command, env, { timeoutMs: Math.max(deadline - Date.now(), 0), ...(options.signal === undefined ? {} : { signal: options.signal }) })
|
|
31
|
+
: undefined;
|
|
32
|
+
return { kind: "logged_in", ...(account === undefined ? {} : { account }), source: SOURCE };
|
|
33
|
+
}
|
|
34
|
+
// Its refusal names the missing login; any other failure (network, a crash) says nothing about it.
|
|
35
|
+
if (result.exitCode === 1 && SIGNED_OUT.test(`${result.stdout}\n${result.stderr}`)) {
|
|
36
|
+
const lastAccount = options.includeAccount === true ? await rememberedAntigravityAccount(env) : undefined;
|
|
37
|
+
return { kind: "logged_out", source: SOURCE, ...(lastAccount === undefined ? {} : { lastAccount }) };
|
|
38
|
+
}
|
|
39
|
+
return { kind: "unknown", source: SOURCE, detail: "agy models ended without saying whether it is signed in" };
|
|
40
|
+
}
|
|
41
|
+
/** Whether Antigravity is signed in, by its own model listing (a remote call: not localOnly). */
|
|
42
|
+
export async function antigravityAuthStatus(installation, options = {}) {
|
|
43
|
+
try {
|
|
44
|
+
const status = await withQueryDeadline("Antigravity auth status", options.timeoutMs ?? 30_000, async (signal) => {
|
|
45
|
+
const read = await readAntigravityAuthStatus(installation, { ...options, includeAccount: true, signal });
|
|
46
|
+
return read;
|
|
47
|
+
}, { kind: "unknown", source: SOURCE, detail: "Antigravity auth status timed out" });
|
|
48
|
+
return status;
|
|
49
|
+
}
|
|
50
|
+
catch {
|
|
51
|
+
return { kind: "unknown", detail: "Antigravity authentication status could not be read" };
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
//# sourceMappingURL=auth-status.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth-status.js","sources":["../../../src/runtimes/antigravity/auth-status.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
import type { AvailableInstallation } from "../../contracts/installation.js";
|
|
2
|
-
import type {
|
|
2
|
+
import type { LoginOptions, LoginResult } from "../../contracts/login.js";
|
|
3
3
|
import type { ProviderLoginInteraction } from "../../contracts/provider-auth.js";
|
|
4
|
-
export
|
|
5
|
-
readonly signal?: AbortSignal;
|
|
6
|
-
}): Promise<AuthStatus>;
|
|
7
|
-
/** Whether Antigravity is signed in, by its own model listing (a remote call: not localOnly). */
|
|
8
|
-
export declare function antigravityAuthStatus(installation: AvailableInstallation, options?: AuthStatusOptions): Promise<AuthStatus>;
|
|
4
|
+
export { antigravityAuthStatus, readAntigravityAuthStatus } from "./auth-status.js";
|
|
9
5
|
/** Signs Antigravity in with its own `agy acp --login`, relaying the Google URL and writing the pasted code to its stdin. */
|
|
10
6
|
export declare function antigravityLogin(installation: AvailableInstallation, interaction: ProviderLoginInteraction, options?: LoginOptions): Promise<LoginResult>;
|
|
11
7
|
//# sourceMappingURL=auth.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sources":["../../../src/runtimes/antigravity/auth.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sources":["../../../src/runtimes/antigravity/auth.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAOjF,OAAO,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAyHpF,6HAA6H;AAC7H,wBAAsB,gBAAgB,CAAC,YAAY,EAAE,qBAAqB,EAAE,WAAW,EAAE,wBAAwB,EAAE,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,WAAW,CAAC,CAanK"}
|