@multiplatform.one/cli 7.10.0 → 7.15.0

package/types/commands/init.d.ts

@@ -1,16 +1,33 @@
-interface InitOptions {
-    name?: string;
-    services?: string;
-    apps?: string;
-    checkout?: string;
-    /** Path to clone.sh script (from CLI); if set, clone via script instead of execSync */
-    cloneScript?: string;
-}
 /**
- * Shared modify step: remove unselected apps/services and rewrite configs.
- * Used by both init (with prompted selections) and update (with getPresentApps/getPresentServices).
+ * `mpo init`: a consumer project is the multiplatform.one monorepo at one
+ * commit, pruned. scripts/scaffold.sh does the work (clone or archive at
+ * the ref, drop public/ and the singleton apps not asked for, rename
+ * apps/one to each product app, rewrite workspace: ranges to semver); this
+ * command picks the commit, asks what to keep, and finishes the repo.
  */
-export declare function runModifyStep(dir: string, selectedServices: string[], selectedApps: string[]): void;
-export declare function init(nameArg: string | undefined, options: InitOptions): Promise<void>;
-export {};
+/** The apps that exist once per project; everything else under apps/ is a product app. */
+export declare const SINGLETON_APPS: readonly ["ethereum", "frappe", "keycloak", "solana", "storybook", "storybook-expo", "sui", "uxpin", "vocs"];
+export type SingletonApp = (typeof SINGLETON_APPS)[number];
+export interface InitOptions {
+    /** Product apps besides the project name (each is a renamed apps/one). */
+    apps?: string[];
+    /** Singleton apps to keep. */
+    services?: string[];
+    /** Path or url to scaffold from instead of the CLI's recorded source. */
+    source?: string;
+    /** Commit, tag or branch at that source. */
+    checkout?: string;
+    /** Range for @multiplatform.one/* (default: ^<cli version at the source>). */
+    mpoVersion?: string;
+    skipInstall?: boolean;
+    skipGit?: boolean;
+    /** Non-interactive: no prompts, no services unless passed. */
+    yes?: boolean;
+    /** Scaffold into an existing (non-empty) directory. */
+    into?: boolean;
+    /** Show the scaffold's per-path progress. */
+    verbose?: boolean;
+}
+export declare function validateServices(services: string[]): SingletonApp[];
+export declare function init(nameArg: string | undefined, options?: InitOptions): Promise<void>;
 //# sourceMappingURL=init.d.ts.map

package/types/commands/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAsEA,UAAU,WAAW;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,uFAAuF;IACvF,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAC3B,GAAG,EAAE,MAAM,EACX,gBAAgB,EAAE,MAAM,EAAE,EAC1B,YAAY,EAAE,MAAM,EAAE,GACrB,IAAI,CAuDN;AAED,wBAAsB,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,WAAW,iBAqI3E"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAUH,0FAA0F;AAC1F,eAAO,MAAM,cAAc,8GAUjB,CAAC;AACX,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC;AAc3D,MAAM,WAAW,WAAW;IAC1B,0EAA0E;IAC1E,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,8BAA8B;IAC9B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,yEAAyE;IACzE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,4CAA4C;IAC5C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,8EAA8E;IAC9E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,8DAA8D;IAC9D,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,uDAAuD;IACvD,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,6CAA6C;IAC7C,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAMD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,YAAY,EAAE,CAUnE;AAsCD,wBAAsB,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiHhG"}

package/types/commands/merge.d.ts

@@ -0,0 +1,54 @@
+/**
+ * The three-way merge behind `mpo update` and `mpo add-app`:
+ *
+ *   base   = the scaffold the project started from (recorded in .mpo.json)
+ *   ours   = the project's HEAD (every commit the project made)
+ *   theirs = the scaffold it is moving to
+ *
+ * `git merge-tree --write-tree --merge-base=<base>` merges the scaffold's
+ * evolution with the project's history; the result lands in the index and
+ * worktree, never in a commit, so the project commits when it is happy.
+ * `.updateignore` entries (exact files or directory prefixes, not globs) and
+ * pnpm-lock.yaml stay pinned to HEAD.
+ */
+export declare function git(projectDir: string, args: string[], env?: Record<string, string>): Promise<import("nano-spawn").Result>;
+export declare function gitOut(projectDir: string, args: string[], env?: Record<string, string>): Promise<string>;
+export declare function projectRootOf(command: string): Promise<string>;
+/** The merge lands in the worktree, so nothing else may be in flight there. */
+export declare function requireCleanTree(projectDir: string, command: string): Promise<void>;
+/**
+ * Pins: pnpm-lock.yaml plus every .updateignore entry. Entries are exact
+ * files or directory prefixes (`git ls-tree -- <path>` semantics); the one
+ * natural glob spelling (`dir/**`, `dir/*`) normalizes to its directory and
+ * any other glob shape is refused, because a silently dead ignore rule is
+ * the worst failure mode.
+ */
+export declare function readPins(projectDir: string): string[];
+/** Structural three-way merge of package.json content, or undefined when a
+ *  divergence cannot be auto-resolved (the textual markers then stay). */
+export declare function threeWayMergePackageJson(base: string | undefined, ours: string, theirs: string): Record<string, unknown> | undefined;
+export interface MergeRequest {
+    projectDir: string;
+    /** The scaffold the project started from; undefined = the empty tree. */
+    baseDir?: string;
+    theirsDir: string;
+    baseLabel: string;
+    theirsLabel: string;
+}
+export interface MergeOutcome {
+    mergedTree: string;
+    /** false when the merged tree is HEAD's tree already. */
+    changed: boolean;
+    conflicts: string[];
+    resolved: string[];
+}
+/** Compute the merged tree. Pure object-database work; nothing is written to the worktree. */
+export declare function mergeScaffolds(request: MergeRequest): Promise<MergeOutcome>;
+/** Land a tree in the index and worktree. The tree was clean before, so
+ *  every difference is the merge; nothing is committed. */
+export declare function landTree(projectDir: string, tree: string): Promise<void>;
+/** Print the outcome and the commit line; run pnpm install on a clean merge. */
+export declare function finishMerge(projectDir: string, outcome: MergeOutcome, commitMessage: string, options?: {
+    skipInstall?: boolean;
+}): Promise<void>;
+//# sourceMappingURL=merge.d.ts.map

package/types/commands/merge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../src/commands/merge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAOH,wBAAsB,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,wCAKzF;AAED,wBAAsB,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,mBAG5F;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAIpE;AAED,+EAA+E;AAC/E,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAUzF;AAuED;;;;;;GAMG;AACH,wBAAgB,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CAkBrD;AA2ED;0EAC0E;AAC1E,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,GACb,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAerC;AAwDD,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,yEAAyE;IACzE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,yDAAyD;IACzD,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,8FAA8F;AAC9F,wBAAsB,cAAc,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CA2DjF;AAED;2DAC2D;AAC3D,wBAAsB,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE9E;AAED,gFAAgF;AAChF,wBAAsB,WAAW,CAC/B,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,YAAY,EACrB,aAAa,EAAE,MAAM,EACrB,OAAO,GAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAO,GACtC,OAAO,CAAC,IAAI,CAAC,CAuBf"}

package/types/commands/pieces.d.ts

@@ -0,0 +1,54 @@
+/**
+ * Pieces: additive fragment trees under templates/pieces/<piece>/ that an
+ * ADOPTED project (`mpo adopt`) hand-copied and wants `mpo update` to keep
+ * reconciling. A project from `mpo init` never needs them: apps/one already
+ * ships gnome/, tauri/, vscode/ and webext/, and frappe / keycloak are
+ * `--service` selections of the real apps. Keep sorted: pieces are recorded
+ * sorted in provenance and overlaid in this order.
+ */
+export declare const INIT_APP_PIECES: readonly ["frappe", "frappe-bench", "gnome", "keycloak", "tauri", "vscode", "webext"];
+export type InitAppPiece = (typeof INIT_APP_PIECES)[number];
+export declare function piecesRoot(): string;
+type JsonValue = string | number | boolean | null | JsonValue[] | {
+    [key: string]: JsonValue;
+};
+/**
+ * Deep-merge for JSON partials: objects merge recursively (fragment keys
+ * append after base keys, so e.g. package.json script order stays stable),
+ * arrays union (base order first), scalars/type-mismatches take the
+ * fragment value.
+ */
+export declare function mergeJsonValues(base: JsonValue, fragment: JsonValue): JsonValue;
+/**
+ * Validate + canonicalize a piece selection: unknown names throw, duplicates
+ * collapse, order is always sorted, and every piece must ship a fragment.
+ */
+export declare function normalizePieces(pieces: string[], root?: string): InitAppPiece[];
+/**
+ * The frappe piece carried the dev bench until the bench became its own piece
+ * (MPO-241). An adoption recorded against pieces that still bundle it keeps
+ * the bench, now as frappe-bench, so an update does not delete it.
+ */
+export declare function withSplitPieces(pieces: InitAppPiece[], recordedRoot?: string): InitAppPiece[];
+export declare function availablePieces(root?: string): InitAppPiece[];
+export declare function pieceDescription(piece: InitAppPiece): string;
+/**
+ * apps/<name>/src/app.ts for the selected backend pieces: each provider
+ * adds one createApp key. Only written when a provider piece is selected.
+ */
+export declare function composeAppTs(pieces: InitAppPiece[]): string;
+export interface PiecesScaffold {
+    name: string;
+    mpoVersion: string;
+    pieces: InitAppPiece[];
+    /** templates/pieces of another CLI version (the merge base of an older adoption). */
+    root?: string;
+}
+/**
+ * The tool-owned surface of an adopted project: the selected piece
+ * fragments overlaid, in sorted order, on an EMPTY tree. `mpo update`
+ * builds both merge baselines of an adopted project with this.
+ */
+export declare function scaffoldPieces(targetDir: string, request: PiecesScaffold): void;
+export {};
+//# sourceMappingURL=pieces.d.ts.map

package/types/commands/pieces.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pieces.d.ts","sourceRoot":"","sources":["../../src/commands/pieces.ts"],"names":[],"mappings":"AAWA;;;;;;;GAOG;AACH,eAAO,MAAM,eAAe,uFAQlB,CAAC;AACX,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AAY5D,wBAAgB,UAAU,IAAI,MAAM,CAEnC;AA8DD,KAAK,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,EAAE,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC;AAM/F;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,GAAG,SAAS,CAoB/E;AAgFD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,IAAI,SAAe,GAAG,YAAY,EAAE,CAYrF;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,YAAY,EAAE,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,YAAY,EAAE,CAI7F;AAED,wBAAgB,eAAe,CAAC,IAAI,SAAe,GAAG,YAAY,EAAE,CAEnE;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,YAAY,GAAG,MAAM,CAE5D;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,CA0C3D;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,YAAY,EAAE,CAAC;IACvB,qFAAqF;IACrF,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,IAAI,CAyB/E"}

package/types/commands/provenance.d.ts

@@ -0,0 +1,52 @@
+import type { InitAppPiece } from "./pieces";
+export declare const PROVENANCE_FILE = ".mpo.json";
+/**
+ * What `mpo update` needs to rebuild the merge base of a project.
+ *
+ * A project from `mpo init` records the monorepo commit it was pruned from
+ * and the selection made at that time; the scaffold at that commit with
+ * that selection IS the merge base. An adopted project (`mpo adopt`,
+ * template "none") records only the pieces it hand-copied. A project from
+ * the retired template scaffolder (template "universal" / "app") has no
+ * reproducible base left; its next update reconciles from an empty tree.
+ */
+export interface MpoProvenance {
+    cliVersion: string;
+    /** The monorepo commit the project was scaffolded from. */
+    source?: {
+        sha: string;
+        url?: string;
+    };
+    /** Product apps derived from apps/one. */
+    apps: string[];
+    /** Singleton apps kept under apps/ (frappe, keycloak, storybook, ...). */
+    services: string[];
+    /** Pieces overlaid for adopted projects (sorted). */
+    pieces: InitAppPiece[];
+    /** "none" = adopted; "universal" / "app" = template-era. Absent on clone-derived projects. */
+    template?: "none" | "universal" | "app";
+    /** Adopted and template-era projects: the name that renders piece paths (apps/<name>/...). */
+    name?: string;
+    mpoVersion?: string;
+    /**
+     * false = adopted but never reconciled: `mpo adopt` wrote provenance
+     * without touching a project file, so the first update merges the piece
+     * baseline from an EMPTY base and then clears the flag.
+     */
+    reconciled?: boolean;
+}
+export declare function validateName(name: string): string;
+/** Root package.json name with any @scope/ prefix stripped (adopt derives the project name from it). */
+export declare function packageJsonName(projectDir: string): string | undefined;
+export declare function cliRoot(): string;
+export declare function cliVersion(): string | undefined;
+/** `^x.y.z` for a bare version; explicit ranges pass through. */
+export declare function mpoRange(explicit: string | undefined, fallbackVersion?: string | undefined): string;
+export declare function writeProvenance(targetDir: string, provenance: MpoProvenance): void;
+/**
+ * Reads both shapes: the clone-derived record ({cliVersion, source, apps,
+ * services, pieces}) and the older {template, name} record written by
+ * `mpo adopt` and the retired template scaffolder.
+ */
+export declare function readProvenance(projectDir: string): MpoProvenance | undefined;
+//# sourceMappingURL=provenance.d.ts.map

package/types/commands/provenance.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"provenance.d.ts","sourceRoot":"","sources":["../../src/commands/provenance.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7C,eAAO,MAAM,eAAe,cAAc,CAAC;AAE3C;;;;;;;;;GASG;AACH,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,2DAA2D;IAC3D,MAAM,CAAC,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACvC,0CAA0C;IAC1C,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,0EAA0E;IAC1E,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,qDAAqD;IACrD,MAAM,EAAE,YAAY,EAAE,CAAC;IACvB,8FAA8F;IAC9F,QAAQ,CAAC,EAAE,MAAM,GAAG,WAAW,GAAG,KAAK,CAAC;IACxC,8FAA8F;IAC9F,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAWjD;AAED,wGAAwG;AACxG,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAStE;AAED,wBAAgB,OAAO,IAAI,MAAM,CAEhC;AAED,wBAAgB,UAAU,IAAI,MAAM,GAAG,SAAS,CAS/C;AAED,iEAAiE;AACjE,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,eAAe,qBAAe,GAAG,MAAM,CAO7F;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,GAAG,IAAI,CAmBlF;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAoD5E"}

package/types/commands/scaffold.d.ts

@@ -0,0 +1,43 @@
+import { type MpoProvenance } from "./provenance";
+/** The scaffold itself: POSIX sh, runs standalone. The TS commands only call it. */
+export declare function scaffoldScript(): string;
+export interface ScaffoldRequest {
+    /** Path to a local clone or a git URL. */
+    source: string;
+    /** Commit, tag or branch. */
+    ref: string;
+    target: string;
+    /** Product apps derived from apps/one. */
+    apps: string[];
+    /** Singleton apps kept under apps/. */
+    services: string[];
+    /** Range written for @multiplatform.one/* (default: ^<cli version at the ref>). */
+    mpoVersion?: string;
+    /** Scaffold into a non-empty directory; existing paths are skipped and pinned. */
+    into?: boolean;
+    /** Url recorded in .mpo.json instead of the source path. */
+    sourceUrl?: string;
+    /** Root package.json name (default: the target's basename). */
+    name?: string;
+    /** Show the script's progress (removed: ... lines). */
+    verbose?: boolean;
+}
+export declare class ScaffoldError extends Error {
+    readonly request: ScaffoldRequest;
+    constructor(message: string, request: ScaffoldRequest);
+}
+/** Run scaffold.sh and return the provenance it wrote. */
+export declare function runScaffold(request: ScaffoldRequest): Promise<MpoProvenance>;
+export interface TempScaffold {
+    dir: string;
+    provenance: MpoProvenance;
+    cleanup: () => void;
+}
+/** A scaffold in a temp dir (merge baselines). */
+export declare function scaffoldToTemp(request: Omit<ScaffoldRequest, "target" | "into">): Promise<TempScaffold>;
+/**
+ * One subtree of the monorepo at a ref, extracted into `dest` (the piece
+ * templates of an older CLI version, for adopted-project merge bases).
+ */
+export declare function archiveSubtree(source: string, ref: string, subtree: string, dest: string): Promise<void>;
+//# sourceMappingURL=scaffold.d.ts.map

package/types/commands/scaffold.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"scaffold.d.ts","sourceRoot":"","sources":["../../src/commands/scaffold.ts"],"names":[],"mappings":"AAIA,OAAO,EAA2B,KAAK,aAAa,EAAE,MAAM,cAAc,CAAC;AAE3E,oFAAoF;AACpF,wBAAgB,cAAc,IAAI,MAAM,CAEvC;AAED,MAAM,WAAW,eAAe;IAC9B,0CAA0C;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,6BAA6B;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,0CAA0C;IAC1C,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,uCAAuC;IACvC,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,mFAAmF;IACnF,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,kFAAkF;IAClF,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,4DAA4D;IAC5D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,+DAA+D;IAC/D,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,uDAAuD;IACvD,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,qBAAa,aAAc,SAAQ,KAAK;IAGpC,QAAQ,CAAC,OAAO,EAAE,eAAe;gBADjC,OAAO,EAAE,MAAM,EACN,OAAO,EAAE,eAAe;CAIpC;AAcD,0DAA0D;AAC1D,wBAAsB,WAAW,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,aAAa,CAAC,CA0BlF;AAED,MAAM,WAAW,YAAY;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,aAAa,CAAC;IAC1B,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AAED,kDAAkD;AAClD,wBAAsB,cAAc,CAClC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,QAAQ,GAAG,MAAM,CAAC,GAChD,OAAO,CAAC,YAAY,CAAC,CAWvB;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC,CAgBf"}

package/types/commands/updateApp.d.ts

@@ -1,38 +1,30 @@
 /**
- * `mpo update` for scaffolded consumer projects — the modern successor of
- * the old cookiecutter flow (init a fresh project, swap your .git in, merge
- * your changes on top), rebuilt with a TRUE three-way merge:
+ * `mpo update`: bring the monorepo's changes into a project as a three-way
+ * merge that is NEVER committed.
  *
- *   base  = the ORIGINAL scaffold, regenerated from the CLI version recorded
- *           in .mpo.json at init time (published CLIs ship their templates,
- *           so `pnpm dlx @multiplatform.one/cli@<old> init` reproduces it)
- *   ours  = the project's HEAD (all your custom changes)
- *   theirs= a fresh scaffold from the CURRENT CLI version
+ *   base   = the scaffold the project started from: the monorepo at the
+ *            commit recorded in .mpo.json, pruned with the recorded apps
+ *            and services
+ *   ours   = the project's HEAD (every commit the project made)
+ *   theirs = the same scaffold at the commit the running CLI was built from
+ *            (or --source/--checkout)
  *
- * `git merge-tree --write-tree --merge-base=<base>` merges template
- * evolution with your customizations; conflicts land in the worktree with
- * normal conflict markers. An `.updateignore` file (one exact file or
- * directory prefix per line — not globs; `dir/**` is normalized, other
- * glob shapes are refused) pins matching paths to your HEAD version.
+ * Every product app is a renamed apps/one on both sides, so a change to
+ * the One app lands in each of them. The merged tree goes into the index
+ * and worktree; the commit line is printed; a dirty tree is refused up
+ * front. Adopted projects (`mpo adopt`) merge their piece fragments the
+ * same way; projects from the retired template scaffolder reconcile from an
+ * empty base once and are clone-derived afterwards.
  */
-import { type InitAppTemplate } from "./initApp";
 export interface UpdateAppOptions {
-    /** Skip pnpm install after the merge. */
     skipInstall?: boolean;
     /** Override the semver range written for @multiplatform.one/* deps. */
     version?: string;
-    /**
-     * Pre-provenance bootstrap: when .mpo.json is missing, assume the project
-     * was scaffolded by this exact CLI version, write provenance first, then
-     * proceed with the normal update.
-     */
-    assumeVersion?: string;
-    /** Template recorded by the --assume-version bootstrap (default universal). */
-    assumeTemplate?: InitAppTemplate;
+    /** Path or url to update from (default: the CLI's recorded source). */
+    source?: string;
+    /** Commit, tag or branch at that source (default: the CLI's source commit). */
+    checkout?: string;
+    verbose?: boolean;
 }
-/** Structural three-way merge of package.json content. Returns the merged
- *  object, or undefined when a divergence can't be auto-resolved (the file
- *  then keeps its textual conflict markers for manual resolution). */
-export declare function threeWayMergePackageJson(base: string | undefined, ours: string, theirs: string): Record<string, unknown> | undefined;
 export declare function updateApp(options?: UpdateAppOptions): Promise<void>;
 //# sourceMappingURL=updateApp.d.ts.map

package/types/commands/updateApp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"updateApp.d.ts","sourceRoot":"","sources":["../../src/commands/updateApp.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAOH,OAAO,EASL,KAAK,eAAe,EAGrB,MAAM,WAAW,CAAC;AAEnB,MAAM,WAAW,gBAAgB;IAC/B,yCAAyC;IACzC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,uEAAuE;IACvE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,+EAA+E;IAC/E,cAAc,CAAC,EAAE,eAAe,CAAC;CAClC;AA2QD;;sEAEsE;AACtE,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,GACb,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAerC;AAyGD,wBAAsB,SAAS,CAAC,OAAO,GAAE,gBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgS7E"}
+{"version":3,"file":"updateApp.d.ts","sourceRoot":"","sources":["../../src/commands/updateApp.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AA2BH,MAAM,WAAW,gBAAgB;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,uEAAuE;IACvE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,uEAAuE;IACvE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,+EAA+E;IAC/E,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAuPD,wBAAsB,SAAS,CAAC,OAAO,GAAE,gBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmB7E"}

package/types/source.d.ts

@@ -0,0 +1,35 @@
+export declare const monorepoUrl = "https://git.corp.bitspur.com/multiplatform.one/mpo.git";
+export interface SourceSpec {
+    /** Path to a local clone, or a git URL. */
+    source: string;
+    /** Commit, tag or branch to scaffold from. */
+    ref: string;
+    /**
+     * flag     = --source / --checkout
+     * monorepo = the CLI runs from inside a monorepo checkout (dev, `make`)
+     * stamp    = lib/source.json written by the build
+     * tag      = no stamp: the release tag of this CLI version
+     */
+    origin: "flag" | "monorepo" | "stamp" | "tag";
+    warning?: string;
+}
+export interface SourceStamp {
+    cliVersion?: string;
+    sha?: string;
+    url?: string;
+}
+export declare function isGitUrl(source: string): boolean;
+/** The monorepo checkout this CLI runs from, if any (src via tsx, or the workspace link). */
+export declare function monorepoCheckout(): string | undefined;
+export declare function readSourceStamp(): SourceStamp | undefined;
+/**
+ * Where `mpo init` clones from. Flags win; a CLI running inside the monorepo
+ * uses that checkout's HEAD; a published CLI uses the commit stamped at build
+ * time; a build without a stamp falls back to the release tag of its own
+ * version, and `init` retries `main` when that tag is missing.
+ */
+export declare function resolveSource(flags?: {
+    source?: string;
+    checkout?: string;
+}): SourceSpec;
+//# sourceMappingURL=source.d.ts.map

package/types/source.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"source.d.ts","sourceRoot":"","sources":["../src/source.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,WAAW,2DAA2D,CAAC;AAEpF,MAAM,WAAW,UAAU;IACzB,2CAA2C;IAC3C,MAAM,EAAE,MAAM,CAAC;IACf,8CAA8C;IAC9C,GAAG,EAAE,MAAM,CAAC;IACZ;;;;;OAKG;IACH,MAAM,EAAE,MAAM,GAAG,UAAU,GAAG,OAAO,GAAG,KAAK,CAAC;IAC9C,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,WAAW;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEhD;AAED,6FAA6F;AAC7F,wBAAgB,gBAAgB,IAAI,MAAM,GAAG,SAAS,CASrD;AAED,wBAAgB,eAAe,IAAI,WAAW,GAAG,SAAS,CAMzD;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,KAAK,GAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,UAAU,CA8B5F"}