agl 43.0.5 → 43.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/changelog.md +30 -0
- package/dist_serve/bundle.js +5996 -5280
- package/dist_serve/bundle.js.map +2 -2
- package/dist_serve/bundle.js.third-party-notices.json +30 -30
- package/dist_serve/bundle.js.third-party-notices.txt +30 -30
- package/dist_serve/third-party-notices.md +1 -1
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/aglapi/aglapisurface.document.js +805 -10
- package/dist_ts/aglapi/interfaces.d.ts +13 -0
- package/dist_ts/aglapi/interfaces.js +4 -1
- package/dist_ts/classes.authmodels.js +17 -4
- package/dist_ts/classes.authstore.js +16 -2
- package/dist_ts/classes.claudeharness.d.ts +14 -5
- package/dist_ts/classes.claudeharness.js +62 -2
- package/dist_ts/classes.cli.d.ts +4 -2
- package/dist_ts/classes.cli.js +6 -3
- package/dist_ts/classes.codexclientadapter.d.ts +7 -5
- package/dist_ts/classes.codexclientadapter.js +38 -3
- package/dist_ts/classes.controller.d.ts +19 -2
- package/dist_ts/classes.controller.js +234 -27
- package/dist_ts/classes.controllermanagement.d.ts +14 -4
- package/dist_ts/classes.controllermanagement.js +20 -2
- package/dist_ts/classes.gatewayclient.d.ts +115 -0
- package/dist_ts/classes.gatewayclient.js +336 -0
- package/dist_ts/classes.gatewayclientstore.d.ts +97 -0
- package/dist_ts/classes.gatewayclientstore.js +261 -0
- package/dist_ts/classes.inferencegateway.d.ts +8 -5
- package/dist_ts/classes.inferencegateway.js +62 -19
- package/dist_ts/classes.inferencerouter.d.ts +9 -0
- package/dist_ts/classes.inferencerouter.js +11 -1
- package/dist_ts/classes.inferenceservice.d.ts +9 -0
- package/dist_ts/classes.inferenceservice.js +27 -1
- package/dist_ts/classes.inferencespend.d.ts +9 -3
- package/dist_ts/classes.inferencespend.js +44 -16
- package/dist_ts/classes.mcpclient.d.ts +9 -4
- package/dist_ts/classes.mcpclient.js +24 -2
- package/dist_ts/classes.mcpcontrollerhost.d.ts +3 -1
- package/dist_ts/classes.mcpcontrollerhost.js +13 -1
- package/dist_ts/classes.mcptools.d.ts +3 -3
- package/dist_ts/classes.mcptools.js +42 -4
- package/dist_ts/classes.mcpvalidation.js +7 -1
- package/dist_ts/classes.opencodeclient.js +3 -1
- package/dist_ts/classes.proxycontrol.d.ts +33 -11
- package/dist_ts/classes.proxycontrol.js +12 -3
- package/dist_ts/classes.proxycontrolclient.d.ts +23 -5
- package/dist_ts/classes.proxycontrolclient.js +42 -6
- package/dist_ts/classes.proxydaemon.d.ts +8 -6
- package/dist_ts/classes.proxydaemon.js +42 -21
- package/dist_ts/classes.proxyleaseholder.d.ts +12 -4
- package/dist_ts/classes.proxyleaseholder.js +39 -9
- package/dist_ts/classes.proxymonitor.d.ts +7 -0
- package/dist_ts/classes.proxymonitor.js +13 -1
- package/dist_ts/classes.proxystore.d.ts +4 -3
- package/dist_ts/classes.proxystore.js +17 -7
- package/dist_ts/classes.sessionfeed.d.ts +1 -1
- package/dist_ts/classes.trustedproxysecrets.d.ts +2 -0
- package/dist_ts/classes.trustedproxysecrets.js +5 -1
- package/dist_ts/classes.validation.d.ts +7 -0
- package/dist_ts/classes.validation.js +49 -2
- package/dist_ts/driver/functions.drivertools.js +2 -2
- package/dist_ts/fleet/classes.codexworkers.d.ts +4 -11
- package/dist_ts/fleet/classes.codexworkers.js +6 -3
- package/dist_ts/fleet/classes.workers.d.ts +25 -13
- package/dist_ts/fleet/classes.workers.js +105 -9
- package/dist_ts/fleet/functions.workervalidation.d.ts +26 -1
- package/dist_ts/fleet/functions.workervalidation.js +40 -11
- package/dist_ts/fleet/interfaces.workers.d.ts +17 -11
- package/dist_ts/fleet/interfaces.workers.js +10 -1
- package/dist_ts/functions.confinedrelay.d.ts +21 -0
- package/dist_ts/functions.confinedrelay.js +65 -0
- package/dist_ts/functions.controllermanagementsurface.d.ts +4 -0
- package/dist_ts/functions.controllermanagementsurface.js +15 -1
- package/dist_ts/functions.deviceapi.d.ts +4 -2
- package/dist_ts/functions.deviceapi.js +20 -2
- package/dist_ts/functions.elicitation.d.ts +49 -0
- package/dist_ts/functions.elicitation.js +418 -0
- package/dist_ts/functions.gatewaycli.d.ts +24 -0
- package/dist_ts/functions.gatewaycli.js +395 -0
- package/dist_ts/functions.gatewayroute.d.ts +135 -0
- package/dist_ts/functions.gatewayroute.js +366 -0
- package/dist_ts/functions.inferencecli.d.ts +3 -3
- package/dist_ts/functions.inferencecli.js +62 -10
- package/dist_ts/functions.inferencecliarguments.d.ts +9 -2
- package/dist_ts/functions.inferencecliarguments.js +59 -10
- package/dist_ts/functions.inferencelaunch.d.ts +35 -7
- package/dist_ts/functions.inferencelaunch.js +143 -16
- package/dist_ts/functions.mcpfleetworkertools.d.ts +63 -70
- package/dist_ts/functions.mcpfleetworkertools.js +32 -4
- package/dist_ts/functions.proxycapacity.d.ts +50 -0
- package/dist_ts/functions.proxycapacity.js +142 -0
- package/dist_ts/functions.proxycapacitycli.d.ts +30 -0
- package/dist_ts/functions.proxycapacitycli.js +65 -0
- package/dist_ts/functions.proxycontract.d.ts +21 -4
- package/dist_ts/functions.proxycontract.js +12 -5
- package/dist_ts/functions.proxyharnessconfig.d.ts +7 -0
- package/dist_ts/functions.proxyharnessconfig.js +11 -1
- package/dist_ts/functions.remotecli.d.ts +30 -3
- package/dist_ts/functions.remotecli.js +44 -18
- package/dist_ts/interfaces.auth.d.ts +25 -4
- package/dist_ts/interfaces.auth.js +8 -1
- package/dist_ts/plugins.d.ts +2 -0
- package/dist_ts/plugins.js +4 -1
- package/dist_ts_authswitch/authority-placement.js +3 -17
- package/dist_ts_authswitch/authority-usagelimit.d.ts +29 -0
- package/dist_ts_authswitch/authority-usagelimit.js +66 -2
- package/dist_ts_authswitch/authority-usagewindows.d.ts +6 -0
- package/dist_ts_authswitch/authority-usagewindows.js +15 -1
- package/dist_ts_interfaces/devices.d.ts +133 -3
- package/dist_ts_interfaces/devices.js +3 -2
- package/dist_ts_interfaces/elicitations.d.ts +125 -0
- package/dist_ts_interfaces/elicitations.js +7 -0
- package/dist_ts_interfaces/fleetworkers.d.ts +119 -5
- package/dist_ts_interfaces/fleetworkers.js +14 -2
- package/dist_ts_interfaces/gateway.d.ts +151 -0
- package/dist_ts_interfaces/gateway.js +66 -0
- package/dist_ts_interfaces/index.d.ts +3 -0
- package/dist_ts_interfaces/index.js +4 -1
- package/dist_ts_interfaces/interfaces.d.ts +3 -1
- package/dist_ts_interfaces/interfaces.js +2 -2
- package/dist_ts_interfaces/management.d.ts +4 -4
- package/dist_ts_interfaces/management.js +3 -2
- package/dist_ts_interfaces/mcprequests.d.ts +18 -2
- package/dist_ts_interfaces/mcprequests.js +3 -1
- package/dist_ts_interfaces/nativesessions.d.ts +14 -0
- package/dist_ts_interfaces/proxycapacity.d.ts +99 -0
- package/dist_ts_interfaces/proxycapacity.js +74 -0
- package/dist_ts_interfaces/requests.d.ts +3 -3
- package/dist_ts_interfaces/requests.fleetworkers.js +2 -2
- package/dist_ts_interfaces/requests.js +1 -1
- package/dist_ts_interfaces/requests.promptreply.d.ts +18 -0
- package/dist_ts_interfaces/sessionfeed.d.ts +3 -2
- package/dist_ts_interfaces/sessionfeed.js +1 -1
- package/package.json +5 -4
- package/readme.md +267 -26
- package/third-party-notices.md +1 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/aglapi/aglapisurface.document.ts +804 -9
- package/ts/aglapi/interfaces.ts +3 -0
- package/ts/classes.authmodels.ts +22 -3
- package/ts/classes.authstore.ts +15 -1
- package/ts/classes.claudeharness.ts +80 -9
- package/ts/classes.cli.ts +7 -3
- package/ts/classes.codexclientadapter.ts +41 -5
- package/ts/classes.controller.ts +276 -32
- package/ts/classes.controllermanagement.ts +40 -7
- package/ts/classes.gatewayclient.ts +401 -0
- package/ts/classes.gatewayclientstore.ts +272 -0
- package/ts/classes.inferencegateway.ts +69 -23
- package/ts/classes.inferencerouter.ts +12 -0
- package/ts/classes.inferenceservice.ts +27 -0
- package/ts/classes.inferencespend.ts +46 -13
- package/ts/classes.mcpclient.ts +26 -4
- package/ts/classes.mcpcontrollerhost.ts +17 -0
- package/ts/classes.mcptools.ts +47 -5
- package/ts/classes.mcpvalidation.ts +5 -0
- package/ts/classes.opencodeclient.ts +2 -0
- package/ts/classes.proxycontrol.ts +43 -13
- package/ts/classes.proxycontrolclient.ts +39 -6
- package/ts/classes.proxydaemon.ts +57 -27
- package/ts/classes.proxyleaseholder.ts +43 -11
- package/ts/classes.proxymonitor.ts +12 -0
- package/ts/classes.proxystore.ts +21 -8
- package/ts/classes.sessionfeed.ts +1 -1
- package/ts/classes.trustedproxysecrets.ts +5 -0
- package/ts/classes.validation.ts +52 -0
- package/ts/driver/functions.drivertools.ts +1 -1
- package/ts/fleet/classes.codexworkers.ts +8 -6
- package/ts/fleet/classes.workers.ts +101 -17
- package/ts/fleet/functions.workervalidation.ts +35 -9
- package/ts/fleet/interfaces.workers.ts +11 -4
- package/ts/functions.confinedrelay.ts +65 -0
- package/ts/functions.controllermanagementsurface.ts +15 -0
- package/ts/functions.deviceapi.ts +24 -1
- package/ts/functions.elicitation.ts +443 -0
- package/ts/functions.gatewaycli.ts +436 -0
- package/ts/functions.gatewayroute.ts +429 -0
- package/ts/functions.inferencecli.ts +62 -13
- package/ts/functions.inferencecliarguments.ts +56 -9
- package/ts/functions.inferencelaunch.ts +143 -16
- package/ts/functions.mcpfleetworkertools.ts +34 -4
- package/ts/functions.proxycapacity.ts +191 -0
- package/ts/functions.proxycapacitycli.ts +104 -0
- package/ts/functions.proxycontract.ts +17 -4
- package/ts/functions.proxyharnessconfig.ts +11 -0
- package/ts/functions.remotecli.ts +56 -20
- package/ts/interfaces.auth.ts +29 -4
- package/ts/plugins.ts +5 -0
- package/ts_authswitch/authority-placement.ts +2 -15
- package/ts_authswitch/authority-usagelimit.ts +84 -1
- package/ts_authswitch/authority-usagewindows.ts +13 -0
- package/ts_interfaces/devices.schema.json +476 -2
- package/ts_interfaces/devices.ts +146 -2
- package/ts_interfaces/elicitations.ts +148 -0
- package/ts_interfaces/fleetworkers.ts +96 -4
- package/ts_interfaces/gateway.ts +242 -0
- package/ts_interfaces/index.ts +3 -0
- package/ts_interfaces/interfaces.ts +3 -1
- package/ts_interfaces/management.ts +6 -4
- package/ts_interfaces/mcprequests.ts +19 -0
- package/ts_interfaces/nativesessions.ts +16 -0
- package/ts_interfaces/proxycapacity.ts +162 -0
- package/ts_interfaces/requests.fleetworkers.ts +1 -1
- package/ts_interfaces/requests.promptreply.ts +22 -0
- package/ts_interfaces/requests.ts +4 -0
- package/ts_interfaces/sessionfeed.ts +3 -2
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/ts_web/classes.browserpresentation.ts +13 -5
- package/ts_web/classes.elicitationcards.ts +106 -0
- package/ts_web/classes.nativesessionstate.ts +38 -1
- package/ts_web/elements.accounts.ts +40 -113
- package/ts_web/elements.configurationpane.ts +24 -37
- package/ts_web/elements.devices.ts +4 -17
- package/ts_web/elements.fleetworker.ts +27 -2
- package/ts_web/elements.flexlimitstrip.ts +21 -70
- package/ts_web/elements.harnesscontrollerapp.ts +159 -186
- package/ts_web/functions.sessionchat.ts +5 -0
|
@@ -8,9 +8,12 @@ import { AglProxyControlClient, AglProxyUnavailableError } from './classes.proxy
|
|
|
8
8
|
import { AglProxyConfinedHolder, AglProxyLeaseHolder } from './classes.proxyleaseholder.js';
|
|
9
9
|
import { AglProxyDaemon } from './classes.proxydaemon.js';
|
|
10
10
|
import { AglProxyService, resolveAglExecutable } from './classes.proxyservice.js';
|
|
11
|
-
import { aglProxyConfinedMountPoint, aglProxyUnitName } from './functions.proxycontract.js';
|
|
11
|
+
import { aglProxyConfinedMountPoint, aglProxyRelayMountPoint, aglProxyUnitName } from './functions.proxycontract.js';
|
|
12
|
+
import { writeConfinedRelay } from './functions.confinedrelay.js';
|
|
12
13
|
import { inferenceCliHelp, parseInferenceCliArguments } from './functions.inferencecliarguments.js';
|
|
13
14
|
import { runProxyCredentialCommand } from './functions.proxycredentialcli.js';
|
|
15
|
+
import { runProxyCapacity } from './functions.proxycapacitycli.js';
|
|
16
|
+
import { isProxyCapacityAnswer } from '../dist_ts_interfaces/proxycapacity.js';
|
|
14
17
|
import { currentProxyCredentialHelper, writeProxyCredentialHelper } from './functions.proxycredentialhelper.js';
|
|
15
18
|
/** A placement score as the status prints it: percent of usage per hour, or `unscored` without a counted window. */
|
|
16
19
|
const scoreText = (scoreArg) => scoreArg === null ? 'unscored'
|
|
@@ -55,8 +58,9 @@ export const formatProxyStatus = (unitArg, statusArg) => {
|
|
|
55
58
|
if (statusArg.confinedSocketPath !== undefined) {
|
|
56
59
|
lines.push(`Confined listener: ${statusArg.confinedSocketPath ?? 'none'}`);
|
|
57
60
|
for (const run of statusArg.confinedRuns ?? []) {
|
|
58
|
-
// An older proxy names no run's pool: it issues Claude-pool runs alone.
|
|
59
|
-
lines.push(`Confined run ${run.id}: ${run.
|
|
61
|
+
// An older proxy names no run's pool: it issues Claude-pool runs alone; nor its harness: it issues Claude Code runs alone.
|
|
62
|
+
lines.push(`Confined run ${run.id}: ${run.harness === 'codex' ? 'Codex on the ChatGPT pool (ChatGPT accounts only)'
|
|
63
|
+
: run.provider === 'openai' ? 'ChatGPT pool' : 'Claude pool'}, issued ${run.createdAt}`
|
|
60
64
|
+ `${run.held ? '' : ', waiting for its launcher to take it back after a proxy restart'}`
|
|
61
65
|
+ ` (end it with \`agl proxy confined end ${run.id}\`)`);
|
|
62
66
|
}
|
|
@@ -206,20 +210,41 @@ const run = (optionsArg) => withSignals(async (signalArg) => {
|
|
|
206
210
|
/**
|
|
207
211
|
* Runs a confined run's container (see `confinedDockerLaunch`) on a credential of its own, which ends when the container
|
|
208
212
|
* exits. A proxy that restarts meanwhile hands the credential back; one the proxy no longer hands back, or the operator
|
|
209
|
-
* ended, stops the container (`docker run` passes the signal on to it), and the run ends with the reason.
|
|
213
|
+
* ended, stops the container (`docker run` passes the signal on to it), and the run ends with the reason. A Codex run's
|
|
214
|
+
* relay is written to a directory of the run's own before the credential is taken, and removed once the container is gone.
|
|
210
215
|
*/
|
|
211
216
|
const confinedRun = (optionsArg) => withSignals(async (signalArg) => {
|
|
212
217
|
await preflightAGLHomeMigration();
|
|
213
218
|
const paths = resolveAGLHomePaths();
|
|
214
|
-
const
|
|
219
|
+
const asked = optionsArg.harness === 'codex' ? { harness: 'codex', provider: 'openai' }
|
|
220
|
+
: { harness: 'claude', provider: optionsArg.provider ?? 'anthropic' };
|
|
221
|
+
const relay = asked.harness === 'codex' ? await writeConfinedRelay() : undefined;
|
|
222
|
+
try {
|
|
223
|
+
await confinedContainer(optionsArg, signalArg, paths.proxySocket, asked, relay?.directory);
|
|
224
|
+
}
|
|
225
|
+
finally {
|
|
226
|
+
// A directory left behind holds AGL's relay alone, never a credential; its path is named so it can be removed.
|
|
227
|
+
await relay?.remove().catch((errorArg) => {
|
|
228
|
+
process.stderr.write(`AGL proxy confined run: the relay directory ${relay.directory} could not be removed: `
|
|
229
|
+
+ `${errorArg instanceof Error ? errorArg.message : String(errorArg)}\n`);
|
|
230
|
+
});
|
|
231
|
+
}
|
|
232
|
+
});
|
|
233
|
+
/** One confined run's container on its credential (see `confinedRun`). */
|
|
234
|
+
const confinedContainer = async (optionsArg, signalArg, proxySocketArg, askedArg, relayDirectoryArg) => {
|
|
235
|
+
const run = await AglProxyConfinedHolder.take({ socketPath: proxySocketArg, run: askedArg }, AbortSignal.any([signalArg, AbortSignal.timeout(90_000)]));
|
|
215
236
|
let lost;
|
|
216
237
|
try {
|
|
217
238
|
const launch = confinedDockerLaunch({ args: optionsArg.args, socketPath: run.confinedSocketPath, baseUrl: run.baseUrl,
|
|
218
239
|
token: run.token, environment: process.env,
|
|
219
|
-
pool:
|
|
220
|
-
|
|
240
|
+
pool: relayDirectoryArg !== undefined ? { harness: 'codex', relayDirectory: relayDirectoryArg }
|
|
241
|
+
: run.provider === 'anthropic' ? { provider: 'anthropic' } : { provider: 'openai', models: run.models } });
|
|
242
|
+
// A Claude-pool run says what it said before ChatGPT-pool runs; a ChatGPT-pool run says so, and a Codex run where its
|
|
243
|
+
// relay is.
|
|
221
244
|
process.stderr.write(`AGL proxy confined run ${run.id}: ${plugins.path.dirname(run.confinedSocketPath)} is mounted read-only `
|
|
222
|
-
+ `at ${aglProxyConfinedMountPoint}${run.
|
|
245
|
+
+ `at ${aglProxyConfinedMountPoint}${run.harness === 'codex'
|
|
246
|
+
? `, Codex on the ChatGPT pool (ChatGPT accounts only), AGL's relay at ${aglProxyRelayMountPoint}`
|
|
247
|
+
: run.provider === 'openai' ? ', served from the ChatGPT pool' : ''}; `
|
|
223
248
|
+ `end it at once with \`agl proxy confined end ${run.id}\`.\n`);
|
|
224
249
|
signalArg.throwIfAborted();
|
|
225
250
|
const child = plugins.childProcess.spawn(launch.command, launch.args, { env: launch.environment, stdio: 'inherit', shell: false });
|
|
@@ -250,7 +275,7 @@ const confinedRun = (optionsArg) => withSignals(async (signalArg) => {
|
|
|
250
275
|
}
|
|
251
276
|
if (lost)
|
|
252
277
|
throw new Error(`${lost.message} The container was stopped; start the run again to continue.`);
|
|
253
|
-
}
|
|
278
|
+
};
|
|
254
279
|
const unitState = async (serviceArg) => {
|
|
255
280
|
try {
|
|
256
281
|
const state = await serviceArg.inspect();
|
|
@@ -290,6 +315,33 @@ export const runInferenceCli = async (argvArg) => {
|
|
|
290
315
|
await runProxyCredentialCommand(options, (textArg) => process.stdout.write(textArg));
|
|
291
316
|
return;
|
|
292
317
|
}
|
|
318
|
+
if (options.command === 'capacity') {
|
|
319
|
+
const request = { ...(options.provider ? { provider: options.provider } : {}),
|
|
320
|
+
...(options.minHeadroom === undefined ? {} : { minHeadroom: options.minHeadroom }) };
|
|
321
|
+
process.exitCode = await withSignals((signalArg) => runProxyCapacity({ request, json: options.json, wait: options.wait,
|
|
322
|
+
...(options.maxSeconds === undefined ? {} : { maxSeconds: options.maxSeconds }) }, {
|
|
323
|
+
ask: async (requestArg, askSignalArg) => {
|
|
324
|
+
// A proxy of another release names itself (`AglProxyOutdatedError`); its answer is read only by the contract.
|
|
325
|
+
const answer = await client.capacity(requestArg, AbortSignal.any([askSignalArg, AbortSignal.timeout(10_000)]), commitinfo.version);
|
|
326
|
+
if (!isProxyCapacityAnswer(answer))
|
|
327
|
+
throw new Error('The proxy answered a capacity this AGL cannot read.');
|
|
328
|
+
return answer;
|
|
329
|
+
},
|
|
330
|
+
now: Date.now,
|
|
331
|
+
sleep: async (msArg, sleepSignalArg) => {
|
|
332
|
+
try {
|
|
333
|
+
await plugins.timersPromises.setTimeout(msArg, undefined, { signal: sleepSignalArg });
|
|
334
|
+
}
|
|
335
|
+
catch (errorArg) {
|
|
336
|
+
sleepSignalArg.throwIfAborted();
|
|
337
|
+
throw errorArg;
|
|
338
|
+
}
|
|
339
|
+
},
|
|
340
|
+
write: (textArg) => process.stdout.write(textArg),
|
|
341
|
+
note: (textArg) => process.stderr.write(textArg),
|
|
342
|
+
}, signalArg));
|
|
343
|
+
return;
|
|
344
|
+
}
|
|
293
345
|
const service = new AglProxyService({ port: options.port });
|
|
294
346
|
if (options.command === 'status') {
|
|
295
347
|
const unit = await unitState(service);
|
|
@@ -329,4 +381,4 @@ export const runInferenceCli = async (argvArg) => {
|
|
|
329
381
|
}
|
|
330
382
|
process.stdout.write(`${aglProxyUnitName}: ${await unitState(service)}\n`);
|
|
331
383
|
};
|
|
332
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"functions.inferencecli.js","sourceRoot":"","sources":["../../ts/functions.inferencecli.ts"],"names":[],"mappings":"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"}
|
|
384
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"functions.inferencecli.js","sourceRoot":"","sources":["../../ts/functions.inferencecli.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,wBAAwB,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AACxG,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,qCAAqC,EAAE,MAAM,8BAA8B,CAAC;AACrF,OAAO,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAE9F,OAAO,EAAE,qBAAqB,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAClG,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAA+B,MAAM,+BAA+B,CAAC;AACzH,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAClF,OAAO,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,gBAAgB,EACjD,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,0BAA0B,EAA+B,MAAM,sCAAsC,CAAC;AACjI,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,4BAA4B,EAAE,0BAA0B,EAAE,MAAM,sCAAsC,CAAC;AAmBhH,oHAAoH;AACpH,MAAM,SAAS,GAAG,CAAC,QAAuB,EAAU,EAAE,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,UAAU;IACnF,CAAC,CAAC,GAAG,QAAQ,GAAG,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC;AAEvE,uGAAuG;AACvG,MAAM,aAAa,GAAG,CAAC,UAAiE,EAAU,EAAE;IAClG,IAAI,UAAU,CAAC,SAAS,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IAClD,IAAI,UAAU,CAAC,SAAS,KAAK,QAAQ;QAAE,OAAO,YAAY,UAAU,CAAC,QAAQ,yBAAyB,CAAC;IACvG,OAAO,GAAG,UAAU,CAAC,SAAS,KAAK,UAAU,CAAC,CAAC,CAAC,sBAAsB,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE;UAC9F,eAAe,SAAS,CAAC,UAAU,CAAC,cAAc,IAAI,IAAI,CAAC,EAAE;UAC7D,GAAG,UAAU,CAAC,aAAa,KAAK,IAAI,IAAI,UAAU,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,4BAA4B;YAC7G,CAAC,CAAC,UAAU,UAAU,CAAC,aAAa,EAAE,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,qCAAqC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;AACpH,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,GAAG,CAAC,UAAiE,EAAU,EAAE,CAChG,UAAU,CAAC,iBAAiB,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,UAAU,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,UAAU;IAC7G,CAAC,CAAC,GAAG,UAAU,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,UAAU,UAAU,CAAC,iBAAiB,GAAG;UACjG,IAAI,UAAU,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,6BAA6B,EAAE;UACtG,GAAG,UAAU,CAAC,aAAa,KAAK,IAAI,IAAI,UAAU,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE;YACnF,CAAC,CAAC,eAAe,UAAU,CAAC,aAAa,EAAE,GAAG;UAC9C,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,EAAE;UAC/C,GAAG,UAAU,CAAC,mBAAmB,CAAC,CAAC,CAAC,wCAAwC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;AAE5F,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,OAAe,EAAE,SAA2C,EAAU,EAAE;IACxG,MAAM,KAAK,GAAG,CAAC,QAAQ,gBAAgB,KAAK,OAAO,EAAE,CAAC,CAAC;IACvD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,KAAK,CAAC,IAAI,CAAC,kGAAkG,CAAC,CAAC;QAC/G,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACjC,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,cAAc,SAAS,CAAC,OAAO,SAAS,SAAS,CAAC,GAAG,kBAAkB,SAAS,CAAC,OAAO,UAAU,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC;IACpI,KAAK,CAAC,IAAI,CAAC,sBAAsB,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC;IACxD,KAAK,CAAC,IAAI,CAAC,cAAc,SAAS,CAAC,QAAQ,aAAa,SAAS,CAAC,MAAM,CAAC,UAAU,gBAAgB;UAC/F,GAAG,SAAS,CAAC,MAAM,CAAC,SAAS,gBAAgB,SAAS,CAAC,MAAM,CAAC,KAAK,qBAAqB,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;IAChH,KAAK,MAAM,MAAM,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;QACvC,KAAK,CAAC,IAAI,CAAC,UAAU,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,QAAQ,KAAK,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,mCAAmC;cAC1H,GAAG,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,OAAO,cAAc;cAC7G,aAAa,MAAM,CAAC,UAAU,IAAI,OAAO,EAAE,CAAC,CAAC;IACnD,CAAC;IACD,IAAI,SAAS,CAAC,kBAAkB,KAAK,SAAS,EAAE,CAAC;QAC/C,KAAK,CAAC,IAAI,CAAC,sBAAsB,SAAS,CAAC,kBAAkB,IAAI,MAAM,EAAE,CAAC,CAAC;QAC3E,KAAK,MAAM,GAAG,IAAI,SAAS,CAAC,YAAY,IAAI,EAAE,EAAE,CAAC;YAC/C,2HAA2H;YAC3H,KAAK,CAAC,IAAI,CAAC,gBAAgB,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,mDAAmD;gBACjH,CAAC,CAAC,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,aAAa,YAAY,GAAG,CAAC,SAAS,EAAE;kBACrF,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,kEAAkE,EAAE;kBACvF,0CAA0C,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IACD,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;QACxB,mHAAmH;QACnH,KAAK,CAAC,IAAI,CAAC,iDAAiD,SAAS,CAAC,OAAO,yBAAyB,UAAU,CAAC,OAAO,IAAI;cACxH,kGAAkG,CAAC,CAAC;QACxG,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACjC,CAAC;IACD,KAAK,MAAM,OAAO,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;QACzC,KAAK,CAAC,IAAI,CAAC,WAAW,OAAO,CAAC,KAAK,KAAK,OAAO,CAAC,UAAU,KAAK,SAAS;YACtE,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE;cAC5H,GAAG,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,IAAI,EAAE,MAAM,OAAO,CAAC,SAAS,EAAE;cAC5E,GAAG,OAAO,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,OAAO,CAAC,OAAO,EAAE,EAAE;YACnE,0EAA0E;cACxE,GAAG,OAAO,CAAC,UAAU,KAAK,SAAS,IAAI,OAAO,CAAC,UAAU,KAAK,KAAK,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,EAAE,IAAI;YACxG,uFAAuF;cACrF,GAAG,OAAO,CAAC,UAAU,KAAK,SAAS;gBACnC,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,6BAA6B,EAAE;gBACpG,CAAC,CAAC,aAAa,OAAO,CAAC,eAAe,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,eAAe,GAAG,EAAE;sBACzF,GAAG,OAAO,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,IAAI,EAAE;cAC3F,GAAG,OAAO,CAAC,QAAQ,YAAY;cAC/B,GAAG,aAAa,CAAC,OAAO,CAAC,KAAK,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC5D,CAAC;IACD,MAAM,YAAY,GAAG,CAAC,KAAoB,EAAU,EAAE,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM;QAC5E,CAAC,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACnG,IAAI,SAAS,CAAC,aAAa,EAAE,CAAC;QAC5B,KAAK,CAAC,IAAI,CAAC,4BAA4B,YAAY,CAAC,SAAS,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI;cACtF,WAAW,YAAY,CAAC,SAAS,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACjE,CAAC;IACD,IAAI,SAAS,CAAC,gBAAgB,EAAE,CAAC;QAC/B,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,mCAAmC,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC;QAChH,KAAK,MAAM,SAAS,IAAI,SAAS,CAAC,gBAAgB,EAAE,CAAC;YACnD,KAAK,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC,EAAE,YAAY,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG;kBACrE,IAAI,SAAS,CAAC,QAAQ,KAAK,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,KAAK;kBAClE,GAAG,SAAS,CAAC,aAAa,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE;kBAC3F,GAAG,YAAY,CAAC,SAAS,CAAC,WAAW,CAAC,KAAK,SAAS,CAAC,MAAM,EAAE;kBAC7D,GAAG,SAAS,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QACpF,CAAC;IACH,CAAC;IACD,IAAI,SAAS,CAAC,iBAAiB,EAAE,CAAC;QAChC,KAAK,CAAC,IAAI,CAAC,uBAAuB,SAAS,CAAC,iBAAiB,CAAC,UAAU,kCAAkC;cACtG,GAAG,SAAS,CAAC,iBAAiB,CAAC,MAAM,SAAS,CAAC,CAAC;IACtD,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AACjC,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,KAAK,EAAK,YAAoD,EAAc,EAAE;IAChG,MAAM,KAAK,GAAG,IAAI,eAAe,EAAE,CAAC;IACpC,MAAM,QAAQ,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC,CAAC;IAChF,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC/B,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAChC,IAAI,CAAC;QAAC,OAAO,MAAM,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAAC,CAAC;YACxC,CAAC;QAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAAC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAAC,CAAC;AAChF,CAAC,CAAC;AAEF,MAAM,KAAK,GAAG,CAAC,OAAe,EAAiB,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE;IAChF,MAAM,wBAAwB,EAAE,CAAC;IACjC,MAAM,KAAK,GAAG,mBAAmB,EAAE,CAAC;IACpC,MAAM,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAC/E,MAAM,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IACpD,kHAAkH;IAClH,0FAA0F;IAC1F,MAAM,gBAAgB,GAAG,MAAM,4BAA4B,CAAC,KAAK,CAAC,IAAI,EACpE,GAAG,EAAE,CAAC,oBAAoB,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACjE,MAAM,MAAM,GAAG,IAAI,cAAc,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,WAAW,EAAE,aAAa,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,SAAS,CAAC;QACzH,mBAAmB,EAAE,KAAK,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,KAAK,CAAC,mBAAmB;QAC1F,cAAc,EAAE,qCAAqC,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAC5E,MAAM,QAAQ,GAAG,GAAG,EAAE,GAAG,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IACtE,SAAS,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9D,IAAI,CAAC;QACH,IAAI,OAAe,CAAC;QACpB,IAAI,CAAC;YAAC,OAAO,GAAG,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;QAAC,CAAC;QACvC,OAAO,QAAQ,EAAE,CAAC;YAChB,kDAAkD;YAClD,IAAI,SAAS,CAAC,OAAO;gBAAE,OAAO;YAC9B,MAAM,QAAQ,CAAC;QACjB,CAAC;QACD,yHAAyH;QACzH,MAAM,0BAA0B,CAAC,KAAK,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,CAAC;QAChF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,OAAO,IAAI,CAAC,CAAC;QACtE,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YAClC,IAAI,SAAS,CAAC,OAAO;gBAAE,OAAO,EAAE,CAAC;;gBAAM,SAAS,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9G,CAAC,CAAC,CAAC;IACL,CAAC;YAAS,CAAC;QACT,SAAS,CAAC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACjD,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC;AACH,CAAC,CAAC,CAAC;AAEH;;;GAGG;AACH,MAAM,GAAG,GAAG,CAAC,UAAkC,EAAiB,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE;IACjG,MAAM,yBAAyB,EAAE,CAAC;IAClC,MAAM,KAAK,GAAG,mBAAmB,EAAE,CAAC;IACpC,+EAA+E;IAC/E,MAAM,KAAK,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,OAAQ,EAAE,EACpI,WAAW,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7D,IAAI,IAAuB,CAAC;IAC5B,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QACvC,OAAO,WAAW,CAAC,wBAAwB,CAAC;QAC5C,MAAM,MAAM,GAAG,sBAAsB,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,OAAQ,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK;YAC9G,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,WAAW;YACvF,qBAAqB,EAAE,KAAK,CAAC,eAAe,EAAE,CAAC,CAAC;QAClD,SAAS,CAAC,cAAc,EAAE,CAAC;QAC3B,MAAM,KAAK,GAAG,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,UAAU,CAAC,OAAQ,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,WAAW,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QACxI,IAAI,SAAoD,CAAC;QACzD,MAAM,SAAS,GAAG,GAAG,EAAE;YACrB,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACtB,SAAS,KAAK,UAAU,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC;YAC9D,SAAS,CAAC,KAAK,EAAE,CAAC;QACpB,CAAC,CAAC;QACF,SAAS,CAAC,gBAAgB,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/D,iHAAiH;QACjH,KAAK,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,GAAG,IAAI,GAAG,QAAQ,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACtE,IAAI,CAAC;YACH,IAAI,SAAS,CAAC,OAAO;gBAAE,SAAS,EAAE,CAAC;YACnC,OAAO,CAAC,QAAQ,GAAG,MAAM,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC/D,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;gBAC5B,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC;YACzD,CAAC,CAAC,CAAC;QACL,CAAC;gBAAS,CAAC;YACT,SAAS,CAAC,mBAAmB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YAClD,IAAI,SAAS;gBAAE,YAAY,CAAC,SAAS,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;YAAS,CAAC;QAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IAAC,CAAC;IAC5B,IAAI,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,OAAO,wBAAwB,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAC9G,CAAC,CAAC,CAAC;AAEH;;;;;GAKG;AACH,MAAM,WAAW,GAAG,CAAC,UAAkC,EAAiB,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE;IACzG,MAAM,yBAAyB,EAAE,CAAC;IAClC,MAAM,KAAK,GAAG,mBAAmB,EAAE,CAAC;IACpC,MAAM,KAAK,GAAyB,UAAU,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE;QAC3G,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,IAAI,WAAW,EAAE,CAAC;IACxE,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,kBAAkB,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IACjF,IAAI,CAAC;QACH,MAAM,iBAAiB,CAAC,UAAU,EAAE,SAAS,EAAE,KAAK,CAAC,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;IAC7F,CAAC;YAAS,CAAC;QACT,+GAA+G;QAC/G,MAAM,KAAK,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,QAAiB,EAAE,EAAE;YAChD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,+CAA+C,KAAK,CAAC,SAAS,yBAAyB;kBACxG,GAAG,QAAQ,YAAY,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC9E,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,0EAA0E;AAC1E,MAAM,iBAAiB,GAAG,KAAK,EAAE,UAAkC,EAAE,SAAsB,EAAE,cAAsB,EACjH,QAA8B,EAAE,iBAAqC,EAAiB,EAAE;IACxF,MAAM,GAAG,GAAG,MAAM,sBAAsB,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,EAAE,QAAQ,EAAE,EACzF,WAAW,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7D,IAAI,IAAwC,CAAC;IAC7C,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,oBAAoB,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,CAAC,kBAAkB,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO;YACnH,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,CAAC,GAAG;YAC1C,IAAI,EAAE,iBAAiB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE;gBAC7F,CAAC,CAAC,GAAG,CAAC,QAAQ,KAAK,WAAW,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC/G,sHAAsH;QACtH,YAAY;QACZ,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,GAAG,CAAC,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,wBAAwB;cAC1H,MAAM,0BAA0B,GAAG,GAAG,CAAC,OAAO,KAAK,OAAO;gBAC1D,CAAC,CAAC,uEAAuE,uBAAuB,EAAE;gBAClG,CAAC,CAAC,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,gCAAgC,CAAC,CAAC,CAAC,EAAE,IAAI;cACvE,gDAAgD,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;QACnE,SAAS,CAAC,cAAc,EAAE,CAAC;QAC3B,MAAM,KAAK,GAAG,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,WAAW,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QACnI,IAAI,SAAoD,CAAC;QACzD,MAAM,SAAS,GAAG,GAAG,EAAE;YACrB,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACtB,SAAS,KAAK,UAAU,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC;YAC9D,SAAS,CAAC,KAAK,EAAE,CAAC;QACpB,CAAC,CAAC;QACF,SAAS,CAAC,gBAAgB,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/D,KAAK,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,GAAG,IAAI,GAAG,QAAQ,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACpE,IAAI,CAAC;YACH,IAAI,SAAS,CAAC,OAAO;gBAAE,SAAS,EAAE,CAAC;YACnC,OAAO,CAAC,QAAQ,GAAG,MAAM,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC/D,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;gBAC5B,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC;YACzD,CAAC,CAAC,CAAC;QACL,CAAC;gBAAS,CAAC;YACT,SAAS,CAAC,mBAAmB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YAClD,IAAI,SAAS;gBAAE,YAAY,CAAC,SAAS,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;YAAS,CAAC;QAAC,GAAG,CAAC,KAAK,EAAE,CAAC;IAAC,CAAC;IAC1B,IAAI,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,OAAO,8DAA8D,CAAC,CAAC;AAC3G,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,KAAK,EAAE,UAA2B,EAAmB,EAAE;IACvE,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,OAAO,EAAE,CAAC;QACzC,OAAO,GAAG,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,QAAQ,KAAK,KAAK,CAAC,aAAa,IAAI,KAAK,CAAC,SAAS,GAAG,CAAC;IAC9F,CAAC;IAAC,OAAO,QAAQ,EAAE,CAAC;QAClB,OAAO,YAAY,QAAQ,YAAY,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,wBAAwB,GAAG,CAAC;IAChG,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,OAA0B,EAAiB,EAAE;IACjF,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,QAAQ,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QAC/F,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QAAC,OAAO;IACjD,CAAC;IACD,MAAM,OAAO,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC;IACpD,IAAI,OAAO,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;QAAC,MAAM,yBAAyB,EAAE,CAAC;QAAC,MAAM,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAAC,OAAO;IAAC,CAAC;IAC1G,IAAI,OAAO,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;QAAC,MAAM,GAAG,CAAC,OAAO,CAAC,CAAC;QAAC,OAAO;IAAC,CAAC;IAC9D,IAAI,OAAO,CAAC,OAAO,KAAK,UAAU,IAAI,OAAO,CAAC,cAAc,KAAK,KAAK,EAAE,CAAC;QAAC,MAAM,WAAW,CAAC,OAAO,CAAC,CAAC;QAAC,OAAO;IAAC,CAAC;IAC/G,MAAM,KAAK,GAAG,mBAAmB,EAAE,CAAC;IACpC,MAAM,MAAM,GAAG,IAAI,qBAAqB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAC5D,IAAI,OAAO,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;QACnC,MAAM,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,UAAW,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;QAC3E,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,OAAO,CAAC,UAAU,mDAAmD,CAAC,CAAC;QAClH,OAAO;IACT,CAAC;IACD,IAAI,OAAO,CAAC,OAAO,KAAK,YAAY,EAAE,CAAC;QACrC,MAAM,yBAAyB,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QACrF,OAAO;IACT,CAAC;IACD,IAAI,OAAO,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;QACnC,MAAM,OAAO,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3E,GAAG,CAAC,OAAO,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;QACvF,OAAO,CAAC,QAAQ,GAAG,MAAM,WAAW,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI;YACpH,GAAG,CAAC,OAAO,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,EAAE,EAAE;YACnF,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE;gBACtC,8GAA8G;gBAC9G,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAC3G,UAAU,CAAC,OAAO,CAAC,CAAC;gBACtB,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC;oBAAE,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;gBAC3G,OAAO,MAAM,CAAC;YAChB,CAAC;YACD,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;gBACrC,IAAI,CAAC;oBAAC,MAAM,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC;gBAAC,CAAC;gBAC9F,OAAO,QAAQ,EAAE,CAAC;oBAAC,cAAc,CAAC,cAAc,EAAE,CAAC;oBAAC,MAAM,QAAQ,CAAC;gBAAC,CAAC;YACvE,CAAC;YACD,KAAK,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;YACjD,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;SACjD,EAAE,SAAS,CAAC,CAAC,CAAC;QACf,OAAO;IACT,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,eAAe,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IAC5D,IAAI,OAAO,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;QACjC,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,CAAC;QACtC,IAAI,MAAwC,CAAC;QAC7C,IAAI,CAAC;YAAC,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;QAAC,CAAC;QAClE,OAAO,QAAQ,EAAE,CAAC;YAAC,IAAI,CAAC,CAAC,QAAQ,YAAY,wBAAwB,CAAC;gBAAE,MAAM,QAAQ,CAAC;QAAC,CAAC;QACzF,IAAI,OAAO,CAAC,IAAI;YAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,IAAI,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;;YAC7H,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QAC3D,IAAI,CAAC,MAAM;YAAE,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QAClC,OAAO;IACT,CAAC;IACD,QAAQ,OAAO,CAAC,aAAa,EAAE,CAAC;QAC9B,KAAK,SAAS,EAAE,CAAC;YACf,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;YAC1C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,KAAK,gBAAgB,SAAS,SAAS,CAAC,UAAU,eAAe;kBAClI,UAAU,OAAO,CAAC,IAAI,4FAA4F,CAAC,CAAC;YACxH,OAAO;QACT,CAAC;QACD,KAAK,QAAQ;YAAE,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC;YAAC,MAAM;QAC7C,KAAK,OAAO;YAAE,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;YAAC,MAAM;QAC3C,KAAK,MAAM;YAAE,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;YAAC,MAAM;QACzC,SAAS,MAAM;IACjB,CAAC;IACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,gBAAgB,KAAK,MAAM,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAC7E,CAAC,CAAC"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import type { IInferenceRoutingPolicy } from './classes.inferencerouter.js';
|
|
2
2
|
import type { TInferenceHarness } from './functions.inferencelaunch.js';
|
|
3
3
|
import { type TInferenceProvider, type TProxyCredentialDelivery } from './functions.proxycontract.js';
|
|
4
|
-
export declare const inferenceCliHelp = "Usage:\n agl proxy service install [--port 4100] | enable | start | stop | status\n agl proxy serve [--port 4100]\n agl proxy status [--json]\n agl proxy credential <client> [--provider openai|anthropic] [--delivery file|none] [--write <path>] [--rotate] | --version\n agl proxy run codex|claude|opencode [--provider openai|anthropic] [--account <id>] [--plan <name>] [--model <id>] -- [harness arguments]\n agl proxy confined run [--provider anthropic|openai] -- docker run [docker options] <image> [command]\n agl proxy confined end <run id>\n\nThe proxy runs as the agl-proxy.service user unit (serve runs it in a terminal instead).\nEvery client (codex, claude, opencode, or a name of your own) has one credential, sealed by the proxy.\ncredential <client> alone prints it: that is the command a harness runs for its credential, not one to type.\n--write puts it in a private file instead; --delivery file has the proxy keep it in its own private file for the\nclient, rewritten on every rotation (none ends that); --rotate replaces it. These print what they did, never the credential.\ncredential --version prints the AGL release a credential command runs, without asking the proxy.\nEach client is served from one pool: ChatGPT accounts (openai) or Claude accounts (anthropic). The claude\nclient starts on Claude accounts, every other client on ChatGPT accounts; --provider moves a client.\nRun gives one child a private credential that ends when the child exits; run claude uses Claude accounts\nunless --provider openai asks for ChatGPT models behind Claude Code.\nconfined run starts Claude Code's container on a credential of its own, accepted only on the proxy's confined\nlistener: a Unix socket whose directory the run mounts read-only at /run/agl-proxy, served Claude Code's\nthree endpoints of the run's pool alone: Claude accounts unless --provider openai asks for the ChatGPT pool, whose\nChatGPT accounts answer it translated, as for run claude --provider openai. It adds the mount and Claude Code's settings\n(ANTHROPIC_UNIX_SOCKET, ANTHROPIC_BASE_URL, ANTHROPIC_AUTH_TOKEN, and on the ChatGPT pool the model variables run claude\n--provider openai sets) right after docker run, prints the run's id on standard error, and ends the credential when the\ncontainer exits. The socket is the proxy user's (0600): run the container as that uid (--user), or as root under\nrootless Docker. Root of a rootful daemon connects as well while it keeps CAP_DAC_OVERRIDE (--cap-drop ALL takes it).\nconfined end ends a run's credential at once, and its launcher stops the container; agl proxy status lists the runs\nwith their pools.\nRepeat --account or --plan to restrict automatic routing. Only accounts the account service holds are eligible.\nChatGPT pools: /openai/v1/responses, /anthropic/v1/messages (translated), and each prefix's /models.\nClaude pools: /anthropic/v1/messages, /anthropic/v1/messages/count_tokens and /anthropic/v1/models, sent on as Claude Code sent them.\nSessions stay on one account until current quota or a provider 429 requires another; recovered accounts do not pull sessions back.\nA session on an account that --account leaves out moves to one of the named accounts.\nUse x-agl-session-id for custom clients; native session headers and prompt_cache_key are recognized.\nSwitches use full history with a cold cache. Provider-only references require a full-history retry; opaque account state never crosses accounts.\n";
|
|
5
|
-
export type TInferenceCommand = 'serve' | 'run' | 'credential' | 'status' | 'service' | 'confined';
|
|
4
|
+
export declare const inferenceCliHelp = "Usage:\n agl proxy service install [--port 4100] | enable | start | stop | status\n agl proxy serve [--port 4100]\n agl proxy status [--json]\n agl proxy capacity [--provider anthropic|openai] [--min-headroom 15] [--json] [--wait [--max-seconds <seconds>]]\n agl proxy credential <client> [--provider openai|anthropic] [--delivery file|none] [--write <path>] [--rotate] | --version\n agl proxy run codex|claude|opencode [--provider openai|anthropic] [--account <id>] [--plan <name>] [--model <id>] -- [harness arguments]\n agl proxy confined run [--provider anthropic|openai] -- docker run [docker options] <image> [command]\n agl proxy confined run --harness codex [--provider openai] -- docker run [docker options] <image> \\\n node /run/agl-proxy-relay/agl-relay.mjs -- codex exec \u2026\n agl proxy confined end <run id>\n\nThe proxy runs as the agl-proxy.service user unit (serve runs it in a terminal instead).\nEvery client (codex, claude, opencode, or a name of your own) has one credential, sealed by the proxy.\ncredential <client> alone prints it: that is the command a harness runs for its credential, not one to type.\n--write puts it in a private file instead; --delivery file has the proxy keep it in its own private file for the\nclient, rewritten on every rotation (none ends that); --rotate replaces it. These print what they did, never the credential.\ncredential --version prints the AGL release a credential command runs, without asking the proxy.\nEach client is served from one pool: ChatGPT accounts (openai) or Claude accounts (anthropic). The claude\nclient starts on Claude accounts, every other client on ChatGPT accounts; --provider moves a client.\nRun gives one child a private credential that ends when the child exits; run claude uses Claude accounts\nunless --provider openai asks for ChatGPT models behind Claude Code.\nconfined run starts Claude Code's container on a credential of its own, accepted only on the proxy's confined\nlistener: a Unix socket whose directory the run mounts read-only at /run/agl-proxy, served Claude Code's\nthree endpoints of the run's pool alone: Claude accounts unless --provider openai asks for the ChatGPT pool, whose\nChatGPT accounts answer it translated, as for run claude --provider openai. It adds the mount and Claude Code's settings\n(ANTHROPIC_UNIX_SOCKET, ANTHROPIC_BASE_URL, ANTHROPIC_AUTH_TOKEN, and on the ChatGPT pool the model variables run claude\n--provider openai sets) right after docker run, prints the run's id on standard error, and ends the credential when the\ncontainer exits. The socket is the proxy user's (0600): run the container as that uid (--user), or as root under\nrootless Docker. Root of a rootful daemon connects as well while it keeps CAP_DAC_OVERRIDE (--cap-drop ALL takes it).\n--harness codex starts Codex's container instead, on the ChatGPT pool's ChatGPT accounts alone (never an OpenAI API\nkey): the listener serves it GET /openai/v1/models and POST /openai/v1/responses alone, and refuses a request that\ndeclares a hosted tool. Codex reaches the socket through AGL's relay, mounted read-only at /run/agl-proxy-relay:\nthe container's command runs node /run/agl-proxy-relay/agl-relay.mjs -- codex exec \u2026, and the relay listens\non 127.0.0.1:4100 inside the container, which therefore keeps a network of its own: --network host\nand --network container:\u2026 are refused. It passes AGL_PROXY_SOCKET and MODELPROFILE_PROXY_TOKEN, and no model.\nconfined end ends a run's credential at once, and its launcher stops the container; agl proxy status lists the runs\nwith their harnesses and pools.\ncapacity answers each pool's room for new work: the headroom its members add now, summed. Its members are its\nsubscription sign-ins that have not lapsed and whose reading states a counted plan (Claude accounts: max; ChatGPT\naccounts: every plan but free); one that takes no work now adds nothing. A pool is open when its room reaches\n--min-headroom (15 unless given) and no provider 429 hit a member within five minutes (a proxy watches for five minutes\nafter its start before it says so); otherwise it waits until the first moment the members' readings foresee enough room.\nEach member names its binding window and when its headroom next grows. Exit status: 0 when every pool reported is open,\n2 when one waits, 1 on a failure. --wait (with --provider) asks again until the pool is open, at most --max-seconds when\ngiven, and exits 2 when that time ran out.\nRepeat --account or --plan to restrict automatic routing. Only accounts the account service holds are eligible.\nChatGPT pools: /openai/v1/responses, /anthropic/v1/messages (translated), and each prefix's /models.\nClaude pools: /anthropic/v1/messages, /anthropic/v1/messages/count_tokens and /anthropic/v1/models, sent on as Claude Code sent them.\nSessions stay on one account until current quota or a provider 429 requires another; recovered accounts do not pull sessions back.\nA session on an account that --account leaves out moves to one of the named accounts.\nUse x-agl-session-id for custom clients; native session headers and prompt_cache_key are recognized.\nSwitches use full history with a cold cache. Provider-only references require a full-history retry; opaque account state never crosses accounts.\n";
|
|
5
|
+
export type TInferenceCommand = 'serve' | 'run' | 'credential' | 'status' | 'capacity' | 'service' | 'confined';
|
|
6
6
|
export type TInferenceServiceAction = 'install' | 'enable' | 'start' | 'stop' | 'status';
|
|
7
7
|
export type TInferenceConfinedAction = 'run' | 'end';
|
|
8
8
|
export interface IInferenceCliArguments {
|
|
9
9
|
command: TInferenceCommand;
|
|
10
|
+
/** `run`'s harness; for `confined run`, `codex` when `--harness codex` names it (Claude Code otherwise). */
|
|
10
11
|
harness?: TInferenceHarness;
|
|
11
12
|
client?: string;
|
|
12
13
|
serviceAction?: TInferenceServiceAction;
|
|
@@ -24,6 +25,12 @@ export interface IInferenceCliArguments {
|
|
|
24
25
|
/** `credential --version`: the release only, no client. */
|
|
25
26
|
version: boolean;
|
|
26
27
|
json: boolean;
|
|
28
|
+
/** `capacity --min-headroom`: the room a pool needs, a non-negative integer. */
|
|
29
|
+
minHeadroom?: number;
|
|
30
|
+
/** `capacity --wait`: ask again until the pool is open. */
|
|
31
|
+
wait: boolean;
|
|
32
|
+
/** `capacity --max-seconds`: how long `--wait` waits at most. */
|
|
33
|
+
maxSeconds?: number;
|
|
27
34
|
args: string[];
|
|
28
35
|
}
|
|
29
36
|
export declare const parseInferenceCliArguments: (argvArg: readonly string[]) => IInferenceCliArguments;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as path from 'node:path';
|
|
2
|
-
import { aglProxyConfinedIdPattern, aglProxyConfinedMountPoint, aglProxyDefaultPort, aglProxyUnitName, defaultProxyClientProvider, inferencePlanPattern, inferenceProviders, proxyClientNamePattern, proxyCredentialDeliveries, } from './functions.proxycontract.js';
|
|
2
|
+
import { aglProxyConfinedIdPattern, aglProxyConfinedMountPoint, aglProxyDefaultPort, aglProxyRelayDefaultPort, aglProxyRelayFile, aglProxyRelayMountPoint, aglProxyUnitName, defaultProxyClientProvider, inferencePlanPattern, inferenceProviders, proxyClientNamePattern, proxyCredentialDeliveries, } from './functions.proxycontract.js';
|
|
3
3
|
/*
|
|
4
4
|
* The `agl proxy` command line's grammar. Node's own modules and plain values only: the fast `agl proxy credential`
|
|
5
5
|
* entry parses its arguments here without loading the rest of AGL.
|
|
@@ -8,9 +8,12 @@ export const inferenceCliHelp = `Usage:
|
|
|
8
8
|
agl proxy service install [--port ${aglProxyDefaultPort}] | enable | start | stop | status
|
|
9
9
|
agl proxy serve [--port ${aglProxyDefaultPort}]
|
|
10
10
|
agl proxy status [--json]
|
|
11
|
+
agl proxy capacity [--provider anthropic|openai] [--min-headroom 15] [--json] [--wait [--max-seconds <seconds>]]
|
|
11
12
|
agl proxy credential <client> [--provider openai|anthropic] [--delivery file|none] [--write <path>] [--rotate] | --version
|
|
12
13
|
agl proxy run codex|claude|opencode [--provider openai|anthropic] [--account <id>] [--plan <name>] [--model <id>] -- [harness arguments]
|
|
13
14
|
agl proxy confined run [--provider anthropic|openai] -- docker run [docker options] <image> [command]
|
|
15
|
+
agl proxy confined run --harness codex [--provider openai] -- docker run [docker options] <image> \\
|
|
16
|
+
node ${aglProxyRelayMountPoint}/${aglProxyRelayFile} -- codex exec …
|
|
14
17
|
agl proxy confined end <run id>
|
|
15
18
|
|
|
16
19
|
The proxy runs as the ${aglProxyUnitName} user unit (serve runs it in a terminal instead).
|
|
@@ -31,8 +34,22 @@ ChatGPT accounts answer it translated, as for run claude --provider openai. It a
|
|
|
31
34
|
--provider openai sets) right after docker run, prints the run's id on standard error, and ends the credential when the
|
|
32
35
|
container exits. The socket is the proxy user's (0600): run the container as that uid (--user), or as root under
|
|
33
36
|
rootless Docker. Root of a rootful daemon connects as well while it keeps CAP_DAC_OVERRIDE (--cap-drop ALL takes it).
|
|
37
|
+
--harness codex starts Codex's container instead, on the ChatGPT pool's ChatGPT accounts alone (never an OpenAI API
|
|
38
|
+
key): the listener serves it GET /openai/v1/models and POST /openai/v1/responses alone, and refuses a request that
|
|
39
|
+
declares a hosted tool. Codex reaches the socket through AGL's relay, mounted read-only at ${aglProxyRelayMountPoint}:
|
|
40
|
+
the container's command runs node ${aglProxyRelayMountPoint}/${aglProxyRelayFile} -- codex exec …, and the relay listens
|
|
41
|
+
on 127.0.0.1:${aglProxyRelayDefaultPort} inside the container, which therefore keeps a network of its own: --network host
|
|
42
|
+
and --network container:… are refused. It passes AGL_PROXY_SOCKET and MODELPROFILE_PROXY_TOKEN, and no model.
|
|
34
43
|
confined end ends a run's credential at once, and its launcher stops the container; agl proxy status lists the runs
|
|
35
|
-
with their pools.
|
|
44
|
+
with their harnesses and pools.
|
|
45
|
+
capacity answers each pool's room for new work: the headroom its members add now, summed. Its members are its
|
|
46
|
+
subscription sign-ins that have not lapsed and whose reading states a counted plan (Claude accounts: max; ChatGPT
|
|
47
|
+
accounts: every plan but free); one that takes no work now adds nothing. A pool is open when its room reaches
|
|
48
|
+
--min-headroom (15 unless given) and no provider 429 hit a member within five minutes (a proxy watches for five minutes
|
|
49
|
+
after its start before it says so); otherwise it waits until the first moment the members' readings foresee enough room.
|
|
50
|
+
Each member names its binding window and when its headroom next grows. Exit status: 0 when every pool reported is open,
|
|
51
|
+
2 when one waits, 1 on a failure. --wait (with --provider) asks again until the pool is open, at most --max-seconds when
|
|
52
|
+
given, and exits 2 when that time ran out.
|
|
36
53
|
Repeat --account or --plan to restrict automatic routing. Only accounts the account service holds are eligible.
|
|
37
54
|
ChatGPT pools: /openai/v1/responses, /anthropic/v1/messages (translated), and each prefix's /models.
|
|
38
55
|
Claude pools: /anthropic/v1/messages, /anthropic/v1/messages/count_tokens and /anthropic/v1/models, sent on as Claude Code sent them.
|
|
@@ -46,17 +63,18 @@ const commandOptions = {
|
|
|
46
63
|
run: ['--provider', '--account', '--plan', '--model'],
|
|
47
64
|
credential: ['--provider', '--delivery', '--write', '--rotate'],
|
|
48
65
|
status: ['--json'],
|
|
66
|
+
capacity: ['--provider', '--min-headroom', '--json', '--wait', '--max-seconds'],
|
|
49
67
|
service: ['--port'],
|
|
50
68
|
confined: [],
|
|
51
69
|
};
|
|
52
|
-
const flags = new Set(['--rotate', '--json']);
|
|
70
|
+
const flags = new Set(['--rotate', '--json', '--wait']);
|
|
53
71
|
export const parseInferenceCliArguments = (argvArg) => {
|
|
54
72
|
const argv = [...argvArg];
|
|
55
73
|
const command = argv.shift();
|
|
56
74
|
if (!command || !Object.hasOwn(commandOptions, command))
|
|
57
75
|
throw new Error(inferenceCliHelp);
|
|
58
76
|
const result = { command, port: aglProxyDefaultPort, policy: {}, rotate: false, version: false, json: false,
|
|
59
|
-
args: [] };
|
|
77
|
+
wait: false, args: [] };
|
|
60
78
|
if (command === 'run') {
|
|
61
79
|
const harness = argv.shift();
|
|
62
80
|
if (!['codex', 'claude', 'opencode'].includes(harness ?? ''))
|
|
@@ -92,12 +110,25 @@ export const parseInferenceCliArguments = (argvArg) => {
|
|
|
92
110
|
}
|
|
93
111
|
if (action !== 'run')
|
|
94
112
|
throw new Error(inferenceCliHelp);
|
|
95
|
-
|
|
96
|
-
|
|
113
|
+
// Each option at most once, before `--`.
|
|
114
|
+
while (argv.length && argv[0] !== '--') {
|
|
115
|
+
const name = argv.shift();
|
|
97
116
|
const value = argv.shift();
|
|
98
|
-
if (
|
|
99
|
-
|
|
100
|
-
|
|
117
|
+
if (name === '--provider' && result.provider === undefined) {
|
|
118
|
+
if (!inferenceProviders.includes(value))
|
|
119
|
+
throw new Error('--provider is openai or anthropic.');
|
|
120
|
+
result.provider = value;
|
|
121
|
+
}
|
|
122
|
+
else if (name === '--harness' && result.harness === undefined) {
|
|
123
|
+
if (value !== 'codex')
|
|
124
|
+
throw new Error('--harness is codex: Codex on the ChatGPT pool. Claude Code runs without it.');
|
|
125
|
+
result.harness = 'codex';
|
|
126
|
+
}
|
|
127
|
+
else
|
|
128
|
+
throw new Error(inferenceCliHelp);
|
|
129
|
+
}
|
|
130
|
+
if (result.harness === 'codex' && result.provider === 'anthropic') {
|
|
131
|
+
throw new Error('Codex runs on the ChatGPT pool\'s ChatGPT accounts; --provider anthropic serves Claude Code alone.');
|
|
101
132
|
}
|
|
102
133
|
if (argv.shift() !== '--' || !argv.length)
|
|
103
134
|
throw new Error(inferenceCliHelp);
|
|
@@ -119,6 +150,8 @@ export const parseInferenceCliArguments = (argvArg) => {
|
|
|
119
150
|
if (flags.has(name)) {
|
|
120
151
|
if (name === '--rotate')
|
|
121
152
|
result.rotate = true;
|
|
153
|
+
else if (name === '--wait')
|
|
154
|
+
result.wait = true;
|
|
122
155
|
else
|
|
123
156
|
result.json = true;
|
|
124
157
|
continue;
|
|
@@ -151,6 +184,16 @@ export const parseInferenceCliArguments = (argvArg) => {
|
|
|
151
184
|
throw new Error('--delivery is file or none.');
|
|
152
185
|
result.delivery = value;
|
|
153
186
|
}
|
|
187
|
+
else if (name === '--min-headroom') {
|
|
188
|
+
if (!/^\d+$/.test(value) || !Number.isSafeInteger(Number(value)))
|
|
189
|
+
throw new Error('--min-headroom is a whole percent, 0 or more.');
|
|
190
|
+
result.minHeadroom = Number(value);
|
|
191
|
+
}
|
|
192
|
+
else if (name === '--max-seconds') {
|
|
193
|
+
if (!/^[1-9]\d*$/.test(value) || !Number.isSafeInteger(Number(value)))
|
|
194
|
+
throw new Error('--max-seconds is a whole number of seconds, 1 or more.');
|
|
195
|
+
result.maxSeconds = Number(value);
|
|
196
|
+
}
|
|
154
197
|
else if (name === '--write') {
|
|
155
198
|
if (!path.isAbsolute(value))
|
|
156
199
|
throw new Error('--write needs an absolute path.');
|
|
@@ -162,6 +205,12 @@ export const parseInferenceCliArguments = (argvArg) => {
|
|
|
162
205
|
result.modelId = value;
|
|
163
206
|
}
|
|
164
207
|
}
|
|
208
|
+
if (command === 'capacity') {
|
|
209
|
+
if (result.wait && result.provider === undefined)
|
|
210
|
+
throw new Error('--wait waits for one pool: name it with --provider.');
|
|
211
|
+
if (result.maxSeconds !== undefined && !result.wait)
|
|
212
|
+
throw new Error('--max-seconds bounds --wait, which it needs.');
|
|
213
|
+
}
|
|
165
214
|
if (accounts.length > 64 || plans.length > 32)
|
|
166
215
|
throw new Error('The proxy policy exceeds its account or plan limit.');
|
|
167
216
|
if (accounts.length)
|
|
@@ -176,4 +225,4 @@ export const parseInferenceCliArguments = (argvArg) => {
|
|
|
176
225
|
}
|
|
177
226
|
return result;
|
|
178
227
|
};
|
|
179
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
228
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"functions.inferencecliarguments.js","sourceRoot":"","sources":["../../ts/functions.inferencecliarguments.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,27 +40,55 @@ export declare const inferenceHarnessLaunch: (optionsArg: IInferenceLaunchOption
|
|
|
40
40
|
args: string[];
|
|
41
41
|
environment: NodeJS.ProcessEnv;
|
|
42
42
|
};
|
|
43
|
-
/**
|
|
43
|
+
/**
|
|
44
|
+
* A confined run's harness and pool, as its launcher configures the container for it: Claude Code on the Claude pool, Claude
|
|
45
|
+
* Code on the ChatGPT pool with the pool's models, or Codex on the ChatGPT pool with the host directory that holds AGL's
|
|
46
|
+
* relay for it (`writeConfinedRelay`).
|
|
47
|
+
*/
|
|
44
48
|
export type TConfinedLaunchPool = {
|
|
45
49
|
provider: 'anthropic';
|
|
46
50
|
} | {
|
|
47
51
|
provider: 'openai';
|
|
48
52
|
models: readonly TInferenceModel[];
|
|
53
|
+
} | {
|
|
54
|
+
harness: 'codex';
|
|
55
|
+
relayDirectory: string;
|
|
49
56
|
};
|
|
57
|
+
/**
|
|
58
|
+
* The `--network` values `docker run`'s options (`optionsArg`, what follows `run`) give the container, in every spelling
|
|
59
|
+
* Docker takes: `--network` or its alias `--net`, with the value after `=` or as the next argument; see
|
|
60
|
+
* `dockerNetworkName` for what a value names. Reading stops at the image, the first argument that is no option, or at `--`.
|
|
61
|
+
* A known option that takes a value takes the next argument whatever it reads like, as Docker does (`-e --network=host`
|
|
62
|
+
* sets a variable); an option only assumed to take one never takes a network option.
|
|
63
|
+
*/
|
|
64
|
+
export declare const dockerRunNetworks: (optionsArg: readonly string[]) => string[];
|
|
65
|
+
/**
|
|
66
|
+
* The network a `--network` value names, as Docker 29.7.1's command line reads it (`NetworkOpt`): a value in which
|
|
67
|
+
* `\w+=\w+` occurs anywhere is its long form, comma-separated `key=value` fields whose keys it trims and lower-cases, and
|
|
68
|
+
* whose last `name` field names the network; any other value is the network's name itself. `undefined` for a long form
|
|
69
|
+
* this does not read whole: one with a quote or a line break (Docker reads the fields as CSV), a field without `=`, or no
|
|
70
|
+
* `name` field.
|
|
71
|
+
*/
|
|
72
|
+
export declare const dockerNetworkName: (valueArg: string) => string | undefined;
|
|
50
73
|
/**
|
|
51
74
|
* A confined run's `docker run`: the given command, with the confined listener's directory mounted read-only at
|
|
52
|
-
* `aglProxyConfinedMountPoint` and
|
|
75
|
+
* `aglProxyConfinedMountPoint` and the harness's settings for it added right after `run`, before the launcher's own
|
|
53
76
|
* options and image. Claude Code inside reaches the proxy through the socket alone (`ANTHROPIC_UNIX_SOCKET`, which
|
|
54
77
|
* Claude Code sends its API requests through as plain HTTP to `ANTHROPIC_BASE_URL`'s path), on the run's credential
|
|
55
78
|
* (`ANTHROPIC_AUTH_TOKEN`), and sends nothing beyond its model requests. On the Claude pool it reads the pool's models
|
|
56
79
|
* from the proxy; on the ChatGPT pool it gets the variables `agl proxy run claude --provider openai` gives it
|
|
57
80
|
* (`claudeChatGptEnvironment`: the pool's default model for every alias, its context window), but neither that command's
|
|
58
81
|
* configuration directory, which lies in the AGL home, nor its `/model` picker, an option of the container's command
|
|
59
|
-
* that the launcher does not touch.
|
|
60
|
-
*
|
|
61
|
-
*
|
|
62
|
-
*
|
|
63
|
-
*
|
|
82
|
+
* that the launcher does not touch. A Codex run (AGL-1614) also gets AGL's relay's directory mounted read-only at
|
|
83
|
+
* `aglProxyRelayMountPoint`, which its command runs Codex through, the socket's path in the container
|
|
84
|
+
* (`AGL_PROXY_SOCKET`) for the relay and the run's credential (`MODELPROFILE_PROXY_TOKEN`) for Codex's provider command;
|
|
85
|
+
* no model variable: Codex reads the pool's catalog through the relay, and the command names its model. The container
|
|
86
|
+
* gets each variable by name from the docker command's environment, so the credential never appears on a command line;
|
|
87
|
+
* that environment drops every variable that would give the harness another login or route -- Claude Code's always, and
|
|
88
|
+
* for a Codex run Codex's and OpenAI's (`codexRoutingVariables`) -- and on the ChatGPT pool every model variable a Claude
|
|
89
|
+
* Code run sets, so `-e NAME` of one of them passes nothing. The mount is the socket's own directory, which holds nothing
|
|
90
|
+
* else and survives a proxy restart, unlike a mount of the socket file. Only `docker run` and `docker container run` are
|
|
91
|
+
* taken.
|
|
64
92
|
*/
|
|
65
93
|
export declare const confinedDockerLaunch: (optionsArg: {
|
|
66
94
|
args: readonly string[];
|