@telora/daemon 0.22.245 → 0.22.290

package/dist/git/focus-branch-identity.js

@@ -0,0 +1,42 @@
+// PINNED-BY-BEGIN (generated by gen:pinned-by -- do not hand-edit; checked by lint:pinned-by)
+// Pinned by: packages/daemon/src/focus/focus-executor-characterization.test.ts,
+//   packages/daemon/src/git/focus-branch-identity.test.ts
+// PINNED-BY-END
+import { sanitizeGitSegment } from './utils.js';
+/**
+ * Derive the focus branch name from the role, focus name, and focus id:
+ * `agent/<role>/<focus-name>-<short-id>`. This is the FIRST-CREATION deriver
+ * only -- once a focus has a pinned branch_name, consumers read that instead
+ * (see resolveFocusBranchName). The short-id is the immutable focus-id prefix.
+ */
+export function generateFocusBranchName(role, focusName, focusId) {
+    const sanitizedRoleName = sanitizeGitSegment(role.name);
+    const shortId = focusId.slice(0, 8);
+    const sanitizedFocusName = sanitizeGitSegment(focusName);
+    return `agent/${sanitizedRoleName}/${sanitizedFocusName}-${shortId}`;
+}
+/**
+ * Map a focus branch name to its worktree directory name. The worktree path is
+ * `join(worktreeDir, branchName.replace('/', '-'))` (worktree.ts), so a pinned
+ * branch name pins the worktree directory too -- one stored value covers both.
+ */
+export function focusWorktreeDirName(branchName) {
+    return branchName.replace(/\//g, '-');
+}
+/**
+ * Resolve a focus's branch identity, preferring the pinned value.
+ *
+ * If `pinnedBranch` is a non-empty string, it is returned verbatim (immune to
+ * role renames -- this is the whole point). Otherwise the name is derived from
+ * the current role and `pinned:false` signals the caller to persist it. A
+ * blank/whitespace pinned value is treated as absent (defensive against an
+ * empty column write).
+ */
+export function resolveFocusBranchName(args) {
+    const { pinnedBranch, role, focusName, focusId } = args;
+    if (typeof pinnedBranch === 'string' && pinnedBranch.trim().length > 0) {
+        return { branchName: pinnedBranch, pinned: true };
+    }
+    return { branchName: generateFocusBranchName(role, focusName, focusId), pinned: false };
+}
+//# sourceMappingURL=focus-branch-identity.js.map

package/dist/git/focus-branch-identity.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"focus-branch-identity.js","sourceRoot":"","sources":["../../src/git/focus-branch-identity.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,gFAAgF;AAChF,0DAA0D;AAC1D,gBAAgB;AAsBhB,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEhD;;;;;GAKG;AACH,MAAM,UAAU,uBAAuB,CAAC,IAAe,EAAE,SAAiB,EAAE,OAAe;IACzF,MAAM,iBAAiB,GAAG,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxD,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACpC,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;IACzD,OAAO,SAAS,iBAAiB,IAAI,kBAAkB,IAAI,OAAO,EAAE,CAAC;AACvE,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,oBAAoB,CAAC,UAAkB;IACrD,OAAO,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AACxC,CAAC;AAcD;;;;;;;;GAQG;AACH,MAAM,UAAU,sBAAsB,CAAC,IAKtC;IACC,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IACxD,IAAI,OAAO,YAAY,KAAK,QAAQ,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACpD,CAAC;IACD,OAAO,EAAE,UAAU,EAAE,uBAAuB,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;AAC1F,CAAC"}

package/dist/git/focus-integration-sync.d.ts

@@ -15,48 +15,51 @@
  * A focus with NO own delta (every commit already on integration) is NOT moved by
  * merge-out, adopt or provision. Moving it only fast-forwards it to the
  * integration tip -- a copy of integration, which verify and review would then
- * judge in the focus's place (2026-09-17, Tinker Tailor: an 11:47 merge-out
- * fast-forward onto a sibling's commit and a 12:25 adopt rebase onto the tip;
- * the sibling's failures were charged to the focus and its reviews covered
- * foreign-only ranges). Merge-out has nothing to merge; adopt and provision start
- * no work.
+ * judge in the focus's place, charging a sibling's failures to the focus.
+ * Merge-out has nothing to merge; adopt and provision start no work.
  *
  * A coding spawn IS moved: a team starting new work needs the current base, or
  * its commits land on a stale one and conflict at merge-out. What the focus
  * already had judged stays judged on its own commits -- a verify at the moved
- * head carries the verdict its own commits earned (verify/no-own-delta-verdict.ts)
+ * head carries the verdict its own commits earned (verify/gate-verdicts/no-own-delta-verdict.ts)
  * and a review over only foreign commits is declined
- * (completion/review-approved-head-gate.ts, focus/review-spawn-coverage.ts) --
+ * (completion/state-cascade/review-approved-head-gate.ts, focus/review-spawn-coverage.ts) --
  * and the commits it moves onto are integration's, each already through its own
  * focus's merge gate.
  *
  * An unreadable delta moves the branch as before (the pre-rule behaviour).
  *
  * A worktree with UNCOMMITTED changes is not rebased at all, whatever the rule
- * says: git refuses to rebase a dirty tree, and that refusal used to be recorded
- * as a conflict with no paths and no missing commits, so the respawned team was
- * handed a reconcile task that did not exist (2026-09-24, "A ruling reaches the
- * gate it rules on": a lead's workers had left edits uncommitted, the branch was
- * identical to integration, and every respawn opened on a phantom reconcile).
- * The dirty tree is the team's work in progress; the sync is held and the next
- * spawn on a clean tree brings the branch current.
+ * says: git refuses to rebase a dirty tree, and that refusal is not a conflict
+ * (result 'held-dirty', no reconcile task). The dirty tree is the team's work in
+ * progress; the sync is held and the next spawn on a clean tree brings the
+ * branch current.
  *
  * A branch that already CONTAINS the integration tip is current and is not
  * rebased: result 'current'. A team that reconciled by merging integration in (as
  * the reconcile task tells it to) holds exactly that shape, and rebasing it
- * linearizes the merge and replays the branch's own commits onto paths the merge
- * already resolved -- a conflict that exists only in the rebase, so every later
- * spawn was handed the same reconcile task again (2026-09-24, "A review's veto is
- * bounded by the criteria it judges": the merge was done, the conflict paths and
- * "behind by 0 commits" came back on every spawn).
+ * would linearize the merge and replay the branch's own commits onto paths the
+ * merge already resolved -- a conflict that exists only in the rebase.
  *
  * A conflict is reported ONLY when git names unmerged paths or the branch lacks
  * commits integration has. A rebase that fails with neither is its own outcome,
  * 'rebase-failed', carrying git's message -- a failure, not a divergence.
  *
+ * applyIntegrationSyncRecord maps a sync's outcome onto the focus's durable
+ * conflict record (queries/focus-debug-artifacts/focus-integration-conflict.ts holds the write and the
+ * IntegrationConflict shape it stores).
+ *
+ * History: docs/daemon/history-platform.md (git/focus-integration-sync.ts).
+ *
  * @module git/focus-integration-sync
  */
-import { type FocusOwnDelta } from './focus-own-delta.js';
+import type { FocusOwnDelta } from './focus-own-delta.js';
+/**
+ * The focus branch's own delta against integration (git/focus-own-delta.ts
+ * readFocusOwnDelta over the git the composition root binds).
+ */
+export type ReadFocusOwnDelta = (worktreePath: string, integrationBranch: string) => FocusOwnDelta;
+import { type IntegrationConflict } from '../queries/focus-debug-artifacts/focus-integration-conflict.js';
 /** Which step is asking to bring the focus branch current. */
 export type FocusSyncPurpose = 'merge-out' | 'adopt' | 'provision' | 'coding-spawn';
 /** Whether to move the focus branch onto integration, and why. */
@@ -65,35 +68,7 @@ export interface FocusSyncDecision {
     reason: string;
 }
 /** Decide whether `purpose` may move the focus branch in `worktreePath` onto integration (module doc). */
-export declare function decideFocusIntegrationSync(worktreePath: string, integrationBranch: string, purpose: FocusSyncPurpose, readDelta?: (worktreePath: string, integrationBranch: string) => FocusOwnDelta): FocusSyncDecision;
-/**
- * WHAT the focus branch and integration disagree about, read from the aborted
- * rebase itself rather than inferred later.
- *
- * The sync step used to answer only "it failed", so the divergence was first
- * DESCRIBED at the completion merge, hours of commits later (2026-09-20, Tinker
- * Tailor: the same abort logged on all 14 coding spawns; the duplication behind
- * it was found by an audit 7 hours in, and the completion merge still conflicted
- * in five files). The conflicting paths are read while the rebase is still
- * stopped on them -- `git diff --diff-filter=U` only names unmerged paths mid-
- * conflict -- and the missing commits after the abort has restored the branch,
- * so reading them costs the worktree nothing: the step still ends CLEAN, on the
- * focus branch, exactly as it did before.
- */
-export interface IntegrationConflict {
-    /** The branch the focus could not be brought current with. */
-    integrationBranch: string;
-    /** Paths git left unmerged in the failed rebase. Empty when the read itself failed. */
-    conflictPaths: string[];
-    /**
-     * Commits on `integrationBranch` the focus branch does not have, newest first,
-     * as `<short sha> <subject>`. Bounded (MISSING_COMMIT_LIMIT) -- a team needs to
-     * know WHAT it is behind, not the whole log. Empty when the read failed.
-     */
-    missingCommits: string[];
-    /** ISO timestamp of the failed sync. */
-    detectedAt: string;
-}
+export declare function decideFocusIntegrationSync(worktreePath: string, integrationBranch: string, purpose: FocusSyncPurpose, readDelta: ReadFocusOwnDelta): FocusSyncDecision;
 /**
  * What bringFocusCurrent did:
  *   - 'held'           the rule declined to move the branch;
@@ -116,8 +91,8 @@ export interface FocusSyncOutcome {
 }
 /** How many of the commits the branch lacks are named. Enough to identify the divergence. */
 export declare const MISSING_COMMIT_LIMIT = 20;
-/** The git seam bringFocusCurrent runs through: success plus the command's stdout. */
-type RunGit = (args: string[], cwd: string) => {
+/** The git bringFocusCurrent runs through (the caller's runner): success plus the command's stdout. */
+export type FocusSyncRunGit = (args: string[], cwd: string) => {
     success: boolean;
     output?: string;
     error?: string;
@@ -133,6 +108,25 @@ type RunGit = (args: string[], cwd: string) => {
  * rebase carries its divergence out (IntegrationConflict) instead of discarding
  * it with the abort -- and only when there IS a divergence to carry.
  */
-export declare function bringFocusCurrent(worktreePath: string, integrationBranch: string, purpose: Exclude<FocusSyncPurpose, 'merge-out'>, run?: RunGit, readDelta?: (worktreePath: string, integrationBranch: string) => FocusOwnDelta): FocusSyncOutcome;
-export {};
+export declare function bringFocusCurrent(worktreePath: string, integrationBranch: string, purpose: Exclude<FocusSyncPurpose, 'merge-out'>, readDelta: ReadFocusOwnDelta, run: FocusSyncRunGit): FocusSyncOutcome;
+/**
+ * Record or clear, per what a coding spawn's sync with integration did. The ONE
+ * place the direction is decided:
+ *   - a conflict            -> record it (carrying the since-when forward);
+ *   - a SUCCESSFUL rebase, or a branch already CURRENT (it contains the
+ *     integration tip) -> clear the record (the divergence is gone);
+ *   - a HELD sync           -> change nothing (the rule declined to move the
+ *                             branch, or the worktree was dirty, so it proved
+ *                             nothing about the divergence);
+ *   - a FAILED rebase with no divergence -> change nothing (likewise).
+ */
+export declare function applyIntegrationSyncRecord(args: {
+    focusId: string;
+    focusName: string;
+    branchName: string;
+    sync: {
+        result: FocusSyncResult;
+        conflict: IntegrationConflict | null;
+    };
+}): Promise<void>;
 //# sourceMappingURL=focus-integration-sync.d.ts.map

package/dist/git/focus-integration-sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"focus-integration-sync.d.ts","sourceRoot":"","sources":["../../src/git/focus-integration-sync.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyDG;AAEH,OAAO,EAAqB,KAAK,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAG7E,8DAA8D;AAC9D,MAAM,MAAM,gBAAgB,GAAG,WAAW,GAAG,OAAO,GAAG,WAAW,GAAG,cAAc,CAAC;AAEpF,kEAAkE;AAClE,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,0GAA0G;AAC1G,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,EACpB,iBAAiB,EAAE,MAAM,EACzB,OAAO,EAAE,gBAAgB,EACzB,SAAS,GAAE,CAAC,YAAY,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,KAAK,aAAiC,GAChG,iBAAiB,CAYnB;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,WAAW,mBAAmB;IAClC,8DAA8D;IAC9D,iBAAiB,EAAE,MAAM,CAAC;IAC1B,uFAAuF;IACvF,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB;;;;OAIG;IACH,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,wCAAwC;IACxC,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;;;GASG;AACH,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG,YAAY,GAAG,SAAS,GAAG,SAAS,GAAG,gBAAgB,GAAG,eAAe,CAAC;AAEjH,qDAAqD;AACrD,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,MAAM,EAAE,eAAe,CAAC;IACxB,6FAA6F;IAC7F,QAAQ,CAAC,EAAE,mBAAmB,CAAC;IAC/B,yFAAyF;IACzF,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,6FAA6F;AAC7F,eAAO,MAAM,oBAAoB,KAAK,CAAC;AAEvC,sFAAsF;AACtF,KAAK,MAAM,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,KAAK;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AA2CrG;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,MAAM,EACpB,iBAAiB,EAAE,MAAM,EACzB,OAAO,EAAE,OAAO,CAAC,gBAAgB,EAAE,WAAW,CAAC,EAC/C,GAAG,GAAE,MAAmB,EACxB,SAAS,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,KAAK,aAAa,GAC7E,gBAAgB,CAmBlB"}
+{"version":3,"file":"focus-integration-sync.d.ts","sourceRoot":"","sources":["../../src/git/focus-integration-sync.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsDG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D;;;GAGG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,YAAY,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,KAAK,aAAa,CAAC;AACnG,OAAO,EAGL,KAAK,mBAAmB,EACzB,MAAM,gEAAgE,CAAC;AAExE,8DAA8D;AAC9D,MAAM,MAAM,gBAAgB,GAAG,WAAW,GAAG,OAAO,GAAG,WAAW,GAAG,cAAc,CAAC;AAEpF,kEAAkE;AAClE,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,0GAA0G;AAC1G,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,EACpB,iBAAiB,EAAE,MAAM,EACzB,OAAO,EAAE,gBAAgB,EACzB,SAAS,EAAE,iBAAiB,GAC3B,iBAAiB,CAYnB;AAED;;;;;;;;;GASG;AACH,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG,YAAY,GAAG,SAAS,GAAG,SAAS,GAAG,gBAAgB,GAAG,eAAe,CAAC;AAEjH,qDAAqD;AACrD,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,MAAM,EAAE,eAAe,CAAC;IACxB,6FAA6F;IAC7F,QAAQ,CAAC,EAAE,mBAAmB,CAAC;IAC/B,yFAAyF;IACzF,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,6FAA6F;AAC7F,eAAO,MAAM,oBAAoB,KAAK,CAAC;AAEvC,uGAAuG;AACvG,MAAM,MAAM,eAAe,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,KAAK;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AA2CrH;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,MAAM,EACpB,iBAAiB,EAAE,MAAM,EACzB,OAAO,EAAE,OAAO,CAAC,gBAAgB,EAAE,WAAW,CAAC,EAC/C,SAAS,EAAE,iBAAiB,EAC5B,GAAG,EAAE,eAAe,GACnB,gBAAgB,CAmBlB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE;IACJ,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE;QAAE,MAAM,EAAE,eAAe,CAAC;QAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI,CAAA;KAAE,CAAC;CACzE,GACA,OAAO,CAAC,IAAI,CAAC,CAOf"}

package/dist/git/focus-integration-sync.js

@@ -1,70 +1,10 @@
 // PINNED-BY-BEGIN (generated by gen:pinned-by -- do not hand-edit; checked by lint:pinned-by)
 // Pinned by: packages/daemon/src/git/focus-integration-sync.test.ts,
-//   packages/daemon/src/queries/focus-integration-conflict.test.ts,
 //   packages/daemon/src/spawn/integration-reconcile-spawn.test.ts
 // PINNED-BY-END
-/**
- * The ONE rule for bringing a focus branch current with integration. Every daemon
- * step that moves a focus branch onto integration asks it first:
- *
- *   - 'merge-out'    git/merge.ts mergeBackFromIntegration (the "merge
- *                    origin/integration" before a focus merges out: merge-back
- *                    loop, team-exit merge, resolved-conflict retry);
- *   - 'adopt'        focus/focus-lifecycle.ts, adopting an existing worktree;
- *   - 'provision'    worktree/provision.ts, a worktree added on an existing branch;
- *   - 'coding-spawn' spawn/worktree-session.ts, a coding team starting on a reused worktree.
- *
- * A focus that carries commits of its own is moved as before: its own delta is
- * what verify attributes and review judges, whatever integration base it sits on.
- *
- * A focus with NO own delta (every commit already on integration) is NOT moved by
- * merge-out, adopt or provision. Moving it only fast-forwards it to the
- * integration tip -- a copy of integration, which verify and review would then
- * judge in the focus's place (2026-09-17, Tinker Tailor: an 11:47 merge-out
- * fast-forward onto a sibling's commit and a 12:25 adopt rebase onto the tip;
- * the sibling's failures were charged to the focus and its reviews covered
- * foreign-only ranges). Merge-out has nothing to merge; adopt and provision start
- * no work.
- *
- * A coding spawn IS moved: a team starting new work needs the current base, or
- * its commits land on a stale one and conflict at merge-out. What the focus
- * already had judged stays judged on its own commits -- a verify at the moved
- * head carries the verdict its own commits earned (verify/no-own-delta-verdict.ts)
- * and a review over only foreign commits is declined
- * (completion/review-approved-head-gate.ts, focus/review-spawn-coverage.ts) --
- * and the commits it moves onto are integration's, each already through its own
- * focus's merge gate.
- *
- * An unreadable delta moves the branch as before (the pre-rule behaviour).
- *
- * A worktree with UNCOMMITTED changes is not rebased at all, whatever the rule
- * says: git refuses to rebase a dirty tree, and that refusal used to be recorded
- * as a conflict with no paths and no missing commits, so the respawned team was
- * handed a reconcile task that did not exist (2026-09-24, "A ruling reaches the
- * gate it rules on": a lead's workers had left edits uncommitted, the branch was
- * identical to integration, and every respawn opened on a phantom reconcile).
- * The dirty tree is the team's work in progress; the sync is held and the next
- * spawn on a clean tree brings the branch current.
- *
- * A branch that already CONTAINS the integration tip is current and is not
- * rebased: result 'current'. A team that reconciled by merging integration in (as
- * the reconcile task tells it to) holds exactly that shape, and rebasing it
- * linearizes the merge and replays the branch's own commits onto paths the merge
- * already resolved -- a conflict that exists only in the rebase, so every later
- * spawn was handed the same reconcile task again (2026-09-24, "A review's veto is
- * bounded by the criteria it judges": the merge was done, the conflict paths and
- * "behind by 0 commits" came back on every spawn).
- *
- * A conflict is reported ONLY when git names unmerged paths or the branch lacks
- * commits integration has. A rebase that fails with neither is its own outcome,
- * 'rebase-failed', carrying git's message -- a failure, not a divergence.
- *
- * @module git/focus-integration-sync
- */
-import { readFocusOwnDelta } from './focus-own-delta.js';
-import { runGitSync } from './types.js';
+import { clearFocusIntegrationConflict, recordFocusIntegrationConflict, } from '../queries/focus-debug-artifacts/focus-integration-conflict.js';
 /** Decide whether `purpose` may move the focus branch in `worktreePath` onto integration (module doc). */
-export function decideFocusIntegrationSync(worktreePath, integrationBranch, purpose, readDelta = readFocusOwnDelta) {
+export function decideFocusIntegrationSync(worktreePath, integrationBranch, purpose, readDelta) {
     const delta = readDelta(worktreePath, integrationBranch);
     if (delta.kind === 'ahead')
         return { move: true, reason: `the focus carries ${delta.commits} commit(s) of its own` };
@@ -126,7 +66,7 @@ function readMissingCommits(run, worktreePath, integrationBranch) {
  * rebase carries its divergence out (IntegrationConflict) instead of discarding
  * it with the abort -- and only when there IS a divergence to carry.
  */
-export function bringFocusCurrent(worktreePath, integrationBranch, purpose, run = runGitSync, readDelta) {
+export function bringFocusCurrent(worktreePath, integrationBranch, purpose, readDelta, run) {
     const decision = decideFocusIntegrationSync(worktreePath, integrationBranch, purpose, readDelta);
     if (!decision.move)
         return { decision, result: 'held' };
@@ -150,4 +90,24 @@ export function bringFocusCurrent(worktreePath, integrationBranch, purpose, run
         conflict: { integrationBranch, conflictPaths, missingCommits, detectedAt: new Date().toISOString() },
     };
 }
+/**
+ * Record or clear, per what a coding spawn's sync with integration did. The ONE
+ * place the direction is decided:
+ *   - a conflict            -> record it (carrying the since-when forward);
+ *   - a SUCCESSFUL rebase, or a branch already CURRENT (it contains the
+ *     integration tip) -> clear the record (the divergence is gone);
+ *   - a HELD sync           -> change nothing (the rule declined to move the
+ *                             branch, or the worktree was dirty, so it proved
+ *                             nothing about the divergence);
+ *   - a FAILED rebase with no divergence -> change nothing (likewise).
+ */
+export async function applyIntegrationSyncRecord(args) {
+    const { focusId, focusName, branchName, sync } = args;
+    if (sync.conflict) {
+        await recordFocusIntegrationConflict({ focusId, focusName, branchName, conflict: sync.conflict });
+        return;
+    }
+    if (sync.result === 'rebased' || sync.result === 'current')
+        await clearFocusIntegrationConflict(focusId);
+}
 //# sourceMappingURL=focus-integration-sync.js.map

package/dist/git/focus-integration-sync.js.map

@@ -1 +1 @@
-{"version":3,"file":"focus-integration-sync.js","sourceRoot":"","sources":["../../src/git/focus-integration-sync.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"focus-integration-sync.js","sourceRoot":"","sources":["../../src/git/focus-integration-sync.ts"],"names":[],"mappings":"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"}

package/dist/git/focus-own-delta.d.ts

@@ -1,4 +1,42 @@
-import { type ReviewWindowCommit } from '../resolvers/shared/review-window-commits.js';
+/**
+ * A focus's OWN delta: the one computation every step that judges or moves a
+ * focus branch reads, so none of them mistakes the integration tip for focus work.
+ *
+ * Two questions:
+ *
+ *   - readFocusOwnDelta: does the focus branch carry commits integration does not?
+ *     'none' means every commit on the branch is already on integration (local or
+ *     origin), so whatever the branch tip holds beyond what the focus already had
+ *     judged came from integration, not from the focus.
+ *   - isForeignOnlyExtension: does `tip` add NOTHING of the focus's own on top of
+ *     `anchor` (a commit the focus's work was already judged at -- a recorded
+ *     verdict, an approval, a review watermark)? True only when the focus has no
+ *     own delta, `anchor` is an ancestor of `tip`, and no non-merge commit in
+ *     anchor..tip is the focus's: none carries a Telora-Delivery trailer naming a
+ *     focus delivery, and any without a foreign trailer came in through the focus
+ *     branch taking in another line (below). A merge commit in it that decided a
+ *     conflict (a non-empty re-merge diff) carries no trailer, so it is attributed
+ *     to the branch it was made on:
+ *     its first parent's nearest non-merge commit must be one of those foreign
+ *     commits in the range (a sibling merged integration into ITS branch and
+ *     resolved there). A resolution made on the focus's own line -- first parent
+ *     reaching the anchor, an own commit or anything outside the range -- is the
+ *     focus's work. An unattributed, sentinel or daemon-capture commit is
+ *     attributed by the operation that put it on the focus branch, read from the
+ *     branch's reflog (each entry records the branch's old and new commit and what
+ *     moved it): commits a merge, pull or rebase-onto brought in from another line
+ *     (integration housekeeping, another focus's `Telora-Delivery: none` capture)
+ *     are not the focus's -- whether they were made before or after the anchor
+ *     reached integration. One a commit, reset or any other move put there, or one
+ *     no reflog step accounts for, counts as the focus's own, and any unreadable
+ *     read answers false -- so the answer fails toward judging, never toward
+ *     skipping the focus's work.
+ *
+ * History: docs/daemon/history-platform.md (git/focus-own-delta.ts).
+ *
+ * @module git/focus-own-delta
+ */
+import { type ReviewWindowCommit } from './review-window-commits.js';
 /** Whether a focus branch carries commits of its own that integration lacks. */
 export type FocusOwnDelta = {
     kind: 'ahead';
@@ -9,7 +47,11 @@ export type FocusOwnDelta = {
     kind: 'unknown';
     reason: string;
 };
-/** Git seams (overridable for tests). */
+/**
+ * The git reads the delta and provenance questions are answered from. The
+ * production binding (the git CLI and the reflog file) is built at the
+ * composition root (composition/execution-git-context.ts).
+ */
 export interface FocusOwnDeltaGit {
     run: (args: string[], cwd: string) => {
         success: boolean;
@@ -23,16 +65,16 @@ export interface FocusOwnDeltaGit {
  * Count the commits on `ref` (default HEAD) that neither the local integration
  * branch nor its origin counterpart contains. 'none' when either contains them all.
  */
-export declare function readFocusOwnDelta(worktreePath: string, integrationBranch: string, ref?: string, git?: FocusOwnDeltaGit): FocusOwnDelta;
+export declare function readFocusOwnDelta(worktreePath: string, integrationBranch: string, git: FocusOwnDeltaGit, ref?: string): FocusOwnDelta;
 /** Which focus branch to read provenance from, and the git seams. */
 export interface ForeignOnlyExtensionOptions {
     /** The focus branch (name or full ref). Default: the branch checked out at `worktreePath`. */
     focusBranch?: string;
-    git?: FocusOwnDeltaGit;
+    git: FocusOwnDeltaGit;
 }
 /**
  * Whether `tip` adds nothing of the focus's own on top of `anchor` (module doc).
  * `ownDeliveryIds` are the focus's delivery ids; an empty set proves nothing foreign.
  */
-export declare function isForeignOnlyExtension(worktreePath: string, integrationBranch: string, anchor: string, tip: string, ownDeliveryIds: ReadonlySet<string>, options?: ForeignOnlyExtensionOptions): boolean;
+export declare function isForeignOnlyExtension(worktreePath: string, integrationBranch: string, anchor: string, tip: string, ownDeliveryIds: ReadonlySet<string>, options: ForeignOnlyExtensionOptions): boolean;
 //# sourceMappingURL=focus-own-delta.d.ts.map

package/dist/git/focus-own-delta.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"focus-own-delta.d.ts","sourceRoot":"","sources":["../../src/git/focus-own-delta.ts"],"names":[],"mappings":"AAoDA,OAAO,EAIL,KAAK,kBAAkB,EACxB,MAAM,8CAA8C,CAAC;AAEtD,gFAAgF;AAChF,MAAM,MAAM,aAAa,GACrB;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAClC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAChB;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAExC,yCAAyC;AACzC,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,KAAK;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3E,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,SAAS,kBAAkB,EAAE,GAAG,IAAI,CAAC;IAC7F,8EAA8E;IAC9E,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;CACzD;AAmBD;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,MAAM,EACpB,iBAAiB,EAAE,MAAM,EACzB,GAAG,SAAS,EACZ,GAAG,GAAE,gBAA6B,GACjC,aAAa,CAYf;AAED,qEAAqE;AACrE,MAAM,WAAW,2BAA2B;IAC1C,8FAA8F;IAC9F,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,gBAAgB,CAAC;CACxB;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,MAAM,EACpB,iBAAiB,EAAE,MAAM,EACzB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,WAAW,CAAC,MAAM,CAAC,EACnC,OAAO,GAAE,2BAAgC,GACxC,OAAO,CAWT"}
+{"version":3,"file":"focus-own-delta.d.ts","sourceRoot":"","sources":["../../src/git/focus-own-delta.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AAEH,OAAO,EAGL,KAAK,kBAAkB,EACxB,MAAM,4BAA4B,CAAC;AAEpC,gFAAgF;AAChF,MAAM,MAAM,aAAa,GACrB;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAClC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAChB;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAExC;;;;GAIG;AACH,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,KAAK;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3E,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,SAAS,kBAAkB,EAAE,GAAG,IAAI,CAAC;IAC7F,8EAA8E;IAC9E,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;CACzD;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,MAAM,EACpB,iBAAiB,EAAE,MAAM,EACzB,GAAG,EAAE,gBAAgB,EACrB,GAAG,SAAS,GACX,aAAa,CAYf;AAED,qEAAqE;AACrE,MAAM,WAAW,2BAA2B;IAC1C,8FAA8F;IAC9F,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,EAAE,gBAAgB,CAAC;CACvB;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,MAAM,EACpB,iBAAiB,EAAE,MAAM,EACzB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,WAAW,CAAC,MAAM,CAAC,EACnC,OAAO,EAAE,2BAA2B,GACnC,OAAO,CAWT"}

package/dist/git/focus-own-delta.js

@@ -37,40 +37,16 @@
  *     read answers false -- so the answer fails toward judging, never toward
  *     skipping the focus's work.
  *
- * Observed 2026-09-17 (Tinker Tailor, daemon 0.22.132): a focus whose commits
- * were all on integration was fast-forwarded to a sibling's commit by the
- * pre-merge-out "merge origin/integration"; its verify then judged the sibling's
- * failures and its reviews ran over foreign-only ranges.
+ * History: docs/daemon/history-platform.md (git/focus-own-delta.ts).
  *
  * @module git/focus-own-delta
  */
-import { readFileSync } from 'node:fs';
-import { resolve } from 'node:path';
-import { runGitSync } from './types.js';
-import { REVIEW_WINDOW_COMMIT_CAP, listReviewWindowCommits, partitionReviewWindowCommits, } from '../resolvers/shared/review-window-commits.js';
-const defaultGit = {
-    run: (args, cwd) => {
-        const r = runGitSync(args, cwd);
-        return { success: r.success, output: r.output.trim() };
-    },
-    listWindow: (cwd, base, tip) => listReviewWindowCommits(cwd, base, tip),
-    readReflog: (cwd, ref) => {
-        const path = runGitSync(['rev-parse', '--git-path', `logs/${ref}`], cwd);
-        if (!path.success)
-            return null;
-        try {
-            return readFileSync(resolve(cwd, path.output.trim()), 'utf8');
-        }
-        catch {
-            return null;
-        }
-    },
-};
+import { REVIEW_WINDOW_COMMIT_CAP, partitionReviewWindowCommits, } from './review-window-commits.js';
 /**
  * Count the commits on `ref` (default HEAD) that neither the local integration
  * branch nor its origin counterpart contains. 'none' when either contains them all.
  */
-export function readFocusOwnDelta(worktreePath, integrationBranch, ref = 'HEAD', git = defaultGit) {
+export function readFocusOwnDelta(worktreePath, integrationBranch, git, ref = 'HEAD') {
     const bases = [integrationBranch, `origin/${integrationBranch}`];
     let fewest = null;
     for (const base of bases) {
@@ -90,11 +66,11 @@ export function readFocusOwnDelta(worktreePath, integrationBranch, ref = 'HEAD',
  * Whether `tip` adds nothing of the focus's own on top of `anchor` (module doc).
  * `ownDeliveryIds` are the focus's delivery ids; an empty set proves nothing foreign.
  */
-export function isForeignOnlyExtension(worktreePath, integrationBranch, anchor, tip, ownDeliveryIds, options = {}) {
-    const git = options.git ?? defaultGit;
+export function isForeignOnlyExtension(worktreePath, integrationBranch, anchor, tip, ownDeliveryIds, options) {
+    const { git } = options;
     if (anchor === tip || ownDeliveryIds.size === 0)
         return false;
-    if (readFocusOwnDelta(worktreePath, integrationBranch, tip, git).kind !== 'none')
+    if (readFocusOwnDelta(worktreePath, integrationBranch, git, tip).kind !== 'none')
         return false;
     if (!git.run(['merge-base', '--is-ancestor', anchor, tip], worktreePath).success)
         return false;

package/dist/git/focus-own-delta.js.map

@@ -1 +1 @@
-{"version":3,"file":"focus-own-delta.js","sourceRoot":"","sources":["../../src/git/focus-own-delta.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"focus-own-delta.js","sourceRoot":"","sources":["../../src/git/focus-own-delta.ts"],"names":[],"mappings":"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"}

package/dist/git/genesis.d.ts

@@ -1,5 +1,5 @@
-import { type GitResult } from './types.js';
-import { type StarterRepoCoordinates } from '../queries/starter-repo.js';
+import { type GitResult } from '@telora/daemon-core';
+import type { StarterRepoCoordinates } from '../queries/org-config/starter-repo.js';
 /** Why the genesis path did (or did not) seed the repo from a starter. */
 export type GenesisReason = 'seeded' | 'repo-has-history' | 'no-starter-selected' | 'starter-not-found' | 'clone-failed' | 'commit-failed';
 export interface GenesisResult {
@@ -19,7 +19,7 @@ export interface GenesisConfig {
 interface PrdStarterSelection {
     starterRepoId: string | null;
 }
-/** Injectable seams so the path is testable without a live backend or network. */
+/** The genesis path's seams; bound at the composition root (composition/execution-git-context.ts). */
 export interface GenesisDeps {
     hasCommits: (repoPath: string) => boolean;
     loadActivePrds: (productId: string) => Promise<PrdStarterSelection[]>;
@@ -40,7 +40,7 @@ export declare const PLACEHOLDER_COMMIT_MESSAGE = "chore: initialize repository
  * Seed an empty product repo's genesis commit from the starter its active PRD
  * selected. Returns a typed result; the caller decides the fallback.
  */
-export declare function seedGenesisFromStarter(config: GenesisConfig, deps?: Partial<GenesisDeps>): Promise<GenesisResult>;
+export declare function seedGenesisFromStarter(config: GenesisConfig, d: GenesisDeps): Promise<GenesisResult>;
 /** Outcome of ensuring an empty repo has its first commit. */
 export interface InitialCommitResult {
     /** The repo now has at least one commit (a seeded genesis or a placeholder). */
@@ -71,6 +71,6 @@ export interface InitialCommitResult {
  *  4. Otherwise (no starter anywhere, or the clone genuinely failed) -> write an
  *     empty placeholder commit so git operations are never wedged.
  */
-export declare function ensureInitialCommit(config: GenesisConfig, deps?: Partial<GenesisDeps>): Promise<InitialCommitResult>;
+export declare function ensureInitialCommit(config: GenesisConfig, d: GenesisDeps): Promise<InitialCommitResult>;
 export {};
 //# sourceMappingURL=genesis.d.ts.map

package/dist/git/genesis.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"genesis.d.ts","sourceRoot":"","sources":["../../src/git/genesis.ts"],"names":[],"mappings":"AAwCA,OAAO,EAAc,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAGxD,OAAO,EAEL,KAAK,sBAAsB,EAC5B,MAAM,4BAA4B,CAAC;AAMpC,0EAA0E;AAC1E,MAAM,MAAM,aAAa,GACrB,QAAQ,GACR,kBAAkB,GAClB,qBAAqB,GACrB,mBAAmB,GACnB,cAAc,GACd,eAAe,CAAC;AAEpB,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,aAAa,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,kEAAkE;AAClE,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,8EAA8E;AAC9E,UAAU,mBAAmB;IAC3B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,kFAAkF;AAClF,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;IAC1C,cAAc,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAAC;IACtE,eAAe,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC,CAAC;IACnF,8EAA8E;IAC9E,0BAA0B,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACpE,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,SAAS,CAAC;IACrF,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAC5B;AAWD;;;GAGG;AACH,eAAO,MAAM,0BAA0B,4CAA4C,CAAC;AAMpF;;;GAGG;AACH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,aAAa,EACrB,IAAI,GAAE,OAAO,CAAC,WAAW,CAAM,GAC9B,OAAO,CAAC,aAAa,CAAC,CA8IxB;AAED,8DAA8D;AAC9D,MAAM,WAAW,mBAAmB;IAClC,gFAAgF;IAChF,SAAS,EAAE,OAAO,CAAC;IACnB,sEAAsE;IACtE,MAAM,EAAE,OAAO,CAAC;IAChB;;;;OAIG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB,2FAA2F;IAC3F,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,aAAa,EACrB,IAAI,GAAE,OAAO,CAAC,WAAW,CAAM,GAC9B,OAAO,CAAC,mBAAmB,CAAC,CA6C9B"}
+{"version":3,"file":"genesis.d.ts","sourceRoot":"","sources":["../../src/git/genesis.ts"],"names":[],"mappings":"AAuCA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAEpF,0EAA0E;AAC1E,MAAM,MAAM,aAAa,GACrB,QAAQ,GACR,kBAAkB,GAClB,qBAAqB,GACrB,mBAAmB,GACnB,cAAc,GACd,eAAe,CAAC;AAEpB,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,aAAa,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,kEAAkE;AAClE,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,8EAA8E;AAC9E,UAAU,mBAAmB;IAC3B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,sGAAsG;AACtG,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;IAC1C,cAAc,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAAC;IACtE,eAAe,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC,CAAC;IACnF,8EAA8E;IAC9E,0BAA0B,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACpE,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,SAAS,CAAC;IACrF,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAC5B;AAED;;;GAGG;AACH,eAAO,MAAM,0BAA0B,4CAA4C,CAAC;AAMpF;;;GAGG;AACH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,aAAa,EACrB,CAAC,EAAE,WAAW,GACb,OAAO,CAAC,aAAa,CAAC,CA4IxB;AAED,8DAA8D;AAC9D,MAAM,WAAW,mBAAmB;IAClC,gFAAgF;IAChF,SAAS,EAAE,OAAO,CAAC;IACnB,sEAAsE;IACtE,MAAM,EAAE,OAAO,CAAC;IAChB;;;;OAIG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB,2FAA2F;IAC3F,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,aAAa,EACrB,CAAC,EAAE,WAAW,GACb,OAAO,CAAC,mBAAmB,CAAC,CA2C9B"}

package/dist/git/genesis.js

@@ -3,8 +3,7 @@
 // PINNED-BY-END
 /**
  * Starter-repo genesis: seed an EMPTY product repo from a registered, polished
- * starter the active PRD selected, instead of scaffolding a frontend from zero
- * (focus 80ecc233).
+ * starter the active PRD selected, instead of scaffolding a frontend from zero.
  *
  * When a product's git repo has no commits AND its active PRD carries a
  * `starterRepoId`, the daemon clones the starter's pinned ref, squashes its
@@ -28,20 +27,6 @@
 import { mkdtempSync, rmSync, cpSync, writeFileSync, mkdirSync, existsSync, } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join, sep } from 'node:path';
-import { runGitSync } from './types.js';
-import { repoHasCommits } from './branch.js';
-import { loadActivePrds, hasPendingStarterSelection } from '../queries/prd.js';
-import { loadStarterRepo, } from '../queries/starter-repo.js';
-import { createLogger } from '../shell/log.js';
-const log = createLogger({ module: 'git/genesis' });
-const defaultDeps = {
-    hasCommits: repoHasCommits,
-    loadActivePrds,
-    loadStarterRepo,
-    hasPendingStarterSelection,
-    runGit: runGitSync,
-    log: (msg) => log.info(msg),
-};
 /**
  * The placeholder initial-commit message written when an empty repo has no
  * starter to seed from. Shared so callers can recognise the placeholder.
@@ -54,8 +39,7 @@ const CLONE_TIMEOUT_MS = 300_000;
  * Seed an empty product repo's genesis commit from the starter its active PRD
  * selected. Returns a typed result; the caller decides the fallback.
  */
-export async function seedGenesisFromStarter(config, deps = {}) {
-    const d = { ...defaultDeps, ...deps };
+export async function seedGenesisFromStarter(config, d) {
     // Greenfield guard: only an empty repo is seeded. A repo with history is left
     // untouched -- a starter is the INITIAL commit, never grafted onto a history.
     if (d.hasCommits(config.repoPath)) {
@@ -195,8 +179,7 @@ export async function seedGenesisFromStarter(config, deps = {}) {
  *  4. Otherwise (no starter anywhere, or the clone genuinely failed) -> write an
  *     empty placeholder commit so git operations are never wedged.
  */
-export async function ensureInitialCommit(config, deps = {}) {
-    const d = { ...defaultDeps, ...deps };
+export async function ensureInitialCommit(config, d) {
     if (d.hasCommits(config.repoPath)) {
         return { committed: true, seeded: false, deferred: false };
     }