Merge branch 'main' into docs-chatbot

MaedahBatool · web-flow · commit ab6065ecc6c6 · 2025-03-20T15:13:20.000-07:00
diff --git a/docs/admin/executors/executor_secrets.mdx b/docs/admin/executors/executor_secrets.mdx
@@ -16,7 +16,7 @@ There are two types of secrets:
 
 - **Namespaced secrets**
 
-  These secrets are set either in org or user settings and are only usable by the user or org members in their respective namespaces. If a namespaced secret has the same name as a global secret, the namespaced secret is preferred.
+  These secrets are set either in org or user settings and are only usable by the user or org members in their respective namespaces. For example, user-specific executor secrets apply only to batch changes within the user's namespace. If you've created a server-side batch spec under an organization or a different namespace, ensure the secret is defined under `/organizations/{org-namespace}/settings/executors/secrets`. If a namespaced secret has the same name as a global secret, the namespaced secret is preferred.
 
 Examples:
 
diff --git a/docs/admin/pricing.mdx b/docs/admin/pricing.mdx
diff --git a/docs/cody/usage-and-pricing.mdx b/docs/cody/usage-and-pricing.mdx
@@ -1,10 +1,11 @@
-# Cody Pricing
+# Cody Pricing Plans
 
 <p className="subtitle">Learn about the different plans available for Cody.</p>
 
 Cody provides three subscription plans: **Free**, **Pro**, and **Enterprise**. Each plan is aimed to cater to a diverse range of users, from individual projects to large-scale enterprises. Cody Free includes basic features, while the Pro and Enterprise plans offer additional advanced features and resources to meet varying user requirements.
 
-## Free
+<Tabs>
+  <Tab title="Free">
 
 The free plan is designed for individuals to get started with Cody. It comes with a set of features to enhance your coding experience. It includes **unlimited autocompletion suggestions** per month, covering both whole and multi-line suggestions. You also get **200 chats/prompts** per month with access to creating custom prompts.
 
@@ -33,7 +34,9 @@ To upgrade from Cody Free to Pro:
 
 Once your Pro subscription is confirmed, click **My subscription** to manage and view your activation details, or click **Dashboard** for the overall view.
 
-## Pro
+</Tab>
+
+<Tab title="Pro">
 
 Cody Pro, designed for individuals or small teams at **$9 per user per month**, offers an enhanced coding experience beyond the free plan. It provides unlimited autocompletion suggestions plus increased limits for chat and prompts. It also uses local repository context to enhance Cody's understanding and accuracy.
 
@@ -92,12 +95,46 @@ Cody Pro users can also switch to the Enterprise Starter plan for **$19 per user
 
 Read more about the [Enterprise Starter plan](/pricing/enterprise-starter).
 
-## Enterprise
+</Tab>
+
+<Tab title="Enterprise">
 
 Cody Enterprise is designed for enterprises prioritizing security and administrative controls. We offer either seat-based or token based pricing models, depending on what makes most sense for your organization. You get Claude Haiku 3.5 and Claude Sonnet 3.5 as the default LLM models without extra cost. You also get additional capabilities like BYOLLM (Bring Your Own LLM), supporting Single-Tenant and Self Hosted setups for flexible coding environments.
 
 Security features include SAML/SSO for enhanced authentication and guardrails to enforce coding standards. Cody Enterprise supports advanced Code Graph context and multi-code host context for a deeper understanding of codebases, especially in complex projects. With 24/5 enhanced support, Cody Enterprise ensures timely assistance.
 
+## Billing FAQs for Cody Enterprise
+
+### How are active users calculated for Cody?
+
+### Billable active users
+
+<Callout type="note">This only applies to Enterprise Cody users. Cody Pro users pay for a seat every month, regardless of usage.</Callout>
+
+A billable active Cody user is signed in to their Enterprise Sourcegraph account and actively interacts with Cody (for example, they see suggested autocompletions, run commands, or chat with Cody, they start new discussions, clear chat history, or copy text from chats. They change Cody's settings and more).
+
+Having Cody installed and signing in is not enough to be considered a billable user.
+
+Specific categories of user actions that qualify as active Cody usage for billing include, but are not limited to:
+
+- Signing in to Cody in an editor
+- Seeing suggested autocompletions and/or accepting/rejecting them
+- Running commands or chatting with Cody
+- Starting new chats, clearing chat history, copying text from chats or otherwise interacting with the Cody chat interface in the editor or on the web
+- Adding or changing context in a Cody chat interface or changing models
+- Interacting with Cody tutorials
+- Changing Cody personal or team settings
+
+### Authenticated users
+
+An authenticated Cody user is authenticated (or signed in) to Cody in their editor within a given time period. This includes all users who interact with Cody on the web.
+
+Authenticated users are a superset of [billable users](#billable-active-users) defined above. They include users who are signed in but do not actively engage with Cody.
+
+</Tab>
+
+</Tabs>
+
 ## Plans Comparison
 
 The following table shows a high-level comparison of the three plans available on Cody.
diff --git a/docs/pricing/faqs.mdx b/docs/pricing/faqs.mdx
@@ -56,6 +56,25 @@ Pro and Enterprise Starter plans are billed monthly and can be paid with a credi
 
 ‍A billable user is one who is signed in to their Enterprise account and actively interacts with the product (e.g., they see suggested autocompletions, run commands or chat with Cody, start new discussions, clear chat history, or copy text from chats, change settings, and more). Simply having Cody installed is not enough to be considered a billable user.
 
+## How are active users calculated for Sourcegraph Code Search and Code Intelligence Platform?
+
+A billable active Code Search or Code Intelligence Platform user is signed into and accesses Sourcegraph. This includes but is not limited to:
+
+- Visiting the Sourcegraph web application or using a browser extension, editor extension, or other client while signed in
+- Conducting a search in the Sourcegraph UI or extension
+- Hovering and navigating code in the Sourcegraph UI or extension
+- Viewing a file or repository in Sourcegraph
+- Creating, viewing, or receiving a code monitor
+- Creating, viewing, modifying, or applying a batch change
+- Creating, viewing, or modifying a code insight
+- Creating, viewing, or modifying a search notebook
+
+## How is this measured in the product?
+
+A user who has accessed a Sourcegraph product is counted as active once they complete an action that represents usage reflected above.
+
+User counts and usage metrics are in [Sourcegraph Analytics](../analytics).
+
 ## Is my data secure when connected to Code Search?
 
 Sourcegraph has security and reliability controls built for the most demanding enterprises. To learn more, see our [Security page](https://sourcegraph.netlify.app/security).
diff --git a/docs/pricing/plans/index.mdx b/docs/pricing/plans/index.mdx
@@ -0,0 +1,9 @@
+# Sourcegraph Pricing Plans
+
+<p className= "subtitle">Sourcegraph offers three different pricing plans based on your needs.</p>
+
+ <ProductCards>
+<ProductCard href="/pricing/plans/free" imgSrc="https://storage.googleapis.com/sourcegraph-assets/Docs/sg-new-logo.svg" imgAlt="Free" title="Free" description="Sourcegraph Free plan for hobbyists, and light usage." />
+<ProductCard href="/pricing/plans/enterprise-starter" imgSrc="https://storage.googleapis.com/sourcegraph-assets/Docs/sg-new-logo.svg" imgAlt="Enterprise Starter" title="Enterprise Starter" description="Enterprise Starter is for individuals and small teams." />
+<ProductCard href="/pricing/plans/enterprise" imgSrc="https://storage.googleapis.com/sourcegraph-assets/Docs/sg-new-logo.svg" imgAlt="Enterprise" title="Enterprise" description="Enterprise is for large teams, enterprises and complex deployments." />
+</ProductCards>
diff --git a/src/data/navigation.ts b/src/data/navigation.ts
@@ -256,7 +256,6 @@ export const navigation: NavigationItem[] = [
 						title: "Enterprise Getting Started",
 						href: "/admin/enterprise_getting_started_guide",
 					},
-					{ title: "Pricing", href: "/admin/pricing" },
 				],
 			},
 			{
@@ -319,7 +318,7 @@ export const navigation: NavigationItem[] = [
 		topics: [
 			{
 				title: "Plans",
-				href: "/pricing/plans/free",
+				href: "/pricing/plans",
 				sections: [
 					{ title: "Free", href: "/pricing/plans/free" },
 					{ title: "Enterprise Starter", href: "/pricing/plans/enterprise-starter" },
diff --git a/src/data/redirects.ts b/src/data/redirects.ts
@@ -6760,6 +6760,25 @@ const redirectsData = [
     permanent: true
   },
 
+  // Admin pricing docs redirects
+  {
+    source: "/admin/pricing",
+    destination: "/pricing/plans",
+    permanent: true
+  },
+
+  {
+    source: "/admin/pricing#how-are-active-users-calculated-for-sourcegraph-cody",
+    destination: "/cody/usage-and-pricing#billing-faqs-for-cody-enterprise",
+    permanent: true
+  },
+
+  {
+    source: "/admin/pricing#how-are-active-users-calculated-for-sourcegraph-code-search-and-code-intelligence-platform",
+    destination: "/pricing/faqs#how-are-active-users-calculated-for-sourcegraph-code-search-and-code-intelligence-platform",
+    permanent: true
+  },
+
 
 ];
 
