Merge main into hyc/orchestration-launch + address PR #98 review by hongyi-chen · Pull Request #102 · warpdotdev/docs

hongyi-chen · 2026-05-19T06:49:37Z

Brings 121 files of changes from main back into the orchestration-launch rollout branch and addresses Oz's review on #98. Once this lands, #98 should be mergeable into main with no remaining conflicts.

What's in this PR

Conflict resolution

Two files conflicted on the merge:

.agents/skills/style_lint/style_lint.py PROPER_FEATURE_NAMES — combined main's Cloud Agents rename (replacing Ambient Agents) with orchestration-launch's removal of Cloud Agent Credits (which was intentionally split into compute credits + cloud agent credits as common nouns in PR docs: add Platform Credits page and three-bucket model #83).
src/content/docs/enterprise/support-and-resources/billing.mdx — kept orchestration-launch's three-bucket framing (AI credits + compute credits + platform credits) but dropped the Oz prefix to match main's terminology rename.

The auto-merged style_lint.py also picked up several new OZ_TERMS_TO_AVOID patterns from main, which is what surfaced the terminology drift below.

Terminology drift fixups

Main introduced new lint patterns that flagged stale Oz cloud agent / Oz agent usage on the orchestration-launch side. Fixed in:

agent-platform/capabilities/agent-memory/index.mdx (4x Oz cloud agents → cloud agents)
agent-platform/harnesses/index.mdx (frontmatter description)
agent-platform/cloud-agents/agents.mdx L11
support-and-community/plans-and-billing/platform-credits.mdx L30 (Oz agent → agent)
agent-platform/cloud-agents/deployment-patterns.mdx — wrapped oz agent run-cloud references in backticks (CLI command, not prose)
agent-platform/cloud-agents/integrations/slack.mdx L10
reference/cli/federate.mdx (description + L12)

PR #98 review feedback (oz-for-oss review on `d7d5c8e`)

Addressed the 4 important concerns:

AI credits glossary — kept as-is per direction (it's fine to use occasionally).
Default-identity vs Quick run contradiction in cloud-agents/agents.mdx (L21 + L84) — rewrote both passages so the user-triggered → calling-user → Quick run path and the headless → team default agent identity path are stated consistently.
OpenAPI / Scalar sync — deferred to a fast-follow PR per direction.
Gemini reference in platform-credits.mdx L40 — removed (Warp Agent, Claude Code, or Codex only).

Validation

python3 .agents/skills/check_for_broken_links/check_links.py --internal-only — 0 broken / 2539 internal links checked
python3 .agents/skills/style_lint/style_lint.py --changed — only 14 pre-existing HEADER-CASE warnings remain (false positives on plan-name strings like Build plan / Business plan inside FAQ headings — baseline noise, not introduced here)
npm run build — 330 pages built cleanly in 43s
No remaining conflict markers in tree

Stats

121 files changed, 416 insertions(+), 736 deletions(-)

Implementation plan · Conversation

Co-Authored-By: Oz oz-agent@warp.dev

* Rename 'Oz agent' terminology across non-platform docs Rename 'Oz agent(s)' to 'agent(s)' or 'Warp's built-in agent(s)' across enterprise, reference, support, terminal, and other docs. Rename 'Oz cloud agent(s)' to 'cloud agent(s)' and 'Oz conversation' to 'conversation'. Rename 'Oz Agent SDK' to 'Oz SDK'. Preserves all Oz platform terms (Oz CLI, Oz web app, Oz run, Oz dashboard, Oz Platform, Oz Open Source Partnership) and CLI command references (oz agent run, oz agent run-cloud, etc.) as-is. Files updated: 26 files across enterprise/, reference/, support-and-community/, terminal/, knowledge-and-collaboration/, guides/, changelog/2026.mdx, quickstart.mdx, and index.mdx. Co-Authored-By: Oz <oz-agent@warp.dev> * Rename 'Oz agent' terminology in source-of-truth and infrastructure files Update terminology references, style guidelines, AGENTS.md, linter rules, templates, CI workflows, and API specs to reflect the new naming: - 'Oz agent' -> 'agent' (generic) or 'Warp Agent' (built-in harness) - 'Oz cloud agent' -> 'cloud agent' - 'Oz subagent' -> 'subagent' - Oz platform terms (Oz CLI, Oz web app, Oz run, etc.) kept as-is Co-Authored-By: Oz <oz-agent@warp.dev> * Rename 'Oz agent' terminology in agent-platform content docs Update all agent-platform docs to reflect the new naming: - 'Oz agent' -> 'agent' (generic) or 'Warp Agent' (built-in harness) - 'Oz cloud agent' / 'Oz Cloud Agent' -> 'cloud agent' / 'Cloud Agent' - 'Oz subagent' -> 'subagent' - Oz platform terms (Oz CLI, Oz web app, Oz run, etc.) kept as-is Co-Authored-By: Oz <oz-agent@warp.dev> * Address review feedback: retire 'Ambient Agents' term, remove 'ambient' language - Rename 'Ambient Agents' to 'Cloud Agents' in terminology glossary and AGENTS.md - Remove 'ambient' from Oz run definition and CLI command descriptions - Remove 'interactive or ambient' from agent definition - Update style_lint.py PROPER_FEATURE_NAMES to match Co-Authored-By: Oz <oz-agent@warp.dev> * Codify 'Ambient Agents' deprecation across all style enforcement surfaces - Add 'ambient agent(s)' to stale_terms.md as deprecated terminology - Add 'Ambient Agents' to terms-to-avoid in terminology.md and AGENTS.md with note that code identifiers (AmbientAgentConfig) are acceptable - Add lint rule to style_lint.py OZ_TERMS_TO_AVOID to auto-flag usage - Remove remaining 'ambient' language from oz-style-guidelines.md Co-Authored-By: Oz <oz-agent@warp.dev> --------- Co-authored-by: Oz <oz-agent@warp.dev>

* Add AEO citation blocks (40-60 word summaries) to 15 key docs pages Add answer-first introductory paragraphs to Tier 1 docs pages to improve AI answer engine citability. Each citation block is a concise 40-60 word summary placed at the top of the page that directly answers 'What is this feature?' in a self-contained, extractable format. Pages updated: - Site root (index.mdx), quickstart, agents overview - Local agents, cloud agents, CLI agents overviews - Capabilities, MCP, Warp Drive, Blocks, Code, Editor overviews - Oz CLI and API/SDK references, Enterprise overview Co-Authored-By: Oz <oz-agent@warp.dev> * Reduce em dash usage in citation blocks by ~50% Replace 5 of 9 em dashes with commas, periods, or rewording. Keep em dashes only where they serve as strong contrast or parenthetical asides (cloud agents, code, blocks, editor). Co-Authored-By: Oz <oz-agent@warp.dev> * Apply suggestion from @oz-for-oss[bot] Co-authored-by: oz-for-oss[bot] <277970191+oz-for-oss[bot]@users.noreply.github.com> * Add Phase 2 citation blocks and fix 'open source' hyphen Add 40-60 word answer-first citation blocks to 9 more pages: - Model choice, Agent Profiles, Teams, Admin Panel - Code Review, Command Palette, Sessions, Supported Shells - Plans and billing Also fix 'open-source' -> 'open source' on index.mdx per style guide. 9 Phase 2 pages already had good intros and were left unchanged: Skills, Rules, Codebase Context, Environments, Secrets, Integrations, Planning, Code Editor, Managing Cloud Agents. Co-Authored-By: Oz <oz-agent@warp.dev> * Add Phase 3 citation blocks to 32 high-value pages Add 40-60 word answer-first citation blocks to remaining high-value pages: - Capabilities: Full Terminal Use, Slash Commands, Task Lists - Cloud agents: Slack integration, cloud providers, demo issue triage - Local agents: Active AI, code diffs, interactive code review, interacting with agents, terminal/agent modes, generate, voice, and all 5 agent-context sub-pages (blocks, images, selections, URLs, @ context) - Code: Vim keybindings, file tree, find and replace - Warp Drive: Workflows, Notebooks, Prompts, Environment Variables, Agent Mode Context, Warp on the Web - Reference: CLI agent profiles, troubleshooting, Warp Drive context, reference index - Getting started: Agents in Warp, Agent FAQs 42 pages already had good intros and were left unchanged. 10 deep procedural pages (self-hosting) were skipped. Co-Authored-By: Oz <oz-agent@warp.dev> --------- Co-authored-by: Oz <oz-agent@warp.dev> Co-authored-by: oz-for-oss[bot] <277970191+oz-for-oss[bot]@users.noreply.github.com>

Bumps [fast-xml-builder](https://github.com/NaturalIntelligence/fast-xml-builder) from 1.1.5 to 1.2.0. - [Changelog](https://github.com/NaturalIntelligence/fast-xml-builder/blob/main/CHANGELOG.md) - [Commits](NaturalIntelligence/fast-xml-builder@v1.1.5...v1.2.0) --- updated-dependencies: - dependency-name: fast-xml-builder dependency-version: 1.2.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Hong Yi Chen <hongyi@warp.dev>

Bumps [devalue](https://github.com/sveltejs/devalue) from 5.7.1 to 5.8.1. - [Release notes](https://github.com/sveltejs/devalue/releases) - [Changelog](https://github.com/sveltejs/devalue/blob/main/CHANGELOG.md) - [Commits](sveltejs/devalue@v5.7.1...v5.8.1) --- updated-dependencies: - dependency-name: devalue dependency-version: 5.8.1 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Hong Yi Chen <hongyi@warp.dev>

These workflows depend on a `WARP_API_KEY` org-level secret that isn't exposed to the public `warpdotdev/docs` repo, so they fail on every PR (example: https://github.com/warpdotdev/docs/actions/runs/26031884808). PR review coverage and `@oz-agent` comment responses are now handled by the Oz management webhook flow, making these workflows redundant. Co-authored-by: Oz <oz-agent@warp.dev>

#94) GLM 5 is no longer offered as a hosted model. GLM 5.1 remains. Co-authored-by: Oz <oz-agent@warp.dev>

Brings in 121 files of changes from main since branch creation, resolving two conflicts and reconciling terminology drift introduced by both sides. Also addresses Oz reviewer's important concerns on PR #98. ## Conflict resolution * .agents/skills/style_lint/style_lint.py - PROPER_FEATURE_NAMES: combined main's 'Cloud Agents' rename (replacing 'Ambient Agents') with orchestration-launch's removal of 'Cloud Agent Credits' (split into 'compute credits' + 'cloud agent credits' common nouns). * src/content/docs/enterprise/support-and-resources/billing.mdx - kept orchestration-launch's three-bucket framing (AI credits + compute credits + platform credits) but dropped the 'Oz ' prefix to match main's rename. ## Terminology drift fixups (7) Aligned with main's terminology updates: * agent-memory/index.mdx - 4x 'Oz cloud agents' -> 'cloud agents' * harnesses/index.mdx - description: 'Oz cloud agents' -> 'cloud agents' * cloud-agents/agents.mdx:11 - 'Oz cloud agents' -> 'cloud agents' * platform-credits.mdx:30 - 'Oz agent' -> 'agent' * deployment-patterns.mdx - 2x wrap 'oz agent run-cloud' in backticks * slack.mdx:10 - 'Oz cloud agents' -> 'cloud agents' * federate.mdx - 2x 'Oz agent' -> 'agent' in frontmatter/prose ## PR #98 review feedback * Remove Gemini reference from platform-credits.mdx:40 (per reviewer). * Resolve default-identity vs Quick run contradiction in agents.mdx (L21 + L84): clarify that headless runs (team API key without identity) default to the team's default agent identity, while user-triggered runs default to the calling user and surface as Quick run in the web app. * Kept 'AI credits' in glossary (per user direction). * OpenAPI/Scalar sync deferred to a fast-follow PR (per user). Validation: * check_for_broken_links: 0 broken links across 2539 internal links * style_lint --changed: only 14 pre-existing HEADER-CASE warnings (plan-name false positives like 'Build plan'/'Business plan') * npm run build: 330 pages built in 43s Co-Authored-By: Oz <oz-agent@warp.dev>

vercel · 2026-05-19T06:49:43Z

The latest updates on your projects. Learn more about Vercel for GitHub.

Project	Deployment	Actions	Updated (UTC)
docs	Ready	Preview, Comment	May 19, 2026 7:02am

oz-for-oss · 2026-05-19T06:49:57Z

@hongyi-chen

I'm starting a first review of this pull request.

You can view the conversation on Warp.

I completed the review and no human review was requested for this pull request.

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

oz-for-oss

Overview

This PR merges main back into the orchestration launch branch and applies terminology updates across docs, skills, and generated API metadata. I reviewed the provided diff, PR description, and spec context; no approved spec context was available, and I did not find security issues that need separate callout.

Concerns

A newly added intro paragraph still uses deprecated Oz agents terminology, which conflicts with the glossary and lint rule updates introduced by this PR.
One security-sensitive GCP federation warning now says any agent; scoping it to cloud agent keeps the trust-boundary language precise.

Verdict

Found: 0 critical, 1 important, 1 suggestions

Request changes

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

oz-for-oss · 2026-05-19T06:55:26Z

 ---
 import VideoEmbed from '@components/VideoEmbed.astro';

+Warp includes Oz agents that help you write code, debug issues, and complete terminal workflows from natural language prompts. Agents operate with full context from your codebase, Warp Drive, and connected tools while you control their autonomy, permissions, and model choices.


⚠️ [IMPORTANT] This newly added paragraph still uses deprecated Oz agents terminology, which the new glossary and lint rules say to avoid.

Suggested change

Warp includes Oz agents that help you write code, debug issues, and complete terminal workflows from natural language prompts. Agents operate with full context from your codebase, Warp Drive, and connected tools while you control their autonomy, permissions, and model choices.

Warp's agents help you write code, debug issues, and complete terminal workflows from natural language prompts. They operate with full context from your codebase, Warp Drive, and connected tools while you control their autonomy, permissions, and model choices.

oz-for-oss · 2026-05-19T06:55:26Z

+If you do not set an attribute condition, then _any_ agent will be able to use your Workload
 Identity Federation provider, even if they do not belong to your team.


💡 [SUGGESTION] This warning is about OIDC-capable cloud runs; any agent also includes local agents that do not use this provider. Scope the warning to cloud agents.

Suggested change

If you do not set an attribute condition, then _any_ agent will be able to use your Workload

Identity Federation provider, even if they do not belong to your team.

If you do not set an attribute condition, then _any cloud agent_ will be able to use your Workload

Identity Federation provider, even if it does not belong to your team.

* agents-in-warp.mdx intro: drop 'Oz agents' (deprecated) → 'Warp's agents'; use 'They' for the follow-up so it reads cleanly with the new subject. * cloud-providers.mdx GCP federation caution: 'any agent' → 'any cloud agent', and 'they do not belong' → 'it does not belong'. This is an OIDC-only warning, so scoping it to cloud agents keeps the trust-boundary language precise (local agents do not use this provider). Validation: * check_for_broken_links: 0 broken / 2539 internal links * style_lint --changed: 14 baseline HEADER-CASE warnings only * npm run build: 330 pages built in 50s Co-Authored-By: Oz <oz-agent@warp.dev>

PR #102 squash-merged main's content into hyc/orchestration-launch but the squash discarded the merge commit, so git no longer sees main as an ancestor. This makes PR #98 (hyc/orchestration-launch -> main) show spurious conflicts even though the content is already consistent. This commit uses '-s ours' to record main as merged WITHOUT changing any file content. The tree on hyc/orchestration-launch is unchanged (verified before and after); only the commit graph gets a second parent pointing at origin/main so PR #98 can merge cleanly. Co-Authored-By: Oz <oz-agent@warp.dev>

rachaelrenk and others added 7 commits May 17, 2026 17:05

docs(model-choice): remove GLM 5 from Fireworks AI hosted models table (

7ded564

#94) GLM 5 is no longer offered as a hosted model. GLM 5.1 remains. Co-authored-by: Oz <oz-agent@warp.dev>

cla-bot Bot added the cla-signed label May 19, 2026

vercel Bot deployed to Preview May 19, 2026 06:51 View deployment

oz-for-oss Bot reviewed May 19, 2026

View reviewed changes

hongyi-chen merged commit 6b75e80 into hyc/orchestration-launch May 19, 2026
3 of 4 checks passed

hongyi-chen deleted the hyc/orch/merge-main branch May 19, 2026 07:01

vercel Bot deployed to Preview May 19, 2026 07:02 View deployment

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge main into hyc/orchestration-launch + address PR #98 review#102

Merge main into hyc/orchestration-launch + address PR #98 review#102
hongyi-chen merged 8 commits into
hyc/orchestration-launchfrom
hyc/orch/merge-main

hongyi-chen commented May 19, 2026

Uh oh!

vercel Bot commented May 19, 2026 •

edited

Loading

Uh oh!

oz-for-oss Bot commented May 19, 2026 •

edited

Loading

Uh oh!

oz-for-oss Bot left a comment

Uh oh!

oz-for-oss Bot May 19, 2026

Uh oh!

oz-for-oss Bot May 19, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	Warp includes Oz agents that help you write code, debug issues, and complete terminal workflows from natural language prompts. Agents operate with full context from your codebase, Warp Drive, and connected tools while you control their autonomy, permissions, and model choices.
	Warp's agents help you write code, debug issues, and complete terminal workflows from natural language prompts. They operate with full context from your codebase, Warp Drive, and connected tools while you control their autonomy, permissions, and model choices.

		If you do not set an attribute condition, then _any_ agent will be able to use your Workload
		Identity Federation provider, even if they do not belong to your team.

Conversation

hongyi-chen commented May 19, 2026

What's in this PR

Conflict resolution

Terminology drift fixups

PR #98 review feedback (oz-for-oss review on d7d5c8e)

Validation

Stats

Uh oh!

vercel Bot commented May 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

oz-for-oss Bot commented May 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

oz-for-oss Bot left a comment

Choose a reason for hiding this comment

Overview

Concerns

Verdict

Uh oh!

oz-for-oss Bot May 19, 2026

Choose a reason for hiding this comment

Uh oh!

oz-for-oss Bot May 19, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

PR #98 review feedback (oz-for-oss review on `d7d5c8e`)

vercel Bot commented May 19, 2026 •

edited

Loading

oz-for-oss Bot commented May 19, 2026 •

edited

Loading