@slkiser/opencode-quota 3.8.1 → 3.8.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/api-key-resolver.d.ts +30 -0
- package/dist/lib/api-key-resolver.d.ts.map +1 -1
- package/dist/lib/api-key-resolver.js +32 -0
- package/dist/lib/api-key-resolver.js.map +1 -1
- package/dist/lib/chutes-config.d.ts +0 -27
- package/dist/lib/chutes-config.d.ts.map +1 -1
- package/dist/lib/chutes-config.js +16 -46
- package/dist/lib/chutes-config.js.map +1 -1
- package/dist/lib/crof-config.d.ts +0 -7
- package/dist/lib/crof-config.d.ts.map +1 -1
- package/dist/lib/crof-config.js +15 -28
- package/dist/lib/crof-config.js.map +1 -1
- package/dist/lib/format-utils.d.ts.map +1 -1
- package/dist/lib/format-utils.js +5 -3
- package/dist/lib/format-utils.js.map +1 -1
- package/dist/lib/google-antigravity-companion.d.ts.map +1 -1
- package/dist/lib/google-antigravity-companion.js +29 -7
- package/dist/lib/google-antigravity-companion.js.map +1 -1
- package/dist/lib/google-gemini-cli-companion.d.ts.map +1 -1
- package/dist/lib/google-gemini-cli-companion.js +64 -20
- package/dist/lib/google-gemini-cli-companion.js.map +1 -1
- package/dist/lib/grouped-entry-normalization.js +1 -1
- package/dist/lib/grouped-entry-normalization.js.map +1 -1
- package/dist/lib/nanogpt-config.d.ts +0 -11
- package/dist/lib/nanogpt-config.d.ts.map +1 -1
- package/dist/lib/nanogpt-config.js +20 -36
- package/dist/lib/nanogpt-config.js.map +1 -1
- package/dist/lib/quota-runtime-context.d.ts +1 -1
- package/dist/lib/quota-runtime-context.d.ts.map +1 -1
- package/dist/lib/quota-runtime-context.js +2 -0
- package/dist/lib/quota-runtime-context.js.map +1 -1
- package/dist/lib/synthetic-config.d.ts +0 -27
- package/dist/lib/synthetic-config.d.ts.map +1 -1
- package/dist/lib/synthetic-config.js +16 -46
- package/dist/lib/synthetic-config.js.map +1 -1
- package/dist/lib/toast-format-grouped.d.ts.map +1 -1
- package/dist/lib/toast-format-grouped.js +6 -3
- package/dist/lib/toast-format-grouped.js.map +1 -1
- package/dist/lib/tui-compact-format.d.ts.map +1 -1
- package/dist/lib/tui-compact-format.js +5 -2
- package/dist/lib/tui-compact-format.js.map +1 -1
- package/dist/providers/chutes.d.ts.map +1 -1
- package/dist/providers/chutes.js +11 -14
- package/dist/providers/chutes.js.map +1 -1
- package/dist/providers/crof.d.ts.map +1 -1
- package/dist/providers/crof.js +22 -23
- package/dist/providers/crof.js.map +1 -1
- package/dist/providers/nanogpt.d.ts.map +1 -1
- package/dist/providers/nanogpt.js +56 -56
- package/dist/providers/nanogpt.js.map +1 -1
- package/dist/providers/openai.d.ts.map +1 -1
- package/dist/providers/openai.js +13 -44
- package/dist/providers/openai.js.map +1 -1
- package/dist/providers/result-helpers.d.ts +21 -0
- package/dist/providers/result-helpers.d.ts.map +1 -1
- package/dist/providers/result-helpers.js +27 -0
- package/dist/providers/result-helpers.js.map +1 -1
- package/dist/providers/synthetic.d.ts.map +1 -1
- package/dist/providers/synthetic.js +17 -20
- package/dist/providers/synthetic.js.map +1 -1
- package/dist/providers/zai.d.ts.map +1 -1
- package/dist/providers/zai.js +13 -44
- package/dist/providers/zai.js.map +1 -1
- package/dist/providers/zhipu.d.ts.map +1 -1
- package/dist/providers/zhipu.js +13 -44
- package/dist/providers/zhipu.js.map +1 -1
- package/package.json +4 -4
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { readFile } from "fs/promises";
|
|
2
|
+
import { readdirSync } from "node:fs";
|
|
2
3
|
import { createRequire } from "node:module";
|
|
3
4
|
import { dirname, join } from "node:path";
|
|
4
5
|
import { pathToFileURL } from "node:url";
|
|
@@ -11,6 +12,12 @@ const COMPANION_JS_IMPORT_SPECIFIERS = [
|
|
|
11
12
|
];
|
|
12
13
|
const COMPANION_SOURCE_IMPORT_SPECIFIER = `${COMPANION_PACKAGE_NAME}/src/constants.ts`;
|
|
13
14
|
const COMPANION_PACKAGE_JSON_SPECIFIER = `${COMPANION_PACKAGE_NAME}/package.json`;
|
|
15
|
+
const COMPANION_DIRECT_CANDIDATE_PATHS = [
|
|
16
|
+
["src", "constants.ts"],
|
|
17
|
+
["src", "constants.js"],
|
|
18
|
+
["dist", "src", "constants.js"],
|
|
19
|
+
["dist", "index.js"],
|
|
20
|
+
];
|
|
14
21
|
const COMPANION_MISSING_ERROR = `Install ${COMPANION_PACKAGE_NAME} separately to enable Gemini CLI quota`;
|
|
15
22
|
const COMPANION_INVALID_ERROR = `Installed ${COMPANION_PACKAGE_NAME} package is incompatible`;
|
|
16
23
|
let resolvedCompanionStatePromise = null;
|
|
@@ -38,17 +45,48 @@ function normalizeCredential(value) {
|
|
|
38
45
|
return typeof value === "string" ? value.trim() : "";
|
|
39
46
|
}
|
|
40
47
|
function getCompanionResolvePaths() {
|
|
41
|
-
return getOpencodeRuntimeDirCandidates().cacheDirs;
|
|
48
|
+
return [...getOpencodeRuntimeDirCandidates().cacheDirs];
|
|
49
|
+
}
|
|
50
|
+
function getRuntimePackageRoots() {
|
|
51
|
+
const cacheDirs = getOpencodeRuntimeDirCandidates().cacheDirs;
|
|
52
|
+
const packageRoots = cacheDirs.map((cacheDir) => join(cacheDir, "node_modules", COMPANION_PACKAGE_NAME));
|
|
53
|
+
for (const cacheDir of cacheDirs) {
|
|
54
|
+
try {
|
|
55
|
+
const packagesDir = join(cacheDir, "packages");
|
|
56
|
+
const entries = readdirSync(packagesDir, { withFileTypes: true });
|
|
57
|
+
for (const entry of entries) {
|
|
58
|
+
if (entry.isDirectory() && entry.name.startsWith(COMPANION_PACKAGE_NAME)) {
|
|
59
|
+
packageRoots.push(join(packagesDir, entry.name));
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
catch {
|
|
64
|
+
// Ignore if packages dir doesn't exist
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
return packageRoots;
|
|
42
68
|
}
|
|
43
|
-
function
|
|
69
|
+
function markPackageFoundForExportBlock(error, context) {
|
|
70
|
+
if (isPackagePathNotExportedError(error)) {
|
|
71
|
+
context.packageFound = true;
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
function resolveCompanionSpecifier(specifier, context) {
|
|
44
75
|
try {
|
|
45
76
|
return require.resolve(specifier);
|
|
46
77
|
}
|
|
47
78
|
catch (error) {
|
|
79
|
+
markPackageFoundForExportBlock(error, context);
|
|
48
80
|
if (!isFallthroughResolutionError(error)) {
|
|
49
81
|
throw error;
|
|
50
82
|
}
|
|
51
|
-
|
|
83
|
+
try {
|
|
84
|
+
return require.resolve(specifier, { paths: getCompanionResolvePaths() });
|
|
85
|
+
}
|
|
86
|
+
catch (resolvePathsError) {
|
|
87
|
+
markPackageFoundForExportBlock(resolvePathsError, context);
|
|
88
|
+
throw resolvePathsError;
|
|
89
|
+
}
|
|
52
90
|
}
|
|
53
91
|
}
|
|
54
92
|
function buildConfiguredState(params) {
|
|
@@ -82,17 +120,19 @@ function buildInvalidState(importSpecifier, resolvedPath) {
|
|
|
82
120
|
};
|
|
83
121
|
}
|
|
84
122
|
function parseSourceCredentials(content) {
|
|
85
|
-
const clientId = content
|
|
86
|
-
|
|
123
|
+
const clientId = content
|
|
124
|
+
.match(/(?:export\s+const|const|var)\s+GEMINI_CLIENT_ID\s*=\s*["']([^"']+)["']/)?.[1]
|
|
125
|
+
?.trim() ?? "";
|
|
126
|
+
const clientSecret = content
|
|
127
|
+
.match(/(?:export\s+const|const|var)\s+GEMINI_CLIENT_SECRET\s*=\s*["']([^"']+)["']/)?.[1]
|
|
128
|
+
?.trim() ?? "";
|
|
87
129
|
return clientId && clientSecret ? { clientId, clientSecret } : null;
|
|
88
130
|
}
|
|
131
|
+
function getPackageCredentialPaths(packageRoot) {
|
|
132
|
+
return COMPANION_DIRECT_CANDIDATE_PATHS.map((parts) => join(packageRoot, ...parts));
|
|
133
|
+
}
|
|
89
134
|
function getRuntimeSourceConstantPaths() {
|
|
90
|
-
return
|
|
91
|
-
join(cacheDir, "node_modules", COMPANION_PACKAGE_NAME, "src", "constants.ts"),
|
|
92
|
-
join(cacheDir, "node_modules", COMPANION_PACKAGE_NAME, "src", "constants.js"),
|
|
93
|
-
join(cacheDir, "node_modules", COMPANION_PACKAGE_NAME, "dist", "src", "constants.js"),
|
|
94
|
-
join(cacheDir, "node_modules", COMPANION_PACKAGE_NAME, "dist", "index.js"),
|
|
95
|
-
]);
|
|
135
|
+
return getRuntimePackageRoots().flatMap((packageRoot) => getPackageCredentialPaths(packageRoot));
|
|
96
136
|
}
|
|
97
137
|
async function tryReadSourceConstantsPath(resolvedPath) {
|
|
98
138
|
try {
|
|
@@ -112,10 +152,10 @@ async function tryReadSourceConstantsPath(resolvedPath) {
|
|
|
112
152
|
return null;
|
|
113
153
|
}
|
|
114
154
|
}
|
|
115
|
-
async function tryResolveJsConstants(importSpecifier) {
|
|
155
|
+
async function tryResolveJsConstants(importSpecifier, context) {
|
|
116
156
|
let resolvedPath;
|
|
117
157
|
try {
|
|
118
|
-
resolvedPath = resolveCompanionSpecifier(importSpecifier);
|
|
158
|
+
resolvedPath = resolveCompanionSpecifier(importSpecifier, context);
|
|
119
159
|
}
|
|
120
160
|
catch (error) {
|
|
121
161
|
if (isFallthroughResolutionError(error)) {
|
|
@@ -137,9 +177,9 @@ async function tryResolveJsConstants(importSpecifier) {
|
|
|
137
177
|
}
|
|
138
178
|
return buildConfiguredState({ importSpecifier, resolvedPath, clientId, clientSecret });
|
|
139
179
|
}
|
|
140
|
-
async function tryResolvePackageEntry() {
|
|
180
|
+
async function tryResolvePackageEntry(context) {
|
|
141
181
|
try {
|
|
142
|
-
const packageEntryPath = resolveCompanionSpecifier(COMPANION_PACKAGE_NAME);
|
|
182
|
+
const packageEntryPath = resolveCompanionSpecifier(COMPANION_PACKAGE_NAME, context);
|
|
143
183
|
const packageEntryResolved = await tryReadSourceConstantsPath(packageEntryPath);
|
|
144
184
|
return packageEntryResolved ?? buildInvalidState(COMPANION_PACKAGE_NAME, packageEntryPath);
|
|
145
185
|
}
|
|
@@ -147,7 +187,7 @@ async function tryResolvePackageEntry() {
|
|
|
147
187
|
return isFallthroughResolutionError(error) ? null : buildInvalidState(COMPANION_PACKAGE_NAME);
|
|
148
188
|
}
|
|
149
189
|
}
|
|
150
|
-
async function tryResolveSourceConstants() {
|
|
190
|
+
async function tryResolveSourceConstants(context) {
|
|
151
191
|
let resolvedPath;
|
|
152
192
|
try {
|
|
153
193
|
resolvedPath = require.resolve(COMPANION_SOURCE_IMPORT_SPECIFIER);
|
|
@@ -163,7 +203,7 @@ async function tryResolveSourceConstants() {
|
|
|
163
203
|
}
|
|
164
204
|
}
|
|
165
205
|
try {
|
|
166
|
-
const packageJsonPath = resolveCompanionSpecifier(COMPANION_PACKAGE_JSON_SPECIFIER);
|
|
206
|
+
const packageJsonPath = resolveCompanionSpecifier(COMPANION_PACKAGE_JSON_SPECIFIER, context);
|
|
167
207
|
const packageRoot = dirname(packageJsonPath);
|
|
168
208
|
for (const candidatePath of [
|
|
169
209
|
join(packageRoot, "src", "constants.ts"),
|
|
@@ -178,7 +218,7 @@ async function tryResolveSourceConstants() {
|
|
|
178
218
|
}
|
|
179
219
|
catch (packageError) {
|
|
180
220
|
if (isFallthroughResolutionError(packageError)) {
|
|
181
|
-
return tryResolvePackageEntry();
|
|
221
|
+
return tryResolvePackageEntry(context);
|
|
182
222
|
}
|
|
183
223
|
return buildInvalidState(COMPANION_SOURCE_IMPORT_SPECIFIER);
|
|
184
224
|
}
|
|
@@ -187,16 +227,20 @@ async function tryResolveSourceConstants() {
|
|
|
187
227
|
buildInvalidState(COMPANION_SOURCE_IMPORT_SPECIFIER, resolvedPath));
|
|
188
228
|
}
|
|
189
229
|
async function resolveCompanionState() {
|
|
230
|
+
const context = { packageFound: false };
|
|
190
231
|
for (const importSpecifier of COMPANION_JS_IMPORT_SPECIFIERS) {
|
|
191
|
-
const resolved = await tryResolveJsConstants(importSpecifier);
|
|
232
|
+
const resolved = await tryResolveJsConstants(importSpecifier, context);
|
|
192
233
|
if (resolved) {
|
|
193
234
|
return resolved;
|
|
194
235
|
}
|
|
195
236
|
}
|
|
196
|
-
const sourceResolved = await tryResolveSourceConstants();
|
|
237
|
+
const sourceResolved = await tryResolveSourceConstants(context);
|
|
197
238
|
if (sourceResolved) {
|
|
198
239
|
return sourceResolved;
|
|
199
240
|
}
|
|
241
|
+
if (context.packageFound) {
|
|
242
|
+
return buildInvalidState(COMPANION_PACKAGE_NAME);
|
|
243
|
+
}
|
|
200
244
|
return {
|
|
201
245
|
presence: {
|
|
202
246
|
state: "missing",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google-gemini-cli-companion.js","sourceRoot":"","sources":["../../src/lib/google-gemini-cli-companion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,OAAO,EAAE,+BAA+B,EAAE,MAAM,6BAA6B,CAAC;AAE9E,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAE/C,MAAM,sBAAsB,GAAG,sBAAsB,CAAC;AACtD,MAAM,8BAA8B,GAAG;IACrC,GAAG,sBAAsB,wBAAwB;IACjD,GAAG,sBAAsB,mBAAmB;CACpC,CAAC;AACX,MAAM,iCAAiC,GAAG,GAAG,sBAAsB,mBAAmB,CAAC;AACvF,MAAM,gCAAgC,GAAG,GAAG,sBAAsB,eAAe,CAAC;AAClF,MAAM,uBAAuB,GAAG,WAAW,sBAAsB,wCAAwC,CAAC;AAC1G,MAAM,uBAAuB,GAAG,aAAa,sBAAsB,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"google-gemini-cli-companion.js","sourceRoot":"","sources":["../../src/lib/google-gemini-cli-companion.ts"],"names":[],"mappings":"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"}
|
|
@@ -63,7 +63,7 @@ function normalizeGroupedQuotaEntry(entry, target) {
|
|
|
63
63
|
return {
|
|
64
64
|
...normalized,
|
|
65
65
|
group: googleFallback.group,
|
|
66
|
-
label: label ?? googleFallback.label,
|
|
66
|
+
...(label || target === "quota" ? { label: label ?? googleFallback.label } : {}),
|
|
67
67
|
};
|
|
68
68
|
}
|
|
69
69
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grouped-entry-normalization.js","sourceRoot":"","sources":["../../src/lib/grouped-entry-normalization.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"grouped-entry-normalization.js","sourceRoot":"","sources":["../../src/lib/grouped-entry-normalization.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,7 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* NanoGPT API key configuration resolver.
|
|
3
|
-
*
|
|
4
|
-
* Resolution priority (first wins):
|
|
5
|
-
* 1. Environment variable: NANOGPT_API_KEY or NANO_GPT_API_KEY
|
|
6
|
-
* 2. User/global opencode.json/opencode.jsonc: provider.nanogpt.options.apiKey
|
|
7
|
-
* or provider["nano-gpt"].options.apiKey
|
|
8
|
-
* 3. auth.json: nanogpt.key or nano-gpt.key
|
|
9
|
-
*/
|
|
10
|
-
/** Result of NanoGPT API key resolution */
|
|
11
1
|
export interface NanoGptApiKeyResult {
|
|
12
2
|
key: string;
|
|
13
3
|
source: NanoGptKeySource;
|
|
14
4
|
}
|
|
15
|
-
/** Source of the resolved API key */
|
|
16
5
|
export type NanoGptKeySource = "env:NANOGPT_API_KEY" | "env:NANO_GPT_API_KEY" | "opencode.json" | "opencode.jsonc" | "auth.json";
|
|
17
6
|
export { getGlobalOpencodeConfigCandidatePaths as getOpencodeConfigCandidatePaths } from "./api-key-resolver.js";
|
|
18
7
|
export declare function resolveNanoGptApiKey(): Promise<NanoGptApiKeyResult | null>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nanogpt-config.d.ts","sourceRoot":"","sources":["../../src/lib/nanogpt-config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"nanogpt-config.d.ts","sourceRoot":"","sources":["../../src/lib/nanogpt-config.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,mBAAmB;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,gBAAgB,CAAC;CAC1B;AAKD,MAAM,MAAM,gBAAgB,GACxB,qBAAqB,GACrB,sBAAsB,GACtB,eAAe,GACf,gBAAgB,GAChB,WAAW,CAAC;AAEhB,OAAO,EAAE,qCAAqC,IAAI,+BAA+B,EAAE,MAAM,uBAAuB,CAAC;AAkBjH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAEhF;AAED,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC,CAEzD;AAED,wBAAsB,wBAAwB,IAAI,OAAO,CAAC;IACxD,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAChC,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC,CAKD"}
|
|
@@ -1,49 +1,33 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* NanoGPT API key configuration resolver.
|
|
3
|
-
*
|
|
4
|
-
* Resolution priority (first wins):
|
|
5
|
-
* 1. Environment variable: NANOGPT_API_KEY or NANO_GPT_API_KEY
|
|
6
|
-
* 2. User/global opencode.json/opencode.jsonc: provider.nanogpt.options.apiKey
|
|
7
|
-
* or provider["nano-gpt"].options.apiKey
|
|
8
|
-
* 3. auth.json: nanogpt.key or nano-gpt.key
|
|
9
|
-
*/
|
|
10
1
|
import { getAuthPaths, readAuthFile } from "./opencode-auth.js";
|
|
11
|
-
import {
|
|
2
|
+
import { createProviderApiKeyResolver, getGlobalOpencodeConfigCandidatePaths, } from "./api-key-resolver.js";
|
|
12
3
|
const ALLOWED_NANOGPT_ENV_VARS = ["NANOGPT_API_KEY", "NANO_GPT_API_KEY"];
|
|
13
4
|
const NANOGPT_PROVIDER_KEYS = ["nanogpt", "nano-gpt"];
|
|
14
|
-
// Re-export for consumers that need path info
|
|
15
5
|
export { getGlobalOpencodeConfigCandidatePaths as getOpencodeConfigCandidatePaths } from "./api-key-resolver.js";
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
extractFromAuth: (auth) => extractAuthApiKeyEntry(auth, NANOGPT_PROVIDER_KEYS),
|
|
6
|
+
const nanoGptApiKeyResolver = createProviderApiKeyResolver({
|
|
7
|
+
envVars: [
|
|
8
|
+
{ name: "NANOGPT_API_KEY", source: "env:NANOGPT_API_KEY" },
|
|
9
|
+
{ name: "NANO_GPT_API_KEY", source: "env:NANO_GPT_API_KEY" },
|
|
10
|
+
],
|
|
11
|
+
providerKeys: NANOGPT_PROVIDER_KEYS,
|
|
12
|
+
allowedEnvVars: ALLOWED_NANOGPT_ENV_VARS,
|
|
13
|
+
configJsonSource: "opencode.json",
|
|
14
|
+
configJsoncSource: "opencode.jsonc",
|
|
15
|
+
getConfigCandidates: getGlobalOpencodeConfigCandidatePaths,
|
|
16
|
+
auth: {
|
|
17
|
+
readAuth: readAuthFile,
|
|
29
18
|
authSource: "auth.json",
|
|
30
|
-
|
|
31
|
-
|
|
19
|
+
},
|
|
20
|
+
});
|
|
21
|
+
export async function resolveNanoGptApiKey() {
|
|
22
|
+
return nanoGptApiKeyResolver.resolve();
|
|
32
23
|
}
|
|
33
24
|
export async function hasNanoGptApiKey() {
|
|
34
|
-
|
|
35
|
-
return result !== null;
|
|
25
|
+
return nanoGptApiKeyResolver.has();
|
|
36
26
|
}
|
|
37
27
|
export async function getNanoGptKeyDiagnostics() {
|
|
38
|
-
const authPaths = getAuthPaths();
|
|
39
|
-
const diagnostics = await getApiKeyDiagnostics({
|
|
40
|
-
envVarNames: ["NANOGPT_API_KEY", "NANO_GPT_API_KEY"],
|
|
41
|
-
resolve: resolveNanoGptApiKey,
|
|
42
|
-
getConfigCandidates: getGlobalOpencodeConfigCandidatePaths,
|
|
43
|
-
});
|
|
44
28
|
return {
|
|
45
|
-
...diagnostics,
|
|
46
|
-
authPaths,
|
|
29
|
+
...(await nanoGptApiKeyResolver.diagnostics()),
|
|
30
|
+
authPaths: getAuthPaths(),
|
|
47
31
|
};
|
|
48
32
|
}
|
|
49
33
|
//# sourceMappingURL=nanogpt-config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nanogpt-config.js","sourceRoot":"","sources":["../../src/lib/nanogpt-config.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"nanogpt-config.js","sourceRoot":"","sources":["../../src/lib/nanogpt-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EACL,4BAA4B,EAC5B,qCAAqC,GACtC,MAAM,uBAAuB,CAAC;AAO/B,MAAM,wBAAwB,GAAG,CAAC,iBAAiB,EAAE,kBAAkB,CAAU,CAAC;AAClF,MAAM,qBAAqB,GAAG,CAAC,SAAS,EAAE,UAAU,CAAU,CAAC;AAS/D,OAAO,EAAE,qCAAqC,IAAI,+BAA+B,EAAE,MAAM,uBAAuB,CAAC;AAEjH,MAAM,qBAAqB,GAAG,4BAA4B,CAAmB;IAC3E,OAAO,EAAE;QACP,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,EAAE,qBAAqB,EAAE;QAC1D,EAAE,IAAI,EAAE,kBAAkB,EAAE,MAAM,EAAE,sBAAsB,EAAE;KAC7D;IACD,YAAY,EAAE,qBAAqB;IACnC,cAAc,EAAE,wBAAwB;IACxC,gBAAgB,EAAE,eAAe;IACjC,iBAAiB,EAAE,gBAAgB;IACnC,mBAAmB,EAAE,qCAAqC;IAC1D,IAAI,EAAE;QACJ,QAAQ,EAAE,YAAY;QACtB,UAAU,EAAE,WAAW;KACxB;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,KAAK,UAAU,oBAAoB;IACxC,OAAO,qBAAqB,CAAC,OAAO,EAAE,CAAC;AACzC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB;IACpC,OAAO,qBAAqB,CAAC,GAAG,EAAE,CAAC;AACrC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB;IAM5C,OAAO;QACL,GAAG,CAAC,MAAM,qBAAqB,CAAC,WAAW,EAAE,CAAC;QAC9C,SAAS,EAAE,YAAY,EAAE;KAC1B,CAAC;AACJ,CAAC"}
|
|
@@ -39,5 +39,5 @@ export declare function createQuotaRuntimeRequestContext(runtime: Pick<QuotaRunt
|
|
|
39
39
|
sessionID?: string;
|
|
40
40
|
sessionMeta?: QuotaSessionModelContext;
|
|
41
41
|
};
|
|
42
|
-
export declare function createQuotaProviderRuntimeContext(runtime: Pick<QuotaRuntimeContext, "client" | "config" | "session">): QuotaProviderContext;
|
|
42
|
+
export declare function createQuotaProviderRuntimeContext(runtime: Pick<QuotaRuntimeContext, "client" | "config" | "session"> & Partial<Pick<QuotaRuntimeContext, "configMeta">>): QuotaProviderContext;
|
|
43
43
|
//# sourceMappingURL=quota-runtime-context.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quota-runtime-context.d.ts","sourceRoot":"","sources":["../../src/lib/quota-runtime-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACxE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,KAAK,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE3F,OAAO,EAAwB,UAAU,EAAE,MAAM,aAAa,CAAC;AAI/D,MAAM,MAAM,kBAAkB,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,GAC5E,oBAAoB,CAAC,QAAQ,CAAC,CAAC;AAEjC,MAAM,WAAW,wBAAwB;IACvC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,gCAAgC;IAC/C,MAAM,EAAE,kBAAkB,CAAC;IAC3B,KAAK,EAAE,uBAAuB,CAAC;IAC/B,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,wBAAwB,CAAC;IACvC,kBAAkB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,wBAAwB,CAAC,CAAC;IAC9E,kBAAkB,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,MAAM,EAAE,gBAAgB,KAAK,OAAO,CAAC,CAAC;IACvE,UAAU,CAAC,EAAE,cAAc,CAAC;IAC5B,SAAS,CAAC,EAAE,aAAa,EAAE,CAAC;CAC7B;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,kBAAkB,CAAC;IAC3B,KAAK,EAAE,mBAAmB,CAAC;IAC3B,MAAM,EAAE,gBAAgB,CAAC;IACzB,UAAU,EAAE,cAAc,CAAC;IAC3B,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,OAAO,EAAE;QACP,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,WAAW,CAAC,EAAE,wBAAwB,CAAC;KACxC,CAAC;CACH;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE;IAC/C,MAAM,EAAE,gBAAgB,CAAC;IACzB,kBAAkB,CAAC,EAAE,gCAAgC,CAAC,oBAAoB,CAAC,CAAC;CAC7E,GAAG,OAAO,CAMV;AAED,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,gCAAgC,GACvC,OAAO,CAAC,mBAAmB,CAAC,CAiC9B;AAED,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,IAAI,CAAC,mBAAmB,EAAE,SAAS,CAAC,GAC5C;IACD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,wBAAwB,CAAC;CACxC,CAKA;AAED,wBAAgB,iCAAiC,CAC/C,OAAO,EAAE,IAAI,CAAC,mBAAmB,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"quota-runtime-context.d.ts","sourceRoot":"","sources":["../../src/lib/quota-runtime-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACxE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,KAAK,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE3F,OAAO,EAAwB,UAAU,EAAE,MAAM,aAAa,CAAC;AAI/D,MAAM,MAAM,kBAAkB,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,GAC5E,oBAAoB,CAAC,QAAQ,CAAC,CAAC;AAEjC,MAAM,WAAW,wBAAwB;IACvC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,gCAAgC;IAC/C,MAAM,EAAE,kBAAkB,CAAC;IAC3B,KAAK,EAAE,uBAAuB,CAAC;IAC/B,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,wBAAwB,CAAC;IACvC,kBAAkB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,wBAAwB,CAAC,CAAC;IAC9E,kBAAkB,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,MAAM,EAAE,gBAAgB,KAAK,OAAO,CAAC,CAAC;IACvE,UAAU,CAAC,EAAE,cAAc,CAAC;IAC5B,SAAS,CAAC,EAAE,aAAa,EAAE,CAAC;CAC7B;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,kBAAkB,CAAC;IAC3B,KAAK,EAAE,mBAAmB,CAAC;IAC3B,MAAM,EAAE,gBAAgB,CAAC;IACzB,UAAU,EAAE,cAAc,CAAC;IAC3B,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,OAAO,EAAE;QACP,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,WAAW,CAAC,EAAE,wBAAwB,CAAC;KACxC,CAAC;CACH;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE;IAC/C,MAAM,EAAE,gBAAgB,CAAC;IACzB,kBAAkB,CAAC,EAAE,gCAAgC,CAAC,oBAAoB,CAAC,CAAC;CAC7E,GAAG,OAAO,CAMV;AAED,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,gCAAgC,GACvC,OAAO,CAAC,mBAAmB,CAAC,CAiC9B;AAED,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,IAAI,CAAC,mBAAmB,EAAE,SAAS,CAAC,GAC5C;IACD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,wBAAwB,CAAC;CACxC,CAKA;AAED,wBAAgB,iCAAiC,CAC/C,OAAO,EAAE,IAAI,CAAC,mBAAmB,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC,GACjE,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,YAAY,CAAC,CAAC,GACjD,oBAAoB,CAsBtB"}
|
|
@@ -53,6 +53,8 @@ export function createQuotaProviderRuntimeContext(runtime) {
|
|
|
53
53
|
cursorIncludedApiUsd: runtime.config.cursorIncludedApiUsd,
|
|
54
54
|
cursorBillingCycleStartDay: runtime.config.cursorBillingCycleStartDay,
|
|
55
55
|
opencodeGoWindows: runtime.config.opencodeGoWindows,
|
|
56
|
+
requestTimeoutMs: runtime.config.requestTimeoutMs,
|
|
57
|
+
requestTimeoutMsConfigured: Boolean(runtime.configMeta?.settingSources.requestTimeoutMs),
|
|
56
58
|
onlyCurrentModel: runtime.config.onlyCurrentModel,
|
|
57
59
|
enabledProviders: runtime.config.enabledProviders === "auto"
|
|
58
60
|
? "auto"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quota-runtime-context.js","sourceRoot":"","sources":["../../src/lib/quota-runtime-context.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAkCpE,MAAM,UAAU,wBAAwB,CAAC,MAGxC;IACC,IAAI,OAAO,MAAM,CAAC,kBAAkB,KAAK,UAAU,EAAE,CAAC;QACpD,OAAO,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAClD,CAAC;IAED,OAAO,MAAM,CAAC,kBAAkB,KAAK,IAAI,CAAC;AAC5C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,MAAwC;IAExC,MAAM,KAAK,GAAG,0BAA0B,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACvD,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,oBAAoB,EAAE,CAAC;IAC/D,MAAM,MAAM,GACV,MAAM,CAAC,MAAM;QACb,CAAC,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE;YAC3C,aAAa,EAAE,KAAK,CAAC,UAAU;SAChC,CAAC,CAAC,CAAC;IAEN,IAAI,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;IACrC,IACE,CAAC,WAAW;QACZ,MAAM,CAAC,SAAS;QAChB,MAAM,CAAC,kBAAkB;QACzB,wBAAwB,CAAC;YACvB,MAAM;YACN,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;SAC9C,CAAC,EACF,CAAC;QACD,WAAW,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAClE,CAAC;IAED,OAAO;QACL,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,KAAK;QACL,MAAM;QACN,UAAU;QACV,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,YAAY,EAAE;QAC7C,OAAO,EAAE;YACP,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,WAAW;SACZ;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gCAAgC,CAC9C,OAA6C;IAK7C,OAAO;QACL,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,SAAS;QACpC,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,WAAW;KACzC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iCAAiC,CAC/C,
|
|
1
|
+
{"version":3,"file":"quota-runtime-context.js","sourceRoot":"","sources":["../../src/lib/quota-runtime-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,38 +1,11 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Synthetic API key configuration resolver
|
|
3
|
-
*
|
|
4
|
-
* Resolution priority (first wins):
|
|
5
|
-
* 1. Environment variable: SYNTHETIC_API_KEY
|
|
6
|
-
* 2. User/global opencode.json/opencode.jsonc: provider.synthetic.options.apiKey
|
|
7
|
-
* - Supports {env:SYNTHETIC_API_KEY} syntax for environment variable references
|
|
8
|
-
* 3. auth.json: synthetic.key (legacy/fallback)
|
|
9
|
-
*/
|
|
10
|
-
/** Result of Synthetic API key resolution */
|
|
11
1
|
export interface SyntheticApiKeyResult {
|
|
12
2
|
key: string;
|
|
13
3
|
source: SyntheticKeySource;
|
|
14
4
|
}
|
|
15
|
-
/** Source of the resolved API key */
|
|
16
5
|
export type SyntheticKeySource = "env:SYNTHETIC_API_KEY" | "opencode.json" | "opencode.jsonc" | "auth.json";
|
|
17
6
|
export { getGlobalOpencodeConfigCandidatePaths as getOpencodeConfigCandidatePaths } from "./api-key-resolver.js";
|
|
18
|
-
/**
|
|
19
|
-
* Resolve Synthetic API key from all available sources.
|
|
20
|
-
*
|
|
21
|
-
* Priority (first wins):
|
|
22
|
-
* 1. Environment variable: SYNTHETIC_API_KEY
|
|
23
|
-
* 2. User/global opencode.json/opencode.jsonc: provider.synthetic.options.apiKey
|
|
24
|
-
* 3. auth.json: synthetic.key
|
|
25
|
-
*
|
|
26
|
-
* @returns API key and source, or null if not found
|
|
27
|
-
*/
|
|
28
7
|
export declare function resolveSyntheticApiKey(): Promise<SyntheticApiKeyResult | null>;
|
|
29
|
-
/**
|
|
30
|
-
* Check if a Synthetic API key is configured
|
|
31
|
-
*/
|
|
32
8
|
export declare function hasSyntheticApiKey(): Promise<boolean>;
|
|
33
|
-
/**
|
|
34
|
-
* Get diagnostic info about Synthetic API key configuration
|
|
35
|
-
*/
|
|
36
9
|
export declare function getSyntheticKeyDiagnostics(): Promise<{
|
|
37
10
|
configured: boolean;
|
|
38
11
|
source: SyntheticKeySource | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"synthetic-config.d.ts","sourceRoot":"","sources":["../../src/lib/synthetic-config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"synthetic-config.d.ts","sourceRoot":"","sources":["../../src/lib/synthetic-config.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,qBAAqB;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,kBAAkB,CAAC;CAC5B;AAKD,MAAM,MAAM,kBAAkB,GAC1B,uBAAuB,GACvB,eAAe,GACf,gBAAgB,GAChB,WAAW,CAAC;AAEhB,OAAO,EAAE,qCAAqC,IAAI,+BAA+B,EAAE,MAAM,uBAAuB,CAAC;AAejH,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC,CAEpF;AAED,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC,CAE3D;AAED,wBAAsB,0BAA0B,IAAI,OAAO,CAAC;IAC1D,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAClC,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC,CAED"}
|
|
@@ -1,57 +1,27 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Synthetic API key configuration resolver
|
|
3
|
-
*
|
|
4
|
-
* Resolution priority (first wins):
|
|
5
|
-
* 1. Environment variable: SYNTHETIC_API_KEY
|
|
6
|
-
* 2. User/global opencode.json/opencode.jsonc: provider.synthetic.options.apiKey
|
|
7
|
-
* - Supports {env:SYNTHETIC_API_KEY} syntax for environment variable references
|
|
8
|
-
* 3. auth.json: synthetic.key (legacy/fallback)
|
|
9
|
-
*/
|
|
10
1
|
import { readAuthFile } from "./opencode-auth.js";
|
|
11
|
-
import {
|
|
2
|
+
import { createProviderApiKeyResolver, getGlobalOpencodeConfigCandidatePaths, } from "./api-key-resolver.js";
|
|
12
3
|
const ALLOWED_SYNTHETIC_ENV_VARS = ["SYNTHETIC_API_KEY"];
|
|
13
4
|
const SYNTHETIC_PROVIDER_KEYS = ["synthetic"];
|
|
14
|
-
// Re-export for consumers that need path info
|
|
15
5
|
export { getGlobalOpencodeConfigCandidatePaths as getOpencodeConfigCandidatePaths } from "./api-key-resolver.js";
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
*/
|
|
26
|
-
export async function resolveSyntheticApiKey() {
|
|
27
|
-
return resolveApiKey({
|
|
28
|
-
envVars: [{ name: "SYNTHETIC_API_KEY", source: "env:SYNTHETIC_API_KEY" }],
|
|
29
|
-
extractFromConfig: (config) => extractProviderOptionsApiKey(config, {
|
|
30
|
-
providerKeys: SYNTHETIC_PROVIDER_KEYS,
|
|
31
|
-
allowedEnvVars: ALLOWED_SYNTHETIC_ENV_VARS,
|
|
32
|
-
}),
|
|
33
|
-
configJsonSource: "opencode.json",
|
|
34
|
-
configJsoncSource: "opencode.jsonc",
|
|
35
|
-
extractFromAuth: (auth) => extractAuthApiKeyEntry(auth, SYNTHETIC_PROVIDER_KEYS),
|
|
6
|
+
const syntheticApiKeyResolver = createProviderApiKeyResolver({
|
|
7
|
+
envVars: [{ name: "SYNTHETIC_API_KEY", source: "env:SYNTHETIC_API_KEY" }],
|
|
8
|
+
providerKeys: SYNTHETIC_PROVIDER_KEYS,
|
|
9
|
+
allowedEnvVars: ALLOWED_SYNTHETIC_ENV_VARS,
|
|
10
|
+
configJsonSource: "opencode.json",
|
|
11
|
+
configJsoncSource: "opencode.jsonc",
|
|
12
|
+
getConfigCandidates: getGlobalOpencodeConfigCandidatePaths,
|
|
13
|
+
auth: {
|
|
14
|
+
readAuth: readAuthFile,
|
|
36
15
|
authSource: "auth.json",
|
|
37
|
-
|
|
38
|
-
|
|
16
|
+
},
|
|
17
|
+
});
|
|
18
|
+
export async function resolveSyntheticApiKey() {
|
|
19
|
+
return syntheticApiKeyResolver.resolve();
|
|
39
20
|
}
|
|
40
|
-
/**
|
|
41
|
-
* Check if a Synthetic API key is configured
|
|
42
|
-
*/
|
|
43
21
|
export async function hasSyntheticApiKey() {
|
|
44
|
-
|
|
45
|
-
return result !== null;
|
|
22
|
+
return syntheticApiKeyResolver.has();
|
|
46
23
|
}
|
|
47
|
-
/**
|
|
48
|
-
* Get diagnostic info about Synthetic API key configuration
|
|
49
|
-
*/
|
|
50
24
|
export async function getSyntheticKeyDiagnostics() {
|
|
51
|
-
return
|
|
52
|
-
envVarNames: ["SYNTHETIC_API_KEY"],
|
|
53
|
-
resolve: resolveSyntheticApiKey,
|
|
54
|
-
getConfigCandidates: getGlobalOpencodeConfigCandidatePaths,
|
|
55
|
-
});
|
|
25
|
+
return syntheticApiKeyResolver.diagnostics();
|
|
56
26
|
}
|
|
57
27
|
//# sourceMappingURL=synthetic-config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"synthetic-config.js","sourceRoot":"","sources":["../../src/lib/synthetic-config.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"synthetic-config.js","sourceRoot":"","sources":["../../src/lib/synthetic-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EACL,4BAA4B,EAC5B,qCAAqC,GACtC,MAAM,uBAAuB,CAAC;AAO/B,MAAM,0BAA0B,GAAG,CAAC,mBAAmB,CAAU,CAAC;AAClE,MAAM,uBAAuB,GAAG,CAAC,WAAW,CAAU,CAAC;AAQvD,OAAO,EAAE,qCAAqC,IAAI,+BAA+B,EAAE,MAAM,uBAAuB,CAAC;AAEjH,MAAM,uBAAuB,GAAG,4BAA4B,CAAqB;IAC/E,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,mBAAmB,EAAE,MAAM,EAAE,uBAAuB,EAAE,CAAC;IACzE,YAAY,EAAE,uBAAuB;IACrC,cAAc,EAAE,0BAA0B;IAC1C,gBAAgB,EAAE,eAAe;IACjC,iBAAiB,EAAE,gBAAgB;IACnC,mBAAmB,EAAE,qCAAqC;IAC1D,IAAI,EAAE;QACJ,QAAQ,EAAE,YAAY;QACtB,UAAU,EAAE,WAAW;KACxB;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,KAAK,UAAU,sBAAsB;IAC1C,OAAO,uBAAuB,CAAC,OAAO,EAAE,CAAC;AAC3C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB;IACtC,OAAO,uBAAuB,CAAC,GAAG,EAAE,CAAC;AACvC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,0BAA0B;IAK9C,OAAO,uBAAuB,CAAC,WAAW,EAAE,CAAC;AAC/C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toast-format-grouped.d.ts","sourceRoot":"","sources":["../../src/lib/toast-format-grouped.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"toast-format-grouped.d.ts","sourceRoot":"","sources":["../../src/lib/toast-format-grouped.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAgDxF,wBAAgB,sBAAsB,CAAC,MAAM,EAAE;IAC7C,MAAM,CAAC,EAAE;QACP,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;IAC5B,MAAM,CAAC,EAAE,eAAe,EAAE,CAAC;IAC3B,kBAAkB,CAAC,EAAE,gBAAgB,CAAC,oBAAoB,CAAC,CAAC;IAC5D,aAAa,CAAC,EAAE,iBAAiB,CAAC;CACnC,GAAG,MAAM,CA8IT"}
|
|
@@ -37,9 +37,12 @@ function extractWindowLabel(text) {
|
|
|
37
37
|
return null;
|
|
38
38
|
}
|
|
39
39
|
function resolveGroupedRowLabel(entry) {
|
|
40
|
-
const
|
|
40
|
+
const rawLabel = normalizeLabelText(entry.label);
|
|
41
|
+
const fromLabel = extractWindowLabel(rawLabel);
|
|
41
42
|
if (fromLabel)
|
|
42
43
|
return `${fromLabel} window`;
|
|
44
|
+
if (rawLabel)
|
|
45
|
+
return rawLabel;
|
|
43
46
|
const fromName = extractWindowLabel(entry.name);
|
|
44
47
|
if (fromName)
|
|
45
48
|
return `${fromName} window`;
|
|
@@ -128,8 +131,8 @@ export function formatQuotaRowsGrouped(params) {
|
|
|
128
131
|
}
|
|
129
132
|
// Line 1: label + optional right + time at end
|
|
130
133
|
const timeWidth = Math.max(timeStr.length, timeCol);
|
|
131
|
-
const leftMax = Math.max(1,
|
|
132
|
-
lines.push((padRight(label, leftMax) + separator + padLeft(timeStr, timeWidth)).slice(0,
|
|
134
|
+
const leftMax = Math.max(1, maxWidth - separator.length - timeWidth);
|
|
135
|
+
lines.push((padRight(label, leftMax) + separator + padLeft(timeStr, timeWidth)).slice(0, maxWidth));
|
|
133
136
|
// Line 2: bar + percent
|
|
134
137
|
const barCell = bar(displayedPercent, barWidth);
|
|
135
138
|
const percentCell = padLeft(percentLabel, percentCol);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toast-format-grouped.js","sourceRoot":"","sources":["../../src/lib/toast-format-grouped.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EACL,GAAG,EACH,6BAA6B,EAC7B,2BAA2B,EAC3B,oBAAoB,EACpB,OAAO,EACP,QAAQ,EACR,uBAAuB,GACxB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,4BAA4B,EAAE,MAAM,kCAAkC,CAAC;AAChF,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAEtE,SAAS,kBAAkB,CAAC,KAAc;IACxC,OAAO,KAAK,EAAE,IAAI,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;AACxD,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAY;IACtC,MAAM,KAAK,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;IACrD,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IAExB,IAAI,wCAAwC,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACvE,IAAI,2DAA2D,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACzF,IAAI,2CAA2C,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,QAAQ,CAAC;IAC7E,IAAI,yCAAyC,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,QAAQ,CAAC;IAC3E,IAAI,uCAAuC,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,OAAO,CAAC;IACxE,IAAI,wBAAwB,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAC3D,IAAI,sCAAsC,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,QAAQ,CAAC;IACxE,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACzC,IAAI,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,aAAa,CAAC;IAEzD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,sBAAsB,CAAC,KAAsB;IACpD,MAAM,
|
|
1
|
+
{"version":3,"file":"toast-format-grouped.js","sourceRoot":"","sources":["../../src/lib/toast-format-grouped.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tui-compact-format.d.ts","sourceRoot":"","sources":["../../src/lib/tui-compact-format.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"tui-compact-format.d.ts","sourceRoot":"","sources":["../../src/lib/tui-compact-format.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAyMnD,wBAAgB,2BAA2B,CAAC,MAAM,EAAE;IAClD,IAAI,EAAE,eAAe,CAAC;IACtB,kBAAkB,CAAC,EAAE,gBAAgB,CAAC,oBAAoB,CAAC,CAAC;IAC5D,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,MAAM,CA2BT"}
|
|
@@ -63,8 +63,11 @@ function getProviderName(entry) {
|
|
|
63
63
|
return formatCompactProviderLabel(entry.name);
|
|
64
64
|
}
|
|
65
65
|
function getWindowLabel(entry) {
|
|
66
|
-
const
|
|
67
|
-
|
|
66
|
+
const windowLabel = extractSingleWindowWindowLabel(entry.label ?? "") ?? extractSingleWindowWindowLabel(entry.name);
|
|
67
|
+
if (windowLabel)
|
|
68
|
+
return formatWindowLabel(windowLabel);
|
|
69
|
+
const explicitLabel = entry.label?.trim().replace(/:+$/u, "").trim();
|
|
70
|
+
return explicitLabel ? compactText(explicitLabel) : null;
|
|
68
71
|
}
|
|
69
72
|
function formatCompactValueEntrySegment(entry) {
|
|
70
73
|
const name = getProviderName(entry);
|