Merge main into hyc/factory-launch (brings the #532 redirect collapse) - #553
Closed
rachaelrenk wants to merge 1 commit into
Closed
Merge main into hyc/factory-launch (brings the #532 redirect collapse)#553rachaelrenk wants to merge 1 commit into
rachaelrenk wants to merge 1 commit into
Conversation
Brings the redirect collapse from #532 down into the launch branch, which branched before it landed. The branch was carrying 2030 redirect rules against a Vercel hard limit of 2048 -- 18 away from deploys failing. main has the same coverage in 1291 rules, because #532 rewrote 742 trailing-slash pairs as single `(/?)` rules. After the merge: 1292 rules, 0 duplicates. Verified the redirect merge by behaviour rather than by diff, since a dropped rule produces a 404 that no build catches. Expanded both parents' rule sets to the literal paths they match and compared: - 0 paths the launch branch served that the merge drops - 0 paths main served that the merge drops - 119 paths where the two disagreed all resolved toward main, which is the right direction: those are redirects #500/#503 pointed straight at /agents/ while this branch still chained them through /agent-platform/local-agents/overview/ - the one launch-branch-only rule, /platform/software-factory/ -> /factories/, survives Five content conflicts. In each, the two sides were not competing edits to the same prose: main carries the #503 rewrites, this branch carries the #513 variable tokenization. Picking a side would lose one or the other, so each resolution combines main's words with this branch's tokens. - agents/index.mdx: took main's rewritten intro plus both imports. The second hunk had aligned this branch's platform content underneath main's new "Privacy and security" heading, which is the wrong home for it, so privacy content stays under that heading and the platform content is restored as its own section -- main has none. Also tokenized a hardcoded "Oz" that main's version reintroduced on the cloud agent line. - managing-cloud-agents.mdx and platform/overview.mdx: main retargeted links to /agents/ because #503 deleted agents-in-warp.mdx, while this branch tokenized the CLI name. Kept both. - support-and-community/index.mdx: not a real conflict, an import on one side and a new section on the other. Kept both. - agents/getting-started/agents-in-warp.mdx: deleted by main in #503, modified here only by the tokenization pass, so the deletion loses nothing. main already ships the redirect to /agents/. Not build-verified locally; CI covers it. Co-Authored-By: Warp <agent@warp.dev>
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
Contributor
|
I'm starting a first review of this pull request. You can view the conversation on Warp. I cancelled the in-progress review run because this pull request was closed. Powered by Oz |
Contributor
Author
|
Closing as redundant — Leaving one note from the verification here in case it is useful later: comparing the two parents by behaviour rather than by diff (expanding every rule to the literal paths it matches) showed 0 paths dropped from either side and 119 paths where the branch had been chaining through |
rachaelrenk
added a commit
that referenced
this pull request
Aug 17, 2026
Clears the conflict on #542 and applies the product answer on the handle. The base already had the #532 redirect collapse: someone merged main into hyc/factory-launch in 1c835b4 while PR #553 was being prepared, so the branch is at 1292 rules with 742 collapsed. #553 is closed as redundant. Three conflicts: - factories/connect-your-factory.mdx and infrastructure-and-security.mdx were STUB placeholders here, tokenized during the guard pass, and are now fully written on the base (#520-#552). Took the base version outright; the stubs no longer exist. - agents/getting-started/agents-in-warp.mdx was deleted upstream by #503 and only modified here by the article pass, so the deletion loses nothing. The redirect to /agents/ already ships. One fix the merge required: agents/index.mdx arrived with "Cloud agents run on [{VARS.WARP_AUTOMATION_PLATFORM}]" and no article. The determiner check caught it, which is the first time that rule has caught a regression coming *in* from another branch rather than one this work introduced. Mention handle: @oz -> @warp, 20 occurrences across 9 pages plus the glossary. Product confirmed today. These were deliberately hardcoded rather than tokenized back in #513, on the grounds that a handle is a literal string the product owns and variabilizing it would silently rewrite a working handle into an invalid one at rename time. That call is what made this a clean one-line-per-site change now: had they been tokenized, the 8/18 flip would already have turned every one of them into "@automation Platform" and the real answer would have arrived too late. The 48 `@oz-agent` GitHub handles are untouched and stay as they are; that is a different handle on a different service. Verified: no stale @oz outside the glossary's own historical note; style_lint 1124 against a 1148 baseline, hardcoded-var 0, determiner 0. Not build-verified locally -- local builds were taking long enough to be the bottleneck, so CI covers it. Co-Authored-By: Warp <agent@warp.dev>
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
Merges
mainintohyc/factory-launchto bring down the redirect collapse from #532.Why now: the launch branch is carrying 2030 redirect rules against a Vercel hard limit of 2048 — 18 away from deploys failing.
mainachieves the same coverage in 1291 rules, because #532 rewrote 742 trailing-slash pairs as single(/?)rules. After this merge: 1292 rules, 0 duplicates.Redirect verification
Verified by behaviour rather than by diff, since a dropped rule produces a 404 that no build catches. Both parents rule sets were expanded to the literal paths they match, then compared:
mainserved that the merge dropsmain— those are redirects docs: collapse the Agents intro pages and de-duplicate the CLI conversation doc #500/docs: merge the agent overview pages on the Agents tab #503 pointed straight at/agents/, while this branch still chained them through/agent-platform/local-agents/overview//platform/software-factory/→/factories/, survivesContent conflicts (5)
In each case the two sides were not competing edits to the same prose:
maincarries the #503 rewrites, this branch carries the #513 variable tokenization. Picking a side loses one or the other, so each resolution combines them.agents/index.mdxOzthat main version reintroduced.platform/managing-cloud-agents.mdx/agents/) + this branch CLI token.platform/overview.mdxsupport-and-community/index.mdxagents/getting-started/agents-in-warp.mdxNote
Not build-verified locally — relying on CI.