@slkiser/opencode-quota 4.8.1 → 4.9.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +17 -18
- package/dist/bin/opencode-quota.d.ts.map +1 -1
- package/dist/bin/opencode-quota.js +5 -3
- package/dist/bin/opencode-quota.js.map +1 -1
- package/dist/lib/accounting-format.d.ts +54 -0
- package/dist/lib/accounting-format.d.ts.map +1 -0
- package/dist/lib/accounting-format.js +271 -0
- package/dist/lib/accounting-format.js.map +1 -0
- package/dist/lib/anthropic.d.ts +2 -0
- package/dist/lib/anthropic.d.ts.map +1 -1
- package/dist/lib/anthropic.js +79 -19
- package/dist/lib/anthropic.js.map +1 -1
- package/dist/lib/cli-show.d.ts.map +1 -1
- package/dist/lib/cli-show.js +1 -0
- package/dist/lib/cli-show.js.map +1 -1
- package/dist/lib/config.d.ts +10 -1
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/config.js +35 -3
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/copilot.d.ts +2 -0
- package/dist/lib/copilot.d.ts.map +1 -1
- package/dist/lib/copilot.js +38 -0
- package/dist/lib/copilot.js.map +1 -1
- package/dist/lib/deepseek.d.ts +12 -12
- package/dist/lib/deepseek.d.ts.map +1 -1
- package/dist/lib/deepseek.js +33 -29
- package/dist/lib/deepseek.js.map +1 -1
- package/dist/lib/display-sanitize.d.ts.map +1 -1
- package/dist/lib/display-sanitize.js +76 -22
- package/dist/lib/display-sanitize.js.map +1 -1
- package/dist/lib/entries.d.ts +107 -23
- package/dist/lib/entries.d.ts.map +1 -1
- package/dist/lib/entries.js +37 -1
- package/dist/lib/entries.js.map +1 -1
- package/dist/lib/format.d.ts +1 -0
- package/dist/lib/format.d.ts.map +1 -1
- package/dist/lib/format.js +84 -19
- package/dist/lib/format.js.map +1 -1
- package/dist/lib/glm-coding-plan.d.ts.map +1 -1
- package/dist/lib/glm-coding-plan.js +4 -2
- package/dist/lib/glm-coding-plan.js.map +1 -1
- package/dist/lib/google-agy.d.ts +2 -0
- package/dist/lib/google-agy.d.ts.map +1 -1
- package/dist/lib/google-agy.js +29 -14
- package/dist/lib/google-agy.js.map +1 -1
- package/dist/lib/google-gemini-cli.d.ts +2 -0
- package/dist/lib/google-gemini-cli.d.ts.map +1 -1
- package/dist/lib/google-gemini-cli.js +29 -3
- package/dist/lib/google-gemini-cli.js.map +1 -1
- package/dist/lib/google-token-cache.d.ts +5 -8
- package/dist/lib/google-token-cache.d.ts.map +1 -1
- package/dist/lib/google-token-cache.js +30 -118
- package/dist/lib/google-token-cache.js.map +1 -1
- package/dist/lib/google.d.ts +2 -0
- package/dist/lib/google.d.ts.map +1 -1
- package/dist/lib/google.js +31 -6
- package/dist/lib/google.js.map +1 -1
- package/dist/lib/grouped-entry-normalization.d.ts.map +1 -1
- package/dist/lib/grouped-entry-normalization.js +53 -20
- package/dist/lib/grouped-entry-normalization.js.map +1 -1
- package/dist/lib/minimax-auth.d.ts +1 -1
- package/dist/lib/minimax-auth.js +1 -1
- package/dist/lib/nanogpt.d.ts +5 -5
- package/dist/lib/nanogpt.d.ts.map +1 -1
- package/dist/lib/nanogpt.js +59 -23
- package/dist/lib/nanogpt.js.map +1 -1
- package/dist/lib/openai.d.ts +4 -0
- package/dist/lib/openai.d.ts.map +1 -1
- package/dist/lib/openai.js +22 -3
- package/dist/lib/openai.js.map +1 -1
- package/dist/lib/opencode-go-auth.js +1 -1
- package/dist/lib/opencode-go-auth.js.map +1 -1
- package/dist/lib/opencode-go.d.ts.map +1 -1
- package/dist/lib/opencode-go.js +6 -1
- package/dist/lib/opencode-go.js.map +1 -1
- package/dist/lib/opencode-zen-config.d.ts +0 -1
- package/dist/lib/opencode-zen-config.d.ts.map +1 -1
- package/dist/lib/opencode-zen-config.js +0 -22
- package/dist/lib/opencode-zen-config.js.map +1 -1
- package/dist/lib/opencode-zen.d.ts +3 -0
- package/dist/lib/opencode-zen.d.ts.map +1 -1
- package/dist/lib/opencode-zen.js +18 -1
- package/dist/lib/opencode-zen.js.map +1 -1
- package/dist/lib/openrouter.d.ts +2 -0
- package/dist/lib/openrouter.d.ts.map +1 -1
- package/dist/lib/openrouter.js +10 -0
- package/dist/lib/openrouter.js.map +1 -1
- package/dist/lib/provider-metadata.d.ts +3 -307
- package/dist/lib/provider-metadata.d.ts.map +1 -1
- package/dist/lib/provider-metadata.js +18 -316
- package/dist/lib/provider-metadata.js.map +1 -1
- package/dist/lib/provider-registration.d.ts +325 -0
- package/dist/lib/provider-registration.d.ts.map +1 -0
- package/dist/lib/provider-registration.js +338 -0
- package/dist/lib/provider-registration.js.map +1 -0
- package/dist/lib/quota-accounting-projection.d.ts +7 -0
- package/dist/lib/quota-accounting-projection.d.ts.map +1 -0
- package/dist/lib/quota-accounting-projection.js +239 -0
- package/dist/lib/quota-accounting-projection.js.map +1 -0
- package/dist/lib/quota-command-format.d.ts +3 -2
- package/dist/lib/quota-command-format.d.ts.map +1 -1
- package/dist/lib/quota-command-format.js +35 -9
- package/dist/lib/quota-command-format.js.map +1 -1
- package/dist/lib/quota-dialog-commands.d.ts.map +1 -1
- package/dist/lib/quota-dialog-commands.js +1 -0
- package/dist/lib/quota-dialog-commands.js.map +1 -1
- package/dist/lib/quota-export.d.ts +2 -1
- package/dist/lib/quota-export.d.ts.map +1 -1
- package/dist/lib/quota-export.js +36 -10
- package/dist/lib/quota-export.js.map +1 -1
- package/dist/lib/quota-render-data.d.ts +0 -1
- package/dist/lib/quota-render-data.d.ts.map +1 -1
- package/dist/lib/quota-render-data.js +43 -155
- package/dist/lib/quota-render-data.js.map +1 -1
- package/dist/lib/quota-reset-notifications.d.ts.map +1 -1
- package/dist/lib/quota-reset-notifications.js +3 -0
- package/dist/lib/quota-reset-notifications.js.map +1 -1
- package/dist/lib/quota-state-codec.d.ts +16 -0
- package/dist/lib/quota-state-codec.d.ts.map +1 -0
- package/dist/lib/quota-state-codec.js +409 -0
- package/dist/lib/quota-state-codec.js.map +1 -0
- package/dist/lib/quota-state.d.ts +2 -11
- package/dist/lib/quota-state.d.ts.map +1 -1
- package/dist/lib/quota-state.js +165 -304
- package/dist/lib/quota-state.js.map +1 -1
- package/dist/lib/quota-status.d.ts.map +1 -1
- package/dist/lib/quota-status.js +14 -7
- package/dist/lib/quota-status.js.map +1 -1
- package/dist/lib/quota-telemetry.d.ts.map +1 -1
- package/dist/lib/quota-telemetry.js +7 -3
- package/dist/lib/quota-telemetry.js.map +1 -1
- package/dist/lib/quota-toast-runtime.d.ts +60 -0
- package/dist/lib/quota-toast-runtime.d.ts.map +1 -0
- package/dist/lib/quota-toast-runtime.js +765 -0
- package/dist/lib/quota-toast-runtime.js.map +1 -0
- package/dist/lib/resolved-auth-identity.d.ts +36 -0
- package/dist/lib/resolved-auth-identity.d.ts.map +1 -0
- package/dist/lib/resolved-auth-identity.js +193 -0
- package/dist/lib/resolved-auth-identity.js.map +1 -0
- package/dist/lib/scoped-update-migration.d.ts +101 -0
- package/dist/lib/scoped-update-migration.d.ts.map +1 -0
- package/dist/lib/scoped-update-migration.js +348 -0
- package/dist/lib/scoped-update-migration.js.map +1 -0
- package/dist/lib/scoped-update.d.ts +8 -0
- package/dist/lib/scoped-update.d.ts.map +1 -1
- package/dist/lib/scoped-update.js +263 -50
- package/dist/lib/scoped-update.js.map +1 -1
- package/dist/lib/toast-format-grouped.d.ts +1 -0
- package/dist/lib/toast-format-grouped.d.ts.map +1 -1
- package/dist/lib/toast-format-grouped.js +111 -24
- package/dist/lib/toast-format-grouped.js.map +1 -1
- package/dist/lib/tui-compact-format.d.ts +1 -0
- package/dist/lib/tui-compact-format.d.ts.map +1 -1
- package/dist/lib/tui-compact-format.js +136 -24
- package/dist/lib/tui-compact-format.js.map +1 -1
- package/dist/lib/tui-panel-state.d.ts +2 -0
- package/dist/lib/tui-panel-state.d.ts.map +1 -1
- package/dist/lib/tui-panel-state.js.map +1 -1
- package/dist/lib/tui-runtime.d.ts.map +1 -1
- package/dist/lib/tui-runtime.js +84 -10
- package/dist/lib/tui-runtime.js.map +1 -1
- package/dist/lib/tui-sidebar-format.d.ts +1 -1
- package/dist/lib/tui-sidebar-format.d.ts.map +1 -1
- package/dist/lib/tui-sidebar-format.js +1 -0
- package/dist/lib/tui-sidebar-format.js.map +1 -1
- package/dist/lib/types.d.ts +7 -1
- package/dist/lib/types.d.ts.map +1 -1
- package/dist/lib/types.js +1 -0
- package/dist/lib/types.js.map +1 -1
- package/dist/lib/xai.d.ts +2 -0
- package/dist/lib/xai.d.ts.map +1 -1
- package/dist/lib/xai.js +10 -0
- package/dist/lib/xai.js.map +1 -1
- package/dist/plugin.d.ts.map +1 -1
- package/dist/plugin.js +27 -720
- package/dist/plugin.js.map +1 -1
- package/dist/providers/accounting-decimal.d.ts +2 -0
- package/dist/providers/accounting-decimal.d.ts.map +1 -0
- package/dist/providers/accounting-decimal.js +23 -0
- package/dist/providers/accounting-decimal.js.map +1 -0
- package/dist/providers/cache-policies.d.ts +64 -0
- package/dist/providers/cache-policies.d.ts.map +1 -0
- package/dist/providers/cache-policies.js +197 -0
- package/dist/providers/cache-policies.js.map +1 -0
- package/dist/providers/cursor.d.ts.map +1 -1
- package/dist/providers/cursor.js +73 -58
- package/dist/providers/cursor.js.map +1 -1
- package/dist/providers/deepseek.d.ts +2 -2
- package/dist/providers/deepseek.d.ts.map +1 -1
- package/dist/providers/deepseek.js +64 -33
- package/dist/providers/deepseek.js.map +1 -1
- package/dist/providers/google-agy.js +2 -2
- package/dist/providers/google-agy.js.map +1 -1
- package/dist/providers/google-gemini-cli.d.ts.map +1 -1
- package/dist/providers/google-gemini-cli.js +1 -1
- package/dist/providers/google-gemini-cli.js.map +1 -1
- package/dist/providers/kilo.d.ts.map +1 -1
- package/dist/providers/kilo.js +56 -29
- package/dist/providers/kilo.js.map +1 -1
- package/dist/providers/mimo.d.ts.map +1 -1
- package/dist/providers/mimo.js +37 -15
- package/dist/providers/mimo.js.map +1 -1
- package/dist/providers/minimax-coding-plan.d.ts +8 -7
- package/dist/providers/minimax-coding-plan.d.ts.map +1 -1
- package/dist/providers/minimax-coding-plan.js +97 -83
- package/dist/providers/minimax-coding-plan.js.map +1 -1
- package/dist/providers/nanogpt.d.ts.map +1 -1
- package/dist/providers/nanogpt.js +72 -51
- package/dist/providers/nanogpt.js.map +1 -1
- package/dist/providers/openai.d.ts.map +1 -1
- package/dist/providers/openai.js +0 -3
- package/dist/providers/openai.js.map +1 -1
- package/dist/providers/opencode-go.d.ts.map +1 -1
- package/dist/providers/opencode-go.js +3 -4
- package/dist/providers/opencode-go.js.map +1 -1
- package/dist/providers/opencode-zen.d.ts.map +1 -1
- package/dist/providers/opencode-zen.js +78 -17
- package/dist/providers/opencode-zen.js.map +1 -1
- package/dist/providers/quota-providers.d.ts.map +1 -1
- package/dist/providers/quota-providers.js +31 -23
- package/dist/providers/quota-providers.js.map +1 -1
- package/dist/providers/registry.d.ts +3 -2
- package/dist/providers/registry.d.ts.map +1 -1
- package/dist/providers/registry.js +41 -31
- package/dist/providers/registry.js.map +1 -1
- package/dist/providers/result-helpers.d.ts +10 -5
- package/dist/providers/result-helpers.d.ts.map +1 -1
- package/dist/providers/result-helpers.js +3 -3
- package/dist/providers/result-helpers.js.map +1 -1
- package/dist/tui.d.ts.map +1 -1
- package/dist/tui.js +11 -3
- package/dist/tui.tsx +16 -7
- package/package.json +1 -1
|
@@ -1,151 +1,63 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
2
|
+
* Process-local access-token cache shared by the Google quota providers.
|
|
3
3
|
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
* -
|
|
7
|
-
* - We persist access tokens so restarts don't force immediate refresh.
|
|
4
|
+
* Access tokens and account correlation material are intentionally never
|
|
5
|
+
* persisted. The legacy v1 disk cache contained account PII and an unkeyed
|
|
6
|
+
* refresh-token verifier, so it is ignored and removed on first use.
|
|
8
7
|
*/
|
|
9
|
-
import {
|
|
10
|
-
import {
|
|
11
|
-
import { join } from "path";
|
|
12
|
-
import { writeTextAtomic } from "./atomic-json.js";
|
|
8
|
+
import { createHmac, randomBytes } from "node:crypto";
|
|
9
|
+
import { rm } from "node:fs/promises";
|
|
10
|
+
import { join } from "node:path";
|
|
13
11
|
import { getOpencodeRuntimeDirs } from "./opencode-runtime-paths.js";
|
|
14
|
-
const
|
|
15
|
-
|
|
16
|
-
let loadPromise = null;
|
|
12
|
+
const PROCESS_CACHE_KEY = randomBytes(32);
|
|
13
|
+
const memoryTokens = new Map();
|
|
17
14
|
let operationQueue = Promise.resolve();
|
|
18
|
-
function getCacheBaseDir() {
|
|
19
|
-
// Match OpenCode runtime cache semantics (xdg-basedir).
|
|
20
|
-
// This avoids mismatches on Windows where OpenCode cache is not under LOCALAPPDATA.
|
|
21
|
-
return getOpencodeRuntimeDirs().cacheDir;
|
|
22
|
-
}
|
|
23
15
|
export function getGoogleTokenCachePath() {
|
|
24
|
-
return join(
|
|
16
|
+
return join(getOpencodeRuntimeDirs().cacheDir, "opencode-quota", "google-access-tokens.json");
|
|
25
17
|
}
|
|
26
18
|
export function makeAccountCacheKey(params) {
|
|
27
|
-
|
|
28
|
-
|
|
19
|
+
return `gat1_${createHmac("sha256", PROCESS_CACHE_KEY)
|
|
20
|
+
.update("google-access-token-cache-v2\0")
|
|
29
21
|
.update(params.refreshToken)
|
|
30
|
-
.update("\
|
|
22
|
+
.update("\0")
|
|
31
23
|
.update(params.projectId)
|
|
32
|
-
.digest("
|
|
33
|
-
.slice(0, 16);
|
|
34
|
-
// Keep a human hint without making it sensitive.
|
|
35
|
-
return `${emailPart}::${params.projectId}::${hash}`;
|
|
24
|
+
.digest("base64url")}`;
|
|
36
25
|
}
|
|
37
26
|
function enqueue(operation) {
|
|
38
27
|
const result = operationQueue.then(operation, operation);
|
|
39
28
|
operationQueue = result.then(() => undefined, () => undefined);
|
|
40
29
|
return result;
|
|
41
30
|
}
|
|
42
|
-
function
|
|
43
|
-
|
|
44
|
-
version: CACHE_VERSION,
|
|
45
|
-
updatedAt: cache.updatedAt,
|
|
46
|
-
tokens: Object.fromEntries(Object.entries(cache.tokens).map(([key, entry]) => [key, { ...entry }])),
|
|
47
|
-
};
|
|
48
|
-
}
|
|
49
|
-
function asRecord(value) {
|
|
50
|
-
return value && typeof value === "object" && !Array.isArray(value)
|
|
51
|
-
? value
|
|
52
|
-
: null;
|
|
53
|
-
}
|
|
54
|
-
function parseCacheEntry(value) {
|
|
55
|
-
const entry = asRecord(value);
|
|
56
|
-
if (!entry)
|
|
57
|
-
return null;
|
|
58
|
-
if (typeof entry.accessToken !== "string" || !entry.accessToken.trim())
|
|
59
|
-
return null;
|
|
60
|
-
if (typeof entry.projectId !== "string" || !entry.projectId.trim())
|
|
61
|
-
return null;
|
|
62
|
-
if (typeof entry.expiresAt !== "number" || !Number.isFinite(entry.expiresAt))
|
|
63
|
-
return null;
|
|
64
|
-
if (entry.email !== undefined && typeof entry.email !== "string")
|
|
65
|
-
return null;
|
|
66
|
-
return {
|
|
67
|
-
accessToken: entry.accessToken,
|
|
68
|
-
expiresAt: entry.expiresAt,
|
|
69
|
-
projectId: entry.projectId,
|
|
70
|
-
...(entry.email === undefined ? {} : { email: entry.email }),
|
|
71
|
-
};
|
|
72
|
-
}
|
|
73
|
-
async function loadFromDisk(path) {
|
|
74
|
-
try {
|
|
75
|
-
const raw = await readFile(path, "utf-8");
|
|
76
|
-
const file = asRecord(JSON.parse(raw));
|
|
77
|
-
const tokenValues = asRecord(file?.tokens);
|
|
78
|
-
if (file?.version !== CACHE_VERSION || !tokenValues) {
|
|
79
|
-
throw new Error("invalid");
|
|
80
|
-
}
|
|
81
|
-
const tokens = {};
|
|
82
|
-
for (const [key, value] of Object.entries(tokenValues)) {
|
|
83
|
-
const entry = parseCacheEntry(value);
|
|
84
|
-
if (entry)
|
|
85
|
-
tokens[key] = entry;
|
|
86
|
-
}
|
|
87
|
-
return {
|
|
88
|
-
version: CACHE_VERSION,
|
|
89
|
-
updatedAt: typeof file.updatedAt === "number" ? file.updatedAt : Date.now(),
|
|
90
|
-
tokens,
|
|
91
|
-
};
|
|
92
|
-
}
|
|
93
|
-
catch {
|
|
94
|
-
return { version: CACHE_VERSION, updatedAt: Date.now(), tokens: {} };
|
|
95
|
-
}
|
|
96
|
-
}
|
|
97
|
-
async function ensureLoaded() {
|
|
98
|
-
if (memCache)
|
|
99
|
-
return memCache;
|
|
100
|
-
if (loadPromise)
|
|
101
|
-
return loadPromise;
|
|
102
|
-
const path = getGoogleTokenCachePath();
|
|
103
|
-
loadPromise = loadFromDisk(path).then((file) => {
|
|
104
|
-
memCache = file;
|
|
105
|
-
loadPromise = null;
|
|
106
|
-
return file;
|
|
107
|
-
});
|
|
108
|
-
return loadPromise;
|
|
109
|
-
}
|
|
110
|
-
async function persist(cache) {
|
|
111
|
-
await writeTextAtomic(getGoogleTokenCachePath(), JSON.stringify(cache, null, 2), {
|
|
112
|
-
directoryMode: 0o700,
|
|
113
|
-
fileMode: 0o600,
|
|
114
|
-
});
|
|
31
|
+
async function removeLegacyCache() {
|
|
32
|
+
await rm(getGoogleTokenCachePath(), { force: true }).catch(() => undefined);
|
|
115
33
|
}
|
|
116
34
|
export async function getCachedAccessToken(params) {
|
|
117
35
|
return enqueue(async () => {
|
|
118
|
-
|
|
119
|
-
const entry =
|
|
36
|
+
await removeLegacyCache();
|
|
37
|
+
const entry = memoryTokens.get(params.key);
|
|
120
38
|
if (!entry)
|
|
121
39
|
return null;
|
|
122
|
-
if (
|
|
40
|
+
if (entry.expiresAt <= Date.now() + params.skewMs) {
|
|
41
|
+
memoryTokens.delete(params.key);
|
|
123
42
|
return null;
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
return entry;
|
|
43
|
+
}
|
|
44
|
+
return { ...entry };
|
|
127
45
|
});
|
|
128
46
|
}
|
|
129
47
|
export async function setCachedAccessToken(params) {
|
|
130
48
|
return enqueue(async () => {
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
next.tokens[params.key] = { ...params.entry };
|
|
134
|
-
next.updatedAt = Date.now();
|
|
135
|
-
await persist(next);
|
|
136
|
-
memCache = next;
|
|
49
|
+
await removeLegacyCache();
|
|
50
|
+
memoryTokens.set(params.key, { ...params.entry });
|
|
137
51
|
});
|
|
138
52
|
}
|
|
139
53
|
export async function clearGoogleTokenCache() {
|
|
140
54
|
return enqueue(async () => {
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
version: CACHE_VERSION,
|
|
144
|
-
updatedAt: Date.now(),
|
|
145
|
-
tokens: {},
|
|
146
|
-
};
|
|
147
|
-
await persist(next);
|
|
148
|
-
memCache = next;
|
|
55
|
+
memoryTokens.clear();
|
|
56
|
+
await removeLegacyCache();
|
|
149
57
|
});
|
|
150
58
|
}
|
|
59
|
+
export function __resetGoogleTokenCacheForTests() {
|
|
60
|
+
memoryTokens.clear();
|
|
61
|
+
operationQueue = Promise.resolve();
|
|
62
|
+
}
|
|
151
63
|
//# sourceMappingURL=google-token-cache.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google-token-cache.js","sourceRoot":"","sources":["../../src/lib/google-token-cache.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"google-token-cache.js","sourceRoot":"","sources":["../../src/lib/google-token-cache.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAOrE,MAAM,iBAAiB,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC;AAC1C,MAAM,YAAY,GAAG,IAAI,GAAG,EAAuC,CAAC;AACpE,IAAI,cAAc,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAC;AAEtD,MAAM,UAAU,uBAAuB;IACrC,OAAO,IAAI,CAAC,sBAAsB,EAAE,CAAC,QAAQ,EAAE,gBAAgB,EAAE,2BAA2B,CAAC,CAAC;AAChG,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,MAAmD;IACrF,OAAO,QAAQ,UAAU,CAAC,QAAQ,EAAE,iBAAiB,CAAC;SACnD,MAAM,CAAC,gCAAgC,CAAC;SACxC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;SAC3B,MAAM,CAAC,IAAI,CAAC;SACZ,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC;SACxB,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;AAC3B,CAAC;AAED,SAAS,OAAO,CAAI,SAA2B;IAC7C,MAAM,MAAM,GAAG,cAAc,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACzD,cAAc,GAAG,MAAM,CAAC,IAAI,CAC1B,GAAG,EAAE,CAAC,SAAS,EACf,GAAG,EAAE,CAAC,SAAS,CAChB,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,KAAK,UAAU,iBAAiB;IAC9B,MAAM,EAAE,CAAC,uBAAuB,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,MAG1C;IACC,OAAO,OAAO,CAAC,KAAK,IAAI,EAAE;QACxB,MAAM,iBAAiB,EAAE,CAAC;QAC1B,MAAM,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC3C,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,IAAI,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;YAClD,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAChC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,EAAE,GAAG,KAAK,EAAE,CAAC;IACtB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,MAG1C;IACC,OAAO,OAAO,CAAC,KAAK,IAAI,EAAE;QACxB,MAAM,iBAAiB,EAAE,CAAC;QAC1B,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB;IACzC,OAAO,OAAO,CAAC,KAAK,IAAI,EAAE;QACxB,YAAY,CAAC,KAAK,EAAE,CAAC;QACrB,MAAM,iBAAiB,EAAE,CAAC;IAC5B,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,+BAA+B;IAC7C,YAAY,CAAC,KAAK,EAAE,CAAC;IACrB,cAAc,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;AACrC,CAAC"}
|
package/dist/lib/google.d.ts
CHANGED
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
* Uses OpenCode's antigravity-accounts.json at ~/.config/opencode/antigravity-accounts.json.
|
|
5
5
|
* Requires the user to have opencode-antigravity-auth installed and logged in.
|
|
6
6
|
*/
|
|
7
|
+
import { type ResolvedAuthIdentity } from "./resolved-auth-identity.js";
|
|
7
8
|
import type { AntigravityAccount, GoogleModelId, GoogleResult } from "./types.js";
|
|
8
9
|
export interface GoogleAntigravityAuthPresence {
|
|
9
10
|
state: "missing" | "present" | "invalid";
|
|
@@ -23,6 +24,7 @@ export declare function readAntigravityAccounts(): Promise<AntigravityAccount[]
|
|
|
23
24
|
export declare function inspectAntigravityAccountsPresence(): Promise<GoogleAntigravityAuthPresence>;
|
|
24
25
|
export declare function hasAntigravityAccountsConfigured(): Promise<boolean>;
|
|
25
26
|
export declare function hasAntigravityQuotaRuntimeAvailable(): Promise<boolean>;
|
|
27
|
+
export declare function resolveGoogleAntigravityAuthIdentity(): Promise<ResolvedAuthIdentity | null>;
|
|
26
28
|
export declare function refreshGoogleTokensForAllAccounts(params?: {
|
|
27
29
|
skewMs?: number;
|
|
28
30
|
force?: boolean;
|
package/dist/lib/google.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google.d.ts","sourceRoot":"","sources":["../../src/lib/google.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAyBH,OAAO,KAAK,EACV,kBAAkB,EAGlB,aAAa,EAIb,YAAY,EACb,MAAM,YAAY,CAAC;AA6BpB,MAAM,WAAW,6BAA6B;IAC5C,KAAK,EAAE,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;IACzC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAeD,wBAAgB,oCAAoC,IAAI,MAAM,EAAE,CAY/D;AAED,wBAAgB,2BAA2B,IAAI,MAAM,CAMpD;AAoCD;;GAEG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,kBAAkB,EAAE,GAAG,IAAI,CAAC,CAmBpF;AAED,wBAAsB,kCAAkC,IAAI,OAAO,CAAC,6BAA6B,CAAC,CAgDjG;AAED,wBAAsB,gCAAgC,IAAI,OAAO,CAAC,OAAO,CAAC,CAGzE;AAED,wBAAsB,mCAAmC,IAAI,OAAO,CAAC,OAAO,CAAC,CAW5E;
|
|
1
|
+
{"version":3,"file":"google.d.ts","sourceRoot":"","sources":["../../src/lib/google.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAyBH,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EACV,kBAAkB,EAGlB,aAAa,EAIb,YAAY,EACb,MAAM,YAAY,CAAC;AA6BpB,MAAM,WAAW,6BAA6B;IAC5C,KAAK,EAAE,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;IACzC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAeD,wBAAgB,oCAAoC,IAAI,MAAM,EAAE,CAY/D;AAED,wBAAgB,2BAA2B,IAAI,MAAM,CAMpD;AAoCD;;GAEG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,kBAAkB,EAAE,GAAG,IAAI,CAAC,CAmBpF;AAED,wBAAsB,kCAAkC,IAAI,OAAO,CAAC,6BAA6B,CAAC,CAgDjG;AAED,wBAAsB,gCAAgC,IAAI,OAAO,CAAC,OAAO,CAAC,CAGzE;AAED,wBAAsB,mCAAmC,IAAI,OAAO,CAAC,OAAO,CAAC,CAW5E;AAED,wBAAsB,oCAAoC,IAAI,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,CA6BjG;AAwGD,wBAAsB,iCAAiC,CAAC,MAAM,CAAC,EAAE;IAC/D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,GAAG,OAAO,CAAC,IAAI,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,KAAK,CAAC;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACpD,CAAC,CA6CD;AAwOD;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,aAAa,EAAE,EACzB,OAAO,GAAE;IAAE,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAAO,GAC1C,OAAO,CAAC,YAAY,CAAC,CAiDvB;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,GAAG,IAAI,CAcrE"}
|
package/dist/lib/google.js
CHANGED
|
@@ -17,6 +17,7 @@ import { getOpencodeRuntimeDirCandidates } from "./opencode-runtime-paths.js";
|
|
|
17
17
|
import { getCachedAccessToken, makeAccountCacheKey, setCachedAccessToken, } from "./google-token-cache.js";
|
|
18
18
|
import { fetchWithTimeout } from "./http.js";
|
|
19
19
|
import { mapWithConcurrency } from "./map-with-concurrency.js";
|
|
20
|
+
import { composeResolvedAuthIdentities, deriveResolvedAuthIdentity, } from "./resolved-auth-identity.js";
|
|
20
21
|
import { GOOGLE_MODEL_KEYS } from "./types.js";
|
|
21
22
|
// =============================================================================
|
|
22
23
|
// Constants
|
|
@@ -156,6 +157,32 @@ export async function hasAntigravityQuotaRuntimeAvailable() {
|
|
|
156
157
|
authPresence.validAccountCount > 0 &&
|
|
157
158
|
companionPresence.state === "present");
|
|
158
159
|
}
|
|
160
|
+
export async function resolveGoogleAntigravityAuthIdentity() {
|
|
161
|
+
const [accounts, credentials] = await Promise.all([
|
|
162
|
+
readAntigravityAccounts(),
|
|
163
|
+
resolveAntigravityClientCredentials(),
|
|
164
|
+
]);
|
|
165
|
+
if (!accounts || accounts.length === 0 || credentials.state !== "configured")
|
|
166
|
+
return null;
|
|
167
|
+
const accountIdentities = await Promise.all(accounts.map((account) => deriveResolvedAuthIdentity({
|
|
168
|
+
providerId: "google-antigravity",
|
|
169
|
+
principal: { kind: "credential", value: account.refreshToken },
|
|
170
|
+
qualifiers: [getProjectId(account) ?? "missing-project-id"],
|
|
171
|
+
})));
|
|
172
|
+
if (accountIdentities.some((identity) => identity === null))
|
|
173
|
+
return null;
|
|
174
|
+
const companionIdentity = await deriveResolvedAuthIdentity({
|
|
175
|
+
providerId: "google-antigravity:companion",
|
|
176
|
+
principal: { kind: "credential", value: credentials.clientSecret },
|
|
177
|
+
qualifiers: [credentials.clientId],
|
|
178
|
+
});
|
|
179
|
+
if (!companionIdentity)
|
|
180
|
+
return null;
|
|
181
|
+
return composeResolvedAuthIdentities({
|
|
182
|
+
providerId: "google-antigravity",
|
|
183
|
+
identities: [...accountIdentities, companionIdentity],
|
|
184
|
+
});
|
|
185
|
+
}
|
|
159
186
|
/**
|
|
160
187
|
* Refresh Google access token
|
|
161
188
|
*/
|
|
@@ -212,7 +239,6 @@ async function refreshAccessTokenWithCache(params) {
|
|
|
212
239
|
const key = makeAccountCacheKey({
|
|
213
240
|
refreshToken: params.refreshToken,
|
|
214
241
|
projectId: params.projectId,
|
|
215
|
-
email: params.email,
|
|
216
242
|
});
|
|
217
243
|
if (!params.force) {
|
|
218
244
|
const cached = await getCachedAccessToken({ key, skewMs });
|
|
@@ -232,8 +258,6 @@ async function refreshAccessTokenWithCache(params) {
|
|
|
232
258
|
entry: {
|
|
233
259
|
accessToken: refreshed.accessToken,
|
|
234
260
|
expiresAt: Date.now() + Math.max(1, refreshed.expiresIn) * 1000,
|
|
235
|
-
projectId: params.projectId,
|
|
236
|
-
email: params.email,
|
|
237
261
|
},
|
|
238
262
|
});
|
|
239
263
|
return { accessToken: refreshed.accessToken };
|
|
@@ -437,12 +461,13 @@ async function fetchAccountQuotaWithAntigravityRefresh(params) {
|
|
|
437
461
|
return { success: false, error: retryToken.error, accountEmail: email };
|
|
438
462
|
}
|
|
439
463
|
await setCachedAccessToken({
|
|
440
|
-
key: makeAccountCacheKey({
|
|
464
|
+
key: makeAccountCacheKey({
|
|
465
|
+
refreshToken: params.account.refreshToken,
|
|
466
|
+
projectId,
|
|
467
|
+
}),
|
|
441
468
|
entry: {
|
|
442
469
|
accessToken: retryToken.accessToken,
|
|
443
470
|
expiresAt: Date.now() + Math.max(1, retryToken.expiresIn) * 1000,
|
|
444
|
-
projectId,
|
|
445
|
-
email,
|
|
446
471
|
},
|
|
447
472
|
});
|
|
448
473
|
data = await fetchGoogleQuota(retryToken.accessToken, projectId, params.timeoutMs);
|
package/dist/lib/google.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google.js","sourceRoot":"","sources":["../../src/lib/google.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"google.js","sourceRoot":"","sources":["../../src/lib/google.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grouped-entry-normalization.d.ts","sourceRoot":"","sources":["../../src/lib/grouped-entry-normalization.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"grouped-entry-normalization.d.ts","sourceRoot":"","sources":["../../src/lib/grouped-entry-normalization.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAGpD,MAAM,MAAM,mBAAmB,GAAG,OAAO,GAAG,OAAO,CAAC;AAEpD,MAAM,MAAM,2BAA2B,GAAG,eAAe,GAAG;IAC1D,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,2BAA2B,EAAE,CAAC;CACxC,CAAC;AA0IF,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,eAAe,EAAE,EAC1B,MAAM,EAAE,mBAAmB,GAC1B,eAAe,EAAE,CA0BnB;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,eAAe,EAAE,EAC1B,MAAM,EAAE,mBAAmB,GAC1B,2BAA2B,EAAE,CAE/B"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { compareAccountingSemanticEntries } from "./accounting-format.js";
|
|
2
|
+
import { cloneQuotaToastEntry } from "./entries.js";
|
|
1
3
|
function trimOptional(value) {
|
|
2
4
|
const trimmed = value?.trim();
|
|
3
5
|
return trimmed ? trimmed : undefined;
|
|
@@ -52,19 +54,29 @@ function getDurationRank(entry) {
|
|
|
52
54
|
return entry.sortPriority;
|
|
53
55
|
return entry.label ? getDurationRankFromText(entry.label) : getDurationRankFromText(entry.name);
|
|
54
56
|
}
|
|
57
|
+
function ownStructuredEntry(entry) {
|
|
58
|
+
// Normalized provider results always have accounting metadata. The guard keeps this
|
|
59
|
+
// presentation helper tolerant of isolated legacy test fixtures without weakening the type.
|
|
60
|
+
return entry.accounting ? cloneQuotaToastEntry(entry) : entry;
|
|
61
|
+
}
|
|
55
62
|
function normalizeGroupedQuotaEntry(entry, target) {
|
|
56
|
-
const
|
|
57
|
-
const
|
|
58
|
-
const
|
|
63
|
+
const owned = ownStructuredEntry(entry);
|
|
64
|
+
const group = trimOptional(owned.group);
|
|
65
|
+
const label = trimOptional(owned.label);
|
|
66
|
+
const right = trimOptional(owned.right);
|
|
59
67
|
const normalized = {
|
|
60
|
-
...
|
|
68
|
+
...owned,
|
|
61
69
|
...(label ? { label } : {}),
|
|
62
70
|
...(right ? { right } : {}),
|
|
63
71
|
};
|
|
72
|
+
if (!label)
|
|
73
|
+
delete normalized.label;
|
|
74
|
+
if (!right)
|
|
75
|
+
delete normalized.right;
|
|
64
76
|
if (group) {
|
|
65
77
|
return { ...normalized, group };
|
|
66
78
|
}
|
|
67
|
-
const googleFallback = getGoogleFallbackMeta(
|
|
79
|
+
const googleFallback = getGoogleFallbackMeta(owned.name);
|
|
68
80
|
if (googleFallback) {
|
|
69
81
|
return {
|
|
70
82
|
...normalized,
|
|
@@ -74,10 +86,43 @@ function normalizeGroupedQuotaEntry(entry, target) {
|
|
|
74
86
|
}
|
|
75
87
|
return {
|
|
76
88
|
...normalized,
|
|
77
|
-
group:
|
|
89
|
+
group: owned.name.trim(),
|
|
78
90
|
...(target === "quota" ? { label: label ?? "Status:" } : {}),
|
|
79
91
|
};
|
|
80
92
|
}
|
|
93
|
+
function sortLegacyEntries(entries) {
|
|
94
|
+
return entries.slice().sort((left, right) => {
|
|
95
|
+
if (left.rank !== null && right.rank !== null && left.rank !== right.rank) {
|
|
96
|
+
return left.rank - right.rank;
|
|
97
|
+
}
|
|
98
|
+
if (left.rank !== null && right.rank === null)
|
|
99
|
+
return -1;
|
|
100
|
+
if (left.rank === null && right.rank !== null)
|
|
101
|
+
return 1;
|
|
102
|
+
return left.originalIndex - right.originalIndex;
|
|
103
|
+
});
|
|
104
|
+
}
|
|
105
|
+
function sortMixedEntries(entries) {
|
|
106
|
+
if (!entries.some(({ entry }) => entry.semantic))
|
|
107
|
+
return sortLegacyEntries(entries);
|
|
108
|
+
const sorted = entries.slice();
|
|
109
|
+
let index = 0;
|
|
110
|
+
while (index < sorted.length) {
|
|
111
|
+
if (!sorted[index].entry.semantic) {
|
|
112
|
+
index += 1;
|
|
113
|
+
continue;
|
|
114
|
+
}
|
|
115
|
+
const start = index;
|
|
116
|
+
while (index < sorted.length && sorted[index].entry.semantic)
|
|
117
|
+
index += 1;
|
|
118
|
+
const run = sorted.slice(start, index).sort((left, right) => {
|
|
119
|
+
const semanticOrder = compareAccountingSemanticEntries(left.entry, right.entry);
|
|
120
|
+
return semanticOrder || left.originalIndex - right.originalIndex;
|
|
121
|
+
});
|
|
122
|
+
sorted.splice(start, run.length, ...run);
|
|
123
|
+
}
|
|
124
|
+
return sorted;
|
|
125
|
+
}
|
|
81
126
|
export function groupQuotaEntries(entries, target) {
|
|
82
127
|
const groupOrder = [];
|
|
83
128
|
const groupedEntries = new Map();
|
|
@@ -86,7 +131,7 @@ export function groupQuotaEntries(entries, target) {
|
|
|
86
131
|
const rankedEntry = {
|
|
87
132
|
entry: normalizedEntry,
|
|
88
133
|
originalIndex,
|
|
89
|
-
rank: getDurationRank(normalizedEntry),
|
|
134
|
+
rank: normalizedEntry.semantic ? null : getDurationRank(normalizedEntry),
|
|
90
135
|
};
|
|
91
136
|
const existing = groupedEntries.get(normalizedEntry.group);
|
|
92
137
|
if (existing) {
|
|
@@ -98,19 +143,7 @@ export function groupQuotaEntries(entries, target) {
|
|
|
98
143
|
}
|
|
99
144
|
return groupOrder.map((group) => {
|
|
100
145
|
const rankedEntries = groupedEntries.get(group) ?? [];
|
|
101
|
-
const entries = rankedEntries
|
|
102
|
-
.slice()
|
|
103
|
-
.sort((left, right) => {
|
|
104
|
-
if (left.rank !== null && right.rank !== null && left.rank !== right.rank) {
|
|
105
|
-
return left.rank - right.rank;
|
|
106
|
-
}
|
|
107
|
-
if (left.rank !== null && right.rank === null)
|
|
108
|
-
return -1;
|
|
109
|
-
if (left.rank === null && right.rank !== null)
|
|
110
|
-
return 1;
|
|
111
|
-
return left.originalIndex - right.originalIndex;
|
|
112
|
-
})
|
|
113
|
-
.map(({ entry }) => entry);
|
|
146
|
+
const entries = sortMixedEntries(rankedEntries).map(({ entry }) => entry);
|
|
114
147
|
return { group, entries };
|
|
115
148
|
});
|
|
116
149
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grouped-entry-normalization.js","sourceRoot":"","sources":["../../src/lib/grouped-entry-normalization.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"grouped-entry-normalization.js","sourceRoot":"","sources":["../../src/lib/grouped-entry-normalization.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*
|
|
4
4
|
* Resolves MiniMax credentials from trusted env vars, trusted user/global
|
|
5
5
|
* OpenCode config, and auth.json fallback into the standardized shape used
|
|
6
|
-
* by the MiniMax
|
|
6
|
+
* by the MiniMax Token Plan providers.
|
|
7
7
|
*/
|
|
8
8
|
import type { MiniMaxQuotaEndpointId } from "./minimax-endpoints.js";
|
|
9
9
|
import type { AuthData } from "./types.js";
|
package/dist/lib/minimax-auth.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*
|
|
4
4
|
* Resolves MiniMax credentials from trusted env vars, trusted user/global
|
|
5
5
|
* OpenCode config, and auth.json fallback into the standardized shape used
|
|
6
|
-
* by the MiniMax
|
|
6
|
+
* by the MiniMax Token Plan providers.
|
|
7
7
|
*/
|
|
8
8
|
import { getApiKeyCheckedPaths, getFirstAuthEntryValue, getGlobalOpencodeConfigCandidatePaths, readOpencodeConfig, } from "./api-key-resolver.js";
|
|
9
9
|
import { sanitizeDisplayText } from "./display-sanitize.js";
|
package/dist/lib/nanogpt.d.ts
CHANGED
|
@@ -13,6 +13,11 @@ export type NanoGptUsageWindow = {
|
|
|
13
13
|
remaining: number;
|
|
14
14
|
percentRemaining: number;
|
|
15
15
|
resetTimeIso?: string;
|
|
16
|
+
reportedBasis: {
|
|
17
|
+
used?: number;
|
|
18
|
+
limit?: number;
|
|
19
|
+
remaining?: number;
|
|
20
|
+
};
|
|
16
21
|
};
|
|
17
22
|
export interface NanoGptSubscription {
|
|
18
23
|
active: boolean;
|
|
@@ -24,7 +29,6 @@ export interface NanoGptSubscription {
|
|
|
24
29
|
graceUntilIso?: string;
|
|
25
30
|
}
|
|
26
31
|
export interface NanoGptBalance {
|
|
27
|
-
usdBalance?: number;
|
|
28
32
|
usdBalanceRaw?: string;
|
|
29
33
|
nanoBalanceRaw?: string;
|
|
30
34
|
}
|
|
@@ -38,10 +42,6 @@ export type NanoGptResult = {
|
|
|
38
42
|
}>;
|
|
39
43
|
} | QuotaError | null;
|
|
40
44
|
export { getNanoGptKeyDiagnostics, hasNanoGptApiKey as hasNanoGptApiKeyConfigured, type NanoGptKeySource, } from "./nanogpt-config.js";
|
|
41
|
-
export declare function formatNanoGptBalanceValue(balance: {
|
|
42
|
-
usdBalance?: number;
|
|
43
|
-
nanoBalanceRaw?: string;
|
|
44
|
-
}): string | null;
|
|
45
45
|
export declare function queryNanoGptQuota(options?: {
|
|
46
46
|
requestTimeoutMs?: number;
|
|
47
47
|
}): Promise<NanoGptResult>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nanogpt.d.ts","sourceRoot":"","sources":["../../src/lib/nanogpt.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;
|
|
1
|
+
{"version":3,"file":"nanogpt.d.ts","sourceRoot":"","sources":["../../src/lib/nanogpt.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAOH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAI7C,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,SAAS,CAAC;AAElD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE;QACb,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;CACH,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,iBAAiB,EAAE,OAAO,CAAC;IAC3B,KAAK,CAAC,EAAE,kBAAkB,CAAC;IAC3B,OAAO,CAAC,EAAE,kBAAkB,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,cAAc;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,MAAM,aAAa,GACrB;IACE,OAAO,EAAE,IAAI,CAAC;IACd,YAAY,CAAC,EAAE,mBAAmB,CAAC;IACnC,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,cAAc,CAAC,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,eAAe,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACxE,GACD,UAAU,GACV,IAAI,CAAC;AA6QT,OAAO,EACL,wBAAwB,EACxB,gBAAgB,IAAI,0BAA0B,EAC9C,KAAK,gBAAgB,GACtB,MAAM,qBAAqB,CAAC;AAE7B,wBAAsB,iBAAiB,CACrC,OAAO,GAAE;IAAE,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAAO,GAC1C,OAAO,CAAC,aAAa,CAAC,CAwCxB"}
|