@modelprofile.com/authswitch 9.2.0 → 10.0.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/dist_ts/00_commitinfo_data.js +2 -2
- package/dist_ts/authority-contract.d.ts +52 -6
- package/dist_ts/authority-contract.js +1 -1
- package/dist_ts/classes.authoritybroker.d.ts +20 -4
- package/dist_ts/classes.authoritybroker.js +44 -8
- package/dist_ts/classes.authoritycli.d.ts +4 -1
- package/dist_ts/classes.authoritycli.js +42 -7
- package/dist_ts/classes.authorityclient.d.ts +9 -1
- package/dist_ts/classes.authorityclient.js +9 -3
- package/dist_ts/classes.authoritydaemon.js +8 -5
- package/dist_ts/classes.authoritydatabase.d.ts +6 -2
- package/dist_ts/classes.authoritydatabase.js +13 -6
- package/dist_ts/classes.authorityimport.d.ts +4 -4
- package/dist_ts/classes.authorityimport.js +8 -7
- package/dist_ts/classes.authoritymodels.d.ts +11 -3
- package/dist_ts/classes.authoritymodels.js +43 -13
- package/dist_ts/classes.authoritypreuse.d.ts +8 -2
- package/dist_ts/classes.authoritypreuse.js +27 -17
- package/dist_ts/classes.authorityusage.d.ts +4 -3
- package/dist_ts/classes.authorityusage.js +3 -5
- package/dist_ts/classes.cli.js +3 -5
- package/dist_ts/classes.codexpreuse.d.ts +14 -3
- package/dist_ts/classes.codexpreuse.js +127 -44
- package/dist_ts/classes.codexstatus.js +44 -95
- package/dist_ts/classes.login.d.ts +20 -10
- package/dist_ts/classes.login.js +14 -13
- package/dist_ts/classes.openaiprovider.d.ts +53 -0
- package/dist_ts/classes.openaiprovider.js +340 -0
- package/dist_ts/classes.opencodeharness.js +3 -2
- package/dist_ts/classes.service.js +3 -5
- package/dist_ts/index.d.ts +2 -0
- package/dist_ts/index.js +3 -1
- package/dist_ts/interfaces.openai.d.ts +118 -0
- package/dist_ts/interfaces.openai.js +3 -0
- package/dist_ts/openaiauth.d.ts +76 -0
- package/dist_ts/openaiauth.js +371 -0
- package/dist_ts/openaiusage.d.ts +59 -0
- package/dist_ts/openaiusage.js +222 -0
- package/dist_ts/plugins.d.ts +1 -3
- package/dist_ts/plugins.js +2 -4
- package/dist_ts/preuse.d.ts +50 -0
- package/dist_ts/preuse.js +63 -4
- package/dist_ts/ts_migration/legacysources/shared.js +4 -3
- package/openai-codex-license.txt +201 -0
- package/package.json +6 -4
- package/readme.md +86 -10
- package/third-party-notices.md +29 -0
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/authority-contract.ts +56 -8
- package/ts/classes.authoritybroker.ts +52 -13
- package/ts/classes.authoritycli.ts +48 -6
- package/ts/classes.authorityclient.ts +11 -3
- package/ts/classes.authoritydaemon.ts +7 -4
- package/ts/classes.authoritydatabase.ts +14 -6
- package/ts/classes.authorityimport.ts +12 -12
- package/ts/classes.authoritymodels.ts +42 -14
- package/ts/classes.authoritypreuse.ts +30 -17
- package/ts/classes.authorityusage.ts +8 -9
- package/ts/classes.cli.ts +3 -3
- package/ts/classes.codexpreuse.ts +130 -40
- package/ts/classes.codexstatus.ts +40 -73
- package/ts/classes.login.ts +34 -21
- package/ts/classes.openaiprovider.ts +365 -0
- package/ts/classes.opencodeharness.ts +3 -2
- package/ts/classes.service.ts +3 -4
- package/ts/index.ts +2 -0
- package/ts/interfaces.openai.ts +142 -0
- package/ts/openaiauth.ts +422 -0
- package/ts/openaiusage.ts +247 -0
- package/ts/plugins.ts +1 -3
- package/ts/preuse.ts +88 -3
- package/ts/ts_migration/legacysources/shared.ts +4 -3
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
import type { IOpenAiAccountRateLimits } from './interfaces.openai.js';
|
|
2
|
+
/**
|
|
3
|
+
* Why a backend read failed, never with the response body:
|
|
4
|
+
* - `unauthorized`: the access token was rejected (401); renew it or sign in again.
|
|
5
|
+
* - `rate_limited`: the service refused for too many requests (429); `retryAfter` is its raw header.
|
|
6
|
+
* - `forbidden`: access denied (403). `challenge`: a Cloudflare verification challenge answered instead.
|
|
7
|
+
* - `http`: another error status. `protocol`: an answer too large or not what this route returns.
|
|
8
|
+
* - `network`: the request did not complete. `aborted` / `timeout`: the caller's signal or the time limit.
|
|
9
|
+
*/
|
|
10
|
+
export type TOpenAiBackendFailure = 'unauthorized' | 'rate_limited' | 'forbidden' | 'challenge' | 'http' | 'protocol' | 'network' | 'aborted' | 'timeout';
|
|
11
|
+
export declare class OpenAiBackendError extends Error {
|
|
12
|
+
readonly reason: TOpenAiBackendFailure;
|
|
13
|
+
readonly status?: number | undefined;
|
|
14
|
+
readonly retryAfter: string | null;
|
|
15
|
+
constructor(reason: TOpenAiBackendFailure, status?: number | undefined, retryAfter?: string | null);
|
|
16
|
+
}
|
|
17
|
+
/** Access to read one ChatGPT account. A legacy login may carry no workspace; its reads send none. */
|
|
18
|
+
export interface IOpenAiReadAccess {
|
|
19
|
+
accessToken: string;
|
|
20
|
+
accountId?: string;
|
|
21
|
+
isFedrampAccount: boolean;
|
|
22
|
+
}
|
|
23
|
+
export interface IOpenAiBackendReadOptions {
|
|
24
|
+
fetch?: typeof fetch;
|
|
25
|
+
signal?: AbortSignal;
|
|
26
|
+
timeoutMs?: number;
|
|
27
|
+
/** The `originator` header; defaults to `authswitch`. */
|
|
28
|
+
originator?: string;
|
|
29
|
+
/** Extra request headers a route requires. */
|
|
30
|
+
headers?: Record<string, string>;
|
|
31
|
+
}
|
|
32
|
+
/** One bounded GET of `https://chatgpt.com/backend-api/<path>`, answered as a JSON object or an `OpenAiBackendError`. */
|
|
33
|
+
export declare const readChatGptBackend: (path: string, access: IOpenAiReadAccess, options?: IOpenAiBackendReadOptions) => Promise<Record<string, unknown>>;
|
|
34
|
+
/** Credits and spend control, which only the account views show; the stored reading keeps the limits alone. */
|
|
35
|
+
export interface IOpenAiAccountUsage {
|
|
36
|
+
/** The workspace the service answered for, when it names one. */
|
|
37
|
+
accountId: string | null;
|
|
38
|
+
rateLimits: IOpenAiAccountRateLimits;
|
|
39
|
+
credits?: {
|
|
40
|
+
unlimited: boolean;
|
|
41
|
+
hasCredits: boolean;
|
|
42
|
+
balance?: string;
|
|
43
|
+
};
|
|
44
|
+
spendControl?: {
|
|
45
|
+
reached: boolean;
|
|
46
|
+
individualLimit?: {
|
|
47
|
+
used: string;
|
|
48
|
+
limit: string;
|
|
49
|
+
remaining: string;
|
|
50
|
+
resetsAt: number;
|
|
51
|
+
};
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
/** Projects one `wham/usage` answer, refusing it whole when any member it carries is not the documented shape. */
|
|
55
|
+
export declare const projectOpenAiAccountUsage: (value: unknown, observedAt: string) => IOpenAiAccountUsage;
|
|
56
|
+
/** Reads and projects one account's `wham/usage`. An answer for another workspace is refused. */
|
|
57
|
+
export declare const readOpenAiAccountUsage: (access: IOpenAiReadAccess, options?: IOpenAiBackendReadOptions & {
|
|
58
|
+
now?: () => Date;
|
|
59
|
+
}) => Promise<IOpenAiAccountUsage>;
|
|
@@ -0,0 +1,222 @@
|
|
|
1
|
+
// OpenAI protocol portions are adapted in TypeScript from OpenAI Codex (Apache-2.0) and modified by Task Venture Capital GmbH; see third-party-notices.md.
|
|
2
|
+
import * as plugins from './plugins.js';
|
|
3
|
+
import { commitinfo } from './00_commitinfo_data.js';
|
|
4
|
+
/**
|
|
5
|
+
* The one reader of the ChatGPT backend's account routes, and of `wham/usage` in particular (Codex
|
|
6
|
+
* `codex-rs/backend-client`: `client.rs`, `models/rate_limit_status_payload.rs`). The authority's usage reading,
|
|
7
|
+
* the import's access-token proof and the legacy `limits` view all read an account through here.
|
|
8
|
+
*/
|
|
9
|
+
const DEFAULT_TIMEOUT_MS = 10_000;
|
|
10
|
+
const MAX_RESPONSE_BYTES = 1024 * 1024;
|
|
11
|
+
const MAX_ADDITIONAL_RATE_LIMITS = 128;
|
|
12
|
+
const MAX_TEXT_BYTES = 256;
|
|
13
|
+
export class OpenAiBackendError extends Error {
|
|
14
|
+
reason;
|
|
15
|
+
status;
|
|
16
|
+
retryAfter;
|
|
17
|
+
constructor(reason, status, retryAfter = null) {
|
|
18
|
+
super(`ChatGPT backend request failed (${reason}${status === undefined ? '' : ` ${status}`}).`);
|
|
19
|
+
this.reason = reason;
|
|
20
|
+
this.status = status;
|
|
21
|
+
this.retryAfter = retryAfter;
|
|
22
|
+
this.name = 'OpenAiBackendError';
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
const isRecord = (value) => value !== null && typeof value === 'object' && !Array.isArray(value);
|
|
26
|
+
/** One bounded GET of `https://chatgpt.com/backend-api/<path>`, answered as a JSON object or an `OpenAiBackendError`. */
|
|
27
|
+
export const readChatGptBackend = async (path, access, options = {}) => {
|
|
28
|
+
// A referenced timer, unlike `AbortSignal.timeout`, so the read settles within its limit even when the
|
|
29
|
+
// transport ignores its signal and holds nothing else open.
|
|
30
|
+
const timeout = new AbortController();
|
|
31
|
+
const timer = setTimeout(() => timeout.abort(), options.timeoutMs ?? DEFAULT_TIMEOUT_MS);
|
|
32
|
+
const signal = options.signal ? AbortSignal.any([options.signal, timeout.signal]) : timeout.signal;
|
|
33
|
+
const fetcher = options.fetch ?? globalThis.fetch;
|
|
34
|
+
const failure = () => new OpenAiBackendError(timeout.signal.aborted ? 'timeout' : signal.aborted ? 'aborted' : 'network');
|
|
35
|
+
// The signal settles the read even when a transport ignores it.
|
|
36
|
+
let onAbort;
|
|
37
|
+
const aborted = new Promise((_resolve, reject) => {
|
|
38
|
+
onAbort = () => reject(failure());
|
|
39
|
+
signal.addEventListener('abort', onAbort, { once: true });
|
|
40
|
+
if (signal.aborted)
|
|
41
|
+
onAbort();
|
|
42
|
+
});
|
|
43
|
+
aborted.catch(() => undefined);
|
|
44
|
+
try {
|
|
45
|
+
return await Promise.race([readBody(fetcher, path, access, options, signal, failure), aborted]);
|
|
46
|
+
}
|
|
47
|
+
finally {
|
|
48
|
+
clearTimeout(timer);
|
|
49
|
+
signal.removeEventListener('abort', onAbort);
|
|
50
|
+
}
|
|
51
|
+
};
|
|
52
|
+
const readBody = async (fetcher, path, access, options, signal, failure) => {
|
|
53
|
+
if (signal.aborted)
|
|
54
|
+
throw failure();
|
|
55
|
+
let response;
|
|
56
|
+
try {
|
|
57
|
+
response = await fetcher(`https://chatgpt.com/backend-api/${path}`, {
|
|
58
|
+
method: 'GET', redirect: 'error', signal,
|
|
59
|
+
headers: { ...plugins.flexOpenAi.createOpenAiChatGptAccessHeaders(access, options.originator ?? 'authswitch'),
|
|
60
|
+
'User-Agent': `authswitch/${commitinfo.version}`, Accept: 'application/json', ...options.headers },
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
catch {
|
|
64
|
+
throw failure();
|
|
65
|
+
}
|
|
66
|
+
if (signal.aborted) {
|
|
67
|
+
await response.body?.cancel().catch(() => undefined);
|
|
68
|
+
throw failure();
|
|
69
|
+
}
|
|
70
|
+
if (!response.ok) {
|
|
71
|
+
await response.body?.cancel().catch(() => undefined);
|
|
72
|
+
if (response.headers.get('cf-mitigated') === 'challenge')
|
|
73
|
+
throw new OpenAiBackendError('challenge', response.status);
|
|
74
|
+
if (response.status === 401)
|
|
75
|
+
throw new OpenAiBackendError('unauthorized', 401);
|
|
76
|
+
if (response.status === 429)
|
|
77
|
+
throw new OpenAiBackendError('rate_limited', 429, response.headers.get('retry-after'));
|
|
78
|
+
if (response.status === 403)
|
|
79
|
+
throw new OpenAiBackendError('forbidden', 403);
|
|
80
|
+
throw new OpenAiBackendError('http', response.status);
|
|
81
|
+
}
|
|
82
|
+
const declared = response.headers.get('content-length');
|
|
83
|
+
if (declared !== null && (!/^\d+$/.test(declared) || Number(declared) > MAX_RESPONSE_BYTES)) {
|
|
84
|
+
await response.body?.cancel().catch(() => undefined);
|
|
85
|
+
throw new OpenAiBackendError('protocol', response.status);
|
|
86
|
+
}
|
|
87
|
+
const reader = response.body?.getReader();
|
|
88
|
+
if (!reader)
|
|
89
|
+
throw new OpenAiBackendError('protocol', response.status);
|
|
90
|
+
const chunks = [];
|
|
91
|
+
let size = 0;
|
|
92
|
+
const cancel = () => { void reader.cancel().catch(() => undefined); };
|
|
93
|
+
signal.addEventListener('abort', cancel, { once: true });
|
|
94
|
+
try {
|
|
95
|
+
while (true) {
|
|
96
|
+
const part = await reader.read();
|
|
97
|
+
if (part.done)
|
|
98
|
+
break;
|
|
99
|
+
size += part.value.byteLength;
|
|
100
|
+
if (size > MAX_RESPONSE_BYTES) {
|
|
101
|
+
await reader.cancel().catch(() => undefined);
|
|
102
|
+
throw new OpenAiBackendError('protocol', response.status);
|
|
103
|
+
}
|
|
104
|
+
chunks.push(part.value);
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
catch (error) {
|
|
108
|
+
if (error instanceof OpenAiBackendError)
|
|
109
|
+
throw error;
|
|
110
|
+
throw failure();
|
|
111
|
+
}
|
|
112
|
+
finally {
|
|
113
|
+
signal.removeEventListener('abort', cancel);
|
|
114
|
+
reader.releaseLock();
|
|
115
|
+
}
|
|
116
|
+
if (signal.aborted)
|
|
117
|
+
throw failure();
|
|
118
|
+
let body;
|
|
119
|
+
try {
|
|
120
|
+
body = JSON.parse(Buffer.concat(chunks).toString('utf8'));
|
|
121
|
+
}
|
|
122
|
+
catch {
|
|
123
|
+
throw new OpenAiBackendError('protocol', response.status);
|
|
124
|
+
}
|
|
125
|
+
if (!isRecord(body))
|
|
126
|
+
throw new OpenAiBackendError('protocol', response.status);
|
|
127
|
+
return body;
|
|
128
|
+
};
|
|
129
|
+
const invalid = () => { throw new OpenAiBackendError('protocol'); };
|
|
130
|
+
const boundedInteger = (value, minimum, maximum = Number.MAX_SAFE_INTEGER) => Number.isSafeInteger(value) && value >= minimum && value <= maximum ? value : invalid();
|
|
131
|
+
const boundedText = (value) => typeof value === 'string' && value.length > 0 && Buffer.byteLength(value, 'utf8') <= MAX_TEXT_BYTES ? value : invalid();
|
|
132
|
+
const present = (value) => value !== null && value !== undefined;
|
|
133
|
+
const projectWindow = (value) => {
|
|
134
|
+
if (!isRecord(value))
|
|
135
|
+
return invalid();
|
|
136
|
+
return {
|
|
137
|
+
usedPercent: boundedInteger(value.used_percent, 0, 100),
|
|
138
|
+
limitWindowSeconds: boundedInteger(value.limit_window_seconds, 1),
|
|
139
|
+
resetAfterSeconds: boundedInteger(value.reset_after_seconds, 0),
|
|
140
|
+
resetsAt: boundedInteger(value.reset_at, 0),
|
|
141
|
+
};
|
|
142
|
+
};
|
|
143
|
+
const projectDetails = (value) => {
|
|
144
|
+
if (!isRecord(value) || typeof value.allowed !== 'boolean' || typeof value.limit_reached !== 'boolean')
|
|
145
|
+
return invalid();
|
|
146
|
+
return {
|
|
147
|
+
allowed: value.allowed,
|
|
148
|
+
limitReached: value.limit_reached,
|
|
149
|
+
...(present(value.primary_window) ? { primaryWindow: projectWindow(value.primary_window) } : {}),
|
|
150
|
+
...(present(value.secondary_window) ? { secondaryWindow: projectWindow(value.secondary_window) } : {}),
|
|
151
|
+
};
|
|
152
|
+
};
|
|
153
|
+
/** Projects one `wham/usage` answer, refusing it whole when any member it carries is not the documented shape. */
|
|
154
|
+
export const projectOpenAiAccountUsage = (value, observedAt) => {
|
|
155
|
+
if (!isRecord(value))
|
|
156
|
+
return invalid();
|
|
157
|
+
const additional = value.additional_rate_limits ?? [];
|
|
158
|
+
if (!Array.isArray(additional) || additional.length > MAX_ADDITIONAL_RATE_LIMITS)
|
|
159
|
+
return invalid();
|
|
160
|
+
let credits;
|
|
161
|
+
if (present(value.credits)) {
|
|
162
|
+
const raw = value.credits;
|
|
163
|
+
if (!isRecord(raw) || typeof raw.unlimited !== 'boolean' || typeof raw.has_credits !== 'boolean')
|
|
164
|
+
return invalid();
|
|
165
|
+
credits = { unlimited: raw.unlimited, hasCredits: raw.has_credits,
|
|
166
|
+
...(present(raw.balance) ? { balance: boundedText(raw.balance) } : {}) };
|
|
167
|
+
}
|
|
168
|
+
let spendControl;
|
|
169
|
+
if (present(value.spend_control)) {
|
|
170
|
+
const raw = value.spend_control;
|
|
171
|
+
if (!isRecord(raw) || typeof raw.reached !== 'boolean')
|
|
172
|
+
return invalid();
|
|
173
|
+
let individualLimit;
|
|
174
|
+
if (present(raw.individual_limit)) {
|
|
175
|
+
const limit = raw.individual_limit;
|
|
176
|
+
if (!isRecord(limit))
|
|
177
|
+
return invalid();
|
|
178
|
+
individualLimit = { used: boundedText(limit.used), limit: boundedText(limit.limit),
|
|
179
|
+
remaining: boundedText(limit.remaining), resetsAt: boundedInteger(limit.reset_at, 0) };
|
|
180
|
+
}
|
|
181
|
+
spendControl = { reached: raw.reached, ...(individualLimit ? { individualLimit } : {}) };
|
|
182
|
+
}
|
|
183
|
+
const reachedType = value.rate_limit_reached_type;
|
|
184
|
+
if (present(reachedType) && !isRecord(reachedType))
|
|
185
|
+
return invalid();
|
|
186
|
+
const resetCredits = value.rate_limit_reset_credits;
|
|
187
|
+
if (present(resetCredits) && !isRecord(resetCredits))
|
|
188
|
+
return invalid();
|
|
189
|
+
return {
|
|
190
|
+
accountId: present(value.account_id) ? boundedText(value.account_id) : null,
|
|
191
|
+
rateLimits: {
|
|
192
|
+
providerId: 'openai',
|
|
193
|
+
plan: boundedText(value.plan_type),
|
|
194
|
+
observedAt,
|
|
195
|
+
...(present(value.rate_limit) ? { rateLimit: projectDetails(value.rate_limit) } : {}),
|
|
196
|
+
additionalRateLimits: additional.map(raw => {
|
|
197
|
+
if (!isRecord(raw))
|
|
198
|
+
return invalid();
|
|
199
|
+
return {
|
|
200
|
+
limitName: boundedText(raw.limit_name),
|
|
201
|
+
meteredFeature: boundedText(raw.metered_feature),
|
|
202
|
+
...(present(raw.rate_limit) ? { rateLimit: projectDetails(raw.rate_limit) } : {}),
|
|
203
|
+
};
|
|
204
|
+
}),
|
|
205
|
+
...(isRecord(reachedType) ? { rateLimitReachedType: boundedText(reachedType.type) } : {}),
|
|
206
|
+
...(isRecord(resetCredits)
|
|
207
|
+
? { rateLimitResetCreditsAvailableCount: boundedInteger(resetCredits.available_count, 0) } : {}),
|
|
208
|
+
},
|
|
209
|
+
...(credits ? { credits } : {}),
|
|
210
|
+
...(spendControl ? { spendControl } : {}),
|
|
211
|
+
};
|
|
212
|
+
};
|
|
213
|
+
/** Reads and projects one account's `wham/usage`. An answer for another workspace is refused. */
|
|
214
|
+
export const readOpenAiAccountUsage = async (access, options = {}) => {
|
|
215
|
+
const body = await readChatGptBackend('wham/usage', access, options);
|
|
216
|
+
const usage = projectOpenAiAccountUsage(body, (options.now ?? (() => new Date()))().toISOString());
|
|
217
|
+
if (usage.accountId !== null && access.accountId !== undefined && usage.accountId !== access.accountId) {
|
|
218
|
+
throw new OpenAiBackendError('protocol');
|
|
219
|
+
}
|
|
220
|
+
return usage;
|
|
221
|
+
};
|
|
222
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"openaiusage.js","sourceRoot":"","sources":["../ts/openaiusage.ts"],"names":[],"mappings":"AAAA,2JAA2J;AAE3J,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAGrD;;;;GAIG;AAEH,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAClC,MAAM,kBAAkB,GAAG,IAAI,GAAG,IAAI,CAAC;AACvC,MAAM,0BAA0B,GAAG,GAAG,CAAC;AACvC,MAAM,cAAc,GAAG,GAAG,CAAC;AAa3B,MAAM,OAAO,kBAAmB,SAAQ,KAAK;IACf;IAA+C;IACzD;IADlB,YAA4B,MAA6B,EAAkB,MAAe,EACxE,aAA4B,IAAI;QAChD,KAAK,CAAC,mCAAmC,MAAM,GAAG,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,MAAM,EAAE,IAAI,CAAC,CAAC;QAFtE,WAAM,GAAN,MAAM,CAAuB;QAAkB,WAAM,GAAN,MAAM,CAAS;QACxE,eAAU,GAAV,UAAU,CAAsB;QAEhD,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC;IACnC,CAAC;CACF;AAmBD,MAAM,QAAQ,GAAG,CAAC,KAAc,EAAoC,EAAE,CACpE,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAEvE,yHAAyH;AACzH,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,IAAY,EAAE,MAAyB,EAC9E,UAAqC,EAAE,EAAoC,EAAE;IAC7E,uGAAuG;IACvG,4DAA4D;IAC5D,MAAM,OAAO,GAAG,IAAI,eAAe,EAAE,CAAC;IACtC,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,OAAO,CAAC,SAAS,IAAI,kBAAkB,CAAC,CAAC;IACzF,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;IACnG,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,IAAI,UAAU,CAAC,KAAK,CAAC;IAClD,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,IAAI,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC1H,gEAAgE;IAChE,IAAI,OAAoB,CAAC;IACzB,MAAM,OAAO,GAAG,IAAI,OAAO,CAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE;QACtD,OAAO,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QAClC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1D,IAAI,MAAM,CAAC,OAAO;YAAE,OAAO,EAAE,CAAC;IAChC,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IAC/B,IAAI,CAAC;QACH,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IAClG,CAAC;YAAS,CAAC;QACT,YAAY,CAAC,KAAK,CAAC,CAAC;QACpB,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG,KAAK,EAAE,OAAqB,EAAE,IAAY,EAAE,MAAyB,EACpF,OAAkC,EAAE,MAAmB,EAAE,OAAiC,EACxD,EAAE;IACpC,IAAI,MAAM,CAAC,OAAO;QAAE,MAAM,OAAO,EAAE,CAAC;IACpC,IAAI,QAAkB,CAAC;IACvB,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,OAAO,CAAC,mCAAmC,IAAI,EAAE,EAAE;YAClE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM;YACxC,OAAO,EAAE,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,gCAAgC,CAAC,MAAM,EAAE,OAAO,CAAC,UAAU,IAAI,YAAY,CAAC;gBAC3G,YAAY,EAAE,cAAc,UAAU,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE;SACrG,CAAC,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,OAAO,EAAE,CAAC;IAClB,CAAC;IACD,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QACrD,MAAM,OAAO,EAAE,CAAC;IAClB,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QACrD,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,WAAW;YAAE,MAAM,IAAI,kBAAkB,CAAC,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;QACrH,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG;YAAE,MAAM,IAAI,kBAAkB,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;QAC/E,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG;YAAE,MAAM,IAAI,kBAAkB,CAAC,cAAc,EAAE,GAAG,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC;QACpH,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG;YAAE,MAAM,IAAI,kBAAkB,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;QAC5E,MAAM,IAAI,kBAAkB,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IACxD,CAAC;IACD,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IACxD,IAAI,QAAQ,KAAK,IAAI,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,kBAAkB,CAAC,EAAE,CAAC;QAC5F,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QACrD,MAAM,IAAI,kBAAkB,CAAC,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC5D,CAAC;IACD,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC;IAC1C,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,kBAAkB,CAAC,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IACvE,MAAM,MAAM,GAAiB,EAAE,CAAC;IAChC,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,MAAM,MAAM,GAAG,GAAS,EAAE,GAAG,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5E,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IACzD,IAAI,CAAC;QACH,OAAO,IAAI,EAAE,CAAC;YACZ,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;YACjC,IAAI,IAAI,CAAC,IAAI;gBAAE,MAAM;YACrB,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC;YAC9B,IAAI,IAAI,GAAG,kBAAkB,EAAE,CAAC;gBAC9B,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;gBAC7C,MAAM,IAAI,kBAAkB,CAAC,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC5D,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,kBAAkB;YAAE,MAAM,KAAK,CAAC;QACrD,MAAM,OAAO,EAAE,CAAC;IAClB,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC5C,MAAM,CAAC,WAAW,EAAE,CAAC;IACvB,CAAC;IACD,IAAI,MAAM,CAAC,OAAO;QAAE,MAAM,OAAO,EAAE,CAAC;IACpC,IAAI,IAAa,CAAC;IAClB,IAAI,CAAC;QAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAAC,CAAC;IAClE,MAAM,CAAC;QAAC,MAAM,IAAI,kBAAkB,CAAC,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAAC,CAAC;IACpE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,MAAM,IAAI,kBAAkB,CAAC,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC/E,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,OAAO,GAAG,GAAU,EAAE,GAAG,MAAM,IAAI,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AAE3E,MAAM,cAAc,GAAG,CAAC,KAAc,EAAE,OAAe,EAAE,OAAO,GAAG,MAAM,CAAC,gBAAgB,EAAU,EAAE,CACpG,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,IAAK,KAAgB,IAAI,OAAO,IAAK,KAAgB,IAAI,OAAO,CAAC,CAAC,CAAC,KAAe,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;AAE5H,MAAM,WAAW,GAAG,CAAC,KAAc,EAAU,EAAE,CAC7C,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;AAE1H,MAAM,OAAO,GAAG,CAAC,KAAc,EAAW,EAAE,CAAC,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,CAAC;AAEnF,MAAM,aAAa,GAAG,CAAC,KAAc,EAA0B,EAAE;IAC/D,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,OAAO,EAAE,CAAC;IACvC,OAAO;QACL,WAAW,EAAE,cAAc,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,EAAE,GAAG,CAAC;QACvD,kBAAkB,EAAE,cAAc,CAAC,KAAK,CAAC,oBAAoB,EAAE,CAAC,CAAC;QACjE,iBAAiB,EAAE,cAAc,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAAC,CAAC;QAC/D,QAAQ,EAAE,cAAc,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;KAC5C,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,KAAc,EAA2B,EAAE;IACjE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,CAAC,aAAa,KAAK,SAAS;QAAE,OAAO,OAAO,EAAE,CAAC;IACzH,OAAO;QACL,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,YAAY,EAAE,KAAK,CAAC,aAAa;QACjC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAChG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,aAAa,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACvG,CAAC;AACJ,CAAC,CAAC;AAWF,kHAAkH;AAClH,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,KAAc,EAAE,UAAkB,EAAuB,EAAE;IACnG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,OAAO,EAAE,CAAC;IACvC,MAAM,UAAU,GAAG,KAAK,CAAC,sBAAsB,IAAI,EAAE,CAAC;IACtD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,MAAM,GAAG,0BAA0B;QAAE,OAAO,OAAO,EAAE,CAAC;IACnG,IAAI,OAAuC,CAAC;IAC5C,IAAI,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QAC3B,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC;QAC1B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,OAAO,GAAG,CAAC,SAAS,KAAK,SAAS,IAAI,OAAO,GAAG,CAAC,WAAW,KAAK,SAAS;YAAE,OAAO,OAAO,EAAE,CAAC;QACnH,OAAO,GAAG,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,UAAU,EAAE,GAAG,CAAC,WAAW;YAC/D,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;IAC7E,CAAC;IACD,IAAI,YAAiD,CAAC;IACtD,IAAI,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC;QACjC,MAAM,GAAG,GAAG,KAAK,CAAC,aAAa,CAAC;QAChC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,SAAS;YAAE,OAAO,OAAO,EAAE,CAAC;QACzE,IAAI,eAAoF,CAAC;QACzF,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAClC,MAAM,KAAK,GAAG,GAAG,CAAC,gBAAgB,CAAC;YACnC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;gBAAE,OAAO,OAAO,EAAE,CAAC;YACvC,eAAe,GAAG,EAAE,IAAI,EAAE,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC;gBAChF,SAAS,EAAE,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,cAAc,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC;QAC3F,CAAC;QACD,YAAY,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;IAC3F,CAAC;IACD,MAAM,WAAW,GAAG,KAAK,CAAC,uBAAuB,CAAC;IAClD,IAAI,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;QAAE,OAAO,OAAO,EAAE,CAAC;IACrE,MAAM,YAAY,GAAG,KAAK,CAAC,wBAAwB,CAAC;IACpD,IAAI,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;QAAE,OAAO,OAAO,EAAE,CAAC;IACvE,OAAO;QACL,SAAS,EAAE,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI;QAC3E,UAAU,EAAE;YACV,UAAU,EAAE,QAAQ;YACpB,IAAI,EAAE,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC;YAClC,UAAU;YACV,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACrF,oBAAoB,EAAE,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gBACzC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;oBAAE,OAAO,OAAO,EAAE,CAAC;gBACrC,OAAO;oBACL,SAAS,EAAE,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC;oBACtC,cAAc,EAAE,WAAW,CAAC,GAAG,CAAC,eAAe,CAAC;oBAChD,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAClF,CAAC;YACJ,CAAC,CAAC;YACF,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,oBAAoB,EAAE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACzF,GAAG,CAAC,QAAQ,CAAC,YAAY,CAAC;gBACxB,CAAC,CAAC,EAAE,mCAAmC,EAAE,cAAc,CAAC,YAAY,CAAC,eAAe,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACnG;QACD,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/B,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC1C,CAAC;AACJ,CAAC,CAAC;AAEF,iGAAiG;AACjG,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,EAAE,MAAyB,EAAE,UACjD,EAAE,EAAgC,EAAE;IACzD,MAAM,IAAI,GAAG,MAAM,kBAAkB,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACrE,MAAM,KAAK,GAAG,yBAAyB,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;IACnG,IAAI,KAAK,CAAC,SAAS,KAAK,IAAI,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS,IAAI,KAAK,CAAC,SAAS,KAAK,MAAM,CAAC,SAAS,EAAE,CAAC;QACvG,MAAM,IAAI,kBAAkB,CAAC,UAAU,CAAC,CAAC;IAC3C,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}
|
package/dist_ts/plugins.d.ts
CHANGED
|
@@ -29,7 +29,5 @@ import * as typedrequest from '@api.global/typedrequest';
|
|
|
29
29
|
export { smartconsole, smartsecret, smartdaemon, typedrequest };
|
|
30
30
|
import * as flexModels from '@modelprofile.com/flexharness-models';
|
|
31
31
|
import * as flexOpenAi from '@modelprofile.com/flexharness-providers/openai';
|
|
32
|
-
import * as flexAuth from '@modelprofile.com/flexharness-providers/auth';
|
|
33
|
-
import * as flexAccounts from '@modelprofile.com/flexharness-providers/accounts';
|
|
34
32
|
import * as crossharness from '@modelprofile.com/mcp-crossharness';
|
|
35
|
-
export { flexModels, flexOpenAi,
|
|
33
|
+
export { flexModels, flexOpenAi, crossharness };
|
package/dist_ts/plugins.js
CHANGED
|
@@ -31,8 +31,6 @@ export { smartconsole, smartsecret, smartdaemon, typedrequest };
|
|
|
31
31
|
// @modelprofile.com modules
|
|
32
32
|
import * as flexModels from '@modelprofile.com/flexharness-models';
|
|
33
33
|
import * as flexOpenAi from '@modelprofile.com/flexharness-providers/openai';
|
|
34
|
-
import * as flexAuth from '@modelprofile.com/flexharness-providers/auth';
|
|
35
|
-
import * as flexAccounts from '@modelprofile.com/flexharness-providers/accounts';
|
|
36
34
|
import * as crossharness from '@modelprofile.com/mcp-crossharness';
|
|
37
|
-
export { flexModels, flexOpenAi,
|
|
38
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
35
|
+
export { flexModels, flexOpenAi, crossharness };
|
|
36
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3BsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsc0JBQXNCO0FBQ3RCLE9BQU8sS0FBSyxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBQzlCLE9BQU8sS0FBSyxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBQzlCLE9BQU8sS0FBSyxJQUFJLE1BQU0sV0FBVyxDQUFDO0FBQ2xDLE9BQU8sS0FBSyxZQUFZLE1BQU0sb0JBQW9CLENBQUM7QUFDbkQsT0FBTyxLQUFLLE1BQU0sTUFBTSxhQUFhLENBQUM7QUFDdEMsT0FBTyxLQUFLLEdBQUcsTUFBTSxVQUFVLENBQUM7QUFDaEMsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUM1QyxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBR3pDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLGFBQWEsRUFBRSxFQUFFLEVBQUUsR0FBRyxFQUFFLEVBQUUsRUFBRSxJQUFJLEVBQUUsQ0FBQztBQUVsRSxNQUFNLGFBQWEsR0FBRyxhQUFhLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUNyRCxrR0FBa0c7QUFDbEcsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHLEdBQWlDLEVBQUUsQ0FBQyxhQUFhLENBQUMsYUFBYSxDQUFDLENBQUM7QUFLM0Y7OztHQUdHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sa0JBQWtCLEdBQUcsR0FBNkIsRUFBRSxDQUFDLE1BQU0sQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO0FBRTVGLHdCQUF3QjtBQUN4QiwrREFBK0Q7QUFDL0QsT0FBTyxLQUFLLE9BQU8sTUFBTSw4QkFBOEIsQ0FBQztBQUN4RCxpR0FBaUc7QUFDakcsT0FBTyxLQUFLLGFBQWEsTUFBTSx1QkFBdUIsQ0FBQztBQUN2RCxPQUFPLEVBQUUsT0FBTyxFQUFFLGFBQWEsRUFBRSxDQUFDO0FBRWxDLHNCQUFzQjtBQUN0QixPQUFPLEtBQUssWUFBWSxNQUFNLDBCQUEwQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxXQUFXLE1BQU0seUJBQXlCLENBQUM7QUFDdkQsT0FBTyxLQUFLLFdBQVcsTUFBTSx5QkFBeUIsQ0FBQztBQUN2RCxPQUFPLEtBQUssWUFBWSxNQUFNLDBCQUEwQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxZQUFZLEVBQUUsV0FBVyxFQUFFLFdBQVcsRUFBRSxZQUFZLEVBQUUsQ0FBQztBQUVoRSw0QkFBNEI7QUFDNUIsT0FBTyxLQUFLLFVBQVUsTUFBTSxzQ0FBc0MsQ0FBQztBQUNuRSxPQUFPLEtBQUssVUFBVSxNQUFNLGdEQUFnRCxDQUFDO0FBQzdFLE9BQU8sS0FBSyxZQUFZLE1BQU0sb0NBQW9DLENBQUM7QUFDbkUsT0FBTyxFQUFFLFVBQVUsRUFBRSxVQUFVLEVBQUUsWUFBWSxFQUFFLENBQUMifQ==
|
package/dist_ts/preuse.d.ts
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import type { IAuthHarness, IHarnessAccount, IHarnessPreuseOptions, IHarnessPreuseResult, IHarnessUsageWindow } from './interfaces.harness.js';
|
|
2
2
|
export declare const defaultPreusePrompt = "Write 2000 words about strawberries.";
|
|
3
|
+
/** The close of every message about a prompt that may have reached the provider. */
|
|
4
|
+
export declare const preuseMayHaveConsumed = "Tokens may already have been consumed; no automatic retry was made. Check the account status before trying again.";
|
|
3
5
|
/**
|
|
4
6
|
* Only fixed local messages may cross the inference error boundary.
|
|
5
7
|
*
|
|
@@ -12,6 +14,54 @@ export declare class PreuseError extends Error {
|
|
|
12
14
|
readonly requestStarted: boolean;
|
|
13
15
|
constructor(messageArg: string, requestStarted?: boolean);
|
|
14
16
|
}
|
|
17
|
+
/**
|
|
18
|
+
* A limit that kept a preuse prompt from being answered.
|
|
19
|
+
*
|
|
20
|
+
* `usage_limit` is the account's quota, spent until it resets; `rate_limit` a short throttle. `window` names the
|
|
21
|
+
* window by its length (`weekly`, `five-hour`) and `resetsAt` is an ISO time; either is null when the account's
|
|
22
|
+
* usage reading or the provider's refusal did not state it.
|
|
23
|
+
*/
|
|
24
|
+
export interface IPreuseLimit {
|
|
25
|
+
kind: 'usage_limit' | 'rate_limit';
|
|
26
|
+
window: string | null;
|
|
27
|
+
resetsAt: string | null;
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
* `Weekly usage limit reached, resets in 16h 46min (2026-09-27 05:12)`: human text, so the reset reads in local time.
|
|
31
|
+
* The limit itself keeps its ISO `resetsAt` for receipts and JSON output.
|
|
32
|
+
*/
|
|
33
|
+
export declare const describePreuseLimit: (limitArg: IPreuseLimit, nowArg: number) => string;
|
|
34
|
+
/**
|
|
35
|
+
* A preuse a limit stopped. `usage` is the account's own usage reading before anything was sent; `provider`
|
|
36
|
+
* is the provider's refusal of the prompt, which `generationStarted` says came before or after it began to
|
|
37
|
+
* answer: a refusal before its answer consumed nothing.
|
|
38
|
+
*/
|
|
39
|
+
export declare class PreuseLimitError extends PreuseError {
|
|
40
|
+
readonly limit: IPreuseLimit;
|
|
41
|
+
readonly source: 'usage' | 'provider';
|
|
42
|
+
readonly generationStarted: boolean;
|
|
43
|
+
constructor(limit: IPreuseLimit, source: 'usage' | 'provider', generationStarted: boolean, nowArg: number);
|
|
44
|
+
}
|
|
45
|
+
/**
|
|
46
|
+
* Why a sent preuse prompt failed without a limit, and never with the provider's text.
|
|
47
|
+
*
|
|
48
|
+
* `http` is an answer with an HTTP error status; `stream` an error the answer stream reported after it began,
|
|
49
|
+
* with the machine-readable code the provider stated and no status, since its answer was a success; `response` an answer that could not be read;
|
|
50
|
+
* `network` a connection that failed before any answer; `aborted` an abort that was neither the caller's nor the
|
|
51
|
+
* deadline; `unknown` anything else. `status` and `providerCode` are null when the failure did not state them.
|
|
52
|
+
*/
|
|
53
|
+
export interface IPreuseFailure {
|
|
54
|
+
kind: 'http' | 'stream' | 'response' | 'network' | 'aborted' | 'unknown';
|
|
55
|
+
status: number | null;
|
|
56
|
+
providerCode: string | null;
|
|
57
|
+
}
|
|
58
|
+
/** `the provider answered HTTP 503`: the cause of a failed preuse, as the tail of a sentence. */
|
|
59
|
+
export declare const describePreuseFailure: (failureArg: IPreuseFailure) => string;
|
|
60
|
+
/** A sent preuse prompt that failed for the stated cause; its tokens may have been consumed. */
|
|
61
|
+
export declare class PreuseFailureError extends PreuseError {
|
|
62
|
+
readonly failure: IPreuseFailure;
|
|
63
|
+
constructor(failure: IPreuseFailure);
|
|
64
|
+
}
|
|
15
65
|
export declare const validatePreuseOptions: (optionsArg: IHarnessPreuseOptions) => void;
|
|
16
66
|
/**
|
|
17
67
|
* What one account's turn in a run did.
|
package/dist_ts/preuse.js
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
|
-
import { orderedUsageWindows } from './accounts.js';
|
|
1
|
+
import { localDateTime, orderedUsageWindows, until } from './accounts.js';
|
|
2
2
|
export const defaultPreusePrompt = 'Write 2000 words about strawberries.';
|
|
3
|
+
/** The close of every message about a prompt that may have reached the provider. */
|
|
4
|
+
export const preuseMayHaveConsumed = 'Tokens may already have been consumed; no automatic retry was made. Check the account status before trying again.';
|
|
3
5
|
/**
|
|
4
6
|
* Only fixed local messages may cross the inference error boundary.
|
|
5
7
|
*
|
|
@@ -15,6 +17,59 @@ export class PreuseError extends Error {
|
|
|
15
17
|
this.requestStarted = requestStarted;
|
|
16
18
|
}
|
|
17
19
|
}
|
|
20
|
+
/**
|
|
21
|
+
* `Weekly usage limit reached, resets in 16h 46min (2026-09-27 05:12)`: human text, so the reset reads in local time.
|
|
22
|
+
* The limit itself keeps its ISO `resetsAt` for receipts and JSON output.
|
|
23
|
+
*/
|
|
24
|
+
export const describePreuseLimit = (limitArg, nowArg) => {
|
|
25
|
+
const name = `${limitArg.window === null ? '' : `${limitArg.window} `}${limitArg.kind === 'usage_limit' ? 'usage' : 'rate'} limit reached`;
|
|
26
|
+
const countdown = limitArg.resetsAt === null ? null : until(limitArg.resetsAt, nowArg);
|
|
27
|
+
const at = localDateTime(limitArg.resetsAt);
|
|
28
|
+
const reset = limitArg.resetsAt === null ? ''
|
|
29
|
+
: countdown === 'due' ? `, due to reset now (${at})` : `, resets in ${countdown} (${at})`;
|
|
30
|
+
return `${name.charAt(0).toUpperCase()}${name.slice(1)}${reset}`;
|
|
31
|
+
};
|
|
32
|
+
/**
|
|
33
|
+
* A preuse a limit stopped. `usage` is the account's own usage reading before anything was sent; `provider`
|
|
34
|
+
* is the provider's refusal of the prompt, which `generationStarted` says came before or after it began to
|
|
35
|
+
* answer: a refusal before its answer consumed nothing.
|
|
36
|
+
*/
|
|
37
|
+
export class PreuseLimitError extends PreuseError {
|
|
38
|
+
limit;
|
|
39
|
+
source;
|
|
40
|
+
generationStarted;
|
|
41
|
+
constructor(limit, source, generationStarted, nowArg) {
|
|
42
|
+
const described = describePreuseLimit(limit, nowArg);
|
|
43
|
+
super(source === 'usage' ? `${described}. No preuse prompt was sent.`
|
|
44
|
+
: generationStarted
|
|
45
|
+
? `The provider stopped the answer: ${described}. Tokens may already have been consumed; no automatic retry was made.`
|
|
46
|
+
: `The provider refused the prompt before answering it: ${described}. No tokens were consumed; no automatic retry was made.`, source === 'provider');
|
|
47
|
+
this.limit = limit;
|
|
48
|
+
this.source = source;
|
|
49
|
+
this.generationStarted = generationStarted;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
/** `the provider answered HTTP 503`: the cause of a failed preuse, as the tail of a sentence. */
|
|
53
|
+
export const describePreuseFailure = (failureArg) => {
|
|
54
|
+
const status = failureArg.status === null ? null : `HTTP ${failureArg.status}`;
|
|
55
|
+
switch (failureArg.kind) {
|
|
56
|
+
case 'http': return `the provider answered ${status ?? 'with an HTTP error'}`;
|
|
57
|
+
case 'stream':
|
|
58
|
+
return `the answer stream reported an error${failureArg.providerCode === null ? '' : ` (code ${failureArg.providerCode})`}`;
|
|
59
|
+
case 'response': return `the provider's answer${status ? ` (${status})` : ''} could not be read`;
|
|
60
|
+
case 'network': return 'no answer arrived: the connection failed';
|
|
61
|
+
case 'aborted': return 'the request was aborted';
|
|
62
|
+
case 'unknown': return 'the request ended in an error that names no cause';
|
|
63
|
+
}
|
|
64
|
+
};
|
|
65
|
+
/** A sent preuse prompt that failed for the stated cause; its tokens may have been consumed. */
|
|
66
|
+
export class PreuseFailureError extends PreuseError {
|
|
67
|
+
failure;
|
|
68
|
+
constructor(failure) {
|
|
69
|
+
super(`Preuse did not complete: ${describePreuseFailure(failure)}. ${preuseMayHaveConsumed}`, true);
|
|
70
|
+
this.failure = failure;
|
|
71
|
+
}
|
|
72
|
+
}
|
|
18
73
|
export const validatePreuseOptions = (optionsArg) => {
|
|
19
74
|
if (typeof optionsArg.prompt !== 'string' || !optionsArg.prompt.trim() || Buffer.byteLength(optionsArg.prompt, 'utf8') > 16_384) {
|
|
20
75
|
throw new PreuseError('The preuse prompt must contain between 1 and 16384 UTF-8 bytes.');
|
|
@@ -54,10 +109,14 @@ export const preuseCountsText = (summaryArg) => [
|
|
|
54
109
|
...(summaryArg.counts.interrupted ? [`${summaryArg.counts.interrupted} interrupted`] : []),
|
|
55
110
|
...(summaryArg.notRun.length ? [`${summaryArg.notRun.length} not run`] : []),
|
|
56
111
|
].join(', ');
|
|
57
|
-
/**
|
|
112
|
+
/**
|
|
113
|
+
* An adapter's own fixed message, or, for an error that crossed the boundary unnamed, the fixed local text with
|
|
114
|
+
* the error's class name -- never its message, which may carry a provider body or a token.
|
|
115
|
+
*/
|
|
58
116
|
const preuseReason = (errorArg) => errorArg instanceof PreuseError
|
|
59
117
|
? errorArg.message
|
|
60
|
-
:
|
|
118
|
+
: `Preuse failed with an error the adapter did not name (${errorArg instanceof Error && /^[A-Za-z]{1,64}$/.test(errorArg.name) ? errorArg.name : 'unknown'}). `
|
|
119
|
+
+ 'Tokens may already have been consumed; check account status before trying again.';
|
|
61
120
|
/**
|
|
62
121
|
* The account's reset schedule, read after its prompt completed, exactly as the single-account command reads it.
|
|
63
122
|
*
|
|
@@ -115,4 +174,4 @@ export const preuseAccounts = async (harnessArg, accountsArg, optionsArg, report
|
|
|
115
174
|
}
|
|
116
175
|
return { results, counts, notRun };
|
|
117
176
|
};
|
|
118
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
177
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"preuse.js","sourceRoot":"","sources":["../ts/preuse.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as plugins from '../../plugins.js';
|
|
2
2
|
import { readCredentialRaw } from '../../classes.credentialstore.js';
|
|
3
|
+
import { parseOpenAiTokenClaims } from '../../openaiauth.js';
|
|
3
4
|
import { resolveClaudeNativeHome } from '../../classes.claudenative.js';
|
|
4
5
|
export const resolveLegacySourceLocations = (env, homeDirectory) => {
|
|
5
6
|
const dataHome = env.XDG_DATA_HOME || plugins.path.join(homeDirectory, '.local', 'share');
|
|
@@ -54,7 +55,7 @@ export const parseLegacyJson = (raw) => {
|
|
|
54
55
|
export const openAiSourceIdentity = (idToken) => {
|
|
55
56
|
let info;
|
|
56
57
|
try {
|
|
57
|
-
info =
|
|
58
|
+
info = parseOpenAiTokenClaims(idToken);
|
|
58
59
|
}
|
|
59
60
|
catch {
|
|
60
61
|
return null;
|
|
@@ -122,7 +123,7 @@ export const accessTokenExpiry = (accessToken) => {
|
|
|
122
123
|
if (!accessToken)
|
|
123
124
|
return null;
|
|
124
125
|
try {
|
|
125
|
-
return
|
|
126
|
+
return parseOpenAiTokenClaims(accessToken).expiresAt ?? null;
|
|
126
127
|
}
|
|
127
128
|
catch {
|
|
128
129
|
return null;
|
|
@@ -137,4 +138,4 @@ export const accessProofAvailable = (expiresAt, now) => {
|
|
|
137
138
|
};
|
|
138
139
|
export const EXPIRED_ACCESS_PROBLEM = 'the stored access token has expired, so the non-rotating proof is unavailable until the native tool '
|
|
139
140
|
+ 'refreshes its own store';
|
|
140
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
141
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hhcmVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vdHMvdHNfbWlncmF0aW9uL2xlZ2FjeXNvdXJjZXMvc2hhcmVkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sa0JBQWtCLENBQUM7QUFDNUMsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFDckUsT0FBTyxFQUFFLHNCQUFzQixFQUEyQixNQUFNLHFCQUFxQixDQUFDO0FBQ3RGLE9BQU8sRUFBRSx1QkFBdUIsRUFBb0MsTUFBTSwrQkFBK0IsQ0FBQztBQXdEMUcsTUFBTSxDQUFDLE1BQU0sNEJBQTRCLEdBQUcsQ0FBQyxHQUFzQixFQUNqRSxhQUFxQixFQUEwQixFQUFFO0lBQ2pELE1BQU0sUUFBUSxHQUFHLEdBQUcsQ0FBQyxhQUFhLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsYUFBYSxFQUFFLFFBQVEsRUFBRSxPQUFPLENBQUMsQ0FBQztJQUMxRixPQUFPO1FBQ0wsY0FBYyxFQUFFLEdBQUcsQ0FBQyxlQUFlLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsYUFBYSxFQUFFLGFBQWEsQ0FBQztRQUN0RixTQUFTLEVBQUUsR0FBRyxDQUFDLFVBQVUsSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxhQUFhLEVBQUUsUUFBUSxDQUFDO1FBQ3ZFLFVBQVUsRUFBRSx1QkFBdUIsQ0FBQyxHQUFHLEVBQUUsYUFBYSxDQUFDO1FBQ3ZELGdCQUFnQixFQUFFLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxVQUFVLEVBQUUsV0FBVyxDQUFDO0tBQ3ZFLENBQUM7QUFDSixDQUFDLENBQUM7QUFFRixNQUFNLENBQUMsTUFBTSxVQUFVLEdBQUcsQ0FBQyxLQUFhLEVBQVUsRUFBRSxDQUNsRCxPQUFPLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FB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
|