agl 40.5.0 → 40.6.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 +16 -0
- package/dist_serve/bundle.js +598 -598
- package/dist_serve/bundle.js.map +2 -2
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/aglapi/aglapisurface.document.js +2 -2
- package/dist_ts/classes.aglhome.d.ts +5 -0
- package/dist_ts/classes.aglhome.js +2 -1
- package/dist_ts/classes.authstore.js +5 -1
- package/dist_ts/classes.controller.js +11 -2
- package/dist_ts/classes.inferencegateway.d.ts +35 -1
- package/dist_ts/classes.inferencegateway.js +86 -26
- package/dist_ts/classes.inferenceservice.d.ts +4 -2
- package/dist_ts/classes.inferenceservice.js +5 -4
- package/dist_ts/classes.proxycontrol.d.ts +58 -4
- package/dist_ts/classes.proxycontrol.js +23 -44
- package/dist_ts/classes.proxycontrolclient.d.ts +15 -5
- package/dist_ts/classes.proxycontrolclient.js +67 -17
- package/dist_ts/classes.proxydaemon.d.ts +22 -3
- package/dist_ts/classes.proxydaemon.js +73 -12
- package/dist_ts/classes.proxyleaseholder.d.ts +43 -14
- package/dist_ts/classes.proxyleaseholder.js +66 -22
- package/dist_ts/classes.proxystore.d.ts +9 -0
- package/dist_ts/classes.proxystore.js +15 -7
- package/dist_ts/classes.workercallerbindings.d.ts +66 -0
- package/dist_ts/classes.workercallerbindings.js +211 -0
- package/dist_ts/classes.workercallers.d.ts +63 -2
- package/dist_ts/classes.workercallers.js +430 -65
- package/dist_ts/fleet/classes.workerlaunches.d.ts +12 -5
- package/dist_ts/fleet/classes.workerlaunches.js +25 -19
- package/dist_ts/fleet/classes.workers.d.ts +17 -0
- package/dist_ts/fleet/classes.workers.js +74 -1
- package/dist_ts/functions.inferencecli.d.ts +3 -2
- package/dist_ts/functions.inferencecli.js +67 -5
- package/dist_ts/functions.inferencecliarguments.d.ts +6 -2
- package/dist_ts/functions.inferencecliarguments.js +29 -2
- package/dist_ts/functions.inferencelaunch.d.ts +24 -0
- package/dist_ts/functions.inferencelaunch.js +42 -2
- package/dist_ts/functions.proxycontract.d.ts +11 -0
- package/dist_ts/functions.proxycontract.js +12 -1
- package/dist_ts/functions.proxysocket.d.ts +6 -0
- package/dist_ts/functions.proxysocket.js +46 -0
- package/dist_ts/functions.workerprocessproof.d.ts +6 -0
- package/dist_ts/functions.workerprocessproof.js +28 -4
- package/dist_ts_authswitch/authority-contract.d.ts +30 -5
- package/dist_ts_authswitch/authority-contract.js +7 -1
- package/dist_ts_authswitch/classes.authoritycli.js +6 -2
- package/dist_ts_authswitch/classes.authorityclient.js +15 -5
- package/dist_ts_authswitch/classes.claudenative.d.ts +7 -1
- package/dist_ts_authswitch/classes.claudenative.js +21 -6
- package/dist_ts_authswitch/classes.claudesignin.d.ts +14 -2
- package/dist_ts_authswitch/classes.claudesignin.js +68 -22
- package/dist_ts_authswitch/classes.codexmanaged.d.ts +8 -0
- package/dist_ts_authswitch/classes.codexmanaged.js +33 -18
- package/dist_ts_authswitch/classes.harnessprocesses.d.ts +8 -0
- package/dist_ts_authswitch/classes.harnessprocesses.js +41 -9
- package/dist_ts_interfaces/interfaces.d.ts +1 -1
- package/dist_ts_interfaces/interfaces.js +1 -1
- package/dist_ts_interfaces/workercallers.d.ts +43 -4
- package/package.json +1 -1
- package/readme.md +103 -14
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/aglapi/aglapisurface.document.ts +2 -2
- package/ts/classes.aglhome.ts +6 -0
- package/ts/classes.authstore.ts +4 -0
- package/ts/classes.controller.ts +10 -1
- package/ts/classes.inferencegateway.ts +104 -23
- package/ts/classes.inferenceservice.ts +6 -3
- package/ts/classes.proxycontrol.ts +76 -39
- package/ts/classes.proxycontrolclient.ts +72 -20
- package/ts/classes.proxydaemon.ts +85 -15
- package/ts/classes.proxyleaseholder.ts +84 -28
- package/ts/classes.proxystore.ts +16 -5
- package/ts/classes.workercallerbindings.ts +147 -0
- package/ts/classes.workercallers.ts +410 -59
- package/ts/fleet/classes.workerlaunches.ts +23 -15
- package/ts/fleet/classes.workers.ts +51 -1
- package/ts/functions.inferencecli.ts +61 -7
- package/ts/functions.inferencecliarguments.ts +32 -1
- package/ts/functions.inferencelaunch.ts +49 -2
- package/ts/functions.proxycontract.ts +12 -0
- package/ts/functions.proxysocket.ts +39 -0
- package/ts/functions.workerprocessproof.ts +27 -4
- package/ts_authswitch/authority-contract.ts +34 -5
- package/ts_authswitch/classes.authoritycli.ts +5 -1
- package/ts_authswitch/classes.authorityclient.ts +25 -9
- package/ts_authswitch/classes.claudenative.ts +23 -7
- package/ts_authswitch/classes.claudesignin.ts +70 -23
- package/ts_authswitch/classes.codexmanaged.ts +30 -16
- package/ts_authswitch/classes.harnessprocesses.ts +39 -8
- package/ts_authswitch/native-contracts.md +1 -1
- package/ts_interfaces/interfaces.ts +1 -1
- package/ts_interfaces/workercallers.ts +32 -4
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/ts_web/accounts.plugins.ts +5 -1
- package/ts_web/classes.accountsreadmodel.ts +4 -1
|
@@ -3,12 +3,12 @@ import { commitinfo } from './00_commitinfo_data.js';
|
|
|
3
3
|
import { ensureControllerDataRoot, preflightAGLHomeMigration } from './functions.controllerdataroot.js';
|
|
4
4
|
import { resolveAGLHomePaths } from './classes.aglhome.js';
|
|
5
5
|
import { resolveProductionAuthoritySocketPaths } from './classes.authorityclient.js';
|
|
6
|
-
import { inferenceHarnessLaunch } from './functions.inferencelaunch.js';
|
|
6
|
+
import { confinedDockerLaunch, inferenceHarnessLaunch } from './functions.inferencelaunch.js';
|
|
7
7
|
import { AglProxyControlClient, AglProxyUnavailableError } from './classes.proxycontrolclient.js';
|
|
8
|
-
import { AglProxyLeaseHolder } from './classes.proxyleaseholder.js';
|
|
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 { aglProxyUnitName } from './functions.proxycontract.js';
|
|
11
|
+
import { aglProxyConfinedMountPoint, aglProxyUnitName } from './functions.proxycontract.js';
|
|
12
12
|
import { inferenceCliHelp, parseInferenceCliArguments } from './functions.inferencecliarguments.js';
|
|
13
13
|
import { runProxyCredentialCommand } from './functions.proxycredentialcli.js';
|
|
14
14
|
import { currentProxyCredentialHelper, writeProxyCredentialHelper } from './functions.proxycredentialhelper.js';
|
|
@@ -52,6 +52,14 @@ export const formatProxyStatus = (unitArg, statusArg) => {
|
|
|
52
52
|
+ `${client.generation}${client.delivery === 'file' ? ' (kept in a file)' : ''}, ${client.pending} in flight, `
|
|
53
53
|
+ `last used ${client.lastUsedAt ?? 'never'}`);
|
|
54
54
|
}
|
|
55
|
+
if (statusArg.confinedSocketPath !== undefined) {
|
|
56
|
+
lines.push(`Confined listener: ${statusArg.confinedSocketPath ?? 'none'}`);
|
|
57
|
+
for (const run of statusArg.confinedRuns ?? []) {
|
|
58
|
+
lines.push(`Confined run ${run.id}: issued ${run.createdAt}`
|
|
59
|
+
+ `${run.held ? '' : ', waiting for its launcher to take it back after a proxy restart'}`
|
|
60
|
+
+ ` (end it with \`agl proxy confined end ${run.id}\`)`);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
55
63
|
if (!statusArg.accounts) {
|
|
56
64
|
// The proxy runs the older AGL it was started from until it restarts, as after an upgrade it was not restarted by.
|
|
57
65
|
lines.push(`Accounts: not reported, as the proxy runs AGL ${statusArg.version} and this command AGL ${commitinfo.version}. `
|
|
@@ -115,7 +123,7 @@ const serve = (portArg) => withSignals(async (signalArg) => {
|
|
|
115
123
|
// files go with the next upgrade, while harnesses still ask this proxy until it restarts.
|
|
116
124
|
const credentialHelper = await currentProxyCredentialHelper(paths.root, () => resolveAglExecutable(process.env, plugins.os.homedir()));
|
|
117
125
|
const daemon = new AglProxyDaemon({ socketPath: paths.proxySocket, dataDirectory: plugins.path.join(paths.proxy, 'nosqldb'),
|
|
118
|
-
credentialDirectory: paths.proxyCredentials,
|
|
126
|
+
credentialDirectory: paths.proxyCredentials, confinedSocketPath: paths.proxyConfinedSocket,
|
|
119
127
|
authorityPaths: resolveProductionAuthoritySocketPaths(), port: portArg });
|
|
120
128
|
const stopping = () => { void daemon.stop().catch(() => undefined); };
|
|
121
129
|
signalArg.addEventListener('abort', stopping, { once: true });
|
|
@@ -192,6 +200,51 @@ const run = (optionsArg) => withSignals(async (signalArg) => {
|
|
|
192
200
|
if (lost)
|
|
193
201
|
throw new Error(`${lost.message} Run \`agl proxy run ${optionsArg.harness}\` again to continue.`);
|
|
194
202
|
});
|
|
203
|
+
/**
|
|
204
|
+
* Runs a confined run's container (see `confinedDockerLaunch`) on a credential of its own, which ends when the container
|
|
205
|
+
* exits. A proxy that restarts meanwhile hands the credential back; one the proxy no longer hands back, or the operator
|
|
206
|
+
* ended, stops the container (`docker run` passes the signal on to it), and the run ends with the reason.
|
|
207
|
+
*/
|
|
208
|
+
const confinedRun = (optionsArg) => withSignals(async (signalArg) => {
|
|
209
|
+
await preflightAGLHomeMigration();
|
|
210
|
+
const paths = resolveAGLHomePaths();
|
|
211
|
+
const run = await AglProxyConfinedHolder.take({ socketPath: paths.proxySocket }, AbortSignal.any([signalArg, AbortSignal.timeout(90_000)]));
|
|
212
|
+
let lost;
|
|
213
|
+
try {
|
|
214
|
+
const launch = confinedDockerLaunch({ args: optionsArg.args, socketPath: run.confinedSocketPath, baseUrl: run.baseUrl,
|
|
215
|
+
token: run.token, environment: process.env });
|
|
216
|
+
process.stderr.write(`AGL proxy confined run ${run.id}: ${plugins.path.dirname(run.confinedSocketPath)} is mounted read-only `
|
|
217
|
+
+ `at ${aglProxyConfinedMountPoint}; end it at once with \`agl proxy confined end ${run.id}\`.\n`);
|
|
218
|
+
signalArg.throwIfAborted();
|
|
219
|
+
const child = plugins.childProcess.spawn(launch.command, launch.args, { env: launch.environment, stdio: 'inherit', shell: false });
|
|
220
|
+
let killTimer;
|
|
221
|
+
const terminate = () => {
|
|
222
|
+
child.kill('SIGTERM');
|
|
223
|
+
killTimer ??= setTimeout(() => child.kill('SIGKILL'), 10_000);
|
|
224
|
+
killTimer.unref();
|
|
225
|
+
};
|
|
226
|
+
signalArg.addEventListener('abort', terminate, { once: true });
|
|
227
|
+
void run.lost.then((errorArg) => { lost = errorArg; terminate(); });
|
|
228
|
+
try {
|
|
229
|
+
if (signalArg.aborted)
|
|
230
|
+
terminate();
|
|
231
|
+
process.exitCode = await new Promise((resolve, reject) => {
|
|
232
|
+
child.once('error', reject);
|
|
233
|
+
child.once('exit', (codeArg) => resolve(codeArg ?? 1));
|
|
234
|
+
});
|
|
235
|
+
}
|
|
236
|
+
finally {
|
|
237
|
+
signalArg.removeEventListener('abort', terminate);
|
|
238
|
+
if (killTimer)
|
|
239
|
+
clearTimeout(killTimer);
|
|
240
|
+
}
|
|
241
|
+
}
|
|
242
|
+
finally {
|
|
243
|
+
run.close();
|
|
244
|
+
}
|
|
245
|
+
if (lost)
|
|
246
|
+
throw new Error(`${lost.message} The container was stopped; start the run again to continue.`);
|
|
247
|
+
});
|
|
195
248
|
const unitState = async (serviceArg) => {
|
|
196
249
|
try {
|
|
197
250
|
const state = await serviceArg.inspect();
|
|
@@ -216,8 +269,17 @@ export const runInferenceCli = async (argvArg) => {
|
|
|
216
269
|
await run(options);
|
|
217
270
|
return;
|
|
218
271
|
}
|
|
272
|
+
if (options.command === 'confined' && options.confinedAction === 'run') {
|
|
273
|
+
await confinedRun(options);
|
|
274
|
+
return;
|
|
275
|
+
}
|
|
219
276
|
const paths = resolveAGLHomePaths();
|
|
220
277
|
const client = new AglProxyControlClient(paths.proxySocket);
|
|
278
|
+
if (options.command === 'confined') {
|
|
279
|
+
await client.endConfined(options.confinedId, AbortSignal.timeout(10_000));
|
|
280
|
+
process.stdout.write(`Ended confined run ${options.confinedId}: the proxy refuses its credential from now on.\n`);
|
|
281
|
+
return;
|
|
282
|
+
}
|
|
221
283
|
if (options.command === 'credential') {
|
|
222
284
|
await runProxyCredentialCommand(options, (textArg) => process.stdout.write(textArg));
|
|
223
285
|
return;
|
|
@@ -261,4 +323,4 @@ export const runInferenceCli = async (argvArg) => {
|
|
|
261
323
|
}
|
|
262
324
|
process.stdout.write(`${aglProxyUnitName}: ${await unitState(service)}\n`);
|
|
263
325
|
};
|
|
264
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"functions.inferencecli.js","sourceRoot":"","sources":["../../ts/functions.inferencecli.ts"],"names":[],"mappings":"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"}
|
|
326
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"functions.inferencecli.js","sourceRoot":"","sources":["../../ts/functions.inferencecli.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,18 @@
|
|
|
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\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.\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';
|
|
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 -- 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 the Claude pool's\nthree Claude Code endpoints alone. It adds the mount and Claude Code's settings (ANTHROPIC_UNIX_SOCKET, ANTHROPIC_BASE_URL,\nANTHROPIC_AUTH_TOKEN) 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.\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';
|
|
6
6
|
export type TInferenceServiceAction = 'install' | 'enable' | 'start' | 'stop' | 'status';
|
|
7
|
+
export type TInferenceConfinedAction = 'run' | 'end';
|
|
7
8
|
export interface IInferenceCliArguments {
|
|
8
9
|
command: TInferenceCommand;
|
|
9
10
|
harness?: TInferenceHarness;
|
|
10
11
|
client?: string;
|
|
11
12
|
serviceAction?: TInferenceServiceAction;
|
|
13
|
+
confinedAction?: TInferenceConfinedAction;
|
|
14
|
+
/** `confined end`: the run to end. */
|
|
15
|
+
confinedId?: string;
|
|
12
16
|
port: number;
|
|
13
17
|
policy: IInferenceRoutingPolicy;
|
|
14
18
|
/** `--provider`, when given. */
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as path from 'node:path';
|
|
2
|
-
import { aglProxyDefaultPort, aglProxyUnitName, defaultProxyClientProvider, inferencePlanPattern, inferenceProviders, proxyClientNamePattern, proxyCredentialDeliveries, } from './functions.proxycontract.js';
|
|
2
|
+
import { aglProxyConfinedIdPattern, aglProxyConfinedMountPoint, aglProxyDefaultPort, 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.
|
|
@@ -10,6 +10,8 @@ export const inferenceCliHelp = `Usage:
|
|
|
10
10
|
agl proxy status [--json]
|
|
11
11
|
agl proxy credential <client> [--provider openai|anthropic] [--delivery file|none] [--write <path>] [--rotate] | --version
|
|
12
12
|
agl proxy run codex|claude|opencode [--provider openai|anthropic] [--account <id>] [--plan <name>] [--model <id>] -- [harness arguments]
|
|
13
|
+
agl proxy confined run -- docker run [docker options] <image> [command]
|
|
14
|
+
agl proxy confined end <run id>
|
|
13
15
|
|
|
14
16
|
The proxy runs as the ${aglProxyUnitName} user unit (serve runs it in a terminal instead).
|
|
15
17
|
Every client (codex, claude, opencode, or a name of your own) has one credential, sealed by the proxy.
|
|
@@ -21,6 +23,13 @@ Each client is served from one pool: ChatGPT accounts (openai) or Claude account
|
|
|
21
23
|
client starts on Claude accounts, every other client on ChatGPT accounts; --provider moves a client.
|
|
22
24
|
Run gives one child a private credential that ends when the child exits; run claude uses Claude accounts
|
|
23
25
|
unless --provider openai asks for ChatGPT models behind Claude Code.
|
|
26
|
+
confined run starts Claude Code's container on a credential of its own, accepted only on the proxy's confined
|
|
27
|
+
listener: a Unix socket whose directory the run mounts read-only at ${aglProxyConfinedMountPoint}, served the Claude pool's
|
|
28
|
+
three Claude Code endpoints alone. It adds the mount and Claude Code's settings (ANTHROPIC_UNIX_SOCKET, ANTHROPIC_BASE_URL,
|
|
29
|
+
ANTHROPIC_AUTH_TOKEN) right after docker run, prints the run's id on standard error, and ends the credential when the
|
|
30
|
+
container exits. The socket is the proxy user's (0600): run the container as that uid (--user), or as root under
|
|
31
|
+
rootless Docker. Root of a rootful daemon connects as well while it keeps CAP_DAC_OVERRIDE (--cap-drop ALL takes it).
|
|
32
|
+
confined end ends a run's credential at once, and its launcher stops the container; agl proxy status lists the runs.
|
|
24
33
|
Repeat --account or --plan to restrict automatic routing. Only accounts the account service holds are eligible.
|
|
25
34
|
ChatGPT pools: /openai/v1/responses, /anthropic/v1/messages (translated), and each prefix's /models.
|
|
26
35
|
Claude pools: /anthropic/v1/messages, /anthropic/v1/messages/count_tokens and /anthropic/v1/models, sent on as Claude Code sent them.
|
|
@@ -35,6 +44,7 @@ const commandOptions = {
|
|
|
35
44
|
credential: ['--provider', '--delivery', '--write', '--rotate'],
|
|
36
45
|
status: ['--json'],
|
|
37
46
|
service: ['--port'],
|
|
47
|
+
confined: [],
|
|
38
48
|
};
|
|
39
49
|
const flags = new Set(['--rotate', '--json']);
|
|
40
50
|
export const parseInferenceCliArguments = (argvArg) => {
|
|
@@ -66,6 +76,23 @@ export const parseInferenceCliArguments = (argvArg) => {
|
|
|
66
76
|
throw new Error(inferenceCliHelp);
|
|
67
77
|
result.serviceAction = action;
|
|
68
78
|
}
|
|
79
|
+
else if (command === 'confined') {
|
|
80
|
+
const action = argv.shift();
|
|
81
|
+
if (action === 'end') {
|
|
82
|
+
const id = argv.shift();
|
|
83
|
+
if (id === undefined || !aglProxyConfinedIdPattern.test(id) || argv.length) {
|
|
84
|
+
throw new Error('Name the confined run to end by its id: 12 hex characters, as `agl proxy status` lists it.');
|
|
85
|
+
}
|
|
86
|
+
result.confinedAction = 'end';
|
|
87
|
+
result.confinedId = id;
|
|
88
|
+
return result;
|
|
89
|
+
}
|
|
90
|
+
if (action !== 'run' || argv.shift() !== '--' || !argv.length)
|
|
91
|
+
throw new Error(inferenceCliHelp);
|
|
92
|
+
result.confinedAction = 'run';
|
|
93
|
+
result.args = argv;
|
|
94
|
+
return result;
|
|
95
|
+
}
|
|
69
96
|
const accounts = [];
|
|
70
97
|
const plans = [];
|
|
71
98
|
while (argv.length) {
|
|
@@ -137,4 +164,4 @@ export const parseInferenceCliArguments = (argvArg) => {
|
|
|
137
164
|
}
|
|
138
165
|
return result;
|
|
139
166
|
};
|
|
140
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
167
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnVuY3Rpb25zLmluZmVyZW5jZWNsaWFyZ3VtZW50cy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL2Z1bmN0aW9ucy5pbmZlcmVuY2VjbGlhcmd1bWVudHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLElBQUksTUFBTSxXQUFXLENBQUM7QUFHbEMsT0FBTyxFQUNMLHlCQUF5QixFQUN6QiwwQkFBMEIsRUFDMUIsbUJBQW1CLEVBQ25CLGdCQUFnQixFQUNoQiwwQkFBMEIsRUFDMUIsb0JBQW9CLEVBQ3BCLGtCQUFrQixFQUNsQixzQkFBc0IsRUFDdEIseUJBQXlCLEdBRzFCLE1BQU0sOEJBQThCLENBQUM7QUFFdEM7OztHQUdHO0FBRUgsTUFBTSxDQUFDLE1BQU0sZ0JBQWdCLEdBQUc7c0NBQ00sbUJBQW1COzRCQUM3QixtQkFBbUI7Ozs7Ozs7d0JBT3ZCLGdCQUFnQjs7Ozs7Ozs7Ozs7c0VBVzhCLDBCQUEwQjs7Ozs7Ozs7Ozs7OztDQWEvRixDQUFDO0FBNEJGLE1BQU0sY0FBYyxHQUFpRDtJQUNuRSxLQUFLLEVBQUUsQ0FBQyxRQUFRLENBQUM7SUFDakIsR0FBRyxFQUFFLENBQUMsWUFBWSxFQUFFLFdBQVcsRUFBRSxRQUFRLEVBQUUsU0FBUyxDQUFDO0lBQ3JELFVBQVUsRUFBRSxDQUFDLFlBQVksRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLFVBQVUsQ0FBQztJQUMvRCxNQUFNLEVBQUUsQ0FBQyxRQUFRLENBQUM7SUFDbEIsT0FBTyxFQUFFLENBQUMsUUFBUSxDQUFDO0lBQ25CLFFBQVEsRUFBRSxFQUFFO0NBQ2IsQ0FBQztBQUNGLE1BQU0sS0FBSyxHQUFHLElBQUksR0FBRyxDQUFDLENBQUMsVUFBVSxFQUFFLFFBQVEsQ0FBQyxDQUFDLENBQUM7QUFFOUMsTUFBTSxDQUFDLE1BQU0sMEJBQTBCLEdBQUcsQ0FBQyxPQUEwQixFQUEwQixFQUFFO0lBQy9GLE1BQU0sSUFBSSxHQUFHLENBQUMsR0FB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
|
|
@@ -31,3 +31,27 @@ export declare const inferenceHarnessLaunch: (optionsArg: IInferenceLaunchOption
|
|
|
31
31
|
args: string[];
|
|
32
32
|
environment: NodeJS.ProcessEnv;
|
|
33
33
|
};
|
|
34
|
+
/**
|
|
35
|
+
* A confined run's `docker run`: the given command, with the confined listener's directory mounted read-only at
|
|
36
|
+
* `aglProxyConfinedMountPoint` and Claude Code's settings for it added right after `run`, before the launcher's own
|
|
37
|
+
* options and image. Claude Code inside reaches the proxy through the socket alone (`ANTHROPIC_UNIX_SOCKET`, which
|
|
38
|
+
* Claude Code sends its API requests through as plain HTTP to `ANTHROPIC_BASE_URL`'s path), on the run's credential
|
|
39
|
+
* (`ANTHROPIC_AUTH_TOKEN`), reads the pool's models from the proxy and sends nothing beyond its model requests. The
|
|
40
|
+
* container gets each variable by name from the docker command's environment, so the credential never appears on a
|
|
41
|
+
* command line; that environment drops every variable that would give Claude Code another login or route, so `-e NAME`
|
|
42
|
+
* of one of them passes nothing. The mount is the socket's own directory, which holds nothing else and survives a proxy
|
|
43
|
+
* restart, unlike a mount of the socket file. Only `docker run` and `docker container run` are taken.
|
|
44
|
+
*/
|
|
45
|
+
export declare const confinedDockerLaunch: (optionsArg: {
|
|
46
|
+
args: readonly string[];
|
|
47
|
+
/** The confined listener's socket on the host. */
|
|
48
|
+
socketPath: string;
|
|
49
|
+
/** The origin Claude Code names; see `IAglProxyConfinedGrant.baseUrl`. */
|
|
50
|
+
baseUrl: string;
|
|
51
|
+
token: string;
|
|
52
|
+
environment: NodeJS.ProcessEnv;
|
|
53
|
+
}) => {
|
|
54
|
+
command: string;
|
|
55
|
+
args: string[];
|
|
56
|
+
environment: NodeJS.ProcessEnv;
|
|
57
|
+
};
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
import
|
|
1
|
+
import * as path from 'node:path';
|
|
2
|
+
import { aglProxyConfinedMountPoint } from './functions.proxycontract.js';
|
|
3
|
+
import { aglProxyProviderId, claudeProxyEnvironment, claudeProxyReservedVariables, claudeRoutingVariables, codexProxyProvider, openCodeProxyProvider, proxyHarnessModels } from './functions.proxyharnessconfig.js';
|
|
2
4
|
/**
|
|
3
5
|
* Claude Code on a Claude pool: its own configuration and home, with only its endpoint and credential pointed at
|
|
4
6
|
* the proxy, which sends its requests on to the account unchanged. The proxy's credential replaces any claude.ai
|
|
@@ -118,4 +120,42 @@ export const inferenceHarnessLaunch = (optionsArg) => {
|
|
|
118
120
|
return { environment, args: ['run', ...selection, ...args.slice(1)] };
|
|
119
121
|
return { environment, args: args[0] !== undefined && openCodeCommands.has(args[0]) ? args : [...selection, ...args] };
|
|
120
122
|
};
|
|
121
|
-
|
|
123
|
+
/**
|
|
124
|
+
* A confined run's `docker run`: the given command, with the confined listener's directory mounted read-only at
|
|
125
|
+
* `aglProxyConfinedMountPoint` and Claude Code's settings for it added right after `run`, before the launcher's own
|
|
126
|
+
* options and image. Claude Code inside reaches the proxy through the socket alone (`ANTHROPIC_UNIX_SOCKET`, which
|
|
127
|
+
* Claude Code sends its API requests through as plain HTTP to `ANTHROPIC_BASE_URL`'s path), on the run's credential
|
|
128
|
+
* (`ANTHROPIC_AUTH_TOKEN`), reads the pool's models from the proxy and sends nothing beyond its model requests. The
|
|
129
|
+
* container gets each variable by name from the docker command's environment, so the credential never appears on a
|
|
130
|
+
* command line; that environment drops every variable that would give Claude Code another login or route, so `-e NAME`
|
|
131
|
+
* of one of them passes nothing. The mount is the socket's own directory, which holds nothing else and survives a proxy
|
|
132
|
+
* restart, unlike a mount of the socket file. Only `docker run` and `docker container run` are taken.
|
|
133
|
+
*/
|
|
134
|
+
export const confinedDockerLaunch = (optionsArg) => {
|
|
135
|
+
const [command, ...args] = optionsArg.args;
|
|
136
|
+
const runAt = args[0] === 'run' ? 1 : args[0] === 'container' && args[1] === 'run' ? 2 : 0;
|
|
137
|
+
if (command === undefined || path.basename(command) !== 'docker' || runAt === 0) {
|
|
138
|
+
throw new Error('A confined run starts its container with `docker run` (or `docker container run`) and its arguments.');
|
|
139
|
+
}
|
|
140
|
+
const directory = path.dirname(optionsArg.socketPath);
|
|
141
|
+
// `--mount` separates its fields with commas and reads quotes; a directory naming either cannot be passed safely.
|
|
142
|
+
if (/[,"'\n]/u.test(directory))
|
|
143
|
+
throw new Error(`The confined listener's directory ${directory} cannot be mounted: it holds a comma, quote or line break.`);
|
|
144
|
+
const variables = {
|
|
145
|
+
...claudeProxyEnvironment(optionsArg.baseUrl),
|
|
146
|
+
ANTHROPIC_UNIX_SOCKET: `${aglProxyConfinedMountPoint}/${path.basename(optionsArg.socketPath)}`,
|
|
147
|
+
ANTHROPIC_AUTH_TOKEN: optionsArg.token,
|
|
148
|
+
};
|
|
149
|
+
const environment = { ...optionsArg.environment };
|
|
150
|
+
for (const name of claudeProxyReservedVariables)
|
|
151
|
+
delete environment[name];
|
|
152
|
+
return {
|
|
153
|
+
command,
|
|
154
|
+
args: [...args.slice(0, runAt),
|
|
155
|
+
'--mount', `type=bind,source=${directory},target=${aglProxyConfinedMountPoint},readonly`,
|
|
156
|
+
...Object.keys(variables).flatMap((nameArg) => ['--env', nameArg]),
|
|
157
|
+
...args.slice(runAt)],
|
|
158
|
+
environment: { ...environment, ...variables },
|
|
159
|
+
};
|
|
160
|
+
};
|
|
161
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"functions.inferencelaunch.js","sourceRoot":"","sources":["../../ts/functions.inferencelaunch.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,3 +27,14 @@ export type TProxyCredentialDelivery = 'none' | 'file';
|
|
|
27
27
|
export declare const proxyCredentialDeliveries: readonly TProxyCredentialDelivery[];
|
|
28
28
|
export declare const aglProxyUnitName = "agl-proxy.service";
|
|
29
29
|
export declare const aglProxyDefaultPort = 4100;
|
|
30
|
+
/**
|
|
31
|
+
* Confined runs (`agl proxy confined run`): Claude Code in a container that reaches the proxy only through the confined
|
|
32
|
+
* listener, a Unix socket alone in its directory, which the run mounts read-only at `aglProxyConfinedMountPoint`. Their
|
|
33
|
+
* sessions are those of the client `aglProxyConfinedClient`, and Claude Code names `aglProxyConfinedOrigin` as its
|
|
34
|
+
* endpoint's origin, whose host the socket makes irrelevant.
|
|
35
|
+
*/
|
|
36
|
+
export declare const aglProxyConfinedClient = "confined";
|
|
37
|
+
export declare const aglProxyConfinedOrigin = "http://localhost";
|
|
38
|
+
export declare const aglProxyConfinedMountPoint = "/run/agl-proxy";
|
|
39
|
+
/** A confined run's id: the first 12 hex characters of its credential's SHA-256 digest. */
|
|
40
|
+
export declare const aglProxyConfinedIdPattern: RegExp;
|
|
@@ -14,4 +14,15 @@ export const defaultProxyClientProvider = (nameArg) => nameArg === 'claude' ? 'a
|
|
|
14
14
|
export const proxyCredentialDeliveries = ['none', 'file'];
|
|
15
15
|
export const aglProxyUnitName = 'agl-proxy.service';
|
|
16
16
|
export const aglProxyDefaultPort = 4100;
|
|
17
|
-
|
|
17
|
+
/**
|
|
18
|
+
* Confined runs (`agl proxy confined run`): Claude Code in a container that reaches the proxy only through the confined
|
|
19
|
+
* listener, a Unix socket alone in its directory, which the run mounts read-only at `aglProxyConfinedMountPoint`. Their
|
|
20
|
+
* sessions are those of the client `aglProxyConfinedClient`, and Claude Code names `aglProxyConfinedOrigin` as its
|
|
21
|
+
* endpoint's origin, whose host the socket makes irrelevant.
|
|
22
|
+
*/
|
|
23
|
+
export const aglProxyConfinedClient = 'confined';
|
|
24
|
+
export const aglProxyConfinedOrigin = 'http://localhost';
|
|
25
|
+
export const aglProxyConfinedMountPoint = '/run/agl-proxy';
|
|
26
|
+
/** A confined run's id: the first 12 hex characters of its credential's SHA-256 digest. */
|
|
27
|
+
export const aglProxyConfinedIdPattern = /^[a-f0-9]{12}$/;
|
|
28
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnVuY3Rpb25zLnByb3h5Y29udHJhY3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9mdW5jdGlvbnMucHJveHljb250cmFjdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7O0dBR0c7QUFJSCxNQUFNLENBQUMsTUFBTSxrQkFBa0IsR0FBa0MsQ0FBQyxRQUFRLEVBQUUsV0FBVyxDQUFDLENBQUM7QUFPekYsTUFBTSxDQUFDLE1BQU0sb0JBQW9CLEdBQW9DLENBQUMsY0FBYyxFQUFFLFNBQVMsQ0FBQyxDQUFDO0FBRWpHLDhHQUE4RztBQUM5RyxNQUFNLENBQUMsTUFBTSxvQkFBb0IsR0FBRywwQkFBMEIsQ0FBQztBQUUvRCw4RkFBOEY7QUFDOUYsTUFBTSxDQUFDLE1BQU0sc0JBQXNCLEdBQUcsd0JBQXdCLENBQUM7QUFDL0QsTUFBTSxDQUFDLE1BQU0sbUJBQW1CLEdBQUcsQ0FBQyxPQUFPLEVBQUUsUUFBUSxFQUFFLFVBQVUsQ0FBVSxDQUFDO0FBQzVFLHVJQUF1STtBQUN2SSxNQUFNLENBQUMsTUFBTSwwQkFBMEIsR0FBRyxDQUFDLE9BQWUsRUFBc0IsRUFBRSxDQUFDLE9BQU8sS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDO0FBUWpJLE1BQU0sQ0FBQyxNQUFNLHlCQUF5QixHQUF3QyxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUMsQ0FBQztBQUUvRixNQUFNLENBQUMsTUFBTSxnQkFBZ0IsR0FBRyxtQkFBbUIsQ0FBQztBQUNwRCxNQUFNLENBQUMsTUFBTSxtQkFBbUIsR0FBRyxJQUFJLENBQUM7QUFFeEM7Ozs7O0dBS0c7QUFDSCxNQUFNLENBQUMsTUFBTSxzQkFBc0IsR0FBRyxVQUFVLENBQUM7QUFDakQsTUFBTSxDQUFDLE1BQU0sc0JBQXNCLEdBQUcsa0JBQWtCLENBQUM7QUFDekQsTUFBTSxDQUFDLE1BQU0sMEJBQTBCLEdBQUcsZ0JBQWdCLENBQUM7QUFDM0QsMkZBQTJGO0FBQzNGLE1BQU0sQ0FBQyxNQUFNLHlCQUF5QixHQUFHLGdCQUFnQixDQUFDIn0=
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Claims the pathname of one of the proxy's Unix sockets: its directory is made private (0700, this user's, not a link),
|
|
3
|
+
* and a socket a killed proxy left there is removed, but only while it is an unchanged, owned socket nobody answers on.
|
|
4
|
+
* `nameArg` names the socket in the refusals; `busyArg` is the refusal for a socket another process answers on.
|
|
5
|
+
*/
|
|
6
|
+
export declare const claimProxySocketPath: (socketPathArg: string, nameArg: string, busyArg: string) => Promise<void>;
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import * as plugins from './plugins.js';
|
|
2
|
+
/**
|
|
3
|
+
* Claims the pathname of one of the proxy's Unix sockets: its directory is made private (0700, this user's, not a link),
|
|
4
|
+
* and a socket a killed proxy left there is removed, but only while it is an unchanged, owned socket nobody answers on.
|
|
5
|
+
* `nameArg` names the socket in the refusals; `busyArg` is the refusal for a socket another process answers on.
|
|
6
|
+
*/
|
|
7
|
+
export const claimProxySocketPath = async (socketPathArg, nameArg, busyArg) => {
|
|
8
|
+
const directory = plugins.path.dirname(socketPathArg);
|
|
9
|
+
await plugins.fs.promises.mkdir(directory, { recursive: true, mode: 0o700 });
|
|
10
|
+
const stat = await plugins.fs.promises.lstat(directory);
|
|
11
|
+
if (!stat.isDirectory() || stat.isSymbolicLink() || stat.uid !== process.getuid?.()) {
|
|
12
|
+
throw new Error(`The ${nameArg} directory is not private.`);
|
|
13
|
+
}
|
|
14
|
+
await plugins.fs.promises.chmod(directory, 0o700);
|
|
15
|
+
let before;
|
|
16
|
+
try {
|
|
17
|
+
before = await plugins.fs.promises.lstat(socketPathArg);
|
|
18
|
+
}
|
|
19
|
+
catch (errorArg) {
|
|
20
|
+
if (errorArg.code === 'ENOENT')
|
|
21
|
+
return;
|
|
22
|
+
throw errorArg;
|
|
23
|
+
}
|
|
24
|
+
if (!before.isSocket() || before.uid !== process.getuid?.())
|
|
25
|
+
throw new Error(`The ${nameArg} path is unsafe.`);
|
|
26
|
+
const refused = await new Promise((resolve, reject) => {
|
|
27
|
+
const probe = plugins.net.createConnection(socketPathArg);
|
|
28
|
+
probe.setTimeout(1_000, () => { probe.destroy(); reject(new Error(`The ${nameArg} probe timed out.`)); });
|
|
29
|
+
probe.once('connect', () => { probe.destroy(); resolve(false); });
|
|
30
|
+
probe.once('error', (errorArg) => {
|
|
31
|
+
probe.destroy();
|
|
32
|
+
if (errorArg.code === 'ECONNREFUSED')
|
|
33
|
+
resolve(true);
|
|
34
|
+
else
|
|
35
|
+
reject(errorArg);
|
|
36
|
+
});
|
|
37
|
+
});
|
|
38
|
+
if (!refused)
|
|
39
|
+
throw new Error(busyArg);
|
|
40
|
+
const after = await plugins.fs.promises.lstat(socketPathArg);
|
|
41
|
+
if (!after.isSocket() || after.dev !== before.dev || after.ino !== before.ino) {
|
|
42
|
+
throw new Error(`The ${nameArg} path changed during startup.`);
|
|
43
|
+
}
|
|
44
|
+
await plugins.fs.promises.unlink(socketPathArg);
|
|
45
|
+
};
|
|
46
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnVuY3Rpb25zLnByb3h5c29ja2V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHMvZnVuY3Rpb25zLnByb3h5c29ja2V0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sY0FBYyxDQUFDO0FBRXhDOzs7O0dBSUc7QUFDSCxNQUFNLENBQUMsTUFBTSxvQkFBb0IsR0FBRyxLQUFLLEVBQUUsYUFBcUIsRUFBRSxPQUFlLEVBQUUsT0FBZSxFQUFpQixFQUFFO0lBQ25ILE1BQU0sU0FBUyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBQ3RELE1BQU0sT0FBTyxDQUFDLEVBQUUsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLFNBQVMsRUFBRSxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUM7SUFDN0UsTUFBTSxJQUFJLEdBQUcsTUFBTSxPQUFPLENBQUMsRUFBRSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDeEQsSUFBSSxDQUFDLElBQUksQ0FBQyxXQUFXLEVBQUUsSUFBSSxJQUFJLENBQUMsY0FBYyxFQUFFLElBQUksSUFBSSxDQUFDLEdBQUcsS0FBSyxPQUFPLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxDQUFDO1FBQ3BGLE1BQU0sSUFBSSxLQUFLLENBQUMsT0FBTyxPQUFPLDRCQUE0QixDQUFDLENBQUM7SUFDOUQsQ0FBQztJQUNELE1BQU0sT0FBTyxDQUFDLEVBQUUsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLFNBQVMsRUFBRSxLQUFLLENBQUMsQ0FBQztJQUNsRCxJQUFJLE1BQXdCLENBQUM7SUFDN0IsSUFBSSxDQUFDO1FBQUMsTUFBTSxHQUFHLE1BQU0sT0FBTyxDQUFDLEVBQUUsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBQUMsQ0FBQztJQUNoRSxPQUFPLFFBQVEsRUFBRSxDQUFDO1FBQ2hCLElBQUssUUFBa0MsQ0FBQyxJQUFJLEtBQUssUUFBUTtZQUFFLE9BQU87UUFDbEUsTUFBTSxRQUFRLENBQUM7SUFDakIsQ0FBQztJQUNELElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxFQUFFLElBQUksTUFBTSxDQUFDLEdBQUcsS0FBSyxPQUFPLENBQUMsTUFBTSxFQUFFLEVBQUU7UUFBRSxNQUFNLElBQUksS0FBSyxDQUFDLE9BQU8sT0FBTyxrQkFBa0IsQ0FBQyxDQUFDO0lBQy9HLE1BQU0sT0FBTyxHQUFHLE1BQU0sSUFBSSxPQUFPLENBQVUsQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUU7UUFDN0QsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUMxRCxLQUFLLENBQUMsVUFBVSxDQUFDLEtBQUssRUFBRSxHQUFHLEVBQUUsR0FBRyxLQUFLLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQyxNQUFNLENBQUMsSUFBSSxLQUFLLENBQUMsT0FBTyxPQUFPLG1CQUFtQixDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzFHLEtBQUssQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLEdBQUcsRUFBRSxHQUFHLEtBQUssQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ2xFLEtBQUssQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUMsUUFBUSxFQUFFLEVBQUU7WUFDL0IsS0FBSyxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ2hCLElBQUssUUFBa0MsQ0FBQyxJQUFJLEtBQUssY0FBYztnQkFBRSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7O2dCQUMxRSxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDeEIsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDLENBQUMsQ0FBQztJQUNILElBQUksQ0FBQyxPQUFPO1FBQUUsTUFBTSxJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUN2QyxNQUFNLEtBQUssR0FBRyxNQUFNLE9BQU8sQ0FBQyxFQUFFLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxhQUFhLENBQUMsQ0FBQztJQUM3RCxJQUFJLENBQUMsS0FBSyxDQUFDLFFBQVEsRUFBRSxJQUFJLEtBQUssQ0FBQyxHQUFHLEtBQUssTUFBTSxDQUFDLEdBQUcsSUFBSSxLQUFLLENBQUMsR0FBRyxLQUFLLE1BQU0sQ0FBQyxHQUFHLEVBQUUsQ0FBQztRQUM5RSxNQUFNLElBQUksS0FBSyxDQUFDLE9BQU8sT0FBTywrQkFBK0IsQ0FBQyxDQUFDO0lBQ2pFLENBQUM7SUFDRCxNQUFNLE9BQU8sQ0FBQyxFQUFFLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsQ0FBQztBQUNsRCxDQUFDLENBQUMifQ==
|
|
@@ -29,6 +29,12 @@ export declare const fleetWorkerPath: (pathArg?: string) => string;
|
|
|
29
29
|
/** The Claude Code executable a fleet worker runs, resolved as the fleet resolves it: a native process's exe is the realpath. */
|
|
30
30
|
export declare const resolveClaudeWorkerExecutable: () => Promise<string>;
|
|
31
31
|
export declare const resolveWorkerBridgeCommand: (serverArg: IConfigurationMcpStdioServer) => Promise<IWorkerBridgeCommand>;
|
|
32
|
+
/**
|
|
33
|
+
* The bridge process `bridgePidArg`, proved to hold the caller's end of the direct loopback connection and to run the
|
|
34
|
+
* approved command, whatever its parent. The command is the one recorded when the launch was prepared: an upgrade
|
|
35
|
+
* installs AGL under another path, and a command whose files are gone is refused as such.
|
|
36
|
+
*/
|
|
37
|
+
export declare const readWorkerBridge: (connectionArg: IWorkerCallerConnection | undefined, bridgePidArg: number, commandArg: IWorkerBridgeCommand) => Promise<IWorkerProcessSnapshot>;
|
|
32
38
|
export declare const verifyWorkerBridge: (connectionArg: IWorkerCallerConnection | undefined, bridgePidArg: number, commandArg: IWorkerBridgeCommand, parentArg: IWorkerProcessSnapshot) => Promise<IWorkerProcessSnapshot>;
|
|
33
39
|
export declare const verifyClaudeWorkerProcess: (processArg: IFleetClaudeProcess, executableArg: string) => Promise<IWorkerProcessSnapshot>;
|
|
34
40
|
export declare const readWorkerUnixSocketOwner: (socketPathArg: string) => Promise<IWorkerProcessSnapshot>;
|