dsh-cliworker-now 0.7.6 → 0.7.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.en.md +29 -9
- package/README.md +31 -9
- package/lib/account-models.mjs +16 -13
- package/lib/client.js +658 -61
- package/lib/client.js.map +1 -1
- package/lib/grok-catalog.mjs +2 -2
- package/lib/hermes-native-entry.py +48 -13
- package/lib/hermes-nous-refresh.py +331 -0
- package/lib/index.js +3724 -1589
- package/lib/index.js.map +1 -1
- package/lib/native-launch.mjs +62 -7
- package/lib/native-spawn.mjs +32 -0
- package/lib/pi-installation.mjs +27 -3
- package/lib/pi-native-catalog.mjs +2 -2
- package/lib/pi-omp-bridge.mjs +2 -2
- package/lib/private-launch.mjs +6 -2
- package/lib/terminal-bridge.mjs +2 -2
- package/lib/typert.host.js +83 -11
- package/lib/typert.remote-client.d.ts +2 -0
- package/lib/typert.remote-client.d.ts.map +1 -1
- package/lib/typert.remote-client.js +77 -11
- package/lib/types/client/account-query-queue.d.ts +16 -0
- package/lib/types/client/account-query-queue.js +61 -0
- package/lib/types/client/account-query-queue.js.map +1 -0
- package/lib/types/client/account-terminal.d.ts +6 -2
- package/lib/types/client/account-terminal.js +260 -31
- package/lib/types/client/account-terminal.js.map +1 -1
- package/lib/types/client/settings-dialog.js +65 -38
- package/lib/types/client/settings-dialog.js.map +1 -1
- package/lib/types/client/zcode-login-link-provider.d.ts +9 -0
- package/lib/types/client/zcode-login-link-provider.js +105 -0
- package/lib/types/client/zcode-login-link-provider.js.map +1 -0
- package/lib/types/client/zcode-login-link.d.ts +16 -0
- package/lib/types/client/zcode-login-link.js +194 -0
- package/lib/types/client/zcode-login-link.js.map +1 -0
- package/lib/types/host/account-models.d.mts +3 -1
- package/lib/types/host/account-models.mjs +16 -13
- package/lib/types/host/accounts.d.ts +3 -2
- package/lib/types/host/accounts.js +129 -22
- package/lib/types/host/accounts.js.map +1 -1
- package/lib/types/host/adapters.d.ts +1 -1
- package/lib/types/host/adapters.js +60 -11
- package/lib/types/host/adapters.js.map +1 -1
- package/lib/types/host/agy-models.d.ts +2 -1
- package/lib/types/host/agy-models.js +6 -6
- package/lib/types/host/agy-models.js.map +1 -1
- package/lib/types/host/agy-windows-account.d.ts +14 -0
- package/lib/types/host/agy-windows-account.js +104 -0
- package/lib/types/host/agy-windows-account.js.map +1 -0
- package/lib/types/host/authorized-catalog.js +13 -4
- package/lib/types/host/authorized-catalog.js.map +1 -1
- package/lib/types/host/claude-native-oauth.d.ts +17 -0
- package/lib/types/host/claude-native-oauth.js +272 -0
- package/lib/types/host/claude-native-oauth.js.map +1 -0
- package/lib/types/host/claude-own-route.d.ts +33 -0
- package/lib/types/host/claude-own-route.js +250 -0
- package/lib/types/host/claude-own-route.js.map +1 -0
- package/lib/types/host/cli-account-binding.d.ts +2 -1
- package/lib/types/host/cli-account-binding.js +59 -21
- package/lib/types/host/cli-account-binding.js.map +1 -1
- package/lib/types/host/codex-models.js +4 -0
- package/lib/types/host/codex-models.js.map +1 -1
- package/lib/types/host/extended-adapters.d.ts +3 -2
- package/lib/types/host/extended-adapters.js +9 -7
- package/lib/types/host/extended-adapters.js.map +1 -1
- package/lib/types/host/first-party-models.d.ts +1 -0
- package/lib/types/host/first-party-models.js +136 -47
- package/lib/types/host/first-party-models.js.map +1 -1
- package/lib/types/host/hermes-accounts.js +15 -1
- package/lib/types/host/hermes-accounts.js.map +1 -1
- package/lib/types/host/hermes-adapter.d.ts +3 -0
- package/lib/types/host/hermes-adapter.js +13 -4
- package/lib/types/host/hermes-adapter.js.map +1 -1
- package/lib/types/host/hermes-installation.js +54 -35
- package/lib/types/host/hermes-installation.js.map +1 -1
- package/lib/types/host/hermes-native-entry.py +48 -13
- package/lib/types/host/hermes-nous-refresh.py +331 -0
- package/lib/types/host/hermes-nous.d.ts +5 -1
- package/lib/types/host/hermes-nous.js +5 -5
- package/lib/types/host/hermes-nous.js.map +1 -1
- package/lib/types/host/hermes-renewal.d.ts +27 -0
- package/lib/types/host/hermes-renewal.js +292 -0
- package/lib/types/host/hermes-renewal.js.map +1 -0
- package/lib/types/host/hermes-windows-installation.d.ts +5 -0
- package/lib/types/host/hermes-windows-installation.js +91 -0
- package/lib/types/host/hermes-windows-installation.js.map +1 -0
- package/lib/types/host/index.d.ts +2 -0
- package/lib/types/host/index.js +17 -2
- package/lib/types/host/index.js.map +1 -1
- package/lib/types/host/kimi-accounts.d.ts +2 -0
- package/lib/types/host/kimi-accounts.js +4 -2
- package/lib/types/host/kimi-accounts.js.map +1 -1
- package/lib/types/host/kimi-oauth-models.d.ts +14 -0
- package/lib/types/host/kimi-oauth-models.js +246 -0
- package/lib/types/host/kimi-oauth-models.js.map +1 -0
- package/lib/types/host/mimo-metadata-cache.d.ts +22 -0
- package/lib/types/host/mimo-metadata-cache.js +121 -0
- package/lib/types/host/mimo-metadata-cache.js.map +1 -0
- package/lib/types/host/native-capability-cache.d.ts +11 -0
- package/lib/types/host/native-capability-cache.js +94 -0
- package/lib/types/host/native-capability-cache.js.map +1 -0
- package/lib/types/host/native-launch.mjs +62 -7
- package/lib/types/host/native-process.d.ts +3 -1
- package/lib/types/host/native-process.js +18 -3
- package/lib/types/host/native-process.js.map +1 -1
- package/lib/types/host/native-spawn.mjs +32 -0
- package/lib/types/host/pi-installation.d.mts +1 -1
- package/lib/types/host/pi-installation.mjs +27 -3
- package/lib/types/host/pi-omp-adapter.js +15 -1
- package/lib/types/host/pi-omp-adapter.js.map +1 -1
- package/lib/types/host/private-launch.mjs +23 -0
- package/lib/types/host/routing.js +25 -2
- package/lib/types/host/routing.js.map +1 -1
- package/lib/types/host/runtime.js +17 -5
- package/lib/types/host/runtime.js.map +1 -1
- package/lib/types/host/windows-account-bootstrap.ps1 +44 -0
- package/lib/types/host/windows-account-launch.mjs +47 -0
- package/lib/types/host/windows-account-owner.ps1 +137 -0
- package/lib/types/host/windows-account-stdio.mjs +19 -0
- package/lib/types/host/windows-account-terminal.d.ts +17 -0
- package/lib/types/host/windows-account-terminal.js +208 -0
- package/lib/types/host/windows-account-terminal.js.map +1 -0
- package/lib/types/host/windows-agy-account.ps1 +81 -0
- package/lib/types/host/windows-cli-installation.d.ts +31 -0
- package/lib/types/host/windows-cli-installation.js +157 -0
- package/lib/types/host/windows-cli-installation.js.map +1 -0
- package/lib/types/host/windows-hidden-launch.mjs +49 -0
- package/lib/types/host/windows-hidden-process.d.ts +12 -0
- package/lib/types/host/windows-hidden-process.js +116 -0
- package/lib/types/host/windows-hidden-process.js.map +1 -0
- package/lib/types/host/zcode-adapter.js +5 -1
- package/lib/types/host/zcode-adapter.js.map +1 -1
- package/lib/types/host/zcode-grok-accounts.d.ts +3 -1
- package/lib/types/host/zcode-grok-accounts.js +60 -11
- package/lib/types/host/zcode-grok-accounts.js.map +1 -1
- package/lib/types/shared/accounts.d.ts +4 -0
- package/lib/windows-account-bootstrap.ps1 +44 -0
- package/lib/windows-account-launch.mjs +47 -0
- package/lib/windows-account-owner.ps1 +137 -0
- package/lib/windows-account-stdio.mjs +19 -0
- package/lib/windows-agy-account.ps1 +81 -0
- package/lib/windows-hidden-launch.mjs +49 -0
- package/lib/zcode-resume.mjs +2 -2
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hermes-nous.js","sourceRoot":"","sources":["../../../src/host/hermes-nous.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"hermes-nous.js","sourceRoot":"","sources":["../../../src/host/hermes-nous.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { HermesNousError, type HermesNousSource } from './hermes-nous.ts';
|
|
2
|
+
import { type ProcessBackend } from './process.ts';
|
|
3
|
+
type Failure = 'relogin' | 'unavailable' | 'changed' | 'unsupported' | 'busy';
|
|
4
|
+
export declare class HermesRenewalError extends HermesNousError {
|
|
5
|
+
readonly state: Failure;
|
|
6
|
+
constructor(state: Failure);
|
|
7
|
+
}
|
|
8
|
+
export interface HermesRenewalContext {
|
|
9
|
+
backend: ProcessBackend;
|
|
10
|
+
signal: AbortSignal;
|
|
11
|
+
graceMs?: number;
|
|
12
|
+
}
|
|
13
|
+
export interface HermesRenewalInput {
|
|
14
|
+
home: string;
|
|
15
|
+
signal: AbortSignal;
|
|
16
|
+
backend?: ProcessBackend;
|
|
17
|
+
executable?: string;
|
|
18
|
+
resolveExecutable?: (signal: AbortSignal) => Promise<string>;
|
|
19
|
+
graceMs?: number;
|
|
20
|
+
}
|
|
21
|
+
/** No bearer, refresh token or email enters the command line or public result. */
|
|
22
|
+
export declare function hermesNousPrincipalDigest(source: HermesNousSource): string;
|
|
23
|
+
/** Share only an in-flight renewal, never a completed authorization decision. */
|
|
24
|
+
export declare function ensureHermesNousFresh(input: HermesRenewalInput): Promise<void>;
|
|
25
|
+
/** Hold until the account terminal's entire managed range has exited. */
|
|
26
|
+
export declare function reserveHermesAccount(home: string, signal: AbortSignal): Promise<() => void>;
|
|
27
|
+
export {};
|
|
@@ -0,0 +1,292 @@
|
|
|
1
|
+
import { createHash } from 'node:crypto';
|
|
2
|
+
import { lstat } from 'node:fs/promises';
|
|
3
|
+
import { join } from 'node:path';
|
|
4
|
+
import { fileURLToPath } from 'node:url';
|
|
5
|
+
import { validateHermesHomeDirectory } from "./hermes-adapter.js";
|
|
6
|
+
import { hermesAccountEnvironment } from "./hermes-account-context.js";
|
|
7
|
+
import { assertHermesOwnAccounts, hermesPoolEntryUnavailable, readHermesAccountMaterial, } from "./hermes-models.js";
|
|
8
|
+
import { hermesNativeCommand } from "./hermes-installation.js";
|
|
9
|
+
import { HermesNousError, hermesNousMinimumTtl, selectHermesNousSource, } from "./hermes-nous.js";
|
|
10
|
+
import { projectHermesUnsuppressedAuth, hermesUnsuppressedEnvironment } from "./hermes-suppression.js";
|
|
11
|
+
import { ProcessCleanupUnconfirmedError } from "./process.js";
|
|
12
|
+
const messages = {
|
|
13
|
+
relogin: 'Hermes 登录已失效,请重新登录',
|
|
14
|
+
unavailable: 'Hermes 登录暂时无法续期,请稍后刷新',
|
|
15
|
+
changed: 'Hermes 账号来源已变化,请刷新后重试',
|
|
16
|
+
unsupported: '当前 Hermes 安装不支持安全续期,请更新原生 CLI 后重试',
|
|
17
|
+
busy: 'Hermes 账号终端正在运行,请关闭后刷新',
|
|
18
|
+
};
|
|
19
|
+
export class HermesRenewalError extends HermesNousError {
|
|
20
|
+
state;
|
|
21
|
+
constructor(state) {
|
|
22
|
+
super(messages[state]);
|
|
23
|
+
this.state = state;
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
const homes = new Map();
|
|
27
|
+
function homeKey(home) {
|
|
28
|
+
const canonical = validateHermesHomeDirectory(home);
|
|
29
|
+
return { home: canonical, key: process.platform === 'win32' ? canonical.toLowerCase() : canonical };
|
|
30
|
+
}
|
|
31
|
+
function retire(key, state) {
|
|
32
|
+
if (!state.flight && !state.reserved && !state.poisoned && homes.get(key) === state)
|
|
33
|
+
homes.delete(key);
|
|
34
|
+
}
|
|
35
|
+
function available(state) {
|
|
36
|
+
if (state.poisoned)
|
|
37
|
+
throw new ProcessCleanupUnconfirmedError();
|
|
38
|
+
if (state.reserved)
|
|
39
|
+
throw new HermesRenewalError('busy');
|
|
40
|
+
}
|
|
41
|
+
/** No bearer, refresh token or email enters the command line or public result. */
|
|
42
|
+
export function hermesNousPrincipalDigest(source) {
|
|
43
|
+
const p = source.principal;
|
|
44
|
+
return createHash('sha256')
|
|
45
|
+
.update(JSON.stringify([
|
|
46
|
+
'hermes-nous-v1',
|
|
47
|
+
p.subject,
|
|
48
|
+
p.organization,
|
|
49
|
+
p.issuer,
|
|
50
|
+
p.clientId ?? '',
|
|
51
|
+
source.route.portal,
|
|
52
|
+
source.route.inference,
|
|
53
|
+
]))
|
|
54
|
+
.digest('hex');
|
|
55
|
+
}
|
|
56
|
+
async function snapshot(home, signal) {
|
|
57
|
+
try {
|
|
58
|
+
await lstat(join(home, 'config.yaml'));
|
|
59
|
+
}
|
|
60
|
+
catch (error) {
|
|
61
|
+
if (error.code === 'ENOENT')
|
|
62
|
+
return;
|
|
63
|
+
throw error;
|
|
64
|
+
}
|
|
65
|
+
const selected = await readHermesAccountMaterial(home, signal);
|
|
66
|
+
if (selected.config.model?.provider !== 'nous' || selected.auth.active_provider !== 'nous')
|
|
67
|
+
return;
|
|
68
|
+
const raw = await assertHermesOwnAccounts(home, signal);
|
|
69
|
+
if (raw.config.model?.provider !== 'nous' || raw.auth.active_provider !== 'nous')
|
|
70
|
+
return;
|
|
71
|
+
const material = {
|
|
72
|
+
...raw,
|
|
73
|
+
auth: projectHermesUnsuppressedAuth(raw.auth),
|
|
74
|
+
env: hermesUnsuppressedEnvironment(raw.auth, raw.env, 'nous'),
|
|
75
|
+
};
|
|
76
|
+
// Suppressed/deleted credentials never become a renewal source.
|
|
77
|
+
if (!material.auth.providers?.nous)
|
|
78
|
+
return;
|
|
79
|
+
const source = selectHermesNousSource(material, { allowExpired: true });
|
|
80
|
+
const ttl = hermesNousMinimumTtl(material.env);
|
|
81
|
+
const state = material.auth.providers.nous;
|
|
82
|
+
return {
|
|
83
|
+
material,
|
|
84
|
+
source,
|
|
85
|
+
ttl,
|
|
86
|
+
state,
|
|
87
|
+
digest: hermesNousPrincipalDigest(source),
|
|
88
|
+
identity: JSON.stringify([
|
|
89
|
+
hermesNousPrincipalDigest(source),
|
|
90
|
+
state.client_id || 'hermes-cli',
|
|
91
|
+
source.route,
|
|
92
|
+
]),
|
|
93
|
+
};
|
|
94
|
+
}
|
|
95
|
+
async function capture(input, home, digest, ttl, signal) {
|
|
96
|
+
if (!input.backend)
|
|
97
|
+
throw new HermesRenewalError('unsupported');
|
|
98
|
+
const executable = input.executable ?? (await input.resolveExecutable?.(signal));
|
|
99
|
+
if (!executable)
|
|
100
|
+
throw new HermesRenewalError('unsupported');
|
|
101
|
+
const argv = await hermesNativeCommand(executable, ['--cliworker-nous-refresh', digest], signal);
|
|
102
|
+
// Unknown standalone launchers must not receive our private protocol as a CLI command.
|
|
103
|
+
if (argv[2] !== fileURLToPath(new URL('./hermes-native-entry.py', import.meta.url)))
|
|
104
|
+
throw new HermesRenewalError('unsupported');
|
|
105
|
+
signal.throwIfAborted();
|
|
106
|
+
// Once rotation starts, cancellation waits for the bounded native transaction to
|
|
107
|
+
// persist its new refresh token. Killing it on UI cancellation could spend the
|
|
108
|
+
// old single-use grant without saving the replacement (especially Windows Job).
|
|
109
|
+
const deadline = AbortSignal.timeout(8000);
|
|
110
|
+
const child = input.backend.spawn({
|
|
111
|
+
argv: [process.execPath, fileURLToPath(new URL('./private-launch.mjs', import.meta.url)), ...argv],
|
|
112
|
+
cwd: home,
|
|
113
|
+
env: {
|
|
114
|
+
...hermesAccountEnvironment(home),
|
|
115
|
+
HERMES_SHARED_AUTH_DIR: join(home, 'shared'),
|
|
116
|
+
HERMES_NOUS_MIN_KEY_TTL_SECONDS: String(ttl),
|
|
117
|
+
PYTHONDONTWRITEBYTECODE: '1',
|
|
118
|
+
ELECTRON_RUN_AS_NODE: '1',
|
|
119
|
+
},
|
|
120
|
+
stdio: { stdin: 'ignore', stdout: 'pipe', stderr: 'pipe' },
|
|
121
|
+
graceMs: input.graceMs ?? 5000,
|
|
122
|
+
signal: deadline,
|
|
123
|
+
});
|
|
124
|
+
void child.done.catch(() => undefined);
|
|
125
|
+
let output = '', bytes = 0;
|
|
126
|
+
const read = async (stream, keep) => {
|
|
127
|
+
if (stream)
|
|
128
|
+
for await (const chunk of stream) {
|
|
129
|
+
bytes += Buffer.byteLength(chunk);
|
|
130
|
+
if (bytes > 8192)
|
|
131
|
+
throw new HermesRenewalError('unavailable');
|
|
132
|
+
if (keep)
|
|
133
|
+
output += String(chunk);
|
|
134
|
+
if (output.length > 512)
|
|
135
|
+
throw new HermesRenewalError('unavailable');
|
|
136
|
+
}
|
|
137
|
+
};
|
|
138
|
+
const readers = [read(child.stdout, true), read(child.stderr, false)];
|
|
139
|
+
try {
|
|
140
|
+
await Promise.all(readers);
|
|
141
|
+
const result = await child.done;
|
|
142
|
+
if (deadline.aborted || result.exitCode !== 0)
|
|
143
|
+
throw new HermesRenewalError('unavailable');
|
|
144
|
+
let receipt;
|
|
145
|
+
try {
|
|
146
|
+
receipt = JSON.parse(output);
|
|
147
|
+
}
|
|
148
|
+
catch {
|
|
149
|
+
throw new HermesRenewalError('unavailable');
|
|
150
|
+
}
|
|
151
|
+
if (!receipt ||
|
|
152
|
+
receipt.version !== 1 ||
|
|
153
|
+
Object.keys(receipt).sort().join(',') !== 'state,version' ||
|
|
154
|
+
!['ready', 'relogin', 'unavailable', 'changed', 'unsupported'].includes(receipt.state))
|
|
155
|
+
throw new HermesRenewalError('unavailable');
|
|
156
|
+
if (receipt.state !== 'ready')
|
|
157
|
+
throw new HermesRenewalError(receipt.state);
|
|
158
|
+
}
|
|
159
|
+
finally {
|
|
160
|
+
output = '';
|
|
161
|
+
let exited = false;
|
|
162
|
+
try {
|
|
163
|
+
child.terminate();
|
|
164
|
+
exited = await child.waitForExit();
|
|
165
|
+
}
|
|
166
|
+
catch {
|
|
167
|
+
/* fail closed below */
|
|
168
|
+
}
|
|
169
|
+
if (!exited)
|
|
170
|
+
throw new ProcessCleanupUnconfirmedError();
|
|
171
|
+
await Promise.allSettled([...readers, child.done]);
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
async function renew(input, home, signal) {
|
|
175
|
+
signal.throwIfAborted();
|
|
176
|
+
const before = await snapshot(home, signal);
|
|
177
|
+
if (!before || before.source.expires > Date.now() + before.ttl * 1000)
|
|
178
|
+
return;
|
|
179
|
+
if (typeof before.state.refresh_token !== 'string' ||
|
|
180
|
+
!before.state.refresh_token.trim() ||
|
|
181
|
+
before.state.refresh_token.length > 32768 ||
|
|
182
|
+
/[\x00-\x20\x7f]/.test(before.state.refresh_token))
|
|
183
|
+
throw new HermesRenewalError('relogin');
|
|
184
|
+
if (before.material.auth.credential_pool.nous.some((row) => hermesPoolEntryUnavailable(row, before.material.config.model?.default)))
|
|
185
|
+
throw new HermesRenewalError('unavailable');
|
|
186
|
+
await capture(input, home, before.digest, before.ttl, signal);
|
|
187
|
+
// Always reread even if all subscribers left while the native transaction ran.
|
|
188
|
+
const after = await snapshot(home, new AbortController().signal);
|
|
189
|
+
if (!after || after.identity !== before.identity)
|
|
190
|
+
throw new HermesRenewalError('changed');
|
|
191
|
+
if (after.source.expires <= Date.now() + after.ttl * 1000)
|
|
192
|
+
throw new HermesRenewalError('unavailable');
|
|
193
|
+
}
|
|
194
|
+
function abortable(operation, signal) {
|
|
195
|
+
signal.throwIfAborted();
|
|
196
|
+
return new Promise((resolve, reject) => {
|
|
197
|
+
const abort = () => reject(signal.reason);
|
|
198
|
+
signal.addEventListener('abort', abort, { once: true });
|
|
199
|
+
operation
|
|
200
|
+
.then(resolve, reject)
|
|
201
|
+
.finally(() => signal.removeEventListener('abort', abort))
|
|
202
|
+
.catch(() => { });
|
|
203
|
+
});
|
|
204
|
+
}
|
|
205
|
+
/** Share only an in-flight renewal, never a completed authorization decision. */
|
|
206
|
+
export async function ensureHermesNousFresh(input) {
|
|
207
|
+
input.signal.throwIfAborted();
|
|
208
|
+
const { home, key } = homeKey(input.home);
|
|
209
|
+
const state = homes.get(key) ?? {};
|
|
210
|
+
homes.set(key, state);
|
|
211
|
+
available(state);
|
|
212
|
+
let flight = state.flight;
|
|
213
|
+
if (flight?.readers.size && [...flight.readers].every((reader) => reader.signal.aborted))
|
|
214
|
+
flight.controller.abort();
|
|
215
|
+
if (flight?.controller.signal.aborted) {
|
|
216
|
+
await abortable(flight.operation.catch(() => { }), input.signal);
|
|
217
|
+
return ensureHermesNousFresh(input);
|
|
218
|
+
}
|
|
219
|
+
if (!flight) {
|
|
220
|
+
const controller = new AbortController();
|
|
221
|
+
flight = { controller, operation: Promise.resolve(), readers: new Set(), settled: false };
|
|
222
|
+
state.flight = flight;
|
|
223
|
+
const current = flight;
|
|
224
|
+
current.operation = Promise.resolve()
|
|
225
|
+
.then(() => renew(input, home, controller.signal))
|
|
226
|
+
.catch((error) => {
|
|
227
|
+
if (error instanceof ProcessCleanupUnconfirmedError)
|
|
228
|
+
state.poisoned = true;
|
|
229
|
+
if (error instanceof HermesNousError || error instanceof ProcessCleanupUnconfirmedError)
|
|
230
|
+
throw error;
|
|
231
|
+
controller.signal.throwIfAborted();
|
|
232
|
+
throw new HermesRenewalError('unavailable');
|
|
233
|
+
})
|
|
234
|
+
.finally(() => {
|
|
235
|
+
current.settled = true;
|
|
236
|
+
if (state.flight === current)
|
|
237
|
+
state.flight = undefined;
|
|
238
|
+
retire(key, state);
|
|
239
|
+
});
|
|
240
|
+
void current.operation.catch(() => { });
|
|
241
|
+
}
|
|
242
|
+
const reader = { signal: input.signal };
|
|
243
|
+
flight.readers.add(reader);
|
|
244
|
+
try {
|
|
245
|
+
await abortable(flight.operation, input.signal);
|
|
246
|
+
input.signal.throwIfAborted();
|
|
247
|
+
available(state);
|
|
248
|
+
}
|
|
249
|
+
finally {
|
|
250
|
+
flight.readers.delete(reader);
|
|
251
|
+
if (!flight.readers.size && !flight.settled) {
|
|
252
|
+
flight.controller.abort();
|
|
253
|
+
await flight.operation.catch((error) => {
|
|
254
|
+
if (error instanceof ProcessCleanupUnconfirmedError)
|
|
255
|
+
throw error;
|
|
256
|
+
});
|
|
257
|
+
}
|
|
258
|
+
}
|
|
259
|
+
}
|
|
260
|
+
/** Hold until the account terminal's entire managed range has exited. */
|
|
261
|
+
export async function reserveHermesAccount(home, signal) {
|
|
262
|
+
signal.throwIfAborted();
|
|
263
|
+
const { key } = homeKey(home);
|
|
264
|
+
const state = homes.get(key) ?? {};
|
|
265
|
+
homes.set(key, state);
|
|
266
|
+
available(state);
|
|
267
|
+
const owner = Symbol();
|
|
268
|
+
state.reserved = owner;
|
|
269
|
+
const release = () => {
|
|
270
|
+
if (state.reserved === owner)
|
|
271
|
+
state.reserved = undefined;
|
|
272
|
+
retire(key, state);
|
|
273
|
+
};
|
|
274
|
+
try {
|
|
275
|
+
if (state.flight) {
|
|
276
|
+
state.flight.controller.abort();
|
|
277
|
+
await state.flight.operation.catch((error) => {
|
|
278
|
+
if (error instanceof ProcessCleanupUnconfirmedError)
|
|
279
|
+
throw error;
|
|
280
|
+
});
|
|
281
|
+
}
|
|
282
|
+
signal.throwIfAborted();
|
|
283
|
+
if (state.poisoned)
|
|
284
|
+
throw new ProcessCleanupUnconfirmedError();
|
|
285
|
+
return release;
|
|
286
|
+
}
|
|
287
|
+
catch (error) {
|
|
288
|
+
release();
|
|
289
|
+
throw error;
|
|
290
|
+
}
|
|
291
|
+
}
|
|
292
|
+
//# sourceMappingURL=hermes-renewal.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hermes-renewal.js","sourceRoot":"","sources":["../../../src/host/hermes-renewal.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
/** Read only the single stored __main__.py member emitted by distlib. No ZIP
|
|
2
|
+
* extraction, Python evaluation, installer invocation, or account lookup. */
|
|
3
|
+
export declare function hermesDistlibSource(bytes: Buffer): string | undefined;
|
|
4
|
+
export declare function hermesLauncherCheckout(source: string): string | undefined;
|
|
5
|
+
export declare function windowsHermesCheckout(executable: string, command: string[], signal?: AbortSignal): Promise<string | undefined>;
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
import { constants } from 'node:fs';
|
|
2
|
+
import { open, realpath } from 'node:fs/promises';
|
|
3
|
+
import { basename, isAbsolute } from 'node:path';
|
|
4
|
+
/** Read only the single stored __main__.py member emitted by distlib. No ZIP
|
|
5
|
+
* extraction, Python evaluation, installer invocation, or account lookup. */
|
|
6
|
+
export function hermesDistlibSource(bytes) {
|
|
7
|
+
if (bytes.length < 128 || bytes.toString('ascii', 0, 2) !== 'MZ')
|
|
8
|
+
return;
|
|
9
|
+
const end = bytes.length - 22;
|
|
10
|
+
if (bytes.readUInt32LE(end) !== 0x06054b50)
|
|
11
|
+
return;
|
|
12
|
+
if (bytes.readUInt16LE(end + 4) !== 0 ||
|
|
13
|
+
bytes.readUInt16LE(end + 6) !== 0 ||
|
|
14
|
+
bytes.readUInt16LE(end + 8) !== 1 ||
|
|
15
|
+
bytes.readUInt16LE(end + 10) !== 1 ||
|
|
16
|
+
bytes.readUInt16LE(end + 20) !== 0)
|
|
17
|
+
throw new Error('Unsupported Hermes launcher archive');
|
|
18
|
+
const centralSize = bytes.readUInt32LE(end + 12);
|
|
19
|
+
const central = end - centralSize;
|
|
20
|
+
if (central < 64 || centralSize < 46 || bytes.readUInt32LE(central) !== 0x02014b50)
|
|
21
|
+
throw new Error('Invalid Hermes launcher directory');
|
|
22
|
+
const nameSize = bytes.readUInt16LE(central + 28);
|
|
23
|
+
const size = bytes.readUInt32LE(central + 24);
|
|
24
|
+
const local = central - bytes.readUInt32LE(end + 16) + bytes.readUInt32LE(central + 42);
|
|
25
|
+
if (centralSize !== 46 + nameSize ||
|
|
26
|
+
bytes.subarray(central + 46, end).toString('utf8') !== '__main__.py' ||
|
|
27
|
+
bytes.readUInt16LE(central + 8) !== 0 ||
|
|
28
|
+
bytes.readUInt16LE(central + 10) !== 0 ||
|
|
29
|
+
bytes.readUInt32LE(central + 20) !== size ||
|
|
30
|
+
size > 128 * 1024 ||
|
|
31
|
+
local < 64 ||
|
|
32
|
+
local + 30 > central ||
|
|
33
|
+
bytes.readUInt32LE(local) !== 0x04034b50 ||
|
|
34
|
+
bytes.readUInt16LE(local + 6) !== 0 ||
|
|
35
|
+
bytes.readUInt16LE(local + 8) !== 0 ||
|
|
36
|
+
bytes.readUInt32LE(local + 18) !== size ||
|
|
37
|
+
bytes.readUInt32LE(local + 22) !== size ||
|
|
38
|
+
bytes.readUInt16LE(local + 26) !== nameSize ||
|
|
39
|
+
bytes.readUInt16LE(local + 28) !== 0 ||
|
|
40
|
+
local + 30 + nameSize + size !== central ||
|
|
41
|
+
bytes.subarray(local + 30, local + 30 + nameSize).toString('utf8') !== '__main__.py')
|
|
42
|
+
throw new Error('Invalid Hermes launcher member');
|
|
43
|
+
return bytes.subarray(local + 30 + nameSize, central).toString('utf8');
|
|
44
|
+
}
|
|
45
|
+
export function hermesLauncherCheckout(source) {
|
|
46
|
+
if (!source.startsWith('import os, re, sys\n') ||
|
|
47
|
+
!source.includes('sys._hermes_pin_default_home = True\n') ||
|
|
48
|
+
!source.includes('import hermes_bootstrap') ||
|
|
49
|
+
!source.includes('from hermes_cli.main import main'))
|
|
50
|
+
return;
|
|
51
|
+
// Python's repr(path) uses only literal escaped backslashes/quotes here.
|
|
52
|
+
// Do not evaluate the launcher, interpolate its statements, or accept expressions.
|
|
53
|
+
const roots = [
|
|
54
|
+
...source.matchAll(/^sys\.path\.insert\(0, ('(?:[^'\\\r\n]|\\[\\'])+'|"(?:[^"\\\r\n]|\\[\\"])+")\)\r?$/gm),
|
|
55
|
+
];
|
|
56
|
+
if (roots.length !== 1)
|
|
57
|
+
throw new Error('Ambiguous Hermes checkout');
|
|
58
|
+
const path = roots[0][1].slice(1, -1).replace(/\\([\\'"])/g, '$1');
|
|
59
|
+
if (!isAbsolute(path) || path.includes('\0'))
|
|
60
|
+
throw new Error('Invalid Hermes checkout');
|
|
61
|
+
return path;
|
|
62
|
+
}
|
|
63
|
+
export async function windowsHermesCheckout(executable, command, signal) {
|
|
64
|
+
let source;
|
|
65
|
+
if (basename(executable).toLowerCase() === 'hermes.exe') {
|
|
66
|
+
const file = await open(executable, constants.O_RDONLY | constants.O_NOFOLLOW | constants.O_NONBLOCK);
|
|
67
|
+
try {
|
|
68
|
+
const info = await file.stat();
|
|
69
|
+
if (!info.isFile() || info.nlink !== 1 || info.size > 1024 * 1024)
|
|
70
|
+
throw new Error('Unsafe Hermes launcher');
|
|
71
|
+
source = hermesDistlibSource(await file.readFile());
|
|
72
|
+
}
|
|
73
|
+
finally {
|
|
74
|
+
await file.close();
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
else if (command[1] === '-I' && command[2] === '-c') {
|
|
78
|
+
const encoded = /^import base64; exec\(base64\.b64decode\('([A-Za-z0-9+/]+={0,2})'\)\)$/.exec(command[3] ?? '');
|
|
79
|
+
if (encoded)
|
|
80
|
+
source = Buffer.from(encoded[1], 'base64').toString('utf8');
|
|
81
|
+
}
|
|
82
|
+
signal?.throwIfAborted();
|
|
83
|
+
if (source === undefined)
|
|
84
|
+
return;
|
|
85
|
+
const checkout = hermesLauncherCheckout(source);
|
|
86
|
+
if (!checkout)
|
|
87
|
+
return;
|
|
88
|
+
// Canonical spelling is part of the native install_key hash.
|
|
89
|
+
return realpath(checkout);
|
|
90
|
+
}
|
|
91
|
+
//# sourceMappingURL=hermes-windows-installation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hermes-windows-installation.js","sourceRoot":"","sources":["../../../src/host/hermes-windows-installation.ts"],"names":[],"mappings":"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"}
|
|
@@ -111,6 +111,8 @@ export declare class CliWorkerService extends TypertRemoteService {
|
|
|
111
111
|
accountStart(parentSessionId: string, cli: string, action: string, signal: AbortSignal): Promise<string>;
|
|
112
112
|
/** @param source - One current CLI-native source, never a filesystem path. */
|
|
113
113
|
accountStartForSource(parentSessionId: string, cli: string, action: string, source: string, signal: AbortSignal): Promise<string>;
|
|
114
|
+
/** @param provider - Explicit ZCode native login provider, never a URL or logout source. */
|
|
115
|
+
accountStartForProvider(parentSessionId: string, cli: string, action: string, provider: string, signal: AbortSignal): Promise<string>;
|
|
114
116
|
private startAccount;
|
|
115
117
|
/** @param parentSessionId - Owning session. @param accountId - Account terminal identity. @param signal - Stream lifetime. @returns Ephemeral terminal frame JSON. */
|
|
116
118
|
accountWatch(parentSessionId: string, accountId: string, signal: AbortSignal): AsyncIterable<string>;
|
package/lib/types/host/index.js
CHANGED
|
@@ -86,6 +86,7 @@ let CliWorkerService = (() => {
|
|
|
86
86
|
let _accountStatus_decorators;
|
|
87
87
|
let _accountStart_decorators;
|
|
88
88
|
let _accountStartForSource_decorators;
|
|
89
|
+
let _accountStartForProvider_decorators;
|
|
89
90
|
let _accountWatch_decorators;
|
|
90
91
|
let _accountWrite_decorators;
|
|
91
92
|
let _accountResize_decorators;
|
|
@@ -114,6 +115,7 @@ let CliWorkerService = (() => {
|
|
|
114
115
|
_accountStatus_decorators = [Remote('accountStatus')];
|
|
115
116
|
_accountStart_decorators = [Remote('accountStart')];
|
|
116
117
|
_accountStartForSource_decorators = [Remote('accountStartForSource')];
|
|
118
|
+
_accountStartForProvider_decorators = [Remote('accountStartForProvider')];
|
|
117
119
|
_accountWatch_decorators = [Remote({ mode: 'stream' })];
|
|
118
120
|
_accountWrite_decorators = [Remote('accountWrite')];
|
|
119
121
|
_accountResize_decorators = [Remote('accountResize')];
|
|
@@ -139,6 +141,7 @@ let CliWorkerService = (() => {
|
|
|
139
141
|
__esDecorate(this, null, _accountStatus_decorators, { kind: "method", name: "accountStatus", static: false, private: false, access: { has: obj => "accountStatus" in obj, get: obj => obj.accountStatus }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
140
142
|
__esDecorate(this, null, _accountStart_decorators, { kind: "method", name: "accountStart", static: false, private: false, access: { has: obj => "accountStart" in obj, get: obj => obj.accountStart }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
141
143
|
__esDecorate(this, null, _accountStartForSource_decorators, { kind: "method", name: "accountStartForSource", static: false, private: false, access: { has: obj => "accountStartForSource" in obj, get: obj => obj.accountStartForSource }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
144
|
+
__esDecorate(this, null, _accountStartForProvider_decorators, { kind: "method", name: "accountStartForProvider", static: false, private: false, access: { has: obj => "accountStartForProvider" in obj, get: obj => obj.accountStartForProvider }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
142
145
|
__esDecorate(this, null, _accountWatch_decorators, { kind: "method", name: "accountWatch", static: false, private: false, access: { has: obj => "accountWatch" in obj, get: obj => obj.accountWatch }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
143
146
|
__esDecorate(this, null, _accountWrite_decorators, { kind: "method", name: "accountWrite", static: false, private: false, access: { has: obj => "accountWrite" in obj, get: obj => obj.accountWrite }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
144
147
|
__esDecorate(this, null, _accountResize_decorators, { kind: "method", name: "accountResize", static: false, private: false, access: { has: obj => "accountResize" in obj, get: obj => obj.accountResize }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
@@ -759,7 +762,19 @@ let CliWorkerService = (() => {
|
|
|
759
762
|
throw failure(error);
|
|
760
763
|
}
|
|
761
764
|
}
|
|
762
|
-
|
|
765
|
+
/** @param provider - Explicit ZCode native login provider, never a URL or logout source. */
|
|
766
|
+
async accountStartForProvider(parentSessionId, cli, action, provider, signal) {
|
|
767
|
+
try {
|
|
768
|
+
const selected = validate.enum(['bigmodel', 'zai']).parse(provider);
|
|
769
|
+
if (cli !== 'zcode' || action !== 'login')
|
|
770
|
+
throw new Error('不支持的 ZCode 授权来源');
|
|
771
|
+
return this.startAccount(parentSessionId, cli, action, signal, undefined, selected);
|
|
772
|
+
}
|
|
773
|
+
catch (error) {
|
|
774
|
+
throw failure(error);
|
|
775
|
+
}
|
|
776
|
+
}
|
|
777
|
+
async startAccount(parentSessionId, cli, action, signal, source, provider) {
|
|
763
778
|
try {
|
|
764
779
|
const id = validate.enum(CLI_IDS).parse(cli);
|
|
765
780
|
const operation = validate.enum(['login', 'logout', 'manage']).parse(action);
|
|
@@ -774,7 +789,7 @@ let CliWorkerService = (() => {
|
|
|
774
789
|
}, 'cliworker:account-parent');
|
|
775
790
|
this.accountParents.set(parent.id, dispose);
|
|
776
791
|
}
|
|
777
|
-
return JSON.stringify(await this.accounts.start(parent.id, id, operation, this.project(parent), signal, source));
|
|
792
|
+
return JSON.stringify(await this.accounts.start(parent.id, id, operation, this.project(parent), signal, source, provider));
|
|
778
793
|
}
|
|
779
794
|
catch (error) {
|
|
780
795
|
throw failure(error);
|