@preventive/triage 1.0.0-alpha.29 → 1.0.0-alpha.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@preventive/triage",
-  "version": "1.0.0-alpha.29",
+  "version": "1.0.0-alpha.30",
   "description": "Client & relay server for triaging of automated reports",
   "license": "MIT OR Apache-2.0",
   "author": {
@@ -32,6 +32,7 @@
     "./reap": "./api/reap.ts",
     "./server": "./server.ts",
     "./server-e2e": "./server-e2e/index.ts",
+    "./bundle-build-worker": "./server-managed/bundle-build-worker.js",
     "./strip-types-loader": "./strip-types-loader.js",
     "./package.json": "./package.json"
   },
@@ -172,6 +173,8 @@
     "server-common/storage-crypto.ts",
     "server-common/vercel-blob.ts",
     "server-common/scan-config.ts",
+    "common/bundle-commit.d.ts",
+    "common/bundle-commit.js",
     "common/bundle-metadata.d.ts",
     "common/bundle-metadata.js",
     "common/bundle-reasons.d.ts",
@@ -248,6 +251,7 @@
     "@stylistic/stylelint-plugin": "^5.3.0",
     "@types/node": "^26.2.0",
     "@types/ws": "^8.18.1",
+    "@vercel/functions": "^3.9.11",
     "brotli": "^1.3.3",
     "esbuild": "^0.28.2",
     "lit": "^3.3.3",
@@ -263,12 +267,12 @@
     "@exodus/stasis-core": "1.0.0-beta.5",
     "@preventive/report": "1.0.0-alpha.4",
     "@preventive/upstream": "1.0.0-alpha.4",
-    "@vercel/functions": "^3.9.11",
     "ws": "^8.20.1"
   },
   "peerDependencies": {
     "@neondatabase/serverless": "^1.0.2",
-    "@vercel/blob": "^2.3.3"
+    "@vercel/blob": "^2.3.3",
+    "@vercel/functions": "^3.9.11"
   },
   "peerDependenciesMeta": {
     "@neondatabase/serverless": {
@@ -276,6 +280,9 @@
     },
     "@vercel/blob": {
       "optional": true
+    },
+    "@vercel/functions": {
+      "optional": true
     }
   },
   "packageManager": "pnpm@10.33.4+sha512.1c67b3b359b2d408119ba1ed289f34b8fc3c6873412bec6fd264fbdc82489e510fcbecb9ce9d22dae7f3b76269d8441046014bdca53b9979cd7a561ad631b800"

package/server-managed/bundle-cache.ts

@@ -19,7 +19,7 @@ const MAX_DECODED_BYTES = 512 * 1024 * 1024
 export const MAX_PACKAGE_INVENTORY_BYTES = 1024 * 1024
 export type BundleCachePart = 'metadata' | 'contents'
 export type BundleCacheRecord = Pick<ManagedBundle, 'id' | 'integrity' | 'filename' | 'kind' | 'byteSize'>
-export interface BundleSummary { files: number; codeFiles: number; lines: number }
+export interface BundleSummary { files: number; codeFiles: number; lines: number; commit?: string }
 
 export async function readBundleDetails(record: BundleCacheRecord, store: BundleStore) {
   const bytes = await store.get(record.id, record.kind)

package/server-managed/bundle-summary-cache.ts

@@ -2,10 +2,11 @@ import { Buffer } from 'node:buffer'
 import { setImmediate } from 'node:timers/promises'
 import { CacheMissError } from './cache-storage.ts'
 import { decodeUtf8 } from '../common/utf8.js'
+import { bundleCommitHash } from '../common/bundle-commit.js'
 import type { BundleCacheRecord, BundleCacheStorage, BundleSummary } from './bundle-cache.ts'
 
-// Origin metadata does not change these counts; retain the byte-sized v2 cache.
-export const SUMMARY_FILENAME = 'v2-summary.json'
+// Version 3 adds the optional source commit; older bundles use bounded backfill.
+export const SUMMARY_FILENAME = 'v3-summary.json'
 const RETRY_MS = 5 * 60_000
 const BACKFILL_LIMIT = 4
 type CachedSummary = BundleSummary | { retryAt: number }
@@ -24,7 +25,7 @@ async function readSummary(storage: BundleCacheStorage, id: string): Promise<Cac
     if (summary && 'retryAt' in summary && Number.isSafeInteger(summary.retryAt) && summary.retryAt > 0) return summary
     const counts = summary as BundleSummary
     if (!counts || ![counts.files, counts.codeFiles, counts.lines].every(value => Number.isSafeInteger(value) && value >= 0)
-        || counts.codeFiles > counts.files) throw new Error('Invalid bundle summary')
+        || counts.codeFiles > counts.files || (counts.commit !== undefined && !bundleCommitHash(counts.commit))) throw new Error('Invalid bundle summary')
     return counts
   } finally { cached.stream.destroy() }
 }

package/server-managed/http.ts

@@ -1175,16 +1175,16 @@ async function handleListBundles(res: ServerResponse, deps: ManagedHttpDeps, ses
   await backfillBundleSummaries(catalog.bundles, deps.bundleCache)
 }
 
-type UploadedBundle = Pick<ManagedBundle, 'id' | 'integrity' | 'filename' | 'byteSize' | 'repoId' | 'repoDirectory'>
+type UploadedBundle = Pick<ManagedBundle, 'id' | 'slug' | 'integrity' | 'filename' | 'byteSize' | 'repoId' | 'repoDirectory'>
 async function sendUploadedBundle(req: IncomingMessage, res: ServerResponse, deps: ManagedHttpDeps, cookie: string | undefined, bundle: UploadedBundle, deduped: boolean): Promise<void> {
   const s = await manageMutation(req, res, deps, cookie)
   if (!s) return
   if (deduped && !(await canAccessBundle(deps, s.user, bundle.id))) { sendJson(res, 409, { error: 'bundle-conflict' }); return }
-  const { id, integrity, filename, byteSize, repoId, repoDirectory } = bundle
+  const { id, slug, integrity, filename, byteSize, repoId, repoDirectory } = bundle
   // Re-uploading also repairs reports uploaded while the bundle was inaccessible.
   await deps.db.linkReportsToBundle(integrity, id, s.user.role === 'admin' ? undefined : s.user.id)
   prebuildBundle(deps, id)
-  sendJson(res, deduped ? 200 : 201, { id, integrity, filename, repoId, repoDirectory, ...(deduped ? { deduped: true } : { byteSize }) })
+  sendJson(res, deduped ? 200 : 201, { id, slug, integrity, filename, repoId, repoDirectory, ...(deduped ? { deduped: true } : { byteSize }) })
 }
 
 async function handleCreateBundle(req: IncomingMessage, res: ServerResponse, deps: ManagedHttpDeps, cookie: string | undefined): Promise<void> {
@@ -1327,7 +1327,9 @@ async function storeUploadedBundle(req: IncomingMessage, res: ServerResponse, de
     if (raced.id !== id) { await sendUploadedBundle(req, res, deps, cookie, raced, true); return }
     // Our insert committed: continue with the ordinary creation response.
   }
-  await sendUploadedBundle(req, res, deps, cookie, { id, integrity, filename, byteSize: bytes.length, repoId, repoDirectory: directory }, false)
+  const stored = await deps.db.getBundle(id)
+  if (!stored) { sendJson(res, 404, { error: 'no-bundle' }); return }
+  await sendUploadedBundle(req, res, deps, cookie, stored, false)
 }
 
 // GET /api/admin/bundles/<id> — download a stored bundle (admin|manage). Bytes

package/server-managed/storage-maintenance.ts

@@ -4,6 +4,22 @@ import { type StorageDb, type StorageEncryptionState, type StorageMigrationRow,
 import { STORAGE_UPLOAD_TTL_MS } from './storage-encryption.ts'
 import { StoragePayloadError, inspectStorageObject, storageOwner, storageRowPath, verifyStoragePayload } from './storage-payload.ts'
 
+async function replacementFailure(raw: RawObjectStorage, identity: string, version: string, signal: AbortSignal): Promise<string> {
+  const format = (value: string) => value.startsWith('W/') ? 'weak' : value.startsWith('"') && value.endsWith('"') ? 'quoted' : 'unquoted'
+  const reason = `Conditional replacement rejected (object version precondition failed); download=${format(version)}`
+  // Diagnose only failed writes. A metadata read cannot authorize a retry with
+  // a different version: the downloaded bytes must remain bound to their own.
+  let current
+  try { current = await raw.head(identity, signal) }
+  catch { return `${reason}; metadata=unavailable` }
+  if (!current) return `${reason}; metadata=missing`
+  // Normalization is diagnostic only. Never use it for conditional writes or
+  // log the actual ETags, which can contain hashes of private payloads.
+  const value = (tag: string) => tag.replace(/^W\//u, '').replace(/^"(.*)"$/u, '$1')
+  const comparison = current.version === version ? 'same' : value(current.version) === value(version) ? 'format-only' : 'different'
+  return `${reason}; metadata=${format(current.version)}; comparison=${comparison}`
+}
+
 async function migrateRow(raw: RawObjectStorage, db: StorageDb, key: StorageKey, item: StorageMigrationRow, signal: AbortSignal): Promise<string | void> {
   if (item.type === 'user') { await db.migrateStorageUserTokens(item.id); return }
   const row = await db.ensureStorageDataKey(item.type, item.id)
@@ -39,7 +55,7 @@ async function migrateRow(raw: RawObjectStorage, db: StorageDb, key: StorageKey,
       let replaced: boolean
       try { replaced = await raw.put(identity, encrypted, signal, source.version, current.size ?? undefined) }
       finally { encrypted.destroy(); current.stream.destroy() }
-      if (!replaced) return 'Conditional replacement rejected (object version precondition failed)'
+      if (!replaced) return await replacementFailure(raw, identity, source.version, signal)
       // Do not mark the row encrypted until the stored bytes authenticate and
       // match the original upload (including decompression for sourcemaps).
       const replacement = await raw.open(identity, signal)