@jingyi0605/codingns4dsh 0.1.0 → 0.1.1

package/data/build/dist/client/cli-catalog.js

@@ -1,22 +1,38 @@
 import { CODINGNS_RPC_CHANNEL } from '../shared/contracts/transport.js';
+import { debugInfo, debugWarn } from '../shared/debug.js';
 /** Client 侧访问 Host CLI 命名空间的统一入口。 */
 export async function callCliRpc(rpc, action, payload) {
     let response;
     try {
+        debugInfo('codingns4dsh: cli rpc request', { channel: CODINGNS_RPC_CHANNEL, action });
         response = await rpc.call(CODINGNS_RPC_CHANNEL, `cli/${action}`, payload);
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
         if (!/HTTP (?:404|405)\b/u.test(message))
             throw error;
-        response = await rpc.call('/api', `codingns/cli/${action}`, payload);
+        debugWarn('codingns4dsh: cli rpc fallback', { action, error: message });
+        try {
+            response = await rpc.call('/api', `codingns/cli/${action}`, payload);
+        }
+        catch (fallbackError) {
+            console.error('codingns4dsh: cli rpc fallback failed', { action, error: fallbackError });
+            throw fallbackError;
+        }
     }
-    if (!response.ok)
+    if (!response.ok) {
+        console.error('codingns4dsh: cli rpc response error', { action, error: response.error });
         throw new Error(response.error.message);
+    }
+    debugInfo('codingns4dsh: cli rpc response success', { action });
     return response.value;
 }
 export function adapterCatalogWithDsh(catalog) {
-    return [{ id: 'dsh', name: 'DeepSeek Harness', installed: true, enabled: true, version: null, command: null }, ...catalog];
+    // 对话框只展示实际可用的适配器；未安装或已停用的适配器由设置页管理。
+    return [
+        { id: 'dsh', name: 'DeepSeek Harness', installed: true, enabled: true, version: null, command: null },
+        ...catalog.filter((adapter) => adapter.installed && adapter.enabled),
+    ];
 }
 export function firstModel(catalog) {
     for (const group of catalog.groups) {
@@ -58,6 +74,7 @@ export async function restoreCliSession(rpc, record) {
         adapterId: record.adapterId,
         ...(record.modelId ? { modelId: record.modelId } : {}),
         ...(record.effortId ? { effortId: record.effortId } : {}),
+        ...(record.providerId ? { providerId: record.providerId } : {}),
         ...(record.providerSessionId ? { providerSessionId: record.providerSessionId } : {}),
     });
     navigateToDshSession(record.dshSessionId);

package/data/build/dist/client/cli-slots.d.ts

@@ -4,6 +4,7 @@ import type { SlotRegistry } from '@deepseek-ai/dsh-client-ui-renderer/client';
 import { type CodingNsLocale } from './locale.js';
 interface SessionSnapshot {
     readonly sessionId?: string;
+    readonly modelSelection?: unknown;
     readonly blank?: boolean;
     readonly promptAttempted?: boolean;
     readonly running?: boolean;
@@ -13,6 +14,10 @@ type SessionSelector = <Selected>(selector: (session: SessionSnapshot) => Select
 /** DSH Web 当前版本的对话工具栏 Slot 契约。Slot 包没有预声明这些业务名称，插件在此补齐类型。 */
 declare module '@deepseek-ai/dsh-client-ui-slots' {
     interface SlotMap {
+        'conversation.input.left': {
+            kind: 'list';
+            scope: 'session';
+        };
         'conversation.input.right': {
             kind: 'list';
             scope: 'session';

package/data/build/dist/client/cli-slots.js

@@ -1,4 +1,4 @@
-import { createElement, useEffect, useState } from 'react';
+import { createElement, useEffect, useRef, useState } from 'react';
 import { adapterCatalogWithDsh, callCliRpc, findModel, firstModel } from './cli-catalog.js';
 import { providerIconUrl } from './provider-icons.js';
 import { publishSessionAdapter } from './session-adapter-cache.js';
@@ -15,12 +15,23 @@ function installComposerStyles() {
     style.textContent = [
         'html[data-codingns-agent]:not([data-codingns-agent="dsh"]) [data-slot="conversation.input.model"],',
         'body[data-codingns-agent]:not([data-codingns-agent="dsh"]) [data-slot="conversation.input.model"]{display:none!important}',
+        // DSH 原生输入栏默认允许工具行换行；选择器过长时保持单行并让右侧区域收缩。
+        '[data-composer-card] > div:has([data-slot="conversation.input.right"]){flex-wrap:nowrap!important}',
+        '[data-composer-card] > div:has([data-slot="conversation.input.right"]) > div:has(> [data-slot="conversation.input.right"]){min-width:0;width:0;flex:1 1 0}',
+        '[data-composer-card] > div:has([data-slot="conversation.input.right"]) [data-slot="conversation.input.right"] > .codingns4dsh-model-root{min-width:0;max-width:min(360px,45cqw);flex:1 1 min(360px,45cqw)}',
+        '[data-composer-card] > div:has([data-slot="conversation.input.right"]) [data-slot="conversation.input.model"] > select{width:100%;min-width:0;max-width:min(150px,45cqw);flex:1 1 min(150px,45cqw);overflow:hidden;white-space:nowrap}',
+        '[data-composer-card] > div:has([data-slot="conversation.input.right"]) [data-slot="conversation.input.model"] > button{width:100%;min-width:0;max-width:min(360px,45cqw);overflow:hidden;white-space:nowrap}',
+        // ContextMeter 在 pressure 尚未合并时会暂时返回 null；dock 保留同样的行高，数值回来时只更新内容。
+        '[data-composer-card] + div{box-sizing:border-box;min-height:26px;align-items:center}',
+        '[data-composer-card] + div svg[viewBox="0 0 14 14"] circle:last-child{transition:stroke-dasharray .18s ease,stroke .18s ease}',
         '@keyframes codingns4dsh-cli-spin{to{transform:rotate(360deg)}}',
+        '@keyframes codingns4dsh-cli-model-scroll{0%,18%{transform:translateX(0)}82%,100%{transform:translateX(var(--codingns4dsh-model-scroll-offset))}}',
         '.codingns4dsh-cli-spinner{animation:codingns4dsh-cli-spin .8s linear infinite}',
+        '.codingns4dsh-model-name[data-overflow="true"]>span{animation:codingns4dsh-cli-model-scroll 6s ease-in-out infinite alternate;will-change:transform}',
         '.codingns4dsh-agent-trigger:hover:not(:disabled){background:color-mix(in srgb,currentColor 7%,transparent)}',
         '.codingns4dsh-agent-option:hover:not(:disabled){background:color-mix(in srgb,currentColor 7%,transparent)!important}',
         '.codingns4dsh-agent-option[data-selected="true"]{background:color-mix(in srgb,currentColor 10%,transparent)!important}',
-        '@media (prefers-reduced-motion:reduce){.codingns4dsh-cli-spinner{animation-duration:1.6s}}',
+        '@media (prefers-reduced-motion:reduce){.codingns4dsh-cli-spinner{animation-duration:1.6s}.codingns4dsh-model-name[data-overflow="true"]>span{animation:none;transform:translateX(0)}}',
     ].join('');
     document.head.appendChild(style);
 }
@@ -174,10 +185,10 @@ function NativeDropdownChevron({ open, locked = false }) {
         fill: 'currentColor',
     }));
 }
-const agentRootStyle = { position: 'relative', minWidth: 0, display: 'inline-flex' };
-const agentTriggerStyle = { height: 30, maxWidth: 220, minWidth: 0, color: dshThemeColor.labelPrimary, border: 0, borderRadius: 8, padding: '0 6px', background: 'transparent', display: 'inline-flex', alignItems: 'center', gap: 7, fontSize: 14, lineHeight: '20px' };
+const agentRootStyle = { position: 'relative', minWidth: 0, flex: '0 0 auto', display: 'inline-flex' };
+const agentTriggerStyle = { height: 30, minWidth: 0, color: dshThemeColor.labelPrimary, border: 0, borderRadius: 8, padding: '0 6px', background: 'transparent', display: 'inline-flex', alignItems: 'center', gap: 7, fontSize: 14, lineHeight: '20px', whiteSpace: 'nowrap' };
 const agentTriggerIconStyle = { width: 20, height: 20, flex: '0 0 20px', objectFit: 'contain' };
-const agentTriggerLabelStyle = { minWidth: 0, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' };
+const agentTriggerLabelStyle = { flex: '0 0 auto', whiteSpace: 'nowrap' };
 const nativeDropdownChevronStyle = { display: 'block', flex: '0 0 14px', color: dshThemeColor.labelCaption, transformOrigin: 'center' };
 const agentMenuStyle = { ...dshPopupSurfaceStyle, position: 'absolute', zIndex: 1100, bottom: 'calc(100% + 8px)', left: 0, minWidth: 238, maxWidth: 'min(320px, calc(100vw - 32px))', maxHeight: 'min(400px, calc(100vh - 96px))', overflowY: 'auto', padding: 5, border: 0, borderRadius: 8 };
 const agentOptionStyle = { width: '100%', minHeight: 40, color: 'inherit', border: 0, borderRadius: 6, padding: '5px 8px 5px 4px', background: 'transparent', display: 'flex', alignItems: 'center', gap: 8, textAlign: 'left', fontSize: 14, lineHeight: '20px' };
@@ -186,6 +197,44 @@ const agentOptionIconStyle = { width: 22, height: 22, flex: '0 0 22px', objectFi
 const agentOptionLabelStyle = { flex: '1 1 auto', minWidth: 0, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' };
 const agentStatusStyle = { flex: '0 0 auto', color: dshThemeColor.labelTertiary, fontSize: 12, whiteSpace: 'nowrap' };
 const agentFallbackIconStyle = { flexGrow: 0, flexShrink: 0, borderRadius: 5, color: '#fff', background: dshThemeColor.labelTertiary, display: 'inline-flex', alignItems: 'center', justifyContent: 'center', fontSize: 11, fontWeight: 600, lineHeight: 1 };
+/** 模型名称超出 150px 时，在固定视口内往返滚动展示完整文本。 */
+function ModelName({ label, loading }) {
+    const viewportRef = useRef(null);
+    const contentRef = useRef(null);
+    const [scrollDistance, setScrollDistance] = useState(0);
+    useEffect(() => {
+        const updateOverflow = () => {
+            const viewport = viewportRef.current;
+            const content = contentRef.current;
+            if (viewport === null || content === null)
+                return;
+            const nextDistance = Math.max(0, Math.ceil(content.getBoundingClientRect().width - viewport.clientWidth));
+            setScrollDistance((current) => current === nextDistance ? current : nextDistance);
+        };
+        updateOverflow();
+        if (typeof ResizeObserver === 'undefined')
+            return;
+        const observer = new ResizeObserver(updateOverflow);
+        if (viewportRef.current !== null)
+            observer.observe(viewportRef.current);
+        if (contentRef.current !== null)
+            observer.observe(contentRef.current);
+        return () => observer.disconnect();
+    }, [label]);
+    const contentStyle = {
+        display: 'inline-block',
+        whiteSpace: 'nowrap',
+        '--codingns4dsh-model-scroll-offset': `-${scrollDistance}px`,
+    };
+    return createElement('span', {
+        ref: viewportRef,
+        className: 'codingns4dsh-model-name',
+        'data-overflow': String(scrollDistance > 0),
+        role: loading ? 'status' : undefined,
+        'aria-live': loading ? 'polite' : undefined,
+        style: modelNameStyle,
+    }, createElement('span', { ref: contentRef, style: contentStyle }, label));
+}
 function ModelSlot(props) {
     // 语言词典中的中文值仍保留“正在加载模型列表…”语义，切换语言时由 t() 取值。
     const t = useCodingNsTranslator(props.locale);
@@ -275,9 +324,10 @@ function ModelSlot(props) {
                     createElement('div', { key: 'title', style: nativeGroupTitleStyle }, `${t('cli.thinking')}（${modelLabel}）`),
                     ...(efforts.length > 0 ? efforts : ['default']).map((effort) => createElement('button', { key: effort, type: 'button', role: 'menuitemradio', 'aria-checked': effort === effortValue, onClick: () => chooseEffort(effort), style: nativeOptionStyle }, createElement('span', { style: { flex: '1 1 auto' } }, effort === 'default' ? 'Default' : effort), effort === effortValue && createElement('span', { 'aria-hidden': true }, '✓'))),
                 ];
-    return createElement('div', { style: { position: 'relative', minWidth: 0, display: 'inline-flex' } }, createElement('button', { type: 'button', disabled: triggerDisabled, 'aria-label': t('cli.chooseModel', { model: modelLabel, effort: effortLabel }), 'aria-busy': loading, 'aria-haspopup': 'menu', 'aria-expanded': open, onClick: () => { setPane('root'); setOpen((value) => !value); }, style: nativeTriggerStyle }, loading && createElement('span', { className: 'codingns4dsh-cli-spinner', 'aria-hidden': true, style: modelSpinnerStyle }), createElement('span', { role: loading ? 'status' : undefined, 'aria-live': loading ? 'polite' : undefined, style: { minWidth: 0, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' } }, modelLabel), !loading && createElement('span', { style: { color: dshThemeColor.labelCaption, whiteSpace: 'nowrap' } }, effortLabel), !loading && createElement(NativeDropdownChevron, { open })), open && createElement('div', { role: 'menu', 'aria-label': t('cli.chooseModelMenu'), style: nativeMenuStyle }, ...menu));
+    return createElement('div', { className: 'codingns4dsh-model-root', style: { position: 'relative', minWidth: 0, maxWidth: '100%', flex: '1 1 min(360px, 45cqw)', display: 'inline-flex' } }, createElement('button', { type: 'button', disabled: triggerDisabled, 'aria-label': t('cli.chooseModel', { model: modelLabel, effort: effortLabel }), 'aria-busy': loading, 'aria-haspopup': 'menu', 'aria-expanded': open, onClick: () => { setPane('root'); setOpen((value) => !value); }, style: nativeTriggerStyle }, loading && createElement('span', { className: 'codingns4dsh-cli-spinner', 'aria-hidden': true, style: modelSpinnerStyle }), createElement(ModelName, { label: modelLabel, loading }), !loading && createElement('span', { style: { color: dshThemeColor.labelCaption, whiteSpace: 'nowrap' } }, effortLabel), !loading && createElement(NativeDropdownChevron, { open })), open && createElement('div', { role: 'menu', 'aria-label': t('cli.chooseModelMenu'), style: nativeMenuStyle }, ...menu));
 }
-const nativeTriggerStyle = { minWidth: 0, maxWidth: 'min(360px, 45cqw)', height: 28, color: dshThemeColor.labelSecondary, cursor: 'pointer', background: 'transparent', border: 0, borderRadius: 24, padding: '0 4px 0 8px', display: 'inline-flex', alignItems: 'center', gap: 4, fontSize: 13, lineHeight: '20px' };
+const nativeTriggerStyle = { width: '100%', minWidth: 0, maxWidth: 'min(360px, 45cqw)', height: 28, color: dshThemeColor.labelSecondary, cursor: 'pointer', background: 'transparent', border: 0, borderRadius: 24, padding: '0 4px 0 8px', display: 'inline-flex', alignItems: 'center', gap: 4, fontSize: 13, lineHeight: '20px' };
+const modelNameStyle = { minWidth: 0, maxWidth: 150, flex: '0 1 150px', display: 'block', overflow: 'hidden', whiteSpace: 'nowrap' };
 const nativeMenuStyle = { ...dshPopupSurfaceStyle, position: 'absolute', zIndex: 1100, right: 0, bottom: 'calc(100% + 8px)', minWidth: 240, maxWidth: 'min(420px, calc(100vw - 32px))', maxHeight: 'min(360px, calc(100vh - 96px))', overflowY: 'auto', padding: 4, border: 0, borderRadius: 20 };
 const nativeMenuCellStyle = { width: '100%', minHeight: 40, color: 'inherit', cursor: 'pointer', background: 'transparent', border: 0, borderRadius: 10, padding: '0 10px', display: 'flex', alignItems: 'center', gap: 8, textAlign: 'left', fontSize: 14, lineHeight: '22px' };
 const nativeMenuLabelStyle = { flex: 'none', whiteSpace: 'nowrap' };

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

@@ -3,7 +3,7 @@ import type { CodingNsRpcClient } from '../features/types.js';
 export declare const DEBUG_KIND = "debug";
 export declare const DEBUG_PROVIDER_ID = "codingns4dsh/debug";
 /** 注册最小 Debug 页面；页面只负责展示和发送用户意图。 */
-export declare function registerDebugUi(ctx: Context, rpc: CodingNsRpcClient, remote: unknown): () => void;
+export declare function registerDebugUi(ctx: Context, rpc: CodingNsRpcClient, remote: unknown, terminalRemote?: () => unknown): () => void;
 declare module '@deepseek-ai/dsh-client-ui-sidebar-right/client' {
     interface SidebarRightTabParamsMap {
         debug: undefined;

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

@@ -1,28 +1,43 @@
 import { createElement, useEffect, useState } from 'react';
 import { CODINGNS_RPC_CHANNEL } from '../../shared/contracts/transport.js';
+import { debugWarn } from '../../shared/debug.js';
 import { dshButtonStyle, dshFieldStyle, dshFormRootStyle, dshThemeColor } from '../theme.js';
 export const DEBUG_KIND = 'debug';
 export const DEBUG_PROVIDER_ID = 'codingns4dsh/debug';
 const PORT_CHECK_INTERVAL_MS = 5_000;
 /** 注册最小 Debug 页面；页面只负责展示和发送用户意图。 */
-export function registerDebugUi(ctx, rpc, remote) {
+export function registerDebugUi(ctx, rpc, remote, terminalRemote) {
     const disposers = [];
-    disposers.push(ctx.sidebarRightTabs.register({
-        id: DEBUG_PROVIDER_ID,
-        kind: DEBUG_KIND,
-        multiple: false,
-        priority: 'extension',
-        title: () => '调试',
-        guide: [{ id: 'debug', order: 30, title: () => '调试', description: () => '启动工作区命令、检查端口并访问服务', icon: DebugIcon }],
-    }));
-    disposers.push(ctx.slots.inject('sidebar.right.pane.tab', () => ctx.slots.register({
-        name: 'sidebar.right.pane.tab', key: DEBUG_PROVIDER_ID,
-        inject: () => ({ rpc, remote, sidebarRight: ctx.sidebarRight }),
-    }, DebugBody)));
+    try {
+        disposers.push(ctx.sidebarRightTabs.register({
+            id: DEBUG_PROVIDER_ID,
+            kind: DEBUG_KIND,
+            multiple: false,
+            priority: 'extension',
+            title: () => '调试',
+            guide: [{ id: 'debug', order: 30, title: () => '调试', description: () => '启动工作区命令、检查端口并访问服务', icon: DebugIcon }],
+        }));
+        disposers.push(ctx.slots.inject('sidebar.right.pane.tab', () => ctx.slots.register({
+            name: 'sidebar.right.pane.tab', key: DEBUG_PROVIDER_ID,
+            inject: () => ({ rpc, remote, terminalRemote, sidebarRight: ctx.sidebarRight }),
+        }, DebugBody)));
+    }
+    catch (error) {
+        for (const dispose of disposers.reverse())
+            dispose();
+        if (isDuplicateDebugRegistration(error)) {
+            debugWarn(`codingns4dsh: 调试 Sidebar 已注册，跳过重复注册: ${DEBUG_PROVIDER_ID}`);
+            return () => { };
+        }
+        throw error;
+    }
     return () => { for (const dispose of disposers.reverse())
         dispose(); };
 }
-function DebugBody({ sessionId, rpc, remote, sidebarRight }) {
+function isDuplicateDebugRegistration(error) {
+    return error instanceof Error && /sidebarRight: (?:tab type id|tab kind) .* already registered/u.test(error.message);
+}
+function DebugBody({ sessionId, rpc, remote, terminalRemote, sidebarRight }) {
     const [workspaceId, setWorkspaceId] = useState(null);
     const [config, setConfig] = useState(null);
     const [instances, setInstances] = useState([]);
@@ -32,10 +47,13 @@ function DebugBody({ sessionId, rpc, remote, sidebarRight }) {
     const [draft, setDraft] = useState(null);
     const [message, setMessage] = useState('正在读取工作区…');
     const [busy, setBusy] = useState(false);
-    const load = async (currentWorkspaceId) => {
+    const load = async (currentWorkspaceId, isCurrent) => {
         const scope = { sessionId: String(sessionId), workspaceId: currentWorkspaceId, generation: 0 };
         const next = await call(rpc, 'debug/config/get', scope);
         const running = await call(rpc, 'debug/runtime/list', scope);
+        // Session 切换后，旧请求的结果不能覆盖新 Session 的面板状态。
+        if (isCurrent?.() === false)
+            return;
         setConfig(next);
         setInstances(running);
         setMessage('');
@@ -43,7 +61,7 @@ function DebugBody({ sessionId, rpc, remote, sidebarRight }) {
     useEffect(() => {
         let disposed = false;
         setPortChecks({});
-        const terminal = remote?.terminal;
+        const terminal = terminalRemote?.();
         void call(rpc, 'terminal/status', {}).then((status) => {
             if (!disposed)
                 setTerminalStatus(status);
@@ -57,7 +75,7 @@ function DebugBody({ sessionId, rpc, remote, sidebarRight }) {
                 if (disposed)
                     return;
                 setWorkspaceId(id);
-                await load(id);
+                await load(id, () => !disposed);
             }
             catch (error) {
                 if (!disposed)
@@ -115,7 +133,7 @@ function DebugBody({ sessionId, rpc, remote, sidebarRight }) {
     if (workspaceId === null)
         return createElement('section', { style: panelStyle }, createElement('div', { style: loadingStyle }, createElement('span', { style: loadingDotStyle }), message));
     const profiles = config?.profiles ?? [];
-    return createElement('section', { style: panelStyle }, createElement('header', { style: headerStyle }, createElement('div', { style: titleBlockStyle }, createElement('div', { style: eyebrowStyle }, '工作区工具'), createElement('h2', { style: titleStyle }, '工作区调试'), createElement('div', { style: workspaceStyle, title: workspaceId }, createElement('span', { style: workspaceDotStyle }), workspaceId)), createElement('div', { style: headerActionsStyle }, createElement('span', { style: countStyle }, `${profiles.length} 个配置`), createElement('button', { type: 'button', 'aria-label': '添加启动配置', disabled: busy || draft !== null, onClick: () => setDraft(createProfileDraft()), style: primaryButtonStyle }, createElement('span', { 'aria-hidden': true }, '+'), ' 添加配置'))), message && createElement('div', { role: 'status', 'aria-live': 'polite', style: statusStyle(statusTone(message)) }, createElement('span', { style: statusIconStyle }, statusTone(message) === 'success' ? '✓' : statusTone(message) === 'error' ? '!' : 'i'), message), draft === null ? null : createProfileForm(draft), profiles.length === 0 && draft === null ? createElement('div', { style: emptyStyle }, createElement('div', { style: emptyIconStyle }, createElement(DebugIcon, { size: 22 })), createElement('strong', { style: emptyTitleStyle }, '还没有启动配置'), createElement('p', { style: emptyTextStyle }, '为当前 Workspace 添加一个命令，即可从这里启动终端、检查端口和访问服务。'), createElement('button', { type: 'button', 'aria-label': '添加启动配置', disabled: busy, onClick: () => setDraft(createProfileDraft()), style: secondaryButtonStyle }, '+ 添加第一个配置')) : null, profiles.map((profile) => {
+    return createElement('section', { style: panelStyle }, createElement('header', { style: headerStyle }, createElement('div', { style: titleBlockStyle }, createElement('div', { style: eyebrowStyle }, '工作区工具'), createElement('h2', { style: titleStyle }, '工作区调试'), createElement('div', { style: workspaceStyle, title: workspaceId }, createElement('span', { style: workspaceDotStyle }), workspaceId)), createElement('div', { style: headerActionsStyle }, createElement('span', { style: countStyle }, `${profiles.length} 个配置`), createElement('button', { type: 'button', 'aria-label': '添加启动配置', disabled: busy || draft !== null, onClick: () => setDraft(createProfileDraft()), style: primaryButtonStyle }, createElement('span', { 'aria-hidden': true }, '+'), ' 添加配置'))), message && createElement('div', { role: 'status', 'aria-live': 'polite', style: statusStyle(statusTone(message)) }, createElement('span', { style: statusIconStyle }, statusTone(message) === 'success' ? '✓' : statusTone(message) === 'error' ? '!' : 'i'), message), terminalStatus?.runtimeWarning === undefined ? null : createElement('div', { role: 'alert', style: warningStatusStyle }, createElement('span', { style: statusIconStyle }, '!'), terminalStatus.runtimeWarning), draft === null ? null : createProfileForm(draft), profiles.length === 0 && draft === null ? createElement('div', { style: emptyStyle }, createElement('div', { style: emptyIconStyle }, createElement(DebugIcon, { size: 22 })), createElement('strong', { style: emptyTitleStyle }, '还没有启动配置'), createElement('p', { style: emptyTextStyle }, '为当前 Workspace 添加一个命令，即可从这里启动终端、检查端口和访问服务。'), createElement('button', { type: 'button', 'aria-label': '添加启动配置', disabled: busy, onClick: () => setDraft(createProfileDraft()), style: secondaryButtonStyle }, '+ 添加第一个配置')) : null, profiles.map((profile) => {
         const running = runningInstances(profile, instances);
         const portCheck = portChecks[profile.id];
         return createElement('article', { key: profile.id, style: itemStyle }, createElement('div', { style: itemHeaderStyle }, createElement('div', { style: itemTitleBlockStyle }, createElement('strong', { style: itemTitleStyle }, profile.name), createElement('span', { style: itemCommandStyle }, formatCommand(profile))), createElement('span', { style: running > 0 ? runningBadgeStyle : stoppedBadgeStyle }, running > 0 ? `${running} 个运行中` : '未运行')), createElement('div', { style: metaStyle }, createElement('span', { style: metaItemStyle }, createElement('span', { style: metaKeyStyle }, '目录'), profile.cwdRelative || '.'), profile.port === null ? null : createElement('span', { style: metaItemStyle }, createElement('span', { style: metaKeyStyle }, '端口'), String(profile.port)), createElement('span', { style: metaItemStyle }, createElement('span', { style: metaKeyStyle }, '运行方式'), profile.runtimeType), profile.proxy.enabled ? createElement('span', { style: proxyBadgeStyle }, '代理已启用') : null), profile.port === null ? null : createElement('div', { style: portStatusStyle }, portCheck === undefined
@@ -150,7 +168,7 @@ function DebugBody({ sessionId, rpc, remote, sidebarRight }) {
             style: inputStyle,
         }));
         const selectField = (label, key, options) => createElement('label', { style: selectFieldStyle }, createElement('span', { style: fieldLabelStyle }, label), createElement('select', { value: value[key], onChange: (event) => setDraft({ ...value, [key]: event.currentTarget.value }), style: inputStyle }, ...options.map((option) => createElement('option', { key: option.value, value: option.value }, option.label))));
-        return createElement('div', { role: 'dialog', 'aria-modal': true, 'aria-labelledby': 'debug-shortcut-title', style: formOverlayStyle }, createElement('form', { style: formStyle, onSubmit: (event) => { event.preventDefault(); void saveProfile(value); } }, createElement('div', { style: formHeaderStyle }, createElement('div', undefined, createElement('h3', { id: 'debug-shortcut-title', style: formTitleStyle }, value.id === null ? '添加快捷启动项' : '编辑快捷启动项'), createElement('p', { style: formHintStyle }, '保存一组可重复使用的启动参数，之后可以一键打开终端。')), createElement('button', { type: 'button', disabled: busy, onClick: () => setDraft(null), style: closeButtonStyle, 'aria-label': '关闭快捷启动项' }, '×')), createElement('section', { style: formSectionStyle }, createElement('div', { style: formSectionHeaderStyle }, createElement('strong', { style: formSectionTitleStyle }, '启动入口'), createElement('span', { style: formSectionHintStyle }, '直接输入完整命令，例如 pnpm run dev --host 0.0.0.0。')), createElement('div', { style: formGridStyle }, field('名称', 'name', 'text', '例如：前端开发'), field('启动目录（Workspace 内相对路径）', 'cwdRelative', 'text', '留空使用根目录'), field('完整启动命令', 'commandLine', 'text', '例如：pnpm run dev --host 0.0.0.0', { gridColumn: '1 / -1' }))), createElement('section', { style: formSectionStyle }, createElement('div', { style: formSectionHeaderStyle }, createElement('strong', { style: formSectionTitleStyle }, '执行环境（可选）'), createElement('span', { style: formSectionHintStyle }, '只显示 Host 实际检测到的 Shell。')), createElement('div', { style: formGridStyle }, selectField('终端 Shell', 'shellProfileId', shellOptions(terminalStatus))), createElement('p', { style: runtimeHintStyle }, `运行方式由 Host 平台自动选择：${terminalRuntimeLabel(terminalStatus?.platform)}。`)), createElement('section', { style: formSectionStyle }, createElement('div', { style: formSectionHeaderStyle }, createElement('strong', { style: formSectionTitleStyle }, '服务检查'), createElement('span', { style: formSectionHintStyle }, '端口每 5 秒自动检查，也可手动刷新。')), createElement('div', { style: formGridStyle }, field('监听端口（可选）', 'port', 'number', '1 - 65535'), createElement('label', { style: proxyFieldStyle }, createElement('span', { style: fieldLabelStyle }, '反向代理'), createElement('span', { style: proxyToggleStyle }, createElement('span', undefined, '允许访问已确认的服务'), createElement('input', { type: 'checkbox', 'aria-label': '启用服务代理', checked: value.proxyEnabled, onChange: (event) => setDraft({ ...value, proxyEnabled: event.currentTarget.checked }), style: { accentColor: dshThemeColor.accent } }))))), createElement('div', { style: formActionsStyle }, createElement('button', { type: 'button', disabled: busy, onClick: () => setDraft(null), style: secondaryButtonStyle }, '关闭'), createElement('button', { type: 'submit', 'aria-label': value.id === null ? '保存配置并创建快捷启动项' : '保存快捷启动项修改', disabled: busy || value.commandLine.trim() === '', style: primaryButtonStyle }, busy ? '保存中…' : value.id === null ? '保存为快捷启动' : '保存修改'))));
+        return createElement('div', { role: 'dialog', 'aria-modal': true, 'aria-labelledby': 'debug-shortcut-title', style: formOverlayStyle }, createElement('form', { style: formStyle, onSubmit: (event) => { event.preventDefault(); void saveProfile(value); } }, createElement('div', { style: formHeaderStyle }, createElement('div', undefined, createElement('h3', { id: 'debug-shortcut-title', style: formTitleStyle }, value.id === null ? '添加快捷启动项' : '编辑快捷启动项'), createElement('p', { style: formHintStyle }, '保存一组可重复使用的启动参数，之后可以一键打开终端。')), createElement('button', { type: 'button', disabled: busy, onClick: () => setDraft(null), style: closeButtonStyle, 'aria-label': '关闭快捷启动项' }, '×')), createElement('section', { style: formSectionStyle }, createElement('div', { style: formSectionHeaderStyle }, createElement('strong', { style: formSectionTitleStyle }, '启动入口'), createElement('span', { style: formSectionHintStyle }, '直接输入完整命令，例如 pnpm run dev --host 0.0.0.0。')), createElement('div', { style: formGridStyle }, field('名称', 'name', 'text', '例如：前端开发'), field('启动目录（Workspace 内相对路径）', 'cwdRelative', 'text', '留空使用根目录'), field('完整启动命令', 'commandLine', 'text', '例如：pnpm run dev --host 0.0.0.0', { gridColumn: '1 / -1' }))), createElement('section', { style: formSectionStyle }, createElement('div', { style: formSectionHeaderStyle }, createElement('strong', { style: formSectionTitleStyle }, '执行环境（可选）'), createElement('span', { style: formSectionHintStyle }, '只显示 Host 实际检测到的 Shell。')), createElement('div', { style: formGridStyle }, selectField('终端 Shell', 'shellProfileId', shellOptions(terminalStatus))), createElement('p', { style: runtimeHintStyle }, `运行方式由 Host 平台自动选择（实际能力：${terminalRuntimeLabel(terminalStatus)}）。`), terminalStatus?.runtimeWarning === undefined ? null : createElement('p', { style: warningHintStyle }, terminalStatus.runtimeWarning)), createElement('section', { style: formSectionStyle }, createElement('div', { style: formSectionHeaderStyle }, createElement('strong', { style: formSectionTitleStyle }, '服务检查'), createElement('span', { style: formSectionHintStyle }, '端口每 5 秒自动检查，也可手动刷新。')), createElement('div', { style: formGridStyle }, field('监听端口（可选）', 'port', 'number', '1 - 65535'), createElement('label', { style: proxyFieldStyle }, createElement('span', { style: fieldLabelStyle }, '反向代理'), createElement('span', { style: proxyToggleStyle }, createElement('span', undefined, '允许访问已确认的服务'), createElement('input', { type: 'checkbox', 'aria-label': '启用服务代理', checked: value.proxyEnabled, onChange: (event) => setDraft({ ...value, proxyEnabled: event.currentTarget.checked }), style: { accentColor: dshThemeColor.accent } }))))), createElement('div', { style: formActionsStyle }, createElement('button', { type: 'button', disabled: busy, onClick: () => setDraft(null), style: secondaryButtonStyle }, '关闭'), createElement('button', { type: 'submit', 'aria-label': value.id === null ? '保存配置并创建快捷启动项' : '保存快捷启动项修改', disabled: busy || value.commandLine.trim() === '', style: primaryButtonStyle }, busy ? '保存中…' : value.id === null ? '保存为快捷启动' : '保存修改'))));
     }
     async function saveProfile(value) {
         await withBusy(async () => {
@@ -171,7 +189,7 @@ function DebugBody({ sessionId, rpc, remote, sidebarRight }) {
                 args: commandParts.slice(1),
                 env: {},
                 shell,
-                runtimeType: runtimeTypeFor(terminalStatus?.platform, shell.profileId),
+                runtimeType: runtimeTypeFor(terminalStatus, shell.profileId),
                 port,
                 proxy: { enabled: value.proxyEnabled },
             };
@@ -331,6 +349,8 @@ const selectFieldStyle = { ...fieldStyle };
 const fieldLabelStyle = { color: dshThemeColor.labelSecondary, fontSize: 12, fontWeight: 500 };
 const inputStyle = { ...dshFieldStyle, width: '100%', boxSizing: 'border-box', minHeight: 32, padding: '6px 8px', borderRadius: 6, fontSize: 12 };
 const runtimeHintStyle = { margin: '-5px 0 0', color: dshThemeColor.labelTertiary, fontSize: 11 };
+const warningHintStyle = { margin: '-5px 0 0', color: dshThemeColor.error, fontSize: 11 };
+const warningStatusStyle = { ...statusStyle('error'), marginBottom: 0 };
 const formGridStyle = { display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(220px, 1fr))', gap: 14 };
 const proxyFieldStyle = { ...fieldStyle };
 const proxyToggleStyle = { display: 'flex', alignItems: 'center', justifyContent: 'space-between', height: 32, boxSizing: 'border-box', padding: '0 2px', border: 0, borderRadius: 0, color: dshThemeColor.labelSecondary, background: 'transparent', fontSize: 12, lineHeight: '18px' };
@@ -386,23 +406,33 @@ function shellArgsFor(profileId) {
 function defaultShellForPlatform(platform) {
     return platform === 'win32' ? 'powershell' : 'zsh';
 }
-function runtimeTypeFor(platform, shellProfileId) {
-    if (platform !== 'win32' && platform !== 'darwin' && platform !== 'linux')
-        throw new Error('Host 平台不支持自动选择终端运行方式');
-    if (platform !== 'win32')
+function runtimeTypeFor(status, shellProfileId) {
+    if (status === null || status === undefined)
+        throw new Error('尚未获取 Host 终端能力');
+    const runtimeTypes = status.runtimeTypes ?? (status.effectiveEnabled ? ['tmux'] : ['local-pty']);
+    if (runtimeTypes.includes('tmux'))
         return 'tmux';
-    if (shellProfileId === 'cmd')
+    if (status.platform !== 'win32')
+        return 'local-pty';
+    if (shellProfileId === 'cmd' && runtimeTypes.includes('conpty-cmd'))
         return 'conpty-cmd';
-    if (shellProfileId === 'git-bash')
+    if (shellProfileId === 'git-bash' && runtimeTypes.includes('conpty-git-bash'))
         return 'conpty-git-bash';
-    return 'conpty-powershell';
+    if (runtimeTypes.includes('conpty-powershell'))
+        return 'conpty-powershell';
+    if (runtimeTypes.includes('local-pty'))
+        return 'local-pty';
+    throw new Error('Host 没有可用的终端 backend');
 }
-function terminalRuntimeLabel(platform) {
-    if (platform === 'win32')
+function terminalRuntimeLabel(status) {
+    const runtimeTypes = status?.runtimeTypes ?? (status?.effectiveEnabled ? ['tmux'] : ['local-pty']);
+    if (runtimeTypes.includes('tmux'))
+        return status?.platform === 'darwin' ? 'macOS 使用 tmux' : 'Linux 使用 tmux';
+    if (runtimeTypes.includes('conpty-powershell') || runtimeTypes.includes('conpty-cmd') || runtimeTypes.includes('conpty-git-bash'))
         return 'Windows 使用 ConPTY';
-    if (platform === 'darwin' || platform === 'linux')
-        return `${platform === 'darwin' ? 'macOS' : 'Linux'} 使用 tmux`;
-    return '等待 Host 平台状态';
+    if (runtimeTypes.includes('local-pty'))
+        return '使用 local-pty（进程内 PTY）';
+    return '等待 Host 终端能力状态';
 }
 function splitCommandLine(value) {
     const parts = [];

package/data/build/dist/client/dsh-runtime-version.d.ts

@@ -1,3 +1,10 @@
-/** 读取 Host 注入的真实 DSH 版本，并在无法读取时拒绝启用 Client。 */
-export declare function assertInjectedDshVersion(): string;
+import type { Context } from '@deepseek-ai/cordis';
+/**
+ * 读取 Host 注入的真实 DSH 版本，并在无法读取时拒绝启用 Client。
+ *
+ * DSH 0.1.7 的设置服务迁移会让旧 Host 启动页注入钩子无法执行；此时
+ * `configForms` 是新版 Client 唯一可靠的运行时标志，使用其最低现代版本
+ * 作为能力路由版本，避免因为旧注入链失败而误判整个 Client 不兼容。
+ */
+export declare function assertInjectedDshVersion(ctx?: Context): string;
 //# sourceMappingURL=dsh-runtime-version.d.ts.map

package/data/build/dist/client/dsh-runtime-version.js

@@ -1,11 +1,33 @@
 import { assertSupportedDshVersion, CODINGNS_DSH_ERROR_CODES, CODINGNS_DSH_VERSION_GLOBAL, CodingNsDshError, } from '../shared/index.js';
-/** 读取 Host 注入的真实 DSH 版本，并在无法读取时拒绝启用 Client。 */
-export function assertInjectedDshVersion() {
+/**
+ * 读取 Host 注入的真实 DSH 版本，并在无法读取时拒绝启用 Client。
+ *
+ * DSH 0.1.7 的设置服务迁移会让旧 Host 启动页注入钩子无法执行；此时
+ * `configForms` 是新版 Client 唯一可靠的运行时标志，使用其最低现代版本
+ * 作为能力路由版本，避免因为旧注入链失败而误判整个 Client 不兼容。
+ */
+export function assertInjectedDshVersion(ctx) {
     const value = globalThis[CODINGNS_DSH_VERSION_GLOBAL];
     if (typeof value !== 'string' || value.trim() === '') {
+        if (hasModernConfigForms(ctx)) {
+            const modernVersion = '0.1.7-rc.2';
+            assertSupportedDshVersion(modernVersion);
+            return modernVersion;
+        }
         throw new CodingNsDshError(CODINGNS_DSH_ERROR_CODES.DSH_VERSION_UNSUPPORTED, '无法读取当前 DSH 版本；为避免 Client API 不兼容，已拒绝启用 codingns4dsh');
     }
     assertSupportedDshVersion(value);
     return value;
 }
+function hasModernConfigForms(ctx) {
+    if (ctx === undefined)
+        return false;
+    try {
+        const forms = ctx.get('configForms');
+        return typeof forms?.get === 'function';
+    }
+    catch {
+        return false;
+    }
+}
 //# sourceMappingURL=dsh-runtime-version.js.map

package/data/build/dist/client/features/cli-adapters.d.ts

@@ -3,5 +3,5 @@ import type { FeaturePanelProps, CodingNsClientFeatureModule } from './types.js'
 /** 外部 Agent 集成模块。Agent 进程在 Host 运行，浏览器只读取目录和状态。 */
 export declare const cliAdaptersFeature: CodingNsClientFeatureModule;
 /** 设置页中的 Agent 列表和详情模态框。 */
-export declare function CliAdaptersPanel({ services, enabled }: FeaturePanelProps): ReactElement;
+export declare function CliAdaptersPanel({ services, enabled, notify }: FeaturePanelProps): ReactElement;
 //# sourceMappingURL=cli-adapters.d.ts.map

package/data/build/dist/client/features/cli-adapters.js

@@ -7,7 +7,7 @@ import { registerExternalToolStreamUi } from '../external-tool-stream.js';
 export const cliAdaptersFeature = {
     descriptor: {
         name: 'cliAdapters',
-        version: '0.1.0',
+        version: '0.1.1',
         enabledByDefault: true,
         dependencies: [],
         runtime: 'client',
@@ -33,7 +33,7 @@ export const cliAdaptersFeature = {
     settingsPanel: CliAdaptersPanel,
 };
 /** 设置页中的 Agent 列表和详情模态框。 */
-export function CliAdaptersPanel({ services, enabled }) {
+export function CliAdaptersPanel({ services, enabled, notify }) {
     const t = useCodingNsTranslator(services.locale);
     const [catalog, setCatalog] = useState([]);
     const [selected, setSelected] = useState(null);
@@ -44,7 +44,7 @@ export function CliAdaptersPanel({ services, enabled }) {
     const [sessionsLoading, setSessionsLoading] = useState(false);
     const [restoringSessionId, setRestoringSessionId] = useState(null);
     const [archivingSessionId, setArchivingSessionId] = useState(null);
-    const [message, setMessage] = useState('');
+    const [modelsError, setModelsError] = useState('');
     const disabled = !enabled;
     useEffect(() => {
         if (disabled)
@@ -55,7 +55,7 @@ export function CliAdaptersPanel({ services, enabled }) {
             .then((value) => { if (active)
             setCatalog(value); })
             .catch((error) => { if (active)
-            setMessage(errorMessage(error)); })
+            notify({ kind: 'error', message: errorMessage(error) }); })
             .finally(() => { if (active)
             setLoading(false); });
         return () => { active = false; };
@@ -71,7 +71,7 @@ export function CliAdaptersPanel({ services, enabled }) {
             .then((value) => { if (active)
             setSessions(value); })
             .catch((error) => { if (active)
-            setMessage(errorMessage(error)); })
+            notify({ kind: 'error', message: errorMessage(error) }); })
             .finally(() => { if (active)
             setSessionsLoading(false); });
         return () => { active = false; };
@@ -83,26 +83,29 @@ export function CliAdaptersPanel({ services, enabled }) {
         }
         let active = true;
         setModels(null);
-        setMessage('');
+        setModelsError('');
         void callCliRpc(services.rpc, 'models', { adapterId: selected.id })
             .then((value) => { if (active)
             setModels(value); })
-            .catch((error) => { if (active)
-            setMessage(errorMessage(error)); });
+            .catch((error) => { if (active) {
+            const message = errorMessage(error);
+            setModelsError(message);
+            notify({ kind: 'error', message });
+        } });
         return () => { active = false; };
     }, [disabled, selected, services.rpc]);
     const rowStyle = dshSettingsListRowStyle;
     const buttonStyle = { ...dshSettingsButtonStyle, cursor: disabled ? 'not-allowed' : 'pointer' };
     const toggleAdapter = async (adapter, next) => {
         setBusyAdapterId(adapter.id);
-        setMessage('');
         try {
             await callCliRpc(services.rpc, 'adapter/set', { adapterId: adapter.id, enabled: next });
             const refreshed = await callCliRpc(services.rpc, 'catalog', {});
             setCatalog(refreshed);
+            notify({ kind: 'success', message: next ? `已启用 ${adapter.name}` : `已停用 ${adapter.name}` });
         }
         catch (error) {
-            setMessage(errorMessage(error));
+            notify({ kind: 'error', message: errorMessage(error) });
         }
         finally {
             setBusyAdapterId(null);
@@ -110,12 +113,12 @@ export function CliAdaptersPanel({ services, enabled }) {
     };
     const restoreSession = async (record) => {
         setRestoringSessionId(record.dshSessionId);
-        setMessage('');
         try {
             await restoreCliSession(services.rpc, record);
+            notify({ kind: 'success', message: `已打开 ${record.title ?? record.adapterId} 会话` });
         }
         catch (error) {
-            setMessage(errorMessage(error));
+            notify({ kind: 'error', message: errorMessage(error) });
         }
         finally {
             setRestoringSessionId(null);
@@ -123,13 +126,13 @@ export function CliAdaptersPanel({ services, enabled }) {
     };
     const archiveSession = async (record) => {
         setArchivingSessionId(record.dshSessionId);
-        setMessage('');
         try {
             await archiveCliSession(services.rpc, record.dshSessionId);
             setSessions((current) => current.filter((item) => item.dshSessionId !== record.dshSessionId));
+            notify({ kind: 'success', message: `已移除 ${record.title ?? record.adapterId} 会话` });
         }
         catch (error) {
-            setMessage(errorMessage(error));
+            notify({ kind: 'error', message: errorMessage(error) });
         }
         finally {
             setArchivingSessionId(null);
@@ -148,10 +151,10 @@ export function CliAdaptersPanel({ services, enabled }) {
         onRestore: (record) => { void restoreSession(record); },
         onArchive: (record) => { void archiveSession(record); },
         t,
-    }), message && createElement('div', { role: 'alert', style: { marginTop: 10, color: dshThemeColor.error } }, message), selected !== null && createElement(AdapterDetailsDialog, {
+    }), selected !== null && createElement(AdapterDetailsDialog, {
         adapter: selected,
         models,
-        loading: selected.installed && selected.enabled && models === null && !message,
+        loading: selected.installed && selected.enabled && models === null && modelsError === '',
         onClose: () => setSelected(null),
         buttonStyle,
         t,

package/data/build/dist/client/features/debug.js

@@ -3,7 +3,7 @@ import { registerDebugUi } from '../debug/ui.js';
 export const debugFeature = {
     descriptor: {
         name: 'debug',
-        version: '0.1.0',
+        version: '0.1.1',
         enabledByDefault: true,
         dependencies: [],
         runtime: 'client',
@@ -18,7 +18,7 @@ export const debugFeature = {
         const uiContext = context.services.uiContext;
         if (uiContext === undefined)
             throw new Error('工作区调试模块缺少 DSH UI 上下文');
-        context.resources.add(registerDebugUi(uiContext, context.services.rpc, context.services.remote));
+        context.resources.add(registerDebugUi(uiContext, context.services.rpc, context.services.remote, context.services.terminalRemote));
     },
 };
 //# sourceMappingURL=debug.js.map

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

@@ -7,6 +7,7 @@ import { cliAdaptersFeature } from './cli-adapters.js';
 import { terminalEnhancementFeature } from './terminal-enhancement.js';
 import { workspaceSessionEnhancementFeature } from './workspace-session-enhancement.js';
 import { debugFeature } from './debug.js';
+import { gitManagementFeature } from '../git-management.js';
 import type { CodingNsClientFeatureModule, CodingNsClientServices } from './types.js';
 /** Client 侧功能模块清单：新增模块在这里登记一行，不需要改动设置页和入口。 */
 export declare const CLIENT_FEATURES: readonly CodingNsClientFeatureModule[];
@@ -21,7 +22,7 @@ export interface CodingNsSettingsModule {
  * 归属 Host 的模块由 Host 侧配置承载，这里跳过；没有 ui 描述的模块不显示。
  */
 export declare function settingsModules(registry: FeatureRegistry<CodingNsClientServices, CodingNsClientFeatureModule>): readonly CodingNsSettingsModule[];
-export { lanAccessFeature, loginProtectionFeature, reverseProxyFeature, cliAdaptersFeature, workspaceSessionEnhancementFeature, terminalEnhancementFeature, debugFeature };
+export { lanAccessFeature, loginProtectionFeature, reverseProxyFeature, cliAdaptersFeature, workspaceSessionEnhancementFeature, terminalEnhancementFeature, debugFeature, gitManagementFeature };
 export { startBrowserRelayConnection } from './reverse-proxy.js';
 export { LanAccessPanel } from './lan-access-panel.js';
 export { LoginProtectionPanel } from './login-protection-panel.js';