mirror of
https://github.com/lobehub/lobehub.git
synced 2026-03-27 13:29:15 +07:00
2c1d21792a
Merge conflict resolution summary: - identifiers.ts: merged both sides' new tool identifiers (UserInteraction, WebOnboarding from HEAD + TopicReference, LobeActivator, WebBrowsing from canary) - builtin-tools/index.ts: merged both sides' new tool entries (WebOnboarding, UserInteraction from HEAD + Task, Brief from canary) - ChatInput/index.tsx: deduplicated independently added showRuntimeConfig prop, kept canary's JSDoc, fixed duplicate destructuring param - Group.tsx: combined HEAD's empty block filtering with canary's index parameter for isFirstBlock - executors/index.ts: kept HEAD's userInteractionExecutor import, removed obsolete toolsActivatorExecutor (renamed to activatorExecutor in canary) - DB migrations: accepted canary's 0095-0096 as base, regenerated local agent_onboarding migration as 0097 Made-with: Cursor