@fuzdev/fuz_gitops 0.73.0 → 0.74.0

package/README.md

@@ -14,8 +14,8 @@ fuz_gitops is alternative to the monorepo pattern that more loosely couples repo
 With fuz_gitops you can:
 
 - dynamically compose repos
-- fetch metadata about collections of repos and import it as typesafe JSON (using
-  [Gro's public package patterns](https://github.com/fuzdev/gro/blob/main/src/docs/gro_plugin_sveltekit_app.md#well_known_package_json))
+- fetch metadata about collections of repos and import it as typesafe JSON (using fuz_ui's
+  [vite_plugin_pkg_json](https://ui.fuz.dev/docs/vite_plugin_pkg_json))
 - publish a generated docs website for your collections of repos
 - import its components to view and interact with repo collection metadata
 - publish metadata about your collections of repos to the web for other users and tools

package/dist/PageHeader.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import type {PackageJson} from '@fuzdev/fuz_util/package_json.js';
+	import type {PkgJson} from '@fuzdev/fuz_util/pkg_json.js';
 	import Breadcrumb from '@fuzdev/fuz_ui/Breadcrumb.svelte';
 	import type {Snippet} from 'svelte';
 	import type {SvelteHTMLElements} from 'svelte/elements';
@@ -11,7 +11,7 @@
 		nav,
 		children,
 	}: {
-		repo: {package_json: PackageJson} | {url: string; package_json: null};
+		repo: {pkg_json: PkgJson} | {url: string; pkg_json: null};
 		nav_attrs?: SvelteHTMLElements['nav'];
 		attrs?: SvelteHTMLElements['header'];
 		nav?: Snippet;
@@ -24,7 +24,7 @@
 	{#if nav}
 		{@render nav()}
 	{:else}
-		<nav {...nav_attrs}><Breadcrumb>{repo.package_json?.glyph}</Breadcrumb></nav>
+		<nav {...nav_attrs}><Breadcrumb>{repo.pkg_json?.glyph}</Breadcrumb></nav>
 	{/if}
 </header>
 

package/dist/PageHeader.svelte.d.ts

@@ -1,12 +1,12 @@
-import type { PackageJson } from '@fuzdev/fuz_util/package_json.js';
+import type { PkgJson } from '@fuzdev/fuz_util/pkg_json.js';
 import type { Snippet } from 'svelte';
 import type { SvelteHTMLElements } from 'svelte/elements';
 type $$ComponentProps = {
     repo: {
-        package_json: PackageJson;
+        pkg_json: PkgJson;
     } | {
         url: string;
-        package_json: null;
+        pkg_json: null;
     };
     nav_attrs?: SvelteHTMLElements['nav'];
     attrs?: SvelteHTMLElements['header'];

package/dist/PageHeader.svelte.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PageHeader.svelte.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/PageHeader.svelte"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,kCAAkC,CAAC;AAElE,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,QAAQ,CAAC;AACpC,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,iBAAiB,CAAC;AAEvD,KAAK,gBAAgB,GAAI;IACxB,IAAI,EAAE;QAAC,YAAY,EAAE,WAAW,CAAA;KAAC,GAAG;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,IAAI,CAAA;KAAC,CAAC;IACtE,SAAS,CAAC,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAC;IACtC,KAAK,CAAC,EAAE,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IACrC,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AA6BH,QAAA,MAAM,UAAU,sDAAwC,CAAC;AACzD,KAAK,UAAU,GAAG,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;AAChD,eAAe,UAAU,CAAC"}
+{"version":3,"file":"PageHeader.svelte.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/PageHeader.svelte"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,8BAA8B,CAAC;AAE1D,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,QAAQ,CAAC;AACpC,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,iBAAiB,CAAC;AAEvD,KAAK,gBAAgB,GAAI;IACxB,IAAI,EAAE;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAC,GAAG;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,IAAI,CAAA;KAAC,CAAC;IAC1D,SAAS,CAAC,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAC;IACtC,KAAK,CAAC,EAAE,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IACrC,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AA6BH,QAAA,MAAM,UAAU,sDAAwC,CAAC;AACzD,KAAK,UAAU,GAAG,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;AAChD,eAAe,UAAU,CAAC"}

package/dist/changeset_generator.js

@@ -40,7 +40,7 @@ export const create_changeset_for_dependency_updates = async (repo, updates, opt
     log?.info(`  Created changeset: ${filename}`);
     return filepath;
 };
-const calculate_required_bump = (repo, updates) => required_bump_for_dependency_update(repo.library.package_json.version || '0.0.0', updates.some((u) => u.breaking));
+const calculate_required_bump = (repo, updates) => required_bump_for_dependency_update(repo.package_json.version || '0.0.0', updates.some((u) => u.breaking));
 /**
  * Generates markdown changeset content for dependency updates.
  *

package/dist/changeset_reader.js

@@ -161,7 +161,7 @@ export const predict_next_version = async (repo, log) => {
     if (!bump_type) {
         return null;
     }
-    const current_version = repo.library.package_json.version || '0.0.0';
+    const current_version = repo.package_json.version || '0.0.0';
     const next_version = calculate_next_version(current_version, bump_type);
     log?.debug(`  Predicted ${repo.library.name}: ${current_version} → ${next_version} (${bump_type})`);
     return {

package/dist/dependency_graph.d.ts.map

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

package/dist/dependency_graph.js

@@ -24,19 +24,19 @@ export class DependencyGraph {
     init_from_repos(repos) {
         // First pass: create nodes
         for (const repo of repos) {
-            const { library } = repo;
+            const { library, package_json } = repo;
             const node = {
                 name: library.name,
-                version: library.package_json.version || '0.0.0',
+                version: package_json.version || '0.0.0',
                 repo,
                 dependencies: new Map(),
                 dependents: new Set(),
-                publishable: !library.package_json.private,
+                publishable: !package_json.private,
             };
             // Extract dependencies
-            const deps = library.package_json.dependencies || EMPTY_OBJECT;
-            const dev_deps = library.package_json.devDependencies || EMPTY_OBJECT;
-            const peer_deps = library.package_json.peerDependencies || EMPTY_OBJECT;
+            const deps = package_json.dependencies || EMPTY_OBJECT;
+            const dev_deps = package_json.devDependencies || EMPTY_OBJECT;
+            const peer_deps = package_json.peerDependencies || EMPTY_OBJECT;
             // Add dependencies, prioritizing prod/peer over dev
             // (if a package appears in multiple dep types, use the stronger constraint)
             for (const [name, version] of Object.entries(deps)) {

package/dist/fetch_repo_data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch_repo_data.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/fetch_repo_data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,yBAAyB,CAAC;AAEpD,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,2BAA2B,CAAC;AAG/D,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAE/C;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,eAAe,GAC3B,gBAAgB,KAAK,CAAC,SAAS,CAAC,EAChC,QAAQ,MAAM,EACd,QAAQ,eAAe,EACvB,MAAM,MAAM,EACZ,cAAU,EACV,qBAAqB,MAAM,KACzB,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAiCzB,CAAC"}
+{"version":3,"file":"fetch_repo_data.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/fetch_repo_data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,yBAAyB,CAAC;AAEpD,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,2BAA2B,CAAC;AAG/D,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAE/C;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,eAAe,GAC3B,gBAAgB,KAAK,CAAC,SAAS,CAAC,EAChC,QAAQ,MAAM,EACd,QAAQ,eAAe,EACvB,MAAM,MAAM,EACZ,cAAU,EACV,qBAAqB,MAAM,KACzB,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAkCzB,CAAC"}

package/dist/fetch_repo_data.js

@@ -15,7 +15,7 @@ import { fetch_github_check_runs, fetch_github_pull_requests } from './github.js
  */
 export const fetch_repo_data = async (resolved_repos, token, cache, log, delay = 33, github_api_version) => {
     const repos = [];
-    for (const { library, library_json, repo_config } of resolved_repos) {
+    for (const { library, package_json, repo_config } of resolved_repos) {
         const repo_url = library.repo_url;
         // CI status
         await wait(delay);
@@ -39,7 +39,8 @@ export const fetch_repo_data = async (resolved_repos, token, cache, log, delay =
         if (!pull_requests)
             log?.error('failed to fetch issues: ' + repo_url);
         repos.push({
-            library_json,
+            library_json: library.library_json,
+            package_json,
             check_runs,
             pull_requests,
         });

package/dist/local_repo.d.ts

@@ -1,4 +1,4 @@
-import type { LibraryJson } from '@fuzdev/fuz_util/library_json.js';
+import type { PackageJson } from '@fuzdev/fuz_util/package_json.js';
 import { Library } from '@fuzdev/fuz_ui/library.svelte.js';
 import type { Logger } from '@fuzdev/fuz_util/log.js';
 import type { GitOperations, NpmOperations } from './operations.js';
@@ -10,7 +10,8 @@ import type { ResolvedGitopsConfig } from './resolved_gitops_config.js';
  */
 export interface LocalRepo {
     library: Library;
-    library_json: LibraryJson;
+    /** The repo's full `package.json` (with `dependencies`/`devDependencies`). */
+    package_json: PackageJson;
     repo_dir: string;
     repo_git_ssh_url: string;
     repo_config: GitopsRepoConfig;

package/dist/local_repo.d.ts.map

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

package/dist/local_repo.js

@@ -71,7 +71,10 @@ export const local_repo_load = async ({ local_repo_path, log: _log, git_ops = de
             throw new TaskError(`Failed to check for remote in ${repo_dir}: ${origin_result.message}`);
         }
         if (origin_result.value) {
-            const pull_result = await git_ops.pull({ cwd: repo_dir });
+            // Pull the configured branch explicitly. Without a branch, `git pull origin`
+            // targets the remote's default branch (origin/HEAD), which for a repo checked
+            // out on a non-default branch rebases the wrong branch onto it.
+            const pull_result = await git_ops.pull({ branch: repo_config.branch, cwd: repo_dir });
             if (!pull_result.ok) {
                 throw new TaskError(`Failed to pull in ${repo_dir}: ${pull_result.message}`);
             }
@@ -116,8 +119,9 @@ export const local_repo_load = async ({ local_repo_path, log: _log, git_ops = de
     }
     // Load library metadata via svelte-docinfo analysis (cached under `.gro/library.json`).
     let library_json;
+    let package_json;
     try {
-        library_json = await library_load_from_repo(repo_dir, { log: _log });
+        ({ library_json, package_json } = await library_load_from_repo(repo_dir, { log: _log }));
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
@@ -127,13 +131,12 @@ export const local_repo_load = async ({ local_repo_path, log: _log, git_ops = de
     const library = new Library(library_json);
     const local_repo = {
         library,
-        library_json,
+        package_json,
         repo_dir,
         repo_git_ssh_url,
         repo_config,
     };
-    // Extract dependencies from package_json
-    const { package_json } = library;
+    // Extract dependencies from the full package_json
     if (package_json.dependencies) {
         local_repo.dependencies = new Map(Object.entries(package_json.dependencies));
     }

package/dist/operations_defaults.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"operations_defaults.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/operations_defaults.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AA4BH,OAAO,KAAK,EACX,mBAAmB,EACnB,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,mBAAmB,EACnB,YAAY,EACZ,eAAe,EACf,gBAAgB,EAChB,MAAM,iBAAiB,CAAC;AA0BzB,eAAO,MAAM,4BAA4B,EAAE,mBAuB1C,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,aA0GpC,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,iBAsBxC,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,aAmDpC,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,mBAI1C,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,YAuCnC,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,eAmBtC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,yBAAyB,EAAE,gBAQvC,CAAC"}
+{"version":3,"file":"operations_defaults.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/operations_defaults.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AA4BH,OAAO,KAAK,EACX,mBAAmB,EACnB,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,mBAAmB,EACnB,YAAY,EACZ,eAAe,EACf,gBAAgB,EAChB,MAAM,iBAAiB,CAAC;AA0BzB,eAAO,MAAM,4BAA4B,EAAE,mBAuB1C,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,aA4GpC,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,iBAsBxC,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,aAmDpC,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,mBAI1C,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,YAuCnC,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,eAmBtC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,yBAAyB,EAAE,gBAQvC,CAAC"}

package/dist/operations_defaults.js

@@ -80,7 +80,9 @@ export const default_git_operations = {
     pull: async (options) => {
         const { origin, branch, cwd } = options ?? EMPTY_OBJECT;
         try {
-            const spawned = await spawn_out('git', ['pull', origin || 'origin', branch || ''], cwd ? { cwd } : undefined);
+            // Omit the branch arg when absent: a trailing `''` makes git pull the remote's
+            // default branch (origin/HEAD) instead of the current branch's upstream.
+            const spawned = await spawn_out('git', ['pull', origin || 'origin', ...(branch ? [branch] : [])], cwd ? { cwd } : undefined);
             if (spawned.result.ok) {
                 return { ok: true };
             }

package/dist/publishing_plan.js

@@ -74,7 +74,7 @@ export const generate_publishing_plan = async (repos, options = {}) => {
         // publish step, npm-wait, bump escalation, or auto-changeset). They keep their slot in
         // the topological order. Flag a private package that carries a changeset, since that
         // changeset can't be published.
-        if (repo.library.package_json.private) {
+        if (repo.package_json.private) {
             const private_has_changesets = await ops.has_changesets({ repo });
             if (private_has_changesets.ok && private_has_changesets.value) {
                 warnings.push(`${pkg_name} is private — its changeset(s) will not be published`);
@@ -118,7 +118,7 @@ export const generate_publishing_plan = async (repos, options = {}) => {
                 }
             }
             {
-                const old_version = repo.library.package_json.version || '0.0.0';
+                const old_version = repo.package_json.version || '0.0.0';
                 const is_breaking = is_breaking_change(old_version, prediction.bump_type);
                 predicted_versions.set(pkg_name, prediction.version);
                 if (is_breaking) {
@@ -153,7 +153,7 @@ export const generate_publishing_plan = async (repos, options = {}) => {
             const pkg_name = repo.library.name;
             // Private packages are excluded from version changes (they never publish), so they
             // never escalate or auto-generate a changeset.
-            if (repo.library.package_json.private)
+            if (repo.package_json.private)
                 continue;
             // Get required bump from dependencies
             const required_bump = get_required_bump_for_dependencies(repo, dependency_updates, breaking_packages);
@@ -173,7 +173,7 @@ export const generate_publishing_plan = async (repos, options = {}) => {
                 // Package has changesets - check if it needs bump escalation
                 if (required_bump && compare_bump_types(required_bump, existing_entry.bump_type) > 0) {
                     // Dependencies require a larger bump than existing changesets provide
-                    const old_version = repo.library.package_json.version || '0.0.0';
+                    const old_version = repo.package_json.version || '0.0.0';
                     const new_version = calculate_next_version(old_version, required_bump);
                     // Only mark as changed if version actually changed
                     if (existing_entry.to !== new_version) {
@@ -209,7 +209,7 @@ export const generate_publishing_plan = async (repos, options = {}) => {
             }
             else if (required_bump) {
                 // No existing changesets but needs changeset for dependency updates
-                const old_version = repo.library.package_json.version || '0.0.0';
+                const old_version = repo.package_json.version || '0.0.0';
                 const new_version = calculate_next_version(old_version, required_bump);
                 // Check if this is a new version (not already in version_changes)
                 if (!predicted_versions.has(pkg_name)) {
@@ -263,7 +263,7 @@ export const generate_publishing_plan = async (repos, options = {}) => {
         const { dependency_updates: pending_updates } = calculate_dependency_updates(repos, predicted_versions, breaking_packages);
         for (const repo of repos) {
             const pkg_name = repo.library.name;
-            if (repo.library.package_json.private)
+            if (repo.package_json.private)
                 continue; // private packages never publish
             const required_bump = get_required_bump_for_dependencies(repo, pending_updates, breaking_packages);
             // Check if this package would need processing

package/dist/publishing_plan_helpers.js

@@ -97,5 +97,5 @@ export const get_required_bump_for_dependencies = (repo, dependency_updates, bre
     }
     // Check if any of these dependencies have breaking changes
     const has_breaking_deps = relevant_updates.some((update) => breaking_packages.has(update.updated_dependency));
-    return required_bump_for_dependency_update(repo.library.package_json.version || '0.0.0', has_breaking_deps);
+    return required_bump_for_dependency_update(repo.package_json.version || '0.0.0', has_breaking_deps);
 };

package/dist/repo.svelte.d.ts

@@ -1,14 +1,19 @@
 import type { LibraryJson, SourceJson } from '@fuzdev/fuz_util/library_json.js';
+import type { PkgJson } from '@fuzdev/fuz_util/pkg_json.js';
 import type { PackageJson } from '@fuzdev/fuz_util/package_json.js';
 import type { Url } from '@fuzdev/fuz_util/url.js';
 import { Library } from '@fuzdev/fuz_ui/library.svelte.js';
-import type { Module } from '@fuzdev/fuz_ui/module.svelte.js';
 import { GithubCheckRunsItem, type GithubPullRequest } from './github.js';
 /**
  * Serialized repo data as stored in `repos.ts` (JSON).
+ *
+ * `package_json` is the repo's full `package.json`, carried alongside
+ * `library_json` because gitops reads `dependencies`/`devDependencies` for the
+ * publishing cascade — fields the curated `LibraryJson.pkg_json` omits.
  */
 export interface RepoJson {
     library_json: LibraryJson;
+    package_json: PackageJson;
     check_runs: GithubCheckRunsItem | null;
     pull_requests: Array<GithubPullRequest> | null;
 }
@@ -20,22 +25,21 @@ export interface RepoJson {
  */
 export declare class Repo {
     readonly library: Library;
+    /** The repo's full `package.json` (with `dependencies`/`devDependencies`). */
+    readonly package_json: PackageJson;
     check_runs: GithubCheckRunsItem | null;
     pull_requests: Array<GithubPullRequest> | null;
     get name(): string;
     get repo_name(): string;
     get repo_url(): Url;
-    get owner_name(): string | null;
     get homepage_url(): Url | null;
     get logo_url(): Url | null;
     get logo_alt(): string;
-    get published(): boolean;
     get npm_url(): Url | null;
     get changelog_url(): Url | null;
-    get package_json(): PackageJson;
+    /** Curated package identity, delegating to `library`. Distinct from the full `package_json`. */
+    get pkg_json(): PkgJson;
     get source_json(): SourceJson;
-    get modules(): Array<Module>;
-    get org_url(): string | null;
     constructor(repo_json: RepoJson);
 }
 export interface Repos {

package/dist/repo.svelte.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"repo.svelte.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/repo.svelte.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,WAAW,EAAE,UAAU,EAAC,MAAM,kCAAkC,CAAC;AAC9E,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,kCAAkC,CAAC;AAClE,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAC,OAAO,EAAC,MAAM,kCAAkC,CAAC;AACzD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,iCAAiC,CAAC;AAE5D,OAAO,EAAC,mBAAmB,EAAE,KAAK,iBAAiB,EAAC,MAAM,aAAa,CAAC;AAExE;;GAEG;AACH,MAAM,WAAW,QAAQ;IACxB,YAAY,EAAE,WAAW,CAAC;IAC1B,UAAU,EAAE,mBAAmB,GAAG,IAAI,CAAC;IACvC,aAAa,EAAE,KAAK,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC;CAC/C;AAED;;;;;GAKG;AACH,qBAAa,IAAI;IAChB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,UAAU,EAAE,mBAAmB,GAAG,IAAI,CAAC;IACvC,aAAa,EAAE,KAAK,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC;IAG/C,IAAI,IAAI,IAAI,MAAM,CAEjB;IACD,IAAI,SAAS,IAAI,MAAM,CAEtB;IACD,IAAI,QAAQ,IAAI,GAAG,CAElB;IACD,IAAI,UAAU,IAAI,MAAM,GAAG,IAAI,CAE9B;IACD,IAAI,YAAY,IAAI,GAAG,GAAG,IAAI,CAE7B;IACD,IAAI,QAAQ,IAAI,GAAG,GAAG,IAAI,CAEzB;IACD,IAAI,QAAQ,IAAI,MAAM,CAErB;IACD,IAAI,SAAS,IAAI,OAAO,CAEvB;IACD,IAAI,OAAO,IAAI,GAAG,GAAG,IAAI,CAExB;IACD,IAAI,aAAa,IAAI,GAAG,GAAG,IAAI,CAE9B;IACD,IAAI,YAAY,IAAI,WAAW,CAE9B;IACD,IAAI,WAAW,IAAI,UAAU,CAE5B;IACD,IAAI,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC,CAE3B;IACD,IAAI,OAAO,IAAI,MAAM,GAAG,IAAI,CAE3B;gBAEW,SAAS,EAAE,QAAQ;CAK/B;AAED,MAAM,WAAW,KAAK;IACrB,IAAI,EAAE,IAAI,CAAC;IACX,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;CACnB;AAED,eAAO,MAAM,aAAa;;;;CAA0B,CAAC;AAErD,eAAO,MAAM,WAAW,GAAI,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,cAAc,MAAM,KAAG,KAMtE,CAAC"}
+{"version":3,"file":"repo.svelte.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/repo.svelte.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,WAAW,EAAE,UAAU,EAAC,MAAM,kCAAkC,CAAC;AAC9E,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,8BAA8B,CAAC;AAC1D,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,kCAAkC,CAAC;AAClE,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAC,OAAO,EAAC,MAAM,kCAAkC,CAAC;AAEzD,OAAO,EAAC,mBAAmB,EAAE,KAAK,iBAAiB,EAAC,MAAM,aAAa,CAAC;AAExE;;;;;;GAMG;AACH,MAAM,WAAW,QAAQ;IACxB,YAAY,EAAE,WAAW,CAAC;IAC1B,YAAY,EAAE,WAAW,CAAC;IAC1B,UAAU,EAAE,mBAAmB,GAAG,IAAI,CAAC;IACvC,aAAa,EAAE,KAAK,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC;CAC/C;AAED;;;;;GAKG;AACH,qBAAa,IAAI;IAChB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,8EAA8E;IAC9E,QAAQ,CAAC,YAAY,EAAE,WAAW,CAAC;IACnC,UAAU,EAAE,mBAAmB,GAAG,IAAI,CAAC;IACvC,aAAa,EAAE,KAAK,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC;IAG/C,IAAI,IAAI,IAAI,MAAM,CAEjB;IACD,IAAI,SAAS,IAAI,MAAM,CAEtB;IACD,IAAI,QAAQ,IAAI,GAAG,CAElB;IACD,IAAI,YAAY,IAAI,GAAG,GAAG,IAAI,CAE7B;IACD,IAAI,QAAQ,IAAI,GAAG,GAAG,IAAI,CAEzB;IACD,IAAI,QAAQ,IAAI,MAAM,CAErB;IACD,IAAI,OAAO,IAAI,GAAG,GAAG,IAAI,CAExB;IACD,IAAI,aAAa,IAAI,GAAG,GAAG,IAAI,CAE9B;IACD,gGAAgG;IAChG,IAAI,QAAQ,IAAI,OAAO,CAEtB;IACD,IAAI,WAAW,IAAI,UAAU,CAE5B;gBAEW,SAAS,EAAE,QAAQ;CAM/B;AAED,MAAM,WAAW,KAAK;IACrB,IAAI,EAAE,IAAI,CAAC;IACX,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;CACnB;AAED,eAAO,MAAM,aAAa;;;;CAA0B,CAAC;AAErD,eAAO,MAAM,WAAW,GAAI,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,cAAc,MAAM,KAAG,KAMtE,CAAC"}

package/dist/repo.svelte.js

@@ -9,6 +9,8 @@ import { GithubCheckRunsItem } from './github.js';
  */
 export class Repo {
     library;
+    /** The repo's full `package.json` (with `dependencies`/`devDependencies`). */
+    package_json;
     check_runs;
     pull_requests;
     // Convenience getters delegating to library
@@ -21,9 +23,6 @@ export class Repo {
     get repo_url() {
         return this.library.repo_url;
     }
-    get owner_name() {
-        return this.library.owner_name;
-    }
     get homepage_url() {
         return this.library.homepage_url;
     }
@@ -33,29 +32,22 @@ export class Repo {
     get logo_alt() {
         return this.library.logo_alt;
     }
-    get published() {
-        return this.library.published;
-    }
     get npm_url() {
         return this.library.npm_url;
     }
     get changelog_url() {
         return this.library.changelog_url;
     }
-    get package_json() {
-        return this.library.package_json;
+    /** Curated package identity, delegating to `library`. Distinct from the full `package_json`. */
+    get pkg_json() {
+        return this.library.pkg_json;
     }
     get source_json() {
         return this.library.source_json;
     }
-    get modules() {
-        return this.library.modules;
-    }
-    get org_url() {
-        return this.library.org_url;
-    }
     constructor(repo_json) {
         this.library = new Library(repo_json.library_json);
+        this.package_json = repo_json.package_json;
         this.check_runs = repo_json.check_runs;
         this.pull_requests = repo_json.pull_requests;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fuzdev/fuz_gitops",
-  "version": "0.73.0",
+  "version": "0.74.0",
   "description": "a tool for managing many repos",
   "glyph": "🪄",
   "logo": "logo.svg",
@@ -29,10 +29,10 @@
     "node": ">=24.14"
   },
   "peerDependencies": {
-    "@fuzdev/fuz_css": ">=0.61.0",
-    "@fuzdev/fuz_ui": ">=0.198.0",
-    "@fuzdev/fuz_util": ">=0.63.1",
-    "@fuzdev/gro": ">=0.200.0",
+    "@fuzdev/fuz_css": ">=0.62.0",
+    "@fuzdev/fuz_ui": ">=0.199.0",
+    "@fuzdev/fuz_util": ">=0.65.1",
+    "@fuzdev/gro": ">=0.204.0",
     "@sveltejs/kit": "^2",
     "svelte": "^5",
     "zod": "^4.3.6"
@@ -40,15 +40,15 @@
   "devDependencies": {
     "@changesets/changelog-git": "^0.2.1",
     "@fuzdev/blake3_wasm": "^0.1.1",
-    "@fuzdev/fuz_code": "^0.45.1",
-    "@fuzdev/fuz_css": "^0.61.1",
-    "@fuzdev/fuz_ui": "^0.198.1",
-    "@fuzdev/fuz_util": "^0.63.2",
-    "@fuzdev/gro": "^0.202.0",
+    "@fuzdev/fuz_code": "^0.46.0",
+    "@fuzdev/fuz_css": "^0.62.0",
+    "@fuzdev/fuz_ui": "^0.199.0",
+    "@fuzdev/fuz_util": "^0.65.1",
+    "@fuzdev/gro": "^0.204.0",
     "@ryanatkn/eslint-config": "^0.12.1",
     "@sveltejs/acorn-typescript": "^1.0.9",
     "@sveltejs/adapter-static": "^3.0.10",
-    "@sveltejs/kit": "^2.61.1",
+    "@sveltejs/kit": "^2.63.0",
     "@sveltejs/package": "^2.5.7",
     "@sveltejs/vite-plugin-svelte": "^6.2.4",
     "@types/estree": "^1.0.8",
@@ -60,8 +60,8 @@
     "magic-string": "^0.30.21",
     "prettier": "^3.7.4",
     "prettier-plugin-svelte": "^3.5.1",
-    "svelte": "^5.56.0",
-    "svelte-check": "^4.4.6",
+    "svelte": "^5.56.2",
+    "svelte-check": "^4.6.0",
     "svelte-docinfo": "^0.4.0",
     "svelte2tsx": "^0.7.52",
     "tslib": "^2.8.1",

package/src/lib/changeset_generator.ts

@@ -75,7 +75,7 @@ const calculate_required_bump = (
 	updates: Array<DependencyVersionChange>,
 ): BumpType =>
 	required_bump_for_dependency_update(
-		repo.library.package_json.version || '0.0.0',
+		repo.package_json.version || '0.0.0',
 		updates.some((u) => u.breaking),
 	);
 

package/src/lib/changeset_reader.ts

@@ -207,7 +207,7 @@ export const predict_next_version = async (
 		return null;
 	}
 
-	const current_version = repo.library.package_json.version || '0.0.0';
+	const current_version = repo.package_json.version || '0.0.0';
 	const next_version = calculate_next_version(current_version, bump_type);
 
 	log?.debug(

package/src/lib/dependency_graph.ts

@@ -59,22 +59,20 @@ export class DependencyGraph {
 	public init_from_repos(repos: Array<LocalRepo>): void {
 		// First pass: create nodes
 		for (const repo of repos) {
-			const {library} = repo;
+			const {library, package_json} = repo;
 			const node: DependencyNode = {
 				name: library.name,
-				version: library.package_json.version || '0.0.0',
+				version: package_json.version || '0.0.0',
 				repo,
 				dependencies: new Map(),
 				dependents: new Set(),
-				publishable: !library.package_json.private,
+				publishable: !package_json.private,
 			};
 
 			// Extract dependencies
-			const deps = library.package_json.dependencies || (EMPTY_OBJECT as Record<string, string>);
-			const dev_deps =
-				library.package_json.devDependencies || (EMPTY_OBJECT as Record<string, string>);
-			const peer_deps =
-				library.package_json.peerDependencies || (EMPTY_OBJECT as Record<string, string>);
+			const deps = package_json.dependencies || (EMPTY_OBJECT as Record<string, string>);
+			const dev_deps = package_json.devDependencies || (EMPTY_OBJECT as Record<string, string>);
+			const peer_deps = package_json.peerDependencies || (EMPTY_OBJECT as Record<string, string>);
 
 			// Add dependencies, prioritizing prod/peer over dev
 			// (if a package appears in multiple dep types, use the stronger constraint)

package/src/lib/fetch_repo_data.ts

@@ -28,7 +28,7 @@ export const fetch_repo_data = async (
 	github_api_version?: string,
 ): Promise<Array<RepoJson>> => {
 	const repos: Array<RepoJson> = [];
-	for (const {library, library_json, repo_config} of resolved_repos) {
+	for (const {library, package_json, repo_config} of resolved_repos) {
 		const repo_url = library.repo_url;
 
 		// CI status
@@ -53,7 +53,8 @@ export const fetch_repo_data = async (
 		if (!pull_requests) log?.error('failed to fetch issues: ' + repo_url);
 
 		repos.push({
-			library_json,
+			library_json: library.library_json,
+			package_json,
 			check_runs,
 			pull_requests,
 		});

package/src/lib/local_repo.ts

@@ -1,5 +1,6 @@
 import {strip_end} from '@fuzdev/fuz_util/string.js';
 import type {LibraryJson} from '@fuzdev/fuz_util/library_json.js';
+import type {PackageJson} from '@fuzdev/fuz_util/package_json.js';
 import {Library} from '@fuzdev/fuz_ui/library.svelte.js';
 import {existsSync} from 'node:fs';
 import {join} from 'node:path';
@@ -21,7 +22,8 @@ import {GITOPS_CONCURRENCY_DEFAULT} from './gitops_constants.js';
  */
 export interface LocalRepo {
 	library: Library;
-	library_json: LibraryJson;
+	/** The repo's full `package.json` (with `dependencies`/`devDependencies`). */
+	package_json: PackageJson;
 	repo_dir: string;
 	repo_git_ssh_url: string;
 	repo_config: GitopsRepoConfig;
@@ -144,7 +146,10 @@ export const local_repo_load = async ({
 		}
 
 		if (origin_result.value) {
-			const pull_result = await git_ops.pull({cwd: repo_dir});
+			// Pull the configured branch explicitly. Without a branch, `git pull origin`
+			// targets the remote's default branch (origin/HEAD), which for a repo checked
+			// out on a non-default branch rebases the wrong branch onto it.
+			const pull_result = await git_ops.pull({branch: repo_config.branch, cwd: repo_dir});
 			if (!pull_result.ok) {
 				throw new TaskError(`Failed to pull in ${repo_dir}: ${pull_result.message}`);
 			}
@@ -207,8 +212,9 @@ export const local_repo_load = async ({
 
 	// Load library metadata via svelte-docinfo analysis (cached under `.gro/library.json`).
 	let library_json: LibraryJson;
+	let package_json: PackageJson;
 	try {
-		library_json = await library_load_from_repo(repo_dir, {log: _log});
+		({library_json, package_json} = await library_load_from_repo(repo_dir, {log: _log}));
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
 		_log?.warn(
@@ -222,14 +228,13 @@ export const local_repo_load = async ({
 
 	const local_repo: LocalRepo = {
 		library,
-		library_json,
+		package_json,
 		repo_dir,
 		repo_git_ssh_url,
 		repo_config,
 	};
 
-	// Extract dependencies from package_json
-	const {package_json} = library;
+	// Extract dependencies from the full package_json
 	if (package_json.dependencies) {
 		local_repo.dependencies = new Map(Object.entries(package_json.dependencies));
 	}

package/src/lib/operations_defaults.ts

@@ -119,9 +119,11 @@ export const default_git_operations: GitOperations = {
 	pull: async (options) => {
 		const {origin, branch, cwd} = options ?? EMPTY_OBJECT;
 		try {
+			// Omit the branch arg when absent: a trailing `''` makes git pull the remote's
+			// default branch (origin/HEAD) instead of the current branch's upstream.
 			const spawned = await spawn_out(
 				'git',
-				['pull', origin || 'origin', branch || ''],
+				['pull', origin || 'origin', ...(branch ? [branch] : [])],
 				cwd ? {cwd} : undefined,
 			);
 			if (spawned.result.ok) {

package/src/lib/publishing_plan.ts

@@ -185,7 +185,7 @@ export const generate_publishing_plan = async (
 		// publish step, npm-wait, bump escalation, or auto-changeset). They keep their slot in
 		// the topological order. Flag a private package that carries a changeset, since that
 		// changeset can't be published.
-		if (repo.library.package_json.private) {
+		if (repo.package_json.private) {
 			const private_has_changesets = await ops.has_changesets({repo});
 			if (private_has_changesets.ok && private_has_changesets.value) {
 				warnings.push(`${pkg_name} is private — its changeset(s) will not be published`);
@@ -236,7 +236,7 @@ export const generate_publishing_plan = async (
 			}
 
 			{
-				const old_version = repo.library.package_json.version || '0.0.0';
+				const old_version = repo.package_json.version || '0.0.0';
 				const is_breaking = is_breaking_change(old_version, prediction.bump_type);
 
 				predicted_versions.set(pkg_name, prediction.version);
@@ -284,7 +284,7 @@ export const generate_publishing_plan = async (
 
 			// Private packages are excluded from version changes (they never publish), so they
 			// never escalate or auto-generate a changeset.
-			if (repo.library.package_json.private) continue;
+			if (repo.package_json.private) continue;
 
 			// Get required bump from dependencies
 			const required_bump = get_required_bump_for_dependencies(
@@ -314,7 +314,7 @@ export const generate_publishing_plan = async (
 				// Package has changesets - check if it needs bump escalation
 				if (required_bump && compare_bump_types(required_bump, existing_entry.bump_type) > 0) {
 					// Dependencies require a larger bump than existing changesets provide
-					const old_version = repo.library.package_json.version || '0.0.0';
+					const old_version = repo.package_json.version || '0.0.0';
 					const new_version = calculate_next_version(old_version, required_bump);
 
 					// Only mark as changed if version actually changed
@@ -356,7 +356,7 @@ export const generate_publishing_plan = async (
 				}
 			} else if (required_bump) {
 				// No existing changesets but needs changeset for dependency updates
-				const old_version = repo.library.package_json.version || '0.0.0';
+				const old_version = repo.package_json.version || '0.0.0';
 				const new_version = calculate_next_version(old_version, required_bump);
 
 				// Check if this is a new version (not already in version_changes)
@@ -424,7 +424,7 @@ export const generate_publishing_plan = async (
 
 		for (const repo of repos) {
 			const pkg_name = repo.library.name;
-			if (repo.library.package_json.private) continue; // private packages never publish
+			if (repo.package_json.private) continue; // private packages never publish
 			const required_bump = get_required_bump_for_dependencies(
 				repo,
 				pending_updates,

package/src/lib/publishing_plan_helpers.ts

@@ -128,7 +128,7 @@ export const get_required_bump_for_dependencies = (
 	);
 
 	return required_bump_for_dependency_update(
-		repo.library.package_json.version || '0.0.0',
+		repo.package_json.version || '0.0.0',
 		has_breaking_deps,
 	);
 };

package/src/lib/repo.svelte.ts

@@ -1,17 +1,22 @@
 import {create_context} from '@fuzdev/fuz_ui/context_helpers.js';
 import type {LibraryJson, SourceJson} from '@fuzdev/fuz_util/library_json.js';
+import type {PkgJson} from '@fuzdev/fuz_util/pkg_json.js';
 import type {PackageJson} from '@fuzdev/fuz_util/package_json.js';
 import type {Url} from '@fuzdev/fuz_util/url.js';
 import {Library} from '@fuzdev/fuz_ui/library.svelte.js';
-import type {Module} from '@fuzdev/fuz_ui/module.svelte.js';
 
 import {GithubCheckRunsItem, type GithubPullRequest} from './github.js';
 
 /**
  * Serialized repo data as stored in `repos.ts` (JSON).
+ *
+ * `package_json` is the repo's full `package.json`, carried alongside
+ * `library_json` because gitops reads `dependencies`/`devDependencies` for the
+ * publishing cascade — fields the curated `LibraryJson.pkg_json` omits.
  */
 export interface RepoJson {
 	library_json: LibraryJson;
+	package_json: PackageJson;
 	check_runs: GithubCheckRunsItem | null;
 	pull_requests: Array<GithubPullRequest> | null;
 }
@@ -24,6 +29,8 @@ export interface RepoJson {
  */
 export class Repo {
 	readonly library: Library;
+	/** The repo's full `package.json` (with `dependencies`/`devDependencies`). */
+	readonly package_json: PackageJson;
 	check_runs: GithubCheckRunsItem | null;
 	pull_requests: Array<GithubPullRequest> | null;
 
@@ -37,9 +44,6 @@ export class Repo {
 	get repo_url(): Url {
 		return this.library.repo_url;
 	}
-	get owner_name(): string | null {
-		return this.library.owner_name;
-	}
 	get homepage_url(): Url | null {
 		return this.library.homepage_url;
 	}
@@ -49,30 +53,23 @@ export class Repo {
 	get logo_alt(): string {
 		return this.library.logo_alt;
 	}
-	get published(): boolean {
-		return this.library.published;
-	}
 	get npm_url(): Url | null {
 		return this.library.npm_url;
 	}
 	get changelog_url(): Url | null {
 		return this.library.changelog_url;
 	}
-	get package_json(): PackageJson {
-		return this.library.package_json;
+	/** Curated package identity, delegating to `library`. Distinct from the full `package_json`. */
+	get pkg_json(): PkgJson {
+		return this.library.pkg_json;
 	}
 	get source_json(): SourceJson {
 		return this.library.source_json;
 	}
-	get modules(): Array<Module> {
-		return this.library.modules;
-	}
-	get org_url(): string | null {
-		return this.library.org_url;
-	}
 
 	constructor(repo_json: RepoJson) {
 		this.library = new Library(repo_json.library_json);
+		this.package_json = repo_json.package_json;
 		this.check_runs = repo_json.check_runs;
 		this.pull_requests = repo_json.pull_requests;
 	}