Merge branch 'main' into independabot/nitropack-CVE-2026-44372-CVE-2026-44373

Author: dannyneira

.agents/references/terminology.md

@@ -69,8 +69,8 @@ For the summary of the most critical terms (core features, Oz terms, terms to av
 
 ## Agent concepts
 
-- **Ambient Agents** — Oz agents that run automatically in the background on a schedule or trigger, without interactive input.
-  *Usage note:* Capitalize as a feature/section name. Use lowercase "ambient agents" only when describing the generic concept of agents running in the background.
+- **Cloud Agents** — Agents that run in the cloud on a schedule, trigger, or integration, without interactive input. Managed by the Oz Platform.
+  *Usage note:* Use lowercase "cloud agents" in most contexts. Capitalize as "Cloud Agents" only when referring to the product section or feature name.
 
 - **Agent Profiles** — Saved configurations that define how an Agent runs (for example, permissions and model selection).
   *Usage note:* Use when describing "choose how your Agent behaves."
@@ -121,42 +121,42 @@ For the summary of the most critical terms (core features, Oz terms, terms to av
 
 ## Oz terminology
 
-### Oz vs Warp
+### Warp Agent vs Oz
 
-- **Warp** is the terminal and coding surface
-- **Oz** is Warp's programmable agent for running and coordinating agents at scale
+- **Warp Agent** — Warp's built-in agent harness. Use "Warp Agent" when specifically referring to the built-in harness, especially when contrasting with third-party agents (Claude Code, Codex, etc.), or when referencing the Settings label (**Settings** > **Agents** > **Warp Agent**).
+- **Oz** — Warp's programmable platform for running and coordinating agents at scale
 - There is typically one Warp environment per user session. Oz can run many agents concurrently, across machines, repos, and teams.
 
-### Core Oz terms
+### Core terms
 
-- **Environment** — The execution context for an Oz agent, including repo access, dependencies, secrets, compute, and runtime configuration.
+- **agent** — A combination of agent instructions (skill or prompt), trigger (cron, webhook, manual), environment (local, cloud), profile, and host. Agents can be local or cloud. Use lowercase "agent" in most contexts; use "Warp Agent" only when referring specifically to the built-in Warp harness.
+  *Example:* Launch an agent from the CLI, the web app, an API or SDK, or directly inside Warp.
 
-- **Oz** — Warp's programmable agent for running and coordinating agents at scale.
-  *Example:* With Oz, you can orchestrate multiple agents to automate and parallelize complex workflows.
+- **cloud agent** — An agent running in the cloud, from a trigger, schedule, or started from someone's local machine.
 
-- **Oz agent** — A combination of agent instructions (skill or prompt), trigger (cron, webhook, manual), environment (local, cloud), profile, and host. Agents can be local or cloud, and interactive or ambient.
-  *Example:* Launch an Oz agent from the CLI, the web app, an API or SDK, or directly inside Warp.
+- **conversation** — An interactive execution lifecycle within the Warp Terminal, regardless of whether it's local or in the cloud.
 
-- **Oz cloud agent** — An Oz agent running in the cloud, from a trigger, schedule, or started from someone's local machine. Cloud agents can be interactive or ambient.
+- **Environment** — The execution context for an agent, including repo access, dependencies, secrets, compute, and runtime configuration.
 
-- **Oz conversation** — An interactive execution lifecycle within the Warp Terminal. An Oz conversation is interactive, started in the terminal regardless of whether it's local or in the cloud.
+- **Oz** — Warp's programmable platform for running and coordinating agents at scale.
+  *Example:* With Oz, you can orchestrate multiple agents to automate and parallelize complex workflows.
 
 - **Oz dashboard** — The app surface to manage all Oz runs, unified across the Warp app and web.
 
-- **Oz run** — A single execution lifecycle of an Oz agent, including actions, outputs, and logs. An Oz run is always ambient and cloud-based.
+- **Oz run** — A single execution lifecycle of an agent, including actions, outputs, and logs. An Oz run is always cloud-based.
 
-- **Oz subagent** — A child Oz agent created by a parent Oz agent to parallelize or delegate work.
+- **Oz web app** — The web app for configuring agents and managing runs.
 
-- **Oz web app** — The web app for configuring Oz agents and managing runs.
+- **subagent** — A child agent created by a parent agent to parallelize or delegate work.
 
 ### Oz CLI commands
 
 - `oz agent run` — Run a local agent
 - `oz agent run-cloud` — Run an adhoc cloud agent
 - `oz environment create/list/get/update/delete` — CRUD on environments
 - `oz integration create` — Install integrations (Slack, Linear)
-- `oz run list/get` — Get info on ambient agent runs
-- `oz schedule create/list/get/update/delete` — CRUD on scheduled ambient agents
+- `oz run list/get` — Get info on cloud agent runs
+- `oz schedule create/list/get/update/delete` — CRUD on scheduled cloud agents
 - `oz secret create/list/update/delete` — CRUD on Warp-managed secrets
 
 ### Preferred phrases
@@ -167,11 +167,16 @@ For the summary of the most critical terms (core features, Oz terms, terms to av
 
 ### Terms to avoid
 
-- ❌ "Ozzies" → Use "Oz agents", "instances", or "Oz subagents"
-- ❌ "Deploying an Oz" → Use "Deploying an Oz agent"
-- ❌ "The Oz Agent" → Use "An Oz agent" or "A parent Oz agent"
-- ❌ "Oz is running" → Use "An Oz agent is running" or "A run is in progress"
+- ❌ "Oz agent" / "Oz agents" → Use "agent" / "agents" (or "Warp Agent" / "Warp Agents" when referring to the built-in harness)
+- ❌ "Oz cloud agent" → Use "cloud agent"
+- ❌ "Oz subagent" → Use "subagent"
+- ❌ "Oz conversation" → Use "conversation"
+- ❌ "Ozzies" → Use "agents", "instances", or "subagents"
+- ❌ "Deploying an Oz" → Use "Deploying an agent"
+- ❌ "The Oz Agent" → Use "the agent" or "the Warp Agent"
+- ❌ "Oz is running" → Use "An agent is running" or "A run is in progress"
 - ❌ "AI agents" → Use "agents" (the "AI" prefix is redundant)
+- ❌ "Ambient Agents" / "ambient agents" → Use "Cloud Agents" / "cloud agents" ("ambient" is no longer a product term; acceptable only in code identifiers like `AmbientAgentConfig`)
 
 ## Platform terms
 

.agents/rules/oz-style-guidelines.md

@@ -34,46 +34,52 @@ When writing about Warp products or features, tie back to at least one of these
 
 ## Oz Terminology and Capitalization
 
-### Core Oz Terms
+### Core Terms
 
 - **Oz** - Warp's programmable platform for running and coordinating agents at scale
-- **Oz agent** - A combination of agent instructions (skill or prompt), trigger (cron, webhook, manual), environment (local, cloud), profile, and host. Can be local or cloud, interactive or ambient
-- **Oz cloud agent (general)** - An Oz agent running in the cloud, from a trigger, schedule, or started from someone's local machine
-- **Oz subagent** - A child Oz agent created by a parent Oz agent to parallelize or delegate work
-- **Oz run** - A single execution lifecycle of an Oz agent, including actions, outputs, and logs. Always ambient and cloud-based
-- **Oz conversation** - An interactive execution lifecycle within Warp terminal, regardless of whether it's local or in the cloud
-- **Environment** - The execution context for an Oz agent, including repo access, dependencies, secrets, compute, and runtime configuration
+- **Warp Agent** - Warp's built-in agent harness. Use "Warp Agent" when specifically referring to the built-in harness, especially when contrasting with third-party agents (Claude Code, Codex, etc.)
+- **agent** - A combination of agent instructions (skill or prompt), trigger (cron, webhook, manual), environment (local, cloud), profile, and host. Can be local or cloud. Use lowercase "agent" in most contexts.
+- **cloud agent** - An agent running in the cloud, from a trigger, schedule, or started from someone's local machine
+- **subagent** - A child agent created by a parent agent to parallelize or delegate work
+- **Oz run** - A single execution lifecycle of an agent, including actions, outputs, and logs. Always cloud-based
+- **conversation** - An interactive execution lifecycle within Warp terminal, regardless of whether it's local or in the cloud
+- **Environment** - The execution context for an agent, including repo access, dependencies, secrets, compute, and runtime configuration
 - **Oz dashboard** - The app surface to manage all Oz runs, unified across the Warp app and web
-- **Oz web app** - The web app for configuring Oz agents and managing runs
+- **Oz web app** - The web app for configuring agents and managing runs
 
 ### Capitalization Rules
 
 **Cloud agents:**
-- **Product** (capitalized): "Oz Cloud Agent" or "Oz Cloud Agents" when referring to Warp's specific product feature
-  - "Oz Cloud Agents send you session sharing links"
-  - "Launch an Oz Cloud Agent from the CLI"
+- **Product** (capitalized): "Cloud Agent" or "Cloud Agents" when referring to Warp's specific product feature
+  - "Cloud Agents send you session sharing links"
+  - "Launch a Cloud Agent from the CLI"
 - **Concept** (lowercase): "cloud agent" or "cloud agents" when referring to the general concept
   - "Running cloud agents lets you escape the limits of your local machine"
   - "The cloud agent architecture enables scalability"
 
 **Other terms:**
 - Use "agents" not "AI agents" (redundant)
+- Use "agent" not "Oz agent" (deprecated); use "Warp Agent" only when referring to the built-in harness
 - "Skills" not "skills" (capitalized)
 - "AGENTS.md" not "agents.md" (all caps)
 
 ### Terms to Avoid
 
 ❌ **Don't use:**
-- "Ozzies" → Use "Oz agents", "instances", or "Oz subagents"
-- "Deploying an Oz" → Use "Deploying an Oz agent"
-- "The Oz Agent" → Use "An Oz agent" or "A parent Oz agent"
-- "Oz is running" → Use "An Oz agent is running" or "A run is in progress"
+- "Oz agent" / "Oz agents" → Use "agent" / "agents" (or "Warp Agent" / "Warp Agents" when referring to the built-in harness)
+- "Oz cloud agent" → Use "cloud agent"
+- "Oz subagent" → Use "subagent"
+- "Oz conversation" → Use "conversation"
+- "Ozzies" → Use "agents", "instances", or "subagents"
+- "Deploying an Oz" → Use "Deploying an agent"
+- "The Oz Agent" → Use "the agent" or "the Warp Agent"
+- "Oz is running" → Use "An agent is running" or "A run is in progress"
 - "AI agents" → Use "agents"
 - "Warp's terminal" → Use "Warp" or "Warp terminal"
 
 ### Important Context About Oz
 
-**All agents in Warp are Oz agents**, whether they are running in the cloud or running locally.
+Oz is Warp's programmable platform for running and coordinating agents at scale, whether they are running in the cloud or running locally.
 
 Oz exists to take agent workflows beyond a single prompt or a single laptop, making them scalable, autonomous, collaborative, and auditable.
 

.agents/skills/answer_question/SKILL.md

@@ -49,7 +49,7 @@ Both repos are indexed for `codebase_semantic_search`. Use `grep` for exact symb
 
 - Be direct and matter-of-fact. Answer the question, don't summarize the docs.
 - Be comprehensive — cover what the user needs to fully understand the answer — but don't pad with tangential information.
-- Use Warp's standard terminology from `AGENTS.md` and the full glossary in `.warp/references/terminology.md`. Key rules: capitalize feature names (Agent, Agent Mode, Warp Drive, Codebase Context), use "Oz agent" not "Ozzie" or "the Oz Agent", use "credits" not "AI credits."
+- Use Warp's standard terminology from `AGENTS.md` and the full glossary in `.warp/references/terminology.md`. Key rules: capitalize feature names (Agent, Agent Mode, Warp Drive, Codebase Context), use "agent" (generic) or "Warp Agent" (built-in harness) not "Oz agent" or "Ozzie", use "credits" not "AI credits."
 - If the docs do not cover the topic, say so honestly. Do not guess or fabricate information.
 
 ### 4. Generate doc links

.agents/skills/missing_docs/references/feature_surface_map.md

@@ -8,7 +8,7 @@ Lines starting with `#` are comments. Blank lines are ignored.
 
 # Maintenance: when a new GA feature flag ships, add a mapping here.
 # Run `python3 .warp/skills/missing_docs/scripts/audit_docs.py` to find unmapped flags.
-# This audit is also run as a recurring scheduled Oz agent to catch drift.
+# This audit is also run as a recurring scheduled cloud agent to catch drift.
 
 ## Feature flags -> doc pages
 

.agents/skills/missing_docs/references/stale_terms.md

@@ -25,10 +25,17 @@ mac os -> Use 'macOS'
 
 ## Deprecated terminology
 
-ozzies -> Use 'Oz agents', 'instances', or 'Oz subagents'
-warp agent -> Use 'Agent' or 'Oz agent' depending on context
-warp agents -> Use 'Agents' or 'Oz agents' depending on context
+ambient agent -> Use 'cloud agent' — 'ambient' is no longer a product term
+ambient agents -> Use 'cloud agents' — 'ambient' is no longer a product term
+ozzies -> Use 'agents', 'instances', or 'subagents'
+oz agent -> Use 'agent' or 'Warp Agent' depending on context
+oz agents -> Use 'agents' or 'Warp Agents' depending on context
+oz cloud agent -> Use 'cloud agent'
+oz cloud agents -> Use 'cloud agents'
+oz subagent -> Use 'subagent'
+oz subagents -> Use 'subagents'
+oz conversation -> Use 'conversation'
 agent-mode -> Use 'Agent Mode' (two words, no hyphen)
-deploying an oz -> Use 'Deploying an Oz agent'
-the oz agent -> Use 'An Oz agent' or 'A parent Oz agent'
-oz is running -> Use 'An Oz agent is running' or 'A run is in progress'
+deploying an oz -> Use 'Deploying an agent'
+the oz agent -> Use 'the agent' or 'the Warp Agent'
+oz is running -> Use 'An agent is running' or 'A run is in progress'

.agents/skills/style_lint/SKILL.md

@@ -52,7 +52,7 @@ python3 .warp/skills/style_lint/style_lint.py --all --fix --create-pr
 ### Terminology checks
 
 - **Product name casing**: "Warp Terminal" (→ "Warp"), "agent mode" (→ "Agent Mode"), "warp drive" (→ "Warp Drive"), "codebase context" (→ "Codebase Context"), "agent management panel" (→ "Agent Management Panel")
-- **Oz terms to avoid**: "Ozzies", "Deploying an Oz", "The Oz Agent", "Oz is running", "AI agents"
+- **Oz terms to avoid**: "Oz agent", "Oz cloud agent", "Oz subagent", "Oz conversation", "Ozzies", "Deploying an Oz", "The Oz Agent", "Oz is running", "AI agents"
 - **Deprecated terminology**: "whitelist" (→ "allowlist"), "blacklist"/"blocklist" (→ "denylist")
 - **External product names**: "Github" (→ "GitHub"), "github actions" (→ "GitHub Actions"), "MacOS" (→ "macOS"), "A.I." (→ "AI")
 - **Unrecognized terms** (warning): Bolded terms that look like product names but aren't in `terminology.md`. Flags candidates for glossary addition — not errors, just suggestions.
@@ -65,15 +65,15 @@ When run with `--fix`:
 
 ## Relationship to validate_ui_refs
 
-This skill checks broader formatting and terminology. The `validate_ui_refs` skill validates UI paths and Command Palette names against the warp-internal codebase. They complement each other with no overlap. Both can run in scheduled Oz agent workflows.
+This skill checks broader formatting and terminology. The `validate_ui_refs` skill validates UI paths and Command Palette names against the warp-internal codebase. They complement each other with no overlap. Both can run in scheduled cloud agent workflows.
 
 ## Dependencies
 
 Requires Python 3.7+. Optional: `requests` (for Slack notifications), `gh` CLI (for PR creation).
 
 ## Cloud agent / scheduling
 
-For scheduled Oz cloud agent runs:
+For scheduled cloud agent runs:
 1. Configure the environment with the docs repo
 2. Set the `SLACK_BOT_TOKEN` secret in the environment (for `--slack-notify`)
 3. Run: `python3 .warp/skills/style_lint/style_lint.py --all --fix --create-pr --slack-notify`

.agents/skills/style_lint/style_lint.py

@@ -35,7 +35,7 @@
 # Feature names that are correctly Title Case (exceptions to sentence-case rule)
 PROPER_FEATURE_NAMES = {
     "Admin Panel", "Agent Management Panel", "Agent Mode", "Agent Profiles",
-    "Ambient Agents", "Auto-detection Mode", "Cloud Agent Credits",
+    "Auto-detection Mode", "Cloud Agent Credits", "Cloud Agents",
     "Codebase Context", "Code Review", "Command Palette", "Global Rules",
     "Oz CLI", "Oz Platform", "Project Rules", "Slash Commands",
     "Terminal Mode", "Universal Input", "Warp Drive", "Warp Platform",
@@ -70,11 +70,16 @@
 
 # Oz terms to avoid (case-insensitive patterns)
 OZ_TERMS_TO_AVOID = [
-    (r"\bOzzies\b", "Use 'Oz agents', 'instances', or 'Oz subagents'"),
-    (r"\bDeploying an Oz\b", "Use 'Deploying an Oz agent'"),
-    (r"\bThe Oz Agent\b", "Use 'An Oz agent' or 'A parent Oz agent'"),
-    (r"\bOz is running\b", "Use 'An Oz agent is running' or 'A run is in progress'"),
+    (r"\bOzzies\b", "Use 'agents', 'instances', or 'subagents'"),
+    (r"\bDeploying an Oz\b", "Use 'Deploying an agent'"),
+    (r"\bThe Oz Agent\b", "Use 'the agent' or 'the Warp Agent'"),
+    (r"\bOz is running\b", "Use 'An agent is running' or 'A run is in progress'"),
     (r"\bAI agents?\b", "Use 'agents' (the 'AI' prefix is redundant)"),
+    (r"\bOz cloud agents?\b", "Use 'cloud agent(s)'"),
+    (r"\bOz subagents?\b", "Use 'subagent(s)'"),
+    (r"\bOz conversation\b", "Use 'conversation'"),
+    (r"\bOz agents?\b", "Use 'agent(s)' or 'Warp Agent(s)' depending on context"),
+    (r"\b[Aa]mbient [Aa]gents?\b", "Use 'cloud agent(s)' — 'ambient' is no longer a product term"),
 ]
 
 # Action verbs that precede UI elements (should be bold, not backtick)
@@ -386,13 +391,23 @@ def check_product_casing(lines: List[str], filepath: str) -> List[Issue]:
 
 
 def check_oz_terms(lines: List[str], filepath: str) -> List[Issue]:
-    """Check for Oz terms to avoid."""
+    """Check for Oz terms to avoid.
+
+    Skips fenced code blocks and strips inline code (backtick-wrapped text)
+    so that legitimate CLI commands like `oz agent run` are not flagged.
+    """
     issues = []
+    in_code_block = False
     for i, line in enumerate(lines, 1):
-        if line.strip().startswith("```") or line.strip().startswith("`"):
+        if line.strip().startswith("```"):
+            in_code_block = not in_code_block
+            continue
+        if in_code_block:
             continue
+        # Strip inline code spans so `oz agent run` is not matched
+        prose_line = re.sub(r"`[^`]+`", "", line)
         for pattern, suggestion in OZ_TERMS_TO_AVOID:
-            for m in re.finditer(pattern, line, re.IGNORECASE):
+            for m in re.finditer(pattern, prose_line, re.IGNORECASE):
                 issues.append(Issue(
                     filepath, i, "oz-term",
                     f"Avoid \"{m.group(0)}\" → {suggestion}",

.agents/skills/sync-error-docs/references/error-page-template.md

@@ -60,7 +60,7 @@ This error is returned when:
 
 ## Related
 
-* [Oz Agent API & SDK](https://docs.warp.dev/reference/api-and-sdk/agent) — API reference
+* [Agent API & SDK](https://docs.warp.dev/reference/api-and-sdk/agent) — API reference
 * [Cloud Agents Overview](https://docs.warp.dev/agent-platform/cloud-agents/overview) — How cloud agents work
 ```
 

.agents/skills/validate_ui_refs/SKILL.md

@@ -135,7 +135,7 @@ The `--slack-notify` flag posts a summary to the configured Slack channel when u
 
 ### Intended behavior for scheduled runs
 
-When this skill is configured as a scheduled Oz agent, Slack notifications should alert the team in two cases:
+When this skill is configured as a scheduled cloud agent, Slack notifications should alert the team in two cases:
 
 1. **Auto-fixes applied** — the script found and corrected issues, and created a PR. The notification should include the PR link so the team can review and merge.
 2. **Unfixed issues remain** — some issues could not be auto-corrected (e.g., a renamed or removed section) and require manual attention. The notification should list these for triage.
@@ -162,7 +162,7 @@ python3 .warp/skills/validate_ui_refs/validate_ui_refs.py --all --slack-notify
 
 ## Cloud Agent / Scheduling
 
-For scheduled Oz cloud agent runs:
+For scheduled cloud agent runs:
 
 1. Configure the environment with the docs repo
 2. Keep `valid_paths.json` up-to-date by running `--refresh-valid-paths` as a pre-step (requires `warp-internal` in the environment)

.agents/templates/faq.md

@@ -1,7 +1,7 @@
 ---
 description: >-
   [1-2 sentences: what topic area these FAQs cover.
-  Example: "Answers to common questions about Oz cloud agents, billing, and environments."]
+  Example: "Answers to common questions about cloud agents, billing, and environments."]
 ---
 
 # [Title — sentence case. Title convention: "[Feature] FAQs" or "Frequently asked questions"]