@jingyi0605/codingns4dsh 0.2.1-beta.13 → 0.2.1-beta.15

package/data/build/dist/client/git-management.js

@@ -1,5 +1,7 @@
 import { startSerialPolling } from './serial-polling.js';
-import { createElement, useEffect, useRef, useState, useSyncExternalStore } from 'react';
+import { createElement, Fragment, useEffect, useMemo, useRef, useState, useSyncExternalStore } from 'react';
+import { MAX_GIT_COMMIT_MESSAGE_CHARS } from '../shared/contracts/git.js';
+import { GitManagementSettingsPanel } from './git-management-settings.js';
 import { buildHistoryGraph, GRAPH_DASH_ARRAY, GRAPH_LANE_WIDTH, GRAPH_ROW_HEIGHT, laneCenterX, laneColor, laneStroke, laneDashed, isUnpushed, segmentStroke } from './git-history-graph.js';
 import { CODINGNS_RPC_CHANNEL } from '../shared/contracts/transport.js';
 import { backdropPointerDownHandler, useDismissOnOutsidePointer } from './popup-dismiss.js';
@@ -46,7 +48,7 @@ export function registerGitManagementUi(ctx, services) {
         }));
         disposers.push(ctx.slots.inject('sidebar.right.pane.tab', () => ctx.slots.register({
             name: 'sidebar.right.pane.tab', key: GIT_PROVIDER_ID,
-            inject: () => ({ rpc: services.rpc, remote: services.remote, uiContext: ctx, t }),
+            inject: () => ({ rpc: services.rpc, remote: services.remote, uiContext: ctx, settings: services.settings, t }),
         }, GitPanel)));
         disposers.push(ctx.slots.inject('sidebar.right.pane.tab.title', () => ctx.slots.register({
             name: 'sidebar.right.pane.tab.title', key: GIT_PROVIDER_ID,
@@ -89,6 +91,12 @@ function GitTabTitle({ useTabInfo, t }) {
 function GitPanel(props) {
     const sessionId = String(props.sessionId);
     const t = props.t;
+    const settingsStore = useMemo(() => ({
+        subscribe: (listener) => props.settings?.subscribe(listener) ?? (() => undefined),
+        read: () => props.settings?.getSnapshot(),
+    }), [props.settings]);
+    const settingsSnapshot = useSyncExternalStore(settingsStore.subscribe, settingsStore.read, settingsStore.read);
+    const generationEnabled = settingsSnapshot?.value?.gitManagement?.commitMessageEnabled !== false;
     const tabInfo = props.useTabInfo();
     // 聚合摘要晚到时重新解析归属；普通状态更新不应清空已经展开的 Git 视图。
     useGitWorkspaceSnapshot(props.uiContext);
@@ -98,44 +106,30 @@ function GitPanel(props) {
     const [history, setHistory] = useState([]);
     const [branches, setBranches] = useState(null);
     const [subject, setSubject] = useState('');
-    const [busy, setBusy] = useState(false);
+    const [operationBusy, setBusy] = useState(false);
+    const [generating, setGenerating] = useState(false);
+    const draftRequest = useRef(null);
+    const busy = operationBusy || generating;
     const [activeOperation, setActiveOperation] = useState(null);
     const [toast, setToast] = useState(null);
     const [diffView, setDiffView] = useState(null);
     const [fileDiff, setFileDiff] = useState(null);
-    const [singleColumn, setSingleColumn] = useState(false);
     const [activeColumn, setActiveColumn] = useState('files');
     const [historyScope, setHistoryScope] = useState('all');
     const [historyTotalCount, setHistoryTotalCount] = useState(0);
     const [historyLoadingMore, setHistoryLoadingMore] = useState(false);
-    const contentGridRef = useRef(null);
     const historyExpanded = useRef(false);
     const gridVisible = status !== null && status.snapshot.enabled !== false;
+    useEffect(() => {
+        setGenerating(false);
+        return () => { draftRequest.current?.abort(); draftRequest.current = null; };
+    }, [workspaceId, generationEnabled, sessionId, projectedWorkspaceId]);
     useEffect(() => {
         if (toast === null)
             return;
         const timer = globalThis.setTimeout(() => setToast(null), 3200);
         return () => globalThis.clearTimeout(timer);
     }, [toast]);
-    useEffect(() => {
-        const element = contentGridRef.current;
-        if (element === null) {
-            setSingleColumn(false);
-            return;
-        }
-        const update = () => {
-            const tracks = getComputedStyle(element).gridTemplateColumns.split(' ').filter((track) => track !== '');
-            setSingleColumn(tracks.length <= 1);
-        };
-        update();
-        if (typeof ResizeObserver === 'undefined') {
-            window.addEventListener('resize', update);
-            return () => window.removeEventListener('resize', update);
-        }
-        const observer = new ResizeObserver(update);
-        observer.observe(element);
-        return () => observer.disconnect();
-    }, [gridVisible]);
     const notify = (kind, message) => setToast({ kind, message });
     useEffect(() => {
         let disposed = false;
@@ -285,6 +279,31 @@ function GitPanel(props) {
         }
         void run('git/commit', { subject: value }, () => setSubject(''));
     };
+    const generateMessage = async () => {
+        if (!generationEnabled || busy || workspaceId === undefined || draftRequest.current !== null)
+            return;
+        const abort = new AbortController();
+        draftRequest.current = abort;
+        setGenerating(true);
+        notify('info', t('git.generatingMessage'));
+        try {
+            const draft = await call(props.rpc, 'git/generate-message', { workspaceId }, abort.signal);
+            if (abort.signal.aborted)
+                return;
+            setSubject(draft.message);
+            setToast(null);
+        }
+        catch (error) {
+            if (!abort.signal.aborted)
+                notify('error', error instanceof Error ? error.message : String(error));
+        }
+        finally {
+            if (draftRequest.current === abort) {
+                draftRequest.current = null;
+                setGenerating(false);
+            }
+        }
+    };
     const copyCommitHash = (commitHash) => {
         void copyText(commitHash).then((copied) => notify(copied ? 'success' : 'error', copied ? t('git.commitHashCopied') : t('git.copyUnsupported')));
     };
@@ -333,16 +352,17 @@ function GitPanel(props) {
     };
     const stageAll = () => { void run('git/stage', { targets: unstaged.map((item) => item.path) }); };
     const discardAll = () => { void run('git/discard', { targets: changes.map((item) => item.path) }); };
-    return createElement('section', { style: panelStyle, 'data-git-management-panel': 'true' }, 
+    const panel = createElement('section', { className: gitPanelClass.panel, style: panelStyle, 'data-git-management-panel': 'true' }, 
     // 面板标题已由 Sidebar 标签页渲染，这里不再重复；只保留视图切换与操作菜单。
-    createElement('header', { style: headerStyle }, singleColumn ? createElement('div', { style: columnSwitchStyle }, createElement((SegmentedControl), {
+    createElement('header', { style: headerStyle }, gridVisible ? createElement('div', { className: gitPanelClass.columnSwitch, style: columnSwitchStyle }, createElement((SegmentedControl), {
         id: 'codingns4dsh-git-view', value: activeColumn, onChange: setActiveColumn, label: t('git.viewSwitcherLabel'),
         options: [
             { value: 'files', label: t('git.switchToFiles'), title: t('git.switchToFiles') },
             { value: 'history', label: t('git.switchToHistory'), title: t('git.switchToHistory') },
         ],
-    })) : null, createElement('div', { style: headerActionsStyle }, createElement(GitOperationsMenu, { busy, activeOperation, hasRemote: Boolean(status?.snapshot.hasRemote || branches?.remote.length), canUndo: history.length > 0, hasMoreVersions: history.length < historyTotalCount, stagedCount: staged.length, unstagedCount: unstaged.length, onStageAll: stageAll, onDiscardAll: discardAll, onLoadMore: loadMoreHistory, onOperation: runGitOperation, t }))), toast === null ? null : createElement('div', { role: toast.kind === 'error' ? 'alert' : 'status', 'aria-live': 'polite', style: { ...dshSettingsToastStyle, position: 'absolute', top: 8, right: 'auto', left: '50%', transform: 'translateX(-50%)', width: 'min(300px, calc(100% - 24px))', pointerEvents: 'none', borderColor: toast.kind === 'error' ? dshThemeColor.error : toast.kind === 'success' ? dshThemeColor.success : dshThemeColor.border } }, toast.message), status === null ? createElement('div', { style: emptyStyle }, t('git.readingStatus')) : null, status !== null && status.snapshot.enabled === false ? createElement('section', { style: sectionStyle }, createElement('strong', undefined, t('git.noRepository')), createElement('div', { style: mutedStyle }, t('git.initHint')), createElement('button', { type: 'button', disabled: busy, onClick: () => void run('git/init', {}), className: `${gitPanelClass.button} ${gitPanelClass.buttonPrimary}`, style: primaryButtonStyle }, t('git.init'))) : null, status !== null ? createElement('div', { style: summaryStyle }, t('git.summary', { staged: staged.length, unstaged: unstaged.length, total: historyTotalCount, scope: historyScope === 'all' ? t('git.allBranches') : t('git.currentBranch') })) : null, diffView !== null ? createElement(DiffViewer, { diff: diffView, onClose: () => setDiffView(null), t }) : null, fileDiff !== null ? createElement(FileDiffViewer, { path: fileDiff.path, staged: fileDiff.staged, diff: fileDiff.diff, onClose: () => setFileDiff(null), t }) : null, status !== null && status.snapshot.enabled !== false ? createElement('div', { ref: contentGridRef, style: contentGridStyle }, singleColumn && activeColumn !== 'files' ? null : createElement('div', { style: columnStyle }, createElement('section', { style: commitSectionStyle }, createElement('div', { style: sectionHeaderStyle }, createElement('strong', undefined, t('git.commitChanges')), createElement('span', { style: mutedStyle }, staged.length === 0 ? t('git.stagingEmpty') : t('git.stagedCount', { count: staged.length }))), createElement('div', { style: commitEditorRowStyle }, createElement('textarea', { value: subject, disabled: busy || workspaceId === undefined, className: gitPanelClass.field, onChange: (event) => setSubject(event.currentTarget.value), onKeyDown: (event) => { if (event.key === 'Enter')
-            event.preventDefault(); }, placeholder: t('git.commitPlaceholder'), rows: 1, style: commitSubjectStyle }), createElement('button', { type: 'button', disabled: busy || workspaceId === undefined, onClick: () => notify('info', t('git.draftUnavailable')), className: `${gitPanelClass.button} ${gitPanelClass.field}`, style: draftButtonStyle, title: t('git.draftMessage'), 'aria-label': t('git.draftMessage') }, '✦')), createElement('div', { style: commitActionsStyle }, createElement('button', { type: 'button', disabled: busy || workspaceId === undefined, onClick: () => void run('git/status', {}, (value) => setStatus(value)), className: `${gitPanelClass.button} ${gitPanelClass.field}`, style: refreshActionStyle }, t('git.refresh')), createElement('button', { type: 'button', disabled: busy || workspaceId === undefined || staged.length === 0 || subject.trim().length === 0, onClick: commit, className: `${gitPanelClass.button} ${gitPanelClass.buttonPrimary}`, style: submitActionStyle }, t('git.commit')))), staged.length > 0 ? createElement(ChangeSection, { title: t('git.stagedFiles'), staged: true, items: staged, busy, onOpenDiff: openFileDiff, onAction: (action, path) => void run(`git/${action}`, { targets: [path] }), onBatchAction: (action, paths) => void run(`git/${action}`, { targets: paths }), onBulkAction: () => void run('git/unstage', { targets: staged.map((item) => item.path) }), t }) : null, unstaged.length > 0 ? createElement(ChangeSection, { title: t('git.unstagedFiles'), staged: false, items: unstaged, busy, onOpenDiff: openFileDiff, onAction: (action, path) => void run(`git/${action}`, { targets: [path] }), onBatchAction: (action, paths) => void run(`git/${action}`, { targets: paths }), onBulkAction: () => void run('git/stage', { targets: unstaged.map((item) => item.path) }), t }) : null), singleColumn && activeColumn !== 'history' ? null : createElement('div', { style: columnStyle }, createElement(HistorySection, { history, totalCount: historyTotalCount, hasMore: history.length < historyTotalCount, loadingMore: historyLoadingMore, onLoadMore: loadMoreHistory, branches, busy, scope: historyScope, hasRemote: Boolean(status?.snapshot.hasRemote || branches?.remote.length), onScopeChange: setHistoryScope, onSwitch: (branchName) => void run('git/switch', { branchName, create: false }, (value) => setBranches(normalizeBranchSnapshot(value))), onCopy: copyCommitHash, onCopyMessage: copyCommitMessage, onViewDiff: openCommitDiff, onUndo: () => runGitOperation('undo'), t }))) : null);
+    })) : null, createElement('div', { style: headerActionsStyle }, createElement(GitOperationsMenu, { busy, activeOperation, hasRemote: Boolean(status?.snapshot.hasRemote || branches?.remote.length), canUndo: history.length > 0, hasMoreVersions: history.length < historyTotalCount, stagedCount: staged.length, unstagedCount: unstaged.length, onStageAll: stageAll, onDiscardAll: discardAll, onLoadMore: loadMoreHistory, onOperation: runGitOperation, t }))), toast === null ? null : createElement('div', { role: toast.kind === 'error' ? 'alert' : 'status', 'aria-live': 'polite', style: { ...dshSettingsToastStyle, position: 'absolute', top: 8, right: 'auto', left: '50%', transform: 'translateX(-50%)', width: 'min(300px, calc(100% - 24px))', pointerEvents: 'none', borderColor: toast.kind === 'error' ? dshThemeColor.error : toast.kind === 'success' ? dshThemeColor.success : dshThemeColor.border } }, toast.message), status === null ? createElement('div', { style: emptyStyle }, t('git.readingStatus')) : null, status !== null && status.snapshot.enabled === false ? createElement('section', { style: sectionStyle }, createElement('strong', undefined, t('git.noRepository')), createElement('div', { style: mutedStyle }, t('git.initHint')), createElement('button', { type: 'button', disabled: busy, onClick: () => void run('git/init', {}), className: `${gitPanelClass.button} ${gitPanelClass.buttonPrimary}`, style: primaryButtonStyle }, t('git.init'))) : null, status !== null ? createElement('div', { style: summaryStyle }, t('git.summary', { staged: staged.length, unstaged: unstaged.length, total: historyTotalCount, scope: historyScope === 'all' ? t('git.allBranches') : t('git.currentBranch') })) : null, status !== null && status.snapshot.enabled !== false ? createElement('div', { className: gitPanelClass.contentGrid, style: contentGridStyle, 'data-active-column': activeColumn }, createElement('div', { className: gitPanelClass.column, style: columnStyle, 'data-git-column': 'files' }, createElement('section', { style: commitSectionStyle }, createElement('div', { style: sectionHeaderStyle }, createElement('strong', undefined, t('git.commitChanges')), createElement('span', { style: mutedStyle }, staged.length === 0 ? t('git.stagingEmpty') : t('git.stagedCount', { count: staged.length }))), createElement('div', { style: commitEditorRowStyle }, createElement('textarea', { value: subject, disabled: busy || workspaceId === undefined, maxLength: MAX_GIT_COMMIT_MESSAGE_CHARS, className: gitPanelClass.field, onChange: (event) => setSubject(event.currentTarget.value), placeholder: t('git.commitPlaceholder'), rows: Math.min(8, subject.split('\n').length), style: commitSubjectStyle }), generationEnabled && createElement('button', { type: 'button', disabled: busy || workspaceId === undefined || staged.length === 0, onClick: () => { void generateMessage(); }, className: `${gitPanelClass.button} ${gitPanelClass.field}`, style: draftButtonStyle, title: t(generating ? 'git.generatingMessage' : 'git.draftMessage'), 'aria-label': t('git.draftMessage'), 'aria-busy': generating }, generating ? '…' : '✦')), createElement('div', { style: commitActionsStyle }, createElement('button', { type: 'button', disabled: busy || workspaceId === undefined, onClick: () => void run('git/status', {}, (value) => setStatus(value)), className: `${gitPanelClass.button} ${gitPanelClass.field}`, style: refreshActionStyle }, t('git.refresh')), createElement('button', { type: 'button', disabled: busy || workspaceId === undefined || staged.length === 0 || subject.trim().length === 0, onClick: commit, className: `${gitPanelClass.button} ${gitPanelClass.buttonPrimary}`, style: submitActionStyle }, t('git.commit')))), staged.length > 0 ? createElement(ChangeSection, { title: t('git.stagedFiles'), staged: true, items: staged, busy, onOpenDiff: openFileDiff, onAction: (action, path) => void run(`git/${action}`, { targets: [path] }), onBatchAction: (action, paths) => void run(`git/${action}`, { targets: paths }), onBulkAction: () => void run('git/unstage', { targets: staged.map((item) => item.path) }), t }) : null, unstaged.length > 0 ? createElement(ChangeSection, { title: t('git.unstagedFiles'), staged: false, items: unstaged, busy, onOpenDiff: openFileDiff, onAction: (action, path) => void run(`git/${action}`, { targets: [path] }), onBatchAction: (action, paths) => void run(`git/${action}`, { targets: paths }), onBulkAction: () => void run('git/stage', { targets: unstaged.map((item) => item.path) }), t }) : null), createElement('div', { className: gitPanelClass.column, style: columnStyle, 'data-git-column': 'history' }, createElement(HistorySection, { history, totalCount: historyTotalCount, hasMore: history.length < historyTotalCount, loadingMore: historyLoadingMore, onLoadMore: loadMoreHistory, branches, busy, scope: historyScope, hasRemote: Boolean(status?.snapshot.hasRemote || branches?.remote.length), onScopeChange: setHistoryScope, onSwitch: (branchName) => void run('git/switch', { branchName, create: false }, (value) => setBranches(normalizeBranchSnapshot(value))), onCopy: copyCommitHash, onCopyMessage: copyCommitMessage, onViewDiff: openCommitDiff, onUndo: () => runGitOperation('undo'), t }))) : null);
+    // Fixed overlays must stay outside the layout containment used by container queries.
+    return createElement(Fragment, undefined, panel, diffView !== null ? createElement(DiffViewer, { diff: diffView, onClose: () => setDiffView(null), t }) : null, fileDiff !== null ? createElement(FileDiffViewer, { path: fileDiff.path, staged: fileDiff.staged, diff: fileDiff.diff, onClose: () => setFileDiff(null), t }) : null);
 }
 function ChangeSection({ title, staged, items, busy, onOpenDiff, onAction, onBatchAction, onBulkAction, t }) {
     const [hoveredPath, setHoveredPath] = useState(null);
@@ -1013,15 +1033,15 @@ function graphRailStyle(lane, stroke, dashed = false) {
     return { position: 'absolute', top: 0, bottom: 0, left: laneCenterX(lane) - 0.75, width: 1.5, borderRadius: dashed ? 0 : 1, background };
 }
 // 面板根节点不再铺底色：DSH 右侧栏的其它面板都是透明的，继承 Sidebar 表面色才不会出现色块接缝。
-const panelStyle = { position: 'relative', userSelect: 'none', boxSizing: 'border-box', display: 'flex', flexDirection: 'column', gap: 12, minHeight: '100%', padding: '12px 14px 20px', overflow: 'auto', color: dshThemeColor.labelPrimary };
+const panelStyle = { position: 'relative', userSelect: 'none', boxSizing: 'border-box', display: 'flex', flexDirection: 'column', gap: 12, height: '100%', minHeight: 0, padding: '12px 14px 20px', overflow: 'auto', color: dshThemeColor.labelPrimary };
 const headerStyle = { display: 'flex', alignItems: 'center', justifyContent: 'space-between', gap: 12, minHeight: 28 };
 const tabTitleStyle = { display: 'inline-flex', alignItems: 'center', minWidth: 0, color: dshThemeColor.labelPrimary, fontSize: uiFontSize(12) };
 const headerActionsStyle = { display: 'inline-flex', alignItems: 'center', gap: 4 };
 // SegmentedControl 自带 indicator 与键盘走查；外层占满面板宽度后再将控件居中。
-const columnSwitchStyle = { display: 'flex', alignItems: 'center', justifyContent: 'center', width: '100%', minWidth: 0 };
+const columnSwitchStyle = { alignItems: 'center', justifyContent: 'center', width: '100%', minWidth: 0 };
 const summaryStyle = { color: dshThemeColor.labelSecondary, fontSize: uiFontSize(12) };
-const contentGridStyle = { display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(300px, 1fr))', alignItems: 'start', gap: 12 };
-const columnStyle = { display: 'flex', flexDirection: 'column', gap: 12, minWidth: 0 };
+const contentGridStyle = { display: 'grid', alignItems: 'start', gap: 12 };
+const columnStyle = { flexDirection: 'column', gap: 12, minWidth: 0 };
 // 卡片用 layer-1：与 DSH 内置卡片同层，暗色下只比侧栏表面亮一档。
 const sectionStyle = { display: 'flex', flexDirection: 'column', gap: 8, padding: 10, border: `.5px solid ${dshThemeColor.menuBorder}`, borderRadius: 8, background: dshThemeColor.cardBackground };
 const sectionHeaderStyle = { display: 'flex', alignItems: 'center', justifyContent: 'space-between', gap: 8, minHeight: 24, fontSize: uiFontSize(12) };
@@ -1074,7 +1094,7 @@ const diffCodeStyle = { minWidth: 0, paddingLeft: 10, color: 'inherit', font: 'i
 const commitSectionStyle = { ...sectionStyle, gap: 10 };
 /** 提交框与「生成提交信息」按钮同高，输入面沿用面板的表单风格（边框 + 输入底色 + 8px 圆角）。 */
 const commitEditorRowStyle = { display: 'flex', alignItems: 'stretch', gap: 8, minWidth: 0 };
-const commitSubjectStyle = { width: '100%', minHeight: 34, boxSizing: 'border-box', resize: 'none', padding: '7px 10px', borderRadius: 8, font: 'inherit', fontSize: uiFontSize(12), lineHeight: '16px' };
+const commitSubjectStyle = { width: '100%', minHeight: 34, boxSizing: 'border-box', resize: 'vertical', padding: '7px 10px', borderRadius: 8, font: 'inherit', fontSize: uiFontSize(12), lineHeight: '16px' };
 const draftButtonStyle = { width: 34, flex: '0 0 auto', padding: 0, borderRadius: 8, fontSize: uiFontSize(16), lineHeight: 1 };
 const commitActionsStyle = { display: 'grid', gridTemplateColumns: '1fr 1fr', gap: 8 };
 const refreshActionStyle = { minHeight: 32, padding: '6px 12px', borderRadius: 8, fontSize: uiFontSize(12), lineHeight: '16px' };
@@ -1098,7 +1118,8 @@ export const gitManagementFeature = {
         const uiContext = context.services.uiContext;
         if (uiContext === undefined)
             throw new Error('Git 管理模块缺少 DSH UI 上下文');
-        context.resources.add(registerGitManagementUi(uiContext, { rpc: context.services.rpc, remote: context.services.remote, locale: context.services.locale }));
+        context.resources.add(registerGitManagementUi(uiContext, { rpc: context.services.rpc, remote: context.services.remote, locale: context.services.locale, settings: context.services.settings }));
     },
+    settingsPanel: GitManagementSettingsPanel,
 };
 //# sourceMappingURL=git-management.js.map