Skip to content

feat: implement branch selection path resolution#111

Merged
chenyme merged 1 commit into
devfrom
fix_branch
Jun 2, 2026
Merged

feat: implement branch selection path resolution#111
chenyme merged 1 commit into
devfrom
fix_branch

Conversation

@chenyme

@chenyme chenyme commented Jun 2, 2026

Copy link
Copy Markdown
Contributor

Summary

Fix chat retry and branch reconciliation so completed retries switch to the latest generated branch instead of staying on the previous branch. The branch selection path is now resolved from the server message chain and applied consistently while replacing temporary pending message IDs with persisted server IDs.

Change type

  • Bug fix
  • Feature
  • Documentation
  • Refactor
  • Configuration / deployment
  • Security hardening
  • Other

Affected areas

  • Frontend / UI
  • Backend / API
  • Authentication / authorization
  • Conversations / streaming
  • Files / RAG / extraction
  • Model routing / providers
  • MCP / tools
  • Billing / payments
  • Admin console
  • Deployment / Docker / configuration
  • Documentation

Verification

  • cd frontend && pnpm lint
  • cd frontend && pnpm build
  • git diff --check

Screenshots, API examples, or logs

N/A

Configuration, migration, and compatibility notes

No configuration, database migration, deployment, or public API contract changes.

Documentation

  • Documentation is not needed for this change.
  • Documentation was updated.
  • Documentation still needs to be updated.

Security and privacy

  • No secrets, tokens, credentials, local config, or personal data are included.
  • User data access remains scoped by authenticated user context unless an admin-only path explicitly requires broader access.
  • Security-sensitive behavior was reviewed, including authentication, authorization, provider routing, file processing, billing, and admin APIs where relevant.

Checklist

  • I searched existing issues and pull requests.
  • Changes are focused and do not include unrelated refactors.
  • Tests or static verification were run where practical.
  • User-facing behavior, deployment steps, API contracts, or configuration changes are documented.
  • Generated artifacts are included only when this project explicitly requires them.
  • Caches, build output, .pyc files, .env files, and local storage data are not committed.

@chenyme chenyme linked an issue Jun 2, 2026 that may be closed by this pull request
3 tasks
@chenyme
chenyme merged commit 59aa200 into dev Jun 2, 2026
4 checks passed
@chenyme
chenyme deleted the fix_branch branch June 2, 2026 15: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.

[Bug]: 重试生成新的对话后,生成完成会跳转到第一个去

1 participant