Skip to content

🐛 fix(chat): re-link orphan tool messages at the raw bucket write boundary#15438

Merged
arvinxx merged 1 commit into
canaryfrom
fix/hetero-orphan-tool-link
Jun 3, 2026
Merged

🐛 fix(chat): re-link orphan tool messages at the raw bucket write boundary#15438
arvinxx merged 1 commit into
canaryfrom
fix/hetero-orphan-tool-link

Conversation

@arvinxx

@arvinxx arvinxx commented Jun 3, 2026

Copy link
Copy Markdown
Member

背景

hetero-agent(Claude Code)流式过程中,快工具(如 Grep:tool_result 紧跟下一步 message_start)偶发会被渲染成顶层孤立技能调用消息(UI 提示 inspector.orphanedToolCall,带"删除技能调用"按钮)。

排查自真实 trace 20260603-205720-8ecfc841…:原始 CLI 输出完整、落库最终也正确,是流式过程中内存态短暂不一致

根因

conversation-flow 把 tool 消息归到 assistant 唯一依据是 assistant.tools[].id === tool.tool_call_idMessageCollector.collectToolMessages),parentId 只用来找下一个 assistant。所以一旦内存里某 assistant 的 tools[] 暂时丢了那条目(即使 tool 行 + parentId 都在),该 tool 就掉到 FlatListBuilder 顶层 → 孤立。

tools[] 丢条目的来源:

  • replaceMessages 收到乱序 / SWR 的过期快照(全量覆盖、无 staleness guard);
  • 或 step 边界处一个打到旧 assistant 的乐观 updateMessage{tools}

这是代码里已知的 "7→6 次技能调用回退" 的极端版。

修复

修在 raw dbMessagesMap 写边界(不是只读的 parse),让乐观更新读写的 SoT 本身保持一致:

  • 新增 reconcileAssistantToolLinks(messages):对每个在场role:'tool' 行,若其 parentId 指向的同桶 assistant 的 tools[] 缺少对应条目,则用 tool 行自身的 plugin 重建条目挂回去(result_msg_id 指回该行以便 hydrate 结果)。
  • 接入两条写路径:replaceMessagesquery.ts)与 internal_dispatchMessageinternals.ts,乐观更新路径)。

安全性

  • 只对在场的 tool 行补链 → 真实删除(行已不在)永不复活;
  • 只往 parentId 指定的 assistant 加、不删不重排 → 正常新增不受影响;
  • 已一致时返回同一数组引用 → 调用方 isEqual 提前返回 / 引用相等不受影响。

测试

新增 store 层回归 replaceMessages.orphanTool.regression.test.ts(走真实 replaceMessages → parse 路径):

  1. control:一致快照 → 整链合并成一个 assistantGroup,无孤立;
  2. regression:过期快照清空 asst-2.tools[] → 修复前 grep-1 孤立、修复后归位;
  3. reverse:真实删除 grep 行 → 不被复活。

受影响的既有测试 action / reducer / heterogeneousAgentExecutor / gatewayEventHandler 共 183 个 + 新增 3 个全部通过。

🤖 Generated with Claude Code

…ndary

A fast hetero-agent (Claude Code) tool can have its parent assistant's
`tools[]` momentarily dropped (stale/out-of-order `replaceMessages` snapshot,
or an optimistic `updateMessage{tools}` on the wrong assistant during a step
boundary) while the `role:'tool'` row + parentId survive. Since conversation-
flow binds a tool into its assistant solely via `assistant.tools[].id`, the
tool then renders as a top-level orphan bubble (`inspector.orphanedToolCall`).

Fix at the RAW `dbMessagesMap` write boundary — shared by `replaceMessages`
and `internal_dispatchMessage` (the optimistic-update path) — so the Source of
Truth stays consistent for optimistic updates, not just the parsed display.
`reconcileAssistantToolLinks` re-attaches the missing `tools[]` entry for any
present tool row whose parentId resolves to an assistant in the same bucket;
it only acts on present rows (never resurrects deletions) and never removes or
reorders entries.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
@vercel

vercel Bot commented Jun 3, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
lobehub Ready Ready Preview, Comment Jun 3, 2026 2:54pm

Request Review

@dosubot dosubot Bot added size:M This PR changes 30-99 lines, ignoring generated files. feature:agent Assistant/Agent configuration and behavior feature:tool Tool calling and function execution labels Jun 3, 2026

@sourcery-ai sourcery-ai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We've reviewed this pull request using the Sourcery rules engine

@codecov

codecov Bot commented Jun 3, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 65.76%. Comparing base (2fb0970) to head (8a81e5d).

Additional details and impacted files
@@            Coverage Diff            @@
##           canary   #15438     +/-   ##
=========================================
  Coverage   65.76%   65.76%             
=========================================
  Files        2762     2763      +1     
  Lines      256076   256110     +34     
  Branches    25563    31273   +5710     
=========================================
+ Hits       168400   168434     +34     
  Misses      87557    87557             
  Partials      119      119             
Flag Coverage Δ
app 61.59% <100.00%> (+<0.01%) ⬆️
database 92.49% <ø> (ø)
packages/file-loaders 87.89% <ø> (ø)
packages/model-runtime 84.51% <ø> (ø)
packages/prompts 72.49% <ø> (ø)
packages/web-crawler 88.08% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
Store 68.48% <100.00%> (+0.03%) ⬆️
Services 54.58% <ø> (ø)
Server 71.89% <ø> (ø)
Libs 57.01% <ø> (ø)
Utils 81.44% <ø> (ø)
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@arvinxx arvinxx merged commit a3a08c2 into canary Jun 3, 2026
55 of 56 checks passed
@arvinxx arvinxx deleted the fix/hetero-orphan-tool-link branch June 3, 2026 16:59
@arvinxx arvinxx mentioned this pull request Jun 3, 2026
arvinxx added a commit that referenced this pull request Jun 4, 2026
# 🚀 LobeHub Release (20260604)

**Release Date:** June 4, 2026  
**Since v2.2.1:** 88 merged PRs · 11 contributors

> This week brings Execution Devices out of the lab — run agents and
Claude Code on any configured local or remote machine — alongside Claude
Opus 4.8, token-usage analytics, and Page sharing.

---

## ✨ Highlights

- **Execution Devices** — Pick where an agent runs. Desktop and CLI
devices auto-register with a stable machine ID, route through the
gateway by channel, and surface a device switcher in the chat input. Run
remote Claude Code on a configured device, with a recent-directory
picker you can drag to reorder. (#15300, #15315, #15322, #15343, #15351,
#15371)
- **Claude Opus 4.8** — Day-one support for Anthropic's latest model.
(#15314)
- **Token-usage analytics** — A new token-usage mode on the activity
heatmap, backed by a denormalized topic usage/cost rollup so totals stay
accurate without recomputing from messages. (#15365, #15417, #15425)
- **Page sharing** — Share a Page through a dedicated document share
flow, plus new Workspace and Agent share tables. (#15309, #15439)
- **Self-iteration agents** — Agent Signal's execAgent migration lands a
server-runtime bridge, async memory writer, and a registered
self-iteration tool package, with a CLI trigger command for testing.
(#15360, #15364, #15392)
- **Knowledge search** — BM25 search now extends to file-backed
documents, and the portal ships an editable CodeMirror viewer for local
files with document highlighting. (#15247, #15298)

---

## 🏗️ Core Agent & Architecture

### Agent Signal & Runtime

- **execAgent migration** — Server-runtime bridge, completion
projection, async memory writer, and removal of the legacy
`executeSelfIteration` path. (#15392)
- Registered the self-iteration builtin tool package and restored the
three mode-specific self-iteration agent slugs. (#15202, #15364)
- Added a CLI trigger command with a golden-snapshot fixture for Agent
Signal. (#15360)
- **Skill priority** — Agent Builder now emits a skill-priority
instruction with matching server runtime. (#15409)
- Retry empty LLM completions instead of silently finishing the turn.
(#15355)
- Classify topic/agent/session foreign-key violations as
`ConversationParentMissing` for clearer recovery. (#15408)
- Persist canonical nested usage/performance on assistant messages, and
re-link orphan tool messages at the raw bucket write boundary. (#15359,
#15438)
- Guard `createAgent` against LLM double-encoded array fields. (#15381)

---

## 🖥️ Execution Devices & Gateway

- Auto-register desktop and CLI devices with a stable machine ID, and
add the `@lobechat/device-identity` package. (#15300, #15321)
- New Devices settings page behind the Execution Device Switcher lab,
with a device switcher shown for all agents in the chat input. (#15315,
#15371)
- `connectionId` + channel routing across the gateway client and device
list; preset the local device on the first LLM request for the 本机
target. (#15322, #15435)
- Run remote Claude Code on a configured device, with drag-to-reorder
recent-directory management and client renders for device tool results.
(#15343, #15351, #15437)
- Preserve content and state across gateway tool calls, and prevent
duplicate streaming from stale reconnects. (#15114, #15354)

---

## 🖥️ CLI & Desktop

- Preserve content/state for connect local file and shell tools; render
the `runCommand` tool result card. (#15441, #15442)
- New `lh topic view` command; CLI now auto-registers its device on
login, matching desktop. (#15340, #15377)
- Resolve CLI tools from the shell `PATH`, and clarify local command
session handling. (#15368, #15389)
- Relocate visual-ref helpers to `@lobechat/const` to fix a renderer
crash; upload `.blockmap` files to S3 for differential updates. (#15326,
#15369)
- Fix a market OAuth expiry that triggered the wrong re-login modal, and
kill dev child processes on parent shutdown. (#15246, #15290)

---

## 🗂️ Pages, Library & Knowledge

- Document share flow with business slot stubs, plus Workspace and Agent
share tables. (#15309, #15439)
- Export Agent profiles as Markdown, preserving an empty agent prompt on
export. (#15312, #15316)
- Editable CodeMirror viewer for local files with document highlighting;
BM25 search extended to file-backed documents. (#15247, #15298)
- Default new Agent-doc files to `.md` and preserve IME composition;
refresh folder data on slug switch and dedupe breadcrumb fetches.
(#15335, #15427)

---

## 💬 Chat & User Experience

- Group-by-status mode for the Topic sidebar; dropped the legacy
session→agentId compatibility path from Topic queries. (#15366, #15378)
- Restore editor focus after the file picker closes, and close the skill
dropdown before navigating to settings. (#15391, #15394)
- Strip markdown tokens from fallback Topic titles; keep an open
ActionBar popup when hovering another message. (#15303, #15372)
- Stabilize home starter loading and stop transliterating model names in
the home starter; show artifact source while streaming. (#15310, #15324,
#15386)
- Group the sidebar spacer with recents and agents. (#15373)

---

## 📊 Analytics, Tasks & Notifications

- Token-usage mode on the activity heatmap, backed by a denormalized
topic usage/cost rollup. (#15365, #15417, #15425)
- Push: new `PushChannel`, receipt cron, and `pushToken` tRPC API.
(#15233)
- Tasks now support file and image attachments. (#15141)

---

## 🧩 Models & Providers

- Support Claude Opus 4.8 and configurable model routing with starters.
(#15314, #15384)
- MiniMax M3: new model entry and an Anthropic video runtime. (#15380,
#15403)
- Add `intern-s2-preview` with `thinking_mode`, and `step-3.7-flash`
support. (#15308, #15317)
- Block disabling the official provider; fix default provider setup in
business mode. (#15379, #15382)

---

## 🎨 UI & Modals

- Migrate modals to `@lobehub/ui/base-ui` (LOBE-9711 + eval batch),
including the create-custom-model and feedback/changelog modals.
(#15401, #15416)
- Restructure confirmModal title and content across deletion flows;
polish the service-model form and migrate its Switch to base-ui.
(#15426, #15440)
- Wrap the BlueBubbles bridge config into a connection card; update
`@lobehub/ui` to v5.15.5. (#15325, #15342)

---

## 🔒 Reliability

- Replace hardcoded `session_context` values with template variables in
credentials. (#15352)
- Point `CHANGELOG_URL` to `/changelog`. (#15428)

---

## 👥 Contributors

Huge thanks to **11 contributors** who shipped **88 merged PRs** this
cycle.

@hezhijie0327 · @qybaihe · @sxjeru · @arvinxx · @Innei · @tjx666 ·
@lijian · @sudongyuer · @cy948 · @rivertwilight · @AmAzing129

Plus @lobehubbot and renovate[bot] for maintenance.

---

**Full Changelog**: v2.2.1...release/weekly-20260604
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

feature:agent Assistant/Agent configuration and behavior feature:tool Tool calling and function execution size:M This PR changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant