@norskvideo/ctl-dev-kit 0.2.67 → 0.2.69

package/build/ctl-shell.nix

@@ -9,6 +9,24 @@
 # need GitHub auth in every shell and CI runner.
 { pkgs, biome }:
 let
+  # Bun from its own nixpkgs pin, so ctl and every product run one Bun, and
+  # bumping it is one edit here (the dev-kit sync carries it to the products)
+  # rather than moving the main nixpkgs pin, and with it Chromium and every
+  # other tool. Fetched by hash, so each repo shares one store path.
+  #
+  # 1.4.2: 1.3.13's node:http2 client segfaulted in its HPACK encoder
+  # (lshpack.HPACK.encode from H2FrameParser.request) — norsk-mgr's gRPC client
+  # to the Manager, killed mid-drain and mid-migration in the nightly e2e.
+  # Keep each repo's package.json "packageManager" (its image's Bun) on the
+  # same version. That nixpkgs no longer builds x86_64-darwin, which keeps the
+  # main pin's.
+  bun =
+    if pkgs.stdenv.hostPlatform.system == "x86_64-darwin" then pkgs.bun
+    else (import (builtins.fetchTarball {
+      url = "https://github.com/NixOS/nixpkgs/archive/e7439b6b14ad3cc35d05608ebca9bce01a25f5f8.tar.gz"; # bun 1.4.2
+      sha256 = "19y4py973w62z4qb7gzn0chjs67ihxy8rbjb7g71iyk8yz7z5k8z";
+    }) { inherit (pkgs.stdenv.hostPlatform) system; }).bun;
+
   # Playwright doc-guide browser. nix-pinned headless Chromium needs a real X
   # display on a truly headless box (page.fill silently no-ops on plain HTML
   # inputs; some pages crash the renderer). Ubuntu's apt Xvfb is too old for
@@ -42,7 +60,7 @@ let
 
   buildTools = [
     biome
-    pkgs.bun
+    bun
     pkgs.nodejs # @biomejs/biome's bin is a JS wrapper, not the binary — it is
                 # what reads BIOME_BINARY and execs the nix build. Something has
                 # to *parse* that wrapper first, so a modern node has to be on
@@ -91,7 +109,7 @@ let
   };
 in
 {
-  inherit browserInputs browserHook buildTools mkCtl shell;
+  inherit browserInputs browserHook buildTools bun mkCtl shell;
 
   # The Studio-product shells:
   #   default / dev -> build tools + the pinned norsk-ctl daemon on PATH

package/build/flake.nix

@@ -19,7 +19,7 @@
   description = "norsk-ctl product build + dev shell";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/d233902339c02a9c334e7e593de68855ad26c4cb"; # nixpkgs-unstable 2026-05-15, bun 1.3.13, chromium 148.0.7778.167
+    nixpkgs.url = "github:NixOS/nixpkgs/d233902339c02a9c334e7e593de68855ad26c4cb"; # nixpkgs-unstable 2026-05-15, chromium 148.0.7778.167 (bun comes from its own pin in nix/ctl-shell.nix)
     # Biome must match the version pinned in package.json (@biomejs/biome 2.5.5)
     # exactly: 2.4.x can't parse this repo's biome.json (`rules.preset` is a
     # 2.5 key) and any other 2.5.x emits a version-mismatch info that breaks the

package/build/flake.sdk-app.nix

@@ -13,12 +13,12 @@
   # result belongs to a commit, and moved nightly by bump.yml. Decision: bun for tooling (install / build /
   # test), Node for the shipped runtime (the SDK's blessed runtime).
   #
-  # nixpkgs is pinned to the same rev the Studio flake uses, so bun matches the
-  # fleet's 1.3.13.
+  # nixpkgs is pinned to the same rev the Studio flake uses, so the store is
+  # shared; bun is the fleet's, from its own pin in nix/ctl-shell.nix.
   description = "norsk-ctl sdk-app product dev shell (bun tooling + node runtime)";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/d233902339c02a9c334e7e593de68855ad26c4cb"; # nixpkgs-unstable 2026-05-15, bun 1.3.13
+    nixpkgs.url = "github:NixOS/nixpkgs/d233902339c02a9c334e7e593de68855ad26c4cb"; # nixpkgs-unstable 2026-05-15 (bun comes from its own pin in nix/ctl-shell.nix)
     # Biome must match the version pinned in package.json (@biomejs/biome 2.5.5)
     # exactly; the node_modules biome binary is glibc-linked and can't run on
     # NixOS, so `bun run lint` execs this nix build via BIOME_BINARY. Keep this
@@ -45,7 +45,7 @@
           ffmpegFull = pkgs.ffmpeg-full;
           tools = [
             biome # `bun run lint` execs this via BIOME_BINARY
-            pkgs.bun # tooling: install / build / test (fleet parity, dev-kit)
+            ctlShell.bun # tooling: install / build / test; its own pin, shared with ctl and every product
             pkgs.nodejs # the shipped runtime (bin/run -> node lib/index.js); also
                         # parses @biomejs/biome's JS wrapper that reads BIOME_BINARY
             pkgs.git

package/conventions/check-drift.ts

@@ -412,6 +412,38 @@ export function productLogsProblems(repoRoot: string): string[] {
       ];
 }
 
+/** The Bun the dev-kit's build/ctl-shell.nix pins: the version its pin's URL
+ *  line names (`… .tar.gz"; # bun 1.4.2`). The shell runs it; the product's
+ *  image runs package.json's "packageManager", which must name the same. */
+export function pinnedBunVersion(ctlShell: string): string | undefined {
+  return /archive\/[0-9a-f]{40}\.tar\.gz"; # bun (\d+\.\d+\.\d+)/.exec(ctlShell)?.[1];
+}
+
+/** package.json's "packageManager" against the shell's Bun. They drifted once
+ *  already: the fleet's shells and images ran 1.3.13 by agreement alone, and a
+ *  move to 1.4.2 (1.3.13's HTTP/2 client segfaulted) had to touch every repo. */
+export function bunVersionProblems(repoRoot: string, ctlShellCanonical: string): string[] {
+  const want = pinnedBunVersion(ctlShellCanonical);
+  if (want === undefined) {
+    return ["@norskvideo/ctl-dev-kit build/ctl-shell.nix names no Bun version on its pin (`# bun X.Y.Z`)."];
+  }
+  const pkgPath = join(repoRoot, "package.json");
+  if (!existsSync(pkgPath)) return [];
+  let have: unknown;
+  try {
+    have = (JSON.parse(readFileSync(pkgPath, "utf8")) as { packageManager?: unknown }).packageManager;
+  } catch (e) {
+    return [`package.json is not parseable JSON (${e instanceof Error ? e.message : String(e)}).`];
+  }
+  return have === `bun@${want}`
+    ? []
+    : [
+        `package.json "packageManager" is ${JSON.stringify(have ?? null)}, not "bun@${want}": it is the Bun the ` +
+          "product's image runs, and must be the one the shell runs (@norskvideo/ctl-dev-kit build/ctl-shell.nix). " +
+          "Re-sync to set it.",
+      ];
+}
+
 // A file that must be a verbatim, byte-for-byte copy of its dev-kit canonical.
 function verbatimProblem(
   repoRoot: string,
@@ -862,6 +894,7 @@ export function checkDrift(repoRoot: string, canonical: CanonicalBytes, opts: Ch
 
   for (const p of demoProblems(repoRoot, canonical.demoShim)) push(p);
   for (const p of productLogsProblems(repoRoot)) push(p);
+  for (const p of bunVersionProblems(repoRoot, canonical.ctlShell)) push(p);
   for (const p of ctlPinProblems(repoRoot)) push(p);
 
   return { ok: problems.length === 0, problems };

package/conventions/sync-drift.ts

@@ -48,6 +48,7 @@ import {
   PRODUCT_SENTINEL,
   type ProductShape,
   PUBLISH_IMAGE_LINE,
+  pinnedBunVersion,
   RETIRED_BUMP_WORKFLOWS,
   RUNNER_LINE,
   resolveRepoName,
@@ -401,6 +402,29 @@ function syncDocsTheme(repoRoot: string, r: SyncReport): void {
   for (const rel of adrift) r.written.push(`${DOCS_SITE_DIR}/${rel}`);
 }
 
+// package.json "packageManager": the Bun the product's image runs, set to the
+// one the shell pins (build/ctl-shell.nix), so a Bun move reaches every
+// product through its sync. Only that field's value is rewritten, so the
+// file's own formatting stays. A package.json with no field is left for the
+// gate to flag.
+function syncPackageManager(repoRoot: string, ctlShell: string, r: SyncReport): void {
+  const want = pinnedBunVersion(ctlShell);
+  const path = join(repoRoot, "package.json");
+  if (want === undefined || !existsSync(path)) return;
+  const current = readFileSync(path, "utf8");
+  const field = /("packageManager"\s*:\s*")[^"]*(")/;
+  if (!field.test(current)) {
+    r.skipped.push("package.json (no packageManager to set)");
+    return;
+  }
+  writeIfChanged(
+    path,
+    current.replace(field, (_m, a: string, b: string) => `${a}bun@${want}${b}`),
+    "package.json",
+    r.written,
+  );
+}
+
 export function syncDrift(
   repoRoot: string,
   canonical: CanonicalBytes,
@@ -448,6 +472,7 @@ export function syncDrift(
 
   mkdirSync(dirname(join(repoRoot, CTL_SHELL_PATH)), { recursive: true });
   writeIfChanged(join(repoRoot, CTL_SHELL_PATH), canonical.ctlShell, CTL_SHELL_PATH, r.written);
+  syncPackageManager(repoRoot, canonical.ctlShell, r);
   syncFlake(repoRoot, flakeCanon, r);
   syncClaude(repoRoot, canonical.core, r);
   syncGitignore(repoRoot, canonical.gitignoreCore, r);

package/create-product/turnkey.ts

@@ -13,6 +13,8 @@
 // from the schema package, addComponent/stubbedLibrary with a THROWING
 // validate(), INVARIANTS + parity + byte-snapshot + studio-load wired into
 // test:unit, and an image smoke tier.
+
+import { pinnedBunVersion } from "../conventions/check-drift.ts";
 import {
   type GeneratedFile,
   PRODUCT_ZOD,
@@ -362,7 +364,8 @@ function rootPackageJson(ctx: ShapeContext): string {
         "@types/node": "^22.10.0",
         typescript: "^5.7.2",
       },
-      packageManager: "bun@1.3.13",
+      // The shell's Bun (build/ctl-shell.nix): the drift gate holds the two together.
+      packageManager: `bun@${pinnedBunVersion(ctx.canon.ctlShell)}`,
       overrides: {
         ws: "^8.20.1",
         "shell-quote": "^1.9.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@norskvideo/ctl-dev-kit",
-  "version": "0.2.67",
+  "version": "0.2.69",
   "type": "module",
   "exports": {
     "./create-product": "./create-product/create-product.ts",
@@ -38,7 +38,7 @@
   },
   "devDependencies": {
     "@norskvideo/ctl-oas-to-ts": "^0.1.0",
-    "@norskvideo/norsk-sdk": "1.3.1-2026-10-09-a8949250",
+    "@norskvideo/norsk-sdk": "1.3.1-2026-10-10-c587f1cc",
     "@norskvideo/norsk-studio": "1.30.0-2026-10-10-c2e37ae9",
     "@norskvideo/norsk-studio-builder": "1.30.0-2026-10-10-c2e37ae9",
     "@norskvideo/norsk-studio-built-ins": "1.30.0-2026-10-10-c2e37ae9",