@aouda/client 0.1.13 → 0.1.15

package/dist/cli/index.js

@@ -392,7 +392,7 @@ import { fileURLToPath } from "url";
 // package.json
 var package_default = {
   name: "@aouda/client",
-  version: "0.1.13",
+  version: "0.1.15",
   description: "Official TypeScript/JavaScript client library for Aouda",
   type: "module",
   main: "./dist/index.cjs",
@@ -507,43 +507,44 @@ var AoudaResponseError = class extends AoudaError {
   }
 };
 var AoudaApiError = class extends AoudaError {
-  constructor(message, code, statusCode, details, requestId, retryAfterSeconds) {
+  constructor(message, code, statusCode, details, requestId, retryAfterSeconds, token) {
     super(message);
     this.code = code;
     this.statusCode = statusCode;
     this.details = details;
     this.requestId = requestId;
     this.retryAfterSeconds = retryAfterSeconds;
+    this.token = token;
     this.name = "AoudaApiError";
   }
 };
 var AoudaNotFoundError = class extends AoudaApiError {
-  constructor(message, code, statusCode, details, requestId) {
-    super(message, code, statusCode, details, requestId);
+  constructor(message, code, statusCode, details, requestId, retryAfterSeconds, token) {
+    super(message, code, statusCode, details, requestId, retryAfterSeconds, token);
     this.name = "AoudaNotFoundError";
   }
 };
 var AoudaConflictError = class extends AoudaApiError {
-  constructor(message, code, statusCode, details, requestId) {
-    super(message, code, statusCode, details, requestId);
+  constructor(message, code, statusCode, details, requestId, retryAfterSeconds, token) {
+    super(message, code, statusCode, details, requestId, retryAfterSeconds, token);
     this.name = "AoudaConflictError";
   }
 };
 var AoudaValidationError = class extends AoudaApiError {
-  constructor(message, code, statusCode, details, requestId) {
-    super(message, code, statusCode, details, requestId);
+  constructor(message, code, statusCode, details, requestId, retryAfterSeconds, token) {
+    super(message, code, statusCode, details, requestId, retryAfterSeconds, token);
     this.name = "AoudaValidationError";
   }
 };
 var AoudaServerError = class extends AoudaApiError {
-  constructor(message, code, statusCode, details, requestId, retryAfterSeconds) {
-    super(message, code, statusCode, details, requestId, retryAfterSeconds);
+  constructor(message, code, statusCode, details, requestId, retryAfterSeconds, token) {
+    super(message, code, statusCode, details, requestId, retryAfterSeconds, token);
     this.name = "AoudaServerError";
   }
 };
 var AoudaAuthenticationError = class extends AoudaApiError {
-  constructor(message, code, statusCode, details, requestId) {
-    super(message, code, statusCode, details, requestId);
+  constructor(message, code, statusCode, details, requestId, retryAfterSeconds, token) {
+    super(message, code, statusCode, details, requestId, retryAfterSeconds, token);
     this.name = "AoudaAuthenticationError";
   }
 };
@@ -1339,7 +1340,7 @@ function buildHandle(jobId, commitResp, wasResumed, transport, database, signal)
     rowsDurablyCommitted: commitResp.rowsLoaded,
     segmentsCreated: commitResp.segmentsCreated,
     committedAtUtc: commitResp.committedAtUtc,
-    walPosition: commitResp.walPosition,
+    token: commitResp.token,
     writeConcernSatisfied: commitResp.writeConcernAchieved ?? "acknowledged",
     writeConcernTimedOut: commitResp.writeConcernTimedOut,
     wasResumed,
@@ -1465,6 +1466,7 @@ var PROTOCOL_VERSION_HEADER = "X-Aouda-Protocol-Version";
 var PROTOCOL_VERSION = "1";
 var CONTENT_TYPE_JSON2 = "application/json";
 var REQUEST_ID_HEADER2 = "X-Request-Id";
+var TOKEN_HEADER = "X-Aouda-Token";
 var ERROR_CODE_MAP = {
   TABLE_NOT_FOUND: AoudaNotFoundError,
   COLUMN_NOT_FOUND: AoudaNotFoundError,
@@ -1504,7 +1506,12 @@ var ERROR_CODE_MAP = {
   AUTH_IDENTITY_INVALID: AoudaValidationError,
   AUTH_IDENTITY_NOT_FOUND: AoudaValidationError,
   BULK_LOAD_TRANSFORM_INTENT_REQUIRED: AoudaValidationError,
-  BULK_LOAD_TRANSFORM_INTENT_CONFLICT: AoudaValidationError
+  BULK_LOAD_TRANSFORM_INTENT_CONFLICT: AoudaValidationError,
+  TOKEN_MALFORMED: AoudaValidationError,
+  TOKEN_FOREIGN_DATABASE: AoudaValidationError,
+  TOKEN_EPOCH_SUPERSEDED: AoudaConflictError,
+  TOKEN_UNSATISFIED: AoudaConflictError,
+  TOKEN_FETCH_PRIMARY: AoudaApiError
 };
 function createComposedAbortController(...signals) {
   const controller = new AbortController();
@@ -1541,7 +1548,7 @@ function createApiError(statusCode, statusText, body, retryAfterHeader) {
   const requestId = body.requestId;
   const retryAfterSeconds = parseRetryAfterSeconds(retryAfterHeader ?? null);
   const Ctor = ERROR_CODE_MAP[code] ?? AoudaApiError;
-  return new Ctor(message, code, statusCode, details, requestId, retryAfterSeconds);
+  return new Ctor(message, code, statusCode, details, requestId, retryAfterSeconds, body.token);
 }
 var HttpTransport = class {
   constructor(options) {
@@ -1553,6 +1560,29 @@ var HttpTransport = class {
       ...options.defaultHeaders
     };
     this.abortController = new AbortController();
+    this.database = options.database;
+    this.store = options.consistencyTokenStore;
+  }
+  presentTokenHeaders(path4, headers) {
+    if (this.store == null || this.database == null || isAuthPath(path4)) {
+      return;
+    }
+    const token = this.store.get(this.database);
+    if (token != null && token.length > 0) {
+      headers[TOKEN_HEADER] = token;
+    }
+  }
+  observeResponse(_path, response, bodyText, errorCode) {
+    if (this.store == null || this.database == null) {
+      return;
+    }
+    if (errorCode === "TOKEN_MALFORMED" || errorCode === "TOKEN_FOREIGN_DATABASE") {
+      return;
+    }
+    const header = response.headers.get(TOKEN_HEADER);
+    const bodyToken = readBodyToken(bodyText);
+    const token = header != null && header.trim().length > 0 ? header : bodyToken;
+    this.store.observe(this.database, token);
   }
   /**
    * Abort all in-flight and future requests (e.g. on client disconnect).
@@ -1590,6 +1620,7 @@ var HttpTransport = class {
       ...this.defaultHeaders,
       ...config.headers
     };
+    this.presentTokenHeaders(config.path, headers);
     if (config.body !== void 0 && config.body !== null) {
       headers["Content-Type"] = CONTENT_TYPE_JSON2;
     }
@@ -1609,6 +1640,7 @@ var HttpTransport = class {
         const text = await response.text();
         if (config.allowStatuses?.includes(response.status) && text) {
           try {
+            this.observeResponse(config.path, response, text);
             return JSON.parse(text);
           } catch {
           }
@@ -1622,15 +1654,19 @@ var HttpTransport = class {
         }
         if (response.status === 401) {
           const code = errorBody?.code ?? "AUTH_TOKEN_MISSING";
+          this.observeResponse(config.path, response, text, code);
           throw new AoudaAuthenticationError(
             errorBody?.error ?? "Unauthorized",
             code,
             401,
             errorBody?.details,
-            errorBody?.requestId
+            errorBody?.requestId,
+            void 0,
+            errorBody?.token
           );
         }
         if (errorBody?.code != null) {
+          this.observeResponse(config.path, response, text, errorBody.code);
           throw createApiError(
             response.status,
             response.statusText,
@@ -1638,6 +1674,7 @@ var HttpTransport = class {
             response.headers.get("Retry-After")
           );
         }
+        this.observeResponse(config.path, response, text);
         throw new AoudaResponseError(
           errorBody?.error ?? `${response.status} ${response.statusText}`,
           response.status,
@@ -1645,6 +1682,7 @@ var HttpTransport = class {
         );
       }
       const responseText = await response.text();
+      this.observeResponse(config.path, response, responseText);
       if (config.rawText) {
         return responseText;
       }
@@ -1705,6 +1743,7 @@ var HttpTransport = class {
       ...this.defaultHeaders,
       ...config.headers
     };
+    this.presentTokenHeaders(config.path, headers);
     if (config.rawBodyStr === void 0 && config.body !== void 0 && config.body !== null) {
       headers["Content-Type"] = CONTENT_TYPE_JSON2;
     }
@@ -1721,6 +1760,7 @@ var HttpTransport = class {
     try {
       const response = await localNetworkFetch(url, init);
       if (response.ok || config.allowStatuses?.includes(response.status)) {
+        this.observeResponse(config.path, response, void 0);
         return response;
       }
       const text = await response.text();
@@ -1733,15 +1773,19 @@ var HttpTransport = class {
       }
       if (response.status === 401) {
         const code = errorBody?.code ?? "AUTH_TOKEN_MISSING";
+        this.observeResponse(config.path, response, text, code);
         throw new AoudaAuthenticationError(
           errorBody?.error ?? "Unauthorized",
           code,
           401,
           errorBody?.details,
-          errorBody?.requestId
+          errorBody?.requestId,
+          void 0,
+          errorBody?.token
         );
       }
       if (errorBody?.code != null) {
+        this.observeResponse(config.path, response, text, errorBody.code);
         throw createApiError(
           response.status,
           response.statusText,
@@ -1749,6 +1793,7 @@ var HttpTransport = class {
           response.headers.get("Retry-After")
         );
       }
+      this.observeResponse(config.path, response, text);
       throw new AoudaResponseError(
         errorBody?.error ?? `${response.status} ${response.statusText}`,
         response.status,
@@ -1903,6 +1948,47 @@ var HttpTransport = class {
     });
   }
 };
+function isAuthPath(path4) {
+  let p = path4;
+  const q = p.indexOf("?");
+  if (q >= 0) {
+    p = p.slice(0, q);
+  }
+  if (/^https?:\/\//i.test(p)) {
+    try {
+      p = new URL(p).pathname;
+    } catch {
+    }
+  }
+  const lower = p.toLowerCase();
+  if (lower === "/api/auth" || lower.startsWith("/api/auth/")) {
+    return true;
+  }
+  const prefix = "/api/databases/";
+  if (!lower.startsWith(prefix)) {
+    return false;
+  }
+  const rest = lower.slice(prefix.length);
+  const slash = rest.indexOf("/");
+  if (slash < 0) {
+    return false;
+  }
+  const afterDb = rest.slice(slash + 1);
+  return afterDb === "auth" || afterDb.startsWith("auth/");
+}
+function readBodyToken(bodyText) {
+  if (bodyText == null || bodyText.trim().length === 0) {
+    return void 0;
+  }
+  try {
+    const parsed = JSON.parse(bodyText);
+    if (parsed !== null && typeof parsed === "object" && "token" in parsed && typeof parsed.token === "string") {
+      return parsed.token;
+    }
+  } catch {
+  }
+  return void 0;
+}
 
 // src/resilience/retry.ts
 var DEFAULT_MAX_RETRIES = 3;
@@ -2335,6 +2421,48 @@ function databasePath2(db) {
   return `/api/databases/${encodeURIComponent(db)}`;
 }
 
+// src/consistency-token-store.ts
+var MemoryConsistencyTokenStore = class {
+  constructor() {
+    this.tokens = /* @__PURE__ */ new Map();
+  }
+  get(database) {
+    if (typeof database !== "string" || database.trim().length === 0) {
+      throw new Error("database must be a non-empty string");
+    }
+    return this.tokens.get(normalizeKey(database));
+  }
+  observe(database, token) {
+    if (typeof database !== "string" || database.trim().length === 0) {
+      throw new Error("database must be a non-empty string");
+    }
+    if (token == null || token.trim().length === 0) {
+      return;
+    }
+    const key = normalizeKey(database);
+    const stored = this.tokens.get(key);
+    if (stored === void 0 || compareOrdinal(token, stored) > 0) {
+      this.tokens.set(key, token);
+    }
+  }
+};
+function compareOrdinal(left, right) {
+  if (left === right) return 0;
+  return left < right ? -1 : 1;
+}
+function maxToken(left, right) {
+  if (left == null || left.length === 0) {
+    return right == null || right.length === 0 ? void 0 : right;
+  }
+  if (right == null || right.length === 0) {
+    return left;
+  }
+  return compareOrdinal(left, right) >= 0 ? left : right;
+}
+function normalizeKey(database) {
+  return database.toLowerCase();
+}
+
 // src/streaming/subscription.ts
 var AsyncEventQueue = class {
   constructor() {
@@ -2391,7 +2519,7 @@ var AsyncEventQueue = class {
   }
 };
 var TableSubscription = class {
-  constructor(transport, identity, options = {}, onWarnings) {
+  constructor(transport, identity, options = {}, onWarnings, store, database) {
     this._queue = new AsyncEventQueue();
     this._active = true;
     this._started = false;
@@ -2407,6 +2535,11 @@ var TableSubscription = class {
     this._onError = options.onError;
     this._onWarnings = onWarnings;
     this._conflate = options.conflate;
+    this._atLeast = options.atLeast;
+    this._waitMs = options.waitMs;
+    this._onExceeded = options.onExceeded;
+    this._store = store;
+    this._database = database;
     this._reconnectHandlerKey = `${this.id}::reconnect`;
   }
   get lastVersion() {
@@ -2471,10 +2604,13 @@ var TableSubscription = class {
       id: this.id
     };
     if (this._identity.kind === "named") {
-      message.hash = this._identity.hash;
+      message.name = this._identity.name;
       if (this._identity.args !== void 0) {
         message.args = this._identity.args;
       }
+      if (this._identity.orderByIndex !== void 0) {
+        message.orderByIndex = this._identity.orderByIndex;
+      }
     } else {
       message.target = this._identity.target;
       if (this._identity.filter !== void 0) {
@@ -2487,8 +2623,30 @@ var TableSubscription = class {
     if (this._conflate !== void 0) {
       message.conflate = this._conflate;
     }
+    const pin = this._resolvePin();
+    if (pin !== void 0) {
+      message.at_least = pin;
+    }
+    if (this._waitMs !== void 0) {
+      message.wait_ms = this._waitMs;
+    }
+    if (this._onExceeded !== void 0) {
+      message.on_exceeded = this._onExceeded;
+    }
     await this._transport.send(message);
   }
+  _resolvePin() {
+    if (this._atLeast !== void 0 && this._store != null && this._database != null) {
+      this._store.observe(this._database, this._atLeast);
+    }
+    const stored = this._store != null && this._database != null ? this._store.get(this._database) : void 0;
+    return maxToken(this._atLeast, stored);
+  }
+  _observeToken(token) {
+    if (token !== void 0 && this._store != null && this._database != null) {
+      this._store.observe(this._database, token);
+    }
+  }
   _handleMessage(message) {
     if (!this._active) {
       return;
@@ -2515,6 +2673,7 @@ var TableSubscription = class {
   }
   _handleSnapshotPage(message) {
     this._pendingSnapshotRows.push(...message.rows);
+    this._observeToken(message.token);
   }
   _handleSnapshotComplete(message) {
     this._lastVersion = message.version;
@@ -2523,12 +2682,20 @@ var TableSubscription = class {
     }
     const rows = this._pendingSnapshotRows;
     this._pendingSnapshotRows = [];
-    this._onSnapshot?.(rows, message.version);
-    this._queue.push({
+    this._onSnapshot?.(rows, message.version, message.total_matches);
+    const snapshot = {
       type: "snapshot",
       rows,
       version: message.version
-    });
+    };
+    if (message.total_matches !== void 0) {
+      snapshot.totalMatches = message.total_matches;
+    }
+    if (message.token !== void 0) {
+      snapshot.token = message.token;
+      this._observeToken(message.token);
+    }
+    this._queue.push(snapshot);
   }
   async _handleGap(message) {
     this._pendingSnapshotRows = [];
@@ -2553,6 +2720,10 @@ var TableSubscription = class {
     if (message.values_skipped !== void 0) {
       event.values_skipped = message.values_skipped;
     }
+    if (message.token !== void 0) {
+      event.token = message.token;
+      this._observeToken(message.token);
+    }
     this._onChange?.(event);
     this._queue.push(event);
   }
@@ -2897,11 +3068,12 @@ var TableQuery = class _TableQuery {
    * @param state - Optional initial state (used for immutable chaining).
    * @internal Use `client.table()` to create queries.
    */
-  constructor(transport, tableName, database, state, getWebSocketTransport) {
+  constructor(transport, tableName, database, state, getWebSocketTransport, store) {
     this.transport = transport;
     this.tableName = tableName;
     this.database = database;
     this.getWebSocketTransport = getWebSocketTransport;
+    this.store = store;
     this.state = state ?? {
       predicates: [],
       groupClauses: [],
@@ -2917,6 +3089,16 @@ var TableQuery = class _TableQuery {
       isDistinct: false
     };
   }
+  withState(state) {
+    return new _TableQuery(
+      this.transport,
+      this.tableName,
+      this.database,
+      state,
+      this.getWebSocketTransport,
+      this.store
+    );
+  }
   where(column, operator, value) {
     const newPredicates = buildWherePredicates(column, operator, value);
     return new _TableQuery(
@@ -2927,7 +3109,8 @@ var TableQuery = class _TableQuery {
         ...this.state,
         predicates: [...this.state.predicates, ...newPredicates]
       },
-      this.getWebSocketTransport
+      this.getWebSocketTransport,
+      this.store
     );
   }
   /**
@@ -2946,7 +3129,7 @@ var TableQuery = class _TableQuery {
     return new _TableQuery(this.transport, this.tableName, this.database, {
       ...this.state,
       groupClauses: [...this.state.groupClauses, sub]
-    }, this.getWebSocketTransport);
+    }, this.getWebSocketTransport, this.store);
   }
   /**
    * Sets the primary sort column for the query.
@@ -2971,7 +3154,7 @@ var TableQuery = class _TableQuery {
     return new _TableQuery(this.transport, this.tableName, this.database, {
       ...this.state,
       orderByClauses: [orderByClause]
-    }, this.getWebSocketTransport);
+    }, this.getWebSocketTransport, this.store);
   }
   /**
    * Sets the primary sort column to descending order.
@@ -3017,7 +3200,7 @@ var TableQuery = class _TableQuery {
     return new _TableQuery(this.transport, this.tableName, this.database, {
       ...this.state,
       orderByClauses: [...this.state.orderByClauses, orderByClause]
-    }, this.getWebSocketTransport);
+    }, this.getWebSocketTransport, this.store);
   }
   /**
    * Sets the maximum number of rows to return.
@@ -3034,7 +3217,7 @@ var TableQuery = class _TableQuery {
     return new _TableQuery(this.transport, this.tableName, this.database, {
       ...this.state,
       limitValue: count
-    }, this.getWebSocketTransport);
+    }, this.getWebSocketTransport, this.store);
   }
   /**
    * Sets the number of rows to skip.
@@ -3051,7 +3234,7 @@ var TableQuery = class _TableQuery {
     return new _TableQuery(this.transport, this.tableName, this.database, {
       ...this.state,
       offsetValue: count
-    }, this.getWebSocketTransport);
+    }, this.getWebSocketTransport, this.store);
   }
   /**
    * Requests cross-partition access for this query.
@@ -3066,10 +3249,21 @@ var TableQuery = class _TableQuery {
     return new _TableQuery(this.transport, this.tableName, this.database, {
       ...this.state,
       crossPartitionAccess: true
-    }, this.getWebSocketTransport);
+    }, this.getWebSocketTransport, this.store);
+  }
+  /**
+   * Pin this query at at least this C-1 token. Observes the token into the
+   * client store (I3, sticky) and presents it on execute via `X-Aouda-Token`.
+   */
+  atLeast(token) {
+    if (typeof token !== "string" || token.trim().length === 0) {
+      throw new Error("atLeast() requires a non-empty token");
+    }
+    this.store?.observe(this.database, token);
+    return this.withState({ ...this.state, atLeast: token });
   }
   /**
-   * Restricts the columns returned in the result.
+   * Selects specific columns to return.
    * If not called, all columns are returned.
    *
    * When T is a specific row type, only keys of T are accepted as column names.
@@ -3091,7 +3285,7 @@ var TableQuery = class _TableQuery {
     return new _TableQuery(this.transport, this.tableName, this.database, {
       ...this.state,
       selectColumns: columns.length > 0 ? columns : null
-    }, this.getWebSocketTransport);
+    }, this.getWebSocketTransport, this.store);
   }
   /**
    * Return only distinct (de-duplicated) rows for the given columns — SQL `SELECT DISTINCT`.
@@ -3121,7 +3315,7 @@ var TableQuery = class _TableQuery {
       ...this.state,
       selectColumns: columns,
       isDistinct: true
-    }, this.getWebSocketTransport);
+    }, this.getWebSocketTransport, this.store);
   }
   /**
    * Adds server-side computed columns to the query result.
@@ -3150,7 +3344,7 @@ var TableQuery = class _TableQuery {
     return new _TableQuery(this.transport, this.tableName, this.database, {
       ...this.state,
       selectExprs: projections
-    }, this.getWebSocketTransport);
+    }, this.getWebSocketTransport, this.store);
   }
   join(rightTable, leftColumnOrColumns, rightColumnOrColumns) {
     return this.addJoinClause(
@@ -3208,7 +3402,8 @@ var TableQuery = class _TableQuery {
           }
         ]
       },
-      this.getWebSocketTransport
+      this.getWebSocketTransport,
+      this.store
     );
   }
   /**
@@ -3244,7 +3439,8 @@ var TableQuery = class _TableQuery {
         ...this.state,
         groupByColumns: [...columns]
       },
-      this.getWebSocketTransport
+      this.getWebSocketTransport,
+      this.store
     );
   }
   /**
@@ -3278,8 +3474,11 @@ var TableQuery = class _TableQuery {
       onSnapshot: options.onSnapshot,
       onChange: options.onChange,
       onError: options.onError,
-      conflate: options.conflate
-    });
+      conflate: options.conflate,
+      atLeast: options.atLeast ?? this.state.atLeast,
+      waitMs: options.waitMs,
+      onExceeded: options.onExceeded
+    }, void 0, this.store, this.database);
     subscription.start();
     return subscription;
   }
@@ -3394,7 +3593,8 @@ var TableQuery = class _TableQuery {
         ...this.state,
         joinClauses: [...this.state.joinClauses, joinClause]
       },
-      this.getWebSocketTransport
+      this.getWebSocketTransport,
+      this.store
     );
   }
   addAggregate(op, column) {
@@ -3415,7 +3615,8 @@ var TableQuery = class _TableQuery {
           }
         ]
       },
-      this.getWebSocketTransport
+      this.getWebSocketTransport,
+      this.store
     );
   }
   requireWebSocketTransport() {
@@ -3445,17 +3646,23 @@ var TableQuery = class _TableQuery {
    * ```
    */
   async execute() {
+    if (this.state.atLeast) {
+      this.store?.observe(this.database, this.state.atLeast);
+    }
     const request = this.buildRequest();
     const path4 = `${databasePath2(this.database)}/query`;
     const response = await this.transport.post(path4, request);
     const rows = columnarToRows(response);
     const stats = response.stats;
-    return { rows, stats };
+    return { rows, stats, token: response.token };
   }
   /**
    * Executes the query and returns the raw columnar JSON payload (no row-object conversion).
    */
   async toColumnar() {
+    if (this.state.atLeast) {
+      this.store?.observe(this.database, this.state.atLeast);
+    }
     const request = this.buildRequest();
     const path4 = `${databasePath2(this.database)}/query`;
     return this.transport.post(path4, request);
@@ -3485,8 +3692,12 @@ var TableQuery = class _TableQuery {
         limitValue: 0,
         selectColumns: []
       },
-      this.getWebSocketTransport
+      this.getWebSocketTransport,
+      this.store
     );
+    if (this.state.atLeast) {
+      this.store?.observe(this.database, this.state.atLeast);
+    }
     const request = countQuery.buildRequest();
     const path4 = `${databasePath2(this.database)}/query`;
     const response = await this.transport.post(path4, request);
@@ -3533,7 +3744,8 @@ var TableQuery = class _TableQuery {
     const response = await this.transport.post(path4, body);
     const result = {
       rowsInserted: response.rowsInserted,
-      executionMs: response.executionMs
+      executionMs: response.executionMs,
+      token: response.token
     };
     if (response.generatedValues !== void 0) {
       result.generatedValues = response.generatedValues;
@@ -3583,7 +3795,8 @@ var TableQuery = class _TableQuery {
     const response = await this.transport.post(path4, body);
     const result = {
       rowsInserted: response.rowsInserted,
-      executionMs: response.executionMs
+      executionMs: response.executionMs,
+      token: response.token
     };
     if (response.generatedValues !== void 0) {
       result.generatedValues = response.generatedValues;
@@ -3635,6 +3848,7 @@ var TableQuery = class _TableQuery {
     return {
       rowsAffected: response.rowsUpdated,
       executionMs: response.executionMs,
+      token: response.token,
       ...response.rows ? { rows: columnarToRows(response.rows) } : {},
       ...response.rowsTruncated ? { rowsTruncated: true } : {}
     };
@@ -3685,6 +3899,7 @@ var TableQuery = class _TableQuery {
       rowsAffected: response.rowsDeleted,
       executionMs: response.executionMs,
       hasMore: response.hasMore,
+      token: response.token,
       ...response.rows ? { rows: columnarToRows(response.rows) } : {},
       ...response.rowsTruncated ? { rowsTruncated: true } : {}
     };
@@ -3704,7 +3919,8 @@ var TableQuery = class _TableQuery {
     return {
       rowsAffected: response.rowsDeleted,
       executionMs: response.executionMs,
-      hasMore: false
+      hasMore: false,
+      token: response.token
     };
   }
   /**
@@ -3717,7 +3933,14 @@ var TableQuery = class _TableQuery {
       throw new Error("batch() requires a non-empty operations array");
     }
     const wireOperations = operations.map((op, index) => {
-      const base = new _TableQuery(this.transport, this.tableName, this.database);
+      const base = new _TableQuery(
+        this.transport,
+        this.tableName,
+        this.database,
+        void 0,
+        this.getWebSocketTransport,
+        this.store
+      );
       const scoped = op.where(base);
       const where = scoped.buildWhereClause();
       if (!where) {
@@ -5054,12 +5277,12 @@ function raiseDeprecationWarnings(sink, warnings) {
       continue;
     }
     const sunset = warning.sunsetAt != null ? ` sunsetAt=${warning.sunsetAt}` : "";
-    const hash = warning.hash != null && warning.hash.length > 0 ? ` hash=${warning.hash}` : "";
+    const name = warning.name != null && warning.name.length > 0 ? ` name=${warning.name}` : "";
     sink({
       code: warning.code,
-      hash: warning.hash,
+      name: warning.name,
       sunsetAt: warning.sunsetAt,
-      message: `${warning.code}:${hash}${sunset}`.trim()
+      message: `${warning.code}:${name}${sunset}`.trim()
     });
   }
 }
@@ -5072,21 +5295,31 @@ function emptyStats() {
   };
 }
 var NamedQueriesApi = class {
-  constructor(transport, database, onWarning, getStreamingTransport) {
+  constructor(transport, database, onWarning, getStreamingTransport, store) {
     this.transport = transport;
     this.database = database;
     this.onWarning = onWarning;
     this.getStreamingTransport = getStreamingTransport;
+    this.store = store;
   }
-  async execute(hash, args, options) {
-    if (typeof hash !== "string" || hash.trim().length === 0) {
-      throw new Error("Named query hash must be a non-empty string");
+  async execute(name, args, options) {
+    if (typeof name !== "string" || name.trim().length === 0) {
+      throw new Error("Named query name must be a non-empty string");
     }
     const prefix = databasePath2(this.database);
-    const path4 = `${prefix}/named-queries/${encodeURIComponent(hash)}/query?format=columnar`;
+    const path4 = `${prefix}/named-queries/${encodeURIComponent(name)}/query?format=columnar`;
+    const body = {
+      args: args ?? {}
+    };
+    if (options?.orderByIndex !== void 0) {
+      body.orderByIndex = options.orderByIndex;
+    }
+    if (options?.atLeast !== void 0) {
+      this.store?.observe(this.database, options.atLeast);
+    }
     const response = await this.transport.post(
       path4,
-      { args: args ?? {} },
+      body,
       { signal: options?.signal }
     );
     const rows = columnarToRows(response);
@@ -5094,7 +5327,9 @@ var NamedQueriesApi = class {
     return {
       rows,
       stats: response.stats,
-      warnings: response.warnings
+      warnings: response.warnings,
+      totalMatches: response.totalMatches,
+      token: response.token
     };
   }
   async batch(items, options) {
@@ -5112,6 +5347,9 @@ var NamedQueriesApi = class {
         400
       );
     }
+    if (options?.atLeast !== void 0) {
+      this.store?.observe(this.database, options.atLeast);
+    }
     const prefix = databasePath2(this.database);
     const path4 = `${prefix}/named-queries/batch?format=columnar`;
     const envelope = await this.transport.post(
@@ -5133,33 +5371,42 @@ var NamedQueriesApi = class {
         data: slot.data ?? [],
         rowCount: slot.rowCount ?? 0,
         stats: slot.stats ?? emptyStats(),
-        warnings: slot.warnings
+        warnings: slot.warnings,
+        totalMatches: slot.totalMatches,
+        token: slot.token
       };
       const result = {
         rows: columnarToRows(columnar),
         stats: columnar.stats,
-        warnings: slot.warnings
+        warnings: slot.warnings,
+        totalMatches: slot.totalMatches,
+        token: slot.token
       };
       raiseDeprecationWarnings(this.onWarning, slot.warnings);
       return { isError: false, result };
     });
   }
-  subscribe(hash, args, options = {}) {
-    if (typeof hash !== "string" || hash.trim().length === 0) {
-      throw new Error("Named query hash must be a non-empty string");
+  subscribe(name, args, options = {}) {
+    if (typeof name !== "string" || name.trim().length === 0) {
+      throw new Error("Named query name must be a non-empty string");
     }
     const subscription = new TableSubscription(
       this.getStreamingTransport(),
-      { kind: "named", hash, args },
+      { kind: "named", name, args, orderByIndex: options.orderByIndex },
       {
         onSnapshot: options.onSnapshot,
         onChange: options.onChange,
         onError: options.onError,
-        conflate: options.conflate
+        conflate: options.conflate,
+        atLeast: options.atLeast,
+        waitMs: options.waitMs,
+        onExceeded: options.onExceeded
       },
       (warnings) => {
         raiseDeprecationWarnings(this.onWarning, warnings);
-      }
+      },
+      this.store,
+      this.database
     );
     subscription.start();
     return subscription;
@@ -5171,12 +5418,12 @@ var NamedMutationsApi = class {
     this.database = database;
     this.onWarning = onWarning;
   }
-  async execute(hash, args) {
-    if (typeof hash !== "string" || hash.trim().length === 0) {
-      throw new Error("Named mutation hash must be a non-empty string");
+  async execute(name, args) {
+    if (typeof name !== "string" || name.trim().length === 0) {
+      throw new Error("Named mutation name must be a non-empty string");
     }
     const prefix = databasePath2(this.database);
-    const path4 = `${prefix}/named-mutations/${encodeURIComponent(hash)}/execute`;
+    const path4 = `${prefix}/named-mutations/${encodeURIComponent(name)}/execute`;
     const wire = await this.transport.post(path4, {
       args: args ?? {}
     });
@@ -5237,6 +5484,7 @@ var WebSocketTransport = class {
     // Serialized-send queue: each send appends to this tail.
     this._sendTail = Promise.resolve();
     this._lastVersion = 0;
+    this._lastToken = null;
     this._reconnectAttempt = 0;
     this._disposed = false;
     this._missedPings = 0;
@@ -5254,6 +5502,7 @@ var WebSocketTransport = class {
     this._pingIntervalMs = options.pingIntervalMs ?? DEFAULT_PING_INTERVAL_MS;
     this._maxMissedHeartbeats = options.maxMissedHeartbeats ?? DEFAULT_MAX_MISSED_HEARTBEATS;
     this._enableCompression = options.enableCompression ?? true;
+    this._store = options.consistencyTokenStore;
     this._wireMode = options.wireMode ?? "json";
     this._authHandler?.setOnAccessTokenRefreshed((token) => {
       if (this._handshakeComplete && this._ws?.readyState === WS_READY_STATE_OPEN) {
@@ -5262,10 +5511,14 @@ var WebSocketTransport = class {
     });
   }
   // ─── Public API ────────────────────────────────────────────────────────────
-  /** Latest version number from the most recent server `heartbeat` message. */
+  /** Latest change-event sequence from the most recent server `heartbeat` message. */
   get lastVersion() {
     return this._lastVersion;
   }
+  /** Consistency token from the most recent server `heartbeat` (ADR 0042 D-13). */
+  get lastToken() {
+    return this._lastToken;
+  }
   /**
    * Registers a handler for incoming server messages with the given channel id.
    * Use `"__global__"` to receive broadcast messages that carry no `id`.
@@ -5453,6 +5706,10 @@ var WebSocketTransport = class {
       }
       case "heartbeat":
         this._lastVersion = msg.version;
+        this._lastToken = msg.token ?? null;
+        if (this._lastToken != null && this._lastToken.length > 0) {
+          this._store?.observe(this._database, this._lastToken);
+        }
         break;
       case "pong":
         this._missedPings = 0;
@@ -5618,16 +5875,21 @@ var LongPollTransport = class {
     this._connected = false;
     this._pollTask = null;
     this._lastVersion = 0;
+    this._lastToken = null;
     this._serverUrl = serverUrl;
     this._database = database;
     this._authHandler = options.authHandler;
     this._onReconnected = options.onReconnected;
     this._waitMs = Math.max(1, options.waitMs ?? DEFAULT_WAIT_MS);
     this._fetch = options.fetchImpl ?? localNetworkFetch;
+    this._store = options.consistencyTokenStore;
   }
   get lastVersion() {
     return this._lastVersion;
   }
+  get lastToken() {
+    return this._lastToken;
+  }
   registerHandler(id, handler) {
     this._handlers.set(id, handler);
   }
@@ -5750,6 +6012,10 @@ var LongPollTransport = class {
     for (const msg of payload.messages) {
       if (msg.type === "heartbeat") {
         this._lastVersion = msg.version;
+        this._lastToken = msg.token ?? null;
+        if (this._lastToken != null && this._lastToken.length > 0) {
+          this._store?.observe(this._database, this._lastToken);
+        }
       }
       const id = "id" in msg ? msg.id : void 0;
       if (id !== void 0 && id !== null) {
@@ -5829,6 +6095,9 @@ var FallbackStreamingTransport = class {
   get lastVersion() {
     return this._active.lastVersion;
   }
+  get lastToken() {
+    return this._active.lastToken;
+  }
   registerHandler(id, handler) {
     this._handlers.set(id, handler);
     this._active.registerHandler(id, handler);
@@ -5908,6 +6177,7 @@ var AoudaClient = class {
     this.baseUrl = normalizeBaseUrl(options.serverUrl);
     this.timeout = options.timeout ?? DEFAULT_TIMEOUT_MS;
     this.database = options.database.trim();
+    this._store = options.consistencyTokenStore ?? new MemoryConsistencyTokenStore();
     if (!Number.isFinite(this.timeout) || this.timeout <= 0) {
       throw new Error("timeout must be a finite positive number");
     }
@@ -5942,7 +6212,9 @@ var AoudaClient = class {
     }
     const httpTransport = new HttpTransport({
       baseUrl: this.baseUrl,
-      timeout: this.timeout
+      timeout: this.timeout,
+      database: this.database,
+      consistencyTokenStore: this._store
     });
     const activeAuth = options.serverAuth ?? options.appAuth;
     if (activeAuth) {
@@ -6002,7 +6274,8 @@ var AoudaClient = class {
       this.transport,
       this.database,
       onNamedArtifactWarning,
-      () => this._getOrCreateWebSocketTransport()
+      () => this._getOrCreateWebSocketTransport(),
+      this._store
     );
     this._namedMutations = new NamedMutationsApi(
       this.transport,
@@ -6101,7 +6374,8 @@ var AoudaClient = class {
       name,
       this.database,
       void 0,
-      () => this._getOrCreateWebSocketTransport()
+      () => this._getOrCreateWebSocketTransport(),
+      this._store
     );
   }
   /**
@@ -6153,13 +6427,26 @@ var AoudaClient = class {
     return this._materializedQueries;
   }
   /**
-   * Hash-only named-query execute and batch. Names are codegen aliases (D-5).
+   * Named-query execute, read-only batch, and subscribe by unique schema name.
    */
   get namedQueries() {
     return this._namedQueries;
   }
+  observeConsistencyToken(token) {
+    this._store.observe(this.database, token);
+  }
+  getObservedConsistencyToken() {
+    return this._store.get(this.database);
+  }
+  async getConsistencyToken() {
+    const body = await this.transport.get(
+      `/api/databases/${encodeURIComponent(this.database)}/token`
+    );
+    this._store.observe(this.database, body.token);
+    return this._store.get(this.database) ?? body.token;
+  }
   /**
-   * Hash-only named-mutation execute. No batch.
+   * Named-mutation execute by unique schema name. No batch.
    */
   get namedMutations() {
     return this._namedMutations;
@@ -6286,13 +6573,15 @@ var AoudaClient = class {
       const primary = new WebSocketTransport(this.baseUrl, this.database, {
         authHandler: this._authHandler,
         enableCompression: this._streamingEnableCompression,
-        wireMode: this._streamingWireMode
+        wireMode: this._streamingWireMode,
+        consistencyTokenStore: this._store
       });
       if (this._streamingEnableLongPollFallback) {
         this._wsTransport = new FallbackStreamingTransport(primary, () => {
           return new LongPollTransport(this.baseUrl, this.database, {
             authHandler: this._authHandler,
-            waitMs: this._streamingLongPollWaitMs
+            waitMs: this._streamingLongPollWaitMs,
+            consistencyTokenStore: this._store
           });
         });
       } else {
@@ -6317,7 +6606,7 @@ Usage:
   npx @aouda/client schema <command> [options]
 
 Commands:
-  generate    Fetch schema from Aouda server and output TypeScript types (tables + named query/mutation hashes)
+  generate    Fetch schema from Aouda server and output TypeScript types (tables + optional named query/mutation Args/Row)
   schema      Schema management (diff, apply, export, validate, history, seed)
     diff      Show migration plan (desired vs current)
     apply    Apply schema (use --allow-destructive for drops; --dry-run to preview)