@bakers-build/addon-herdr 0.1.2-next.93 → 0.2.0

package/dist/src/shared.d.ts

@@ -0,0 +1,19 @@
+export { renderTemplate } from './config.js';
+export { restoreWritable } from './fs.js';
+export { type LaunchScript, type LaunchWatchOptions, watchLaunch, writeLaunchScript, } from './launch-script.js';
+export { truncateOpenTabTitle, validateBranch } from './workspace.js';
+/** Runs `git <args>`; resolves with stdout, rejects on non-zero exit. */
+export type BaseRefGitExec = (args: string[]) => Promise<string>;
+/**
+ * Resolve (and fetch) the base ref a NEW worktree branch is created from, so a
+ * run starts from the pushed remote state, not the host's local branch.
+ *
+ * A ticket's `override` (its `origin/<base_branch>`) wins only when it resolves
+ * on the remote after a fetch; otherwise the configured `baseBranch`, else the
+ * upstream of the repo's HEAD (e.g. `origin/develop`). A repo with no upstream
+ * yields `undefined`. Fetch failures are non-fatal (offline / unknown remote).
+ */
+export declare function resolveBaseRef(root: string, execGit: BaseRefGitExec, opts: {
+    baseBranch?: string;
+    override?: string;
+}): Promise<string | undefined>;

package/dist/src/shared.js

@@ -0,0 +1,72 @@
+// The herdr pieces a sibling host addon (`@bakers-build/addon-orca`) reuses
+// rather than copies: the 0600 launch wrapper + its watch, the label template,
+// the Drupal write-bit restore and the worktree base-ref resolution.
+export { renderTemplate } from './config.js';
+export { restoreWritable } from './fs.js';
+export { watchLaunch, writeLaunchScript, } from './launch-script.js';
+export { truncateOpenTabTitle, validateBranch } from './workspace.js';
+/**
+ * Resolve (and fetch) the base ref a NEW worktree branch is created from, so a
+ * run starts from the pushed remote state, not the host's local branch.
+ *
+ * A ticket's `override` (its `origin/<base_branch>`) wins only when it resolves
+ * on the remote after a fetch; otherwise the configured `baseBranch`, else the
+ * upstream of the repo's HEAD (e.g. `origin/develop`). A repo with no upstream
+ * yields `undefined`. Fetch failures are non-fatal (offline / unknown remote).
+ */
+export async function resolveBaseRef(root, execGit, opts) {
+    const fetch = async (ref) => {
+        const slash = ref.indexOf('/');
+        if (slash <= 0)
+            return;
+        try {
+            await execGit([
+                '-C',
+                root,
+                'fetch',
+                ref.slice(0, slash),
+                ref.slice(slash + 1),
+            ]);
+        }
+        catch {
+            // Non-fatal: use whatever the local tracking ref already points at.
+        }
+    };
+    if (opts.override !== undefined) {
+        await fetch(opts.override);
+        try {
+            await execGit([
+                '-C',
+                root,
+                'rev-parse',
+                '--verify',
+                '--quiet',
+                `${opts.override}^{commit}`,
+            ]);
+            return opts.override;
+        }
+        catch {
+            // Not on the remote — fall back to the default base below.
+        }
+    }
+    let ref = opts.baseBranch;
+    if (!ref) {
+        try {
+            ref =
+                (await execGit([
+                    '-C',
+                    root,
+                    'rev-parse',
+                    '--abbrev-ref',
+                    '--symbolic-full-name',
+                    '@{u}',
+                ])).trim() || undefined;
+        }
+        catch {
+            return undefined;
+        }
+    }
+    if (ref !== undefined)
+        await fetch(ref);
+    return ref;
+}

package/dist/src/workspace.d.ts

@@ -89,6 +89,8 @@ export interface HerdrWorkspaceOptions {
     /** Optional logger for the best-effort open-layout path (defaults to noop). */
     logger?: ConductorLogger;
 }
+/** Git-safe branch validation: safe ref chars only, no leading dot, no `..`. */
+export declare function validateBranch(branch: string): void;
 export declare class HerdrWorkspace implements BbWorkspace {
     private readonly options;
     private readonly execHerdr;
@@ -106,23 +108,6 @@ export declare class HerdrWorkspace implements BbWorkspace {
     /** Herdr-backed intent-level agent host for `bakers ui` (BB-190). */
     readonly agentHost: AgentLaunchHost;
     constructor(options: HerdrWorkspaceOptions);
-    /**
-     * Resolve the base ref for a new worktree branch. Prefers the configured
-     * `baseBranch`; otherwise the remote tracking branch of the repo's HEAD
-     * (e.g. `origin/develop`). Best-effort: a repo with no upstream returns
-     * `undefined`, leaving herdr to fall back to the parent workspace HEAD.
-     */
-    private resolveBaseRef;
-    /**
-     * Fetch the base ref's remote branch so the new worktree starts from the
-     * latest pushed state. Best-effort: offline / unknown remote is non-fatal.
-     */
-    private fetchBaseRef;
-    /**
-     * Verify a base-ref candidate resolves on the remote (after fetching it).
-     * Returns the ref when it exists, else undefined so the caller falls back.
-     */
-    private verifyRemoteRef;
     /**
      * Ensure the branch's worktree + herdr workspace exist.
      *

package/dist/src/workspace.js

@@ -5,6 +5,7 @@ import { herdrAgentHost } from './agents.js';
 import { renderTemplate } from './config.js';
 import { applyPaneLayout, isRecord, parseJson } from './pane-layout.js';
 import { deriveHerdrRoot } from './root-anchor.js';
+import { resolveBaseRef } from './shared.js';
 /** Max `{title}` length substituted into the overview **tab** label (BB-374). */
 export const OPEN_TAB_TITLE_MAX = 30;
 /** Cap overview-tab `{title}` and append `...` when truncated. */
@@ -94,7 +95,7 @@ function parseWorktreeRootPane(output) {
     return tabId !== undefined ? { paneId, tabId } : { paneId };
 }
 /** Git-safe branch validation: safe ref chars only, no leading dot, no `..`. */
-function validateBranch(branch) {
+export function validateBranch(branch) {
     if (!/^[A-Za-z0-9._/-]+$/.test(branch) ||
         branch.startsWith('.') ||
         branch.includes('..')) {
@@ -128,70 +129,6 @@ export class HerdrWorkspace {
         this.logger = options.logger ?? noopLogger;
         this.agentHost = herdrAgentHost(this.execHerdr);
     }
-    /**
-     * Resolve the base ref for a new worktree branch. Prefers the configured
-     * `baseBranch`; otherwise the remote tracking branch of the repo's HEAD
-     * (e.g. `origin/develop`). Best-effort: a repo with no upstream returns
-     * `undefined`, leaving herdr to fall back to the parent workspace HEAD.
-     */
-    async resolveBaseRef() {
-        if (this.options.baseBranch) {
-            return this.options.baseBranch;
-        }
-        try {
-            const ref = (await this.execGit([
-                '-C',
-                this.root,
-                'rev-parse',
-                '--abbrev-ref',
-                '--symbolic-full-name',
-                '@{u}',
-            ])).trim();
-            return ref || undefined;
-        }
-        catch {
-            return undefined;
-        }
-    }
-    /**
-     * Fetch the base ref's remote branch so the new worktree starts from the
-     * latest pushed state. Best-effort: offline / unknown remote is non-fatal.
-     */
-    async fetchBaseRef(baseRef) {
-        const slash = baseRef.indexOf('/');
-        if (slash <= 0) {
-            return;
-        }
-        const remote = baseRef.slice(0, slash);
-        const branch = baseRef.slice(slash + 1);
-        try {
-            await this.execGit(['-C', this.root, 'fetch', remote, branch]);
-        }
-        catch {
-            // Non-fatal: use whatever the local tracking ref already points at.
-        }
-    }
-    /**
-     * Verify a base-ref candidate resolves on the remote (after fetching it).
-     * Returns the ref when it exists, else undefined so the caller falls back.
-     */
-    async verifyRemoteRef(ref) {
-        await this.fetchBaseRef(ref);
-        try {
-            await this.execGit([
-                '-C',
-                this.root,
-                'rev-parse',
-                '--verify',
-                '--quiet',
-                `${ref}^{commit}`,
-            ]);
-            return ref;
-        }
-        catch {
-            return undefined;
-        }
-    }
     /**
      * Ensure the branch's worktree + herdr workspace exist.
      *
@@ -235,16 +172,12 @@ export class HerdrWorkspace {
         // host's local checked-out branch. A ticket passes its `origin/<base_branch>`
         // as the override; use it only when it resolves on the remote, else fall
         // back to the default base.
-        let baseRef;
-        if (baseRefOverride !== undefined) {
-            baseRef = await this.verifyRemoteRef(baseRefOverride);
-        }
-        if (baseRef === undefined) {
-            baseRef = await this.resolveBaseRef();
-            if (baseRef !== undefined) {
-                await this.fetchBaseRef(baseRef);
-            }
-        }
+        const baseRef = await resolveBaseRef(this.root, this.execGit, {
+            ...(this.options.baseBranch
+                ? { baseBranch: this.options.baseBranch }
+                : {}),
+            ...(baseRefOverride !== undefined ? { override: baseRefOverride } : {}),
+        });
         const createOutput = await this.execHerdr([
             'worktree',
             'create',

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@bakers-build/addon-herdr",
-  "version": "0.1.2-next.93",
+  "version": "0.2.0",
   "description": "bakers.build herdr integration: spawn executor + per-ticket worktree workspace.",
   "type": "module",
   "license": "MIT",
   "exports": {
     ".": "./dist/src/index.js",
-    "./preset": "./dist/src/preset.js"
+    "./preset": "./dist/src/preset.js",
+    "./shared": "./dist/src/shared.js"
   },
   "files": [
     "dist/src"
@@ -20,10 +21,10 @@
     "directory": "bakers-cli/addons/herdr"
   },
   "dependencies": {
-    "@bakers-build/addon-workspace-git": "^0.1.2-next.93"
+    "@bakers-build/addon-workspace-git": "^0.2.0"
   },
   "peerDependencies": {
-    "@bakers-build/conductor": "^0.1.2-next.93",
-    "@bakers-build/core": "^0.1.2-next.93"
+    "@bakers-build/conductor": "^0.2.0",
+    "@bakers-build/core": "^0.2.0"
   }
 }