@abloatai/ablo 0.14.0 → 0.15.1

package/dist/transactions/TransactionQueue.js

@@ -409,6 +409,10 @@ export class TransactionQueue extends EventEmitter {
     executingCount = 0;
     // Optimistic update tracking
     optimisticUpdates = new Map();
+    // Stale-context notifications (CoAgent/MTPO notify-instead-of-abort) keyed by
+    // transaction id, populated from the commit ack and drained by
+    // `waitForCommitReceipt` so the receipt carries the self-heal signal.
+    commitNotifications = new Map();
     // LINEAR PATTERN: Track delta confirmation timeouts for awaiting_delta transactions
     // Following Replicache/PowerSync pattern: retry with backoff instead of rolling back
     deltaConfirmationTimeouts = new Map();
@@ -1127,6 +1131,20 @@ export class TransactionQueue extends EventEmitter {
                         const result = await this.mutationExecutor.commit(operations);
                         const lastSyncId = result?.lastSyncId ?? 0;
                         this.noteAck(lastSyncId);
+                        // Notify-instead-of-abort: the server returned stale-context
+                        // notifications for `onStale: 'notify'` ops whose premise moved.
+                        // Every notified op was HELD (not written) — its optimistic state
+                        // must be rolled back here; no delta will ever confirm it. We also
+                        // stamp the signal so `waitForCommitReceipt` carries it onto the
+                        // receipt.
+                        const notifications = result?.notifications;
+                        const heldIds = new Set((notifications ?? []).map((n) => n.id));
+                        for (const { tx } of batchOps) {
+                            const txNotifs = notifications?.filter((n) => n.id === tx.modelId);
+                            if (txNotifs && txNotifs.length > 0) {
+                                this.commitNotifications.set(tx.id, txNotifs);
+                            }
+                        }
                         // Detect server bug: lastSyncId 0 means mutation succeeded but no sync delta was emitted
                         if (lastSyncId === 0) {
                             getContext().observability.captureCommitZeroSyncId({
@@ -1137,6 +1155,19 @@ export class TransactionQueue extends EventEmitter {
                         // LINEAR PATTERN: Mark as awaiting_delta with syncId threshold
                         // Transactions will be confirmed when any delta with id >= lastSyncId arrives
                         for (const { tx } of batchOps) {
+                            // Held op ('notify'): the server withheld the write, so no delta
+                            // will confirm it. Roll back the optimistic update (server
+                            // wins) and complete the transaction now — the agent self-heals
+                            // from the notification rather than waiting out the delta
+                            // timeout. The receipt still resolves (commit succeeded).
+                            if (heldIds.has(tx.modelId)) {
+                                await this.rollbackOptimistic(tx, 'conflict_server_wins');
+                                this.store.updateStatus(tx.id, 'completed');
+                                this.emit('transaction:completed', tx);
+                                this.emit(`transaction:completed:${tx.id}`, tx);
+                                this.optimisticUpdates.delete(tx.id);
+                                continue;
+                            }
                             tx.syncIdNeededForCompletion = lastSyncId;
                             // Safety net: when lastSyncId is 0, DELETE transactions should be confirmed
                             // immediately. DELETEs are idempotent — if no delta was emitted, the entity
@@ -1528,6 +1559,7 @@ export class TransactionQueue extends EventEmitter {
             kind: 'commit',
             operations: [...operations],
             causedByTaskId: options.causedByTaskId ?? null,
+            ...(options.reads ? { reads: options.reads } : {}),
             status: 'pending',
             createdAt: Date.now(),
             attempts: 0,
@@ -1565,6 +1597,7 @@ export class TransactionQueue extends EventEmitter {
                     const result = await this.mutationExecutor.commit(tx.operations, {
                         idempotencyKey: tx.id,
                         causedByTaskId: tx.causedByTaskId ?? undefined,
+                        ...(tx.reads ? { reads: tx.reads } : {}),
                     });
                     tx.lastSyncId = result?.lastSyncId ?? 0;
                     this.noteAck(tx.lastSyncId);
@@ -1610,10 +1643,18 @@ export class TransactionQueue extends EventEmitter {
      * of `ablo.commits.create()`.
      */
     waitForCommitReceipt(clientTxId) {
+        // Drain any stale-context notifications stamped for this tx on the ack.
+        const drainNotifications = () => {
+            const n = this.commitNotifications.get(clientTxId);
+            if (!n)
+                return undefined;
+            this.commitNotifications.delete(clientTxId);
+            return n.length > 0 ? n : undefined;
+        };
         return new Promise((resolve, reject) => {
             const existing = this.commitStore.get(clientTxId);
             if (existing?.status === 'completed') {
-                resolve({ lastSyncId: existing.lastSyncId ?? 0 });
+                resolve({ lastSyncId: existing.lastSyncId ?? 0, notifications: drainNotifications() });
                 return;
             }
             if (existing?.status === 'failed' && existing.error) {
@@ -1622,7 +1663,7 @@ export class TransactionQueue extends EventEmitter {
             }
             const onCompleted = (tx) => {
                 cleanup();
-                resolve({ lastSyncId: tx.lastSyncId ?? 0 });
+                resolve({ lastSyncId: tx.lastSyncId ?? 0, notifications: drainNotifications() });
             };
             const onFailed = ({ error }) => {
                 cleanup();

package/dist/wire/frames.d.ts

@@ -18,7 +18,7 @@
  * Changing any shape here is a wire-contract change — it requires
  * coordinated client + server updates.
  */
-import type { OnStaleMode } from '../coordination/index.js';
+import type { OnStaleMode, StaleNotification, ReadDependency } from '../coordination/index.js';
 import type { ErrorCode, RequiredCapability } from '../errors.js';
 /**
  * A single operation within a {@link CommitMessage} batch. The atomic unit
@@ -44,9 +44,10 @@ export interface CommitOperation {
      */
     readAt?: number | null;
     /**
-     * Mode on stale detection. `'reject'` (default) throws
-     * AbloStaleContextError; `'force'` applies unconditionally. `'flag'` /
-     * `'merge'` are reserved, not yet implemented.
+     * Mode on stale detection (non-coercion). `'reject'` (default) throws
+     * AbloStaleContextError; `'overwrite'` applies unconditionally (blind LWW);
+     * `'notify'` holds the write and returns a `StaleNotification` for the actor
+     * to resolve.
      */
     onStale?: OnStaleMode | null;
 }
@@ -84,6 +85,15 @@ export interface CommitMessage {
          * `null` (the audit pane treats null as "no prompt-side context").
          */
         causedByTaskId?: string | null;
+        /**
+         * Batch-level read dependencies (the STORM "did anything I looked at
+         * change?" layer). Each entry is a row (`{model,id,readAt,fields?}`) or a
+         * sync group (`{group,readAt}`) the batch's writes were premised on; the
+         * server validates none moved since `readAt` and fires the entry's
+         * `onStale` disposition over the batch. Omitted ⇒ only write-targets are
+         * checked (legacy behavior).
+         */
+        reads?: ReadDependency[] | null;
     };
 }
 /**
@@ -105,6 +115,20 @@ export interface MutationResultMessage {
         status?: 'confirmed' | 'rejected';
         lastSyncId?: number;
         ops?: number;
+        /**
+         * Stale-context notifications for `onStale: 'notify' ops whose
+         * premise moved concurrently. Present only on a successful ack that hit a
+         * notify-resolved conflict; the client surfaces these via the
+         * `conflict:notified` event and the commit receipt instead of rejecting.
+         */
+        notifications?: StaleNotification[];
+        /**
+         * Ids of UPDATE/DELETE targets that matched ZERO rows (don't exist or are
+         * outside the org). Present (non-empty) only when a write missed. The
+         * client turns this into a loud `AbloNotFoundError` for the affected
+         * caller instead of treating the no-op as success.
+         */
+        missingIds?: string[];
         error?: {
             code: ErrorCode;
             message: string;

package/docs/concurrency-convention.md

@@ -0,0 +1,222 @@
+# Concurrency Convention
+
+> The governing convention for how Ablo resolves concurrent writes to shared
+> state, and the boundaries of that convention. This is the contract; the
+> three-layer mechanics live in [`coordination.md`](./coordination.md).
+
+---
+
+## 1. The principle: non-coercion
+
+**The engine surfaces the truthful current state and lets the intelligent actor —
+agent or human — decide what to do. It does not force a resolution.**
+
+That is the whole convention. Everything below is a consequence of it.
+
+Classical concurrency control is *coercive*: it imposes the remedy. Two-phase
+locking forces a block; optimistic concurrency forces an abort. Ablo's wager is
+that the actor in the loop (an agent reasoning over the change, or a human
+watching the row) is better placed to resolve a conflict than a fixed rule baked
+into the storage layer. So the engine's job narrows to one thing: **report what
+is true, on time, and get out of the way.**
+
+There are two forms of non-coercion, and they are the same principle at two
+moments in time:
+
+| form | when | mechanism |
+|---|---|---|
+| **Claim** | *prospective* — before you act | reserve the row; others queue. Coordinate so the conflict never forms. |
+| **Notification** | *in-flight* — after a concurrent change | surface the changed value; the actor resolves and re-issues. |
+
+Use a claim when you will hold the row across a slow read→reason→write gap. Use a
+notification when you didn't, and the premise moved under you.
+
+---
+
+## 2. The dispositions (`onStale`)
+
+Every guarded write (and every read dependency, §4) declares how a stale premise
+should be handled. Three modes, split by whether they **force** an outcome:
+
+| mode | coercive? | what the engine does | who resolves | use when |
+|---|---|---|---|---|
+| `notify` | **No** — surface + delegate | Holds the write (does **not** apply it); returns a `StaleNotification` with the current value. | The actor (agent or human) reconciles and re-issues. | The aligned mode: tell the actor what changed, let it solve. |
+| `reject` | **Yes** — force-abort | Throws `AbloStaleContextError`; the batch is discarded. | The caller retries from scratch. | Hard invariants; legacy/strict callers. The current default. |
+| `overwrite` | **Yes** — force-clobber | Overwrites blindly last-writer-wins; **no** signal. | Nobody. | You genuinely own the field and concurrent values are noise. |
+
+> `notify` is the convention. `reject` and `overwrite` are escape hatches for the
+> two ends — "never let this be wrong" and "never bother me." They are not the
+> spirit; they are the boundary of it.
+
+---
+
+## 3. What is checked: two footprints
+
+A conflict is a **footprint intersection** — your operation's footprint overlaps
+a concurrent delta. Ablo checks two footprints, and they are independent:
+
+| footprint | declared by | question | scope |
+|---|---|---|---|
+| **Write-target** | per-op `readAt` | "did a row I'm **writing** change since I read it?" | the rows in `operations[]` |
+| **Read-set** | batch-level `reads[]` | "did anything I **looked at** change since I read it?" | rows/groups in `reads[]`, even if not written |
+
+The write-target check alone is the narrow case the canary anomaly defeats: an
+agent reads `deal.stage`, writes `task.status`, and a peer moves `deal.stage` —
+`task` never changed, so a write-target-only check waves it through. The read-set
+closes that gap.
+
+---
+
+## 4. The read-set (`reads[]`)
+
+A commit may declare, at the batch level, the premises its writes depended on.
+Two granularities, developer's choice per entry:
+
+```ts
+reads: [
+  { model: 'Slide', id: 's-1', readAt: N, fields?: ['title'] }, // ROW premise
+  { group: 'deck:abc', readAt: N, onStale: 'notify' },          // GROUP premise
+]
+```
+
+- **Row** — did this specific row (optionally these fields) change? The literal
+  per-object premise.
+- **Group** — did *anything* in this sync group change? `group` is a sync-group
+  key (`deck:abc`, `slide:s1`, `org:X`) — the same unit a participant **watches
+  and claims**. This is the more Ablo-native granularity.
+
+**Boundary — a stale read fires over the whole batch.** A read dependency is a
+premise for *all* the writes in the commit, so its disposition governs the batch:
+`reject` aborts it, `notify` holds **every** write and notifies, `overwrite`
+lets them land. Per-entry `onStale` defaults to `reject`.
+
+---
+
+## 5. The notification (`StaleNotification`)
+
+The non-coercive modes hand back data instead of throwing. The signal is
+delivered **twice**, by design — once as a value, once as an event:
+
+- On the **commit receipt**: `receipt.notifications` (and `CommitResult.notifications`).
+- On the **event channel**: `conflict:notified` (mirrors `reconciliation:needed` /
+  `sync:rollback`).
+
+Shape (canonical in `coordination/schema.ts`):
+
+| field | meaning |
+|---|---|
+| `object` | Stripe-style type tag — `'stale_notification'` |
+| `model`, `id` | the conflicting row (for a group dep, both are the group key) |
+| `group?` | set when this is a group-scoped notification |
+| `readAt` | the watermark the committer reasoned against |
+| `observedSyncId` | the newest delta on the premise — re-read at/after this |
+| `conflictingFields` | fields that moved (empty for group / whole-entity) |
+| `currentValues` | the live values of those fields — the premise to reconcile against (empty for group) |
+| `writtenBy` | `{ kind, id }` of the concurrent author, reported faithfully |
+
+Only `notify` produces a notification (the write was held). `reject` throws and
+`overwrite` is silent — neither notifies.
+
+### 5.1 The receive → reconcile loop
+
+You receive the signal two ways (same payload), then re-commit against the fresh
+watermark. The engine never re-issues for you — the actor decides.
+
+```ts
+// Trigger: a guarded write under the non-coercive mode.
+const receipt = await ablo.task.update({
+  id, data: { status: 'blocked' },
+  readAt: myWatermark,
+  onStale: 'notify',
+});
+
+// Receive — pull: the held write surfaces on the receipt.
+for (const n of receipt.notifications ?? []) reconcile(n);
+
+// Receive — push: the same StaleNotification[] fires ambiently on the socket.
+ws.subscribe('conflict:notified', ({ notifications }) => notifications.forEach(reconcile));
+
+function reconcile(n: StaleNotification) {
+  // n.currentValues — what's actually there now (e.g. { status: 'done' })
+  // n.writtenBy     — who moved it (e.g. { kind: 'agent', id: 'agent-b' })
+  if (!stillValid(n.currentValues)) return;       // premise gone → drop the write
+
+  return ablo.task.update({
+    id: n.id,
+    data: { status: 'blocked' },
+    readAt: n.observedSyncId,   // adopt the new high-water mark — this is what terminates the loop
+    onStale: 'notify',
+  });
+}
+```
+
+The loop **terminates** because each retry advances `readAt` to `observedSyncId`;
+a peer that keeps writing only ever notifies you against a *newer* baseline, never
+the same one twice. A group read-dep reconciles identically, except `group` is set
+and `currentValues` is empty (re-read the group).
+
+---
+
+## 6. Boundaries & invariants
+
+What the convention **guarantees**, and where it **stops**:
+
+1. **Engine surfaces, actor decides.** For `flag`/`merge` the engine never
+   repairs, merges, or re-plans. It reports `currentValues` and the actor (agent
+   or human) owns the resolution. The engine does not distinguish them — it is
+   actor-neutral by design.
+
+2. **Truthfulness.** `currentValues` / `observedSyncId` reflect committed state at
+   detection time, inside the same transaction as the write. A notification is
+   never speculative.
+
+3. **Termination (no livelock).** The monotonic `sync_id` landing order is the
+   serialization order. The stale committer always yields/recomputes — an
+   asymmetry that rules out the symmetric notify-rewrite livelock. Unbounded
+   retry is bounded by the client's reconciliation retry cap.
+
+4. **Scope: reversible DB state only.** The convention governs writes to the
+   shared database, which are inherently reversible (prior value in
+   `sync_deltas`). **Irreversible external side-effects** (emails, payments,
+   third-party calls) are *out of scope* — the engine cannot hold or undo them,
+   so they must not be gated by `flag`/`merge`.
+
+5. **Defaults.** A plain write (no `readAt`) is last-writer-wins with **no**
+   check. A guarded write with `readAt` but no `onStale` defaults to `reject`
+   (back-compat). *Open decision (§7).*
+
+6. **Policy seam.** Custom `ConflictPolicy` functions see **write-target**
+   conflicts (`stale_context` / `claim_held`). **Read-set** conflicts are
+   currently resolved directly via each entry's `onStale`, not through the policy
+   seam. *Open decision (§7).*
+
+7. **Claims win when held.** A non-holder writing to a claimed row is rejected
+   (`AbloClaimedError`) regardless of `readAt` — the prospective form takes
+   precedence over the in-flight form. Only `user`/`system` principals may
+   `bypass` a foreign claim; agents may not.
+
+---
+
+## 7. Open decisions (bounded, not yet made)
+
+These are deliberately left open; they change behavior and are the user's call.
+
+- **Default disposition for agents.** Should an agent-participant guarded write
+  default to `flag` (philosophy-aligned: surface, don't force) instead of
+  `reject` (back-compat)? Trade-off: alignment vs. a behavior change for existing
+  agent callers.
+- **Read-deps through the policy seam.** Should read-set conflicts also pass
+  through `ConflictPolicy` (requires a group-aware conflict shape), or stay on
+  the direct `onStale` mapping?
+
+---
+
+## 8. Out of scope
+
+- Irreversible external side-effects (§6.4) — not gated by this convention.
+- Cross-object *serializability proof*. The read-set is a sound premise check,
+  not a full precedence-graph guarantee; it needs declared reads to catch a
+  premise, and a caller that declares none gets only write-target checking.
+- Identity → participant-kind mapping. `writtenBy.kind` reports whatever
+  authenticated (an `sk_` key resolves to `system`, not `agent`); how identities
+  map to kinds is a separate concern.

package/docs/coordination.md

@@ -1,5 +1,10 @@
 # Coordination Reference
 
+> **Governing convention:** [`concurrency-convention.md`](./concurrency-convention.md)
+> — the non-coercion principle (surface state, let the actor decide), the full
+> `onStale` taxonomy, the read-set (`reads[]`), and the boundaries. Read that for
+> the *why* and the contract; this reference is the *how* (claim mechanics + API).
+
 Coordinate long-running work on a row so humans and agents don't clobber each
 other. Most writes need none of this — a plain `ablo.<model>.update({ id, data })`
 is **last-write-wins** by default. For lost-update detection, take a claim or pass

package/docs/data-sources.md

@@ -205,6 +205,47 @@ await ablo.weatherReports.update({
 });
 ```
 
+## Local development & locked-down VPC — the reverse channel
+
+The signed route above is an **inbound webhook**: Ablo Cloud calls your HTTPS
+endpoint. That needs a public URL — which `localhost` doesn't have, and a
+locked-down VPC won't expose. The reverse channel fixes both. A connector you run
+next to your database dials an **outbound** WebSocket to Ablo Cloud and serves the
+same `commit`/`load`/`list` requests over it — the Stripe-CLI `stripe listen`
+pattern. No tunnel, no public endpoint, and your database credentials never leave
+your process.
+
+It wraps the **same handler** your deployed route uses — share the options object,
+so there's zero handler drift:
+
+```ts
+// scripts/ablo-connector.ts — run locally, or as a sidecar in a private VPC
+import { dataSource, createSourceConnector } from '@abloatai/ablo';
+import { sourceOptions } from '@/ablo/source'; // the same object route.ts passes
+
+const connector = createSourceConnector({
+  apiKey: process.env.ABLO_API_KEY!,         // sk_test_* for the dev loop
+  handler: dataSource(sourceOptions),         // the unchanged (Request) => Response
+});
+
+const controller = new AbortController();
+await connector.run(controller.signal);       // dials out, serves until aborted
+```
+
+When a connector is attached for a source, Ablo Cloud drains that source's
+`commit`/`load`/`list` down the socket instead of POSTing the webhook; when none
+is attached, the inbound webhook path is used unchanged. The drained requests
+carry the **same** Standard Webhooks signature, so `dataSource` verifies them
+exactly as on the webhook path — the transport changes, the trust model does not.
+
+**Production / no-public-URL deploy.** By default the connector is gated to
+`sk_test_*` keys (the dev-loop affordance). A customer who genuinely cannot expose
+an inbound endpoint — a locked-down VPC — can run the connector as their deployed
+production transport by opting that source into `reverseChannelProd` and using an
+`sk_live_*` key. The inbound webhook remains the default for everyone else (it's
+stateless and lower-latency); the reverse channel is the escape hatch for
+no-inbound environments.
+
 ## Commit Request
 
 When Ablo calls your Data Source, it sends a signed JSON request:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abloatai/ablo",
-  "version": "0.14.0",
+  "version": "0.15.1",
   "description": "The Collaboration Layer For AI Agents",
   "license": "Apache-2.0",
   "type": "module",
@@ -88,6 +88,11 @@
       "import": "./dist/keys/index.js",
       "default": "./dist/keys/index.js"
     },
+    "./auth": {
+      "types": "./dist/auth/index.d.ts",
+      "import": "./dist/auth/index.js",
+      "default": "./dist/auth/index.js"
+    },
     "./environment": {
       "types": "./dist/environment.d.ts",
       "import": "./dist/environment.js",