@botiverse/oar 0.99.0 → 0.101.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 +17 -17
- 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/contracts/session-options.d.ts +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-candidates.d.ts +31 -0
- package/dist/runtimes/codex/installation-candidates.d.ts.map +1 -0
- package/dist/runtimes/codex/installation-candidates.js +92 -0
- package/dist/runtimes/codex/installation-candidates.js.map +1 -0
- package/dist/runtimes/codex/installation.d.ts +1 -19
- package/dist/runtimes/codex/installation.d.ts.map +1 -1
- package/dist/runtimes/codex/installation.js +2 -49
- 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/cursor/access.d.ts +68 -0
- package/dist/runtimes/cursor/access.d.ts.map +1 -0
- package/dist/runtimes/cursor/access.js +77 -0
- package/dist/runtimes/cursor/access.js.map +1 -0
- package/dist/runtimes/cursor/auth-status.d.ts +4 -3
- package/dist/runtimes/cursor/auth-status.d.ts.map +1 -1
- package/dist/runtimes/cursor/auth-status.js +20 -18
- package/dist/runtimes/cursor/auth-status.js.map +1 -1
- package/dist/runtimes/cursor/index.d.ts +50 -10
- package/dist/runtimes/cursor/index.d.ts.map +1 -1
- package/dist/runtimes/cursor/index.js +40 -21
- package/dist/runtimes/cursor/index.js.map +1 -1
- package/dist/runtimes/cursor/installation.d.ts +1 -1
- package/dist/runtimes/cursor/installation.d.ts.map +1 -1
- package/dist/runtimes/cursor/installation.js +5 -2
- package/dist/runtimes/cursor/installation.js.map +1 -1
- package/dist/runtimes/cursor/list-models.d.ts +4 -2
- package/dist/runtimes/cursor/list-models.d.ts.map +1 -1
- package/dist/runtimes/cursor/list-models.js +31 -14
- package/dist/runtimes/cursor/list-models.js.map +1 -1
- package/dist/runtimes/cursor/login.d.ts +8 -3
- package/dist/runtimes/cursor/login.d.ts.map +1 -1
- package/dist/runtimes/cursor/login.js +29 -22
- package/dist/runtimes/cursor/login.js.map +1 -1
- package/dist/runtimes/cursor/logout.d.ts +3 -3
- package/dist/runtimes/cursor/logout.d.ts.map +1 -1
- package/dist/runtimes/cursor/logout.js +19 -18
- package/dist/runtimes/cursor/logout.js.map +1 -1
- package/dist/runtimes/cursor/model.d.ts +5 -0
- package/dist/runtimes/cursor/model.d.ts.map +1 -1
- package/dist/runtimes/cursor/model.js +10 -1
- package/dist/runtimes/cursor/model.js.map +1 -1
- package/dist/runtimes/cursor/sdk.d.ts +0 -4
- package/dist/runtimes/cursor/sdk.d.ts.map +1 -1
- package/dist/runtimes/cursor/sdk.js +5 -11
- package/dist/runtimes/cursor/sdk.js.map +1 -1
- package/dist/runtimes/cursor/session-process.d.ts +31 -0
- package/dist/runtimes/cursor/session-process.d.ts.map +1 -0
- package/dist/runtimes/cursor/session-process.js +80 -0
- package/dist/runtimes/cursor/session-process.js.map +1 -0
- package/dist/runtimes/cursor/session.d.ts +2 -2
- package/dist/runtimes/cursor/session.d.ts.map +1 -1
- package/dist/runtimes/cursor/session.js +10 -10
- package/dist/runtimes/cursor/session.js.map +1 -1
- package/dist/runtimes/cursor/subprocess/channel.d.ts +37 -0
- package/dist/runtimes/cursor/subprocess/channel.d.ts.map +1 -0
- package/dist/runtimes/cursor/subprocess/channel.js +170 -0
- package/dist/runtimes/cursor/subprocess/channel.js.map +1 -0
- package/dist/runtimes/cursor/subprocess/child-script.d.ts +12 -0
- package/dist/runtimes/cursor/subprocess/child-script.d.ts.map +1 -0
- package/dist/runtimes/cursor/subprocess/child-script.js +257 -0
- package/dist/runtimes/cursor/subprocess/child-script.js.map +1 -0
- package/dist/runtimes/cursor/subprocess/proxy.d.ts +11 -0
- package/dist/runtimes/cursor/subprocess/proxy.d.ts.map +1 -0
- package/dist/runtimes/cursor/subprocess/proxy.js +242 -0
- package/dist/runtimes/cursor/subprocess/proxy.js.map +1 -0
- package/dist/runtimes/grok/auth.d.ts.map +1 -1
- package/dist/runtimes/grok/auth.js +3 -2
- package/dist/runtimes/grok/auth.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.js +4 -1
- package/dist/shared/acp/session.js.map +1 -1
- package/dist/shared/acp/turn-terminals.d.ts +2 -1
- package/dist/shared/acp/turn-terminals.d.ts.map +1 -1
- package/dist/shared/acp/turn-terminals.js +47 -23
- package/dist/shared/acp/turn-terminals.js.map +1 -1
- package/dist/shared/executable/environment-marker.d.ts +21 -0
- package/dist/shared/executable/environment-marker.d.ts.map +1 -0
- package/dist/shared/executable/environment-marker.js +137 -0
- package/dist/shared/executable/environment-marker.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/executable/node-script.d.ts +53 -0
- package/dist/shared/executable/node-script.d.ts.map +1 -0
- package/dist/shared/executable/node-script.js +131 -0
- package/dist/shared/executable/node-script.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 +5 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"child-script.js","sources":["../../../../src/runtimes/cursor/subprocess/child-script.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACtF,OAAO,EAAE,oBAAoB,EAAE,MAAM,kDAAkD,CAAC;AACxF,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAElE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmDG;AACH,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmLxB,CAAC;AAEF;;;GAGG;AACH,SAAS,YAAY;IACnB,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QAAC,OAAO,IAAI,CAAC;IAAC,CAAC;IAClD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,GAAG,EAAE,YAAY,CAAC,IAAI,MAAM,CAAC,GAAG,CAAA,YAAY,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC;AAC5H,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,SAAiB,EAAE,GAAgC;IACnF,MAAM,MAAM,GAAG,oBAAoB,EAAE,CAAC;IACtC,MAAM,IAAI,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,EAAE,gBAAgB,CAAC,GAAG,EAAE,sBAAsB,CAAC,IAAI,IAAI,EAAE,YAAY,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC7I,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,kBAAkB,CAAC,EAAE,oBAAoB,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;AACnK,CAAC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { CursorSdk } from "../sdk.js";
|
|
2
|
+
import type { CursorChannel } from "./channel.js";
|
|
3
|
+
/**
|
|
4
|
+
* `CursorSdk` over one cursor child. `apiKey` is the `CURSOR_API_KEY` the
|
|
5
|
+
* lease took out of the child's environment: it goes to the SDK as
|
|
6
|
+
* `AgentOptions.apiKey` (create, resume) and `CursorRequestOptions.apiKey`
|
|
7
|
+
* (`Cursor.models.list`), which SDK 1.3.1 uses instead of the variable.
|
|
8
|
+
* Local `Agent.listRuns` reads the local store and takes none.
|
|
9
|
+
*/
|
|
10
|
+
export declare function proxySdk(channel: CursorChannel, apiKey?: string): CursorSdk;
|
|
11
|
+
//# sourceMappingURL=proxy.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"proxy.d.ts","sources":["../../../../src/runtimes/cursor/subprocess/proxy.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAOV,SAAS,EAIV,MAAM,WAAW,CAAC;AACnB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAgLlD;;;;;;GAMG;AACH,wBAAgB,QAAQ,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAoC3E"}
|
|
@@ -0,0 +1,242 @@
|
|
|
1
|
+
import { asRecord, asRecordList } from "../../../shared/json.js";
|
|
2
|
+
function isModelSelection(value) {
|
|
3
|
+
return typeof asRecord(value)?.id === "string";
|
|
4
|
+
}
|
|
5
|
+
function isModelList(value) {
|
|
6
|
+
return Array.isArray(value) && asRecordList(value).length === value.length
|
|
7
|
+
&& asRecordList(value).every((model) => typeof model.id === "string" && typeof model.displayName === "string");
|
|
8
|
+
}
|
|
9
|
+
function isListRunsPage(value) {
|
|
10
|
+
const page = asRecord(value);
|
|
11
|
+
return page !== null && Array.isArray(page.items) && (page.nextCursor === undefined || typeof page.nextCursor === "string");
|
|
12
|
+
}
|
|
13
|
+
function isAuthStatus(value) {
|
|
14
|
+
const status = asRecord(value)?.status;
|
|
15
|
+
return status === "logged-in" || status === "logged-out";
|
|
16
|
+
}
|
|
17
|
+
function isSteerAck(value) {
|
|
18
|
+
return value === "complete_delivered" || value === "revert_to_followup";
|
|
19
|
+
}
|
|
20
|
+
function unexpected(call) {
|
|
21
|
+
return new Error(`cursor's child process answered ${call} with a shape oar cannot read`);
|
|
22
|
+
}
|
|
23
|
+
/** The run a `send` or `summarize` call made, as the child described it. */
|
|
24
|
+
function proxyRun(channel, key, value) {
|
|
25
|
+
const described = asRecord(value);
|
|
26
|
+
if (typeof described?.runId !== "string") {
|
|
27
|
+
throw unexpected("a send");
|
|
28
|
+
}
|
|
29
|
+
const runId = described.runId;
|
|
30
|
+
const run = {
|
|
31
|
+
id: runId,
|
|
32
|
+
stream: () => proxyStream(channel, key),
|
|
33
|
+
wait: async () => { const result = await channel.call("wait", [key]); return result; },
|
|
34
|
+
cancel: async () => { await channel.call("cancel", [key]); },
|
|
35
|
+
};
|
|
36
|
+
if (described.steer !== true) {
|
|
37
|
+
return run;
|
|
38
|
+
}
|
|
39
|
+
return {
|
|
40
|
+
...run,
|
|
41
|
+
async steer(text) {
|
|
42
|
+
const ack = await channel.call("steer", [key, text]);
|
|
43
|
+
if (!isSteerAck(ack)) {
|
|
44
|
+
throw unexpected("a steer");
|
|
45
|
+
}
|
|
46
|
+
return ack;
|
|
47
|
+
},
|
|
48
|
+
};
|
|
49
|
+
}
|
|
50
|
+
/** The run's `stream()`: the child reads it and forwards each message; `return()` stops the child's reading. */
|
|
51
|
+
function proxyStream(channel, key) {
|
|
52
|
+
return {
|
|
53
|
+
[Symbol.asyncIterator]: () => {
|
|
54
|
+
const queue = [];
|
|
55
|
+
let wake = Promise.withResolvers();
|
|
56
|
+
const state = { ended: false, error: null };
|
|
57
|
+
const streaming = channel.start("stream", [key], (message) => { queue.push(message); wake.resolve(); });
|
|
58
|
+
void (async () => {
|
|
59
|
+
try {
|
|
60
|
+
await streaming.reply;
|
|
61
|
+
}
|
|
62
|
+
catch (error) {
|
|
63
|
+
state.error = error instanceof Error ? error : new Error(String(error));
|
|
64
|
+
}
|
|
65
|
+
finally {
|
|
66
|
+
state.ended = true;
|
|
67
|
+
wake.resolve();
|
|
68
|
+
}
|
|
69
|
+
})();
|
|
70
|
+
return {
|
|
71
|
+
async next() {
|
|
72
|
+
for (;;) {
|
|
73
|
+
if (queue.length > 0) {
|
|
74
|
+
return { done: false, value: queue.shift() };
|
|
75
|
+
}
|
|
76
|
+
if (state.ended) {
|
|
77
|
+
if (state.error !== null) {
|
|
78
|
+
throw state.error;
|
|
79
|
+
}
|
|
80
|
+
return { done: true, value: undefined };
|
|
81
|
+
}
|
|
82
|
+
await wake.promise;
|
|
83
|
+
wake = Promise.withResolvers();
|
|
84
|
+
}
|
|
85
|
+
},
|
|
86
|
+
async return() {
|
|
87
|
+
queue.length = 0;
|
|
88
|
+
// Not waiting for the child's reading to end: an SDK stream can queue return() behind its pending next() (run.ts).
|
|
89
|
+
if (!state.ended) {
|
|
90
|
+
try {
|
|
91
|
+
await channel.call("unstream", [streaming.id]);
|
|
92
|
+
}
|
|
93
|
+
catch { /* The child may be gone; nothing more arrives then. */ }
|
|
94
|
+
}
|
|
95
|
+
return { done: true, value: undefined };
|
|
96
|
+
},
|
|
97
|
+
};
|
|
98
|
+
},
|
|
99
|
+
};
|
|
100
|
+
}
|
|
101
|
+
async function proxyAgent(channel, opening) {
|
|
102
|
+
const key = opening.id;
|
|
103
|
+
const value = await opening.reply;
|
|
104
|
+
const described = asRecord(value);
|
|
105
|
+
if (typeof described?.agentId !== "string") {
|
|
106
|
+
throw unexpected("an open");
|
|
107
|
+
}
|
|
108
|
+
const model = isModelSelection(described.model) ? described.model : undefined;
|
|
109
|
+
const launch = async (method, args, onDelta) => {
|
|
110
|
+
const started = channel.start(method, [key, ...args], onDelta === undefined ? undefined : (update) => { onDelta({ update }); });
|
|
111
|
+
return proxyRun(channel, started.id, await started.reply);
|
|
112
|
+
};
|
|
113
|
+
const agent = {
|
|
114
|
+
agentId: described.agentId,
|
|
115
|
+
model,
|
|
116
|
+
send: async (message, options) => {
|
|
117
|
+
const run = await launch("send", [message, options.local], options.onDelta);
|
|
118
|
+
return run;
|
|
119
|
+
},
|
|
120
|
+
close() {
|
|
121
|
+
void (async () => {
|
|
122
|
+
try {
|
|
123
|
+
await channel.call("close", [key]);
|
|
124
|
+
}
|
|
125
|
+
catch { /* The child ending closes the agent with it. */ }
|
|
126
|
+
})();
|
|
127
|
+
},
|
|
128
|
+
};
|
|
129
|
+
if (described.summarize !== true) {
|
|
130
|
+
return agent;
|
|
131
|
+
}
|
|
132
|
+
return { ...agent, summarize: async () => { const run = await launch("summarize", []); return run; } };
|
|
133
|
+
}
|
|
134
|
+
/** `Cursor.auth` over the child: the login's save is decided here, and done there. */
|
|
135
|
+
function proxyAuth(channel) {
|
|
136
|
+
const auth = {
|
|
137
|
+
async login(options) {
|
|
138
|
+
const stop = () => {
|
|
139
|
+
void (async () => {
|
|
140
|
+
try {
|
|
141
|
+
await channel.call("abortLogin", []);
|
|
142
|
+
}
|
|
143
|
+
catch { /* The child may be gone. */ }
|
|
144
|
+
})();
|
|
145
|
+
};
|
|
146
|
+
options.signal.addEventListener("abort", stop, { once: true });
|
|
147
|
+
try {
|
|
148
|
+
await channel.call("login", [], (event) => {
|
|
149
|
+
const step = asRecord(event);
|
|
150
|
+
if (typeof step?.url === "string") {
|
|
151
|
+
options.onLoginUrl(step.url);
|
|
152
|
+
}
|
|
153
|
+
if (step?.save === true) {
|
|
154
|
+
void decideSave(channel, options);
|
|
155
|
+
}
|
|
156
|
+
});
|
|
157
|
+
}
|
|
158
|
+
finally {
|
|
159
|
+
options.signal.removeEventListener("abort", stop);
|
|
160
|
+
}
|
|
161
|
+
},
|
|
162
|
+
async status() {
|
|
163
|
+
const status = await channel.call("status", []);
|
|
164
|
+
if (!isAuthStatus(status)) {
|
|
165
|
+
throw unexpected("Cursor.auth.status");
|
|
166
|
+
}
|
|
167
|
+
return status;
|
|
168
|
+
},
|
|
169
|
+
};
|
|
170
|
+
if (!channel.features.logout) {
|
|
171
|
+
return auth;
|
|
172
|
+
}
|
|
173
|
+
return { ...auth, logout: async () => { await channel.call("logout", []); } };
|
|
174
|
+
}
|
|
175
|
+
/**
|
|
176
|
+
* The SDK in the child asked to save its key. The host's login store decides
|
|
177
|
+
* (login.ts): it refuses once OAR ended the login, or passes the save on to
|
|
178
|
+
* `FileCredentialStore.save`, which here tells the child to save to its own
|
|
179
|
+
* store (`commit`). The child is then told how it went.
|
|
180
|
+
*/
|
|
181
|
+
async function decideSave(channel, options) {
|
|
182
|
+
try {
|
|
183
|
+
// A placeholder: the credentials stay in the child.
|
|
184
|
+
await options.store.save({});
|
|
185
|
+
await channel.call("saved", []);
|
|
186
|
+
}
|
|
187
|
+
catch (error) {
|
|
188
|
+
try {
|
|
189
|
+
await channel.call("refused", [error instanceof Error ? error.message : String(error)]);
|
|
190
|
+
}
|
|
191
|
+
catch { /* The child is gone. */ }
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
/**
|
|
195
|
+
* `CursorSdk` over one cursor child. `apiKey` is the `CURSOR_API_KEY` the
|
|
196
|
+
* lease took out of the child's environment: it goes to the SDK as
|
|
197
|
+
* `AgentOptions.apiKey` (create, resume) and `CursorRequestOptions.apiKey`
|
|
198
|
+
* (`Cursor.models.list`), which SDK 1.3.1 uses instead of the variable.
|
|
199
|
+
* Local `Agent.listRuns` reads the local store and takes none.
|
|
200
|
+
*/
|
|
201
|
+
export function proxySdk(channel, apiKey) {
|
|
202
|
+
const keyed = (options) => (apiKey === undefined ? options : { ...options, apiKey });
|
|
203
|
+
const open = async (method, args) => {
|
|
204
|
+
const agent = await proxyAgent(channel, channel.start(method, args));
|
|
205
|
+
return agent;
|
|
206
|
+
};
|
|
207
|
+
const { features } = channel;
|
|
208
|
+
return {
|
|
209
|
+
Agent: {
|
|
210
|
+
create: async (options) => { const agent = await open("create", [keyed(options)]); return agent; },
|
|
211
|
+
resume: async (agentId, options) => { const agent = await open("resume", [agentId, keyed(options)]); return agent; },
|
|
212
|
+
async listRuns(agentId, options) {
|
|
213
|
+
const page = await channel.call("listRuns", [agentId, options]);
|
|
214
|
+
if (!isListRunsPage(page)) {
|
|
215
|
+
throw unexpected("Agent.listRuns");
|
|
216
|
+
}
|
|
217
|
+
return page;
|
|
218
|
+
},
|
|
219
|
+
},
|
|
220
|
+
Cursor: {
|
|
221
|
+
models: {
|
|
222
|
+
async list() {
|
|
223
|
+
const models = await channel.call("models", apiKey === undefined ? [] : [{ apiKey }]);
|
|
224
|
+
if (!isModelList(models)) {
|
|
225
|
+
throw unexpected("Cursor.models.list");
|
|
226
|
+
}
|
|
227
|
+
return models;
|
|
228
|
+
},
|
|
229
|
+
},
|
|
230
|
+
...(features.auth ? { auth: proxyAuth(channel) } : {}),
|
|
231
|
+
},
|
|
232
|
+
...(features.store ? {
|
|
233
|
+
FileCredentialStore: class {
|
|
234
|
+
// The argument is the login store's placeholder; the child saves what its SDK gave it.
|
|
235
|
+
async save() {
|
|
236
|
+
await channel.call("commit", []);
|
|
237
|
+
}
|
|
238
|
+
},
|
|
239
|
+
} : {}),
|
|
240
|
+
};
|
|
241
|
+
}
|
|
242
|
+
//# sourceMappingURL=proxy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"proxy.js","sources":["../../../../src/runtimes/cursor/subprocess/proxy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sources":["../../../src/runtimes/grok/auth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACtI,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AA2BjF,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,CAYtK;AAED,2DAA2D;AAC3D,wBAAsB,cAAc,CAAC,YAAY,EAAE,qBAAqB,EAAE,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,UAAU,CAAC,CAM9H;AA6DD;;;;GAIG;AACH,wBAAsB,SAAS,CAAC,YAAY,EAAE,qBAAqB,EAAE,WAAW,EAAE,wBAAwB,EAAE,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,WAAW,CAAC,CAU5J;AAED,gEAAgE;AAChE,wBAAsB,UAAU,CAAC,YAAY,EAAE,qBAAqB,EAAE,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sources":["../../../src/runtimes/grok/auth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACtI,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AA2BjF,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,CAYtK;AAED,2DAA2D;AAC3D,wBAAsB,cAAc,CAAC,YAAY,EAAE,qBAAqB,EAAE,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,UAAU,CAAC,CAM9H;AA6DD;;;;GAIG;AACH,wBAAsB,SAAS,CAAC,YAAY,EAAE,qBAAqB,EAAE,WAAW,EAAE,wBAAwB,EAAE,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,WAAW,CAAC,CAU5J;AAED,gEAAgE;AAChE,wBAAsB,UAAU,CAAC,YAAY,EAAE,qBAAqB,EAAE,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,YAAY,CAAC,CASxH"}
|
|
@@ -2,7 +2,7 @@ import { sessionEnvironment } from "../../shared/environment.js";
|
|
|
2
2
|
import { runExecutable } from "../../shared/executable/index.js";
|
|
3
3
|
import { withQueryDeadline } from "../../shared/executable/query.js";
|
|
4
4
|
import { errorMessage, LoginSecrets, loginBounds, loginExecutable, spawnLoginProcess, stoppedResult } from "../../shared/login.js";
|
|
5
|
-
import { commandLogout, confirmedLogout, runLogoutCommand } from "../../shared/logout.js";
|
|
5
|
+
import { commandLogout, confirmedLogout, runLogoutCommand, statusAfterLogout } from "../../shared/logout.js";
|
|
6
6
|
/*
|
|
7
7
|
* Grok Build's own sign-in (1.0.77, 2026-11-11; docs/runtimes/grok.md#login).
|
|
8
8
|
* `grok login --device-auth` prints `https://accounts.x.ai/oauth2/device?user_code=<CODE>`,
|
|
@@ -147,6 +147,7 @@ export async function grokLogin(installation, interaction, options = {}) {
|
|
|
147
147
|
}
|
|
148
148
|
/** Signs Grok out with `grok logout`; `grok models` decides. */
|
|
149
149
|
export async function grokLogout(installation, options = {}) {
|
|
150
|
+
const startedAt = Date.now();
|
|
150
151
|
const env = sessionEnvironment(options.env);
|
|
151
152
|
const target = loginExecutable(installation, "grok", undefined, env);
|
|
152
153
|
if (target.kind === "settled") {
|
|
@@ -157,6 +158,6 @@ export async function grokLogout(installation, options = {}) {
|
|
|
157
158
|
if (end.kind === "not_started") {
|
|
158
159
|
return { kind: "failed", reason: "process_failed", detail: end.detail };
|
|
159
160
|
}
|
|
160
|
-
return confirmedLogout(commandLogout(end, "grok logout", timeoutMs), await readGrokAuthStatus(installation, { env: options.env }), "grok logout");
|
|
161
|
+
return confirmedLogout(commandLogout(end, "grok logout", timeoutMs), await readGrokAuthStatus(installation, { env: options.env, ...statusAfterLogout(startedAt, options.timeoutMs) }), "grok logout");
|
|
161
162
|
}
|
|
162
163
|
//# sourceMappingURL=auth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sources":["../../../src/runtimes/grok/auth.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,eAAe,EAAE,iBAAiB,EAAE,aAAa,EAA4D,MAAM,uBAAuB,CAAC;AAC7L,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.js","sources":["../../../src/runtimes/grok/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logout.d.ts","sources":["../../../src/runtimes/kimi/logout.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAM5E,qFAAqF;AACrF,wBAAsB,UAAU,CAAC,YAAY,EAAE,qBAAqB,EAAE,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"logout.d.ts","sources":["../../../src/runtimes/kimi/logout.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAM5E,qFAAqF;AACrF,wBAAsB,UAAU,CAAC,YAAY,EAAE,qBAAqB,EAAE,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,YAAY,CAAC,CAUxH"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { sessionEnvironment } from "../../shared/environment.js";
|
|
2
2
|
import { loginExecutable } from "../../shared/login.js";
|
|
3
|
-
import { confirmedLogout } from "../../shared/logout.js";
|
|
3
|
+
import { confirmedLogout, statusAfterLogout } from "../../shared/logout.js";
|
|
4
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
|
+
const startedAt = Date.now();
|
|
7
8
|
const target = loginExecutable(installation, "Kimi", "2.3.3", sessionEnvironment(options.env));
|
|
8
9
|
if (target.kind === "settled") {
|
|
9
10
|
return target.result;
|
|
@@ -15,6 +16,6 @@ export async function kimiLogout(installation, options = {}) {
|
|
|
15
16
|
const native = result === "ok" ? { kind: "done" } : {
|
|
16
17
|
kind: "failed", reason: result === "timed_out" ? "timed_out" : "process_failed", detail: "Kimi ACP logout did not complete",
|
|
17
18
|
};
|
|
18
|
-
return confirmedLogout(native, await readKimiAuthStatus(installation, { env: options.env }), "kimi acp logout");
|
|
19
|
+
return confirmedLogout(native, await readKimiAuthStatus(installation, { env: options.env, ...statusAfterLogout(startedAt, options.timeoutMs) }), "kimi acp logout");
|
|
19
20
|
}
|
|
20
21
|
//# sourceMappingURL=logout.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logout.js","sources":["../../../src/runtimes/kimi/logout.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAqB,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"logout.js","sources":["../../../src/runtimes/kimi/logout.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAqB,MAAM,wBAAwB,CAAC;AAC/F,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAErE,qFAAqF;AACrF,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,YAAmC,EAAE,OAAO,GAAkB,EAAE;IAC/F,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAG,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/F,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAAC,OAAO,MAAM,CAAC,MAAM,CAAC;IAAC,CAAC;IACxD,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC;IACxJ,IAAI,MAAM,KAAK,aAAa,EAAE,CAAC;QAAC,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,EAAE,mCAAmC,EAAE,CAAC;IAAC,CAAC;IAC7I,MAAM,MAAM,GAAiB,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QAChE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,gBAAgB,EAAE,MAAM,EAAE,kCAAkC;KAC5H,CAAC;IACF,OAAO,eAAe,CAAC,MAAM,EAAE,MAAM,kBAAkB,CAAC,YAAY,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,iBAAiB,CAAC,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,iBAAiB,CAAC,CAAC;AACtK,CAAC"}
|
|
@@ -17,4 +17,6 @@ export declare const opencodeRuntime: Omit<{
|
|
|
17
17
|
readonly session: (installation: import("../../browser.js").AvailableInstallation, options: import("../../browser.js").SessionOptions, context?: import("../../browser.js").SessionOpenContext | undefined) => Promise<import("../../browser.js").Session>;
|
|
18
18
|
readonly listModels: import("../../browser.js").ModelLister;
|
|
19
19
|
}, "execution" | "placement" | "session" | "withPlacement"> & import("../../contracts/runtime.js").Runtime;
|
|
20
|
+
export { createOpencodeProviderAuth, OpencodeProviderAuthError } from "./provider-auth.js";
|
|
21
|
+
export type { OpencodeProviderAuth, OpencodeProviderAuthErrorKind, OpencodeProviderAuthOptions } from "./provider-auth.js";
|
|
20
22
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sources":["../../../src/runtimes/opencode/index.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;0GAoBxB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sources":["../../../src/runtimes/opencode/index.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;0GAoBxB,CAAC;AAEL,OAAO,EAAE,0BAA0B,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAC3F,YAAY,EAAE,oBAAoB,EAAE,6BAA6B,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../../src/runtimes/opencode/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAC1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,6BAA6B,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,MAAM,CAAC,MAAM,eAAe,GAAG,aAAa,CAAC;IAC3C,EAAE,EAAE,UAAU;IACd,KAAK,EAAE,aAAa,CAAC,QAAQ;IAC7B,qBAAqB,EAAE,6BAA6B;IACpD,mBAAmB,EAAE,MAAM;IAC3B,YAAY,EAAE,oBAAoB;IAClC,WAAW,EAAE,mBAAmB;IAChC,OAAO,EAAE,eAAe;IACxB,YAAY,EAAE,oBAAoB;IAClC,OAAO,EAAE,WAAW,CAAC,KAAK,IAAI,EAAE;QAC9B,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC;QACzD,OAAO,eAAe,CAAC;IACzB,CAAC,CAAC;IACF,UAAU,EAAE,kBAAkB;CAC/B,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE;QACjC,OAAO,EAAE,qBAAqB;QAC9B,OAAO,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,KAAK,IAAI,EAAE;YACpC,MAAM,EAAE,2BAA2B,EAAE,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;YAC5E,OAAO,2BAA2B,EAAE,CAAC;QACvC,CAAC,CAAC;KACH,EAAE,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../src/runtimes/opencode/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAC1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,6BAA6B,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,MAAM,CAAC,MAAM,eAAe,GAAG,aAAa,CAAC;IAC3C,EAAE,EAAE,UAAU;IACd,KAAK,EAAE,aAAa,CAAC,QAAQ;IAC7B,qBAAqB,EAAE,6BAA6B;IACpD,mBAAmB,EAAE,MAAM;IAC3B,YAAY,EAAE,oBAAoB;IAClC,WAAW,EAAE,mBAAmB;IAChC,OAAO,EAAE,eAAe;IACxB,YAAY,EAAE,oBAAoB;IAClC,OAAO,EAAE,WAAW,CAAC,KAAK,IAAI,EAAE;QAC9B,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC;QACzD,OAAO,eAAe,CAAC;IACzB,CAAC,CAAC;IACF,UAAU,EAAE,kBAAkB;CAC/B,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE;QACjC,OAAO,EAAE,qBAAqB;QAC9B,OAAO,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,KAAK,IAAI,EAAE;YACpC,MAAM,EAAE,2BAA2B,EAAE,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;YAC5E,OAAO,2BAA2B,EAAE,CAAC;QACvC,CAAC,CAAC;KACH,EAAE,CAAC,CAAC;AAEL,OAAO,EAAE,0BAA0B,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Why an OpenCode provider-auth operation did not complete.
|
|
3
|
+
*
|
|
4
|
+
* - `version_unsupported`: the installation is OpenCode 1; provider sign-in needs OpenCode 2 (`@opencode/cli`).
|
|
5
|
+
* - `unsupported_installation`: not a machine-installed `opencode` executable.
|
|
6
|
+
* - `startup_failed`: `opencode serve` exited or never printed its address.
|
|
7
|
+
* - `server_failed`: OpenCode's server stopped answering.
|
|
8
|
+
* - `authentication_failed`: OpenCode's server answered 401 to OAR's password (something else answered on its port, or it ignored `OPENCODE_PASSWORD`).
|
|
9
|
+
* - `timed_out`: OAR's deadline passed (startup, a request, or a sign-in the person did not finish).
|
|
10
|
+
* - `unknown_provider`: OpenCode has no integration with that id.
|
|
11
|
+
* - `method_unavailable`: the integration offers no such sign-in (no OAuth method, no key prompt, or `setApiKey` on a key that needs more answers).
|
|
12
|
+
* - `rejected`: OpenCode refused the request or reported the sign-in `failed` (`status`, `tag` and its words when it gave them).
|
|
13
|
+
* - `expired`: the sign-in attempt expired before the person finished it.
|
|
14
|
+
* - `loopback_required`: with `loopback: "refuse"`, the OAuth attempt redirects its browser to a loopback address on the machine running `opencode serve` and takes no pasted code, so only a browser on that machine can finish it; the attempt was cancelled.
|
|
15
|
+
*/
|
|
16
|
+
export type OpencodeProviderAuthErrorKind = "version_unsupported" | "unsupported_installation" | "startup_failed" | "server_failed" | "authentication_failed" | "timed_out" | "unknown_provider" | "method_unavailable" | "rejected" | "expired" | "loopback_required";
|
|
17
|
+
/** The message carries OpenCode's own words, redacted; never a key, a pasted code or a token. */
|
|
18
|
+
export declare class OpencodeProviderAuthError extends Error {
|
|
19
|
+
readonly name = "OpencodeProviderAuthError";
|
|
20
|
+
readonly kind: OpencodeProviderAuthErrorKind;
|
|
21
|
+
/** OpenCode's HTTP status, when it answered. */
|
|
22
|
+
readonly status: number | undefined;
|
|
23
|
+
constructor(kind: OpencodeProviderAuthErrorKind, message: string, status?: number);
|
|
24
|
+
}
|
|
25
|
+
//# sourceMappingURL=provider-auth-error.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider-auth-error.d.ts","sources":["../../../src/runtimes/opencode/provider-auth-error.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,MAAM,MAAM,6BAA6B,GACrC,qBAAqB,GACrB,0BAA0B,GAC1B,gBAAgB,GAChB,eAAe,GACf,uBAAuB,GACvB,WAAW,GACX,kBAAkB,GAClB,oBAAoB,GACpB,UAAU,GACV,SAAS,GACT,mBAAmB,CAAC;AAExB,iGAAiG;AACjG,qBAAa,yBAA0B,SAAQ,KAAK;IAClD,SAAkB,IAAI,+BAA+B;IACrD,QAAQ,CAAC,IAAI,EAAE,6BAA6B,CAAC;IAC7C,gDAAgD;IAChD,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAEpC,YAAY,IAAI,EAAE,6BAA6B,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAIhF;CACF"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/** The message carries OpenCode's own words, redacted; never a key, a pasted code or a token. */
|
|
2
|
+
export class OpencodeProviderAuthError extends Error {
|
|
3
|
+
name = "OpencodeProviderAuthError";
|
|
4
|
+
kind;
|
|
5
|
+
/** OpenCode's HTTP status, when it answered. */
|
|
6
|
+
status;
|
|
7
|
+
constructor(kind, message, status) {
|
|
8
|
+
super(message);
|
|
9
|
+
this.kind = kind;
|
|
10
|
+
this.status = status;
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
//# sourceMappingURL=provider-auth-error.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider-auth-error.js","sources":["../../../src/runtimes/opencode/provider-auth-error.ts"],"names":[],"mappings":"AA4BA,iGAAiG;AACjG,MAAM,OAAO,yBAA0B,SAAQ,KAAK;IAChC,IAAI,GAAG,2BAA2B,CAAC;IAC5C,IAAI,CAAgC;IAC7C,gDAAgD;IACvC,MAAM,CAAqB;IAEpC,YAAY,IAAmC,EAAE,OAAe,EAAE,MAAe;QAC/E,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;CACF"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import type { LoginProvider, ProviderAuthStatus, ProviderLoginInteraction, ProviderLoginMethod } from "../../contracts/provider-auth.js";
|
|
2
|
+
import { type OpencodeServerOptions } from "./provider-auth-server.js";
|
|
3
|
+
import type { OpencodeProviderAuth } from "./provider-auth.js";
|
|
4
|
+
export interface OpencodeFacadeOptions extends OpencodeServerOptions {
|
|
5
|
+
/** Bound for one login, the person's time included. */
|
|
6
|
+
readonly loginTimeoutMs: number;
|
|
7
|
+
/** How often a login reads its attempt's status. */
|
|
8
|
+
readonly statusPollMs: number;
|
|
9
|
+
/** Whether an OAuth attempt only a browser on the server's machine can finish is offered or refused. */
|
|
10
|
+
readonly loopback: "allow" | "refuse";
|
|
11
|
+
}
|
|
12
|
+
export declare class OpencodeProviderAuthFacade implements OpencodeProviderAuth {
|
|
13
|
+
#private;
|
|
14
|
+
private constructor();
|
|
15
|
+
/** Start OpenCode's server once to read its registry, which `loginProviders()` then serves. */
|
|
16
|
+
static create(options: OpencodeFacadeOptions): Promise<OpencodeProviderAuthFacade>;
|
|
17
|
+
listProviders(): Promise<readonly ProviderAuthStatus[]>;
|
|
18
|
+
loginProviders(): readonly LoginProvider[];
|
|
19
|
+
/** An integration OpenCode does not know is not configured, as with Pi. */
|
|
20
|
+
status(providerId: string): Promise<ProviderAuthStatus>;
|
|
21
|
+
login(providerId: string, method: ProviderLoginMethod, interaction: ProviderLoginInteraction): Promise<ProviderAuthStatus>;
|
|
22
|
+
/** Stores the key, then removes earlier credentials best effort: once the key is stored it resolves, and an earlier credential may remain. */
|
|
23
|
+
setApiKey(providerId: string, apiKey: string): Promise<void>;
|
|
24
|
+
/** Every stored credential of the integration, through OpenCode's own removal; environment variables stay. */
|
|
25
|
+
logout(providerId: string): Promise<void>;
|
|
26
|
+
close(): Promise<void>;
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=provider-auth-facade.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider-auth-facade.d.ts","sources":["../../../src/runtimes/opencode/provider-auth-facade.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,kBAAkB,EAClB,wBAAwB,EACxB,mBAAmB,EACpB,MAAM,kCAAkC,CAAC;AAO1C,OAAO,EAA8C,KAAK,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACnH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE/D,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,uDAAuD;IACvD,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,oDAAoD;IACpD,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,wGAAwG;IACxG,QAAQ,CAAC,QAAQ,EAAE,OAAO,GAAG,QAAQ,CAAC;CACvC;AAkED,qBAAa,0BAA2B,YAAW,oBAAoB;;IAKrE,OAAO,eAIN;IAED,+FAA+F;IAC/F,OAAa,MAAM,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,0BAA0B,CAAC,CASvF;IAEK,aAAa,IAAI,OAAO,CAAC,SAAS,kBAAkB,EAAE,CAAC,CAM5D;IAED,cAAc,IAAI,SAAS,aAAa,EAAE,CAEzC;IAED,2EAA2E;IACrE,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAM5D;IAEK,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,mBAAmB,EAAE,WAAW,EAAE,wBAAwB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAqB/H;IAED,8IAA8I;IACxI,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBjE;IAED,8GAA8G;IACxG,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAK9C;IAEK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAE3B;CAyBF"}
|