@zoahhq/cli 0.1.2 → 0.1.3

package/README.md

@@ -139,7 +139,7 @@ fresh `agent/<timestamp>` branch off main, so an agent's edits stay reviewable
 rather than landing on main.
 
 **4. Check it worked.** `status` reports the connected project, the branch, and
-workspace role. It also reports credential health. `whoami` reports the
+organization role. It also reports credential health. `whoami` reports the
 identity, role, and instance.
 
 #### What the agent gets
@@ -149,17 +149,17 @@ session without direct human confirmation. Confirmation actions stay in the
 Zoah app. The server replaces renderer-only and workspace-agent verbs with
 the session tools below.
 
-| Group                   | Tools                                                                                                                                 |
-| ----------------------- | ------------------------------------------------------------------------------------------------------------------------------------- |
-| Session                 | `connect`, `status`, `pullEvents`, `disconnect`, `whoami`, `logout`, `describeProperties`                                             |
-| Workspaces and projects | `listWorkspaces`, `createWorkspace`, `listProjects`, `createProject`, `updateProject`                                                 |
-| Branches                | `listBranches`, `createBranch`                                                                                                        |
-| Pull requests           | `createPullRequest`, `getPullRequest`, `updatePullRequest`, `commentOnPullRequest`                                                    |
-| Canvas                  | one per applicable Action API verb for nodes, pages, components, slots, variants, variables, themes, breakpoints, events, and queries |
+| Group                      | Tools                                                                                                                                 |
+| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------- |
+| Session                    | `connect`, `status`, `pullEvents`, `disconnect`, `whoami`, `logout`, `describeProperties`                                             |
+| Organizations and projects | `listOrganizations`, `createOrganization`, `listProjects`, `createProject`, `updateProject`                                           |
+| Branches                   | `listBranches`, `createBranch`                                                                                                        |
+| Pull requests              | `createPullRequest`, `getPullRequest`, `updatePullRequest`, `commentOnPullRequest`                                                    |
+| Canvas                     | one per applicable Action API verb for nodes, pages, components, slots, variants, variables, themes, breakpoints, events, and queries |
 
 Two properties are worth knowing. Mutation tools return only after the sync
 gateway acks the write, so a returned success means persisted, not queued. And
-the server does not provide branch, project, or workspace deletion.
+the server does not provide branch, project, or organization deletion.
 `pullEvents` returns structured rejection and collaborator action details. It
 also returns merge summaries. Sync and cache signals mean the agent should
 re-query after reconnect catch-up.
@@ -339,7 +339,7 @@ When the import fails (e.g. the server returns 400 because no components were ex
 
 Commit these files. They bind the checkout to the Zoah project:
 
-- `.zoah/config.json`: workspace and project binding, written on the first import.
+- `.zoah/config.json`: organization and project binding, written on the first import.
 - `.zoah/components.json`: component IDs, package exports, and slot anchors.
 - `.zoah/manifest.json`: published package name, version, and registry URL.
 

package/dist/cli.mjs

@@ -467,29 +467,29 @@ var init_client = __esm({
         );
       }
       /**
-       * Every workspace the user belongs to (`GET /api/import/organizations`).
+       * Every organization the user belongs to (`GET /api/import/organizations`).
        *
-       * The workspace is the outermost scope an agent works in and was the only one
+       * The organization is the outermost scope an agent works in and was the only one
        * with no way to see it: responses carried an opaque `orgId` and the readable
        * slug appeared only inside an app URL. Membership comes from the owner-group
        * walk the sync gateway already performs on every socket identify, so this
-       * lists every workspace rather than the one the human last selected.
+       * lists every organization rather than the one the human last selected.
        */
-      listWorkspaces() {
+      listOrganizations() {
         return this.send(
           "GET",
           "/api/import/organizations"
         );
       }
       /**
-       * Create a workspace (`POST /api/import/organizations`).
+       * Create an organization (`POST /api/import/organizations`).
        *
        * The server creates it and keeps the org-capable credential to itself, so
        * this call carries nothing but the name. The slug is derived server-side
        * from that name: `slug` is globally unique, so a caller that invented one
        * would be inventing a value it cannot check.
        */
-      createWorkspace(name) {
+      createOrganization(name) {
         return this.send(
           "POST",
           "/api/import/organizations",
@@ -53471,8 +53471,8 @@ var init_ai_action_style_keys = __esm({
 
 // ../shared/dist/ai/opaque/opaqueActions.js
 import { z as z51 } from "zod";
-function isWorkspaceActionType(type) {
-  return WORKSPACE_ACTION_TYPES.includes(type);
+function isOrganizationActionType(type) {
+  return ORGANIZATION_ACTION_TYPES.includes(type);
 }
 function def(type, description, input, options) {
   var _a2;
@@ -53485,7 +53485,7 @@ function def(type, description, input, options) {
 function getOpaqueActionDef(type) {
   return OPAQUE_ACTIONS.find((a5) => a5.type === type);
 }
-var shaderLayersSchema, variableValue, STYLE_KEYS, STYLE_TRAPS, nodeUpdatesSchema, WORKSPACE_ACTION_TYPES, componentId, pageId, variantId, OPAQUE_ACTIONS;
+var shaderLayersSchema, variableValue, STYLE_KEYS, STYLE_TRAPS, nodeUpdatesSchema, ORGANIZATION_ACTION_TYPES, componentId, pageId, variantId, OPAQUE_ACTIONS;
 var init_opaqueActions = __esm({
   "../shared/dist/ai/opaque/opaqueActions.js"() {
     "use strict";
@@ -53530,7 +53530,7 @@ var init_opaqueActions = __esm({
         base: z51.record(z51.string(), z51.unknown()).optional().describe(`Visual properties. VALID KEYS \u2014 no others are accepted, and one invalid key rejects the WHOLE edit: ${STYLE_KEYS.join(", ")}. Common mistakes: ${STYLE_TRAPS}.`)
       }).optional()
     }).describe("Initial/updated values: `styles` for visual properties, `name` for the layer name, `innerText` for text content (text nodes only), `svgPath` to promote to vector, `shaderLayers` for shader effects, plus the semantic node fields (placeholder, inputValue, inputTextType, htmlTag, className, url, target, frameUrl).");
-    WORKSPACE_ACTION_TYPES = [
+    ORGANIZATION_ACTION_TYPES = [
       "listProjects",
       "createProject",
       "updateProject",
@@ -53821,12 +53821,12 @@ var init_opaqueActions = __esm({
         sourceBranch: z51.string().optional().describe("The branch whose OPEN pull request to comment on. Pass this OR prId."),
         body: z51.string().describe("The comment, in plain text.")
       })),
-      def("listProjects", "List the projects in the user's current workspace (organization): id, name, slug, and last-update time. The [Workspace] context block already carries this list \u2014 call this only when you need a FRESH read (e.g. right after you created a project).", z51.object({}), { readOnly: true }),
-      def("createProject", "Create a new project in the user's current workspace. Returns the new project's id and slug. Set `open: true` to also navigate the user's browser to it \u2014 do that only when the user asked to open or start working in it.", z51.object({
+      def("listProjects", "List the projects in the user's current organization: id, name, slug, and last-update time. The [Organization] context block already carries this list \u2014 call this only when you need a FRESH read (e.g. right after you created a project).", z51.object({}), { readOnly: true }),
+      def("createProject", "Create a new project in the user's current organization. Returns the new project's id and slug. Set `open: true` to also navigate the user's browser to it \u2014 do that only when the user asked to open or start working in it.", z51.object({
         name: z51.string().describe("Display name for the new project."),
         open: z51.boolean().optional().describe("True to navigate the user's browser to the new project. Only when the user asked to open it.")
       })),
-      def("updateProject", "Rename a project in the user's current workspace. Never navigates.", z51.object({
+      def("updateProject", "Rename a project in the user's current organization. Never navigates.", z51.object({
         projectRef: z51.string().describe("The target project's id, or its exact display name."),
         name: z51.string().describe("The new display name.")
       })),
@@ -53836,7 +53836,7 @@ var init_opaqueActions = __esm({
       def("setTargetProject", "Point this turn's canvas verbs at a project WITHOUT navigating the user's browser. Later canvas edits run against that project in the background, on this agent's own work branch. Use this to act on a project the user did not ask to open.", z51.object({
         projectRef: z51.string().describe("The target project's id, or its exact display name.")
       })),
-      def("createAgent", "Create a new agent for the user. With `projectId` the new agent is DEDICATED: it can act only inside that project, and the user finds it in that project's agent picker. Without `projectId` it is another workspace agent. This does not start the new agent \u2014 the user sends its first message.", z51.object({
+      def("createAgent", "Create a new agent for the user. With `projectId` the new agent is DEDICATED: it can act only inside that project, and the user finds it in that project's agent picker. Without `projectId` it is another organization agent. This does not start the new agent \u2014 the user sends its first message.", z51.object({
         name: z51.string().optional().describe("Display name for the new agent (default: 'Agent N')."),
         projectId: z51.string().optional().describe("Bind the new agent to this project id.")
       })),
@@ -53943,7 +53943,7 @@ var init_brief_context = __esm({
 });
 
 // ../shared/dist/ai/conversation-personas.js
-var AGENT_PREAMBLE, MULTI_FAMILY_GUIDANCE, CONVERSATIONAL_PERSONA, WORKSPACE_PERSONA, CANVAS_PERSONA, CANVAS_STYLES_SUPPLIED_NOTE;
+var AGENT_PREAMBLE, MULTI_FAMILY_GUIDANCE, CONVERSATIONAL_PERSONA, ORGANIZATION_PERSONA, CANVAS_PERSONA, CANVAS_STYLES_SUPPLIED_NOTE;
 var init_conversation_personas = __esm({
   "../shared/dist/ai/conversation-personas.js"() {
     "use strict";
@@ -53977,11 +53977,11 @@ uses the filesystem tools. Some tasks use more than one; that's fine.
       "  asks to build/generate a new brand or design system.",
       "- You work inside THIS project only. If the user asks for work outside it \u2014",
       "  creating projects, or renaming or editing other projects \u2014 say that a",
-      "  WORKSPACE agent does that, in the agent picker's Workspace section."
+      "  ORGANIZATION agent does that, in the agent picker's Organization section."
     ].join("\n");
-    WORKSPACE_PERSONA = [
-      "You are the user's WORKSPACE agent. No project is open on screen.",
-      "- The [Workspace] block above lists the workspace's projects (name, slug,",
+    ORGANIZATION_PERSONA = [
+      "You are the user's ORGANIZATION agent. No project is open on screen.",
+      "- The [Organization] block above lists the organization's projects (name, slug,",
       "  id). Resolve a project the user names from that list; ask only",
       "  when two projects genuinely collide. Call listProjects only for a FRESH",
       "  read (e.g. right after you created a project).",
@@ -54020,7 +54020,7 @@ uses the filesystem tools. Some tasks use more than one; that's fine.
       "  correct property. Fix and retry rather than reporting failure to the user.",
       "- You work inside THIS project only. If the user asks for work outside it \u2014",
       "  creating projects, or renaming or editing other projects \u2014 say that a",
-      "  WORKSPACE agent does that, in the agent picker's Workspace section."
+      "  ORGANIZATION agent does that, in the agent picker's Organization section."
     ].join("\n");
     CANVAS_STYLES_SUPPLIED_NOTE = [
       "- The selected element's CURRENT STYLES are listed above and are up to date.",
@@ -57607,7 +57607,7 @@ var init_page_generator = __esm({
 });
 
 // ../shared/dist/element-generation/components/adapters/deployment/app-runtime.js
-var NODE_HOOK_ATTR, INSTANCE_HOOK_ATTR, DATA_ATTR_PREFIX;
+var NODE_HOOK_ATTR, BUSY_CONTROL_KEY, INSTANCE_HOOK_ATTR, DATA_ATTR_PREFIX;
 var init_app_runtime = __esm({
   "../shared/dist/element-generation/components/adapters/deployment/app-runtime.js"() {
     "use strict";
@@ -57615,6 +57615,7 @@ var init_app_runtime = __esm({
     init_deployed_naming();
     init_constants3();
     NODE_HOOK_ATTR = dataAttr("node");
+    BUSY_CONTROL_KEY = `__${DEPLOYED_NAMING.dataAttrPrefix}Control`;
     INSTANCE_HOOK_ATTR = dataAttr("instance");
     DATA_ATTR_PREFIX = DEPLOYED_NAMING.dataAttrPrefix;
   }
@@ -88283,7 +88284,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/config/version.ts"() {
     "use strict";
-    CLI_VERSION = true ? "0.1.2" : "0.0.0-dev";
+    CLI_VERSION = true ? "0.1.3" : "0.0.0-dev";
   }
 });
 
@@ -90638,13 +90639,13 @@ function serializeProject(project) {
     slug: typeof project.slug === "string" ? project.slug : null
   };
 }
-async function loadWorkspaceProjects() {
+async function loadOrganizationProjects() {
   const matches = await Project2.query({}).reduce({});
   return matches.filter((project) => !!project);
 }
 async function executeOrgActionAsync(action, context) {
   var _a2, _b;
-  const projects = await loadWorkspaceProjects();
+  const projects = await loadOrganizationProjects();
   if (action.type === "listProjects") {
     return {
       action,
@@ -90670,7 +90671,7 @@ async function executeOrgActionAsync(action, context) {
     return {
       action,
       success: false,
-      error: `No project "${ref2}" in this workspace. Call listProjects to see what is there.`
+      error: `No project "${ref2}" in this organization. Call listProjects to see what is there.`
     };
   }
   const named = Object.assign(Object.assign({}, action), { projectRef: resolved.id });
@@ -90705,7 +90706,7 @@ function executeCreateProject(action, context, existing) {
     return {
       action,
       success: false,
-      error: `This workspace already has a project called "${name}" (${taken.id}). Two projects with one name leave every later reference ambiguous.`
+      error: `This organization already has a project called "${name}" (${taken.id}). Two projects with one name leave every later reference ambiguous.`
     };
   }
   const actionIds = [];
@@ -96622,7 +96623,7 @@ var init_async_context = __esm({
 });
 
 // src/opaque/headless-client.ts
-function isWorkspaceClientUsable(client2) {
+function isOrganizationClientUsable(client2) {
   return client2.isWebSocketOpen() && client2.isOrgConfirmed();
 }
 function assertNodeWebSocket() {
@@ -96742,7 +96743,7 @@ async function resolveProjectRef(listing, reference) {
     throw new ProjectRefError("Project reference is empty.");
   }
   const { projects } = listing;
-  const workspace = listing.workspace ?? (listing.orgId ? { id: listing.orgId, name: null, slug: null } : void 0);
+  const organization = listing.organization ?? (listing.orgId ? { id: listing.orgId, name: null, slug: null } : void 0);
   if (PROJECT_ID_PATTERN.test(trimmed)) {
     const mine = projects.find(
       (p4) => p4.id.toLowerCase() === trimmed.toLowerCase()
@@ -96753,38 +96754,38 @@ async function resolveProjectRef(listing, reference) {
         name: mine.name,
         slug: mine.slug,
         matchedBy: "id",
-        workspace
+        organization
       };
     }
     throw new ProjectRefError(
-      `${trimmed} is not among this workspace's projects. Call listProjects to see what is here, or pass \`workspace\` to look somewhere else. Nothing was connected.`
+      `${trimmed} is not among this organization's projects. Call listProjects to see what is here, or pass \`organization\` to look somewhere else. Nothing was connected.`
     );
   }
   const { record, matchedBy } = matchRef({
     reference: trimmed,
     records: projects,
     noun: "project",
-    emptyMessage: "This workspace has no projects. Call createProject, then connect to it.",
-    candidatesPrefix: "This workspace's projects"
+    emptyMessage: "This organization has no projects. Call createProject, then connect to it.",
+    candidatesPrefix: "This organization's projects"
   });
   return {
     projectId: record.id,
     name: record.name,
     slug: record.slug,
     matchedBy,
-    workspace
+    organization
   };
 }
-async function resolveWorkspaceRef(api, reference) {
+async function resolveOrganizationRef(api, reference) {
   const trimmed = reference.trim();
   if (!trimmed) {
-    throw new ProjectRefError("Workspace reference is empty.");
+    throw new ProjectRefError("Organization reference is empty.");
   }
-  const { organizations } = await api.listWorkspaces();
+  const { organizations } = await api.listOrganizations();
   if (ORG_ID_PATTERN.test(trimmed)) {
     const known = organizations.find((o3) => o3.id === trimmed);
     return {
-      workspaceId: trimmed,
+      organizationId: trimmed,
       ...known ? { name: known.name, slug: known.slug } : {},
       role: known?.role ?? "read",
       matchedBy: "id"
@@ -96793,12 +96794,12 @@ async function resolveWorkspaceRef(api, reference) {
   const { record, matchedBy } = matchRef({
     reference: trimmed,
     records: organizations,
-    noun: "workspace",
-    emptyMessage: "This account belongs to no workspace yet.",
-    candidatesPrefix: "Your workspaces"
+    noun: "organization",
+    emptyMessage: "This account belongs to no organization yet.",
+    candidatesPrefix: "Your organizations"
   });
   return {
-    workspaceId: record.id,
+    organizationId: record.id,
     name: record.name,
     slug: record.slug,
     role: record.role,
@@ -97363,12 +97364,12 @@ var init_ai_action_api = __esm({
         },
         {
           type: "listProjects",
-          description: "List the projects in the user's current workspace (organization): id, name, slug, and last-update time. The [Workspace] context block already carries this list \u2014 call this only when you need a FRESH read (e.g. right after you created a project).",
+          description: "List the projects in the user's current organization: id, name, slug, and last-update time. The [Organization] context block already carries this list \u2014 call this only when you need a FRESH read (e.g. right after you created a project).",
           parameters: {}
         },
         {
           type: "createProject",
-          description: "Create a new project in the user's current workspace. Returns the new project's id and slug. Set `open: true` to also navigate the user's browser to it \u2014 do that only when the user asked to open or start working in it.",
+          description: "Create a new project in the user's current organization. Returns the new project's id and slug. Set `open: true` to also navigate the user's browser to it \u2014 do that only when the user asked to open or start working in it.",
           parameters: {
             name: "string - Display name for the new project.",
             open: "boolean (optional) - True to navigate the user's browser to the new project. Only when the user asked to open it."
@@ -97376,7 +97377,7 @@ var init_ai_action_api = __esm({
         },
         {
           type: "updateProject",
-          description: "Rename a project in the user's current workspace. Never navigates.",
+          description: "Rename a project in the user's current organization. Never navigates.",
           parameters: {
             projectRef: "string - The target project's id, or its exact display name.",
             name: "string - The new display name."
@@ -97398,7 +97399,7 @@ var init_ai_action_api = __esm({
         },
         {
           type: "createAgent",
-          description: "Create a new agent for the user. With `projectId` the new agent is DEDICATED: it can act only inside that project, and the user finds it in that project's agent picker. Without `projectId` it is another workspace agent. This does not start the new agent \u2014 the user sends its first message.",
+          description: "Create a new agent for the user. With `projectId` the new agent is DEDICATED: it can act only inside that project, and the user finds it in that project's agent picker. Without `projectId` it is another organization agent. This does not start the new agent \u2014 the user sends its first message.",
           parameters: {
             name: "string (optional) - Display name for the new agent (default: 'Agent N').",
             projectId: "string (optional) - Bind the new agent to this project id."
@@ -98603,13 +98604,13 @@ async function runMcpServer(options) {
       options.baseUrlOverride ?? creds.baseUrl ?? BUILT_IN_BASE_URL
     );
     if (credentialInstance === session.baseUrl) return null;
-    return `The credential now points at ${credentialInstance}, but this session is open against ${session.baseUrl}. Refusing to send this call to a different instance than the one you are working on: the token would be presented to the wrong server, and on a development machine the two are commonly local dev and production. Nothing was sent. Either restore the credential for ${session.baseUrl} (\`zoah login\` in that workspace), or call \`disconnect\` and then \`connect\` to move this session to ${credentialInstance} deliberately.`;
+    return `The credential now points at ${credentialInstance}, but this session is open against ${session.baseUrl}. Refusing to send this call to a different instance than the one you are working on: the token would be presented to the wrong server, and on a development machine the two are commonly local dev and production. Nothing was sent. Either restore the credential for ${session.baseUrl} (\`zoah login\` in that directory), or call \`disconnect\` and then \`connect\` to move this session to ${credentialInstance} deliberately.`;
   }
   function loginScope() {
     return existsSync10(zoahPaths.localCredentials(process.cwd())) || existsSync10(legacyOpacityPaths.localCredentials(process.cwd())) ? "local" : "global";
   }
   let pendingSignIn = null;
-  let selectedWorkspace = null;
+  let selectedOrganization = null;
   let sessionEndedBy = null;
   function noSessionMessage() {
     return (sessionEndedBy ? `No session: ${sessionEndedBy}. ` : "No session. ") + "Call `connect` with `project` (a slug, a name or an id) to open one; add `branch` to pick a branch, or omit it to work on a fresh agent branch.";
@@ -98666,18 +98667,18 @@ async function runMcpServer(options) {
       return result;
     }
   }
-  let ambientWorkspace = null;
+  let ambientOrganization = null;
   function describeWorkingIn(fallbackId) {
-    if (selectedWorkspace) {
+    if (selectedOrganization) {
       return {
-        id: selectedWorkspace.workspaceId,
-        name: selectedWorkspace.name ?? null,
-        slug: selectedWorkspace.slug ?? null,
+        id: selectedOrganization.organizationId,
+        name: selectedOrganization.name ?? null,
+        slug: selectedOrganization.slug ?? null,
         pinnedBy: "connect"
       };
     }
-    if (ambientWorkspace) {
-      return { ...ambientWorkspace, pinnedBy: "the human's selection" };
+    if (ambientOrganization) {
+      return { ...ambientOrganization, pinnedBy: "the human's selection" };
     }
     return fallbackId ? {
       id: fallbackId,
@@ -98686,57 +98687,60 @@ async function runMcpServer(options) {
       pinnedBy: "the human's selection"
     } : null;
   }
-  function workspaceLabel(fallbackId) {
+  function organizationLabel(fallbackId) {
     const working = describeWorkingIn(fallbackId);
     return working?.slug ?? working?.id ?? fallbackId;
   }
-  function describeSelectedWorkspace() {
+  function describeSelectedOrganization() {
     const working = describeWorkingIn();
-    return working ? { workspace: working } : {};
+    return working ? { organization: working } : {};
   }
-  async function pinWorkspace(reference) {
+  async function pinOrganization(reference) {
     if (!reference) return {};
-    const resolved = await resolveWorkspaceRef(await currentApi(), reference);
-    const droppedSession = resolved.workspaceId !== selectedWorkspace?.workspaceId ? await endSessionForWorkspaceChange(resolved) : void 0;
-    selectedWorkspace = resolved;
+    const resolved = await resolveOrganizationRef(
+      await currentApi(),
+      reference
+    );
+    const droppedSession = resolved.organizationId !== selectedOrganization?.organizationId ? await endSessionForOrganizationChange(resolved) : void 0;
+    selectedOrganization = resolved;
     applyRole(resolved.role);
     return droppedSession ? { droppedSession } : {};
   }
-  async function endSessionForWorkspaceChange(to) {
+  async function endSessionForOrganizationChange(to) {
     const dropped = session ? {
       project: session.projectId,
       branch: session.branchSlug,
-      fromWorkspace: workspaceLabel(session.orgId),
-      toWorkspace: to.slug ?? to.workspaceId
+      fromOrganization: organizationLabel(session.orgId),
+      toOrganization: to.slug ?? to.organizationId
     } : void 0;
     if (session) await teardownSession();
-    await teardownWorkspaceClient();
+    await teardownOrganizationClient();
     if (!dropped) return void 0;
-    sessionEndedBy = `switching to workspace ${dropped.toWorkspace} ended the session on ${dropped.project} (${dropped.branch}), because that session's token was minted for a project in ${dropped.fromWorkspace}`;
+    sessionEndedBy = `switching to organization ${dropped.toOrganization} ended the session on ${dropped.project} (${dropped.branch}), because that session's token was minted for a project in ${dropped.fromOrganization}`;
     return dropped;
   }
   const syncUrlOverride = options.syncUrlOverride ?? process.env.ZOAH_SYNC_WS_URL ?? process.env.OPACITY_SYNC_WS_URL;
   let session = null;
-  let workspaceClient = null;
+  let organizationClient = null;
   function applyClientRole(client2, role) {
     let applied = false;
     if (session?.client === client2) {
       session.role = role;
       applied = true;
     }
-    if (workspaceClient?.client === client2) {
-      workspaceClient.role = role;
+    if (organizationClient?.client === client2) {
+      organizationClient.role = role;
       applied = true;
     }
     if (applied) applyRole(role);
   }
-  async function teardownWorkspaceClient() {
-    if (!workspaceClient) return;
-    const { client: client2 } = workspaceClient;
-    workspaceClient = null;
+  async function teardownOrganizationClient() {
+    if (!organizationClient) return;
+    const { client: client2 } = organizationClient;
+    organizationClient = null;
     await client2.disconnectAndWait();
   }
-  async function ensureWorkspaceClient() {
+  async function ensureOrganizationClient() {
     if (session) {
       return {
         client: session.client,
@@ -98744,15 +98748,15 @@ async function runMcpServer(options) {
         role: session.role
       };
     }
-    if (workspaceClient) return workspaceClient;
-    let orgId = selectedWorkspace?.workspaceId;
+    if (organizationClient) return organizationClient;
+    let orgId = selectedOrganization?.organizationId;
     if (!orgId) {
-      const { organizations, activeOrganizationId } = await (await currentApi()).listWorkspaces();
+      const { organizations, activeOrganizationId } = await (await currentApi()).listOrganizations();
       orgId = activeOrganizationId ?? (organizations.length === 1 ? organizations[0]?.id : void 0);
     }
     if (!orgId) {
       throw new Error(
-        "No workspace selected, and you belong to more than one. Call listWorkspaces to see them, then connect with `workspace` to choose one."
+        "No organization selected, and you belong to more than one. Call listOrganizations to see them, then connect with `organization` to choose one."
       );
     }
     let minted = await (await currentApi()).mintAgentSyncToken({ orgId });
@@ -98770,14 +98774,14 @@ async function runMcpServer(options) {
         return minted.token;
       }
     });
-    workspaceClient = {
+    organizationClient = {
       client: client2,
       orgId: minted.orgId,
       role: minted.role,
       getSyncTokenExpiresAt: () => minted.expiresAt
     };
     applyRole(minted.role);
-    return workspaceClient;
+    return organizationClient;
   }
   async function teardownSession() {
     if (!session) return;
@@ -98785,7 +98789,7 @@ async function runMcpServer(options) {
     const { client: client2 } = session;
     session = null;
     await client2.disconnectAndWait();
-    applyRole(selectedWorkspace?.role ?? null);
+    applyRole(selectedOrganization?.role ?? null);
   }
   function pushEvent(event) {
     if (!session) return;
@@ -98801,15 +98805,15 @@ async function runMcpServer(options) {
     let minted = await (await currentApi()).mintAgentSyncToken({
       projectId,
       branchSlug,
-      // ORG-scoped: the token names the workspace, not this project. The
-      // The gateway confines this token to projects owned by the workspace.
+      // ORG-scoped: the token names the organization, not this project. The
+      // The gateway confines this token to projects owned by the organization.
       // The session selects one project through its socket context.
       orgScoped: true
     });
     const wsUrl = syncUrlOverride ?? minted.syncUrl ?? deriveSyncWsUrl(await currentBaseUrl());
-    const adopted = workspaceClient && workspaceClient.orgId === minted.orgId ? workspaceClient : null;
+    const adopted = organizationClient && organizationClient.orgId === minted.orgId ? organizationClient : null;
     if (adopted) {
-      workspaceClient = null;
+      organizationClient = null;
       try {
         await enterProjectScope(adopted.client, {
           orgId: minted.orgId,
@@ -98965,7 +98969,7 @@ async function runMcpServer(options) {
     const def3 = OPAQUE_ACTIONS.find((candidate) => candidate.type === type);
     if ((def3?.mutates ?? true) && s5.role === "read") {
       throw new Error(
-        `${type}: this workspace role is read-only. NOTHING was written.`
+        `${type}: this organization role is read-only. NOTHING was written.`
       );
     }
     const wasDown = !socketUsable(s5);
@@ -99003,17 +99007,17 @@ async function runMcpServer(options) {
       await client2.waitForActionAck(actionId, VERB_ACK_TIMEOUT_MS);
     }
   }
-  async function runWorkspaceVerb(type, input) {
-    const { client: client2, orgId, role } = await ensureWorkspaceClient();
+  async function runOrganizationVerb(type, input) {
+    const { client: client2, orgId, role } = await ensureOrganizationClient();
     const def3 = OPAQUE_ACTIONS.find((candidate) => candidate.type === type);
     if ((def3?.mutates ?? true) && role === "read") {
       throw new Error(
-        `${type}: this workspace role is read-only. NOTHING was written.`
+        `${type}: this organization role is read-only. NOTHING was written.`
       );
     }
-    if ((def3?.mutates ?? true) && await awaitLiveClient(client2, isWorkspaceClientUsable) === "down") {
+    if ((def3?.mutates ?? true) && await awaitLiveClient(client2, isOrganizationClientUsable) === "down") {
       throw new Error(
-        `${type}: the workspace sync connection is down. NOTHING was written. Nothing is queued or applied later. Call this verb again after the connection returns.`
+        `${type}: the organization sync connection is down. NOTHING was written. Nothing is queued or applied later. Call this verb again after the connection returns.`
       );
     }
     return client2.runWithSchemas(async () => {
@@ -99024,7 +99028,7 @@ async function runMcpServer(options) {
         return {
           action: { type },
           success: false,
-          error: !org ? `Workspace ${orgId} could not be loaded, so ${type} has nothing to act on.` : `This session has no signed-in user, so ${type} cannot run.`
+          error: !org ? `Organization ${orgId} could not be loaded, so ${type} has nothing to act on.` : `This session has no signed-in user, so ${type} cannot run.`
         };
       }
       const action = { type, ...input };
@@ -99033,20 +99037,20 @@ async function runMcpServer(options) {
       return executed;
     });
   }
-  async function workspaceListing() {
-    const executed = await runWorkspaceVerb("listProjects", {});
+  async function organizationListing() {
+    const executed = await runOrganizationVerb("listProjects", {});
     if (!executed.success) {
       throw new Error(executed.error ?? "listProjects failed");
     }
     const { projects } = executed.data;
     return {
       projects,
-      workspace: selectedWorkspace ? {
-        id: selectedWorkspace.workspaceId,
-        name: selectedWorkspace.name ?? null,
-        slug: selectedWorkspace.slug ?? null
+      organization: selectedOrganization ? {
+        id: selectedOrganization.organizationId,
+        name: selectedOrganization.name ?? null,
+        slug: selectedOrganization.slug ?? null
       } : null,
-      orgId: selectedWorkspace?.workspaceId ?? null
+      orgId: selectedOrganization?.organizationId ?? null
     };
   }
   function reviewUrlFor(s5, prId) {
@@ -99058,7 +99062,7 @@ async function runMcpServer(options) {
     if (!dropped) return {};
     return {
       droppedSession: { project: dropped.project, branch: dropped.branch },
-      droppedSessionReason: `Switching to workspace ${dropped.toWorkspace} ended the session on ${dropped.project} (${dropped.branch}): that session's token was minted for a project in ${dropped.fromWorkspace}, so keeping it open would leave the next write landing in a workspace you have stopped talking about. Every verb that returned success was confirmed by the server before it returned. Open a session here with \`project\`.`
+      droppedSessionReason: `Switching to organization ${dropped.toOrganization} ended the session on ${dropped.project} (${dropped.branch}): that session's token was minted for a project in ${dropped.fromOrganization}, so keeping it open would leave the next write landing in an organization you have stopped talking about. Every verb that returned success was confirmed by the server before it returned. Open a session here with \`project\`.`
     };
   }
   const server = new McpServer({ name: "zoah", version: CLI_VERSION });
@@ -99087,8 +99091,8 @@ async function runMcpServer(options) {
           "Name what to open: pass `project` (a slug, a name or an id). Call listProjects to see what is available, or run `zoah mcp init` in a repo linked to a project to bake in a default."
         );
       }
-      resolved = await resolveProjectRef(await workspaceListing(), named);
-      if (resolved.workspace) ambientWorkspace = resolved.workspace;
+      resolved = await resolveProjectRef(await organizationListing(), named);
+      if (resolved.organization) ambientOrganization = resolved.organization;
       const projectId = resolved.projectId;
       await teardownSession();
       if (options.readOnly || branch) {
@@ -99134,10 +99138,10 @@ async function runMcpServer(options) {
       sessionEndedBy = null;
       return jsonResult({
         connected: true,
-        // Which workspace this project is in, named rather than implied. The
-        // same project name in two workspaces is two different projects, so a
+        // Which organization this project is in, named rather than implied. The
+        // same project name in two organizations is two different projects, so a
         // connected result that omits it is ambiguous by construction.
-        workspace: describeWorkingIn(session.orgId),
+        organization: describeWorkingIn(session.orgId),
         role: session.role,
         projectId,
         // Name what the reference resolved to. A partial match that lands on
@@ -99168,13 +99172,13 @@ async function runMcpServer(options) {
   server.registerTool(
     "connect",
     {
-      description: "Choose what you are working on: workspace, project, and branch. Call it to start, and again whenever you want to switch any of the three. It signs you in first if it has to, so a session usually needs nothing else. Safe to call at any time: it reports which state it is in rather than assuming one. When it returns an `authUrl`, give that URL to the human, wait for them to approve it, then call `connect` again - do not open it yourself and do not ask them for a token.",
+      description: "Choose what you are working on: organization, project, and branch. Call it to start, and again whenever you want to switch any of the three. It signs you in first if it has to, so a session usually needs nothing else. Safe to call at any time: it reports which state it is in rather than assuming one. When it returns an `authUrl`, give that URL to the human, wait for them to approve it, then call `connect` again - do not open it yourself and do not ask them for a token.",
       inputSchema: {
         baseUrl: z57.string().optional().describe(
           "The Zoah instance to use, e.g. http://localhost:5071. Wins over the launch flag, the saved credential and the built-in default, and is saved so later calls agree. Needed on a clean workspace: with no credential file yet, the built-in default is a guess, and on a multi-instance dev machine it is usually the wrong port."
         ),
-        workspace: z57.string().optional().describe(
-          "Workspace to work in: its slug, its name, or its id. Stays selected for the rest of this session, so later calls and listProjects all scope to it. Omit to follow the human's own selection. Call listWorkspaces to see them."
+        organization: z57.string().optional().describe(
+          "Organization to work in: its slug, its name, or its id. Stays selected for the rest of this session, so later calls and listProjects all scope to it. Omit to follow the human's own selection. Call listOrganizations to see them."
         ),
         project: z57.string().optional().describe(
           "Project to connect to: its slug, its name, or its id. Omit it to sign in only." + (options.defaultProject ? ` Defaults to this repo's linked project (${options.defaultProject}).` : " Call listProjects to see what is available.")
@@ -99184,7 +99188,7 @@ async function runMcpServer(options) {
         )
       }
     },
-    async ({ baseUrl, workspace, project, branch }) => {
+    async ({ baseUrl, organization, project, branch }) => {
       try {
         const creds = await currentCreds().catch(() => null);
         const target = resolveBaseUrl({
@@ -99196,7 +99200,7 @@ async function runMcpServer(options) {
         const health = creds ? credentialHealth(creds.token) : null;
         const usable = creds !== null && health !== null && !health.expired && !health.expiringSoon && stripSlash(creds.baseUrl) === target.baseUrl;
         if (usable) {
-          const pin = await pinWorkspace(workspace);
+          const pin = await pinOrganization(organization);
           if (!project && !options.defaultProject) {
             return jsonResult({
               signedIn: true,
@@ -99204,9 +99208,9 @@ async function runMcpServer(options) {
               signingInTo: target.baseUrl,
               baseUrlSource: target.source,
               credentialExpiresInSeconds: health.expiresInSeconds,
-              ...describeSelectedWorkspace(),
+              ...describeSelectedOrganization(),
               ...describeDrop(pin),
-              note: selectedWorkspace !== null ? `Already signed in, and working in ${selectedWorkspace.slug ?? selectedWorkspace.workspaceId}. Pass \`project\` to connect to one, or call listProjects to see what is there.` : "Already signed in. Pass `project` to connect to one, or call listProjects to see what is available."
+              note: selectedOrganization !== null ? `Already signed in, and working in ${selectedOrganization.slug ?? selectedOrganization.organizationId}. Pass \`project\` to connect to one, or call listProjects to see what is there.` : "Already signed in. Pass `project` to connect to one, or call listProjects to see what is available."
             });
           }
           const connected = await connectAndDescribe({ project, branch });
@@ -99228,7 +99232,7 @@ async function runMcpServer(options) {
             }),
             startedAtMs: Date.now(),
             baseUrl: target.baseUrl,
-            workspace,
+            organization,
             project,
             branch
           };
@@ -99258,14 +99262,16 @@ async function runMcpServer(options) {
           pendingSignIn = null;
           const wanted = project ?? pending.project;
           const wantedBranch = branch ?? pending.branch;
-          const pin = await pinWorkspace(workspace ?? pending.workspace);
+          const pin = await pinOrganization(
+            organization ?? pending.organization
+          );
           if (!wanted && !options.defaultProject) {
             return jsonResult({
               signedIn: true,
               userEmail,
               signingInTo: target.baseUrl,
               baseUrlSource: target.source,
-              ...describeSelectedWorkspace(),
+              ...describeSelectedOrganization(),
               ...describeDrop(pin),
               note: "Signed in. Pass `project` to connect to one, or call listProjects to see what is available."
             });
@@ -99309,57 +99315,57 @@ async function runMcpServer(options) {
     }
   );
   server.registerTool(
-    "listWorkspaces",
+    "listOrganizations",
     {
-      description: "List the Zoah workspaces you belong to (id, name, slug), and say which one this session is working in. A workspace holds projects; anything in another workspace is invisible until you switch, and reads as 'not found' rather than 'elsewhere'. Switch with connect({ workspace }).",
+      description: "List the Zoah organizations you belong to (id, name, slug), and say which one this session is working in. An organization holds projects; anything in another organization is invisible until you switch, and reads as 'not found' rather than 'elsewhere'. Switch with connect({ organization }).",
       inputSchema: {}
     },
     async () => {
       try {
-        const { organizations, activeOrganizationId } = await (await currentApi()).listWorkspaces();
+        const { organizations, activeOrganizationId } = await (await currentApi()).listOrganizations();
         return jsonResult({
-          workspaces: organizations.map((workspace) => ({
-            ...workspace,
+          organizations: organizations.map((organization) => ({
+            ...organization,
             // Two different meanings of "current", kept apart on purpose. The
             // human's stored selection decides where a call that names no
-            // workspace lands; this session's pin decides where THIS session
+            // organization lands; this session's pin decides where THIS session
             // works. Collapsing them into one flag would hide which of the two
             // a caller is looking at.
-            active: workspace.id === activeOrganizationId,
-            workingHere: selectedWorkspace ? workspace.id === selectedWorkspace.workspaceId : workspace.id === activeOrganizationId
+            active: organization.id === activeOrganizationId,
+            workingHere: selectedOrganization ? organization.id === selectedOrganization.organizationId : organization.id === activeOrganizationId
           })),
           workingIn: describeWorkingIn(activeOrganizationId ?? void 0),
           ...organizations.length === 0 ? {
-            note: "This account belongs to no workspace yet. Call createWorkspace to make one. Projects live inside a workspace, so nothing else can be created first."
+            note: "This account belongs to no organization yet. Call createOrganization to make one. Projects live inside an organization, so nothing else can be created first."
           } : {}
         });
       } catch (error) {
         return errorResult2(
-          `listWorkspaces failed: ${describeError2(error)}`
+          `listOrganizations failed: ${describeError2(error)}`
         );
       }
     }
   );
   if (!options.readOnly) {
     server.registerTool(
-      "createWorkspace",
+      "createOrganization",
       {
-        description: "Create a new Zoah workspace and work in it. A workspace holds projects, so this is the first step on an account that has none. createProject needs a workspace to hold the project. This session switches to it, which drops any open session. Ask the human before creating one if they may already have a workspace you have not looked at: call listWorkspaces first.",
+        description: "Create a new Zoah organization and work in it. An organization holds projects, so this is the first step on an account that has none. createProject needs an organization to hold the project. This session switches to it, which drops any open session. Ask the human before creating one if they may already have an organization you have not looked at: call listOrganizations first.",
         inputSchema: {
           name: z57.string().describe(
-            'Name for the workspace, e.g. "Acme Design". The slug is derived from it server-side.'
+            'Name for the organization, e.g. "Acme Design". The slug is derived from it server-side.'
           )
         }
       },
       async ({ name }) => {
         try {
-          const created = await (await currentApi()).createWorkspace(name);
-          const dropped = await endSessionForWorkspaceChange({
-            workspaceId: created.id,
+          const created = await (await currentApi()).createOrganization(name);
+          const dropped = await endSessionForOrganizationChange({
+            organizationId: created.id,
             slug: created.slug
           });
-          selectedWorkspace = {
-            workspaceId: created.id,
+          selectedOrganization = {
+            organizationId: created.id,
             name: created.name,
             slug: created.slug,
             role: "admin",
@@ -99367,23 +99373,23 @@ async function runMcpServer(options) {
           };
           applyRole("admin");
           return jsonResult({
-            workspace: {
+            organization: {
               id: created.id,
               name: created.name,
               slug: created.slug
             },
             workingHere: true,
             ...describeDrop({ droppedSession: dropped }),
-            ...created.becameActiveWorkspace ? {
-              becameActiveWorkspace: true,
-              note: "This account had no workspace, so this one is now its default - the app will open onto it. Create a project with createProject, then call connect to start work."
+            ...created.becameActiveOrganization ? {
+              becameActiveOrganization: true,
+              note: "This account had no organization, so this one is now its default - the app will open onto it. Create a project with createProject, then call connect to start work."
             } : {
-              note: "Created and selected for this session. The human's own default workspace is unchanged. Create a project with createProject, then call connect to start work."
+              note: "Created and selected for this session. The human's own default organization is unchanged. Create a project with createProject, then call connect to start work."
             }
           });
         } catch (error) {
           return errorResult2(
-            `createWorkspace failed: ${describeError2(error)}`
+            `createOrganization failed: ${describeError2(error)}`
           );
         }
       }
@@ -99392,14 +99398,14 @@ async function runMcpServer(options) {
   server.registerTool(
     "listProjects",
     {
-      description: "List the projects in the Zoah workspace this session is working in (id, name, slug), and name that workspace. Call this before connect to discover what you can connect to. Connect accepts the slug, the name, or the id. Call listWorkspaces to work elsewhere.",
+      description: "List the projects in the Zoah organization this session is working in (id, name, slug), and name that organization. Call this before connect to discover what you can connect to. Connect accepts the slug, the name, or the id. Call listOrganizations to work elsewhere.",
       inputSchema: {}
     },
     async () => {
       try {
-        const result = await workspaceListing();
+        const result = await organizationListing();
         return jsonResult({
-          workspace: result.workspace ?? { id: result.orgId },
+          organization: result.organization ?? { id: result.orgId },
           orgId: result.orgId,
           projects: result.projects.map(({ id, name, slug }) => ({
             id,
@@ -99407,7 +99413,7 @@ async function runMcpServer(options) {
             slug
           })),
           ...result.projects.length === 0 ? {
-            note: "This workspace has no projects. Call createProject, then connect to it."
+            note: "This organization has no projects. Call createProject, then connect to it."
           } : {}
         });
       } catch (error) {
@@ -99421,14 +99427,14 @@ async function runMcpServer(options) {
     const roleGatedTool = server.registerTool(
       "createProject",
       {
-        description: "Create a new project in this session's workspace. The new project becomes this session's target. Call connect to open a branch in it.",
+        description: "Create a new project in this session's organization. The new project becomes this session's target. Call connect to open a branch in it.",
         inputSchema: {
           name: z57.string().describe('Name for the new project, e.g. "Marketing Site"')
         }
       },
       async ({ name }) => {
         try {
-          const executed = await runWorkspaceVerb("createProject", {
+          const executed = await runOrganizationVerb("createProject", {
             name,
             kind: "app"
           });
@@ -99438,7 +99444,7 @@ async function runMcpServer(options) {
             );
           }
           const { project: created } = executed.data;
-          await teardownWorkspaceClient();
+          await teardownOrganizationClient();
           return jsonResult({
             id: created.id,
             name: created.name,
@@ -99480,7 +99486,7 @@ async function runMcpServer(options) {
           credentialBaseUrl: who.baseUrl,
           credentialExpired: health.expired,
           credentialExpiresInSeconds: health.expiresInSeconds,
-          ...describeSelectedWorkspace(),
+          ...describeSelectedOrganization(),
           ...session ? {
             session: {
               projectId: session.projectId,
@@ -99520,8 +99526,8 @@ async function runMcpServer(options) {
             await teardownSession();
             sessionEndedBy = `signing out removed ${outcome.removedPath}, the credential this session's token was minted from`;
           }
-          selectedWorkspace = null;
-          ambientWorkspace = null;
+          selectedOrganization = null;
+          ambientOrganization = null;
           return jsonResult({
             removed: true,
             removedPath: outcome.removedPath,
@@ -99602,7 +99608,7 @@ async function runMcpServer(options) {
         try {
           if (s5.role === "read") {
             throw new Error(
-              "this workspace role is read-only. NOTHING was written."
+              "this organization role is read-only. NOTHING was written."
             );
           }
           if (await awaitLiveSocket(s5) === "down") {
@@ -99762,7 +99768,7 @@ async function runMcpServer(options) {
     const roleGatedTool = server.registerTool(
       "updateProject",
       {
-        description: "Rename a project in this session's workspace. Name the project by id or by its exact current name. This tool only changes the name.",
+        description: "Rename a project in this session's organization. Name the project by id or by its exact current name. This tool only changes the name.",
         inputSchema: {
           projectRef: z57.string().describe(
             "The project to rename: its id, or its exact current name. Call listProjects to see what is there."
@@ -99772,7 +99778,7 @@ async function runMcpServer(options) {
       },
       async ({ projectRef, name }) => {
         try {
-          const executed = await runWorkspaceVerb("updateProject", {
+          const executed = await runOrganizationVerb("updateProject", {
             projectRef,
             name
           });
@@ -99854,7 +99860,7 @@ async function runMcpServer(options) {
         try {
           if (s5.role === "read") {
             throw new Error(
-              "this workspace role is read-only. NOTHING was written."
+              "this organization role is read-only. NOTHING was written."
             );
           }
           if (await awaitLiveSocket(s5) === "down") {
@@ -100023,7 +100029,7 @@ async function runMcpServer(options) {
           // that move together, so it read `false` while a live localhost
           // session was addressing production.
           sessionInstance: session.baseUrl,
-          workspace: describeWorkingIn(session.orgId),
+          organization: describeWorkingIn(session.orgId),
           baseUrlMismatch: stripSlash(baseUrl) !== session.baseUrl,
           ...moved ? { instanceMovedWarning: moved } : {},
           bufferedEvents: session.events.length,
@@ -100037,9 +100043,9 @@ async function runMcpServer(options) {
           credentialExpiringSoon: health.expiringSoon,
           cliTokenExpiresAt,
           cliTokenExpiresInSeconds: health.expiresInSeconds,
-          // The workspace pin survives a disconnect: it is a session
+          // The organization pin survives a disconnect: it is a session
           // choice, not a property of the socket.
-          ...describeSelectedWorkspace(),
+          ...describeSelectedOrganization(),
           baseUrl,
           credentialBaseUrl: creds.baseUrl,
           // A real comparison, not a constant. This was hard-coded `false`
@@ -100130,7 +100136,7 @@ async function runMcpServer(options) {
     if (def3.mutates) trackRoleGatedTool(tool);
   }
   for (const def3 of OPAQUE_ACTIONS) {
-    if (isWorkspaceActionType(def3.type)) continue;
+    if (isOrganizationActionType(def3.type)) continue;
     if (SESSION_WRAPPED_VERBS.has(def3.type)) continue;
     if (!canServeCatalogAction(def3, options.readOnly === true)) continue;
     registerCatalogVerb(def3);
@@ -100548,7 +100554,7 @@ init_login();
 init_logout();
 import { Command } from "commander";
 
-// src/commands/workspace.ts
+// src/commands/organization.ts
 init_client();
 init_session();
 async function client(opts) {
@@ -100561,27 +100567,27 @@ async function client(opts) {
     found.creds.baseUrl ?? opts.baseUrl
   );
 }
-async function runWorkspaceList(opts) {
-  const { organizations } = await (await client(opts)).listWorkspaces();
+async function runOrganizationList(opts) {
+  const { organizations } = await (await client(opts)).listOrganizations();
   if (organizations.length === 0) {
     console.log(
-      "No workspaces. Create one with `zoah workspace create <name>`."
+      "No organizations. Create one with `zoah organization create <name>`."
     );
     return;
   }
-  for (const workspace of organizations) {
+  for (const organization of organizations) {
     console.log(
-      `${workspace.active ? "*" : " "} ${workspace.slug ?? workspace.id}  ${workspace.name}`
+      `${organization.active ? "*" : " "} ${organization.slug ?? organization.id}  ${organization.name}`
     );
   }
-  console.log("\n* = the workspace a command with no workspace uses.");
+  console.log("\n* = the organization a command with no organization uses.");
 }
-async function runWorkspaceCreate(opts) {
-  const created = await (await client(opts)).createWorkspace(opts.name);
-  console.log(`Created workspace "${created.name}" (${created.slug}).`);
-  if (created.becameActiveWorkspace) {
+async function runOrganizationCreate(opts) {
+  const created = await (await client(opts)).createOrganization(opts.name);
+  console.log(`Created organization "${created.name}" (${created.slug}).`);
+  if (created.becameActiveOrganization) {
     console.log(
-      "This account had no workspace, so this one is now its default."
+      "This account had no organization, so this one is now its default."
     );
   }
   console.log(
@@ -101594,12 +101600,12 @@ async function main() {
       fail(err);
     }
   });
-  const workspace = program.command("workspace").description(
-    "Workspaces: the outermost scope, holding this account's projects."
+  const organization = program.command("organization").description(
+    "Organizations: the outermost scope, holding this account's projects."
   );
-  workspace.command("list").description("List the workspaces this account belongs to.").action(async () => {
+  organization.command("list").description("List the organizations this account belongs to.").action(async () => {
     try {
-      await runWorkspaceList({
+      await runOrganizationList({
         cwd: process.cwd(),
         baseUrl: program.opts().baseUrl ?? DEFAULT_BASE_URL
       });
@@ -101607,9 +101613,9 @@ async function main() {
       fail(err);
     }
   });
-  workspace.command("create").argument("<name>", 'Workspace name, e.g. "Acme Design"').description("Create a workspace. The slug is derived from the name.").action(async (name) => {
+  organization.command("create").argument("<name>", 'Organization name, e.g. "Acme Design"').description("Create an organization. The slug is derived from the name.").action(async (name) => {
     try {
-      await runWorkspaceCreate({
+      await runOrganizationCreate({
         name,
         cwd: process.cwd(),
         baseUrl: program.opts().baseUrl ?? DEFAULT_BASE_URL

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zoahhq/cli",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Zoah CLI: import React components, publish via Zoah, swap local imports",
   "license": "Apache-2.0",
   "author": "Zoah Inc.",
@@ -41,8 +41,8 @@
     "tsup": "^8.3.5",
     "typescript": "^5.8.3",
     "vitest": "^2.1.8",
-    "@opacityapp/opaque": "0.0.1",
-    "@opacityapp/shared": "0.1.0"
+    "@opacityapp/shared": "0.1.0",
+    "@opacityapp/opaque": "0.0.1"
   },
   "scripts": {
     "build": "tsup",