dsh-cliworker-now 0.7.6 → 0.7.8
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 +53 -11
- package/README.md +56 -11
- package/lib/account-models.mjs +49 -18
- package/lib/client.js +1221 -151
- 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 +9469 -6030
- 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 +17 -7
- package/lib/pi-omp-bridge.mjs +2 -2
- package/lib/pi-omp-refresh.mjs +3 -3
- package/lib/private-launch.mjs +6 -2
- package/lib/terminal-bridge.mjs +2 -2
- package/lib/typert.host.js +265 -25
- package/lib/typert.remote-client.d.ts +8 -0
- package/lib/typert.remote-client.d.ts.map +1 -1
- package/lib/typert.remote-client.js +241 -25
- 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/cli-executable-settings.d.ts +13 -0
- package/lib/types/client/cli-executable-settings.js +128 -0
- package/lib/types/client/cli-executable-settings.js.map +1 -0
- package/lib/types/client/management-styles.d.ts +1 -1
- package/lib/types/client/management-styles.js +4 -0
- package/lib/types/client/management-styles.js.map +1 -1
- package/lib/types/client/settings-dialog.js +196 -80
- package/lib/types/client/settings-dialog.js.map +1 -1
- package/lib/types/client/styles.d.ts +1 -1
- package/lib/types/client/styles.js +18 -16
- package/lib/types/client/styles.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 +10 -2
- package/lib/types/host/account-models.mjs +49 -18
- package/lib/types/host/accounts.d.ts +3 -2
- package/lib/types/host/accounts.js +168 -29
- package/lib/types/host/accounts.js.map +1 -1
- package/lib/types/host/adapters.d.ts +3 -1
- package/lib/types/host/adapters.js +138 -11
- package/lib/types/host/adapters.js.map +1 -1
- package/lib/types/host/agy-background-environment.d.ts +2 -0
- package/lib/types/host/agy-background-environment.js +7 -0
- package/lib/types/host/agy-background-environment.js.map +1 -0
- 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 +274 -0
- package/lib/types/host/claude-native-oauth.js.map +1 -0
- package/lib/types/host/claude-own-route.d.ts +45 -0
- package/lib/types/host/claude-own-route.js +375 -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 +64 -21
- package/lib/types/host/cli-account-binding.js.map +1 -1
- package/lib/types/host/cli-executable-paths.d.ts +30 -0
- package/lib/types/host/cli-executable-paths.js +272 -0
- package/lib/types/host/cli-executable-paths.js.map +1 -0
- package/lib/types/host/codex-models.d.ts +3 -1
- package/lib/types/host/codex-models.js +41 -4
- 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 +5 -0
- package/lib/types/host/first-party-models.js +173 -50
- package/lib/types/host/first-party-models.js.map +1 -1
- package/lib/types/host/hermes-accounts.js +68 -9
- 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-models.js +21 -2
- package/lib/types/host/hermes-models.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 +12 -0
- package/lib/types/host/index.js +138 -8
- 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 +30 -5
- package/lib/types/host/native-process.js.map +1 -1
- package/lib/types/host/native-spawn.mjs +32 -0
- package/lib/types/host/opencode-native.js +13 -0
- package/lib/types/host/opencode-native.js.map +1 -1
- 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 +17 -3
- package/lib/types/host/pi-omp-adapter.js.map +1 -1
- package/lib/types/host/pi-omp-native.js +5 -3
- package/lib/types/host/pi-omp-native.js.map +1 -1
- package/lib/types/host/pi-omp-refresh.mjs +3 -3
- package/lib/types/host/private-launch.mjs +23 -0
- package/lib/types/host/process.d.ts +3 -0
- package/lib/types/host/process.js +3 -1
- package/lib/types/host/process.js.map +1 -1
- package/lib/types/host/routing.js +25 -2
- package/lib/types/host/routing.js.map +1 -1
- package/lib/types/host/runtime.js +21 -5
- package/lib/types/host/runtime.js.map +1 -1
- package/lib/types/host/settings-catalog-cache.d.ts +28 -0
- package/lib/types/host/settings-catalog-cache.js +189 -0
- package/lib/types/host/settings-catalog-cache.js.map +1 -0
- 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 +35 -0
- package/lib/types/host/windows-cli-installation.js +164 -0
- package/lib/types/host/windows-cli-installation.js.map +1 -0
- package/lib/types/host/windows-codex-launch.d.ts +9 -0
- package/lib/types/host/windows-codex-launch.js +216 -0
- package/lib/types/host/windows-codex-launch.js.map +1 -0
- package/lib/types/host/windows-desktop-cli-installation.d.ts +20 -0
- package/lib/types/host/windows-desktop-cli-installation.js +420 -0
- package/lib/types/host/windows-desktop-cli-installation.js.map +1 -0
- package/lib/types/host/windows-hidden-launch.mjs +51 -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/types/shared/cli-settings.d.ts +8 -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 +51 -0
- package/lib/zcode-resume.mjs +2 -2
- package/package.json +2 -2
|
@@ -3,7 +3,7 @@ import { mkdirSync, lstatSync, chmodSync, realpathSync, mkdtempSync, rmSync, rea
|
|
|
3
3
|
import { join } from 'node:path';
|
|
4
4
|
import { homedir, tmpdir } from 'node:os';
|
|
5
5
|
import { prepareZCode, discoverZCode, zcodeAuthDirectory } from "./zcode-adapter.js";
|
|
6
|
-
import { preparePiOmp, discoverPiOmp
|
|
6
|
+
import { preparePiOmp, discoverPiOmp } from "./pi-omp-adapter.js";
|
|
7
7
|
import { prepareOpenCode, discoverOpenCode, openCodeAuthDirectory } from "./opencode-adapter.js";
|
|
8
8
|
import { prepareHermes, discoverHermes } from "./hermes-adapter.js";
|
|
9
9
|
import { effectiveHermesHome } from "./hermes-account-context.js";
|
|
@@ -95,7 +95,7 @@ export function sealPrivateTree(root) {
|
|
|
95
95
|
export async function credentialEnvironment(_cli, _config, _selectedModel) {
|
|
96
96
|
return {};
|
|
97
97
|
}
|
|
98
|
-
export async function extendedLaunch(cli, executable, project, preference, mode, prompt, stateDirectory, config, conversationId, metadataCapture) {
|
|
98
|
+
export async function extendedLaunch(cli, executable, project, preference, mode, prompt, stateDirectory, config, conversationId, metadataCapture, renewal) {
|
|
99
99
|
const state = privateDirectory(stateDirectory);
|
|
100
100
|
const input = { executable, project, preference, mode, prompt, conversationId, stateDirectory: state };
|
|
101
101
|
const metadata = metadataCapture &&
|
|
@@ -119,7 +119,7 @@ export async function extendedLaunch(cli, executable, project, preference, mode,
|
|
|
119
119
|
authDirectory: openCodeAuthDirectory(config.stateDirectory),
|
|
120
120
|
})
|
|
121
121
|
: cli === 'hermes'
|
|
122
|
-
? await prepareHermes({ ...input, hermesHome: effectiveHermesHome(config) })
|
|
122
|
+
? await prepareHermes({ ...input, hermesHome: effectiveHermesHome(config), renewal })
|
|
123
123
|
: cli === 'grok'
|
|
124
124
|
? await prepareGrok(input)
|
|
125
125
|
: undefined;
|
|
@@ -160,7 +160,7 @@ export async function extendedLaunch(cli, executable, project, preference, mode,
|
|
|
160
160
|
throw error;
|
|
161
161
|
}
|
|
162
162
|
}
|
|
163
|
-
export async function extendedCatalog(cli, executable, capture, stateDirectory, config, signal) {
|
|
163
|
+
export async function extendedCatalog(cli, executable, capture, stateDirectory, config, signal, renewal) {
|
|
164
164
|
signal?.throwIfAborted();
|
|
165
165
|
const catalogRoot = privateDirectory(join(stateDirectory, 'catalog', cli));
|
|
166
166
|
const state = privateDirectory(mkdtempSync(join(catalogRoot, 'query-')));
|
|
@@ -190,16 +190,18 @@ export async function extendedCatalog(cli, executable, capture, stateDirectory,
|
|
|
190
190
|
: cli === 'opencode'
|
|
191
191
|
? await discoverOpenCode(executable, run, state, openCodeAuthDirectory(config.stateDirectory ?? stateDirectory), false, { signal })
|
|
192
192
|
: cli === 'hermes'
|
|
193
|
-
? await discoverHermes(executable, run, state, effectiveHermesHome({ ...config, stateDirectory: config.stateDirectory ?? stateDirectory }), { signal })
|
|
193
|
+
? await discoverHermes(executable, run, state, effectiveHermesHome({ ...config, stateDirectory: config.stateDirectory ?? stateDirectory }), { signal, renewal })
|
|
194
194
|
: cli === 'grok'
|
|
195
195
|
? await discoverGrok(executable, run, state, { signal })
|
|
196
196
|
: undefined;
|
|
197
197
|
if (!models)
|
|
198
198
|
throw new Error('未知 CLI');
|
|
199
199
|
signal?.throwIfAborted();
|
|
200
|
-
// A successful capture has confirmed that its process range exited.
|
|
201
|
-
//
|
|
200
|
+
// A successful capture has confirmed that its process range exited. Only
|
|
201
|
+
// model values leave this operation; its private snapshots and native caches
|
|
202
|
+
// are no longer needed. Rejected captures keep their potentially live files.
|
|
202
203
|
sealPrivateTree(state);
|
|
204
|
+
rmSync(state, { recursive: true, force: true });
|
|
203
205
|
return models;
|
|
204
206
|
}
|
|
205
207
|
//# sourceMappingURL=extended-adapters.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extended-adapters.js","sourceRoot":"","sources":["../../../src/host/extended-adapters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AACxC,OAAO,EACL,SAAS,EACT,SAAS,EACT,SAAS,EACT,YAAY,EACZ,WAAW,EACX,MAAM,EACN,WAAW,EACX,QAAQ,EACR,SAAS,EACT,SAAS,EACT,UAAU,EACV,SAAS,GAEV,MAAM,SAAS,CAAA;AAChB,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAGzC,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AACpF,OAAO,
|
|
1
|
+
{"version":3,"file":"extended-adapters.js","sourceRoot":"","sources":["../../../src/host/extended-adapters.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,12 @@ type Capture = (argv: string[], env?: Record<string, string>) => Promise<string>
|
|
|
5
5
|
/** Private material only. Never return this structure through Gateway or persist it. */
|
|
6
6
|
export interface FirstPartyModelSource extends AccountModelInput {
|
|
7
7
|
sourceIds: string[];
|
|
8
|
+
claudeRoute?: 'proxy' | 'api';
|
|
8
9
|
nativeFullModelIds?: boolean;
|
|
10
|
+
/** Claude-only explicit native route declarations, never account entitlement evidence. */
|
|
11
|
+
claudeConfiguredModels?: boolean;
|
|
12
|
+
modelEnvironment?: Record<string, string>;
|
|
13
|
+
model?: string;
|
|
9
14
|
nativeModels: {
|
|
10
15
|
remoteId: string;
|
|
11
16
|
choice: ModelChoice;
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { readClaudeOwnRoute, claudeRouteIdentity, ClaudeOwnRouteError, prepareClaudeWorkerLaunch, claudeRemoteModelId, claudeLaunchEnvironment, } from "./claude-own-route.js";
|
|
1
2
|
import { constants } from 'node:fs';
|
|
2
3
|
import { lstat, open } from 'node:fs/promises';
|
|
3
4
|
import { homedir } from 'node:os';
|
|
@@ -6,8 +7,15 @@ import { safePiOmpAncestors } from "./pi-omp-native.js";
|
|
|
6
7
|
import { EFFORTS } from "../shared/types.js";
|
|
7
8
|
import { probeAccountModels } from './account-models.mjs';
|
|
8
9
|
import { parseNativeJsonc } from "./opencode-native.js";
|
|
10
|
+
import { mimoMetadataCache, mimoMetadataKey, nativeMetadataKey, } from "./mimo-metadata-cache.js";
|
|
11
|
+
import { metadataFileFingerprint, NativeCapabilityCache } from "./native-capability-cache.js";
|
|
12
|
+
import { readKimiOAuthModelSources, probeKimiOAuthModels } from "./kimi-oauth-models.js";
|
|
13
|
+
import { readKimiOwnToken } from "./kimi-accounts.js";
|
|
14
|
+
import { ProcessCleanupUnconfirmedError } from "./process.js";
|
|
9
15
|
import { assertMimoConfiguration, mimoConfigurationFiles, mimoConfigurationPaths, MimoConfigurationError, } from "./mimo-configuration.js";
|
|
10
16
|
export { MimoConfigurationError } from "./mimo-configuration.js";
|
|
17
|
+
const claudeHelpCapabilities = new NativeCapabilityCache();
|
|
18
|
+
const kimiOAuthCapabilities = new NativeCapabilityCache();
|
|
11
19
|
const record = (v) => !!v && typeof v === 'object' && !Array.isArray(v);
|
|
12
20
|
const literal = (v) => typeof v === 'string' && !!v.trim() && !/[\s\x00-\x1f{}$]/.test(v) && !v.startsWith('!');
|
|
13
21
|
const id = (v) => typeof v === 'string' && /^[A-Za-z0-9][A-Za-z0-9._:/-]*$/.test(v);
|
|
@@ -249,18 +257,78 @@ export async function readFirstPartyModelSources(cli, executable, project, captu
|
|
|
249
257
|
if (cli === 'kimi') {
|
|
250
258
|
if (['KIMI_CODE_BASE_URL', 'KIMI_CODE_OAUTH_HOST', 'KIMI_OAUTH_HOST', 'KIMI_CODE_CUSTOM_HEADERS'].some((key) => process.env[key]))
|
|
251
259
|
return [];
|
|
260
|
+
const sourceId = join(process.env.KIMI_CODE_HOME ?? join(homedir(), '.kimi-code'), 'config.toml');
|
|
261
|
+
const keyFor = async () => {
|
|
262
|
+
const fingerprints = await Promise.all([
|
|
263
|
+
metadataFileFingerprint(sourceId, signal),
|
|
264
|
+
metadataFileFingerprint(join(dirname(sourceId), 'credentials/kimi-code.json'), signal),
|
|
265
|
+
]);
|
|
266
|
+
return fingerprints.some((value) => value === undefined)
|
|
267
|
+
? undefined
|
|
268
|
+
: nativeMetadataKey(executable, project, { cli, sourceId, fingerprints }, signal);
|
|
269
|
+
};
|
|
270
|
+
const key = await keyFor(), cached = kimiOAuthCapabilities.get(key);
|
|
271
|
+
if (cached)
|
|
272
|
+
return readKimiOAuthModelSources(cached, sourceId, signal);
|
|
252
273
|
const raw = parseMetadata(await capture([executable, 'provider', 'list', '--json']));
|
|
253
274
|
signal.throwIfAborted();
|
|
254
|
-
|
|
275
|
+
const sources = [
|
|
276
|
+
...parseKimiModelSources(raw, sourceId),
|
|
277
|
+
...(await readKimiOAuthModelSources(raw, sourceId, signal)),
|
|
278
|
+
];
|
|
279
|
+
// Only the proven managed OAuth schema can be rehydrated from a current own
|
|
280
|
+
// token. API providers remain uncached: their native resolver may derive keys.
|
|
281
|
+
if (sources.length === 1 && sources[0].apiType === 'kimi-managed-oauth') {
|
|
282
|
+
const source = sources[0];
|
|
283
|
+
const metadata = {
|
|
284
|
+
providers: {
|
|
285
|
+
'managed:kimi-code': {
|
|
286
|
+
type: 'kimi',
|
|
287
|
+
baseUrl: source.baseUrl,
|
|
288
|
+
oauth: { storage: 'file', key: 'oauth/kimi-code' },
|
|
289
|
+
},
|
|
290
|
+
},
|
|
291
|
+
models: Object.fromEntries(source.nativeModels.map(({ remoteId, choice }) => [
|
|
292
|
+
choice.id,
|
|
293
|
+
{ provider: 'managed:kimi-code', model: remoteId, displayName: choice.label },
|
|
294
|
+
])),
|
|
295
|
+
};
|
|
296
|
+
// Neither tokens nor arbitrary provider fields enter the capability cache.
|
|
297
|
+
const serialized = JSON.stringify(metadata);
|
|
298
|
+
const token = await readKimiOwnToken(join(dirname(sourceId), 'credentials'), 'kimi-code', signal);
|
|
299
|
+
const configFingerprint = await keyFor();
|
|
300
|
+
if (source.credential.type === 'oauth' &&
|
|
301
|
+
token?.access_token === source.credential.access &&
|
|
302
|
+
![token?.access_token, token?.refresh_token].some((value) => typeof value === 'string' && value && serialized.includes(value)) &&
|
|
303
|
+
key === configFingerprint)
|
|
304
|
+
kimiOAuthCapabilities.set(key, metadata);
|
|
305
|
+
}
|
|
306
|
+
signal.throwIfAborted();
|
|
307
|
+
return sources;
|
|
255
308
|
}
|
|
256
309
|
if (cli === 'mimo') {
|
|
257
310
|
const env = firstPartyEnvironment(cli);
|
|
311
|
+
const expected = mimoConfigurationPaths();
|
|
312
|
+
const own = {
|
|
313
|
+
authPath: join(expected.data, 'auth.json'),
|
|
314
|
+
auth: await readFirstPartyJson(join(expected.data, 'auth.json')),
|
|
315
|
+
configurations: [],
|
|
316
|
+
};
|
|
317
|
+
// Read current own material before every reuse, including logout/account or route changes.
|
|
318
|
+
// The cache stores neither credentials nor raw native config output.
|
|
319
|
+
for (const path of await mimoConfigurationFiles(project)) {
|
|
320
|
+
own.configurations.push({ path, value: await readFirstPartyJson(path) });
|
|
321
|
+
signal.throwIfAborted();
|
|
322
|
+
}
|
|
323
|
+
const key = await mimoMetadataKey(executable, project, own, signal);
|
|
324
|
+
const cached = mimoMetadataCache.get(key, own);
|
|
325
|
+
if (cached)
|
|
326
|
+
return cached;
|
|
258
327
|
const paths = await capture([executable, 'debug', 'paths'], env);
|
|
259
328
|
signal.throwIfAborted();
|
|
260
329
|
const data = paths.match(/^data\s+(.+)$/m)?.[1]?.trim();
|
|
261
330
|
if (!data || !isAbsolute(data) || dirname(data) === data)
|
|
262
331
|
return [];
|
|
263
|
-
const expected = mimoConfigurationPaths();
|
|
264
332
|
if (data !== expected.data || paths.match(/^config\s+(.+)$/m)?.[1]?.trim() !== expected.config)
|
|
265
333
|
throw new MimoConfigurationError('MiMo 配置来源无法确认,请检查配置');
|
|
266
334
|
const authPath = join(data, 'auth.json'), auth = await readFirstPartyJson(authPath);
|
|
@@ -286,70 +354,121 @@ export async function readFirstPartyModelSources(cli, executable, project, captu
|
|
|
286
354
|
await assertFirstPartyConfiguration(cli, project, signal);
|
|
287
355
|
const native = parseMimoModelRecords(await capture([executable, 'models', '--verbose'], env));
|
|
288
356
|
signal.throwIfAborted();
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
357
|
+
const sources = mimoModelSources(native, config, auth, authPath, inline);
|
|
358
|
+
// If native discovery overlapped a configuration write, keep the normal result but do
|
|
359
|
+
// not publish it under the older snapshot. Authorization still compares fresh bindings.
|
|
360
|
+
const after = {
|
|
361
|
+
authPath,
|
|
362
|
+
auth: await readFirstPartyJson(authPath),
|
|
363
|
+
configurations: [],
|
|
364
|
+
};
|
|
365
|
+
for (const path of await mimoConfigurationFiles(project)) {
|
|
366
|
+
after.configurations.push({ path, value: await readFirstPartyJson(path) });
|
|
367
|
+
signal.throwIfAborted();
|
|
368
|
+
}
|
|
369
|
+
if (key === (await mimoMetadataKey(executable, project, after, signal)))
|
|
370
|
+
mimoMetadataCache.set(key, sources, after);
|
|
300
371
|
signal.throwIfAborted();
|
|
301
|
-
|
|
302
|
-
if (record(settings.env))
|
|
303
|
-
Object.assign(env, settings.env);
|
|
372
|
+
return sources;
|
|
304
373
|
}
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
if (!literal(env.ANTHROPIC_API_KEY))
|
|
374
|
+
let route;
|
|
375
|
+
try {
|
|
376
|
+
route = await readClaudeOwnRoute(project, signal);
|
|
377
|
+
}
|
|
378
|
+
catch (error) {
|
|
379
|
+
if (error instanceof ClaudeOwnRouteError)
|
|
380
|
+
return [];
|
|
381
|
+
throw error;
|
|
382
|
+
}
|
|
383
|
+
if (route.kind === 'native' || !route.source)
|
|
316
384
|
return [];
|
|
317
|
-
const
|
|
385
|
+
const launch = await prepareClaudeWorkerLaunch(route, [executable, 'auth', 'status', '--json'], join(process.env.DSH_HOME ?? join(homedir(), '.dsh'), 'cliworker-now'), signal);
|
|
386
|
+
let raw;
|
|
387
|
+
try {
|
|
388
|
+
raw = await capture(launch.argv, launch.env);
|
|
389
|
+
}
|
|
390
|
+
catch (error) {
|
|
391
|
+
if (!(error instanceof ProcessCleanupUnconfirmedError) && 'cleanup' in launch)
|
|
392
|
+
await launch.cleanup?.();
|
|
393
|
+
throw error;
|
|
394
|
+
}
|
|
395
|
+
if ('cleanup' in launch)
|
|
396
|
+
await launch.cleanup?.();
|
|
318
397
|
signal.throwIfAborted();
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
398
|
+
try {
|
|
399
|
+
claudeRouteIdentity(route, raw, 0);
|
|
400
|
+
}
|
|
401
|
+
catch (error) {
|
|
402
|
+
if (error instanceof ClaudeOwnRouteError)
|
|
403
|
+
return [];
|
|
404
|
+
throw error;
|
|
405
|
+
}
|
|
406
|
+
const keyFor = async () => {
|
|
407
|
+
const fingerprints = await Promise.all(route.sourceIds.map((path) => metadataFileFingerprint(path, signal)));
|
|
408
|
+
return fingerprints.some((value) => value === undefined)
|
|
409
|
+
? undefined
|
|
410
|
+
: nativeMetadataKey(executable, project, { cli, source: route.source, fingerprints }, signal);
|
|
411
|
+
};
|
|
412
|
+
const key = await keyFor();
|
|
413
|
+
if (!claudeHelpCapabilities.get(key)) {
|
|
414
|
+
const help = await capture([executable, '--help'], claudeLaunchEnvironment());
|
|
415
|
+
signal.throwIfAborted();
|
|
416
|
+
if (!help.includes('--model') || !help.includes('--output-format') || !help.includes('--settings'))
|
|
417
|
+
throw new Error('Claude 版本不支持原生来源参数,请升级');
|
|
418
|
+
if (key === (await keyFor()))
|
|
419
|
+
claudeHelpCapabilities.set(key, true);
|
|
420
|
+
}
|
|
322
421
|
signal.throwIfAborted();
|
|
323
|
-
|
|
324
|
-
throw new Error('Claude 版本不支持模型参数,请升级');
|
|
325
|
-
return [
|
|
326
|
-
{
|
|
327
|
-
provider: 'anthropic',
|
|
328
|
-
credential: { type: 'api', key: env.ANTHROPIC_API_KEY },
|
|
329
|
-
baseUrl: env.ANTHROPIC_BASE_URL ?? 'https://api.anthropic.com',
|
|
330
|
-
apiType: 'anthropic-messages',
|
|
331
|
-
sourceIds: paths,
|
|
332
|
-
nativeModels: [],
|
|
333
|
-
nativeFullModelIds: true,
|
|
334
|
-
},
|
|
335
|
-
];
|
|
422
|
+
return [route.source];
|
|
336
423
|
}
|
|
337
424
|
export async function discoverFirstPartySources(sources, signal, options = {}) {
|
|
338
425
|
const models = new Map(), scopes = new Map();
|
|
339
426
|
for (const source of sources) {
|
|
340
427
|
signal.throwIfAborted();
|
|
341
|
-
const route = JSON.stringify([
|
|
428
|
+
const route = JSON.stringify([
|
|
429
|
+
source.provider,
|
|
430
|
+
source.baseUrl,
|
|
431
|
+
source.apiType,
|
|
432
|
+
source.anthropicAuth,
|
|
433
|
+
source.credential,
|
|
434
|
+
]);
|
|
342
435
|
let scope = scopes.get(route);
|
|
343
436
|
if (!scope) {
|
|
344
|
-
scope =
|
|
437
|
+
scope =
|
|
438
|
+
source.apiType === 'kimi-managed-oauth'
|
|
439
|
+
? await probeKimiOAuthModels(source, { ...options, signal })
|
|
440
|
+
: await probeAccountModels(source, { ...options, signal });
|
|
345
441
|
scopes.set(route, scope);
|
|
346
442
|
}
|
|
347
443
|
signal.throwIfAborted();
|
|
348
|
-
if (scope.state !== 'supported')
|
|
444
|
+
if (scope.state !== 'supported') {
|
|
445
|
+
if (source.claudeConfiguredModels && scope.catalogUnavailable) {
|
|
446
|
+
for (const { choice } of source.nativeModels)
|
|
447
|
+
models.set(choice.id, { ...choice, cost: 'unknown' });
|
|
448
|
+
continue;
|
|
449
|
+
}
|
|
450
|
+
if (source.claudeRoute)
|
|
451
|
+
throw new ClaudeOwnRouteError(scope.state === 'denied'
|
|
452
|
+
? source.claudeRoute === 'proxy'
|
|
453
|
+
? 'Claude 本地代理认证失败,请检查代理配置'
|
|
454
|
+
: 'Claude 路由认证失败,请检查配置'
|
|
455
|
+
: source.claudeRoute === 'proxy'
|
|
456
|
+
? 'Claude 本地代理模型目录无法确认,请检查代理服务'
|
|
457
|
+
: 'Claude 路由模型目录无法确认,请检查服务');
|
|
458
|
+
continue;
|
|
459
|
+
}
|
|
460
|
+
// CC Switch's Claude discovery endpoint lists Stack entries, not its role mappings.
|
|
461
|
+
// A successful empty auxiliary list must not erase explicit local proxy choices.
|
|
462
|
+
// Filtering denied entries to an empty list does not establish catalogEmpty.
|
|
463
|
+
if (source.claudeRoute === 'proxy' && source.claudeConfiguredModels && scope.catalogEmpty) {
|
|
464
|
+
for (const { choice } of source.nativeModels)
|
|
465
|
+
models.set(choice.id, { ...choice, cost: 'unknown' });
|
|
349
466
|
continue;
|
|
467
|
+
}
|
|
350
468
|
const nativeModels = source.nativeFullModelIds
|
|
351
469
|
? scope.models
|
|
352
|
-
.filter((model) => id(model.id)
|
|
470
|
+
.filter((model) => id(source.claudeRoute ? claudeRemoteModelId(model.id) : model.id) &&
|
|
471
|
+
!['sonnet', 'opus', 'haiku', 'fable'].includes(model.id))
|
|
353
472
|
.map((model) => ({
|
|
354
473
|
remoteId: model.id,
|
|
355
474
|
choice: {
|
|
@@ -359,8 +478,12 @@ export async function discoverFirstPartySources(sources, signal, options = {}) {
|
|
|
359
478
|
},
|
|
360
479
|
}))
|
|
361
480
|
: source.nativeModels;
|
|
362
|
-
|
|
363
|
-
|
|
481
|
+
const candidates = source.claudeConfiguredModels
|
|
482
|
+
? [...source.nativeModels, ...nativeModels]
|
|
483
|
+
: nativeModels;
|
|
484
|
+
for (const { remoteId, choice } of candidates) {
|
|
485
|
+
const available = scope.models.find((model) => model.id === remoteId ||
|
|
486
|
+
(source.claudeConfiguredModels && model.id === claudeRemoteModelId(remoteId)));
|
|
364
487
|
if (available)
|
|
365
488
|
models.set(choice.id, { ...choice, cost: available.cost });
|
|
366
489
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"first-party-models.js","sourceRoot":"","sources":["../../../src/host/first-party-models.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"first-party-models.js","sourceRoot":"","sources":["../../../src/host/first-party-models.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,6 +55,7 @@ export function projectHermesIdentity(raw) {
|
|
|
55
55
|
const ids = nonempty(raw.active_provider) ? [raw.active_provider] : Object.keys(providers);
|
|
56
56
|
const logins = [];
|
|
57
57
|
let expired = false;
|
|
58
|
+
let renewable = false;
|
|
58
59
|
for (const id of ids) {
|
|
59
60
|
const state = providers[id];
|
|
60
61
|
if (id === 'nous' && record(state)) {
|
|
@@ -66,8 +67,16 @@ export function projectHermesIdentity(raw) {
|
|
|
66
67
|
});
|
|
67
68
|
}
|
|
68
69
|
catch (error) {
|
|
69
|
-
if (error instanceof Error && /过期/.test(error.message))
|
|
70
|
+
if (error instanceof Error && /过期/.test(error.message)) {
|
|
70
71
|
expired = true;
|
|
72
|
+
try {
|
|
73
|
+
projectHermesNousSource(raw, 0, { allowExpired: true });
|
|
74
|
+
renewable = nonempty(state.refresh_token);
|
|
75
|
+
}
|
|
76
|
+
catch {
|
|
77
|
+
/* A stale bearer is not sufficient without the same valid own source. */
|
|
78
|
+
}
|
|
79
|
+
}
|
|
71
80
|
}
|
|
72
81
|
continue;
|
|
73
82
|
}
|
|
@@ -126,6 +135,13 @@ export function projectHermesIdentity(raw) {
|
|
|
126
135
|
const only = identity.logins?.length === 1 ? identity.logins[0] : undefined;
|
|
127
136
|
return { ...identity, ...(only?.accountLabel ? { accountLabel: only.accountLabel } : {}) };
|
|
128
137
|
}
|
|
138
|
+
if (renewable)
|
|
139
|
+
return {
|
|
140
|
+
state: 'configured',
|
|
141
|
+
verification: 'local',
|
|
142
|
+
authMethod: 'oauth',
|
|
143
|
+
summary: 'Hermes 登录已保存,等待自动续期',
|
|
144
|
+
};
|
|
129
145
|
if (expired)
|
|
130
146
|
return {
|
|
131
147
|
state: 'unauthenticated',
|
|
@@ -146,9 +162,20 @@ async function environmentLogins(path, signal, auth) {
|
|
|
146
162
|
let file;
|
|
147
163
|
const buffer = Buffer.alloc(64 * 1024 + 1);
|
|
148
164
|
try {
|
|
165
|
+
const inspected = await lstat(path);
|
|
166
|
+
if (!inspected.isFile() || inspected.isSymbolicLink() || inspected.nlink !== 1)
|
|
167
|
+
throw new Error('Unsafe Hermes environment');
|
|
149
168
|
file = await open(path, constants.O_RDONLY | constants.O_NOFOLLOW | constants.O_NONBLOCK);
|
|
150
169
|
const info = await file.stat();
|
|
151
|
-
|
|
170
|
+
const openedPath = await lstat(path);
|
|
171
|
+
if (openedPath.isSymbolicLink() ||
|
|
172
|
+
openedPath.dev !== info.dev ||
|
|
173
|
+
openedPath.ino !== info.ino ||
|
|
174
|
+
inspected.dev !== info.dev ||
|
|
175
|
+
inspected.ino !== info.ino ||
|
|
176
|
+
!info.isFile() ||
|
|
177
|
+
info.nlink !== 1 ||
|
|
178
|
+
info.size > 64 * 1024)
|
|
152
179
|
throw new Error('Unsafe Hermes environment');
|
|
153
180
|
let length = 0;
|
|
154
181
|
while (length < buffer.length) {
|
|
@@ -158,8 +185,16 @@ async function environmentLogins(path, signal, auth) {
|
|
|
158
185
|
break;
|
|
159
186
|
length += bytesRead;
|
|
160
187
|
}
|
|
161
|
-
|
|
162
|
-
|
|
188
|
+
const after = await file.stat();
|
|
189
|
+
const currentPath = await lstat(path);
|
|
190
|
+
if (length !== info.size ||
|
|
191
|
+
after.size !== info.size ||
|
|
192
|
+
after.mtimeMs !== info.mtimeMs ||
|
|
193
|
+
after.nlink !== 1 ||
|
|
194
|
+
currentPath.isSymbolicLink() ||
|
|
195
|
+
currentPath.dev !== info.dev ||
|
|
196
|
+
currentPath.ino !== info.ino)
|
|
197
|
+
throw new Error('Hermes environment changed during inspection');
|
|
163
198
|
// Default generated config.yaml and commented .env templates do not prove an account exists.
|
|
164
199
|
// Only explicit provider API-key assignments count; values never leave this local boolean check.
|
|
165
200
|
const env = parseHermesOwnEnvironment(buffer.subarray(0, length).toString('utf8'));
|
|
@@ -197,9 +232,21 @@ export async function readHermesAccount(config, signal) {
|
|
|
197
232
|
if (!info.isDirectory() || info.isSymbolicLink())
|
|
198
233
|
throw new Error('Unsafe Hermes home');
|
|
199
234
|
try {
|
|
200
|
-
|
|
235
|
+
const path = join(home, 'auth.json');
|
|
236
|
+
const inspected = await lstat(path);
|
|
237
|
+
if (!inspected.isFile() || inspected.isSymbolicLink() || inspected.nlink !== 1)
|
|
238
|
+
throw new Error('Unsafe Hermes auth file');
|
|
239
|
+
file = await open(path, constants.O_RDONLY | constants.O_NOFOLLOW | constants.O_NONBLOCK);
|
|
201
240
|
const info = await file.stat();
|
|
202
|
-
|
|
241
|
+
const openedPath = await lstat(path);
|
|
242
|
+
if (openedPath.isSymbolicLink() ||
|
|
243
|
+
openedPath.dev !== info.dev ||
|
|
244
|
+
openedPath.ino !== info.ino ||
|
|
245
|
+
inspected.dev !== info.dev ||
|
|
246
|
+
inspected.ino !== info.ino ||
|
|
247
|
+
!info.isFile() ||
|
|
248
|
+
info.nlink !== 1 ||
|
|
249
|
+
info.size > 64 * 1024)
|
|
203
250
|
throw new Error('Unsafe Hermes auth file');
|
|
204
251
|
let length = 0;
|
|
205
252
|
while (length < buffer.length) {
|
|
@@ -209,8 +256,16 @@ export async function readHermesAccount(config, signal) {
|
|
|
209
256
|
break;
|
|
210
257
|
length += result.bytesRead;
|
|
211
258
|
}
|
|
212
|
-
|
|
213
|
-
|
|
259
|
+
const after = await file.stat();
|
|
260
|
+
const currentPath = await lstat(path);
|
|
261
|
+
if (length !== info.size ||
|
|
262
|
+
after.size !== info.size ||
|
|
263
|
+
after.mtimeMs !== info.mtimeMs ||
|
|
264
|
+
after.nlink !== 1 ||
|
|
265
|
+
currentPath.isSymbolicLink() ||
|
|
266
|
+
currentPath.dev !== info.dev ||
|
|
267
|
+
currentPath.ino !== info.ino)
|
|
268
|
+
throw new Error('Hermes auth changed during inspection');
|
|
214
269
|
auth = JSON.parse(buffer.subarray(0, length).toString('utf8'));
|
|
215
270
|
identity = projectHermesIdentity(auth);
|
|
216
271
|
signal.throwIfAborted();
|
|
@@ -310,7 +365,11 @@ export async function prepareHermesAccount(action, executable, project, config,
|
|
|
310
365
|
signal.throwIfAborted();
|
|
311
366
|
const temporary = privateDirectory(join(state, 'tmp'));
|
|
312
367
|
const command = await hermesNativeCommand(executable, [action === 'login' ? 'model' : 'auth'], signal);
|
|
313
|
-
const argv = [
|
|
368
|
+
const argv = [
|
|
369
|
+
process.execPath,
|
|
370
|
+
fileURLToPath(new URL('./private-launch.mjs', import.meta.url)),
|
|
371
|
+
...command,
|
|
372
|
+
];
|
|
314
373
|
return {
|
|
315
374
|
argv,
|
|
316
375
|
cwd: state,
|