Repository navigation
Conversation
cargo x deps now keeps a root [workspace.dependencies] entry for every
member at its current path, sorts members one per line, and rewrites
relative path dependencies between members to { workspace = true }.
--check reports manifests that need it. hakari's workspace-hack lines
keep their relative path.
Generated by `cargo x deps`: every member has a root entry, members are
sorted one per line, and the relative path dependencies between members
become { workspace = true }. Feature resolution is unchanged.
cargo x deps now reads .config/layers.toml, places every workspace crate in a layer by directory glob, and prints the normal and build edges that cross layers in a direction the config does not allow. The 26 edges that violate the rules today are baselined as [[allow]] entries with reasons. The report never fails the run.
Also documents how to read and fix the layer report.
The root manifest now lists every workspace crate in [workspace.dependencies]. Hash only the entries of crates in the wasm package's closure, so adding or moving another crate keeps the key.
Took main's manifests where they conflicted and regenerated them with `cargo x deps`.
cargo shear rejects root [workspace.dependencies] entries no member uses, so cargo x deps now drops those and adds an entry once a crate gains its first dependent.
Took main's manifests where they conflicted and regenerated them with `cargo x deps`.
…f/reorg-move-names # Conflicts: # tooling/xtask/crates/xtask_deps/src/main.rs
The crate reorganization moves crates/ into feature groups over a series of PRs. Check in the scripts that do each move, and the map each PR runs, so branches opened before a move can rewrite their own paths with `move_crates.py --rewrite-only` after merging it. MACRO-4984
model-entity, model-error-response and worker-rs-otel were hyphenated packages in hyphenated directories while their lib names were already snake_case; local_e2e_integration_tests did not match its directory. Rename the packages and directories so directory, package and lib name agree, and every dependency key reads like the `use` path. Also drops two layer-baseline entries that main made stale: mcp_client no longer depends on agent, and microsoft_oauth_grant_db_utils is no longer a workspace member. MACRO-4984
Move the 19 graphql_* adapter crates and complete_graph into crates/graphql/. Paths change; package names do not. MACRO-4984
Move the AWS SDK adapters (s3, sqs, sns, ses, dynamodb, lambda, secrets manager, the shared config and the SQS worker) into crates/aws/. Paths change; package names do not. MACRO-4984
Move the HTTP and SDK client crates (Macro service clients, vendor clients, the cache client and its Redis wrapper) into crates/clients/. Paths change; package names do not. MACRO-4984
Move the shared service plumbing (config, env vars, service URLs, queues, events, middleware, auth, telemetry, feature flags) into crates/platform/. Paths change; package names do not. MACRO-4984
Move the leaf id, token and wire-model crates (model, models_*, model_*, *_id, *_token and the other no-I/O value crates) into crates/types/. Paths change; package names do not. MACRO-4984
Move the team, onboarding, API key and account crates into crates/accounts/, and the notification domain, its store, inbox and payload crates into crates/notifications/. Paths change; package names do not. MACRO-4984
Move the email domain, its API client, stores and helpers into crates/email/ (the email crate itself is now crates/email/email), and the calendar crates into crates/calendar/. Paths change; package names do not. MACRO-4984
Move channels, messages, AI chat, calls, contacts and the Slack and external chat crates into crates/comms/, and the WhatsApp protocol, linked-device and test crates into crates/whatsapp/. Paths change; package names do not. MACRO-4984
Move entity access, sharing, roles, access requests, the entity registry crates (flattened out of crates/entity_registry/), foreign entities, entity mutations, favorites and frecency into crates/entities/. Paths change; package names do not. MACRO-4984
Move Soup, its realtime and model crates, item filters, search, the work feed, activity and the attention feed into crates/search/. Paths change; package names do not. MACRO-4984
Move initiative (product projects), its description crate, projects (folders) and task deduplication into crates/projects/. The projects crate is now crates/projects/projects. Paths change; package names do not. MACRO-4984
Move the GitHub, webhook, importer, Granola and unfurl crates into crates/integrations/. Paths change; package names do not. MACRO-4984
Move databases, the SQL engine and its runner, database webhooks,
forms, properties, saved views and CRM into crates/databases/. The
web app's database_sql wasm-pack build follows the new path. Paths
change; package names do not.
The crate move script now resolves include_str! migration paths
against the file, and follows {{justfile_directory()}}/.. paths.
MACRO-4984
Move documents, collab surfaces, the sync domain and router, static files and Lexical mention extraction into crates/documents/. The sync domain's directory becomes sync_service_hex to match its package name, so it no longer shares a name with services/sync-service. Paths change; package names do not. services/sync-service/bebop-schema stays where it is: it is generated by the sync worker's Bebop build, and services/ is outside this series. MACRO-4984
Move the PowerPoint, Word, Figma, Photoshop and Illustrator engines into crates/engines/. The web app's wasm-pack builds, the desktop nix wasm derivations and the browser-test fixture paths follow. Paths change; package names do not. MACRO-4984
Move the LLM loop, AI tools and toolsets, projections, attachments, embeddings, image generation, memory, MCP and dictation crates into crates/ai/, and AI usage, AI billing and referrals into crates/billing/. Paths change; package names do not. MACRO-4984
Move the agent session, harness, trigger, bot, Codex and Cursor, routine, skill, prompt, code execution and dynamic UI crates into crates/agents/, and flatten the transcript folds out of crates/folds/ into it (the folds README becomes a section of the group's AGENTS.md). The agent harness's CI source paths, the Daytona snapshot workflow and the web app's agent_fold wasm-pack build follow. Paths change; package names do not. crates/coding_agent_worker (macrod) stays at the top level: the public install command fetches install/install.sh from that path on main. MACRO-4984
Move the local end-to-end suite out of crates/integration_tests/ and its support crate into crates/testing/. Paths change; package names do not. MACRO-4984
Add crates/AGENTS.md, which lists each group with its layer and the crates that stay at the top level and why, and point the root map and the Rust guide at it. MACRO-4984
Contributor
WalkthroughWarning Review details and warnings were omitted to fit the comment limit. |
Contributor
Author
|
Folded into the single reorg PR #10111 (one PR for the whole reorganization). Its commits are there; closing this one. |
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.
Why
Move the local end-to-end suite out of crates/integration_tests/ and
its support crate into crates/testing/. Paths change; package names do
not.
Add crates/AGENTS.md, which lists each group with its layer and the
crates that stay at the top level and why, and point the root map and
the Rust guide at it.
Part of the crate reorganization: crates grouped one level deep by feature,
so the layer rules in
.config/layers.tomlare path globs and relatedcrates sit together. Package names are unchanged unless the title says
otherwise.
Stacked. This branch includes #10022 (root
[workspace.dependencies]) and #10021 (layer check), and the earlier moves #10080, #10081, #10082, #10083, #10084, #10085, #10086, #10087, #10088, #10089, #10090, #10091, #10092, #10093, #10094, #10095, #10096, #10097, so CI runs againstmain.Review only
fa9623ce2d..95658f14d6(32 files changed, 100 insertions(+), 14 deletions(-)).MACRO-5020
MACRO-4984
How it works
move_crates.py tooling/scripts/crate_moves/maps/20-testing.txtmoved the crates and rewrote every path tothem (root
membersand[workspace.dependencies], manifests, sqlxmigrations =and fixture paths, CI, nix,just, docs).crates/AGENTS.md, which lists every group withits layer and the crates that stay at the top level and why, and points
the root map and
docs/development/rust.mdat it.Updating an open branch after this lands
Git carries your edits across the renames. A file you added inside a moved
crate shows up as "added in a directory that was renamed": accept git's
suggested location. Then fix paths your branch wrote for the old layout: