@substrat-run/adapter-cloudflare 0.131.0 → 0.133.0

package/dist/scope-do.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scope-do.d.ts","sourceRoot":"","sources":["../src/scope-do.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAcL,KAAK,WAAW,EAsCjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAoCL,KAAK,SAAS,EAmBd,KAAK,kBAAkB,EAEvB,KAAK,gBAAgB,EAuEtB,MAAM,sBAAsB,CAAC;AAsF9B;;;;;;;;;;;;;GAaG;AAEH,MAAM,WAAW,UAAU;IACzB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,sBAAsB,CAAC;IACvC;;;;;;OAMG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAwbD;;;GAGG;AACH,MAAM,MAAM,yBAAyB,CAAC,CAAC,IAAI;IAAE,KAAK,EAAE,CAAC,CAAC;IAAC,OAAO,CAAC,EAAE,SAAS,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,WAAW,CAAA;CAAE,CAAC;AAgDxG;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,UAAU,GAAG,SAAS,CAOxD;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAwDxD;AAED,wBAAgB,aAAa,CAC3B,OAAO,EAAE,kBAAkB,EAAE,EAC7B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,GACxD,KAAK,GAAG,EAAE,kBAAkB,EAAE,GAAG,EAAE,UAAU,KAAK,aAAa,CAkkKjE"}
+{"version":3,"file":"scope-do.d.ts","sourceRoot":"","sources":["../src/scope-do.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAcL,KAAK,WAAW,EAsCjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAoCL,KAAK,SAAS,EAmBd,KAAK,kBAAkB,EAEvB,KAAK,gBAAgB,EAuEtB,MAAM,sBAAsB,CAAC;AAsF9B;;;;;;;;;;;;;GAaG;AAEH,MAAM,WAAW,UAAU;IACzB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,sBAAsB,CAAC;IACvC;;;;;;OAMG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AA0bD;;;GAGG;AACH,MAAM,MAAM,yBAAyB,CAAC,CAAC,IAAI;IAAE,KAAK,EAAE,CAAC,CAAC;IAAC,OAAO,CAAC,EAAE,SAAS,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,WAAW,CAAA;CAAE,CAAC;AAgDxG;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,UAAU,GAAG,SAAS,CAOxD;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAwDxD;AAED,wBAAgB,aAAa,CAC3B,OAAO,EAAE,kBAAkB,EAAE,EAC7B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,GACxD,KAAK,GAAG,EAAE,kBAAkB,EAAE,GAAG,EAAE,UAAU,KAAK,aAAa,CAslKjE"}

package/dist/scope-do.js

@@ -160,6 +160,8 @@ const KERNEL_DDL = `
     module_id TEXT NOT NULL,
     version TEXT NOT NULL,
     applied_at TEXT NOT NULL,
+    duration_ms INTEGER,
+    rows_changed INTEGER,
     PRIMARY KEY (module_id, version)
   );
   -- #286: the PITR bookmark taken immediately BEFORE a migration pass runs on a
@@ -833,13 +835,15 @@ export function defineScopeDO(modules, bareOps) {
          */
         appliedMigrations(limit = 100) {
             return this.sql
-                .exec(`SELECT module_id, version, applied_at FROM _substrat_migrations
+                .exec(`SELECT module_id, version, applied_at, duration_ms, rows_changed FROM _substrat_migrations
             ORDER BY applied_at DESC, module_id, version LIMIT ?`, limit)
                 .toArray()
                 .map((r) => ({
                 moduleId: r.module_id,
                 version: r.version,
                 appliedAt: r.applied_at ?? null,
+                durationMs: r.duration_ms ?? null,
+                rowsChanged: r.rows_changed ?? null,
             }));
         }
         /**
@@ -2818,8 +2822,8 @@ export function defineScopeDO(modules, bareOps) {
             this.ctx.storage.transactionSync(() => {
                 this.sql.exec(`INSERT INTO _substrat_job_runs
              (id, module_id, job, instance, payload, status, cursor, counters, attempts,
-              last_error, started_at, updated_at, next_attempt_at, ended_at)
-           VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, row.id, row.module_id, row.job, row.instance, row.payload, row.status, row.cursor, row.counters, row.attempts, row.last_error, row.started_at, row.updated_at, row.next_attempt_at, row.ended_at);
+              last_error, started_at, updated_at, next_attempt_at, ended_at, subject_id)
+           VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, row.id, row.module_id, row.job, row.instance, row.payload, row.status, row.cursor, row.counters, row.attempts, row.last_error, row.started_at, row.updated_at, row.next_attempt_at, row.ended_at, row.subject_id ?? null);
             });
             return row;
         }
@@ -2831,8 +2835,8 @@ export function defineScopeDO(modules, bareOps) {
         async jobRunInsert(row) {
             this.sql.exec(`INSERT INTO _substrat_job_runs
            (id, module_id, job, instance, payload, status, cursor, counters, attempts,
-            last_error, started_at, updated_at, next_attempt_at, ended_at)
-         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, row.id, row.module_id, row.job, row.instance, row.payload, row.status, row.cursor, row.counters, row.attempts, row.last_error, row.started_at, row.updated_at, row.next_attempt_at, row.ended_at);
+            last_error, started_at, updated_at, next_attempt_at, ended_at, subject_id)
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, row.id, row.module_id, row.job, row.instance, row.payload, row.status, row.cursor, row.counters, row.attempts, row.last_error, row.started_at, row.updated_at, row.next_attempt_at, row.ended_at, row.subject_id ?? null);
         }
         /**
          * `running` runs whose backoff has elapsed, oldest first, after `afterId`.
@@ -2989,13 +2993,16 @@ export function defineScopeDO(modules, bareOps) {
                                 .exec('SELECT 1 FROM _substrat_migrations WHERE module_id = ? AND version = ?', moduleId, migration.version)
                                 .toArray()[0];
                             if (!already) {
+                                const started = performance.now();
+                                const before = this.sql.exec('SELECT total_changes() AS n').toArray()[0].n;
                                 // #1898: a migration runs on this DO's own handle, not `ctx.sql`, so the
                                 // spine guard's REFERENCES rule is applied here.
                                 assertNoSpineReference(migration.sql, `migration ${key}`);
                                 for (const stmt of splitSqlStatements(migration.sql)) {
                                     this.sql.exec(stmt);
                                 }
-                                this.sql.exec('INSERT INTO _substrat_migrations (module_id, version, applied_at) VALUES (?, ?, ?)', moduleId, migration.version, new Date().toISOString());
+                                const after = this.sql.exec('SELECT total_changes() AS n').toArray()[0].n;
+                                this.sql.exec('INSERT INTO _substrat_migrations (module_id, version, applied_at, duration_ms, rows_changed) VALUES (?, ?, ?, ?, ?)', moduleId, migration.version, new Date().toISOString(), Math.max(0, Math.round(performance.now() - started)), after - before);
                             }
                         });
                     }
@@ -3405,7 +3412,12 @@ export function defineScopeDO(modules, bareOps) {
             // have added it bare already, and then this ALTER is skipped as a duplicate (#1883).
             // `lint:spine-ddl` refuses one that is not.
             for (const alter of [
+                // #1763: rows written before these fields keep NULL, meaning unrecorded.
+                'ALTER TABLE _substrat_migrations ADD COLUMN duration_ms INTEGER',
+                'ALTER TABLE _substrat_migrations ADD COLUMN rows_changed INTEGER',
                 'ALTER TABLE _substrat_tuples ADD COLUMN revoked_at TEXT',
+                // #1632: legacy runs retain an unknown subject; no content-based backfill.
+                'ALTER TABLE _substrat_job_runs ADD COLUMN subject_id TEXT',
                 // Executor retry state (#100). The defaults read as "terminal", which is
                 // right for every row already there: each is a completed delivery or a
                 // consumer dead-letter.
@@ -4415,7 +4427,9 @@ export function defineScopeDO(modules, bareOps) {
         /** The directory's recorded-off modules (#1742), switched off in THIS unit right after the
          *  seat, so no sweep can run the grants the seat just re-created. `scopeId` is the scope
          *  this projection provisions (the object of `scopeTuples`), never another. */
-        switchOff) {
+        switchOff, 
+        /** Declared service subjects excluded only from human lockout repair (#1896). */
+        serviceSubjects) {
             if (await this.isReaped())
                 return [];
             // A projection that arrives after this scope was reaped is dropped, not
@@ -4500,14 +4514,14 @@ export function defineScopeDO(modules, bareOps) {
                     this.sql.exec(seat.sql, ...seat.params);
                 }
                 // #1659's one exception: the owner-of-record's seat comes back over a revoke when
-                // NOTHING else would let anyone act here — roles projected, no effective role grant.
-                // That is the #332 lockout this path exists to repair, and it is decided by the same
-                // predicate as the flip guard below, so "locked out" means one thing in this unit.
+                // No HUMAN holder remains — declared service subjects cannot prevent lockout repair.
+                // That is the #332 lockout this path exists to repair. The flip guard below still
+                // counts service authority; only the repair excludes the declared service subjects.
                 // With any other effective holder, the revoke stands: a hand-over that seats a
                 // successor before unseating the owner is not undone by the next promote. A holder of
                 // a role the vertical no longer defines is NOT one — it passes no check, so it must
                 // not stand in for the holder this repair exists to restore.
-                if (roles.length > 0 && !this.hasEffectiveRoleGrant(tenantId)) {
+                if (roles.length > 0 && !this.hasEffectiveRoleGrant(tenantId, serviceSubjects)) {
                     for (const st of scopeTuples ?? []) {
                         if (!st.lockout_reseat)
                             continue;
@@ -4556,8 +4570,8 @@ export function defineScopeDO(modules, bareOps) {
          *  kernel's `effectiveRoleGrantQuery`, where it is tested against a real SQLite. A tuple
          *  for a role the vertical no longer defines counts for nothing, exactly as in the local
          *  checker, which expands a role only through its definition. */
-        hasEffectiveRoleGrant(tenantId) {
-            const q = effectiveRoleGrantQuery(tenantId, new Date().toISOString());
+        hasEffectiveRoleGrant(tenantId, excludedSubjects) {
+            const q = effectiveRoleGrantQuery(tenantId, new Date().toISOString(), undefined, excludedSubjects);
             const row = this.sql.exec(q.sql, ...q.params).toArray()[0];
             return row?.effective === 1;
         }