@steve31415/baselib 3.36.0 → 3.36.1

package/dist/deploy/deploy.js

@@ -15,6 +15,20 @@ import { acquireLock, clearHold, publishRetainedAssets, readHold, readReleaseRec
 import { consistentBaseSha, readServingState, SHA40 } from './plan.js';
 const RELEASE_DEADLINE_MS = 25 * 60_000;
 const IMAGE_DIGEST = /@sha256:[0-9a-f]{64}$/;
+const MAX_DIRTY_PATHS = 20;
+/** The clean-worktree refusal, naming what made the tree dirty (`git status
+ * --porcelain` lines) so the reader need not go and look (2026-10-11: games'
+ * deploy checkout held untracked Cloudflare-era build outputs). */
+function dirtyWorktreeMessage(porcelain) {
+    const lines = porcelain.split('\n').filter((l) => l.trim() !== '');
+    const shown = lines.slice(0, MAX_DIRTY_PATHS);
+    const more = lines.length - shown.length;
+    return [
+        'deploys require a clean worktree; uncommitted or untracked files:',
+        ...shown.map((l) => `  ${l}`),
+        ...(more > 0 ? [`  … and ${more} more`] : []),
+    ].join('\n');
+}
 export async function runDeploy(options) {
     const log = options.log ?? ((m) => console.error(`[pw-deploy] ${m}`));
     const runner = options.runner;
@@ -37,9 +51,9 @@ export async function runDeploy(options) {
             throw new Error('deploys run from main');
         const dirty = (await must(runner, 'git', ['status', '--porcelain=v1', '--untracked-files=all'], {
             cwd: options.repoRoot,
-        })).stdout.trim();
-        if (dirty)
-            throw new Error('deploys require a clean worktree');
+        })).stdout;
+        if (dirty.trim())
+            throw new Error(dirtyWorktreeMessage(dirty));
         const sha = (await must(runner, 'git', ['rev-parse', 'HEAD'], { cwd: options.repoRoot })).stdout.trim();
         const originMain = (await must(runner, 'git', ['rev-parse', 'origin/main'], { cwd: options.repoRoot })).stdout.trim();
         if (sha !== originMain)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steve31415/baselib",
-  "version": "3.36.0",
+  "version": "3.36.1",
   "description": "Plasticine new-world shared platform library: logging, auth, service-to-service auth, db, HTTP, sync, app updates",
   "type": "module",
   "license": "MIT",