@pikku/cli 0.12.156 → 0.12.160

package/dist/src/deploy/analyzer/analyzer.js

@@ -10,7 +10,56 @@ import { incompatibleServicesFor, resolveDeployTarget, } from '@pikku/inspector'
 import { relative } from 'node:path';
 import { isScenarioFunction, withoutScenarios, withoutScenarioWorkflows, } from '../../functions/wirings/scenarios/scenario-partition.js';
 import { toSafeKebab } from './naming.js';
+import { mcpSurfaceSlug } from '../../utils/mcp-surface.js';
 import { createUnitResolver } from './grouping.js';
+/**
+ * Where an MCP unit answers. Every runtime that mounts MCP defaults to `/mcp`,
+ * and pikku's own codegen never writes an `mcpPath` into the generated
+ * manifest, so the route table and the mount agree. A project that overrides
+ * `mcpPath` in `mcp.gen.json` moves the mount but not this — the analyzer never
+ * reads that file.
+ */
+const MCP_PATH = '/mcp';
+/** The discovery document `PikkuMCPServer` serves, per RFC 9728. */
+const WELL_KNOWN_PRM = '/.well-known/oauth-protected-resource';
+/**
+ * The routes an MCP unit has to receive to serve Streamable HTTP. Without them
+ * the unit deploys with an empty route table and nothing ever reaches it: POST
+ * carries the JSON-RPC calls, GET opens the server-to-client stream, and DELETE
+ * ends a session. The well-known paths are how a client discovers the
+ * authorization server when the endpoint refuses it.
+ *
+ * `bareDiscovery` is what keeps a multi-endpoint project's route table
+ * unambiguous. RFC 9728 folds the resource's path into the well-known route, so
+ * each endpoint's own document is distinct, but the bare path predates that and
+ * describes whichever resource answers it. Handing it to every unit would
+ * register the same route twice and let the router pick a winner, so only the
+ * project's default endpoint claims it; a surface serves its path-aware
+ * document alone.
+ *
+ * The ids are synthetic, as they are for the agent gateway's routes: no single
+ * pikku function answers here, because the MCP transport picks the tool out of
+ * the JSON-RPC body and dispatches it itself.
+ */
+const mcpRoutes = (mcpPath, { bareDiscovery = true } = {}) => [
+    { method: 'post', route: mcpPath, pikkuFuncId: 'mcp:call' },
+    { method: 'get', route: mcpPath, pikkuFuncId: 'mcp:stream' },
+    { method: 'delete', route: mcpPath, pikkuFuncId: 'mcp:end' },
+    ...(bareDiscovery
+        ? [
+            {
+                method: 'get',
+                route: WELL_KNOWN_PRM,
+                pikkuFuncId: 'mcp:discovery',
+            },
+        ]
+        : []),
+    {
+        method: 'get',
+        route: `${WELL_KNOWN_PRM}${mcpPath}`,
+        pikkuFuncId: 'mcp:discovery',
+    },
+];
 export function analyzeDeployment(state, options) {
     const serverlessIncompatible = new Set(options.serverlessIncompatible ?? []);
     const defaultTarget = options.defaultTarget ?? 'serverless';
@@ -370,9 +419,25 @@ export function analyzeDeployment(state, options) {
     // place a scenario or step id can still arrive from raw state. A gateway that
     // lists one would depend on a unit that was never emitted.
     const deployableFuncId = (funcId) => !isScenarioFunction(state.functions.meta[funcId]);
-    const mcpToolIds = values(state.mcpEndpoints.toolsMeta)
-        .map((t) => t.pikkuFuncId)
-        .filter(deployableFuncId);
+    // A tool naming a surface is served by that surface's endpoint and by no
+    // other, so it is grouped out of the default set here rather than pooled
+    // with it. Resources and prompts have no surface of their own yet.
+    const surfacePaths = state.mcpEndpoints.surfaces ?? {};
+    const toolIdsBySurface = new Map();
+    const mcpToolIds = [];
+    for (const tool of values(state.mcpEndpoints.toolsMeta)) {
+        if (!deployableFuncId(tool.pikkuFuncId))
+            continue;
+        const surface = tool.surface;
+        if (surface && surfacePaths[surface]) {
+            const ids = toolIdsBySurface.get(surface) ?? [];
+            ids.push(tool.pikkuFuncId);
+            toolIdsBySurface.set(surface, ids);
+        }
+        else {
+            mcpToolIds.push(tool.pikkuFuncId);
+        }
+    }
     const mcpResourceIds = values(state.mcpEndpoints.resourcesMeta)
         .map((r) => r.pikkuFuncId)
         .filter(deployableFuncId);
@@ -388,6 +453,30 @@ export function analyzeDeployment(state, options) {
             mcpToolIds.push(funcId);
         }
     }
+    for (const [surface, toolIds] of toolIdsBySurface) {
+        const unitName = `mcp-${mcpSurfaceSlug(surface)}`;
+        units.push({
+            name: unitName,
+            role: 'mcp',
+            target: 'serverless',
+            functionIds: [],
+            services: [],
+            dependsOn: toolIds.map((id) => unitFor(id)),
+            handlers: [
+                {
+                    type: 'fetch',
+                    routes: mcpRoutes(surfacePaths[surface], { bareDiscovery: false }),
+                },
+            ],
+            tags: collectTags(toolIds, tagsFor),
+        });
+        mcpEndpoints.push({
+            unitName,
+            toolFunctionIds: toolIds,
+            resourceFunctionIds: [],
+            promptFunctionIds: [],
+        });
+    }
     const allMcpIds = [...mcpToolIds, ...mcpResourceIds, ...mcpPromptIds];
     if (allMcpIds.length > 0) {
         const unitName = 'mcp-server';
@@ -399,7 +488,7 @@ export function analyzeDeployment(state, options) {
             functionIds: [], // No function code bundled
             services: [],
             dependsOn: mcpFuncUnitNames,
-            handlers: [{ type: 'fetch', routes: [] }],
+            handlers: [{ type: 'fetch', routes: mcpRoutes(MCP_PATH) }],
             tags: collectTags(allMcpIds, tagsFor),
         });
         mcpEndpoints.push({

package/dist/src/deploy/build-pipeline.d.ts

@@ -111,6 +111,8 @@ export declare function runBuildPipeline(options: {
     srcDirectories?: string[];
     /** Emit sourcemaps + per-unit `metafile.json` (debug-only). Default false. */
     debugArtifacts?: boolean;
+    /** Overrides the provider's own choice when set. See PikkuCLIConfig. */
+    mangleIdentifiers?: boolean;
     logger: BuildLogger;
     /** Runtime-specific bundler (esbuild for node, Bun.build for bun). */
     bundler: Bundler;

package/dist/src/deploy/build-pipeline.js

@@ -193,7 +193,7 @@ function resolveLifecycle(unitDir, state) {
     };
 }
 export async function runBuildPipeline(options) {
-    const { projectDir, projectId, provider, inspectorState, getEntryContext, debugArtifacts, logger, bundler, } = options;
+    const { projectDir, projectId, provider, inspectorState, getEntryContext, debugArtifacts, mangleIdentifiers, logger, bundler, } = options;
     const deployDir = options.deployDir ?? join(projectDir, '.deploy');
     const providerDir = join(deployDir, provider.deployDirName);
     // Step 1: Analyze
@@ -263,7 +263,7 @@ export async function runBuildPipeline(options) {
             define: provider.getDefine?.(),
             platform: provider.getPlatform?.(),
             format: provider.getFormat?.(),
-            mangleIdentifiers: provider.getMangleIdentifiers?.(),
+            mangleIdentifiers: mangleIdentifiers ?? provider.getMangleIdentifiers?.(),
             noRequireShim: provider.getNoRequireShim?.(),
             sourcemap: debugArtifacts,
             emitMetafile: debugArtifacts,
@@ -417,7 +417,7 @@ export async function runBuildPipeline(options) {
                 define: provider.getDefine?.(),
                 platform: provider.getPlatform?.(),
                 format: provider.getFormat?.(),
-                mangleIdentifiers: provider.getMangleIdentifiers?.(),
+                mangleIdentifiers: mangleIdentifiers ?? provider.getMangleIdentifiers?.(),
                 noRequireShim: provider.getNoRequireShim?.(),
                 sourcemap: debugArtifacts,
                 emitMetafile: debugArtifacts,
@@ -442,6 +442,7 @@ export async function runBuildPipeline(options) {
                 define: undefined,
                 platform: 'node',
                 format: 'esm',
+                mangleIdentifiers,
                 noRequireShim: false,
                 sourcemap: debugArtifacts,
                 emitMetafile: debugArtifacts,

package/dist/src/deploy/codegen/per-unit-codegen.js

@@ -99,6 +99,30 @@ export function collectFilterNames(unit, manifest, inspectorState, workflowQueue
                 for (const id of channelDef.functionIds)
                     names.add(id);
             }
+            // A CLI channel is a whole program's transport, not a set of commands.
+            //
+            // `wireCLI` generates this channel and tags it ['cli', <program>]. Its
+            // own wirings are the per-command ones plus `__help` and `__raw`, and
+            // those two resolve against `CLIMeta.programs[<program>]` rather than
+            // against a wiring — so without the program the channel connects, serves
+            // a named command, and answers `__help` with "Program not found".
+            //
+            // CLI programs are filtered by COMMAND name (see the inspector's
+            // filter-inspector-state), and a command name matches nothing in the set
+            // above, so every command is dropped and the empty program with it. The
+            // program's commands are what has to be asked for.
+            if (unit.tags.includes('cli')) {
+                const programs = inspectorState.cli?.meta?.programs ?? {};
+                for (const tag of unit.tags) {
+                    const programMeta = programs[tag];
+                    if (!programMeta)
+                        continue;
+                    names.add(tag);
+                    for (const commandName of Object.keys(programMeta.commands ?? {})) {
+                        names.add(commandName);
+                    }
+                }
+            }
             break;
         }
         case 'function': {

package/dist/src/fabric/fabric-commands.d.ts

@@ -134,6 +134,7 @@ export declare const fabricCommands: {
         branch?: string | undefined;
         force?: boolean | undefined;
         apiUrl?: string | undefined;
+        organization?: string | undefined;
     }, {
         projectId: string;
         projectSlug: string;
@@ -144,6 +145,7 @@ export declare const fabricCommands: {
         branch?: string | undefined;
         force?: boolean | undefined;
         apiUrl?: string | undefined;
+        organization?: string | undefined;
     }, {
         projectId: string;
         projectSlug: string;
@@ -154,6 +156,7 @@ export declare const fabricCommands: {
         branch?: string | undefined;
         force?: boolean | undefined;
         apiUrl?: string | undefined;
+        organization?: string | undefined;
     }, {
         projectId: string;
         projectSlug: string;
@@ -164,6 +167,7 @@ export declare const fabricCommands: {
         github?: boolean | undefined;
         gitea?: boolean | undefined;
         repoName?: string | undefined;
+        organization?: string | undefined;
     }, {
         projectId: string;
         projectSlug: string;
@@ -174,6 +178,7 @@ export declare const fabricCommands: {
         github?: boolean | undefined;
         gitea?: boolean | undefined;
         repoName?: string | undefined;
+        organization?: string | undefined;
     }, {
         projectId: string;
         projectSlug: string;
@@ -184,6 +189,7 @@ export declare const fabricCommands: {
         github?: boolean | undefined;
         gitea?: boolean | undefined;
         repoName?: string | undefined;
+        organization?: string | undefined;
     }, {
         projectId: string;
         projectSlug: string;
@@ -1205,6 +1211,7 @@ export declare const fabricCommands: {
                 apiUrl?: string | undefined;
                 changeId: string;
                 question: string;
+                option?: string[] | undefined;
                 authorName?: string | undefined;
             }, {
                 message: any;
@@ -1212,6 +1219,7 @@ export declare const fabricCommands: {
                 apiUrl?: string | undefined;
                 changeId: string;
                 question: string;
+                option?: string[] | undefined;
                 authorName?: string | undefined;
             }, {
                 message: any;
@@ -1219,6 +1227,7 @@ export declare const fabricCommands: {
                 apiUrl?: string | undefined;
                 changeId: string;
                 question: string;
+                option?: string[] | undefined;
                 authorName?: string | undefined;
             }, {
                 message: any;

package/dist/src/fabric/fabric-commands.js

@@ -116,6 +116,9 @@ export const fabricCommands = defineCLICommands({
                 description: 'Override the project display name (defaults to repo name)',
             },
             branch: { description: 'Default branch (defaults to main)' },
+            organization: {
+                description: 'Organization to import into — slug, name or id (defaults to the one your session is in)',
+            },
             force: {
                 description: 'Replace existing fabric.config.json',
                 default: false,
@@ -138,6 +141,9 @@ export const fabricCommands = defineCLICommands({
             repoName: {
                 description: 'Name for a repo created by --gitea (defaults to the directory name)',
             },
+            organization: {
+                description: 'Organization to import into — slug, name or id (defaults to the one your session is in)',
+            },
             apiUrl: {
                 description: 'Override the fabric-api URL stored in fabric.config.json',
             },
@@ -591,9 +597,13 @@ export const fabricCommands = defineCLICommands({
                 options: {
                     changeId: { description: 'The item the question is about' },
                     question: {
-                        description: 'One decision, in the filer’s vocabulary, with the options named',
+                        description: 'One decision, in the filer’s vocabulary. Name the choices with --option, not as “(a) … (b) …” inside this text',
                         short: 'q',
                     },
+                    option: {
+                        description: 'A choice the filer can click, repeatable — e.g. --option "Reprice them" --option "Leave them". Without these they have to type an answer',
+                        type: 'string[]',
+                    },
                     authorName: { description: 'Who is asking, e.g. claude-code' },
                     apiUrl: { description: 'Override the fabric-api URL for this call' },
                 },

package/dist/src/fabric/functions/changes-ask.function.d.ts

@@ -4,6 +4,7 @@ export declare const FabricChangesAskInput: z.ZodObject<{
     apiUrl: z.ZodOptional<z.ZodString>;
     changeId: z.ZodString;
     question: z.ZodString;
+    option: z.ZodOptional<z.ZodArray<z.ZodString>>;
     authorName: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;
 export declare const FabricChangesAskOutput: z.ZodObject<{
@@ -13,6 +14,7 @@ export declare const FabricChangesAsk: import("../../../.pikku/function/pikku-fu
     apiUrl?: string | undefined;
     changeId: string;
     question: string;
+    option?: string[] | undefined;
     authorName?: string | undefined;
 }, {
     message: any;
@@ -20,6 +22,7 @@ export declare const FabricChangesAsk: import("../../../.pikku/function/pikku-fu
     apiUrl?: string | undefined;
     changeId: string;
     question: string;
+    option?: string[] | undefined;
     authorName?: string | undefined;
 }, {
     message: any;
@@ -27,6 +30,7 @@ export declare const FabricChangesAsk: import("../../../.pikku/function/pikku-fu
     apiUrl?: string | undefined;
     changeId: string;
     question: string;
+    option?: string[] | undefined;
     authorName?: string | undefined;
 }, {
     message: any;

package/dist/src/fabric/functions/changes-ask.function.js

@@ -1,11 +1,12 @@
 import { z } from 'zod';
 import { pikkuSessionlessFunc } from '../../../.pikku/function/index.js';
 import { changesContext } from '../lib/changes.js';
-import { dim, safeBlock } from '../lib/output.js';
+import { dim, safe, safeBlock } from '../lib/output.js';
 export const FabricChangesAskInput = z.object({
     apiUrl: z.string().optional(),
     changeId: z.string(),
     question: z.string().trim().min(1, 'Ask something — the question is empty.'),
+    option: z.array(z.string().trim().min(1)).max(6).optional(),
     authorName: z.string().optional(),
 });
 export const FabricChangesAskOutput = z.object({
@@ -21,10 +22,15 @@ export const FabricChangesAsk = pikkuSessionlessFunc({
             changeId: input.changeId,
             question: input.question,
             authorName: input.authorName ?? 'pikku-cli',
+            ...(input.option?.length ? { option: input.option } : {}),
         });
     },
 });
 export const renderChangesAsk = (_s, { message }) => {
+    const options = (message.attachments ?? []).filter((attachment) => attachment.kind === 'option');
     console.log('Asked — the item now shows as needing an answer in the panel.');
     console.log(dim(`  ${safeBlock(message.body)}`));
+    if (options.length) {
+        console.log(dim(`  they can click: ${options.map(({ label }) => safe(label)).join(' · ')}`));
+    }
 };

package/dist/src/fabric/functions/init.function.d.ts

@@ -5,6 +5,7 @@ export declare const FabricInitInput: z.ZodObject<{
     branch: z.ZodOptional<z.ZodString>;
     force: z.ZodOptional<z.ZodBoolean>;
     apiUrl: z.ZodOptional<z.ZodString>;
+    organization: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;
 export declare const FabricInitOutput: z.ZodObject<{
     projectId: z.ZodString;
@@ -24,6 +25,7 @@ export declare const FabricInit: import("../../../.pikku/function/pikku-function
     branch?: string | undefined;
     force?: boolean | undefined;
     apiUrl?: string | undefined;
+    organization?: string | undefined;
 }, {
     projectId: string;
     projectSlug: string;
@@ -34,6 +36,7 @@ export declare const FabricInit: import("../../../.pikku/function/pikku-function
     branch?: string | undefined;
     force?: boolean | undefined;
     apiUrl?: string | undefined;
+    organization?: string | undefined;
 }, {
     projectId: string;
     projectSlug: string;
@@ -44,6 +47,7 @@ export declare const FabricInit: import("../../../.pikku/function/pikku-function
     branch?: string | undefined;
     force?: boolean | undefined;
     apiUrl?: string | undefined;
+    organization?: string | undefined;
 }, {
     projectId: string;
     projectSlug: string;

package/dist/src/fabric/functions/init.function.js

@@ -3,12 +3,14 @@ import { pikkuSessionlessFunc } from '../../../.pikku/function/index.js';
 import { findProjectConfig, isLinkedProjectId, resolveApiContext, writeProjectConfig, } from '../lib/config.js';
 import { getFabricRPC } from '../lib/http.js';
 import { FabricPreconditionError } from '../lib/errors.js';
+import { resolveOrganizationId } from '../lib/organization.js';
 export const FabricInitInput = z.object({
     repo: z.string(),
     name: z.string().optional(),
     branch: z.string().optional(),
     force: z.boolean().optional(),
     apiUrl: z.string().optional(),
+    organization: z.string().optional(),
 });
 export const FabricInitOutput = z.object({
     projectId: z.string(),
@@ -26,7 +28,7 @@ export const FabricInit = pikkuSessionlessFunc({
     description: 'Adopt an existing repo as a fabric project (writes fabric.config.json).',
     input: FabricInitInput,
     output: FabricInitOutput,
-    func: async (_services, { repo, name, branch, force, apiUrl: apiUrlOverride }) => {
+    func: async (_services, { repo, name, branch, force, apiUrl: apiUrlOverride, organization }) => {
         const ctx = await resolveApiContext({ apiUrlOverride });
         if (!ctx.token)
             throw new FabricPreconditionError('Not logged in. Run `pikku fabric login` first.');
@@ -35,11 +37,13 @@ export const FabricInit = pikkuSessionlessFunc({
             throw new FabricPreconditionError(`Already linked: ${existing.config.projectId} at ${existing.path}. Pass --force to replace.`);
         }
         const rpc = getFabricRPC({ apiUrl: ctx.apiUrl, token: ctx.token });
+        const organizationId = await resolveOrganizationId(rpc, organization);
         const result = await rpc.invoke('importProject', {
             repoUrl: repo,
             name,
             defaultBranch: branch,
             productionBranch: 'main',
+            ...(organizationId ? { organizationId } : {}),
         });
         const path = await writeProjectConfig(process.cwd(), {
             projectId: result.projectId,

package/dist/src/fabric/functions/link.function.d.ts

@@ -4,6 +4,7 @@ export declare const FabricLinkInput: z.ZodObject<{
     github: z.ZodOptional<z.ZodBoolean>;
     gitea: z.ZodOptional<z.ZodBoolean>;
     repoName: z.ZodOptional<z.ZodString>;
+    organization: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;
 export declare const FabricLinkOutput: z.ZodObject<{
     projectId: z.ZodString;
@@ -16,6 +17,7 @@ export declare const FabricLink: import("../../../.pikku/function/pikku-function
     github?: boolean | undefined;
     gitea?: boolean | undefined;
     repoName?: string | undefined;
+    organization?: string | undefined;
 }, {
     projectId: string;
     projectSlug: string;
@@ -26,6 +28,7 @@ export declare const FabricLink: import("../../../.pikku/function/pikku-function
     github?: boolean | undefined;
     gitea?: boolean | undefined;
     repoName?: string | undefined;
+    organization?: string | undefined;
 }, {
     projectId: string;
     projectSlug: string;
@@ -36,6 +39,7 @@ export declare const FabricLink: import("../../../.pikku/function/pikku-function
     github?: boolean | undefined;
     gitea?: boolean | undefined;
     repoName?: string | undefined;
+    organization?: string | undefined;
 }, {
     projectId: string;
     projectSlug: string;

package/dist/src/fabric/functions/link.function.js

@@ -5,6 +5,7 @@ import { resolveApiContext, writeProjectConfig } from '../lib/config.js';
 import { getFabricRPC } from '../lib/http.js';
 import { addRemote, assertDeploySafety, currentBranch, getRemoteUrl, hasCommits, hasRemote, isWorkingTreeClean, pushWithCredential, removeRemote, } from '../lib/git.js';
 import { FabricPreconditionError } from '../lib/errors.js';
+import { resolveOrganizationId } from '../lib/organization.js';
 import { promptConfirm } from '../lib/prompt.js';
 export const FabricLinkInput = z.object({
     apiUrl: z.string().optional(),
@@ -14,6 +15,8 @@ export const FabricLinkInput = z.object({
     gitea: z.boolean().optional(),
     /** Name for a repo created here. Defaults to the directory name. */
     repoName: z.string().optional(),
+    /** Slug, name or id of the organization to import into. Defaults to the session's. */
+    organization: z.string().optional(),
 });
 export const FabricLinkOutput = z.object({
     projectId: z.string(),
@@ -29,7 +32,7 @@ export const FabricLink = pikkuSessionlessFunc({
     description: 'Register the current git repo as a fabric project and queue an initial deploy.',
     input: FabricLinkInput,
     output: FabricLinkOutput,
-    func: async (_services, { apiUrl: apiUrlOverride, github, gitea, repoName }) => {
+    func: async (_services, { apiUrl: apiUrlOverride, github, gitea, repoName, organization }) => {
         const ctx = await resolveApiContext({ apiUrlOverride });
         if (!ctx.token) {
             throw new FabricPreconditionError('Not logged in. Run `pikku fabric login` first.');
@@ -48,6 +51,10 @@ export const FabricLink = pikkuSessionlessFunc({
         if (!(await isWorkingTreeClean())) {
             throw new FabricPreconditionError('Deployment blocked: uncommitted changes detected.\nCommit and push your changes before deploying.');
         }
+        // Resolved here for the same reason, since `--gitea` reaches `createRemote`
+        // below: a misspelt organization must not cost the user a repository they
+        // then have to go and delete.
+        const organizationId = await resolveOrganizationId(rpc, organization);
         const remoteUrl = (await hasRemote())
             ? await adoptExistingRemote({ github, gitea })
             : await createRemote({ rpc, github, gitea, repoName });
@@ -85,6 +92,7 @@ export const FabricLink = pikkuSessionlessFunc({
         const project = await rpc.invoke('importProject', {
             repoUrl: remoteUrl,
             productionBranch: 'main',
+            ...(organizationId ? { organizationId } : {}),
         });
         await writeProjectConfig(process.cwd(), {
             projectId: project.projectId,

package/dist/src/fabric/lib/organization.d.ts

@@ -0,0 +1,8 @@
+import type { getFabricRPC } from './http.js';
+/**
+ * Turn `--organization` into an id. Fabric derives the owning org from the
+ * session when the flag is absent, which silently imports into whichever org
+ * the token happens to be scoped to — the flag is how a repo belonging to a
+ * different org gets linked without re-logging-in.
+ */
+export declare function resolveOrganizationId(rpc: ReturnType<typeof getFabricRPC>, organization: string | undefined): Promise<string | undefined>;

package/dist/src/fabric/lib/organization.js

@@ -0,0 +1,26 @@
+import { FabricPreconditionError } from './errors.js';
+const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+/**
+ * Turn `--organization` into an id. Fabric derives the owning org from the
+ * session when the flag is absent, which silently imports into whichever org
+ * the token happens to be scoped to — the flag is how a repo belonging to a
+ * different org gets linked without re-logging-in.
+ */
+export async function resolveOrganizationId(rpc, organization) {
+    if (!organization)
+        return undefined;
+    if (UUID.test(organization))
+        return organization;
+    const { organizations } = await rpc.invoke('listMyOrganizations', {});
+    const wanted = organization.toLowerCase();
+    const matches = organizations.filter((org) => org.slug.toLowerCase() === wanted || org.name.toLowerCase() === wanted);
+    if (matches.length === 0) {
+        const known = organizations.map((org) => org.slug).join(', ');
+        throw new FabricPreconditionError(`No organization named "${organization}".\nYou belong to: ${known || '(none)'}`);
+    }
+    if (matches.length > 1) {
+        const ids = matches.map((org) => org.organizationId).join(', ');
+        throw new FabricPreconditionError(`"${organization}" matches more than one organization. Pass the id instead: ${ids}`);
+    }
+    return matches[0].organizationId;
+}