@norskvideo/ctl-dev-kit 0.2.24 → 0.2.25

package/conventions/sync-dev-kit.yml

@@ -186,7 +186,14 @@ jobs:
           for attempt in 1 2 3 4 5; do
             if git push origin HEAD:main; then exit 0; fi
             echo "push rejected (attempt $attempt) - rebasing onto latest origin/main"
-            git fetch origin main
+            # --unshallow, not a plain fetch: these runners keep their .git
+            # between jobs, and a commit an earlier job fetched at depth 1 stays
+            # recorded as parentless. A plain fetch does not re-fetch an object it
+            # already holds, so main's tip can look like an unrelated root and the
+            # rebase replays our base commit over it -- add/add conflicts on every
+            # file it touches (playout + studio, 2026-10-03). The fallback covers
+            # a repo that is already complete, where --unshallow is refused.
+            git fetch --unshallow origin main 2>/dev/null || git fetch origin main
             git rebase origin/main || { git rebase --abort; echo "rebase hit a real conflict; aborting"; exit 1; }
           done
           echo "push still failing after 5 rebase attempts"; exit 1

package/conventions/upgrade-latest.yml

@@ -318,7 +318,14 @@ jobs:
           for attempt in 1 2 3 4 5; do
             if git push origin HEAD:main; then exit 0; fi
             echo "push rejected (attempt $attempt) - rebasing onto latest origin/main"
-            git fetch origin main
+            # --unshallow, not a plain fetch: these runners keep their .git
+            # between jobs, and a commit an earlier job fetched at depth 1 stays
+            # recorded as parentless. A plain fetch does not re-fetch an object it
+            # already holds, so main's tip can look like an unrelated root and the
+            # rebase replays our base commit over it -- add/add conflicts on every
+            # file it touches (playout + studio, 2026-10-03). The fallback covers
+            # a repo that is already complete, where --unshallow is refused.
+            git fetch --unshallow origin main 2>/dev/null || git fetch origin main
             git rebase origin/main || { git rebase --abort; echo "rebase hit a real conflict; aborting"; exit 1; }
           done
           echo "push still failing after 5 rebase attempts"; exit 1

package/conventions/workflow-shell.ts

@@ -265,6 +265,28 @@ export function lockfileRefreshCanFail(yaml: string): number[] {
   return out;
 }
 
+/** `- name:` lines of steps that rebase onto a fetched branch without first
+ *  unshallowing.
+ *
+ *  The self-hosted runners keep each repo's .git between jobs, and
+ *  actions/checkout fetches at depth 1, so a commit an earlier job fetched is
+ *  left recorded as parentless. A plain `git fetch` will not re-fetch an object
+ *  it already holds, so when that commit is main's tip the rebase sees two
+ *  unrelated roots and replays our base commit over it: add/add conflicts on
+ *  every file, read as "a real conflict". It failed playout's sync-dev-kit and
+ *  studio's upgrade-latest that way on 2026-10-03. `--unshallow` re-fetches the
+ *  parents and clears the stale boundary. */
+export function rebaseWithoutUnshallow(yaml: string): number[] {
+  const lines = yaml.split("\n");
+  const out: number[] = [];
+  lines.forEach((text, i) => {
+    if (!/^\s+- name:/.test(text)) return;
+    const body = stepBody(lines, i);
+    if (/\bgit rebase\b/.test(body) && !/git fetch --unshallow\b/.test(body)) out.push(i + 1);
+  });
+  return out;
+}
+
 /** A `ctl-candidate` validation that another candidate, or its own retry, can
  *  cancel.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@norskvideo/ctl-dev-kit",
-  "version": "0.2.24",
+  "version": "0.2.25",
   "type": "module",
   "exports": {
     "./create-product": "./create-product/create-product.ts",