chivgent 1.0.1 → 1.1.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 +102 -131
- package/README.zh-CN.md +97 -824
- package/dist/agent.d.ts +16 -1
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +95 -43
- package/dist/agent.js.map +1 -1
- package/dist/auth/oauth.d.ts +51 -0
- package/dist/auth/oauth.d.ts.map +1 -0
- package/dist/auth/oauth.js +444 -0
- package/dist/auth/oauth.js.map +1 -0
- package/dist/cli-options.d.ts +8 -5
- package/dist/cli-options.d.ts.map +1 -1
- package/dist/cli-options.js +36 -3
- package/dist/cli-options.js.map +1 -1
- package/dist/cli-runtime.d.ts +9 -0
- package/dist/cli-runtime.d.ts.map +1 -1
- package/dist/cli-runtime.js +32 -6
- package/dist/cli-runtime.js.map +1 -1
- package/dist/cli.js +57 -10
- package/dist/cli.js.map +1 -1
- package/dist/context/context-manager.d.ts +21 -0
- package/dist/context/context-manager.d.ts.map +1 -1
- package/dist/context/context-manager.js +199 -35
- package/dist/context/context-manager.js.map +1 -1
- package/dist/evals/tools.d.ts.map +1 -1
- package/dist/evals/tools.js +4 -2
- package/dist/evals/tools.js.map +1 -1
- package/dist/events.d.ts +5 -0
- package/dist/events.d.ts.map +1 -1
- package/dist/events.js.map +1 -1
- package/dist/permissions.d.ts +35 -0
- package/dist/permissions.d.ts.map +1 -0
- package/dist/permissions.js +89 -0
- package/dist/permissions.js.map +1 -0
- package/dist/prompts.d.ts +1 -1
- package/dist/prompts.d.ts.map +1 -1
- package/dist/prompts.js +1 -0
- package/dist/prompts.js.map +1 -1
- package/dist/providers/client.d.ts +1 -1
- package/dist/providers/client.d.ts.map +1 -1
- package/dist/providers/client.js +19 -1
- package/dist/providers/client.js.map +1 -1
- package/dist/providers/definitions.d.ts +2 -0
- package/dist/providers/definitions.d.ts.map +1 -1
- package/dist/providers/definitions.js +3 -1
- package/dist/providers/definitions.js.map +1 -1
- package/dist/providers/interactive.d.ts +4 -0
- package/dist/providers/interactive.d.ts.map +1 -1
- package/dist/providers/interactive.js +86 -2
- package/dist/providers/interactive.js.map +1 -1
- package/dist/providers/oauth-client.d.ts +14 -0
- package/dist/providers/oauth-client.d.ts.map +1 -0
- package/dist/providers/oauth-client.js +52 -0
- package/dist/providers/oauth-client.js.map +1 -0
- package/dist/providers/openai-compatible-chat.d.ts +1 -0
- package/dist/providers/openai-compatible-chat.d.ts.map +1 -1
- package/dist/providers/openai-compatible-chat.js +1 -0
- package/dist/providers/openai-compatible-chat.js.map +1 -1
- package/dist/providers/openai.d.ts +3 -0
- package/dist/providers/openai.d.ts.map +1 -1
- package/dist/providers/openai.js +72 -10
- package/dist/providers/openai.js.map +1 -1
- package/dist/remote/repl.d.ts.map +1 -1
- package/dist/remote/repl.js +9 -0
- package/dist/remote/repl.js.map +1 -1
- package/dist/repl.d.ts +42 -1
- package/dist/repl.d.ts.map +1 -1
- package/dist/repl.js +255 -12
- package/dist/repl.js.map +1 -1
- package/dist/session-store.d.ts +22 -1
- package/dist/session-store.d.ts.map +1 -1
- package/dist/session-store.js +80 -1
- package/dist/session-store.js.map +1 -1
- package/dist/session.d.ts +19 -0
- package/dist/session.d.ts.map +1 -1
- package/dist/session.js +106 -4
- package/dist/session.js.map +1 -1
- package/dist/shell/approval.d.ts +2 -2
- package/dist/shell/approval.d.ts.map +1 -1
- package/dist/shell/approval.js +2 -2
- package/dist/shell/approval.js.map +1 -1
- package/dist/shell/docker.d.ts +2 -0
- package/dist/shell/docker.d.ts.map +1 -1
- package/dist/shell/docker.js +17 -3
- package/dist/shell/docker.js.map +1 -1
- package/dist/shell/factory.d.ts +9 -0
- package/dist/shell/factory.d.ts.map +1 -0
- package/dist/shell/factory.js +13 -0
- package/dist/shell/factory.js.map +1 -0
- package/dist/shell/local.d.ts +4 -0
- package/dist/shell/local.d.ts.map +1 -1
- package/dist/shell/local.js +16 -1
- package/dist/shell/local.js.map +1 -1
- package/dist/shell/native.d.ts +15 -0
- package/dist/shell/native.d.ts.map +1 -0
- package/dist/shell/native.js +99 -0
- package/dist/shell/native.js.map +1 -0
- package/dist/shell/types.d.ts +1 -0
- package/dist/shell/types.d.ts.map +1 -1
- package/dist/tools/bash.d.ts +19 -0
- package/dist/tools/bash.d.ts.map +1 -1
- package/dist/tools/bash.js +30 -11
- package/dist/tools/bash.js.map +1 -1
- package/dist/tools/edit-file.d.ts.map +1 -1
- package/dist/tools/edit-file.js +1 -1
- package/dist/tools/edit-file.js.map +1 -1
- package/dist/tools/parallel.d.ts +2 -0
- package/dist/tools/parallel.d.ts.map +1 -1
- package/dist/tools/parallel.js +8 -0
- package/dist/tools/parallel.js.map +1 -1
- package/dist/tools/write-file.d.ts.map +1 -1
- package/dist/tools/write-file.js +1 -1
- package/dist/tools/write-file.js.map +1 -1
- package/dist/transcript-hash.d.ts +4 -0
- package/dist/transcript-hash.d.ts.map +1 -0
- package/dist/transcript-hash.js +6 -0
- package/dist/transcript-hash.js.map +1 -0
- package/dist/tui/activity.d.ts +1 -1
- package/dist/tui/activity.d.ts.map +1 -1
- package/dist/tui/activity.js +2 -2
- package/dist/tui/activity.js.map +1 -1
- package/dist/tui/live.d.ts +2 -0
- package/dist/tui/live.d.ts.map +1 -1
- package/dist/tui/live.js +5 -0
- package/dist/tui/live.js.map +1 -1
- package/dist/workspace/paths.d.ts.map +1 -1
- package/dist/workspace/paths.js +4 -0
- package/dist/workspace/paths.js.map +1 -1
- package/dist/workspace/types.d.ts +2 -2
- package/dist/workspace/types.d.ts.map +1 -1
- package/dist/workspace/types.js.map +1 -1
- package/dist/workspace.d.ts +2 -2
- package/dist/workspace.d.ts.map +1 -1
- package/dist/workspace.js +2 -2
- package/dist/workspace.js.map +1 -1
- package/package.json +6 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/providers/client.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/providers/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ export interface ProviderClientConfig {
|
|
|
3
3
|
readonly apiKey: string;
|
|
4
4
|
readonly model: string;
|
|
5
5
|
readonly baseURL?: string;
|
|
6
|
+
readonly fetch?: typeof fetch;
|
|
6
7
|
}
|
|
7
8
|
export interface ProviderDefinition {
|
|
8
9
|
readonly id: string;
|
|
@@ -20,6 +21,7 @@ export interface ProviderDefinition {
|
|
|
20
21
|
/** True when the Provider cannot be configured without an explicit base URL. */
|
|
21
22
|
readonly requiresBaseURL: boolean;
|
|
22
23
|
createClient(config: ProviderClientConfig): LLMClient;
|
|
24
|
+
createOAuthClient?(config: ProviderClientConfig): LLMClient;
|
|
23
25
|
}
|
|
24
26
|
export declare const BUILTIN_PROVIDERS: readonly ProviderDefinition[];
|
|
25
27
|
//# sourceMappingURL=definitions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"definitions.d.ts","sourceRoot":"","sources":["../../src/providers/definitions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAK3C,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"definitions.d.ts","sourceRoot":"","sources":["../../src/providers/definitions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAK3C,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;CAC/B;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,2EAA2E;IAC3E,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,mEAAmE;IACnE,QAAQ,CAAC,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;IACzC,0EAA0E;IAC1E,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAC/B,uEAAuE;IACvE,QAAQ,CAAC,cAAc,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3C,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IACjC,6EAA6E;IAC7E,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;IAChC,gFAAgF;IAChF,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC;IAClC,YAAY,CAAC,MAAM,EAAE,oBAAoB,GAAG,SAAS,CAAC;IACtD,iBAAiB,CAAC,CAAC,MAAM,EAAE,oBAAoB,GAAG,SAAS,CAAC;CAC7D;AAmCD,eAAO,MAAM,iBAAiB,EAAE,SAAS,kBAAkB,EAsE1D,CAAC"}
|
|
@@ -17,11 +17,12 @@ function compatibleProvider(definition) {
|
|
|
17
17
|
defaultBaseURL: definition.defaultBaseURL,
|
|
18
18
|
requiresModel: definition.defaultModel === undefined,
|
|
19
19
|
requiresBaseURL: false,
|
|
20
|
-
createClient: ({ apiKey, model, baseURL }) => new OpenAICompatibleChatClient({
|
|
20
|
+
createClient: ({ apiKey, model, baseURL, fetch }) => new OpenAICompatibleChatClient({
|
|
21
21
|
apiKey,
|
|
22
22
|
model,
|
|
23
23
|
baseURL: baseURL ?? definition.defaultBaseURL,
|
|
24
24
|
continuationTag: `${definition.id}-chat`,
|
|
25
|
+
...(fetch === undefined ? {} : { fetch }),
|
|
25
26
|
}),
|
|
26
27
|
};
|
|
27
28
|
}
|
|
@@ -35,6 +36,7 @@ export const BUILTIN_PROVIDERS = [
|
|
|
35
36
|
requiresModel: false,
|
|
36
37
|
requiresBaseURL: false,
|
|
37
38
|
createClient: ({ apiKey, model }) => new OpenAIClient({ apiKey, model }),
|
|
39
|
+
createOAuthClient: ({ apiKey, model }) => new OpenAIClient({ apiKey, model, oauth: true }),
|
|
38
40
|
},
|
|
39
41
|
{
|
|
40
42
|
id: "deepseek",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/providers/definitions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/providers/definitions.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,12 +12,16 @@ export declare class InteractiveProvider implements SignIn, ProviderControl {
|
|
|
12
12
|
private active;
|
|
13
13
|
private readonly choices;
|
|
14
14
|
private ignoreStartupKey;
|
|
15
|
+
private readonly oauthModes;
|
|
15
16
|
constructor(options: CliOptions, llm: DeferredLLMClient, registry?: ProviderRegistry, environment?: NodeJS.ProcessEnv, authFile?: string);
|
|
16
17
|
get provider(): string;
|
|
17
18
|
get model(): string | undefined;
|
|
18
19
|
ready(): boolean;
|
|
19
20
|
providerIds(): readonly string[];
|
|
20
21
|
needsApiKey(): Promise<boolean>;
|
|
22
|
+
oauth(provider: "openai" | "xai", signal?: AbortSignal): Promise<string | undefined>;
|
|
23
|
+
signOut(): Promise<string | undefined>;
|
|
24
|
+
private get oauthFile();
|
|
21
25
|
unavailableMessage(): string;
|
|
22
26
|
describe(): string;
|
|
23
27
|
select(argument: string): Promise<ProviderSelection>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interactive.d.ts","sourceRoot":"","sources":["../../src/providers/interactive.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"interactive.d.ts","sourceRoot":"","sources":["../../src/providers/interactive.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAOpD,OAAO,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,EAA2B,KAAK,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAgB/E,uFAAuF;AACvF,qBAAa,mBAAoB,YAAW,MAAM,EAAE,eAAe;IAQ/D,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAV9B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA6B;IACrD,OAAO,CAAC,gBAAgB,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA+B;IAE1D,YACmB,OAAO,EAAE,UAAU,EACnB,GAAG,EAAE,iBAAiB,EACtB,QAAQ,GAAE,gBAA0C,EACpD,WAAW,GAAE,MAAM,CAAC,UAAwB,EAC7D,QAAQ,GAAE,MAAqC,EAMhD;IAED,IAAI,QAAQ,IAAI,MAAM,CAAiC;IACvD,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAA8B;IAC7D,KAAK,IAAI,OAAO,CAA2B;IAC3C,WAAW,IAAI,SAAS,MAAM,EAAE,CAAgC;IAC1D,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,CAOpC;IAEK,KAAK,CAAC,QAAQ,EAAE,QAAQ,GAAG,KAAK,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CA4BzF;IAEK,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAe3C;IAED,OAAO,KAAK,SAAS,GAA2E;IAChG,kBAAkB,IAAI,MAAM,CAO3B;IAED,QAAQ,IAAI,MAAM,CAYjB;IAEK,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAMzD;IAEK,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAM3D;IAEK,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAYhE;IAEK,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAgCxD;YAEa,SAAS;IA8CvB,OAAO,CAAC,kBAAkB;IAY1B,OAAO,CAAC,aAAa;CAMtB"}
|
|
@@ -1,9 +1,12 @@
|
|
|
1
|
+
import path from "node:path";
|
|
1
2
|
import { CredentialResolver } from "../auth/credentials.js";
|
|
2
3
|
import { EnvCredentialSource } from "../auth/env-credentials.js";
|
|
3
4
|
import { defaultAuthFile, FileCredentialSource, writeApiKey } from "../auth/file-credentials.js";
|
|
4
5
|
import { RuntimeCredentialSource } from "../auth/runtime-credentials.js";
|
|
6
|
+
import { removeOAuthCredential, signInOpenAI, signInXAI, revokeOAuthCredential, readOAuthCredentials } from "../auth/oauth.js";
|
|
5
7
|
import { createConfiguredClient } from "./client.js";
|
|
6
8
|
import { DeferredLLMClient } from "./deferred-client.js";
|
|
9
|
+
import { OAuthRefreshingLLMClient } from "./oauth-client.js";
|
|
7
10
|
import { defaultProviderRegistry } from "./registry.js";
|
|
8
11
|
function firstValue(environment, names) {
|
|
9
12
|
for (const name of names) {
|
|
@@ -23,6 +26,7 @@ export class InteractiveProvider {
|
|
|
23
26
|
active;
|
|
24
27
|
choices = new Map();
|
|
25
28
|
ignoreStartupKey = false;
|
|
29
|
+
oauthModes = new Set();
|
|
26
30
|
constructor(options, llm, registry = defaultProviderRegistry, environment = process.env, authFile = defaultAuthFile(environment)) {
|
|
27
31
|
this.options = options;
|
|
28
32
|
this.llm = llm;
|
|
@@ -38,8 +42,74 @@ export class InteractiveProvider {
|
|
|
38
42
|
ready() { return this.llm.ready; }
|
|
39
43
|
providerIds() { return this.registry.ids(); }
|
|
40
44
|
async needsApiKey() {
|
|
41
|
-
|
|
45
|
+
if ((await this.credentialResolver(this.active.provider).resolve(this.registry.get(this.active.provider))) !== undefined)
|
|
46
|
+
return false;
|
|
47
|
+
if ((this.active.provider === "openai" || this.active.provider === "xai") && this.active.model !== undefined) {
|
|
48
|
+
const saved = (await readOAuthCredentials(this.oauthFile)).find((item) => item.provider === this.active.provider);
|
|
49
|
+
if (saved && (this.active.provider !== "xai" || this.active.baseURL === undefined || this.active.baseURL === "https://api.x.ai/v1"))
|
|
50
|
+
return false;
|
|
51
|
+
}
|
|
52
|
+
return true;
|
|
53
|
+
}
|
|
54
|
+
async oauth(provider, signal) {
|
|
55
|
+
if (this.active.provider !== provider)
|
|
56
|
+
return `Select ${provider} with /provider ${provider} before signing in.\n`;
|
|
57
|
+
if (this.active.model === undefined)
|
|
58
|
+
return `Set a model first with /model MODEL before signing in to ${provider}.\n`;
|
|
59
|
+
if (provider === "xai" && this.active.baseURL !== undefined && this.active.baseURL !== "https://api.x.ai/v1") {
|
|
60
|
+
return "xAI subscription OAuth cannot be used with a custom endpoint.\n";
|
|
61
|
+
}
|
|
62
|
+
try {
|
|
63
|
+
if (provider === "openai")
|
|
64
|
+
await signInOpenAI({ appName: "Chivgent", file: this.oauthFile, signal });
|
|
65
|
+
else
|
|
66
|
+
await signInXAI({ file: this.oauthFile, write: (text) => process.stderr.write(text), signal });
|
|
67
|
+
let model = this.active.model;
|
|
68
|
+
if (provider === "openai") {
|
|
69
|
+
const credential = (await readOAuthCredentials(this.oauthFile)).find((item) => item.provider === provider);
|
|
70
|
+
if (!credential)
|
|
71
|
+
return "OAuth credential was not saved. Sign in again.\n";
|
|
72
|
+
const response = await fetch("https://api.openai.com/v1/models", { headers: { authorization: `Bearer ${credential.accessToken}` }, redirect: "error", signal: AbortSignal.timeout(15_000) });
|
|
73
|
+
if (!response.ok)
|
|
74
|
+
throw new Error(`Could not load ChatGPT plan models (${response.status}).`);
|
|
75
|
+
const body = await response.json();
|
|
76
|
+
const available = body.models?.filter((item) => item.visibility === "list" && typeof item.slug === "string").map((item) => item.slug) ?? [];
|
|
77
|
+
if (!available.length)
|
|
78
|
+
throw new Error("The signed-in ChatGPT account returned no available models.");
|
|
79
|
+
if (!available.includes(model ?? ""))
|
|
80
|
+
model = available[0];
|
|
81
|
+
this.active = { ...this.active, model };
|
|
82
|
+
this.choices.set(provider, this.active);
|
|
83
|
+
}
|
|
84
|
+
this.oauthModes.add(provider);
|
|
85
|
+
this.llm.set(new OAuthRefreshingLLMClient(provider, model ?? "", this.oauthFile));
|
|
86
|
+
return undefined;
|
|
87
|
+
}
|
|
88
|
+
catch (error) {
|
|
89
|
+
return `${error instanceof Error ? error.message : "OAuth sign-in failed."}\n`;
|
|
90
|
+
}
|
|
42
91
|
}
|
|
92
|
+
async signOut() {
|
|
93
|
+
const provider = this.active.provider;
|
|
94
|
+
if (provider !== "openai" && provider !== "xai")
|
|
95
|
+
return `No OAuth subscription is active for ${provider}.`;
|
|
96
|
+
try {
|
|
97
|
+
const saved = (await readOAuthCredentials(this.oauthFile)).find((item) => item.provider === provider);
|
|
98
|
+
const revoked = saved === undefined ? true : await revokeOAuthCredential(saved);
|
|
99
|
+
await removeOAuthCredential(provider, this.oauthFile);
|
|
100
|
+
this.oauthModes.delete(provider);
|
|
101
|
+
const replacement = await createConfiguredClient(this.clientOptions(this.active), this.registry, this.credentialResolver(provider), this.oauthFile);
|
|
102
|
+
if (typeof replacement !== "string")
|
|
103
|
+
this.llm.set(replacement);
|
|
104
|
+
else
|
|
105
|
+
this.llm.clear(replacement);
|
|
106
|
+
return revoked ? `Signed out of ${provider} subscription.` : `Signed out locally; remote revocation was not confirmed. Disconnect this app in the provider's account settings.`;
|
|
107
|
+
}
|
|
108
|
+
catch (error) {
|
|
109
|
+
return error instanceof Error ? error.message : "Could not sign out.";
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
get oauthFile() { return path.join(path.dirname(this.authFile), "oauth.json"); }
|
|
43
113
|
unavailableMessage() {
|
|
44
114
|
const definition = this.registry.get(this.active.provider);
|
|
45
115
|
const missing = [this.active.model === undefined ? "/model MODEL" : undefined,
|
|
@@ -99,8 +169,11 @@ export class InteractiveProvider {
|
|
|
99
169
|
catch (error) {
|
|
100
170
|
return error instanceof Error ? error.message : String(error);
|
|
101
171
|
}
|
|
172
|
+
if (this.active.provider === "openai" || this.active.provider === "xai")
|
|
173
|
+
this.oauthModes.delete(this.active.provider);
|
|
102
174
|
if (this.active.provider === this.options.provider)
|
|
103
175
|
this.ignoreStartupKey = true;
|
|
176
|
+
this.llm.clear(`Configure ${this.active.provider} before using its API key.`);
|
|
104
177
|
return undefined;
|
|
105
178
|
}
|
|
106
179
|
const nextOptions = this.clientOptions(this.active, apiKey);
|
|
@@ -121,6 +194,8 @@ export class InteractiveProvider {
|
|
|
121
194
|
catch (error) {
|
|
122
195
|
return error instanceof Error ? error.message : String(error);
|
|
123
196
|
}
|
|
197
|
+
if (this.active.provider === "openai" || this.active.provider === "xai")
|
|
198
|
+
this.oauthModes.delete(this.active.provider);
|
|
124
199
|
if (this.active.provider === this.options.provider)
|
|
125
200
|
this.ignoreStartupKey = true;
|
|
126
201
|
this.llm.set(client);
|
|
@@ -142,9 +217,18 @@ export class InteractiveProvider {
|
|
|
142
217
|
this.llm.clear(`Configure ${id} with ${missing}.`);
|
|
143
218
|
return { ok: true, message: `Selected ${id}. Set ${missing} to continue.\n` };
|
|
144
219
|
}
|
|
220
|
+
if ((id === "openai" || id === "xai") && this.oauthModes.has(id)) {
|
|
221
|
+
if (id === "xai" && baseURL !== undefined && baseURL !== "https://api.x.ai/v1") {
|
|
222
|
+
return { ok: false, message: "xAI subscription OAuth cannot be used with a custom endpoint.\n" };
|
|
223
|
+
}
|
|
224
|
+
this.active = choice;
|
|
225
|
+
this.choices.set(id, choice);
|
|
226
|
+
this.llm.set(new OAuthRefreshingLLMClient(id, model, this.oauthFile));
|
|
227
|
+
return { ok: true, message: `Selected ${id} subscription / ${model}.\n` };
|
|
228
|
+
}
|
|
145
229
|
let client;
|
|
146
230
|
try {
|
|
147
|
-
client = await createConfiguredClient(this.clientOptions(choice), this.registry, this.credentialResolver(id));
|
|
231
|
+
client = await createConfiguredClient(this.clientOptions(choice), this.registry, this.credentialResolver(id), this.oauthFile);
|
|
148
232
|
}
|
|
149
233
|
catch (error) {
|
|
150
234
|
const message = error instanceof Error ? error.message : String(error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interactive.js","sourceRoot":"","sources":["../../src/providers/interactive.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"interactive.js","sourceRoot":"","sources":["../../src/providers/interactive.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AACjG,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,SAAS,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAE/H,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAyB,MAAM,eAAe,CAAC;AAQ/E,SAAS,UAAU,CAAC,WAA8B,EAAE,KAAwB;IAC1E,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,KAAK,CAAC;IAC5D,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,uFAAuF;AACvF,MAAM,OAAO,mBAAmB;IAQX,OAAO;IACP,GAAG;IACH,QAAQ;IACR,WAAW;IAVrB,QAAQ,CAAS;IAClB,MAAM,CAAS;IACN,OAAO,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC7C,gBAAgB,GAAG,KAAK,CAAC;IAChB,UAAU,GAAG,IAAI,GAAG,EAAoB,CAAC;IAE1D,YACmB,OAAmB,EACnB,GAAsB,EACtB,QAAQ,GAAqB,uBAAuB,EACpD,WAAW,GAAsB,OAAO,CAAC,GAAG,EAC7D,QAAQ,GAAW,eAAe,CAAC,WAAW,CAAC;uBAJ9B,OAAO;mBACP,GAAG;wBACH,QAAQ;2BACR,WAAW;QAG5B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC;YAC1G,GAAG,CAAC,OAAO,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;QAC3E,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAClD,CAAC;IAED,IAAI,QAAQ,KAAa,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IACvD,IAAI,KAAK,KAAyB,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7D,KAAK,KAAc,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3C,WAAW,KAAwB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IAChE,KAAK,CAAC,WAAW;QACf,IAAI,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,SAAS;YAAE,OAAO,KAAK,CAAC;QACvI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YAC7G,MAAM,KAAK,GAAG,CAAC,MAAM,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAClH,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,KAAK,qBAAqB,CAAC;gBAAE,OAAO,KAAK,CAAC;QACpJ,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,QAA0B,EAAE,MAAoB;QAC1D,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,QAAQ;YAAE,OAAO,UAAU,QAAQ,mBAAmB,QAAQ,uBAAuB,CAAC;QACnH,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,SAAS;YAAE,OAAO,4DAA4D,QAAQ,KAAK,CAAC;QACtH,IAAI,QAAQ,KAAK,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,KAAK,qBAAqB,EAAE,CAAC;YAC7G,OAAO,iEAAiE,CAAC;QAC3E,CAAC;QACD,IAAI,CAAC;YACH,IAAI,QAAQ,KAAK,QAAQ;gBAAE,MAAM,YAAY,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;;gBAChG,MAAM,SAAS,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;YACpG,IAAI,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;YAC9B,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;gBAC1B,MAAM,UAAU,GAAG,CAAC,MAAM,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;gBAC3G,IAAI,CAAC,UAAU;oBAAE,OAAO,kDAAkD,CAAC;gBAC3E,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,kCAAkC,EAAE,EAAE,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,UAAU,CAAC,WAAW,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAC7L,IAAI,CAAC,QAAQ,CAAC,EAAE;oBAAE,MAAM,IAAI,KAAK,CAAC,uCAAuC,QAAQ,CAAC,MAAM,IAAI,CAAC,CAAC;gBAC9F,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAgE,CAAC;gBACjG,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,KAAK,MAAM,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAc,CAAC,IAAI,EAAE,CAAC;gBACtJ,IAAI,CAAC,SAAS,CAAC,MAAM;oBAAE,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;gBACtG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC;oBAAE,KAAK,GAAG,SAAS,CAAC,CAAC,CAAE,CAAC;gBAC5D,IAAI,CAAC,MAAM,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC;gBACxC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAC1C,CAAC;YACD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC9B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,wBAAwB,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;YAClF,OAAO,SAAS,CAAC;QACnB,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,uBAAuB,IAAI,CAAC;QACjF,CAAC;IACH,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;QACtC,IAAI,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,KAAK;YAAE,OAAO,uCAAuC,QAAQ,GAAG,CAAC;QAC3G,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,CAAC,MAAM,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;YACtG,MAAM,OAAO,GAAG,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,qBAAqB,CAAC,KAAK,CAAC,CAAC;YAChF,MAAM,qBAAqB,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YACtD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACjC,MAAM,WAAW,GAAG,MAAM,sBAAsB,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YACpJ,IAAI,OAAO,WAAW,KAAK,QAAQ;gBAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;;gBAC1D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YACjC,OAAO,OAAO,CAAC,CAAC,CAAC,iBAAiB,QAAQ,gBAAgB,CAAC,CAAC,CAAC,kHAAkH,CAAC;QAClL,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,OAAO,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,qBAAqB,CAAC;QACxE,CAAC;IACH,CAAC;IAED,IAAY,SAAS,KAAa,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;IAChG,kBAAkB;QAChB,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC3D,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS;YAC3E,UAAU,CAAC,eAAe,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC;aAC7F,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACjC,OAAO,OAAO,CAAC,CAAC,CAAC,aAAa,IAAI,CAAC,MAAM,CAAC,QAAQ,SAAS,OAAO,GAAG;YACnE,CAAC,CAAC,kBAAkB,IAAI,CAAC,MAAM,CAAC,QAAQ,0CAA0C,CAAC;IACvF,CAAC;IAED,QAAQ;QACN,MAAM,OAAO,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,cAAc,EAAE,CAAC;QACnF,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;YAC7C,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACzC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,KAAK,IAAI,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,YAAY,CAAC;mBAC7F,UAAU,CAAC,YAAY,IAAI,gBAAgB,CAAC;YACjD,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,cAAc,CAAC;mBACzG,UAAU,CAAC,cAAc,CAAC;YAC/B,MAAM,GAAG,GAAG,UAAU,CAAC,eAAe,IAAI,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,EAAE,CAAC;YACnG,OAAO,KAAK,EAAE,KAAK,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,KAAK,GAAG,GAAG,EAAE,CAAC;QACvF,CAAC,CAAC,CAAC;QACH,OAAO,YAAY,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,+HAA+H,CAAC;IACrO,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,QAAgB;QAC3B,MAAM,EAAE,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YAC3B,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,iEAAiE,EAAE,CAAC;QACnG,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAa;QAC7B,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;QAC3B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3C,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,oCAAoC,EAAE,CAAC;QACtE,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC1E,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAAe;QAClC,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;QAC7B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,eAAe,EAAE,CAAC;YAC7D,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,oFAAoF,EAAE,CAAC;QACtH,CAAC;QACD,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;YAC3B,IAAI,GAAG,CAAC,QAAQ,KAAK,OAAO,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ;gBAAE,MAAM,IAAI,KAAK,EAAE,CAAC;QAC/E,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,kDAAkD,EAAE,CAAC;QACpF,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,MAAc;QACzB,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC3D,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,SAAS,IAAI,CAAC,UAAU,CAAC,eAAe,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,KAAK,SAAS,CAAC,EAAE,CAAC;YACzG,IAAI,CAAC;gBACH,MAAM,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YACjE,CAAC;YAAC,OAAO,KAAc,EAAE,CAAC;gBACxB,OAAO,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAChE,CAAC;YACD,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,KAAK;gBAAE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACtH,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,IAAI,CAAC,OAAO,CAAC,QAAQ;gBAAE,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;YACjF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,aAAa,IAAI,CAAC,MAAM,CAAC,QAAQ,4BAA4B,CAAC,CAAC;YAC9E,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC5D,IAAI,MAAM,CAAC;QACX,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,sBAAsB,CAAC,WAAW,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,kBAAkB,CAAC;gBACvF,IAAI,uBAAuB,CAAC,MAAM,CAAC;aACpC,CAAC,CAAC,CAAC;QACN,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,OAAO,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAChE,CAAC;QACD,IAAI,OAAO,MAAM,KAAK,QAAQ;YAAE,OAAO,MAAM,CAAC;QAC9C,IAAI,CAAC;YACH,MAAM,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QACjE,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,OAAO,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAChE,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,KAAK;YAAE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACtH,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,IAAI,CAAC,OAAO,CAAC,QAAQ;YAAE,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QACjF,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACrB,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,KAAK,CAAC,SAAS,CAAC,EAAU,EAAE,cAAuB,EAAE,gBAAyB;QACpF,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACtC,MAAM,KAAK,GAAG,cAAc,IAAI,QAAQ,EAAE,KAAK,IAAI,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,YAAY,CAAC;eACnG,UAAU,CAAC,YAAY,CAAC;QAC7B,MAAM,OAAO,GAAG,gBAAgB,IAAI,QAAQ,EAAE,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,cAAc,CAAC;eAC3G,UAAU,CAAC,cAAc,CAAC;QAC/B,MAAM,MAAM,GAAW,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;QAC9F,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,UAAU,CAAC,eAAe,IAAI,OAAO,KAAK,SAAS,CAAC,EAAE,CAAC;YACjF,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;YACrB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;YAC7B,MAAM,OAAO,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS;gBAC/D,UAAU,CAAC,eAAe,IAAI,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACnH,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,aAAa,EAAE,SAAS,OAAO,GAAG,CAAC,CAAC;YACnD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,OAAO,iBAAiB,EAAE,CAAC;QAChF,CAAC;QACD,IAAI,CAAC,EAAE,KAAK,QAAQ,IAAI,EAAE,KAAK,KAAK,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YACjE,IAAI,EAAE,KAAK,KAAK,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,qBAAqB,EAAE,CAAC;gBAC/E,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,iEAAiE,EAAE,CAAC;YACnG,CAAC;YACD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;YACrB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;YAC7B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,wBAAwB,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;YACtE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,mBAAmB,KAAK,KAAK,EAAE,CAAC;QAC5E,CAAC;QACD,IAAI,MAAM,CAAC;QACX,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,sBAAsB,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAChI,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACvE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,OAAO,IAAI,EAAE,CAAC;QACxE,CAAC;QACD,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,kBAAkB,EAAE,GAAG,CAAC,EAAE,CAAC;YAC9E,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,MAAM,IAAI,EAAE,CAAC;QACvE,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QAC7B,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC/B,MAAM,QAAQ,GAAG,sBAAsB,EAAE,GAAG,CAAC;YAC7C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACzB,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,KAAK,KAAK,QAAQ,IAAI,EAAE,CAAC;QAC3E,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACrB,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,KAAK,iCAAiC,EAAE,CAAC;IAC3F,CAAC;IAEO,kBAAkB,CAAC,EAAU;QACnC,wEAAwE;QACxE,MAAM,qBAAqB,GAAG,EAAE,KAAK,mBAAmB,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,KAAK,EAAE;YACtF,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,WAAW,EAAE,cAAc,EAAE,SAAS,EAAE;YACpD,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC;QACrB,OAAO,IAAI,kBAAkB,CAAC;YAC5B,IAAI,uBAAuB,CAAC,EAAE,KAAK,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;YACrH,IAAI,mBAAmB,CAAC,qBAAqB,CAAC;YAC9C,IAAI,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC;SACxC,CAAC,CAAC;IACL,CAAC;IAEO,aAAa,CAAC,MAAc,EAAE,MAAe;QACnD,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QAClG,OAAO,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;YACzG,GAAG,CAAC,MAAM,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC;YACpE,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;IAClD,CAAC;CACF"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import type { LLMClient, LLMRequest, LLMResponse, LLMStreamHandlers } from "../llm.js";
|
|
2
|
+
import { type OAuthCredential } from "../auth/oauth.js";
|
|
3
|
+
/** Resolves rotating bearer tokens before every request, including long sessions. */
|
|
4
|
+
export declare class OAuthRefreshingLLMClient implements LLMClient {
|
|
5
|
+
private readonly provider;
|
|
6
|
+
private readonly model;
|
|
7
|
+
private readonly file?;
|
|
8
|
+
constructor(provider: OAuthCredential["provider"], model: string, file?: string | undefined);
|
|
9
|
+
private current;
|
|
10
|
+
complete(request: LLMRequest): Promise<LLMResponse>;
|
|
11
|
+
stream(request: LLMRequest, handlers: LLMStreamHandlers): Promise<LLMResponse>;
|
|
12
|
+
cancel(): void;
|
|
13
|
+
}
|
|
14
|
+
//# sourceMappingURL=oauth-client.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauth-client.d.ts","sourceRoot":"","sources":["../../src/providers/oauth-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AACvF,OAAO,EAA+B,KAAK,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAIrF,qFAAqF;AACrF,qBAAa,wBAAyB,YAAW,SAAS;IAC5C,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAA+B,OAAO,CAAC,QAAQ,CAAC,KAAK;IAAU,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;IAA1H,YAA6B,QAAQ,EAAE,eAAe,CAAC,UAAU,CAAC,EAAmB,KAAK,EAAE,MAAM,EAAmB,IAAI,CAAC,EAAE,MAAM,YAAA,EAAI;YAExH,OAAO;IAYf,QAAQ,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,CAIxD;IACK,MAAM,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,iBAAiB,GAAG,OAAO,CAAC,WAAW,CAAC,CAKnF;IACD,MAAM,IAAI,IAAI,CAA0E;CACzF"}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
import { refreshSavedOAuthCredential } from "../auth/oauth.js";
|
|
2
|
+
import { defaultProviderRegistry } from "./registry.js";
|
|
3
|
+
import { oauthApiFetch } from "../auth/oauth.js";
|
|
4
|
+
/** Resolves rotating bearer tokens before every request, including long sessions. */
|
|
5
|
+
export class OAuthRefreshingLLMClient {
|
|
6
|
+
provider;
|
|
7
|
+
model;
|
|
8
|
+
file;
|
|
9
|
+
constructor(provider, model, file) {
|
|
10
|
+
this.provider = provider;
|
|
11
|
+
this.model = model;
|
|
12
|
+
this.file = file;
|
|
13
|
+
}
|
|
14
|
+
async current(signal) {
|
|
15
|
+
const credential = await refreshSavedOAuthCredential(this.provider, this.file, fetch, signal);
|
|
16
|
+
if (!credential)
|
|
17
|
+
throw new Error(`No ${this.provider} OAuth session is saved. Run /login oauth ${this.provider}.`);
|
|
18
|
+
if (this.provider === "openai") {
|
|
19
|
+
const definition = defaultProviderRegistry.get("openai");
|
|
20
|
+
if (!definition.createOAuthClient)
|
|
21
|
+
throw new Error("OpenAI subscription OAuth is not configured.");
|
|
22
|
+
return definition.createOAuthClient({ apiKey: credential.accessToken, model: this.model });
|
|
23
|
+
}
|
|
24
|
+
return defaultProviderRegistry.get("xai").createClient({ apiKey: credential.accessToken, model: this.model,
|
|
25
|
+
baseURL: "https://api.x.ai/v1", fetch: oauthApiFetch("https://api.x.ai") });
|
|
26
|
+
}
|
|
27
|
+
async complete(request) {
|
|
28
|
+
const client = await this.current(request.signal);
|
|
29
|
+
try {
|
|
30
|
+
return await client.complete(request);
|
|
31
|
+
}
|
|
32
|
+
catch (error) {
|
|
33
|
+
throw safeOAuthRequestError(error, request.signal);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
async stream(request, handlers) {
|
|
37
|
+
const client = await this.current(request.signal);
|
|
38
|
+
try {
|
|
39
|
+
return client.stream ? await client.stream(request, handlers) : await client.complete(request);
|
|
40
|
+
}
|
|
41
|
+
catch (error) {
|
|
42
|
+
throw safeOAuthRequestError(error, request.signal);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
cancel() { }
|
|
46
|
+
}
|
|
47
|
+
function safeOAuthRequestError(_error, signal) {
|
|
48
|
+
return signal?.aborted
|
|
49
|
+
? new Error("OAuth provider request was cancelled.")
|
|
50
|
+
: new Error("OAuth provider request failed. Check the provider session and network, then retry.");
|
|
51
|
+
}
|
|
52
|
+
//# sourceMappingURL=oauth-client.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauth-client.js","sourceRoot":"","sources":["../../src/providers/oauth-client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAwB,MAAM,kBAAkB,CAAC;AACrF,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,qFAAqF;AACrF,MAAM,OAAO,wBAAwB;IACN,QAAQ;IAAgD,KAAK;IAA2B,IAAI;IAAzH,YAA6B,QAAqC,EAAmB,KAAa,EAAmB,IAAa;wBAArG,QAAQ;qBAAgD,KAAK;oBAA2B,IAAI;IAAY,CAAC;IAE9H,KAAK,CAAC,OAAO,CAAC,MAAoB;QACxC,MAAM,UAAU,GAAG,MAAM,2BAA2B,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QAC9F,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,QAAQ,6CAA6C,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;QACnH,IAAI,IAAI,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC/B,MAAM,UAAU,GAAG,uBAAuB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACzD,IAAI,CAAC,UAAU,CAAC,iBAAiB;gBAAE,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;YACnG,OAAO,UAAU,CAAC,iBAAiB,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QAC7F,CAAC;QACD,OAAO,uBAAuB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK;YACxG,OAAO,EAAE,qBAAqB,EAAE,KAAK,EAAE,aAAa,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;IAChF,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAmB;QAChC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAClD,IAAI,CAAC;YAAC,OAAO,MAAM,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAAC,CAAC;QAC9C,OAAO,KAAK,EAAE,CAAC;YAAC,MAAM,qBAAqB,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAAC,CAAC;IACvE,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,OAAmB,EAAE,QAA2B;QAC3D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAClD,IAAI,CAAC;YACH,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACjG,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAAC,MAAM,qBAAqB,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAAC,CAAC;IACzE,CAAC;IACD,MAAM,KAAiF,CAAC;CACzF;AAED,SAAS,qBAAqB,CAAC,MAAe,EAAE,MAAoB;IAClE,OAAO,MAAM,EAAE,OAAO;QACpB,CAAC,CAAC,IAAI,KAAK,CAAC,uCAAuC,CAAC;QACpD,CAAC,CAAC,IAAI,KAAK,CAAC,oFAAoF,CAAC,CAAC;AACtG,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-compatible-chat.d.ts","sourceRoot":"","sources":["../../src/providers/openai-compatible-chat.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAW5B,OAAO,KAAK,EACV,SAAS,EACT,UAAU,EACV,WAAW,EACX,iBAAiB,EAClB,MAAM,WAAW,CAAC;AA2BnB,MAAM,WAAW,iCAAiC;IAChD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"openai-compatible-chat.d.ts","sourceRoot":"","sources":["../../src/providers/openai-compatible-chat.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAW5B,OAAO,KAAK,EACV,SAAS,EACT,UAAU,EACV,WAAW,EACX,iBAAiB,EAClB,MAAM,WAAW,CAAC;AA2BnB,MAAM,WAAW,iCAAiC;IAChD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;CAC/B;AAED;;;GAGG;AACH,qBAAa,0BAA2B,YAAW,SAAS;IAC1D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAE/B,YAAY,OAAO,EAAE,iCAAiC,EAWrD;IAEK,QAAQ,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,CAmBxD;IAEK,MAAM,CACV,OAAO,EAAE,UAAU,EACnB,QAAQ,EAAE,iBAAiB,GAC1B,OAAO,CAAC,WAAW,CAAC,CA8BtB;IAED,OAAO,CAAC,aAAa;IAUrB,OAAO,CAAC,gBAAgB;IAWxB,OAAO,CAAC,aAAa;CAmBtB"}
|
|
@@ -14,6 +14,7 @@ export class OpenAICompatibleChatClient {
|
|
|
14
14
|
new OpenAI({
|
|
15
15
|
apiKey: options.apiKey,
|
|
16
16
|
baseURL: options.baseURL,
|
|
17
|
+
...(options.fetch === undefined ? {} : { fetch: options.fetch }),
|
|
17
18
|
});
|
|
18
19
|
this.continuationTag =
|
|
19
20
|
options.continuationTag ?? "openai-compatible-chat";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-compatible-chat.js","sourceRoot":"","sources":["../../src/providers/openai-compatible-chat.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAsB5B,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"openai-compatible-chat.js","sourceRoot":"","sources":["../../src/providers/openai-compatible-chat.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,10 +4,13 @@ export interface OpenAIClientOptions {
|
|
|
4
4
|
readonly apiKey: string;
|
|
5
5
|
readonly model: string;
|
|
6
6
|
readonly client?: OpenAI;
|
|
7
|
+
/** ChatGPT plan tokens require streamed, non-stored Responses requests. */
|
|
8
|
+
readonly oauth?: boolean;
|
|
7
9
|
}
|
|
8
10
|
export declare class OpenAIClient implements LLMClient {
|
|
9
11
|
private readonly client;
|
|
10
12
|
private readonly model;
|
|
13
|
+
private readonly oauth;
|
|
11
14
|
constructor(options: OpenAIClientOptions);
|
|
12
15
|
complete(request: LLMRequest): Promise<LLMResponse>;
|
|
13
16
|
stream(request: LLMRequest, handlers: LLMStreamHandlers): Promise<LLMResponse>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../src/providers/openai.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAQ5B,OAAO,KAAK,EACV,SAAS,EACT,UAAU,EACV,WAAW,EACX,iBAAiB,EAClB,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../src/providers/openai.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAQ5B,OAAO,KAAK,EACV,SAAS,EACT,UAAU,EACV,WAAW,EACX,iBAAiB,EAClB,MAAM,WAAW,CAAC;AAwBnB,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,2EAA2E;IAC3E,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,qBAAa,YAAa,YAAW,SAAS;IAC5C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAU;IAEhC,YAAY,OAAO,EAAE,mBAAmB,EAMvC;IAEK,QAAQ,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,CAWxD;IAEK,MAAM,CACV,OAAO,EAAE,UAAU,EACnB,QAAQ,EAAE,iBAAiB,GAC1B,OAAO,CAAC,WAAW,CAAC,CA4BtB;IAED,OAAO,CAAC,gBAAgB;CAsBzB"}
|
package/dist/providers/openai.js
CHANGED
|
@@ -1,13 +1,20 @@
|
|
|
1
1
|
import OpenAI from "openai";
|
|
2
2
|
import { fromResponsesUsage } from "./usage.js";
|
|
3
|
+
import { oauthApiFetch } from "../auth/oauth.js";
|
|
3
4
|
export class OpenAIClient {
|
|
4
5
|
client;
|
|
5
6
|
model;
|
|
7
|
+
oauth;
|
|
6
8
|
constructor(options) {
|
|
7
|
-
|
|
9
|
+
const oauth = options.oauth ?? false;
|
|
10
|
+
this.client = options.client ?? new OpenAI({ apiKey: options.apiKey,
|
|
11
|
+
...(oauth ? { baseURL: "https://api.openai.com/v1", fetch: oauthApiFetch("https://api.openai.com") } : {}) });
|
|
8
12
|
this.model = options.model;
|
|
13
|
+
this.oauth = oauth;
|
|
9
14
|
}
|
|
10
15
|
async complete(request) {
|
|
16
|
+
if (this.oauth)
|
|
17
|
+
return this.stream(request, { onTextDelta: () => undefined });
|
|
11
18
|
const parameters = { ...this.createParameters(request), stream: false };
|
|
12
19
|
const response = request.signal === undefined
|
|
13
20
|
? await this.client.responses.create(parameters)
|
|
@@ -32,27 +39,35 @@ export class OpenAIClient {
|
|
|
32
39
|
completed = event.response;
|
|
33
40
|
}
|
|
34
41
|
else if (event.type === "response.failed") {
|
|
35
|
-
throw new TypeError(
|
|
42
|
+
throw new TypeError(this.oauth
|
|
43
|
+
? "OpenAI subscription request failed."
|
|
44
|
+
: `OpenAI stream failed: ${event.response.error?.code ?? "unknown error"}`);
|
|
36
45
|
}
|
|
37
46
|
}
|
|
38
47
|
if (completed === undefined) {
|
|
39
48
|
throw new TypeError("OpenAI stream ended without a completed response.");
|
|
40
49
|
}
|
|
41
|
-
return
|
|
50
|
+
return this.oauth
|
|
51
|
+
? toOAuthLLMResponse(completed, request.messages.length, (parameters.input ?? []))
|
|
52
|
+
: toLLMResponse(completed);
|
|
42
53
|
}
|
|
43
54
|
createParameters(request) {
|
|
44
|
-
const continuation = parseContinuation(request.continuation);
|
|
55
|
+
const continuation = this.oauth ? undefined : parseContinuation(request.continuation);
|
|
45
56
|
return {
|
|
46
57
|
model: this.model,
|
|
58
|
+
...(this.oauth ? { store: false } : {}),
|
|
59
|
+
...(this.oauth ? { include: ["reasoning.encrypted_content"] } : {}),
|
|
47
60
|
instructions: request.systemPrompt,
|
|
48
|
-
input:
|
|
49
|
-
?
|
|
50
|
-
:
|
|
61
|
+
input: this.oauth
|
|
62
|
+
? toOAuthStatelessInput(request.messages, parseOAuthContinuation(request.continuation))
|
|
63
|
+
: continuation === undefined
|
|
64
|
+
? toInitialInput(request.messages)
|
|
65
|
+
: toContinuationInput(request.messages),
|
|
51
66
|
tools: request.tools.map(toOpenAITool),
|
|
52
67
|
parallel_tool_calls: false,
|
|
53
|
-
...(continuation
|
|
54
|
-
? {}
|
|
55
|
-
: {
|
|
68
|
+
...(!this.oauth && continuation !== undefined
|
|
69
|
+
? { previous_response_id: continuation.previousResponseId }
|
|
70
|
+
: {}),
|
|
56
71
|
};
|
|
57
72
|
}
|
|
58
73
|
}
|
|
@@ -67,6 +82,19 @@ function toLLMResponse(response) {
|
|
|
67
82
|
},
|
|
68
83
|
};
|
|
69
84
|
}
|
|
85
|
+
function toOAuthLLMResponse(response, messageCount, priorInput) {
|
|
86
|
+
const usage = fromResponsesUsage(response.usage);
|
|
87
|
+
return {
|
|
88
|
+
message: fromOpenAIResponse(response),
|
|
89
|
+
...(usage === undefined ? {} : { usage }),
|
|
90
|
+
continuation: {
|
|
91
|
+
provider: "openai-oauth-stateless",
|
|
92
|
+
messageCount,
|
|
93
|
+
priorInput,
|
|
94
|
+
responseOutput: response.output,
|
|
95
|
+
},
|
|
96
|
+
};
|
|
97
|
+
}
|
|
70
98
|
function parseContinuation(value) {
|
|
71
99
|
if (value === undefined) {
|
|
72
100
|
return undefined;
|
|
@@ -81,6 +109,40 @@ function parseContinuation(value) {
|
|
|
81
109
|
}
|
|
82
110
|
return value;
|
|
83
111
|
}
|
|
112
|
+
function parseOAuthContinuation(value) {
|
|
113
|
+
if (value === undefined)
|
|
114
|
+
return undefined;
|
|
115
|
+
// A continuation from the API-key Responses flow is intentionally ignored:
|
|
116
|
+
// OAuth must never use previous_response_id and can replay the transcript.
|
|
117
|
+
if (typeof value !== "object" || value === null ||
|
|
118
|
+
!("provider" in value) || value.provider !== "openai-oauth-stateless")
|
|
119
|
+
return undefined;
|
|
120
|
+
if (!("messageCount" in value) || !Number.isSafeInteger(value.messageCount) ||
|
|
121
|
+
value.messageCount < 0 ||
|
|
122
|
+
!("priorInput" in value) || !Array.isArray(value.priorInput) ||
|
|
123
|
+
!("responseOutput" in value) || !Array.isArray(value.responseOutput)) {
|
|
124
|
+
throw new TypeError("OpenAI OAuth received an incompatible continuation.");
|
|
125
|
+
}
|
|
126
|
+
return value;
|
|
127
|
+
}
|
|
128
|
+
function toOAuthStatelessInput(messages, continuation) {
|
|
129
|
+
if (continuation === undefined)
|
|
130
|
+
return toInitialInput(messages);
|
|
131
|
+
if (continuation.messageCount > messages.length) {
|
|
132
|
+
throw new TypeError("OpenAI OAuth continuation does not match the transcript.");
|
|
133
|
+
}
|
|
134
|
+
// With store:false, replay accumulated input, the prior response output
|
|
135
|
+
// (including reasoning), and only newly-added tool results. Prior assistant
|
|
136
|
+
// calls are already in responseOutput, so transcript assistant messages are
|
|
137
|
+
// omitted to avoid duplicating them.
|
|
138
|
+
const newMessages = messages.slice(continuation.messageCount).filter((message) => message.role !== "assistant");
|
|
139
|
+
const toolResults = newMessages.filter((message) => message.role === "tool");
|
|
140
|
+
return [
|
|
141
|
+
...continuation.priorInput,
|
|
142
|
+
...continuation.responseOutput,
|
|
143
|
+
...toInitialInput(toolResults),
|
|
144
|
+
];
|
|
145
|
+
}
|
|
84
146
|
/**
|
|
85
147
|
* Replays a whole transcript as Responses input. A session's second prompt
|
|
86
148
|
* starts a new request with earlier assistant turns and tool results already in
|