Track ACP registry install receipts#682
Open
Finesssee wants to merge 42 commits into
Open
Conversation
Merge registry agents ahead of the legacy Athas marketplace catalog while preserving legacy-only entries as fallback options. Add agentServers settings support for custom agents and registry env/default overrides, and apply configured defaults through ACP session controls when available. Cover catalog precedence, custom agent mapping, env/default overrides, malformed local entries, and settings import/normalization with focused tests.
This reverts commit f0660fd.
…ex/acp-pr673-compat-check # Conflicts: # crates/ai/src/acp/bridge_init.rs # src-tauri/src/commands/ai/acp.rs
…nto codex/acp-pr673-compat-check
This was referenced May 10, 2026
…o codex/acp-pr683-compat-check # Conflicts: # src/features/ai/components/selectors/agent-selector.tsx
…odex/acp-pr683-compat-check
This was referenced May 10, 2026
…s' into codex/acp-pr684-compat-check
Contributor
Author
…to codex/acp-registry-lifecycle
…y-lifecycle # Conflicts: # src/features/collaboration/components/collaboration-sidebar.tsx # src/features/command-palette/components/command-palette.tsx # src/features/debugger/components/debug-breakpoint-indicators.tsx # src/features/editor/components/diff/inline-diff.tsx # src/features/editor/components/editor.tsx # src/features/editor/components/gutter/fold-indicators.tsx # src/features/editor/components/gutter/git-indicators.tsx # src/features/editor/components/gutter/gutter.tsx # src/features/editor/hooks/use-fold-transform.ts # src/features/editor/hooks/use-tokenizer.ts # src/features/editor/stores/editor-app-store.ts # src/features/layout/components/footer/footer.tsx # src/features/layout/components/sidebar/main-sidebar.tsx # src/features/layout/components/sidebar/sidebar-pane-selector.tsx
Contributor
Author
|
Final consolidation pass done. #682 is now merged with current master using a normal merge commit, the diff is scoped to ACP/settings files, and GitHub reports it as mergeable. Validation rerun after the master merge: bun typecheck, focused ACP Vitest tests, cargo test -p athas-ai acp, cargo test -p athas ai::acp, and git diff --check. |
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
1 participant
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
Validation
bun typecheckbunx vp test run src/features/ai/tests/acp-provider-errors.test.ts src/features/ai/tests/error-block-parsing.test.ts src/features/ai/tests/acp-cancellation.test.ts src/features/ai/tests/acp-permission.test.ts src/features/ai/tests/acp-usage.test.tscargo test -p athas-ai acpcargo test -p athas ai::acpgit diff --checkbun dev, verified with Computer Use that the ACP selector shows the expanded catalog with colored icons and tail providers are reachable by searchPR Consolidation
This PR supersedes the older overlapping ACP PRs: #673, #678, #681, #683, #684, and #685. Their useful non-conflicting pieces were folded into this branch, while this branch keeps the newer ACP runtime/catalog implementation for the files that conflicted.