@jingyi0605/codingns4dsh 0.2.1-rc.4 → 0.2.1-rc.5

package/data/build/dist/host/cli-adapters/feature.js

@@ -21,7 +21,7 @@ import { CodingNsCliSessionStore } from './session-store.js';
 import { CodingNsDshMessageProjector } from './dsh-message-projector.js';
 import { CommandCodeSubscriptionService } from './command-code-subscription.js';
 import { ProviderSubscriptionService } from './provider-subscription.js';
-import { attachMagpieSessionNames, MagpieUsageService, magpieAgentForAdapter } from './magpie-usage.js';
+import { attachMagpieSessionNames, MagpieUsageService, magpieAgentForAdapter, magpieUsageAgentAliases } from './magpie-usage.js';
 import { readDshProviderSource } from './dsh-config.js';
 import { MagpieManagementService } from './magpie-management.js';
 import { MagpieWebService } from './magpie-web.js';
@@ -89,6 +89,7 @@ export function createCliAdaptersFeature(options = {}) {
             };
             let subscriptions = options.subscriptions ?? buildSubscriptions(context.services.settings?.get());
             let magpieDetection = options.magpieDetection ?? new MagpieInstallDetectionService(options.magpieDetectionOptions);
+            let magpieDetectionRequest = 0;
             // 最近一次可用的 Magpie 入口；探测会随用户指定的路径变化而重建，Web 服务总是读最新值。
             let magpieCommand = null;
             let magpieVersion = null;
@@ -387,6 +388,14 @@ export function createCliAdaptersFeature(options = {}) {
                     case 'subscription': {
                         const subscription = readSubscriptionRequest(payload);
                         const requestSignal = signal ?? lifetime.signal;
+                        // A newly opened native DSH session may not be in the Host bridge's
+                        // local store yet. Adopt it before reading the Registry, otherwise
+                        // the native model/provider selection is invisible and the request
+                        // incorrectly falls back to the official DSH balance.
+                        if (subscription.adapterId === 'dsh' && subscription.sessionId !== undefined && nativeSessions !== undefined) {
+                            await nativeSessions.ensure(subscription.sessionId);
+                            requestSignal.throwIfAborted();
+                        }
                         const session = subscription.sessionId === undefined ? undefined : registry.getSession(subscription.sessionId);
                         if (context.services.settings?.get().modules.magpieManagement === true
                             && session !== undefined && session.adapterId === subscription.adapterId) {
@@ -394,9 +403,9 @@ export function createCliAdaptersFeature(options = {}) {
                             requestSignal.throwIfAborted();
                             const snapshot = magpie ?? (subscription.sessionId === undefined
                                 ? null
-                                : await pendingMagpieUsage(magpieUsage, nativeSessions, subscription.sessionId, session, requestSignal));
+                                : await pendingMagpieUsage(magpieUsage, nativeSessions, subscription.sessionId, session, requestSignal, subscription.includeRoute));
                             if (snapshot !== null) {
-                                const sessionName = subscription.sessionId === undefined ? undefined : readDshSessionDisplayName(subscription.sessionId, sessionStore, nativeSessions);
+                                const sessionName = subscription.sessionId === undefined ? undefined : readDshSessionDisplayName(subscription.sessionId, sessionStore, nativeSessions, context.services.dshContext);
                                 return { providerUsage: null, magpie: sessionName === undefined ? snapshot : { ...snapshot, sessionName } };
                             }
                         }
@@ -430,31 +439,54 @@ export function createCliAdaptersFeature(options = {}) {
                 const signal = isAbortSignal(rpcSignal) ? rpcSignal : lifetime.signal;
                 // 安装探测本身就是启用前的判断依据，因此不要求模块已启用。
                 if (action === 'management/detection') {
+                    const requestId = ++magpieDetectionRequest;
                     const request = readMagpieDetectionRequest(payload);
                     const force = readMagpieDetectionForce(payload);
-                    // A custom path is request-scoped; it must not poison later automatic detection.
+                    // Only a successful custom probe replaces the Host-session selection.
                     const customCommand = normalizeCustomCommand(request.commandPath);
                     const detectionService = customCommand === null
                         ? magpieDetection
                         : new MagpieInstallDetectionService({ ...options.magpieDetectionOptions, customCommand });
                     const detection = await detectionService.detect(customCommand === null ? {} : { commandPath: customCommand }, { force: force || customCommand !== null });
-                    magpieCommand = MagpieInstallDetectionService.isUsable(detection) ? detection.command : null;
-                    magpieVersion = MagpieInstallDetectionService.isUsable(detection) ? detection.version : null;
+                    if (requestId !== magpieDetectionRequest || lifetime.signal.aborted)
+                        return detection;
+                    const usable = MagpieInstallDetectionService.isUsable(detection);
+                    if (usable || customCommand === null) {
+                        if (usable && customCommand !== null)
+                            magpieDetection = detectionService;
+                        magpieInstalled = usable;
+                        magpieCommand = usable ? detection.command : null;
+                        magpieVersion = usable ? detection.version : null;
+                        scheduleMagpieWebSync(context.services.settings?.get().modules.magpieManagement === true && usable);
+                    }
                     return detection;
                 }
+                if (action === 'context') {
+                    const request = readMagpieContextRequest(payload);
+                    const target = await resolveMagpieContextTarget(request.sessionId, sessionStore, nativeSessions, magpieUsage, signal);
+                    if (target === null || !magpieInstalled)
+                        return null;
+                    try {
+                        await magpieWeb.start();
+                    }
+                    catch {
+                        return null;
+                    }
+                    return magpieUsage.readContext(target, signal);
+                }
                 if (context.services.settings?.get().modules.magpieManagement !== true) {
                     throw new CodingNsRpcError('CODINGNS_MAGPIE_DISABLED', 'Magpie management is disabled');
                 }
                 switch (action) {
                     case 'usage/dashboard': {
                         const dashboard = await magpieUsage.readDashboard(readMagpieDashboardPeriod(payload), signal);
-                        return attachMagpieSessionNames(dashboard, await magpieSessionNameBindings(sessionStore, nativeSessions, signal));
+                        return attachMagpieSessionNames(dashboard, await magpieSessionNameBindings(sessionStore, nativeSessions, signal, context.services.dshContext));
                     }
                     case 'usage/dashboard/stream': {
                         const input = asRecord(payload);
                         const period = readMagpieDashboardPeriod(payload);
                         const force = input?.force === true;
-                        return streamMagpieDashboard(magpieUsage, period, signal, force, sessionStore, nativeSessions);
+                        return streamMagpieDashboard(magpieUsage, period, signal, force, sessionStore, nativeSessions, context.services.dshContext);
                     }
                     case 'usage/requests': {
                         const request = readMagpieRequestOptions(payload);
@@ -463,6 +495,7 @@ export function createCliAdaptersFeature(options = {}) {
                             return page;
                         return {
                             ...page,
+                            sessionName: readDshSessionDisplayName(request.sessionId, sessionStore, nativeSessions, context.services.dshContext) ?? null,
                             sessionMetrics: readMagpieSessionMetrics(sessionStore, nativeSessions, request.sessionId, request.sessionIds),
                         };
                     }
@@ -1544,6 +1577,11 @@ function readOptionalText(value) {
 function readNativeModelSelection(nativeSessions, sessionId) {
     if (nativeSessions === undefined)
         return undefined;
+    const current = nativeSessions.modelSelection?.(sessionId);
+    if (current !== undefined && current.model.trim() !== '') {
+        const provider = current.provider.trim();
+        return provider === '' ? { modelId: current.model.trim() } : { providerId: provider, modelId: current.model.trim() };
+    }
     let session;
     try {
         session = nativeSessions.get(sessionId);
@@ -1587,6 +1625,43 @@ function isMagpieGatewayProvider(providerId) {
         return isMagpieGateway(source.baseUrl);
     return /^magpie(?:[-_.].*)?$/iu.test(providerId);
 }
+/** Resolve the exact identities needed for one Magpie context read. */
+async function resolveMagpieContextTarget(sessionId, sessionStore, nativeSessions, magpieUsage, signal) {
+    const normalizedSessionId = sessionId.trim();
+    if (normalizedSessionId === '')
+        return null;
+    let stored = sessionStore.get(normalizedSessionId);
+    if (stored === undefined && nativeSessions !== undefined) {
+        try {
+            await nativeSessions.ensure(normalizedSessionId);
+            signal.throwIfAborted();
+        }
+        catch {
+            return null;
+        }
+        stored = sessionStore.get(normalizedSessionId);
+    }
+    const adapterId = stored?.adapterId ?? DSH_NATIVE_SESSION_ADAPTER_ID;
+    const selection = adapterId === DSH_NATIVE_SESSION_ADAPTER_ID
+        ? readNativeModelSelection(nativeSessions, normalizedSessionId)
+        : undefined;
+    const modelId = stored?.modelId?.trim() || selection?.modelId;
+    if (modelId === undefined || modelId === '')
+        return null;
+    const providerId = stored?.providerId?.trim() || selection?.providerId;
+    if (adapterId === DSH_NATIVE_SESSION_ADAPTER_ID) {
+        if (providerId === undefined || !isMagpieGatewayProvider(providerId))
+            return null;
+    }
+    else if (await magpieUsage.readModelMetadata(adapterId, modelId, signal) === null) {
+        return null;
+    }
+    const agents = magpieUsageAgentAliases(adapterId);
+    if (agents.length === 0)
+        return null;
+    const sessionIds = [...new Set([normalizedSessionId, stored?.providerSessionId?.trim() ?? ''].filter(Boolean))];
+    return { agents, sessionIds };
+}
 /**
  * 读到用量之后仍然要判断「这个模型是不是 Magpie 的」。
  *
@@ -1595,21 +1670,25 @@ function isMagpieGatewayProvider(providerId) {
  * 会话 ID 在滚动升级期间并不相等，这时返回 null 会让 Host 直接回退到官方余量。
  * 只有确认模型由 Magpie 提供时才下发占位快照，避免官方数字抢占首屏。
  */
-async function pendingMagpieUsage(magpie, nativeSessions, sessionId, session, signal) {
+async function pendingMagpieUsage(magpie, nativeSessions, sessionId, session, signal, includeRoute = false) {
     const agent = magpieAgentForAdapter(session.adapterId);
     const modelId = session.modelId?.trim();
     if (agent === null || modelId === undefined || modelId === '')
         return null;
     try {
-        const selectedProviderId = session.providerId?.trim();
-        const providerId = selectedProviderId === undefined || selectedProviderId === ''
-            ? readNativeModelSelection(nativeSessions, sessionId)?.providerId
-            : selectedProviderId;
-        if (providerId === undefined || !isMagpieGatewayProvider(providerId))
-            return null;
+        if (session.adapterId === DSH_NATIVE_SESSION_ADAPTER_ID) {
+            const providerId = session.providerId?.trim() || readNativeModelSelection(nativeSessions, sessionId)?.providerId;
+            if (providerId === undefined || !isMagpieGatewayProvider(providerId))
+                return null;
+        }
         const confirmed = await magpie.readModelMetadata(session.adapterId, modelId, signal);
         signal.throwIfAborted();
-        return confirmed === null ? null : pendingMagpieSnapshot(agent, modelId);
+        if (confirmed === null)
+            return null;
+        // Gateway totals do not depend on a provider session binding. Keep them
+        // while the exact session row is pending, without attributing other rows.
+        return await magpie.read(session, signal, includeRoute, sessionId, { allowPendingSession: true })
+            ?? pendingMagpieSnapshot(agent, modelId);
     }
     catch {
         // 目录不可读、超时或请求被取消：保持原有回退语义，不伪造 Magpie 用量。
@@ -2137,8 +2216,8 @@ function readMagpieDashboardPeriod(payload) {
         return value;
     throw new TypeError('Magpie usage period must be today, week, month, or all');
 }
-async function* streamMagpieDashboard(service, period, signal, force, sessionStore, nativeSessions) {
-    const names = magpieSessionNameBindings(sessionStore, nativeSessions, signal).catch(() => []);
+async function* streamMagpieDashboard(service, period, signal, force, sessionStore, nativeSessions, dshContext) {
+    const names = magpieSessionNameBindings(sessionStore, nativeSessions, signal, dshContext).catch(() => []);
     let latest;
     for await (const chunk of service.readDashboardStream(period, signal, force)) {
         latest = chunk.dashboard;
@@ -2162,6 +2241,12 @@ function readMagpieDetectionRequest(payload) {
 function readMagpieDetectionForce(payload) {
     return asRecord(payload)?.force === true;
 }
+function readMagpieContextRequest(payload) {
+    const sessionId = readOptionalMagpieIdentity(asRecord(payload)?.sessionId, 512);
+    if (sessionId === undefined)
+        throw new TypeError('Magpie context requires a session ID');
+    return { sessionId };
+}
 function readMagpieRequestOptions(payload) {
     const record = asRecord(payload);
     if (record === null)
@@ -2245,7 +2330,7 @@ function readOptionalMagpieIdentityList(value, maxItems, maxLength) {
         throw new TypeError('Magpie session IDs are invalid');
     return [...new Set(values)];
 }
-async function magpieSessionNameBindings(sessionStore, nativeSessions, signal) {
+async function magpieSessionNameBindings(sessionStore, nativeSessions, signal, dshContext) {
     const records = sessionStore.list({ includeArchived: true });
     const bindings = [];
     const knownSessionIds = new Set();
@@ -2261,13 +2346,13 @@ async function magpieSessionNameBindings(sessionStore, nativeSessions, signal) {
     const nativeNames = new Map();
     for (const value of nativeValues) {
         const sessionId = nativeSessionId(value);
-        const name = readNativeSessionDisplayName(value);
+        const name = readNativeSessionDisplayName(value, dshContext);
         if (sessionId !== undefined && name !== undefined)
             nativeNames.set(sessionId, name);
     }
     for (const record of records) {
         knownSessionIds.add(record.dshSessionId);
-        const name = nativeNames.get(record.dshSessionId) ?? readDshSessionDisplayName(record.dshSessionId, sessionStore, nativeSessions);
+        const name = nativeNames.get(record.dshSessionId) ?? readDshSessionDisplayName(record.dshSessionId, sessionStore, nativeSessions, dshContext);
         bindings.push({
             dshSessionId: record.dshSessionId,
             adapterId: record.adapterId,
@@ -2282,31 +2367,94 @@ async function magpieSessionNameBindings(sessionStore, nativeSessions, signal) {
         const sessionId = nativeSessionId(value);
         if (sessionId === undefined || knownSessionIds.has(sessionId))
             continue;
-        const name = readNativeSessionDisplayName(value);
+        const name = readNativeSessionDisplayName(value, dshContext);
         bindings.push({ dshSessionId: sessionId, adapterId: 'dsh', ...(name === undefined ? {} : { name }) });
     }
     return bindings;
 }
-function readDshSessionDisplayName(sessionId, sessionStore, nativeSessions) {
-    return readNativeSessionDisplayName(nativeSessions?.get(sessionId)) ?? cleanDisplayName(sessionStore.get(sessionId)?.title);
+function readDshSessionDisplayName(sessionId, sessionStore, nativeSessions, dshContext) {
+    const direct = readNativeSession(nativeSessions, sessionId);
+    const directName = readNativeSessionDisplayName(direct, dshContext);
+    if (directName !== undefined)
+        return directName;
+    const directRecord = sessionStore.get(sessionId);
+    const directRecordName = cleanDisplayName(directRecord?.title);
+    if (directRecordName !== undefined)
+        return directRecordName;
+    const binding = sessionStore.list({ includeArchived: true }).find((record) => record.dshSessionId === sessionId || record.providerSessionId === sessionId);
+    if (binding === undefined)
+        return undefined;
+    return readNativeSessionDisplayName(readNativeSession(nativeSessions, binding.dshSessionId), dshContext)
+        ?? cleanDisplayName(binding.title);
 }
-function readNativeSessionDisplayName(value) {
+function readNativeSessionDisplayName(value, dshContext) {
     const root = asRecord(value);
     if (root === null)
         return undefined;
     const projection = asRecord(root.projections) ?? asRecord(asRecord(root.record)?.projections);
     const values = asRecord(projection?.values);
     const record = asRecord(root.record);
+    const header = asRecord(root.header);
+    const recordHeader = asRecord(record?.header);
     const rows = asRecord(record?.rows);
     const rowProjection = asRecord(rows?.projections);
     const rowValues = asRecord(rowProjection?.values);
-    for (const candidate of [values?.title, rowValues?.title, root.title, root.name, root.displayName, record?.title, record?.name]) {
+    const titleService = asRecord(readOptionalDshService(dshContext, 'sessionTitle'));
+    if (typeof titleService?.get === 'function') {
+        try {
+            const snapshot = titleService.get(value);
+            const title = cleanDisplayName(asRecord(snapshot)?.title ?? snapshot);
+            if (title !== undefined)
+                return title;
+        }
+        catch { /* The optional native title service may not accept this session shape. */ }
+    }
+    for (const candidate of [
+        values?.title, rowValues?.title, root.title, root.name, root.displayName,
+        header?.title, header?.name, header?.displayName,
+        record?.title, record?.name, recordHeader?.title, recordHeader?.name,
+    ]) {
         const title = cleanDisplayName(candidate);
         if (title !== undefined)
             return title;
     }
+    if (typeof root.snapshotEvents === 'function') {
+        try {
+            const events = root.snapshotEvents.call(value);
+            if (Array.isArray(events)) {
+                for (let index = events.length - 1; index >= 0; index -= 1) {
+                    const event = asRecord(events[index]);
+                    if (event?.type !== 'session/title')
+                        continue;
+                    const title = cleanDisplayName(asRecord(event.data)?.title ?? event.title);
+                    if (title !== undefined)
+                        return title;
+                }
+            }
+        }
+        catch { /* A missing or closed native history cannot block usage rendering. */ }
+    }
     return undefined;
 }
+function readNativeSession(nativeSessions, sessionId) {
+    try {
+        return nativeSessions?.get(sessionId);
+    }
+    catch {
+        return undefined;
+    }
+}
+function readOptionalDshService(context, name) {
+    const get = context?.get;
+    if (typeof get !== 'function')
+        return undefined;
+    try {
+        return get.call(context, name);
+    }
+    catch {
+        return undefined;
+    }
+}
 function cleanDisplayName(value) {
     if (typeof value !== 'string')
         return undefined;