@ultimat3/cli 25.0.0 → 25.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ultimat3/cli",
-  "version": "25.0.0",
+  "version": "25.1.0",
   "description": "The `x` binary: new, dev, build, verify, generate, db, mcp, doctor, deploy",
   "license": "MIT",
   "type": "module",
@@ -39,33 +39,33 @@
   },
   "dependencies": {
     "@babel/core": "^8.0.1",
-    "@ultimat3/action": "25.0.0",
-    "@ultimat3/admin": "25.0.0",
-    "@ultimat3/ai": "25.0.0",
-    "@ultimat3/auth": "25.0.0",
-    "@ultimat3/cache": "25.0.0",
-    "@ultimat3/core": "25.0.0",
-    "@ultimat3/db": "25.0.0",
-    "@ultimat3/entity": "25.0.0",
-    "@ultimat3/flags": "25.0.0",
-    "@ultimat3/http": "25.0.0",
-    "@ultimat3/i18n": "25.0.0",
-    "@ultimat3/jobs": "25.0.0",
-    "@ultimat3/mail": "25.0.0",
-    "@ultimat3/manifest": "25.0.0",
-    "@ultimat3/mcp": "25.0.0",
-    "@ultimat3/money": "25.0.0",
-    "@ultimat3/notify": "25.0.0",
-    "@ultimat3/policy": "25.0.0",
-    "@ultimat3/pwa": "25.0.0",
-    "@ultimat3/query": "25.0.0",
-    "@ultimat3/realtime": "25.0.0",
-    "@ultimat3/render": "25.0.0",
-    "@ultimat3/schema": "25.0.0",
-    "@ultimat3/seo": "25.0.0",
-    "@ultimat3/storage": "25.0.0",
-    "@ultimat3/testing": "25.0.0",
-    "@ultimat3/time": "25.0.0",
+    "@ultimat3/action": "25.1.0",
+    "@ultimat3/admin": "25.1.0",
+    "@ultimat3/ai": "25.1.0",
+    "@ultimat3/auth": "25.1.0",
+    "@ultimat3/cache": "25.1.0",
+    "@ultimat3/core": "25.1.0",
+    "@ultimat3/db": "25.1.0",
+    "@ultimat3/entity": "25.1.0",
+    "@ultimat3/flags": "25.1.0",
+    "@ultimat3/http": "25.1.0",
+    "@ultimat3/i18n": "25.1.0",
+    "@ultimat3/jobs": "25.1.0",
+    "@ultimat3/mail": "25.1.0",
+    "@ultimat3/manifest": "25.1.0",
+    "@ultimat3/mcp": "25.1.0",
+    "@ultimat3/money": "25.1.0",
+    "@ultimat3/notify": "25.1.0",
+    "@ultimat3/policy": "25.1.0",
+    "@ultimat3/pwa": "25.1.0",
+    "@ultimat3/query": "25.1.0",
+    "@ultimat3/realtime": "25.1.0",
+    "@ultimat3/render": "25.1.0",
+    "@ultimat3/schema": "25.1.0",
+    "@ultimat3/seo": "25.1.0",
+    "@ultimat3/storage": "25.1.0",
+    "@ultimat3/testing": "25.1.0",
+    "@ultimat3/time": "25.1.0",
     "babel-preset-solid": "^1.9.15"
   }
 }

package/src/role-start.ts

@@ -8,6 +8,7 @@
 
 import type { Role } from '@ultimat3/core';
 import { ctxOf, isRole, logger, markReady, ROLES } from '@ultimat3/core';
+import { dbExecutor } from '@ultimat3/db';
 import type { RateLimitStore, Route, ServerHandle, WebSocketMount } from '@ultimat3/http';
 import {
   adoptRateLimitStore,
@@ -43,7 +44,6 @@ import { startWorkerWake } from './role-wake';
 import { devHooks } from './runtime-hooks';
 import { workerOptionsFor } from './runtime-jobs';
 import { startLiveFeed } from './runtime-live-feed';
-import { pgExecutorFor } from './runtime-queue';
 import { type RunningServices, releaseOrThrow } from './runtime-services';
 import { inlineScriptSources } from './script-csp';
 import { inlineStyleSources } from './style-csp';
@@ -359,7 +359,7 @@ export async function startRoles(options: StartRolesOptions): Promise<RunningRol
     // SESSION-scoped, and the session ends the moment the connection goes back to the pool, so
     // every node reads itself as leader anyway. An expiring row is correct on the executor this
     // package is actually handed.
-    const executor = pgExecutorFor(options.runtime.db);
+    const executor = dbExecutor(() => options.runtime.db);
     const scheduler = selected.includes('scheduler')
       ? jobScheduler({
           driver: options.runtime.jobs,

package/src/role-wake.ts

@@ -5,10 +5,9 @@
 
 import { gauge } from '@ultimat3/core';
 import type { DbClient } from '@ultimat3/db';
-import { canListen } from '@ultimat3/db';
+import { canListen, dbExecutor } from '@ultimat3/db';
 import type { QueueWake } from '@ultimat3/jobs';
 import { startQueueWake } from '@ultimat3/jobs';
-import { pgExecutorFor } from './runtime-queue';
 
 // The wake the gauge reads. One observer for the life of the process: a gauge redeclared with a
 // different `observe` is refused, and `x dev` starts the roles again on every restart-in-place.
@@ -32,7 +31,7 @@ export function startWorkerWake(db: DbClient): QueueWake | null {
       observe: wakeLive,
     });
   }
-  const wake = startQueueWake({ listener: db, executor: pgExecutorFor(db) });
+  const wake = startQueueWake({ listener: db, executor: dbExecutor(() => db) });
   current = wake;
   return {
     live: () => wake.live(),

package/src/runtime-queue.ts

@@ -11,17 +11,18 @@ import {
   resetIdempotency,
   setIdempotencyStore,
 } from '@ultimat3/action';
-import type { DbClient, PgliteClient, PostgresClient, SqlFragment } from '@ultimat3/db';
+import type { PgliteClient, PostgresClient } from '@ultimat3/db';
 import {
   baseClient,
   currentTx,
+  dbExecutor,
   pgliteClient,
   pgliteDataDir,
   postgresClient,
   setDbClient,
 } from '@ultimat3/db';
 import type { Tx } from '@ultimat3/entity';
-import type { EventBus, JobDriver, OutboxStore, PgExecutor } from '@ultimat3/jobs';
+import type { EventBus, JobDriver, OutboxStore } from '@ultimat3/jobs';
 import {
   outboxJobsFacade,
   postgresEventBus,
@@ -109,20 +110,6 @@ export function startDb(services: DevServices, env: ReplicaEnv): StartedDb {
   return { client, replica: attached.replica };
 }
 
-/**
- * `@ultimat3/jobs` deliberately depends on no database package: Postgres reaches it as an
- * injected `PgExecutor`. Boot code is what supplies one, and this is the boot.
- *
- * The fragment is assembled by hand rather than through `sql`` ` because the driver hands over
- * `$1..$n` text it wrote itself plus already-bound values — there is no interpolation to guard.
- */
-export function pgExecutorFor(client: DbClient): PgExecutor {
-  return {
-    query: <R>(text: string, values: readonly unknown[]): Promise<readonly R[]> =>
-      client.query<R>({ text, values } satisfies SqlFragment),
-  };
-}
-
 /**
  * Every table this process's framework packages own, applied before anything reads one.
  *
@@ -183,13 +170,15 @@ async function startJobs(
   schema: SchemaMode,
 ): Promise<RunningQueue> {
   await applySchema(client, schema);
-  const executor = pgExecutorFor(client);
+  // Bound to `client`, never the ambient `db()`: the queue, the event bus and the idempotency
+  // reservations stay on the boot's pool whatever transaction is open.
+  const executor = dbExecutor(() => client);
   const driver = overrides?.jobs ?? postgresJobDriver({ executor });
   setJobDriver(driver);
   const outbox = postgresOutboxStore({
     executor,
     // The open transaction is a client on its own connection; the `Tx` token is not that object.
-    txExecutor: () => pgExecutorFor(currentTx() ?? client),
+    txExecutor: () => dbExecutor(() => currentTx() ?? client),
   });
   setJobsFacade(
     outboxJobsFacade({ store: outbox, driver }, () => currentTx() as unknown as Tx | undefined),

package/src/runtime-services.ts

@@ -15,6 +15,7 @@ import {
   resolveEnvironment,
   systemClock,
 } from '@ultimat3/core';
+import { dbExecutor } from '@ultimat3/db';
 import type { RateLimitStore } from '@ultimat3/http';
 import { adoptRateLimitStore, postgresRateLimitStore } from '@ultimat3/http';
 import type { EventBus, JobDriver, OutboxStore } from '@ultimat3/jobs';
@@ -40,7 +41,7 @@ import { inboxRetentionOf } from './runtime-notify-retention';
 import type { RuntimeOverrides } from './runtime-overrides';
 import { installRetentionSweep } from './runtime-purge';
 import type { DevDbClient, SchemaMode } from './runtime-queue';
-import { pgExecutorFor, startQueue } from './runtime-queue';
+import { startQueue } from './runtime-queue';
 import { realtimeConfigOf } from './runtime-realtime';
 
 export interface RunningServices {
@@ -351,7 +352,7 @@ export async function startServices(
   // The same executor the jobs driver, the outbox, the event bus and the idempotency store run
   // on — one pool, one `Bun.sql` that does NOT satisfy `PgExecutor` (`Bun.sql.query` is
   // `undefined`), one wrapper.
-  const executor = pgExecutorFor(db);
+  const executor = dbExecutor(() => db);
   const rateLimitStore = postgresRateLimitStore({ executor });
   // Boot is a sequence of external resources, and every step after the first can reject — the
   // queue is already up, so from here an unwind must release it exactly like everything after it.