@botiverse/oar 0.98.0 → 0.100.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 -15
- package/dist/contracts/login.d.ts +7 -1
- package/dist/contracts/login.d.ts.map +1 -1
- package/dist/contracts/provider-auth.d.ts +8 -4
- package/dist/contracts/provider-auth.d.ts.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/runtimes/antigravity/logout.d.ts.map +1 -1
- package/dist/runtimes/antigravity/logout.js +3 -2
- package/dist/runtimes/antigravity/logout.js.map +1 -1
- package/dist/runtimes/claude/logout.d.ts.map +1 -1
- package/dist/runtimes/claude/logout.js +3 -2
- package/dist/runtimes/claude/logout.js.map +1 -1
- package/dist/runtimes/codebuddy/index.d.ts +1 -0
- package/dist/runtimes/codebuddy/index.d.ts.map +1 -1
- package/dist/runtimes/codebuddy/index.js +1 -0
- package/dist/runtimes/codebuddy/index.js.map +1 -1
- package/dist/runtimes/codebuddy/logout.d.ts +5 -0
- package/dist/runtimes/codebuddy/logout.d.ts.map +1 -0
- package/dist/runtimes/codebuddy/logout.js +57 -0
- package/dist/runtimes/codebuddy/logout.js.map +1 -0
- package/dist/runtimes/codex/installation.d.ts +15 -4
- package/dist/runtimes/codex/installation.d.ts.map +1 -1
- package/dist/runtimes/codex/installation.js +42 -9
- package/dist/runtimes/codex/installation.js.map +1 -1
- package/dist/runtimes/codex/logout.d.ts.map +1 -1
- package/dist/runtimes/codex/logout.js +3 -2
- package/dist/runtimes/codex/logout.js.map +1 -1
- package/dist/runtimes/grok/auth.d.ts +17 -0
- package/dist/runtimes/grok/auth.d.ts.map +1 -0
- package/dist/runtimes/grok/auth.js +163 -0
- package/dist/runtimes/grok/auth.js.map +1 -0
- package/dist/runtimes/grok/index.d.ts +3 -0
- package/dist/runtimes/grok/index.d.ts.map +1 -1
- package/dist/runtimes/grok/index.js +3 -0
- package/dist/runtimes/grok/index.js.map +1 -1
- package/dist/runtimes/grok/options.d.ts.map +1 -1
- package/dist/runtimes/grok/options.js +0 -1
- package/dist/runtimes/grok/options.js.map +1 -1
- package/dist/runtimes/kimi/logout.d.ts.map +1 -1
- package/dist/runtimes/kimi/logout.js +3 -2
- package/dist/runtimes/kimi/logout.js.map +1 -1
- package/dist/runtimes/opencode/index.d.ts +2 -0
- package/dist/runtimes/opencode/index.d.ts.map +1 -1
- package/dist/runtimes/opencode/index.js +1 -0
- package/dist/runtimes/opencode/index.js.map +1 -1
- package/dist/runtimes/opencode/provider-auth-error.d.ts +25 -0
- package/dist/runtimes/opencode/provider-auth-error.d.ts.map +1 -0
- package/dist/runtimes/opencode/provider-auth-error.js +13 -0
- package/dist/runtimes/opencode/provider-auth-error.js.map +1 -0
- package/dist/runtimes/opencode/provider-auth-facade.d.ts +28 -0
- package/dist/runtimes/opencode/provider-auth-facade.d.ts.map +1 -0
- package/dist/runtimes/opencode/provider-auth-facade.js +178 -0
- package/dist/runtimes/opencode/provider-auth-facade.js.map +1 -0
- package/dist/runtimes/opencode/provider-auth-oauth.d.ts +24 -0
- package/dist/runtimes/opencode/provider-auth-oauth.d.ts.map +1 -0
- package/dist/runtimes/opencode/provider-auth-oauth.js +189 -0
- package/dist/runtimes/opencode/provider-auth-oauth.js.map +1 -0
- package/dist/runtimes/opencode/provider-auth-prompts.d.ts +16 -0
- package/dist/runtimes/opencode/provider-auth-prompts.d.ts.map +1 -0
- package/dist/runtimes/opencode/provider-auth-prompts.js +91 -0
- package/dist/runtimes/opencode/provider-auth-prompts.js.map +1 -0
- package/dist/runtimes/opencode/provider-auth-registry.d.ts +79 -0
- package/dist/runtimes/opencode/provider-auth-registry.d.ts.map +1 -0
- package/dist/runtimes/opencode/provider-auth-registry.js +146 -0
- package/dist/runtimes/opencode/provider-auth-registry.js.map +1 -0
- package/dist/runtimes/opencode/provider-auth-server.d.ts +38 -0
- package/dist/runtimes/opencode/provider-auth-server.d.ts.map +1 -0
- package/dist/runtimes/opencode/provider-auth-server.js +221 -0
- package/dist/runtimes/opencode/provider-auth-server.js.map +1 -0
- package/dist/runtimes/opencode/provider-auth.d.ts +49 -0
- package/dist/runtimes/opencode/provider-auth.d.ts.map +1 -0
- package/dist/runtimes/opencode/provider-auth.js +39 -0
- package/dist/runtimes/opencode/provider-auth.js.map +1 -0
- package/dist/shared/acp/session.d.ts.map +1 -1
- package/dist/shared/acp/session.js +15 -2
- package/dist/shared/acp/session.js.map +1 -1
- package/dist/shared/acp/terminal.d.ts +12 -1
- package/dist/shared/acp/terminal.d.ts.map +1 -1
- package/dist/shared/acp/terminal.js +8 -0
- package/dist/shared/acp/terminal.js.map +1 -1
- package/dist/shared/acp/turn-terminals.d.ts +13 -0
- package/dist/shared/acp/turn-terminals.d.ts.map +1 -0
- package/dist/shared/acp/turn-terminals.js +103 -0
- package/dist/shared/acp/turn-terminals.js.map +1 -0
- package/dist/shared/executable/host-watchdog.d.ts +22 -0
- package/dist/shared/executable/host-watchdog.d.ts.map +1 -0
- package/dist/shared/executable/host-watchdog.js +79 -0
- package/dist/shared/executable/host-watchdog.js.map +1 -0
- package/dist/shared/executable/node-eval.d.ts +10 -0
- package/dist/shared/executable/node-eval.d.ts.map +1 -0
- package/dist/shared/executable/node-eval.js +17 -0
- package/dist/shared/executable/node-eval.js.map +1 -0
- package/dist/shared/login.d.ts +9 -4
- package/dist/shared/login.d.ts.map +1 -1
- package/dist/shared/login.js +15 -7
- package/dist/shared/login.js.map +1 -1
- package/dist/shared/logout.d.ts +8 -0
- package/dist/shared/logout.d.ts.map +1 -1
- package/dist/shared/logout.js +13 -0
- package/dist/shared/logout.js.map +1 -1
- package/dist/shared/shell-environment.d.ts.map +1 -1
- package/dist/shared/shell-environment.js +6 -13
- package/dist/shared/shell-environment.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,221 @@
|
|
|
1
|
+
import { randomBytes } from "node:crypto";
|
|
2
|
+
import { asRecord, parseJson } from "../../shared/json.js";
|
|
3
|
+
import { LoginSecrets, spawnLoginProcess } from "../../shared/login.js";
|
|
4
|
+
import { OpencodeProviderAuthError } from "./provider-auth-error.js";
|
|
5
|
+
const LISTENING = /^server listening on (https?:\/\/\S+)/u;
|
|
6
|
+
// OpenCode's error tag, e.g. `InvalidRequestError`.
|
|
7
|
+
const TAG = "_tag";
|
|
8
|
+
/** OpenCode's own error JSON (`{_tag, message}`) as one redacted line. */
|
|
9
|
+
export function nativeDetail(response, secrets) {
|
|
10
|
+
const record = asRecord(response.body);
|
|
11
|
+
const tag = record?.[TAG];
|
|
12
|
+
const message = typeof record?.message === "string" ? secrets.line(record.message) : undefined;
|
|
13
|
+
return [`HTTP ${String(response.status)}`, typeof tag === "string" ? tag : undefined, message].filter((part) => part !== undefined && part !== "").join(": ");
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
* The serve child's environment: the caller's, with OAR's password, no
|
|
17
|
+
* inherited OpenCode 1 username (2.2.7 has a fixed user), and no update
|
|
18
|
+
* check or model-catalog fetch (OPENCODE_DISABLE_AUTOUPDATE and
|
|
19
|
+
* OPENCODE_DISABLE_MODELS_FETCH, both read by 2.2.7). On POSIX, BROWSER is a
|
|
20
|
+
* command that does nothing, so OpenCode can never open a browser on the
|
|
21
|
+
* machine it runs on; Windows has no such command and keeps the caller's.
|
|
22
|
+
*/
|
|
23
|
+
export function serveEnvironment(env, password, platform = process.platform) {
|
|
24
|
+
const inherited = { ...env };
|
|
25
|
+
delete inherited.OPENCODE_SERVER_USERNAME;
|
|
26
|
+
return {
|
|
27
|
+
...inherited,
|
|
28
|
+
// OpenCode reads OPENCODE_PASSWORD first, then OPENCODE_SERVER_PASSWORD.
|
|
29
|
+
OPENCODE_PASSWORD: password,
|
|
30
|
+
OPENCODE_SERVER_PASSWORD: password,
|
|
31
|
+
OPENCODE_DISABLE_AUTOUPDATE: "1",
|
|
32
|
+
OPENCODE_DISABLE_MODELS_FETCH: "1",
|
|
33
|
+
...(platform === "win32" ? {} : { BROWSER: "true" }),
|
|
34
|
+
};
|
|
35
|
+
}
|
|
36
|
+
function listed(response) {
|
|
37
|
+
const data = asRecord(response.body)?.data;
|
|
38
|
+
return response.status === 200 && Array.isArray(data) && data.length > 0;
|
|
39
|
+
}
|
|
40
|
+
export class OpencodeServer {
|
|
41
|
+
#options;
|
|
42
|
+
#running;
|
|
43
|
+
#users = 0;
|
|
44
|
+
#idle;
|
|
45
|
+
#stopping = new Set();
|
|
46
|
+
constructor(options) {
|
|
47
|
+
this.#options = options;
|
|
48
|
+
}
|
|
49
|
+
/** Run `work` against a ready server, starting one when none runs. */
|
|
50
|
+
async run(work) {
|
|
51
|
+
clearTimeout(this.#idle);
|
|
52
|
+
this.#users += 1;
|
|
53
|
+
try {
|
|
54
|
+
const running = await this.#ensure();
|
|
55
|
+
return await work(async (method, path, body) => {
|
|
56
|
+
const response = await this.#request(running, method, path, body);
|
|
57
|
+
return response;
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
finally {
|
|
61
|
+
this.#users -= 1;
|
|
62
|
+
if (this.#users === 0) {
|
|
63
|
+
this.#idle = setTimeout(() => { void this.close(); }, this.#options.idleMs);
|
|
64
|
+
// Waiting to stop an idle server must not keep the host process alive.
|
|
65
|
+
this.#idle.unref();
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
/** Stop the server and everything it started; the next operation starts a new one. */
|
|
70
|
+
async close() {
|
|
71
|
+
clearTimeout(this.#idle);
|
|
72
|
+
const running = this.#running;
|
|
73
|
+
this.#running = undefined;
|
|
74
|
+
if (running !== undefined) {
|
|
75
|
+
const stopping = OpencodeServer.#stop(running);
|
|
76
|
+
this.#stopping.add(stopping);
|
|
77
|
+
void (async () => { await stopping; this.#stopping.delete(stopping); })();
|
|
78
|
+
}
|
|
79
|
+
// Also a stop already under way (the idle period's): close() settles once no server it started runs.
|
|
80
|
+
await Promise.all(this.#stopping);
|
|
81
|
+
}
|
|
82
|
+
static async #stop(running) {
|
|
83
|
+
try {
|
|
84
|
+
const settled = await running;
|
|
85
|
+
settled.process.stop();
|
|
86
|
+
await settled.process.exited;
|
|
87
|
+
}
|
|
88
|
+
catch {
|
|
89
|
+
// A failed start already stopped its process.
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
async #ensure() {
|
|
93
|
+
// Another caller may replace an exited server while this one waits.
|
|
94
|
+
for (let current = this.#running; current !== undefined; current = this.#running) {
|
|
95
|
+
const running = await current;
|
|
96
|
+
if (!running.exited) {
|
|
97
|
+
return running;
|
|
98
|
+
}
|
|
99
|
+
if (this.#running === current) {
|
|
100
|
+
this.#running = undefined;
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
const started = this.#start();
|
|
104
|
+
this.#running = started;
|
|
105
|
+
try {
|
|
106
|
+
return await started;
|
|
107
|
+
}
|
|
108
|
+
catch (error) {
|
|
109
|
+
// A failed start leaves nothing to reuse.
|
|
110
|
+
if (this.#running === started) {
|
|
111
|
+
this.#running = undefined;
|
|
112
|
+
}
|
|
113
|
+
throw error;
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
async #start() {
|
|
117
|
+
const { command, env, cwd, timeoutMs, pollMs } = this.#options;
|
|
118
|
+
const password = randomBytes(24).toString("base64url");
|
|
119
|
+
const secrets = new LoginSecrets();
|
|
120
|
+
secrets.add(password);
|
|
121
|
+
const listening = Promise.withResolvers();
|
|
122
|
+
const said = { first: "" };
|
|
123
|
+
const child = spawnLoginProcess(command, ["serve", "--hostname", "127.0.0.1", "--port", "0"], serveEnvironment(env, password), {
|
|
124
|
+
onLine: (line) => {
|
|
125
|
+
const url = LISTENING.exec(line)?.[1];
|
|
126
|
+
if (url !== undefined) {
|
|
127
|
+
listening.resolve(url);
|
|
128
|
+
}
|
|
129
|
+
if (said.first === "") {
|
|
130
|
+
said.first = line;
|
|
131
|
+
}
|
|
132
|
+
},
|
|
133
|
+
}, { cwd, stopWithHost: true });
|
|
134
|
+
const deadline = Date.now() + timeoutMs;
|
|
135
|
+
const timer = setTimeout(() => { listening.reject(new OpencodeProviderAuthError("timed_out", `opencode serve did not start within ${String(timeoutMs)} ms`)); }, timeoutMs);
|
|
136
|
+
void (async () => {
|
|
137
|
+
const exit = await child.exited;
|
|
138
|
+
const words = said.first === "" ? "" : `: ${secrets.line(said.first)}`;
|
|
139
|
+
listening.reject(new OpencodeProviderAuthError("startup_failed", `opencode serve exited (${exit.error ?? `code ${String(exit.exitCode)}`})${words}`));
|
|
140
|
+
})();
|
|
141
|
+
try {
|
|
142
|
+
const url = await listening.promise;
|
|
143
|
+
const running = { process: child, url, authorization: `Basic ${Buffer.from(`opencode:${password}`).toString("base64")}`, exited: false };
|
|
144
|
+
void (async () => {
|
|
145
|
+
await child.exited;
|
|
146
|
+
running.exited = true;
|
|
147
|
+
})();
|
|
148
|
+
await this.#ready(running, deadline, timeoutMs, pollMs);
|
|
149
|
+
return running;
|
|
150
|
+
}
|
|
151
|
+
catch (error) {
|
|
152
|
+
// Gone before the caller hears of the failure: Windows cannot remove a directory a live process runs in.
|
|
153
|
+
child.stop();
|
|
154
|
+
await child.exited;
|
|
155
|
+
throw error;
|
|
156
|
+
}
|
|
157
|
+
finally {
|
|
158
|
+
clearTimeout(timer);
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
/**
|
|
162
|
+
* The registry fills in stages after listening; 2.2.7 lists its plugins
|
|
163
|
+
* only once it is complete. Startup and readiness share one budget: each
|
|
164
|
+
* read gets only what is left of it.
|
|
165
|
+
*/
|
|
166
|
+
async #ready(running, deadline, timeoutMs, pollMs) {
|
|
167
|
+
const late = () => new OpencodeProviderAuthError("timed_out", `opencode serve did not load its integrations within ${String(timeoutMs)} ms`);
|
|
168
|
+
const read = async (path) => {
|
|
169
|
+
const left = deadline - Date.now();
|
|
170
|
+
if (left <= 0) {
|
|
171
|
+
throw late();
|
|
172
|
+
}
|
|
173
|
+
try {
|
|
174
|
+
return await this.#request(running, "GET", path, undefined, left);
|
|
175
|
+
}
|
|
176
|
+
catch (error) {
|
|
177
|
+
throw error instanceof OpencodeProviderAuthError && error.kind === "timed_out" ? late() : error;
|
|
178
|
+
}
|
|
179
|
+
};
|
|
180
|
+
for (;;) {
|
|
181
|
+
const plugins = await read("/api/plugin");
|
|
182
|
+
const integrations = await read("/api/integration");
|
|
183
|
+
if (listed(plugins) && listed(integrations)) {
|
|
184
|
+
return;
|
|
185
|
+
}
|
|
186
|
+
if (running.exited) {
|
|
187
|
+
throw new OpencodeProviderAuthError("startup_failed", "opencode serve exited before its integrations loaded");
|
|
188
|
+
}
|
|
189
|
+
if (Date.now() + pollMs > deadline) {
|
|
190
|
+
throw late();
|
|
191
|
+
}
|
|
192
|
+
await new Promise((resolve) => { setTimeout(resolve, pollMs); });
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
async #request(running, method, path, body, timeoutMs = this.#options.timeoutMs) {
|
|
196
|
+
const parsed = await this.#fetch(running, method, path, body, timeoutMs);
|
|
197
|
+
if (parsed.status === 401) {
|
|
198
|
+
// 2.2.7: `{"_tag":"UnauthorizedError","message":"Authentication required"}` for a wrong or missing password.
|
|
199
|
+
throw new OpencodeProviderAuthError("authentication_failed", `OpenCode's server refused OAR's password (${nativeDetail(parsed, new LoginSecrets())})`, 401);
|
|
200
|
+
}
|
|
201
|
+
return parsed;
|
|
202
|
+
}
|
|
203
|
+
async #fetch(running, method, path, body, timeoutMs) {
|
|
204
|
+
try {
|
|
205
|
+
const response = await fetch(`${running.url}${path}`, {
|
|
206
|
+
method,
|
|
207
|
+
headers: { authorization: running.authorization, ...(body === undefined ? {} : { "content-type": "application/json" }) },
|
|
208
|
+
...(body === undefined ? {} : { body: JSON.stringify(body) }),
|
|
209
|
+
signal: AbortSignal.timeout(timeoutMs),
|
|
210
|
+
});
|
|
211
|
+
const textBody = await response.text();
|
|
212
|
+
return { status: response.status, body: textBody === "" ? undefined : parseJson(textBody) };
|
|
213
|
+
}
|
|
214
|
+
catch (error) {
|
|
215
|
+
const timedOut = error instanceof Error && error.name === "TimeoutError";
|
|
216
|
+
// Never the request body: it may carry a key.
|
|
217
|
+
throw new OpencodeProviderAuthError(timedOut ? "timed_out" : "server_failed", `${method} ${path} ${timedOut ? `timed out after ${String(timeoutMs)} ms` : "failed: OpenCode's server did not answer"}`);
|
|
218
|
+
}
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
//# sourceMappingURL=provider-auth-server.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider-auth-server.js","sources":["../../../src/runtimes/opencode/provider-auth-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import type { AvailableInstallation } from "../../contracts/installation.js";
|
|
2
|
+
import type { ProviderAuthFacade } from "../../contracts/provider-auth.js";
|
|
3
|
+
import type { SessionOptions } from "../../contracts/session-options.js";
|
|
4
|
+
export { OpencodeProviderAuthError, type OpencodeProviderAuthErrorKind } from "./provider-auth-error.js";
|
|
5
|
+
export interface OpencodeProviderAuthOptions {
|
|
6
|
+
/** Same overlay as sessions: strings override, null removes, and the host is untouched. */
|
|
7
|
+
readonly env?: SessionOptions["env"];
|
|
8
|
+
/**
|
|
9
|
+
* One budget for starting `opencode serve` until its integrations are
|
|
10
|
+
* loaded, and the bound for each request (default 30 s).
|
|
11
|
+
*/
|
|
12
|
+
readonly timeoutMs?: number;
|
|
13
|
+
/**
|
|
14
|
+
* How long a login waits for the person to finish signing in (default
|
|
15
|
+
* 10 minutes; OpenCode 2.2.7's own attempts expire after 600 s, xAI's after
|
|
16
|
+
* 1800 s).
|
|
17
|
+
*/
|
|
18
|
+
readonly loginTimeoutMs?: number;
|
|
19
|
+
/** How long the server stays up after the last operation ends (default 5 s). */
|
|
20
|
+
readonly idleMs?: number;
|
|
21
|
+
/**
|
|
22
|
+
* `"refuse"`: an OAuth attempt whose authorize URL returns the browser to
|
|
23
|
+
* a loopback address (`localhost`, `127.0.0.1`, `::1`) on the machine
|
|
24
|
+
* running `opencode serve`, and that takes no pasted code, is cancelled and
|
|
25
|
+
* rejected with kind `loopback_required`, before any URL is shown. For a
|
|
26
|
+
* host whose person signs in from another machine (a remote web UI).
|
|
27
|
+
* Default `"allow"`.
|
|
28
|
+
*/
|
|
29
|
+
readonly loopback?: "allow" | "refuse";
|
|
30
|
+
}
|
|
31
|
+
/**
|
|
32
|
+
* A {@link ProviderAuthFacade} over OpenCode 2's integrations. It owns one
|
|
33
|
+
* `opencode serve` process, started on first use and stopped `idleMs` after
|
|
34
|
+
* the last operation ends; `close()` stops it at once. An unclosed facade
|
|
35
|
+
* never keeps its server longer than that idle period, and the server also
|
|
36
|
+
* stops when the host process dies, SIGKILL included.
|
|
37
|
+
*/
|
|
38
|
+
export interface OpencodeProviderAuth extends ProviderAuthFacade {
|
|
39
|
+
/** Stop the owned `opencode serve` now; a later operation starts a new one. */
|
|
40
|
+
close(): Promise<void>;
|
|
41
|
+
}
|
|
42
|
+
/**
|
|
43
|
+
* Sign in to OpenCode 2's providers through OpenCode's own HTTP API
|
|
44
|
+
* (`integration.*`, `credential.remove`). OAR never reads or writes
|
|
45
|
+
* OpenCode's credential files. OpenCode 1 has no such API and is refused
|
|
46
|
+
* with `OpencodeProviderAuthError` kind `version_unsupported`.
|
|
47
|
+
*/
|
|
48
|
+
export declare function createOpencodeProviderAuth(installation: AvailableInstallation, options?: OpencodeProviderAuthOptions): Promise<OpencodeProviderAuth>;
|
|
49
|
+
//# sourceMappingURL=provider-auth.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider-auth.d.ts","sources":["../../../src/runtimes/opencode/provider-auth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAMzE,OAAO,EAAE,yBAAyB,EAAE,KAAK,6BAA6B,EAAE,MAAM,0BAA0B,CAAC;AAEzG,MAAM,WAAW,2BAA2B;IAC1C,2FAA2F;IAC3F,QAAQ,CAAC,GAAG,CAAC,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC;IACrC;;;OAGG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B;;;;OAIG;IACH,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IACjC,gFAAgF;IAChF,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB;;;;;;;OAOG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;CACxC;AAED;;;;;;GAMG;AACH,MAAM,WAAW,oBAAqB,SAAQ,kBAAkB;IAC9D,+EAA+E;IAC/E,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAMD;;;;;GAKG;AACH,wBAAsB,0BAA0B,CAC9C,YAAY,EAAE,qBAAqB,EACnC,OAAO,GAAE,2BAAgC,GACxC,OAAO,CAAC,oBAAoB,CAAC,CAwB/B"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { sessionEnvironment } from "../../shared/environment.js";
|
|
2
|
+
import { environmentHome } from "../../shared/environment-home.js";
|
|
3
|
+
import { OpencodeProviderAuthError } from "./provider-auth-error.js";
|
|
4
|
+
import { opencodeMajor } from "./version.js";
|
|
5
|
+
export { OpencodeProviderAuthError } from "./provider-auth-error.js";
|
|
6
|
+
const DEFAULT_TIMEOUT_MS = 30_000;
|
|
7
|
+
const DEFAULT_LOGIN_TIMEOUT_MS = 600_000;
|
|
8
|
+
const DEFAULT_IDLE_MS = 5000;
|
|
9
|
+
/**
|
|
10
|
+
* Sign in to OpenCode 2's providers through OpenCode's own HTTP API
|
|
11
|
+
* (`integration.*`, `credential.remove`). OAR never reads or writes
|
|
12
|
+
* OpenCode's credential files. OpenCode 1 has no such API and is refused
|
|
13
|
+
* with `OpencodeProviderAuthError` kind `version_unsupported`.
|
|
14
|
+
*/
|
|
15
|
+
export async function createOpencodeProviderAuth(installation, options = {}) {
|
|
16
|
+
if (installation.via !== "executable") {
|
|
17
|
+
throw new OpencodeProviderAuthError("unsupported_installation", "OpenCode provider sign-in requires the opencode executable");
|
|
18
|
+
}
|
|
19
|
+
const env = sessionEnvironment(options.env);
|
|
20
|
+
// OpenCode's own background service runs in the home directory; a
|
|
21
|
+
// project directory could add integrations from its configuration.
|
|
22
|
+
const cwd = environmentHome(env);
|
|
23
|
+
if (await opencodeMajor(installation, { cwd, env: options.env ?? {} }) === 1) {
|
|
24
|
+
throw new OpencodeProviderAuthError("version_unsupported", `OpenCode provider sign-in requires OpenCode 2 (@opencode/cli); this installation is OpenCode 1 (${installation.version ?? "version unknown"})`);
|
|
25
|
+
}
|
|
26
|
+
const { OpencodeProviderAuthFacade } = await import("./provider-auth-facade.js");
|
|
27
|
+
return OpencodeProviderAuthFacade.create({
|
|
28
|
+
command: installation.command,
|
|
29
|
+
env,
|
|
30
|
+
cwd,
|
|
31
|
+
timeoutMs: options.timeoutMs ?? DEFAULT_TIMEOUT_MS,
|
|
32
|
+
loginTimeoutMs: options.loginTimeoutMs ?? DEFAULT_LOGIN_TIMEOUT_MS,
|
|
33
|
+
idleMs: options.idleMs ?? DEFAULT_IDLE_MS,
|
|
34
|
+
loopback: options.loopback ?? "allow",
|
|
35
|
+
pollMs: 100,
|
|
36
|
+
statusPollMs: 1000,
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
//# sourceMappingURL=provider-auth.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider-auth.js","sources":["../../../src/runtimes/opencode/provider-auth.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,yBAAyB,EAAsC,MAAM,0BAA0B,CAAC;AAyCzG,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAClC,MAAM,wBAAwB,GAAG,OAAO,CAAC;AACzC,MAAM,eAAe,GAAG,IAAI,CAAC;AAE7B;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,YAAmC,EACnC,OAAO,GAAgC,EAAE;IAEzC,IAAI,YAAY,CAAC,GAAG,KAAK,YAAY,EAAE,CAAC;QACtC,MAAM,IAAI,yBAAyB,CAAC,0BAA0B,EAAE,4DAA4D,CAAC,CAAC;IAChI,CAAC;IACD,MAAM,GAAG,GAAG,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC5C,kEAAkE;IAClE,mEAAmE;IACnE,MAAM,GAAG,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;IACjC,IAAI,MAAM,aAAa,CAAC,YAAY,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7E,MAAM,IAAI,yBAAyB,CAAC,qBAAqB,EACvD,mGAAmG,YAAY,CAAC,OAAO,IAAI,iBAAiB,GAAG,CAAC,CAAC;IACrJ,CAAC;IACD,MAAM,EAAE,0BAA0B,EAAE,GAAG,MAAM,MAAM,CAAC,2BAA2B,CAAC,CAAC;IACjF,OAAO,0BAA0B,CAAC,MAAM,CAAC;QACvC,OAAO,EAAE,YAAY,CAAC,OAAO;QAC7B,GAAG;QACH,GAAG;QACH,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,kBAAkB;QAClD,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,wBAAwB;QAClE,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,eAAe;QACzC,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,OAAO;QACrC,MAAM,EAAE,GAAG;QACX,YAAY,EAAE,IAAI;KACnB,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sources":["../../../src/shared/acp/session.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAMV,OAAO,EACP,cAAc,EACd,YAAY,EACb,MAAM,4BAA4B,CAAC;AAGpC,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAA0B,KAAK,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE5F,OAAO,EAIL,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACtB,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAmB,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AAIhE,OAAO,EAAyB,KAAK,eAAe,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sources":["../../../src/shared/acp/session.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAMV,OAAO,EACP,cAAc,EACd,YAAY,EACb,MAAM,4BAA4B,CAAC;AAGpC,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAA0B,KAAK,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE5F,OAAO,EAIL,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACtB,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAmB,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AAIhE,OAAO,EAAyB,KAAK,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAIjF,YAAY,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,KAAK,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAcjF,wBAAgB,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,YAAY,CA6BnE;AAED,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,aAAa,CAAC,CAAC;IAC5C,QAAQ,CAAC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,QAAQ,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC;IAC5B,QAAQ,CAAC,YAAY,EAAE,MAAM,IAAI,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC;CACrC;AAED,2EAA2E;AAC3E,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,iBAAiB,EAC1B,OAAO,EAAE,cAAc,EACvB,WAAW,EAAE,kBAAkB,EAC/B,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE,gBAAgB,EACxB,YAAY,EAAE,eAAe,EAC7B,MAAM,CAAC,EAAE,yBAAyB,GACjC,OAAO,CA4KT"}
|
|
@@ -12,6 +12,7 @@ import { AcpError, acpProcessExitedError } from "./errors.js";
|
|
|
12
12
|
import { createAcpTurns } from "./turns.js";
|
|
13
13
|
import { acpTakesImages } from "./prompt.js";
|
|
14
14
|
import { createAcpSessionState } from "./session-state.js";
|
|
15
|
+
import { acpTurnTerminals } from "./turn-terminals.js";
|
|
15
16
|
import { sendAcpSteerRequest } from "./steer-request.js";
|
|
16
17
|
export { createAcpSessionState } from "./session-state.js";
|
|
17
18
|
/*
|
|
@@ -76,6 +77,7 @@ export function finishAcpSession(profile, options, credentials, runtime, opened,
|
|
|
76
77
|
} });
|
|
77
78
|
// Bound only now: frames queued since the open answer may start a native turn, which needs the driver above.
|
|
78
79
|
recorder.bind(kernel);
|
|
80
|
+
const turnTerminals = acpTurnTerminals(options.endTurnProcessesOnAbort === true, kernel, terminalHost, () => turns.active());
|
|
79
81
|
const createCompaction = profile.compaction;
|
|
80
82
|
if (createCompaction !== undefined) {
|
|
81
83
|
compaction = manualCompaction(kernel, {
|
|
@@ -200,9 +202,20 @@ export function finishAcpSession(profile, options, credentials, runtime, opened,
|
|
|
200
202
|
queue: (input, inputOptions) => control({ kind: "queue", input, ...inputOptions }, (request) => turns.hold(input, inputOptions?.images, inputOptions?.inputId, request)),
|
|
201
203
|
// The queue is held here (turns.ts), not by the vendor: an entry can be taken back until the drain sends it.
|
|
202
204
|
withdraw: (inputId) => control({ kind: "withdraw", inputId }, () => turns.withdraw(inputId)),
|
|
203
|
-
abort: () => control({ kind: "abort" }, (request) => {
|
|
205
|
+
abort: () => control({ kind: "abort" }, async (request) => {
|
|
204
206
|
const state = turns.active();
|
|
205
|
-
|
|
207
|
+
if (state === null) {
|
|
208
|
+
return { kind: "rejected", code: "no_active_turn", reason: "no active turn" };
|
|
209
|
+
}
|
|
210
|
+
const claim = turnTerminals.aborting(state, request);
|
|
211
|
+
const answer = await turns.abort(state, request);
|
|
212
|
+
if (answer.kind === "accepted") {
|
|
213
|
+
claim.accepted();
|
|
214
|
+
}
|
|
215
|
+
else {
|
|
216
|
+
claim.refused();
|
|
217
|
+
}
|
|
218
|
+
return answer;
|
|
206
219
|
}),
|
|
207
220
|
rawEvents: (observer, cursor) => kernel.rawEvents(observer, cursor),
|
|
208
221
|
records: () => kernel.records(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sources":["../../../src/shared/acp/session.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"session.js","sources":["../../../src/shared/acp/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,11 +7,22 @@ export interface AcpTerminalHost {
|
|
|
7
7
|
release(params: ReleaseTerminalRequest): Promise<ReleaseTerminalResponse>;
|
|
8
8
|
dispose(): Promise<void>;
|
|
9
9
|
}
|
|
10
|
+
/** The host a session owns: the runtime's terminal surface, plus ending chosen terminals. */
|
|
11
|
+
export interface OwnedAcpTerminalHost extends AcpTerminalHost {
|
|
12
|
+
/**
|
|
13
|
+
* Stop these terminals' commands (their process groups; their trees on
|
|
14
|
+
* Windows) if still running, keeping the terminals so the runtime can still
|
|
15
|
+
* read and release them. Counts the commands it had to stop.
|
|
16
|
+
*/
|
|
17
|
+
end(terminalIds: readonly string[]): Promise<{
|
|
18
|
+
readonly signalled: number;
|
|
19
|
+
}>;
|
|
20
|
+
}
|
|
10
21
|
export interface AcpTerminalHostOptions {
|
|
11
22
|
readonly shellCommand?: boolean;
|
|
12
23
|
/** Native process issuing reverse terminal requests. */
|
|
13
24
|
readonly agentPid?: () => number | undefined;
|
|
14
25
|
}
|
|
15
26
|
/** Host implementation of ACP v1's typed terminal reverse-RPC surface. */
|
|
16
|
-
export declare function createAcpTerminalHost(cwd: string, environment: NodeJS.ProcessEnv, options?: AcpTerminalHostOptions):
|
|
27
|
+
export declare function createAcpTerminalHost(cwd: string, environment: NodeJS.ProcessEnv, options?: AcpTerminalHostOptions): OwnedAcpTerminalHost;
|
|
17
28
|
//# sourceMappingURL=terminal.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.d.ts","sources":["../../../src/shared/acp/terminal.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAC3B,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EACzB,KAAK,sBAAsB,EAC3B,KAAK,uBAAuB,EAC5B,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAC3B,KAAK,0BAA0B,EAC/B,KAAK,2BAA2B,EACjC,MAAM,0BAA0B,CAAC;AA6BlC,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;IACvE,MAAM,CAAC,MAAM,EAAE,qBAAqB,GAAG,sBAAsB,CAAC;IAC9D,WAAW,CAAC,MAAM,EAAE,0BAA0B,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;IACtF,IAAI,CAAC,MAAM,EAAE,mBAAmB,GAAG,oBAAoB,CAAC;IACxD,OAAO,CAAC,MAAM,EAAE,sBAAsB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAC1E,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAChC,wDAAwD;IACxD,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;CAC9C;AAsED,0EAA0E;AAC1E,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,CAAC,UAAU,EAC9B,OAAO,GAAE,sBAA2B,GACnC,
|
|
1
|
+
{"version":3,"file":"terminal.d.ts","sources":["../../../src/shared/acp/terminal.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAC3B,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EACzB,KAAK,sBAAsB,EAC3B,KAAK,uBAAuB,EAC5B,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAC3B,KAAK,0BAA0B,EAC/B,KAAK,2BAA2B,EACjC,MAAM,0BAA0B,CAAC;AA6BlC,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;IACvE,MAAM,CAAC,MAAM,EAAE,qBAAqB,GAAG,sBAAsB,CAAC;IAC9D,WAAW,CAAC,MAAM,EAAE,0BAA0B,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;IACtF,IAAI,CAAC,MAAM,EAAE,mBAAmB,GAAG,oBAAoB,CAAC;IACxD,OAAO,CAAC,MAAM,EAAE,sBAAsB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAC1E,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED,6FAA6F;AAC7F,MAAM,WAAW,oBAAqB,SAAQ,eAAe;IAC3D;;;;OAIG;IACH,GAAG,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC;QAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC9E;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAChC,wDAAwD;IACxD,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;CAC9C;AAsED,0EAA0E;AAC1E,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,CAAC,UAAU,EAC9B,OAAO,GAAE,sBAA2B,GACnC,oBAAoB,CAyItB"}
|
|
@@ -180,6 +180,14 @@ export function createAcpTerminalHost(cwd, environment, options = {}) {
|
|
|
180
180
|
waitForExit,
|
|
181
181
|
kill,
|
|
182
182
|
release,
|
|
183
|
+
async end(terminalIds) {
|
|
184
|
+
const running = [...new Set(terminalIds)].flatMap((id) => {
|
|
185
|
+
const state = terminals.get(id);
|
|
186
|
+
return state === undefined || state.exitStatus !== null ? [] : [state];
|
|
187
|
+
});
|
|
188
|
+
await Promise.all(running.map(async (state) => { await stopTerminal(state); }));
|
|
189
|
+
return { signalled: running.length };
|
|
190
|
+
},
|
|
183
191
|
async dispose() {
|
|
184
192
|
const active = [...terminals.values()];
|
|
185
193
|
terminals.clear();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.js","sources":["../../../src/shared/acp/terminal.ts"],"names":[],"mappings":"AAAA,sHAAsH;AACtH,OAAO,EACL,YAAY,GAWb,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAEnH,MAAM,oBAAoB,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;AAC7C,MAAM,gBAAgB,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"terminal.js","sources":["../../../src/shared/acp/terminal.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import type { RequestRecord } from "../../contracts/session.js";
|
|
2
|
+
import type { SessionKernel } from "../session-kernel.js";
|
|
3
|
+
import type { OwnedAcpTerminalHost } from "./terminal.js";
|
|
4
|
+
import type { ActiveTurn } from "./turns.js";
|
|
5
|
+
export interface AcpTurnTerminals {
|
|
6
|
+
/** An abort of this turn is about to be sent; report its answer through the claim. */
|
|
7
|
+
aborting(state: ActiveTurn, request: RequestRecord): {
|
|
8
|
+
readonly accepted: () => void;
|
|
9
|
+
readonly refused: () => void;
|
|
10
|
+
};
|
|
11
|
+
}
|
|
12
|
+
export declare function acpTurnTerminals(enabled: boolean, kernel: SessionKernel, host: Pick<OwnedAcpTerminalHost, "end">, active: () => ActiveTurn | null): AcpTurnTerminals;
|
|
13
|
+
//# sourceMappingURL=turn-terminals.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"turn-terminals.d.ts","sources":["../../../src/shared/acp/turn-terminals.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAEhE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAe7C,MAAM,WAAW,gBAAgB;IAC/B,sFAAsF;IACtF,QAAQ,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,GAAG;QAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAC;QAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,CAAA;KAAE,CAAC;CACtH;AAUD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,CAAC,oBAAoB,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,MAAM,UAAU,GAAG,IAAI,GAAG,gBAAgB,CAkEpK"}
|