substrate-ai 0.1.25 → 0.1.26

package/dist/cli/index.js

@@ -9,7 +9,7 @@ import { fileURLToPath } from "url";
 import { dirname, extname, isAbsolute, join, relative, resolve } from "path";
 import { access, mkdir, readFile, readdir, stat, writeFile } from "fs/promises";
 import { execFile } from "child_process";
-import { cpSync, existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, renameSync, statSync, unlinkSync, writeFileSync } from "fs";
+import { chmodSync, cpSync, existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, renameSync, statSync, unlinkSync, writeFileSync } from "fs";
 import yaml, { dump, load } from "js-yaml";
 import { z } from "zod";
 import { fileURLToPath as fileURLToPath$1 } from "node:url";
@@ -6786,6 +6786,41 @@ Initialize a methodology pack and decision store.
 \`\`\`
 substrate auto init [--pack bmad] [--project-root .]
 \`\`\`
+
+### substrate auto supervisor
+Long-running process that monitors pipeline health, kills stalled runs, and auto-restarts.
+
+\`\`\`
+substrate auto supervisor [options]
+\`\`\`
+
+Options:
+- \`--poll-interval <seconds>\` — Health check interval (default: 60)
+- \`--stall-threshold <seconds>\` — Staleness before killing (default: 600)
+- \`--max-restarts <n>\` — Maximum restart attempts (default: 3)
+- \`--output-format <format>\` — Output format: human (default) or json
+
+Exit codes: 0 = all succeeded, 1 = failures/escalations, 2 = max restarts exceeded.
+
+### substrate auto metrics
+Show historical pipeline run metrics and cross-run comparison.
+
+\`\`\`
+substrate auto metrics [options]
+\`\`\`
+
+Options:
+- \`--limit <n>\` — Number of runs to show (default: 10)
+- \`--compare <run-id-a,run-id-b>\` — Compare two runs side-by-side (token, time, review cycle deltas)
+- \`--tag-baseline <run-id>\` — Mark a run as the performance baseline
+- \`--output-format <format>\` — Output format: human (default) or json
+
+### substrate auto health
+Check pipeline health, stall detection, and process status.
+
+\`\`\`
+substrate auto health [--output-format json]
+\`\`\`
 `;
 }
 /**
@@ -8385,6 +8420,12 @@ function writeStoryMetrics(db, input) {
 	stmt.run(input.run_id, input.story_key, input.result, input.phase_durations_json ?? null, input.started_at ?? null, input.completed_at ?? null, input.wall_clock_seconds ?? 0, input.input_tokens ?? 0, input.output_tokens ?? 0, input.cost_usd ?? 0, input.review_cycles ?? 0, input.dispatches ?? 0);
 }
 /**
+* Get all story metrics for a given run.
+*/
+function getStoryMetricsForRun(db, runId) {
+	return db.prepare("SELECT * FROM story_metrics WHERE run_id = ? ORDER BY id ASC").all(runId);
+}
+/**
 * Compare two runs and return percentage deltas for key numeric fields.
 * Positive deltas mean run B is larger/longer than run A.
 * Returns null if either run does not exist.
@@ -8432,6 +8473,27 @@ function aggregateTokenUsageForRun(db, runId) {
 		cost: 0
 	};
 }
+/**
+* Aggregate token usage for a specific story within a pipeline run.
+* Matches rows where the metadata JSON contains the given storyKey.
+*/
+function aggregateTokenUsageForStory(db, runId, storyKey) {
+	const row = db.prepare(`
+    SELECT
+      COALESCE(SUM(input_tokens), 0) as input,
+      COALESCE(SUM(output_tokens), 0) as output,
+      COALESCE(SUM(cost_usd), 0) as cost
+    FROM token_usage
+    WHERE pipeline_run_id = ?
+      AND metadata IS NOT NULL
+      AND json_extract(metadata, '$.storyKey') = ?
+  `).get(runId, storyKey);
+	return row ?? {
+		input: 0,
+		output: 0,
+		cost: 0
+	};
+}
 
 //#endregion
 //#region src/modules/compiled-workflows/prompt-assembler.ts
@@ -10444,6 +10506,7 @@ function createImplementationOrchestrator(deps) {
 			const startedAt = storyState?.startedAt;
 			const completedAt = storyState?.completedAt ?? new Date().toISOString();
 			const wallClockSeconds = startedAt ? Math.round((new Date(completedAt).getTime() - new Date(startedAt).getTime()) / 1e3) : 0;
+			const tokenAgg = aggregateTokenUsageForStory(db, config.pipelineRunId, storyKey);
 			writeStoryMetrics(db, {
 				run_id: config.pipelineRunId,
 				story_key: storyKey,
@@ -10452,6 +10515,9 @@ function createImplementationOrchestrator(deps) {
 				started_at: startedAt,
 				completed_at: completedAt,
 				wall_clock_seconds: wallClockSeconds,
+				input_tokens: tokenAgg.input,
+				output_tokens: tokenAgg.output,
+				cost_usd: tokenAgg.cost,
 				review_cycles: reviewCycles,
 				dispatches: _storyDispatches.get(storyKey) ?? 0
 			});
@@ -15728,6 +15794,19 @@ const BMAD_BASELINE_TOKENS = 23800;
 /** Story key pattern: <epic>-<story> e.g. "10-1" */
 const STORY_KEY_PATTERN = /^\d+-\d+$/;
 /**
+* Top-level keys in .claude/settings.json that substrate owns.
+* On init, these are set/updated unconditionally.
+* User-defined keys outside this set are never touched.
+*/
+const SUBSTRATE_OWNED_SETTINGS_KEYS = ["statusLine"];
+function getSubstrateDefaultSettings() {
+	return { statusLine: {
+		type: "command",
+		command: "bash \"$CLAUDE_PROJECT_DIR\"/.claude/statusline.sh",
+		padding: 0
+	} };
+}
+/**
 * Format output according to the requested format.
 */
 function formatOutput(data, format, success = true, errorMessage) {
@@ -16028,6 +16107,54 @@ async function scaffoldClaudeMd(projectRoot) {
 	await writeFile(claudeMdPath, newContent, "utf8");
 	logger$3.info({ claudeMdPath }, "Wrote substrate section to CLAUDE.md");
 }
+/**
+* Scaffold the statusline script from the bundled template.
+*
+* Always overwrites — substrate fully owns this file.
+*/
+async function scaffoldStatuslineScript(projectRoot) {
+	const pkgRoot = findPackageRoot(__dirname);
+	const templateName = "statusline.sh";
+	let templatePath = join(pkgRoot, "dist", "cli", "templates", templateName);
+	if (!existsSync(templatePath)) templatePath = join(pkgRoot, "src", "cli", "templates", templateName);
+	let content;
+	try {
+		content = await readFile(templatePath, "utf8");
+	} catch {
+		logger$3.warn({ templatePath }, "statusline.sh template not found; skipping");
+		return;
+	}
+	const claudeDir = join(projectRoot, ".claude");
+	const statuslinePath = join(claudeDir, "statusline.sh");
+	mkdirSync(claudeDir, { recursive: true });
+	await writeFile(statuslinePath, content, "utf8");
+	chmodSync(statuslinePath, 493);
+	logger$3.info({ statuslinePath }, "Wrote .claude/statusline.sh");
+}
+/**
+* Scaffold or merge .claude/settings.json with substrate-owned settings.
+*
+* Merge strategy:
+* - Keys in SUBSTRATE_OWNED_SETTINGS_KEYS are set/updated unconditionally.
+* - All other keys (permissions, hooks, etc.) are preserved as-is.
+* - $schema is added only if not already present.
+*/
+async function scaffoldClaudeSettings(projectRoot) {
+	const claudeDir = join(projectRoot, ".claude");
+	const settingsPath = join(claudeDir, "settings.json");
+	let existing = {};
+	try {
+		const raw = await readFile(settingsPath, "utf8");
+		existing = JSON.parse(raw);
+	} catch {}
+	const defaults = getSubstrateDefaultSettings();
+	const merged = { ...existing };
+	for (const key of SUBSTRATE_OWNED_SETTINGS_KEYS) merged[key] = defaults[key];
+	if (!merged["$schema"]) merged["$schema"] = "https://json.schemastore.org/claude-code-settings.json";
+	mkdirSync(claudeDir, { recursive: true });
+	await writeFile(settingsPath, JSON.stringify(merged, null, 2) + "\n", "utf8");
+	logger$3.info({ settingsPath }, "Wrote substrate settings to .claude/settings.json");
+}
 async function runAutoInit(options) {
 	const { pack: packName, projectRoot, outputFormat, force = false } = options;
 	const packPath = join(projectRoot, "packs", packName);
@@ -16076,6 +16203,8 @@ async function runAutoInit(options) {
 		runMigrations(dbWrapper.db);
 		dbWrapper.close();
 		await scaffoldClaudeMd(projectRoot);
+		await scaffoldStatuslineScript(projectRoot);
+		await scaffoldClaudeSettings(projectRoot);
 		const successMsg = `Pack '${packName}' and database initialized successfully at ${dbPath}`;
 		if (outputFormat === "json") process.stdout.write(formatOutput({
 			pack: packName,
@@ -16260,7 +16389,8 @@ async function runAutoRun(options) {
 						agent: "claude-code",
 						input_tokens: input,
 						output_tokens: output,
-						cost_usd: costUsd
+						cost_usd: costUsd,
+						metadata: JSON.stringify({ storyKey: payload.storyKey })
 					});
 				}
 			} catch (err) {
@@ -16526,10 +16656,13 @@ async function runAutoRun(options) {
 			const runEndMs = Date.now();
 			const runStartMs = new Date(pipelineRun.created_at).getTime();
 			const tokenAgg = aggregateTokenUsageForRun(db, pipelineRun.id);
+			const storyMetrics = getStoryMetricsForRun(db, pipelineRun.id);
+			const totalReviewCycles = storyMetrics.reduce((sum, m) => sum + (m.review_cycles ?? 0), 0);
+			const totalDispatches = storyMetrics.reduce((sum, m) => sum + (m.dispatches ?? 0), 0);
 			writeRunMetrics(db, {
 				run_id: pipelineRun.id,
 				methodology: pack.manifest.name,
-				status: failedKeys.length > 0 ? "failed" : "completed",
+				status: failedKeys.length > 0 || escalatedKeys.length > 0 ? "failed" : "completed",
 				started_at: pipelineRun.created_at,
 				completed_at: new Date().toISOString(),
 				wall_clock_seconds: Math.round((runEndMs - runStartMs) / 1e3),
@@ -16540,6 +16673,8 @@ async function runAutoRun(options) {
 				stories_succeeded: succeededKeys.length,
 				stories_failed: failedKeys.length,
 				stories_escalated: escalatedKeys.length,
+				total_review_cycles: totalReviewCycles,
+				total_dispatches: totalDispatches,
 				concurrency_setting: concurrency
 			});
 		} catch (metricsErr) {
@@ -17573,7 +17708,7 @@ async function runAutoSupervisor(options, deps = {}) {
 		if (health.verdict === "NO_PIPELINE_RUNNING") {
 			const elapsedSeconds = Math.round((Date.now() - startTime) / 1e3);
 			const succeeded = Object.entries(health.stories.details).filter(([, s]) => s.phase === "COMPLETE").map(([k]) => k);
-			const failed = Object.entries(health.stories.details).filter(([, s]) => s.phase !== "COMPLETE" && s.phase !== "PENDING").map(([k]) => k);
+			const failed = Object.entries(health.stories.details).filter(([, s]) => s.phase !== "COMPLETE" && s.phase !== "PENDING" && s.phase !== "ESCALATED").map(([k]) => k);
 			const escalated = Object.entries(health.stories.details).filter(([, s]) => s.phase === "ESCALATED").map(([k]) => k);
 			emitEvent$1({
 				type: "supervisor:summary",
@@ -17585,7 +17720,7 @@ async function runAutoSupervisor(options, deps = {}) {
 				restarts: restartCount
 			});
 			log(`\nPipeline reached terminal state. Elapsed: ${elapsedSeconds}s | succeeded: ${succeeded.length} | failed: ${failed.length} | restarts: ${restartCount}`);
-			return failed.length > 0 ? 1 : 0;
+			return failed.length > 0 || escalated.length > 0 ? 1 : 0;
 		}
 		if (health.staleness_seconds >= stallThreshold) {
 			const pids = [...health.process.orchestrator_pid !== null ? [health.process.orchestrator_pid] : [], ...health.process.child_pids];
@@ -17637,22 +17772,23 @@ async function runAutoSupervisor(options, deps = {}) {
 				attempt: restartCount
 			});
 			log(`Supervisor: Restarting pipeline (attempt ${restartCount}/${maxRestarts})`);
-			resumePipeline({
-				runId: health.run_id ?? void 0,
-				outputFormat,
-				projectRoot,
-				concurrency: 3,
-				pack
-			}).catch((err) => {
+			try {
+				await resumePipeline({
+					runId: health.run_id ?? void 0,
+					outputFormat,
+					projectRoot,
+					concurrency: 3,
+					pack
+				});
+			} catch (err) {
 				const message = err instanceof Error ? err.message : String(err);
 				log(`Supervisor: Resume error: ${message}`);
-				if (outputFormat === "json") process.stderr.write(JSON.stringify({
+				if (outputFormat === "json") emitEvent$1({
 					type: "supervisor:error",
 					reason: "resume_failed",
-					message,
-					ts: new Date().toISOString()
-				}) + "\n");
-			});
+					message
+				});
+			}
 		}
 		await sleep(pollInterval * 1e3);
 	}

package/dist/cli/templates/statusline.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+# Substrate AI — persistent status line
+# Receives JSON on stdin with session metadata
+
+input=$(cat)
+
+MODEL=$(echo "$input" | jq -r '.model.display_name // "Claude"' 2>/dev/null)
+PCT=$(echo "$input" | jq -r '.context_window.used_percentage // 0' 2>/dev/null | cut -d. -f1)
+COST=$(echo "$input" | jq -r '.session.cost // "0.00"' 2>/dev/null)
+BRANCH=$(echo "$input" | jq -r '.git.branch // ""' 2>/dev/null)
+
+BRANCH_PART=""
+if [ -n "$BRANCH" ]; then
+  BRANCH_PART=" | $BRANCH"
+fi
+
+echo "⚡ substrate-ai | $MODEL | ctx ${PCT}% | \$${COST}${BRANCH_PART}"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "substrate-ai",
-  "version": "0.1.25",
+  "version": "0.1.26",
   "description": "Substrate — multi-agent orchestration daemon for AI coding agents",
   "type": "module",
   "license": "MIT",