merge: resolve PR #710 conflicts with main - #3
Merged
Yuang-Deng merged 10 commits intoSep 17, 2026
Merged
Yuang-Deng merged 10 commits into
Yuang-Deng merged 10 commits into
Conversation
…#714) * fix(conversation-organizer): recover unresolved scope audits * fix(conversation-organizer): preserve progress and restore undone memberships
…mation (LazyAGI#726) * fix(search): paginate URL fetches and update bounded search tools * test(search): align URL fetch mocks with pagination * fix(chat): bound shared tool results and stream frames with workspace snapshots * test(chat): verify executor result budget middleware ordering * fix(search): scope result budgets to search and remove generic transport changes * fix(search): honor URL page limits and cap preview titles * fix(search): prefer current information and inherit subagent time context * chore: update LazyLLM submodule to merged main
) * feat(capabilities): expose authorized models and registry tools to external agents * open * fix(compose): revert unrelated OpenSearch platform override * fix(mcp): support strict client output schema validation * fix(capabilities): refresh signed images in invocation history * fix(capabilities): serve absolute image links and default eligible models on * ui(capabilities): collapse invocation history at page bottom
…I#729) * fix(compose): bypass proxy for internal Core services Merge proxy environment into core and core-dev, and add Compose service names to both NO_PROXY variants. Scope: docker-compose.yml. * fix(compose): bypass proxy for remaining internal services Add processor-server, ppt-export, and mineru to both proxy bypass lists in docker-compose.yml so internal service traffic remains direct.
* feat: add extensible document learning capabilities * feat: streamline knowledge base creation modal * feat: route Chinese dictionaries by learning scenario * fix: route Chinese selections to learning dictionaries * fix: keep newly created wordbook selected * fix: make word explanation fallback resilient * fix: strengthen learning JSON prompts * feat: redesign document analysis presets * fix(learning): make document AI analysis resilient * fix(learning): preview explanations before saving * fix(ci): catalog learning errors * fix(learning): track document analysis outside dialog * fix(learning): generate structured capability content * refactor(learning): configure extraction repair prompt * feat(learning): configure preanalysis candidate limits * fix bugs * feat(learning): refine document quick reference workflow * refactor(learning): hide unfinished learning collections
* fix: skip image generation for existing-source edits * fix: collect uploaded images and refresh capability configuration state * fix: align capability card with workflow panel * fix: continue configured workflows with a follow-up message * fix: resume workflow capability checks without rerunning analysis * fix(workflow): synchronize runtime state across panels * fix(workflow): hide continue during automatic step handoffs * test(workflow): align CI contracts with durable state synchronization
* feat(runtime): add structured lifecycle diagnostics - define diagnostic contract and typed failure classification - expose optional state diagnostics and contract tests in local-runtime-manager * feat(runtime): finalize Up lifecycle diagnostics - centralize startup failure diagnosis and state ownership checks - preserve automatic port retries and add Up lifecycle regression tests * feat(runtime): finalize Down lifecycle diagnostics - update local/local-runtime-manager/manager.go with shutdown diagnostics, fallback result handling, and ownership-safe state writes * feat(runtime): expose diagnostics in status - update local/local-runtime-manager/manager.go to pass diagnostics through status --json\n- add lifecycle diagnostic contract tests in local/local-runtime-manager/manager_test.go * fix(runtime): close lifecycle diagnostic gaps - 补齐 Up/Down 失败上下文、实例冲突与停止超时诊断\n- 修正 Status 恢复态清理陈旧诊断并补充 manager_test.go 覆盖 * fix(runtime): preserve failed status during unhealthy recovery - 防止算法服务探测失败时将持久化 failed 状态误报为 ready\n- 保留未恢复运行时的结构化诊断并补充 Status 回归测试 * fix(runtime): retain port conflict diagnostics - 保留固定端口和最终重试冲突的服务、地址、端口信息 - 补充 attempt、maxAttempts、日志路径并增加回归测试 * fix(runtime): align algorithm port diagnostics - 使用实际算法服务的端口冲突上下文生成结构化诊断 - 增加 chat 端口冲突启动路径回归测试 * fix(runtime): classify duplicate pinned ports - 将固定端口重复配置归类为 RUNTIME_PORT_CONFLICT - 增加重复端口服务和诊断上下文回归测试 * fix(runtime): classify desktop algorithm port failures Classify algorithm readiness failures before applying the Desktop retry policy in local/local-runtime-manager. * fix(runtime): preserve startup retry metadata Record accurate attempt and maxAttempts values for automatic, pinned, and Desktop no-retry startup diagnostics in local/local-runtime-manager.
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
4 participants
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.
合入 LazyAGI/LazyMind main（80613cde），解决 PR LazyAGI#710 与主线的冲突，保留双方已有功能。
验证（现有容器内）：Python 82 passed / 1 skipped；前端 56 passed；Core migrate、subagent、localworkspace 和 OpenAPI 检查通过。Workflow 除下述已有失败外通过。
已知原有失败：TestLaunchWorkflowAttemptCreatesTaskCenterRowAtomically 的测试数据库缺少 conversation_tool_grants 表；已在未合并的 PR 头 264cf7b 复现相同失败。本次按仅处理冲突的范围保留，不额外修复。
原 PR：LazyAGI#710