docs: clarify team credit spend order and dedupe Factories changelog

src/content/docs/changelog/2026.mdx

@@ -99,7 +99,6 @@ Submit bugs and feature requests on our [GitHub board!](https://github.com/warpd
 
 **New features**
 
-* Warp Factories are now live in Early Access! Check out more details [here](https://www.warp.dev/blog/open-infrastructure-for-building-a-software-factory).
 * Added an inline `/usage` command to the Warp Agent CLI showing plan, credit usage, and billing links. ([#14968](https://github.com/warpdotdev/warp/pull/14968))
 
 **Bug fixes**
@@ -116,7 +115,6 @@ Submit bugs and feature requests on our [GitHub board!](https://github.com/warpd
 
 **New features**
 
-* Warp Factories is now live in Early Access! Read the [Warp Factories launch announcement](https://www.warp.dev/blog/open-infrastructure-for-building-a-software-factory) for more details.
 * Added an inline `/usage` command to the Warp Agent CLI showing plan, credit usage, and billing links. ([#14968](https://github.com/warpdotdev/warp/pull/14968))
 
 **Bug fixes**
@@ -133,7 +131,6 @@ Submit bugs and feature requests on our [GitHub board!](https://github.com/warpd
 
 **New features**
 
-* Warp Factories is now live in Early Access! Read the [Warp Factories announcement](https://www.warp.dev/blog/open-infrastructure-for-building-a-software-factory).
 * Warp now includes a built-in Factory MCP server for logged-in users.
 
 **Improvements**

src/content/docs/platform/team-access-billing-and-identity.mdx

@@ -221,7 +221,12 @@ How credits are consumed depends on how the agent run is triggered and authentic
 **User-triggered runs** (CLI with personal API key, Slack, Linear, or the Warp app):
 
 * Runs are tied to the triggering user's identity.
-* On Build, Max, and Business plans, credits are consumed starting with any [cloud agent credits](/support-and-community/plans-and-billing/credits/#compute-credits) allocated to the user, then the user's plan-included credits, then the team's shared add-on credit pool.
+* On Build, Max, and Business plans, Warp always drains credits in a fixed order — there is no setting to spend personal credits first while on a team:
+  1. The triggering user's plan-included monthly credits.
+  2. Shared bonus or add-on grants available to the active team (team-wide pool first).
+  3. Any remaining user-scoped bonus grants that apply on that team.
+     Leftover personal add-on balances from May–August 2026 are one example.
+     These are used only after shared grants are exhausted.
 * On Enterprise plans, runs draw from the team-scoped credit pool, per your Enterprise contract terms.
 
 **Agent API key and scheduled cloud agent runs** (fully automated workflows):
@@ -235,7 +240,7 @@ How credits are consumed depends on how the agent run is triggered and authentic
 For more details on creating and using API keys, see [API Keys](/reference/cli/api-keys/).
 
 :::note
-When a user triggers an agent via Slack or Linear, the run follows the standard credit precedence, starting with any credit grants specifically allocated for cloud agent usage. This applies even for integrations—as long as the triggering user's identity can be mapped to their Warp account.
+When a user triggers an agent via Slack or Linear, the run still follows that same order — plan-included credits first, then shared team grants, then any applicable user-scoped grants — as long as the triggering user's identity can be mapped to their Warp account.
 :::
 
 #### Who configures triggers and workflows
@@ -249,7 +254,7 @@ All triggers and instructions used by cloud agents are defined and controlled by
 
 Because triggers and instructions are configured by your team, the credits consumed when an agent runs are billed according to the model above:
 
-* **Build, Max, Business** - User-triggered runs draw from the triggering user's plan-included credits, then the team's shared add-on credit pool. Agent API key runs and scheduled cloud agent runs are billed to the team owner (the owner's plan-included credits, then the team's shared add-on credit pool, subject to the team-wide spend cap when auto-reload is on).
+* **Build, Max, Business** - User-triggered runs draw from the triggering user's plan-included credits, then shared team grants, then any remaining user-scoped grants. Agent API key runs and scheduled cloud agent runs are billed to the team owner (the owner's plan-included credits, then the team's shared add-on credit pool, subject to the team-wide spend cap when auto-reload is on).
 * **Enterprise** - All runs draw from the team-scoped credit pool, per your Enterprise contract terms.
 
 It's the team's responsibility to manage triggers, confirm they behave as intended, and monitor usage. Reviewing triggers, prompts, and agent behavior periodically helps ensure that credit usage aligns with expectations.

src/content/docs/reference/api-and-sdk/troubleshooting/errors/insufficient-credits.mdx

@@ -9,10 +9,10 @@ The `insufficient_credits` error occurs when the principal billed for a cloud ag
 
 On self-serve plans (Build, Max, Business), the billed principal depends on how the run was triggered:
 
-* **User-triggered runs** draw from the triggering user's plan-included credits first, then the team's shared add-on credit pool.
+* **User-triggered runs** draw from the triggering user's plan-included credits first, then shared team add-on grants, then any remaining user-scoped grants that apply on the active team. There is no option to spend personal credits first while on a team.
 * **Agent API key and scheduled runs** draw from the team owner's plan-included credits first, then the team's shared add-on credit pool.
 
-When both are depleted and [auto-reload](/support-and-community/plans-and-billing/add-on-credits/) is off, new runs return this error. On Enterprise plans, runs draw from the team-scoped credit pool per your contract — contact your account manager when the pool is exhausted.
+When those sources are depleted and [auto-reload](/support-and-community/plans-and-billing/add-on-credits/) is off, new runs return this error. On Enterprise plans, runs draw from the team-scoped credit pool per your contract — contact your account manager when the pool is exhausted.
 
 ---
 

src/content/docs/support-and-community/plans-and-billing/add-on-credits.mdx

@@ -79,11 +79,15 @@ When your monthly credit balance renews:
 2. After those are used, Warp continues to draw from any available add-on credits.
 3. If your add-on credits run out and auto-reload is enabled, Warp will automatically purchase more up to your monthly limit.
 
+On a team, that add-on step is also fixed: shared team grants drain before any
+remaining user-scoped grants. You cannot choose to spend personal credits first
+while on a team.
+
 You can track your remaining credits and spending in the credits transparency footer and in **Settings** > **Billing and usage**.
 
 #### Teams using add-on credits
 
-On self-serve plans (Free, Build, Max, and Business), add-on credits are shared across the team. Purchases from any member — manual or auto-reload — go into a single team-wide pool, and every member's usage draws from that pool once their plan-included credits are used up. One member's heavy usage can consume credits another member purchased; use the team-wide spend cap to limit what the team spends each month.
+On self-serve plans (Free, Build, Max, and Business), add-on credits are shared across the team. Purchases from any member — manual or auto-reload — go into a single team-wide pool, and every member's usage draws from that pool once their plan-included credits are used up. Any leftover user-scoped balances (from the May–August 2026 window) are used only after the shared pool is exhausted. One member's heavy usage can consume credits another member purchased; use the team-wide spend cap to limit what the team spends each month.
 
 Team admins manage add-on credit settings for the team in **Settings** > **Billing and usage**:
 

src/content/docs/support-and-community/plans-and-billing/pricing-faqs.mdx

@@ -152,9 +152,12 @@ Unused credits do not rollover to the next cycle and can't be transferred to oth
 
 On the multi-seat paid plans, plan-included credits are per-seat while add-on credits are shared across the team:
 
-* **Plan-included monthly credits** — Each seat receives its own monthly credit allowance that resets every 30 days based on the team's renewal date. See [Warp pricing](https://www.warp.dev/pricing) for the current per-seat allowance on your plan.
+* **Plan-included monthly credits** — Each seat receives its own monthly credit allowance that resets every 30 days based on the team's renewal date. See [Warp pricing](https://www.warp.dev/pricing) for the current per-seat allowance on your plan. Warp always consumes this allowance before any bonus or add-on grants.
 * **Add-on credits** — As of August 2026, [add-on credits](/support-and-community/plans-and-billing/add-on-credits/) purchased by any team member go into a single team-wide pool. Once a member's plan-included credits are used up, their usage draws from the shared pool — including credits another member purchased.
-* **User-scoped credits from May–August 2026** — Add-on credits purchased between May 21, 2026 and August 2026 were scoped to the purchasing member. Any remaining user-scoped balance stays attributed to that member and is consumed after the shared team pool.
+* **User-scoped credits from May–August 2026** — Add-on credits purchased between May 21, 2026 and August 2026 were scoped to the purchasing member. Any remaining user-scoped balance stays attributed to that member and is consumed only after shared team grants are exhausted. Personal grants are not blocked while you are on a team; they simply come after shared grants, and only when they apply to the active team.
+* **No personal-first option** — While you are on a team, you cannot spend
+  personal or user-scoped credits before the team's shared grants.
+  Team-first drawdown is intentional.
 * **Team-wide spend cap** — Admins set a single team-wide monthly spend cap that governs add-on credit purchases across the team. See [How does auto-reload work for teams?](#how-does-auto-reload-work-for-teams) below.
 
 Enterprise plans support team-scoped credit pools and per-user spend limits separately — see [enterprise billing](/enterprise/support-and-resources/billing/).
@@ -419,7 +422,7 @@ Add-on credit attribution has changed twice in 2026:
 
 * **Before May 21, 2026** — Add-on credits on multi-seat teams were pooled; every member drew from a single shared balance.
 * **May 21 – August 2026** — Add-on credits were user-scoped; each user had their own balance.
-* **As of August 2026** — Add-on credits are **team-pooled again**. Purchases from any member go into the team's shared pool, and any member's usage draws the pool down once their plan-included credits are used up. Remaining user-scoped balances from the May–August window stay attributed to the purchasing member and are consumed after the shared pool.
+* **As of August 2026** — Add-on credits are **team-pooled again**. Purchases from any member go into the team's shared pool, and any member's usage draws the pool down once their plan-included credits are used up. Remaining user-scoped balances from the May–August window stay attributed to the purchasing member and are consumed after the shared pool. There is no way to prefer personal credits first while on a team.
 
 Anyone on the team can purchase add-on credits, subject to the team-wide spend cap admins set under **Settings** > **Billing and usage**.