Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(desktop): 换行设置下 Enter 自动续写列表 #7227 (#7248)

DavidShenXDd64ddccf7806
diff --git a/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx b/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx
index 088bb0398f..1a4cd4b3cb 100644
--- a/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx
+++ b/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx
@@ -41,7 +41,7 @@ import {
ComposerListItem,
ComposerOrderedList,
handleStructuredListBackspace,
- handleStructuredListBreak,
+ handleComposerListEnter,
hasTrailingPlainListParagraph,
isTopLevelBlockSelection,
isTrailingEmptyTopLevelParagraph,
@@ -299,7 +299,7 @@ import {
type ComposerSuggestionEntry,
} from '@/lib/composerSuggestion';
import { countUserExtraDirs, MAX_EXTRA_DIRS, pickAndAddExtraDir } from './extraDirsActions';
-import { applyListBackspace, applyListContinuation } from '@/lib/composerListContinuation';
+import { applyListBackspace } from '@/lib/composerListContinuation';
import type { Effort, PermissionMode } from '@/lib/userPreferences.types';
import { getAppShortcutCombos } from '@/lib/appShortcutStore';
import { getNextPermissionMode } from '@/lib/permissionModeCycle';
@@ -2838,21 +2838,11 @@ export function ChatInput({
return true;
}
- // Shift/Alt+Enter — split or exit a structured item. The plain-text
- // fallback remains for old drafts and pasted Markdown that has not
- // gone through an input rule.
- if (
- event.key === 'Enter' &&
- (event.shiftKey || event.altKey) &&
- !event.metaKey &&
- !event.ctrlKey &&
- !event.isComposing
- ) {
- if (handleStructuredListBreak(view) || applyListContinuation(view)) {
- event.preventDefault();
- return true;
- }
- return false;
+ // Newline keys follow the send preference for both structured lists
+ // and plain Markdown restored from old drafts or pasted text.
+ if (handleComposerListEnter(view, event, getComposerSendShortcutPreference())) {
+ event.preventDefault();
+ return true;
}
// Resolve the configurable send shortcut after structured list handling.
diff --git a/apps/desktop/src/renderer/components/new-chat/ComposerListNodes.ts b/apps/desktop/src/renderer/components/new-chat/ComposerListNodes.ts
index 14efcc480c..9708e33e22 100644
--- a/apps/desktop/src/renderer/components/new-chat/ComposerListNodes.ts
+++ b/apps/desktop/src/renderer/components/new-chat/ComposerListNodes.ts
@@ -11,6 +11,8 @@ import { Fragment, type Node as PMNode, type NodeType } from '@tiptap/pm/model';
import { liftListItem, splitListItem } from '@tiptap/pm/schema-list';
import { Selection, TextSelection } from '@tiptap/pm/state';
import type { EditorView } from '@tiptap/pm/view';
+import type { ComposerSendShortcutPreference } from '@/hooks/useComposerSendShortcutPreference';
+import { applyListContinuation } from '@/lib/composerListContinuation';
const BULLET_MARKER_RE = /^([-+*•])([ \t]+)$/;
const ORDERED_MARKER_RE = /^([1-9]\d{0,8})([.)])([ \t]+)$/;
@@ -458,6 +460,35 @@ export function handleStructuredListBreak(view: EditorView): boolean {
return split;
}
+/** Handle list editing only for newline keys; leave sending and IME to the caller. */
+export function handleComposerListEnter(
+ view: EditorView,
+ event: KeyboardEvent,
+ preference: ComposerSendShortcutPreference,
+): boolean {
+ if (
+ event.key !== 'Enter' ||
+ event.metaKey ||
+ event.ctrlKey ||
+ event.isComposing ||
+ !(event.shiftKey || event.altKey || preference === 'modifier-enter')
+ ) return false;
+
+ const { $from } = view.state.selection;
+ if ($from.parent.type.spec.code) return false;
+ // Fenced code remains plain text in the composer. Do not turn a code line
+ // that happens to start with a list marker into a new list item.
+ if (
+ $from.depth === 1 &&
+ scanFenceState(
+ $from.parent.textBetween(0, $from.parentOffset, '\n', '\n'),
+ documentFenceStateBefore(view.state.doc, $from.before(1)),
+ )
+ ) return false;
+
+ return handleStructuredListBreak(view) || applyListContinuation(view);
+}
+
/** Exit an empty structured item with one Backspace, matching plain-list input. */
export function handleStructuredListBackspace(view: EditorView): boolean {
const { state } = view;
diff --git a/apps/desktop/src/renderer/lib/__tests__/composerListContinuationEditor.test.ts b/apps/desktop/src/renderer/lib/__tests__/composerListContinuationEditor.test.ts
index 4235ff068a..aad822c65f 100644
--- a/apps/desktop/src/renderer/lib/__tests__/composerListContinuationEditor.test.ts
+++ b/apps/desktop/src/renderer/lib/__tests__/composerListContinuationEditor.test.ts
@@ -6,10 +6,17 @@ import Paragraph from '@tiptap/extension-paragraph';
import Text from '@tiptap/extension-text';
import HardBreak from '@tiptap/extension-hard-break';
import { applyListBackspace, applyListContinuation } from '../composerListContinuation';
+import {
+ ComposerBulletList,
+ ComposerListItem,
+ ComposerOrderedList,
+ handleComposerListEnter,
+} from '@/components/new-chat/ComposerListNodes';
+import { serializeEditorContent } from '@/components/new-chat/composerContentSerialization';
/**
* applyListContinuation 在真实 Tiptap/ProseMirror 编辑器上的行为测试
- * (schema 与 ChatInput 一致的最小子集:Document + Paragraph + Text + HardBreak)。
+ * (schema 与 ChatInput 一致的最小子集,包含文本、换行和结构化列表)。
* 覆盖行提取(hardBreak 分行)、事务 dispatch(接续插入 / 空项前缀删除)。
* 纯前缀匹配用例见 composerListContinuation.test.ts。
*/
@@ -25,7 +32,10 @@ function makeEditor(lines: string[]): Editor {
});
editor = new Editor({
element: document.createElement('div'),
- extensions: [Document, Paragraph, Text, HardBreak],
+ extensions: [
+ Document, Paragraph, Text, HardBreak,
+ ComposerListItem, ComposerBulletList, ComposerOrderedList,
+ ],
content: { type: 'doc', content: [{ type: 'paragraph', content }] },
});
// 光标移到文档末尾(段落收尾位置),模拟用户刚敲完最后一个字符。
@@ -43,6 +53,60 @@ afterEach(() => {
editor = null;
});
+/**
+ * #7227: ChatInput's list key handler must honor Enter-as-newline. Existing
+ * command tests bypassed key routing. Minimal failure: "1. test" + Enter
+ * with modifier-enter enabled. Unit tier, real editor transactions/selection.
+ * Standalone Windows run: 1.95s Vitest duration (4.82s command wall time).
+ */
+describe('composer list newline keys', () => {
+ it.each([
+ { name: 'plain ordered', content: '1. test', html: null, expected: '1. test\n2. ' },
+ { name: 'structured ordered', content: '', html: '<ol><li><p>test</p></li></ol>', expected: '1. test\n2. ' },
+ { name: 'structured bullet', content: '', html: '<ul><li><p>test</p></li></ul>', expected: '- test\n- ' },
+ { name: 'empty plain item', content: '1. ', html: null, expected: '' },
+ { name: 'empty structured item', content: '', html: '<ol><li><p></p></li></ol>', expected: '' },
+ ])('continues or exits $name on Enter in modifier-enter mode', ({ content, html, expected }) => {
+ const ed = makeEditor([content]);
+ if (html) {
+ ed.commands.setContent(html);
+ ed.commands.setTextSelection(ed.state.doc.content.size - 3);
+ }
+ const event = new KeyboardEvent('keydown', { key: 'Enter' });
+ expect(handleComposerListEnter(ed.view, event, 'modifier-enter')).toBe(true);
+ expect(serializeEditorContent(ed).text).toBe(expected);
+ });
+
+ it.each([
+ { name: 'default send', preference: 'enter' as const, init: {} },
+ { name: 'macOS send', preference: 'modifier-enter' as const, init: { metaKey: true } },
+ { name: 'Windows send', preference: 'modifier-enter' as const, init: { ctrlKey: true } },
+ { name: 'IME confirmation', preference: 'modifier-enter' as const, init: { isComposing: true } },
+ ])('leaves $name untouched', ({ preference, init }) => {
+ const ed = makeEditor(['1. test']);
+ const event = new KeyboardEvent('keydown', { key: 'Enter', ...init });
+ expect(handleComposerListEnter(ed.view, event, preference)).toBe(false);
+ expect(docText(ed)).toBe('1. test');
+ });
+
+ it.each([{ shiftKey: true }, { altKey: true }])('preserves explicit newline shortcuts: %j', (init) => {
+ const ed = makeEditor(['1. test']);
+ const event = new KeyboardEvent('keydown', { key: 'Enter', ...init });
+ expect(handleComposerListEnter(ed.view, event, 'enter')).toBe(true);
+ expect(docText(ed)).toBe('1. test\n2. ');
+ });
+
+ it.each([
+ { lines: ['plain text'] },
+ { lines: ['```', '1. code'] },
+ ])('leaves ordinary text and code fences to native newline handling: $lines', ({ lines }) => {
+ const ed = makeEditor(lines);
+ const event = new KeyboardEvent('keydown', { key: 'Enter' });
+ expect(handleComposerListEnter(ed.view, event, 'modifier-enter')).toBe(false);
+ expect(docText(ed)).toBe(lines.join('\n'));
+ });
+});
+
describe('applyListContinuation on a real editor', () => {
it('continues an ordered list with the incremented prefix', () => {
const ed = makeEditor(['1. test']);
diff --git a/apps/desktop/src/renderer/lib/composerListContinuation.ts b/apps/desktop/src/renderer/lib/composerListContinuation.ts
index 0024b81eb5..879b513692 100644
--- a/apps/desktop/src/renderer/lib/composerListContinuation.ts
+++ b/apps/desktop/src/renderer/lib/composerListContinuation.ts
@@ -4,8 +4,8 @@ import type { ResolvedPos } from '@tiptap/pm/model';
/**
* Composer 纯文本 Markdown 列表的兼容接续。结构化 bullet / ordered list
* 由编辑器 schema 处理;本模块继续覆盖粘贴或旧草稿中的文本前缀,以及尚未
- * 结构化的待办和引用前缀。Shift/Alt+Enter 接续或退出当前项,普通 Enter
- * 始终保持发送语义。
+ * 结构化的待办和引用前缀。调用方根据发送偏好,将用于换行的 Enter
+ * (包括 Shift/Alt+Enter)交给本模块接续或退出当前项。
*/
export type ListContinuation =
diff --git a/docs/design-rules/DESIGN.md b/docs/design-rules/DESIGN.md
index d89af93748..8d5ba7261e 100644
--- a/docs/design-rules/DESIGN.md
+++ b/docs/design-rules/DESIGN.md
@@ -1185,7 +1185,8 @@ Known but deliberately-deferred cleanups are tracked in the decision log's backl
Applies to submit-on-Enter fields: the chat composer, goal input, ask input, etc. **Not** ordinary single-line editors in Settings — there Enter must not submit.
-- **Enter = submit**, **Shift+Enter = newline**.
+- By default, **Enter = submit**, **Shift+Enter = newline**. The desktop chat composer also supports the existing **Cmd/Ctrl+Enter = submit** preference; when enabled, **Enter = newline**.
+- Composer list continuation follows newline intent: Enter in that preference, as well as Shift/Alt+Enter, continues a list or exits an empty item. Send shortcuts and IME confirmation must not edit lists; fenced code keeps native newline behavior. The shared key handler is `handleComposerListEnter` in `apps/desktop/src/renderer/components/new-chat/ComposerListNodes.ts`, covered by `apps/desktop/src/renderer/lib/__tests__/composerListContinuationEditor.test.ts`.
- **Enter during IME composition must not submit** — check `event.nativeEvent.isComposing` (a CJK user confirming a candidate must not accidentally send).
- Centralize this logic in code; do not re-implement it per field and let behavior drift (per "code-first determinism" in `docs/dev-rules/maker-core-and-agent-behavior.md`).