smithers-orchestrator 0.25.3 → 0.25.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "smithers-orchestrator",
-  "version": "0.25.3",
+  "version": "0.25.4",
   "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.3",
-    "@smithers-orchestrator/components": "0.25.3",
-    "@smithers-orchestrator/cli": "0.25.3",
-    "@smithers-orchestrator/driver": "0.25.3",
-    "@smithers-orchestrator/control-plane": "0.25.3",
-    "@smithers-orchestrator/engine": "0.25.3",
-    "@smithers-orchestrator/gateway-client": "0.25.3",
-    "@smithers-orchestrator/gateway-react": "0.25.3",
-    "@smithers-orchestrator/errors": "0.25.3",
-    "@smithers-orchestrator/db": "0.25.3",
-    "@smithers-orchestrator/memory": "0.25.3",
-    "@smithers-orchestrator/graph": "0.25.3",
-    "@smithers-orchestrator/observability": "0.25.3",
-    "@smithers-orchestrator/sandbox": "0.25.3",
-    "@smithers-orchestrator/openapi": "0.25.3",
-    "@smithers-orchestrator/react-reconciler": "0.25.3",
-    "@smithers-orchestrator/scheduler": "0.25.3",
-    "@smithers-orchestrator/scorers": "0.25.3",
-    "@smithers-orchestrator/server": "0.25.3",
-    "@smithers-orchestrator/time-travel": "0.25.3",
-    "@smithers-orchestrator/tool-context": "0.25.3",
-    "@smithers-orchestrator/vcs": "0.25.3"
+    "@smithers-orchestrator/agents": "0.25.4",
+    "@smithers-orchestrator/cli": "0.25.4",
+    "@smithers-orchestrator/components": "0.25.4",
+    "@smithers-orchestrator/control-plane": "0.25.4",
+    "@smithers-orchestrator/db": "0.25.4",
+    "@smithers-orchestrator/driver": "0.25.4",
+    "@smithers-orchestrator/errors": "0.25.4",
+    "@smithers-orchestrator/engine": "0.25.4",
+    "@smithers-orchestrator/gateway-client": "0.25.4",
+    "@smithers-orchestrator/gateway-react": "0.25.4",
+    "@smithers-orchestrator/graph": "0.25.4",
+    "@smithers-orchestrator/memory": "0.25.4",
+    "@smithers-orchestrator/observability": "0.25.4",
+    "@smithers-orchestrator/sandbox": "0.25.4",
+    "@smithers-orchestrator/openapi": "0.25.4",
+    "@smithers-orchestrator/react-reconciler": "0.25.4",
+    "@smithers-orchestrator/server": "0.25.4",
+    "@smithers-orchestrator/scorers": "0.25.4",
+    "@smithers-orchestrator/scheduler": "0.25.4",
+    "@smithers-orchestrator/time-travel": "0.25.4",
+    "@smithers-orchestrator/tool-context": "0.25.4",
+    "@smithers-orchestrator/vcs": "0.25.4"
   },
   "optionalDependencies": {
     "@electric-sql/pglite": "0.5.1",

package/src/resolveSmithersBackendChoice.js

@@ -153,6 +153,10 @@ function readMigratedMarker(workspaceRoot) {
         return {
             exists: true,
             backend: normalizeBackend(parsed?.target?.backend ?? parsed?.target ?? parsed?.backend, markerPath),
+            // The migration SOURCE backend, recorded by `migrate` for every
+            // direction. A reverse (target sqlite) receipt uses it to tolerate the
+            // kept source store (pglite/postgres) without hiding an unrelated one.
+            sourceBackend: normalizeBackend(parsed?.source?.backend ?? (typeof parsed?.source === "string" ? parsed.source : undefined), markerPath),
         };
     }
     catch {
@@ -376,14 +380,32 @@ export async function resolveSmithersBackendChoice(opts = {}) {
     // otherwise an explicit pglite/postgres open beside a populated SQLite store
     // would hide the SQLite history.
     const marker = migratedMarker.exists && (migratedMarker.backend === "pglite" || migratedMarker.backend === "postgres");
+    // A REVERSE migration receipt (target sqlite) is authoritative the same way a
+    // forward one is — but the only leftover store it authorizes keeping is the
+    // recorded migration SOURCE (pglite/postgres). It must NOT silently hide an
+    // unrelated populated store, so it requires a recorded source backend (a bare
+    // or sourceless receipt does not suppress) and resolves only when we actually
+    // land on sqlite. Symmetric to the forward path's sqlite-source tolerance.
+    const reverseMarker = migratedMarker.exists
+        && migratedMarker.backend === "sqlite"
+        && backend === "sqlite"
+        && (migratedMarker.sourceBackend === "pglite" || migratedMarker.sourceBackend === "postgres");
     const populated = [
         ...(sqliteStore.runCount > 0 ? [{ backend: /** @type {"sqlite"} */ ("sqlite"), location: sqliteStore.dbPath, runCount: sqliteStore.runCount, schemaVersion: sqliteStore.schemaVersion }] : []),
         ...(pgliteStore.runCount > 0 ? [{ backend: /** @type {"pglite"} */ ("pglite"), location: pgliteStore.dataDir, runCount: pgliteStore.runCount, schemaVersion: pgliteStore.schemaVersion }] : []),
         ...(postgresStore.runCount > 0 ? [{ backend: /** @type {"postgres"} */ ("postgres"), location: postgresStore.connectionString === "set" ? "postgres connection" : "postgres", runCount: postgresStore.runCount, schemaVersion: postgresStore.schemaVersion }] : []),
     ];
-    if (!marker && populated.length > 1) {
+    if (!marker && !reverseMarker && populated.length > 1) {
         throw backendConflictError({ populated });
     }
+    if (reverseMarker) {
+        // Tolerate sqlite (the migration target) and the recorded source only;
+        // any other populated store would be hidden, so refuse to choose.
+        const unexpectedPopulated = populated.filter((store) => store.backend !== "sqlite" && store.backend !== migratedMarker.sourceBackend);
+        if (unexpectedPopulated.length > 0) {
+            throw backendConflictError({ populated });
+        }
+    }
     const migratedTargetBackend = marker && (migratedMarker.backend ?? markerBackend) !== "sqlite"
         ? /** @type {"pglite" | "postgres" | undefined} */ (migratedMarker.backend ?? markerBackend)
         : undefined;
@@ -452,6 +474,6 @@ export async function resolveSmithersBackendChoice(opts = {}) {
         sqlite: sqliteStore,
         pglite: pgliteStore,
         postgres: postgresStore,
-        migratedMarker: marker,
+        migratedMarker: marker || reverseMarker,
     };
 }