@jingyi0605/codingns4dsh 0.1.2 → 0.1.7-rc.2

package/data/build/dist/client/features/reverse-proxy-panel.js

@@ -1,4 +1,5 @@
-import { createElement, useEffect, useState } from 'react';
+import { createElement, useEffect, useRef, useState } from 'react';
+import { sameSettingsValue } from '../../dsh-capabilities/settings-store.js';
 import { CODINGNS_CONTROL_STATION_URL, CODINGNS_CONTROL_BASE_URL_FIELD, CODINGNS_CONTROL_BASE_URLS_FIELD, CODINGNS_H5_LOGIN_URL, DEFAULT_CODINGNS_CONTROL_BASE_URLS, } from '../../shared/contracts/config.js';
 import { CODINGNS_RPC_CHANNEL } from '../../shared/contracts/transport.js';
 import { dshFormRootStyle, dshPopupSurfaceStyle, dshSettingsButtonStyle, dshSettingsFieldLabelStyle, dshSettingsFieldStyle, dshSettingsNoteStyle, dshSettingsPrimaryButtonStyle, dshSettingsRowStyle, dshThemeColor, } from '../theme.js';
@@ -25,14 +26,23 @@ export function ReverseProxyPanel({ services, enabled, snapshot, notify }) {
     const [selectedDeviceId, setSelectedDeviceId] = useState('');
     const [busy, setBusy] = useState(false);
     const [h5UrlCopied, setH5UrlCopied] = useState(false);
+    // 设置快照更新与写入互相触发时必须能收敛：同一个目标地址只写入一次，
+    // 否则一旦 Host 规范化或拒绝写入，就会形成 effect → publish → effect 的
+    // 无限重渲染（React #185）。
+    const lastPersistedControlBaseUrl = useRef(null);
     useEffect(() => {
         const saved = snapshot.value?.controlBaseUrl;
         const resolved = resolveControlBaseUrl(saved);
-        setControlBaseUrls(uniqueControlBaseUrls(snapshot.value?.controlBaseUrls, resolved));
-        setControlBaseUrl(resolved);
-        if (snapshot.status === 'ready' && snapshot.writable && saved !== resolved) {
-            void settings.set(CODINGNS_CONTROL_BASE_URL_FIELD, resolved).catch(() => undefined);
-        }
+        const nextUrls = uniqueControlBaseUrls(snapshot.value?.controlBaseUrls, resolved);
+        // 内容未变化时保留原有状态引用，避免设置通知引起无意义的渲染。
+        setControlBaseUrls((current) => (sameSettingsValue(current, nextUrls) ? current : nextUrls));
+        setControlBaseUrl((current) => (current === resolved ? current : resolved));
+        if (snapshot.status !== 'ready' || !snapshot.writable || saved === resolved)
+            return;
+        if (lastPersistedControlBaseUrl.current === resolved)
+            return;
+        lastPersistedControlBaseUrl.current = resolved;
+        void settings.set(CODINGNS_CONTROL_BASE_URL_FIELD, resolved).catch(() => undefined);
     }, [settings, snapshot.status, snapshot.writable, snapshot.value?.controlBaseUrl, snapshot.value?.controlBaseUrls]);
     useEffect(() => {
         void callCodingNsRpc(rpc, 'auth/snapshot', {})
@@ -106,7 +116,13 @@ export function ReverseProxyPanel({ services, enabled, snapshot, notify }) {
     async function loadDevicesInternal() {
         const next = await callCodingNsRpc(rpc, 'auth/dsh/device/list', {});
         setDevices(next);
-        const preferred = next.devices.find((device) => device.online && device.status === 'active')?.dshDeviceId ?? '';
+        const hasCurrentDevice = typeof next.currentDeviceId === 'string' && next.currentDeviceId.length > 0;
+        const current = !hasCurrentDevice
+            ? undefined
+            : next.devices.find((device) => device.dshDeviceId === next.currentDeviceId && device.status === 'active');
+        const preferred = hasCurrentDevice
+            ? current?.dshDeviceId ?? ''
+            : next.devices.find((device) => device.online && device.status === 'active')?.dshDeviceId ?? '';
         setSelectedDeviceId(preferred);
     }
     const addControlBaseUrl = async () => {

package/data/build/dist/client/features/reverse-proxy.d.ts

@@ -1,5 +1,4 @@
-import type { CodingNsClientFeatureModule } from './types.js';
-import type { CodingNsRpcClient } from './types.js';
+import type { CodingNsClientFeatureModule, CodingNsRpcClient } from './types.js';
 /**
  * 中转访问服务模块。
  *

package/data/build/dist/client/features/reverse-proxy.js

@@ -2,6 +2,7 @@ import { ReverseProxyPanel } from './reverse-proxy-panel.js';
 import { startDshH5Bootstrap } from '../dsh-h5-bootstrap.js';
 import { callCodingNsRpc } from '../settings-bridge.js';
 import { LOGIN_PROTECTION_SESSION_EVENT, readLoginProtectionSession } from './login-protection-session.js';
+import { CODINGNS_DSH_ERROR_CODES } from '../../shared/index.js';
 function isRemoteWebContext() {
     return globalThis.__CODINGNS4DSH_REMOTE_WEB_CONTEXT__ === true;
 }
@@ -32,24 +33,42 @@ export const reverseProxyFeature = {
      * 接入连接后，流与订阅必须登记到 context.resources，由停用自动清理。
      */
     start(context) {
+        const runtime = globalThis;
+        const epoch = Symbol('codingns4dsh.reverse-proxy');
+        runtime.__CODINGNS4DSH_REVERSE_PROXY_EPOCH__ = epoch;
+        const isCurrent = () => runtime.__CODINGNS4DSH_REVERSE_PROXY_EPOCH__ === epoch;
         if (isRemoteWebContext()) {
             // 远程 DSH Web 的外层已经拥有有效 Tunnel；这里只保留设置 UI 和其它
             // 插件贡献，禁止同一页面重新申请票据并建立第二条中继连接。
-            return () => { };
+            return () => { if (isCurrent())
+                delete runtime.__CODINGNS4DSH_REVERSE_PROXY_EPOCH__; };
+        }
+        // 页面级 Transport 已经在启动期由 DSH 或 Desktop 登记，动态功能不能在
+        // Cordis 启动后再次接管全局 Connection：两个 owner 会竞争同一个
+        // generation，插件自己的中继连接还会覆盖页面真实的传输实现。
+        // 独立 H5 页面使用专用入口（startDshH5BrowserBootstrap），不经过功能模块。
+        if (hasPageConnection(context.services)) {
+            return () => { if (isCurrent())
+                delete runtime.__CODINGNS4DSH_REVERSE_PROXY_EPOCH__; };
         }
         const abort = new AbortController();
         let disposeConnection;
         let retryTimer;
         let stopped = false;
         let waitingForLogin = false;
+        let attemptInFlight = false;
+        let connected = false;
+        let transportUnavailable = false;
         const onLoginProtectionSession = () => {
             waitingForLogin = false;
-            void attempt();
+            if (!connected)
+                void attempt();
         };
         globalThis.addEventListener(LOGIN_PROTECTION_SESSION_EVENT, onLoginProtectionSession);
         const attempt = async () => {
-            if (stopped || waitingForLogin)
+            if (!isCurrent() || stopped || waitingForLogin || connected || transportUnavailable || attemptInFlight)
                 return;
+            attemptInFlight = true;
             try {
                 const auth = await readAuthSnapshot(context.services.rpc);
                 if (auth.status !== 'authenticated') {
@@ -62,19 +81,38 @@ export const reverseProxyFeature = {
                     waitingForLogin = true;
                     return;
                 }
+                if (!isCurrent())
+                    return;
                 const dispose = await startBrowserRelayConnection(context.services.rpc, abort.signal, loginProtectionToken);
+                if (!isCurrent()) {
+                    await dispose();
+                    return;
+                }
                 if (stopped || abort.signal.aborted) {
                     await dispose();
                     return;
                 }
                 disposeConnection = dispose;
+                connected = true;
+                if (retryTimer !== undefined) {
+                    clearTimeout(retryTimer);
+                    retryTimer = undefined;
+                }
             }
             catch (error) {
-                if (stopped || abort.signal.aborted)
+                if (!isCurrent() || stopped || abort.signal.aborted)
+                    return;
+                if (isTransportAlreadyRegistered(error)) {
+                    // 这是生命周期冲突，不是网络瞬断；继续定时重试只会刷屏。
+                    transportUnavailable = true;
                     return;
+                }
                 console.error('codingns4dsh: 中继连接建立失败，将在稍后重试', error);
                 scheduleRetry();
             }
+            finally {
+                attemptInFlight = false;
+            }
         };
         const scheduleRetry = () => {
             if (retryTimer !== undefined || stopped || abort.signal.aborted)
@@ -84,18 +122,50 @@ export const reverseProxyFeature = {
         void attempt();
         return async () => {
             stopped = true;
+            connected = false;
             globalThis.removeEventListener(LOGIN_PROTECTION_SESSION_EVENT, onLoginProtectionSession);
             abort.abort();
             if (retryTimer !== undefined)
                 clearTimeout(retryTimer);
             await disposeConnection?.();
+            if (isCurrent())
+                delete runtime.__CODINGNS4DSH_REVERSE_PROXY_EPOCH__;
         };
     },
     settingsPanel: ReverseProxyPanel,
 };
+/**
+ * 本页是否已经由 DSH Client 持有页面级 Connection。
+ *
+ * 功能模块运行在 DSH Client 内部，页面级 Transport 已由 DSH 或 Desktop 在启动期
+ * 登记。这里只读取显式的连接服务：页面级 Transport 全局同时被 Desktop 壳、Host
+ * 启动页注入行和中继 iframe 桥三方写入，用它的存在性推断运行环境无法区分
+ * 「Desktop 页面」「Host 自己的 Web 页面」和「普通浏览器页面」，一旦它的写入策略
+ * 变化，中继模块的启停就会跟着漂移。
+ */
+function hasPageConnection(services) {
+    const ctx = services.uiContext;
+    if (ctx === undefined || typeof ctx.get !== 'function')
+        return false;
+    try {
+        return ctx.get('connection') !== undefined;
+    }
+    catch {
+        return false;
+    }
+}
+function isTransportAlreadyRegistered(error) {
+    return typeof error === 'object' && error !== null
+        && error.code === CODINGNS_DSH_ERROR_CODES.TRANSPORT_NOT_READY;
+}
 /** 浏览器侧真实中继连接；refresh token 和 access token 只经过 Host RPC。 */
 export async function startBrowserRelayConnection(rpc, signal, loginProtectionToken) {
-    const bootstrap = await startDshH5Bootstrap({ rpc, signal, ...(loginProtectionToken === undefined ? {} : { loginProtectionToken }) });
+    const bootstrap = await startDshH5Bootstrap({
+        rpc,
+        signal,
+        ...(loginProtectionToken === undefined ? {} : { loginProtectionToken }),
+        getLoginProtectionToken: readLoginProtectionSession,
+    });
     const state = globalThis;
     state.__CODINGNS4DSH_RELAY_MODE__ = bootstrap.relayMode;
     return async () => {

package/data/build/dist/client/features/types.d.ts

@@ -5,6 +5,9 @@ import type { FeatureModule } from '../../shared/contracts/feature.js';
 import type { CodingNsSettings } from '../../shared/contracts/config.js';
 import type { CodingNsLocale } from '../locale.js';
 import type { CodingNsSettingsSnapshot, CodingNsSettingsStore } from '../../dsh-capabilities/settings-store.js';
+import type { PeerHostScopedClient } from '../peer-host-scoped-client.js';
+import type { HostRouter } from '../host-router.js';
+import type { PeerHostSessionController } from '../peer-host-session-controller.js';
 /** 一次 Codingns4DSH RPC 的结果，与 DSH Connection 的结果形状一致。 */
 export type CodingNsRpcResult = {
     readonly ok: true;
@@ -26,6 +29,12 @@ export interface CodingNsClientServices {
     readonly dshVersion: string;
     readonly settings: CodingNsSettingsStore<CodingNsSettings>;
     readonly rpc: CodingNsRpcClient;
+    /** PeerHost 远端资源适配器；请求始终绑定 HostScope。 */
+    readonly peerHost: PeerHostScopedClient;
+    /** 所有跨 Host 资源共用的 generation 路由器。 */
+    readonly hostRouter: HostRouter;
+    /** 远端会话的唯一控制入口；与 hostRouter 共享 generation 和清理生命周期。 */
+    readonly peerHostSession: PeerHostSessionController;
     /** DSH Typert Remote；归档会话模块只通过运行时探测调用可选方法。 */
     readonly remote?: unknown;
     /** Codingns4DSH 自有终端 Remote；调试页不能依赖已停用的 DSH 官方 terminal。 */

package/data/build/dist/client/features/workspace-session-enhancement-panel.js

@@ -83,6 +83,16 @@ export function WorkspaceSessionEnhancementPanel({ services, enabled, snapshot,
         disabled,
         onChange: (event) => updateSetting('showQuickPhrases', event.currentTarget.checked),
         style: { flex: '0 0 auto', accentColor: dshThemeColor.accent },
+    })), createElement('label', {
+        style: dshSettingsListRowStyle,
+    }, createElement('span', { style: { minWidth: 0 } }, createElement('strong', { style: { display: 'block', fontSize: 13, lineHeight: 1.4 } }, t('workspace.rememberConversationRightbarRatio')), createElement('span', { style: { display: 'block', marginTop: 3, ...dshSettingsHelpStyle } }, t('workspace.rememberConversationRightbarRatioDescription'))), createElement('input', {
+        type: 'checkbox',
+        role: 'switch',
+        'aria-label': t('workspace.rememberConversationRightbarRatio'),
+        checked: value.rememberConversationRightbarRatio,
+        disabled,
+        onChange: (event) => updateSetting('rememberConversationRightbarRatio', event.currentTarget.checked),
+        style: { flex: '0 0 auto', accentColor: dshThemeColor.accent },
     })));
 }
 //# sourceMappingURL=workspace-session-enhancement-panel.js.map

package/data/build/dist/client/features/workspace-session-enhancement.js

@@ -6,6 +6,7 @@ import { startWorkspaceSessionVisibilityDom } from '../workspace-session-visibil
 import { WorkspaceSessionEnhancementPanel } from './workspace-session-enhancement-panel.js';
 import { registerSubscriptionSlot } from '../subscription-slot.js';
 import { registerQuickPhraseSlot } from '../quick-phrase-slot.js';
+import { startWorkspaceSessionRightbarDom } from '../workspace-session-rightbar-dom.js';
 /** DSH 0.1.6 原生会话行增强：Logo 与归档会话入口共用同一生命周期。 */
 export const workspaceSessionEnhancementFeature = {
     descriptor: {
@@ -16,7 +17,7 @@ export const workspaceSessionEnhancementFeature = {
         runtime: 'client',
         ui: {
             label: '工作区会话增强',
-            description: '在原生工作区会话行显示 Agent Logo、归档入口、工作区隐藏/恢复入口和订阅/用量信息，并提供本地快捷会话。',
+            description: '在原生工作区会话行显示 Agent Logo、归档入口、工作区隐藏/恢复入口和订阅/用量信息，提供本地快捷会话，并可记忆对话窗口与右侧栏宽度比例。',
             labelKey: 'feature.workspaceSession.label',
             descriptionKey: 'feature.workspaceSession.description',
             order: 35,
@@ -30,6 +31,7 @@ export const workspaceSessionEnhancementFeature = {
         let logoDom;
         let archiveDom;
         let visibilityDom;
+        let rightbarDom;
         let adapterRefreshTimer;
         let disposeSubscription;
         let disposeQuickPhrases;
@@ -68,6 +70,14 @@ export const workspaceSessionEnhancementFeature = {
             visibilityDom?.dispose();
             visibilityDom = undefined;
         };
+        const enableRightbarMemory = () => {
+            if (rightbarDom === undefined)
+                rightbarDom = startWorkspaceSessionRightbarDom();
+        };
+        const disableRightbarMemory = () => {
+            rightbarDom?.dispose();
+            rightbarDom = undefined;
+        };
         const enableSubscription = () => {
             if (disposeSubscription !== undefined || context.services.slots === undefined)
                 return;
@@ -91,6 +101,7 @@ export const workspaceSessionEnhancementFeature = {
             archiveDom?.dispose();
             archiveDom = undefined;
             disableWorkspaceVisibility();
+            disableRightbarMemory();
             disableSubscription();
             disableQuickPhrases();
         };
@@ -151,6 +162,12 @@ export const workspaceSessionEnhancementFeature = {
                 enableQuickPhrases();
             else
                 disableQuickPhrases();
+            const rememberConversationRightbarRatio = workspaceSettings?.rememberConversationRightbarRatio
+                ?? DEFAULT_WORKSPACE_SESSION_ENHANCEMENT_SETTINGS.rememberConversationRightbarRatio;
+            if (rememberConversationRightbarRatio)
+                enableRightbarMemory();
+            else
+                disableRightbarMemory();
         };
         sync();
         const unsubscribe = context.services.settings.subscribe(sync);

package/data/build/dist/client/file-management-dom.d.ts

@@ -0,0 +1,12 @@
+import type { CodingNsRpcClient } from './features/types.js';
+export interface FileManagementDomOptions {
+    readonly menuEnhancement: boolean;
+    readonly fileEditor: boolean;
+}
+export interface FileManagementDomController {
+    setOptions(options: FileManagementDomOptions): void;
+    dispose(): void;
+}
+/** 给 DSH 原生文件树和文本查看器补充文件操作，不接管 DSH 自己的渲染状态。 */
+export declare function startFileManagementDom(rpc: CodingNsRpcClient, initialOptions: FileManagementDomOptions): FileManagementDomController;
+//# sourceMappingURL=file-management-dom.d.ts.map