The open-source app everyone uses to manage agents at work
TypeScript acpxagent-orchestrationagent-skillsagentic-aiai-agentsai-engineeringai-governanceai-toolsautonomous-agentsclaudeclaude-codeclaude-skillscodexhermesllmmcpmulti-agentopenclawproject-managementworkflow-automation
copy: unify user-facing "company" wording to "organization" (#12243)
scotttong4d82f5eaea81
diff --git a/README.md b/README.mdindex 5541a858b8..cea39e55c8 100644--- a/README.md+++ b/README.md@@ -67,7 +67,7 @@ It looks like a task manager. Under the hood: org charts, budgets, governance, g## Paperclip is right for you if-- ✅ You want to build **autonomous AI companies**+- ✅ You want to build **autonomous AI organizations**- ✅ You **coordinate many different agents** (OpenClaw, Codex, Claude, Cursor) toward a common goal- ✅ You have **20 simultaneous Claude Code terminals** open and lose track of what everyone is doing- ✅ You want agents running **autonomously 24/7**, but still want to audit work and chime in when needed@@ -106,7 +106,7 @@ Any agent, any runtime, one org chart. If it can receive a heartbeat, it's hired</td><td align="center" width="33%"><h3>🎯 Goal Alignment</h3>-Every task traces back to the company mission. Agents know <em>what</em> to do and <em>why</em>.+Every task traces back to the organization mission. Agents know <em>what</em> to do and <em>why</em>.</td><td align="center" width="33%"><h3>💓 Heartbeats</h3>@@ -119,8 +119,8 @@ Agents wake on a schedule, check work, and act. Delegation flows up and down theMonthly budgets per agent. When they hit the limit, they stop. No runaway costs.</td><td align="center">-<h3>🏢 Multi-Company</h3>-One deployment, many companies. Complete data isolation. One control plane for your portfolio.+<h3>🏢 Multi-Organization</h3>+One deployment, many organizations. Complete data isolation. One control plane for your portfolio.</td><td align="center"><h3>🎫 Ticket System</h3>@@ -170,7 +170,7 @@ Paperclip handles the hard orchestration details correctly.| **Governance with rollback.** | Approval gates are enforced, config changes are revisioned, and bad changes can be rolled back safely. || **Goal-aware execution.** | Tasks carry full goal ancestry so agents consistently see the "why," not just a title. || **Portable company templates.** | Export/import orgs, agents, and skills with secret scrubbing and collision handling. |-| **True multi-company isolation.** | Every entity is company-scoped, so one deployment can run many companies with separate data and audit trails. |+| **True multi-organization isolation.** | Every entity is company-scoped, so one deployment can run many companies with separate data and audit trails. |<br/>diff --git a/doc/CLI.md b/doc/CLI.mdindex f01291b299..aa6a0ad616 100644--- a/doc/CLI.md+++ b/doc/CLI.md@@ -297,7 +297,7 @@ npx paperclipai context set --api-key-env-var-name PAPERCLIP_API_KEYexport PAPERCLIP_API_KEY=...```-## Company Commands+## Organization Commands```shnpx paperclipai company list@@ -633,7 +633,7 @@ npx paperclipai skills install paperclipai:optional:browser:agent-browser --compExternal GitHub, skills.sh, local-path, and URL sources still go through`skills import`; catalog commands are for the app-shipped catalog only.-### Company library+### Organization library```shnpx paperclipai skills list --company-id <company-id>@@ -762,7 +762,7 @@ bootstrap credentials in Paperclip secrets.Per-company provider vaults (multiple vault instances per provider, defaultvault selection, coming-soon GCP/Vault) can be configured from the board UI under-`Company Settings → Secrets → Provider vaults` or through the provider-config CLI+`Organization Settings → Secrets → Provider vaults` or through the provider-config CLIcommands above. See the[secrets deploy guide](../docs/deploy/secrets.md#provider-vaults) and[API reference](../docs/api/secrets.md#provider-vaults) for the contract.diff --git a/docs/deploy/secrets.md b/docs/deploy/secrets.mdindex c589eacf2c..3823079578 100644--- a/docs/deploy/secrets.md+++ b/docs/deploy/secrets.md@@ -254,7 +254,7 @@ default provider — no migration is required.### Where to configure-Open `Company Settings → Secrets` in the board UI and switch to the+Open `Organization Settings → Secrets` in the board UI and switch to the`Provider vaults` tab. From there you can:- Create a vault for any supported provider family.diff --git a/docs/start/core-concepts.md b/docs/start/core-concepts.mdindex 6709e8a8c2..ad65b6881f 100644--- a/docs/start/core-concepts.md+++ b/docs/start/core-concepts.md@@ -5,9 +5,9 @@ summary: Companies, agents, issues, delegation, heartbeats, and governancePaperclip organizes autonomous AI work around six key concepts.-## Company+## Organization-A company is the top-level unit of organization. Each company has:+An organization is the top-level unit in Paperclip. Each organization has:- A **goal** — the reason it exists (e.g. "Build the #1 AI note-taking app at $1M MRR")- **Employees** — every employee is an AI agentdiff --git a/tests/e2e/conference-room-typing-intro.spec.ts b/tests/e2e/conference-room-typing-intro.spec.tsindex b69f9a6a16..0935ebc0a2 100644--- a/tests/e2e/conference-room-typing-intro.spec.ts+++ b/tests/e2e/conference-room-typing-intro.spec.ts@@ -69,7 +69,7 @@ async function runOnboardingWizard(page: Page, companyName: string) {if (await startBtn.count()) await startBtn.first().click();// Step 0: front door (skipped when the wizard opens on the create path).- const frontDoor = page.getByText("Build a new company");+ const frontDoor = page.getByText("Build a new organization");if (await frontDoor.count()) await frontDoor.first().click();// Step 1: company name.diff --git a/tests/e2e/nux-phase4-screenshots.spec.ts b/tests/e2e/nux-phase4-screenshots.spec.tsindex cf3da3e3a6..e18b5a5b8f 100644--- a/tests/e2e/nux-phase4-screenshots.spec.ts+++ b/tests/e2e/nux-phase4-screenshots.spec.ts@@ -33,7 +33,7 @@ function shot(name: string) {async function openWizard(page: import("@playwright/test").Page) {await page.goto("/onboarding");- const startBtn = page.getByRole("button", { name: /Start Onboarding|New Company|Add Agent/ });+ const startBtn = page.getByRole("button", { name: /Start Onboarding|New Organization|Add Agent/ });if (await startBtn.count()) {await startBtn.first().click();}@@ -61,7 +61,7 @@ test.describe("NUX Phase 4 visual QA", () => {await openWizard(page);// Front door shows when the wizard doesn't open directly on the create// path (e.g. another spec already created a company on this instance).- const createCard = page.getByRole("button", { name: /Build a new company/ });+ const createCard = page.getByRole("button", { name: /Build a new organization/ });if (await createCard.count()) {await createCard.first().click();}@@ -101,7 +101,7 @@ test.describe("NUX Phase 4 visual QA", () => {page.getByRole("heading", { name: "Welcome to Paperclip" }),).toBeVisible({ timeout: 10_000 });await expect(- page.getByRole("heading", { name: "Build a new company" }),+ page.getByRole("heading", { name: "Build a new organization" }),).toBeVisible();await expect(page.getByRole("heading", { name: "Add agents to your org" }),@@ -131,7 +131,7 @@ test.describe("NUX Phase 4 visual QA", () => {// Composer renders once a company is selected. (Regression guard for the// Rules-of-Hooks crash that previously blanked this page — see PAP-50.)await expect(- page.getByPlaceholder("Ask anything about your company..."),+ page.getByPlaceholder("Ask anything about your organization..."),).toBeVisible({ timeout: 20_000 });await page.waitForTimeout(2_000); // let welcome bubble + suggestion chips stage inawait page.screenshot({ path: shot("06-board-chat.png") });diff --git a/tests/e2e/onboarding.spec.ts b/tests/e2e/onboarding.spec.tsindex d7819493fd..0755e6aade 100644--- a/tests/e2e/onboarding.spec.ts+++ b/tests/e2e/onboarding.spec.ts@@ -41,12 +41,12 @@ test.describe("Onboarding wizard", () => {// The wizard may open on a launcher card or directly on the capsule// wizard; the front door (step 0) requires a click into the create path.const startBtn = page.getByRole("button", {- name: /Start Onboarding|New Company|Add Agent/,+ name: /Start Onboarding|New Organization|Add Agent/,});if (await startBtn.count()) {await startBtn.first().click();}- const createCard = page.getByRole("button", { name: /Build a new company/ });+ const createCard = page.getByRole("button", { name: /Build a new organization/ });if (await createCard.count()) {await createCard.first().click();}diff --git a/tests/e2e/planning-mode-visual-verification.spec.ts b/tests/e2e/planning-mode-visual-verification.spec.tsindex 1c8978c2e8..d3a69bf1f8 100644--- a/tests/e2e/planning-mode-visual-verification.spec.ts+++ b/tests/e2e/planning-mode-visual-verification.spec.ts@@ -48,10 +48,10 @@ test("captures planning mode UI for desktop and mobile", async ({ page }) => {});await page.goto("/onboarding");- const startBtn = page.getByRole("button", { name: /Start Onboarding|New Company|Add Agent/ });+ const startBtn = page.getByRole("button", { name: /Start Onboarding|New Organization|Add Agent/ });if (await startBtn.count()) await startBtn.first().click();- const createCard = page.getByRole("button", { name: /Build a new company/ });+ const createCard = page.getByRole("button", { name: /Build a new organization/ });if (await createCard.count()) await createCard.first().click();await expect(page.getByRole("heading", { name: "What is the name of your organization?" })).toBeVisible({ timeout: 15_000 });diff --git a/ui/src/App.activity-routing.test.tsx b/ui/src/App.activity-routing.test.tsxindex 5a7e5ce7de..55eb7abb30 100644--- a/ui/src/App.activity-routing.test.tsx+++ b/ui/src/App.activity-routing.test.tsx@@ -141,7 +141,7 @@ describe("App Activity routing (PAP-16302)", () => {it("serves the merged Activity page at /:company/activity", async () => {const root = renderAppAt(container, "/PAP/activity");await waitForRoute(container, "ACTIVITY_PAGE@/PAP/activity");- expect(container.textContent).not.toContain("No company matches prefix");+ expect(container.textContent).not.toContain("No organization matches prefix");flushSync(() => root.unmount());});@@ -169,7 +169,7 @@ describe("App Activity routing (PAP-16302)", () => {it("redirects the bare /audit deep link through to the prefixed Activity page", async () => {const root = renderAppAt(container, "/audit");await waitForRoute(container, "ACTIVITY_PAGE@/PAP/activity?mode=agents");- expect(container.textContent).not.toContain("No company matches prefix");+ expect(container.textContent).not.toContain("No organization matches prefix");flushSync(() => root.unmount());});});diff --git a/ui/src/App.cases-routing.test.tsx b/ui/src/App.cases-routing.test.tsxindex 7a85e81981..dc110a1307 100644--- a/ui/src/App.cases-routing.test.tsx+++ b/ui/src/App.cases-routing.test.tsx@@ -132,14 +132,14 @@ describe("App Cases routing (PAP-13002)", () => {it("redirects unprefixed /cases to the company-prefixed list page", async () => {const root = await renderAppAt(container, "/cases");await waitForRoute(container, "CASES_LIST_PAGE");- expect(container.textContent).not.toContain("No company matches prefix");+ expect(container.textContent).not.toContain("No organization matches prefix");flushSync(() => root.unmount());});it("redirects unprefixed /cases/:id to the company-prefixed detail page", async () => {const root = await renderAppAt(container, "/cases/PAP-C5");await waitForRoute(container, "CASE_DETAIL_PAGE");- expect(container.textContent).not.toContain("No company matches prefix");+ expect(container.textContent).not.toContain("No organization matches prefix");flushSync(() => root.unmount());});});diff --git a/ui/src/App.test.tsx b/ui/src/App.test.tsxindex 920f192baf..020c2c0eb2 100644--- a/ui/src/App.test.tsx+++ b/ui/src/App.test.tsx@@ -115,9 +115,9 @@ describe("CloudAccessGate", () => {});const root = renderGate(container);- await waitForText(container, "No company access");+ await waitForText(container, "No organization access");- expect(container.textContent).toContain("No company access");+ expect(container.textContent).toContain("No organization access");expect(container.textContent).not.toContain("Outlet content");unmountRoot(root);@@ -141,7 +141,7 @@ describe("CloudAccessGate", () => {await waitForText(container, "Outlet content");expect(container.textContent).toContain("Outlet content");- expect(container.textContent).not.toContain("No company access");+ expect(container.textContent).not.toContain("No organization access");unmountRoot(root);});diff --git a/ui/src/App.tsx b/ui/src/App.tsxindex 4e9d9fcee9..5e6b326c48 100644--- a/ui/src/App.tsx+++ b/ui/src/App.tsx@@ -463,13 +463,13 @@ export function OnboardingRoutePage() {const title = matchedCompany? `Add another agent to ${matchedCompany.name}`: companies.length > 0- ? "Create another company"- : "Create your first company";+ ? "Create another organization"+ : "Create your first organization";const description = matchedCompany- ? "Run onboarding again to add an agent and a starter task for this company."+ ? "Run onboarding again to add an agent and a starter task for this organization.": companies.length > 0- ? "Run onboarding again to create another company and seed its first agent."- : "Get started by creating a company and your first agent.";+ ? "Run onboarding again to create another organization and seed its first agent."+ : "Get started by creating an organization and your first agent.";return (<div className="mx-auto max-w-xl py-10">@@ -588,10 +588,10 @@ function NoCompaniesStartPage() {<div className="mx-auto max-w-xl py-10"><div className="rounded-lg border border-border bg-card p-6"><h1 className="text-xl font-semibold">- {t("app.noCompanies.title", { defaultValue: "Create your first company" })}+ {t("app.noCompanies.title", { defaultValue: "Create your first organization" })}</h1><p className="mt-2 text-sm text-muted-foreground">- {t("app.noCompanies.description", { defaultValue: "Get started by creating a company." })}+ {t("app.noCompanies.description", { defaultValue: "Get started by creating an organization." })}</p><div className="mt-4">{/* Same as the onboarding route: no Cloud origin means nowhere to@@ -611,7 +611,7 @@ function NoCompaniesStartPage() {: openOnboarding()}>- {t("app.noCompanies.newCompany", { defaultValue: "New Company" })}+ {t("app.noCompanies.newCompany", { defaultValue: "New Organization" })}</Button>)}</div>diff --git a/ui/src/adapters/claude-local/config-fields.tsx b/ui/src/adapters/claude-local/config-fields.tsxindex ab546ebbb5..d0604b79ab 100644--- a/ui/src/adapters/claude-local/config-fields.tsx+++ b/ui/src/adapters/claude-local/config-fields.tsx@@ -167,7 +167,7 @@ export function ClaudeLocalAdvancedFields({</Field><Fieldlabel="ACP state directory"- hint="Optional ACP session state directory. Defaults to Paperclip-managed company/agent scoped storage."+ hint="Optional ACP session state directory. Defaults to Paperclip-managed organization/agent scoped storage."><div className="flex items-center gap-2"><DraftInputdiff --git a/ui/src/adapters/codex-local/config-fields.tsx b/ui/src/adapters/codex-local/config-fields.tsxindex 99dd7c0c92..0b724ceb8e 100644--- a/ui/src/adapters/codex-local/config-fields.tsx+++ b/ui/src/adapters/codex-local/config-fields.tsx@@ -144,7 +144,7 @@ export function CodexLocalConfigFields({</Field><Fieldlabel="ACP state directory"- hint="Optional ACP session state directory. Defaults to Paperclip-managed company/agent scoped storage."+ hint="Optional ACP session state directory. Defaults to Paperclip-managed organization/agent scoped storage."><div className="flex items-center gap-2"><DraftInputdiff --git a/ui/src/adapters/gemini-local/config-fields.tsx b/ui/src/adapters/gemini-local/config-fields.tsxindex df7d3d58d8..62149b7946 100644--- a/ui/src/adapters/gemini-local/config-fields.tsx+++ b/ui/src/adapters/gemini-local/config-fields.tsx@@ -109,7 +109,7 @@ export function GeminiLocalConfigFields({</Field><Fieldlabel="ACP state directory"- hint="Optional ACP session state directory. Defaults to Paperclip-managed company/agent scoped storage."+ hint="Optional ACP session state directory. Defaults to Paperclip-managed organization/agent scoped storage."><div className="flex items-center gap-2"><DraftInputdiff --git a/ui/src/components/AgentConfigForm.tsx b/ui/src/components/AgentConfigForm.tsxindex a065b6d8b7..d95193a1d1 100644--- a/ui/src/components/AgentConfigForm.tsx+++ b/ui/src/components/AgentConfigForm.tsx@@ -323,7 +323,7 @@ export function AgentConfigForm(props: AgentConfigFormProps) {);const createSecret = useMutation({mutationFn: (input: { name: string; value: string }) => {- if (!selectedCompanyId) throw new Error("Select a company to create secrets");+ if (!selectedCompanyId) throw new Error("Select an organization to create secrets");return secretsApi.create(selectedCompanyId, input);},onSuccess: () => {@@ -334,7 +334,7 @@ export function AgentConfigForm(props: AgentConfigFormProps) {const uploadMarkdownImage = useMutation({mutationFn: async ({ file, namespace }: { file: File; namespace: string }) => {- if (!selectedCompanyId) throw new Error("Select a company to upload images");+ if (!selectedCompanyId) throw new Error("Select an organization to upload images");return assetsApi.uploadImage(selectedCompanyId, file, namespace);},});@@ -711,7 +711,7 @@ export function AgentConfigForm(props: AgentConfigFormProps) {: ["agents", "none", "detect-model", adapterType],queryFn: () => {if (!selectedCompanyId) {- throw new Error("Select a company to detect the model");+ throw new Error("Select an organization to detect the model");}return agentsApi.detectModel(selectedCompanyId, adapterType);},@@ -867,7 +867,7 @@ export function AgentConfigForm(props: AgentConfigFormProps) {const testEnvironment = useMutation({mutationFn: async () => {if (!selectedCompanyId) {- throw new Error("Select a company to test adapter environment");+ throw new Error("Select an organization to test adapter environment");}const flushedEnv = flushEnvironmentDraft();const adapterConfigPatch = flushedEnv ? { env: flushedEnv } : undefined;@@ -1052,7 +1052,7 @@ export function AgentConfigForm(props: AgentConfigFormProps) {(!loginNeedsPty || providerSupportsLoginPty);const runEnvironmentTest = useCallback(async () => {if (!selectedCompanyId) {- throw new Error("Select a company to test adapter environment");+ throw new Error("Select an organization to test adapter environment");}setTestActionPending(true);setTestActionError(null);@@ -1454,7 +1454,7 @@ export function AgentConfigForm(props: AgentConfigFormProps) {) : (<div className="rounded-md border border-amber-500/25 bg-amber-500/10 px-3 py-2 text-xs text-amber-800 dark:text-amber-200">This instance requires the Kubernetes sandbox, but no managed Kubernetes- environment is available for this company yet. Configure one before creating+ environment is available for this organization yet. Configure one before creatingagents; execution will not fall back to local.</div>)}diff --git a/ui/src/components/AppsSidebar.tsx b/ui/src/components/AppsSidebar.tsxindex f339f8e9bc..882e969b7a 100644--- a/ui/src/components/AppsSidebar.tsx+++ b/ui/src/components/AppsSidebar.tsx@@ -57,7 +57,7 @@ export function AppsSidebar() {className="flex items-center gap-1.5 rounded-md px-2 py-1 text-xs text-muted-foreground transition-colors hover:bg-accent/50 hover:text-foreground"><ChevronLeft className="h-3.5 w-3.5 shrink-0" />- <span className="truncate">{selectedCompany?.name ?? "Company"}</span>+ <span className="truncate">{selectedCompany?.name ?? "Organization"}</span></Link><div className="flex items-center gap-2 px-2 py-1"><AppWindow className="h-4 w-4 text-muted-foreground shrink-0" />diff --git a/ui/src/components/BootstrapPendingPage.tsx b/ui/src/components/BootstrapPendingPage.tsxindex 6724a5dff0..b2d4885267 100644--- a/ui/src/components/BootstrapPendingPage.tsx+++ b/ui/src/components/BootstrapPendingPage.tsx@@ -100,7 +100,7 @@ export function BootstrapPendingPage({<div><h1 className="text-xl font-semibold">You're the instance admin</h1><p className="mt-2 text-sm text-muted-foreground">- Setup is complete. Taking you to onboarding to create your first company...+ Setup is complete. Taking you to onboarding to create your first organization...</p></div></div>diff --git a/ui/src/components/CloudAccessGate.tsx b/ui/src/components/CloudAccessGate.tsxindex 960533875a..7b47cb854c 100644--- a/ui/src/components/CloudAccessGate.tsx+++ b/ui/src/components/CloudAccessGate.tsx@@ -13,13 +13,13 @@ function NoBoardAccessPage() {return (<div className="mx-auto max-w-xl py-10"><Card className="block p-6">- <h1 className="text-xl font-semibold">No company access</h1>+ <h1 className="text-xl font-semibold">No organization access</h1><p className="mt-2 text-sm text-muted-foreground">- This account is signed in, but it does not have an active company membership or instance-admin access on+ This account is signed in, but it does not have an active organization membership or instance-admin access onthis Paperclip instance.</p><p className="mt-2 text-sm text-muted-foreground">- Use a company invite or sign in with an account that already belongs to this org.+ Use an organization invite or sign in with an account that already belongs to this org.</p></Card></div>diff --git a/ui/src/components/CompanySettingsSidebar.tsx b/ui/src/components/CompanySettingsSidebar.tsxindex 2f9e7abaaa..368715fcb4 100644--- a/ui/src/components/CompanySettingsSidebar.tsx+++ b/ui/src/components/CompanySettingsSidebar.tsx@@ -94,7 +94,7 @@ export function CompanySettingsSidebar() {className="flex items-center gap-1.5 rounded-md px-2 py-1 text-xs text-muted-foreground transition-colors hover:bg-accent/50 hover:text-foreground"><ChevronLeft className="h-3.5 w-3.5 shrink-0" />- <span className="truncate">{selectedCompany?.name ?? "Company"}</span>+ <span className="truncate">{selectedCompany?.name ?? "Organization"}</span></Link></div>diff --git a/ui/src/components/CompanySwitcher.tsx b/ui/src/components/CompanySwitcher.tsxindex 9882d53be2..64fbe7d245 100644--- a/ui/src/components/CompanySwitcher.tsx+++ b/ui/src/components/CompanySwitcher.tsx@@ -50,14 +50,14 @@ export function CompanySwitcher({ open: controlledOpen, onOpenChange }: CompanyS<span className={`h-2 w-2 rounded-full shrink-0 ${statusDotColor(selectedCompany.status)}`} />)}<span className="text-sm font-medium truncate">- {selectedCompany?.name ?? "Select company"}+ {selectedCompany?.name ?? "Select organization"}</span></div><ChevronsUpDown className="h-3.5 w-3.5 shrink-0 text-muted-foreground" /></Button></DropdownMenuTrigger><DropdownMenuContent align="start" className="w-(--sz-220px)">- <DropdownMenuLabel>Companies</DropdownMenuLabel>+ <DropdownMenuLabel>Organizations</DropdownMenuLabel><DropdownMenuSeparator />{sidebarCompanies.map((company) => (<DropdownMenuItem@@ -75,7 +75,7 @@ export function CompanySwitcher({ open: controlledOpen, onOpenChange }: CompanyS// give the customer the way out, since nothing else in the app does.companyListUnavailable ? (<>- <DropdownMenuItem disabled>Couldn't load companies</DropdownMenuItem>+ <DropdownMenuItem disabled>Couldn't load organizations</DropdownMenuItem><DropdownMenuItemonSelect={(event) => {// Keep the menu open so the result of the retry is visible.@@ -88,7 +88,7 @@ export function CompanySwitcher({ open: controlledOpen, onOpenChange }: CompanyS</DropdownMenuItem></>) : (- <DropdownMenuItem disabled>No companies</DropdownMenuItem>+ <DropdownMenuItem disabled>No organizations</DropdownMenuItem>))}<DropdownMenuSeparator />@@ -101,7 +101,7 @@ export function CompanySwitcher({ open: controlledOpen, onOpenChange }: CompanyS<DropdownMenuItem asChild><Link to="/companies" className="no-underline text-inherit"><Plus className="h-4 w-4 mr-2" />- Manage Companies+ Manage Organizations</Link></DropdownMenuItem></DropdownMenuContent>diff --git a/ui/src/components/ConfigureBuiltInAgentModal.tsx b/ui/src/components/ConfigureBuiltInAgentModal.tsxindex 3931474e47..79e29131f8 100644--- a/ui/src/components/ConfigureBuiltInAgentModal.tsx+++ b/ui/src/components/ConfigureBuiltInAgentModal.tsx@@ -158,7 +158,7 @@ export function ConfigureBuiltInAgentModal({<div className="space-y-4"><InlineBanner tone="info" compact>Creates <strong>{definition.displayName}</strong> in your roster, badged{" "}- <strong>Built-in</strong>. Companies that require hire approval will queue this for the+ <strong>Built-in</strong>. Organizations that require hire approval will queue this for theboard.</InlineBanner>diff --git a/ui/src/components/FeedCard.tsx b/ui/src/components/FeedCard.tsxindex 099071969a..614f299b34 100644--- a/ui/src/components/FeedCard.tsx+++ b/ui/src/components/FeedCard.tsx@@ -115,13 +115,13 @@ function formatVerb(case "goal.deleted":return "deleted goal";case "company.created":- return "created company";+ return "created organization";case "company.updated":- return "updated company";+ return "updated organization";case "company.archived":- return "archived company";+ return "archived organization";case "company.budget_updated":- return "updated company budget";+ return "updated organization budget";default:return action.replace(/[._]/g, " ");diff --git a/ui/src/components/FrontDoor.tsx b/ui/src/components/FrontDoor.tsxindex 24345fa7f9..9986ed2bdf 100644--- a/ui/src/components/FrontDoor.tsx+++ b/ui/src/components/FrontDoor.tsx@@ -30,7 +30,7 @@ export function FrontDoor({ onChoose }: FrontDoorProps) {<Rocket className="h-6 w-6" /></div><div>- <h3 className="font-semibold text-sm">Build a new company</h3>+ <h3 className="font-semibold text-sm">Build a new organization</h3><p className="text-xs text-muted-foreground mt-1">Begin with a mission, bring on a lead agent, and grow a team of agents to do the work.</p>diff --git a/ui/src/components/InteractionGovernancePanel.tsx b/ui/src/components/InteractionGovernancePanel.tsxindex 358a57a8a7..d697b1f094 100644--- a/ui/src/components/InteractionGovernancePanel.tsx+++ b/ui/src/components/InteractionGovernancePanel.tsx@@ -243,7 +243,7 @@ export function InteractionGovernancePanel({<div className="space-y-4"><p className="text-sm text-muted-foreground">Thread interactions are open by default:{" "}- <span className="font-medium text-foreground">Anyone</span> in the company — the+ <span className="font-medium text-foreground">Anyone</span> in the organization — theboard or any agent, including the one that asked — can respond. Narrow a kindonly when you need to.{" "}<span className="font-medium text-foreground">Default policy</span> is thediff --git a/ui/src/components/IssueChatThread.test.tsx b/ui/src/components/IssueChatThread.test.tsxindex 0fbc3a1a14..757dd7ad94 100644--- a/ui/src/components/IssueChatThread.test.tsx+++ b/ui/src/components/IssueChatThread.test.tsx@@ -3948,7 +3948,7 @@ describe("IssueAssigneePausedNotice", () => {);});- expect(container.textContent).toContain("arrived paused from a company import");+ expect(container.textContent).toContain("arrived paused from an organization import");const resumeButton = container.querySelector('[data-testid="issue-assignee-paused-resume"]',) as HTMLButtonElement | null;diff --git a/ui/src/components/IssueChatThread.tsx b/ui/src/components/IssueChatThread.tsxindex 71862484c1..cf4b0baf8e 100644--- a/ui/src/components/IssueChatThread.tsx+++ b/ui/src/components/IssueChatThread.tsx@@ -644,7 +644,7 @@ export function IssueAssigneePausedNotice({agent.pauseReason === "budget"? "It was paused by a budget hard stop.": agent.pauseReason === "import"- ? "It arrived paused from a company import — imported agents stay parked until you resume them."+ ? "It arrived paused from an organization import — imported agents stay parked until you resume them.": agent.pauseReason === "system"? "It was paused by the system.": "It was paused manually.";diff --git a/ui/src/components/IssueThreadInteractionCard.test.tsx b/ui/src/components/IssueThreadInteractionCard.test.tsxindex 3995a58cdf..2b27093e8f 100644--- a/ui/src/components/IssueThreadInteractionCard.test.tsx+++ b/ui/src/components/IssueThreadInteractionCard.test.tsx@@ -1276,7 +1276,7 @@ describe("IssueThreadInteractionCard resolver audience", () => {expect(audience?.getAttribute("data-audience-policy")).toBe("human_only");expect(host.querySelector('[data-testid="interaction-audience-note"]')?.textContent,- ).toBe("Company interaction governance narrowed this from Anyone to Human only.");+ ).toBe("Organization interaction governance narrowed this from Anyone to Human only.");});it("explains a legacy card that predates the open default", () => {diff --git a/ui/src/components/IssueThreadInteractionCard.tsx b/ui/src/components/IssueThreadInteractionCard.tsxindex 747ccb378a..a7b7f2ac2a 100644--- a/ui/src/components/IssueThreadInteractionCard.tsx+++ b/ui/src/components/IssueThreadInteractionCard.tsx@@ -3682,7 +3682,7 @@ export function IssueThreadInteractionCard({</Badge></TooltipTrigger><TooltipContent side="bottom" className="max-w-xs text-xs">- Directed to {addresseeLabel}. Agent-addressed interactions are owned by that agent and are kept out of the open company attention feed.+ Directed to {addresseeLabel}. Agent-addressed interactions are owned by that agent and are kept out of the open organization attention feed.</TooltipContent></Tooltip>) : null}@@ -3853,7 +3853,7 @@ function ResolvedByAgentChip() {</Badge></TooltipTrigger><TooltipContent side="bottom" className="max-w-xs text-xs">- Resolved by an agent under the company's interaction governance policy — audit-distinct from a human board resolution.+ Resolved by an agent under the organization's interaction governance policy — audit-distinct from a human board resolution.</TooltipContent></Tooltip>);diff --git a/ui/src/components/JsonSchemaForm.tsx b/ui/src/components/JsonSchemaForm.tsxindex 5668665854..d1466eb8fc 100644--- a/ui/src/components/JsonSchemaForm.tsx+++ b/ui/src/components/JsonSchemaForm.tsx@@ -699,7 +699,7 @@ const SecretField = React.memo(({label={label}description={description ||- "Pick an existing company secret, or paste a raw value (Paperclip will store it as a secret on save)."+ "Pick an existing organization secret, or paste a raw value (Paperclip will store it as a secret on save)."}required={isRequired}error={error}diff --git a/ui/src/components/NewAgentDialog.test.tsx b/ui/src/components/NewAgentDialog.test.tsxindex b1c63b9e1c..5fc729d9cb 100644--- a/ui/src/components/NewAgentDialog.test.tsx+++ b/ui/src/components/NewAgentDialog.test.tsx@@ -160,7 +160,7 @@ describe("NewAgentDialog", () => {});expect(container.textContent).toContain("Generate a one-time onboarding prompt");- expect(container.textContent).not.toContain("Company Invites");+ expect(container.textContent).not.toContain("Organization Invites");const generateButton = Array.from(container.querySelectorAll("button")).find((button) => button.textContent === "Generate onboarding prompt",diff --git a/ui/src/components/NewAgentDialog.tsx b/ui/src/components/NewAgentDialog.tsxindex 1324b84c2a..73bd9e3b6a 100644--- a/ui/src/components/NewAgentDialog.tsx+++ b/ui/src/components/NewAgentDialog.tsx@@ -352,7 +352,7 @@ export function NewAgentDialog() {</label><div className="rounded-lg border border-border px-4 py-3 text-sm text-muted-foreground">- Agent invites create a join request first. A company admin still approves the request before the agent can claim its API key.+ Agent invites create a join request first. An organization admin still approves the request before the agent can claim its API key.</div><div>@@ -385,7 +385,7 @@ export function NewAgentDialog() {) : null}</div><p className="text-sm text-muted-foreground">- Send this prompt to the external agent that should join this company.+ Send this prompt to the external agent that should join this organization.</p></div></div>diff --git a/ui/src/components/NewGoalDialog.tsx b/ui/src/components/NewGoalDialog.tsxindex a41ea3e4e5..f842015452 100644--- a/ui/src/components/NewGoalDialog.tsx+++ b/ui/src/components/NewGoalDialog.tsx@@ -27,7 +27,7 @@ import { MarkdownEditor, type MarkdownEditorRef } from "./MarkdownEditor";import { StatusBadge } from "./StatusBadge";const levelLabels: Record<string, string> = {- company: "Company",+ company: "Organization",team: "Team",agent: "Agent",task: "Task",@@ -70,7 +70,7 @@ export function NewGoalDialog() {const uploadDescriptionImage = useMutation({mutationFn: async (file: File) => {- if (!selectedCompanyId) throw new Error("No company selected");+ if (!selectedCompanyId) throw new Error("No organization selected");return assetsApi.uploadImage(selectedCompanyId, file, "goals/drafts");},});diff --git a/ui/src/components/NewIssueDialog.test.tsx b/ui/src/components/NewIssueDialog.test.tsxindex 2a6c778a7a..8e9275f83c 100644--- a/ui/src/components/NewIssueDialog.test.tsx+++ b/ui/src/components/NewIssueDialog.test.tsx@@ -570,7 +570,7 @@ describe("NewIssueDialog", () => {await waitForAssertion(() => {expect(container.querySelector('[data-testid="new-issue-paused-assignee-note"]')).not.toBeNull();});- expect(container.textContent).toContain("arrived paused from a company import");+ expect(container.textContent).toContain("arrived paused from an organization import");act(() => root.unmount());});diff --git a/ui/src/components/NewIssueDialog.tsx b/ui/src/components/NewIssueDialog.tsxindex a382b7c13a..8de5329688 100644--- a/ui/src/components/NewIssueDialog.tsx+++ b/ui/src/components/NewIssueDialog.tsx@@ -688,7 +688,7 @@ export function NewIssueDialog() {const uploadDescriptionImage = useMutation({mutationFn: async (file: File) => {- if (!effectiveCompanyId) throw new Error("No company selected");+ if (!effectiveCompanyId) throw new Error("No organization selected");return assetsApi.uploadImage(effectiveCompanyId, file, "issues/drafts");},});@@ -2341,7 +2341,7 @@ export function NewIssueDialog() {<div data-testid="new-issue-paused-assignee-note" className="mx-4 mb-2"><InlineBanner tone="warning" icon={PauseCircle} compact><span className="font-medium">{selectedAssigneeAgent.name}</span> is paused and will not start work on this task until it is resumed- {selectedAssigneeAgent.pauseReason === "import" ? " — it arrived paused from a company import" : ""}. You can resume it from the task page after creating the task.+ {selectedAssigneeAgent.pauseReason === "import" ? " — it arrived paused from an organization import" : ""}. You can resume it from the task page after creating the task.</InlineBanner></div>) : null}diff --git a/ui/src/components/NewProjectDialog.tsx b/ui/src/components/NewProjectDialog.tsxindex 7bb3158f7d..a041a72a65 100644--- a/ui/src/components/NewProjectDialog.tsx+++ b/ui/src/components/NewProjectDialog.tsx@@ -96,7 +96,7 @@ export function NewProjectDialog() {const uploadDescriptionImage = useMutation({mutationFn: async (file: File) => {- if (!selectedCompanyId) throw new Error("No company selected");+ if (!selectedCompanyId) throw new Error("No organization selected");return assetsApi.uploadImage(selectedCompanyId, file, "projects/drafts");},});diff --git a/ui/src/components/OnboardingWizard.step.test.tsx b/ui/src/components/OnboardingWizard.step.test.tsxindex 66304ba1a6..fb4cb0170c 100644--- a/ui/src/components/OnboardingWizard.step.test.tsx+++ b/ui/src/components/OnboardingWizard.step.test.tsx@@ -961,7 +961,7 @@ describe("OnboardingWizard — which step it lands on", () => {expect(segments.every((segment) => segment.disabled)).toBe(true);// And company creation is genuinely unreachable, not merely unlinked.- expect(document.body.textContent).not.toContain("Name your company");+ expect(document.body.textContent).not.toContain("Name your organization");});});});diff --git a/ui/src/components/OnboardingWizard.tsx b/ui/src/components/OnboardingWizard.tsxindex 55a6880b69..138f100c23 100644--- a/ui/src/components/OnboardingWizard.tsx+++ b/ui/src/components/OnboardingWizard.tsx@@ -1025,7 +1025,7 @@ function OnboardingWizardInner({): Promise<AdapterEnvironmentTestResult | null> {if (!createdCompanyId) {setAdapterEnvError(- "Create or select a company before testing adapter environment."+ "Create or select an organization before testing adapter environment.");return null;}@@ -1209,7 +1209,7 @@ function OnboardingWizardInner({setStep(3); // → Create your team lead} catch (err) {- setError(err instanceof Error ? err.message : "Failed to create company");+ setError(err instanceof Error ? err.message : "Failed to create organization");} finally {setLoading(false);}@@ -1255,7 +1255,7 @@ function OnboardingWizardInner({setSelectedCompanyId(company.id);setStep(3);} catch (err) {- setError(err instanceof Error ? err.message : "Failed to create company");+ setError(err instanceof Error ? err.message : "Failed to create organization");} finally {creatingCompanyRef.current = false;setLoading(false);diff --git a/ui/src/components/ProjectProperties.tsx b/ui/src/components/ProjectProperties.tsxindex d4f890772a..7a4cde1df5 100644--- a/ui/src/components/ProjectProperties.tsx+++ b/ui/src/components/ProjectProperties.tsx@@ -293,7 +293,7 @@ export function ProjectProperties({ project, onUpdate, onFieldUpdate, getFieldSa});const createSecret = useMutation({mutationFn: (input: { name: string; value: string }) => {- if (!selectedCompanyId) throw new Error("Select a company to create secrets");+ if (!selectedCompanyId) throw new Error("Select an organization to create secrets");return secretsApi.create(selectedCompanyId, input);},onSuccess: () => {diff --git a/ui/src/components/ReportsToPicker.tsx b/ui/src/components/ReportsToPicker.tsxindex 3c279f7881..d3a4bf0d0b 100644--- a/ui/src/components/ReportsToPicker.tsx+++ b/ui/src/components/ReportsToPicker.tsx@@ -99,7 +99,7 @@ export function ReportsToPicker({)}{unknownManager && (<div className="px-2 py-1.5 text-xs text-muted-foreground border-b border-border mb-0.5">- Saved manager is missing from this company. Choose a new manager or clear.+ Saved manager is missing from this organization. Choose a new manager or clear.</div>)}{rows.map((a) => (diff --git a/ui/src/components/SecretBindingPicker.test.tsx b/ui/src/components/SecretBindingPicker.test.tsxindex 476ab5b5d3..787e3b1af0 100644--- a/ui/src/components/SecretBindingPicker.test.tsx+++ b/ui/src/components/SecretBindingPicker.test.tsx@@ -88,7 +88,7 @@ describe("SecretBindingPicker", () => {await render(readyContext("active"));expect(container.textContent).toContain("DAYTONA_API_KEY — Other Team");- expect(container.textContent).toContain("Owned by the Other Team company");+ expect(container.textContent).toContain("Owned by the Other Team organization");expect(container.textContent).not.toContain("Missing secret");expect(container.querySelector("select")?.className).not.toContain("border-destructive");});diff --git a/ui/src/components/SecretBindingPicker.tsx b/ui/src/components/SecretBindingPicker.tsxindex a25891f0a4..f04033ae54 100644--- a/ui/src/components/SecretBindingPicker.tsx+++ b/ui/src/components/SecretBindingPicker.tsx@@ -197,7 +197,7 @@ export function SecretBindingPicker({{selectedMissing && value ? (<option value={value.secretId}>{missingHint- ? `${missingHint.name} — ${missingHint.companyName ?? "another company"}`+ ? `${missingHint.name} — ${missingHint.companyName ?? "another organization"}`: hintsPending? `Secret (${value.secretId.slice(0, 8)}…)`: `Missing secret (${value.secretId.slice(0, 8)}…)`}@@ -257,7 +257,7 @@ export function SecretBindingPicker({) : crossCompanyHint ? (<p className="text-(length:--text-micro) text-muted-foreground flex items-center gap-1"><AlertCircle className="h-3 w-3" />- Owned by {crossCompanyHint.companyName ? `the ${crossCompanyHint.companyName} company` : "another company"}. The binding keeps working; selecting a secret from this list re-points it here.+ Owned by {crossCompanyHint.companyName ? `the ${crossCompanyHint.companyName} organization` : "another organization"}. The binding keeps working; selecting a secret from this list re-points it here.</p>) : missingHint ? (<p className="text-(length:--text-micro) text-destructive flex items-center gap-1">diff --git a/ui/src/components/Sidebar.test.tsx b/ui/src/components/Sidebar.test.tsxindex 16b816428b..84c2bac08b 100644--- a/ui/src/components/Sidebar.test.tsx+++ b/ui/src/components/Sidebar.test.tsx@@ -352,7 +352,7 @@ describe("Sidebar", () => {const sections = [...container.querySelectorAll("nav > div")];const workSection = sections.find((section) => section.textContent?.startsWith("Work"));- const companySection = sections.find((section) => section.textContent?.startsWith("Company"));+ const companySection = sections.find((section) => section.textContent?.startsWith("Organization"));expect(workSection?.textContent).toContain("Skills");expect(companySection?.textContent).not.toContain("Skills");@@ -411,7 +411,7 @@ describe("Sidebar", () => {const sections = [...container.querySelectorAll("nav > div")];const workSection = sections.find((section) => section.textContent?.startsWith("Work"));- const companySection = sections.find((section) => section.textContent?.startsWith("Company"));+ const companySection = sections.find((section) => section.textContent?.startsWith("Organization"));expect(workSection?.textContent).not.toContain("Timeline");expect(companySection?.textContent).toContain("Timeline");diff --git a/ui/src/components/Sidebar.tsx b/ui/src/components/Sidebar.tsxindex c40d0b27af..f54b3dec79 100644--- a/ui/src/components/Sidebar.tsx+++ b/ui/src/components/Sidebar.tsx@@ -273,7 +273,7 @@ export function Sidebar() {<SidebarAgents streamlined={streamlined} />- <SidebarSection label="Company" collapsible={{ open: companyOpen, onOpenChange: setCompanyOpen }}>+ <SidebarSection label="Organization" collapsible={{ open: companyOpen, onOpenChange: setCompanyOpen }}><SidebarNavItem to="/org" label="Org" icon={Network} />{showApps ? <SidebarNavItem to="/apps" label="Apps" icon={AppWindow} /> : null}<SidebarNavItem to="/timeline" label="Timeline" icon={GanttChartSquare} />diff --git a/ui/src/components/SidebarCompanyMenu.test.tsx b/ui/src/components/SidebarCompanyMenu.test.tsxindex 4f57fae617..52bb357074 100644--- a/ui/src/components/SidebarCompanyMenu.test.tsx+++ b/ui/src/components/SidebarCompanyMenu.test.tsx@@ -240,10 +240,10 @@ describe("SidebarCompanyMenu", () => {const { root } = renderMenu();await flushReact();- await openMenu("Open Acme Labs company switcher");+ await openMenu("Open Acme Labs organization switcher");- expect(document.body.textContent).toContain("Couldn't load companies");- expect(document.body.textContent).not.toContain("No companies");+ expect(document.body.textContent).toContain("Couldn't load organizations");+ expect(document.body.textContent).not.toContain("No organizations");const retryItem = Array.from(document.body.querySelectorAll('[role="menuitem"]')).find((item) => item.textContent?.includes("Try again"),@@ -269,10 +269,10 @@ describe("SidebarCompanyMenu", () => {const { root } = renderMenu();await flushReact();- await openMenu("Open Acme Labs company switcher");+ await openMenu("Open Acme Labs organization switcher");- expect(document.body.textContent).toContain("No companies");- expect(document.body.textContent).not.toContain("Couldn't load companies");+ expect(document.body.textContent).toContain("No organizations");+ expect(document.body.textContent).not.toContain("Couldn't load organizations");act(() => {root.unmount();@@ -295,7 +295,7 @@ describe("SidebarCompanyMenu", () => {await flushReact();await flushReact();- const trigger = container.querySelector('button[aria-label="Open Acme Labs company switcher"]');+ const trigger = container.querySelector('button[aria-label="Open Acme Labs organization switcher"]');expect(trigger).not.toBeNull();act(() => {trigger?.dispatchEvent(new PointerEvent("pointerdown", { bubbles: true, button: 0 }));@@ -329,7 +329,7 @@ describe("SidebarCompanyMenu", () => {expect(container.textContent).toContain("Acme Labs");- const trigger = container.querySelector('button[aria-label="Open Acme Labs company switcher"]');+ const trigger = container.querySelector('button[aria-label="Open Acme Labs organization switcher"]');expect(trigger).not.toBeNull();act(() => {@@ -338,7 +338,7 @@ describe("SidebarCompanyMenu", () => {});await flushReact();- expect(document.body.textContent).toContain("Switch company");+ expect(document.body.textContent).toContain("Switch organization");expect(document.body.textContent).toContain("Edit");expect(document.body.textContent).toContain("Strata");expect(document.body.textContent).toContain("ANA");@@ -359,7 +359,7 @@ describe("SidebarCompanyMenu", () => {expect(mockAuthApi.signOut).toHaveBeenCalledTimes(1);expect(mockNavigateTopLevel).not.toHaveBeenCalled();expect(queryClient.getQueryState(queryKeys.health)?.isInvalidated).toBe(true);- expect(document.body.textContent).not.toContain("Switch company");+ expect(document.body.textContent).not.toContain("Switch organization");act(() => {root.unmount();@@ -382,7 +382,7 @@ describe("SidebarCompanyMenu", () => {await flushReact();await flushReact();- const trigger = container.querySelector('button[aria-label="Open Acme Labs company switcher"]');+ const trigger = container.querySelector('button[aria-label="Open Acme Labs organization switcher"]');expect(trigger).not.toBeNull();act(() => {@@ -439,7 +439,7 @@ describe("SidebarCompanyMenu", () => {await flushReact();await flushReact();- const trigger = container.querySelector('button[aria-label="Open Acme Labs company switcher"]');+ const trigger = container.querySelector('button[aria-label="Open Acme Labs organization switcher"]');expect(trigger).not.toBeNull();act(() => {@@ -470,7 +470,7 @@ describe("SidebarCompanyMenu", () => {await flushReact();await flushReact();- await openMenu("Open Acme Labs company switcher");+ await openMenu("Open Acme Labs organization switcher");const createItem = Array.from(document.body.querySelectorAll('[data-slot="dropdown-menu-item"]')).find((element) => element.textContent?.includes("Create new organization..."));@@ -500,7 +500,7 @@ describe("SidebarCompanyMenu", () => {const { root } = renderMenu();await flushReact();- const trigger = container.querySelector('button[aria-label="Open Acme Labs company switcher"]');+ const trigger = container.querySelector('button[aria-label="Open Acme Labs organization switcher"]');expect(trigger).not.toBeNull();expect(trigger?.className).toContain("min-w-0");diff --git a/ui/src/components/SidebarCompanyMenu.tsx b/ui/src/components/SidebarCompanyMenu.tsxindex 5b193a214c..ec5728afd7 100644--- a/ui/src/components/SidebarCompanyMenu.tsx+++ b/ui/src/components/SidebarCompanyMenu.tsx@@ -251,7 +251,7 @@ export function SidebarCompanyMenu({ open: controlledOpen, onOpenChange }: Sideb?? null: null;const createStackUrl = isCloud ? cloudStackCreateUrl(cloudBaseUrl) : null;- const switcherNoun = isCloud ? "organization" : "company";+ const switcherNoun = "organization";// The one name the chrome shows for "where am I": the stack in cloud, the// company when self-hosted.const currentName = isCloud@@ -368,7 +368,7 @@ export function SidebarCompanyMenu({ open: controlledOpen, onOpenChange }: Sideb)}title={currentName ?? undefined}>- {currentName ?? (isCloud ? "Select organization" : "Select company")}+ {currentName ?? `Select ${switcherNoun}`}</span></span>{!rail && <ChevronsUpDown className="size-3.5 shrink-0 text-muted-foreground" />}@@ -377,7 +377,7 @@ export function SidebarCompanyMenu({ open: controlledOpen, onOpenChange }: Sideb<DropdownMenuContent align="start" sideOffset={8} className="w-64 p-1"><div className="flex items-center justify-between gap-2 px-2 py-1.5"><DropdownMenuLabel className="p-0 text-(length:--text-micro) font-semibold uppercase text-muted-foreground">- {isCloud ? "Switch organization" : "Switch company"}+ {`Switch ${switcherNoun}`}</DropdownMenuLabel>{/* Stack order is owned by cloud's own portfolio in v1, so thedrag-to-reorder affordance stays self-hosted-only. */}@@ -445,7 +445,7 @@ export function SidebarCompanyMenu({ open: controlledOpen, onOpenChange }: Sideb// offer the way back.companyListUnavailable ? (<>- <DropdownMenuItem disabled>Couldn't load companies</DropdownMenuItem>+ <DropdownMenuItem disabled>Couldn't load organizations</DropdownMenuItem><DropdownMenuItemonSelect={(event) => {// Keep the menu open so the result of the retry is visible.@@ -458,7 +458,7 @@ export function SidebarCompanyMenu({ open: controlledOpen, onOpenChange }: Sideb</DropdownMenuItem></>) : (- <DropdownMenuItem disabled>No companies</DropdownMenuItem>+ <DropdownMenuItem disabled>No organizations</DropdownMenuItem>)) : null}</>diff --git a/ui/src/components/TrustPresetSection.tsx b/ui/src/components/TrustPresetSection.tsxindex e7c60b679d..a5bcd86a78 100644--- a/ui/src/components/TrustPresetSection.tsx+++ b/ui/src/components/TrustPresetSection.tsx@@ -185,7 +185,7 @@ export function TrustPresetSection({</div><div className="flex flex-wrap items-center justify-between gap-2"><p className="text-xs text-muted-foreground">- CE saves one containment boundary at a time. Saved policies include this company id.+ CE saves one containment boundary at a time. Saved policies include this organization id.</p>{boundaryTarget ? (<Buttondiff --git a/ui/src/components/WorkspaceFileBrowser.tsx b/ui/src/components/WorkspaceFileBrowser.tsxindex 64a84513ae..56314f2b1b 100644--- a/ui/src/components/WorkspaceFileBrowser.tsx+++ b/ui/src/components/WorkspaceFileBrowser.tsx@@ -987,8 +987,8 @@ export function WorkspaceFileBrowser({body = (<StateMessageicon={<FolderOpen aria-hidden="true" className="h-5 w-5 text-muted-foreground" />}- title="No company selected"- body="Choose a company before browsing another project workspace."+ title="No organization selected"+ body="Choose an organization before browsing another project workspace."/>);} else if (source === "other" && projectsQuery.isFetching && projectsWithWorkspaces.length === 0) {@@ -1004,7 +1004,7 @@ export function WorkspaceFileBrowser({<StateMessageicon={<FolderOpen aria-hidden="true" className="h-5 w-5 text-muted-foreground" />}title="No project workspaces"- body="No same-company project has a registered workspace to browse."+ body="No same-organization project has a registered workspace to browse."/>);} else if (listQuery.isFetching && !data) {diff --git a/ui/src/components/environment-variables-editor/CreateSecretPopover.tsx b/ui/src/components/environment-variables-editor/CreateSecretPopover.tsxindex 9d829bda0c..047c6f5345 100644--- a/ui/src/components/environment-variables-editor/CreateSecretPopover.tsx+++ b/ui/src/components/environment-variables-editor/CreateSecretPopover.tsx@@ -76,7 +76,7 @@ export function SecretPopoverForm({<PopoverTitle className="text-sm font-medium">{heading}</PopoverTitle>{mode === "store" ? (<PopoverDescription className="text-(length:--text-micro) text-muted-foreground">- Moves the typed value into an encrypted company secret and binds{" "}+ Moves the typed value into an encrypted organization secret and binds{" "}<span className="font-mono">{initialName || "this variable"}</span> to it.</PopoverDescription>) : null}diff --git a/ui/src/components/environment-variables-editor/EnvironmentVariablesEditor.test.tsx b/ui/src/components/environment-variables-editor/EnvironmentVariablesEditor.test.tsxindex 5f367ddf5c..a18d4f9378 100644--- a/ui/src/components/environment-variables-editor/EnvironmentVariablesEditor.test.tsx+++ b/ui/src/components/environment-variables-editor/EnvironmentVariablesEditor.test.tsx@@ -806,9 +806,9 @@ describe("EnvironmentVariablesEditor", () => {pointerClick(sourceButton!);settleFakeTimers();const secretItem = [...document.querySelectorAll<HTMLElement>('[role="menuitem"]')].find((el) =>- el.textContent?.includes("Company secret"),+ el.textContent?.includes("Organization secret"),);- expect(secretItem, "Company secret menu item should be present").toBeTruthy();+ expect(secretItem, "Organization secret menu item should be present").toBeTruthy();pointerClick(secretItem!);settleFakeTimers();// The store popover is open (heading rendered) and stays open — it must notdiff --git a/ui/src/components/environment-variables-editor/Row.tsx b/ui/src/components/environment-variables-editor/Row.tsxindex f2f9f317a3..e31c187f16 100644--- a/ui/src/components/environment-variables-editor/Row.tsx+++ b/ui/src/components/environment-variables-editor/Row.tsx@@ -186,7 +186,7 @@ export function EnvironmentVariableRow({row.source === "text"? "Text value": row.source === "secret"- ? "Company secret reference"+ ? "Organization secret reference": "User secret reference";const nameErrorId = `${row.id}-name-error`;const healthId = `${row.id}-health`;@@ -284,8 +284,8 @@ export function EnvironmentVariableRow({<span className="text-(length:--text-micro) text-muted-foreground">Store the value inline as plain text.</span></DropdownMenuItem><DropdownMenuItem className="flex-col items-start gap-0.5" onSelect={() => switchSource("secret")}>- <span className="text-sm">Company secret</span>- <span className="text-(length:--text-micro) text-muted-foreground">Resolve a stored company secret at run start.</span>+ <span className="text-sm">Organization secret</span>+ <span className="text-(length:--text-micro) text-muted-foreground">Resolve a stored organization secret at run start.</span></DropdownMenuItem><DropdownMenuItem className="flex-col items-start gap-0.5" onSelect={() => switchSource("user_secret")}><span className="text-sm">User secret</span>diff --git a/ui/src/components/folders/FolderControls.test.tsx b/ui/src/components/folders/FolderControls.test.tsxindex d68324b2cd..6940e0840a 100644--- a/ui/src/components/folders/FolderControls.test.tsx+++ b/ui/src/components/folders/FolderControls.test.tsx@@ -426,8 +426,8 @@ describe("FolderControls", () => {});const body = document.body.textContent ?? "";- expect(body.indexOf("My Skills")).toBeLessThan(body.indexOf("Company"));- expect(body.indexOf("Company")).toBeLessThan(body.indexOf("Engineering"));+ expect(body.indexOf("My Skills")).toBeLessThan(body.indexOf("Organization"));+ expect(body.indexOf("Organization")).toBeLessThan(body.indexOf("Engineering"));expect(body.indexOf("Engineering")).toBeLessThan(body.indexOf("Code Review"));expect(body.indexOf("Code Review")).toBeLessThan(body.indexOf("Projects"));expect(body.indexOf("Projects")).toBeLessThan(body.indexOf("Bundled"));diff --git a/ui/src/components/folders/FolderControls.tsx b/ui/src/components/folders/FolderControls.tsxindex 2262769fc5..47a773ad81 100644--- a/ui/src/components/folders/FolderControls.tsx+++ b/ui/src/components/folders/FolderControls.tsx@@ -466,7 +466,7 @@ export function MobileFolderSheet({<>{model.my ? renderBranch(model.my, "My Skills") : null}<div className="px-2 pb-0.5 pt-2 text-(length:--text-micro) font-medium uppercase tracking-wide text-muted-foreground">- Company+ Organization</div>{model.company.map((node) => renderBranch(node))}{model.projects ? renderBranch(model.projects, "Projects") : null}@@ -637,7 +637,7 @@ export function FolderFormDialog({<DialogHeader><DialogTitle>{isEdit ? "Edit folder" : "Create folder"}</DialogTitle><DialogDescription>- {kind === "routine" ? "Organize routines in this company." : "Organize installed company skills."}+ {kind === "routine" ? "Organize routines in this organization." : "Organize installed organization skills."}</DialogDescription></DialogHeader><div className="space-y-4">diff --git a/ui/src/components/folders/SkillFolderTree.tsx b/ui/src/components/folders/SkillFolderTree.tsxindex 7673299c17..6761c170bc 100644--- a/ui/src/components/folders/SkillFolderTree.tsx+++ b/ui/src/components/folders/SkillFolderTree.tsx@@ -311,7 +311,7 @@ export function SkillFolderRail({) : null}{/* Company — plain top-level company folders */}- <RailHeading label="Company" onCreate={() => onCreateFolder(null)} />+ <RailHeading label="Organization" onCreate={() => onCreateFolder(null)} />{model.company.length > 0 ? (model.company.map((node) => (<TreeBranch@@ -335,7 +335,7 @@ export function SkillFolderRail({/>))) : (- <div className="px-2 py-1 text-xs text-muted-foreground">No company folders yet.</div>+ <div className="px-2 py-1 text-xs text-muted-foreground">No organization folders yet.</div>)}{/* Projects — auto-managed, read-only structure */}@@ -649,7 +649,7 @@ function TreeBranch({<DropdownMenuItem onSelect={() => onEditFolder(folder)}>Edit color</DropdownMenuItem><DropdownMenuItem onSelect={() => onMoveFolder(folder, isInMySkills ? "company" : "my")}><MoveRight className="h-3.5 w-3.5" />- Move to {isInMySkills ? "Company" : "My Skills"}+ Move to {isInMySkills ? "Organization" : "My Skills"}</DropdownMenuItem><DropdownMenuSeparator /><DropdownMenuItem variant="destructive" onSelect={() => onDeleteFolder(folder)}>diff --git a/ui/src/components/folders/skill-folder-tree.test.ts b/ui/src/components/folders/skill-folder-tree.test.tsindex 2a8ebdffba..5ed98ceec0 100644--- a/ui/src/components/folders/skill-folder-tree.test.ts+++ b/ui/src/components/folders/skill-folder-tree.test.ts@@ -101,7 +101,7 @@ describe("reservedRootLabel", () => {describe("skillFolderDisplayPath", () => {it("prefixes company folders and preserves reserved-root labels", () => {const model = buildSkillFolderTree(folders);- expect(skillFolderDisplayPath(model, "eng-review")).toBe("Company / Engineering / Review");+ expect(skillFolderDisplayPath(model, "eng-review")).toBe("Organization / Engineering / Review");expect(skillFolderDisplayPath(model, "mine")).toBe("My Skills / dotta");expect(skillFolderDisplayPath(model, "bundled-git")).toBe("Bundled / git");expect(skillFolderDisplayPath(model, null)).toBeNull();@@ -110,7 +110,7 @@ describe("skillFolderDisplayPath", () => {describe("skillFolderPathDisplayFallback", () => {it("humanizes cold detail paths before folder metadata loads", () => {- expect(skillFolderPathDisplayFallback("engineering/code-review")).toBe("Company / Engineering / Code Review");+ expect(skillFolderPathDisplayFallback("engineering/code-review")).toBe("Organization / Engineering / Code Review");expect(skillFolderPathDisplayFallback("my/local-board/drafts")).toBe("My Skills / Local Board / Drafts");expect(skillFolderPathDisplayFallback("bundled/review-pr")).toBe("Bundled / Review Pr");expect(skillFolderPathDisplayFallback(null)).toBeNull();diff --git a/ui/src/components/folders/skill-folder-tree.ts b/ui/src/components/folders/skill-folder-tree.tsindex e7ba740fe4..ca6258d038 100644--- a/ui/src/components/folders/skill-folder-tree.ts+++ b/ui/src/components/folders/skill-folder-tree.ts@@ -167,7 +167,7 @@ export function skillFolderDisplayPath(const trail = folderBreadcrumbTrail(model, folderId);if (trail.length === 0) return null;const labels = trail.map((folder) => reservedRootLabel(folder));- if (!trail[0]?.systemKey) labels.unshift("Company");+ if (!trail[0]?.systemKey) labels.unshift("Organization");return labels.join(" / ");}@@ -189,7 +189,7 @@ export function skillFolderPathDisplayFallback(folderPath: string | null | undefif (root === "my") labels[0] = "My Skills";else if (root === "projects") labels[0] = "Projects";else if (root === "bundled") labels[0] = "Bundled";- else labels.unshift("Company");+ else labels.unshift("Organization");return labels.join(" / ");}diff --git a/ui/src/components/routine-sections/editable-sections.tsx b/ui/src/components/routine-sections/editable-sections.tsxindex 49e79c2522..a80ff3d4ba 100644--- a/ui/src/components/routine-sections/editable-sections.tsx+++ b/ui/src/components/routine-sections/editable-sections.tsx@@ -85,8 +85,8 @@ const activityGatePolicyOptions = [const activityGateScopeOptions = [{value: "company",- title: "Company-wide",- description: "Any activity across the company counts as a reason to run.",+ title: "Organization-wide",+ description: "Any activity across the organization counts as a reason to run.",},{value: "project",diff --git a/ui/src/components/skill-studio/SkillPolicySurfaces.test.tsx b/ui/src/components/skill-studio/SkillPolicySurfaces.test.tsxindex 472c2d370f..92e9cc0617 100644--- a/ui/src/components/skill-studio/SkillPolicySurfaces.test.tsx+++ b/ui/src/components/skill-studio/SkillPolicySurfaces.test.tsx@@ -64,7 +64,7 @@ function platformDenial() {describe("SkillPolicyDenialNotice", () => {it("renders a State B policy denial with title and remediation", () => {const el = render(<SkillPolicyDenialNotice denial={policyDenial()} />);- expect(el.textContent).toContain("restricted by your company policy");+ expect(el.textContent).toContain("restricted by your organization policy");expect(el.textContent).toContain("administrator can change the skill policy");});diff --git a/ui/src/fixtures/issueThreadInteractionFixtures.ts b/ui/src/fixtures/issueThreadInteractionFixtures.tsindex 7d7e3b0f4f..deb4d2485b 100644--- a/ui/src/fixtures/issueThreadInteractionFixtures.ts+++ b/ui/src/fixtures/issueThreadInteractionFixtures.ts@@ -967,7 +967,7 @@ export const humanOnlyRequestConfirmationInteraction =createRequestConfirmationInteraction({id: "interaction-confirmation-human-only",title: "Approve the customer-facing announcement",- summary: "Reserved for a human on the board because it commits the company publicly.",+ summary: "Reserved for a human on the board because it commits the organization publicly.",requestedResolverPolicy: "human_only",});@@ -976,7 +976,7 @@ export const companyCappedRequestConfirmationInteraction =createRequestConfirmationInteraction({id: "interaction-confirmation-company-capped",title: "Confirm the data retention change",- summary: "Asked for an open audience; the company caps this kind at a human decision.",+ summary: "Asked for an open audience; the organization caps this kind at a human decision.",requestedResolverPolicy: "anyone",effectiveResolverPolicy: "human_only",effectiveResolverPolicySource: "company_cap",diff --git a/ui/src/hooks/useResourceMemberships.ts b/ui/src/hooks/useResourceMemberships.tsindex db0d2a8c93..cfc3318524 100644--- a/ui/src/hooks/useResourceMemberships.ts+++ b/ui/src/hooks/useResourceMemberships.ts@@ -151,7 +151,7 @@ export function useResourceMembershipMutation(companyId: string | null | undefinreturn useMutation({mutationFn: (variables: MutationVariables) => {- if (!companyId) throw new Error("Select a company first.");+ if (!companyId) throw new Error("Select an organization first.");const body = { state: variables.state, starred: variables.starred };return variables.resourceType === "project"? resourceMembershipsApi.updateProject(companyId, variables.resourceId, body)diff --git a/ui/src/i18n/locales/en.json b/ui/src/i18n/locales/en.jsonindex 9e50199bb4..de0aba03a2 100644--- a/ui/src/i18n/locales/en.json+++ b/ui/src/i18n/locales/en.json@@ -1,9 +1,9 @@{"app": {"noCompanies": {- "title": "Create your first company",- "description": "Get started by creating a company.",- "newCompany": "New Company"+ "title": "Create your first organization",+ "description": "Get started by creating an organization.",+ "newCompany": "New Organization"}}}diff --git a/ui/src/lib/activity-format.ts b/ui/src/lib/activity-format.tsindex 0d4f015de6..52552d1c29 100644--- a/ui/src/lib/activity-format.ts+++ b/ui/src/lib/activity-format.ts@@ -91,8 +91,8 @@ const ACTIVITY_ROW_VERBS: Record<string, string> = {"goal.deleted": "deleted","cost.reported": "reported cost for","cost.recorded": "recorded cost for",- "company.created": "created company",- "company.updated": "updated company",+ "company.created": "created organization",+ "company.updated": "updated organization","company.archived": "archived","company.reactivated": "reactivated","company.budget_updated": "updated budget for",diff --git a/ui/src/lib/interaction-audience.test.ts b/ui/src/lib/interaction-audience.test.tsindex 36d7ef8bf5..8dc1a7bb65 100644--- a/ui/src/lib/interaction-audience.test.ts+++ b/ui/src/lib/interaction-audience.test.ts@@ -79,14 +79,14 @@ describe("describeInteractionAudience", () => {expect(audience.narrowedBy).toBeNull();expect(audience.narrowedNote).toBeNull();expect(audience.summary).toBe(- "Anyone in the company can respond — the board or any agent, including the one that asked.",+ "Anyone in the organization can respond — the board or any agent, including the one that asked.",);});it("does not present an open card as board-required", () => {const audience = describeInteractionAudience({ interaction: confirmation() });expect(audience.summary).not.toMatch(/only .*board/i);- expect(audience.summary).toMatch(/anyone in the company/i);+ expect(audience.summary).toMatch(/anyone in the organization/i);});it("names the excluded creator for an explicit not_creator restriction", () => {@@ -102,7 +102,7 @@ describe("describeInteractionAudience", () => {expect(audience.isOpen).toBe(false);expect(audience.label).toBe("Anyone except creator");expect(audience.narrowedBy).toBe("requested");- expect(audience.summary).toBe("Anyone in the company except ClaudeCoder can respond.");+ expect(audience.summary).toBe("Anyone in the organization except ClaudeCoder can respond.");// An explicitly requested restriction needs no extra explanation.expect(audience.narrowedNote).toBeNull();});@@ -116,7 +116,7 @@ describe("describeInteractionAudience", () => {}),});expect(audience.summary).toBe(- "Anyone in the company except the agent that created it can respond.",+ "Anyone in the organization except the agent that created it can respond.",);});@@ -189,7 +189,7 @@ describe("describeInteractionAudience", () => {});expect(audience.narrowedBy).toBe("company_cap");expect(audience.narrowedNote).toBe(- "Company interaction governance narrowed this from Anyone to Human only.",+ "Organization interaction governance narrowed this from Anyone to Human only.",);});@@ -206,7 +206,7 @@ describe("describeInteractionAudience", () => {expect(audience.narrowedNote).toBe("Created before Anyone became the default, so it stays restricted. A new card would be open.",);- expect(audience.summary).toBe("Anyone in the company except ClaudeCoder can respond.");+ expect(audience.summary).toBe("Anyone in the organization except ClaudeCoder can respond.");});});@@ -294,7 +294,7 @@ describe("describeAttentionResolverAudience", () => {})));expect(audience?.narrowedBy).toBe("company_cap");expect(audience?.narrowedNote).toBe(- "Company interaction governance narrowed this from Anyone to Human only.",+ "Organization interaction governance narrowed this from Anyone to Human only.",);});diff --git a/ui/src/lib/interaction-audience.ts b/ui/src/lib/interaction-audience.tsindex 456b975eb3..044ec13e23 100644--- a/ui/src/lib/interaction-audience.ts+++ b/ui/src/lib/interaction-audience.ts@@ -50,9 +50,9 @@ const RESOLVER_POLICY_LABELS: Record<IssueThreadInteractionCanonicalResolverPoli*/const RESOLVER_POLICY_EFFECTS: Record<IssueThreadInteractionCanonicalResolverPolicy, string> = {anyone:- "Anyone in the company can respond — the board or any agent, including the one that asked.",+ "Anyone in the organization can respond — the board or any agent, including the one that asked.",not_creator:- "Anyone in the company except the agent that created the card, and its run. Use this when the answer has to come from someone else.",+ "Anyone in the organization except the agent that created the card, and its run. Use this when the answer has to come from someone else.",human_only: "Only a person on the board can respond. Agents are turned away.",};@@ -184,8 +184,8 @@ export function describeResolverAudience({: hasAddressee? `Only ${addressee} or a person on the board can respond.`: policy === "not_creator"- ? `Anyone in the company except ${creator} can respond.`- : "Anyone in the company can respond — the board or any agent, including the one that asked.";+ ? `Anyone in the organization except ${creator} can respond.`+ : "Anyone in the organization can respond — the board or any agent, including the one that asked.";// Same fact, fewer words: a collapsed row has to answer "is this mine to// decide?" in one glance, next to the buttons that act on the answer.@@ -207,7 +207,7 @@ export function describeResolverAudience({const narrowedNote = source === "governed_action"? "This card runs a governed action, so it stays human-only whatever audience was requested.": source === "company_cap"- ? `Company interaction governance narrowed this from ${RESOLVER_POLICY_LABELS[requestedPolicy]} to ${RESOLVER_POLICY_LABELS[policy]}.`+ ? `Organization interaction governance narrowed this from ${RESOLVER_POLICY_LABELS[requestedPolicy]} to ${RESOLVER_POLICY_LABELS[policy]}.`: provenance === "legacy_inherited_restriction"? "Created before Anyone became the default, so it stays restricted. A new card would be open.": null;diff --git a/ui/src/lib/skill-policy-denial.test.ts b/ui/src/lib/skill-policy-denial.test.tsindex b0a8d805e7..71c33b6ddb 100644--- a/ui/src/lib/skill-policy-denial.test.ts+++ b/ui/src/lib/skill-policy-denial.test.ts@@ -37,14 +37,14 @@ describe("classifySkillDenial", () => {);expect(denial).not.toBeNull();expect(denial?.state).toBe("policy");- expect(denial?.title).toBe("Installing external skills is restricted by your company policy.");+ expect(denial?.title).toBe("Installing external skills is restricted by your organization policy.");expect(denial?.remediation).toBe("Contact a company administrator to change the skill policy.");});it("recognises a policy denial from reason alone (policy_default) and falls back to default remediation", () => {const denial = classifySkillDenial(apiError(403, { reason: "policy_default" }));expect(denial?.state).toBe("policy");- expect(denial?.title).toBe("This action is restricted by your company policy.");+ expect(denial?.title).toBe("This action is restricted by your organization policy.");expect(denial?.remediation).toContain("administrator can change the skill policy");});diff --git a/ui/src/lib/skill-policy-denial.ts b/ui/src/lib/skill-policy-denial.tsindex 4f2f489ab2..06f37e5700 100644--- a/ui/src/lib/skill-policy-denial.ts+++ b/ui/src/lib/skill-policy-denial.ts@@ -59,14 +59,14 @@ export interface SkillDenial {}const DEFAULT_POLICY_REMEDIATION =- "A company administrator can change the skill policy to allow this.";+ "An organization administrator can change the skill policy to allow this.";const DEFAULT_ADMIN_REMEDIATION =- "This requires company administration access. Ask an administrator to make this change.";+ "This requires organization administration access. Ask an administrator to make this change.";/** Human-readable titles for the platform-invariant codes (State C). */const PLATFORM_TITLES: Record<string, string> = {skill_authentication_required: "Sign in to manage skills.",- skill_company_boundary_denied: "This skill belongs to another company.",+ skill_company_boundary_denied: "This skill belongs to another organization.",skill_workspace_boundary_denied: "This skill source is outside an allowed workspace.",skill_source_validation_failed: "This skill source failed validation.",skill_unsafe_content_blocked: "This skill contains unsafe content.",@@ -77,9 +77,9 @@ const PLATFORM_TITLES: Record<string, string> = {/** Default remediation copy per platform-invariant code — framed as a fix, never a grant. */const PLATFORM_REMEDIATIONS: Record<string, string> = {skill_authentication_required: "Sign in and try again.",- skill_company_boundary_denied: "Open the skill from the company that owns it.",+ skill_company_boundary_denied: "Open the skill from the organization that owns it.",skill_workspace_boundary_denied:- "Import from a configured Paperclip workspace or the company managed-skill directory.",+ "Import from a configured Paperclip workspace or the organization managed-skill directory.",skill_source_validation_failed: "Fix the flagged source and retry.",skill_unsafe_content_blocked:"Remove the fetch-and-execute or unsafe pattern before saving.",@@ -119,8 +119,8 @@ export function classifySkillDenial(|| reason === "policy_default";if (isPolicyDenial) {const title = actionLabel- ? `${actionLabel} is restricted by your company policy.`- : "This action is restricted by your company policy.";+ ? `${actionLabel} is restricted by your organization policy.`+ : "This action is restricted by your organization policy.";return {state: "policy",code,diff --git a/ui/src/lib/trust-policy-ui.ts b/ui/src/lib/trust-policy-ui.tsindex c46cbdc344..f2442435d8 100644--- a/ui/src/lib/trust-policy-ui.ts+++ b/ui/src/lib/trust-policy-ui.ts@@ -21,7 +21,7 @@ export const TRUST_PRESET_LABELS: Record<TrustPreset, string> = {};export const TRUST_PRESET_DESCRIPTIONS: Record<TrustPreset, string> = {- standard: "Company-visible collaboration. This is the default for normal work.",+ standard: "Organization-visible collaboration. This is the default for normal work.",low_trust_review:"Contained for hostile or untrusted input. Narrow Paperclip API, quarantined output. Use for PR review and external-content triage.",};diff --git a/ui/src/lib/workspace-access-state.test.ts b/ui/src/lib/workspace-access-state.test.tsindex 594a2feb5a..bc48c39ae4 100644--- a/ui/src/lib/workspace-access-state.test.ts+++ b/ui/src/lib/workspace-access-state.test.ts@@ -298,7 +298,7 @@ describe("resolveWorkspaceAccessState", () => {},});expect(access).toMatchObject({ state: "validating", action: { kind: "wait" } });- expect(access.description).toContain("restored no company or issue rows");+ expect(access.description).toContain("restored no organization or issue rows");});it("degrades a verified clone whose database regressed and offers one repair", () => {@@ -398,7 +398,7 @@ describe("describeWorkspaceReadinessCause", () => {failurePhase: "cloned_membership_missing",},}),- ).toBe("No cloned user has an active company membership.");+ ).toBe("No cloned user has an active organization membership.");});it("falls back to the reason and finally to null", () => {diff --git a/ui/src/lib/workspace-access-state.ts b/ui/src/lib/workspace-access-state.tsindex 049974e7a2..7326338425 100644--- a/ui/src/lib/workspace-access-state.ts+++ b/ui/src/lib/workspace-access-state.ts@@ -106,9 +106,9 @@ const HANDOFF_REASON_COPY: Record<string, string> = {const READINESS_FAILURE_COPY: Record<string, string> = {database_unreachable: "The isolated database is not answering.",- clone_data_missing: "The clone restored no company or issue rows.",+ clone_data_missing: "The clone restored no organization or issue rows.",clone_data_unreadable: "The cloned product tables could not be read.",- cloned_membership_missing: "No cloned user has an active company membership.",+ cloned_membership_missing: "No cloned user has an active organization membership.",cloned_identity_unreadable: "The cloned identity tables could not be read.",auth_handoff_not_configured: "The workspace was started without a login handoff key.",seed_manifest_unreadable: "The seed manifest is unreadable, so the restore cannot be trusted.",diff --git a/ui/src/pages/AdapterManager.tsx b/ui/src/pages/AdapterManager.tsxindex 57ab9fa336..d9f643ef80 100644--- a/ui/src/pages/AdapterManager.tsx+++ b/ui/src/pages/AdapterManager.tsx@@ -269,7 +269,7 @@ export function AdapterManager() {useEffect(() => {setBreadcrumbs([- { label: selectedCompany?.name ?? "Company", href: "/dashboard" },+ { label: selectedCompany?.name ?? "Organization", href: "/dashboard" },{ label: "Settings", href: "/company/settings" },{ label: "Adapters" },]);diff --git a/ui/src/pages/AgentDetail.tsx b/ui/src/pages/AgentDetail.tsxindex 1f247223b4..962969cb2d 100644--- a/ui/src/pages/AgentDetail.tsx+++ b/ui/src/pages/AgentDetail.tsx@@ -2166,9 +2166,9 @@ function ConfigurationTab({: taskAssignSource === "agent_creator"? "Enabled automatically while this agent can create new agents.": taskAssignSource === "explicit_grant"- ? "Enabled via explicit company permission grant."+ ? "Enabled via explicit organization permission grant.": taskAssignSource === "simple_default"- ? "Enabled by simple company-wide task assignment defaults."+ ? "Enabled by simple organization-wide task assignment defaults.": "Disabled unless explicitly granted.";return (@@ -2243,7 +2243,7 @@ function ConfigurationTab({<div className="space-y-1"><div>Can create/import skills</div><p className="text-xs text-muted-foreground">- Lets this agent install, import, create, and scan company skills without creating agents.+ Lets this agent install, import, create, and scan organization skills without creating agents.</p></div><ToggleSwitch@@ -2430,7 +2430,7 @@ export function PromptsTab({const uploadMarkdownImage = useMutation({mutationFn: async ({ file, namespace }: { file: File; namespace: string }) => {- if (!selectedCompanyId) throw new Error("Select a company to upload images");+ if (!selectedCompanyId) throw new Error("Select an organization to upload images");return assetsApi.uploadImage(selectedCompanyId, file, namespace);},});diff --git a/ui/src/pages/AgentToolsTab.test.tsx b/ui/src/pages/AgentToolsTab.test.tsxindex 5ba996769b..9fd3320d83 100644--- a/ui/src/pages/AgentToolsTab.test.tsx+++ b/ui/src/pages/AgentToolsTab.test.tsx@@ -240,7 +240,7 @@ describe("AgentToolsTab", () => {expect(text).toContain("Production GitHub");expect(text).toContain("GitHub safe");expect(text).toContain("Access profiles");- expect(text).toContain("Company default");+ expect(text).toContain("Organization default");expect(container.querySelector('a[href="/apps/advanced/profiles/prof-1"]')?.textContent).toBe("GitHub safe");expect(container.querySelector('a[href="/apps/advanced/profiles?check=1"]')?.textContent).toBe("Check access");// Governing policy #1 is the company-wide require_approval rule.diff --git a/ui/src/pages/AgentToolsTab.tsx b/ui/src/pages/AgentToolsTab.tsxindex 3b22837d7e..7e4099510c 100644--- a/ui/src/pages/AgentToolsTab.tsx+++ b/ui/src/pages/AgentToolsTab.tsx@@ -549,7 +549,7 @@ export function AgentToolsTab({ agent, companyId }: { agent: AgentDetailRecord;{profile.summary.isCompanyDefault ? (<div className="mt-1"><span className="rounded border border-border px-1.5 py-0.5 text-(length:--text-nano) uppercase text-muted-foreground">- Company default+ Organization default</span></div>) : null}diff --git a/ui/src/pages/Agents.tsx b/ui/src/pages/Agents.tsxindex 8e519f538b..01c90c944f 100644--- a/ui/src/pages/Agents.tsx+++ b/ui/src/pages/Agents.tsx@@ -328,7 +328,7 @@ export function Agents() {}, [builtInAgentsEnabled, instanceSettings, navigate, requestedTab, selectedCompanyId]);if (!selectedCompanyId) {- return <EmptyState icon={Bot} message="Select a company to view agents." />;+ return <EmptyState icon={Bot} message="Select an organization to view agents." />;}if (isLoading) {diff --git a/ui/src/pages/Approvals.tsx b/ui/src/pages/Approvals.tsxindex 597e48e1eb..10ac21c855 100644--- a/ui/src/pages/Approvals.tsx+++ b/ui/src/pages/Approvals.tsx@@ -76,7 +76,7 @@ export function Approvals() {).length;if (!selectedCompanyId) {- return <p className="text-sm text-muted-foreground">Select a company first.</p>;+ return <p className="text-sm text-muted-foreground">Select an organization first.</p>;}if (isLoading) {diff --git a/ui/src/pages/Artifacts.tsx b/ui/src/pages/Artifacts.tsxindex 8d09e459dc..4bb04e8cda 100644--- a/ui/src/pages/Artifacts.tsx+++ b/ui/src/pages/Artifacts.tsx@@ -227,7 +227,7 @@ export function Artifacts() {}, [setBreadcrumbs, viewingSelectedStack, selectedGroup]);if (!selectedCompanyId) {- return <EmptyState icon={Package} message="Select a company to view artifacts." />;+ return <EmptyState icon={Package} message="Select an organization to view artifacts." />;}const showGroupCards = viewingStackList;diff --git a/ui/src/pages/BoardChat.test.tsx b/ui/src/pages/BoardChat.test.tsxindex 77faf5f11a..a18800ddd1 100644--- a/ui/src/pages/BoardChat.test.tsx+++ b/ui/src/pages/BoardChat.test.tsx@@ -110,7 +110,7 @@ function hasWelcome(container: HTMLElement) {}function hasChips(container: HTMLElement) {- return (container.textContent ?? "").includes("Draft a Company Brief");+ return (container.textContent ?? "").includes("Draft an Organization Brief");}describe("BoardChat staged typing intro", () => {diff --git a/ui/src/pages/BoardChat.tsx b/ui/src/pages/BoardChat.tsxindex 0faafa9cc8..caf067fbe2 100644--- a/ui/src/pages/BoardChat.tsx+++ b/ui/src/pages/BoardChat.tsx@@ -658,9 +658,9 @@ export function BoardChat() {return (<div className="flex items-center justify-center h-full"><div className="text-center max-w-sm">- <h2 className="text-lg font-semibold">No company selected</h2>+ <h2 className="text-lg font-semibold">No organization selected</h2><p className="text-sm text-muted-foreground mt-2">- Select a company to start chatting with your board concierge.+ Select an organization to start chatting with your board concierge.</p></div></div>@@ -692,7 +692,7 @@ export function BoardChat() {{ceoAgent?.name ?? "Conference Room"}</h3><p className="text-xs text-muted-foreground">- {selectedCompany?.name ?? "Your company"}+ {selectedCompany?.name ?? "Your organization"}</p></div><div className="flex shrink-0 items-center gap-0.5">@@ -756,8 +756,8 @@ export function BoardChat() {const chips: Array<{ label: string; prompt: string }> = [{- label: "Draft a Company Brief",- prompt: `Draft a one-page Company Brief for ${companyName} — include our mission, team roster, and first priorities.`,+ label: "Draft an Organization Brief",+ prompt: `Draft a one-page Organization Brief for ${companyName} — include our mission, team roster, and first priorities.`,},{label: "Create a hiring plan",@@ -967,7 +967,7 @@ export function BoardChat() {value={input}onChange={setInput}onSubmit={handleSend}- placeholder="Ask anything about your company..."+ placeholder="Ask anything about your organization..."submitKey="enter"surface="translucent"submitting={sending}diff --git a/ui/src/pages/BoardClaim.tsx b/ui/src/pages/BoardClaim.tsxindex 0af36cb35f..4645edafcd 100644--- a/ui/src/pages/BoardClaim.tsx+++ b/ui/src/pages/BoardClaim.tsx@@ -104,7 +104,7 @@ export function BoardClaimPage() {<Card className="block p-6"><h1 className="text-xl font-semibold">Claim Board ownership</h1><p className="mt-2 text-sm text-muted-foreground">- This will promote your user to instance admin and migrate company ownership access from local trusted mode.+ This will promote your user to instance admin and migrate organization ownership access from local trusted mode.</p>{claimMutation.error && (diff --git a/ui/src/pages/BootstrapSetupUxLab.tsx b/ui/src/pages/BootstrapSetupUxLab.tsxindex 4d20299c7f..3e7c0003e0 100644--- a/ui/src/pages/BootstrapSetupUxLab.tsx+++ b/ui/src/pages/BootstrapSetupUxLab.tsx@@ -162,7 +162,7 @@ function ClaimSuccess() {<div><h1 className="text-xl font-semibold">You’re the instance admin</h1><p className="mt-2 text-sm text-muted-foreground">- Setup is complete. Taking you to onboarding to create your first company…+ Setup is complete. Taking you to onboarding to create your first organization…</p></div></div>diff --git a/ui/src/pages/CliAuth.tsx b/ui/src/pages/CliAuth.tsxindex cb40bc6958..ae706db6be 100644--- a/ui/src/pages/CliAuth.tsx+++ b/ui/src/pages/CliAuth.tsx@@ -143,7 +143,7 @@ export function CliAuthPage() {</div>{challenge.requestedCompanyName && (<div>- <div className="text-muted-foreground">Requested company</div>+ <div className="text-muted-foreground">Requested organization</div><div className="text-foreground">{challenge.requestedCompanyName}</div></div>)}diff --git a/ui/src/pages/Companies.test.tsx b/ui/src/pages/Companies.test.tsxindex e80c305a8c..6ee7c306b8 100644--- a/ui/src/pages/Companies.test.tsx+++ b/ui/src/pages/Companies.test.tsx@@ -103,7 +103,7 @@ describe("Companies page", () => {it("offers the company wizard when self-hosted", async () => {const root = await renderPage();- expect(container.textContent).toContain("New Company");+ expect(container.textContent).toContain("New Organization");act(() => {root.unmount();@@ -115,7 +115,7 @@ describe("Companies page", () => {// Cloud stacks hold exactly one company and POST /companies is a 403 floor,// so the entry point must not be offered at all.- expect(container.textContent).not.toContain("New Company");+ expect(container.textContent).not.toContain("New Organization");expect(container.textContent).toContain("Acme Labs");expect(mockOpenOnboarding).not.toHaveBeenCalled();diff --git a/ui/src/pages/Companies.tsx b/ui/src/pages/Companies.tsxindex 8e307201c4..fea4d97a34 100644--- a/ui/src/pages/Companies.tsx+++ b/ui/src/pages/Companies.tsx@@ -89,7 +89,7 @@ export function Companies() {});useEffect(() => {- setBreadcrumbs([{ label: "Companies" }]);+ setBreadcrumbs([{ label: "Organizations" }]);}, [setBreadcrumbs]);function startEdit(companyId: string, currentName: string) {@@ -113,13 +113,13 @@ export function Companies() {{isCloud ? null : (<Button size="sm" onClick={() => openOnboarding()}><Plus className="h-3.5 w-3.5 mr-1.5" />- New Company+ New Organization</Button>)}</div><div className="h-6">- {loading && <p className="text-sm text-muted-foreground">Loading companies...</p>}+ {loading && <p className="text-sm text-muted-foreground">Loading organizations...</p>}{error && <p className="text-sm text-destructive">{error.message}</p>}</div>@@ -253,7 +253,7 @@ export function Companies() {onClick={() => setConfirmDeleteId(company.id)}><Trash2 className="h-3.5 w-3.5" />- Delete Company+ Delete Organization</DropdownMenuItem></DropdownMenuContent></DropdownMenu>@@ -296,7 +296,7 @@ export function Companies() {onClick={(e) => e.stopPropagation()}><p className="text-sm text-destructive font-medium">- Delete this company and all its data? This cannot be undone.+ Delete this organization and all its data? This cannot be undone.</p><div className="flex items-center gap-2 ml-4 shrink-0"><Buttondiff --git a/ui/src/pages/CompanyAccess.test.tsx b/ui/src/pages/CompanyAccess.test.tsxindex e78c252546..84ac8c8f66 100644--- a/ui/src/pages/CompanyAccess.test.tsx+++ b/ui/src/pages/CompanyAccess.test.tsx@@ -236,7 +236,7 @@ describe("CompanyAccess", () => {});await flushReact();- expect(document.body.textContent).toContain("Update company role and membership status");+ expect(document.body.textContent).toContain("Update organization role and membership status");expect(document.body.textContent).not.toContain("Implicit grants from role");expect(document.body.textContent).not.toContain("permissionKey");diff --git a/ui/src/pages/CompanyAccess.tsx b/ui/src/pages/CompanyAccess.tsxindex 4208713552..9f7e71da87 100644--- a/ui/src/pages/CompanyAccess.tsx+++ b/ui/src/pages/CompanyAccess.tsx@@ -43,7 +43,7 @@ export function CompanyAccess() {useEffect(() => {setBreadcrumbs([- { label: selectedCompany?.name ?? "Company", href: "/dashboard" },+ { label: selectedCompany?.name ?? "Organization", href: "/dashboard" },{ label: "Settings", href: "/company/settings" },{ label: "Members" },]);@@ -202,20 +202,20 @@ export function CompanyAccess() {}, [removingMember]);if (!selectedCompanyId) {- return <div className="text-sm text-muted-foreground">Select a company to manage access.</div>;+ return <div className="text-sm text-muted-foreground">Select an organization to manage access.</div>;}if (membersQuery.isLoading) {- return <div className="text-sm text-muted-foreground">Loading company access…</div>;+ return <div className="text-sm text-muted-foreground">Loading organization access…</div>;}if (membersQuery.error) {const message =membersQuery.error instanceof ApiError && membersQuery.error.status === 403- ? "You do not have permission to manage company members."+ ? "You do not have permission to manage organization members.": membersQuery.error instanceof Error? membersQuery.error.message- : "Failed to load company members.";+ : "Failed to load organization members.";return <div className="text-sm text-destructive">{message}</div>;}@@ -238,12 +238,12 @@ export function CompanyAccess() {<div className="max-w-6xl space-y-8"><div className="flex items-center gap-2"><ShieldCheck className="h-5 w-5 text-muted-foreground" />- <h1 className="text-lg font-semibold">Company Members</h1>+ <h1 className="text-lg font-semibold">Organization Members</h1></div>{access && !access.currentUserRole && (<div className="rounded-xl bg-amber-500/10 px-4 py-3 text-sm text-amber-800 dark:text-amber-200">- This account can manage access here through instance-admin privileges, but it does not currently hold an active company membership.+ This account can manage access here through instance-admin privileges, but it does not currently hold an active organization membership.</div>)}@@ -254,7 +254,7 @@ export function CompanyAccess() {<div><h3 className="text-sm font-semibold">Pending human joins</h3><p className="text-sm text-muted-foreground">- Review pending join requests before they become active company members.+ Review pending join requests before they become active organization members.</p></div><Badge variant="outline">{pendingHumanJoinRequests.length} pending</Badge>@@ -307,7 +307,7 @@ export function CompanyAccess() {{members.length === 0 ? (<tr><td colSpan={5} className="px-3 py-8 text-muted-foreground">- No user memberships found for this company yet.+ No user memberships found for this organization yet.</td></tr>) : members.map((member) => {@@ -373,14 +373,14 @@ export function CompanyAccess() {<DialogHeader><DialogTitle>Edit member</DialogTitle><DialogDescription>- Update company role and membership status for {editingMember?.user?.name || editingMember?.user?.email || editingMember?.principalId}.+ Update organization role and membership status for {editingMember?.user?.name || editingMember?.user?.email || editingMember?.principalId}.</DialogDescription></DialogHeader>{editingMember && (<div className="space-y-5"><div className="grid gap-4 md:grid-cols-2"><label className="space-y-2 text-sm">- <span className="font-medium">Company role</span>+ <span className="font-medium">Organization role</span><selectclassName="w-full rounded-md border border-border bg-background px-3 py-2"value={draftRole ?? ""}@@ -556,7 +556,7 @@ export function CompanyAccessLegacyRoute() {<h1 className="text-lg font-semibold">Advanced Permissions</h1></div><p className="text-sm text-muted-foreground">- Advanced access, scoped assignment, and explicit grant controls are provided by installed company settings extensions.+ Advanced access, scoped assignment, and explicit grant controls are provided by installed organization settings extensions.</p></div>@@ -564,7 +564,7 @@ export function CompanyAccessLegacyRoute() {<div className="space-y-2"><h2 className="text-sm font-semibold">Advanced permissions unavailable</h2><p className="text-sm text-muted-foreground">- Core Paperclip keeps enforcing company boundaries and any existing restrictive policy data, but editing advanced permissions requires an installed extension.+ Core Paperclip keeps enforcing organization boundaries and any existing restrictive policy data, but editing advanced permissions requires an installed extension.</p>{errorMessage ? (<p className="text-sm text-destructive">Plugin extensions unavailable: {errorMessage}</p>diff --git a/ui/src/pages/CompanyEnvironments.tsx b/ui/src/pages/CompanyEnvironments.tsxindex c4ffc09646..8600b40b9e 100644--- a/ui/src/pages/CompanyEnvironments.tsx+++ b/ui/src/pages/CompanyEnvironments.tsx@@ -1409,7 +1409,7 @@ export function CompanyEnvironments({ mode = "list" }: CompanyEnvironmentsProps)});const createSecret = useMutation({mutationFn: (input: { name: string; value: string }) => {- if (!selectedCompanyId) throw new Error("Select a company to create secrets");+ if (!selectedCompanyId) throw new Error("Select an organization to create secrets");return secretsApi.create(selectedCompanyId, input);},onSuccess: async () => {@@ -1888,7 +1888,7 @@ export function CompanyEnvironments({ mode = "list" }: CompanyEnvironmentsProps)if (deleteBlastRadius && !deleteBlockMessage) {if (deleteBlastRadius.staticReferences.agentDefaultCount > agentsUsingEnvironment.length) {deleteImpactNotes.push(- "Other references to this environment (agents in other companies or terminated agents) fall back to the instance default.",+ "Other references to this environment (agents in other organizations or terminated agents) fall back to the instance default.",);}const selectionCount =@@ -1940,7 +1940,7 @@ export function CompanyEnvironments({ mode = "list" }: CompanyEnvironmentsProps)})();if (!selectedCompanyId) {- return <div className="text-sm text-muted-foreground">Select a company context to manage environment secrets and bindings.</div>;+ return <div className="text-sm text-muted-foreground">Select an organization context to manage environment secrets and bindings.</div>;}if (!environmentsEnabled) {@@ -2102,7 +2102,7 @@ export function CompanyEnvironments({ mode = "list" }: CompanyEnvironmentsProps){isEnvironmentFormPage && mode === "edit" && environments !== undefined && !editingEnvironment ? (<div className="space-y-3 text-sm"><div className="font-medium">Environment not found</div>- <div className="text-muted-foreground">The environment may have been removed or is not available in this company.</div>+ <div className="text-muted-foreground">The environment may have been removed or is not available in this organization.</div><Button size="sm" variant="outline" asChild><Link to={ENVIRONMENTS_PATH}>Back to environments</Link></Button>@@ -2139,7 +2139,7 @@ export function CompanyEnvironments({ mode = "list" }: CompanyEnvironmentsProps)<div className="py-4"><Fieldlabel="Environment variables"- hint="Injected into runs that resolve through this environment. Use plain values or company secrets."+ hint="Injected into runs that resolve through this environment. Use plain values or organization secrets."><EnvironmentVariablesEditorref={environmentVariablesEditorRef}@@ -2427,7 +2427,7 @@ export function CompanyEnvironments({ mode = "list" }: CompanyEnvironmentsProps)<Fieldlabel="Environment variables"- hint="Injected into runs that resolve through this environment. Use plain values or company secrets."+ hint="Injected into runs that resolve through this environment. Use plain values or organization secrets."><EnvironmentVariablesEditorref={environmentVariablesEditorRef}diff --git a/ui/src/pages/CompanyExport.tsx b/ui/src/pages/CompanyExport.tsxindex 64352b8c9f..c0409607af 100644--- a/ui/src/pages/CompanyExport.tsx+++ b/ui/src/pages/CompanyExport.tsx@@ -733,7 +733,7 @@ export function CompanyExport() {useEffect(() => {setBreadcrumbs([- { label: selectedCompany?.name ?? "Company", href: "/dashboard" },+ { label: selectedCompany?.name ?? "Organization", href: "/dashboard" },{ label: "Settings", href: "/company/settings" },{ label: "Export" },]);@@ -1024,7 +1024,7 @@ export function CompanyExport() {}if (!selectedCompanyId) {- return <EmptyState icon={Package} message="Select a company to export." />;+ return <EmptyState icon={Package} message="Select an organization to export." />;}if (exportPreviewMutation.isPending && !exportData) {@@ -1084,7 +1084,7 @@ export function CompanyExport() {<div className="flex flex-wrap items-center justify-between gap-3"><div className="flex flex-wrap items-center gap-4 text-sm"><span className="font-medium">- {selectedCompany?.name ?? "Company"} export+ {selectedCompany?.name ?? "Organization"} export</span><span className="text-muted-foreground">Exporting {selectedCount.toLocaleString()} of {totalFiles.toLocaleString()} file{totalFiles === 1 ? "" : "s"}diff --git a/ui/src/pages/CompanyImport.test.tsx b/ui/src/pages/CompanyImport.test.tsxindex 272a924705..66a6e871ba 100644--- a/ui/src/pages/CompanyImport.test.tsx+++ b/ui/src/pages/CompanyImport.test.tsx@@ -714,7 +714,7 @@ describe("CompanyImport", () => {// Config edits while the import is in flight must not detach it from// the UI: the progress panel keeps reporting it until it settles.const midFlightNameInput = container.querySelector<HTMLInputElement>(- 'input[placeholder="Imported Company"]',+ 'input[placeholder="Imported Organization"]',);expect(midFlightNameInput).toBeTruthy();await act(async () => {@@ -738,7 +738,7 @@ describe("CompanyImport", () => {// The new-company name feeds the request payload too: editing it clears// the stale error panel without discarding the rendered preview.- const nameInput = container.querySelector<HTMLInputElement>('input[placeholder="Imported Company"]');+ const nameInput = container.querySelector<HTMLInputElement>('input[placeholder="Imported Organization"]');expect(nameInput).toBeTruthy();await act(async () => {const setter = Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, "value")!.set!;@@ -950,7 +950,7 @@ describe("CompanyImport", () => {await renderPageAndImport();expect(container.textContent).toContain("Import completed");- expect(container.textContent).toContain("select it from the company switcher");+ expect(container.textContent).toContain("select it from the organization switcher");// No readable company, so no dashboard CTA — the switcher guidance stands in.expect(container.querySelector('[data-testid="import-expired-open-company"]')).toBeNull();});diff --git a/ui/src/pages/CompanyImport.tsx b/ui/src/pages/CompanyImport.tsxindex 21b57eb9d4..fa3787d7b7 100644--- a/ui/src/pages/CompanyImport.tsx+++ b/ui/src/pages/CompanyImport.tsx@@ -697,7 +697,7 @@ async function readLocalPackageZip(file: File): Promise<{files: Record<string, CompanyPortabilityFileEntry>;}> {if (!/\.zip$/i.test(file.name)) {- throw new Error("Select a .zip company package.");+ throw new Error("Select a .zip organization package.");}const archive = await readZipArchive(await file.arrayBuffer());if (Object.keys(archive.files).length === 0) {@@ -1273,7 +1273,7 @@ export function CompanyImport() {pushToast({tone: "success",title: "Import completed",- body: "Open the company to view it.",+ body: "Open the organization to view it.",});return;}@@ -1643,7 +1643,7 @@ export function CompanyImport() {<p className="text-xs text-muted-foreground mt-1">{importOutcome.companyName? <>The import finished and <span className="font-medium text-foreground">{importOutcome.companyName}</span> is ready. Its detailed summary is no longer available.</>- : "The import finished and your company is ready. Its detailed summary is no longer available, but the company has been added — select it from the company switcher to view it."}+ : "The import finished and your organization is ready. Its detailed summary is no longer available, but the organization has been added — select it from the organization switcher to view it."}</p>{importOutcome.pausedAutomations ? (<p className="text-xs text-muted-foreground mt-1">@@ -1661,7 +1661,7 @@ export function CompanyImport() {// immediately visible (same reason as the full-outcome CTA).onClick={() => window.location.assign(importOutcome.dashboardPath!)}>- Open company dashboard+ Open organization dashboard</Button></div>) : null}@@ -1809,7 +1809,7 @@ export function CompanyImport() {}if (!selectedCompanyId) {- return <EmptyState icon={Download} message="Select a company to import into." />;+ return <EmptyState icon={Download} message="Select an organization to import into." />;}return (@@ -1906,7 +1906,7 @@ export function CompanyImport() {</Field>)}- <Field label="Target" hint="Import into this company or create a new one.">+ <Field label="Target" hint="Import into this organization or create a new one."><selectclassName="w-full rounded-md border border-border bg-transparent px-2.5 py-1.5 text-sm outline-none"value={targetMode}@@ -1916,7 +1916,7 @@ export function CompanyImport() {resetImportFlowState();}}>- <option value="new">Create new company</option>+ <option value="new">Create new organization</option><option value="existing">Existing company: {selectedCompany?.name}</option>@@ -1925,7 +1925,7 @@ export function CompanyImport() {{targetMode === "new" && (<Field- label="New company name"+ label="New organization name"hint="Optional override. Leave blank to use the package name."><input@@ -1936,14 +1936,14 @@ export function CompanyImport() {setNewCompanyName(e.target.value);resetMutationState();}}- placeholder="Imported Company"+ placeholder="Imported Organization"/></Field>)}<Fieldlabel="Collision strategy"- hint="Board imports can rename, skip, or replace matching company content."+ hint="Board imports can rename, skip, or replace matching organization content."><selectclassName="w-full rounded-md border border-border bg-transparent px-2.5 py-1.5 text-sm outline-none"diff --git a/ui/src/pages/CompanyInvites.test.tsx b/ui/src/pages/CompanyInvites.test.tsxindex dc2e3b3e32..c7da613c50 100644--- a/ui/src/pages/CompanyInvites.test.tsx+++ b/ui/src/pages/CompanyInvites.test.tsx@@ -136,7 +136,7 @@ describe("CompanyInvites", () => {await flushReact();await flushReact();- expect(container.textContent).toContain("Company Invites");+ expect(container.textContent).toContain("Organization Invites");expect(container.textContent).toContain("Invite a person");expect(container.textContent).not.toContain("Invite an agent");expect(container.textContent).not.toContain("Generate agent onboarding prompt");diff --git a/ui/src/pages/CompanyInvites.tsx b/ui/src/pages/CompanyInvites.tsxindex 291ba8181a..8540cf784d 100644--- a/ui/src/pages/CompanyInvites.tsx+++ b/ui/src/pages/CompanyInvites.tsx@@ -16,8 +16,8 @@ const inviteRoleOptions = [{value: "viewer",label: "Viewer",- description: "Can view company work and follow along.",- gets: "View-only company membership.",+ description: "Can view organization work and follow along.",+ gets: "View-only organization membership.",},{value: "operator",@@ -34,7 +34,7 @@ const inviteRoleOptions = [{value: "owner",label: "Owner",- description: "Full company access, including membership management.",+ description: "Full organization access, including membership management.",gets: "Everything in Admin, plus managing members.",},] as const;@@ -90,7 +90,7 @@ export function CompanyInvites() {useEffect(() => {setBreadcrumbs([- { label: selectedCompany?.name ?? "Company", href: "/dashboard" },+ { label: selectedCompany?.name ?? "Organization", href: "/dashboard" },{ label: "Settings", href: "/company/settings" },{ label: "Invites" },]);@@ -160,7 +160,7 @@ export function CompanyInvites() {});if (!selectedCompanyId) {- return <div className="text-sm text-muted-foreground">Select a company to manage invites.</div>;+ return <div className="text-sm text-muted-foreground">Select an organization to manage invites.</div>;}if (invitesQuery.isLoading) {@@ -170,7 +170,7 @@ export function CompanyInvites() {if (invitesQuery.error) {const message =invitesQuery.error instanceof ApiError && invitesQuery.error.status === 403- ? "You do not have permission to manage company invites."+ ? "You do not have permission to manage organization invites.": invitesQuery.error instanceof Error? invitesQuery.error.message: "Failed to load invites.";@@ -182,10 +182,10 @@ export function CompanyInvites() {<div className="space-y-3"><div className="flex items-center gap-2"><MailPlus className="h-5 w-5 text-muted-foreground" />- <h1 className="text-lg font-semibold">Company Invites</h1>+ <h1 className="text-lg font-semibold">Organization Invites</h1></div><p className="max-w-3xl text-sm text-muted-foreground">- Invite people to request access to this company. New invite links are copied to your clipboard when they are generated.+ Invite people to request access to this organization. New invite links are copied to your clipboard when they are generated.</p></div>@@ -311,7 +311,7 @@ export function CompanyInvites() {{inviteHistory.length === 0 ? (<div className="border-t border-border px-5 py-8 text-sm text-muted-foreground">- No invites have been created for this company yet.+ No invites have been created for this organization yet.</div>) : (<div className="border-t border-border">diff --git a/ui/src/pages/CompanySettings.tsx b/ui/src/pages/CompanySettings.tsxindex f7e280dd6d..d78cc89c21 100644--- a/ui/src/pages/CompanySettings.tsx+++ b/ui/src/pages/CompanySettings.tsx@@ -180,7 +180,7 @@ export function CompanySettings() {if (!selectedCompany) {return (<div className="text-sm text-muted-foreground">- No company selected. Select a company from the switcher above.+ No organization selected. Select an organization from the switcher above.</div>);}@@ -207,7 +207,7 @@ export function CompanySettings() {General</div><div className="space-y-3">- <Field label="Company name" hint="The display name for your company.">+ <Field label="Organization name" hint="The display name for your organization."><inputclassName="w-full rounded-md border border-border bg-transparent px-2.5 py-1.5 text-sm outline-none"type="text"@@ -217,13 +217,13 @@ export function CompanySettings() {</Field><Fieldlabel="Description"- hint="Optional description shown in the company profile."+ hint="Optional description shown in the organization profile."><inputclassName="w-full rounded-md border border-border bg-transparent px-2.5 py-1.5 text-sm outline-none"type="text"value={description}- placeholder="Optional company description"+ placeholder="Optional organization description"onChange={(e) => setDescription(e.target.value)}/></Field>@@ -289,7 +289,7 @@ export function CompanySettings() {</Field><Fieldlabel="Brand color"- hint="Sets the hue for the company icon. Leave empty for auto-generated color."+ hint="Sets the hue for the organization icon. Leave empty for auto-generated color."><div className="flex items-center gap-2">{/* token-extraction: allowlisted — <input type="color"> value must be a real hex string, not a var() reference. */}@@ -414,7 +414,7 @@ export function CompanySettings() {</div><div className="space-y-3 bg-destructive/5 px-4 py-4"><p className="text-sm text-muted-foreground">- Archive this company to hide it from the sidebar. This persists in+ Archive this organization to hide it from the sidebar. This persists inthe database.</p><div className="flex items-center gap-2">@@ -428,7 +428,7 @@ export function CompanySettings() {onClick={() => {if (!selectedCompanyId) return;const confirmed = window.confirm(- `Archive company "${selectedCompany.name}"? It will be hidden from the sidebar.`+ `Archive organization "${selectedCompany.name}"? It will be hidden from the sidebar.`);if (!confirmed) return;const nextCompanyId =@@ -447,13 +447,13 @@ export function CompanySettings() {? "Archiving...": selectedCompany.status === "archived"? "Already archived"- : "Archive company"}+ : "Archive organization"}</Button>{archiveMutation.isError && (<span className="text-xs text-destructive">{archiveMutation.error instanceof Error? archiveMutation.error.message- : "Failed to archive company"}+ : "Failed to archive organization"}</span>)}</div>diff --git a/ui/src/pages/CompanySettingsPluginPage.tsx b/ui/src/pages/CompanySettingsPluginPage.tsxindex 2ad5ba5193..091c7d6830 100644--- a/ui/src/pages/CompanySettingsPluginPage.tsx+++ b/ui/src/pages/CompanySettingsPluginPage.tsx@@ -50,7 +50,7 @@ export function CompanySettingsPluginPage() {if (hasInvalidCompanyPrefix) {return <NotFoundPage scope="invalid_company_prefix" requestedPrefix={routeCompanyPrefix} />;}- return <div className="text-sm text-muted-foreground">Select a company to view this page.</div>;+ return <div className="text-sm text-muted-foreground">Select an organization to view this page.</div>;}if (!settingsRoutePath || isLoading) {diff --git a/ui/src/pages/CompanySkills.test.tsx b/ui/src/pages/CompanySkills.test.tsxindex ff565fdf9a..cabcb1a4c6 100644--- a/ui/src/pages/CompanySkills.test.tsx+++ b/ui/src/pages/CompanySkills.test.tsx@@ -655,7 +655,7 @@ describe("SkillDetailPage settings", () => {detail: makeDetail(v1, { folderPath: "engineering/code-review" }),});- expect(node.textContent).toContain("Company / Engineering / Code Review");+ expect(node.textContent).toContain("Organization / Engineering / Code Review");});it("shows a direct fork action for read-only skills", async () => {diff --git a/ui/src/pages/CompanySkills.tsx b/ui/src/pages/CompanySkills.tsxindex 0f9e67ddb7..6440e73a9c 100644--- a/ui/src/pages/CompanySkills.tsx+++ b/ui/src/pages/CompanySkills.tsx@@ -321,7 +321,7 @@ type SourceFilter = "all" | "company" | "bundled" | "optional" | "external";const SOURCE_FILTER_LABELS: Record<SourceFilter, string> = {all: "All",- company: "Company",+ company: "Organization",bundled: "Bundled",optional: "Optional",external: "External",@@ -654,7 +654,7 @@ function categorySetKey(categories: string[]) {}function skillSettingsToastBody(skill: Pick<CompanySkillDetail, "categories" | "sharingScope">) {- const sharing = skill.sharingScope === "private" ? "Sharing: private" : "Sharing: company";+ const sharing = skill.sharingScope === "private" ? "Sharing: private" : "Sharing: organization";const categories = skill.categories.length ? `Categories: ${skill.categories.join(", ")}` : "Categories: none";return `${sharing} | ${categories}`;}@@ -1644,7 +1644,7 @@ function NewSkillWizard({<span className="text-muted-foreground">Slug</span><span className="font-mono">{effectiveSlug || "skill"}</span><span className="text-muted-foreground">Scope</span>- <span>{draft.sharingScope === "private" ? "Private" : "Company"}</span>+ <span>{draft.sharingScope === "private" ? "Private" : "Organization"}</span><span className="text-muted-foreground">Categories</span><span>{draft.categories.length ? draft.categories.join(", ") : "none"}</span></div>@@ -1661,9 +1661,9 @@ function NewSkillWizard({draft.sharingScope === scope ? "border-foreground bg-accent/50" : "border-border",)}>- <span className="block font-medium">{scope === "company" ? "Company" : "Private"}</span>+ <span className="block font-medium">{scope === "company" ? "Organization" : "Private"}</span><span className="mt-1 block text-xs text-muted-foreground">- {scope === "company" ? "Visible inside this company." : "Only visible in your library."}+ {scope === "company" ? "Visible inside this organization." : "Only visible in your library."}</span></button>))}@@ -2175,7 +2175,7 @@ export function InstallPreviewDialog({<div className="rounded-md border border-border p-3"><div className="mb-1 text-xs uppercase tracking-wide text-muted-foreground">Enable for agents</div><p className="mb-2 text-xs text-muted-foreground">- Installing adds the skill to the company library. Agents can only use it once it is enabled for them.+ Installing adds the skill to the organization library. Agents can only use it once it is enabled for them.</p><AgentMultiSelectagents={agents}@@ -2185,7 +2185,7 @@ export function InstallPreviewDialog({setSelectedAgentIds(next);}}showSelectionPreview={false}- emptyMessage="No agents in this company support skills yet."+ emptyMessage="No agents in this organization support skills yet."isAgentDisabled={(agent) => {const option = agent as AttachAgentOption;return option.required || !option.supportsSkills;@@ -2315,7 +2315,7 @@ function AttachAgentsPopover({</select></div>) : null}- emptyMessage={eligible.length === 0 ? "No agents in this company support skills yet." : "No agents yet."}+ emptyMessage={eligible.length === 0 ? "No agents in this organization support skills yet." : "No agents yet."}isAgentDisabled={(agent) => {const option = agent as AttachAgentOption;return option.required || !option.supportsSkills;@@ -3367,7 +3367,7 @@ export function SkillDetailPage({<span className="hidden sm:inline">{detail.attachedAgentCount === 1 ? "install" : "installs"}</span></span></TooltipTrigger>- <TooltipContent>Agents in this company that currently have this skill installed.</TooltipContent>+ <TooltipContent>Agents in this organization that currently have this skill installed.</TooltipContent></Tooltip><buttontype="button"@@ -3624,7 +3624,7 @@ export function SkillDetailPage({disabled={updateSettingsPending}className="h-9 w-full rounded-md border border-border bg-background px-2 text-sm text-foreground">- <option value="company">Company — visible inside this company</option>+ <option value="company">Organization — visible inside this organization</option><option value="private">Private — only visible in your library</option></select><p className="text-xs text-muted-foreground">Public link sharing is coming later.</p>@@ -3656,7 +3656,7 @@ export function SkillDetailPage({<div className="rounded-md border border-destructive/40 p-3"><div className="text-xs font-semibold uppercase tracking-wide text-destructive">Danger zone</div><div className="mt-2 flex items-center justify-between gap-3">- <p className="min-w-0 text-xs text-muted-foreground">Remove this skill from the company library.</p>+ <p className="min-w-0 text-xs text-muted-foreground">Remove this skill from the organization library.</p><Buttonvariant="destructive"size="sm"@@ -5063,7 +5063,7 @@ export function CompanySkills() {pushToast({tone: "success",title: "Skill removed",- body: `${skill.name} was removed from the company skill library.`,+ body: `${skill.name} was removed from the organization skill library.`,});},onError: (error) => {@@ -5107,7 +5107,7 @@ export function CompanySkills() {);if (!selectedCompanyId) {- return <EmptyState icon={Boxes} message="Select a company to manage skills." />;+ return <EmptyState icon={Boxes} message="Select an organization to manage skills." />;}function handleAddSkillSource() {@@ -5147,8 +5147,8 @@ export function CompanySkills() {const studioBackHref = studioForkDetailQuery.data ? routeForSkill(studioForkDetailQuery.data) : "/skills";const studioTitle = studioForkFromId ? "Fork skill" : "Create a new skill";const studioDescription = studioForkFromId- ? "Review the fork metadata and create an editable company copy."- : "Create an editable company skill in the Paperclip workspace.";+ ? "Review the fork metadata and create an editable organization copy."+ : "Create an editable organization skill in the Paperclip workspace.";return (<>{policyDenial.denial ? (@@ -5161,7 +5161,7 @@ export function CompanySkills() {<DialogHeader><DialogTitle>Remove skill</DialogTitle><DialogDescription>- Remove this skill from the company library. If any agents still use it, removal will be blocked until it is detached.+ Remove this skill from the organization library. If any agents still use it, removal will be blocked until it is detached.</DialogDescription></DialogHeader><div className="space-y-3 text-sm">@@ -5275,7 +5275,7 @@ export function CompanySkills() {<DialogHeader><DialogTitle>Import a skill</DialogTitle><DialogDescription>- Paste a local path, GitHub URL, or `skills.sh` command to import a skill into this company.+ Paste a local path, GitHub URL, or `skills.sh` command to import a skill into this organization.</DialogDescription></DialogHeader><div className="space-y-3">diff --git a/ui/src/pages/Costs.tsx b/ui/src/pages/Costs.tsxindex a314c5ffb6..44206e50fa 100644--- a/ui/src/pages/Costs.tsx+++ b/ui/src/pages/Costs.tsx@@ -529,7 +529,7 @@ export function Costs() {}), [budgetPolicies]);if (!selectedCompanyId) {- return <EmptyState icon={DollarSign} message="Select a company to view costs." />;+ return <EmptyState icon={DollarSign} message="Select an organization to view costs." />;}const showCustomPrompt = preset === "custom" && !customReady;@@ -908,10 +908,10 @@ export function Costs() {return (<section key={scopeType} className="space-y-3"><div>- <h2 className="text-lg font-semibold capitalize">{scopeType} budgets</h2>+ <h2 className="text-lg font-semibold capitalize">{scopeType === "company" ? "organization" : scopeType} budgets</h2><p className="text-sm text-muted-foreground">{scopeType === "company"- ? "Company-wide monthly policy."+ ? "Organization-wide monthly policy.": scopeType === "agent"? "Recurring monthly spend policies for individual agents.": "Lifetime spend policies for execution-bound projects."}@@ -940,7 +940,7 @@ export function Costs() {{budgetPolicies.length === 0 ? (<Card><CardContent className="px-5 py-8 text-sm text-muted-foreground">- No budget policies yet. Set agent and project budgets from their detail pages, or use the existing company monthly budget control.+ No budget policies yet. Set agent and project budgets from their detail pages, or use the existing organization monthly budget control.</CardContent></Card>) : null}diff --git a/ui/src/pages/Dashboard.tsx b/ui/src/pages/Dashboard.tsxindex 75b24dbe89..3b0e7e04b5 100644--- a/ui/src/pages/Dashboard.tsx+++ b/ui/src/pages/Dashboard.tsx@@ -293,14 +293,14 @@ export function Dashboard() {return (<EmptyStateicon={LayoutDashboard}- message="Welcome to Paperclip. Set up your first company and agent to get started."+ message="Welcome to Paperclip. Set up your first organization and agent to get started."action="Get Started"onAction={openOnboarding}/>);}return (- <EmptyState icon={LayoutDashboard} message="Create or select a company to view the dashboard." />+ <EmptyState icon={LayoutDashboard} message="Create or select an organization to view the dashboard." />);}@@ -333,13 +333,13 @@ export function Dashboard() {</Button>}>- Agents from a company import arrive paused as a safety default. Resume them so assigned tasks can start.+ Agents from an organization import arrive paused as a safety default. Resume them so assigned tasks can start.</InlineBanner>) : pausedBanner?.kind === "all-paused" ? (<InlineBannertone="warning"icon={PauseCircle}- title="All agents in this company are paused — nothing will run."+ title="All agents in this organization are paused — nothing will run."actions={<Button variant="ghost" size="sm" asChild><Link to="/agents">Review agents</Link>diff --git a/ui/src/pages/DashboardLive.tsx b/ui/src/pages/DashboardLive.tsxindex 8c50ae09d4..a7a4323068 100644--- a/ui/src/pages/DashboardLive.tsx+++ b/ui/src/pages/DashboardLive.tsx@@ -23,7 +23,7 @@ export function DashboardLive() {return (<EmptyStateicon={RadioTower}- message={companies.length === 0 ? "Create a company to view live runs." : "Select a company to view live runs."}+ message={companies.length === 0 ? "Create an organization to view live runs." : "Select an organization to view live runs."}/>);}diff --git a/ui/src/pages/DecisionQueuePage.tsx b/ui/src/pages/DecisionQueuePage.tsxindex 71c960f7a1..b442fd02bf 100644--- a/ui/src/pages/DecisionQueuePage.tsx+++ b/ui/src/pages/DecisionQueuePage.tsx@@ -212,7 +212,7 @@ export function DecisionQueuePage() {});if (!selectedCompanyId) {- return <p className="text-sm text-muted-foreground">Select a company first.</p>;+ return <p className="text-sm text-muted-foreground">Select an organization first.</p>;}if (isLoading) {return <PageSkeleton variant="approvals" />;diff --git a/ui/src/pages/GoalDetail.tsx b/ui/src/pages/GoalDetail.tsxindex f22ce4604b..e922a6e700 100644--- a/ui/src/pages/GoalDetail.tsx+++ b/ui/src/pages/GoalDetail.tsx@@ -99,7 +99,7 @@ export function GoalDetail() {const uploadImage = useMutation({mutationFn: async (file: File) => {- if (!resolvedCompanyId) throw new Error("No company selected");+ if (!resolvedCompanyId) throw new Error("No organization selected");return assetsApi.uploadImage(resolvedCompanyId,file,diff --git a/ui/src/pages/Goals.tsx b/ui/src/pages/Goals.tsxindex 7dca9e18dd..3c58263375 100644--- a/ui/src/pages/Goals.tsx+++ b/ui/src/pages/Goals.tsx@@ -27,7 +27,7 @@ export function Goals() {});if (!selectedCompanyId) {- return <EmptyState icon={Target} message="Select a company to view goals." />;+ return <EmptyState icon={Target} message="Select an organization to view goals." />;}if (isLoading) {diff --git a/ui/src/pages/Inbox.tsx b/ui/src/pages/Inbox.tsxindex 1d2fa37c62..60799b7c4c 100644--- a/ui/src/pages/Inbox.tsx+++ b/ui/src/pages/Inbox.tsx@@ -2210,7 +2210,7 @@ export function Inbox() {}, [selectedIndex]);if (!selectedCompanyId) {- return <EmptyState icon={InboxIcon} message="Select a company to view inbox." />;+ return <EmptyState icon={InboxIcon} message="Select an organization to view inbox." />;}const hasRunFailures = failedRuns.length > 0;diff --git a/ui/src/pages/InstanceAccess.tsx b/ui/src/pages/InstanceAccess.tsxindex 0dadd26d1e..ddfa8b1f3c 100644--- a/ui/src/pages/InstanceAccess.tsx+++ b/ui/src/pages/InstanceAccess.tsx@@ -66,7 +66,7 @@ export function InstanceAccess() {onSuccess: async () => {await queryClient.invalidateQueries({ queryKey: queryKeys.access.userCompanyAccess(selectedUserId!) });await queryClient.invalidateQueries({ queryKey: queryKeys.access.adminUsers(search) });- pushToast({ title: "Company access updated", tone: "success" });+ pushToast({ title: "Organization access updated", tone: "success" });},});@@ -107,7 +107,7 @@ export function InstanceAccess() {<h1 className="text-lg font-semibold">Instance Access</h1></div><p className="max-w-3xl text-sm text-muted-foreground">- Search users, manage instance-admin status, and control which companies they can access.+ Search users, manage instance-admin status, and control which organizations they can access.</p></div>@@ -144,7 +144,7 @@ export function InstanceAccess() {) : null}</div><div className="mt-2 text-xs text-muted-foreground">- {user.activeCompanyMembershipCount} active company memberships+ {user.activeCompanyMembershipCount} active organization memberships</div></button>))}@@ -182,9 +182,9 @@ export function InstanceAccess() {<div className="space-y-3"><div>- <h2 className="text-sm font-semibold">Company access</h2>+ <h2 className="text-sm font-semibold">Organization access</h2><p className="text-sm text-muted-foreground">- Toggle company membership for this user. New access defaults to an active operator membership.+ Toggle organization membership for this user. New access defaults to an active operator membership.</p></div><div className="grid gap-3 md:grid-cols-2">@@ -216,7 +216,7 @@ export function InstanceAccess() {onClick={() => updateCompanyAccessMutation.mutate()}disabled={updateCompanyAccessMutation.isPending}>- {updateCompanyAccessMutation.isPending ? "Saving…" : "Save company access"}+ {updateCompanyAccessMutation.isPending ? "Saving…" : "Save organization access"}</Button></div></div>diff --git a/ui/src/pages/InstanceSettings.tsx b/ui/src/pages/InstanceSettings.tsxindex 77d371a731..c6ef6c4013 100644--- a/ui/src/pages/InstanceSettings.tsx+++ b/ui/src/pages/InstanceSettings.tsx@@ -171,14 +171,14 @@ export function InstanceSettings() {<h1 className="text-lg font-semibold">Scheduler Heartbeats</h1></div><p className="text-sm text-muted-foreground">- Agents with a timer heartbeat enabled across all of your companies.+ Agents with a timer heartbeat enabled across all of your organizations.</p></div><div className="flex items-center gap-4 text-sm text-muted-foreground"><span><span className="font-semibold text-foreground">{activeCount}</span> active</span><span><span className="font-semibold text-foreground">{disabledCount}</span> disabled</span>- <span><span className="font-semibold text-foreground">{grouped.length}</span> {grouped.length === 1 ? "company" : "companies"}</span>+ <span><span className="font-semibold text-foreground">{grouped.length}</span> {grouped.length === 1 ? "organization" : "organizations"}</span>{anyEnabled && (<Buttonvariant="destructive"diff --git a/ui/src/pages/InviteLanding.test.tsx b/ui/src/pages/InviteLanding.test.tsxindex cd59f51409..b6fc6e13ea 100644--- a/ui/src/pages/InviteLanding.test.tsx+++ b/ui/src/pages/InviteLanding.test.tsx@@ -547,7 +547,7 @@ describe("InviteLandingPage", () => {expect(acceptInviteMock).toHaveBeenCalledWith("pcp_invite_test", { requestType: "human" });expect(container.textContent).toContain("Request to join Acme Robotics");- expect(container.textContent).toContain("A company admin must approve your request to join.");+ expect(container.textContent).toContain("An organization admin must approve your request to join.");expect(container.textContent).toContain("Ask them to visit Settings → Members to approve your request.",);@@ -918,7 +918,7 @@ describe("InviteLandingPage", () => {await flushReact();expect(listCompaniesMock).toHaveBeenCalled();- expect(container.textContent).not.toContain("Already in this company");+ expect(container.textContent).not.toContain("Already in this organization");expect(acceptInviteMock).toHaveBeenCalledWith("pcp_invite_test", { requestType: "human" });expect(container.textContent).toContain("Request to join Acme Robotics");@@ -983,7 +983,7 @@ describe("InviteLandingPage", () => {await flushReact();await flushReact();- expect(container.textContent).toContain("Already in this company");+ expect(container.textContent).toContain("Already in this organization");expect(acceptInviteMock).not.toHaveBeenCalled();await act(async () => {@@ -1024,12 +1024,12 @@ describe("InviteLandingPage", () => {await flushReact();expect(container.textContent).toContain("Join Acme Robotics");- expect(container.textContent).toContain("Already in this company");+ expect(container.textContent).toContain("Already in this organization");expect(container.textContent).toContain("This account already belongs to Acme Robotics.");expect(acceptInviteMock).not.toHaveBeenCalled();const openButton = Array.from(container.querySelectorAll("button")).find(- (button) => button.textContent === "Open company",+ (button) => button.textContent === "Open organization",);expect(openButton).not.toBeNull();@@ -1173,7 +1173,7 @@ describe("InviteLandingPage", () => {await flushReact();expect(container.textContent).toContain("Checking your access...");- expect(container.textContent).not.toContain("Accept company invite");+ expect(container.textContent).not.toContain("Accept organization invite");expect(acceptInviteMock).not.toHaveBeenCalled();await act(async () => {diff --git a/ui/src/pages/InviteLanding.tsx b/ui/src/pages/InviteLanding.tsxindex 3ac1e9ca26..99d07e1d4b 100644--- a/ui/src/pages/InviteLanding.tsx+++ b/ui/src/pages/InviteLanding.tsx@@ -161,7 +161,7 @@ function AwaitingJoinApprovalPanel({claimApiKeyPath = null,onboardingTextUrl = null,}: AwaitingJoinApprovalPanelProps) {- const approverLabel = invitedByUserName ?? "A company admin";+ const approverLabel = invitedByUserName ?? "An organization admin";return (<div className="min-h-screen bg-zinc-950 px-6 py-12 text-zinc-100">@@ -334,10 +334,10 @@ export function InviteLandingPage() {mutationFn: async () => {if (!invite) throw new Error("Invite not found");if (isCheckingExistingMembership) {- throw new Error("Checking your company access. Try again in a moment.");+ throw new Error("Checking your organization access. Try again in a moment.");}if (isCurrentMember) {- throw new Error("This account already belongs to the company.");+ throw new Error("This account already belongs to the organization.");}if (invite.inviteType === "bootstrap_ceo" || invite.allowedJoinTypes !== "agent") {return accessApi.acceptInvite(token, { requestType: "human" });@@ -431,7 +431,7 @@ export function InviteLandingPage() {const joinButtonLabel = useMemo(() => {if (!invite) return "Continue";- if (isCurrentMember) return "Open company";+ if (isCurrentMember) return "Open organization";if (invite.inviteType === "bootstrap_ceo") return "Accept invite";if (showsAgentForm) return "Submit request";return sessionQuery.data ? "Accept invite" : "Continue";@@ -467,7 +467,7 @@ export function InviteLandingPage() {inviteJoinRequestType === "human" &&isCurrentMember) {- return <div className="mx-auto max-w-xl py-10 text-sm text-muted-foreground">Opening company...</div>;+ return <div className="mx-auto max-w-xl py-10 text-sm text-muted-foreground">Opening organization...</div>;}if (inviteJoinRequestStatus === "pending_approval" && !canCompleteAcceptedHumanInvite) {@@ -533,7 +533,7 @@ export function InviteLandingPage() {companyBrandColor={companyBrandColor}className="h-12 w-12 border border-zinc-800 rounded-none"/>- <h1 className="text-lg font-semibold">You joined the company</h1>+ <h1 className="text-lg font-semibold">You joined the organization</h1></div><div className="mt-4"><Button asChild className="w-full rounded-none">@@ -587,7 +587,7 @@ export function InviteLandingPage() {<div className="grid gap-3 sm:grid-cols-2"><div className="border border-zinc-800 p-3">- <div className="text-xs uppercase tracking-(--tracking-caps) text-zinc-500">Company</div>+ <div className="text-xs uppercase tracking-(--tracking-caps) text-zinc-500">Organization</div><div className="mt-1 text-sm text-zinc-100">{companyDisplayName}</div></div><div className="border border-zinc-800 p-3">@@ -597,7 +597,7 @@ export function InviteLandingPage() {<div className="border border-zinc-800 p-3"><div className="text-xs uppercase tracking-(--tracking-caps) text-zinc-500">Requested access</div><div className="mt-1 text-sm text-zinc-100">- {showsAgentForm ? "Agent join request" : requestedHumanRole ?? "Company access"}+ {showsAgentForm ? "Agent join request" : requestedHumanRole ?? "Organization access"}</div></div><div className="border border-zinc-800 p-3">@@ -824,12 +824,12 @@ export function InviteLandingPage() {<div><h2 className="text-lg font-semibold">{isCurrentMember- ? "Already in this company"+ ? "Already in this organization": shouldAutoAcceptHumanInvite- ? "Completing company access"+ ? "Completing organization access": invite.inviteType === "bootstrap_ceo"? "Accept bootstrap invite"- : "Accept company invite"}+ : "Accept organization invite"}</h2><p className="mt-1 text-sm text-zinc-400">{shouldAutoAcceptHumanInvitediff --git a/ui/src/pages/InviteUxLab.test.tsx b/ui/src/pages/InviteUxLab.test.tsxindex 0eb7e8d85e..092baadf3b 100644--- a/ui/src/pages/InviteUxLab.test.tsx+++ b/ui/src/pages/InviteUxLab.test.tsx@@ -41,7 +41,7 @@ describe("InviteUxLab", () => {expect(container.textContent).toContain("Split-screen invite flows");expect(container.textContent).toContain("Approval and completion screens");expect(container.textContent).toContain("Auth page states");- expect(container.textContent).toContain("Company invite management");+ expect(container.textContent).toContain("Organization invite management");expect(container.textContent).toContain("Create your account");expect(container.textContent).toContain("Invite history");diff --git a/ui/src/pages/InviteUxLab.tsx b/ui/src/pages/InviteUxLab.tsxindex b1a6f2747f..a48e866414 100644--- a/ui/src/pages/InviteUxLab.tsx+++ b/ui/src/pages/InviteUxLab.tsx@@ -27,8 +27,8 @@ const inviteRoleOptions = [{value: "viewer",label: "Viewer",- description: "Can view company work and follow along.",- gets: "View-only company membership.",+ description: "Can view organization work and follow along.",+ gets: "View-only organization membership.",},{value: "operator",@@ -45,7 +45,7 @@ const inviteRoleOptions = [{value: "owner",label: "Owner",- description: "Full company access, including membership management.",+ description: "Full organization access, including membership management.",gets: "Everything in Admin, plus managing members.",},] as const;@@ -212,7 +212,7 @@ function InviteSummaryPanel({</div><div className="grid gap-3 sm:grid-cols-2">- <MetaCard label="Company" value="Acme Robotics" />+ <MetaCard label="Organization" value="Acme Robotics" /><MetaCard label="Invited by" value="Board User" /><MetaCard label="Requested access" value={requestedAccess} /><MetaCard label="Invite expires" value="Mar 7, 2027" />@@ -373,7 +373,7 @@ function AcceptInvitePreview({return (<div className="space-y-4"><div>- <h3 className="text-lg font-semibold text-zinc-100">Accept company invite</h3>+ <h3 className="text-lg font-semibold text-zinc-100">Accept organization invite</h3><p className="mt-1 text-sm text-zinc-400">{autoAccept? "Granting your access to Acme Robotics."@@ -535,7 +535,7 @@ function CompanyInvitesPreview() {<CardHeader className="space-y-3"><div className="flex items-center gap-2 text-sm text-muted-foreground"><MailPlus className="h-4 w-4" />- Company Invites+ Organization Invites</div><div><CardTitle>Create invite</CardTitle>@@ -683,13 +683,13 @@ function CompanyInvitesPreview() {<div className="rounded-2xl border border-border p-4"><div className="text-sm font-medium">Empty history state</div><div className="mt-2 text-sm text-muted-foreground">- No invites have been created for this company yet.+ No invites have been created for this organization yet.</div></div><div className="rounded-2xl border border-rose-400/40 bg-rose-500/[0.07] p-4"><div className="text-sm font-medium text-foreground">Permission error</div><div className="mt-2 text-sm text-muted-foreground">- You do not have permission to manage company invites.+ You do not have permission to manage organization invites.</div></div></div>@@ -711,7 +711,7 @@ export function InviteUxLab() {</div><h1 className="mt-4 text-3xl font-semibold tracking-tight">Invite and signup UX review surface</h1><p className="mt-3 max-w-3xl text-sm leading-6 text-muted-foreground">- This page collects the current invite landing, signup, approval-result, and company invite-management states in one place so styling changes can be reviewed without recreating each backend condition by hand.+ This page collects the current invite landing, signup, approval-result, and organization invite-management states in one place so styling changes can be reviewed without recreating each backend condition by hand.</p><div className="mt-5 flex flex-wrap items-center gap-2">@@ -737,7 +737,7 @@ export function InviteUxLab() {"Inline account creation and sign-in variants, including feedback/error copy","Human accept, agent request, and auto-accept transitions","Pending approval, joined-now, claim secret, and onboarding result screens",- "Company invite creation, copied-link, history, empty, and permission-error states",+ "Organization invite creation, copied-link, history, empty, and permission-error states",].map((highlight) => (<divkey={highlight}@@ -766,7 +766,7 @@ export function InviteUxLab() {<StatusCardicon={<Clock3 className="h-4 w-4" />}title="Checking your access"- body="Shown after sign-in while the app verifies whether the current user already belongs to the invited company."+ body="Shown after sign-in while the app verifies whether the current user already belongs to the invited organization."/><StatusCardicon={<KeyRound className="h-4 w-4" />}@@ -794,7 +794,7 @@ export function InviteUxLab() {<StatusCardicon={<Users className="h-4 w-4" />}title="Already a member"- body="Acceptance stays disabled and the page redirects into the company once membership is confirmed."+ body="Acceptance stays disabled and the page redirects into the organization once membership is confirmed."/><StatusCardicon={<UserPlus className="h-4 w-4" />}@@ -877,7 +877,7 @@ export function InviteUxLab() {signedInLabel="Jane Example"/>}- right={<AcceptInvitePreview error="This account already belongs to the company." isCurrentMember />}+ right={<AcceptInvitePreview error="This account already belongs to the organization." isCurrentMember />}/></div></LabSection>@@ -896,7 +896,7 @@ export function InviteUxLab() {onboardingTextUrl="/api/invites/pcp_invite_test/onboarding.txt"/><InviteResultPreview- title="You joined the company"+ title="You joined the organization"description="Your account already matched the approved invite, so the board can be opened immediately."joinedNow/>@@ -921,7 +921,7 @@ export function InviteUxLab() {<LabSectioneyebrow="Settings"- title="Company invite management"+ title="Organization invite management"description="This section captures the board-side invite creation flow, copied-link state, audit table, and the edge states that are otherwise tedious to stage."accentClassName="bg-[linear-gradient(180deg,rgba(244,114,182,0.06),transparent_28%),var(--background)]">diff --git a/ui/src/pages/IssueDetail.tsx b/ui/src/pages/IssueDetail.tsxindex 6d7b5e8aa2..fcc4afa846 100644--- a/ui/src/pages/IssueDetail.tsx+++ b/ui/src/pages/IssueDetail.tsx@@ -3340,7 +3340,7 @@ export function IssueDetail() {const uploadAttachment = useMutation({mutationFn: async (file: File) => {- if (!selectedCompanyId) throw new Error("No company selected");+ if (!selectedCompanyId) throw new Error("No organization selected");return issuesApi.uploadAttachment(selectedCompanyId, issueId!, file);},onSuccess: () => {diff --git a/ui/src/pages/Issues.tsx b/ui/src/pages/Issues.tsxindex 02bcddd5f1..86fca351c1 100644--- a/ui/src/pages/Issues.tsx+++ b/ui/src/pages/Issues.tsx@@ -187,7 +187,7 @@ export function Issues() {});if (!selectedCompanyId) {- return <EmptyState icon={CircleDot} message="Select a company to view tasks." />;+ return <EmptyState icon={CircleDot} message="Select an organization to view tasks." />;}return (diff --git a/ui/src/pages/JoinRequestQueue.tsx b/ui/src/pages/JoinRequestQueue.tsxindex ab4c1a20cc..7941324315 100644--- a/ui/src/pages/JoinRequestQueue.tsx+++ b/ui/src/pages/JoinRequestQueue.tsx@@ -21,7 +21,7 @@ export function JoinRequestQueue() {useEffect(() => {setBreadcrumbs([- { label: selectedCompany?.name ?? "Company", href: "/dashboard" },+ { label: selectedCompany?.name ?? "Organization", href: "/dashboard" },{ label: "Inbox", href: "/inbox" },{ label: "Join Requests" },]);@@ -57,7 +57,7 @@ export function JoinRequestQueue() {});if (!selectedCompanyId) {- return <div className="text-sm text-muted-foreground">Select a company to review join requests.</div>;+ return <div className="text-sm text-muted-foreground">Select an organization to review join requests.</div>;}if (requestsQuery.isLoading) {@@ -67,7 +67,7 @@ export function JoinRequestQueue() {if (requestsQuery.error) {const message =requestsQuery.error instanceof ApiError && requestsQuery.error.status === 403- ? "You do not have permission to review join requests for this company."+ ? "You do not have permission to review join requests for this organization.": requestsQuery.error instanceof Error? requestsQuery.error.message: "Failed to load join requests.";diff --git a/ui/src/pages/MyIssues.tsx b/ui/src/pages/MyIssues.tsxindex 6fd9b1a056..0388ba11c9 100644--- a/ui/src/pages/MyIssues.tsx+++ b/ui/src/pages/MyIssues.tsx@@ -27,7 +27,7 @@ export function MyIssues() {});if (!selectedCompanyId) {- return <EmptyState icon={ListTodo} message="Select a company to view your tasks." />;+ return <EmptyState icon={ListTodo} message="Select an organization to view your tasks." />;}if (isLoading) {diff --git a/ui/src/pages/NewAgent.tsx b/ui/src/pages/NewAgent.tsxindex 8fcc815865..ba1c2326dd 100644--- a/ui/src/pages/NewAgent.tsx+++ b/ui/src/pages/NewAgent.tsx@@ -351,14 +351,14 @@ export function NewAgent() {<div className="border-t border-border px-4 py-4"><div className="space-y-3"><div>- <h2 className="text-sm font-medium">Company skills</h2>+ <h2 className="text-sm font-medium">Organization skills</h2><p className="mt-1 text-xs text-muted-foreground">- Optional skills from the company library. Built-in Paperclip runtime skills are added automatically.+ Optional skills from the organization library. Built-in Paperclip runtime skills are added automatically.</p></div>{availableSkills.length === 0 ? (<p className="text-xs text-muted-foreground">- No optional company skills installed yet.+ No optional organization skills installed yet.</p>) : (<div className="space-y-3">diff --git a/ui/src/pages/NotFound.tsx b/ui/src/pages/NotFound.tsxindex d9054c87d0..606dc58bd1 100644--- a/ui/src/pages/NotFound.tsx+++ b/ui/src/pages/NotFound.tsx@@ -27,10 +27,10 @@ export function NotFoundPage({ scope = "global", requestedPrefix }: NotFoundPageconst currentPath = `${location.pathname}${location.search}${location.hash}`;const normalizedPrefix = requestedPrefix?.toUpperCase();- const title = scope === "invalid_company_prefix" ? "Company not found" : "Page not found";+ const title = scope === "invalid_company_prefix" ? "Organization not found" : "Page not found";const description =scope === "invalid_company_prefix"- ? `No company matches prefix "${normalizedPrefix ?? "unknown"}".`+ ? `No organization matches prefix "${normalizedPrefix ?? "unknown"}".`: "This route does not exist.";return (diff --git a/ui/src/pages/Org.tsx b/ui/src/pages/Org.tsxindex 1cd2b8a974..8a3c860048 100644--- a/ui/src/pages/Org.tsx+++ b/ui/src/pages/Org.tsx@@ -99,7 +99,7 @@ export function Org() {});if (!selectedCompanyId) {- return <EmptyState icon={GitBranch} message="Select a company to view org chart." />;+ return <EmptyState icon={GitBranch} message="Select an organization to view org chart." />;}if (isLoading) {diff --git a/ui/src/pages/OrgChart.test.tsx b/ui/src/pages/OrgChart.test.tsxindex d76f32ae70..36e8238c54 100644--- a/ui/src/pages/OrgChart.test.tsx+++ b/ui/src/pages/OrgChart.test.tsx@@ -267,15 +267,15 @@ describe("OrgChart mobile gestures", () => {it("shows both portability buttons on self-hosted instances", async () => {await renderOrgChart();- expect(container.textContent).toContain("Import company");- expect(container.textContent).toContain("Export company");+ expect(container.textContent).toContain("Import organization");+ expect(container.textContent).toContain("Export organization");});it("hides the Import button but keeps Export on a Cloud-managed instance", async () => {queryClient.setQueryData(queryKeys.health, { status: "ok", cloud: { managed: true } });await renderOrgChart();- expect(container.textContent).not.toContain("Import company");- expect(container.textContent).toContain("Export company");+ expect(container.textContent).not.toContain("Import organization");+ expect(container.textContent).toContain("Export organization");});});diff --git a/ui/src/pages/OrgChart.tsx b/ui/src/pages/OrgChart.tsxindex d394489b43..b5c8b47546 100644--- a/ui/src/pages/OrgChart.tsx+++ b/ui/src/pages/OrgChart.tsx@@ -439,7 +439,7 @@ export function OrgChart() {}, [pan, zoom]);if (!selectedCompanyId) {- return <EmptyState icon={Network} message="Select a company to view the org chart." />;+ return <EmptyState icon={Network} message="Select an organization to view the org chart." />;}if (isLoading) {@@ -457,7 +457,7 @@ export function OrgChart() {<Link to="/company/import"><Button variant="outline" size="sm"><Upload className="mr-1.5 h-3.5 w-3.5" />- Import company+ Import organization</Button></Link>)}@@ -465,7 +465,7 @@ export function OrgChart() {<Link to="/company/export"><Button variant="outline" size="sm"><Download className="mr-1.5 h-3.5 w-3.5" />- Export company+ Export organization</Button></Link>)}diff --git a/ui/src/pages/PipelineSettings.tsx b/ui/src/pages/PipelineSettings.tsxindex eec8bacb6b..5e53515a63 100644--- a/ui/src/pages/PipelineSettings.tsx+++ b/ui/src/pages/PipelineSettings.tsx@@ -1391,7 +1391,7 @@ export function PipelineSettings() {const createSecret = useMutation({mutationFn: (input: { name: string; value: string }) => {- if (!selectedCompanyId) throw new Error("Select a company to create secrets");+ if (!selectedCompanyId) throw new Error("Select an organization to create secrets");return secretsApi.create(selectedCompanyId, input);},onSuccess: () => {@@ -2119,7 +2119,7 @@ export function PipelineSettings() {};if (!selectedCompanyId) {- return <EmptyState icon={Hexagon} message="Select a company to edit pipeline settings." />;+ return <EmptyState icon={Hexagon} message="Select an organization to edit pipeline settings." />;}if (!pipelineId) {diff --git a/ui/src/pages/Pipelines.tsx b/ui/src/pages/Pipelines.tsxindex 66b411bf84..3589753b0d 100644--- a/ui/src/pages/Pipelines.tsx+++ b/ui/src/pages/Pipelines.tsx@@ -941,7 +941,7 @@ function PipelinesIndex() {});if (!selectedCompanyId) {- return <div className="mx-auto max-w-3xl py-10 text-sm text-muted-foreground">Select a company to view pipelines.</div>;+ return <div className="mx-auto max-w-3xl py-10 text-sm text-muted-foreground">Select an organization to view pipelines.</div>;}if (pipelinesQuery.isLoading) return <PageSkeleton />;@@ -4941,7 +4941,7 @@ export function ReviewQueue() {const bulkApprove = useMutation({mutationFn: async (targetRows: ReviewQueueRow[]) => {- if (!selectedCompanyId) throw new Error("Select a company first.");+ if (!selectedCompanyId) throw new Error("Select an organization first.");const reviewRows = targetRows.filter((row) => row.kind === "review");const suggestionRows = targetRows.filter((row) => row.kind === "suggestion" && row.suggestionId);const tasks: Promise<unknown>[] = [];@@ -5046,7 +5046,7 @@ export function ReviewQueue() {}, [activeRowId, decideRow, openItem, visibleRows]);if (!selectedCompanyId) {- return <EmptyState icon={Hexagon} message="Select a company to view the review queue." />;+ return <EmptyState icon={Hexagon} message="Select an organization to view the review queue." />;}if (attentionQuery.isLoading || reviewCasesQuery.isLoading) {@@ -5170,7 +5170,7 @@ export function Learnings() {});if (!selectedCompanyId) {- return <EmptyState icon={BookOpenText} message="Select a company to view learnings." />;+ return <EmptyState icon={BookOpenText} message="Select an organization to view learnings." />;}if (learningsQuery.isLoading && !learningsQuery.data) {diff --git a/ui/src/pages/PluginManager.tsx b/ui/src/pages/PluginManager.tsxindex e13ab4ce28..e1cccb4060 100644--- a/ui/src/pages/PluginManager.tsx+++ b/ui/src/pages/PluginManager.tsx@@ -99,7 +99,7 @@ export function PluginManager() {useEffect(() => {setBreadcrumbs([- { label: selectedCompany?.name ?? "Company", href: "/dashboard" },+ { label: selectedCompany?.name ?? "Organization", href: "/dashboard" },{ label: "Settings", href: "/company/settings" },{ label: "Plugins" },]);diff --git a/ui/src/pages/PluginPage.tsx b/ui/src/pages/PluginPage.tsxindex f22ee4a930..1a8b9a2269 100644--- a/ui/src/pages/PluginPage.tsx+++ b/ui/src/pages/PluginPage.tsx@@ -130,7 +130,7 @@ export function PluginPage() {}return (<div className="space-y-4">- <p className="text-sm text-muted-foreground">Select a company to view this page.</p>+ <p className="text-sm text-muted-foreground">Select an organization to view this page.</p></div>);}diff --git a/ui/src/pages/PluginSettings.test.tsx b/ui/src/pages/PluginSettings.test.tsxindex b1a6c047e6..2b631e4d5d 100644--- a/ui/src/pages/PluginSettings.test.tsx+++ b/ui/src/pages/PluginSettings.test.tsx@@ -165,7 +165,7 @@ describe("PluginSettings", () => {const root = await renderSettings(container);expect(container.textContent).toContain("Configure this plugin from Settings → Environments.");- expect(container.textContent).toContain("secret bindings still resolve through the selected company context");+ expect(container.textContent).toContain("secret bindings still resolve through the selected organization context");const link = container.querySelector('a[href="/company/settings/instance/environments"]');expect(link?.textContent).toContain("Open Environments");diff --git a/ui/src/pages/PluginSettings.tsx b/ui/src/pages/PluginSettings.tsxindex 4985765efc..2aeab483bb 100644--- a/ui/src/pages/PluginSettings.tsx+++ b/ui/src/pages/PluginSettings.tsx@@ -120,7 +120,7 @@ export function PluginSettings() {useEffect(() => {setBreadcrumbs([- { label: selectedCompany?.name ?? "Company", href: "/dashboard" },+ { label: selectedCompany?.name ?? "Organization", href: "/dashboard" },{ label: "Settings", href: "/company/settings" },{ label: "Plugins", href: "/company/settings/instance/plugins" },{ label: plugin?.manifestJson?.displayName ?? plugin?.packageName ?? "Plugin Details" },@@ -261,7 +261,7 @@ export function PluginSettings() {<p className="font-medium text-foreground">Configure this plugin from Settings → Environments.</p><p className="mt-1 text-muted-foreground">{driverLabel || "This plugin"} registers environment runtime settings there so the execution target- stays instance-scoped while secret bindings still resolve through the selected company context.+ stays instance-scoped while secret bindings still resolve through the selected organization context.</p><div className="mt-3"><Link to="/company/settings/instance/environments">@@ -598,7 +598,7 @@ function PluginLocalFoldersSettings({ pluginId, companyId, declarations }: Plugiif (!companyId) {return (<div className="rounded-md border border-border/60 bg-muted/20 px-4 py-3 text-sm text-muted-foreground">- Select a company to configure this plugin's local folders.+ Select an organization to configure this plugin's local folders.</div>);}@@ -982,7 +982,7 @@ function PluginConfigForm({ pluginId, companyId, schema, initialValues, isLoadin// Save mutationconst saveMutation = useMutation({mutationFn: (configJson: Record<string, unknown>) => {- if (!companyId) throw new Error("Select a company before saving plugin configuration.");+ if (!companyId) throw new Error("Select an organization before saving plugin configuration.");return pluginsApi.saveConfig(pluginId, companyId, configJson);},onSuccess: () => {@@ -1002,7 +1002,7 @@ function PluginConfigForm({ pluginId, companyId, schema, initialValues, isLoadin// Test configuration mutationconst testMutation = useMutation({mutationFn: (configJson: Record<string, unknown>) => {- if (!companyId) throw new Error("Select a company before testing plugin configuration.");+ if (!companyId) throw new Error("Select an organization before testing plugin configuration.");return pluginsApi.testConfig(pluginId, companyId, configJson);},onSuccess: (result) => {diff --git a/ui/src/pages/ProfileSettings.tsx b/ui/src/pages/ProfileSettings.tsxindex 8dbd86cd62..1b7717c5ac 100644--- a/ui/src/pages/ProfileSettings.tsx+++ b/ui/src/pages/ProfileSettings.tsx@@ -87,7 +87,7 @@ export function ProfileSettings() {const uploadAvatarMutation = useMutation({mutationFn: async (file: File) => {if (!selectedCompanyId) {- throw new Error("Select a company before uploading a profile avatar.");+ throw new Error("Select an organization before uploading a profile avatar.");}const asset = await assetsApi.uploadImage(@@ -137,7 +137,7 @@ export function ProfileSettings() {const isSavingProfile = updateMutation.isPending || uploadAvatarMutation.isPending || removeAvatarMutation.isPending;const uploadHint = selectedCompany? `Stored in Paperclip file storage for ${selectedCompany.name}.`- : "Select a company to upload an avatar into Paperclip storage.";+ : "Select an organization to upload an avatar into Paperclip storage.";return (<div className="max-w-6xl space-y-6">diff --git a/ui/src/pages/ProjectDetail.tsx b/ui/src/pages/ProjectDetail.tsxindex db612c6ce0..8d9a64df7e 100644--- a/ui/src/pages/ProjectDetail.tsx+++ b/ui/src/pages/ProjectDetail.tsx@@ -514,7 +514,7 @@ export function ProjectDetail() {const uploadImage = useMutation({mutationFn: async (file: File) => {- if (!resolvedCompanyId) throw new Error("No company selected");+ if (!resolvedCompanyId) throw new Error("No organization selected");return assetsApi.uploadImage(resolvedCompanyId, file, `projects/${projectLookupRef || "draft"}`);},});diff --git a/ui/src/pages/Projects.tsx b/ui/src/pages/Projects.tsxindex 50c5133c82..02006e0f28 100644--- a/ui/src/pages/Projects.tsx+++ b/ui/src/pages/Projects.tsx@@ -119,7 +119,7 @@ export function Projects() {const sortLabel = PROJECT_SORT_OPTIONS.find((option) => option.field === sortField)?.label ?? "Name";if (!selectedCompanyId) {- return <EmptyState icon={Hexagon} message="Select a company to view projects." />;+ return <EmptyState icon={Hexagon} message="Select an organization to view projects." />;}if (isLoading) {diff --git a/ui/src/pages/RoutineDetail.tsx b/ui/src/pages/RoutineDetail.tsxindex 88d4443bef..ffaca21049 100644--- a/ui/src/pages/RoutineDetail.tsx+++ b/ui/src/pages/RoutineDetail.tsx@@ -251,7 +251,7 @@ export function RoutineDetail() {});const createSecret = useMutation({mutationFn: (input: { name: string; value: string }) => {- if (!selectedCompanyId) throw new Error("Select a company to create secrets");+ if (!selectedCompanyId) throw new Error("Select an organization to create secrets");return secretsApi.create(selectedCompanyId, input);},onSuccess: () => {@@ -674,7 +674,7 @@ export function RoutineDetail() {);if (!selectedCompanyId) {- return <EmptyState icon={Repeat} message="Select a company to view routines." />;+ return <EmptyState icon={Repeat} message="Select an organization to view routines." />;}// Back-compat redirect: `?tab=x` → `/routines/:id/x`.diff --git a/ui/src/pages/Routines.tsx b/ui/src/pages/Routines.tsxindex 4ec6f10503..1c93762451 100644--- a/ui/src/pages/Routines.tsx+++ b/ui/src/pages/Routines.tsx@@ -796,7 +796,7 @@ export function Routines() {}if (!selectedCompanyId) {- return <EmptyState icon={Repeat} message="Select a company to view routines." />;+ return <EmptyState icon={Repeat} message="Select an organization to view routines." />;}if (isLoading) {diff --git a/ui/src/pages/Search.tsx b/ui/src/pages/Search.tsxindex 51625bd02b..3f528a50f9 100644--- a/ui/src/pages/Search.tsx+++ b/ui/src/pages/Search.tsx@@ -805,7 +805,7 @@ function SearchTabContent({return (<div className="mx-auto flex w-full max-w-2xl flex-col gap-4 px-4 py-10 sm:px-6"><div>- <h2 className="text-lg font-semibold">Type to search company memory.</h2>+ <h2 className="text-lg font-semibold">Type to search organization memory.</h2><p className="mt-1 text-sm text-muted-foreground">Tasks, comments, plan documents, artifacts, agents, projects — same surface, ranked by relevance.</p>diff --git a/ui/src/pages/Secrets.render.test.tsx b/ui/src/pages/Secrets.render.test.tsxindex bd4b62ba11..9e945ba3ba 100644--- a/ui/src/pages/Secrets.render.test.tsx+++ b/ui/src/pages/Secrets.render.test.tsx@@ -771,7 +771,7 @@ describe("Secrets page layout", () => {expect(container.textContent).toContain("OPENAI_API_KEY");expect(container.textContent).toContain("Personal GitHub token");- expect(container.textContent).toContain("Company");+ expect(container.textContent).toContain("Organization");expect(container.textContent).toContain("Each user");expect(container.textContent).toContain("3/5 set");expect(container.textContent).not.toContain("User secret definitions");diff --git a/ui/src/pages/Secrets.tsx b/ui/src/pages/Secrets.tsxindex b385b0276d..7d4698d79a 100644--- a/ui/src/pages/Secrets.tsx+++ b/ui/src/pages/Secrets.tsx@@ -1787,7 +1787,7 @@ export function Secrets() {if (!selectedCompanyId) {return (- <div className="p-6 text-sm text-muted-foreground">Select a company to manage secrets.</div>+ <div className="p-6 text-sm text-muted-foreground">Select an organization to manage secrets.</div>);}@@ -1958,7 +1958,7 @@ export function Secrets() {!(showFolderView && folderPath) ? (<EmptyStateicon={KeyRound}- message="No secrets yet. Create a shared company secret or one that each user supplies."+ message="No secrets yet. Create a shared organization secret or one that each user supplies."action="New secret"onAction={openCreateSecret}/>@@ -2076,7 +2076,7 @@ export function Secrets() {<div className="mt-1">{row.kind === "company" ? (<MetaChip>- <ShieldCheck className="h-3 w-3" /> Company+ <ShieldCheck className="h-3 w-3" /> Organization</MetaChip>) : (<UserSecretChip label="Each user" />@@ -2141,7 +2141,7 @@ export function Secrets() {{row.kind === "company" ? (<><MetaChip>- <ShieldCheck className="h-3 w-3" /> Company+ <ShieldCheck className="h-3 w-3" /> Organization</MetaChip><SecretProviderIndicatorsecret={row.secret}@@ -2253,7 +2253,7 @@ export function Secrets() {</div><div className="flex flex-wrap gap-1.5"><MetaChip>- <ShieldCheck className="h-3 w-3" /> Company+ <ShieldCheck className="h-3 w-3" /> Organization</MetaChip><MetaChip>{modeLabel(selectedSecret.managedMode)}</MetaChip><MetaChip>{providerLabel(providers, selectedSecret.provider)}</MetaChip>@@ -2581,12 +2581,12 @@ export function Secrets() {}}><TabsList className="grid w-full grid-cols-2">- <TabsTrigger value="company">Company</TabsTrigger>+ <TabsTrigger value="company">Organization</TabsTrigger><TabsTrigger value="user">Each user</TabsTrigger></TabsList></Tabs><p className="text-(length:--text-micro) text-muted-foreground">- Company stores one shared value. Each user lets every member supply their own value under My secrets.+ Organization stores one shared value. Each user lets every member supply their own value under My secrets.</p></div>) : null}@@ -3182,7 +3182,7 @@ export function Secrets() {<DialogHeader><DialogTitle>Delete user-provided secret</DialogTitle><DialogDescription>- Permanently removes <strong>{definitionDeleteConfirm?.name}</strong> for the whole company.+ Permanently removes <strong>{definitionDeleteConfirm?.name}</strong> for the whole organization.Existing member values become unreferenced and active bindings must be remapped.</DialogDescription></DialogHeader>@@ -3351,7 +3351,7 @@ function SecretsFiltersPopover({<div className="space-y-0.5">{[{ value: "all" as const, label: "All sources" },- { value: "company" as const, label: "Company" },+ { value: "company" as const, label: "Organization" },{ value: "user" as const, label: "Each user" },].map((option) => (<label key={option.value} className="flex cursor-pointer items-center gap-2 rounded-sm px-2 py-1 hover:bg-accent/50">@@ -3585,7 +3585,7 @@ export function ProviderVaultsTab({<div className="rounded-md border border-dashed border-border bg-muted/20 p-4 text-sm text-muted-foreground">{isComingSoonFamily? "Not yet supported."- : "No company-specific vaults yet. Secrets can still use the deployment default provider settings."}+ : "No organization-specific vaults yet. Secrets can still use the deployment default provider settings."}</div>) : (<div className="space-y-3">@@ -4619,7 +4619,7 @@ function SecretDetailsTab({<DetailRow label="Description"><span>{secret.description ?? <span className="text-muted-foreground">—</span>}</span></DetailRow>- <DetailRow label="Provided by">Company</DetailRow>+ <DetailRow label="Provided by">Organization</DetailRow><DetailRow label="Custody">{modeLabel(secret.managedMode)}</DetailRow><DetailRow label="Provider">{providerLabel(providers, secret.provider)}</DetailRow><DetailRow label="Provider vault">{providerVaultLabel(providerConfigs, secret.providerConfigId)}</DetailRow>diff --git a/ui/src/pages/SkillStudio.tsx b/ui/src/pages/SkillStudio.tsxindex eb211b2894..36dfee3ac3 100644--- a/ui/src/pages/SkillStudio.tsx+++ b/ui/src/pages/SkillStudio.tsx@@ -328,7 +328,7 @@ export function SkillStudio() {}, [skill?.id]);if (!companyId) {- return <StudioMessage message="Select a company to open Skill Studio." />;+ return <StudioMessage message="Select an organization to open Skill Studio." />;}if (isCreateMode) {return (@@ -518,7 +518,7 @@ function StudioNewSkillPanel({{draft.forkedFromSkillId ? "Fork skill" : "Create a new skill"}</h1><p className="text-sm text-muted-foreground">- Create an editable company skill and open it directly in Studio.+ Create an editable organization skill and open it directly in Studio.</p></div>@@ -657,9 +657,9 @@ function StudioNewSkillPanel({draft.sharingScope === scope ? "border-foreground bg-accent/50" : "border-border",)}>- <span className="block font-medium">{scope === "company" ? "Company" : "Private"}</span>+ <span className="block font-medium">{scope === "company" ? "Organization" : "Private"}</span><span className="mt-1 block text-xs text-muted-foreground">- {scope === "company" ? "Visible inside this company." : "Only visible in your library."}+ {scope === "company" ? "Visible inside this organization." : "Only visible in your library."}</span></button>))}diff --git a/ui/src/pages/TeamCatalog.tsx b/ui/src/pages/TeamCatalog.tsxindex 44218cfc88..40ade4b773 100644--- a/ui/src/pages/TeamCatalog.tsx+++ b/ui/src/pages/TeamCatalog.tsx@@ -1299,7 +1299,7 @@ function TeamInstallerDialog({<p className="font-medium">Install failed</p><p className="mt-0.5 text-xs">{applyError}</p><p className="mt-1 text-xs opacity-80">- Partial state is not rolled back. Review the company activity log before retrying.+ Partial state is not rolled back. Review the organization activity log before retrying.</p></div></div>@@ -1407,7 +1407,7 @@ export function StepTargetManager({className="rounded-md border border-blue-500/30 bg-blue-500/10 px-3 py-2.5 text-sm text-blue-700 dark:text-blue-300"id="target-manager-help">- This team's root agents need a manager in your company. Pick the agent who will become+ This team's root agents need a manager in your organization. Pick the agent who will becometheir parent. Internal team hierarchy is preserved.</div>@@ -1461,7 +1461,7 @@ export function StepTargetManager({checked={fullCompany}onChange={(e) => onToggleFullCompany(e.target.checked)}/>- Use this team as a full-company package (no target manager)+ Use this team as a full-organization package (no target manager)</label>)}</div>@@ -1998,7 +1998,7 @@ export function ApplySuccess({<p className="text-base font-semibold">Team installed</p></div><p className="text-sm text-muted-foreground">- {team.name} was imported into your company. Imported entities are stamped with catalog provenance.+ {team.name} was imported into your organization. Imported entities are stamped with catalog provenance.</p>{result && (<ul className="divide-y divide-border/60 rounded-md border border-border px-3">@@ -2299,7 +2299,7 @@ export function TeamCatalog() {if (!selectedCompanyId) {return (<div className="p-8">- <EmptyState icon={Users2} message="Select a company to browse the team catalog." />+ <EmptyState icon={Users2} message="Select an organization to browse the team catalog." /></div>);}diff --git a/ui/src/pages/Timeline.tsx b/ui/src/pages/Timeline.tsxindex afa400ae22..1957742740 100644--- a/ui/src/pages/Timeline.tsx+++ b/ui/src/pages/Timeline.tsx@@ -352,7 +352,7 @@ export function Timeline() {return (<><RequestCollapsedSidebar />- <EmptyState icon={GanttChartSquare} message="Select a company to view its work timeline." />+ <EmptyState icon={GanttChartSquare} message="Select an organization to view its work timeline." /></>);}diff --git a/ui/src/pages/UserProfile.tsx b/ui/src/pages/UserProfile.tsxindex 260ae6b4e2..f91e33c2f9 100644--- a/ui/src/pages/UserProfile.tsx+++ b/ui/src/pages/UserProfile.tsx@@ -243,7 +243,7 @@ export function UserProfile() {);if (!selectedCompanyId) {- return <EmptyState icon={UserRound} message="Select a company to view user profiles." />;+ return <EmptyState icon={UserRound} message="Select an organization to view user profiles." />;}if (isLoading) {@@ -251,7 +251,7 @@ export function UserProfile() {}if (error || !data) {- return <EmptyState icon={AlertCircle} message="User profile not found for this company." />;+ return <EmptyState icon={AlertCircle} message="User profile not found for this organization." />;}const allTimeTokens = allTime ? totalTokens(allTime) : 0;diff --git a/ui/src/pages/WhatNeedsMe.tsx b/ui/src/pages/WhatNeedsMe.tsxindex 0e51fc88bf..05ce04e3ac 100644--- a/ui/src/pages/WhatNeedsMe.tsx+++ b/ui/src/pages/WhatNeedsMe.tsx@@ -507,7 +507,7 @@ export function WhatNeedsMe() {}, [handleDismiss, keyboardItems, navigate, selectedAttentionId]);if (!selectedCompanyId) {- return <p className="text-sm text-muted-foreground">Select a company first.</p>;+ return <p className="text-sm text-muted-foreground">Select an organization first.</p>;}if (isLoading) {diff --git a/ui/src/pages/agent-skills/AgentSkillsTab.tsx b/ui/src/pages/agent-skills/AgentSkillsTab.tsxindex 4ec4d2b82e..f4057d4b11 100644--- a/ui/src/pages/agent-skills/AgentSkillsTab.tsx+++ b/ui/src/pages/agent-skills/AgentSkillsTab.tsx@@ -452,7 +452,7 @@ export function AgentSkillsTab({ agent, companyId }: { agent: Agent; companyId?:className="flex items-center justify-between gap-3 border-b border-amber-300/40 bg-amber-50/60 px-3 py-2 text-xs text-amber-800 last:border-b-0 dark:border-amber-500/20 dark:bg-amber-950/20 dark:text-amber-200"><span className="min-w-0 truncate">- <span className="font-medium">{key}</span> is enabled but missing from the company library.+ <span className="font-medium">{key}</span> is enabled but missing from the organization library.</span><buttontype="button"@@ -491,7 +491,7 @@ export function AgentSkillsTab({ agent, companyId }: { agent: Agent; companyId?:{search? "No available skills match your search.": libraryEmpty- ? "Import skills into the company library to enable them here."+ ? "Import skills into the organization library to enable them here.": "Every library skill is enabled on this agent."}</SectionEmpty>)}@@ -604,9 +604,9 @@ function EmptyLibraryCard() {<div className="flex flex-col items-center gap-3 rounded-lg border border-dashed border-border px-6 py-10 text-center"><Store className="h-8 w-8 text-muted-foreground/60" /><div className="space-y-1">- <p className="text-sm font-medium text-foreground">No skills in the company library</p>+ <p className="text-sm font-medium text-foreground">No skills in the organization library</p><p className="text-xs text-muted-foreground">- Install skills to the company, then enable them on this agent.+ Install skills to the organization, then enable them on this agent.</p></div><Button asChild variant="outline" size="sm">diff --git a/ui/src/pages/apps/AppDetail.tsx b/ui/src/pages/apps/AppDetail.tsxindex 5dff43b1c2..432fe8a57b 100644--- a/ui/src/pages/apps/AppDetail.tsx+++ b/ui/src/pages/apps/AppDetail.tsx@@ -119,7 +119,7 @@ export function AppDetail() {useEffect(() => {if (!activeTab) return;setBreadcrumbs([- { label: selectedCompany?.name ?? "Company", href: "/dashboard" },+ { label: selectedCompany?.name ?? "Organization", href: "/dashboard" },{ label: "Apps", href: "/apps" },{ label: appName, href: appTabHref(connectionId, "setup") },{ label: appTabLabel(activeTab) },@@ -348,7 +348,7 @@ export function AppDetail() {}if (!selectedCompanyId) {- return <div className="p-6 text-sm text-muted-foreground">Select a company to manage apps.</div>;+ return <div className="p-6 text-sm text-muted-foreground">Select an organization to manage apps.</div>;}if (connectionQuery.isLoading || catalogQuery.isLoading) {return (diff --git a/ui/src/pages/apps/AppNotConnected.tsx b/ui/src/pages/apps/AppNotConnected.tsxindex d49da9cb48..e47728709f 100644--- a/ui/src/pages/apps/AppNotConnected.tsx+++ b/ui/src/pages/apps/AppNotConnected.tsx@@ -94,7 +94,7 @@ export function AppNotConnected() {useEffect(() => {if (!activeTab) return;setBreadcrumbs([- { label: selectedCompany?.name ?? "Company", href: "/dashboard" },+ { label: selectedCompany?.name ?? "Organization", href: "/dashboard" },{ label: "Apps", href: "/apps" },{ label: appName, href: appApplicationTabHref(applicationId, "setup") },{ label: appTabLabel(activeTab) },@@ -123,7 +123,7 @@ export function AppNotConnected() {});if (!selectedCompanyId) {- return <div className="p-6 text-sm text-muted-foreground">Select a company to manage apps.</div>;+ return <div className="p-6 text-sm text-muted-foreground">Select an organization to manage apps.</div>;}if (!applicationId || !activeTab) {return <Navigate to={applicationId ? appApplicationTabHref(applicationId, "setup") : "/apps/connections"} replace />;diff --git a/ui/src/pages/apps/AppsConnect.tsx b/ui/src/pages/apps/AppsConnect.tsxindex 0f2791cd53..e05312b62b 100644--- a/ui/src/pages/apps/AppsConnect.tsx+++ b/ui/src/pages/apps/AppsConnect.tsx@@ -197,7 +197,7 @@ export function AppsConnect() {useEffect(() => {setBreadcrumbs([- { label: selectedCompany?.name ?? "Company", href: "/dashboard" },+ { label: selectedCompany?.name ?? "Organization", href: "/dashboard" },{ label: "Apps", href: "/apps" },{ label: "Connect an app" },]);@@ -443,7 +443,7 @@ export function AppsConnect() {});if (!selectedCompanyId) {- return <div className="p-6 text-sm text-muted-foreground">Select a company to connect apps.</div>;+ return <div className="p-6 text-sm text-muted-foreground">Select an organization to connect apps.</div>;}if (directOAuthEntry && step === "key") {diff --git a/ui/src/pages/apps/AppsReview.tsx b/ui/src/pages/apps/AppsReview.tsxindex 719a3a0150..48b09298ef 100644--- a/ui/src/pages/apps/AppsReview.tsx+++ b/ui/src/pages/apps/AppsReview.tsx@@ -19,7 +19,7 @@ export function AppsReview() {useEffect(() => {setBreadcrumbs([- { label: selectedCompany?.name ?? "Company", href: "/dashboard" },+ { label: selectedCompany?.name ?? "Organization", href: "/dashboard" },{ label: "Apps", href: "/apps" },{ label: "Review" },]);@@ -27,7 +27,7 @@ export function AppsReview() {}, [setBreadcrumbs, selectedCompany?.name]);if (!selectedCompanyId) {- return <div className="p-6 text-sm text-muted-foreground">Select a company to review approvals.</div>;+ return <div className="p-6 text-sm text-muted-foreground">Select an organization to review approvals.</div>;}return (diff --git a/ui/src/pages/apps/Browse.tsx b/ui/src/pages/apps/Browse.tsxindex e7daa94c47..4dfa4704e0 100644--- a/ui/src/pages/apps/Browse.tsx+++ b/ui/src/pages/apps/Browse.tsx@@ -48,7 +48,7 @@ export function Browse() {useEffect(() => {setBreadcrumbs([- { label: selectedCompany?.name ?? "Company", href: "/dashboard" },+ { label: selectedCompany?.name ?? "Organization", href: "/dashboard" },{ label: "Apps" },]);return () => setBreadcrumbs([]);@@ -115,7 +115,7 @@ export function Browse() {}, [applicationsQuery.data, connectionsQuery.data]);if (!selectedCompanyId) {- return <div className="p-6 text-sm text-muted-foreground">Select a company to browse apps.</div>;+ return <div className="p-6 text-sm text-muted-foreground">Select an organization to browse apps.</div>;}const loading = galleryQuery.isLoading || applicationsQuery.isLoading || connectionsQuery.isLoading;diff --git a/ui/src/pages/apps/Connections.tsx b/ui/src/pages/apps/Connections.tsxindex 7d2a9ac054..2db854e107 100644--- a/ui/src/pages/apps/Connections.tsx+++ b/ui/src/pages/apps/Connections.tsx@@ -110,7 +110,7 @@ export function Connections() {useEffect(() => {setBreadcrumbs([- { label: selectedCompany?.name ?? "Company", href: "/dashboard" },+ { label: selectedCompany?.name ?? "Organization", href: "/dashboard" },{ label: "Apps", href: "/apps" },{ label: "Connections" },]);@@ -236,7 +236,7 @@ export function Connections() {const visibleRows = filter === "attention" ? rowsNeedingAttention : rows;if (!selectedCompanyId) {- return <div className="p-6 text-sm text-muted-foreground">Select a company to manage apps.</div>;+ return <div className="p-6 text-sm text-muted-foreground">Select an organization to manage apps.</div>;}const loading = applicationsQuery.isLoading || connectionsQuery.isLoading || galleryQuery.isLoading;diff --git a/ui/src/pages/apps/gateways/GatewayDetail.tsx b/ui/src/pages/apps/gateways/GatewayDetail.tsxindex e19ea2c4dc..9e69818a45 100644--- a/ui/src/pages/apps/gateways/GatewayDetail.tsx+++ b/ui/src/pages/apps/gateways/GatewayDetail.tsx@@ -96,7 +96,7 @@ export function GatewayDetail() {useEffect(() => {if (!gateway) return;setBreadcrumbs([- { label: selectedCompany?.name ?? "Company", href: "/dashboard" },+ { label: selectedCompany?.name ?? "Organization", href: "/dashboard" },{ label: "Apps", href: "/apps" },{ label: "Gateways", href: "/apps/gateways" },{ label: gateway.name },@@ -129,7 +129,7 @@ export function GatewayDetail() {});if (!selectedCompanyId) {- return <div className="p-6 text-sm text-muted-foreground">Select a company to manage gateways.</div>;+ return <div className="p-6 text-sm text-muted-foreground">Select an organization to manage gateways.</div>;}if (!activeTab) {return <Navigate replace to={gatewayTabHref(gatewayId, "overview")} />;diff --git a/ui/src/pages/apps/gateways/GatewaysList.tsx b/ui/src/pages/apps/gateways/GatewaysList.tsxindex d6728cc343..0ef638ee21 100644--- a/ui/src/pages/apps/gateways/GatewaysList.tsx+++ b/ui/src/pages/apps/gateways/GatewaysList.tsx@@ -39,7 +39,7 @@ export function GatewaysList() {useEffect(() => {setBreadcrumbs([- { label: selectedCompany?.name ?? "Company", href: "/dashboard" },+ { label: selectedCompany?.name ?? "Organization", href: "/dashboard" },{ label: "Apps", href: "/apps" },{ label: "Gateways" },]);@@ -115,7 +115,7 @@ export function GatewaysList() {});if (!selectedCompanyId) {- return <div className="p-6 text-sm text-muted-foreground">Select a company to manage gateways.</div>;+ return <div className="p-6 text-sm text-muted-foreground">Select an organization to manage gateways.</div>;}const gateways = gatewaysQuery.data?.gateways ?? [];diff --git a/ui/src/pages/apps/gateways/gateway-helpers.test.ts b/ui/src/pages/apps/gateways/gateway-helpers.test.tsindex d7578297b5..58341172a3 100644--- a/ui/src/pages/apps/gateways/gateway-helpers.test.ts+++ b/ui/src/pages/apps/gateways/gateway-helpers.test.ts@@ -121,8 +121,8 @@ describe("isGatewayOn", () => {});describe("formatScope", () => {- it("labels company, project, and agent scopes", () => {- expect(formatScope(gateway(), new Map(), new Map())).toBe("Company");+ it("labels organization, project, and agent scopes", () => {+ expect(formatScope(gateway(), new Map(), new Map())).toBe("Organization");expect(formatScope(gateway({ contextScopeType: "project", contextScopeId: "p1" }),diff --git a/ui/src/pages/apps/gateways/gateway-helpers.ts b/ui/src/pages/apps/gateways/gateway-helpers.tsindex 9c00a440d3..71d0924173 100644--- a/ui/src/pages/apps/gateways/gateway-helpers.ts+++ b/ui/src/pages/apps/gateways/gateway-helpers.ts@@ -86,7 +86,7 @@ export function formatScope(}if (gateway.projectId) return `Project · ${projectNames.get(gateway.projectId) ?? shortId(gateway.projectId)}`;if (gateway.agentId) return `Agent · ${agentNames.get(gateway.agentId) ?? shortId(gateway.agentId)}`;- return "Company";+ return "Organization";}export function formatOwner(gateway: ToolMcpGatewayWithTokens, agentNames: Map<string, string>): string {diff --git a/ui/src/pages/audit/AuditFeed.tsx b/ui/src/pages/audit/AuditFeed.tsxindex 94426bfcda..9726362f5e 100644--- a/ui/src/pages/audit/AuditFeed.tsx+++ b/ui/src/pages/audit/AuditFeed.tsx@@ -40,7 +40,7 @@ const ACTION_DOMAINS: { value: string; label: string }[] = [{ value: "goal.", label: "Goals" },{ value: "tool_gateway.", label: "Tools" },{ value: "cost.", label: "Costs" },- { value: "company.", label: "Company" },+ { value: "company.", label: "Organization" },];/** Entity types offered in the filter (server does an exact match). */@@ -50,7 +50,7 @@ const ENTITY_TYPES: { value: string; label: string }[] = [{ value: "agent", label: "Agent" },{ value: "project", label: "Project" },{ value: "goal", label: "Goal" },- { value: "company", label: "Company" },+ { value: "company", label: "Organization" },];/**@@ -469,7 +469,7 @@ export function AuditFeed({<p className="mt-1 max-w-2xl text-sm text-muted-foreground">{resolvedMode === "agents"? "Every recorded agent action, newest first — with the responsible person and run behind each one."- : "Everything happening in your company, newest first — people, agents, and the system. Each line is one recorded action."}+ : "Everything happening in your organization, newest first — people, agents, and the system. Each line is one recorded action."}</p></div></div>@@ -607,7 +607,7 @@ export function AuditFeed({? "Try a wider date range or different filters.": resolvedMode === "agents"? "As soon as your agents start doing things, their actions show up here."- : "As soon as anyone in your company does something, it shows up here."}+ : "As soon as anyone in your organization does something, it shows up here."}</p></div>{hasActiveFilters ? (diff --git a/ui/src/pages/audit/CompanyActivity.tsx b/ui/src/pages/audit/CompanyActivity.tsxindex 8bde7c66b8..c986ef58c0 100644--- a/ui/src/pages/audit/CompanyActivity.tsx+++ b/ui/src/pages/audit/CompanyActivity.tsx@@ -42,7 +42,7 @@ export function CompanyActivity() {);if (!selectedCompanyId) {- return <EmptyState icon={History} message="Select a company to view activity." />;+ return <EmptyState icon={History} message="Select an organization to view activity." />;}return <AuditFeed companyId={selectedCompanyId} mode={mode} onModeChange={handleModeChange} />;diff --git a/ui/src/pages/secrets/MyUserSecretsTab.tsx b/ui/src/pages/secrets/MyUserSecretsTab.tsxindex 53d7935971..04686763b9 100644--- a/ui/src/pages/secrets/MyUserSecretsTab.tsx+++ b/ui/src/pages/secrets/MyUserSecretsTab.tsx@@ -81,7 +81,7 @@ export function MyUserSecretsTab({ companyId }: { companyId: string }) {) : entries.length === 0 && !mySecretsQuery.isPending ? (<EmptyStateicon={KeyRound}- message="No user secrets are defined for this company yet. An admin defines which credentials each member supplies."+ message="No user secrets are defined for this organization yet. An admin defines which credentials each member supplies."/>) : (<ul className="space-y-2">diff --git a/ui/src/pages/skills/ImportSkillsFromProjectDialog.tsx b/ui/src/pages/skills/ImportSkillsFromProjectDialog.tsxindex f20b87625b..0785ae7a40 100644--- a/ui/src/pages/skills/ImportSkillsFromProjectDialog.tsx+++ b/ui/src/pages/skills/ImportSkillsFromProjectDialog.tsx@@ -685,7 +685,7 @@ function PickProjectStep({<div>{readableErrorMessage(error)}</div></div>) : totalProjects === 0 ? (- <EmptyState icon={Layers} message="This company has no projects yet." />+ <EmptyState icon={Layers} message="This organization has no projects yet." />) : projects.length === 0 ? (<EmptyState icon={Search} message={`No projects match "${filter}".`} />) : (@@ -955,7 +955,7 @@ function SelectStep({</p><p className="mt-1.5 text-sm text-muted-foreground">{grant- ? "Your account doesn't have permission to add skills to this company. Ask an owner to grant the skills permission, then try again."+ ? "Your account doesn't have permission to add skills to this organization. Ask an owner to grant the skills permission, then try again.": readableErrorMessage(scanError)}</p>{!grant && (diff --git a/ui/src/pages/tools/ProfilesTab.tsx b/ui/src/pages/tools/ProfilesTab.tsxindex 6b58e00806..ca8d312eef 100644--- a/ui/src/pages/tools/ProfilesTab.tsx+++ b/ui/src/pages/tools/ProfilesTab.tsx@@ -538,7 +538,7 @@ export function EffectiveAgentPanel({ companyId, agentOptions }: { companyId: st<div key={profile.id} className="flex items-center justify-between gap-3 px-3 py-2.5"><span className="min-w-0 truncate text-sm font-medium text-foreground">{profile.name}</span>{profile.summary.isCompanyDefault ? (- <Badge variant="secondary">Company default</Badge>+ <Badge variant="secondary">Organization default</Badge>) : null}</div>))}@@ -935,7 +935,7 @@ export function ProfilesTab({ companyId }: { companyId: string }) {<EmptyStateicon={Layers}message="No access profiles yet"- description="Create a profile to group tool selectors, then bind it to the company or a specific agent."+ description="Create a profile to group tool selectors, then bind it to the organization or a specific agent."action="New profile"onAction={() => setCreateOpen(true)}/>diff --git a/ui/src/pages/tools/RunYourOwnTab.tsx b/ui/src/pages/tools/RunYourOwnTab.tsxindex a2aac5a266..418cb8491a 100644--- a/ui/src/pages/tools/RunYourOwnTab.tsx+++ b/ui/src/pages/tools/RunYourOwnTab.tsx@@ -94,7 +94,7 @@ export function RunYourOwnTab({ companyId }: { companyId: string }) {return (<div className="space-y-6"><p className="max-w-2xl text-sm text-muted-foreground">- For a tool that runs from a command. Paperclip runs it in your company's own isolated workspace.+ For a tool that runs from a command. Paperclip runs it in your organization's own isolated workspace.Administrators only.</p>diff --git a/ui/src/pages/tools/RuntimeTab.tsx b/ui/src/pages/tools/RuntimeTab.tsxindex 3af13ae8c9..8687fee11f 100644--- a/ui/src/pages/tools/RuntimeTab.tsx+++ b/ui/src/pages/tools/RuntimeTab.tsx@@ -94,7 +94,7 @@ function howItRuns(slot: ToolRuntimeSlot): string {function scopeLabel(scope: string | null | undefined): string {switch (scope) {case "company":- return "Whole company";+ return "Whole organization";case "project":case "project_workspace":return "This project";diff --git a/ui/src/pages/tools/ToolsAccess.tsx b/ui/src/pages/tools/ToolsAccess.tsxindex 1ffeff8049..e9c0aa781e 100644--- a/ui/src/pages/tools/ToolsAccess.tsx+++ b/ui/src/pages/tools/ToolsAccess.tsx@@ -65,7 +65,7 @@ export function ToolsAccess() {}, [setBreadcrumbs, selectedCompany?.name, advanced, tabLabel]);if (!selectedCompanyId) {- return <div className="p-6 text-sm text-muted-foreground">Select a company to open advanced setup.</div>;+ return <div className="p-6 text-sm text-muted-foreground">Select an organization to open advanced setup.</div>;}// Retired developer tabs (PAP-10915/PAP-10928) — keep old links working.diff --git a/ui/src/pages/tools/profiles/ProfileActionDialog.tsx b/ui/src/pages/tools/profiles/ProfileActionDialog.tsxindex 20a4dc7582..2142332b62 100644--- a/ui/src/pages/tools/profiles/ProfileActionDialog.tsx+++ b/ui/src/pages/tools/profiles/ProfileActionDialog.tsx@@ -48,7 +48,7 @@ export function ProfileActionDialog({delete: {title: "Delete profile",body: defaultDeleteBlocked- ? "This profile is the company default. Reassign the company default to another profile before deleting it."+ ? "This profile is the organization default. Reassign the organization default to another profile before deleting it.": `This permanently deletes the profile and removes ${profile.summary.assignmentCount} ${profile.summary.assignmentCount === 1 ? "assignment" : "assignments"}.`,confirm: "Delete",action: onDelete,@@ -65,7 +65,7 @@ export function ProfileActionDialog({{defaultDeleteBlocked ? (<div className="flex gap-3 rounded-lg border border-destructive/40 bg-destructive/5 px-3 py-2 text-sm text-destructive"><AlertTriangle className="mt-0.5 h-4 w-4 shrink-0" />- <span>Choose another access profile and make it the company default first.</span>+ <span>Choose another access profile and make it the organization default first.</span></div>) : null}<DialogFooter>diff --git a/ui/src/pages/tools/profiles/ProfileDetail.test.tsx b/ui/src/pages/tools/profiles/ProfileDetail.test.tsxindex e86f006be4..7d1958b063 100644--- a/ui/src/pages/tools/profiles/ProfileDetail.test.tsx+++ b/ui/src/pages/tools/profiles/ProfileDetail.test.tsx@@ -339,7 +339,7 @@ describe("ProfileDetail", () => {});await Promise.resolve();- expect(document.body.textContent).toContain("Reassign the company default to another profile before deleting it.");+ expect(document.body.textContent).toContain("Reassign the organization default to another profile before deleting it.");const dialogDelete = [...document.body.querySelectorAll('[role="dialog"] button')].find((b) => b.textContent?.trim() === "Delete") as HTMLButtonElement | undefined;expect(dialogDelete?.disabled).toBe(true);expect(api.deleteProfile).not.toHaveBeenCalled();diff --git a/ui/src/pages/tools/profiles/ProfileDetail.tsx b/ui/src/pages/tools/profiles/ProfileDetail.tsxindex be4b3c4321..f3a04bf454 100644--- a/ui/src/pages/tools/profiles/ProfileDetail.tsx+++ b/ui/src/pages/tools/profiles/ProfileDetail.tsx@@ -534,7 +534,7 @@ function Assignments({<div key={binding.id} className="flex items-center justify-between gap-3 px-3 py-2.5"><div className="flex min-w-0 items-center gap-3"><span className="flex h-8 w-8 items-center justify-center rounded-full bg-muted text-xs font-semibold text-muted-foreground">- {binding.targetType === "company" ? "Co" : binding.targetType.slice(0, 2).toUpperCase()}+ {binding.targetType === "company" ? "Or" : binding.targetType.slice(0, 2).toUpperCase()}</span><div className="min-w-0"><p className="truncate text-sm font-medium text-foreground">{assignmentLabel(binding, companyId, maps)}</p>@@ -730,7 +730,7 @@ function RemoveAssignmentDialog({<DialogTitle>Remove assignment</DialogTitle><DialogDescription>{binding?.targetType === "company"- ? "Removing the company default changes access for every agent that relies on it."+ ? "Removing the organization default changes access for every agent that relies on it.": `Remove this profile from ${label}.`}</DialogDescription></DialogHeader>@@ -831,16 +831,16 @@ function assignmentLabel(companyId: string,maps: ReturnType<typeof useProfilesData>["maps"],): string {- if (binding.targetType === "company") return "Company default";+ if (binding.targetType === "company") return "Organization default";if (binding.targetType === "agent") return maps.agentsById.get(binding.targetId) ?? "Unknown agent";if (binding.targetType === "project") return maps.projectsById.get(binding.targetId) ?? "Unknown project";if (binding.targetType === "routine") return maps.routinesById.get(binding.targetId) ?? "Unknown routine";- if (binding.targetId === companyId) return "Company";+ if (binding.targetId === companyId) return "Organization";return binding.targetId;}function assignmentTypeLabel(type: ToolProfileBinding["targetType"]): string {- if (type === "company") return "Company default";+ if (type === "company") return "Organization default";if (type === "agent") return "Agent";if (type === "project") return "Project";if (type === "routine") return "Routine";diff --git a/ui/src/pages/tools/profiles/ProfileDetailRoute.tsx b/ui/src/pages/tools/profiles/ProfileDetailRoute.tsxindex ec1d695946..28c684462d 100644--- a/ui/src/pages/tools/profiles/ProfileDetailRoute.tsx+++ b/ui/src/pages/tools/profiles/ProfileDetailRoute.tsx@@ -22,7 +22,7 @@ export function ProfileDetailRoute() {}, [setBreadcrumbs, selectedCompany?.name]);if (!selectedCompanyId || !params.profileId) {- return <div className="p-6 text-sm text-muted-foreground">Select a company and profile.</div>;+ return <div className="p-6 text-sm text-muted-foreground">Select an organization and profile.</div>;}return (diff --git a/ui/src/pages/tools/profiles/ProfileWizard.tsx b/ui/src/pages/tools/profiles/ProfileWizard.tsxindex eebfbcbd87..704be38582 100644--- a/ui/src/pages/tools/profiles/ProfileWizard.tsx+++ b/ui/src/pages/tools/profiles/ProfileWizard.tsx@@ -609,7 +609,7 @@ export function StepAssign({onChange={(e) => onCompanyDefault(e.target.checked)}/><span className="flex flex-col gap-0.5">- <span className="text-sm font-medium text-foreground">Make this the company default</span>+ <span className="text-sm font-medium text-foreground">Make this the organization default</span><span className="text-xs text-muted-foreground">Every agent without its own profile uses this one.{defaultProfileName ? ` Replaces “${defaultProfileName}”.` : ""}@@ -630,7 +630,7 @@ export function StepAssign({getDescription={(agent) => {const context = contextByAgent.get(agent.id) ?? [];const bits = [...context];- if (defaultProfileName) bits.push("company default");+ if (defaultProfileName) bits.push("organization default");return bits.length > 0 ? `already has: ${bits.join(" · ")}` : "no profiles yet";}}/>diff --git a/ui/src/pages/tools/profiles/ProfileWizardRoute.tsx b/ui/src/pages/tools/profiles/ProfileWizardRoute.tsxindex 9b6b34a77b..12a7e51bc9 100644--- a/ui/src/pages/tools/profiles/ProfileWizardRoute.tsx+++ b/ui/src/pages/tools/profiles/ProfileWizardRoute.tsx@@ -28,7 +28,7 @@ export function ProfileWizardRoute({ mode }: { mode: "new" | "edit" }) {useEffect(() => {setBreadcrumbs([- { label: selectedCompany?.name ?? "Company", href: "/dashboard" },+ { label: selectedCompany?.name ?? "Organization", href: "/dashboard" },{ label: "Apps", href: "/apps" },{ label: "Access profiles", href: advancedTabHref("profiles") },{ label: mode === "edit" ? "Resume draft" : "New profile" },@@ -37,7 +37,7 @@ export function ProfileWizardRoute({ mode }: { mode: "new" | "edit" }) {}, [setBreadcrumbs, selectedCompany?.name, mode]);if (!selectedCompanyId) {- return <div className="p-6 text-sm text-muted-foreground">Select a company to create a profile.</div>;+ return <div className="p-6 text-sm text-muted-foreground">Select an organization to create a profile.</div>;}return (diff --git a/ui/src/pages/tools/profiles/ProfilesIndex.test.tsx b/ui/src/pages/tools/profiles/ProfilesIndex.test.tsxindex 70744341cc..73052caa3d 100644--- a/ui/src/pages/tools/profiles/ProfilesIndex.test.tsx+++ b/ui/src/pages/tools/profiles/ProfilesIndex.test.tsx@@ -140,7 +140,7 @@ describe("ProfilesIndex", () => {expect(container.textContent).toContain("9 tools · 3 apps");expect(container.textContent).toContain("2 agents");expect(container.textContent).toContain("All except 2 tools");- expect(container.textContent).toContain("Company default");+ expect(container.textContent).toContain("Organization default");});it("shows a new-tools chip in the Allows column", async () => {@@ -266,7 +266,7 @@ describe("ProfilesIndex", () => {await Promise.resolve();expect(confirm).not.toHaveBeenCalled();- expect(document.body.textContent).toContain("Reassign the company default to another profile before deleting it.");+ expect(document.body.textContent).toContain("Reassign the organization default to another profile before deleting it.");const dialogDelete = [...document.body.querySelectorAll('[role="dialog"] button')].find((b) => b.textContent?.trim() === "Delete") as HTMLButtonElement | undefined;expect(dialogDelete?.disabled).toBe(true);expect(api.deleteProfile).not.toHaveBeenCalled();diff --git a/ui/src/pages/tools/profiles/profile-summary.test.ts b/ui/src/pages/tools/profiles/profile-summary.test.tsindex c22859ebde..01ed6c98c0 100644--- a/ui/src/pages/tools/profiles/profile-summary.test.ts+++ b/ui/src/pages/tools/profiles/profile-summary.test.ts@@ -37,7 +37,7 @@ describe("allowsLabel", () => {describe("assignedLabel", () => {it("prefers the company-default label", () => {expect(assignedLabel(summary({ isCompanyDefault: true, appliesToAgentCount: 4 }))).toEqual({- text: "Company default",+ text: "Organization default",unassigned: false,});});diff --git a/ui/src/pages/tools/profiles/profile-summary.ts b/ui/src/pages/tools/profiles/profile-summary.tsindex 3f9fe33a5e..978839f6e6 100644--- a/ui/src/pages/tools/profiles/profile-summary.ts+++ b/ui/src/pages/tools/profiles/profile-summary.ts@@ -31,9 +31,9 @@ export interface AssignedLabel {unassigned: boolean;}-/** "Company default" / "2 agents" / "Not assigned yet". */+/** "Organization default" / "2 agents" / "Not assigned yet". */export function assignedLabel(summary: ToolProfileSummary): AssignedLabel {- if (summary.isCompanyDefault) return { text: "Company default", unassigned: false };+ if (summary.isCompanyDefault) return { text: "Organization default", unassigned: false };if (summary.appliesToAgentCount > 0) {return { text: plural(summary.appliesToAgentCount, "agent"), unassigned: false };}diff --git a/ui/src/plugins/bridge-init.ts b/ui/src/plugins/bridge-init.tsindex 5cccc7769b..e94a3e880c 100644--- a/ui/src/plugins/bridge-init.ts+++ b/ui/src/plugins/bridge-init.ts@@ -324,7 +324,7 @@ function PluginSdkIssuesList({});if (!companyId) {- return createElement("div", { className: "text-sm text-muted-foreground" }, "Select a company to view tasks.");+ return createElement("div", { className: "text-sm text-muted-foreground" }, "Select an organization to view tasks.");}return createElement(HostIssuesList, {