@jingyi0605/codingns4dsh 0.1.0 → 0.1.1

package/data/build/dist/host/settings.js

@@ -1,5 +1,6 @@
 import z from '@deepseek-ai/schemastery';
-import { CODINGNS_SETTINGS_NAMESPACE, DEFAULT_CODINGNS_SETTINGS, } from '../shared/contracts/config.js';
+import { CODINGNS_SETTINGS_NAMESPACE, isCodingNsSettingsEntryId, DEFAULT_CODINGNS_SETTINGS, } from '../shared/contracts/config.js';
+import { debugInfo } from '../shared/debug.js';
 /**
  * DSH 设置服务使用的 Codingns4DSH namespace schema。
  *
@@ -55,9 +56,26 @@ export const CodingNsSettingsSchema = z.object({
     workspaceSessionEnhancement: z.object({
         showAdapterLogo: z.boolean().default(DEFAULT_CODINGNS_SETTINGS.workspaceSessionEnhancement.showAdapterLogo),
         showArchivedSessions: z.boolean().default(DEFAULT_CODINGNS_SETTINGS.workspaceSessionEnhancement.showArchivedSessions),
+        showWorkspaceHiding: z.boolean().default(DEFAULT_CODINGNS_SETTINGS.workspaceSessionEnhancement.showWorkspaceHiding),
+        hiddenWorkspaceIds: z.array(z.string().min(1).max(512)).default(DEFAULT_CODINGNS_SETTINGS.workspaceSessionEnhancement.hiddenWorkspaceIds),
         showSubscriptionUsage: z.boolean().default(DEFAULT_CODINGNS_SETTINGS.workspaceSessionEnhancement.showSubscriptionUsage),
+        showQuickPhrases: z.boolean().default(DEFAULT_CODINGNS_SETTINGS.workspaceSessionEnhancement.showQuickPhrases),
+        quickPhrases: z.array(z.object({
+            id: z.string().min(1).max(128),
+            text: z.string().min(1).max(4000),
+        })).default(DEFAULT_CODINGNS_SETTINGS.workspaceSessionEnhancement.quickPhrases),
+        // 缺少该字段说明是旧配置；Client 首次加载时会补齐内置快捷会话。
+        quickPhrasesSeeded: z.boolean().default(false),
     }).default(DEFAULT_CODINGNS_SETTINGS.workspaceSessionEnhancement),
 });
+/**
+ * DSH 0.1.7 只会把 `volatile` 配置投影成可编辑 ConfigForm。
+ *
+ * 整个根节点标记为 volatile，保留 Host 侧 `cliSessions` 的持久化能力；
+ * Client 适配器会在镜像配置时剔除这个 Host-only 字段，避免会话索引进入浏览器。
+ */
+export const CodingNsConfigSchema = CodingNsSettingsSchema.volatile();
+let lastConfigDescriptorSignature;
 /** 颜色字段只接受完整十六进制颜色，`null` 表示继承 DSH 原生值。 */
 function nullableColorSchema() {
     return z.union([z.string().pattern(/^#[0-9A-Fa-f]{6}$/u), z.const(null)]).default(null);
@@ -73,8 +91,81 @@ function nullableNumberSchema(min, max) {
  */
 export function registerCodingNsSettings(ctx) {
     const settings = ctx.settings;
-    return settings.register(CODINGNS_SETTINGS_NAMESPACE, CodingNsSettingsSchema, {
-        applies: 'live',
+    const legacyRegister = settings.register;
+    if (typeof legacyRegister === 'function') {
+        debugInfo('codingns4dsh: host settings source=legacy-settings');
+        return legacyRegister.call(settings, CODINGNS_SETTINGS_NAMESPACE, CodingNsSettingsSchema, {
+            applies: 'live',
+        });
+    }
+    debugInfo('codingns4dsh: host settings source=config-forms');
+    return createConfigSettingsScope(ctx, settings);
+}
+/** 将 DSH 0.1.7 SettingsForms 适配成 Host 业务沿用的 SettingsScope。 */
+function createConfigSettingsScope(ctx, settings) {
+    const provider = settings;
+    let previous = readConfigSettings(provider);
+    const listeners = new Set();
+    const eventContext = ctx;
+    const disposeEvent = eventContext.on?.('settings/document-updated', (namespace) => {
+        if (!isCodingNsSettingsNamespace(namespace))
+            return;
+        const next = readConfigSettings(provider);
+        const prev = previous;
+        previous = next;
+        if (next === prev)
+            return;
+        for (const listener of [...listeners])
+            void listener(next, prev);
     });
+    if (disposeEvent !== undefined) {
+        ctx.effect(() => disposeEvent, 'codingns4dsh: ConfigForm 设置监听');
+    }
+    return {
+        get: () => readConfigSettings(provider),
+        watch: (listener) => {
+            listeners.add(listener);
+            return () => listeners.delete(listener);
+        },
+        update: async (patch) => {
+            if (typeof provider.update !== 'function')
+                throw new Error('DSH ConfigForms 不支持 update');
+            await provider.update(resolveConfigSettingsNamespace(provider), patch);
+        },
+        replace: async (section) => {
+            if (typeof provider.replace !== 'function')
+                throw new Error('DSH ConfigForms 不支持 replace');
+            await provider.replace(resolveConfigSettingsNamespace(provider), section);
+        },
+    };
+}
+function readConfigSettings(settings) {
+    const descriptor = findConfigSettingsDescriptor(settings);
+    if (descriptor === undefined) {
+        console.warn('codingns4dsh: host ConfigForms 未找到设置 namespace，使用默认值');
+        return DEFAULT_CODINGNS_SETTINGS;
+    }
+    return descriptor.value;
+}
+/** DSH 0.1.7 使用插件 entry id；旧 SettingsScope 使用显式 namespace。 */
+function findConfigSettingsDescriptor(settings) {
+    const descriptors = settings.describe({ redactSecrets: false });
+    const signature = JSON.stringify(descriptors.map((item) => ({
+        ns: item.ns,
+        revision: item.revision,
+        writable: item.writable,
+        hasValue: item.value !== undefined,
+    })));
+    if (signature !== lastConfigDescriptorSignature) {
+        lastConfigDescriptorSignature = signature;
+        debugInfo('codingns4dsh: host ConfigForms descriptors', JSON.parse(signature));
+    }
+    return descriptors.find((item) => isCodingNsSettingsNamespace(item.ns));
+}
+function resolveConfigSettingsNamespace(settings) {
+    return findConfigSettingsDescriptor(settings)?.ns ?? CODINGNS_SETTINGS_NAMESPACE;
+}
+function isCodingNsSettingsNamespace(namespace) {
+    return isCodingNsSettingsEntryId(namespace);
 }
 //# sourceMappingURL=settings.js.map

package/data/build/dist/host/terminal/backends/tmux-backend.d.ts

@@ -37,4 +37,5 @@ export declare class TmuxTerminalBackend implements TerminalRuntimeAdapter {
     private requireTmuxPath;
 }
 export declare function tmuxSessionName(runtimeSessionKey: string): string;
+export declare function detectTmuxPath(platform: string, pathValue?: string | undefined): string | null;
 //# sourceMappingURL=tmux-backend.d.ts.map

package/data/build/dist/host/terminal/backends/tmux-backend.js

@@ -166,10 +166,12 @@ export function tmuxSessionName(runtimeSessionKey) {
 function runCommand(command, args) {
     return spawnSync(command, args, { encoding: 'utf8', windowsHide: true, shell: false });
 }
-function detectTmuxPath(platform) {
-    const candidates = platform === 'darwin'
+export function detectTmuxPath(platform, pathValue = process.env.PATH) {
+    const fixedCandidates = platform === 'darwin'
         ? ['/opt/homebrew/bin/tmux', '/usr/local/bin/tmux', '/usr/bin/tmux']
         : ['/usr/bin/tmux', '/usr/local/bin/tmux', '/bin/tmux'];
+    const pathCandidates = (pathValue ?? '').split(':').filter(Boolean).map((directory) => `${directory}/tmux`);
+    const candidates = [...new Set([...fixedCandidates, ...pathCandidates])];
     return candidates.find(isExecutable) ?? null;
 }
 function isExecutable(path) {

package/data/build/dist/host/terminal/controller-factory.d.ts

@@ -1,5 +1,6 @@
 import type { Context } from '@deepseek-ai/cordis';
 import type { TerminalEnhancementSettings } from '../../shared/contracts/config.js';
+import type { CodingNsTerminalRuntimeType } from '../../shared/contracts/terminal.js';
 import { CodingNsTerminalController, type DshTerminalAgent } from './terminal-controller.js';
 import type { TerminalRuntimeAdapter } from './runtime-adapter.js';
 import { CodingNsTerminalService } from './terminal-service.js';
@@ -9,6 +10,7 @@ interface TerminalControllerFactoryCommonOptions {
     readonly platform?: string;
     readonly generation?: (agent: DshTerminalAgent, attachmentId: string) => string;
     readonly workspaceId?: (agent: DshTerminalAgent, cwd: string) => string;
+    readonly registerWorkspaceRoot?: (workspaceId: string, cwd: string) => void;
     readonly resolveWorkspaceRoot?: (workspaceId: string) => string | null;
 }
 export type TerminalControllerFactoryOptions = TerminalControllerFactoryCommonOptions & ({
@@ -22,6 +24,8 @@ export type TerminalControllerFactoryOptions = TerminalControllerFactoryCommonOp
 });
 export interface TerminalControllerFactoryResult {
     readonly mode: 'baseline' | 'enhanced';
+    readonly runtimeTypes: readonly CodingNsTerminalRuntimeType[];
+    readonly runtimeWarning?: string;
     readonly controller: CodingNsTerminalController;
     readonly service: CodingNsTerminalService;
     readonly processService: TerminalProcessService;

package/data/build/dist/host/terminal/controller-factory.js

@@ -1,6 +1,6 @@
 import { ConptyTerminalBackend } from './backends/conpty-backend.js';
 import { LocalPtyTerminalBackend } from './backends/local-pty-backend.js';
-import { TmuxTerminalBackend } from './backends/tmux-backend.js';
+import { detectTmuxPath, TmuxTerminalBackend } from './backends/tmux-backend.js';
 import { CodingNsTerminalController } from './terminal-controller.js';
 import { TerminalRuntimeManager } from './runtime-manager.js';
 import { CodingNsTerminalService } from './terminal-service.js';
@@ -16,12 +16,21 @@ import { TerminalProcessService } from './terminal-process-service.js';
 export async function createTerminalController(ctx, options) {
     const platform = options.platform ?? process.platform;
     if (!options.enhancedEnabled) {
-        const backend = options.baselineBackend ?? new LocalPtyTerminalBackend({ platform });
+        const localBackend = options.baselineBackend ?? new LocalPtyTerminalBackend({ platform });
+        const tmuxPath = platform === 'darwin' || platform === 'linux' ? detectTmuxPath(platform) : null;
+        const tmuxBackend = tmuxPath === null || localBackend.runtimeTypes.includes('tmux')
+            ? undefined
+            : new TmuxTerminalBackend({ platform, tmuxPath });
+        const backends = tmuxBackend === undefined ? [localBackend] : [localBackend, tmuxBackend];
         return assembleController(ctx, {
             mode: 'baseline',
             hostId: 'local-baseline',
             store: new CodingNsTerminalStore(new InMemoryTerminalStorePersistence()),
-            backend,
+            backends,
+            runtimeTypes: backends.flatMap((backend) => backend.runtimeTypes),
+            ...(tmuxBackend === undefined && !localBackend.runtimeTypes.includes('tmux') && (platform === 'darwin' || platform === 'linux')
+                ? { runtimeWarning: '未检测到可执行的 tmux，调试终端将回退到 local-pty。' }
+                : {}),
             processStore: new TerminalProcessStore(new InMemoryTerminalProcessStorePersistence()),
             settings: options.settings,
             platform,
@@ -31,24 +40,31 @@ export async function createTerminalController(ctx, options) {
             ...(options.resolveWorkspaceRoot === undefined ? {} : { resolveWorkspaceRoot: options.resolveWorkspaceRoot }),
         });
     }
-    const backend = platform === 'win32'
+    const localBackend = new LocalPtyTerminalBackend({ platform });
+    const tmuxPath = platform === 'darwin' || platform === 'linux' ? detectTmuxPath(platform) : null;
+    const enhancedBackend = platform === 'win32'
         ? new ConptyTerminalBackend({ platform })
-        : new TmuxTerminalBackend({ platform });
+        : tmuxPath === null ? localBackend : new TmuxTerminalBackend({ platform, tmuxPath });
+    const runtimeTypes = [...enhancedBackend.runtimeTypes];
     return assembleController(ctx, {
         mode: 'enhanced',
         hostId: options.hostId,
         store: new CodingNsTerminalStore(new JsonFileTerminalStorePersistence(options.storeFilename)),
         processStore: new TerminalProcessStore(new JsonFileTerminalProcessStorePersistence(options.processStoreFilename ?? `${options.storeFilename}.processes`)),
-        backend,
+        backends: [enhancedBackend],
+        runtimeTypes,
+        ...(enhancedBackend === localBackend ? { runtimeWarning: '未检测到可执行的 tmux，终端已回退到 local-pty。' } : {}),
+        ...(enhancedBackend === localBackend ? { runtimeType: () => 'local-pty' } : {}),
         settings: options.settings,
         platform,
         ...(options.generation === undefined ? {} : { generation: options.generation }),
         ...(options.workspaceId === undefined ? {} : { workspaceId: options.workspaceId }),
+        ...(options.registerWorkspaceRoot === undefined ? {} : { registerWorkspaceRoot: options.registerWorkspaceRoot }),
         ...(options.resolveWorkspaceRoot === undefined ? {} : { resolveWorkspaceRoot: options.resolveWorkspaceRoot }),
     });
 }
 async function assembleController(ctx, options) {
-    const service = new CodingNsTerminalService(options.store, new TerminalRuntimeManager([options.backend]));
+    const service = new CodingNsTerminalService(options.store, new TerminalRuntimeManager(options.backends));
     await service.initialize();
     if (options.mode === 'enhanced')
         await service.recover();
@@ -59,6 +75,7 @@ async function assembleController(ctx, options) {
         ...(options.platform === undefined ? {} : { platform: options.platform }),
         ...(options.generation === undefined ? {} : { generation: options.generation }),
         ...(options.workspaceId === undefined ? {} : { workspaceId: options.workspaceId }),
+        ...(options.registerWorkspaceRoot === undefined ? {} : { registerWorkspaceRoot: options.registerWorkspaceRoot }),
         ...(options.runtimeType === undefined ? {} : { runtimeType: options.runtimeType }),
     });
     const processService = new TerminalProcessService(options.processStore, {
@@ -74,6 +91,8 @@ async function assembleController(ctx, options) {
         : 'codingns4dsh: 持久终端 attach 清理');
     return {
         mode: options.mode,
+        runtimeTypes: options.runtimeTypes,
+        ...(options.runtimeWarning === undefined ? {} : { runtimeWarning: options.runtimeWarning }),
         controller,
         service,
         processService,

package/data/build/dist/host/terminal/runtime-manager.d.ts

@@ -1,6 +1,6 @@
 import type { PersistentTerminalRecord, TerminalRecordIdentity } from '../../shared/contracts/terminal.js';
 import { type ManagedTerminalAttachment } from './attachment-registry.js';
-import type { TerminalRuntimeAdapter, TerminalRuntimeIdentity } from './runtime-adapter.js';
+import type { TerminalRuntimeAdapter, TerminalRuntimeIdentity, TerminalRuntimeType } from './runtime-adapter.js';
 export interface RuntimeAttachmentInput {
     readonly identity: TerminalRecordIdentity;
     readonly generation: string;
@@ -17,6 +17,7 @@ export declare class TerminalRuntimeManager {
     private readonly registry;
     private readonly monitors;
     constructor(adapters: readonly TerminalRuntimeAdapter[]);
+    supports(runtimeType: TerminalRuntimeType): boolean;
     create(record: PersistentTerminalRecord): Promise<TerminalRuntimeIdentity>;
     inspect(record: PersistentTerminalRecord): Promise<TerminalRuntimeIdentity>;
     attach(record: PersistentTerminalRecord, input: RuntimeAttachmentInput): Promise<ManagedTerminalAttachment>;

package/data/build/dist/host/terminal/runtime-manager.js

@@ -14,6 +14,9 @@ export class TerminalRuntimeManager {
             }
         }
     }
+    supports(runtimeType) {
+        return this.adapters.has(runtimeType);
+    }
     create(record) {
         return this.adapter(record.runtimeType).create({ session: runtimeSession(record), cols: record.cols, rows: record.rows });
     }

package/data/build/dist/host/terminal/startup.d.ts

@@ -13,6 +13,8 @@ export interface InstallTerminalControllerOptions {
     readonly resolveIdentity?: (settingsDocumentPath: string) => Promise<TerminalStartupIdentity>;
     /** 由 Host 解析稳定 Workspace ID 到受信任根目录；不能接收浏览器传来的绝对路径。 */
     readonly resolveWorkspaceRoot?: (workspaceId: string) => string | null;
+    /** 由终端 controller 在 Host 侧登记可信 Workspace 根目录。 */
+    readonly registerWorkspaceRoot?: (workspaceId: string, cwd: string) => void;
 }
 /**
  * 从 DSH 设置文档旁边的持久目录读取本机终端身份。

package/data/build/dist/host/terminal/startup.js

@@ -61,13 +61,14 @@ export async function installTerminalController(ctx, settings, provider, options
         settings: () => settings.get().terminalEnhancement,
         ...(options.platform === undefined ? {} : { platform: options.platform }),
         ...(options.resolveWorkspaceRoot === undefined ? {} : { resolveWorkspaceRoot: options.resolveWorkspaceRoot }),
+        ...(options.registerWorkspaceRoot === undefined ? {} : { registerWorkspaceRoot: options.registerWorkspaceRoot }),
     };
     if (!enhancedEnabled) {
         return createController(ctx, { enhancedEnabled: false, ...common });
     }
     const documentPath = provider.documentPath;
     if (documentPath === undefined) {
-        throw new Error('终端强化需要文件型 DSH 设置 Provider，以便持久保存 Host ID 和终端映射');
+        throw new Error('终端增强需要文件型 DSH 设置 Provider，以便持久保存 Host ID 和终端映射');
     }
     const identity = await (options.resolveIdentity ?? resolveTerminalStartupIdentity)(documentPath);
     return createController(ctx, {

package/data/build/dist/host/terminal/terminal-controller.d.ts

@@ -30,6 +30,8 @@ export interface CodingNsTerminalControllerOptions {
     readonly platform?: string;
     readonly generation?: (agent: DshTerminalAgent, attachmentId: string) => string;
     readonly workspaceId?: (agent: DshTerminalAgent, cwd: string) => string;
+    /** 终端解析出 Workspace 后登记 Host 侧可信根目录，供调试服务复用。 */
+    readonly registerWorkspaceRoot?: (workspaceId: string, cwd: string) => void;
     /** 基线模式固定使用进程内 PTY；强化模式再按平台选择持久 backend。 */
     readonly runtimeType?: (profileId: Exclude<TerminalShellProfileId, 'system'>, platform: string) => CodingNsTerminalRuntimeType;
     readonly detectShells?: () => readonly DetectedTerminalShell[];
@@ -38,7 +40,7 @@ export interface CodingNsTerminalControllerOptions {
     readonly maxCols?: number;
     readonly maxRows?: number;
 }
-/** 与 DSH 0.1.6-alpha.2 `remote.terminal` 完全同名、同方法的 Host controller。 */
+/** Codingns4DSH 自有终端 Host controller，避免与 DSH 官方 `remote.terminal` 冲突。 */
 export declare class CodingNsTerminalController extends TypertRemoteService {
     private readonly options;
     static inject: string[];
@@ -68,8 +70,13 @@ export declare class CodingNsTerminalController extends TypertRemoteService {
     private scope;
     private rememberWorkspace;
     /**
-     * Workspace Registry 是跨会话的稳定身份。只有找不到正式工作区时才回退到
-     * 插件提供的 cwd 规则，避免把同一工作区的不同 Session 拆成多个终端集合。
+     * list/retain 的 wire 只有 sessionId，可能早于 agent-scoped environment 到达。
+     * 这时仍从 Host 侧 Registry 解析工作区，避免暂时缺少缓存就退回会话列表。
+     */
+    private workspaceForSession;
+    /**
+     * Workspace Registry 是跨会话的稳定身份；找不到正式工作区时回退到会话身份，
+     * 避免旧版 DSH 把 cwd 误当成跨会话的工作区。
      */
     private workspaceId;
     private identity;

package/data/build/dist/host/terminal/terminal-controller.js

@@ -35,7 +35,8 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
 import { Remote, RemoteError, TypertRemoteService } from '@deepseek-ai/dsh-typert-protocol';
 import { detectTerminalShells, resolveTerminalShell, } from './shell-detection.js';
 import { CodingNsTerminalService, TerminalServiceError } from './terminal-service.js';
-/** 与 DSH 0.1.6-alpha.2 `remote.terminal` 完全同名、同方法的 Host controller。 */
+import { debugInfo, debugWarn } from '../../shared/debug.js';
+/** Codingns4DSH 自有终端 Host controller，避免与 DSH 官方 `remote.terminal` 冲突。 */
 let CodingNsTerminalController = (() => {
     let _classSuper = TypertRemoteService;
     let _instanceExtraInitializers = [];
@@ -87,7 +88,7 @@ let CodingNsTerminalController = (() => {
         /** list/retain 的官方 wire 只有 sessionId；这里把它解析到工作区后再查持久终端。 */
         sessionWorkspaces = new Map();
         constructor(ctx, options) {
-            super(ctx, 'terminalController', { namespace: 'terminal' });
+            super(ctx, 'terminalController', { namespace: 'codingnsTerminal' });
             this.options = options;
             this.platform = options.platform ?? process.platform;
             this.detectShells = options.detectShells ?? (() => detectTerminalShells({ platform: this.platform }));
@@ -100,9 +101,18 @@ let CodingNsTerminalController = (() => {
         environment(agent, signal) {
             signal.throwIfAborted();
             const workspaceId = this.rememberWorkspace(agent);
-            return {
+            debugInfo('codingns4dsh: terminal environment', {
+                sessionId: agent.id,
                 cwd: this.cwd(agent),
+                bindingScope: this.bindingScope,
                 workspaceId,
+                wireWorkspaceId: isSessionWorkspaceId(workspaceId) ? undefined : workspaceId,
+            });
+            return {
+                cwd: this.cwd(agent),
+                // 旧版 DSH 没有 Workspace Registry；不要把 cwd 伪装成稳定 Workspace ID，
+                // 否则旧版 Client 会把同目录的不同会话错误合并。
+                ...(isSessionWorkspaceId(workspaceId) ? {} : { workspaceId }),
                 maxInputBytes: this.maxInputBytes,
                 maxCols: this.maxCols,
                 maxRows: this.maxRows,
@@ -123,14 +133,27 @@ let CodingNsTerminalController = (() => {
             return ordered.map(shellOption);
         }
         list(sessionId) {
-            const workspaceId = this.sessionWorkspaces.get(sessionId);
-            return [...this.options.service.listSession(this.options.hostId, sessionId, workspaceId)];
+            const workspaceId = this.workspaceForSession(sessionId);
+            const result = [...this.options.service.listSession(this.options.hostId, sessionId, workspaceId)];
+            debugInfo('codingns4dsh: terminal list', {
+                sessionId,
+                workspaceId,
+                registryResolved: workspaceId !== undefined && !isSessionWorkspaceId(workspaceId),
+                terminalIds: result.map((terminal) => terminal.id),
+            });
+            return result;
         }
         async create(agent, request, signal) {
             signal.throwIfAborted();
             const scope = this.scope(agent);
             this.rememberWorkspace(agent);
             const existing = this.options.service.list(scope).find((terminal) => terminal.id === request.id);
+            debugInfo('codingns4dsh: terminal create', {
+                sessionId: agent.id,
+                terminalId: request.id,
+                scope,
+                existing: existing?.id ?? null,
+            });
             if (existing !== undefined)
                 return existing;
             if (this.options.service.list(scope).length >= this.maxTerminals) {
@@ -155,7 +178,7 @@ let CodingNsTerminalController = (() => {
         }
         retain(sessionId, id, signal) {
             try {
-                const identity = this.options.service.findIdentity(this.options.hostId, sessionId, id, this.sessionWorkspaces.get(sessionId));
+                const identity = this.options.service.findIdentity(this.options.hostId, sessionId, id, this.workspaceForSession(sessionId));
                 return translateTerminalStream(this.options.service.retain(identity, signal));
             }
             catch (error) {
@@ -208,10 +231,18 @@ let CodingNsTerminalController = (() => {
         async close(agent, id) {
             try {
                 const identity = this.optionalIdentity(agent, id);
-                if (identity !== undefined)
+                debugInfo('codingns4dsh: terminal close entered', {
+                    sessionId: agent.id,
+                    terminalId: id,
+                    identity: identity ?? null,
+                });
+                if (identity !== undefined) {
                     await this.options.service.close(identity);
+                    debugInfo('codingns4dsh: terminal close success', { sessionId: agent.id, terminalId: id, identity });
+                }
             }
             catch (error) {
+                debugWarn('codingns4dsh: terminal close failed', { sessionId: agent.id, terminalId: id, error: errorMessage(error) });
                 throw remoteTerminalError(error);
             }
         }
@@ -246,26 +277,75 @@ let CodingNsTerminalController = (() => {
             return workspaceId;
         }
         /**
-         * Workspace Registry 是跨会话的稳定身份。只有找不到正式工作区时才回退到
-         * 插件提供的 cwd 规则，避免把同一工作区的不同 Session 拆成多个终端集合。
+         * list/retain 的 wire 只有 sessionId，可能早于 agent-scoped environment 到达。
+         * 这时仍从 Host 侧 Registry 解析工作区，避免暂时缺少缓存就退回会话列表。
+         */
+        workspaceForSession(sessionId) {
+            const cached = this.sessionWorkspaces.get(sessionId);
+            if (cached !== undefined) {
+                debugInfo('codingns4dsh: terminal workspace lookup', { sessionId, source: 'cache', workspaceId: cached });
+                return cached;
+            }
+            if (this.bindingScope === 'session') {
+                const fallback = `session:${sessionId}`;
+                debugInfo('codingns4dsh: terminal workspace lookup', { sessionId, source: 'binding-scope-session', workspaceId: fallback });
+                return fallback;
+            }
+            try {
+                const registry = this.ctx.get('workspaceRegistry');
+                if (registry === undefined) {
+                    debugWarn('codingns4dsh: terminal workspace lookup unavailable', { sessionId, reason: 'registry-undefined' });
+                    return undefined;
+                }
+                const entries = registry.list();
+                const workspace = entries.find((entry) => entry.sessionIds.includes(sessionId));
+                if (workspace === undefined) {
+                    debugWarn('codingns4dsh: terminal workspace lookup miss', { sessionId, registryCount: entries.length });
+                    return undefined;
+                }
+                this.sessionWorkspaces.set(sessionId, workspace.id);
+                debugInfo('codingns4dsh: terminal workspace lookup', { sessionId, source: 'registry', workspaceId: workspace.id, registryCount: entries.length });
+                return workspace.id;
+            }
+            catch (error) {
+                debugWarn('codingns4dsh: terminal workspace lookup failed', { sessionId, error: errorMessage(error) });
+                return undefined;
+            }
+        }
+        /**
+         * Workspace Registry 是跨会话的稳定身份；找不到正式工作区时回退到会话身份，
+         * 避免旧版 DSH 把 cwd 误当成跨会话的工作区。
          */
         workspaceId(agent, cwd) {
-            if (this.bindingScope === 'session')
-                return `session:${agent.id}`;
+            if (this.bindingScope === 'session') {
+                const value = `session:${agent.id}`;
+                debugInfo('codingns4dsh: terminal workspace identity', { sessionId: agent.id, cwd, source: 'binding-scope-session', workspaceId: value });
+                return value;
+            }
             // Cordis 未注入可选服务时直接读 ctx.workspaceRegistry 会抛出 "without inject"；
             // 通过 get 探测是官方允许的可选服务读取方式。
             const registry = this.ctx.get('workspaceRegistry');
             if (registry !== undefined) {
                 try {
-                    const workspace = registry.list().find((entry) => entry.sessionIds.includes(agent.id));
-                    if (workspace !== undefined)
+                    const entries = registry.list();
+                    const workspace = entries.find((entry) => entry.sessionIds.includes(agent.id));
+                    if (workspace !== undefined) {
+                        this.options.registerWorkspaceRoot?.(workspace.id, cwd);
+                        debugInfo('codingns4dsh: terminal workspace identity', { sessionId: agent.id, cwd, source: 'registry', workspaceId: workspace.id, registryCount: entries.length });
                         return workspace.id;
+                    }
+                    debugWarn('codingns4dsh: terminal workspace identity miss', { sessionId: agent.id, cwd, registryCount: entries.length });
                 }
-                catch {
+                catch (error) {
                     // Workspace Registry 尚未完成启动时继续使用兼容回退，不能让终端功能阻塞 DSH。
+                    debugWarn('codingns4dsh: terminal workspace identity lookup failed', { sessionId: agent.id, cwd, error: errorMessage(error) });
                 }
             }
-            return this.options.workspaceId?.(agent, cwd) ?? cwd;
+            // 没有正式 Registry 时只能保证当前会话隔离。options.workspaceId 保留在
+            // 接口中供旧调用方编译兼容，但不能把 cwd 当作跨会话身份。
+            const value = `session:${agent.id}`;
+            debugWarn('codingns4dsh: terminal workspace identity fallback', { sessionId: agent.id, cwd, reason: registry === undefined ? 'registry-undefined' : 'registry-miss-or-not-ready', workspaceId: value });
+            return value;
         }
         identity(agent, terminalId) {
             return { ...this.scope(agent), terminalId };
@@ -283,6 +363,9 @@ let CodingNsTerminalController = (() => {
     };
 })();
 export { CodingNsTerminalController };
+function isSessionWorkspaceId(value) {
+    return value.startsWith('session:');
+}
 function shellOption(shell) {
     return { path: shell.path, name: shell.displayName, args: shellArgs(shell.profileId) };
 }
@@ -313,6 +396,9 @@ function remoteTerminalError(error) {
     }
     return new RemoteError('terminal/unavailable', error.message, {});
 }
+function errorMessage(error) {
+    return error instanceof Error ? error.message : String(error);
+}
 async function* translateTerminalStream(stream) {
     try {
         yield* stream;

package/data/build/dist/host/terminal/terminal-process-service.js

@@ -26,7 +26,9 @@ export class TerminalProcessService {
             args: [...(input.args ?? [])],
             env: { ...(input.env ?? {}) },
             shell: { ...input.shell, args: [...input.shell.args] },
-            runtimeType: input.runtimeType,
+            // 配置可能来自 tmux 不可用时的旧版本；Host 以当前实际注册的 backend 为准，
+            // 保证已有调试配置不会因为运行模式切换而彻底无法启动。
+            runtimeType: this.options.terminalService.resolveRuntimeType(input.runtimeType),
             runtimeMode: 'pty',
             revision: (current?.revision ?? 0) + 1,
             createdAt: current?.createdAt ?? timestamp,

package/data/build/dist/host/terminal/terminal-service.d.ts

@@ -41,6 +41,8 @@ export declare class CodingNsTerminalService {
     private initialized;
     constructor(store: CodingNsTerminalStore, runtimes: TerminalRuntimeManager, now?: () => Date);
     initialize(): Promise<void>;
+    supportsRuntimeType(runtimeType: CodingNsTerminalRuntimeType): boolean;
+    resolveRuntimeType(runtimeType: CodingNsTerminalRuntimeType): CodingNsTerminalRuntimeType;
     list(scope: TerminalOwnerScope): readonly CodingNsWebTerminalInfo[];
     /** 兼容旧调用名；真正的持久归属只按 Host + workspace 查询。 */
     listSession(hostId: string, dshSessionId: string, workspaceId?: string): readonly CodingNsWebTerminalInfo[];

package/data/build/dist/host/terminal/terminal-service.js

@@ -25,6 +25,16 @@ export class CodingNsTerminalService {
         await this.store.load();
         this.initialized = true;
     }
+    supportsRuntimeType(runtimeType) {
+        return this.runtimes.supports(runtimeType);
+    }
+    resolveRuntimeType(runtimeType) {
+        if (this.runtimes.supports(runtimeType))
+            return runtimeType;
+        if (this.runtimes.supports('local-pty'))
+            return 'local-pty';
+        return runtimeType;
+    }
     list(scope) {
         this.requireInitialized();
         return this.store.list(scope)

package/data/build/dist/index.d.ts

@@ -1,10 +1,11 @@
 /** Host 入口是包根导出；共享契约通过显式子路径另行提供。 */
 import { apply as hostApply } from './host/index.js';
 /** Cordis Bundle 标准插件名称。 */
-export declare const name = "codingns4dsh";
+export declare const name = "@jingyi0605/codingns4dsh";
+/** DSH 0.1.7 原生配置入口；Host-only 的 cliSessions 已标记为 volatile。 */
+export { CodingNsConfigSchema as Config } from './host/settings.js';
 /** Host Cordis 入口。 */
 export declare const apply: typeof hostApply;
-export default hostApply;
 export { createCodingNsRpcHandler, createCodingNsSettingsRpcHandler, registerCodingNsRpc } from './host/rpc.js';
 export { CodingNsRpcError, CodingNsRpcTable, type CodingNsRpcHandler, type CodingNsRpcTarget, } from './host/rpc-table.js';
 export { HOST_FEATURES, createAuthFeature, createCliAdaptersFeature, createLanAccessDshFeature, } from './host/features/index.js';
@@ -18,8 +19,11 @@ export type { RemoteDshWebBoot, RemoteDshWebContextOptions } from './client/remo
 export { createHttpDshH5ControlApi, startDshH5BrowserBootstrap } from './client/dsh-h5-bootstrap.js';
 export type { DshH5BrowserBootstrapOptions, DshH5BrowserBootstrapResult, DshH5BrowserControlApi } from './client/dsh-h5-bootstrap.js';
 export { CODINGNS_RPC_CHANNEL } from './shared/contracts/transport.js';
+export { CODINGNS4DSH_DEBUG_ENV, debugInfo, debugWarn, resolveCodingNsDebugEnabled, } from './shared/debug.js';
 export { CODINGNS_CONTROL_BASE_URL_FIELD, CODINGNS_CONTROL_BASE_URLS_FIELD, CODINGNS_LAN_ACCESS_DSH_FIELD, CODINGNS_MODULES_FIELD, CODINGNS_SETTINGS_NAMESPACE, DEFAULT_CODINGNS_CONTROL_BASE_URL, DEFAULT_CODINGNS_CONTROL_BASE_URLS, DEFAULT_CODINGNS_SETTINGS, enabledFeatureNames, isFeatureEnabled, } from './shared/contracts/config.js';
 export type * from './shared/index.js';
+export * from './dsh-capabilities/index.js';
+export { dispatchCodingNsRpc, type CodingNsRpcContext, type CodingNsRpcDispatchResult } from './dsh-capabilities/host/connection-rpc-adapter.js';
 export { FeatureRegistry, FeatureRegistryError, FeatureResourceScopeImpl, } from './features/registry.js';
 export type { FeatureRegistryErrorCode, FeatureSnapshot, } from './features/registry.js';
 export { ResourceScopeManager } from './features/resource-scope/index.js';

package/data/build/dist/index.js

@@ -1,10 +1,13 @@
 /** Host 入口是包根导出；共享契约通过显式子路径另行提供。 */
 import { apply as hostApply } from './host/index.js';
 /** Cordis Bundle 标准插件名称。 */
-export const name = 'codingns4dsh';
+// Bundle 的运行时名称必须与 npm 包名和 dsh.bundle.patch 中的 entry id 保持一致。
+// 包名改为 scoped 后仍导出旧名称，会让 DSH 的 Bundle、ConfigForm 和 Client 处于不同身份。
+export const name = '@jingyi0605/codingns4dsh';
+/** DSH 0.1.7 原生配置入口；Host-only 的 cliSessions 已标记为 volatile。 */
+export { CodingNsConfigSchema as Config } from './host/settings.js';
 /** Host Cordis 入口。 */
 export const apply = hostApply;
-export default hostApply;
 export { createCodingNsRpcHandler, createCodingNsSettingsRpcHandler, registerCodingNsRpc } from './host/rpc.js';
 export { CodingNsRpcError, CodingNsRpcTable, } from './host/rpc-table.js';
 export { HOST_FEATURES, createAuthFeature, createCliAdaptersFeature, createLanAccessDshFeature, } from './host/features/index.js';
@@ -14,7 +17,10 @@ export { createLocalDshWebRuntimeProvider, createRemoteWebRuntimeFeature, } from
 export { RemoteDshWebContext } from './client/remote-web-context.js';
 export { createHttpDshH5ControlApi, startDshH5BrowserBootstrap } from './client/dsh-h5-bootstrap.js';
 export { CODINGNS_RPC_CHANNEL } from './shared/contracts/transport.js';
+export { CODINGNS4DSH_DEBUG_ENV, debugInfo, debugWarn, resolveCodingNsDebugEnabled, } from './shared/debug.js';
 export { CODINGNS_CONTROL_BASE_URL_FIELD, CODINGNS_CONTROL_BASE_URLS_FIELD, CODINGNS_LAN_ACCESS_DSH_FIELD, CODINGNS_MODULES_FIELD, CODINGNS_SETTINGS_NAMESPACE, DEFAULT_CODINGNS_CONTROL_BASE_URL, DEFAULT_CODINGNS_CONTROL_BASE_URLS, DEFAULT_CODINGNS_SETTINGS, enabledFeatureNames, isFeatureEnabled, } from './shared/contracts/config.js';
+export * from './dsh-capabilities/index.js';
+export { dispatchCodingNsRpc } from './dsh-capabilities/host/connection-rpc-adapter.js';
 export { FeatureRegistry, FeatureRegistryError, FeatureResourceScopeImpl, } from './features/registry.js';
 export { ResourceScopeManager } from './features/resource-scope/index.js';
 export { CodingNsAuthSession, } from './host/auth-session.js';