@fabrika/app 0.9.0-dev.3 → 0.9.0-dev.4

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@fabrika/app",
-	"version": "0.9.0-dev.3",
+	"version": "0.9.0-dev.4",
 	"type": "module",
 	"license": "MIT",
 	"repository": {
@@ -93,6 +93,11 @@
 			"types": "./types/src/dev/wire.d.ts",
 			"default": "./src/dev/wire.ts"
 		},
+		"./dev/changes": {
+			"bun": "./src/dev/changes.ts",
+			"types": "./types/src/dev/changes.d.ts",
+			"default": "./src/dev/changes.ts"
+		},
 		"./agent-skill": {
 			"bun": "./src/agent-skill.ts",
 			"types": "./types/src/agent-skill.d.ts",
@@ -104,14 +109,14 @@
 		"test": "bun test --path-ignore-patterns='src/react/**' && bun test --isolate src/react"
 	},
 	"dependencies": {
-		"@fabrika/auth": "0.9.0-dev.3",
-		"@fabrika/auth-core": "0.9.0-dev.3",
-		"@fabrika/db": "0.9.0-dev.3",
-		"@fabrika/email": "0.9.0-dev.3",
-		"@fabrika/jwks": "0.9.0-dev.3",
-		"@fabrika/platform": "0.9.0-dev.3",
-		"@fabrika/platform-node": "0.9.0-dev.3",
-		"@fabrika/proxy-core": "0.9.0-dev.3",
+		"@fabrika/auth": "0.9.0-dev.4",
+		"@fabrika/auth-core": "0.9.0-dev.4",
+		"@fabrika/db": "0.9.0-dev.4",
+		"@fabrika/email": "0.9.0-dev.4",
+		"@fabrika/jwks": "0.9.0-dev.4",
+		"@fabrika/platform": "0.9.0-dev.4",
+		"@fabrika/platform-node": "0.9.0-dev.4",
+		"@fabrika/proxy-core": "0.9.0-dev.4",
 		"altcha-lib": "2.6.0",
 		"jose": "^5.9.0"
 	},

package/skill/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: fabrika-app
-version: 0.9.0-dev.3
+version: 0.9.0-dev.4
 description: >
   How to write and change a Fabrika application: src/vocabulary.ts, db/migrations/, src/db/tables.ts, the
   slices' endpoints.ts with their handlers, fabrika.contract.ts, jobs, files, webhooks, share links, connectors

package/skill/references/app-setup.md

@@ -19,20 +19,20 @@ the SPA is added with it.
 		"test": "bun test --isolate"
 	},
 	"dependencies": {
-		"@fabrika/app": "0.9.0-dev.3",
-		"@fabrika/db": "0.9.0-dev.3",
-		"@fabrika/provider-zerops": "0.9.0-dev.3",
-		"@fabrika/proxy-core": "0.9.0-dev.3",
-		"@fabrika/ui": "0.9.0-dev.3",
+		"@fabrika/app": "0.9.0-dev.4",
+		"@fabrika/db": "0.9.0-dev.4",
+		"@fabrika/provider-zerops": "0.9.0-dev.4",
+		"@fabrika/proxy-core": "0.9.0-dev.4",
+		"@fabrika/ui": "0.9.0-dev.4",
 		"kysely": "0.29.6",
 		"react": "^19.0.0",
 		"react-dom": "^19.0.0",
 		"zod": "^3.25.76"
 	},
 	"devDependencies": {
-		"@fabrika/check": "0.9.0-dev.3",
-		"@fabrika/cli": "0.9.0-dev.3",
-		"@fabrika/platform": "0.9.0-dev.3",
+		"@fabrika/check": "0.9.0-dev.4",
+		"@fabrika/cli": "0.9.0-dev.4",
+		"@fabrika/platform": "0.9.0-dev.4",
 		"@happy-dom/global-registrator": "^20.11.2",
 		"@types/bun": "latest",
 		"@types/react": "^19.0.0",

package/src/dev/launcher.ts

@@ -18,7 +18,7 @@ import { fileURLToPath } from 'node:url'
 import { z } from 'zod/v4'
 import { makeProcessUndumpable } from '../undumpable.js'
 import { bootstrapReason, migrationsChanged, webSourceChanged } from './changes.js'
-import { OutputRing, type OutputSink, processOutput, readLines } from './output.js'
+import { OutputRing, type OutputSink, type OutputStream, processOutput, readLines } from './output.js'
 import {
 	DEV_SOURCE_REPORT_PATH,
 	DEV_SOURCE_WAIT_MS,
@@ -123,9 +123,14 @@ interface RunningApplication {
 
 interface CommandResult {
 	readonly exitCode: number | null
+	/** The signal that ended the command, when one did: it never exited on its own. */
+	readonly signal: string | null
 	readonly lines: readonly string[]
 }
 
+/** Bun echoes the script it runs (`$ bun build-web.ts`) on stderr; it names the command, not a failure. */
+const BUN_SCRIPT_ECHO = /^\$ \S/
+
 type SyncOutcome =
 	| { readonly kind: 'applied'; readonly migrations: boolean; readonly spaFailure: string | null }
 	| { readonly kind: 'refused'; readonly reason: string }
@@ -329,6 +334,8 @@ class Launcher {
 		let changed = boot
 		let migrate = boot
 		let spaFailure: string | null = null
+		const reset = answer.reset > (this.state.reset ?? answer.reset)
+		if (answer.sync !== null || reset) this.ring.mark()
 		if (answer.sync !== null) {
 			const outcome = await this.writeSync(answer.sync)
 			if (outcome.kind === 'refused') {
@@ -343,7 +350,6 @@ class Launcher {
 				spaFailure = outcome.spaFailure
 			}
 		}
-		const reset = answer.reset > (this.state.reset ?? answer.reset)
 		if (changed || reset) await this.converge({ migrate: migrate || reset, reset, spaFailure, resetTo: answer.reset })
 		if (answer.checks > (this.state.checks ?? answer.checks)) await this.check(answer.checks)
 	}
@@ -483,7 +489,12 @@ class Launcher {
 
 	private async buildSpa(): Promise<string | null> {
 		for (const command of this.config.spaBuild) {
-			const result = await this.run(['sh', '-c', command], this.commandEnvironment)
+			const result = await this.run(
+				['sh', '-c', command],
+				this.commandEnvironment,
+				CHECK_TIMEOUT_MS,
+				(stream, line) => stream === 'stderr' && BUN_SCRIPT_ECHO.test(line) ? 'stdout' : stream,
+			)
 			if (result.exitCode !== 0) return `the SPA command \`${command}\` failed: ${lastLine(result)}`
 		}
 		return null
@@ -498,12 +509,15 @@ class Launcher {
 			this.say(`check ${check.name}: ${check.command}`)
 			const started = performance.now()
 			const result = await this.run(['sh', '-c', check.command], this.commandEnvironment, CHECK_TIMEOUT_MS)
+			const durationMs = Math.round(performance.now() - started)
+			const killed = result.signal === null ? [] : [killedLine(check.name, result.signal, durationMs >= CHECK_TIMEOUT_MS)]
+			for (const line of killed) this.say(line, 'stderr')
 			results.push({
 				name: check.name,
 				ok: result.exitCode === 0,
 				exitCode: result.exitCode,
-				durationMs: Math.round(performance.now() - started),
-				output: result.lines.slice(-CHECK_OUTPUT_LINES).map((line) => line.slice(0, 2_000)),
+				durationMs,
+				output: [...result.lines.slice(-(CHECK_OUTPUT_LINES - killed.length)), ...killed].map((line) => line.slice(0, 2_000)),
 			})
 		}
 		this.checkResults = { request, head: this.state.head, results }
@@ -515,17 +529,22 @@ class Launcher {
 	}
 
 	/** Run a command in the root; its output goes to the log, and its lines are returned. */
-	private async run(argv: readonly string[], env: Record<string, string>, timeoutMs = CHECK_TIMEOUT_MS): Promise<CommandResult> {
+	private async run(
+		argv: readonly string[],
+		env: Record<string, string>,
+		timeoutMs = CHECK_TIMEOUT_MS,
+		classify: (stream: OutputStream, line: string) => OutputStream = (stream) => stream,
+	): Promise<CommandResult> {
 		const child = Bun.spawn([...argv], { cwd: this.root, env, stdin: 'ignore', stdout: 'pipe', stderr: 'pipe' })
 		const lines: string[] = []
-		const collect = (stream: 'stdout' | 'stderr') => (line: string) => {
+		const collect = (stream: OutputStream) => (line: string) => {
 			lines.push(line)
-			this.ring.push(stream, line)
+			this.ring.push(classify(stream, line), line)
 		}
 		const timer = setTimeout(() => child.kill('SIGKILL'), timeoutMs)
 		await Promise.all([readLines(child.stdout, collect('stdout')), readLines(child.stderr, collect('stderr')), child.exited])
 		clearTimeout(timer)
-		return { exitCode: child.exitCode, lines }
+		return { exitCode: child.exitCode, signal: child.signalCode === null ? null : String(child.signalCode), lines }
 	}
 
 	private async restartApplication(): Promise<string | null> {
@@ -609,6 +628,12 @@ class Launcher {
 	}
 }
 
+/** Why a check has no exit code: the launcher's timeout, or a signal from outside, most often the out-of-memory killer. */
+const killedLine = (name: string, signal: string, timedOut: boolean): string =>
+	timedOut
+		? `check ${name} was killed (${signal}) after the ${CHECK_TIMEOUT_MS / 60_000}-minute timeout; it failed`
+		: `check ${name} was killed (${signal}) before it finished, most likely because the container ran out of memory; it failed`
+
 const lastLine = (result: CommandResult): string => [...result.lines].reverse().find((line) => line.trim() !== '')?.trim() ?? 'no output'
 
 /** The process environment with its string values only. */

package/src/dev/output.ts

@@ -16,10 +16,14 @@ export const processOutput: OutputSink = {
 	},
 }
 
-/** The newest `capacity` lines, numbered from 0 since the launcher started, with every known secret value replaced. */
+/**
+ * The newest `capacity` lines, numbered from 0 since the launcher started, with every known secret value replaced. A
+ * mark starts the lines a report carries: those of the newest sync or reset, and the output after it.
+ */
 export class OutputRing {
 	private readonly lines: DevLogLine[] = []
 	private next = 0
+	private marked = 0
 
 	constructor(private readonly capacity: number, private readonly secrets: readonly string[], private readonly sink: OutputSink) {}
 
@@ -31,9 +35,15 @@ export class OutputRing {
 		if (this.lines.length > this.capacity) this.lines.shift()
 	}
 
-	/** The newest `count` lines, oldest first. */
+	/** Report from the next line on: the lines before it belong to an older head. */
+	mark(): void {
+		this.marked = this.next
+	}
+
+	/** The newest `count` lines since the mark, oldest first. */
 	tail(count: number): DevLogLine[] {
-		return this.lines.slice(Math.max(0, this.lines.length - count))
+		const since = this.lines.filter((line) => line.n >= this.marked)
+		return since.slice(Math.max(0, since.length - count))
 	}
 
 	private redact(text: string): string {

package/types/src/dev/output.d.ts

@@ -5,16 +5,22 @@ export interface OutputSink {
 }
 /** The launcher process's own stdout and stderr. */
 export declare const processOutput: OutputSink;
-/** The newest `capacity` lines, numbered from 0 since the launcher started, with every known secret value replaced. */
+/**
+ * The newest `capacity` lines, numbered from 0 since the launcher started, with every known secret value replaced. A
+ * mark starts the lines a report carries: those of the newest sync or reset, and the output after it.
+ */
 export declare class OutputRing {
     private readonly capacity;
     private readonly secrets;
     private readonly sink;
     private readonly lines;
     private next;
+    private marked;
     constructor(capacity: number, secrets: readonly string[], sink: OutputSink);
     push(stream: OutputStream, text: string): void;
-    /** The newest `count` lines, oldest first. */
+    /** Report from the next line on: the lines before it belong to an older head. */
+    mark(): void;
+    /** The newest `count` lines since the mark, oldest first. */
     tail(count: number): DevLogLine[];
     private redact;
 }