Conversation
…ypoints Remove catalog-sync/check-modules wrappers and unused publish/version helpers from the monorepo tools surface. Keep ci-release-packages for Changesets; drop local prerelease/release npm scripts. Co-authored-by: Cursor <cursoragent@cursor.com>
- Refactor message routing in db-server to support QQ message forwarding. - Introduce new interfaces for better type safety in message handling. - Implement logic to filter channels accepting QQ messages. - Update transaction runner to support after-commit hooks for message inserts. - Modify QQ bridge to remove deprecated channelId usage and improve message forwarding logic. - Update changelog and documentation to reflect changes in resource pack handling. - Improve error handling and logging for message forwarding failures. - Refactor command handlers to clarify functionality related to QQ messages.
…20260929 # Conflicts: # AGENTS.md # README.md # docs/en/guide/troubleshooting.mdx # docs/zh/dev/contributing.md # docs/zh/dev/module-author.mdx # docs/zh/dev/tools.md # docs/zh/guide/modules.mdx # docs/zh/guide/troubleshooting.mdx # package-lock.json # package.json # packages/cli/src/services.ts # packages/tools/README.md # packages/tools/changeset-assert-mode.mjs # packages/tools/package.json # packages/tools/run-release.mjs
…0260929 # Conflicts: # .changeset/build-deps-world-packs-solid.md # .changeset/chat-channel-qq-forwarding.md # .changeset/qq-platform-refresh.md # .github/workflows/module-publish.yml # README.en.md # README.md # docs/en/guide/backup-upgrade.mdx # docs/en/guide/index.mdx # docs/zh/dev/contributing.md # docs/zh/dev/stable-release-plan.md # docs/zh/dev/style-sample.mdx # docs/zh/dev/tools.md # docs/zh/guide/backup-upgrade.mdx # modules/sdk/@sfmc-sdk/src/sapi/runtime/msg.ts # packages/cli/README.md # packages/cli/src/commands.ts # packages/create-module/package.json # packages/meta/README.md # packages/tools/README.md # packages/tools/changeset-assert-mode.mjs
# Conflicts: # docs/zh/dev/stable-release-plan.md
…0260929 # Conflicts: # .github/workflows/module-publish.yml # docs/zh/dev/stable-release-plan.md
Member
Author
|
这次汇总合并把冲突标记写进了 AGENTS.md、module-publish 工作流和多份文档/源文件。ootb 在安装 pnpm 时失败。页面上虽显示可合并，但不能进入 main。关闭 PR，并删除 release/verified-20260929，避免误合并。 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.