@botiverse/oar 0.97.0 → 0.99.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/dist/runtimes/antigravity/auth.d.ts.map +1 -1
- package/dist/runtimes/antigravity/auth.js +2 -3
- package/dist/runtimes/antigravity/auth.js.map +1 -1
- package/dist/runtimes/antigravity/index.d.ts +1 -0
- package/dist/runtimes/antigravity/index.d.ts.map +1 -1
- package/dist/runtimes/antigravity/index.js +1 -1
- package/dist/runtimes/antigravity/index.js.map +1 -1
- package/dist/runtimes/antigravity/logout.d.ts +12 -0
- package/dist/runtimes/antigravity/logout.d.ts.map +1 -0
- package/dist/runtimes/antigravity/logout.js +28 -0
- package/dist/runtimes/antigravity/logout.js.map +1 -0
- package/dist/runtimes/cursor/model.d.ts +11 -2
- package/dist/runtimes/cursor/model.d.ts.map +1 -1
- package/dist/runtimes/cursor/model.js +17 -1
- package/dist/runtimes/cursor/model.js.map +1 -1
- package/dist/runtimes/cursor/sdk.d.ts +12 -0
- package/dist/runtimes/cursor/sdk.d.ts.map +1 -1
- package/dist/runtimes/cursor/sdk.js.map +1 -1
- package/dist/runtimes/cursor/session.d.ts.map +1 -1
- package/dist/runtimes/cursor/session.js +8 -7
- package/dist/runtimes/cursor/session.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 +162 -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/auth-status.d.ts +2 -1
- package/dist/runtimes/kimi/auth-status.d.ts.map +1 -1
- package/dist/runtimes/kimi/auth-status.js +3 -56
- package/dist/runtimes/kimi/auth-status.js.map +1 -1
- package/dist/shared/acp/auth-query.d.ts +19 -0
- package/dist/shared/acp/auth-query.d.ts.map +1 -0
- package/dist/shared/acp/auth-query.js +66 -0
- package/dist/shared/acp/auth-query.js.map +1 -0
- package/dist/shared/acp/session.d.ts.map +1 -1
- package/dist/shared/acp/session.js +12 -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 +12 -0
- package/dist/shared/acp/turn-terminals.d.ts.map +1 -0
- package/dist/shared/acp/turn-terminals.js +79 -0
- package/dist/shared/acp/turn-terminals.js.map +1 -0
- package/package.json +1 -1
|
@@ -0,0 +1,162 @@
|
|
|
1
|
+
import { sessionEnvironment } from "../../shared/environment.js";
|
|
2
|
+
import { runExecutable } from "../../shared/executable/index.js";
|
|
3
|
+
import { withQueryDeadline } from "../../shared/executable/query.js";
|
|
4
|
+
import { errorMessage, LoginSecrets, loginBounds, loginExecutable, spawnLoginProcess, stoppedResult } from "../../shared/login.js";
|
|
5
|
+
import { commandLogout, confirmedLogout, runLogoutCommand } from "../../shared/logout.js";
|
|
6
|
+
/*
|
|
7
|
+
* Grok Build's own sign-in (1.0.77, 2026-11-11; docs/runtimes/grok.md#login).
|
|
8
|
+
* `grok login --device-auth` prints `https://accounts.x.ai/oauth2/device?user_code=<CODE>`,
|
|
9
|
+
* then the code on a line of its own, and waits ("Waiting for authorization...")
|
|
10
|
+
* until the person confirms the code in a browser: nothing is pasted back.
|
|
11
|
+
* Before that it starts a browser itself: `BROWSER` when set (the command,
|
|
12
|
+
* with the URL), otherwise the desktop's launcher (`gio open` here). Status is
|
|
13
|
+
* `grok models`, which starts with "You are not authenticated." without a
|
|
14
|
+
* sign-in and "You are logged in with grok.com." with one. `grok logout` clears the cached sign-in ("No cached session to log
|
|
15
|
+
* out of." when there is none, exit 0). OAR never reads or writes the
|
|
16
|
+
* credential.
|
|
17
|
+
*/
|
|
18
|
+
const SOURCE = "grok models";
|
|
19
|
+
const LOGIN_TIMEOUT_MS = 15 * 60_000;
|
|
20
|
+
const LOGOUT_TIMEOUT_MS = 60_000;
|
|
21
|
+
const DEVICE_URL = /^(https:\/\/accounts\.x\.ai\/oauth2\/device\?\S+)$/u;
|
|
22
|
+
const SIGNED_OUT = "You are not authenticated.";
|
|
23
|
+
/** Its first line with a sign-in (1.0.77, a real login): `You are logged in with grok.com.` */
|
|
24
|
+
const SIGNED_IN = /^You are logged in with (\S+?)\.$/mu;
|
|
25
|
+
export async function readGrokAuthStatus(installation, options = {}) {
|
|
26
|
+
if (installation.via !== "executable") {
|
|
27
|
+
return { kind: "unknown", detail: "not a machine-installed executable" };
|
|
28
|
+
}
|
|
29
|
+
const result = await runExecutable(installation.command, ["models"], {
|
|
30
|
+
env: sessionEnvironment(options.env), timeoutMs: options.timeoutMs ?? 30_000, ...(options.signal === undefined ? {} : { signal: options.signal }),
|
|
31
|
+
});
|
|
32
|
+
if (!result.ok) {
|
|
33
|
+
return { kind: "unknown", source: SOURCE, detail: "grok models failed" };
|
|
34
|
+
}
|
|
35
|
+
const output = `${result.stdout}\n${result.stderr}`;
|
|
36
|
+
if (output.includes(SIGNED_OUT)) {
|
|
37
|
+
return { kind: "logged_out", source: SOURCE };
|
|
38
|
+
}
|
|
39
|
+
const method = SIGNED_IN.exec(output)?.[1];
|
|
40
|
+
return method === undefined
|
|
41
|
+
? { kind: "unknown", source: SOURCE, detail: "grok models said neither that it is logged in nor that it is not" }
|
|
42
|
+
: { kind: "logged_in", account: { method }, source: SOURCE };
|
|
43
|
+
}
|
|
44
|
+
/** Whether Grok is signed in, by its own model listing. */
|
|
45
|
+
export async function grokAuthStatus(installation, options = {}) {
|
|
46
|
+
const status = await withQueryDeadline("Grok auth status", options.timeoutMs ?? 30_000, async (signal) => {
|
|
47
|
+
const read = await readGrokAuthStatus(installation, { ...options, signal });
|
|
48
|
+
return read;
|
|
49
|
+
}, { kind: "unknown", source: SOURCE, detail: "Grok auth status timed out" });
|
|
50
|
+
return status;
|
|
51
|
+
}
|
|
52
|
+
/** Exit 0 is only Grok's word: its status decides; an unanswered status leaves a login without an account. */
|
|
53
|
+
async function confirmed(installation, signal, env) {
|
|
54
|
+
const status = signal?.aborted === true ? undefined : await readGrokAuthStatus(installation, { env, timeoutMs: 20_000, ...(signal === undefined ? {} : { signal }) });
|
|
55
|
+
return status?.kind === "logged_out"
|
|
56
|
+
? { kind: "failed", reason: "not_logged_in", detail: "grok login exited 0, yet grok models says it is not authenticated" }
|
|
57
|
+
: { kind: "logged_in" };
|
|
58
|
+
}
|
|
59
|
+
/** The device URL as `device_code`: the code is its `user_code`. */
|
|
60
|
+
function deviceCode(url) {
|
|
61
|
+
const userCode = URL.canParse(url) ? new URL(url).searchParams.get("user_code") : null;
|
|
62
|
+
return userCode === null || userCode === "" ? null : { kind: "device_code", userCode, verificationUri: url };
|
|
63
|
+
}
|
|
64
|
+
async function runGrokLogin(installation, command, interaction, options, env) {
|
|
65
|
+
const timeoutMs = options.timeoutMs ?? LOGIN_TIMEOUT_MS;
|
|
66
|
+
const secrets = new LoginSecrets();
|
|
67
|
+
const interactionFailure = Promise.withResolvers();
|
|
68
|
+
const flow = { sent: false, lastLine: undefined };
|
|
69
|
+
let child = null;
|
|
70
|
+
try {
|
|
71
|
+
child = spawnLoginProcess(command, ["login", "--device-auth"], env, {
|
|
72
|
+
onLine(line) {
|
|
73
|
+
const url = DEVICE_URL.exec(line)?.[1];
|
|
74
|
+
const event = url === undefined ? null : deviceCode(url);
|
|
75
|
+
if (event === null) {
|
|
76
|
+
flow.lastLine = line;
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
if (flow.sent) {
|
|
80
|
+
return;
|
|
81
|
+
}
|
|
82
|
+
flow.sent = true;
|
|
83
|
+
try {
|
|
84
|
+
interaction.onEvent(event);
|
|
85
|
+
}
|
|
86
|
+
catch (error) {
|
|
87
|
+
interactionFailure.resolve({ kind: "interaction_failed", message: errorMessage(error) });
|
|
88
|
+
}
|
|
89
|
+
},
|
|
90
|
+
});
|
|
91
|
+
}
|
|
92
|
+
catch (error) {
|
|
93
|
+
return { kind: "failed", reason: "process_failed", detail: secrets.line(errorMessage(error)) };
|
|
94
|
+
}
|
|
95
|
+
const bounds = loginBounds(interaction.signal, timeoutMs);
|
|
96
|
+
try {
|
|
97
|
+
const ending = await Promise.race([
|
|
98
|
+
// oxlint-disable-next-line promise/prefer-await-to-then -- racing three endings
|
|
99
|
+
child.exited.then((exit) => ({ kind: "exit", exit })),
|
|
100
|
+
// oxlint-disable-next-line promise/prefer-await-to-then -- racing three endings
|
|
101
|
+
bounds.stopped.then((stop) => ({ kind: "stop", stop })),
|
|
102
|
+
interactionFailure.promise,
|
|
103
|
+
]);
|
|
104
|
+
if (ending.kind === "stop") {
|
|
105
|
+
child.stop();
|
|
106
|
+
await child.exited;
|
|
107
|
+
return stoppedResult(ending.stop, timeoutMs);
|
|
108
|
+
}
|
|
109
|
+
if (ending.kind === "interaction_failed") {
|
|
110
|
+
child.stop();
|
|
111
|
+
await child.exited;
|
|
112
|
+
return { kind: "failed", reason: "interaction_failed", detail: secrets.line(ending.message) };
|
|
113
|
+
}
|
|
114
|
+
const { exit } = ending;
|
|
115
|
+
if (exit.exitCode === 0 && exit.error === undefined) {
|
|
116
|
+
return await confirmed(installation, interaction.signal, options.env);
|
|
117
|
+
}
|
|
118
|
+
if (exit.error !== undefined) {
|
|
119
|
+
return { kind: "failed", reason: "process_failed", detail: secrets.line(exit.error) };
|
|
120
|
+
}
|
|
121
|
+
const how = exit.exitCode === null ? `signal ${exit.signal ?? "unknown"}` : `code ${String(exit.exitCode)}`;
|
|
122
|
+
return { kind: "failed", reason: flow.lastLine === undefined ? "process_failed" : "rejected", detail: flow.lastLine === undefined ? `grok login exited with ${how}` : secrets.line(flow.lastLine) };
|
|
123
|
+
}
|
|
124
|
+
finally {
|
|
125
|
+
bounds.dispose();
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
/**
|
|
129
|
+
* Signs Grok in with its own device-code login, relaying the code. With
|
|
130
|
+
* `openBrowser: false`, `BROWSER` names a command that does nothing, which
|
|
131
|
+
* Grok runs instead of the desktop's launcher (POSIX; Windows is refused).
|
|
132
|
+
*/
|
|
133
|
+
export async function grokLogin(installation, interaction, options = {}) {
|
|
134
|
+
const env = sessionEnvironment(options.env);
|
|
135
|
+
const target = loginExecutable(installation, "grok", undefined, env);
|
|
136
|
+
if (target.kind === "settled") {
|
|
137
|
+
return target.result;
|
|
138
|
+
}
|
|
139
|
+
if (interaction.signal?.aborted === true) {
|
|
140
|
+
return { kind: "cancelled" };
|
|
141
|
+
}
|
|
142
|
+
if (options.openBrowser === false && process.platform === "win32") {
|
|
143
|
+
return { kind: "unsupported", reason: "browser_suppression_unavailable", detail: "OAR has not verified that Grok honours BROWSER on Windows; allow local browser opening" };
|
|
144
|
+
}
|
|
145
|
+
const result = await runGrokLogin(installation, target.installation.command, interaction, options, options.openBrowser === false ? { ...env, BROWSER: "true" } : env);
|
|
146
|
+
return result;
|
|
147
|
+
}
|
|
148
|
+
/** Signs Grok out with `grok logout`; `grok models` decides. */
|
|
149
|
+
export async function grokLogout(installation, options = {}) {
|
|
150
|
+
const env = sessionEnvironment(options.env);
|
|
151
|
+
const target = loginExecutable(installation, "grok", undefined, env);
|
|
152
|
+
if (target.kind === "settled") {
|
|
153
|
+
return target.result;
|
|
154
|
+
}
|
|
155
|
+
const timeoutMs = options.timeoutMs ?? LOGOUT_TIMEOUT_MS;
|
|
156
|
+
const end = await runLogoutCommand(target.installation.command, ["logout"], env, timeoutMs);
|
|
157
|
+
if (end.kind === "not_started") {
|
|
158
|
+
return { kind: "failed", reason: "process_failed", detail: end.detail };
|
|
159
|
+
}
|
|
160
|
+
return confirmedLogout(commandLogout(end, "grok logout", timeoutMs), await readGrokAuthStatus(installation, { env: options.env }), "grok logout");
|
|
161
|
+
}
|
|
162
|
+
//# sourceMappingURL=auth.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth.js","sources":["../../../src/runtimes/grok/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,9 @@ export declare const grokRuntime: Omit<{
|
|
|
24
24
|
readonly listModels: (installation: import("../../browser.js").AvailableInstallation, options?: import("../../browser.js").ListModelsOptions | undefined) => Promise<import("../../browser.js").ListModelsResult>;
|
|
25
25
|
readonly checkUpdate: typeof grokCheckUpdate;
|
|
26
26
|
readonly upgrade: typeof grokUpgrade;
|
|
27
|
+
readonly login: (installation: import("../../browser.js").AvailableInstallation, interaction: import("../../browser.js").ProviderLoginInteraction, options?: import("../../browser.js").LoginOptions | undefined) => Promise<import("../../browser.js").LoginResult>;
|
|
28
|
+
readonly authStatus: (installation: import("../../browser.js").AvailableInstallation, options?: import("../../browser.js").AuthStatusOptions | undefined) => Promise<import("../../browser.js").AuthStatus>;
|
|
29
|
+
readonly logout: (installation: import("../../browser.js").AvailableInstallation, options?: import("../../browser.js").LogoutOptions | undefined) => Promise<import("../../browser.js").LogoutResult>;
|
|
27
30
|
readonly session: (installation: import("../../browser.js").AvailableInstallation, options: import("../../browser.js").SessionOptions, context?: import("../../browser.js").SessionOpenContext | undefined) => Promise<import("../../browser.js").Session>;
|
|
28
31
|
}, "execution" | "placement" | "session" | "withPlacement"> & import("../../contracts/runtime.js").Runtime;
|
|
29
32
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sources":["../../../src/runtimes/grok/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI3D,eAAO,MAAM,WAAW
|
|
1
|
+
{"version":3,"file":"index.d.ts","sources":["../../../src/runtimes/grok/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI3D,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0GAgCjB,CAAC"}
|
|
@@ -28,6 +28,9 @@ export const grokRuntime = defineRuntime({
|
|
|
28
28
|
}),
|
|
29
29
|
checkUpdate: grokCheckUpdate,
|
|
30
30
|
upgrade: grokUpgrade,
|
|
31
|
+
login: onFirstCall(async () => { const { grokLogin } = await import("./auth.js"); return grokLogin; }),
|
|
32
|
+
authStatus: onFirstCall(async () => { const { grokAuthStatus } = await import("./auth.js"); return grokAuthStatus; }),
|
|
33
|
+
logout: onFirstCall(async () => { const { grokLogout } = await import("./auth.js"); return grokLogout; }),
|
|
31
34
|
session: onFirstCall(async () => {
|
|
32
35
|
const { grokSession } = await import("./session.js");
|
|
33
36
|
return grokSession;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../../src/runtimes/grok/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AAEzD,MAAM,CAAC,MAAM,WAAW,GAAG,aAAa,CAAC;IACvC,EAAE,EAAE,MAAM;IACV,KAAK,EAAE,aAAa,CAAC,IAAI;IACzB,gBAAgB,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE;IAC7D,qBAAqB,EAAE,yBAAyB;IAChD,mBAAmB,EAAE,MAAM;IAC3B,MAAM,EAAE,UAAU;IAClB,UAAU,EAAE,cAAc;IAE1B,YAAY,EAAE,gBAAgB;IAC9B,WAAW,EAAE,eAAe;IAC5B,OAAO,EAAE,WAAW;IACpB,YAAY,EAAE,WAAW,CAAC,KAAK,IAAI,EAAE;QACnC,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,oBAAoB,CAAC,CAAC;QAChE,OAAO,gBAAgB,CAAC;IAC1B,CAAC,CAAC;IACF,UAAU,EAAE,WAAW,CAAC,KAAK,IAAI,EAAE;QACjC,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;QAC5D,OAAO,cAAc,CAAC;IACxB,CAAC,CAAC;IACF,WAAW,EAAE,eAAe;IAC5B,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,WAAW,CAAC,KAAK,IAAI,EAAE;QAC9B,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC;QACrD,OAAO,WAAW,CAAC;IACrB,CAAC,CAAC;CACH,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,KAAK,IAAI,EAAE;YACrG,MAAM,EAAE,uBAAuB,EAAE,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;YACxE,OAAO,uBAAuB,EAAE,CAAC;QACnC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../src/runtimes/grok/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AAEzD,MAAM,CAAC,MAAM,WAAW,GAAG,aAAa,CAAC;IACvC,EAAE,EAAE,MAAM;IACV,KAAK,EAAE,aAAa,CAAC,IAAI;IACzB,gBAAgB,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE;IAC7D,qBAAqB,EAAE,yBAAyB;IAChD,mBAAmB,EAAE,MAAM;IAC3B,MAAM,EAAE,UAAU;IAClB,UAAU,EAAE,cAAc;IAE1B,YAAY,EAAE,gBAAgB;IAC9B,WAAW,EAAE,eAAe;IAC5B,OAAO,EAAE,WAAW;IACpB,YAAY,EAAE,WAAW,CAAC,KAAK,IAAI,EAAE;QACnC,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,oBAAoB,CAAC,CAAC;QAChE,OAAO,gBAAgB,CAAC;IAC1B,CAAC,CAAC;IACF,UAAU,EAAE,WAAW,CAAC,KAAK,IAAI,EAAE;QACjC,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;QAC5D,OAAO,cAAc,CAAC;IACxB,CAAC,CAAC;IACF,WAAW,EAAE,eAAe;IAC5B,OAAO,EAAE,WAAW;IACpB,KAAK,EAAE,WAAW,CAAC,KAAK,IAAI,EAAE,GAAG,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC;IACtG,UAAU,EAAE,WAAW,CAAC,KAAK,IAAI,EAAE,GAAG,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,cAAc,CAAC,CAAC,CAAC,CAAC;IACrH,MAAM,EAAE,WAAW,CAAC,KAAK,IAAI,EAAE,GAAG,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC;IACzG,OAAO,EAAE,WAAW,CAAC,KAAK,IAAI,EAAE;QAC9B,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC;QACrD,OAAO,WAAW,CAAC;IACrB,CAAC,CAAC;CACH,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,KAAK,IAAI,EAAE;YACrG,MAAM,EAAE,uBAAuB,EAAE,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;YACxE,OAAO,uBAAuB,EAAE,CAAC;QACnC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.d.ts","sources":["../../../src/runtimes/grok/options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAIxE,eAAO,MAAM,yBAAyB,EAAE,
|
|
1
|
+
{"version":3,"file":"options.d.ts","sources":["../../../src/runtimes/grok/options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAIxE,eAAO,MAAM,yBAAyB,EAAE,qBAOvC,CAAC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
/* Declared refusals, apart from the session code so the runtime entry loads no ACP SDK until a session opens. */
|
|
2
2
|
export const grokRefusedSessionOptions = {
|
|
3
3
|
goals: "This runtime interface exposes no structured native goal controls",
|
|
4
|
-
endTurnProcessesOnAbort: "OAR has not verified reading and ending one aborted Grok turn's processes while its session stays usable",
|
|
5
4
|
userConfiguration: "grok has no verified separation of user configuration from its native login",
|
|
6
5
|
additionalDirectories: "grok ACP exposes no effective additional workspace directory setting",
|
|
7
6
|
serviceTier: "grok exposes no verified per-session service-tier setting and readback",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sources":["../../../src/runtimes/grok/options.ts"],"names":[],"mappings":"AAEA,iHAAiH;AAEjH,MAAM,CAAC,MAAM,yBAAyB,GAA0B;IAC9D,KAAK,EAAE,mEAAmE;IAC1E,
|
|
1
|
+
{"version":3,"file":"options.js","sources":["../../../src/runtimes/grok/options.ts"],"names":[],"mappings":"AAEA,iHAAiH;AAEjH,MAAM,CAAC,MAAM,yBAAyB,GAA0B;IAC9D,KAAK,EAAE,mEAAmE;IAC1E,iBAAiB,EAAE,6EAA6E;IAChG,qBAAqB,EAAE,sEAAsE;IAC7F,WAAW,EAAE,wEAAwE;IACrF,IAAI,EAAE,+CAA+C;IACrD,eAAe,EAAE,6JAA6J;CAC/K,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { AvailableInstallation } from "../../contracts/installation.js";
|
|
2
2
|
import type { AuthStatus, AuthStatusOptions } from "../../contracts/login.js";
|
|
3
|
-
|
|
3
|
+
import { type AcpAuthQuery } from "../../shared/acp/auth-query.js";
|
|
4
|
+
export type KimiAuthQuery = AcpAuthQuery;
|
|
4
5
|
/** Native authenticate only checks readiness; it never drives terminal-auth or creates a session. */
|
|
5
6
|
export declare function queryKimiAuth(command: string, method: "authenticate" | "logout", options: AuthStatusOptions & {
|
|
6
7
|
readonly signal?: AbortSignal;
|
|
@@ -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":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC9E,OAAO,EAAgB,KAAK,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAEjF,MAAM,MAAM,aAAa,GAAG,YAAY,CAAC;AAGzC,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,CAG9K;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,63 +1,10 @@
|
|
|
1
1
|
import { withQueryDeadline } from "../../shared/executable/query.js";
|
|
2
|
-
import {
|
|
3
|
-
import { startAcpProcess } from "../../shared/acp/process.js";
|
|
4
|
-
import { sessionEnvironment } from "../../shared/environment.js";
|
|
5
|
-
import { asRecord, asRecordList } from "../../shared/json.js";
|
|
6
|
-
import { loginBounds } from "../../shared/login.js";
|
|
2
|
+
import { queryAcpAuth } from "../../shared/acp/auth-query.js";
|
|
7
3
|
const SOURCE = "kimi acp authenticate";
|
|
8
4
|
/** Native authenticate only checks readiness; it never drives terminal-auth or creates a session. */
|
|
9
5
|
export async function queryKimiAuth(command, method, options) {
|
|
10
|
-
const
|
|
11
|
-
|
|
12
|
-
try {
|
|
13
|
-
runtime = startAcpProcess(command, ["acp"], client({ name: "oar" }), {
|
|
14
|
-
env: sessionEnvironment(options.env), inheritStderr: false,
|
|
15
|
-
redact: () => "Kimi authentication query failed",
|
|
16
|
-
});
|
|
17
|
-
const process = runtime;
|
|
18
|
-
const query = async () => {
|
|
19
|
-
try {
|
|
20
|
-
await process.spawned;
|
|
21
|
-
options.signal?.throwIfAborted();
|
|
22
|
-
const initialized = await process.connection.agent.request(methods.agent.initialize, {
|
|
23
|
-
protocolVersion: PROTOCOL_VERSION,
|
|
24
|
-
clientCapabilities: { fs: { readTextFile: false, writeTextFile: false }, terminal: false },
|
|
25
|
-
clientInfo: { name: "oar", version: "0.0.0" },
|
|
26
|
-
});
|
|
27
|
-
options.signal?.throwIfAborted();
|
|
28
|
-
const response = asRecord(initialized);
|
|
29
|
-
if (method === "authenticate" && !asRecordList(response?.authMethods).some((entry) => entry.id === "login")) {
|
|
30
|
-
return "unsupported";
|
|
31
|
-
}
|
|
32
|
-
if (method === "logout" && asRecord(asRecord(response?.agentCapabilities)?.auth)?.logout === undefined) {
|
|
33
|
-
return "unsupported";
|
|
34
|
-
}
|
|
35
|
-
try {
|
|
36
|
-
await process.connection.agent.request(method, method === "authenticate" ? { methodId: "login" } : {});
|
|
37
|
-
return "ok";
|
|
38
|
-
}
|
|
39
|
-
catch (error) {
|
|
40
|
-
if (error instanceof RequestError && error.code === -32_000 && method === "authenticate") {
|
|
41
|
-
return "auth_required";
|
|
42
|
-
}
|
|
43
|
-
if (error instanceof RequestError && error.code === -32_601) {
|
|
44
|
-
return "unsupported";
|
|
45
|
-
}
|
|
46
|
-
return "failed";
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
catch {
|
|
50
|
-
return "failed";
|
|
51
|
-
}
|
|
52
|
-
};
|
|
53
|
-
const timedOut = async () => { await bounds.stopped; return "timed_out"; };
|
|
54
|
-
return await Promise.race([query(), timedOut()]);
|
|
55
|
-
}
|
|
56
|
-
finally {
|
|
57
|
-
bounds.dispose();
|
|
58
|
-
runtime?.kill();
|
|
59
|
-
await runtime?.exited;
|
|
60
|
-
}
|
|
6
|
+
const result = await queryAcpAuth(command, method === "authenticate" ? { method, methodId: "login" } : { method }, "Kimi", options);
|
|
7
|
+
return result;
|
|
61
8
|
}
|
|
62
9
|
/** The auth gate reads cached material; the whole ACP startup is not declared local-only. */
|
|
63
10
|
export async function readKimiAuthStatus(installation, options = {}) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-status.js","sources":["../../../src/runtimes/kimi/auth-status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"auth-status.js","sources":["../../../src/runtimes/kimi/auth-status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAGrE,OAAO,EAAE,YAAY,EAAqB,MAAM,gCAAgC,CAAC;AAGjF,MAAM,MAAM,GAAG,uBAAuB,CAAC;AAEvC,qGAAqG;AACrG,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,OAAe,EAAE,MAAiC,EAAE,OAA8D;IACpJ,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,MAAM,KAAK,cAAc,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACpI,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,6FAA6F;AAC7F,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,YAAmC,EAAE,OAAO,GAA0D,EAAE;IAC/I,IAAI,YAAY,CAAC,GAAG,KAAK,YAAY,EAAE,CAAC;QAAC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,4CAA4C,EAAE,CAAC;IAAC,CAAC;IAC5I,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,YAAY,CAAC,OAAO,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,GAAkB,EAAE,CAAC,QAAQ,CAAC,CAAC;IACvH,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,eAAe,EAAE,CAAC;QAAC,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAAC,CAAC;IACrI,MAAM,MAAM,GAAG,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,qCAAqC;QAC3E,CAAC,CAAC,CAAC,MAAM,KAAK,aAAa,CAAC,CAAC,CAAC,0DAA0D;YACxF,CAAC,CAAC,kCAAkC,CAAC,CAAC;IACxC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AACrD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,YAAmC,EAAE,OAAO,GAAsB,EAAE;IACvG,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAa,kBAAkB,EAAE,OAAO,CAAC,SAAS,IAAI,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACnH,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,YAAY,EAAE,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QAC9E,OAAO,MAAM,CAAC;IAChB,CAAC,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,qCAAqC,EAAE,CAAC,CAAC;IACvF,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type { AuthStatusOptions } from "../../contracts/login.js";
|
|
2
|
+
/** How an ACP auth call ended: done, a typed "sign in first", not offered by this build, or not finished. */
|
|
3
|
+
export type AcpAuthQuery = "ok" | "auth_required" | "unsupported" | "timed_out" | "failed";
|
|
4
|
+
/**
|
|
5
|
+
* One ACP auth call on a fresh `<command> acp` process, killed afterwards:
|
|
6
|
+
* `authenticate {methodId}` (a readiness check where the runtime answers it
|
|
7
|
+
* from cached material; never terminal auth, never a session) or `logout`
|
|
8
|
+
* (only when `initialize` declares `agentCapabilities.auth.logout`).
|
|
9
|
+
* `name` labels the redacted failure.
|
|
10
|
+
*/
|
|
11
|
+
export declare function queryAcpAuth(command: string, call: {
|
|
12
|
+
readonly method: "authenticate";
|
|
13
|
+
readonly methodId: string;
|
|
14
|
+
} | {
|
|
15
|
+
readonly method: "logout";
|
|
16
|
+
}, name: string, options: AuthStatusOptions & {
|
|
17
|
+
readonly signal?: AbortSignal;
|
|
18
|
+
}): Promise<AcpAuthQuery>;
|
|
19
|
+
//# sourceMappingURL=auth-query.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth-query.d.ts","sources":["../../../src/shared/acp/auth-query.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAMlE,6GAA6G;AAC7G,MAAM,MAAM,YAAY,GAAG,IAAI,GAAG,eAAe,GAAG,aAAa,GAAG,WAAW,GAAG,QAAQ,CAAC;AAE3F;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE;IAAE,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAA;CAAE,EACpG,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,iBAAiB,GAAG;IAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAA;CAAE,GAC7D,OAAO,CAAC,YAAY,CAAC,CAmCvB"}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
import { client, methods, PROTOCOL_VERSION, RequestError } from "@agentclientprotocol/sdk";
|
|
2
|
+
import { sessionEnvironment } from "../environment.js";
|
|
3
|
+
import { asRecord, asRecordList } from "../json.js";
|
|
4
|
+
import { loginBounds } from "../login.js";
|
|
5
|
+
import { startAcpProcess } from "./process.js";
|
|
6
|
+
/**
|
|
7
|
+
* One ACP auth call on a fresh `<command> acp` process, killed afterwards:
|
|
8
|
+
* `authenticate {methodId}` (a readiness check where the runtime answers it
|
|
9
|
+
* from cached material; never terminal auth, never a session) or `logout`
|
|
10
|
+
* (only when `initialize` declares `agentCapabilities.auth.logout`).
|
|
11
|
+
* `name` labels the redacted failure.
|
|
12
|
+
*/
|
|
13
|
+
export async function queryAcpAuth(command, call, name, options) {
|
|
14
|
+
const bounds = loginBounds(options.signal, options.timeoutMs ?? 20_000);
|
|
15
|
+
let runtime = undefined;
|
|
16
|
+
try {
|
|
17
|
+
runtime = startAcpProcess(command, ["acp"], client({ name: "oar" }), {
|
|
18
|
+
env: sessionEnvironment(options.env), inheritStderr: false,
|
|
19
|
+
redact: () => `${name} authentication query failed`,
|
|
20
|
+
});
|
|
21
|
+
const process = runtime;
|
|
22
|
+
const query = async () => {
|
|
23
|
+
try {
|
|
24
|
+
await process.spawned;
|
|
25
|
+
options.signal?.throwIfAborted();
|
|
26
|
+
const initialized = await process.connection.agent.request(methods.agent.initialize, {
|
|
27
|
+
protocolVersion: PROTOCOL_VERSION,
|
|
28
|
+
clientCapabilities: { fs: { readTextFile: false, writeTextFile: false }, terminal: false },
|
|
29
|
+
clientInfo: { name: "oar", version: "0.0.0" },
|
|
30
|
+
});
|
|
31
|
+
options.signal?.throwIfAborted();
|
|
32
|
+
const response = asRecord(initialized);
|
|
33
|
+
if (call.method === "authenticate" && !asRecordList(response?.authMethods).some((entry) => entry.id === call.methodId)) {
|
|
34
|
+
return "unsupported";
|
|
35
|
+
}
|
|
36
|
+
if (call.method === "logout" && asRecord(asRecord(response?.agentCapabilities)?.auth)?.logout === undefined) {
|
|
37
|
+
return "unsupported";
|
|
38
|
+
}
|
|
39
|
+
try {
|
|
40
|
+
await process.connection.agent.request(call.method, call.method === "authenticate" ? { methodId: call.methodId } : {});
|
|
41
|
+
return "ok";
|
|
42
|
+
}
|
|
43
|
+
catch (error) {
|
|
44
|
+
if (error instanceof RequestError && error.code === -32_000 && call.method === "authenticate") {
|
|
45
|
+
return "auth_required";
|
|
46
|
+
}
|
|
47
|
+
if (error instanceof RequestError && error.code === -32_601) {
|
|
48
|
+
return "unsupported";
|
|
49
|
+
}
|
|
50
|
+
return "failed";
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
catch {
|
|
54
|
+
return "failed";
|
|
55
|
+
}
|
|
56
|
+
};
|
|
57
|
+
const timedOut = async () => { await bounds.stopped; return "timed_out"; };
|
|
58
|
+
return await Promise.race([query(), timedOut()]);
|
|
59
|
+
}
|
|
60
|
+
finally {
|
|
61
|
+
bounds.dispose();
|
|
62
|
+
runtime?.kill();
|
|
63
|
+
await runtime?.exited;
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
//# sourceMappingURL=auth-query.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth-query.js","sources":["../../../src/shared/acp/auth-query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAE3F,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAmB,MAAM,cAAc,CAAC;AAKhE;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,OAAe,EACf,IAAoG,EACpG,IAAY,EACZ,OAA8D;IAE9D,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,IAAI,MAAM,CAAC,CAAC;IACxE,IAAI,OAAO,GAA2B,SAAS,CAAC;IAChD,IAAI,CAAC;QACH,OAAO,GAAG,eAAe,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE;YACnE,GAAG,EAAE,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,aAAa,EAAE,KAAK;YAC1D,MAAM,EAAE,GAAG,EAAE,CAAC,GAAG,IAAI,8BAA8B;SACpD,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,OAAO,CAAC;QACxB,MAAM,KAAK,GAAG,KAAK,IAA2B,EAAE;YAC9C,IAAI,CAAC;gBACH,MAAM,OAAO,CAAC,OAAO,CAAC;gBACtB,OAAO,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC;gBACjC,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE;oBACnF,eAAe,EAAE,gBAAgB;oBACjC,kBAAkB,EAAE,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE;oBAC1F,UAAU,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE;iBAC9C,CAAC,CAAC;gBACH,OAAO,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC;gBACjC,MAAM,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;gBACvC,IAAI,IAAI,CAAC,MAAM,KAAK,cAAc,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAAC,OAAO,aAAa,CAAC;gBAAC,CAAC;gBACjJ,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ,IAAI,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,iBAAiB,CAAC,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,SAAS,EAAE,CAAC;oBAAC,OAAO,aAAa,CAAC;gBAAC,CAAC;gBACtI,IAAI,CAAC;oBACH,MAAM,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,KAAK,cAAc,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBACvH,OAAO,IAAI,CAAC;gBACd,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,IAAI,KAAK,YAAY,YAAY,IAAI,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,KAAK,cAAc,EAAE,CAAC;wBAAC,OAAO,eAAe,CAAC;oBAAC,CAAC;oBAC1H,IAAI,KAAK,YAAY,YAAY,IAAI,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;wBAAC,OAAO,aAAa,CAAC;oBAAC,CAAC;oBACtF,OAAO,QAAQ,CAAC;gBAClB,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBAAC,OAAO,QAAQ,CAAC;YAAC,CAAC;QAC9B,CAAC,CAAC;QACF,MAAM,QAAQ,GAAG,KAAK,IAA2B,EAAE,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC;QAClG,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IACnD,CAAC;YAAS,CAAC;QAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QAAC,OAAO,EAAE,IAAI,EAAE,CAAC;QAAC,MAAM,OAAO,EAAE,MAAM,CAAC;IAAC,CAAC;AACzE,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,17 @@ 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.refused();
|
|
214
|
+
}
|
|
215
|
+
return answer;
|
|
206
216
|
}),
|
|
207
217
|
rawEvents: (observer, cursor) => kernel.rawEvents(observer, cursor),
|
|
208
218
|
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":"AAAA,+IAA+I;AAC/I,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAC9F,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAavD,OAAO,EAAE,gBAAgB,EAA4B,MAAM,yBAAyB,CAAC;AACrF,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEhE,OAAO,EAAE,sBAAsB,EAA2B,MAAM,2BAA2B,CAAC;AAC5F,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EACL,eAAe,EACf,eAAe,EACf,cAAc,GAGf,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAmB,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAmB,MAAM,YAAY,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAwB,MAAM,oBAAoB,CAAC;AACjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAGzD,OAAO,EAAE,qBAAqB,EAAwB,MAAM,oBAAoB,CAAC;AAEjF;;;;;;;;;;GAUG;AAEH,MAAM,UAAU,UAAU,CAAC,OAA0B;IACnD,OAAO,sBAAsB,CAAC,KAAK,EAAE,YAAmC,EAAE,OAAuB,EAAE,WAAW,EAAoB,EAAE;QAClI,IAAI,YAAY,CAAC,GAAG,KAAK,YAAY,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;QACrE,CAAC;QACD,OAAO,CAAC,eAAe,EAAE,CAAC,OAAO,CAAC,CAAC;QACnC,yEAAyE;QACzE,sEAAsE;QACtE,2DAA2D;QAC3D,MAAM,kBAAkB,GAAG,eAAe,CAAC,OAAO,CAAC,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;QACnF,MAAM,IAAI,GAAG,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC7C,MAAM,WAAW,GAAG,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACpD,MAAM,KAAK,GAAG,qBAAqB,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACjG,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;QAClD,MAAM,MAAM,GAAG,kBAAkB,CAAC,YAAY,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;QAC7D,MAAM,OAAO,GAAe,eAAe,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;QAC7J,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;YACtE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC5C,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,KAAc,EAAE,EAAE;YACrD,OAAO,CAAC,IAAI,EAAE,CAAC;YACf,MAAM,OAAO,CAAC,MAAM,CAAC;YACrB,MAAM,YAAY,CAAC,OAAO,EAAE,CAAC;YAC7B,MAAM,OAAO,GAAG,KAAK,YAAY,QAAQ,IAAI,KAAK,CAAC,IAAI,KAAK,gBAAgB;gBAC1E,CAAC,CAAC,qBAAqB,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,WAAW,EAAE,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YAC7F,MAAM,MAAM,GAAG,oBAAoB,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,CAAC;YACnE,MAAM,kBAAkB,CAAC,oBAAoB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;QAClE,CAAC,CAAC,CAAC;QACH,OAAO,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;IACjF,CAAC,CAAC,CAAC;AACL,CAAC;AAUD,2EAA2E;AAC3E,MAAM,UAAU,gBAAgB,CAC9B,OAA0B,EAC1B,OAAuB,EACvB,WAA+B,EAC/B,OAAmB,EACnB,MAAwB,EACxB,YAA6B,EAC7B,MAAkC;IAElC,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,YAAY,CAAC;IACpF,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAEpE,IAAI,cAAc,GAAyB,IAAI,CAAC;IAChD,MAAM,YAAY,GAAG,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,MAAM,IAAI,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;IAC5H,MAAM,SAAS,GAAG,MAAM,CAAC;IACzB,IAAI,UAAU,GAA+C,IAAI,CAAC;IAClE,MAAM,KAAK,GAAG,cAAc,CAAC,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC,UAAU,EAAE,IAAI,EAAE,KAAK,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC;QAC/N,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,CAAC,OAA2B,EAAc,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,UAAU,EAAE,WAAW,CAAC,YAAY,EAAE,EAAE,CAAC;QAC7L,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAsB,EAAiB,EAAE,GAAG,SAAS,CAAC,YAAY,EAAE,CAAC,CAAC,MAAM,SAAS,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KAC1K,CAAC,CAAC;IACH,yGAAyG;IACzG,WAAW,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;YAC3G,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;YAC9B,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;gBAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;YAAC,CAAC;QACzD,CAAC,EAAE,CAAC,CAAC;IACL,6GAA6G;IAC7G,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACtB,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,uBAAuB,KAAK,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7H,MAAM,gBAAgB,GAAG,OAAO,CAAC,UAAU,CAAC;IAC5C,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;QACnC,UAAU,GAAG,gBAAgB,CAAC,MAAM,EAAE;YACpC,IAAI,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,IAAI,IAAI,KAAK,CAAC,MAAM,EAAE,IAAI,KAAK,CAAC,mBAAmB,EAAE,KAAK,IAAI;YAC7F,UAAU,EAAE,oEAAoE;YAChF,SAAS,EAAE,iBAAiB;YAC5B,QAAQ,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7D,MAAM,EAAE,GAAwB,EAAE;gBAChC,MAAM,SAAS,GAAG,gBAAgB,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC/F,IAAI,KAAK,GAAsB,IAAI,CAAC;gBACpC,MAAM,MAAM,GAAG,GAAS,EAAE,GAAG,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;oBAAC,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;oBAAC,KAAK,GAAG,IAAI,CAAC;gBAAC,CAAC,CAAC,CAAC,CAAC;gBACnG,OAAO;oBACL,OAAO,CAAC,KAAK;wBACX,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;wBACxC,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;4BAAC,MAAM,EAAE,CAAC;wBAAC,CAAC;wBAClC,OAAO,MAAM,CAAC;oBAChB,CAAC;oBACD,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK;wBACxB,KAAK,GAAG,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;wBACtC,IAAI,CAAC;4BAAC,OAAO,MAAM,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;wBAAC,CAAC;gCAC7C,CAAC;4BAAC,MAAM,EAAE,CAAC;wBAAC,CAAC;oBACvB,CAAC;iBACF,CAAC;YACJ,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IACD,MAAM,gBAAgB,GAAG,KAAK,IAAmB,EAAE;QACjD,IAAI,CAAC;YAAC,MAAM,YAAY,CAAC,OAAO,EAAE,CAAC;QAAC,CAAC;QACrC,OAAO,KAAK,EAAE,CAAC;YAAC,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QAAC,CAAC;IACxJ,CAAC,CAAC;IACF,MAAM,aAAa,GAAG,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,QAAuC,EAAgB,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;YACnL,QAAQ,CAAC,IAAI,CAAC,CAAC;YAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAAC,KAAK,gBAAgB,EAAE,CAAC;QAC1D,CAAC,CAAC,EAAE,CAAC;IACL,MAAM,SAAS,GAAG,aAAa,KAAK,SAAS,IAAI,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,uBAAuB,CAAC,MAAM,EAAE,aAAa,EAAE,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC/J,8HAA8H;IAC9H,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAAC,KAAK,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YAC/D,KAAK,gBAAgB,EAAE,CAAC;YACxB,uEAAuE;YACvE,sEAAsE;YACtE,MAAM,MAAM,GAAG,oBAAoB,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,CAAC;YACnE,MAAM,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;YAChH,KAAK,CAAC,MAAM,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;IAAC,CAAC;IAEL,qEAAqE;IACrE,uEAAuE;IACvE,wEAAwE;IACxE,qEAAqE;IACrE,wEAAwE;IACxE,sEAAsE;IACtE,0BAA0B;IAC1B,IAAI,QAAQ,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IACjC,MAAM,MAAM,GAAG,KAAK,EAAK,GAAqB,EAAc,EAAE;QAC5D,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAAC,MAAM,KAAK,GAAG,MAAM,GAAG,EAAE,CAAC;YAAC,OAAO,KAAK,CAAC;QAAC,CAAC;QACzE,MAAM,QAAQ,GAAG,QAAQ,CAAC;QAC1B,MAAM,MAAM,GAAG,CAAC,KAAK,IAAgB,EAAE,GAAG,MAAM,QAAQ,CAAC,CAAC,MAAM,KAAK,GAAG,MAAM,GAAG,EAAE,CAAC,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACxG,QAAQ,GAAG,CAAC,KAAK,IAAmB,EAAE,GAAG,IAAI,CAAC;YAAC,MAAM,MAAM,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC,CAAC,mDAAmD,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAClI,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC;QAAC,OAAO,KAAK,CAAC;IAC3C,CAAC,CAAC;IACF,MAAM,OAAO,GAAG,CACd,IAAiB,EACjB,MAAwE,EAChD,EAAE,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE;QAC7C,MAAM,mBAAmB,GAAG,KAAK,CAAC,mBAAmB,EAAE,CAAC;QACxD,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,mBAAmB,KAAK,IAAI,EAAE,CAAC;YACtF,IAAI,CAAC;gBAAC,MAAM,mBAAmB,CAAC;YAAC,CAAC;YAClC,MAAM,CAAC,CAAC,uEAAuE,CAAC,CAAC;QACnF,CAAC;QACD,IAAI,OAAO,CAAC,MAAM,IAAI,MAAM,CAAC,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC;YAAC,MAAM,OAAO,CAAC,MAAM,CAAC;QAAC,CAAC;QAC9E,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,iFAAiF;IACjF,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;IAC9C,MAAM,KAAK,GAAG,WAAW,KAAK,SAAS,IAAI,YAAY,KAAK,SAAS;QACnE,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC;YACA,KAAK,EAAE,CAAC,KAAa,EAAE,YAA2B,EAA0B,EAAE,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,EAAE,CAAC,OAAO,EAAwC,EAAE;gBAClL,IAAI,UAAU,EAAE,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;oBAAC,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,oCAAoC,EAAE,CAAC;gBAAC,CAAC;gBAC7H,yGAAyG;gBACzG,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;gBAC9B,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;oBAAC,OAAO,mBAAmB,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,MAAM,KAAK,IAAI,IAAI,KAAK,CAAC,MAAM,EAAE,KAAK,MAAM,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;gBAAC,CAAC;gBAChO,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;gBAC7B,OAAO,KAAK,KAAK,IAAI,IAAI,WAAW,KAAK,SAAS;oBAChD,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,gBAAgB,EAAE,MAAM,EAAE,+BAA+B,EAAE;oBACvF,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;YAClE,CAAC,CAAC;SACH,CAAC;IAEJ,OAAO,WAAW,CAAC,IAAI,CAAC;QACtB,EAAE,EAAE,MAAM,CAAC,SAAS;QACpB,YAAY;QACZ,MAAM,EAAE,CAAC,KAAK,EAAE,YAA2B,EAA0B,EAAE,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,EAAE,CAAC,OAAO,EAAgB,EAAE,CACpJ,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,UAAU,EAAE,IAAI,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QACvL,GAAG,KAAK;QACR,GAAG,CAAC,UAAU,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC;QAC/D,KAAK,EAAE,CAAC,KAAK,EAAE,YAA2B,EAA0B,EAAE,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAC/M,6GAA6G;QAC7G,QAAQ,EAAE,CAAC,OAAe,EAA0B,EAAE,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC5H,KAAK,EAAE,GAA2B,EAAE,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,OAAO,EAAyB,EAAE;YACvG,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;YAC7B,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBAAC,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,gBAAgB,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC;YAAC,CAAC;YACtG,MAAM,KAAK,GAAG,aAAa,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YACrD,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YACjD,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gBAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YAAC,CAAC;YACpD,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;QACF,SAAS,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;QACnE,OAAO,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE;QAC/B,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE;QAC3B,SAAS,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,IAAI,OAAO,CAAC,SAAS;QAC1D,OAAO,EAAE,GAAkB,EAAE,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE;YAC9C,IAAI,SAAS,KAAK,SAAS,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;gBACvD,SAAS,CAAC,YAAY,EAAE,CAAC;gBACzB,MAAM,QAAQ,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC;gBACrC,KAAK,CAAC,MAAM,EAAE,CAAC;gBACf,MAAM,QAAQ,CAAC;gBACf,SAAS,CAAC,MAAM,EAAE,CAAC;gBACnB,OAAO;YACT,CAAC;YACD,IAAI,cAAc,KAAK,IAAI,EAAE,CAAC;gBAC5B,OAAO,CAAC,yDAAyD;YACnE,CAAC;YACD,sEAAsE;YACtE,6DAA6D;YAC7D,MAAM,IAAI,GAAG,MAAM,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC;YAC3C,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;YAClE,IAAI,IAAI,EAAE,CAAC;gBACT,iFAAiF;gBACjF,kEAAkE;gBAClE,kEAAkE;gBAClE,iEAAiE;gBACjE,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;gBACxD,MAAM,YAAY,CAAC,OAAO,EAAE,CAAC;gBAC7B,OAAO;YACT,CAAC;YACD,8EAA8E;YAC9E,MAAM,OAAO,CAAC,eAAe,EAAE,CAAC;YAChC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;YAC7B,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;gBACtC,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC;oBAAC,OAAO,CAAC,cAAc,EAAE,CAAC;gBAAC,CAAC;gBACxD,MAAM,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC3B,CAAC;YACD,IAAI,MAAM,CAAC,aAAa,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;gBAC5C,OAAO,CAAC,cAAc,EAAE,CAAC;gBACzB,MAAM,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;YACnE,CAAC;YACD,OAAO,CAAC,IAAI,EAAE,CAAC;YACf,MAAM,OAAO,CAAC,MAAM,CAAC;YACrB,MAAM,YAAY,CAAC,OAAO,EAAE,CAAC;QAC/B,CAAC,CAAC;KACH,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AACrB,CAAC"}
|
|
@@ -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();
|