@jingyi0605/codingns4dsh 0.1.0 → 0.1.1

package/data/build/dist/client/terminal/model.js

@@ -1,4 +1,5 @@
 import { Service } from '@deepseek-ai/cordis';
+import { debugInfo, debugWarn } from '../../shared/debug.js';
 class ObservableValue {
     value;
     listeners = new Set();
@@ -19,12 +20,12 @@ class ObservableValue {
 /** 一个 Sidebar 标签对应的终端模型；DOM 卸载只 detach，显式 close 才结束 Host 进程。 */
 export class CodingNsTerminalView {
     sessionId;
-    id;
     remote;
     createWhenMissing;
     shellPath;
     onWorkspaceResolved;
     state;
+    id;
     store = new ObservableValue({ phase: 'idle', title: '终端', writable: false });
     lifetime = new AbortController();
     followController;
@@ -38,11 +39,11 @@ export class CodingNsTerminalView {
     lastResize;
     constructor(sessionId, id, remote, createWhenMissing, shellPath, onWorkspaceResolved) {
         this.sessionId = sessionId;
-        this.id = id;
         this.remote = remote;
         this.createWhenMissing = createWhenMissing;
         this.shellPath = shellPath;
         this.onWorkspaceResolved = onWorkspaceResolved;
+        this.id = id;
         this.state = this.store;
     }
     mount() {
@@ -122,9 +123,11 @@ export class CodingNsTerminalView {
     async close() {
         if (this.store.getSnapshot().phase === 'closed')
             return;
+        debugInfo('codingns4dsh: client terminal close entered', { sessionId: this.sessionId, terminalId: this.id });
         this.patch({ phase: 'closing', writable: false });
         this.detach();
         unwrap(await resolveRemote(this.remote).close(this.sessionId, this.id));
+        debugInfo('codingns4dsh: client terminal close success', { sessionId: this.sessionId, terminalId: this.id });
         this.patch({ phase: 'closed', writable: false });
     }
     async dispose() {
@@ -137,11 +140,22 @@ export class CodingNsTerminalView {
         try {
             const remote = resolveRemote(this.remote);
             const environment = unwrap(await remote.environment(this.sessionId, this.lifetime.signal));
-            if (environment.workspaceId !== undefined)
-                this.onWorkspaceResolved?.(environment.workspaceId);
+            debugInfo('codingns4dsh: client terminal environment', { sessionId: this.sessionId, workspaceId: environment.workspaceId, cwd: environment.cwd });
+            let createWhenMissing = this.createWhenMissing;
+            if (environment.workspaceId !== undefined) {
+                const binding = this.onWorkspaceResolved?.(environment.workspaceId, this.id);
+                debugInfo('codingns4dsh: client terminal workspace binding', { sessionId: this.sessionId, workspaceId: environment.workspaceId, requestedId: this.id, binding: binding ?? null });
+                if (binding !== undefined) {
+                    if (binding.id !== this.id)
+                        this.id = binding.id;
+                    // 工作区已有绑定时，恢复必须失败闭合，不能用新 ID 偷建替代终端。
+                    createWhenMissing = !binding.existing;
+                }
+            }
             const listed = unwrap(await remote.list(this.sessionId));
+            debugInfo('codingns4dsh: client terminal list', { sessionId: this.sessionId, workspaceId: environment.workspaceId, terminalIds: listed.map((entry) => entry.id), requestedId: this.id, createWhenMissing });
             let info = listed.find((entry) => entry.id === this.id);
-            if (info === undefined && this.createWhenMissing) {
+            if (info === undefined && createWhenMissing) {
                 this.patch({ phase: 'creating', environment });
                 info = unwrap(await remote.create(this.sessionId, {
                     id: this.id,
@@ -149,6 +163,7 @@ export class CodingNsTerminalView {
                     cols: Math.min(80, environment.maxCols),
                     rows: Math.min(24, environment.maxRows),
                 }, this.lifetime.signal));
+                debugInfo('codingns4dsh: client terminal created', { sessionId: this.sessionId, workspaceId: environment.workspaceId, terminalId: info.id });
             }
             if (info === undefined)
                 throw new Error('Host 中不存在该终端，且恢复流程禁止自动创建替代进程');
@@ -238,14 +253,17 @@ export class CodingNsWebTerminals extends Service {
     recoveries = new Map();
     closeFailureStore = new ObservableValue([]);
     closeFailures = this.closeFailureStore;
+    remoteReadyStore = new ObservableValue(false);
+    remoteReadyState = this.remoteReadyStore;
     closeRequests = new Map();
+    /** Remote 注入前不能执行关闭请求；就绪后统一冲刷，避免把启动竞态显示成永久错误。 */
+    cleanupQueued = false;
     constructor(ctx, remote) {
         super(ctx, 'webTerminals');
         this.remote = remote;
         for (const request of readCloseRequests())
             this.closeRequests.set(String(request.id), request);
-        for (const request of this.closeRequests.values())
-            void this.cleanup(request);
+        void this.flushCleanup();
     }
     view(sessionId, key, contentId, terminalId, shellPath) {
         const mapKey = JSON.stringify([sessionId, key]);
@@ -254,19 +272,20 @@ export class CodingNsWebTerminals extends Service {
             return existing.view;
         const workspaceId = this.workspaceIds.get(sessionId);
         const saved = terminalId
-            ?? (workspaceId === undefined ? undefined : readWorkspaceBinding(workspaceId, contentId))
+            ?? (workspaceId === undefined ? undefined : readWorkspaceBindingWithMigration(workspaceId, contentId))
             ?? readBinding(sessionId, contentId);
         const id = saved ?? crypto.randomUUID();
+        debugInfo('codingns4dsh: client terminal view', { sessionId, key, contentId, workspaceId: workspaceId ?? null, savedId: saved ?? null, terminalId: id, bindingSource: terminalId !== undefined ? 'argument' : workspaceId !== undefined && readWorkspaceBindingWithMigration(workspaceId, contentId) !== undefined ? 'workspace-storage' : readBinding(sessionId, contentId) !== undefined ? 'session-storage' : 'new' });
         if (saved === undefined)
             writeBinding(sessionId, contentId, id);
-        const view = new CodingNsTerminalView(sessionId, id, this.remote, saved === undefined, shellPath, (resolvedWorkspaceId) => this.rememberWorkspace(sessionId, contentId, id, resolvedWorkspaceId));
+        const view = new CodingNsTerminalView(sessionId, id, this.remote, saved === undefined, shellPath, (resolvedWorkspaceId, currentId) => this.rememberWorkspace(sessionId, contentId, currentId, resolvedWorkspaceId));
         this.views.set(mapKey, { contentId, view });
         return view;
     }
     /** 返回某个 Sidebar 内容已经保存的 Host 终端身份，用于恢复时去重。 */
     boundTerminalId(sessionId, contentId) {
         const workspaceId = this.workspaceIds.get(sessionId);
-        return (workspaceId === undefined ? undefined : readWorkspaceBinding(workspaceId, contentId))
+        return (workspaceId === undefined ? undefined : readWorkspaceBindingWithMigration(workspaceId, contentId))
             ?? readBinding(sessionId, contentId);
     }
     async launchShells(sessionId, signal) {
@@ -284,13 +303,16 @@ export class CodingNsWebTerminals extends Service {
         const id = terminalId ?? record?.view.id ?? this.boundTerminalId(sessionId, contentId);
         if (id === undefined)
             return;
+        debugInfo('codingns4dsh: client terminal close request', { sessionId, key, contentId, workspaceId: this.workspaceIds.get(sessionId) ?? null, terminalId: id, hasView: record !== undefined });
         const request = { sessionId, id, title: record?.view.state.getSnapshot().title ?? '终端' };
         this.closeRequests.set(String(id), request);
         persistCloseRequests(this.closeRequests.values());
         deleteBinding(sessionId, contentId);
         const workspaceId = this.workspaceIds.get(sessionId);
-        if (workspaceId !== undefined)
-            deleteWorkspaceBinding(workspaceId, contentId);
+        if (workspaceId !== undefined) {
+            deleteWorkspaceBinding(workspaceId);
+            deleteLegacyWorkspaceBinding(workspaceId, contentId);
+        }
         this.views.delete(mapKey);
         void this.cleanup(request, record?.view);
     }
@@ -303,7 +325,9 @@ export class CodingNsWebTerminals extends Service {
             const environment = unwrap(await resolveRemote(this.remote).environment(sessionId));
             if (environment.workspaceId !== undefined)
                 this.workspaceIds.set(sessionId, environment.workspaceId);
-            return unwrap(await resolveRemote(this.remote).list(sessionId));
+            const result = unwrap(await resolveRemote(this.remote).list(sessionId));
+            debugInfo('codingns4dsh: client terminal recover', { sessionId, workspaceId: environment.workspaceId, terminalIds: result.map((entry) => entry.id) });
+            return result;
         })().finally(() => this.recoveries.delete(sessionId));
         this.recoveries.set(sessionId, recovery);
         return recovery;
@@ -313,6 +337,12 @@ export class CodingNsWebTerminals extends Service {
         if (request !== undefined)
             void this.cleanup(request);
     }
+    /** 由 Client 的 Remote 注入回调调用，完成启动阶段延迟的关闭请求。 */
+    remoteReady() {
+        debugInfo('codingns4dsh: client terminal remote ready notification');
+        this.remoteReadyStore.set(true);
+        void this.flushCleanup();
+    }
     async dispose() {
         await Promise.all([...this.views.values()].map((record) => record.view.dispose()));
         this.views.clear();
@@ -321,23 +351,59 @@ export class CodingNsWebTerminals extends Service {
     }
     rememberWorkspace(sessionId, contentId, id, workspaceId) {
         this.workspaceIds.set(sessionId, workspaceId);
-        writeWorkspaceBinding(workspaceId, contentId, id);
+        const existing = readWorkspaceBindingWithMigration(workspaceId, contentId);
+        const resolvedId = existing ?? id;
+        // 修正首次渲染时已经写入的会话键，避免第二个会话继续携带临时 ID。
+        writeBinding(sessionId, contentId, resolvedId);
+        // 旧版本的工作区键带 contentId；统一重写成只含 Workspace ID 的新键。
+        writeWorkspaceBinding(workspaceId, contentId, resolvedId);
+        deleteLegacyWorkspaceBinding(workspaceId, contentId);
+        return { id: resolvedId, existing: existing !== undefined };
     }
     async cleanup(request, view) {
         try {
+            debugInfo('codingns4dsh: client terminal cleanup begin', { sessionId: request.sessionId, terminalId: request.id, hasView: view !== undefined });
             if (view === undefined)
                 unwrap(await resolveRemote(this.remote).close(request.sessionId, request.id));
             else
                 await view.close();
+            debugInfo('codingns4dsh: client terminal cleanup success', { sessionId: request.sessionId, terminalId: request.id });
             this.closeRequests.delete(String(request.id));
             persistCloseRequests(this.closeRequests.values());
             this.closeFailureStore.set(this.closeFailureStore.getSnapshot().filter((item) => item.id !== request.id));
         }
         catch (error) {
+            if (isTerminalRemoteUnavailable(error)) {
+                debugInfo('codingns4dsh: client terminal cleanup deferred', { sessionId: request.sessionId, terminalId: request.id });
+                return;
+            }
+            debugWarn('codingns4dsh: client terminal cleanup failed', { sessionId: request.sessionId, terminalId: request.id, error: errorMessage(error) });
             const failure = { ...request, message: errorMessage(error) };
             this.closeFailureStore.set([...this.closeFailureStore.getSnapshot().filter((item) => item.id !== request.id), failure]);
         }
     }
+    async flushCleanup() {
+        if (this.cleanupQueued || this.closeRequests.size === 0)
+            return;
+        try {
+            resolveRemote(this.remote);
+        }
+        catch (error) {
+            if (isTerminalRemoteUnavailable(error)) {
+                debugInfo('codingns4dsh: client terminal cleanup waiting for remote');
+                return;
+            }
+            throw error;
+        }
+        this.cleanupQueued = true;
+        try {
+            for (const request of [...this.closeRequests.values()])
+                await this.cleanup(request);
+        }
+        finally {
+            this.cleanupQueued = false;
+        }
+    }
 }
 function unwrap(result) {
     if (typeof result !== 'object' || result === null || !('ok' in result)) {
@@ -359,10 +425,19 @@ function sameResize(left, right) {
 function errorMessage(error) {
     return error instanceof Error ? error.message : String(error);
 }
+function isTerminalRemoteUnavailable(error) {
+    return errorMessage(error) === '终端服务尚未就绪，请稍后重试';
+}
 function bindingKey(sessionId, contentId) {
     return `${BINDING_PREFIX}${JSON.stringify([sessionId, contentId])}`;
 }
-function workspaceBindingKey(workspaceId, contentId) {
+function workspaceBindingKey(workspaceId) {
+    // 工作区模式的终端身份不能带 session、tab 或 contentId；这些值在每个
+    // DSH 会话中都会重新生成，带进去就会把所谓的工作区绑定重新拆回会话绑定。
+    return `${BINDING_PREFIX}${JSON.stringify(['workspace', workspaceId])}`;
+}
+/** 0.1.7 早期构建把 contentId 写进了工作区键，读取它只用于一次迁移。 */
+function legacyWorkspaceBindingKey(workspaceId, contentId) {
     return `${BINDING_PREFIX}${JSON.stringify(['workspace', workspaceId, contentId])}`;
 }
 function readBinding(sessionId, contentId) {
@@ -372,16 +447,29 @@ function readBinding(sessionId, contentId) {
 function writeBinding(sessionId, contentId, id) {
     writeString(bindingKey(sessionId, contentId), String(id));
 }
-function readWorkspaceBinding(workspaceId, contentId) {
-    const value = readString(workspaceBindingKey(workspaceId, contentId));
+function readWorkspaceBinding(workspaceId, _contentId) {
+    const value = readString(workspaceBindingKey(workspaceId));
     return value !== null && /^[\w-]{1,128}$/u.test(value) ? value : undefined;
 }
-function writeWorkspaceBinding(workspaceId, contentId, id) {
-    writeString(workspaceBindingKey(workspaceId, contentId), String(id));
+function readWorkspaceBindingWithMigration(workspaceId, contentId) {
+    const current = readWorkspaceBinding(workspaceId);
+    if (current !== undefined)
+        return current;
+    const legacy = readString(legacyWorkspaceBindingKey(workspaceId, contentId));
+    return legacy !== null && /^[\w-]{1,128}$/u.test(legacy) ? legacy : undefined;
+}
+function writeWorkspaceBinding(workspaceId, _contentId, id) {
+    writeString(workspaceBindingKey(workspaceId), String(id));
+}
+function deleteWorkspaceBinding(workspaceId, _contentId) {
+    try {
+        localStorage.removeItem(workspaceBindingKey(workspaceId));
+    }
+    catch { /* 浏览器禁用存储时仅失去跨刷新绑定。 */ }
 }
-function deleteWorkspaceBinding(workspaceId, contentId) {
+function deleteLegacyWorkspaceBinding(workspaceId, contentId) {
     try {
-        localStorage.removeItem(workspaceBindingKey(workspaceId, contentId));
+        localStorage.removeItem(legacyWorkspaceBindingKey(workspaceId, contentId));
     }
     catch { /* 浏览器禁用存储时仅失去跨刷新绑定。 */ }
 }

package/data/build/dist/client/terminal/recovery.d.ts

@@ -0,0 +1,50 @@
+import type { CodingNsWebTerminals, WebTerminalInfo } from './model.js';
+/** Sidebar 记录的最小结构，避免恢复逻辑绑定某个 DSH 版本的类型包。 */
+export interface TerminalSidebarTab {
+    readonly id: string;
+    readonly kind: string;
+}
+interface TerminalNavigationSnapshot {
+    readonly params?: unknown;
+}
+interface TerminalOccurrence {
+    readonly navigation: {
+        getSnapshot(): TerminalNavigationSnapshot;
+    };
+}
+export interface TerminalSidebarMountedSource {
+    readonly getSnapshot: () => string | undefined;
+    readonly subscribe: (listener: () => void) => () => void;
+}
+export interface TerminalSidebarRecoveryPort {
+    readonly tabsIn?: (sessionId: string) => readonly TerminalSidebarTab[];
+    readonly openTabs?: {
+        getSnapshot(): readonly {
+            readonly sessionId: string;
+            readonly tabId: string;
+            readonly kind: string;
+        }[];
+        subscribe?: (listener: () => void) => () => void;
+    };
+    readonly mounted?: TerminalSidebarMountedSource;
+    readonly openTabIn?: (sessionId: string, kind: string, options?: {
+        readonly params?: unknown;
+    }) => void;
+    readonly tabDomain?: {
+        occurrence(sessionId: string, tab: {
+            readonly id: string;
+        }): TerminalOccurrence;
+    };
+}
+export interface TerminalSessionRecovery {
+    ensure(sessionId: string): Promise<readonly WebTerminalInfo[]>;
+}
+/**
+ * 将 Host 已存在的终端补回当前 DSH 会话的 Sidebar。
+ *
+ * DSH 的布局和标签身份以 sessionId 为存储边界，所以工作区共享只解决
+ * Host 终端身份，不能替新会话创建 Sidebar 标签。这里把两个生命周期接起来。
+ */
+export declare function createTerminalSessionRecovery(webTerminals: Pick<CodingNsWebTerminals, 'recover'>, sidebar: TerminalSidebarRecoveryPort, terminalKind: string): TerminalSessionRecovery;
+export {};
+//# sourceMappingURL=recovery.d.ts.map

package/data/build/dist/client/terminal/recovery.js

@@ -0,0 +1,101 @@
+import { debugInfo, debugWarn } from '../../shared/debug.js';
+/**
+ * 将 Host 已存在的终端补回当前 DSH 会话的 Sidebar。
+ *
+ * DSH 的布局和标签身份以 sessionId 为存储边界，所以工作区共享只解决
+ * Host 终端身份，不能替新会话创建 Sidebar 标签。这里把两个生命周期接起来。
+ */
+export function createTerminalSessionRecovery(webTerminals, sidebar, terminalKind) {
+    const pending = new Map();
+    const ensure = (sessionId) => {
+        const normalized = sessionId.trim();
+        if (normalized === '')
+            return Promise.resolve([]);
+        const current = pending.get(normalized);
+        if (current !== undefined)
+            return current;
+        debugInfo('codingns4dsh: client terminal sidebar recovery begin', { sessionId: normalized });
+        const task = recoverAndOpen(normalized)
+            .catch((cause) => {
+            debugWarn('codingns4dsh: client terminal sidebar recovery failed', { sessionId: normalized, error: messageOf(cause) });
+            throw cause;
+        })
+            .finally(() => pending.delete(normalized));
+        pending.set(normalized, task);
+        return task;
+    };
+    const recoverAndOpen = async (sessionId) => {
+        const terminals = await webTerminals.recover(sessionId);
+        const existing = readTabs(sidebar, sessionId);
+        debugInfo('codingns4dsh: client terminal sidebar recovery listed', {
+            sessionId,
+            terminalIds: terminals.map((terminal) => terminal.id),
+            existingTabs: existing.map((tab) => ({ id: tab.id, kind: tab.kind })),
+        });
+        const opened = new Set();
+        for (const tab of existing) {
+            if (tab.kind !== terminalKind)
+                continue;
+            const id = terminalIdOf(sidebar, sessionId, tab);
+            if (id === undefined) {
+                // 旧版标签没有导航参数时仍代表一个有效终端，避免恢复时重复创建。
+                for (const terminal of terminals)
+                    opened.add(terminal.id);
+                debugInfo('codingns4dsh: client terminal sidebar recovery legacy tab', { sessionId, tabId: tab.id });
+            }
+            else {
+                opened.add(id);
+            }
+        }
+        for (const terminal of terminals) {
+            if (opened.has(terminal.id)) {
+                debugInfo('codingns4dsh: client terminal sidebar recovery skip existing', { sessionId, terminalId: terminal.id });
+                continue;
+            }
+            if (typeof sidebar.openTabIn !== 'function') {
+                debugWarn('codingns4dsh: client terminal sidebar recovery unavailable', { sessionId, terminalId: terminal.id, reason: 'openTabIn-undefined' });
+                continue;
+            }
+            sidebar.openTabIn(sessionId, terminalKind, { params: { terminalId: terminal.id } });
+            debugInfo('codingns4dsh: client terminal sidebar recovery opened', { sessionId, terminalId: terminal.id });
+            opened.add(terminal.id);
+        }
+        return terminals;
+    };
+    return { ensure };
+}
+function readTabs(sidebar, sessionId) {
+    if (typeof sidebar.tabsIn === 'function') {
+        try {
+            return sidebar.tabsIn(sessionId);
+        }
+        catch {
+            return [];
+        }
+    }
+    return readOpenTabs(sidebar)
+        .filter((tab) => tab.sessionId === sessionId)
+        .map((tab) => ({ id: tab.tabId, kind: tab.kind }));
+}
+function readOpenTabs(sidebar) {
+    try {
+        return sidebar.openTabs?.getSnapshot() ?? [];
+    }
+    catch {
+        return [];
+    }
+}
+function terminalIdOf(sidebar, sessionId, tab) {
+    try {
+        const params = sidebar.tabDomain?.occurrence(sessionId, tab).navigation.getSnapshot().params;
+        if (typeof params !== 'object' || params === null)
+            return undefined;
+        const terminalId = params.terminalId;
+        return typeof terminalId === 'string' && terminalId.trim() !== '' ? terminalId : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function messageOf(value) { return value instanceof Error ? value.message : String(value); }
+//# sourceMappingURL=recovery.js.map

package/data/build/dist/client/terminal/ui.d.ts

@@ -1,7 +1,7 @@
 import type { Context } from '@deepseek-ai/cordis';
-import type { SettingsScope } from '@deepseek-ai/dsh-client-ui-settings/client';
 import type { CodingNsSettings } from '../../shared/contracts/config.js';
 import { CodingNsWebTerminals, type WebTerminalId } from './model.js';
+import type { CodingNsSettingsStore } from '../../dsh-capabilities/settings-store.js';
 export declare const TERMINAL_PROVIDER_ID = "codingns4dsh/terminal";
 export declare const TERMINAL_KIND = "terminal";
 interface TerminalParams {
@@ -9,7 +9,7 @@ interface TerminalParams {
     readonly shellPath?: string;
 }
 /** 注册终端类型及其所有公开 Sidebar Slot。 */
-export declare function registerCodingNsTerminalUi(ctx: Context, webTerminals: CodingNsWebTerminals, settings: SettingsScope<CodingNsSettings>): () => void;
+export declare function registerCodingNsTerminalUi(ctx: Context, webTerminals: CodingNsWebTerminals, settings: CodingNsSettingsStore<CodingNsSettings>): () => void;
 declare module '@deepseek-ai/dsh-client-ui-sidebar-right/client' {
     interface SidebarRightTabParamsMap {
         terminal: TerminalParams;

package/data/build/dist/client/terminal/ui.js

@@ -1,6 +1,8 @@
 import { createElement, Fragment, useEffect, useLayoutEffect, useRef, useState, useSyncExternalStore, } from 'react';
 import { Button, IconChevronDownOutline14, Menu, } from '@deepseek-ai/dsh-client-ui-primitives';
+import { resolveChevronDownIcon } from '../../dsh-capabilities/client/primitives-adapter.js';
 import { CodingNsWebTerminals } from './model.js';
+import { createTerminalSessionRecovery } from './recovery.js';
 import { installTerminalStyles, terminalClass } from './styles.js';
 import { CodingNsXtermView } from './xterm-view.js';
 import { codingNsTranslator, useCodingNsTranslator } from '../locale.js';
@@ -18,8 +20,9 @@ export function registerCodingNsTerminalUi(ctx, webTerminals, settings) {
     const registerCloseHandler = sidebarRight.registerCloseHandler;
     // alpha2 提供多 Tab 元数据和关闭 API；rc3 没有这些字段，不能直接调用。
     const legacyCloseFallback = typeof registerCloseHandler !== 'function';
-    const supportsMultiple = typeof ctx.sidebarRight.openTabs !== 'undefined';
-    const guideEntrySlot = ctx.slots.specDynamic?.('sidebar.right.tab.guide.entry') !== undefined;
+    const recoverySidebar = sidebarRight;
+    const supportsMultiple = readSidebarOpenTabs(recoverySidebar) !== undefined;
+    const recovery = createTerminalSessionRecovery(webTerminals, recoverySidebar, TERMINAL_KIND);
     disposers.push(installTerminalStyles());
     const tabDefinition = {
         id: TERMINAL_PROVIDER_ID,
@@ -44,14 +47,13 @@ export function registerCodingNsTerminalUi(ctx, webTerminals, settings) {
         name: 'sidebar.right.pane.tab.title', key: TERMINAL_PROVIDER_ID,
         inject: () => ({ webTerminals, locale: ctx.locale }),
     }, TerminalTitle)));
-    if (guideEntrySlot)
-        disposers.push(ctx.slots.inject('sidebar.right.tab.guide.entry', () => ctx.slots.register({
-            name: 'sidebar.right.tab.guide.entry', key: TERMINAL_PROVIDER_ID,
-            inject: () => ({ webTerminals, locale: ctx.locale }),
-        }, TerminalGuide)));
+    disposers.push(ctx.slots.inject('sidebar.right.tab.guide.entry', () => ctx.slots.register({
+        name: 'sidebar.right.tab.guide.entry', key: TERMINAL_PROVIDER_ID,
+        inject: () => ({ webTerminals, recoverSession: recovery.ensure, locale: ctx.locale }),
+    }, TerminalGuide)));
     disposers.push(ctx.slots.inject('shell.overlay', () => ctx.slots.register({
         name: 'shell.overlay', id: 'codingns4dsh-terminal-cleanup', order: 1000,
-        inject: () => ({ webTerminals, locale: ctx.locale }),
+        inject: () => ({ webTerminals, locale: ctx.locale, sidebarRight: recoverySidebar, recoverSession: recovery.ensure }),
     }, TerminalCleanup)));
     if (typeof registerCloseHandler === 'function')
         disposers.push(registerCloseHandler.call(ctx.sidebarRight, TERMINAL_KIND, (sessionId, tab) => {
@@ -141,12 +143,13 @@ function TerminalTitle({ sessionId, useTabInfo, webTerminals, locale }) {
             title: t('terminal.rename'),
         }, state.title));
 }
-function TerminalGuide({ sessionId, useTabInfo, webTerminals, title, description, locale }) {
+function TerminalGuide({ sessionId, useTabInfo, webTerminals, recoverSession, title, description, locale }) {
     const t = useCodingNsTranslator(locale);
     const info = useTabInfo();
     const [open, setOpen] = useState(false);
     const [attempt, setAttempt] = useState(0);
     const [state, setState] = useState({ phase: 'loading' });
+    useEffect(() => { void recoverSession(String(sessionId)).catch(() => undefined); }, [recoverSession, sessionId]);
     useEffect(() => {
         if (!open)
             return;
@@ -200,7 +203,7 @@ function TerminalGuide({ sessionId, useTabInfo, webTerminals, title, description
             'aria-haspopup': 'menu',
             'aria-expanded': open,
             onClick: () => { setState({ phase: 'loading' }); setOpen((value) => !value); },
-        }, createElement(IconChevronDownOutline14)),
+        }, createElement(resolveChevronDownIcon())),
     }));
 }
 function shellMenuItems(state, t) {
@@ -215,8 +218,23 @@ function shellMenuItems(state, t) {
         return [{ id: 'empty', label: t('terminal.noShell'), disabled: true }];
     return state.shells.map((shell) => ({ id: shell.path, label: shell.name }));
 }
-function TerminalCleanup({ webTerminals, locale }) {
+function TerminalCleanup({ webTerminals, locale, sidebarRight, recoverSession }) {
     const t = useCodingNsTranslator(locale);
+    const openTabs = readSidebarOpenTabs(sidebarRight);
+    const openTabSnapshot = useSyncExternalStore(openTabs?.subscribe ?? noSubscribe, openTabs?.getSnapshot ?? noOpenTabs, openTabs?.getSnapshot ?? noOpenTabs);
+    const remoteReady = useSyncExternalStore(webTerminals.remoteReadyState.subscribe.bind(webTerminals.remoteReadyState), webTerminals.remoteReadyState.getSnapshot.bind(webTerminals.remoteReadyState), webTerminals.remoteReadyState.getSnapshot.bind(webTerminals.remoteReadyState));
+    const mounted = readSidebarMounted(sidebarRight);
+    const mountedSessionId = useSyncExternalStore(mounted?.subscribe ?? noSubscribe, mounted?.getSnapshot ?? noMountedSession, mounted?.getSnapshot ?? noMountedSession);
+    useEffect(() => {
+        // 0.1.7 才提供 mounted 会话 observable；旧版本保留原有 Guide 挂载路径。
+        if (!remoteReady || mounted === undefined)
+            return;
+        const sessionIds = new Set(openTabSnapshot.map((tab) => String(tab.sessionId).trim()).filter(Boolean));
+        if (mountedSessionId !== undefined)
+            sessionIds.add(String(mountedSessionId).trim());
+        for (const sessionId of sessionIds)
+            void recoverSession(sessionId).catch(() => undefined);
+    }, [openTabSnapshot, recoverSession, remoteReady, mountedSessionId]);
     const failures = useSyncExternalStore(webTerminals.closeFailures.subscribe.bind(webTerminals.closeFailures), webTerminals.closeFailures.getSnapshot.bind(webTerminals.closeFailures));
     if (failures.length === 0)
         return null;
@@ -226,6 +244,26 @@ function TerminalCleanup({ webTerminals, locale }) {
         role: 'alert',
     }, createElement('span', undefined, t('terminal.cleanupFailed', { title: failure.title, message: failure.message })), createElement('button', { type: 'button', onClick: () => webTerminals.retryClose(failure.id) }, t('terminal.retry')))));
 }
+function readSidebarOpenTabs(sidebarRight) {
+    try {
+        return sidebarRight.openTabs;
+    }
+    catch {
+        return undefined;
+    }
+}
+function readSidebarMounted(sidebarRight) {
+    try {
+        return sidebarRight.mounted;
+    }
+    catch {
+        return undefined;
+    }
+}
+function noMountedSession() { return undefined; }
+const EMPTY_OPEN_TABS = [];
+function noOpenTabs() { return EMPTY_OPEN_TABS; }
+function noSubscribe() { return () => undefined; }
 function terminalParams(info) {
     const params = info.tab.navigation.params;
     return typeof params === 'object' && params !== null ? params : {};

package/data/build/dist/client/terminal/xterm-view.d.ts

@@ -1,10 +1,10 @@
 import type { ReactElement } from 'react';
-import type { SettingsScope } from '@deepseek-ai/dsh-client-ui-settings/client';
+import type { CodingNsSettingsStore } from '../../dsh-capabilities/settings-store.js';
 import { type CodingNsSettings } from '../../shared/contracts/config.js';
 import type { CodingNsTerminalView } from './model.js';
 export interface CodingNsXtermViewProps {
     readonly view: CodingNsTerminalView;
-    readonly settings: SettingsScope<CodingNsSettings>;
+    readonly settings: CodingNsSettingsStore<CodingNsSettings>;
     readonly themeRevision: number;
     readonly onNewTerminal: () => void;
 }

package/data/build/dist/client/terminal/xterm-view.js

@@ -3,6 +3,7 @@ import { Button, IconPlusOutline16 } from '@deepseek-ai/dsh-client-ui-primitives
 import { FitAddon } from '@xterm/addon-fit';
 import { Terminal } from '@xterm/xterm';
 import xtermCss from '@xterm/xterm/css/xterm.css';
+import { resolvePlusIcon } from '../../dsh-capabilities/client/primitives-adapter.js';
 import { DEFAULT_TERMINAL_ENHANCEMENT_SETTINGS, } from '../../shared/contracts/config.js';
 import { terminalClass } from './styles.js';
 /** 使用与 DSH 内置终端相同的布局、状态条和 xterm 默认参数。 */
@@ -116,7 +117,7 @@ function TerminalStatus({ state, view, onNewTerminal, }) {
     }, state.phase === 'disconnected' ? '重新连接' : '重试') : null, ended ? createElement(Button, {
         variant: 'primary',
         size: 'sm',
-        icon: createElement(IconPlusOutline16),
+        icon: createElement(resolvePlusIcon()),
         onClick: onNewTerminal,
     }, '新建终端') : null);
 }

package/data/build/dist/client/theme.d.ts

@@ -14,7 +14,7 @@ export declare const dshThemeColor: {
     readonly inputBackground: "var(--dsw-specific-input-major, Canvas)";
     readonly surfaceSubtle: "var(--dsw-alias-bg-secondary, rgba(127, 127, 127, 0.06))";
     readonly buttonBackground: "var(--dsw-alias-button-elevated-fill, transparent)";
-    readonly menuBackground: "var(--dsw-specific-menu, Canvas)";
+    readonly menuBackground: "var(--dsw-alias-bg-layer-3, var(--dsw-alias-bg-l1, var(--dsw-specific-menu, Canvas)))";
     readonly pageBackground: "var(--dsw-alias-bg-primary, Canvas)";
     readonly overlay: "var(--dsw-alias-bg-mask-1, rgba(0, 0, 0, 0.45))";
     readonly accent: "var(--dsw-alias-button-info-fill, #1677ff)";
@@ -51,6 +51,11 @@ export declare const dshSettingsRowStyle: CSSProperties;
 export declare const dshSettingsListRowStyle: CSSProperties;
 export declare const dshSettingsHelpStyle: CSSProperties;
 export declare const dshSettingsNoteStyle: CSSProperties;
+/** 终端外观设置的紧凑双列布局。 */
+export declare const dshSettingsGridStyle: CSSProperties;
+export declare const dshSettingsSectionHeaderStyle: CSSProperties;
+/** 设置写入结果的顶部浮动提示。 */
+export declare const dshSettingsToastStyle: CSSProperties;
 /** 模态框和弹出菜单必须成对设置前景色与背景色。 */
 export declare const dshPopupSurfaceStyle: CSSProperties;
 //# sourceMappingURL=theme.d.ts.map