@botiverse/oar 0.95.0 → 0.96.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 +59 -41
- package/dist/contracts/login.d.ts +1 -0
- package/dist/contracts/login.d.ts.map +1 -1
- package/dist/contracts/records.d.ts +2 -2
- package/dist/contracts/records.d.ts.map +1 -1
- package/dist/runtimes/claude/account-usage.d.ts.map +1 -1
- package/dist/runtimes/claude/account-usage.js +69 -66
- package/dist/runtimes/claude/account-usage.js.map +1 -1
- package/dist/runtimes/claude/auth-status.d.ts +1 -3
- package/dist/runtimes/claude/auth-status.d.ts.map +1 -1
- package/dist/runtimes/claude/auth-status.js +6 -2
- package/dist/runtimes/claude/auth-status.js.map +1 -1
- package/dist/runtimes/claude/login.d.ts.map +1 -1
- package/dist/runtimes/claude/login.js +4 -3
- package/dist/runtimes/claude/login.js.map +1 -1
- package/dist/runtimes/codebuddy/auth-status.d.ts +2 -1
- package/dist/runtimes/codebuddy/auth-status.d.ts.map +1 -1
- package/dist/runtimes/codebuddy/auth-status.js +9 -1
- package/dist/runtimes/codebuddy/auth-status.js.map +1 -1
- package/dist/runtimes/codebuddy/login.js +2 -2
- package/dist/runtimes/codebuddy/login.js.map +1 -1
- package/dist/runtimes/codex/account-request.d.ts.map +1 -1
- package/dist/runtimes/codex/account-request.js +38 -30
- package/dist/runtimes/codex/account-request.js.map +1 -1
- package/dist/runtimes/codex/installation.d.ts +8 -0
- package/dist/runtimes/codex/installation.d.ts.map +1 -1
- package/dist/runtimes/codex/installation.js +22 -1
- package/dist/runtimes/codex/installation.js.map +1 -1
- package/dist/runtimes/codex/login.d.ts +4 -1
- package/dist/runtimes/codex/login.d.ts.map +1 -1
- package/dist/runtimes/codex/login.js +10 -3
- package/dist/runtimes/codex/login.js.map +1 -1
- package/dist/runtimes/codex/logout.js +2 -2
- package/dist/runtimes/codex/logout.js.map +1 -1
- package/dist/runtimes/cursor/auth-status.d.ts.map +1 -1
- package/dist/runtimes/cursor/auth-status.js +15 -10
- package/dist/runtimes/cursor/auth-status.js.map +1 -1
- package/dist/runtimes/grok/account-usage.d.ts.map +1 -1
- package/dist/runtimes/grok/account-usage.js +58 -29
- package/dist/runtimes/grok/account-usage.js.map +1 -1
- package/dist/runtimes/grok/failure.d.ts.map +1 -1
- package/dist/runtimes/grok/failure.js +35 -6
- package/dist/runtimes/grok/failure.js.map +1 -1
- package/dist/runtimes/grok/native-turns.d.ts +13 -0
- package/dist/runtimes/grok/native-turns.d.ts.map +1 -0
- package/dist/runtimes/grok/native-turns.js +49 -0
- package/dist/runtimes/grok/native-turns.js.map +1 -0
- package/dist/runtimes/grok/session.d.ts.map +1 -1
- package/dist/runtimes/grok/session.js +12 -6
- package/dist/runtimes/grok/session.js.map +1 -1
- package/dist/runtimes/grok/spontaneous-usage.d.ts +6 -5
- package/dist/runtimes/grok/spontaneous-usage.d.ts.map +1 -1
- package/dist/runtimes/grok/spontaneous-usage.js +7 -6
- package/dist/runtimes/grok/spontaneous-usage.js.map +1 -1
- package/dist/runtimes/kimi/auth-config.d.ts.map +1 -1
- package/dist/runtimes/kimi/auth-config.js +5 -3
- package/dist/runtimes/kimi/auth-config.js.map +1 -1
- package/dist/runtimes/kimi/auth-status.d.ts +3 -0
- package/dist/runtimes/kimi/auth-status.d.ts.map +1 -1
- package/dist/runtimes/kimi/auth-status.js +11 -1
- package/dist/runtimes/kimi/auth-status.js.map +1 -1
- package/dist/runtimes/kimi/logout.js +2 -2
- package/dist/runtimes/kimi/logout.js.map +1 -1
- package/dist/runtimes/opencode/failure.d.ts +3 -0
- package/dist/runtimes/opencode/failure.d.ts.map +1 -0
- package/dist/runtimes/opencode/failure.js +29 -0
- package/dist/runtimes/opencode/failure.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/qoder/auth-status.d.ts +3 -0
- package/dist/runtimes/qoder/auth-status.d.ts.map +1 -1
- package/dist/runtimes/qoder/auth-status.js +10 -2
- package/dist/runtimes/qoder/auth-status.js.map +1 -1
- package/dist/runtimes/qoder/login.js +2 -2
- package/dist/runtimes/qoder/login.js.map +1 -1
- package/dist/runtimes/qwen/auth-status.d.ts.map +1 -1
- package/dist/runtimes/qwen/auth-status.js +10 -16
- package/dist/runtimes/qwen/auth-status.js.map +1 -1
- package/dist/shared/acp/native-turns.d.ts +37 -0
- package/dist/shared/acp/native-turns.d.ts.map +1 -0
- package/dist/shared/acp/native-turns.js +107 -0
- package/dist/shared/acp/native-turns.js.map +1 -0
- package/dist/shared/acp/profile.d.ts +44 -2
- package/dist/shared/acp/profile.d.ts.map +1 -1
- package/dist/shared/acp/profile.js.map +1 -1
- package/dist/shared/acp/records.d.ts +4 -1
- package/dist/shared/acp/records.d.ts.map +1 -1
- package/dist/shared/acp/records.js +2 -2
- package/dist/shared/acp/records.js.map +1 -1
- package/dist/shared/acp/session-state.d.ts +22 -0
- package/dist/shared/acp/session-state.d.ts.map +1 -0
- package/dist/shared/acp/session-state.js +39 -0
- package/dist/shared/acp/session-state.js.map +1 -0
- package/dist/shared/acp/session.d.ts +3 -17
- package/dist/shared/acp/session.d.ts.map +1 -1
- package/dist/shared/acp/session.js +25 -43
- package/dist/shared/acp/session.js.map +1 -1
- package/dist/shared/acp/steer-request.d.ts +12 -0
- package/dist/shared/acp/steer-request.d.ts.map +1 -0
- package/dist/shared/acp/steer-request.js +56 -0
- package/dist/shared/acp/steer-request.js.map +1 -0
- package/dist/shared/acp/token-usage.d.ts +1 -1
- package/dist/shared/acp/token-usage.d.ts.map +1 -1
- package/dist/shared/acp/token-usage.js +2 -2
- package/dist/shared/acp/token-usage.js.map +1 -1
- package/dist/shared/acp/turns.d.ts +6 -2
- package/dist/shared/acp/turns.d.ts.map +1 -1
- package/dist/shared/acp/turns.js +4 -3
- package/dist/shared/acp/turns.js.map +1 -1
- package/dist/shared/executable/query.d.ts +11 -0
- package/dist/shared/executable/query.d.ts.map +1 -0
- package/dist/shared/executable/query.js +31 -0
- package/dist/shared/executable/query.js.map +1 -0
- package/dist/shared/record-retention.d.ts.map +1 -1
- package/dist/shared/record-retention.js +3 -1
- package/dist/shared/record-retention.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { withQueryDeadline } from "../../shared/executable/query.js";
|
|
1
2
|
import { sessionEnvironment } from "../../shared/environment.js";
|
|
2
3
|
/* oxlint-disable typescript/promise-function-async -- Deadline callbacks deliberately return the SDK's native promises. */
|
|
3
4
|
import { client as createClient, methods, PROTOCOL_VERSION, RequestError, } from "@agentclientprotocol/sdk";
|
|
@@ -91,43 +92,71 @@ export function projectGrokUsage(result, email) {
|
|
|
91
92
|
};
|
|
92
93
|
}
|
|
93
94
|
const USAGE = "Grok account usage";
|
|
95
|
+
// Identity is optional. Leave room to return the already-read billing result
|
|
96
|
+
// before the caller's deadline, without waiting for process cleanup.
|
|
97
|
+
const IDENTITY_MARGIN_MS = 100;
|
|
94
98
|
async function readBilling(command, timeoutMs, env) {
|
|
95
|
-
// One budget for the whole read, shared by every request.
|
|
96
99
|
const deadline = Date.now() + timeoutMs;
|
|
97
100
|
const runtime = startAcpProcess(command, ["agent", "--always-approve", "--no-leader", "stdio"], createClient({ name: "oar" }), { env });
|
|
101
|
+
const stop = () => { runtime.kill(); };
|
|
98
102
|
try {
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
103
|
+
// Failure to obtain billing is fatal. Once obtained, optional identity
|
|
104
|
+
// gets its own earlier cutoff and cannot discard the billing result.
|
|
105
|
+
const billing = await withQueryDeadline(USAGE, remainingMs(deadline, USAGE), async (signal) => {
|
|
106
|
+
signal.addEventListener("abort", stop, { once: true });
|
|
107
|
+
try {
|
|
108
|
+
const initialize = methods.agent.initialize;
|
|
109
|
+
const response = await withAcpDeadline(runtime, initialize, remainingMs(deadline, USAGE), (requestOptions) => runtime.connection.agent.request(initialize, {
|
|
110
|
+
protocolVersion: PROTOCOL_VERSION,
|
|
111
|
+
clientCapabilities: {
|
|
112
|
+
fs: { readTextFile: false, writeTextFile: false },
|
|
113
|
+
terminal: false,
|
|
114
|
+
},
|
|
115
|
+
clientInfo: { name: "oar", version: "0.0.0" },
|
|
116
|
+
_meta: grokInitializeMeta({ cwd: process.cwd() }),
|
|
117
|
+
}, requestOptions));
|
|
118
|
+
signal.throwIfAborted();
|
|
119
|
+
const initialized = asRecord(response) ?? {};
|
|
120
|
+
const method = selectGrokAuthMethod(initialized);
|
|
121
|
+
if (method !== undefined) {
|
|
122
|
+
const authenticate = methods.agent.authenticate;
|
|
123
|
+
await withAcpDeadline(runtime, authenticate, remainingMs(deadline, USAGE), (requestOptions) => runtime.connection.agent.request(authenticate, { methodId: method }, requestOptions));
|
|
124
|
+
}
|
|
125
|
+
signal.throwIfAborted();
|
|
126
|
+
const payload = await withAcpDeadline(runtime, "_x.ai/billing", remainingMs(deadline, USAGE), (requestOptions) => runtime.connection.agent.request("_x.ai/billing", {}, requestOptions));
|
|
127
|
+
signal.throwIfAborted();
|
|
128
|
+
return payload;
|
|
129
|
+
}
|
|
130
|
+
finally {
|
|
131
|
+
signal.removeEventListener("abort", stop);
|
|
132
|
+
}
|
|
133
|
+
});
|
|
134
|
+
const identityMs = deadline - Date.now() - IDENTITY_MARGIN_MS;
|
|
135
|
+
if (identityMs <= 0) {
|
|
136
|
+
return { billing };
|
|
125
137
|
}
|
|
126
|
-
|
|
138
|
+
const email = await withQueryDeadline(USAGE, identityMs, async (signal) => {
|
|
139
|
+
signal.addEventListener("abort", stop, { once: true });
|
|
140
|
+
try {
|
|
141
|
+
const authInfo = await withAcpDeadline(runtime, "_x.ai/auth/info", identityMs, (requestOptions) => runtime.connection.agent.request("_x.ai/auth/info", {}, requestOptions));
|
|
142
|
+
signal.throwIfAborted();
|
|
143
|
+
return grokAccountEmail(authInfo) ?? null;
|
|
144
|
+
}
|
|
145
|
+
catch {
|
|
146
|
+
// Older Grok builds and transient identity failures must not hide the
|
|
147
|
+
// billing result that was already read successfully.
|
|
148
|
+
return null;
|
|
149
|
+
}
|
|
150
|
+
finally {
|
|
151
|
+
signal.removeEventListener("abort", stop);
|
|
152
|
+
}
|
|
153
|
+
}, null);
|
|
154
|
+
return { billing, ...(email === null ? {} : { email }) };
|
|
127
155
|
}
|
|
128
156
|
finally {
|
|
157
|
+
// Process ownership and escalation remain with the ACP process. Joining
|
|
158
|
+
// exited here would discard billing when optional identity times out.
|
|
129
159
|
runtime.kill();
|
|
130
|
-
await runtime.exited;
|
|
131
160
|
}
|
|
132
161
|
}
|
|
133
162
|
export const grokAccountUsage = async (installation, options = {}) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account-usage.js","sources":["../../../src/runtimes/grok/account-usage.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"account-usage.js","sources":["../../../src/runtimes/grok/account-usage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"failure.d.ts","sources":["../../../src/runtimes/grok/failure.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA2B,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACvF,OAAO,EAAgC,KAAK,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"failure.d.ts","sources":["../../../src/runtimes/grok/failure.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA2B,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACvF,OAAO,EAAgC,KAAK,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAElG,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAsDjE,eAAO,MAAM,kBAAkB,EAAE,gBAYhC,CAAC;AAEF,uGAAuG;AACvG,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,UAAU,GAAG,WAAW,CAQnE"}
|
|
@@ -1,13 +1,19 @@
|
|
|
1
1
|
import { acpErrorReason, rpcErrorCode } from "../../shared/acp/failure.js";
|
|
2
|
+
import { failureFromErrorCode, failureFromStatus } from "../../shared/failure-class.js";
|
|
2
3
|
import { asRecord } from "../../shared/json.js";
|
|
3
4
|
/*
|
|
4
5
|
* A prompt grok answered with an error (docs/spec/runtime-matrix.md#opencode-kimi-grok-antigravity-acp),
|
|
5
|
-
* observed on 1.0.46 against a scripted provider: -32003 "Rate
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
* is the `error_type` of the `retry_state`
|
|
6
|
+
* observed on 1.0.46 and 1.0.77 against a scripted provider: -32003 "Rate
|
|
7
|
+
* limited" for every HTTP 429, its `data` the provider's words as
|
|
8
|
+
* `API error (status 429 …): <error type>: <message>`; otherwise -32603
|
|
9
|
+
* "Internal error", whose cause is the `error_type` of the `retry_state`
|
|
10
|
+
* update that ended grok's retries, and whose `data.http_status` is the
|
|
11
|
+
* provider's status for an API error (sampling/error.rs
|
|
12
|
+
* `map_sampling_err_to_acp`, `error_data_with_status`).
|
|
9
13
|
*/
|
|
10
14
|
const RATE_LIMITED = -32_003;
|
|
15
|
+
/** Grok's own code for an exhausted free allowance on a 429 (sampling/error.rs `FREE_USAGE_EXHAUSTED_ERROR_CODE`). */
|
|
16
|
+
const FREE_USAGE_EXHAUSTED = "subscription:free-usage-exhausted";
|
|
11
17
|
const ERROR_TYPES = {
|
|
12
18
|
auth: "auth",
|
|
13
19
|
rate_limited: "rate_limited",
|
|
@@ -24,14 +30,37 @@ function finalRetryState(frames) {
|
|
|
24
30
|
}
|
|
25
31
|
return null;
|
|
26
32
|
}
|
|
33
|
+
/**
|
|
34
|
+
* A 429 is throttling unless the provider named a spending limit: Grok's
|
|
35
|
+
* free-usage code, or an error type the shared table calls `quota` or
|
|
36
|
+
* `billing` (`insufficient_quota`, 1.0.77). The type is the word after
|
|
37
|
+
* Grok's `API error (status …): ` prefix.
|
|
38
|
+
*/
|
|
39
|
+
function limitFailure(detail) {
|
|
40
|
+
if (detail.includes(FREE_USAGE_EXHAUSTED)) {
|
|
41
|
+
return "quota";
|
|
42
|
+
}
|
|
43
|
+
const type = /API error \(status [^)]*\): ([\w.-]+):/u.exec(detail)?.[1];
|
|
44
|
+
const named = type === undefined ? null : failureFromErrorCode(type);
|
|
45
|
+
return named === "quota" || named === "billing" ? named : "rate_limited";
|
|
46
|
+
}
|
|
47
|
+
/** The provider's HTTP status Grok put on an API error's `data` (-32603 only). */
|
|
48
|
+
function httpStatus(error) {
|
|
49
|
+
const status = asRecord(error instanceof Error && "data" in error ? error.data : undefined)?.http_status;
|
|
50
|
+
return typeof status === "number" && Number.isInteger(status) ? status : null;
|
|
51
|
+
}
|
|
27
52
|
export const grokFailureOutcome = (error, frames) => {
|
|
28
53
|
const reason = acpErrorReason(error);
|
|
29
54
|
if (rpcErrorCode(error) === RATE_LIMITED) {
|
|
30
|
-
return { kind: "failed", reason, failure:
|
|
55
|
+
return { kind: "failed", reason, failure: limitFailure(reason), status: 429 };
|
|
31
56
|
}
|
|
32
57
|
const update = finalRetryState(frames);
|
|
33
58
|
const named = typeof update?.error_type === "string" ? ERROR_TYPES[update.error_type] : undefined;
|
|
34
|
-
|
|
59
|
+
// Grok's `api` is any API error; the status it kept says which (402: billing).
|
|
60
|
+
const status = httpStatus(error);
|
|
61
|
+
const byStatus = status === null ? "unknown" : failureFromStatus(status);
|
|
62
|
+
const failure = (named === undefined || named === "provider") && byStatus !== "unknown" ? byStatus : named;
|
|
63
|
+
return failure === undefined ? null : { kind: "failed", reason, failure, ...(status === null ? {} : { status }) };
|
|
35
64
|
};
|
|
36
65
|
/** Grok validates its schema and reports either a value or a typed error field, even with end_turn. */
|
|
37
66
|
export function grokPromptOutcome(response) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"failure.js","sources":["../../../src/runtimes/grok/failure.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAyB,MAAM,6BAA6B,CAAC;AAClG,OAAO,EAAE,QAAQ,EAAmB,MAAM,sBAAsB,CAAC;AAEjE
|
|
1
|
+
{"version":3,"file":"failure.js","sources":["../../../src/runtimes/grok/failure.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import type { AcpNativeTurns } from "../../shared/acp/profile.js";
|
|
2
|
+
/**
|
|
3
|
+
* Grok runs turns OAR never prompted: a finished sub-agent wakes its parent
|
|
4
|
+
* (`subagent-completed-*`), an interjection that missed its turn runs on its
|
|
5
|
+
* own (`interject-fallback-*`), and more (grok-build 2bdd1d6: `bash-completed-*`,
|
|
6
|
+
* `goal-summary-*`, ...). Grok takes the client's `_meta.promptId` verbatim
|
|
7
|
+
* (acp_agent.rs `prompt`), so OAR names its own prompts and every other name is
|
|
8
|
+
* Grok's. Its `_x.ai/queue/changed` lists held prompt ids and the running one
|
|
9
|
+
* (`runningPromptId`); its `turn_completed` closes a turn by `prompt_id`
|
|
10
|
+
* (live 1.0.77: experiments/grok-interject/README.md).
|
|
11
|
+
*/
|
|
12
|
+
export declare const grokNativeTurns: AcpNativeTurns;
|
|
13
|
+
//# sourceMappingURL=native-turns.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"native-turns.d.ts","sources":["../../../src/runtimes/grok/native-turns.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAIlE;;;;;;;;;GASG;AACH,eAAO,MAAM,eAAe,EAAE,cAoB7B,CAAC"}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import { classifyFailure } from "../../shared/failure-class.js";
|
|
2
|
+
import { asRecord } from "../../shared/json.js";
|
|
3
|
+
/**
|
|
4
|
+
* Grok runs turns OAR never prompted: a finished sub-agent wakes its parent
|
|
5
|
+
* (`subagent-completed-*`), an interjection that missed its turn runs on its
|
|
6
|
+
* own (`interject-fallback-*`), and more (grok-build 2bdd1d6: `bash-completed-*`,
|
|
7
|
+
* `goal-summary-*`, ...). Grok takes the client's `_meta.promptId` verbatim
|
|
8
|
+
* (acp_agent.rs `prompt`), so OAR names its own prompts and every other name is
|
|
9
|
+
* Grok's. Its `_x.ai/queue/changed` lists held prompt ids and the running one
|
|
10
|
+
* (`runningPromptId`); its `turn_completed` closes a turn by `prompt_id`
|
|
11
|
+
* (live 1.0.77: experiments/grok-interject/README.md).
|
|
12
|
+
*/
|
|
13
|
+
export const grokNativeTurns = {
|
|
14
|
+
promptMeta: (promptId) => ({ promptId }),
|
|
15
|
+
read(method, params) {
|
|
16
|
+
if (method === "_x.ai/queue/changed") {
|
|
17
|
+
const entries = Array.isArray(params.entries) ? params.entries : [];
|
|
18
|
+
const queued = entries.flatMap((entry) => {
|
|
19
|
+
const id = asRecord(entry)?.id;
|
|
20
|
+
return typeof id === "string" && id !== "" ? [id] : [];
|
|
21
|
+
});
|
|
22
|
+
const running = typeof params.runningPromptId === "string" && params.runningPromptId !== "" ? params.runningPromptId : null;
|
|
23
|
+
return { kind: "queue", running, queued };
|
|
24
|
+
}
|
|
25
|
+
if (method !== "_x.ai/session_notification") {
|
|
26
|
+
return null;
|
|
27
|
+
}
|
|
28
|
+
const update = asRecord(params.update);
|
|
29
|
+
if (update?.sessionUpdate !== "turn_completed" || typeof update.prompt_id !== "string" || update.prompt_id === "") {
|
|
30
|
+
return null;
|
|
31
|
+
}
|
|
32
|
+
// A later wake of the same child reuses its prompt id; the native event id tells the reports apart.
|
|
33
|
+
// oxlint-disable-next-line eslint/no-underscore-dangle -- Native ACP extension envelope.
|
|
34
|
+
const key = asRecord(params._meta)?.eventId;
|
|
35
|
+
return { kind: "ended", promptId: update.prompt_id, outcome: grokTurnOutcome(update), ...(typeof key === "string" && key !== "" ? { key } : {}) };
|
|
36
|
+
},
|
|
37
|
+
};
|
|
38
|
+
/** `stop_reason`: the model's (`end_turn`, ...), `cancelled`, or `error` with the message in `agent_result` (turn_completion.rs). */
|
|
39
|
+
function grokTurnOutcome(update) {
|
|
40
|
+
if (update.stop_reason === "cancelled") {
|
|
41
|
+
return { kind: "aborted" };
|
|
42
|
+
}
|
|
43
|
+
if (update.stop_reason === "error") {
|
|
44
|
+
const reason = typeof update.agent_result === "string" && update.agent_result !== "" ? update.agent_result : "Grok reported an error";
|
|
45
|
+
return { kind: "failed", reason, failure: classifyFailure(reason) };
|
|
46
|
+
}
|
|
47
|
+
return { kind: "completed" };
|
|
48
|
+
}
|
|
49
|
+
//# sourceMappingURL=native-turns.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"native-turns.js","sources":["../../../src/runtimes/grok/native-turns.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAmB,MAAM,sBAAsB,CAAC;AAEjE;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,eAAe,GAAmB;IAC7C,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC;IACxC,IAAI,CAAC,MAAM,EAAE,MAAM;QACjB,IAAI,MAAM,KAAK,qBAAqB,EAAE,CAAC;YACrC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YACpE,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,KAAc,EAAE,EAAE;gBAChD,MAAM,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;gBAC/B,OAAO,OAAO,EAAE,KAAK,QAAQ,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACzD,CAAC,CAAC,CAAC;YACH,MAAM,OAAO,GAAG,OAAO,MAAM,CAAC,eAAe,KAAK,QAAQ,IAAI,MAAM,CAAC,eAAe,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC;YAC5H,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QAC5C,CAAC;QACD,IAAI,MAAM,KAAK,4BAA4B,EAAE,CAAC;YAAC,OAAO,IAAI,CAAC;QAAC,CAAC;QAC7D,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACvC,IAAI,MAAM,EAAE,aAAa,KAAK,gBAAgB,IAAI,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,KAAK,EAAE,EAAE,CAAC;YAAC,OAAO,IAAI,CAAC;QAAC,CAAC;QACnI,oGAAoG;QACpG,yFAAyF;QACzF,MAAM,GAAG,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;QAC5C,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,eAAe,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;IACpJ,CAAC;CACF,CAAC;AAEF,qIAAqI;AACrI,SAAS,eAAe,CAAC,MAAkB;IACzC,IAAI,MAAM,CAAC,WAAW,KAAK,WAAW,EAAE,CAAC;QAAC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IAAC,CAAC;IACvE,IAAI,MAAM,CAAC,WAAW,KAAK,OAAO,EAAE,CAAC;QACnC,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC,YAAY,KAAK,QAAQ,IAAI,MAAM,CAAC,YAAY,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,wBAAwB,CAAC;QACtI,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;IACtE,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;AAC/B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sources":["../../../src/runtimes/grok/session.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAE5F,OAAO,EAAc,KAAK,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACjF,OAAO,EAAsB,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sources":["../../../src/runtimes/grok/session.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAE5F,OAAO,EAAc,KAAK,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACjF,OAAO,EAAsB,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAc3E,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,UAAU,GAAG,MAAM,GAAG,SAAS,CAQhF;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,cAAc,GAAG,UAAU,CAYtE;AAYD,8EAA8E;AAC9E,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,UAAU,GAAG,YAAY,GAAG,IAAI,CAc1E;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,UAAU,GAAG,WAAW,GAAG,IAAI,CAUzE;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,eAAO,MAAM,4BAA4B,EAAE,SAAS,MAAM,EAoBzD,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,iBA6C5B,CAAC;AAEF,eAAO,MAAM,WAAW,mDAA6B,CAAC"}
|
|
@@ -9,6 +9,7 @@ import { asNumber, asRecord } from "../../shared/json.js";
|
|
|
9
9
|
import { cacheParts, reasoningPart } from "../../shared/token-totals.js";
|
|
10
10
|
import { grokFailureOutcome, grokPromptOutcome } from "./failure.js";
|
|
11
11
|
import { grokSpontaneousTokens } from "./spontaneous-usage.js";
|
|
12
|
+
import { grokNativeTurns } from "./native-turns.js";
|
|
12
13
|
import { redactGrokNotification } from "../../shared/credential-redaction.js";
|
|
13
14
|
function authMethodIds(initialized) {
|
|
14
15
|
return (Array.isArray(initialized.authMethods) ? initialized.authMethods : [])
|
|
@@ -128,6 +129,8 @@ export const GROK_EXTENSION_NOTIFICATIONS = [
|
|
|
128
129
|
"_x.ai/mcp/init_progress",
|
|
129
130
|
"_x.ai/mcp/server_status",
|
|
130
131
|
"_x.ai/mcp_initialized",
|
|
132
|
+
// live 1.0.77: the echo of an accepted `_x.ai/interject` (experiments/grok-interject)
|
|
133
|
+
"_x.ai/session/interjection",
|
|
131
134
|
// [sym] only
|
|
132
135
|
"_x.ai/session/update",
|
|
133
136
|
"_x.ai/task_backgrounded",
|
|
@@ -165,12 +168,15 @@ export const grokAcpProfile = {
|
|
|
165
168
|
},
|
|
166
169
|
sessionMeta: () => ({ yoloMode: true }),
|
|
167
170
|
selectAuthMethod: selectGrokAuthMethod,
|
|
168
|
-
// `
|
|
169
|
-
// `
|
|
170
|
-
//
|
|
171
|
-
//
|
|
172
|
-
|
|
173
|
-
|
|
171
|
+
// `_x.ai/interject` adds the input to the running turn without cancelling
|
|
172
|
+
// it: Grok answers `queued` at once and the turn takes it at its next safe
|
|
173
|
+
// point; one that misses the turn runs as Grok's own (live 1.0.77,
|
|
174
|
+
// experiments/grok-interject). `_meta.sendNow` would cancel the turn instead.
|
|
175
|
+
steerRequest: ({ sessionId, input, prompt, inputId }) => ({
|
|
176
|
+
method: "_x.ai/interject",
|
|
177
|
+
params: { sessionId, text: input, interjectionId: inputId, ...(prompt.some((block) => block.type === "image") ? { content: prompt } : {}) },
|
|
178
|
+
}),
|
|
179
|
+
nativeTurns: grokNativeTurns,
|
|
174
180
|
promptMeta: (options) => options.outputSchema === undefined ? undefined : { outputSchema: options.outputSchema },
|
|
175
181
|
promptOutcome: grokPromptOutcome,
|
|
176
182
|
promptContextUsage: grokContextUsage,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sources":["../../../src/runtimes/grok/session.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"session.js","sources":["../../../src/runtimes/grok/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import type { TokenTotals } from "../../contracts/session.js";
|
|
2
2
|
import { type JsonRecord } from "../../shared/json.js";
|
|
3
3
|
/**
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
4
|
+
* The ledger of a turn Grok ran on its own: a prompt OAR did not send (a
|
|
5
|
+
* sub-agent's completion wake, spawn.rs::inject_subagent_completed_prompt; a
|
|
6
|
+
* late interjection; native-turns.ts). Its terminal ledger is independent of
|
|
7
|
+
* RPC prompt ledgers, which carry OAR's own prompts. The ACP recorder enforces
|
|
8
|
+
* root attribution; child frames never reach this.
|
|
8
9
|
*/
|
|
9
|
-
export declare function grokSpontaneousTokens(method: string, params: JsonRecord): {
|
|
10
|
+
export declare function grokSpontaneousTokens(method: string, params: JsonRecord, sentByOar?: (promptId: string) => boolean): {
|
|
10
11
|
readonly key: string;
|
|
11
12
|
readonly tokens: TokenTotals;
|
|
12
13
|
readonly replayed?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spontaneous-usage.d.ts","sources":["../../../src/runtimes/grok/spontaneous-usage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAsB,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAG3E
|
|
1
|
+
{"version":3,"file":"spontaneous-usage.d.ts","sources":["../../../src/runtimes/grok/spontaneous-usage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAsB,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAG3E;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,GAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAqB,GAAG;IAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAe5N"}
|
|
@@ -1,18 +1,19 @@
|
|
|
1
1
|
import { asNumber, asRecord } from "../../shared/json.js";
|
|
2
2
|
import { cacheParts, reasoningPart } from "../../shared/token-totals.js";
|
|
3
3
|
/**
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
4
|
+
* The ledger of a turn Grok ran on its own: a prompt OAR did not send (a
|
|
5
|
+
* sub-agent's completion wake, spawn.rs::inject_subagent_completed_prompt; a
|
|
6
|
+
* late interjection; native-turns.ts). Its terminal ledger is independent of
|
|
7
|
+
* RPC prompt ledgers, which carry OAR's own prompts. The ACP recorder enforces
|
|
8
|
+
* root attribution; child frames never reach this.
|
|
8
9
|
*/
|
|
9
|
-
export function grokSpontaneousTokens(method, params) {
|
|
10
|
+
export function grokSpontaneousTokens(method, params, sentByOar = () => false) {
|
|
10
11
|
if (method !== "_x.ai/session_notification") {
|
|
11
12
|
return null;
|
|
12
13
|
}
|
|
13
14
|
const update = asRecord(params.update);
|
|
14
15
|
if (update?.sessionUpdate !== "turn_completed" || typeof update.prompt_id !== "string"
|
|
15
|
-
||
|
|
16
|
+
|| update.prompt_id === "" || sentByOar(update.prompt_id)) {
|
|
16
17
|
return null;
|
|
17
18
|
}
|
|
18
19
|
// eventId is stable across duplicate delivery. A later wake of the same
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spontaneous-usage.js","sources":["../../../src/runtimes/grok/spontaneous-usage.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAmB,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAEzE
|
|
1
|
+
{"version":3,"file":"spontaneous-usage.js","sources":["../../../src/runtimes/grok/spontaneous-usage.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAmB,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAEzE;;;;;;GAMG;AACH,MAAM,UAAU,qBAAqB,CAAC,MAAc,EAAE,MAAkB,EAAE,SAAS,GAAkC,GAAG,EAAE,CAAC,KAAK;IAC9H,IAAI,MAAM,KAAK,4BAA4B,EAAE,CAAC;QAAC,OAAO,IAAI,CAAC;IAAC,CAAC;IAC7D,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACvC,IAAI,MAAM,EAAE,aAAa,KAAK,gBAAgB,IAAI,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ;WACjF,MAAM,CAAC,SAAS,KAAK,EAAE,IAAI,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QAAC,OAAO,IAAI,CAAC;IAAC,CAAC;IAC7E,wEAAwE;IACxE,6EAA6E;IAC7E,yFAAyF;IACzF,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACpC,MAAM,GAAG,GAAG,IAAI,EAAE,OAAO,CAAC;IAC1B,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACrC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IAC7C,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,EAAE,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAAC,OAAO,IAAI,CAAC;IAAC,CAAC;IAClH,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,qBAAqB,EAAE,CAAC,EAAE,GAAG,aAAa,CAAC,KAAK,EAAE,iBAAiB,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,EAAE,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;AAClO,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-config.d.ts","sources":["../../../src/runtimes/kimi/auth-config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"auth-config.d.ts","sources":["../../../src/runtimes/kimi/auth-config.ts"],"names":[],"mappings":"AAeA,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;IACnC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;CACjC;AAoCD,eAAO,MAAM,UAAU,uBAAuB,CAAC;AAE/C;;;GAGG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAe,GAC7C,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CA6CjC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { withQueryDeadline } from "../../shared/executable/query.js";
|
|
1
2
|
import { environmentValue } from "../../shared/environment.js";
|
|
2
3
|
import { createHash } from "node:crypto";
|
|
3
4
|
import { environmentHome } from "../../shared/environment-home.js";
|
|
@@ -48,9 +49,10 @@ export const KIMI_USAGE = "Kimi account usage";
|
|
|
48
49
|
export async function resolveKimiAuth(command, deadline, env = process.env) {
|
|
49
50
|
// Kimi's public JSON command is the stable way to read its resolved TOML
|
|
50
51
|
// shape without importing private packages or teaching OAR a TOML dialect.
|
|
51
|
-
const
|
|
52
|
-
|
|
53
|
-
|
|
52
|
+
const timeoutMs = remainingMs(deadline, KIMI_USAGE);
|
|
53
|
+
const result = await withQueryDeadline(KIMI_USAGE, timeoutMs, async (signal) => {
|
|
54
|
+
const execution = await runExecutable(command, ["provider", "list", "--json"], { env, timeoutMs, signal });
|
|
55
|
+
return execution;
|
|
54
56
|
});
|
|
55
57
|
assertRan(result, `Failed to run ${command} provider list --json`);
|
|
56
58
|
if (!result.ok) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-config.js","sources":["../../../src/runtimes/kimi/auth-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAE3D,MAAM,gBAAgB,GAAG,mBAAmB,CAAC;AAC7C,MAAM,gBAAgB,GAAG,gCAAgC,CAAC;AAC1D,MAAM,kBAAkB,GAAG,uBAAuB,CAAC;AACnD,MAAM,iBAAiB,GAAG,iBAAiB,CAAC;AAW5C,SAAS,IAAI,CAAC,KAAc;IAC1B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;AAClD,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAa;IACvC,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;AAC3C,CAAC;AAED,SAAS,QAAQ,CAAC,SAAiB,EAAE,OAAe;IAClD,MAAM,cAAc,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IACnD,IAAI,cAAc,KAAK,kBAAkB,IAAI,cAAc,KAAK,gBAAgB,EAAE,CAAC;QACjF,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IACD,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC;SAChC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC;SAC9E,MAAM,CAAC,KAAK,CAAC;SACb,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAChB,OAAO,uBAAuB,MAAM,EAAE,CAAC;AACzC,CAAC;AAED,SAAS,WAAW,CAAC,GAAW;IAC9B,MAAM,MAAM,GAAG,QAAQ,CAAC;IACxB,MAAM,SAAS,GAAG,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAC1E,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,SAAS,CAAC,KAAK,SAAS,EAAE,CAAC;QAC7F,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;IACnE,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,oBAAoB,CAAC;AAE/C;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,OAAe,EACf,QAAgB,EAChB,GAAG,GAAgC,OAAO,CAAC,GAAG;IAE9C,yEAAyE;IACzE,2EAA2E;IAC3E,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,OAAO,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE
|
|
1
|
+
{"version":3,"file":"auth-config.js","sources":["../../../src/runtimes/kimi/auth-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAE3D,MAAM,gBAAgB,GAAG,mBAAmB,CAAC;AAC7C,MAAM,gBAAgB,GAAG,gCAAgC,CAAC;AAC1D,MAAM,kBAAkB,GAAG,uBAAuB,CAAC;AACnD,MAAM,iBAAiB,GAAG,iBAAiB,CAAC;AAW5C,SAAS,IAAI,CAAC,KAAc;IAC1B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;AAClD,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAa;IACvC,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;AAC3C,CAAC;AAED,SAAS,QAAQ,CAAC,SAAiB,EAAE,OAAe;IAClD,MAAM,cAAc,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IACnD,IAAI,cAAc,KAAK,kBAAkB,IAAI,cAAc,KAAK,gBAAgB,EAAE,CAAC;QACjF,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IACD,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC;SAChC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC;SAC9E,MAAM,CAAC,KAAK,CAAC;SACb,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAChB,OAAO,uBAAuB,MAAM,EAAE,CAAC;AACzC,CAAC;AAED,SAAS,WAAW,CAAC,GAAW;IAC9B,MAAM,MAAM,GAAG,QAAQ,CAAC;IACxB,MAAM,SAAS,GAAG,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAC1E,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,SAAS,CAAC,KAAK,SAAS,EAAE,CAAC;QAC7F,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;IACnE,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,oBAAoB,CAAC;AAE/C;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,OAAe,EACf,QAAgB,EAChB,GAAG,GAAgC,OAAO,CAAC,GAAG;IAE9C,yEAAyE;IACzE,2EAA2E;IAC3E,MAAM,SAAS,GAAG,WAAW,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,UAAU,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAC7E,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,OAAO,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;QAC3G,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC,CAAC;IACH,SAAS,CAAC,MAAM,EAAE,iBAAiB,OAAO,uBAAuB,CAAC,CAAC;IACnE,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;QACf,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,IAAI,GAAG,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IAChD,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC;IACzE,IAAI,QAAQ,KAAK,IAAI,IAAI,QAAQ,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAClD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,eAAe,GAAG,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACjD,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,oBAAoB,CAAC,CAAC,CAAC;IACrE,MAAM,YAAY,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,sBAAsB,CAAC,IAAI,gBAAgB,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC,CAAC;IACrH,MAAM,sBAAsB,GAAG,UAAU,KAAK,SAAS,IAAI,YAAY,KAAK,SAAS,CAAC;IACtF,MAAM,OAAO,GAAG,kBAAkB,CAAC,UAAU,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,gBAAgB,CAAC,CAAC;IAC7F,MAAM,SAAS,GAAG,kBAAkB,CAClC,YAAY,IAAI,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,IAAI,kBAAkB,CACvE,CAAC;IACF,MAAM,WAAW,GAAG,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACjD,MAAM,aAAa,GAAG,IAAI,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;IACjD,MAAM,WAAW,GAAG,CAAC,sBAAsB,IAAI,aAAa,KAAK,WAAW;QAC1E,CAAC,CAAC,aAAa;QACf,CAAC,CAAC,WAAW,CAAC;IAChB,MAAM,iBAAiB,GAAG,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IACzD,MAAM,eAAe,GAAG,CAAC,sBAAsB,IAAI,aAAa,KAAK,WAAW;WAC3E,iBAAiB,KAAK,SAAS,IAAI,iBAAiB,KAAK,MAAM;QAClE,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,MAAM,CAAC;IACX,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,YAAY,CAAC,CAAC;IACvG,MAAM,mBAAmB,GAAG,WAAW,CAAC,WAAW,CAAC,CAAC;IACrD,OAAO;QACL,OAAO;QACP,SAAS;QACT,OAAO,EAAE,eAAe;QACxB,WAAW,EAAE,mBAAmB;QAChC,IAAI;QACJ,cAAc,EAAE,IAAI,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,mBAAmB,OAAO,CAAC;KACzE,CAAC;AACJ,CAAC"}
|
|
@@ -6,5 +6,8 @@ export declare function queryKimiAuth(command: string, method: "authenticate" |
|
|
|
6
6
|
readonly signal?: AbortSignal;
|
|
7
7
|
}): Promise<KimiAuthQuery>;
|
|
8
8
|
/** The auth gate reads cached material; the whole ACP startup is not declared local-only. */
|
|
9
|
+
export declare function readKimiAuthStatus(installation: AvailableInstallation, options?: AuthStatusOptions & {
|
|
10
|
+
readonly signal?: AbortSignal;
|
|
11
|
+
}): Promise<AuthStatus>;
|
|
9
12
|
export declare function kimiAuthStatus(installation: AvailableInstallation, options?: AuthStatusOptions): Promise<AuthStatus>;
|
|
10
13
|
//# sourceMappingURL=auth-status.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-status.d.ts","sources":["../../../src/runtimes/kimi/auth-status.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"auth-status.d.ts","sources":["../../../src/runtimes/kimi/auth-status.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAM9E,MAAM,MAAM,aAAa,GAAG,IAAI,GAAG,eAAe,GAAG,aAAa,GAAG,WAAW,GAAG,QAAQ,CAAC;AAG5F,qGAAqG;AACrG,wBAAsB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,GAAG,QAAQ,EAAE,OAAO,EAAE,iBAAiB,GAAG;IAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAA;CAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAmC9K;AAED,6FAA6F;AAC7F,wBAAsB,kBAAkB,CAAC,YAAY,EAAE,qBAAqB,EAAE,OAAO,GAAE,iBAAiB,GAAG;IAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAA;CAAO,GAAG,OAAO,CAAC,UAAU,CAAC,CAQtK;AAED,wBAAsB,cAAc,CAAC,YAAY,EAAE,qBAAqB,EAAE,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,UAAU,CAAC,CAM9H"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { withQueryDeadline } from "../../shared/executable/query.js";
|
|
1
2
|
import { client, methods, PROTOCOL_VERSION, RequestError } from "@agentclientprotocol/sdk";
|
|
2
3
|
import { startAcpProcess } from "../../shared/acp/process.js";
|
|
3
4
|
import { sessionEnvironment } from "../../shared/environment.js";
|
|
@@ -17,11 +18,13 @@ export async function queryKimiAuth(command, method, options) {
|
|
|
17
18
|
const query = async () => {
|
|
18
19
|
try {
|
|
19
20
|
await process.spawned;
|
|
21
|
+
options.signal?.throwIfAborted();
|
|
20
22
|
const initialized = await process.connection.agent.request(methods.agent.initialize, {
|
|
21
23
|
protocolVersion: PROTOCOL_VERSION,
|
|
22
24
|
clientCapabilities: { fs: { readTextFile: false, writeTextFile: false }, terminal: false },
|
|
23
25
|
clientInfo: { name: "oar", version: "0.0.0" },
|
|
24
26
|
});
|
|
27
|
+
options.signal?.throwIfAborted();
|
|
25
28
|
const response = asRecord(initialized);
|
|
26
29
|
if (method === "authenticate" && !asRecordList(response?.authMethods).some((entry) => entry.id === "login")) {
|
|
27
30
|
return "unsupported";
|
|
@@ -57,7 +60,7 @@ export async function queryKimiAuth(command, method, options) {
|
|
|
57
60
|
}
|
|
58
61
|
}
|
|
59
62
|
/** The auth gate reads cached material; the whole ACP startup is not declared local-only. */
|
|
60
|
-
export async function
|
|
63
|
+
export async function readKimiAuthStatus(installation, options = {}) {
|
|
61
64
|
if (installation.via !== "executable") {
|
|
62
65
|
return { kind: "unknown", source: SOURCE, detail: "Kimi authentication requires an executable" };
|
|
63
66
|
}
|
|
@@ -70,4 +73,11 @@ export async function kimiAuthStatus(installation, options = {}) {
|
|
|
70
73
|
: "Kimi authentication query failed");
|
|
71
74
|
return { kind: "unknown", source: SOURCE, detail };
|
|
72
75
|
}
|
|
76
|
+
export async function kimiAuthStatus(installation, options = {}) {
|
|
77
|
+
const status = await withQueryDeadline("Kimi auth status", options.timeoutMs ?? 20_000, async (signal) => {
|
|
78
|
+
const result = await readKimiAuthStatus(installation, { ...options, signal });
|
|
79
|
+
return result;
|
|
80
|
+
}, { kind: "unknown", source: SOURCE, detail: "Kimi authentication query timed out" });
|
|
81
|
+
return status;
|
|
82
|
+
}
|
|
73
83
|
//# sourceMappingURL=auth-status.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-status.js","sources":["../../../src/runtimes/kimi/auth-status.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"auth-status.js","sources":["../../../src/runtimes/kimi/auth-status.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { sessionEnvironment } from "../../shared/environment.js";
|
|
2
2
|
import { loginExecutable } from "../../shared/login.js";
|
|
3
3
|
import { confirmedLogout } from "../../shared/logout.js";
|
|
4
|
-
import {
|
|
4
|
+
import { readKimiAuthStatus, queryKimiAuth } from "./auth-status.js";
|
|
5
5
|
/** ACP logout removes the managed OAuth slot and its managed model configuration. */
|
|
6
6
|
export async function kimiLogout(installation, options = {}) {
|
|
7
7
|
const target = loginExecutable(installation, "Kimi", "2.3.3", sessionEnvironment(options.env));
|
|
@@ -15,6 +15,6 @@ export async function kimiLogout(installation, options = {}) {
|
|
|
15
15
|
const native = result === "ok" ? { kind: "done" } : {
|
|
16
16
|
kind: "failed", reason: result === "timed_out" ? "timed_out" : "process_failed", detail: "Kimi ACP logout did not complete",
|
|
17
17
|
};
|
|
18
|
-
return confirmedLogout(native, await
|
|
18
|
+
return confirmedLogout(native, await readKimiAuthStatus(installation, { env: options.env }), "kimi acp logout");
|
|
19
19
|
}
|
|
20
20
|
//# sourceMappingURL=logout.js.map
|