@botiverse/oar 0.114.0 → 0.116.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 +1 -1
- package/dist/runtimes/antigravity/list-models.d.ts +2 -10
- package/dist/runtimes/antigravity/list-models.d.ts.map +1 -1
- package/dist/runtimes/antigravity/list-models.js +16 -96
- package/dist/runtimes/antigravity/list-models.js.map +1 -1
- package/dist/runtimes/antigravity/model-menus.d.ts +15 -0
- package/dist/runtimes/antigravity/model-menus.d.ts.map +1 -0
- package/dist/runtimes/antigravity/model-menus.js +191 -0
- package/dist/runtimes/antigravity/model-menus.js.map +1 -0
- package/dist/runtimes/cursor/index.d.ts +2 -2
- package/dist/runtimes/cursor/sdk-version.d.ts +1 -1
- package/dist/runtimes/cursor/sdk-version.js +1 -1
- package/dist/runtimes/kimi/native-usage.d.ts.map +1 -1
- package/dist/runtimes/kimi/native-usage.js +6 -10
- package/dist/runtimes/kimi/native-usage.js.map +1 -1
- package/dist/runtimes/kimi/skills.d.ts.map +1 -1
- package/dist/runtimes/kimi/skills.js +16 -13
- package/dist/runtimes/kimi/skills.js.map +1 -1
- package/dist/runtimes/kimi/web-startup.d.ts +10 -0
- package/dist/runtimes/kimi/web-startup.d.ts.map +1 -0
- package/dist/runtimes/kimi/web-startup.js +145 -0
- package/dist/runtimes/kimi/web-startup.js.map +1 -0
- package/dist/runtimes/opencode/session.d.ts.map +1 -1
- package/dist/runtimes/opencode/session.js +2 -0
- package/dist/runtimes/opencode/session.js.map +1 -1
- package/dist/runtimes/opencode/startup-gate.d.ts +8 -0
- package/dist/runtimes/opencode/startup-gate.d.ts.map +1 -0
- package/dist/runtimes/opencode/startup-gate.js +86 -0
- package/dist/runtimes/opencode/startup-gate.js.map +1 -0
- package/dist/runtimes/qoder/index.d.ts +1 -0
- package/dist/runtimes/qoder/index.d.ts.map +1 -1
- package/dist/runtimes/qoder/index.js +2 -1
- package/dist/runtimes/qoder/index.js.map +1 -1
- package/dist/runtimes/qoder/installation.d.ts +4 -1
- package/dist/runtimes/qoder/installation.d.ts.map +1 -1
- package/dist/runtimes/qoder/installation.js +19 -1
- package/dist/runtimes/qoder/installation.js.map +1 -1
- package/dist/shared/acp/initialize.d.ts +1 -1
- package/dist/shared/acp/initialize.d.ts.map +1 -1
- package/dist/shared/acp/initialize.js +2 -2
- package/dist/shared/acp/initialize.js.map +1 -1
- package/dist/shared/acp/process.d.ts +1 -1
- package/dist/shared/acp/process.d.ts.map +1 -1
- package/dist/shared/acp/process.js +19 -7
- package/dist/shared/acp/process.js.map +1 -1
- package/dist/shared/acp/profile.d.ts +3 -1
- package/dist/shared/acp/profile.d.ts.map +1 -1
- package/dist/shared/acp/profile.js +2 -2
- package/dist/shared/acp/profile.js.map +1 -1
- package/dist/shared/acp/session.d.ts.map +1 -1
- package/dist/shared/acp/session.js +32 -16
- package/dist/shared/acp/session.js.map +1 -1
- package/dist/shared/orientation/customization.d.ts.map +1 -1
- package/dist/shared/orientation/customization.js +8 -2
- package/dist/shared/orientation/customization.js.map +1 -1
- package/package.json +3 -3
package/README.md
CHANGED
|
@@ -164,7 +164,7 @@ The package has these public entry points, plus `@botiverse/oar/pi-durable` ([be
|
|
|
164
164
|
|
|
165
165
|
Brand SVG files are exported at `@botiverse/oar/assets/brands/<runtime-id>.svg`. Any other deep import (`@botiverse/oar/dist/...`, source paths) is internal and may break without notice.
|
|
166
166
|
|
|
167
|
-
Antigravity, CodeBuddy, Devin, Grok, Kimi, and OpenCode share an internal ACP v1 transport and session kernel, but only their concrete runtime identities are public. The registry deliberately does not expose a generic `acp` runtime. The pi SDK (`@earendil-works/pi-coding-agent`) is a dependency of this package. `@cursor/sdk` is an optional peer dependency, and cursor is not in `defaultRuntimes`: install the SDK (`npm install @cursor/sdk@1.4.
|
|
167
|
+
Antigravity, CodeBuddy, Devin, Grok, Kimi, and OpenCode share an internal ACP v1 transport and session kernel, but only their concrete runtime identities are public. The registry deliberately does not expose a generic `acp` runtime. The pi SDK (`@earendil-works/pi-coding-agent`) is a dependency of this package. `@cursor/sdk` is an optional peer dependency, and cursor is not in `defaultRuntimes`: install the SDK (`npm install @cursor/sdk@1.4.1`) and hand it over, `createRuntimeRegistry([...defaultRuntimes.list(), createCursorRuntime({ sdk: () => import("@cursor/sdk") })])`. Written in your code, that import fails your compile if the package is missing. It is Cursor's own package under Cursor's terms, and it signs in with `CURSOR_API_KEY` or its own `Cursor.auth.login()`. `createCursorRuntime({ execution: "subprocess", sdkModule: import.meta.resolve("@cursor/sdk") })` instead runs the SDK in a Node child per session, which takes `SessionOptions.env` and whose crash is recorded as `exited` ([execution modes](https://github.com/botiverse/oar/blob/main/docs/runtimes/cursor.md#execution-modes)).
|
|
168
168
|
|
|
169
169
|
Community runtimes are contributed and maintained outside the core team (each maintainer is named on its runtime page). They ship in this package from a separate entry point, `@botiverse/oar/community`, and are not in `defaultRuntimes`: `createRuntimeRegistry([...defaultRuntimes.list(), createMorphRuntime()])` adds [Mister Morph](https://github.com/botiverse/oar/blob/main/docs/runtimes/morph.md), driven through its Console Runtime API. The `oar` CLI includes them.
|
|
170
170
|
|
|
@@ -1,12 +1,4 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
|
|
3
|
-
* Project a `session/new` response. agy CLI 1.5.0 has no model-list
|
|
4
|
-
* method; the account's models ride on every new session as the
|
|
5
|
-
* `configOptions` entry with id `model`, the option the session switches
|
|
6
|
-
* through `session/set_config_option`. Its `thought_level` menu belongs only
|
|
7
|
-
* to the current model. The legacy availableModels catalog enumerates
|
|
8
|
-
* model/effort combinations for the other families without switching sessions.
|
|
9
|
-
*/
|
|
10
|
-
export declare function projectAntigravityModels(response: unknown): ModelEntry[] | undefined;
|
|
1
|
+
import type { ModelLister } from "../../contracts/list-models.js";
|
|
2
|
+
export { projectAntigravityModels } from "./model-menus.js";
|
|
11
3
|
export declare const antigravityListModels: ModelLister;
|
|
12
4
|
//# sourceMappingURL=list-models.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-models.d.ts","sources":["../../../src/runtimes/antigravity/list-models.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"list-models.d.ts","sources":["../../../src/runtimes/antigravity/list-models.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAc,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAS9E,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAmD5D,eAAO,MAAM,qBAAqB,EAAE,WAoBnC,CAAC"}
|
|
@@ -3,99 +3,12 @@ import { sessionEnvironment } from "../../shared/environment.js";
|
|
|
3
3
|
import { client as createClient, methods, PROTOCOL_VERSION, RequestError, } from "@agentclientprotocol/sdk";
|
|
4
4
|
import { startAcpProcess, withAcpDeadline } from "../../shared/acp/process.js";
|
|
5
5
|
import { hasAcpCapability } from "../../shared/acp/profile.js";
|
|
6
|
-
import {
|
|
7
|
-
import { asRecord, asRecordList } from "../../shared/json.js";
|
|
6
|
+
import { asRecord } from "../../shared/json.js";
|
|
8
7
|
import { listingCwd } from "../../shared/listing-cwd.js";
|
|
9
8
|
import { antigravityAcpArgs } from "./session.js";
|
|
10
9
|
import { antigravityVersionPreflight } from "./version.js";
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
return undefined;
|
|
14
|
-
}
|
|
15
|
-
const trimmed = value.trim();
|
|
16
|
-
return trimmed.length > 0 ? trimmed : undefined;
|
|
17
|
-
}
|
|
18
|
-
/**
|
|
19
|
-
* Project a `session/new` response. agy CLI 1.5.0 has no model-list
|
|
20
|
-
* method; the account's models ride on every new session as the
|
|
21
|
-
* `configOptions` entry with id `model`, the option the session switches
|
|
22
|
-
* through `session/set_config_option`. Its `thought_level` menu belongs only
|
|
23
|
-
* to the current model. The legacy availableModels catalog enumerates
|
|
24
|
-
* model/effort combinations for the other families without switching sessions.
|
|
25
|
-
*/
|
|
26
|
-
export function projectAntigravityModels(response) {
|
|
27
|
-
const root = asRecord(response);
|
|
28
|
-
const modelOption = asRecordList(root?.configOptions).find((option) => option.id === "model");
|
|
29
|
-
if (modelOption === undefined) {
|
|
30
|
-
return undefined;
|
|
31
|
-
}
|
|
32
|
-
// A new session's current model: what a session uses with no `model` set.
|
|
33
|
-
const current = text(modelOption.currentValue);
|
|
34
|
-
const thinking = acpThoughtLevelOption(root);
|
|
35
|
-
const effortLevels = asRecordList(thinking?.options)
|
|
36
|
-
.map((option) => text(option.value))
|
|
37
|
-
.filter((value) => value !== undefined);
|
|
38
|
-
const defaultEffort = text(thinking?.currentValue);
|
|
39
|
-
const entries = [];
|
|
40
|
-
for (const model of asRecordList(modelOption.options)) {
|
|
41
|
-
const id = text(model.value);
|
|
42
|
-
if (id === undefined) {
|
|
43
|
-
continue;
|
|
44
|
-
}
|
|
45
|
-
const displayName = text(model.name);
|
|
46
|
-
entries.push({
|
|
47
|
-
id,
|
|
48
|
-
...(displayName === undefined || displayName === id ? {} : { displayName }),
|
|
49
|
-
...(id === current ? { default: true } : {}),
|
|
50
|
-
...(id === current && effortLevels.length > 0 ? { effortLevels } : {}),
|
|
51
|
-
...(id === current && defaultEffort !== undefined && effortLevels.includes(defaultEffort) ? { defaultEffort } : {}),
|
|
52
|
-
});
|
|
53
|
-
}
|
|
54
|
-
return withCatalogEfforts(root, entries);
|
|
55
|
-
}
|
|
56
|
-
/** Never infer another model's menu from the current model's thought_level. */
|
|
57
|
-
function withCatalogEfforts(root, entries) {
|
|
58
|
-
const available = asRecordList(asRecord(root?.models)?.availableModels);
|
|
59
|
-
const levels = new Map();
|
|
60
|
-
const bareModels = new Set();
|
|
61
|
-
const unparsed = [];
|
|
62
|
-
for (const item of available) {
|
|
63
|
-
const id = text(item.modelId);
|
|
64
|
-
if (id === undefined) {
|
|
65
|
-
continue;
|
|
66
|
-
}
|
|
67
|
-
if (entries.some(entry => entry.id === id)) {
|
|
68
|
-
bareModels.add(id);
|
|
69
|
-
continue;
|
|
70
|
-
}
|
|
71
|
-
const candidates = entries.filter(entry => id.startsWith(`${entry.id}-`) && id.length > entry.id.length + 1);
|
|
72
|
-
const [family] = candidates;
|
|
73
|
-
if (candidates.length === 1 && family !== undefined) {
|
|
74
|
-
const value = id.slice(family.id.length + 1);
|
|
75
|
-
const menu = levels.get(family.id) ?? [];
|
|
76
|
-
if (!menu.includes(value)) {
|
|
77
|
-
menu.push(value);
|
|
78
|
-
}
|
|
79
|
-
levels.set(family.id, menu);
|
|
80
|
-
}
|
|
81
|
-
else if (!unparsed.some(entry => entry.id === id)) {
|
|
82
|
-
const displayName = text(item.name);
|
|
83
|
-
unparsed.push({ id, ...(displayName === undefined || displayName === id ? {} : { displayName }),
|
|
84
|
-
effortUnavailableReason: "Native model entry could not be associated with a unique model and effort." });
|
|
85
|
-
}
|
|
86
|
-
}
|
|
87
|
-
const hasEfforts = levels.size > 0 || acpThoughtLevelOption(root) !== null;
|
|
88
|
-
return [...entries.map(entry => {
|
|
89
|
-
if (entry.effortLevels !== undefined) {
|
|
90
|
-
return entry;
|
|
91
|
-
}
|
|
92
|
-
const menu = levels.get(entry.id);
|
|
93
|
-
if (menu !== undefined) {
|
|
94
|
-
return { ...entry, effortLevels: menu };
|
|
95
|
-
}
|
|
96
|
-
return hasEfforts && !bareModels.has(entry.id) ? { ...entry, effortUnavailableReason: "Native catalog did not expose this model's effort menu." } : entry;
|
|
97
|
-
}), ...unparsed];
|
|
98
|
-
}
|
|
10
|
+
import { projectAntigravityModels, readAntigravityModelMenus } from "./model-menus.js";
|
|
11
|
+
export { projectAntigravityModels } from "./model-menus.js";
|
|
99
12
|
async function readNewSession(command, cwd, timeoutMs, env) {
|
|
100
13
|
const runtime = startAcpProcess(command, antigravityAcpArgs(env), createClient({ name: "oar" }), { cwd, env });
|
|
101
14
|
try {
|
|
@@ -112,11 +25,19 @@ async function readNewSession(command, cwd, timeoutMs, env) {
|
|
|
112
25
|
const newSession = methods.agent.session.new;
|
|
113
26
|
const response = await withAcpDeadline(runtime, newSession, timeoutMs, (requestOptions) => runtime.connection.agent.request(newSession, { cwd, mcpServers: [] }, requestOptions));
|
|
114
27
|
const capabilities = asRecord(asRecord(initialized?.agentCapabilities)?.sessionCapabilities);
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
28
|
+
try {
|
|
29
|
+
const fallback = projectAntigravityModels(response);
|
|
30
|
+
if (fallback === undefined) {
|
|
31
|
+
return undefined;
|
|
32
|
+
}
|
|
33
|
+
return await readAntigravityModelMenus(response, fallback, (configId, value) => withAcpDeadline(runtime, "session/set_config_option", timeoutMs, (requestOptions) => runtime.connection.agent.request("session/set_config_option", { sessionId: response.sessionId, configId, value }, requestOptions)));
|
|
34
|
+
}
|
|
35
|
+
finally {
|
|
36
|
+
if (typeof response.sessionId === "string" && hasAcpCapability(capabilities?.close)) {
|
|
37
|
+
// Restoration errors still fail the listing, even if native close succeeds.
|
|
38
|
+
await withAcpDeadline(runtime, methods.agent.session.close, timeoutMs, (requestOptions) => runtime.connection.agent.request(methods.agent.session.close, { sessionId: response.sessionId }, requestOptions)).catch(() => { });
|
|
39
|
+
}
|
|
118
40
|
}
|
|
119
|
-
return asRecord(response) ?? {};
|
|
120
41
|
}
|
|
121
42
|
finally {
|
|
122
43
|
runtime.kill();
|
|
@@ -134,8 +55,7 @@ export const antigravityListModels = async (installation, options = {}) => {
|
|
|
134
55
|
if (version.kind === "unsupported") {
|
|
135
56
|
return version;
|
|
136
57
|
}
|
|
137
|
-
const
|
|
138
|
-
const models = projectAntigravityModels(response);
|
|
58
|
+
const models = await readNewSession(installation.command, listingCwd(options), version.timeoutMs, env);
|
|
139
59
|
if (models === undefined) {
|
|
140
60
|
return { kind: "unsupported", reason: "this agy CLI build returns no model config option on session/new" };
|
|
141
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-models.js","sources":["../../../src/runtimes/antigravity/list-models.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,2HAA2H;AAC3H,OAAO,EACL,MAAM,IAAI,YAAY,EACtB,OAAO,EACP,gBAAgB,EAChB,YAAY,GACb,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"list-models.js","sources":["../../../src/runtimes/antigravity/list-models.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { ModelEntry } from "../../contracts/list-models.js";
|
|
2
|
+
type SetOption = (configId: string, value: string) => Promise<unknown>;
|
|
3
|
+
/** Read each menu while selected, restoring the temporary session before closing it. */
|
|
4
|
+
export declare function readAntigravityModelMenus(opened: unknown, fallback: ModelEntry[], setOption: SetOption): Promise<ModelEntry[]>;
|
|
5
|
+
/**
|
|
6
|
+
* Project a `session/new` fallback. agy CLI 1.5.0 has no model-list
|
|
7
|
+
* method; the account's models ride on every new session as the
|
|
8
|
+
* `configOptions` entry with id `model`, the option the session switches
|
|
9
|
+
* through `session/set_config_option`. Its `thought_level` menu belongs only
|
|
10
|
+
* to the current model. The legacy availableModels catalog enumerates
|
|
11
|
+
* model/effort combinations for the other families without switching sessions.
|
|
12
|
+
*/
|
|
13
|
+
export declare function projectAntigravityModels(response: unknown): ModelEntry[] | undefined;
|
|
14
|
+
export {};
|
|
15
|
+
//# sourceMappingURL=model-menus.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"model-menus.d.ts","sources":["../../../src/runtimes/antigravity/model-menus.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAIjE,KAAK,SAAS,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AA0BvE,wFAAwF;AACxF,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,OAAO,EACf,QAAQ,EAAE,UAAU,EAAE,EACtB,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,UAAU,EAAE,CAAC,CA8CvB;AA+BD;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,OAAO,GAAG,UAAU,EAAE,GAAG,SAAS,CA6BpF"}
|
|
@@ -0,0 +1,191 @@
|
|
|
1
|
+
import { RequestError } from "@agentclientprotocol/sdk";
|
|
2
|
+
import { acpThoughtLevelOption } from "../../shared/acp/model.js";
|
|
3
|
+
import { asRecord, asRecordList } from "../../shared/json.js";
|
|
4
|
+
function nonempty(value) {
|
|
5
|
+
return typeof value === "string" && value.length > 0;
|
|
6
|
+
}
|
|
7
|
+
function readModelOption(response) {
|
|
8
|
+
return asRecordList(asRecord(response)?.configOptions).find(option => option.id === "model");
|
|
9
|
+
}
|
|
10
|
+
function selected(response, model) {
|
|
11
|
+
return Array.isArray(asRecord(response)?.configOptions) && readModelOption(response)?.currentValue === model;
|
|
12
|
+
}
|
|
13
|
+
function readLevels(response) {
|
|
14
|
+
return asRecordList(acpThoughtLevelOption(asRecord(response))?.options).map(option => option.value).filter(value => nonempty(value));
|
|
15
|
+
}
|
|
16
|
+
function withoutEffort(entry) {
|
|
17
|
+
const result = { ...entry };
|
|
18
|
+
delete result.effortLevels;
|
|
19
|
+
delete result.defaultEffort;
|
|
20
|
+
delete result.effortUnavailableReason;
|
|
21
|
+
return result;
|
|
22
|
+
}
|
|
23
|
+
/** Read each menu while selected, restoring the temporary session before closing it. */
|
|
24
|
+
export async function readAntigravityModelMenus(opened, fallback, setOption) {
|
|
25
|
+
const selector = readModelOption(opened);
|
|
26
|
+
const original = selector?.currentValue;
|
|
27
|
+
const ids = new Set(asRecordList(selector?.options).map(option => option.value).filter(value => nonempty(value)));
|
|
28
|
+
const thought = acpThoughtLevelOption(asRecord(opened));
|
|
29
|
+
const effort = thought?.currentValue;
|
|
30
|
+
// Do not mutate a selection we cannot restore from the initial native response.
|
|
31
|
+
if (!nonempty(asRecord(opened)?.sessionId) || !nonempty(original) || !ids.has(original)
|
|
32
|
+
|| (thought !== null && (!nonempty(thought.id) || !nonempty(effort) || !readLevels(opened).includes(effort)))) {
|
|
33
|
+
return fallback;
|
|
34
|
+
}
|
|
35
|
+
let attempted = false;
|
|
36
|
+
let methodMissing = false;
|
|
37
|
+
try {
|
|
38
|
+
const result = [];
|
|
39
|
+
for (const entry of fallback) {
|
|
40
|
+
if (!ids.has(entry.id)) {
|
|
41
|
+
result.push(entry);
|
|
42
|
+
continue;
|
|
43
|
+
}
|
|
44
|
+
const clean = withoutEffort(entry);
|
|
45
|
+
const first = !attempted;
|
|
46
|
+
attempted = true;
|
|
47
|
+
try {
|
|
48
|
+
const response = await setOption("model", entry.id);
|
|
49
|
+
if (!selected(response, entry.id)) {
|
|
50
|
+
throw new Error("Model selection was not confirmed");
|
|
51
|
+
}
|
|
52
|
+
const menu = readLevels(response);
|
|
53
|
+
if (acpThoughtLevelOption(asRecord(response)) !== null && menu.length === 0) {
|
|
54
|
+
throw new Error("Native effort menu was empty");
|
|
55
|
+
}
|
|
56
|
+
result.push({ ...clean,
|
|
57
|
+
...(menu.length > 0 ? { effortLevels: menu } : {}),
|
|
58
|
+
...(entry.id === original && nonempty(effort) && menu.includes(effort) ? { defaultEffort: effort } : {}),
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
catch (error) {
|
|
62
|
+
// Method-not-found on the first call means no selection was changed.
|
|
63
|
+
if (first && error instanceof RequestError && error.code === -32_601) {
|
|
64
|
+
methodMissing = true;
|
|
65
|
+
return fallback;
|
|
66
|
+
}
|
|
67
|
+
result.push({ ...clean, effortUnavailableReason: "Native model selection did not return a confirmed effort menu." });
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
return result;
|
|
71
|
+
}
|
|
72
|
+
finally {
|
|
73
|
+
if (attempted && !methodMissing) {
|
|
74
|
+
await restoreSelection(setOption, original, nonempty(effort) ? effort : null);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
async function restoreSelection(setOption, original, effort) {
|
|
79
|
+
try {
|
|
80
|
+
const restored = await setOption("model", original);
|
|
81
|
+
if (!selected(restored, original)) {
|
|
82
|
+
throw new Error("Original model was not confirmed");
|
|
83
|
+
}
|
|
84
|
+
const option = acpThoughtLevelOption(asRecord(restored));
|
|
85
|
+
if (effort === null) {
|
|
86
|
+
if (option !== null) {
|
|
87
|
+
throw new Error("Original absent effort menu was not restored");
|
|
88
|
+
}
|
|
89
|
+
return;
|
|
90
|
+
}
|
|
91
|
+
if (!nonempty(option?.id) || !readLevels(restored).includes(effort)) {
|
|
92
|
+
throw new Error("Original effort was not available for restoration");
|
|
93
|
+
}
|
|
94
|
+
const confirmed = await setOption(option.id, effort);
|
|
95
|
+
if (!selected(confirmed, original) || acpThoughtLevelOption(asRecord(confirmed))?.currentValue !== effort) {
|
|
96
|
+
throw new Error("Original effort was not confirmed");
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
catch (error) {
|
|
100
|
+
throw new Error("Antigravity model listing could not confirm restoration of the original selection", { cause: error });
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
function text(value) {
|
|
104
|
+
if (typeof value !== "string") {
|
|
105
|
+
return undefined;
|
|
106
|
+
}
|
|
107
|
+
const trimmed = value.trim();
|
|
108
|
+
return trimmed.length > 0 ? trimmed : undefined;
|
|
109
|
+
}
|
|
110
|
+
/**
|
|
111
|
+
* Project a `session/new` fallback. agy CLI 1.5.0 has no model-list
|
|
112
|
+
* method; the account's models ride on every new session as the
|
|
113
|
+
* `configOptions` entry with id `model`, the option the session switches
|
|
114
|
+
* through `session/set_config_option`. Its `thought_level` menu belongs only
|
|
115
|
+
* to the current model. The legacy availableModels catalog enumerates
|
|
116
|
+
* model/effort combinations for the other families without switching sessions.
|
|
117
|
+
*/
|
|
118
|
+
export function projectAntigravityModels(response) {
|
|
119
|
+
const root = asRecord(response);
|
|
120
|
+
const modelOption = asRecordList(root?.configOptions).find((option) => option.id === "model");
|
|
121
|
+
if (modelOption === undefined) {
|
|
122
|
+
return undefined;
|
|
123
|
+
}
|
|
124
|
+
// A new session's current model: what a session uses with no `model` set.
|
|
125
|
+
const current = text(modelOption.currentValue);
|
|
126
|
+
const thinking = acpThoughtLevelOption(root);
|
|
127
|
+
const effortLevels = asRecordList(thinking?.options)
|
|
128
|
+
.map((option) => text(option.value))
|
|
129
|
+
.filter((value) => value !== undefined);
|
|
130
|
+
const defaultEffort = text(thinking?.currentValue);
|
|
131
|
+
const entries = [];
|
|
132
|
+
for (const model of asRecordList(modelOption.options)) {
|
|
133
|
+
const id = text(model.value);
|
|
134
|
+
if (id === undefined) {
|
|
135
|
+
continue;
|
|
136
|
+
}
|
|
137
|
+
const displayName = text(model.name);
|
|
138
|
+
entries.push({
|
|
139
|
+
id,
|
|
140
|
+
...(displayName === undefined || displayName === id ? {} : { displayName }),
|
|
141
|
+
...(id === current ? { default: true } : {}),
|
|
142
|
+
...(id === current && effortLevels.length > 0 ? { effortLevels } : {}),
|
|
143
|
+
...(id === current && defaultEffort !== undefined && effortLevels.includes(defaultEffort) ? { defaultEffort } : {}),
|
|
144
|
+
});
|
|
145
|
+
}
|
|
146
|
+
return withCatalogEfforts(root, entries);
|
|
147
|
+
}
|
|
148
|
+
/** Never infer another model's menu from the current model's thought_level. */
|
|
149
|
+
function withCatalogEfforts(root, entries) {
|
|
150
|
+
const available = asRecordList(asRecord(root?.models)?.availableModels);
|
|
151
|
+
const levels = new Map();
|
|
152
|
+
const bareModels = new Set();
|
|
153
|
+
const unparsed = [];
|
|
154
|
+
for (const item of available) {
|
|
155
|
+
const id = text(item.modelId);
|
|
156
|
+
if (id === undefined) {
|
|
157
|
+
continue;
|
|
158
|
+
}
|
|
159
|
+
if (entries.some(entry => entry.id === id)) {
|
|
160
|
+
bareModels.add(id);
|
|
161
|
+
continue;
|
|
162
|
+
}
|
|
163
|
+
const candidates = entries.filter(entry => id.startsWith(`${entry.id}-`) && id.length > entry.id.length + 1);
|
|
164
|
+
const [family] = candidates;
|
|
165
|
+
if (candidates.length === 1 && family !== undefined) {
|
|
166
|
+
const value = id.slice(family.id.length + 1);
|
|
167
|
+
const menu = levels.get(family.id) ?? [];
|
|
168
|
+
if (!menu.includes(value)) {
|
|
169
|
+
menu.push(value);
|
|
170
|
+
}
|
|
171
|
+
levels.set(family.id, menu);
|
|
172
|
+
}
|
|
173
|
+
else if (!unparsed.some(entry => entry.id === id)) {
|
|
174
|
+
const displayName = text(item.name);
|
|
175
|
+
unparsed.push({ id, ...(displayName === undefined || displayName === id ? {} : { displayName }),
|
|
176
|
+
effortUnavailableReason: "Native model entry could not be associated with a unique model and effort." });
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
const hasEfforts = levels.size > 0 || acpThoughtLevelOption(root) !== null;
|
|
180
|
+
return [...entries.map(entry => {
|
|
181
|
+
if (entry.effortLevels !== undefined) {
|
|
182
|
+
return entry;
|
|
183
|
+
}
|
|
184
|
+
const menu = levels.get(entry.id);
|
|
185
|
+
if (menu !== undefined) {
|
|
186
|
+
return { ...entry, effortLevels: menu };
|
|
187
|
+
}
|
|
188
|
+
return hasEfforts && !bareModels.has(entry.id) ? { ...entry, effortUnavailableReason: "Native catalog did not expose this model's effort menu." } : entry;
|
|
189
|
+
}), ...unparsed];
|
|
190
|
+
}
|
|
191
|
+
//# sourceMappingURL=model-menus.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"model-menus.js","sources":["../../../src/runtimes/antigravity/model-menus.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import type { CursorSdk } from "./sdk.js";
|
|
|
4
4
|
export interface CursorInProcessOptions {
|
|
5
5
|
readonly execution?: "in_process";
|
|
6
6
|
/**
|
|
7
|
-
* Loads `@cursor/sdk` 1.4.
|
|
7
|
+
* Loads `@cursor/sdk` 1.4.1, which the host installs (an optional peer
|
|
8
8
|
* dependency of OAR): `() => import("@cursor/sdk")`. Written in the host's
|
|
9
9
|
* own code, the import fails the host's compile when the package is
|
|
10
10
|
* missing, checks the SDK's types against `CursorSdk`, and is visible to
|
|
@@ -19,7 +19,7 @@ export interface CursorInProcessOptions {
|
|
|
19
19
|
export interface CursorSubprocessOptions {
|
|
20
20
|
readonly execution: "subprocess";
|
|
21
21
|
/**
|
|
22
|
-
* What the child passes to `import()` to load `@cursor/sdk` 1.4.
|
|
22
|
+
* What the child passes to `import()` to load `@cursor/sdk` 1.4.1: a file
|
|
23
23
|
* URL, e.g. `import.meta.resolve("@cursor/sdk")` in the host's own code.
|
|
24
24
|
* The host never loads the SDK itself in this mode, so nothing checks the
|
|
25
25
|
* module's types against `CursorSdk` at compile time.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native-usage.d.ts","sources":["../../../src/runtimes/kimi/native-usage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAsB,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"native-usage.d.ts","sources":["../../../src/runtimes/kimi/native-usage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAsB,MAAM,kCAAkC,CAAC;AAEjG,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAGjE,OAAO,EAAc,KAAK,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAOpE,uFAAuF;AACvF,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,UAAU,GAAG,oBAAoB,CAkB9E;AAaD,wBAAsB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,CAAC,UAAU,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAmBrJ"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { withQueryDeadline } from "../../shared/executable/query.js";
|
|
2
|
-
import { spawnLineProcess } from "../../shared/executable/index.js";
|
|
3
2
|
import { asRecord } from "../../shared/json.js";
|
|
4
3
|
import { remainingMs } from "../../shared/deadline.js";
|
|
5
4
|
import { utcInstantFromDate } from "../../shared/instant.js";
|
|
6
5
|
import { KIMI_USAGE } from "./auth-config.js";
|
|
7
6
|
import { readKimiToken } from "./oauth-token.js";
|
|
8
|
-
import {
|
|
7
|
+
import { kimiWebRequest } from "./web-query.js";
|
|
8
|
+
import { startKimiWeb } from "./web-startup.js";
|
|
9
9
|
const buckets = { limit5h: "5h limit", limit7d: "Weekly limit", monthTotal: "Monthly limit", monthCode: "Monthly code limit" };
|
|
10
10
|
/** These ratios and cents have already been parsed by Kimi's managed-usage service. */
|
|
11
11
|
export function projectKimiNativeUsage(quota) {
|
|
@@ -53,14 +53,8 @@ async function failure(payload, auth) {
|
|
|
53
53
|
}
|
|
54
54
|
export async function kimiNativeUsage(command, auth, env, deadline) {
|
|
55
55
|
const snapshot = await withQueryDeadline(KIMI_USAGE, remainingMs(deadline, KIMI_USAGE), async (signal) => {
|
|
56
|
-
const child
|
|
57
|
-
const ready = kimiWebEndpoint(child, signal);
|
|
58
|
-
// oxlint-disable-next-line promise/prefer-await-to-then -- Observe spawn failure before readiness is awaited.
|
|
59
|
-
void ready.catch(() => { });
|
|
60
|
-
signal.addEventListener("abort", () => { child.kill(); }, { once: true });
|
|
56
|
+
const { child, web } = await startKimiWeb(command, env, signal);
|
|
61
57
|
try {
|
|
62
|
-
await child.spawned;
|
|
63
|
-
const web = await ready;
|
|
64
58
|
const payload = await kimiWebRequest(web, signal, "/oauth/usage");
|
|
65
59
|
if (payload.kind === "error") {
|
|
66
60
|
return await failure(payload, auth);
|
|
@@ -81,7 +75,9 @@ export async function kimiNativeUsage(command, auth, env, deadline) {
|
|
|
81
75
|
...(typeof user.userLevelName === "string" && user.userLevelName.length > 0 ? { plan: user.userLevelName } : {}) };
|
|
82
76
|
}
|
|
83
77
|
finally {
|
|
84
|
-
child.
|
|
78
|
+
if (!child.stopping()) {
|
|
79
|
+
child.kill();
|
|
80
|
+
}
|
|
85
81
|
await child.exited;
|
|
86
82
|
}
|
|
87
83
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native-usage.js","sources":["../../../src/runtimes/kimi/native-usage.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"native-usage.js","sources":["../../../src/runtimes/kimi/native-usage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skills.d.ts","sources":["../../../src/runtimes/kimi/skills.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"skills.d.ts","sources":["../../../src/runtimes/kimi/skills.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAuBhF,iFAAiF;AACjF,eAAO,MAAM,UAAU,EAAE,eAAe,CAAC,UAAU,CAmClD,CAAC"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { sessionEnvironment } from "../../shared/environment.js";
|
|
2
|
-
import {
|
|
2
|
+
import {} from "../../shared/executable/index.js";
|
|
3
3
|
import {} from "../../shared/json.js";
|
|
4
4
|
import { boolField, inventoryOk, inventoryRead, named, nativeRows, skillScope, textField, unsupportedInventory, workspaceScope } from "../../shared/inventory.js";
|
|
5
|
-
import {
|
|
5
|
+
import { kimiWebRequest } from "./web-query.js";
|
|
6
|
+
import { startKimiWeb } from "./web-startup.js";
|
|
6
7
|
function skills(payload) {
|
|
7
8
|
return nativeRows(payload.skills).map((skill) => ({
|
|
8
9
|
name: named(skill), ...textField("description", skill.description),
|
|
@@ -28,17 +29,13 @@ export const kimiSkills = async (installation, options = {}) => {
|
|
|
28
29
|
throw new RangeError("timeoutMs must be positive and finite");
|
|
29
30
|
}
|
|
30
31
|
const controller = new AbortController();
|
|
31
|
-
const
|
|
32
|
-
cwd: scope.cwd, env: sessionEnvironment(options.env), killTree: true, inheritStderr: false,
|
|
33
|
-
});
|
|
34
|
-
const ready = kimiWebEndpoint(child, controller.signal);
|
|
35
|
-
// A spawn failure can occur before the readiness promise is awaited.
|
|
36
|
-
// oxlint-disable-next-line promise/prefer-await-to-then -- Observe early rejection without blocking process startup.
|
|
37
|
-
void ready.catch(() => { });
|
|
32
|
+
const state = {};
|
|
38
33
|
try {
|
|
39
34
|
return await inventoryRead(async () => {
|
|
40
|
-
|
|
41
|
-
const
|
|
35
|
+
state.starting = startKimiWeb(installation.command, sessionEnvironment(options.env), controller.signal, scope.cwd);
|
|
36
|
+
const started = await state.starting;
|
|
37
|
+
state.child = started.child;
|
|
38
|
+
const web = started.web;
|
|
42
39
|
const catalog = await kimiWebRequest(web, controller.signal, "/workspaces");
|
|
43
40
|
const existing = new Set(nativeRows(catalog.items).map((row) => workspaceId(row)));
|
|
44
41
|
const id = workspaceId(await kimiWebRequest(web, controller.signal, "/workspaces", "POST", { root: scope.cwd }));
|
|
@@ -58,8 +55,14 @@ export const kimiSkills = async (installation, options = {}) => {
|
|
|
58
55
|
}
|
|
59
56
|
finally {
|
|
60
57
|
controller.abort();
|
|
61
|
-
|
|
62
|
-
await
|
|
58
|
+
// Inventory reads retain their existing joined-startup cleanup contract.
|
|
59
|
+
await state.starting?.catch(() => { });
|
|
60
|
+
if (state.child !== undefined && !state.child.stopping()) {
|
|
61
|
+
state.child.kill();
|
|
62
|
+
}
|
|
63
|
+
if (state.child !== undefined) {
|
|
64
|
+
await state.child.exited;
|
|
65
|
+
}
|
|
63
66
|
}
|
|
64
67
|
};
|
|
65
68
|
//# sourceMappingURL=skills.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skills.js","sources":["../../../src/runtimes/kimi/skills.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,
|
|
1
|
+
{"version":3,"file":"skills.js","sources":["../../../src/runtimes/kimi/skills.ts"],"names":[],"mappings":"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"}
|