Repository navigation
Conversation
|
Sorry @BegoniaHe, your pull request is larger than the review limit of 150,000 diff characters |
|
Important
This repository does not receive automatic reviews because it has fewer than 10 stars. ⚙️ Run configuration
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
git fetch origin master
git rebase origin/master
# after resolving the conflicts
git push --force-with-leaseThe |
…Devs#10515) (AstrBotDevs#10614) Adapt the OpenTelemetry-backed trace model and bounded SQLite history to the fork's grouped configuration, per-runtime session waiter registry, sanitized logging pipeline, and MDI-only Dashboard. Trace upserts keep completed traces closed when update timestamps collide. Upstream-Commit: 8774e53 Upstream-Author: Soulter <37870767+Soulter@users.noreply.github.com> Upstream-PR: AstrBotDevs#10614 Sync-Disposition: adapt Fork-Adaptation: Kept grouped trace.* settings and schema_revision 4, per-runtime session_waiter_registry, sanitized log broker, event_context temp-file ownership, and MDI icons; omitted ja-JP/ru-RU and upstream log format trace tags. Tested: uv run pytest tests/unit -q --test-profile blocking; cd dashboard && pnpm typecheck && pnpm test && pnpm i18n:check AI-Generated: true Generated-At: 2026-10-20T08:35:38Z
Use the trace-specific cleanup confirmation for trace and all targets so the dialog states that historical traces cannot be recovered, and cover the mapping with a focused Vitest. AI-Generated: true Generated-At: 2026-10-20T08:44:22Z
Evaluate active interactive waits before the waking stage honors route.stop, so follow-up input without a wake prefix reaches ProcessStage dispatch. Cover the order with a WakingCheckStage regression test. AI-Generated: true Generated-At: 2026-10-20T08:53:10Z
Move the English Trace section beside Logs so the bilingual navigation matches. AI-Generated: true Generated-At: 2026-10-20T08:58:02Z
Update the trace hint in both shipped locales to describe bounded SQLite history instead of in-memory-only storage. AI-Generated: true Generated-At: 2026-10-20T09:02:13Z
Reject a stale running snapshot when it shares the completed trace's timestamp, and cover the collision case directly. AI-Generated: true Generated-At: 2026-10-20T09:06:22Z
…otDevs#10517) Upstream-Commit: e5e21b7 Upstream-Author: Wei Chengqian <wcqqq1214@gmail.com> Upstream-PR: AstrBotDevs#10517 Sync-Disposition: adapt Fork-Adaptation: Added the dict default to the fork typed defaultValueMap. Tested: cd dashboard && pnpm typecheck && pnpm exec vitest run --config vitest.config.ts tests/configEditorDialogs.vitest.ts AI-Generated: true Generated-At: 2026-10-20T09:12:00Z
Add a TemplateListEditor regression that requires dict fields without an explicit default to initialize as an empty object. AI-Generated: true Generated-At: 2026-10-20T10:14:40Z
Check the emitted settings value directly so a missing key cannot satisfy the regression test. AI-Generated: true Generated-At: 2026-10-20T10:17:35Z
Upstream-Commit: 68a4252 Upstream-Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-PR: AstrBotDevs#10636 Sync-Disposition: adapt Fork-Adaptation: Kept the fork's commit-SHA pinning and updated both init and analyze to the v4.39.0 commit. Tested: actionlint (.github/workflows/codeql.yml) not available; YAML parse checked AI-Generated: true Generated-At: 2026-10-20T10:24:00Z
…trBotDevs#10608) Upstream-Commit: 776793b Upstream-Author: 一张白纸 <202384594+mantoujun12@users.noreply.github.com> Upstream-PR: AstrBotDevs#10608 Sync-Disposition: adapt Fork-Adaptation: Applied the dialog attach target to the fork LogsPage and added the matching id to the shared ConsoleDisplayer root, which owns the fullscreen element. Tested: cd dashboard && pnpm typecheck; pnpm exec vitest run --config vitest.config.ts tests/remainingCoverage.vitest.ts AI-Generated: true Generated-At: 2026-10-20T10:28:10Z
Keep the dialog's surface and field colors readable when it is attached to the dark fullscreen console element. AI-Generated: true Generated-At: 2026-10-20T10:31:10Z
…AstrBotDevs#10647) Upstream-Commit: f2404c1 Upstream-Author: Soulter <37870767+Soulter@users.noreply.github.com> Upstream-PR: AstrBotDevs#10647 Sync-Disposition: adapt Fork-Adaptation: Applied the hints and enabled-conditions to the fork's grouped metadata, kept fork-only command_prefixes/llm_access/group_sender_concurrency/OneBot-forward and image-caption scope keys, and updated only en-US/zh-CN metadata plus bilingual WebUI docs. Tested: uv run pytest tests/unit/test_config_metadata_i18n.py tests/unit/test_dashboard_util.py -q --test-profile blocking; cd dashboard && pnpm typecheck && pnpm i18n:check && pnpm exec vitest run --config vitest.config.ts tests/configEditorDialogs.vitest.ts tests/configItemFragments.vitest.ts AI-Generated: true Generated-At: 2026-10-20T10:37:20Z
Resolve pyright span typing, Bandit SQL annotations, ESLint violations, and mccabe complexity in the trace integration. Keep the full Python and Dashboard gates green. AI-Generated: true Generated-At: 2026-10-20T11:05:00Z
Advance the upstream cursor through f2404c1 with per-commit dispositions: six adaptations, three skips, and the review-driven follow-up commits recorded in the decision ledger. AI-Generated: true Generated-At: 2026-10-20T11:06:00Z
- Shorten parametrized test ids so Windows keeps PYTEST_CURRENT_TEST bounded - Wait for the trace writer before asserting retention and allow CI slack - Document intentional dropped log entries for CodeQL - Remove metadata for the wake-prefix setting this fork replaced AI-Generated: true Generated-At: 2026-10-20T14:07:00Z
Return directly from the bounded queue handlers instead of leaving an empty except body, so CodeQL no longer reports py/empty-except for intentionally dropped log entries. AI-Generated: true Generated-At: 2026-10-20T17:58:10Z
Regenerate the tracked subset after rebasing onto master so the wallpaper and authorization views keep their swipe-horizontal hint icon. AI-Generated: true Generated-At: 2026-10-20T22:36:31Z
Point the 2026-10-20 window's integration and follow-up commits at the rewritten SHAs so the provenance audit stays clean. AI-Generated: true Generated-At: 2026-10-20T22:45:18Z
BegoniaHe
force-pushed
the
sync/upstream-2026-10-20
branch
from
October 20, 2026 22:45
3d2b1dc to
9cb5d57
Compare
|
✅ Conflicts resolved; removing the |
The PowerShell job failed when Install-Module found no PSGallery match on the runner. Register the default gallery when it is missing and retry the install three times so a transient gallery outage does not fail the required format check. AI-Generated: true Generated-At: 2026-10-21T15:54:23Z
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
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.
Summary
Absorb upstream
dffe922..f2404c19(9 commits) into the fork. The main change is OpenTelemetry-backed message tracing with bounded SQLite history, a redesigned Trace explorer, trace-aware storage cleanup, configuration migration toschema_revision4, and core session-waiter dispatch. The window also includes provider metadata preservation, template dict defaults, a CodeQL action bump, a fullscreen pip-dialog fix, and clearer configuration hints with conditional segmented-reply options.Related issue
Related: AstrBotDevs#10614, AstrBotDevs#10522, AstrBotDevs#10517, AstrBotDevs#10636, AstrBotDevs#10608, AstrBotDevs#10647 (upstream PRs)
Behavior
data/logs/traces.dbby default with an 80 MB capacity target and 7-day retention; grouped settings aretrace.enable,trace.db_path,trace.db_max_mb, andtrace.retention_days.route.stopand dispatched inProcessStageafter access and safety checks, so follow-up input does not need another wake prefix.dicttemplate fields initialize to{}; the console pip dialog stays visible in fullscreen; configuration hints and disabled-option hiding match upstream.Non-goals
docs.astrbot.applinks. The fork keeps source/Docker deployment and its own docs.star/context.py,migra_helper.py,changelogs/unreleased.md,api/v1.ts, or the monolithic dashboard test.Implementation notes
tracesection and a forward-onlyschema_revision4 migration converts legacy trace-log settings (log_max_mb× 4) to the SQLite budget.SessionWaiterRegistry;event_contextonly binds the current event, while the scheduler owns active-event registration and cleanup.en-US/zh-CN, and regenerates the OpenAPI client and public OpenAPI JSON.PYTEST_CURRENT_TESTbelow its environment limit, made the retention assertion wait for writer readiness with diagnostics, documented intentionally dropped log entries for CodeQL, and removed the deadfriend_message_needs_wake_prefixmetadata that this fork's turn-routing model replaced.masterand made the PowerShell formatjob retry the PSScriptAnalyzer install and register PSGallery when the runner
image lacks it, so a transient gallery outage cannot fail the required gate.
Validation
Per-commit independent Codex reviews were recorded in
upstream-decisions.jsonl; the interval audit reports 0 errors.Compatibility and risk
schema_revisionadvances to 4. Legacy trace file settings are converted; old JSONL trace files are not imported or deleted.opentelemetry-apiandopentelemetry-sdktopyproject.toml,requirements.txt, anduv.lock.Checklist
docs/zh/anddocs/en/.docs/public/openapi.json, and tests change together when routes or schemas change.pyproject.toml,requirements.txt, anduv.locktogether.!and aBREAKING CHANGE:footer.Agent note
Goal: absorb the upstream window into the fork without restoring legacy paths or upstream deployment artifacts.
Paths touched: tracing core and storage (
astrbot/core/utils/{trace,trace_store,telemetry}.py, pipeline stages, event bus, log broker), Dashboard trace/settings/console views and i18n, grouped config metadata and migration, Dashboard API/OpenAPI/generated client,upstream-sync.yaml, andupstream-decisions.jsonl.Checks run:
uv run pytest -q --test-profile blocking;make check;make quality;make build-docs; Dashboardpnpm typecheck,pnpm test,pnpm i18n:check; focused per-commit tests and independent Codex reviews recorded in the ledger.Residual risk: no browser screenshot of fullscreen dialog contrast; binary screenshots and MDI font payloads were not visually inspected; skipped upstream features are documented with revisit conditions.
AI tools: OpenCode (implementation) and Codex CLI (independent review).
Need help on this PR? Tag
@codesmith-botwith what you need.