@botiverse/oar 0.106.0 → 0.108.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +15 -10
- package/assets/brands/NOTICE.md +2 -0
- package/assets/brands/factory.svg +8 -0
- package/dist/brands.d.ts +4 -0
- package/dist/brands.d.ts.map +1 -1
- package/dist/brands.js +4 -0
- package/dist/brands.js.map +1 -1
- package/dist/contracts/errors.d.ts +1 -1
- package/dist/contracts/errors.d.ts.map +1 -1
- package/dist/contracts/errors.js.map +1 -1
- package/dist/contracts/index.d.ts +2 -0
- package/dist/contracts/index.d.ts.map +1 -1
- package/dist/contracts/index.js +2 -0
- package/dist/contracts/index.js.map +1 -1
- package/dist/contracts/model-confirmation-error.d.ts +27 -0
- package/dist/contracts/model-confirmation-error.d.ts.map +1 -0
- package/dist/contracts/model-confirmation-error.js +24 -0
- package/dist/contracts/model-confirmation-error.js.map +1 -0
- package/dist/contracts/resume-cwd-error.d.ts +30 -0
- package/dist/contracts/resume-cwd-error.d.ts.map +1 -0
- package/dist/contracts/resume-cwd-error.js +24 -0
- package/dist/contracts/resume-cwd-error.js.map +1 -0
- package/dist/index.d.ts +4 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +6 -0
- package/dist/index.js.map +1 -1
- package/dist/runtimes/antigravity/account-usage.d.ts.map +1 -1
- package/dist/runtimes/antigravity/account-usage.js +7 -2
- package/dist/runtimes/antigravity/account-usage.js.map +1 -1
- package/dist/runtimes/antigravity/auth.d.ts.map +1 -1
- package/dist/runtimes/antigravity/auth.js +8 -3
- package/dist/runtimes/antigravity/auth.js.map +1 -1
- package/dist/runtimes/antigravity/list-models.js +1 -1
- package/dist/runtimes/antigravity/list-models.js.map +1 -1
- package/dist/runtimes/antigravity/logout.d.ts.map +1 -1
- package/dist/runtimes/antigravity/logout.js +4 -2
- package/dist/runtimes/antigravity/logout.js.map +1 -1
- package/dist/runtimes/antigravity/options.js +1 -1
- package/dist/runtimes/antigravity/options.js.map +1 -1
- package/dist/runtimes/antigravity/session.d.ts +1 -1
- package/dist/runtimes/antigravity/session.d.ts.map +1 -1
- package/dist/runtimes/antigravity/session.js +5 -3
- package/dist/runtimes/antigravity/session.js.map +1 -1
- package/dist/runtimes/antigravity/state-directory.d.ts +6 -0
- package/dist/runtimes/antigravity/state-directory.d.ts.map +1 -0
- package/dist/runtimes/antigravity/state-directory.js +24 -0
- package/dist/runtimes/antigravity/state-directory.js.map +1 -0
- package/dist/runtimes/codex/open.d.ts +2 -1
- package/dist/runtimes/codex/open.d.ts.map +1 -1
- package/dist/runtimes/codex/open.js +2 -1
- package/dist/runtimes/codex/open.js.map +1 -1
- package/dist/runtimes/codex/session.js +1 -1
- package/dist/runtimes/codex/session.js.map +1 -1
- package/dist/runtimes/cursor/subprocess/child-script.js +1 -1
- package/dist/runtimes/dsh/session.d.ts.map +1 -1
- package/dist/runtimes/dsh/session.js +12 -5
- package/dist/runtimes/dsh/session.js.map +1 -1
- package/dist/runtimes/factory/account-credential.d.ts +20 -0
- package/dist/runtimes/factory/account-credential.d.ts.map +1 -0
- package/dist/runtimes/factory/account-credential.js +90 -0
- package/dist/runtimes/factory/account-credential.js.map +1 -0
- package/dist/runtimes/factory/account-usage.d.ts +5 -0
- package/dist/runtimes/factory/account-usage.d.ts.map +1 -0
- package/dist/runtimes/factory/account-usage.js +168 -0
- package/dist/runtimes/factory/account-usage.js.map +1 -0
- package/dist/runtimes/factory/account.d.ts +15 -0
- package/dist/runtimes/factory/account.d.ts.map +1 -0
- package/dist/runtimes/factory/account.js +238 -0
- package/dist/runtimes/factory/account.js.map +1 -0
- package/dist/runtimes/factory/client.d.ts +61 -0
- package/dist/runtimes/factory/client.d.ts.map +1 -0
- package/dist/runtimes/factory/client.js +116 -0
- package/dist/runtimes/factory/client.js.map +1 -0
- package/dist/runtimes/factory/compaction.d.ts +5 -0
- package/dist/runtimes/factory/compaction.d.ts.map +1 -0
- package/dist/runtimes/factory/compaction.js +70 -0
- package/dist/runtimes/factory/compaction.js.map +1 -0
- package/dist/runtimes/factory/index.d.ts +27 -0
- package/dist/runtimes/factory/index.d.ts.map +1 -0
- package/dist/runtimes/factory/index.js +22 -0
- package/dist/runtimes/factory/index.js.map +1 -0
- package/dist/runtimes/factory/install.d.ts +12 -0
- package/dist/runtimes/factory/install.d.ts.map +1 -0
- package/dist/runtimes/factory/install.js +21 -0
- package/dist/runtimes/factory/install.js.map +1 -0
- package/dist/runtimes/factory/installation.d.ts +5 -0
- package/dist/runtimes/factory/installation.d.ts.map +1 -0
- package/dist/runtimes/factory/installation.js +12 -0
- package/dist/runtimes/factory/installation.js.map +1 -0
- package/dist/runtimes/factory/list-models.d.ts +9 -0
- package/dist/runtimes/factory/list-models.d.ts.map +1 -0
- package/dist/runtimes/factory/list-models.js +46 -0
- package/dist/runtimes/factory/list-models.js.map +1 -0
- package/dist/runtimes/factory/open.d.ts +29 -0
- package/dist/runtimes/factory/open.d.ts.map +1 -0
- package/dist/runtimes/factory/open.js +96 -0
- package/dist/runtimes/factory/open.js.map +1 -0
- package/dist/runtimes/factory/options.d.ts +9 -0
- package/dist/runtimes/factory/options.d.ts.map +1 -0
- package/dist/runtimes/factory/options.js +29 -0
- package/dist/runtimes/factory/options.js.map +1 -0
- package/dist/runtimes/factory/projection.d.ts +33 -0
- package/dist/runtimes/factory/projection.d.ts.map +1 -0
- package/dist/runtimes/factory/projection.js +173 -0
- package/dist/runtimes/factory/projection.js.map +1 -0
- package/dist/runtimes/factory/session-state.d.ts +19 -0
- package/dist/runtimes/factory/session-state.d.ts.map +1 -0
- package/dist/runtimes/factory/session-state.js +5 -0
- package/dist/runtimes/factory/session-state.js.map +1 -0
- package/dist/runtimes/factory/session.d.ts +5 -0
- package/dist/runtimes/factory/session.d.ts.map +1 -0
- package/dist/runtimes/factory/session.js +340 -0
- package/dist/runtimes/factory/session.js.map +1 -0
- package/dist/runtimes/factory/settings.d.ts +20 -0
- package/dist/runtimes/factory/settings.d.ts.map +1 -0
- package/dist/runtimes/factory/settings.js +62 -0
- package/dist/runtimes/factory/settings.js.map +1 -0
- package/dist/runtimes/factory/update.d.ts +10 -0
- package/dist/runtimes/factory/update.d.ts.map +1 -0
- package/dist/runtimes/factory/update.js +34 -0
- package/dist/runtimes/factory/update.js.map +1 -0
- package/dist/runtimes/kimi/account-usage.d.ts.map +1 -1
- package/dist/runtimes/kimi/account-usage.js +4 -2
- package/dist/runtimes/kimi/account-usage.js.map +1 -1
- package/dist/runtimes/kimi/usage-environment.d.ts.map +1 -1
- package/dist/runtimes/kimi/usage-environment.js +2 -17
- package/dist/runtimes/kimi/usage-environment.js.map +1 -1
- package/dist/runtimes/pi/open.d.ts.map +1 -1
- package/dist/runtimes/pi/open.js +2 -1
- package/dist/runtimes/pi/open.js.map +1 -1
- package/dist/runtimes/pi/rpc/open.d.ts.map +1 -1
- package/dist/runtimes/pi/rpc/open.js +2 -1
- package/dist/runtimes/pi/rpc/open.js.map +1 -1
- package/dist/runtimes/pi-durable/options.d.ts.map +1 -1
- package/dist/runtimes/pi-durable/options.js +4 -2
- package/dist/runtimes/pi-durable/options.js.map +1 -1
- package/dist/runtimes/qoder/session.d.ts.map +1 -1
- package/dist/runtimes/qoder/session.js +18 -8
- package/dist/runtimes/qoder/session.js.map +1 -1
- package/dist/shared/acp/auth-query.d.ts +1 -0
- package/dist/shared/acp/auth-query.d.ts.map +1 -1
- package/dist/shared/acp/auth-query.js +1 -1
- package/dist/shared/acp/auth-query.js.map +1 -1
- package/dist/shared/acp/config-updates.d.ts +4 -2
- package/dist/shared/acp/config-updates.d.ts.map +1 -1
- package/dist/shared/acp/config-updates.js +42 -14
- package/dist/shared/acp/config-updates.js.map +1 -1
- package/dist/shared/acp/effort.d.ts.map +1 -1
- package/dist/shared/acp/effort.js +8 -5
- package/dist/shared/acp/effort.js.map +1 -1
- package/dist/shared/acp/profile.js +1 -1
- package/dist/shared/acp/profile.js.map +1 -1
- package/dist/shared/acp/resume-cwd.d.ts +2 -2
- package/dist/shared/acp/resume-cwd.d.ts.map +1 -1
- package/dist/shared/acp/resume-cwd.js +13 -9
- package/dist/shared/acp/resume-cwd.js.map +1 -1
- package/dist/shared/acp/terminal.d.ts.map +1 -1
- package/dist/shared/acp/terminal.js +1 -0
- package/dist/shared/acp/terminal.js.map +1 -1
- package/dist/shared/credential-http.d.ts +14 -0
- package/dist/shared/credential-http.d.ts.map +1 -0
- package/dist/shared/credential-http.js +25 -0
- package/dist/shared/credential-http.js.map +1 -0
- package/dist/shared/executable/probe-cleanup.d.ts +4 -0
- package/dist/shared/executable/probe-cleanup.d.ts.map +1 -0
- package/dist/shared/executable/probe-cleanup.js +85 -0
- package/dist/shared/executable/probe-cleanup.js.map +1 -0
- package/dist/shared/executable/process-tree.d.ts +2 -2
- package/dist/shared/executable/process-tree.d.ts.map +1 -1
- package/dist/shared/executable/process-tree.js +6 -5
- package/dist/shared/executable/process-tree.js.map +1 -1
- package/dist/shared/executable/process.d.ts.map +1 -1
- package/dist/shared/executable/process.js +1 -0
- package/dist/shared/executable/process.js.map +1 -1
- package/dist/shared/executable/run.d.ts.map +1 -1
- package/dist/shared/executable/run.js +6 -4
- package/dist/shared/executable/run.js.map +1 -1
- package/dist/shared/executable/script-terminal.d.ts.map +1 -1
- package/dist/shared/executable/script-terminal.js +2 -1
- package/dist/shared/executable/script-terminal.js.map +1 -1
- package/dist/shared/shell-environment.js +1 -1
- package/dist/shared/shell-environment.js.map +1 -1
- package/dist/shared/usage-environment.d.ts +9 -0
- package/dist/shared/usage-environment.d.ts.map +1 -0
- package/dist/shared/usage-environment.js +26 -0
- package/dist/shared/usage-environment.js.map +1 -0
- package/package.json +1 -1
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
import { createDecipheriv, createHash } from "node:crypto";
|
|
2
|
+
import { existsSync } from "node:fs";
|
|
3
|
+
import { readFile } from "node:fs/promises";
|
|
4
|
+
import path from "node:path";
|
|
5
|
+
import { getSystemErrorMap } from "node:util";
|
|
6
|
+
import { environmentValue } from "../../shared/environment.js";
|
|
7
|
+
import { environmentHome } from "../../shared/environment-home.js";
|
|
8
|
+
import { asRecord, parseJson } from "../../shared/json.js";
|
|
9
|
+
const systemErrorCodes = new Set([...getSystemErrorMap().values()].map(([code]) => code));
|
|
10
|
+
async function readText(file, what) {
|
|
11
|
+
try {
|
|
12
|
+
return await readFile(file, "utf8");
|
|
13
|
+
}
|
|
14
|
+
catch (error) {
|
|
15
|
+
const code = asRecord(error)?.code;
|
|
16
|
+
if (code === "ENOENT") {
|
|
17
|
+
return null;
|
|
18
|
+
}
|
|
19
|
+
// Native errors carry a path; keep only the system error code.
|
|
20
|
+
// oxlint-disable-next-line preserve-caught-error -- The native cause can expose the credential path.
|
|
21
|
+
throw new Error(`${what} could not be read (${typeof code === "string" && systemErrorCodes.has(code) ? code : "unknown I/O error"})`);
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
/** droid's keyfile cipher: `base64(iv):base64(tag):base64(ciphertext)`, AES-256-GCM, 16-byte IV and tag. */
|
|
25
|
+
export function decryptFactoryCredentials(ciphertext, key) {
|
|
26
|
+
const parts = ciphertext.trim().split(":");
|
|
27
|
+
const [iv, tag, data] = parts.map(part => Buffer.from(part, "base64"));
|
|
28
|
+
if (parts.length !== 3 || iv?.length !== 16 || tag?.length !== 16 || data === undefined || key.length !== 32) {
|
|
29
|
+
throw new Error("droid's stored login is not in its keyfile format");
|
|
30
|
+
}
|
|
31
|
+
try {
|
|
32
|
+
const decipher = createDecipheriv("aes-256-gcm", key, iv);
|
|
33
|
+
decipher.setAuthTag(tag);
|
|
34
|
+
return Buffer.concat([decipher.update(data), decipher.final()]).toString("utf8");
|
|
35
|
+
}
|
|
36
|
+
catch {
|
|
37
|
+
// The cause would be a crypto error about the stored bytes; it says nothing more useful.
|
|
38
|
+
throw new Error("droid's stored login could not be decrypted with its key file");
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
function enabled(value) {
|
|
42
|
+
return value !== undefined && value.trim() !== "" && !["0", "false"].includes(value.trim().toLowerCase());
|
|
43
|
+
}
|
|
44
|
+
/** The region droid cached for this API key (`api-key-identity/seed.json`), when it is for this key and API. */
|
|
45
|
+
async function apiKeyRegion(directory, key, api) {
|
|
46
|
+
const file = path.join(directory, "api-key-identity", "seed.json");
|
|
47
|
+
const text = await readText(file, "droid's API key identity cache").catch(() => null);
|
|
48
|
+
const seed = asRecord(parseJson(text ?? ""));
|
|
49
|
+
const credentialId = createHash("sha256").update(key).digest("hex");
|
|
50
|
+
if (seed?.version !== 2 || seed.credentialId !== credentialId || seed.apiBaseUrl !== api) {
|
|
51
|
+
return null;
|
|
52
|
+
}
|
|
53
|
+
const region = asRecord(seed.routing)?.region;
|
|
54
|
+
return typeof region === "string" ? region : null;
|
|
55
|
+
}
|
|
56
|
+
/**
|
|
57
|
+
* droid's own directory, resolved as droid 1.12.1 does: `FACTORY_HOME_OVERRIDE`
|
|
58
|
+
* when set, else the user's home (`HOME`, or `USERPROFILE` on Windows), then
|
|
59
|
+
* `.factory`.
|
|
60
|
+
*/
|
|
61
|
+
export function factoryDirectory(env) {
|
|
62
|
+
const override = environmentValue(env, "FACTORY_HOME_OVERRIDE")?.trim();
|
|
63
|
+
return path.join(override === undefined || override === "" ? environmentHome(env) : override, ".factory");
|
|
64
|
+
}
|
|
65
|
+
export async function factoryCredential(env, api) {
|
|
66
|
+
const directory = factoryDirectory(env);
|
|
67
|
+
const key = environmentValue(env, "FACTORY_API_KEY")?.trim();
|
|
68
|
+
if (key !== undefined && key !== "") {
|
|
69
|
+
return { kind: "credential", token: key, region: await apiKeyRegion(directory, key, api), organizationId: null };
|
|
70
|
+
}
|
|
71
|
+
const sealed = ["auth.v2.keyring", "auth.v2.loginkeychain"].map(file => path.join(directory, file));
|
|
72
|
+
if (!enabled(environmentValue(env, "FACTORY_DISABLE_KEYRING")) && sealed.some(file => existsSync(file))) {
|
|
73
|
+
return { kind: "snapshot", snapshot: { kind: "unsupported", reason: "unsupported_auth_storage" } };
|
|
74
|
+
}
|
|
75
|
+
const stored = await readText(path.join(directory, "auth.v2.file"), "droid's stored login");
|
|
76
|
+
const keyText = stored === null ? null : await readText(path.join(directory, "auth.v2.key"), "droid's login key file");
|
|
77
|
+
if (stored === null || keyText === null) {
|
|
78
|
+
return { kind: "snapshot", snapshot: { kind: "reauth_required", reason: "credentials_missing" } };
|
|
79
|
+
}
|
|
80
|
+
const plain = decryptFactoryCredentials(stored, Buffer.from(keyText.trim(), "base64"));
|
|
81
|
+
const credentials = asRecord(parseJson(plain));
|
|
82
|
+
const token = typeof credentials?.access_token === "string" ? credentials.access_token.trim() : "";
|
|
83
|
+
if (token === "") {
|
|
84
|
+
throw new Error("droid's stored login has no usable access_token");
|
|
85
|
+
}
|
|
86
|
+
const routed = asRecord(credentials?.whoami)?.region ?? credentials?.region;
|
|
87
|
+
const organization = typeof credentials?.active_organization_id === "string" ? credentials.active_organization_id.trim() : "";
|
|
88
|
+
return { kind: "credential", token, region: typeof routed === "string" ? routed : null, organizationId: organization === "" ? null : organization };
|
|
89
|
+
}
|
|
90
|
+
//# sourceMappingURL=account-credential.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"account-credential.js","sources":["../../../src/runtimes/factory/account-credential.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { AccountUsageReader, AccountUsageSnapshot } from "../../contracts/account-usage.js";
|
|
2
|
+
/** Project `/api/billing/limits` as droid's usage screen reads it. */
|
|
3
|
+
export declare function projectFactoryUsage(payload: unknown, now?: number): AccountUsageSnapshot;
|
|
4
|
+
export declare const factoryAccountUsage: AccountUsageReader;
|
|
5
|
+
//# sourceMappingURL=account-usage.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"account-usage.d.ts","sources":["../../../src/runtimes/factory/account-usage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,oBAAoB,EAA+C,MAAM,kCAAkC,CAAC;AAoE9I,sEAAsE;AACtE,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,GAAE,MAAmB,GAAG,oBAAoB,CAsBpG;AAWD,eAAO,MAAM,mBAAmB,EAAE,kBAgCjC,CAAC"}
|
|
@@ -0,0 +1,168 @@
|
|
|
1
|
+
import { remainingMs } from "../../shared/deadline.js";
|
|
2
|
+
import { credentialHeaderValue, requestFailure } from "../../shared/credential-http.js";
|
|
3
|
+
import { environmentValue } from "../../shared/environment.js";
|
|
4
|
+
import { utcInstantFromDate } from "../../shared/instant.js";
|
|
5
|
+
import { asNumber, asRecord, parseJson } from "../../shared/json.js";
|
|
6
|
+
import { factoryCredential } from "./account-credential.js";
|
|
7
|
+
import { accountUsageEnvironment } from "../../shared/usage-environment.js";
|
|
8
|
+
/*
|
|
9
|
+
* Factory droid's own usage screen (droid 1.12.1, read from its bundle; no
|
|
10
|
+
* Factory account has answered it yet): `GET <api>/api/billing/limits` with
|
|
11
|
+
* `Authorization: Bearer <credential>` and, for a signed-in user,
|
|
12
|
+
* `X-Factory-Org-Id`. `<api>` is `FACTORY_API_BASE_URL` (default
|
|
13
|
+
* https://api.factory.ai), or `FACTORY_API_BASE_URL_EU` (default
|
|
14
|
+
* https://api.eu.factory.ai) for an account droid has routed to region `eu`.
|
|
15
|
+
* The answer is not schema-checked by droid itself; its screen reads
|
|
16
|
+
* `limits.standard` and `limits.core`, each `{ fiveHour, weekly, monthly }`
|
|
17
|
+
* buckets of `{ usedPercent, windowEnd, unlimited? }`, plus
|
|
18
|
+
* `hasActiveSubscription`, `extraUsageBalanceCents`, `overagePreference` and
|
|
19
|
+
* `extraUsageAllowed`. A bucket whose `windowEnd` is absent or past has reset
|
|
20
|
+
* (droid shows 0%). droid has no limit-reset endpoint.
|
|
21
|
+
*
|
|
22
|
+
* The credential is the one droid itself would use, read as stored and never
|
|
23
|
+
* refreshed or written: `FACTORY_API_KEY` when set, else droid's
|
|
24
|
+
* `~/.factory/auth.v2.file`, AES-256-GCM encrypted with `~/.factory/auth.v2.key`
|
|
25
|
+
* (droid's "keyfile" storage). A login droid keeps under an OS keyring key
|
|
26
|
+
* (`auth.v2.keyring`, `auth.v2.loginkeychain`) is not readable here.
|
|
27
|
+
*/
|
|
28
|
+
const NAME = "Factory account usage";
|
|
29
|
+
const API = "https://api.factory.ai";
|
|
30
|
+
const API_EU = "https://api.eu.factory.ai";
|
|
31
|
+
const LIMITS = "/api/billing/limits";
|
|
32
|
+
const TIERS = [
|
|
33
|
+
{ key: "fiveHour", label: "5-hour", durationMs: 5 * 3_600_000 },
|
|
34
|
+
{ key: "weekly", label: "Weekly", durationMs: 7 * 86_400_000 },
|
|
35
|
+
// droid names the bucket "monthly" and gives its end; it does not say how long it is.
|
|
36
|
+
{ key: "monthly", label: "Monthly", durationMs: undefined },
|
|
37
|
+
];
|
|
38
|
+
function baseUrl(value, fallback) {
|
|
39
|
+
const url = value === undefined || value.trim() === "" ? fallback : value.trim().replace(/\/+$/u, "");
|
|
40
|
+
if (!/^https?:\/\//u.test(url)) {
|
|
41
|
+
throw new Error(`${NAME}: the Factory API base URL must start with http:// or https://`);
|
|
42
|
+
}
|
|
43
|
+
return url;
|
|
44
|
+
}
|
|
45
|
+
function bucketWindow(value, tier, prefix, labelPrefix, scope, now) {
|
|
46
|
+
const bucket = asRecord(value);
|
|
47
|
+
if (bucket === null) {
|
|
48
|
+
return null;
|
|
49
|
+
}
|
|
50
|
+
if (bucket.unlimited === true) {
|
|
51
|
+
return "unlimited";
|
|
52
|
+
}
|
|
53
|
+
const used = asNumber(bucket.usedPercent);
|
|
54
|
+
if (used === null || used < 0) {
|
|
55
|
+
return null;
|
|
56
|
+
}
|
|
57
|
+
let resetsAt = null;
|
|
58
|
+
if (typeof bucket.windowEnd === "string") {
|
|
59
|
+
resetsAt = utcInstantFromDate(new Date(bucket.windowEnd));
|
|
60
|
+
if (resetsAt === null) {
|
|
61
|
+
return null;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
else if (bucket.windowEnd !== null && bucket.windowEnd !== undefined) {
|
|
65
|
+
return null;
|
|
66
|
+
}
|
|
67
|
+
// Without a future end the window has reset: droid shows it at 0%.
|
|
68
|
+
const running = resetsAt !== null && Date.parse(resetsAt) > now;
|
|
69
|
+
return {
|
|
70
|
+
id: `${prefix}.${tier.key}`, label: `${labelPrefix}${tier.label}`,
|
|
71
|
+
usedRatio: running ? Number(Math.min(1, used / 100).toFixed(6)) : 0,
|
|
72
|
+
...(running && resetsAt !== null ? { resetsAt } : {}),
|
|
73
|
+
...(tier.durationMs === undefined ? {} : { durationMs: tier.durationMs }),
|
|
74
|
+
scope,
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
/** Project `/api/billing/limits` as droid's usage screen reads it. */
|
|
78
|
+
export function projectFactoryUsage(payload, now = Date.now()) {
|
|
79
|
+
const root = asRecord(payload);
|
|
80
|
+
if (root === null) {
|
|
81
|
+
throw new Error("Factory limits response is not an object");
|
|
82
|
+
}
|
|
83
|
+
const limits = asRecord(root.limits);
|
|
84
|
+
const groups = [
|
|
85
|
+
{ group: asRecord(limits?.standard), prefix: "standard", labelPrefix: "", scope: { kind: "account" } },
|
|
86
|
+
{ group: asRecord(limits?.core), prefix: "core", labelPrefix: "Droid Core ", scope: { kind: "models", name: "Droid Core" } },
|
|
87
|
+
].filter(entry => entry.group !== null);
|
|
88
|
+
if (groups.length === 0) {
|
|
89
|
+
if (root.hasActiveSubscription === false) {
|
|
90
|
+
return { kind: "unsupported", reason: "quota_unavailable" };
|
|
91
|
+
}
|
|
92
|
+
throw new Error("Factory limits response has no limits");
|
|
93
|
+
}
|
|
94
|
+
const read = groups.flatMap(({ group, prefix, labelPrefix, scope }) => TIERS.map((tier) => {
|
|
95
|
+
const window = bucketWindow(group?.[tier.key], tier, prefix, labelPrefix, scope, now);
|
|
96
|
+
return { prefix, window };
|
|
97
|
+
}));
|
|
98
|
+
const windows = read.flatMap(entry => entry.window !== null && entry.window !== "unlimited" ? [entry.window] : []);
|
|
99
|
+
if (windows.length === 0 && !read.some(entry => entry.window === "unlimited")) {
|
|
100
|
+
throw new Error("Factory limits response contains no usable windows");
|
|
101
|
+
}
|
|
102
|
+
// Standard Usage spent: droid continues only on Extra Usage the account allows and has balance for.
|
|
103
|
+
const exhausted = windows.some(window => window.id?.startsWith("standard.") === true && window.usedRatio >= 1);
|
|
104
|
+
const extraUsage = root.overagePreference === "extraUsage" && root.extraUsageAllowed === true && (asNumber(root.extraUsageBalanceCents) ?? 0) > 0;
|
|
105
|
+
return { kind: "available", rateLimited: exhausted && !extraUsage, windows };
|
|
106
|
+
}
|
|
107
|
+
async function body(response) {
|
|
108
|
+
let text = "";
|
|
109
|
+
try {
|
|
110
|
+
text = await response.text();
|
|
111
|
+
}
|
|
112
|
+
catch {
|
|
113
|
+
throw new Error("Factory limits response body could not be read");
|
|
114
|
+
}
|
|
115
|
+
const parsed = parseJson(text);
|
|
116
|
+
if (parsed === undefined) {
|
|
117
|
+
throw new Error("Factory limits response is not valid JSON");
|
|
118
|
+
}
|
|
119
|
+
return parsed;
|
|
120
|
+
}
|
|
121
|
+
export const factoryAccountUsage = async (installation, options = {}) => {
|
|
122
|
+
if (installation.via !== "executable") {
|
|
123
|
+
return { kind: "unsupported", reason: "unsupported_installation" };
|
|
124
|
+
}
|
|
125
|
+
const env = accountUsageEnvironment("Factory", options.env);
|
|
126
|
+
const deadline = Date.now() + (options.timeoutMs ?? 30_000);
|
|
127
|
+
const api = baseUrl(environmentValue(env, "FACTORY_API_BASE_URL"), API);
|
|
128
|
+
try {
|
|
129
|
+
const credential = await factoryCredential(env, api);
|
|
130
|
+
if (credential.kind === "snapshot") {
|
|
131
|
+
return credential.snapshot;
|
|
132
|
+
}
|
|
133
|
+
credentialHeaderValue(credential.token, "The Factory credential");
|
|
134
|
+
if (credential.organizationId !== null) {
|
|
135
|
+
credentialHeaderValue(credential.organizationId, "droid's stored organization id");
|
|
136
|
+
}
|
|
137
|
+
const base = credential.region === "eu" ? baseUrl(environmentValue(env, "FACTORY_API_BASE_URL_EU"), API_EU) : api;
|
|
138
|
+
let response = null;
|
|
139
|
+
try {
|
|
140
|
+
response = await fetch(`${base}${LIMITS}`, {
|
|
141
|
+
headers: {
|
|
142
|
+
"Authorization": `Bearer ${credential.token}`, "Accept": "application/json", "X-Factory-Client": "cli",
|
|
143
|
+
...(installation.version === undefined ? {} : { "X-Client-Version": installation.version }),
|
|
144
|
+
...(credential.organizationId === null ? {} : { "X-Factory-Org-Id": credential.organizationId }),
|
|
145
|
+
},
|
|
146
|
+
signal: AbortSignal.timeout(remainingMs(deadline, NAME)),
|
|
147
|
+
});
|
|
148
|
+
}
|
|
149
|
+
catch (error) {
|
|
150
|
+
// Not the cause: fetch's errors can quote the Authorization header.
|
|
151
|
+
throw requestFailure("Failed to reach the Factory limits endpoint", error);
|
|
152
|
+
}
|
|
153
|
+
if (response.status === 401 || response.status === 403) {
|
|
154
|
+
return { kind: "reauth_required", reason: "credentials_rejected" };
|
|
155
|
+
}
|
|
156
|
+
if (response.status === 404) {
|
|
157
|
+
return { kind: "unsupported", reason: "endpoint_unavailable" };
|
|
158
|
+
}
|
|
159
|
+
if (!response.ok) {
|
|
160
|
+
throw new Error(`Factory limits endpoint returned HTTP ${String(response.status)}`);
|
|
161
|
+
}
|
|
162
|
+
return projectFactoryUsage(await body(response));
|
|
163
|
+
}
|
|
164
|
+
catch (error) {
|
|
165
|
+
throw new Error("Failed to read Factory account usage", { cause: error });
|
|
166
|
+
}
|
|
167
|
+
};
|
|
168
|
+
//# sourceMappingURL=account-usage.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"account-usage.js","sources":["../../../src/runtimes/factory/account-usage.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { AvailableInstallation } from "../../contracts/installation.js";
|
|
2
|
+
import type { AuthStatus, AuthStatusOptions, LoginOptions, LoginResult, LogoutOptions, LogoutResult } from "../../contracts/login.js";
|
|
3
|
+
import type { ProviderLoginInteraction } from "../../contracts/provider-auth.js";
|
|
4
|
+
import { type JsonRecord } from "../../shared/json.js";
|
|
5
|
+
/** droid's `auth/status` answer as OAR's status. An API key droid reports without checking it is not a confirmed login. */
|
|
6
|
+
export declare function projectFactoryAuthStatus(result: JsonRecord | undefined): AuthStatus;
|
|
7
|
+
/** Whether droid is signed in, by its own ACP `auth/status`. */
|
|
8
|
+
export declare function factoryAuthStatus(installation: AvailableInstallation, options?: AuthStatusOptions & {
|
|
9
|
+
readonly signal?: AbortSignal;
|
|
10
|
+
}): Promise<AuthStatus>;
|
|
11
|
+
/** Signs droid in through its device-pairing flow: the URL reaches the host as an `auth_url` event. */
|
|
12
|
+
export declare function factoryLogin(installation: AvailableInstallation, interaction: ProviderLoginInteraction, options?: LoginOptions): Promise<LoginResult>;
|
|
13
|
+
/** Signs droid out through its own ACP `logout`; its `auth/status` decides. */
|
|
14
|
+
export declare function factoryLogout(installation: AvailableInstallation, options?: LogoutOptions): Promise<LogoutResult>;
|
|
15
|
+
//# sourceMappingURL=account.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"account.d.ts","sources":["../../../src/runtimes/factory/account.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACtI,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAGjF,OAAO,EAAqC,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAiF1F,2HAA2H;AAC3H,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,UAAU,GAAG,SAAS,GAAG,UAAU,CAUnF;AAsBD,gEAAgE;AAChE,wBAAsB,iBAAiB,CAAC,YAAY,EAAE,qBAAqB,EAAE,OAAO,GAAE,iBAAiB,GAAG;IAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAA;CAAO,GAAG,OAAO,CAAC,UAAU,CAAC,CAYrK;AAED,uGAAuG;AACvG,wBAAsB,YAAY,CAAC,YAAY,EAAE,qBAAqB,EAAE,WAAW,EAAE,wBAAwB,EAAE,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,WAAW,CAAC,CA4C/J;AAED,+EAA+E;AAC/E,wBAAsB,aAAa,CAAC,YAAY,EAAE,qBAAqB,EAAE,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,YAAY,CAAC,CAwB3H"}
|
|
@@ -0,0 +1,238 @@
|
|
|
1
|
+
import { sessionEnvironment } from "../../shared/environment.js";
|
|
2
|
+
import { spawnLineProcess } from "../../shared/executable/index.js";
|
|
3
|
+
import { asRecord, asRecordList, parseJson } from "../../shared/json.js";
|
|
4
|
+
import { loginBounds, loginExecutable, stoppedResult } from "../../shared/login.js";
|
|
5
|
+
/*
|
|
6
|
+
* Factory droid's sign-in lives on its own ACP entry, `droid exec
|
|
7
|
+
* --output-format acp` (droid 1.12.1; docs/runtimes/factory.md#login): its
|
|
8
|
+
* stream-jsonrpc protocol has no login, status or logout method. There:
|
|
9
|
+
* - `initialize` advertises `authMethods` `device-pairing` and
|
|
10
|
+
* `factory-api-key` and `agentCapabilities.auth` `{ logout, status }`;
|
|
11
|
+
* - `auth/status` answers `{ state: "unauthenticated" }`, or
|
|
12
|
+
* `{ state: "authenticated", accounts: [{ label, active }] }`. With
|
|
13
|
+
* `FACTORY_API_KEY` set it answers authenticated with the label
|
|
14
|
+
* "Factory API key" without checking the key;
|
|
15
|
+
* - `authenticate { methodId: "device-pairing" }` from a client declaring
|
|
16
|
+
* `clientCapabilities.elicitation.url` sends `elicitation/create { mode:
|
|
17
|
+
* "url", url }` (Factory's device page with the code in it); after an
|
|
18
|
+
* `accept` droid polls until the person confirms, stores the login and
|
|
19
|
+
* answers the authenticate. A decline ends it with -32000 "Sign-in was
|
|
20
|
+
* cancelled";
|
|
21
|
+
* - `logout` clears droid's stored login.
|
|
22
|
+
* droid opens no browser itself on this path. OAR never reads or writes the credential.
|
|
23
|
+
*/
|
|
24
|
+
const ACP_ARGS = ["exec", "--output-format", "acp"];
|
|
25
|
+
const SOURCE = "droid exec --output-format acp: auth/status";
|
|
26
|
+
const API_KEY_LABEL = "Factory API key";
|
|
27
|
+
const LOGIN_TIMEOUT_MS = 15 * 60_000;
|
|
28
|
+
const QUERY_TIMEOUT_MS = 30_000;
|
|
29
|
+
/** One line of droid's own words, without any URL (the device page carries the pairing code). */
|
|
30
|
+
function safeDetail(text) {
|
|
31
|
+
return text.replaceAll(/https?:\/\/\S+/gu, "<url>").split("\n")[0] ?? text;
|
|
32
|
+
}
|
|
33
|
+
/** One droid ACP process for one account operation, killed afterwards. Requests from droid go to `onRequest`; anything else is refused. */
|
|
34
|
+
async function withDroidAcp(command, env, onRequest, run) {
|
|
35
|
+
const child = spawnLineProcess(command, [...ACP_ARGS], { env, inheritStderr: false, killTree: true });
|
|
36
|
+
// oxlint-disable-next-line promise/prefer-await-to-then -- spawn failure is observed through the pending requests.
|
|
37
|
+
void child.spawned.catch(() => { });
|
|
38
|
+
const pending = new Map();
|
|
39
|
+
let next = 1;
|
|
40
|
+
const write = (message) => { child.write(`${JSON.stringify({ jsonrpc: "2.0", ...message })}\n`); };
|
|
41
|
+
child.onLine((line) => {
|
|
42
|
+
const message = asRecord(parseJson(line));
|
|
43
|
+
if (message === null) {
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
46
|
+
if (typeof message.method === "string" && message.id !== undefined) {
|
|
47
|
+
const result = onRequest(message.method, asRecord(message.params) ?? {});
|
|
48
|
+
write(result === null ? { id: message.id, error: { code: -32_601, message: "not handled" } } : { id: message.id, result });
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
if (typeof message.id === "number") {
|
|
52
|
+
const settle = pending.get(message.id);
|
|
53
|
+
pending.delete(message.id);
|
|
54
|
+
settle?.({ ...(asRecord(message.result) === null ? {} : { result: asRecord(message.result) ?? {} }), ...(asRecord(message.error) === null ? {} : { error: asRecord(message.error) ?? {} }) });
|
|
55
|
+
}
|
|
56
|
+
});
|
|
57
|
+
child.onExit(() => { for (const settle of pending.values()) {
|
|
58
|
+
settle({ error: { message: "droid exited" } });
|
|
59
|
+
} pending.clear(); });
|
|
60
|
+
try {
|
|
61
|
+
return await run({
|
|
62
|
+
async request(method, params) {
|
|
63
|
+
const id = next;
|
|
64
|
+
next += 1;
|
|
65
|
+
const { promise, resolve } = Promise.withResolvers();
|
|
66
|
+
pending.set(id, resolve);
|
|
67
|
+
write({ id, method, params });
|
|
68
|
+
const reply = await promise;
|
|
69
|
+
return reply;
|
|
70
|
+
},
|
|
71
|
+
}, child.exited);
|
|
72
|
+
}
|
|
73
|
+
finally {
|
|
74
|
+
child.kill();
|
|
75
|
+
await child.exited;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
const initializeParams = (elicitation) => ({
|
|
79
|
+
protocolVersion: 1,
|
|
80
|
+
clientCapabilities: { fs: { readTextFile: false, writeTextFile: false }, terminal: false, ...(elicitation ? { elicitation: { url: {} } } : {}) },
|
|
81
|
+
clientInfo: { name: "oar", version: "0.0.0" },
|
|
82
|
+
});
|
|
83
|
+
/** droid's `auth/status` answer as OAR's status. An API key droid reports without checking it is not a confirmed login. */
|
|
84
|
+
export function projectFactoryAuthStatus(result) {
|
|
85
|
+
const state = result?.state;
|
|
86
|
+
if (state === "unauthenticated") {
|
|
87
|
+
return { kind: "logged_out", source: SOURCE };
|
|
88
|
+
}
|
|
89
|
+
if (state !== "authenticated") {
|
|
90
|
+
return { kind: "unknown", source: SOURCE, detail: `droid reported auth state ${JSON.stringify(state ?? null)}` };
|
|
91
|
+
}
|
|
92
|
+
const active = asRecordList(result?.accounts).find(account => account.active === true);
|
|
93
|
+
if (active?.label === API_KEY_LABEL) {
|
|
94
|
+
return { kind: "unknown", source: SOURCE, configured: ["FACTORY_API_KEY"],
|
|
95
|
+
detail: "FACTORY_API_KEY is set; droid uses it instead of any stored login and reports it without checking it" };
|
|
96
|
+
}
|
|
97
|
+
return { kind: "logged_in", source: SOURCE, account: { credential: "account" } };
|
|
98
|
+
}
|
|
99
|
+
async function statusQuery(call) {
|
|
100
|
+
const status = await call.request("auth/status", {});
|
|
101
|
+
return status.error === undefined ? projectFactoryAuthStatus(status.result) : { kind: "unknown", source: SOURCE, detail: "droid auth/status failed" };
|
|
102
|
+
}
|
|
103
|
+
async function readStatus(call) {
|
|
104
|
+
const initialized = await call.request("initialize", initializeParams(false));
|
|
105
|
+
if (asRecord(asRecord(asRecord(initialized.result)?.agentCapabilities)?.auth)?.status === undefined) {
|
|
106
|
+
return { kind: "unknown", source: SOURCE, detail: "this droid declares no auth/status" };
|
|
107
|
+
}
|
|
108
|
+
const status = await statusQuery(call);
|
|
109
|
+
return status;
|
|
110
|
+
}
|
|
111
|
+
async function bounded(timeoutMs, fallback, signal, run) {
|
|
112
|
+
const bounds = loginBounds(signal, timeoutMs);
|
|
113
|
+
try {
|
|
114
|
+
return await Promise.race([run(), (async () => { await bounds.stopped; return fallback; })()]);
|
|
115
|
+
}
|
|
116
|
+
finally {
|
|
117
|
+
bounds.dispose();
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
/** Whether droid is signed in, by its own ACP `auth/status`. */
|
|
121
|
+
export async function factoryAuthStatus(installation, options = {}) {
|
|
122
|
+
if (installation.via !== "executable") {
|
|
123
|
+
return { kind: "unknown", detail: "not a machine-installed executable" };
|
|
124
|
+
}
|
|
125
|
+
const timeoutMs = options.timeoutMs ?? QUERY_TIMEOUT_MS;
|
|
126
|
+
const query = (async () => {
|
|
127
|
+
try {
|
|
128
|
+
const status = await withDroidAcp(installation.command, sessionEnvironment(options.env), () => null, async (call) => { const read = await readStatus(call); return read; });
|
|
129
|
+
return status;
|
|
130
|
+
}
|
|
131
|
+
catch {
|
|
132
|
+
return { kind: "unknown", source: SOURCE, detail: "droid auth status could not run" };
|
|
133
|
+
}
|
|
134
|
+
})();
|
|
135
|
+
// At the deadline the answer is unknown at once; stopping the process continues in the background (AuthStatusOptions.timeoutMs).
|
|
136
|
+
const status = await bounded(timeoutMs, { kind: "unknown", source: SOURCE, detail: "droid auth status timed out" }, options.signal, async () => { const read = await query; return read; });
|
|
137
|
+
return status;
|
|
138
|
+
}
|
|
139
|
+
/** Signs droid in through its device-pairing flow: the URL reaches the host as an `auth_url` event. */
|
|
140
|
+
export async function factoryLogin(installation, interaction, options = {}) {
|
|
141
|
+
const env = sessionEnvironment(options.env);
|
|
142
|
+
const target = loginExecutable(installation, "Factory droid", undefined, env);
|
|
143
|
+
if (target.kind === "settled") {
|
|
144
|
+
return target.result;
|
|
145
|
+
}
|
|
146
|
+
if (interaction.signal?.aborted === true) {
|
|
147
|
+
return { kind: "cancelled" };
|
|
148
|
+
}
|
|
149
|
+
const timeoutMs = options.timeoutMs ?? LOGIN_TIMEOUT_MS;
|
|
150
|
+
const bounds = loginBounds(interaction.signal, timeoutMs);
|
|
151
|
+
let failedInteraction = false;
|
|
152
|
+
try {
|
|
153
|
+
return await withDroidAcp(target.installation.command, env, (method, params) => {
|
|
154
|
+
if (method !== "elicitation/create" || params.mode !== "url" || typeof params.url !== "string") {
|
|
155
|
+
return null;
|
|
156
|
+
}
|
|
157
|
+
try {
|
|
158
|
+
interaction.onEvent({ kind: "auth_url", url: params.url, ...(typeof params.message === "string" ? { instructions: params.message } : {}) });
|
|
159
|
+
}
|
|
160
|
+
catch {
|
|
161
|
+
failedInteraction = true;
|
|
162
|
+
return { action: "decline" };
|
|
163
|
+
}
|
|
164
|
+
return { action: "accept" };
|
|
165
|
+
}, async (call, exited) => {
|
|
166
|
+
const flow = async () => {
|
|
167
|
+
const initialized = await call.request("initialize", initializeParams(true));
|
|
168
|
+
if (!asRecordList(asRecord(initialized.result)?.authMethods).some(entry => entry.id === "device-pairing")) {
|
|
169
|
+
return { kind: "failed", reason: "process_failed", detail: "this droid offers no device-pairing sign-in" };
|
|
170
|
+
}
|
|
171
|
+
const answer = await call.request("authenticate", { methodId: "device-pairing" });
|
|
172
|
+
if (failedInteraction) {
|
|
173
|
+
return { kind: "failed", reason: "interaction_failed", detail: "Could not present the Factory sign-in link" };
|
|
174
|
+
}
|
|
175
|
+
if (answer.error !== undefined) {
|
|
176
|
+
return { kind: "failed", reason: "rejected", detail: safeDetail(typeof answer.error.message === "string" ? answer.error.message : "droid sign-in failed") };
|
|
177
|
+
}
|
|
178
|
+
// droid answered success: it has stored the login, so its own status decides from here.
|
|
179
|
+
const status = interaction.signal?.aborted === true ? null : await statusQuery(call).catch(() => null);
|
|
180
|
+
if (status?.kind === "logged_out") {
|
|
181
|
+
return { kind: "failed", reason: "not_logged_in", detail: "droid reported sign-in success, yet its auth/status reads unauthenticated" };
|
|
182
|
+
}
|
|
183
|
+
if (status?.kind === "unknown" && status.configured !== undefined) {
|
|
184
|
+
return { kind: "failed", reason: "not_logged_in", detail: "droid stored the sign-in, but FACTORY_API_KEY is set and droid uses the key instead; OAR does not touch the environment" };
|
|
185
|
+
}
|
|
186
|
+
return status?.kind === "logged_in" && status.account !== undefined ? { kind: "logged_in", account: status.account } : { kind: "logged_in" };
|
|
187
|
+
};
|
|
188
|
+
const ended = async () => { await exited; return { kind: "failed", reason: "process_failed", detail: "droid ended before the sign-in finished" }; };
|
|
189
|
+
const stopped = async () => stoppedResult(await bounds.stopped, timeoutMs);
|
|
190
|
+
const result = await Promise.race([flow(), ended(), stopped()]);
|
|
191
|
+
return result;
|
|
192
|
+
});
|
|
193
|
+
}
|
|
194
|
+
catch {
|
|
195
|
+
return { kind: "failed", reason: "process_failed", detail: "droid sign-in could not start" };
|
|
196
|
+
}
|
|
197
|
+
finally {
|
|
198
|
+
bounds.dispose();
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
/** Signs droid out through its own ACP `logout`; its `auth/status` decides. */
|
|
202
|
+
export async function factoryLogout(installation, options = {}) {
|
|
203
|
+
const env = sessionEnvironment(options.env);
|
|
204
|
+
const target = loginExecutable(installation, "Factory droid", undefined, env);
|
|
205
|
+
if (target.kind === "settled") {
|
|
206
|
+
return target.result;
|
|
207
|
+
}
|
|
208
|
+
const timeoutMs = options.timeoutMs ?? QUERY_TIMEOUT_MS;
|
|
209
|
+
try {
|
|
210
|
+
return await withDroidAcp(target.installation.command, env, () => null, async (call) => {
|
|
211
|
+
const result = await bounded(timeoutMs, { kind: "failed", reason: "timed_out", detail: `droid logout did not finish within ${String(timeoutMs)} ms` }, undefined, async () => {
|
|
212
|
+
const initialized = await call.request("initialize", initializeParams(false));
|
|
213
|
+
if (asRecord(asRecord(asRecord(initialized.result)?.agentCapabilities)?.auth)?.logout === undefined) {
|
|
214
|
+
return { kind: "failed", reason: "process_failed", detail: "this droid declares no logout" };
|
|
215
|
+
}
|
|
216
|
+
const answer = await call.request("logout", {});
|
|
217
|
+
const status = await call.request("auth/status", {});
|
|
218
|
+
const read = status.error === undefined ? projectFactoryAuthStatus(status.result) : null;
|
|
219
|
+
if (read?.kind === "logged_out") {
|
|
220
|
+
return { kind: "logged_out" };
|
|
221
|
+
}
|
|
222
|
+
if (read?.kind === "unknown" && read.configured !== undefined) {
|
|
223
|
+
return { kind: "failed", reason: "still_logged_in", detail: "FACTORY_API_KEY is set; droid keeps using it, and OAR does not touch the environment" };
|
|
224
|
+
}
|
|
225
|
+
if (read?.kind === "logged_in") {
|
|
226
|
+
return { kind: "failed", reason: "still_logged_in", detail: "droid auth/status still reads authenticated after its logout" };
|
|
227
|
+
}
|
|
228
|
+
return answer.error === undefined ? { kind: "logged_out" }
|
|
229
|
+
: { kind: "failed", reason: "rejected", detail: safeDetail(typeof answer.error.message === "string" ? answer.error.message : "droid logout failed") };
|
|
230
|
+
});
|
|
231
|
+
return result;
|
|
232
|
+
});
|
|
233
|
+
}
|
|
234
|
+
catch {
|
|
235
|
+
return { kind: "failed", reason: "process_failed", detail: "droid logout could not start" };
|
|
236
|
+
}
|
|
237
|
+
}
|
|
238
|
+
//# sourceMappingURL=account.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"account.js","sources":["../../../src/runtimes/factory/account.ts"],"names":[],"mappings":"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"}
|