@smthrs/engine-store 1.0.0-rc.5 → 1.0.0-rc.7

package/dist/esm/test/TestStores.d.ts

@@ -39,7 +39,7 @@ export interface TestStoresOptions {
  * @category layers
  * @since 0.1.0
  */
-export declare const database: Layer.Layer<import("effect/unstable/sql/SqlClient").SqlClient | DurableWriter.DurableWriter, import("effect/unstable/sql/SqlError").SqlError | import("effect/unstable/sql/Migrator").MigrationError, never>;
+export declare const database: Layer.Layer<import("effect/sql/SqlClient").SqlClient | DurableWriter.DurableWriter, import("effect/sql/SqlError").SqlError | import("effect/sql/Migrator").MigrationError, never>;
 /**
  * Provides the production SQLite journal, run, attempt, and cache services
  * over one in-memory database. Migrations run before any durable service is
@@ -54,7 +54,7 @@ export declare const database: Layer.Layer<import("effect/unstable/sql/SqlClient
  * @category layers
  * @since 0.1.0
  */
-export declare const layer: (options?: TestStoresOptions) => Layer.Layer<DurableWriter.DurableWriter | CacheStore.CacheStore | import("@smthrs/journal/Journal").Journal | RunStore.RunStore | AttemptStore.AttemptStore | OwnerIdentity.OwnerIdentity | PlanInputStore.PlanInputStore | PlanMergeStore.PlanMergeStore | PlanStore.PlanStore, import("effect/unstable/sql/SqlError").SqlError | import("effect/unstable/sql/Migrator").MigrationError | import("@smthrs/journal/Journal").JournalError, import("effect/Crypto").Crypto>;
+export declare const layer: (options?: TestStoresOptions) => Layer.Layer<DurableWriter.DurableWriter | CacheStore.CacheStore | import("@smthrs/journal/Journal").Journal | RunStore.RunStore | AttemptStore.AttemptStore | OwnerIdentity.OwnerIdentity | PlanInputStore.PlanInputStore | PlanMergeStore.PlanMergeStore | PlanStore.PlanStore, import("effect/sql/SqlError").SqlError | import("effect/sql/Migrator").MigrationError | import("@smthrs/journal/Journal").JournalError, import("effect/Crypto").Crypto>;
 /**
  * The same schema over a named SQLite database or PostgreSQL URL, with the connection exposed.
  *
@@ -68,7 +68,7 @@ export declare const layer: (options?: TestStoresOptions) => Layer.Layer<Durable
  * @category layers
  * @since 0.1.0
  */
-export declare const databaseAt: (filename: string) => Layer.Layer<import("effect/unstable/sql/SqlClient").SqlClient | DurableWriter.DurableWriter, import("effect/unstable/sql/SqlError").SqlError | import("effect/unstable/sql/Migrator").MigrationError, never>;
+export declare const databaseAt: (filename: string) => Layer.Layer<import("effect/sql/SqlClient").SqlClient | DurableWriter.DurableWriter, import("effect/sql/SqlError").SqlError | import("effect/sql/Migrator").MigrationError, never>;
 /**
  * Every durable engine service over one named database, connection included.
  *
@@ -85,5 +85,5 @@ export declare const databaseAt: (filename: string) => Layer.Layer<import("effec
  * @category layers
  * @since 0.1.0
  */
-export declare const layerAt: (filename: string, options?: TestStoresOptions) => Layer.Layer<import("effect/unstable/sql/SqlClient").SqlClient | DurableWriter.DurableWriter | CacheStore.CacheStore | import("@smthrs/journal/Journal").Journal | RunStore.RunStore | DurableEngineState.DurableEngineState | AttemptStore.AttemptStore | OwnerIdentity.OwnerIdentity | PlanInputStore.PlanInputStore | PlanMergeStore.PlanMergeStore | PlanStore.PlanStore, import("effect/unstable/sql/SqlError").SqlError | import("effect/unstable/sql/Migrator").MigrationError | import("@smthrs/journal/Journal").JournalError, import("effect/Crypto").Crypto>;
+export declare const layerAt: (filename: string, options?: TestStoresOptions) => Layer.Layer<import("effect/sql/SqlClient").SqlClient | DurableWriter.DurableWriter | CacheStore.CacheStore | import("@smthrs/journal/Journal").Journal | RunStore.RunStore | DurableEngineState.DurableEngineState | AttemptStore.AttemptStore | OwnerIdentity.OwnerIdentity | PlanInputStore.PlanInputStore | PlanMergeStore.PlanMergeStore | PlanStore.PlanStore, import("effect/sql/SqlError").SqlError | import("effect/sql/Migrator").MigrationError | import("@smthrs/journal/Journal").JournalError, import("effect/Crypto").Crypto>;
 //# sourceMappingURL=TestStores.d.ts.map

package/dist/esm/test/TestStores.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TestStores.d.ts","sourceRoot":"","sources":["../../../src/test/TestStores.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,aAAa,MAAM,gCAAgC,CAAA;AAI/D,OAAO,KAAK,SAAS,MAAM,8BAA8B,CAAA;AACzD,OAAO,KAAK,YAAY,MAAM,gCAAgC,CAAA;AAC9D,OAAO,KAAK,QAAQ,MAAM,4BAA4B,CAAA;AACtD,OAAO,KAAK,UAAU,MAAM,+BAA+B,CAAA;AAE3D,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,kBAAkB,MAAM,0BAA0B,CAAA;AAE9D,OAAO,KAAK,aAAa,MAAM,qBAAqB,CAAA;AACpD,OAAO,KAAK,cAAc,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,cAAc,MAAM,sBAAsB,CAAA;AAEtD;;;;;GAKG;AACH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,aAAa,GAAG,aAAa,CAAA;IAC5D,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAC5B;AAED;;;;;;GAMG;AACH,eAAO,MAAM,QAAQ,8MAA2D,CAAA;AAEhF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,KAAK,GAAI,UAAU,iBAAiB,+cAckB,CAAA;AAEnE;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,UAAU,GAAI,UAAU,MAAM,iNAkB1C,CAAA;AAED;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,OAAO,GAAI,UAAU,MAAM,EAAE,UAAU,iBAAiB,2iBAce,CAAA"}
+{"version":3,"file":"TestStores.d.ts","sourceRoot":"","sources":["../../../src/test/TestStores.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,aAAa,MAAM,gCAAgC,CAAA;AAI/D,OAAO,KAAK,SAAS,MAAM,8BAA8B,CAAA;AACzD,OAAO,KAAK,YAAY,MAAM,gCAAgC,CAAA;AAC9D,OAAO,KAAK,QAAQ,MAAM,4BAA4B,CAAA;AACtD,OAAO,KAAK,UAAU,MAAM,+BAA+B,CAAA;AAE3D,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,kBAAkB,MAAM,0BAA0B,CAAA;AAE9D,OAAO,KAAK,aAAa,MAAM,qBAAqB,CAAA;AACpD,OAAO,KAAK,cAAc,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,cAAc,MAAM,sBAAsB,CAAA;AAEtD;;;;;GAKG;AACH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,aAAa,GAAG,aAAa,CAAA;IAC5D,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAC5B;AAED;;;;;;GAMG;AACH,eAAO,MAAM,QAAQ,mLAA2D,CAAA;AAEhF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,KAAK,GAAI,UAAU,iBAAiB,6bAckB,CAAA;AAEnE;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,UAAU,GAAI,UAAU,MAAM,sLAkB1C,CAAA;AAED;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,OAAO,GAAI,UAAU,MAAM,EAAE,UAAU,iBAAiB,ghBAce,CAAA"}

package/docs/api.md

@@ -369,16 +369,16 @@ interface Service {
 }
 ```
 
-| Export              | Signature                                                                                                | Meaning                                                                                                                       |
-| ------------------- | -------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
-| `StepBoundary`      | `Context.Service<Service>`                                                                               | Service tag.                                                                                                                  |
-| `make`              | `(service: Service) => Service`                                                                          | Brands an implementation, so a wrong shape is reported where it is written.                                                   |
-| `makeFileSystem`    | `(fs: FileSystem, path: Path, artifacts: ArtifactStore.Service, options?: FileSystemOptions) => Service` | The production boundary.                                                                                                      |
-| `layer`             | `Layer<Service, never, FileSystem \| Path \| ArtifactStore>`                                             | Provides it, confining replay to the kernel `Workspace` root when one is in context. Resolves that root with the host `Path`. |
-| `layerTest`         | `(options?: TestOptions) => Layer<Service>`                                                              | Deterministic in-memory boundary.                                                                                             |
-| `exactReads`        | `(descriptor: FileBoundary) => ReadonlyArray<FileInput>`                                                 | Exact read inputs, ignoring declarations that still need expansion.                                                           |
-| `readSetMatches`    | `(prepared: PreparedBoundary) => boolean`                                                                | Whether the measured snapshot still matches the declaration.                                                                  |
-| `referencedDigests` | `(evidence: BoundaryEvidence) => ReadonlyArray<ArtifactStore.Digest>`                                    | The digests the evidence references rather than inlines. Evidence from a foreign implementation yields the empty list.        |
+| Export              | Signature                                                                                                | Meaning                                                                                                                                     |
+| ------------------- | -------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- |
+| `StepBoundary`      | `Context.Service<Service>`                                                                               | Service tag.                                                                                                                                |
+| `make`              | `(service: Service) => Service`                                                                          | Brands an implementation, so a wrong shape is reported where it is written.                                                                 |
+| `makeFileSystem`    | `(fs: FileSystem, path: Path, artifacts: ArtifactStore.Service, options?: FileSystemOptions) => Service` | The production boundary.                                                                                                                    |
+| `layer`             | `Layer<Service, never, FileSystem \| Path \| ArtifactStore>`                                             | Provides it, rooting measurement and replay at the kernel `Workspace` root when one is in context. Resolves that root with the host `Path`. |
+| `layerTest`         | `(options?: TestOptions) => Layer<Service>`                                                              | Deterministic in-memory boundary.                                                                                                           |
+| `exactReads`        | `(descriptor: FileBoundary) => ReadonlyArray<FileInput>`                                                 | Exact read inputs, ignoring declarations that still need expansion.                                                                         |
+| `readSetMatches`    | `(prepared: PreparedBoundary) => boolean`                                                                | Whether the measured snapshot still matches the declaration.                                                                                |
+| `referencedDigests` | `(evidence: BoundaryEvidence) => ReadonlyArray<ArtifactStore.Digest>`                                    | The digests the evidence references rather than inlines. Evidence from a foreign implementation yields the empty list.                      |
 
 ### Schemas
 
@@ -393,11 +393,11 @@ interface Service {
 
 ### FileSystemOptions
 
-| Field                 | Default | Meaning                                                                                                                      |
-| --------------------- | ------- | ---------------------------------------------------------------------------------------------------------------------------- |
-| `maxInlineBytes`      | 1 MiB   | The largest single output inlined into the evidence. Anything larger is stored by digest reference.                          |
-| `maxTotalInlineBytes` | 8 MiB   | The largest aggregate inline payload one settle may fold in. Past it, an output is spilled even though it individually fits. |
-| `root`                | cwd     | The root replay confines writes and removals to. A filesystem already confined to a root keeps its own.                      |
+| Field                 | Default | Meaning                                                                                                                                                                                 |
+| --------------------- | ------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `maxInlineBytes`      | 1 MiB   | The largest single output inlined into the evidence. Anything larger is stored by digest reference.                                                                                     |
+| `maxTotalInlineBytes` | 8 MiB   | The largest aggregate inline payload one settle may fold in. Past it, an output is spilled even though it individually fits.                                                            |
+| `root`                | cwd     | The root declared paths resolve against: `prepare` and `settle` measure under it, and replay confines writes and removals to it. A filesystem already confined to a root keeps its own. |
 
 `replayOutputs` writes and deletes what the evidence names, so it confines its
 own mutations instead of trusting the composition. Every write, removal, probe,
@@ -406,7 +406,10 @@ one descriptor-relative, no-follow request per call against the pinned root. A
 symlink on a replayed path (a parent, the final component, or a member of a
 replayed tree) refuses with `UnsupportedBoundary`, and so does a host with no
 descriptor-relative executor or isolation attestation, before any host call.
-`prepare` and `settle` only read and keep the caller's filesystem.
+`prepare` and `settle` only read and keep the caller's filesystem, but hand a
+path-based host each declared path resolved against `root`, the root a step's
+own FileSystem resolves against. A same-named file in the process working
+directory therefore never answers the dirty check (issue #3911).
 
 ### TestOptions
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@smthrs/engine-store",
   "type": "module",
-  "version": "1.0.0-rc.5",
+  "version": "1.0.0-rc.7",
   "license": "MIT",
   "smthrs": {
     "group": "engine"
@@ -386,33 +386,33 @@
     "tag": "next"
   },
   "dependencies": {
-    "@smthrs/artifacts": "1.0.0-rc.5",
-    "@smthrs/canonical": "1.0.0-rc.5",
-    "@smthrs/crypto": "1.0.0-rc.5",
-    "@smthrs/database": "1.0.0-rc.5",
-    "@smthrs/engine": "1.0.0-rc.5",
-    "@smthrs/flow": "1.0.0-rc.5",
-    "@smthrs/journal": "1.0.0-rc.5",
-    "@smthrs/kernel": "1.0.0-rc.5",
-    "@smthrs/keys": "1.0.0-rc.5",
-    "@smthrs/plan": "1.0.0-rc.5",
-    "@smthrs/plan-store": "1.0.0-rc.5",
-    "@smthrs/run-store": "1.0.0-rc.5",
-    "@smthrs/step-cache": "1.0.0-rc.5",
-    "@smthrs/capability": "1.0.0-rc.5"
+    "@smthrs/artifacts": "1.0.0-rc.7",
+    "@smthrs/canonical": "1.0.0-rc.7",
+    "@smthrs/crypto": "1.0.0-rc.7",
+    "@smthrs/database": "1.0.0-rc.7",
+    "@smthrs/engine": "1.0.0-rc.7",
+    "@smthrs/flow": "1.0.0-rc.7",
+    "@smthrs/journal": "1.0.0-rc.7",
+    "@smthrs/kernel": "1.0.0-rc.7",
+    "@smthrs/keys": "1.0.0-rc.7",
+    "@smthrs/plan": "1.0.0-rc.7",
+    "@smthrs/plan-store": "1.0.0-rc.7",
+    "@smthrs/run-store": "1.0.0-rc.7",
+    "@smthrs/step-cache": "1.0.0-rc.7",
+    "@smthrs/capability": "1.0.0-rc.7"
   },
   "devDependencies": {
     "@effect/language-service": "0.87.2",
-    "@effect/platform-node": "4.0.0-rc.115",
-    "@effect/vitest": "4.0.0-rc.115",
+    "@effect/platform-node": "4.0.4",
+    "@effect/vitest": "4.0.4",
     "@eslint/js": "9.39.5",
-    "@smthrs/core": "1.0.0-rc.5",
-    "@smthrs/patterns": "1.0.0-rc.5",
-    "@smthrs/platform-node": "1.0.0-rc.5",
+    "@smthrs/core": "1.0.0-rc.7",
+    "@smthrs/patterns": "1.0.0-rc.7",
+    "@smthrs/platform-node": "1.0.0-rc.7",
     "@types/node": "26.4.1",
     "@vitest/coverage-v8": "5.0.0",
     "dprint": "0.57.1",
-    "effect": "4.0.0-rc.115",
+    "effect": "4.0.4",
     "esbuild": "0.28.2",
     "eslint": "9.39.5",
     "eslint-import-resolver-typescript": "4.4.5",
@@ -426,7 +426,7 @@
     "vitest": "5.0.0"
   },
   "peerDependencies": {
-    "effect": "4.0.0-rc.115"
+    "effect": "^4.0.4"
   },
   "scripts": {
     "lint": "eslint src --max-warnings=0 && dprint check",

package/src/ArtifactGc.ts

@@ -46,7 +46,7 @@ import type * as FileSystem from "effect/FileSystem"
 import * as Layer from "effect/Layer"
 import * as Option from "effect/Option"
 import * as Schema from "effect/Schema"
-import * as SqlClient from "effect/unstable/sql/SqlClient"
+import * as SqlClient from "effect/sql/SqlClient"
 import * as ArtifactRoots from "./internal/ArtifactRoots.ts"
 
 /**

package/src/DeferredClockFold.ts

@@ -37,7 +37,7 @@ import { Journal, JournalEvent, Projection } from "@smthrs/journal"
 import * as Effect from "effect/Effect"
 import * as Option from "effect/Option"
 import * as Schema from "effect/Schema"
-import * as SqlClient from "effect/unstable/sql/SqlClient"
+import * as SqlClient from "effect/sql/SqlClient"
 import { EventTypes } from "./EventTypes.ts"
 
 /**

package/src/DisasterRecovery.ts

@@ -46,7 +46,7 @@ import * as Effect from "effect/Effect"
 import * as FileSystem from "effect/FileSystem"
 import type * as Layer from "effect/Layer"
 import * as Schema from "effect/Schema"
-import * as SqlClient from "effect/unstable/sql/SqlClient"
+import * as SqlClient from "effect/sql/SqlClient"
 import * as ArtifactRoots from "./internal/ArtifactRoots.ts"
 
 /**

package/src/DurableEngineState.ts

@@ -24,7 +24,7 @@ import * as Option from "effect/Option"
 import * as Result from "effect/Result"
 import * as Schema from "effect/Schema"
 import * as Semaphore from "effect/Semaphore"
-import * as SqlClient from "effect/unstable/sql/SqlClient"
+import * as SqlClient from "effect/sql/SqlClient"
 import * as EngineStateSchema from "./internal/EngineStateSchema.ts"
 import { compareText } from "./internal/Ordering.ts"
 import type { OnParentExit } from "./RunState.ts"

package/src/ExecutionSnapshot.ts

@@ -7,7 +7,7 @@
 import * as Dialect from "@smthrs/database/Dialect"
 import type { RunStoreError } from "@smthrs/run-store/RunStore"
 import { Context, Effect, Layer, Schema } from "effect"
-import * as SqlClient from "effect/unstable/sql/SqlClient"
+import * as SqlClient from "effect/sql/SqlClient"
 import * as Read from "./internal/ExecutionSnapshotRead.ts"
 import * as Relations from "./internal/ExecutionSnapshotRelations.ts"
 

package/src/OwnerIdentity.ts

@@ -94,7 +94,7 @@ export const makeIncarnation = (pid: number | undefined, crypto: Crypto.Crypto):
       return {
         hostId,
         pid: yield* incarnationId,
-        nonce: yield* crypto.randomUUIDv4.pipe(Effect.orDie)
+        nonce: yield* crypto.randomUUIDv4().pipe(Effect.orDie)
       } satisfies OwnerId
     })
   })

package/src/PlanInputStore.ts

@@ -10,7 +10,7 @@ import { FileSet, Plan } from "@smthrs/plan"
 import { OwnerId } from "@smthrs/run-store/Ownership"
 import { Context, Effect, Layer, Option, Schema } from "effect"
 import type * as Crypto from "effect/Crypto"
-import * as SqlClient from "effect/unstable/sql/SqlClient"
+import * as SqlClient from "effect/sql/SqlClient"
 
 const Natural = Schema.Int.check(Schema.isGreaterThanOrEqualTo(0))
 

package/src/PlanMergeStore.ts

@@ -10,7 +10,7 @@ import { Plan } from "@smthrs/plan"
 import { OwnerId } from "@smthrs/run-store/Ownership"
 import { Context, Effect, Layer, Option, Schema } from "effect"
 import type * as Crypto from "effect/Crypto"
-import * as SqlClient from "effect/unstable/sql/SqlClient"
+import * as SqlClient from "effect/sql/SqlClient"
 
 const Natural = Schema.Int.check(Schema.isGreaterThanOrEqualTo(0))
 const Positive = Schema.Int.check(Schema.isGreaterThan(0))

package/src/Retention.ts

@@ -34,8 +34,8 @@
 import * as Dialect from "@smthrs/database/Dialect"
 import * as DurableWriter from "@smthrs/database/DurableWriter"
 import * as Effect from "effect/Effect"
-import * as SqlClient from "effect/unstable/sql/SqlClient"
-import type { SqlError } from "effect/unstable/sql/SqlError"
+import * as SqlClient from "effect/sql/SqlClient"
+import type { SqlError } from "effect/sql/SqlError"
 import * as RetentionOps from "./internal/RetentionOps.ts"
 
 export {

package/src/RunChangeFeed.ts

@@ -6,7 +6,7 @@
 
 import { RunStoreError } from "@smthrs/run-store/RunStore"
 import { Context, Effect, Layer, Schema } from "effect"
-import * as SqlClient from "effect/unstable/sql/SqlClient"
+import * as SqlClient from "effect/sql/SqlClient"
 import type { Position } from "./ExecutionSnapshot.ts"
 import * as Read from "./internal/ExecutionSnapshotRead.ts"
 

package/src/SelectionStore.ts

@@ -26,7 +26,7 @@ import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
 import * as Layer from "effect/Layer"
 import * as Schema from "effect/Schema"
-import * as SqlClient from "effect/unstable/sql/SqlClient"
+import * as SqlClient from "effect/sql/SqlClient"
 import * as Selection from "./Selection.ts"
 
 /**

package/src/StepBoundary.ts

@@ -16,7 +16,7 @@ import * as FileSet from "@smthrs/plan/FileSet"
 import * as Context from "effect/Context"
 import type * as Crypto from "effect/Crypto"
 import * as Effect from "effect/Effect"
-import * as Encoding from "effect/Encoding"
+import * as Base64 from "effect/encoding/Base64"
 import * as FileSystem from "effect/FileSystem"
 import * as Layer from "effect/Layer"
 import * as Path from "effect/Path"
@@ -496,12 +496,14 @@ export interface FileSystemOptions {
    */
   readonly maxTotalInlineBytes?: number | undefined
   /**
-   * The workspace root cache replay confines its writes, removals, and prune
-   * walk to. A filesystem already confined to a root (the kernel-guarded
-   * layer's service, or a `confined` view) keeps its own root and ignores
-   * this. Otherwise it defaults to the process working directory, the root a
-   * path-based host resolves `prepare` and `settle` against. {@link layer}
-   * passes the kernel `Workspace` root when one is in context.
+   * The workspace root every declared path resolves against: `prepare` and
+   * `settle` measure under it, and cache replay confines its writes, removals,
+   * and prune walk to it. A filesystem already confined to a root (the
+   * kernel-guarded layer's service, or a `confined` view) keeps its own root
+   * and ignores this. Otherwise it defaults to the process working directory,
+   * the root a path-based host resolves a relative path against. {@link layer}
+   * passes the kernel `Workspace` root when one is in context, which is the
+   * root a step's own FileSystem resolves against (issue #3911).
    */
   readonly root?: string | undefined
 }
@@ -573,7 +575,16 @@ export const makeFileSystem = (
     const digest = yield* Schema.decodeUnknownEffect(Sha256)(bytes).pipe(Effect.orDie)
     return { digest, bytes } satisfies MeasuredDigest
   })
-  const readDigest = (path: string) => readDigestFrom(fs, path)
+  // Declared paths are workspace-relative. A confined filesystem resolves them
+  // against its own root, but a path-based host resolves them against the
+  // process working directory, where a same-named file would answer the dirty
+  // check and let a stale declaration serve a cache hit (issue #3911). Such a
+  // host is handed each path resolved against the configured root; results
+  // stay keyed by the declared path.
+  const readRoot = KernelFileSystem.confinedRoot(fs) === undefined ? options.root : undefined
+  const hostPath = (path: string): string => readRoot === undefined ? path : platformPath.resolve(readRoot, path)
+  const enumeration: FileEnumeration.EnumerationOptions = readRoot === undefined ? {} : { resolve: hostPath }
+  const readDigest = (path: string) => readDigestFrom(fs, hostPath(path))
   const batch = KernelFileSystem.batch(fs)
   const measurements = Effect.fn("StepBoundary.measurements")(
     function*(paths: ReadonlyArray<string>, content: boolean) {
@@ -594,7 +605,7 @@ export const makeFileSystem = (
         const response = yield* batch.execute(
           paths.slice(offset, offset + batch.maxSize).map((path) => ({
             operation: "digest",
-            path,
+            path: hostPath(path),
             content
           }))
         ).pipe(Effect.mapError(hostFailure))
@@ -636,10 +647,14 @@ export const makeFileSystem = (
   // workspace-relative expansion and let a tree replay delete dotfiles the
   // producer wrote.
   const expandGlob = Effect.fn("StepBoundary.expandGlob")(function*(glob: FileSet.Glob) {
-    return yield* FileEnumeration.expandGlob(fs, glob).pipe(Effect.mapError(hostFailure))
+    return yield* FileEnumeration.expandGlob(fs, glob, enumeration).pipe(Effect.mapError(hostFailure))
   })
-  const treeEntries = Effect.fn("StepBoundary.treeEntries")(function*(host: FileSystem.FileSystem, path: string) {
-    return yield* FileEnumeration.entriesUnder(host, path).pipe(Effect.mapError(hostFailure))
+  const treeEntries = Effect.fn("StepBoundary.treeEntries")(function*(
+    host: FileSystem.FileSystem,
+    path: string,
+    resolution: FileEnumeration.EnumerationOptions
+  ) {
+    return yield* FileEnumeration.entriesUnder(host, path, resolution).pipe(Effect.mapError(hostFailure))
   })
   // Replay writes and deletes what evidence names, so the lexical check alone
   // is not a boundary: a symlink planted on a lexically valid path would carry
@@ -647,7 +662,7 @@ export const makeFileSystem = (
   // its prune walk go through a view pinned to the root, where each call is
   // one descriptor-relative, no-follow request and a symlink anywhere on the
   // path is refused rather than followed. `prepare` and `settle` only read,
-  // and keep the caller's filesystem.
+  // and keep the caller's filesystem, rooted through `hostPath`.
   const replayRoot = KernelFileSystem.confinedRoot(fs) ?? options.root ?? "."
   const replayHost: Effect.Effect<FileSystem.FileSystem, UnsupportedBoundary> = KernelFileSystem.isConfinable(fs)
     ? KernelFileSystem.confined(fs, replayRoot).pipe(
@@ -680,7 +695,7 @@ export const makeFileSystem = (
             path,
             digest,
             sizeBytes: bytes.length,
-            content: Encoding.encodeBase64(bytes)
+            content: Base64.encode(bytes)
           } satisfies MaterializedOutput,
           inlinedBytes: bytes.length
         }
@@ -720,7 +735,7 @@ export const makeFileSystem = (
     if (current) return
     let bytes: Uint8Array
     if (output.content !== undefined) {
-      const decoded = Encoding.decodeBase64(output.content)
+      const decoded = Base64.decode(output.content)
       if (Result.isFailure(decoded)) {
         // Inline content is cache-origin bytes: an undecodable payload is a
         // tampered durable row, classified exactly like a digest mismatch so
@@ -849,7 +864,7 @@ export const makeFileSystem = (
         if (typeof entry === "string") outputPaths.push(entry)
         else if (entry._tag === "Glob") outputPaths.push(...yield* expandGlob(entry))
         else {
-          const files = (yield* treeEntries(fs, entry.path)).files
+          const files = (yield* treeEntries(fs, entry.path, enumeration)).files
           outputPaths.push(...files)
           treeMembers.push({ path: entry.path, files })
         }
@@ -1007,7 +1022,7 @@ export const makeFileSystem = (
             .map((output) => output.path)
             .filter((path) => path.startsWith(prefix))
         )
-        const entries = yield* treeEntries(host, tree.path)
+        const entries = yield* treeEntries(host, tree.path, {})
         for (const path of entries.files) {
           if (!recorded.has(path)) yield* host.remove(path).pipe(Effect.mapError(hostFailure))
         }

package/src/StepCacheFold.ts

@@ -42,7 +42,7 @@ import { CacheStore } from "@smthrs/step-cache"
 import * as Effect from "effect/Effect"
 import * as HashMap from "effect/HashMap"
 import * as HashSet from "effect/HashSet"
-import * as SqlClient from "effect/unstable/sql/SqlClient"
+import * as SqlClient from "effect/sql/SqlClient"
 
 /**
  * The journal event type the fold reads.

package/src/internal/EngineStateSchema.ts

@@ -20,7 +20,7 @@
 import { isReadOnly } from "@smthrs/database/Dialect"
 import type { Service as WriterService } from "@smthrs/database/DurableWriter"
 import * as Effect from "effect/Effect"
-import type * as SqlClient from "effect/unstable/sql/SqlClient"
+import type * as SqlClient from "effect/sql/SqlClient"
 
 /**
  * SQL dialects a statement is known to be accepted by, verbatim.

package/src/internal/ExecutionSnapshotRead.ts

@@ -8,7 +8,7 @@ import * as Sha256 from "@smthrs/crypto/Sha256"
 import { OwnerId } from "@smthrs/journal/OwnerId"
 import { RunStatus, RunStoreError } from "@smthrs/run-store/RunStore"
 import { Cause, Effect, Exit, Option, Schema } from "effect"
-import type * as SqlClient from "effect/unstable/sql/SqlClient"
+import type * as SqlClient from "effect/sql/SqlClient"
 import type { Batch } from "../ExecutionSnapshot.ts"
 import { RunState } from "../RunState.ts"
 

package/src/internal/ExecutionSnapshotRelations.ts

@@ -7,7 +7,7 @@
 import * as Dialect from "@smthrs/database/Dialect"
 import { RunStoreError } from "@smthrs/run-store/RunStore"
 import { Effect, Schema } from "effect"
-import type * as SqlClient from "effect/unstable/sql/SqlClient"
+import type * as SqlClient from "effect/sql/SqlClient"
 import type { Batch, Snapshot } from "../ExecutionSnapshot.ts"
 import * as Read from "./ExecutionSnapshotRead.ts"
 

package/src/internal/RetentionOps.ts

@@ -58,8 +58,8 @@ import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
 import * as Layer from "effect/Layer"
 import * as Schema from "effect/Schema"
-import * as SqlClient from "effect/unstable/sql/SqlClient"
-import type { SqlError } from "effect/unstable/sql/SqlError"
+import * as SqlClient from "effect/sql/SqlClient"
+import type { SqlError } from "effect/sql/SqlError"
 
 /**
  * Stable error codes returned by retention.

package/src/internal/RunCatalogOps.ts

@@ -26,7 +26,7 @@
 import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
 import * as Layer from "effect/Layer"
-import * as SqlClient from "effect/unstable/sql/SqlClient"
+import * as SqlClient from "effect/sql/SqlClient"
 import * as RunListing from "./RunListing.ts"
 import { RunCatalogError } from "./RunListingError.ts"
 

package/src/internal/RunListing.ts

@@ -7,7 +7,7 @@
 import * as Dialect from "@smthrs/database/Dialect"
 import { RunStatus } from "@smthrs/run-store/RunStore"
 import { Cause, Effect, Schema } from "effect"
-import * as SqlClient from "effect/unstable/sql/SqlClient"
+import * as SqlClient from "effect/sql/SqlClient"
 import * as Read from "./ExecutionSnapshotRead.ts"
 import { RunCatalogError } from "./RunListingError.ts"
 

package/src/migrations/0001_initial.ts

@@ -8,7 +8,7 @@
 
 import * as Dialect from "@smthrs/database/Dialect"
 import * as Effect from "effect/Effect"
-import * as SqlClient from "effect/unstable/sql/SqlClient"
+import * as SqlClient from "effect/sql/SqlClient"
 
 /**
  * Creates the `flows_deferred_completions` and `flows_clock_deadlines` tables.

package/src/migrations/0002_selection_store.ts

@@ -6,7 +6,7 @@
 
 import * as Dialect from "@smthrs/database/Dialect"
 import * as Effect from "effect/Effect"
-import * as SqlClient from "effect/unstable/sql/SqlClient"
+import * as SqlClient from "effect/sql/SqlClient"
 
 /**
  * Creates the `flows_selection_suspected_edges` table.

package/src/migrations/0003_plan_inputs.ts

@@ -5,7 +5,7 @@
 
 import * as Dialect from "@smthrs/database/Dialect"
 import * as Effect from "effect/Effect"
-import * as SqlClient from "effect/unstable/sql/SqlClient"
+import * as SqlClient from "effect/sql/SqlClient"
 
 /**
  * Creates input generations and marks pre-observation executions as non-recoverable.

package/src/migrations/0004_plan_environment.ts

@@ -5,7 +5,7 @@
 
 import * as Dialect from "@smthrs/database/Dialect"
 import * as Effect from "effect/Effect"
-import * as SqlClient from "effect/unstable/sql/SqlClient"
+import * as SqlClient from "effect/sql/SqlClient"
 
 /**
  * Older heads retain NULL: their original runtime environment is unknowable.

package/src/migrations/0005_plan_merges.ts

@@ -5,7 +5,7 @@
 
 import * as Dialect from "@smthrs/database/Dialect"
 import * as Effect from "effect/Effect"
-import * as SqlClient from "effect/unstable/sql/SqlClient"
+import * as SqlClient from "effect/sql/SqlClient"
 
 /**
  * Existing heads retain an unknown merge-state version; a later runtime must

package/src/migrations/0006_execution_listing.ts

@@ -6,7 +6,7 @@
 
 import * as Dialect from "@smthrs/database/Dialect"
 import * as Effect from "effect/Effect"
-import * as SqlClient from "effect/unstable/sql/SqlClient"
+import * as SqlClient from "effect/sql/SqlClient"
 
 /**
  * Brings existing spawn edges into the migration ladder and binds changes to

package/src/migrations/0007_run_parent_sequence.ts

@@ -5,7 +5,7 @@
  */
 
 import * as Effect from "effect/Effect"
-import * as SqlClient from "effect/unstable/sql/SqlClient"
+import * as SqlClient from "effect/sql/SqlClient"
 
 /**
  * Supports MAX(seq) without scanning retained edges from unrelated runs.

package/src/migrations/0008_deferred_consumption.ts

@@ -6,7 +6,7 @@
 
 import * as Dialect from "@smthrs/database/Dialect"
 import * as Effect from "effect/Effect"
-import * as SqlClient from "effect/unstable/sql/SqlClient"
+import * as SqlClient from "effect/sql/SqlClient"
 
 /**
  * Retains completion values for replay while removing consumed rows from sweeps.

package/src/migrations/0009_deferred_clock_facts.ts

@@ -7,7 +7,7 @@
 import { FlowEngine } from "@smthrs/engine"
 import * as JournalEvent from "@smthrs/journal/JournalEvent"
 import * as Effect from "effect/Effect"
-import * as SqlClient from "effect/unstable/sql/SqlClient"
+import * as SqlClient from "effect/sql/SqlClient"
 import { EventTypes } from "../EventTypes.ts"
 
 interface ClockRow {

package/src/migrations/0010_pending_cancellation.ts

@@ -5,7 +5,7 @@
  */
 
 import * as Effect from "effect/Effect"
-import * as SqlClient from "effect/unstable/sql/SqlClient"
+import * as SqlClient from "effect/sql/SqlClient"
 
 /**
  * Bounds cleanup reads to requested pending rows.