@gaia-ai/addon-herdr 0.11.2 → 0.11.4

package/dist/src/root-anchor.d.ts

@@ -1,26 +1,13 @@
-/** Runs `git <args>` in a cwd; resolves stdout, rejects on non-zero exit. */
-export type RootGitExec = (args: string[], cwd: string) => Promise<string>;
-/** Default git runner for root derivation: real `git` in the given cwd. */
-export declare const defaultRootGitExec: RootGitExec;
+import { defaultRootGitExec, deriveCheckoutRoot, type RootGitExec } from '@gaia-ai/core';
+export type { RootGitExec };
+export { defaultRootGitExec };
 /**
- * Derive the main-clone root that herdr requires as the `--cwd` for every
- * `worktree list/open/create`. This is the single anchor shared by BOTH the
- * `herdrExecutor` and `herdrWorkspace` factories (GAIA-177 AC-3).
- *
- * The config path is NOT a safe anchor: `.gaia/` is checked in, so config
- * discovery walks up to the *worktree-local* config, whose dirname IS the linked
- * worktree — and herdr rejects a linked worktree as that `--cwd`
- * (`linked_worktree_source`). Instead ask git: `git rev-parse
- * --path-format=absolute --git-common-dir`, run from the config dir, always
- * resolves to the shared main `.git` even from a linked worktree; its parent is
- * the main clone.
- *
- * `override` (a factory `root:` option) always wins and skips git entirely.
- * Best-effort: a missing `config_path` or a git failure (e.g. not a repo) falls
- * back to `dirname(config_path)` — the previous behaviour — and finally
- * `process.cwd()`.
+ * herdr's own name for the shared checkout-root anchor (GAIA-177), kept as a
+ * thin alias so `index.ts` and `workspace.ts` need no rename. The behaviour —
+ * including the injected git-exec seam — now lives in `@gaia-ai/core` as
+ * `deriveCheckoutRoot()` (GAIA-450 D2): two other call sites
+ * (`@gaia-ai/conductor`'s `checkoutRootOf()` and `addon-workspace-git`'s
+ * `gitWorkspace` fallback) needed the same derivation and neither may import
+ * this addon, so the helper moved to the kernel rather than staying herdr-owned.
  */
-export declare function deriveHerdrRoot(configPath: string | undefined, opts?: {
-    override?: string;
-    execGit?: RootGitExec;
-}): Promise<string>;
+export declare const deriveHerdrRoot: typeof deriveCheckoutRoot;

package/dist/src/root-anchor.js

@@ -1,40 +1,12 @@
-import { dirname } from 'node:path';
-import { exec } from '@gaia-ai/core';
-/** Default git runner for root derivation: real `git` in the given cwd. */
-export const defaultRootGitExec = (args, cwd) => exec('git', args, { cwd });
+import { defaultRootGitExec, deriveCheckoutRoot, } from '@gaia-ai/core';
+export { defaultRootGitExec };
 /**
- * Derive the main-clone root that herdr requires as the `--cwd` for every
- * `worktree list/open/create`. This is the single anchor shared by BOTH the
- * `herdrExecutor` and `herdrWorkspace` factories (GAIA-177 AC-3).
- *
- * The config path is NOT a safe anchor: `.gaia/` is checked in, so config
- * discovery walks up to the *worktree-local* config, whose dirname IS the linked
- * worktree — and herdr rejects a linked worktree as that `--cwd`
- * (`linked_worktree_source`). Instead ask git: `git rev-parse
- * --path-format=absolute --git-common-dir`, run from the config dir, always
- * resolves to the shared main `.git` even from a linked worktree; its parent is
- * the main clone.
- *
- * `override` (a factory `root:` option) always wins and skips git entirely.
- * Best-effort: a missing `config_path` or a git failure (e.g. not a repo) falls
- * back to `dirname(config_path)` — the previous behaviour — and finally
- * `process.cwd()`.
+ * herdr's own name for the shared checkout-root anchor (GAIA-177), kept as a
+ * thin alias so `index.ts` and `workspace.ts` need no rename. The behaviour —
+ * including the injected git-exec seam — now lives in `@gaia-ai/core` as
+ * `deriveCheckoutRoot()` (GAIA-450 D2): two other call sites
+ * (`@gaia-ai/conductor`'s `checkoutRootOf()` and `addon-workspace-git`'s
+ * `gitWorkspace` fallback) needed the same derivation and neither may import
+ * this addon, so the helper moved to the kernel rather than staying herdr-owned.
  */
-export async function deriveHerdrRoot(configPath, opts = {}) {
-    if (opts.override !== undefined) {
-        return opts.override;
-    }
-    const configDir = configPath ? dirname(configPath) : undefined;
-    const fallback = configDir ?? process.cwd();
-    if (configDir === undefined) {
-        return fallback;
-    }
-    const execGit = opts.execGit ?? defaultRootGitExec;
-    try {
-        const commonDir = (await execGit(['rev-parse', '--path-format=absolute', '--git-common-dir'], configDir)).trim();
-        return commonDir ? dirname(commonDir) : fallback;
-    }
-    catch {
-        return fallback;
-    }
-}
+export const deriveHerdrRoot = deriveCheckoutRoot;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gaia-ai/addon-herdr",
-  "version": "0.11.2",
+  "version": "0.11.4",
   "description": "GAIA herdr integration: spawn executor + per-ticket worktree workspace.",
   "type": "module",
   "license": "MIT",
@@ -20,10 +20,10 @@
     "directory": "gaia-cli/addons/herdr"
   },
   "dependencies": {
-    "@gaia-ai/addon-workspace-git": "^0.11.2"
+    "@gaia-ai/addon-workspace-git": "^0.11.4"
   },
   "peerDependencies": {
-    "@gaia-ai/conductor": "^0.11.2",
-    "@gaia-ai/core": "^0.11.2"
+    "@gaia-ai/conductor": "^0.11.4",
+    "@gaia-ai/core": "^0.11.4"
   }
 }