Skip to content

Merge #640: keep selected PPT template under the opening message (ported to 0.2.0-rc.2) - #645

Merged
yaojin3616 merged 2 commits into
mainfrom
merge-pr-640
Oct 1, 2026
Merged

yaojin3616 merged 2 commits into
mainfrom
merge-pr-640

Conversation

@yaojin3616

Copy link
Copy Markdown
Contributor

Carries #640 onto current main. The fork branch does not allow maintainer edits; merging this marks #640 as merged.

Conflict resolution

#640 modified patches/@deepseek-ai+dsh-client-ui-chat+0.1.7-rc.2.patch, but #627 moved main to 0.2.0-rc.2. Instead of text-merging the patch:

  1. Applied the base and 在首条用户消息底部保留已选 PPT 模板。 #640 versions of the 0.1.7 patch to the pristine 0.1.7-rc.2 package and diffed them to get 在首条用户消息底部保留已选 PPT 模板。 #640's source delta (lib/client.js +63/−12, slots.d.ts +17).
  2. Applied that delta to the 0.2.0-rc.2 package with main's patch already applied (no rejects).
  3. Regenerated patches/@deepseek-ai+dsh-client-ui-chat+0.2.0-rc.2.patch with patch-package and verified it applies from a clean npm ci.

Test fix

#640 broke two cases in test/ppt-unbound-mode.test.mjs (also on its own branch):

  • the chooser catalog-effect comparison now anchors at OfficePptChooser, because the new opening-template card has an identical first line earlier in the file;
  • applyStandard is built with the new OfficePptOpeningTemplateCard binding, and the test asserts the conversation.chat.userMessageFooter registration.

Checks

  • npm ci (postinstall incl. patch-package): ok
  • npm test: 176 files / 1591 tests passed
  • npm run typecheck: passed
  • npm run build: passed
  • git diff --check: clean

Not verified: real app UI (opening-template card under the first user message, preview dialog).

🤖 Generated with Claude Code

fairy and others added 2 commits September 30, 2026 18:20
发送后选择器会收起,把会话里持久化的模板以图标和标题挂在对话开头,点击标题可分页预览。

Co-authored-by: Cursor <cursoragent@cursor.com>
…2.0-rc.2

#640 edited the 0.1.7-rc.2 patch, which #627 replaced with 0.2.0-rc.2.
Its source delta (userMessageFooter slot, footer props through the user
bubble and ChatNodeSeat) was extracted by applying the old and new 0.1.7
patches to the pristine package, applied cleanly to the patched 0.2.0
package, and the patch regenerated with patch-package.

test/ppt-unbound-mode: anchor the catalog-effect comparison at
OfficePptChooser (the new opening-template card has its own effect earlier
in the file) and inject OfficePptOpeningTemplateCard into applyStandard,
asserting the new userMessageFooter registration.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@yaojin3616
yaojin3616 merged commit df976f1 into main Oct 1, 2026
9 checks passed
@yaojin3616
yaojin3616 deleted the merge-pr-640 branch October 1, 2026 08:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant