primitive-admin 1.0.62 → 1.0.64

package/dist/src/lib/block-selector.js

@@ -0,0 +1,92 @@
+/**
+ * Resolve the identifier the `prompts tests` and `workflows tests` verbs take
+ * (issue #3249).
+ *
+ * The block-testing endpoints key on the composite `<type>#<blockId>` and
+ * never check that the block exists, so an identifier that names no prompt or
+ * workflow came back as an empty page rather than a 404: `tests list <key>`
+ * printed "No test cases found." and exited 0, and a checked-in
+ * `prompts/<key>.tests/` sidecar looked unregistered until the id was tried.
+ * The key is what an author has to hand — `prompts list` prints it beside the
+ * id, and the config tree, `config push` and the test sidecars are all
+ * key-addressed — so a wrong identifier was indistinguishable from a block
+ * with no cases.
+ *
+ * Resolving here — against the app's own list — is what makes an empty
+ * listing mean "this block exists and has no cases", the same answer #3000
+ * gave the integration verbs (`integration-selector.ts`). The list is the one
+ * call that can answer both halves: it maps a key to its id and it proves the
+ * identifier belongs to THIS app. It is drained across every page, because
+ * the server pages prompts at 50 and workflows at 25 by default. Archived
+ * blocks are included, because their cases stay inspectable.
+ *
+ * Keys are matched exactly first. The server does not lowercase prompt or
+ * workflow keys on write, so a case-insensitive match is a fallback that
+ * resolves only when it is unambiguous — two keys differing only in case are
+ * refused by name rather than picked between (the `resolveScript` rule in
+ * `scripts.ts`).
+ */
+import { paginateAll } from "./paginate.js";
+const PROMPT_KIND = {
+    noun: "prompt",
+    idField: "promptId",
+    keyField: "promptKey",
+    listCommand: "primitive prompts list",
+};
+const WORKFLOW_KIND = {
+    noun: "workflow",
+    idField: "workflowId",
+    keyField: "workflowKey",
+    listCommand: "primitive workflows list",
+};
+/** The largest page the list endpoints accept (#1316), so a drain is few calls. */
+const PAGE_LIMIT = 100;
+/**
+ * Map a prompt ID or key to its prompt ID.
+ *
+ * Throws — naming the identifier — when nothing in the app matches, so the
+ * caller's existing catch prints the message and exits non-zero.
+ */
+export function resolvePromptSelector(client, appId, selector) {
+    return resolveBlockSelector(PROMPT_KIND, (params) => client.listPrompts(appId, params), appId, selector);
+}
+/** The same resolution for a workflow ID or key. */
+export function resolveWorkflowSelector(client, appId, selector) {
+    return resolveBlockSelector(WORKFLOW_KIND, (params) => client.listWorkflows(appId, params), appId, selector);
+}
+async function resolveBlockSelector(kind, list, appId, selector) {
+    const identifier = (selector ?? "").trim();
+    if (!identifier) {
+        throw new Error(`A ${kind.noun} ID or key is required.`);
+    }
+    const items = await paginateAll((cursor) => list(cursor ? { cursor, limit: PAGE_LIMIT } : { limit: PAGE_LIMIT }));
+    const keyOf = (item) => typeof item?.[kind.keyField] === "string" ? item[kind.keyField] : undefined;
+    let match = items.find((item) => item?.[kind.idField] === identifier) ??
+        items.find((item) => keyOf(item) === identifier);
+    if (!match) {
+        const lowered = identifier.toLowerCase();
+        const ci = items.filter((item) => keyOf(item)?.toLowerCase() === lowered);
+        if (ci.length > 1) {
+            const candidates = ci
+                .map((item) => keyOf(item))
+                .sort()
+                .join(", ");
+            throw new Error(`${capitalize(kind.noun)} key is ambiguous: ${identifier}. Did you mean: ${candidates}? ` +
+                `Keys differing only in case must be given exactly, or by ID.`);
+        }
+        match = ci[0];
+    }
+    if (!match) {
+        throw new Error(`No ${kind.noun} '${identifier}' in app ${appId}. ` +
+            `Pass a ${kind.noun} key or ID from '${kind.listCommand}'.`);
+    }
+    const blockKey = keyOf(match);
+    return {
+        blockId: match[kind.idField] ?? identifier,
+        ...(blockKey ? { blockKey } : {}),
+    };
+}
+function capitalize(word) {
+    return word.charAt(0).toUpperCase() + word.slice(1);
+}
+//# sourceMappingURL=block-selector.js.map

package/dist/src/lib/block-selector.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"block-selector.js","sourceRoot":"","sources":["../../../src/lib/block-selector.ts"],"names":[],"mappings":"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"}

package/dist/src/lib/codegen-shared/resolveCodegenSourceDir.d.ts

@@ -1,68 +1,38 @@
 /**
  * Shared source-directory resolution for the CLI codegen commands
- * (`workflows codegen` #1442 and `databases codegen` #814, issue #1510).
+ * (`workflows codegen` #1442, `databases codegen` #814, `databases schema
+ * generate` #666, issue #1510).
  *
- * Both commands read a set of `*.toml` schemas out of a synced sub-directory
- * (`workflows/` or `database-type-configs/`) and render `*.generated.ts` beside them.
- * Historically each command located that source directory by scanning EVERY
- * `.primitive/sync/<env>/<appId>/<subdir>` slot and either hard-erroring on
- * more than one (`workflows`) or silently merging across environments
- * (`databases`, via a `seenTypes` dedup). Neither did any environment
- * resolution, so `PRIMITIVE_ENV=dev workflows codegen` would happily generate
- * from the `alpha` TOML while `databases codegen` followed a different env —
- * the two generated-type trees could come from different environments in one
- * run.
+ * Each of them reads a set of `*.toml` schemas out of one synced sub-directory
+ * (`workflows/`, `database-type-configs/`) and renders `*.generated.ts` beside
+ * them. It used to take four branches to say which directory that was: a
+ * `--dir` override, the resolved environment, an `--app`-alone fallback, and —
+ * when none of those answered — a SCAN of every `primitive/<env>/<subdir>` that resolved
+ * if exactly one environment happened to have the directory. The scan is how
+ * `PRIMITIVE_ENV=dev workflows codegen` could generate from the `alpha` TOML,
+ * and how two codegen commands in one run could read two different
+ * environments.
  *
- * This helper resolves the source directory the same way every other CLI
- * command targets an environment: `--env` → `PRIMITIVE_ENV` →
- * `defaultEnvironment` → single-env → error. `--dir` and `--app` remain
- * explicit overrides. It returns ONLY the resolved source directory; TOML
- * collection, type filtering/dedup, and output-dir defaulting stay in each
- * command.
+ * There is one branch now (#3154, intent criterion 4): the sub-directory of
+ * the environment's own tree. `resolveSyncDir()` refuses rather than guesses,
+ * so an ambiguous project, an unknown `--env` and no project at all each reach
+ * the user as themselves.
  *
- * Design notes (binding, from the plan of record for #1510):
- *   - Call `getCurrentEnvironment()` DIRECTLY when no `--dir` override is given.
- *     `resolveSyncDir()`'s internal `safeEnv()` swallows the resolver's
- *     ambiguity error and falls back to `./config`, so genuine ambiguity must
- *     be surfaced here, not through `resolveSyncDir()`.
+ * Design notes that survive:
  *   - Throw plain `Error`s; the calling commands keep their existing
- *     `error(); process.exit(1)` convention (they catch at the boundary).
- *   - Do NOT use `resolveAppId()` — it is auth-oriented and exits the process,
- *     which is wrong for an offline codegen path.
- *   - Preserve the `--app`-alone legacy fallback: when `--app` is given, NO
- *     environment was explicitly requested, and env resolution fails (or there
- *     is no project config / legacy bare-dir mode), scan
- *     `.primitive/sync/<env>/<app>/<subdir>` for that specific app, resolving
- *     when it appears under exactly one env and erroring (naming the candidate
- *     envs) when it appears under more than one. This keeps the existing
- *     integration contract
- *     (`cli/tests/integration/workflows-codegen.test.ts`) intact.
- *   - Do NOT fall through to that scan when an environment WAS explicitly named
- *     (`--env` or `PRIMITIVE_ENV`) but is invalid/unknown: surface the
- *     resolver's error instead, so an explicit env selection never silently
- *     generates code from a different synced environment.
+ *     `error(); process.exit(1)` convention (they catch at the boundary). A
+ *     `PrimitiveEnvError` from the resolver is an Error too, and its message is
+ *     already the one the user needs.
+ *   - Do NOT use `resolveAppId()` — it is auth-oriented, and codegen is
+ *     offline.
  */
-export interface ResolveCodegenSourceDirOptions {
-    /** `--app <app-id>` override, if the user passed it. */
-    app?: string;
-    /** The resolved sync-directory override (`--dir <path>`), if the user passed it. */
-    syncDir?: string;
-}
 export interface ResolveCodegenSourceDirArgs {
     /** The synced sub-directory to resolve, e.g. "workflows" or "database-type-configs". */
     subdir: string;
-    /** Parsed command options (`--app`, plus the resolved `--dir` override). */
-    options: ResolveCodegenSourceDirOptions;
-    /**
-     * Working directory the legacy scan is rooted at. Defaults to
-     * `process.cwd()`; parameterised so unit tests can point it at a tmp tree
-     * (vitest workers can't `chdir`).
-     */
-    cwd?: string;
 }
 /**
- * Resolves the single source directory a codegen command should read its
- * `*.toml` schemas from. Throws a plain `Error` (with a user-facing message)
- * when the directory can't be resolved unambiguously or doesn't exist.
+ * The single source directory a codegen command reads its `*.toml` schemas
+ * from. Throws with a user-facing message when the environment cannot be
+ * resolved or the directory is not there.
  */
 export declare function resolveCodegenSourceDir(args: ResolveCodegenSourceDirArgs): string;

package/dist/src/lib/codegen-shared/resolveCodegenSourceDir.js

@@ -1,168 +1,46 @@
 /**
  * Shared source-directory resolution for the CLI codegen commands
- * (`workflows codegen` #1442 and `databases codegen` #814, issue #1510).
+ * (`workflows codegen` #1442, `databases codegen` #814, `databases schema
+ * generate` #666, issue #1510).
  *
- * Both commands read a set of `*.toml` schemas out of a synced sub-directory
- * (`workflows/` or `database-type-configs/`) and render `*.generated.ts` beside them.
- * Historically each command located that source directory by scanning EVERY
- * `.primitive/sync/<env>/<appId>/<subdir>` slot and either hard-erroring on
- * more than one (`workflows`) or silently merging across environments
- * (`databases`, via a `seenTypes` dedup). Neither did any environment
- * resolution, so `PRIMITIVE_ENV=dev workflows codegen` would happily generate
- * from the `alpha` TOML while `databases codegen` followed a different env —
- * the two generated-type trees could come from different environments in one
- * run.
+ * Each of them reads a set of `*.toml` schemas out of one synced sub-directory
+ * (`workflows/`, `database-type-configs/`) and renders `*.generated.ts` beside
+ * them. It used to take four branches to say which directory that was: a
+ * `--dir` override, the resolved environment, an `--app`-alone fallback, and —
+ * when none of those answered — a SCAN of every `primitive/<env>/<subdir>` that resolved
+ * if exactly one environment happened to have the directory. The scan is how
+ * `PRIMITIVE_ENV=dev workflows codegen` could generate from the `alpha` TOML,
+ * and how two codegen commands in one run could read two different
+ * environments.
  *
- * This helper resolves the source directory the same way every other CLI
- * command targets an environment: `--env` → `PRIMITIVE_ENV` →
- * `defaultEnvironment` → single-env → error. `--dir` and `--app` remain
- * explicit overrides. It returns ONLY the resolved source directory; TOML
- * collection, type filtering/dedup, and output-dir defaulting stay in each
- * command.
+ * There is one branch now (#3154, intent criterion 4): the sub-directory of
+ * the environment's own tree. `resolveSyncDir()` refuses rather than guesses,
+ * so an ambiguous project, an unknown `--env` and no project at all each reach
+ * the user as themselves.
  *
- * Design notes (binding, from the plan of record for #1510):
- *   - Call `getCurrentEnvironment()` DIRECTLY when no `--dir` override is given.
- *     `resolveSyncDir()`'s internal `safeEnv()` swallows the resolver's
- *     ambiguity error and falls back to `./config`, so genuine ambiguity must
- *     be surfaced here, not through `resolveSyncDir()`.
+ * Design notes that survive:
  *   - Throw plain `Error`s; the calling commands keep their existing
- *     `error(); process.exit(1)` convention (they catch at the boundary).
- *   - Do NOT use `resolveAppId()` — it is auth-oriented and exits the process,
- *     which is wrong for an offline codegen path.
- *   - Preserve the `--app`-alone legacy fallback: when `--app` is given, NO
- *     environment was explicitly requested, and env resolution fails (or there
- *     is no project config / legacy bare-dir mode), scan
- *     `.primitive/sync/<env>/<app>/<subdir>` for that specific app, resolving
- *     when it appears under exactly one env and erroring (naming the candidate
- *     envs) when it appears under more than one. This keeps the existing
- *     integration contract
- *     (`cli/tests/integration/workflows-codegen.test.ts`) intact.
- *   - Do NOT fall through to that scan when an environment WAS explicitly named
- *     (`--env` or `PRIMITIVE_ENV`) but is invalid/unknown: surface the
- *     resolver's error instead, so an explicit env selection never silently
- *     generates code from a different synced environment.
+ *     `error(); process.exit(1)` convention (they catch at the boundary). A
+ *     `PrimitiveEnvError` from the resolver is an Error too, and its message is
+ *     already the one the user needs.
+ *   - Do NOT use `resolveAppId()` — it is auth-oriented, and codegen is
+ *     offline.
  */
-import { existsSync, readdirSync } from "fs";
-import { basename, dirname, join } from "path";
-import { getCurrentEnvironment, getExplicitEnvName } from "../env-resolver.js";
-import { getCurrentAppId } from "../config.js";
-import { resolveSyncDir, assertSafePathComponent } from "../sync-paths.js";
+import { existsSync } from "fs";
+import { join } from "path";
+import { resolveSyncDir } from "../sync-paths.js";
 /**
- * Resolves the single source directory a codegen command should read its
- * `*.toml` schemas from. Throws a plain `Error` (with a user-facing message)
- * when the directory can't be resolved unambiguously or doesn't exist.
+ * The single source directory a codegen command reads its `*.toml` schemas
+ * from. Throws with a user-facing message when the environment cannot be
+ * resolved or the directory is not there.
  */
 export function resolveCodegenSourceDir(args) {
-    const { subdir, options } = args;
-    const cwd = args.cwd ?? process.cwd();
-    // 1. --dir is an explicit override: use <dir>/<subdir> verbatim.
-    if (options.syncDir) {
-        return requireExisting(join(options.syncDir, subdir), subdir, undefined);
-    }
-    // 2. Resolve the active environment. Call getCurrentEnvironment() directly
-    //    (not via resolveSyncDir/safeEnv) so a genuinely ambiguous project
-    //    surfaces the resolver's "No environment selected… Available: …" error
-    //    with a non-zero exit — unless the caller narrowed the target with
-    //    --app AND did not name an environment, in which case we fall back to the
-    //    legacy per-app scan.
-    //
-    //    The `--app`-alone fallback only applies when NO environment was
-    //    explicitly requested (neither `--env` nor `PRIMITIVE_ENV`). When the
-    //    user DID name an env but it's invalid/unknown, getCurrentEnvironment()
-    //    throws; we must surface that error (non-zero exit) rather than silently
-    //    scanning the app under some OTHER synced environment — that would
-    //    generate code from the wrong env instead of honoring the explicit
-    //    selection.
-    const explicitEnvRequested = getExplicitEnvName() !== null || !!process.env.PRIMITIVE_ENV;
-    let env;
-    try {
-        env = getCurrentEnvironment();
-    }
-    catch (err) {
-        if (options.app && !explicitEnvRequested) {
-            return scanSyncTree({ subdir, appId: options.app, cwd });
-        }
-        throw err;
-    }
-    // 3. Project mode: resolve the app id and build the env/app-scoped path.
-    if (env) {
-        const appId = options.app ?? env.config.appId ?? getCurrentAppId();
-        if (!appId) {
-            throw new Error(`No app configured for environment "${env.name}" in .primitive/config.json ` +
-                `and no --app given. Add "appId" to the environment or pass --app <app-id>.`);
-        }
-        // resolveSyncDir re-reads the (cached) resolved env and guards appId via
-        // assertSafePathComponent, so an unsafe --app is rejected here.
-        const dir = join(resolveSyncDir({ appId }), subdir);
-        return requireExisting(dir, subdir, appId);
-    }
-    // 4. Legacy / bare-dir mode (no .primitive/config.json): scan the sync tree,
-    //    filtered to --app when given. This preserves the pre-#1510 behavior.
-    return scanSyncTree({ subdir, appId: options.app, cwd });
-}
-/**
- * Legacy fallback: scan `<cwd>/.primitive/sync/<env>/<app>/<subdir>` for a
- * source directory. When `appId` is given, only that app's slots are
- * considered. Resolves to the single match; errors clearly on zero or on
- * ambiguity (naming the candidate apps or envs).
- */
-function scanSyncTree(args) {
-    const { subdir, appId, cwd } = args;
-    // Defence-in-depth: an --app value flows into a file-system path below, so
-    // reject separators / `..` before using it.
-    if (appId)
-        assertSafePathComponent(appId, "appId");
-    const root = join(cwd, ".primitive", "sync");
-    const found = [];
-    if (existsSync(root)) {
-        for (const envName of readdirSync(root)) {
-            const envDir = join(root, envName);
-            try {
-                for (const app of readdirSync(envDir)) {
-                    if (appId && app !== appId)
-                        continue;
-                    const candidate = join(envDir, app, subdir);
-                    if (existsSync(candidate))
-                        found.push(candidate);
-                }
-            }
-            catch {
-                // Not a directory (or unreadable) — skip.
-            }
-        }
-    }
-    if (found.length === 0) {
-        throw new Error(notFoundMessage(subdir, appId));
-    }
-    if (found.length > 1) {
-        if (appId) {
-            const envs = [
-                ...new Set(found.map((d) => basename(dirname(dirname(d))))),
-            ];
-            throw new Error(`App "${appId}" has a ${subdir}/ directory under multiple environments: ` +
-                `${envs.join(", ")}.\n` +
-                found.map((d) => `  ${d}`).join("\n") +
-                `\nPass --env <name> or --dir to select one.`);
-        }
-        const apps = [...new Set(found.map((d) => basename(dirname(d))))];
-        throw new Error(`Found ${subdir}/ directories for more than one app/env:\n` +
-            found.map((d) => `  ${d}`).join("\n") +
-            `\nCodegen writes into one output dir, so it must run against one app. ` +
-            `Pass --app <app-id> (found: ${apps.join(", ")}) or --dir to select one.`);
-    }
-    return found[0];
-}
-/** Verifies `dir` exists, throwing the standard "no source dir" error otherwise. */
-function requireExisting(dir, subdir, appId) {
+    const { subdir } = args;
+    const dir = join(resolveSyncDir(), subdir);
     if (!existsSync(dir)) {
-        throw new Error(notFoundMessage(subdir, appId));
+        throw new Error(`No ${subdir}/ directory in ${dir}. Run \`primitive config pull\` first, ` +
+            `or select another environment with --env <name>.`);
     }
     return dir;
 }
-function notFoundMessage(subdir, appId) {
-    return appId
-        ? `No ${subdir}/ directory found for app "${appId}" under .primitive/sync/. ` +
-            `Check the --app id, pass --dir, or run \`primitive config pull\` first.`
-        : `No ${subdir}/ directory found. Pass --dir or run \`primitive config pull\` first.`;
-}
 //# sourceMappingURL=resolveCodegenSourceDir.js.map

package/dist/src/lib/codegen-shared/resolveCodegenSourceDir.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveCodegenSourceDir.js","sourceRoot":"","sources":["../../../../src/lib/codegen-shared/resolveCodegenSourceDir.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolveCodegenSourceDir.js","sourceRoot":"","sources":["../../../../src/lib/codegen-shared/resolveCodegenSourceDir.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAOlD;;;;GAIG;AACH,MAAM,UAAU,uBAAuB,CAAC,IAAiC;IACvE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACxB,MAAM,GAAG,GAAG,IAAI,CAAC,cAAc,EAAE,EAAE,MAAM,CAAC,CAAC;IAC3C,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CACb,MAAM,MAAM,kBAAkB,GAAG,yCAAyC;YACxE,kDAAkD,CACrD,CAAC;IACJ,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}

package/dist/src/lib/collection-export.d.ts

@@ -0,0 +1,184 @@
+/**
+ * The `collections.json` artifact, and the decisions an import makes from it
+ * (#3643).
+ *
+ * `documents export-all` / `documents import` carry Yjs state, blobs,
+ * permissions and aliases, but nothing about collections: which exist, what
+ * each contains, who its members are and at what level, its group grants, and
+ * who owns it. This module is the half of `collections export` /
+ * `collections import` that needs no server — the file's shape, the plan the
+ * import builds from it, the comparisons that plan rests on, and the exit
+ * rule — so each is checkable on its own, as `document-ingest-rows` and
+ * `snapshot-build-rows` are for their commands.
+ *
+ * The one thing that does NOT live here is resolution: which userId an email
+ * answers to, whether a document exists, whether a group exists. Those are
+ * reads against a real server, they are the facts the plan is built from, and
+ * the command performs them and hands the answers in.
+ */
+/** The only file version this CLI reads or writes. */
+export declare const COLLECTION_EXPORT_VERSION = 1;
+/** Its name inside an export directory, beside `manifest.json`. */
+export declare const COLLECTION_EXPORT_FILENAME = "collections.json";
+export type CollectionPermission = "reader" | "read-write";
+export interface ExportedOwner {
+    /** The SOURCE app's userId. Meaningful in the target only for a same-app import. */
+    userId: string;
+    /** Present when the source server could resolve it; the only cross-app identity. */
+    email?: string;
+}
+export interface ExportedMember extends ExportedOwner {
+    permission: CollectionPermission;
+}
+export interface ExportedGroupGrant {
+    groupType: string;
+    groupId: string;
+    permission: CollectionPermission;
+}
+export interface ExportedCollectionDocument {
+    documentId: string;
+    addedAt?: string | null;
+}
+export interface ExportedCollection {
+    collectionId: string;
+    name: string;
+    description: string | null;
+    collectionType: string | null;
+    contextId: string | null;
+    createdAt: string | null;
+    owner: ExportedOwner | null;
+    documents: ExportedCollectionDocument[];
+    members: ExportedMember[];
+    groups: ExportedGroupGrant[];
+}
+export interface CollectionExportFile {
+    version: number;
+    exportedAt: string;
+    sourceAppId: string;
+    collectionCount: number;
+    collections: ExportedCollection[];
+}
+/**
+ * Resolve the `<path>` an import was given to the file it must read.
+ *
+ * Both forms work: an export DIRECTORY (the one `documents export-all` also
+ * wrote into) and the file itself.
+ */
+export declare function resolveCollectionExportPath(inputPath: string): string;
+/**
+ * Read and validate `collections.json`.
+ *
+ * Every refusal here happens BEFORE any request: a file this CLI cannot read
+ * is not a reason to start writing collections into the target app.
+ */
+export declare function readCollectionExportFile(inputPath: string): CollectionExportFile;
+export type CollectionImportAction = "create" | "merge" | "skip" | "refused";
+/** Which part of a collection a per-item problem is about. */
+export type CollectionProblemKind = "owner" | "collection" | "document" | "member" | "group";
+export interface CollectionImportProblem {
+    sourceCollectionId: string;
+    name: string;
+    kind: CollectionProblemKind;
+    /** The offending identity: a userId, an email, a documentId, `type/id`. */
+    id: string;
+    reason: string;
+}
+/** The target collection a name match found, as far as compatibility cares. */
+export interface ExistingTargetCollection {
+    collectionId: string;
+    createdBy: string;
+    collectionType: string | null;
+    contextId: string | null;
+}
+export interface CollectionResolution {
+    /** The userId the owner resolved to in the TARGET app, or null. */
+    ownerUserId: string | null;
+    /** Why the owner could not be resolved — becomes the refusal's reason. */
+    ownerReason?: string;
+    /** The target collection carrying this exact name, if any. */
+    existing?: ExistingTargetCollection | null;
+    /** The source id of an earlier collection in the same file with this name. */
+    duplicateOfSourceId?: string | null;
+}
+export interface CollectionPlanRow {
+    sourceCollectionId: string;
+    name: string;
+    action: CollectionImportAction;
+    /** Why it was refused or skipped. Absent for `create`/`merge`. */
+    reason?: string;
+    /** Where it lands: known up front only for a `merge`. */
+    targetCollectionId?: string;
+    /** The resolved owner, for a `create`. */
+    ownerUserId?: string;
+    /** A refusal that must also be REPORTED as a problem carries it here. */
+    problem?: Omit<CollectionImportProblem, "sourceCollectionId" | "name">;
+}
+/**
+ * Which of `createdBy`, `collectionType` and `contextId` a name match differs
+ * on — the fields the server will never let an update change
+ * (`collections-controller.ts` rejects type and context; `createdBy` is
+ * immutable), so a difference cannot be merged away (F2).
+ *
+ * Returns null when the match is compatible.
+ */
+export declare function incompatibleField(collection: Pick<ExportedCollection, "collectionType" | "contextId">, existing: ExistingTargetCollection, ownerUserId: string): "owner" | "collectionType" | "contextId" | null;
+/** What to do about one recorded group grant, given the target's grants. */
+export type GrantDisposition = "grant" | "already-applied" | "update";
+/**
+ * Compare a recorded grant with the target's.
+ *
+ * A grant already at the recorded level counts as applied without a write. A
+ * grant at a DIFFERENT level is sent: #3163 recomputes each document's
+ * materialized `DocumentGroupPermission` from its live sources on every
+ * collection-wide change, so the new level reaches what the group's members can
+ * actually do. Before that it did not — `materializeDGP` left an existing row
+ * alone once the collection was one of its sources — which is why the import
+ * used to report such a grant instead of changing it (F3).
+ */
+export declare function grantDisposition(wanted: ExportedGroupGrant, targetGrants: ExportedGroupGrant[]): GrantDisposition;
+/** The line a level change is announced with, named from and to. */
+export declare function grantUpdateLine(groupLabel: string, existingPermission: string, wantedPermission: string): string;
+/**
+ * What a server refusal reads as in a per-item problem.
+ *
+ * The prose alone is not enough to act on. `COLLECTION_FANOUT_LIMIT` is the
+ * case that matters here: past `COLLECTION_GROUP_FANOUT_MAX` documents the
+ * server refuses a collection-wide group change whole (#3163), and the remedy —
+ * split the collection, or grant its documents one at a time — is nothing like
+ * the remedy for a 404 group. Carrying the code makes the two tellable apart by
+ * a script as well as by a reader.
+ */
+export declare function serverReason(err: any): string;
+/**
+ * Decide what happens to one collection, from the facts the resolve phase read.
+ *
+ * Nothing here talks to a server: every input is already an answer.
+ */
+export declare function planCollection(collection: ExportedCollection, resolution: CollectionResolution, options: {
+    overwrite: boolean;
+}): CollectionPlanRow;
+/**
+ * The source ids of earlier same-named collections, keyed by source id.
+ *
+ * The FIRST collection with a name is the one that may land; every later one
+ * maps to it here and is refused.
+ */
+export declare function duplicateNameSources(collections: ExportedCollection[]): Map<string, string>;
+export interface CollectionImportSummary {
+    created: number;
+    merged: number;
+    skipped: number;
+    refused: number;
+    groupsGranted: number;
+    membersAdded: number;
+    documentsAdded: number;
+}
+export declare function emptyImportSummary(): CollectionImportSummary;
+/**
+ * The exit rule, in one place: 1 when any per-item problem was reported.
+ *
+ * A skip for a name collision is NOT a problem — it is the documented way to
+ * re-run an import without `--overwrite`. A refusal is, because something the
+ * operator asked for did not happen.
+ */
+export declare function importExitCode(problems: CollectionImportProblem[]): number;