smithers-orchestrator 0.25.0 → 0.25.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "smithers-orchestrator",
-  "version": "0.25.0",
+  "version": "0.25.1",
   "description": "Public Smithers facade for durable coding-agent workflows and Gateway operation",
   "license": "MIT",
   "homepage": "https://smithers.sh",
@@ -92,28 +92,28 @@
     "incur": "^0.4.1",
     "react": "^19.2.5",
     "zod": "^4.3.6",
-    "@smithers-orchestrator/agents": "0.25.0",
-    "@smithers-orchestrator/components": "0.25.0",
-    "@smithers-orchestrator/control-plane": "0.25.0",
-    "@smithers-orchestrator/db": "0.25.0",
-    "@smithers-orchestrator/engine": "0.25.0",
-    "@smithers-orchestrator/driver": "0.25.0",
-    "@smithers-orchestrator/errors": "0.25.0",
-    "@smithers-orchestrator/gateway-client": "0.25.0",
-    "@smithers-orchestrator/gateway-react": "0.25.0",
-    "@smithers-orchestrator/graph": "0.25.0",
-    "@smithers-orchestrator/memory": "0.25.0",
-    "@smithers-orchestrator/observability": "0.25.0",
-    "@smithers-orchestrator/openapi": "0.25.0",
-    "@smithers-orchestrator/react-reconciler": "0.25.0",
-    "@smithers-orchestrator/sandbox": "0.25.0",
-    "@smithers-orchestrator/scorers": "0.25.0",
-    "@smithers-orchestrator/scheduler": "0.25.0",
-    "@smithers-orchestrator/server": "0.25.0",
-    "@smithers-orchestrator/time-travel": "0.25.0",
-    "@smithers-orchestrator/vcs": "0.25.0",
-    "@smithers-orchestrator/cli": "0.25.0",
-    "@smithers-orchestrator/tool-context": "0.25.0"
+    "@smithers-orchestrator/agents": "0.25.1",
+    "@smithers-orchestrator/db": "0.25.1",
+    "@smithers-orchestrator/engine": "0.25.1",
+    "@smithers-orchestrator/errors": "0.25.1",
+    "@smithers-orchestrator/components": "0.25.1",
+    "@smithers-orchestrator/cli": "0.25.1",
+    "@smithers-orchestrator/control-plane": "0.25.1",
+    "@smithers-orchestrator/memory": "0.25.1",
+    "@smithers-orchestrator/gateway-client": "0.25.1",
+    "@smithers-orchestrator/observability": "0.25.1",
+    "@smithers-orchestrator/driver": "0.25.1",
+    "@smithers-orchestrator/openapi": "0.25.1",
+    "@smithers-orchestrator/react-reconciler": "0.25.1",
+    "@smithers-orchestrator/gateway-react": "0.25.1",
+    "@smithers-orchestrator/sandbox": "0.25.1",
+    "@smithers-orchestrator/scheduler": "0.25.1",
+    "@smithers-orchestrator/scorers": "0.25.1",
+    "@smithers-orchestrator/server": "0.25.1",
+    "@smithers-orchestrator/time-travel": "0.25.1",
+    "@smithers-orchestrator/tool-context": "0.25.1",
+    "@smithers-orchestrator/graph": "0.25.1",
+    "@smithers-orchestrator/vcs": "0.25.1"
   },
   "optionalDependencies": {
     "@electric-sql/pglite": "0.5.1",

package/src/bin/smithers-delegation.js

@@ -0,0 +1,98 @@
+import { existsSync, readFileSync } from "node:fs";
+import { dirname, parse, resolve } from "node:path";
+
+const WORKFLOW_PATH_COMMANDS = new Set([
+    "up",
+    "graph",
+    "fork",
+    "replay",
+    "revert",
+    "timetravel",
+]);
+const WORKFLOW_EXTENSIONS = new Set([".js", ".jsx", ".ts", ".tsx", ".mjs", ".mts"]);
+
+/**
+ * @param {string} value
+ */
+export function isOptionLike(value) {
+    return value.startsWith("-");
+}
+
+/**
+ * @param {string} value
+ */
+export function looksLikeWorkflowPath(value) {
+    if (isOptionLike(value))
+        return false;
+    return WORKFLOW_EXTENSIONS.has(parse(value).ext);
+}
+
+/**
+ * @param {string[]} args
+ */
+export function getExplicitWorkflowPath(args) {
+    if (args.length === 0)
+        return null;
+    if (looksLikeWorkflowPath(args[0]))
+        return args[0];
+    for (let index = 0; index < args.length; index++) {
+        const arg = args[index];
+        if (!WORKFLOW_PATH_COMMANDS.has(arg))
+            continue;
+        for (let nextIndex = index + 1; nextIndex < args.length; nextIndex++) {
+            const candidate = args[nextIndex];
+            if (looksLikeWorkflowPath(candidate))
+                return candidate;
+        }
+        return null;
+    }
+    for (const arg of args) {
+        if (looksLikeWorkflowPath(arg))
+            return arg;
+    }
+    return null;
+}
+
+/**
+ * Resolve the local `smithers-orchestrator` package's bin JS file under
+ * `<directory>/node_modules/`. Going through `package.json` (instead of the
+ * `.bin/smithers` shell shim npm/pnpm generate) is the whole point: the shim
+ * is `#!/bin/sh` and re-execing it with `process.execPath` (bun) makes bun
+ * parse shell as JavaScript, which crashes with `Expected ")" but found
+ * "$(echo "`.
+ *
+ * @param {string} directory
+ */
+export function resolveLocalSmithersBinJs(directory) {
+    const pkgJsonPath = resolve(directory, "node_modules/smithers-orchestrator/package.json");
+    if (!existsSync(pkgJsonPath))
+        return null;
+    let pkg;
+    try {
+        pkg = JSON.parse(readFileSync(pkgJsonPath, "utf8"));
+    } catch {
+        return null;
+    }
+    const binEntry = typeof pkg?.bin === "string" ? pkg.bin : pkg?.bin?.smithers;
+    if (typeof binEntry !== "string" || binEntry.length === 0)
+        return null;
+    const binPath = resolve(dirname(pkgJsonPath), binEntry);
+    return existsSync(binPath) ? binPath : null;
+}
+
+/**
+ * @param {string} cwd
+ * @param {string} workflowPath
+ */
+export function findNearestWorkflowLocalCli(cwd, workflowPath) {
+    let current = dirname(resolve(cwd, workflowPath));
+    while (true) {
+        const localBin = resolveLocalSmithersBinJs(current);
+        if (localBin)
+            return localBin;
+        const parent = dirname(current);
+        if (parent === current)
+            return null;
+        current = parent;
+    }
+}

package/src/bin/smithers.js

@@ -1,104 +1,13 @@
 #!/usr/bin/env bun
 import { spawn } from "node:child_process";
-import { existsSync, readFileSync, realpathSync } from "node:fs";
-import { dirname, parse, resolve } from "node:path";
+import { realpathSync } from "node:fs";
+import { resolve } from "node:path";
 import { fileURLToPath } from "node:url";
-
-const WORKFLOW_PATH_COMMANDS = new Set([
-    "up",
-    "graph",
-    "fork",
-    "replay",
-    "revert",
-    "timetravel",
-]);
-const WORKFLOW_EXTENSIONS = new Set([".js", ".jsx", ".ts", ".tsx", ".mjs", ".mts"]);
-
-/**
- * @param {string} value
- */
-function isOptionLike(value) {
-    return value.startsWith("-");
-}
-
-/**
- * @param {string} value
- */
-function looksLikeWorkflowPath(value) {
-    if (isOptionLike(value))
-        return false;
-    return WORKFLOW_EXTENSIONS.has(parse(value).ext);
-}
-
-/**
- * @param {string[]} args
- */
-function getExplicitWorkflowPath(args) {
-    if (args.length === 0)
-        return null;
-    if (looksLikeWorkflowPath(args[0]))
-        return args[0];
-    for (let index = 0; index < args.length; index++) {
-        const arg = args[index];
-        if (!WORKFLOW_PATH_COMMANDS.has(arg))
-            continue;
-        for (let nextIndex = index + 1; nextIndex < args.length; nextIndex++) {
-            const candidate = args[nextIndex];
-            if (looksLikeWorkflowPath(candidate))
-                return candidate;
-        }
-        return null;
-    }
-    for (const arg of args) {
-        if (looksLikeWorkflowPath(arg))
-            return arg;
-    }
-    return null;
-}
-
-/**
- * Resolve the local `smithers-orchestrator` package's bin JS file under
- * `<directory>/node_modules/`. Going through `package.json` (instead of the
- * `.bin/smithers` shell shim npm/pnpm generate) is the whole point: the shim
- * is `#!/bin/sh` and re-execing it with `process.execPath` (bun) makes bun
- * parse shell as JavaScript, which crashes with `Expected ")" but found
- * "$(echo "`.
- *
- * @param {string} directory
- */
-function resolveLocalSmithersBinJs(directory) {
-    const pkgJsonPath = resolve(directory, "node_modules/smithers-orchestrator/package.json");
-    if (!existsSync(pkgJsonPath))
-        return null;
-    let pkg;
-    try {
-        pkg = JSON.parse(readFileSync(pkgJsonPath, "utf8"));
-    } catch {
-        return null;
-    }
-    const binEntry = typeof pkg?.bin === "string" ? pkg.bin : pkg?.bin?.smithers;
-    if (typeof binEntry !== "string" || binEntry.length === 0)
-        return null;
-    const binPath = resolve(dirname(pkgJsonPath), binEntry);
-    return existsSync(binPath) ? binPath : null;
-}
-
-/**
- * @param {string} cwd
- * @param {string} workflowPath
- */
-function findNearestWorkflowLocalCli(cwd, workflowPath) {
-    let current = dirname(resolve(cwd, workflowPath));
-    while (true) {
-        const localBin = resolveLocalSmithersBinJs(current);
-        if (localBin)
-            return localBin;
-        const parent = dirname(current);
-        if (parent === current)
-            return null;
-        current = parent;
-    }
-}
+import {
+    getExplicitWorkflowPath,
+    findNearestWorkflowLocalCli,
+    resolveLocalSmithersBinJs,
+} from "./smithers-delegation.js";
 
 /**
  * When a workflow directory (`.smithers/`) exists in the user's cwd and it's

package/src/migrateSmithersStore.js

@@ -471,6 +471,78 @@ function writeMigrationMarker(result, sourceStats) {
     writeFileSync(result.markerPath, `${JSON.stringify(marker, null, 2)}\n`, "utf8");
 }
 
+// bun:sqlite surfaces a corrupt, encrypted, or non-SQLite source file with one
+// of these substrings (case-insensitive). Detecting them lets us replace the
+// raw, unactionable engine text with guidance the operator can follow.
+const CORRUPT_SQLITE_MARKERS = ["malformed", "not a database", "file is encrypted", "disk image is malformed"];
+const UNOPENABLE_SQLITE_MARKERS = ["unable to open database file"];
+
+/**
+ * @param {unknown} error
+ * @returns {boolean}
+ */
+function isCorruptSqliteError(error) {
+    const message = (error instanceof Error ? error.message : String(error ?? "")).toLowerCase();
+    return CORRUPT_SQLITE_MARKERS.some((marker) => message.includes(marker));
+}
+
+/**
+ * @param {unknown} error
+ * @returns {boolean}
+ */
+function isUnopenableSqliteError(error) {
+    const message = (error instanceof Error ? error.message : String(error ?? "")).toLowerCase();
+    return UNOPENABLE_SQLITE_MARKERS.some((marker) => message.includes(marker));
+}
+
+/**
+ * Open the legacy SQLite source and read its schema-level metadata. A corrupt,
+ * encrypted, or non-SQLite file fails here (open, BEGIN, or the first query);
+ * we wrap that into an actionable SmithersError so the CLI maps it to a clean
+ * exit code instead of leaking the raw bun:sqlite text. The source is opened
+ * read-only and nothing has been written to the target yet, so no partial
+ * output can exist when this throws.
+ *
+ * @param {string} dbPath
+ * @returns {{ sqlite: Database; runCount: number; schemaVersion: string; tables: Array<{ name: string; sql: string }>; indexes: Array<{ name: string; sql: string }> }}
+ */
+function openSourceStore(dbPath) {
+    /** @type {Database | undefined} */
+    let sqlite;
+    try {
+        sqlite = new Database(dbPath, { readonly: true });
+        sqlite.exec("BEGIN");
+        const runCount = sqliteTableExists(sqlite, "_smithers_runs") ? countSqliteRows(sqlite, "_smithers_runs") : 0;
+        const schemaVersion = sqliteSchemaVersion(sqlite);
+        const tables = orderedTables(sourceTables(sqlite));
+        const indexes = sourceIndexes(sqlite);
+        return { sqlite, runCount, schemaVersion, tables, indexes };
+    }
+    catch (error) {
+        try {
+            sqlite?.exec("ROLLBACK");
+        }
+        catch {
+            // No open transaction to roll back; closing the handle is enough.
+        }
+        try {
+            sqlite?.close();
+        }
+        catch {
+            // Best-effort read-only source cleanup.
+        }
+        if (isCorruptSqliteError(error)) {
+            const original = error instanceof Error ? error.message : String(error);
+            throw new SmithersError("DB_QUERY_FAILED", `The legacy SQLite store at ${dbPath} appears to be corrupted (${original}). Smithers cannot migrate a corrupt store. Verify with: sqlite3 ${dbPath} 'PRAGMA integrity_check'. If it reports corruption, restore from a backup or start fresh; the original file was left untouched.`, { dbPath }, { cause: error });
+        }
+        if (isUnopenableSqliteError(error)) {
+            const original = error instanceof Error ? error.message : String(error);
+            throw new SmithersError("DB_QUERY_FAILED", `Could not open the legacy SQLite store at ${dbPath} (${original}). It may be locked by another process, have unreadable permissions, or be missing its -wal/-shm sidecar files (copy smithers.db together with smithers.db-wal and smithers.db-shm). The original file was left untouched.`, { dbPath }, { cause: error });
+        }
+        throw error;
+    }
+}
+
 /**
  * @param {string} dbPath
  */
@@ -498,6 +570,16 @@ export async function migrateSmithersStore(opts = {}) {
         });
     }
     const target = normalizeTarget(opts.to);
+    // Validate the Postgres connection target BEFORE opening the source store, so
+    // `migrate --to postgres` with no url fails fast with a clear INVALID_INPUT
+    // instead of being masked by an unrelated source-open error (e.g. an
+    // unreadable or sidecar-less smithers.db).
+    const postgresUrl = target === "postgres" ? (opts.url ?? env.SMITHERS_POSTGRES_URL ?? env.DATABASE_URL) : undefined;
+    if (target === "postgres" && !postgresUrl) {
+        throw new SmithersError("INVALID_INPUT", "smithers migrate --to postgres requires --url, SMITHERS_POSTGRES_URL, or DATABASE_URL.", {
+            target,
+        });
+    }
     const markerPath = markerPathFor(dbPath, workspaceRoot);
     const batchSize = Math.max(1, Math.floor(opts.batchSize ?? DEFAULT_BATCH_SIZE));
     const keepSqlite = opts.keepSqlite ?? true;
@@ -507,12 +589,9 @@ export async function migrateSmithersStore(opts = {}) {
     /** @type {(import("./CreateSmithersApi.ts").CreateSmithersApi<Record<string, import("zod").ZodObject<any>>> & { close?: () => Promise<void> }) | undefined} */
     let targetApi;
     try {
-        sqlite = new Database(dbPath, { readonly: true });
-        sqlite.exec("BEGIN");
-        const runCount = sqliteTableExists(sqlite, "_smithers_runs") ? countSqliteRows(sqlite, "_smithers_runs") : 0;
-        const schemaVersion = sqliteSchemaVersion(sqlite);
-        const tables = orderedTables(sourceTables(sqlite));
-        const indexes = sourceIndexes(sqlite);
+        const source = openSourceStore(dbPath);
+        sqlite = source.sqlite;
+        const { runCount, schemaVersion, tables, indexes } = source;
         await emitMigrationLog("info", "smithers.migration.started", {
             dbPath,
             target,
@@ -521,15 +600,9 @@ export async function migrateSmithersStore(opts = {}) {
             schemaVersion,
         }, "smithers:migrate");
         if (target === "postgres") {
-            const connectionString = opts.url ?? env.SMITHERS_POSTGRES_URL ?? env.DATABASE_URL;
-            if (!connectionString) {
-                throw new SmithersError("INVALID_INPUT", "smithers migrate --to postgres requires --url, SMITHERS_POSTGRES_URL, or DATABASE_URL.", {
-                    target,
-                });
-            }
             targetApi = await createSmithersPostgres({}, {
                 provider: "postgres",
-                connectionString,
+                connectionString: postgresUrl,
             });
         }
         else {