diff --git a/apps/web/components/agents-view.test.ts b/apps/web/components/agents-view.test.ts
new file mode 100644
index 0000000..36907bf
--- /dev/null
+++ b/apps/web/components/agents-view.test.ts
@@ -0,0 +1,35 @@
+import { readFile } from "node:fs/promises";
+import { describe, expect, it } from "vitest";
+
+const viewUrl = new URL("./agents-view.tsx", import.meta.url);
+
+describe("Agent directory", () => {
+  it("describes agents, not humans", async () => {
+    const source = await readFile(viewUrl, "utf8");
+    expect(source).toContain(
+      'description="Permission-scoped agents with governed learning"',
+    );
+    expect(source).not.toContain("human collaborators");
+  });
+
+  it("offers no affordance for agent creation, which has no API", async () => {
+    const source = await readFile(viewUrl, "utf8");
+    expect(source).not.toContain("New agent");
+  });
+});
+
+describe("Agent detail", () => {
+  it("routes work assignment to the operations board", async () => {
+    const source = await readFile(viewUrl, "utf8");
+    expect(source).toContain('href="/operations"');
+    expect(source).toContain("Assign work");
+    expect(source).not.toContain("Invoke");
+  });
+
+  it("keeps every remaining disabled control tied to live state", async () => {
+    const source = await readFile(viewUrl, "utf8");
+    for (const match of source.matchAll(/disabled(?:={([^}]*)})?/g)) {
+      expect(match[1], "permanently disabled control").toBeTruthy();
+    }
+  });
+});
diff --git a/apps/web/components/agents-view.tsx b/apps/web/components/agents-view.tsx
index 94112a1..aa91412 100644
--- a/apps/web/components/agents-view.tsx
+++ b/apps/web/components/agents-view.tsx
@@ -15,7 +15,7 @@ import { OpsShell } from "@/components/ops-shell";
 import { PageHeader } from "@/components/page-header";
 import { Avatar } from "@/components/ui/avatar";
 import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
+import { Button, buttonVariants } from "@/components/ui/button";
 
 type EvidenceState = "reported" | "unavailable" | "unknown";
 type AgentReadiness = {
@@ -130,13 +130,7 @@ export function AgentsView() {
       <PageHeader
         eyebrow="Workforce"
         title="Agent directory"
-        description="Permission-scoped human collaborators with governed learning"
-        actions={
-          <Button disabled title="Agent creation is not available yet">
-            <Bot />
-            New agent
-          </Button>
-        }
+        description="Permission-scoped agents with governed learning"
       />
       <div className="flex items-center gap-2 border-b bg-[var(--color-paper-2)] p-3">
         <label className="flex h-9 min-w-0 max-w-md flex-1 items-center gap-2 rounded-md border bg-background px-3">
@@ -300,17 +294,18 @@ export function AgentDetailView({
         title={agent.name}
         description={`${agent.configuredRuntime} · ${agent.configuredModel} · owned by ${agent.owner}`}
         actions={
-          <Button
-            disabled
+          <Link
+            href="/operations"
+            className={buttonVariants({ variant: "default" })}
             title={
               agent.readiness.state === "ready"
-                ? "Assign work from Tasks"
+                ? "Create a task on the operations board and dispatch it here"
                 : agent.readiness.reason
             }
           >
             <Bot />
-            Invoke
-          </Button>
+            Assign work
+          </Link>
         }
       />
       <div className="flex items-center gap-3 border-b bg-[var(--color-paper-2)] px-4 py-3">
diff --git a/apps/web/components/os/company-os-shell.test.ts b/apps/web/components/os/company-os-shell.test.ts
index ab8d482..54f7c40 100644
--- a/apps/web/components/os/company-os-shell.test.ts
+++ b/apps/web/components/os/company-os-shell.test.ts
@@ -24,10 +24,12 @@ describe("Company OS shell foundation", () => {
     }
   });
 
-  it("keeps organisation switcher non-authoritative and disabled until multi-org exists", async () => {
+  it("states the organisation instead of offering a dead switcher", async () => {
     const source = await readFile(shellUrl, "utf8");
+    expect(source).toContain("organisations.length > 1");
     expect(source).toContain('id="org-switcher"');
-    expect(source).toContain("disabled");
+    expect(source).toContain('<span className="sr-only">Organisation: </span>');
+    expect(source).not.toContain("not available yet");
     expect(source).toContain("localStorage.setItem(\"muster-theme\"");
     expect(source).not.toMatch(/localStorage\.setItem\([^\)]*organisation/i);
     expect(source).not.toMatch(/localStorage\.setItem\([^\)]*approval/i);
diff --git a/apps/web/components/os/company-os-shell.tsx b/apps/web/components/os/company-os-shell.tsx
index 087be0e..f347707 100644
--- a/apps/web/components/os/company-os-shell.tsx
+++ b/apps/web/components/os/company-os-shell.tsx
@@ -245,6 +245,7 @@ export function CompanyOsShell({ children }: { children: ReactNode }) {
   const [mobileOpen, setMobileOpen] = useState(false);
   const [paletteOpen, setPaletteOpen] = useState(false);
   const [theme, setTheme] = useState<"dark" | "light">("dark");
+  const [chosenOrganisationId, setChosenOrganisationId] = useState("");
 
   useEffect(() => {
     const current =
@@ -266,6 +267,10 @@ export function CompanyOsShell({ children }: { children: ReactNode }) {
   const pendingApprovals = command.data?.pendingApprovalCount ?? 0;
   const overallHealth = toHealthState(command.data?.overallHealth ?? "unknown");
   const org = session.data?.organisation;
+  const organisations = session.data?.organisations ?? [];
+  // The switcher only earns its interactivity once a second membership exists;
+  // with one organisation the top bar states it instead of offering a choice.
+  const selectedOrganisationId = chosenOrganisationId || org?.id || "";
   const actor = session.data?.actor;
   const environment = session.data?.environment ?? "unknown";
 
@@ -324,20 +329,33 @@ export function CompanyOsShell({ children }: { children: ReactNode }) {
 
           <div className="min-w-0 flex-1">
             <div className="flex flex-wrap items-center gap-2">
-              <label className="sr-only" htmlFor="org-switcher">
-                Organisation
-              </label>
-              <select
-                id="org-switcher"
-                className="max-w-[12rem] truncate rounded-md border border-border bg-background px-2 py-1 text-xs font-medium"
-                value={org?.id ?? ""}
-                disabled
-                title="Multi-organisation membership is not available yet"
-              >
-                <option value={org?.id ?? ""}>
-                  {org?.name ?? (session.isLoading ? "Loading…" : "Organisation")}
-                </option>
-              </select>
+              {organisations.length > 1 ? (
+                <>
+                  <label className="sr-only" htmlFor="org-switcher">
+                    Organisation
+                  </label>
+                  <select
+                    id="org-switcher"
+                    className="max-w-[12rem] truncate rounded-md border border-border bg-background px-2 py-1 text-xs font-medium"
+                    value={selectedOrganisationId}
+                    onChange={(event) =>
+                      setChosenOrganisationId(event.target.value)
+                    }
+                  >
+                    {organisations.map((membership) => (
+                      <option key={membership.id} value={membership.id}>
+                        {membership.name}
+                      </option>
+                    ))}
+                  </select>
+                </>
+              ) : (
+                <p className="max-w-[12rem] truncate text-xs font-medium">
+                  <span className="sr-only">Organisation: </span>
+                  {org?.name ??
+                    (session.isLoading ? "Loading…" : "Organisation")}
+                </p>
+              )}
               {session.data?.customer ? (
                 <Badge className="bg-muted text-muted-foreground">
                   Customer: {session.data.customer.name}