dsh-coding-subscription-oauth 0.5.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/CHANGELOG.md +136 -0
- package/CONTRIBUTING.md +109 -0
- package/INSTALL.md +220 -0
- package/LICENSE +19 -0
- package/NOTICE +11 -0
- package/README.de.md +254 -0
- package/README.es.md +254 -0
- package/README.fr.md +254 -0
- package/README.ja.md +254 -0
- package/README.ko.md +254 -0
- package/README.md +286 -0
- package/README.pt-BR.md +254 -0
- package/README.ru.md +254 -0
- package/README.zh-CN.md +271 -0
- package/cordis.patch.yml +13 -0
- package/docs/00-project-rules.md +195 -0
- package/docs/02-architecture.md +132 -0
- package/docs/02-architecture.zh-CN.md +128 -0
- package/lib/adapter.d.ts +24 -0
- package/lib/adapter.d.ts.map +1 -0
- package/lib/alias-adapter.d.ts +43 -0
- package/lib/alias-adapter.d.ts.map +1 -0
- package/lib/auth-routes.d.ts +155 -0
- package/lib/auth-routes.d.ts.map +1 -0
- package/lib/auth.d.ts +29 -0
- package/lib/auth.d.ts.map +1 -0
- package/lib/bin.d.ts +6 -0
- package/lib/bin.d.ts.map +1 -0
- package/lib/bin.js +27591 -0
- package/lib/bin.js.map +7 -0
- package/lib/capability-routes.d.ts +43 -0
- package/lib/capability-routes.d.ts.map +1 -0
- package/lib/capability-runtime.d.ts +56 -0
- package/lib/capability-runtime.d.ts.map +1 -0
- package/lib/capability-settings.d.ts +263 -0
- package/lib/capability-settings.d.ts.map +1 -0
- package/lib/capability-tools.d.ts +50 -0
- package/lib/capability-tools.d.ts.map +1 -0
- package/lib/catalog.d.ts +53 -0
- package/lib/catalog.d.ts.map +1 -0
- package/lib/client.js +3 -0
- package/lib/client.js.map +7 -0
- package/lib/codex-http.d.ts +77 -0
- package/lib/codex-http.d.ts.map +1 -0
- package/lib/codex-images.d.ts +109 -0
- package/lib/codex-images.d.ts.map +1 -0
- package/lib/codex-model-capabilities.d.ts +112 -0
- package/lib/codex-model-capabilities.d.ts.map +1 -0
- package/lib/codex-search.d.ts +96 -0
- package/lib/codex-search.d.ts.map +1 -0
- package/lib/codex-usage.d.ts +79 -0
- package/lib/codex-usage.d.ts.map +1 -0
- package/lib/gateway-anthropic-messages.d.ts +8 -0
- package/lib/gateway-anthropic-messages.d.ts.map +1 -0
- package/lib/gateway-auth.d.ts +22 -0
- package/lib/gateway-auth.d.ts.map +1 -0
- package/lib/gateway-backend.d.ts +62 -0
- package/lib/gateway-backend.d.ts.map +1 -0
- package/lib/gateway-body.d.ts +9 -0
- package/lib/gateway-body.d.ts.map +1 -0
- package/lib/gateway-config.d.ts +24 -0
- package/lib/gateway-config.d.ts.map +1 -0
- package/lib/gateway-http.d.ts +16 -0
- package/lib/gateway-http.d.ts.map +1 -0
- package/lib/gateway-openai-chat.d.ts +8 -0
- package/lib/gateway-openai-chat.d.ts.map +1 -0
- package/lib/gateway-openai-responses.d.ts +8 -0
- package/lib/gateway-openai-responses.d.ts.map +1 -0
- package/lib/gateway-parse.d.ts +10 -0
- package/lib/gateway-parse.d.ts.map +1 -0
- package/lib/gateway-protocol.d.ts +47 -0
- package/lib/gateway-protocol.d.ts.map +1 -0
- package/lib/gateway-routes.d.ts +21 -0
- package/lib/gateway-routes.d.ts.map +1 -0
- package/lib/gateway.d.ts +48 -0
- package/lib/gateway.d.ts.map +1 -0
- package/lib/grok-imagine.d.ts +271 -0
- package/lib/grok-imagine.d.ts.map +1 -0
- package/lib/grok-import.d.ts +21 -0
- package/lib/grok-import.d.ts.map +1 -0
- package/lib/http-json.d.ts +10 -0
- package/lib/http-json.d.ts.map +1 -0
- package/lib/ids.d.ts +33 -0
- package/lib/ids.d.ts.map +1 -0
- package/lib/imagine-routes.d.ts +59 -0
- package/lib/imagine-routes.d.ts.map +1 -0
- package/lib/index.d.ts +69 -0
- package/lib/index.d.ts.map +1 -0
- package/lib/index.js +35355 -0
- package/lib/index.js.map +7 -0
- package/lib/invariant.d.ts +9 -0
- package/lib/invariant.d.ts.map +1 -0
- package/lib/invariant.js +14 -0
- package/lib/invariant.js.map +7 -0
- package/lib/kimi-errors.d.ts +13 -0
- package/lib/kimi-errors.d.ts.map +1 -0
- package/lib/media-store.d.ts +130 -0
- package/lib/media-store.d.ts.map +1 -0
- package/lib/oauth-import-routes.d.ts +52 -0
- package/lib/oauth-import-routes.d.ts.map +1 -0
- package/lib/oauth-providers.d.ts +26 -0
- package/lib/oauth-providers.d.ts.map +1 -0
- package/lib/oauth-session.d.ts +40 -0
- package/lib/oauth-session.d.ts.map +1 -0
- package/lib/oauth-sources.d.ts +205 -0
- package/lib/oauth-sources.d.ts.map +1 -0
- package/lib/oauth.d.ts +79 -0
- package/lib/oauth.d.ts.map +1 -0
- package/lib/provider.d.ts +38 -0
- package/lib/provider.d.ts.map +1 -0
- package/lib/proxy.d.ts +17 -0
- package/lib/proxy.d.ts.map +1 -0
- package/lib/redact.d.ts +5 -0
- package/lib/redact.d.ts.map +1 -0
- package/lib/session.d.ts +40 -0
- package/lib/session.d.ts.map +1 -0
- package/lib/store.d.ts +46 -0
- package/lib/store.d.ts.map +1 -0
- package/lib/web-origin.d.ts +10 -0
- package/lib/web-origin.d.ts.map +1 -0
- package/lib/web-routes.d.ts +20 -0
- package/lib/web-routes.d.ts.map +1 -0
- package/package.json +185 -0
- package/patches/dsh-agy@0.1.2.patch +25 -0
- package/scripts/release.mjs +166 -0
- package/scripts/smoke-deployed-routes.mjs +146 -0
- package/scripts/verify-deployed-catalog.mjs +87 -0
- package/src/adapter.ts +282 -0
- package/src/alias-adapter.ts +152 -0
- package/src/auth-routes.ts +871 -0
- package/src/auth.ts +67 -0
- package/src/bin.ts +350 -0
- package/src/capability-routes.ts +275 -0
- package/src/capability-runtime.ts +313 -0
- package/src/capability-settings.ts +657 -0
- package/src/capability-tools.ts +666 -0
- package/src/catalog.ts +271 -0
- package/src/client/GrokBuildSettings.tsx +2221 -0
- package/src/client/index.tsx +37 -0
- package/src/client/locales.ts +421 -0
- package/src/codex-http.ts +447 -0
- package/src/codex-images.ts +485 -0
- package/src/codex-model-capabilities.ts +320 -0
- package/src/codex-search.ts +245 -0
- package/src/codex-usage.ts +263 -0
- package/src/gateway-anthropic-messages.ts +84 -0
- package/src/gateway-auth.ts +100 -0
- package/src/gateway-backend.ts +274 -0
- package/src/gateway-body.ts +49 -0
- package/src/gateway-config.ts +76 -0
- package/src/gateway-http.ts +104 -0
- package/src/gateway-openai-chat.ts +124 -0
- package/src/gateway-openai-responses.ts +53 -0
- package/src/gateway-parse.ts +224 -0
- package/src/gateway-protocol.ts +52 -0
- package/src/gateway-routes.ts +152 -0
- package/src/gateway.ts +242 -0
- package/src/grok-imagine.ts +1627 -0
- package/src/grok-import.ts +151 -0
- package/src/http-json.ts +82 -0
- package/src/ids.ts +45 -0
- package/src/imagine-routes.ts +461 -0
- package/src/index.ts +598 -0
- package/src/invariant.ts +17 -0
- package/src/kimi-errors.ts +26 -0
- package/src/media-store.ts +927 -0
- package/src/oauth-import-routes.ts +314 -0
- package/src/oauth-providers.ts +152 -0
- package/src/oauth-session.ts +183 -0
- package/src/oauth-sources.ts +1104 -0
- package/src/oauth.ts +620 -0
- package/src/provider.ts +128 -0
- package/src/proxy.ts +99 -0
- package/src/redact.ts +72 -0
- package/src/session.ts +218 -0
- package/src/store.ts +217 -0
- package/src/web-origin.ts +60 -0
- package/src/web-routes.ts +75 -0
package/src/provider.ts
ADDED
|
@@ -0,0 +1,128 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Grok Build provider: a pi-ai provider pointed at the official Grok CLI
|
|
3
|
+
* coding backend (`cli-chat-proxy.grok.com`) carrying the CLI fingerprint
|
|
4
|
+
* headers the risk-control middleware requires.
|
|
5
|
+
* @module dsh-coding-subscription-oauth/provider
|
|
6
|
+
*/
|
|
7
|
+
|
|
8
|
+
import type { Api, Model, Provider, ThinkingLevelMap } from "@earendil-works/pi-ai";
|
|
9
|
+
import { createProvider } from "@earendil-works/pi-ai";
|
|
10
|
+
import { openAIResponsesApi } from "@earendil-works/pi-ai/api/openai-responses.lazy";
|
|
11
|
+
import { GROK_BUILD_ROUTE } from "./ids.ts";
|
|
12
|
+
|
|
13
|
+
/**
|
|
14
|
+
* Grok Build cannot disable reasoning (`reasoning_effort: "none"` is 400).
|
|
15
|
+
* pi-ai treats an absent `xhigh`/`max` key as unsupported, so those levels
|
|
16
|
+
* must be declared explicitly when the model offers them.
|
|
17
|
+
*/
|
|
18
|
+
export function grokBuildReasoningMap(levels: readonly ("low" | "medium" | "high" | "xhigh")[]): ThinkingLevelMap {
|
|
19
|
+
const offered = new Set(levels);
|
|
20
|
+
return {
|
|
21
|
+
off: null,
|
|
22
|
+
minimal: null,
|
|
23
|
+
low: offered.has("low") ? "low" : null,
|
|
24
|
+
medium: offered.has("medium") ? "medium" : null,
|
|
25
|
+
high: offered.has("high") ? "high" : null,
|
|
26
|
+
xhigh: offered.has("xhigh") ? "xhigh" : null,
|
|
27
|
+
max: null,
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
/** Inference backend base URL (Responses API lives under `${baseUrl}/responses`). */
|
|
32
|
+
export const GROK_BUILD_BASE_URL = "https://cli-chat-proxy.grok.com/v1";
|
|
33
|
+
|
|
34
|
+
/** Account model catalog endpoint fetched by the official CLI. */
|
|
35
|
+
export const GROK_BUILD_MODELS_URL = `${GROK_BUILD_BASE_URL}/models-v2`;
|
|
36
|
+
|
|
37
|
+
/**
|
|
38
|
+
* Official Grok CLI version this plugin fingerprints as.
|
|
39
|
+
* Track the `@xai-official/grok` npm release stream; make overridable via
|
|
40
|
+
* GROK_BUILD_CLIENT_VERSION for urgent drift fixes without a release.
|
|
41
|
+
*/
|
|
42
|
+
export const GROK_CLIENT_VERSION: string = process.env["GROK_BUILD_CLIENT_VERSION"] ?? "0.1.220";
|
|
43
|
+
|
|
44
|
+
/**
|
|
45
|
+
* Fingerprint headers required by the Grok Build middleware. Missing headers
|
|
46
|
+
* are a known 403 trigger (codex-app-transfer field notes, 2026-07).
|
|
47
|
+
*/
|
|
48
|
+
export function grokBuildFingerprintHeaders(): Record<string, string> {
|
|
49
|
+
return {
|
|
50
|
+
"X-XAI-Token-Auth": "xai-grok-cli",
|
|
51
|
+
"x-grok-client-identifier": "grok-shell",
|
|
52
|
+
"x-grok-client-version": GROK_CLIENT_VERSION,
|
|
53
|
+
"User-Agent": `grok-shell/${GROK_CLIENT_VERSION}`,
|
|
54
|
+
};
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
/** Static baseline catalog, used until a live `/models-v2` listing succeeds. */
|
|
58
|
+
export function grokBuildBaselineModels(): Model<"openai-responses">[] {
|
|
59
|
+
return [
|
|
60
|
+
{
|
|
61
|
+
id: "grok-4.5",
|
|
62
|
+
name: "Grok 4.5",
|
|
63
|
+
api: "openai-responses",
|
|
64
|
+
provider: GROK_BUILD_ROUTE,
|
|
65
|
+
baseUrl: GROK_BUILD_BASE_URL,
|
|
66
|
+
reasoning: true,
|
|
67
|
+
// Official xAI docs + live /models-v2: grok-4.5 is low/medium/high only.
|
|
68
|
+
thinkingLevelMap: grokBuildReasoningMap(["low", "medium", "high"]),
|
|
69
|
+
input: ["text", "image"],
|
|
70
|
+
cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
|
|
71
|
+
contextWindow: 500_000,
|
|
72
|
+
maxTokens: 128_000,
|
|
73
|
+
},
|
|
74
|
+
{
|
|
75
|
+
id: "grok-4.6",
|
|
76
|
+
name: "Grok 4.6",
|
|
77
|
+
api: "openai-responses",
|
|
78
|
+
provider: GROK_BUILD_ROUTE,
|
|
79
|
+
baseUrl: GROK_BUILD_BASE_URL,
|
|
80
|
+
reasoning: true,
|
|
81
|
+
// grok-4.6 and later advertise xhigh. pi-ai hides xhigh unless this key
|
|
82
|
+
// is an explicit non-null mapping (absent !== supported).
|
|
83
|
+
thinkingLevelMap: grokBuildReasoningMap(["low", "medium", "high", "xhigh"]),
|
|
84
|
+
input: ["text", "image"],
|
|
85
|
+
cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
|
|
86
|
+
contextWindow: 500_000,
|
|
87
|
+
maxTokens: 128_000,
|
|
88
|
+
},
|
|
89
|
+
{
|
|
90
|
+
id: "grok-composer-2.5-fast",
|
|
91
|
+
name: "Grok Composer 2.5 Fast",
|
|
92
|
+
api: "openai-responses",
|
|
93
|
+
provider: GROK_BUILD_ROUTE,
|
|
94
|
+
baseUrl: GROK_BUILD_BASE_URL,
|
|
95
|
+
reasoning: false,
|
|
96
|
+
input: ["text"],
|
|
97
|
+
cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
|
|
98
|
+
contextWindow: 200_000,
|
|
99
|
+
maxTokens: 64_000,
|
|
100
|
+
},
|
|
101
|
+
];
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
/**
|
|
105
|
+
* Build the Grok Build pi-ai provider. Auth is apiKey-shaped: the OAuth
|
|
106
|
+
* access token is injected as the bearer key by the surrounding adapter
|
|
107
|
+
* (`Models.getAuth` on the login provider performs refresh under the store
|
|
108
|
+
* lock before the key ever reaches here).
|
|
109
|
+
*/
|
|
110
|
+
export function grokBuildProvider(models: readonly Model<Api>[]): Provider {
|
|
111
|
+
return createProvider({
|
|
112
|
+
id: GROK_BUILD_ROUTE,
|
|
113
|
+
name: "xAI Grok Build",
|
|
114
|
+
baseUrl: GROK_BUILD_BASE_URL,
|
|
115
|
+
headers: grokBuildFingerprintHeaders(),
|
|
116
|
+
auth: {
|
|
117
|
+
apiKey: {
|
|
118
|
+
name: "Grok Build OAuth access token",
|
|
119
|
+
async resolve({ credential }) {
|
|
120
|
+
const apiKey = credential?.key;
|
|
121
|
+
return apiKey === undefined || apiKey.length === 0 ? undefined : { auth: { apiKey }, source: "OAuth" };
|
|
122
|
+
},
|
|
123
|
+
},
|
|
124
|
+
},
|
|
125
|
+
models,
|
|
126
|
+
api: { "openai-responses": openAIResponsesApi() },
|
|
127
|
+
});
|
|
128
|
+
}
|
package/src/proxy.ts
ADDED
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Scoped egress proxy for coding-subscription OAuth and inference traffic.
|
|
3
|
+
* @module dsh-coding-subscription-oauth/proxy
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
import { Dispatcher, getGlobalDispatcher, ProxyAgent, setGlobalDispatcher } from "undici";
|
|
7
|
+
|
|
8
|
+
const DEFAULT_PROXIED_HOSTS = [
|
|
9
|
+
"auth.x.ai",
|
|
10
|
+
"cli-chat-proxy.grok.com",
|
|
11
|
+
"auth.openai.com",
|
|
12
|
+
"chatgpt.com",
|
|
13
|
+
"claude.ai",
|
|
14
|
+
"platform.claude.com",
|
|
15
|
+
"api.anthropic.com",
|
|
16
|
+
"accounts.google.com",
|
|
17
|
+
"oauth2.googleapis.com",
|
|
18
|
+
"cloudcode-pa.googleapis.com",
|
|
19
|
+
"www.googleapis.com",
|
|
20
|
+
] as const;
|
|
21
|
+
|
|
22
|
+
const KIMI_PROXIED_HOSTS = ["auth.kimi.com", "api.kimi.com"] as const;
|
|
23
|
+
|
|
24
|
+
class CodingOAuthDispatcher extends Dispatcher {
|
|
25
|
+
constructor(
|
|
26
|
+
private readonly proxied: Dispatcher,
|
|
27
|
+
private readonly fallback: Dispatcher,
|
|
28
|
+
private readonly hosts: ReadonlySet<string>,
|
|
29
|
+
) {
|
|
30
|
+
super();
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
dispatch(options: Dispatcher.DispatchOptions, handler: Dispatcher.DispatchHandler): boolean {
|
|
34
|
+
const origin = options.origin;
|
|
35
|
+
const host = origin instanceof URL ? origin.hostname : typeof origin === "string" ? new URL(origin).hostname : "";
|
|
36
|
+
if (this.hosts.has(host)) return this.proxied.dispatch(options, handler);
|
|
37
|
+
return this.fallback.dispatch(options, handler);
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
override async close(): Promise<void> {
|
|
41
|
+
await this.proxied.close();
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
override async destroy(): Promise<void> {
|
|
45
|
+
await this.proxied.destroy();
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
let installedProxy: string | undefined;
|
|
50
|
+
let installed = false;
|
|
51
|
+
|
|
52
|
+
function firstEnv(names: readonly string[]): string | undefined {
|
|
53
|
+
for (const name of names) {
|
|
54
|
+
const value = process.env[name];
|
|
55
|
+
if (value !== undefined && value.length > 0) return value;
|
|
56
|
+
}
|
|
57
|
+
return undefined;
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
export interface CodingOAuthProxyOptions {
|
|
61
|
+
proxyKimi?: boolean;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
/** Install one process-wide dispatcher that proxies only the audited host list. */
|
|
65
|
+
export function ensureCodingOAuthProxy(explicit?: string, options: CodingOAuthProxyOptions = {}): string | undefined {
|
|
66
|
+
if (installed) return installedProxy;
|
|
67
|
+
const url =
|
|
68
|
+
explicit ??
|
|
69
|
+
firstEnv(["CODING_OAUTH_PROXY", "GROK_BUILD_PROXY", "HTTPS_PROXY", "https_proxy", "HTTP_PROXY", "http_proxy"]);
|
|
70
|
+
if (url === undefined) return undefined;
|
|
71
|
+
const hosts = new Set<string>(DEFAULT_PROXIED_HOSTS);
|
|
72
|
+
if (options.proxyKimi === true) {
|
|
73
|
+
for (const host of KIMI_PROXIED_HOSTS) hosts.add(host);
|
|
74
|
+
}
|
|
75
|
+
const fallback = getGlobalDispatcher();
|
|
76
|
+
setGlobalDispatcher(new CodingOAuthDispatcher(new ProxyAgent(url), fallback, hosts));
|
|
77
|
+
installed = true;
|
|
78
|
+
installedProxy = url;
|
|
79
|
+
return url;
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
/** Backward-compatible name retained for existing callers. */
|
|
83
|
+
export function ensureGrokBuildProxy(explicit?: string): string | undefined {
|
|
84
|
+
return ensureCodingOAuthProxy(explicit);
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
export function codingOAuthProxyInEffect(): string | undefined {
|
|
88
|
+
return installedProxy;
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
/** Appended to Grok discovery/token/catalog transport errors when a scoped proxy is installed. */
|
|
92
|
+
export function codingOAuthProxyUnreachableHint(): string {
|
|
93
|
+
return installedProxy === undefined ? "" : "; check that CODING_OAUTH_PROXY is reachable";
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
/** Backward-compatible status accessor. */
|
|
97
|
+
export function grokBuildProxyInEffect(): string | undefined {
|
|
98
|
+
return codingOAuthProxyInEffect();
|
|
99
|
+
}
|
package/src/redact.ts
ADDED
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
/** Remove token-like strings from an external OAuth diagnostic. */
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* An opaque credential value run. We require the surrounding label to be one of
|
|
5
|
+
* the known credential field names AND the value to be at least this many
|
|
6
|
+
* characters so that ordinary prose ("code is fun", "token missing") is left
|
|
7
|
+
* alone. The minimum also keeps the regex from matching in code-style
|
|
8
|
+
* strings like `code: a`.
|
|
9
|
+
*/
|
|
10
|
+
const OPAQUE_TOKEN_MIN_LENGTH = 16;
|
|
11
|
+
|
|
12
|
+
/** The opaque-value class: at least the minimum chars of URL-safe alphabet. */
|
|
13
|
+
const OPAQUE_TOKEN_RUN = `[A-Za-z0-9_\\-.+]{${OPAQUE_TOKEN_MIN_LENGTH},}`;
|
|
14
|
+
|
|
15
|
+
/** Known sensitive field names that may precede an opaque credential value. */
|
|
16
|
+
const SENSITIVE_LABEL =
|
|
17
|
+
"(?:token|bearer|code|user_code|access_token|refresh_token|id_token|api[_-]?key|secret|password|client[_-]?secret|authorization)";
|
|
18
|
+
|
|
19
|
+
/**
|
|
20
|
+
* Sweep additional opaque tokens that follow a known credential label. We
|
|
21
|
+
* require the value to be long and URL-safe-shaped so that ordinary prose
|
|
22
|
+
* ("code is fun", "token missing") is left alone. This complements the short
|
|
23
|
+
* and structured sweep above — it catches longer opaque tokens that survive
|
|
24
|
+
* the more specific regexes.
|
|
25
|
+
*/
|
|
26
|
+
function redactOpaqueTokens(input: string): string {
|
|
27
|
+
let output = input.replace(
|
|
28
|
+
new RegExp(`(["']?${SENSITIVE_LABEL}["']?\\s*:\\s*["'])(${OPAQUE_TOKEN_RUN})(["'])`, "giu"),
|
|
29
|
+
`$1[redacted]$3`,
|
|
30
|
+
);
|
|
31
|
+
output = output.replace(
|
|
32
|
+
new RegExp(`\\b(${SENSITIVE_LABEL})=(${OPAQUE_TOKEN_RUN})(?=[&\\s"']|$)`, "giu"),
|
|
33
|
+
`$1=[redacted]`,
|
|
34
|
+
);
|
|
35
|
+
output = output.replace(
|
|
36
|
+
new RegExp(`\\b(${SENSITIVE_LABEL}\\s*:\\s*)(${OPAQUE_TOKEN_RUN})(?=[\\s"',}]|$)`, "giu"),
|
|
37
|
+
`$1[redacted]`,
|
|
38
|
+
);
|
|
39
|
+
output = output.replace(new RegExp(`\\b(Authorization)\\s+(${OPAQUE_TOKEN_RUN})\\b`, "giu"), `$1 [redacted]`);
|
|
40
|
+
return output;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
/** Strip userinfo from a proxy URL so CLI/logs never print `user:pass@`. */
|
|
44
|
+
export function redactProxyUrl(value: string): string {
|
|
45
|
+
try {
|
|
46
|
+
const parsed = new URL(value);
|
|
47
|
+
if (parsed.username === "" && parsed.password === "") return value;
|
|
48
|
+
parsed.username = "";
|
|
49
|
+
parsed.password = "";
|
|
50
|
+
const href = parsed.href;
|
|
51
|
+
if (!value.endsWith("/") && href.endsWith("/") && parsed.pathname === "/") return href.slice(0, -1);
|
|
52
|
+
return href;
|
|
53
|
+
} catch {
|
|
54
|
+
return value.replace(/^([a-z][a-z0-9+.-]*:\/\/)[^/@\s]+@/iu, "$1");
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
export function safeMessage(error: unknown): string {
|
|
59
|
+
let text = (error instanceof Error ? error.message : String(error))
|
|
60
|
+
.replace(/\beyJ[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\b/gu, "[redacted token]")
|
|
61
|
+
.replace(/\bsk-ant-oat[A-Za-z0-9_-]*\b/giu, "[redacted token]")
|
|
62
|
+
.replace(/\bsk-[A-Za-z0-9_-]{16,}\b/gu, "[redacted token]")
|
|
63
|
+
.replace(/\bxai-[A-Za-z0-9._-]{8,}\b/gu, "[redacted token]")
|
|
64
|
+
.replace(/(\bBearer\s+)[^\s"',}]+/giu, "$1[redacted]")
|
|
65
|
+
.replace(/(\b(?:code|user_code|token|id_token|refresh_token|access_token)=)[^&\s]+/giu, "$1[redacted]")
|
|
66
|
+
.replace(/(["']?(?:code|user_code|id_token|refresh_token|access_token)["']?\s*:\s*["'])[^"']+/giu, "$1[redacted]");
|
|
67
|
+
// Generic opaque sweep catches long values preceded by labels such as
|
|
68
|
+
// client_secret, api_key, password, or Authorization. The minimum length
|
|
69
|
+
// guards against ordinary prose and the case-insensitive pass handles repeats.
|
|
70
|
+
text = redactOpaqueTokens(text);
|
|
71
|
+
return text.slice(0, 1000);
|
|
72
|
+
}
|
package/src/session.ts
ADDED
|
@@ -0,0 +1,218 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Shared OAuth store + live catalog for the host plugin and CLI.
|
|
3
|
+
* @module dsh-coding-subscription-oauth/session
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
import { mkdir, readFile, rm } from "node:fs/promises";
|
|
7
|
+
import { dirname, join, resolve } from "node:path";
|
|
8
|
+
import { writeFileAtomic } from "@deepseek-ai/dsh-atomic-write";
|
|
9
|
+
import { resolveDshHome } from "@deepseek-ai/dsh-home-paths";
|
|
10
|
+
import type { Api, Model, MutableModels, Provider } from "@earendil-works/pi-ai";
|
|
11
|
+
import { createModels } from "@earendil-works/pi-ai";
|
|
12
|
+
import { xaiProvider } from "@earendil-works/pi-ai/providers/xai";
|
|
13
|
+
import {
|
|
14
|
+
type CatalogSource,
|
|
15
|
+
fetchLiveModels,
|
|
16
|
+
type LiveModelDescriptor,
|
|
17
|
+
materializeLiveModel,
|
|
18
|
+
mergeLiveCatalog,
|
|
19
|
+
} from "./catalog.ts";
|
|
20
|
+
import { GROK_BUILD_MODELS_CACHE_FILENAME, GROK_BUILD_ROUTE, XAI_PI_PROVIDER } from "./ids.ts";
|
|
21
|
+
import { grokBuildBaselineModels, grokBuildProvider } from "./provider.ts";
|
|
22
|
+
import { safeMessage } from "./redact.ts";
|
|
23
|
+
import { GrokBuildCredentialStore } from "./store.ts";
|
|
24
|
+
|
|
25
|
+
const MODELS_CACHE_VERSION = 2;
|
|
26
|
+
|
|
27
|
+
interface ModelsCacheDocument {
|
|
28
|
+
version: typeof MODELS_CACHE_VERSION;
|
|
29
|
+
ids: string[];
|
|
30
|
+
selected?: string[];
|
|
31
|
+
fetchedAt: number;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
interface ParsedCache {
|
|
35
|
+
ids: string[];
|
|
36
|
+
selected?: string[];
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
function isENOENT(error: unknown): boolean {
|
|
40
|
+
return (error as NodeJS.ErrnoException | null)?.code === "ENOENT";
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
function modelsCachePath(dshHome?: string): string {
|
|
44
|
+
return resolve(join(resolveDshHome(dshHome), GROK_BUILD_MODELS_CACHE_FILENAME));
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
function parseIdList(value: unknown): string[] {
|
|
48
|
+
if (!Array.isArray(value)) return [];
|
|
49
|
+
return [...new Set(value.filter((id): id is string => typeof id === "string" && id.length > 0))];
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
function parseCache(text: string): ParsedCache | undefined {
|
|
53
|
+
let value: unknown;
|
|
54
|
+
try {
|
|
55
|
+
value = JSON.parse(text);
|
|
56
|
+
} catch {
|
|
57
|
+
return undefined;
|
|
58
|
+
}
|
|
59
|
+
if (typeof value !== "object" || value === null || Array.isArray(value)) return undefined;
|
|
60
|
+
const document = value as Record<string, unknown>;
|
|
61
|
+
if (document["version"] !== 1 && document["version"] !== MODELS_CACHE_VERSION) return undefined;
|
|
62
|
+
const ids = parseIdList(document["ids"]);
|
|
63
|
+
const selected = parseIdList(document["selected"]);
|
|
64
|
+
if (ids.length === 0 && selected.length === 0) return undefined;
|
|
65
|
+
return {
|
|
66
|
+
ids,
|
|
67
|
+
...(selected.length === 0 ? {} : { selected }),
|
|
68
|
+
};
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
function asHarnessModels(models: readonly Model<Api>[]): Model<Api>[] {
|
|
72
|
+
return models.map((model) =>
|
|
73
|
+
model.provider === GROK_BUILD_ROUTE ? model : { ...model, provider: GROK_BUILD_ROUTE },
|
|
74
|
+
);
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
/** One process-local owner of the credential and the account model list. */
|
|
78
|
+
export class GrokBuildSession {
|
|
79
|
+
readonly store: GrokBuildCredentialStore;
|
|
80
|
+
readonly models: MutableModels;
|
|
81
|
+
private readonly baselineCatalog: readonly Model<Api>[];
|
|
82
|
+
private liveIds: string[] | undefined;
|
|
83
|
+
private liveModels: readonly LiveModelDescriptor[] | undefined;
|
|
84
|
+
private selectedIds: string[] | undefined;
|
|
85
|
+
private source: CatalogSource = "fallback";
|
|
86
|
+
private listingError: string | undefined;
|
|
87
|
+
private readonly cacheFile: string;
|
|
88
|
+
private onCatalogChange: (() => void) | undefined;
|
|
89
|
+
|
|
90
|
+
constructor(store: GrokBuildCredentialStore = new GrokBuildCredentialStore(), onCatalogChange?: () => void) {
|
|
91
|
+
this.store = store;
|
|
92
|
+
this.cacheFile = modelsCachePath();
|
|
93
|
+
this.baselineCatalog = grokBuildBaselineModels();
|
|
94
|
+
// The built-in xai provider owns login/refresh (device flow today); the
|
|
95
|
+
// credential lives in this plugin's own file via the store above.
|
|
96
|
+
this.models = createModels({ credentials: store });
|
|
97
|
+
this.models.setProvider(xaiProvider());
|
|
98
|
+
this.onCatalogChange = onCatalogChange;
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
/** Secret-free listing diagnostic from the last refresh. */
|
|
102
|
+
get catalogError(): string | undefined {
|
|
103
|
+
return this.listingError;
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
get catalogSource(): CatalogSource {
|
|
107
|
+
return this.source;
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
availableModels(): Model<Api>[] {
|
|
111
|
+
return mergeLiveCatalog(this.baselineCatalog, this.liveIds, this.liveModels);
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
selectedModelIds(): string[] | undefined {
|
|
115
|
+
return this.selectedIds;
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
visibleModels(): Model<Api>[] {
|
|
119
|
+
const available = this.availableModels();
|
|
120
|
+
if (this.selectedIds === undefined || this.selectedIds.length === 0) return available;
|
|
121
|
+
const byId = new Map(available.map((model) => [model.id, model]));
|
|
122
|
+
return this.selectedIds.map((id) => byId.get(id) ?? materializeLiveModel(id, this.baselineCatalog));
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
/** Provider whose id matches the harness route so PiAiAdapter can list models. */
|
|
126
|
+
provider(): Provider {
|
|
127
|
+
const visible = this.visibleModels();
|
|
128
|
+
const base = grokBuildProvider(visible);
|
|
129
|
+
return {
|
|
130
|
+
...base,
|
|
131
|
+
getModels: () => asHarnessModels(this.visibleModels()),
|
|
132
|
+
};
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
async loadCachedCatalog(): Promise<void> {
|
|
136
|
+
try {
|
|
137
|
+
const cache = parseCache(await readFile(this.cacheFile, "utf8"));
|
|
138
|
+
if (cache === undefined) return;
|
|
139
|
+
if (cache.ids.length > 0) {
|
|
140
|
+
this.liveIds = cache.ids;
|
|
141
|
+
this.liveModels = undefined;
|
|
142
|
+
this.source = "cache";
|
|
143
|
+
}
|
|
144
|
+
this.selectedIds = cache.selected;
|
|
145
|
+
} catch (error) {
|
|
146
|
+
if (!isENOENT(error)) throw error;
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
async refreshLiveCatalog(signal?: AbortSignal): Promise<void> {
|
|
151
|
+
try {
|
|
152
|
+
const auth = await this.models.getAuth(XAI_PI_PROVIDER);
|
|
153
|
+
const access = auth?.auth.apiKey;
|
|
154
|
+
if (access === undefined || access.length === 0) {
|
|
155
|
+
this.listingError = undefined;
|
|
156
|
+
return;
|
|
157
|
+
}
|
|
158
|
+
const live = await fetchLiveModels(access, signal);
|
|
159
|
+
this.liveIds = live.map((model) => model.id);
|
|
160
|
+
this.liveModels = live;
|
|
161
|
+
this.source = "live";
|
|
162
|
+
this.listingError = undefined;
|
|
163
|
+
await this.writeCache();
|
|
164
|
+
} catch (error) {
|
|
165
|
+
this.listingError = safeMessage(error);
|
|
166
|
+
if (this.liveIds === undefined) this.source = "fallback";
|
|
167
|
+
} finally {
|
|
168
|
+
// Login must reveal the fallback catalog even when auth refresh or live listing fails.
|
|
169
|
+
this.onCatalogChange?.();
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
|
|
173
|
+
async setSelectedModels(ids: readonly string[]): Promise<void> {
|
|
174
|
+
const unique = [...new Set(ids.filter((id) => id.length > 0))];
|
|
175
|
+
this.selectedIds = unique.length === 0 ? undefined : unique;
|
|
176
|
+
await this.writeCache();
|
|
177
|
+
this.onCatalogChange?.();
|
|
178
|
+
}
|
|
179
|
+
|
|
180
|
+
/**
|
|
181
|
+
* Backdate the stored token's expiry so the next `getAuth()` refreshes.
|
|
182
|
+
* Called after an upstream 401 rejected a locally-valid token.
|
|
183
|
+
*/
|
|
184
|
+
async invalidateAccessToken(): Promise<void> {
|
|
185
|
+
await this.store.invalidate(XAI_PI_PROVIDER);
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
async logout(): Promise<void> {
|
|
189
|
+
try {
|
|
190
|
+
await this.store.delete(XAI_PI_PROVIDER);
|
|
191
|
+
this.liveIds = undefined;
|
|
192
|
+
this.liveModels = undefined;
|
|
193
|
+
this.selectedIds = undefined;
|
|
194
|
+
this.source = "fallback";
|
|
195
|
+
this.listingError = undefined;
|
|
196
|
+
await mkdir(dirname(this.cacheFile), { recursive: true, mode: 0o700 });
|
|
197
|
+
await rm(this.cacheFile, { force: true });
|
|
198
|
+
} finally {
|
|
199
|
+
// Credential deletion may succeed before cache cleanup fails. Always
|
|
200
|
+
// refresh discovery so an open selector cannot retain stale models.
|
|
201
|
+
this.onCatalogChange?.();
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
|
|
205
|
+
private async writeCache(): Promise<void> {
|
|
206
|
+
const document: ModelsCacheDocument = {
|
|
207
|
+
version: MODELS_CACHE_VERSION,
|
|
208
|
+
ids: this.liveIds === undefined ? [] : [...this.liveIds],
|
|
209
|
+
fetchedAt: Date.now(),
|
|
210
|
+
...(this.selectedIds === undefined ? {} : { selected: [...this.selectedIds] }),
|
|
211
|
+
};
|
|
212
|
+
await mkdir(dirname(this.cacheFile), { recursive: true, mode: 0o700 });
|
|
213
|
+
await writeFileAtomic(this.cacheFile, `${JSON.stringify(document)}\n`, {
|
|
214
|
+
mode: 0o600,
|
|
215
|
+
dirMode: 0o700,
|
|
216
|
+
});
|
|
217
|
+
}
|
|
218
|
+
}
|