@botiverse/oar 0.107.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 +1 -0
- package/dist/contracts/index.d.ts.map +1 -1
- package/dist/contracts/index.js +1 -0
- package/dist/contracts/index.js.map +1 -1
- 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/dsh/session.d.ts.map +1 -1
- package/dist/runtimes/dsh/session.js +4 -1
- 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/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 +41 -15
- 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/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/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
|
@@ -1,21 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { environmentValue, sessionEnvironment } from "../../shared/environment.js";
|
|
3
|
-
const httpVariables = [
|
|
4
|
-
"HTTP_PROXY", "HTTPS_PROXY", "ALL_PROXY", "NO_PROXY",
|
|
5
|
-
"http_proxy", "https_proxy", "all_proxy", "no_proxy",
|
|
6
|
-
"NODE_EXTRA_CA_CERTS", "SSL_CERT_FILE", "SSL_CERT_DIR", "NODE_TLS_REJECT_UNAUTHORIZED",
|
|
7
|
-
];
|
|
1
|
+
import { accountUsageEnvironment } from "../../shared/usage-environment.js";
|
|
8
2
|
/** The CLI and credential paths are scoped; HTTP still runs in the host process. */
|
|
9
3
|
export function kimiUsageEnvironment(overlay) {
|
|
10
|
-
|
|
11
|
-
const changed = Object.keys(overlay ?? {}).filter((name) => {
|
|
12
|
-
const affectsHttp = httpVariables.some((variable) => process.platform === "win32"
|
|
13
|
-
? variable.toUpperCase() === name.toUpperCase() : variable === name);
|
|
14
|
-
return affectsHttp && environmentValue(environment, name) !== environmentValue(process.env, name);
|
|
15
|
-
});
|
|
16
|
-
if (changed.length > 0) {
|
|
17
|
-
throw new UnsupportedOptionError("env", `Kimi account usage sends HTTP from the host process and cannot isolate: ${changed.join(", ")}`);
|
|
18
|
-
}
|
|
19
|
-
return environment;
|
|
4
|
+
return accountUsageEnvironment("Kimi", overlay);
|
|
20
5
|
}
|
|
21
6
|
//# sourceMappingURL=usage-environment.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usage-environment.js","sources":["../../../src/runtimes/kimi/usage-environment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"usage-environment.js","sources":["../../../src/runtimes/kimi/usage-environment.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAE5E,oFAAoF;AACpF,MAAM,UAAU,oBAAoB,CAAC,OAA8B;IACjE,OAAO,uBAAuB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAClD,CAAC"}
|
|
@@ -15,5 +15,6 @@ export declare function queryAcpAuth(command: string, call: {
|
|
|
15
15
|
readonly method: "logout";
|
|
16
16
|
}, name: string, options: AuthStatusOptions & {
|
|
17
17
|
readonly signal?: AbortSignal;
|
|
18
|
+
readonly args?: readonly string[];
|
|
18
19
|
}): Promise<AcpAuthQuery>;
|
|
19
20
|
//# sourceMappingURL=auth-query.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-query.d.ts","sources":["../../../src/shared/acp/auth-query.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAMlE,6GAA6G;AAC7G,MAAM,MAAM,YAAY,GAAG,IAAI,GAAG,eAAe,GAAG,aAAa,GAAG,WAAW,GAAG,QAAQ,CAAC;AAE3F;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE;IAAE,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAA;CAAE,EACpG,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,iBAAiB,GAAG;IAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAA;CAAE,
|
|
1
|
+
{"version":3,"file":"auth-query.d.ts","sources":["../../../src/shared/acp/auth-query.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAMlE,6GAA6G;AAC7G,MAAM,MAAM,YAAY,GAAG,IAAI,GAAG,eAAe,GAAG,aAAa,GAAG,WAAW,GAAG,QAAQ,CAAC;AAE3F;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE;IAAE,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAA;CAAE,EACpG,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,iBAAiB,GAAG;IAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,GAChG,OAAO,CAAC,YAAY,CAAC,CAmCvB"}
|
|
@@ -14,7 +14,7 @@ export async function queryAcpAuth(command, call, name, options) {
|
|
|
14
14
|
const bounds = loginBounds(options.signal, options.timeoutMs ?? 20_000);
|
|
15
15
|
let runtime = undefined;
|
|
16
16
|
try {
|
|
17
|
-
runtime = startAcpProcess(command, ["acp"], client({ name: "oar" }), {
|
|
17
|
+
runtime = startAcpProcess(command, options.args ?? ["acp"], client({ name: "oar" }), {
|
|
18
18
|
env: sessionEnvironment(options.env), inheritStderr: false,
|
|
19
19
|
redact: () => `${name} authentication query failed`,
|
|
20
20
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-query.js","sources":["../../../src/shared/acp/auth-query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAE3F,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAmB,MAAM,cAAc,CAAC;AAKhE;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,OAAe,EACf,IAAoG,EACpG,IAAY,EACZ,
|
|
1
|
+
{"version":3,"file":"auth-query.js","sources":["../../../src/shared/acp/auth-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
|
+
type WaitForConfirmation = (signal: AbortSignal) => Promise<void>;
|
|
1
2
|
export interface AcpConfigUpdates {
|
|
2
3
|
observe(notification: unknown): void;
|
|
3
|
-
confirm<T>(sessionId: string, configId: string, value: string,
|
|
4
|
+
confirm<T>(sessionId: string, configId: string, value: string, run: (wait: WaitForConfirmation) => Promise<T>): Promise<T>;
|
|
4
5
|
}
|
|
5
|
-
/**
|
|
6
|
+
/** Observe before sending; wait after the native answer, inside the same request deadline. */
|
|
6
7
|
export declare function createAcpConfigUpdates(): AcpConfigUpdates;
|
|
8
|
+
export {};
|
|
7
9
|
//# sourceMappingURL=config-updates.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-updates.d.ts","sources":["../../../src/shared/acp/config-updates.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"config-updates.d.ts","sources":["../../../src/shared/acp/config-updates.ts"],"names":[],"mappings":"AAIA,KAAK,mBAAmB,GAAG,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAElE,MAAM,WAAW,gBAAgB;IAC/B,OAAO,CAAC,YAAY,EAAE,OAAO,GAAG,IAAI,CAAC;IACrC,OAAO,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,mBAAmB,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CAC5H;AAED,8FAA8F;AAC9F,wBAAgB,sBAAsB,IAAI,gBAAgB,CAmDzD"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { asRecord, asRecordList } from "../json.js";
|
|
2
2
|
import { ModelConfirmationError } from "../../contracts/model-confirmation-error.js";
|
|
3
|
-
|
|
3
|
+
import { AcpError } from "./errors.js";
|
|
4
|
+
/** Observe before sending; wait after the native answer, inside the same request deadline. */
|
|
4
5
|
export function createAcpConfigUpdates() {
|
|
5
6
|
const listeners = new Set();
|
|
6
7
|
return {
|
|
@@ -13,10 +14,8 @@ export function createAcpConfigUpdates() {
|
|
|
13
14
|
listener(params.sessionId, update);
|
|
14
15
|
}
|
|
15
16
|
},
|
|
16
|
-
async confirm(sessionId, configId, value,
|
|
17
|
-
|
|
18
|
-
const seen = Promise.withResolvers();
|
|
19
|
-
let current = null;
|
|
17
|
+
async confirm(sessionId, configId, value, run) {
|
|
18
|
+
const state = { observed: false, current: null };
|
|
20
19
|
const listener = (id, update) => {
|
|
21
20
|
if (id !== sessionId) {
|
|
22
21
|
return;
|
|
@@ -25,23 +24,50 @@ export function createAcpConfigUpdates() {
|
|
|
25
24
|
if (option === undefined) {
|
|
26
25
|
return;
|
|
27
26
|
}
|
|
28
|
-
|
|
29
|
-
|
|
27
|
+
state.observed = true;
|
|
28
|
+
state.current = option.currentValue;
|
|
29
|
+
state.changed?.();
|
|
30
30
|
};
|
|
31
|
-
const aborted = () => { seen.reject(signal.reason); };
|
|
32
31
|
listeners.add(listener);
|
|
33
|
-
signal.addEventListener("abort", aborted, { once: true });
|
|
34
32
|
try {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
33
|
+
return await run(async (signal) => {
|
|
34
|
+
signal.throwIfAborted();
|
|
35
|
+
if (state.observed && state.current === value) {
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
38
|
+
do {
|
|
39
|
+
signal.throwIfAborted();
|
|
40
|
+
const matched = Promise.withResolvers();
|
|
41
|
+
// oxlint-disable-next-line eslint/no-loop-func -- Native callbacks update state; each iteration owns its own deferred.
|
|
42
|
+
state.changed = () => { if (state.current === value) {
|
|
43
|
+
matched.resolve();
|
|
44
|
+
} };
|
|
45
|
+
const aborted = () => { matched.reject(signal.reason); };
|
|
46
|
+
signal.addEventListener("abort", aborted, { once: true });
|
|
47
|
+
// Recheck after draining the notification callback: another update
|
|
48
|
+
// in the same batch may already have replaced the matching value.
|
|
49
|
+
try {
|
|
50
|
+
await matched.promise;
|
|
51
|
+
}
|
|
52
|
+
finally {
|
|
53
|
+
signal.removeEventListener("abort", aborted);
|
|
54
|
+
}
|
|
55
|
+
// oxlint-disable-next-line eslint/no-unmodified-loop-condition -- Notifications update the observed state while awaiting.
|
|
56
|
+
} while (state.current !== value);
|
|
57
|
+
});
|
|
58
|
+
}
|
|
59
|
+
catch (error) {
|
|
60
|
+
// An explicit RPC failure or process exit retains its own classification.
|
|
61
|
+
// A conflicting notification is an observation, not proof of refusal,
|
|
62
|
+
// until the request's existing deadline runs out.
|
|
63
|
+
if (error instanceof AcpError && error.kind === "timeout" && state.observed && state.current !== value) {
|
|
64
|
+
const message = `ACP config_option_update left ${configId} at ${String(state.current)} although ${value} was requested`;
|
|
65
|
+
throw configId === "model" ? new ModelConfirmationError(message, { requested: value, reported: typeof state.current === "string" ? state.current : null }) : new Error(message);
|
|
39
66
|
}
|
|
40
|
-
|
|
67
|
+
throw error;
|
|
41
68
|
}
|
|
42
69
|
finally {
|
|
43
70
|
listeners.delete(listener);
|
|
44
|
-
signal.removeEventListener("abort", aborted);
|
|
45
71
|
}
|
|
46
72
|
},
|
|
47
73
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-updates.js","sources":["../../../src/shared/acp/config-updates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAmB,MAAM,YAAY,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;
|
|
1
|
+
{"version":3,"file":"config-updates.js","sources":["../../../src/shared/acp/config-updates.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"effort.d.ts","sources":["../../../src/shared/acp/effort.ts"],"names":[],"mappings":"AAEA,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAEvD,OAAO,EAAE,KAAK,UAAU,EAAmB,MAAM,cAAc,CAAC;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"effort.d.ts","sources":["../../../src/shared/acp/effort.ts"],"names":[],"mappings":"AAEA,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAEvD,OAAO,EAAE,KAAK,UAAU,EAAmB,MAAM,cAAc,CAAC;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AA+B5D;;;;;;;;;;GAUG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE;IAAE,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;CAAE,EAClG,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IACP,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC;IACpC,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE;QAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAA;KAAE,KAAK,IAAI,CAAC;CAC9F,GACA,OAAO,CAAC,IAAI,CAAC,CAoBf;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE,UAAU,EACnB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE;IACP,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC;IAClC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC;IACpC,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE;QAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAA;KAAE,KAAK,IAAI,CAAC;CAC9F,GACA,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAYjC"}
|
|
@@ -4,12 +4,15 @@ import { asRecord } from "../json.js";
|
|
|
4
4
|
import { acpReportedEffort, acpThoughtLevelOption } from "./model.js";
|
|
5
5
|
import { withAcpDeadline } from "./process.js";
|
|
6
6
|
function setConfigOption(process, sessionId, configId, value, context) {
|
|
7
|
-
|
|
8
|
-
|
|
7
|
+
if (context.updates === undefined) {
|
|
8
|
+
return withAcpDeadline(process, "session/set_config_option", context.timeoutMs, requestOptions => process.connection.agent.request("session/set_config_option", { sessionId, configId, value }, requestOptions));
|
|
9
|
+
}
|
|
10
|
+
return context.updates.confirm(sessionId, configId, value, wait => withAcpDeadline(process, "session/set_config_option", context.timeoutMs, async (requestOptions) => {
|
|
11
|
+
const response = await process.connection.agent.request("session/set_config_option", { sessionId, configId, value }, requestOptions);
|
|
9
12
|
const signals = [process.connection.signal, ...(requestOptions?.cancellationSignal === undefined ? [] : [requestOptions.cancellationSignal])];
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
});
|
|
13
|
+
await wait(AbortSignal.any(signals));
|
|
14
|
+
return response;
|
|
15
|
+
}));
|
|
13
16
|
}
|
|
14
17
|
/** An RPC error's message plus its `data` (grok puts the reason there: "unknown reasoning_effort value"). */
|
|
15
18
|
function rpcErrorText(error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"effort.js","sources":["../../../src/shared/acp/effort.ts"],"names":[],"mappings":"AAAA,2HAA2H;AAC3H,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAmB,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACtE,OAAO,EAAmB,eAAe,EAAE,MAAM,cAAc,CAAC;AAGhE,SAAS,eAAe,CACtB,OAAmB,EAAE,SAAiB,EAAE,QAAgB,EAAE,KAAa,EACvE,OAA4E;IAE5E,OAAO,eAAe,CAAC,OAAO,EAAE,2BAA2B,EAAE,OAAO,CAAC,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"effort.js","sources":["../../../src/shared/acp/effort.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,7 +36,7 @@ async function createOrResume(process, profile, initialized, options, meta) {
|
|
|
36
36
|
const sessionId = options.resume;
|
|
37
37
|
if (profile.resumeKeepsSessionCwd === true) {
|
|
38
38
|
if (!hasAcpCapability(sessionCapabilities?.list)) {
|
|
39
|
-
throw unknownResumeCwd(sessionId);
|
|
39
|
+
throw unknownResumeCwd(sessionId, options.cwd, "listing_unavailable");
|
|
40
40
|
}
|
|
41
41
|
await refuseResumeElsewhere(process, sessionId, options.cwd, timeoutMs);
|
|
42
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile.js","sources":["../../../src/shared/acp/profile.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,QAAQ,EAAmB,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAG1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5D,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAoD,MAAM,cAAc,CAAC;AAC/G,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAmB,eAAe,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAE1E,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,qBAAqB,EAAwB,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AA6HnD,MAAM,UAAU,gBAAgB,CAAC,KAAc,IAAa,OAAO,KAAK,KAAK,IAAI,IAAI,QAAQ,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;AAEhH,SAAS,cAAc,CAAC,MAAc,EAAE,KAAc;IACpD,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACjC,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;QACtB,MAAM,IAAI,SAAS,CAAC,OAAO,MAAM,iCAAiC,CAAC,CAAC;IACtE,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,OAAmB,EAAE,SAAiB;IAC1E,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;IAC3C,MAAM,eAAe,CACnB,OAAO,EACP,MAAM,EACN,IAAI,EACJ,CAAC,cAAc,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAClD,MAAM,EACN,EAAE,SAAS,EAAE,EACb,cAAc,CACf,CACF,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,OAAmB,EACnB,OAA0B,EAC1B,WAAuB,EACvB,OAAuB,EACvB,IAA4B;IAE5B,MAAM,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;IAC7D,MAAM,mBAAmB,GAAG,QAAQ,CAAC,YAAY,EAAE,mBAAmB,CAAC,CAAC;IACxE,MAAM,UAAU,GAAG;QACjB,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,GAAG,wBAAwB,CAAC,OAAO,EAAE,WAAW,CAAC;QACjD,UAAU,EAAE,kBAAkB,CAAC,OAAO,CAAC,UAAU,EAAE,WAAW,CAAC;QAC/D,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;KAC/C,CAAC;IACF,MAAM,SAAS,GAAG,OAAO,CAAC,gBAAgB,IAAI,MAAM,CAAC;IACrD,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACjC,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;QACjC,IAAI,OAAO,CAAC,qBAAqB,KAAK,IAAI,EAAE,CAAC;YAC3C,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,IAAI,CAAC,EAAE,CAAC;gBAAC,MAAM,gBAAgB,CAAC,SAAS,CAAC,CAAC;YAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"profile.js","sources":["../../../src/shared/acp/profile.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ResumeCwdError, type ResumeCwdReason } from "../../contracts/resume-cwd-error.js";
|
|
2
2
|
import { type AcpProcess } from "./process.js";
|
|
3
3
|
/**
|
|
4
4
|
* A resume is safe only after the saved cwd is positively confirmed. Absence
|
|
@@ -8,5 +8,5 @@ import { type AcpProcess } from "./process.js";
|
|
|
8
8
|
*/
|
|
9
9
|
export declare function refuseResumeElsewhere(process: AcpProcess, sessionId: string, cwd: string, timeoutMs: number): Promise<void>;
|
|
10
10
|
/** No filesystem or history inference can substitute for the native directory. */
|
|
11
|
-
export declare function unknownResumeCwd(sessionId: string):
|
|
11
|
+
export declare function unknownResumeCwd(sessionId: string, cwd: string, reason: Exclude<ResumeCwdReason, "other_cwd">): ResumeCwdError;
|
|
12
12
|
//# sourceMappingURL=resume-cwd.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resume-cwd.d.ts","sources":["../../../src/shared/acp/resume-cwd.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"resume-cwd.d.ts","sources":["../../../src/shared/acp/resume-cwd.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,KAAK,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAG3F,OAAO,EAAE,KAAK,UAAU,EAA4B,MAAM,cAAc,CAAC;AAEzE;;;;;GAKG;AACH,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA+BjI;AAED,kFAAkF;AAClF,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,eAAe,EAAE,WAAW,CAAC,GAAG,cAAc,CAI9H"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/* oxlint-disable typescript/promise-function-async -- Deadline callbacks deliberately return the SDK's native promises. */
|
|
2
|
-
import {
|
|
2
|
+
import { ResumeCwdError } from "../../contracts/resume-cwd-error.js";
|
|
3
3
|
import { asRecord, asRecordList } from "../json.js";
|
|
4
4
|
import { sameDirectory } from "../same-directory.js";
|
|
5
5
|
import { methods, withAcpDeadline } from "./process.js";
|
|
@@ -20,33 +20,37 @@ export async function refuseResumeElsewhere(process, sessionId, cwd, timeoutMs)
|
|
|
20
20
|
const sessions = asRecordList(page?.sessions);
|
|
21
21
|
if (!Array.isArray(page?.sessions) || sessions.length !== page.sessions.length
|
|
22
22
|
|| sessions.some((session) => typeof session.sessionId !== "string" || session.sessionId.length === 0)) {
|
|
23
|
-
throw unknownResumeCwd(sessionId);
|
|
23
|
+
throw unknownResumeCwd(sessionId, cwd, "listing_unavailable");
|
|
24
24
|
}
|
|
25
25
|
const found = sessions.find((session) => session.sessionId === sessionId);
|
|
26
26
|
if (found !== undefined) {
|
|
27
27
|
if (typeof found.cwd !== "string" || found.cwd.length === 0) {
|
|
28
|
-
throw unknownResumeCwd(sessionId);
|
|
28
|
+
throw unknownResumeCwd(sessionId, cwd, "cwd_unreported");
|
|
29
29
|
}
|
|
30
30
|
if (!sameDirectory(found.cwd, cwd)) {
|
|
31
|
-
throw new
|
|
31
|
+
throw new ResumeCwdError(`session ${sessionId} lives in ${found.cwd} and this runtime resumes it only there; the resume names ${cwd}`, {
|
|
32
|
+
sessionId, requestedCwd: cwd, reason: "other_cwd", savedCwd: found.cwd,
|
|
33
|
+
});
|
|
32
34
|
}
|
|
33
35
|
return;
|
|
34
36
|
}
|
|
35
37
|
if (page.nextCursor !== undefined && page.nextCursor !== null && typeof page.nextCursor !== "string") {
|
|
36
|
-
throw unknownResumeCwd(sessionId);
|
|
38
|
+
throw unknownResumeCwd(sessionId, cwd, "listing_unavailable");
|
|
37
39
|
}
|
|
38
40
|
cursor = typeof page.nextCursor === "string" && page.nextCursor !== "" ? page.nextCursor : null;
|
|
39
41
|
if (cursor !== null) {
|
|
40
42
|
if (visited.has(cursor)) {
|
|
41
|
-
throw unknownResumeCwd(sessionId);
|
|
43
|
+
throw unknownResumeCwd(sessionId, cwd, "listing_unavailable");
|
|
42
44
|
}
|
|
43
45
|
visited.add(cursor);
|
|
44
46
|
}
|
|
45
47
|
} while (cursor !== null);
|
|
46
|
-
throw unknownResumeCwd(sessionId);
|
|
48
|
+
throw unknownResumeCwd(sessionId, cwd, "not_listed");
|
|
47
49
|
}
|
|
48
50
|
/** No filesystem or history inference can substitute for the native directory. */
|
|
49
|
-
export function unknownResumeCwd(sessionId) {
|
|
50
|
-
return new
|
|
51
|
+
export function unknownResumeCwd(sessionId, cwd, reason) {
|
|
52
|
+
return new ResumeCwdError(`cannot confirm the saved directory of session ${sessionId}; this runtime resumes in its saved directory, so open a new session instead`, {
|
|
53
|
+
sessionId, requestedCwd: cwd, reason,
|
|
54
|
+
});
|
|
51
55
|
}
|
|
52
56
|
//# sourceMappingURL=resume-cwd.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resume-cwd.js","sources":["../../../src/shared/acp/resume-cwd.ts"],"names":[],"mappings":"AAAA,2HAA2H;AAC3H,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"resume-cwd.js","sources":["../../../src/shared/acp/resume-cwd.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A credential about to become an HTTP header value. Checked before any
|
|
3
|
+
* request: fetch refuses a value with a control character or space with an
|
|
4
|
+
* error that quotes the whole header, credential included, so an invalid one
|
|
5
|
+
* must fail here with a message that names only `what`.
|
|
6
|
+
*/
|
|
7
|
+
export declare function credentialHeaderValue(value: string, what: string): string;
|
|
8
|
+
/**
|
|
9
|
+
* A request that failed before any answer, without the failure as its cause:
|
|
10
|
+
* fetch's errors can quote request header values. Keeps only the system code
|
|
11
|
+
* (`ECONNREFUSED`, ...) or that it timed out.
|
|
12
|
+
*/
|
|
13
|
+
export declare function requestFailure(what: string, error: unknown): Error;
|
|
14
|
+
//# sourceMappingURL=credential-http.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"credential-http.d.ts","sources":["../../src/shared/credential-http.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAGzE;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,KAAK,CAKlE"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { asRecord } from "./json.js";
|
|
2
|
+
/**
|
|
3
|
+
* A credential about to become an HTTP header value. Checked before any
|
|
4
|
+
* request: fetch refuses a value with a control character or space with an
|
|
5
|
+
* error that quotes the whole header, credential included, so an invalid one
|
|
6
|
+
* must fail here with a message that names only `what`.
|
|
7
|
+
*/
|
|
8
|
+
export function credentialHeaderValue(value, what) {
|
|
9
|
+
if (!/^[\u0021-\u007E]+$/u.test(value)) {
|
|
10
|
+
throw new Error(`${what} is not a valid HTTP header value`);
|
|
11
|
+
}
|
|
12
|
+
return value;
|
|
13
|
+
}
|
|
14
|
+
/**
|
|
15
|
+
* A request that failed before any answer, without the failure as its cause:
|
|
16
|
+
* fetch's errors can quote request header values. Keeps only the system code
|
|
17
|
+
* (`ECONNREFUSED`, ...) or that it timed out.
|
|
18
|
+
*/
|
|
19
|
+
export function requestFailure(what, error) {
|
|
20
|
+
const code = asRecord(asRecord(error)?.cause)?.code ?? asRecord(error)?.code;
|
|
21
|
+
const timedOut = error instanceof Error && (error.name === "TimeoutError" || error.name === "AbortError");
|
|
22
|
+
const detail = typeof code === "string" && /^[A-Z][A-Z0-9_]*$/u.test(code) ? ` (${code})` : (timedOut ? " (timed out)" : "");
|
|
23
|
+
return new Error(`${what}${detail}`);
|
|
24
|
+
}
|
|
25
|
+
//# sourceMappingURL=credential-http.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"credential-http.js","sources":["../../src/shared/credential-http.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAErC;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CAAC,KAAa,EAAE,IAAY;IAC/D,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAAC,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,mCAAmC,CAAC,CAAC;IAAC,CAAC;IACxG,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAAC,IAAY,EAAE,KAAc;IACzD,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,EAAE,IAAI,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC;IAC7E,MAAM,QAAQ,GAAG,KAAK,YAAY,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,cAAc,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC;IAC1G,MAAM,MAAM,GAAG,OAAO,IAAI,KAAK,QAAQ,IAAI,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAC7H,OAAO,IAAI,KAAK,CAAC,GAAG,IAAI,GAAG,MAAM,EAAE,CAAC,CAAC;AACvC,CAAC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { SessionOptions } from "../contracts/session-options.js";
|
|
2
|
+
/**
|
|
3
|
+
* The environment an account-usage reader resolves the runtime's paths and
|
|
4
|
+
* credentials in. Its HTTP runs in the host process, which an overlay cannot
|
|
5
|
+
* change, so an overlay that changes the host's HTTP/TLS variables is refused
|
|
6
|
+
* before any process or request ([usage environment](../../../../docs/spec/account-usage.md#environment)).
|
|
7
|
+
*/
|
|
8
|
+
export declare function accountUsageEnvironment(runtime: string, overlay: SessionOptions["env"]): NodeJS.ProcessEnv;
|
|
9
|
+
//# sourceMappingURL=usage-environment.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"usage-environment.d.ts","sources":["../../src/shared/usage-environment.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAStE;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,UAAU,CAW1G"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { UnsupportedOptionError } from "../contracts/errors.js";
|
|
2
|
+
import { environmentValue, sessionEnvironment } from "./environment.js";
|
|
3
|
+
const httpVariables = [
|
|
4
|
+
"HTTP_PROXY", "HTTPS_PROXY", "ALL_PROXY", "NO_PROXY",
|
|
5
|
+
"http_proxy", "https_proxy", "all_proxy", "no_proxy",
|
|
6
|
+
"NODE_EXTRA_CA_CERTS", "SSL_CERT_FILE", "SSL_CERT_DIR", "NODE_TLS_REJECT_UNAUTHORIZED",
|
|
7
|
+
];
|
|
8
|
+
/**
|
|
9
|
+
* The environment an account-usage reader resolves the runtime's paths and
|
|
10
|
+
* credentials in. Its HTTP runs in the host process, which an overlay cannot
|
|
11
|
+
* change, so an overlay that changes the host's HTTP/TLS variables is refused
|
|
12
|
+
* before any process or request ([usage environment](../../../../docs/spec/account-usage.md#environment)).
|
|
13
|
+
*/
|
|
14
|
+
export function accountUsageEnvironment(runtime, overlay) {
|
|
15
|
+
const environment = sessionEnvironment(overlay);
|
|
16
|
+
const changed = Object.keys(overlay ?? {}).filter((name) => {
|
|
17
|
+
const affectsHttp = httpVariables.some((variable) => process.platform === "win32"
|
|
18
|
+
? variable.toUpperCase() === name.toUpperCase() : variable === name);
|
|
19
|
+
return affectsHttp && environmentValue(environment, name) !== environmentValue(process.env, name);
|
|
20
|
+
});
|
|
21
|
+
if (changed.length > 0) {
|
|
22
|
+
throw new UnsupportedOptionError("env", `${runtime} account usage sends HTTP from the host process and cannot isolate: ${changed.join(", ")}`);
|
|
23
|
+
}
|
|
24
|
+
return environment;
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=usage-environment.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"usage-environment.js","sources":["../../src/shared/usage-environment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAEhE,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAExE,MAAM,aAAa,GAAG;IACpB,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,UAAU;IACpD,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,UAAU;IACpD,qBAAqB,EAAE,eAAe,EAAE,cAAc,EAAE,8BAA8B;CAC9E,CAAC;AAEX;;;;;GAKG;AACH,MAAM,UAAU,uBAAuB,CAAC,OAAe,EAAE,OAA8B;IACrF,MAAM,WAAW,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QACzD,MAAM,WAAW,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO;YAC/E,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC;QACvE,OAAO,WAAW,IAAI,gBAAgB,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,gBAAgB,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACpG,CAAC,CAAC,CAAC;IACH,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,MAAM,IAAI,sBAAsB,CAAC,KAAK,EAAE,GAAG,OAAO,uEAAuE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACjJ,CAAC;IACD,OAAO,WAAW,CAAC;AACrB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@botiverse/oar",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.108.0",
|
|
4
4
|
"description": "A programming interface for all agent harnesses: provider-independent contracts for controlling and observing agent runtimes",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|