@jingyi0605/codingns4dsh 0.2.1-beta.8 → 0.2.1-rc.2

package/data/build/dist/host/cli-adapters/process-utils.js

@@ -1,8 +1,8 @@
 import { execFile, spawn, spawnSync } from 'node:child_process';
-import { access } from 'node:fs/promises';
+import { access, stat } from 'node:fs/promises';
 import { constants } from 'node:fs';
 import { AsyncLocalStorage } from 'node:async_hooks';
-import { dirname, join, win32 } from 'node:path';
+import { dirname, join, resolve, win32 } from 'node:path';
 import { environmentValue, parseWindowsEnvironmentSnapshot, windowsCommandEnvironment } from './windows-command-environment.js';
 /** Windows 的 npm CLI 通常是 .cmd 包装器，必须经由 shell 才能启动。 */
 export const WINDOWS = process.platform === 'win32';
@@ -150,15 +150,7 @@ export async function resolveCommandPath(command, run = spawnSync) {
             await loginShellLookup;
             if (revision !== commandEnvironmentRevision)
                 return resolveCommandPath(command, run);
-            for (const directory of (loginShellPath ?? '').split(':').filter(Boolean)) {
-                const candidate = join(directory, command);
-                try {
-                    await access(candidate, constants.X_OK);
-                    return candidate;
-                }
-                catch { /* 继续检查 PATH。 */ }
-            }
-            return null;
+            return resolvePosixCommandPath(command, loginShellPath ?? '');
         }
         const result = WINDOWS
             ? await runAsyncCommand(run, win32.join(environmentValue(process.env, 'SystemRoot') ?? 'C:\\Windows', 'System32', 'where.exe'), [command], { timeout: 3_000, env: commandEnvironment(command) })
@@ -186,6 +178,19 @@ export async function resolveCommandPath(command, run = spawnSync) {
     }
     return null;
 }
+/** Resolve against the exact PATH used for a probe, without loading another shell environment. */
+export async function resolvePosixCommandPath(command, path) {
+    const candidates = command.includes('/') ? [resolve(command)] : path.split(':').map(directory => resolve(directory, command));
+    for (const candidate of candidates) {
+        try {
+            await access(candidate, constants.X_OK);
+            if ((await stat(candidate)).isFile())
+                return candidate;
+        }
+        catch { /* Continue to the next executable on this PATH. */ }
+    }
+    return null;
+}
 /** 补充子进程 PATH；显式 base 是完整环境，不回填调用方已删除的登录变量。 */
 export function commandEnvironment(command, base) {
     const environment = base ?? process.env;

package/data/build/dist/host/cli-adapters/process-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"process-utils.js","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/process-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"process-utils.js","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/process-utils.ts"],"names":[],"mappings":"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"}

package/data/build/dist/host/cli-adapters/provider-subscription.d.ts

@@ -35,9 +35,12 @@ export declare class ProviderSubscriptionService {
     reset(adapterId: string, providerId?: string): Promise<CliSubscriptionResetResult>;
     private readDsh;
     private readSub2ApiFirst;
+    private readGrokFirst;
+    private resolveR4Source;
     /** 余额属于当前模型的原生 Provider，不能用其它账号或 Start Plan 冒充。 */
     private readZcode;
     private readCustomUpstream;
+    private resolveCustomUpstreamCandidates;
 }
 export interface ProviderSubscriptionOptions {
     readonly r4?: R4SubscriptionOptions;
@@ -179,7 +182,8 @@ export declare class GrokSubscriptionService implements SubscriptionReader {
     private readonly credentialPaths;
     constructor(options?: GrokSubscriptionOptions);
     read(): Promise<CliSubscriptionUsage | null>;
-    private readAccessToken;
+    private readCredentials;
+    private readPlanType;
 }
 export {};
 //# sourceMappingURL=provider-subscription.d.ts.map

package/data/build/dist/host/cli-adapters/provider-subscription.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provider-subscription.d.ts","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/provider-subscription.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"provider-subscription.d.ts","sourceRoot":"","sources":["../../../../../src/host/cli-adapters/provider-subscription.ts"],"names":[],"mappings":"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"}

package/data/build/dist/host/cli-adapters/provider-subscription.js

@@ -73,7 +73,12 @@ export class ProviderSubscriptionService {
             return this.antigravity.read({ modelId });
         if (adapterId === 'zcode')
             return this.readZcode(providerId, modelId);
-        if (adapterId === 'codex' || adapterId === 'claude-code' || adapterId === 'grok' || adapterId === 'opencode' || adapterId === 'command-code' || adapterId === 'codebuddy' || adapterId === 'workbuddy') {
+        // Grok Build 的 OAuth 登录代表官方 SuperGrok 订阅，即使本机同时保留了
+        // GROK_BASE_URL/XAI_BASE_URL 之类的自定义上游配置，也必须先展示官方订阅窗口。
+        // 否则自定义上游只要能返回余额，就会在官方读取器执行前截获结果。
+        if (adapterId === 'grok')
+            return this.readGrokFirst(providerId);
+        if (adapterId === 'codex' || adapterId === 'claude-code' || adapterId === 'opencode' || adapterId === 'command-code' || adapterId === 'codebuddy' || adapterId === 'workbuddy') {
             return this.readSub2ApiFirst(adapterId, providerId);
         }
         switch (adapterId) {
@@ -134,6 +139,21 @@ export class ProviderSubscriptionService {
             return this.codebuddy.read(adapterId);
         return null;
     }
+    async readGrokFirst(providerId) {
+        // R4 按来源域名识别，不能先被本机 Grok OAuth 读取器短路；其它自定义来源仍保持
+        // 官方 Grok 订阅优先，避免自定义余额覆盖 SuperGrok 订阅。
+        const r4Source = this.resolveR4Source('grok', providerId);
+        if (r4Source !== undefined)
+            return this.r4.read(r4Source);
+        const official = await this.grok.read();
+        if (official !== null)
+            return withProvider(official, identifyModelProvider({ name: 'xai' }), '');
+        return (await this.readCustomUpstream('grok', providerId))?.usage ?? null;
+    }
+    resolveR4Source(adapterId, providerId, discoveredSources) {
+        return this.resolveCustomUpstreamCandidates(adapterId, providerId, discoveredSources)
+            .find((candidate) => isR4Source(candidate.source))?.source;
+    }
     /** 余额属于当前模型的原生 Provider，不能用其它账号或 Start Plan 冒充。 */
     async readZcode(providerId, modelId) {
         const slash = modelId?.indexOf('/') ?? -1;
@@ -168,31 +188,34 @@ export class ProviderSubscriptionService {
         return (await this.readCustomUpstream('zcode', selectedId, [source]))?.usage ?? null;
     }
     async readCustomUpstream(adapterId, providerId, discoveredSources) {
+        const candidates = this.resolveCustomUpstreamCandidates(adapterId, providerId, discoveredSources);
+        if (candidates.length === 0)
+            return null;
+        const r4Source = candidates.find((candidate) => isR4Source(candidate.source))?.source;
+        if (r4Source !== undefined)
+            return { usage: await this.r4.read(r4Source) };
+        return this.customUpstreamClassifier.read(adapterId, providerId, candidates, {
+            newApi: (source) => this.newApi.readWithKind(adapterId, providerId, source),
+            sub2api: (source) => this.sub2api.readWithKind(adapterId, providerId, source),
+        });
+    }
+    resolveCustomUpstreamCandidates(adapterId, providerId, discoveredSources) {
         const newApiConfigured = this.newApi.hasConfiguredSource(adapterId, providerId);
         const sub2apiConfigured = this.sub2api.hasConfiguredSource(adapterId, providerId);
         // 只要一侧有显式来源，就不把另一侧从本机环境自动发现的无关来源混进来。
         // 两侧都没有显式来源时，才同时使用各自的 Agent 配置自动发现结果。
         const newApiSources = discoveredSources ?? (sub2apiConfigured && !newApiConfigured ? [] : this.newApi.resolveSources(adapterId, providerId));
-        const sub2apiSources = discoveredSources ?? (newApiConfigured && !sub2apiConfigured ? [] : this.sub2api.resolveSources(adapterId, providerId))
+        const sub2apiSources = (discoveredSources ?? (newApiConfigured && !sub2apiConfigured ? [] : this.sub2api.resolveSources(adapterId, providerId)))
             .filter((source) => !isOfficialAgentBaseUrl(adapterId, source.baseUrl));
         // 同一自定义来源的协议不能由配置项名称预先决定：一个 Agent 的配置文件
         // 可能实际接入 New-API，也可能接入 Sub2API。统一分类器需要对每个候选
         // 同时做两侧协议探测，再缓存最终分类，才能覆盖所有支持自定义 Provider
         // 的适配器（尤其是 Command Code、ZCode、CodeBuddy 和 WorkBuddy）。
-        const candidates = mergeCustomUpstreamCandidates(newApiSources, sub2apiSources).map((candidate) => ({
+        return mergeCustomUpstreamCandidates(newApiSources, sub2apiSources).map((candidate) => ({
             ...candidate,
             newApi: true,
             sub2api: true,
         }));
-        if (candidates.length === 0)
-            return null;
-        const r4Source = candidates.find((candidate) => isR4Source(candidate.source))?.source;
-        if (r4Source !== undefined)
-            return { usage: await this.r4.read(r4Source) };
-        return this.customUpstreamClassifier.read(adapterId, providerId, candidates, {
-            newApi: (source) => this.newApi.readWithKind(adapterId, providerId, source),
-            sub2api: (source) => this.sub2api.readWithKind(adapterId, providerId, source),
-        });
     }
 }
 /** 读取官方 DeepSeek API 的余额；凭据只在 Host 内使用。 */
@@ -581,8 +604,10 @@ export class KimiSubscriptionService {
     }
 }
 const GROK_BILLING_ENDPOINT = 'https://grok.com/grok_api_v2.GrokBuildBilling/GetGrokCreditsConfig';
+const GROK_SETTINGS_ENDPOINT = 'https://cli-chat-proxy.grok.com/v1/settings';
 const GROK_OIDC_SCOPE_PREFIX = 'https://auth.x.ai::';
 const GROK_LEGACY_SESSION_SCOPE = 'https://accounts.x.ai/sign-in';
+const GROK_DEFAULT_PLAN = 'SuperGrok';
 /** 读取 Grok（xAI）官方 SuperGrok 订阅额度；只读 Grok CLI 的 OAuth 凭据（~/.grok/auth.json），不做刷新，过期令牌也照常尝试以容忍时钟偏差。 */
 export class GrokSubscriptionService {
     request;
@@ -594,8 +619,8 @@ export class GrokSubscriptionService {
         this.credentialPaths = options.credentials ?? defaultGrokCredentialPaths();
     }
     async read() {
-        const token = this.readAccessToken();
-        if (token === null)
+        const credentials = this.readCredentials();
+        if (credentials === null)
             return null;
         const controller = new AbortController();
         const timer = setTimeout(() => controller.abort(), this.timeoutMs);
@@ -604,7 +629,7 @@ export class GrokSubscriptionService {
             const response = await this.request(GROK_BILLING_ENDPOINT, {
                 method: 'POST',
                 headers: {
-                    Authorization: `Bearer ${token}`,
+                    Authorization: `Bearer ${credentials.token}`,
                     Origin: 'https://grok.com',
                     Referer: 'https://grok.com/?_s=usage',
                     Accept: '*/*',
@@ -630,15 +655,17 @@ export class GrokSubscriptionService {
             if (snapshot === null)
                 return null;
             const usedPercent = clamp(snapshot.usedPercent);
+            const planType = await this.readPlanType(credentials.token, credentials.isOidc);
             return {
                 authenticated: true,
-                planType: null,
+                planType,
                 primary: { usedPercent, remainingPercent: 100 - usedPercent, windowDurationMins: grokWindowDurationMins(snapshot.resetsAt, nowSecs), resetsAt: snapshot.resetsAt },
                 secondary: null,
                 monthly: null,
                 rateLimitReachedType: null,
                 resetCredits: null,
                 capturedAt: new Date().toISOString(),
+                ...(credentials.accountName === null ? {} : { accountName: credentials.accountName }),
             };
         }
         catch {
@@ -648,36 +675,74 @@ export class GrokSubscriptionService {
             clearTimeout(timer);
         }
     }
-    readAccessToken() {
+    readCredentials() {
         for (const path of this.credentialPaths) {
             const auth = readJson(path);
             if (auth === null)
                 continue;
-            const token = selectGrokAuthToken(auth);
-            if (token !== null)
-                return token;
+            const credentials = selectGrokAuthCredentials(auth);
+            if (credentials !== null)
+                return credentials;
         }
         return null;
     }
+    async readPlanType(token, isOidc) {
+        const controller = new AbortController();
+        const timer = setTimeout(() => controller.abort(), this.timeoutMs);
+        try {
+            const response = await this.request(GROK_SETTINGS_ENDPOINT, {
+                headers: {
+                    Authorization: `Bearer ${token}`,
+                    Accept: 'application/json',
+                    'x-xai-token-auth': 'xai-grok-cli',
+                },
+                signal: controller.signal,
+            });
+            if (!response.ok)
+                return isOidc ? GROK_DEFAULT_PLAN : null;
+            const payload = recordValue(await response.json());
+            return textValue(payload?.subscription_tier_display) ?? (isOidc ? GROK_DEFAULT_PLAN : null);
+        }
+        catch {
+            return isOidc ? GROK_DEFAULT_PLAN : null;
+        }
+        finally {
+            clearTimeout(timer);
+        }
+    }
 }
 function defaultGrokCredentialPaths() {
     return [join(process.env.GROK_HOME ?? join(homedir(), '.grok'), 'auth.json')];
 }
 /** auth.json 以 OIDC scope URL 为键；优先 SuperGrok 的 auth.x.ai 条目，回退 legacy 登录条目，残缺条目不遮蔽健康条目。 */
-function selectGrokAuthToken(auth) {
+function selectGrokAuthCredentials(auth) {
     let oidc = null;
     let legacy = null;
     for (const [scope, value] of Object.entries(auth)) {
-        const key = textValue(recordValue(value)?.key);
-        if (key === null)
+        const record = recordValue(value);
+        const token = textValue(record?.key);
+        if (token === null)
             continue;
+        const credentials = {
+            token,
+            accountName: grokAccountName(record),
+            isOidc: scope.startsWith(GROK_OIDC_SCOPE_PREFIX),
+        };
         if (scope.startsWith(GROK_OIDC_SCOPE_PREFIX))
-            oidc = key;
+            oidc = credentials;
         else if (scope === GROK_LEGACY_SESSION_SCOPE || scope.includes('/sign-in'))
-            legacy = key;
+            legacy = credentials;
     }
     return oidc ?? legacy;
 }
+function grokAccountName(auth) {
+    if (auth === null)
+        return null;
+    const firstName = textValue(auth.first_name ?? auth.firstName);
+    const lastName = textValue(auth.last_name ?? auth.lastName);
+    const fullName = [firstName, lastName].filter((value) => value !== null).join(' ');
+    return fullName || textValue(auth.name) || textValue(auth.email);
+}
 /** 按重置时间距今的天数推断窗口长度（4–12 天按周窗口、20–45 天按月窗口），无法推断时留空由客户端使用兜底标签。 */
 function grokWindowDurationMins(resetsAt, nowSecs) {
     if (resetsAt === null)