@agentunion/fastaun 0.5.13 → 0.5.15

package/CHANGELOG.md

@@ -6,6 +6,45 @@
 
 ---
 
+## 0.5.15 — 2026-09-15
+
+### 修复
+
+#### 协议事件与应用事件隔离
+- 协议事件、transport observer 和断线回调使用独立 dispatcher，不再被慢速应用 handler 阻塞。
+- 协议事件转发到应用层时深拷贝 payload，公开错误统一转换为 `{code, message}`，避免暴露内部错误对象。
+
+#### Worker、Pull 与 V2 连接代次
+- Node.js Worker transport 增加连接代次和旧响应保护；Worker 启动、运行中异常或熔断时回退本地 transport，旧连接结果不会污染新连接。
+- Transport、Pull gate、ACK 和后台同步默认超时统一放宽到约 35 秒；Forward gate key 将默认 `limit=50` 纳入归一化，V2 续页使用初始 cursor 构造 gate key。
+
+### 改进
+
+- Transport/RPC 日志补充本端 AID、对端 AID 和入站/出站方向，并为乱序响应保留原请求上下文。
+- 统一公开 RPC 错误信息，移除错误结果中的内部 `cause` 暴露。
+- SDK、锁文件、运行时版本和 V2 E2EE envelope `sdk_version` 统一更新为 `0.5.15`。
+
+### 测试
+
+- 增加协议 dispatcher、payload 隔离、错误映射、日志上下文和 transport 超时测试。
+- 扩展 Worker/native transport、Pull gate、V2 cursor、连接代次和 Node.js conformance 测试。
+
+## 0.5.14 — 2026-09-11
+
+### 修复
+
+#### Pull gate watchdog 超时隔离
+- Pull watchdog 超时只使当前 Pull job 失败，不再通过全局失效状态影响 `message.send` 等非 Pull RPC。
+- 保留 background Pull 的全局 single-flight gate；超时但尚未真正结束的旧 Pull 继续占用 gate，后续 Pull 等待其 settle 后再执行。
+
+### 改进
+
+- SDK、锁文件、运行时版本和 V2 E2EE envelope `sdk_version` 统一更新为 `0.5.14`。
+
+### 测试
+
+- 增加 Pull 超时隔离、非 Pull RPC 投递和全局 single-flight gate 保持的单元测试。
+
 ## 0.5.13 — 2026-09-08
 
 ### 修复

package/_packed_docs/CHANGELOG.md

@@ -6,6 +6,45 @@
 
 ---
 
+## 0.5.15 — 2026-09-15
+
+### 修复
+
+#### 协议事件与应用事件隔离
+- 协议事件、transport observer 和断线回调使用独立 dispatcher，不再被慢速应用 handler 阻塞。
+- 协议事件转发到应用层时深拷贝 payload，公开错误统一转换为 `{code, message}`，避免暴露内部错误对象。
+
+#### Worker、Pull 与 V2 连接代次
+- Node.js Worker transport 增加连接代次和旧响应保护；Worker 启动、运行中异常或熔断时回退本地 transport，旧连接结果不会污染新连接。
+- Transport、Pull gate、ACK 和后台同步默认超时统一放宽到约 35 秒；Forward gate key 将默认 `limit=50` 纳入归一化，V2 续页使用初始 cursor 构造 gate key。
+
+### 改进
+
+- Transport/RPC 日志补充本端 AID、对端 AID 和入站/出站方向，并为乱序响应保留原请求上下文。
+- 统一公开 RPC 错误信息，移除错误结果中的内部 `cause` 暴露。
+- SDK、锁文件、运行时版本和 V2 E2EE envelope `sdk_version` 统一更新为 `0.5.15`。
+
+### 测试
+
+- 增加协议 dispatcher、payload 隔离、错误映射、日志上下文和 transport 超时测试。
+- 扩展 Worker/native transport、Pull gate、V2 cursor、连接代次和 Node.js conformance 测试。
+
+## 0.5.14 — 2026-09-11
+
+### 修复
+
+#### Pull gate watchdog 超时隔离
+- Pull watchdog 超时只使当前 Pull job 失败，不再通过全局失效状态影响 `message.send` 等非 Pull RPC。
+- 保留 background Pull 的全局 single-flight gate；超时但尚未真正结束的旧 Pull 继续占用 gate，后续 Pull 等待其 settle 后再执行。
+
+### 改进
+
+- SDK、锁文件、运行时版本和 V2 E2EE envelope `sdk_version` 统一更新为 `0.5.14`。
+
+### 测试
+
+- 增加 Pull 超时隔离、非 Pull RPC 投递和全局 single-flight gate 保持的单元测试。
+
 ## 0.5.13 — 2026-09-08
 
 ### 修复

package/_packed_docs/aun/345/210/206/345/270/203/345/274/217/346/265/213/350/257/225/350/277/220/350/241/214/346/214/207/345/215/227.md

@@ -700,6 +700,56 @@ foreach ($phase in $phases) {
 }
 ```
 
+TS 与浏览器 JS federation 用例使用已准备好的 `kite-ts-tester`、`kite-js-tester`，先启动容器并接入两域共享业务网络。容器不存在或依赖未准备时停止，不要在业务测试阶段执行 `up`、`--force-recreate` 或安装依赖：
+
+```powershell
+cd D:\modelunion\kite\docker-deploy
+docker compose --env-file agentid.pub/local.env --project-directory . `
+  -f docker-compose.testers.yml start ts-sdk-tester js-sdk-tester
+docker network connect kite-agentid-federation-net kite-ts-tester 2>$null
+docker network connect kite-agentid-federation-net kite-js-tester 2>$null
+```
+
+TS 用例必须逐文件执行，失败立即停止；从失败文件续跑时，只保留该文件及后续尚未执行的文件：
+
+```powershell
+$tsCases = @(
+  'federation.test.ts',
+  'federation-storage.test.ts',
+  'federation-v2-thought.test.ts',
+  'federation-notify.test.ts',
+  'federation-service-proxy.test.ts'
+)
+foreach ($case in $tsCases) {
+  docker exec -e AUN_TEST_ISSUER_A=agentid.pub -e AUN_TEST_ISSUER_B=agentid.cn `
+    -e AUN_VERIFY_SSL=0 -w /workspace/ts kite-ts-tester bash -lc `
+    "node_modules/.bin/vitest run tests/integration/$case --no-file-parallelism --maxWorkers=1 --reporter=verbose"
+  if ($LASTEXITCODE -ne 0) { throw "TS federation 失败: $case" }
+}
+```
+
+`federation-reconnect.test.ts` 需要按本指南的 Gateway 重启与 marker 协调流程单独运行，不并入上述无重启序列。隔离 federation 运行同一批 TS 用例时，必须显式传入 `AUN_TEST_ISSUER_A=dist-aid.com`、`AUN_TEST_ISSUER_B=dist-aid.net`，避免使用真实域默认值。
+
+浏览器 JS federation 必须使用 Playwright，按文件串行执行。先构建一次，再分别运行 `federation.spec.ts` 与 `notify.spec.ts`；`AUN_TEST_DISABLE_LOCAL_DOCKER_PIN=1` 使浏览器使用共享 Docker DNS，不把域名 pin 到宿主机回环地址：
+
+```powershell
+docker exec -e AUN_TEST_ISSUER_A=agentid.pub -e AUN_TEST_ISSUER_B=agentid.cn `
+  -e AUN_TEST_DISABLE_LOCAL_DOCKER_PIN=1 -e AUN_VERIFY_SSL=0 `
+  -w /workspace/js kite-js-tester bash -lc "npm run build"
+if ($LASTEXITCODE -ne 0) { throw 'JS federation 构建失败' }
+
+$jsCases = @('federation.spec.ts', 'notify.spec.ts')
+foreach ($case in $jsCases) {
+  docker exec -e AUN_TEST_ISSUER_A=agentid.pub -e AUN_TEST_ISSUER_B=agentid.cn `
+    -e AUN_TEST_DISABLE_LOCAL_DOCKER_PIN=1 -e AUN_VERIFY_SSL=0 `
+    -w /workspace/js kite-js-tester bash -lc `
+    "node_modules/.bin/playwright test --config=playwright.agentid-local.config.ts tests/e2e-browser/$case --reporter=line"
+  if ($LASTEXITCODE -ne 0) { throw "JS Playwright federation 失败: $case" }
+}
+```
+
+失败后不得重复已通过文件；如果只需重跑 Notify，可将 `$jsCases` 改为 `@('notify.spec.ts')`。隔离 federation 运行时将两处 `agentid.pub/agentid.cn` 同时替换为 `dist-aid.com/dist-aid.net`。
+
 除 `federation-boundary` 外，runner 在进入业务阶段前会用全新的运行目录分别完成两域固定身份登录。`auth.aid_login1` 必须依次通过 CA 的 `verify_chain`、`get_cert` 和 `ocsp_query` 数据库查询，因此登录成功就是 CA/Auth 数据库调用链可用的证据；日志必须先出现两条 `DOMAIN_READY ... evidence=aid_login`。`ca.status` 属于域内诊断 RPC，普通 AID 被 Gateway 拒绝是正确权限边界，不得为了预检放宽。任一域登录失败时，runner 会汇总两域结果并在业务 RPC 前停止；此时应先检查对应 MySQL 容器状态和 CA/Auth 重连日志，不能把 `ca.verify_chain: database not connected` 归因于联邦身份边界。
 
 若 MySQL 日志出现 `Trying to access page ... outside the tablespace bounds`、`Server exits` 或 InnoDB assertion failure，只能判定运行中的 InnoDB 已访问非法页并退出，不能仅凭页越界日志判定磁盘数据文件已经物理损坏。立即停止后续业务阶段，保留原容器、挂载、完整错误日志和冷态只读副本；不得通过清库、删除表、替换固定 AID 材料或运行 `setup_aids.py` 掩盖现场。
@@ -984,7 +1034,7 @@ docker exec main-dist-client-a python /test/cross_domain_service_proxy.py
 - reconnect 相关测试
 - `e2e_real.py`、`e2e_comprehensive.py`、`e2e_coverage_gaps.py` 这类仍依赖宿主机 Docker 协调并可能硬编码旧容器名的脚本
 
-### TypeScript / Go federation
+### TypeScript / Go federation（dist-aid.com / dist-aid.net）
 
 先复用已有 Tester，不得在断网阶段通过 `up` 或 `--force-recreate` 新建：
 
@@ -996,12 +1046,43 @@ if ($missing) { throw "Federation Tester 尚未完成离线依赖准备，停止
 docker compose --env-file ../.env.distributed -f docker-compose.yml start ts-tester go-tester
 ```
 
+TS federation 按文件串行执行；失败后只保留失败文件及其后的未执行文件。隔离环境必须显式覆盖所有运行时域名变量，避免 TS 默认回到 `agentid.pub/agentid.cn`：
+
 ```powershell
-docker exec main-dist-federation-ts-tester bash -lc "cd /workspace/ts && node_modules/.bin/vitest run tests/integration/federation.test.ts tests/integration/federation-storage.test.ts"
+$tsCases = @(
+  'federation.test.ts',
+  'federation-storage.test.ts',
+  'federation-v2-thought.test.ts',
+  'federation-notify.test.ts',
+  'federation-service-proxy.test.ts'
+)
+foreach ($case in $tsCases) {
+  docker exec `
+    -e AUN_TEST_ISSUER=dist-aid.com `
+    -e AUN_TEST_ISSUER_A=dist-aid.com `
+    -e AUN_TEST_ISSUER_B=dist-aid.net `
+    -e LOCAL_ISSUER=dist-aid.com `
+    -e REMOTE_ISSUER=dist-aid.net `
+    -e AUN_VERIFY_SSL=0 `
+    -w /workspace/ts main-dist-federation-ts-tester bash -lc `
+    "node_modules/.bin/vitest run tests/integration/$case --no-file-parallelism --maxWorkers=1 --reporter=verbose"
+  if ($LASTEXITCODE -ne 0) { throw "TS federation 失败: $case" }
+}
 ```
 
+`federation-reconnect.test.ts` 需要按 Gateway 重启与 marker 协调流程单独运行，不并入上述无重启序列。
+
+Go federation 显式覆盖同样的 issuer 变量；Service Proxy 用例还需覆盖 `LOCAL_ISSUER/REMOTE_ISSUER`：
+
 ```powershell
-docker exec main-dist-federation-go-tester sh -lc "cd /workspace/go && /usr/local/go/bin/go test -tags integration . -run Federation -count=1 -v"
+docker exec `
+  -e AUN_TEST_ISSUER_A=dist-aid.com `
+  -e AUN_TEST_ISSUER_B=dist-aid.net `
+  -e LOCAL_ISSUER=dist-aid.com `
+  -e REMOTE_ISSUER=dist-aid.net `
+  -e AUN_VERIFY_SSL=0 `
+  main-dist-federation-go-tester sh -lc `
+  "cd /workspace/go && /usr/local/go/bin/go test -tags integration . -run Federation -count=1 -v"
 ```
 
 如果用临时 Go 容器，需要加入分布式 federation 网络：
@@ -1066,7 +1147,7 @@ cd D:\modelunion\kite\docker-deploy
 docker compose --env-file NUL -f docker-compose.yml up -d
 ```
 
-这一路径必须继续保持默认单实例值，不使用 `dist-*` 域名，不使用 `data-dist`，也不使用 `kite-dist-*` 容器名。默认单实例测试按主指南执行；双域测试只按本指南的 `dist-aid.*` 环境执行。
+这一路径必须继续保持默认单实例值，不使用 `dist-*` 域名，不使用 `data-dist`，也不使用 `kite-dist-*` 容器名。默认单实例测试按主指南执行；本地真实域名双域按本指南 `agentid.pub/agentid.cn` 专节执行；隔离 federation 双域仅按 `dist-aid.com/dist-aid.net` 专节执行。两套双域的 CA、固定身份、数据根、Compose project、Tester 和日志不得混用。
 
 如果目标是证明“同一批非 reconnect / 非 mail 用例可在分布式控制 master 上通过”，使用本指南的 `dist-agentid.pub` 和临时测试容器命令。
 

package/_packed_docs/aun/346/265/213/350/257/225/350/277/220/350/241/214/346/214/207/345/215/227.md

@@ -120,7 +120,7 @@ Docker Desktop 可能把 Windows bind source 返回为 `/run/desktop/mnt/host/<
 | Python | `kite-python-sdk-tester` 容器内 `/tests/*.py` | 见分布式指南的 `main-dist-client-a` / `main-dist-client-b` | Docker 测试容器为主，少数 reconnect 脚本在宿主机 |
 | TypeScript | `kite-ts-tester` 容器内 `tests/integration`、`tests/e2e` | 见分布式指南的 `main-dist-federation-ts-tester` | Docker 测试容器为主，reconnect 由宿主机协调 |
 | Go | `kite-go-tester` 容器或临时 `golang:1.24-bookworm` 容器 | 见分布式指南的 `main-dist-federation-go-tester` | Docker 网络内运行，reconnect 由宿主机 marker 协调 |
-| JavaScript | `kite-js-tester` 容器内运行 Vitest 或 Playwright `tests/e2e-browser` | 当前无独立双域 JS 浏览器 E2E 标准命令 | 默认单实例优先使用带 Chrome 的 Docker Tester；宿主机 Playwright 可作为备选 |
+| JavaScript | `kite-js-tester` 容器内运行 Vitest 或 Playwright `tests/e2e-browser` | 见分布式指南的真实域名双域 Playwright 入口 | 默认单实例优先使用带 Chrome 的 Docker Tester；宿主机 Playwright 可作为备选 |
 
 JS 的真实 E2E 统一使用 `js/tests/e2e-browser`，不要把浏览器 E2E 混入 `tests/integration`。`kite-js-tester` 已提供 Linux Chrome；宿主机运行时仍使用 `playwright.agentid-local.config.ts`。
 

package/dist/client/delivery.d.ts

@@ -25,6 +25,7 @@ export declare class MessageDeliveryEngine {
     constructor(runtime: ClientRuntime);
     private isPullOperationCurrent;
     private ensurePullOperationCurrent;
+    private isPullScopedSource;
     private forwardCoordinator;
     private confirmPlainForwardAck;
     commitPlainForwardPage(ns: string, afterSeq: number, method: 'message.pull' | 'group.pull', result: unknown, groupId?: string): Promise<{

package/dist/client/delivery.js

@@ -1,4 +1,5 @@
 import { slotIsolationKey } from '../config.js';
+import { trafficLogContext, withLogContext } from '../logger.js';
 import { ConnectionState, isJsonObject } from '../types.js';
 import { validateGroupAIDFormat } from '../validators.js';
 import { hasGroupMentionModeField, normalizeGroupMentionMode } from './mention-mode.js';
@@ -91,20 +92,19 @@ export class MessageDeliveryEngine {
     constructor(runtime) {
         this.runtime = runtime;
     }
-    isPullOperationCurrent() {
-        const client = this.runtime.client;
-        const generation = client._pullOperationGeneration;
-        if (generation === undefined)
-            return true;
-        const pipeline = client._rpcPipeline;
-        return typeof pipeline?.isPullGenerationCurrent === 'function'
-            ? pipeline.isPullGenerationCurrent(generation)
+    isPullOperationCurrent(namespace = '') {
+        const pipeline = this.runtime.client._rpcPipeline;
+        return typeof pipeline?.isPullNamespaceCurrent === 'function'
+            ? pipeline.isPullNamespaceCurrent(namespace)
             : true;
     }
-    ensurePullOperationCurrent() {
-        if (!this.isPullOperationCurrent())
+    ensurePullOperationCurrent(namespace = '') {
+        if (!this.isPullOperationCurrent(namespace))
             throw new Error('pull invalidated');
     }
+    isPullScopedSource(source) {
+        return source === 'pull';
+    }
     forwardCoordinator() {
         const coordinator = this.runtime.client._v2E2EE;
         if (!coordinator
@@ -120,7 +120,7 @@ export class MessageDeliveryEngine {
     }
     async confirmPlainForwardAck(ns, method, ackSeq, groupId = '') {
         const client = this.runtime.client;
-        this.ensurePullOperationCurrent();
+        this.ensurePullOperationCurrent(ns);
         const coordinator = this.forwardCoordinator();
         const generation = this.captureInlineAckGeneration();
         coordinator.recordForwardAck(ns, ackSeq);
@@ -139,7 +139,7 @@ export class MessageDeliveryEngine {
                 _rpc_background: true,
             };
         const result = await client._rpcPipeline.rawCall(method, params, { background: true });
-        this.ensurePullOperationCurrent();
+        this.ensurePullOperationCurrent(ns);
         const actualAckSeq = this.resolveForwardAckSeq(result, ackSeq);
         if (actualAckSeq < ackSeq) {
             throw new Error(`${method} server ACK watermark ${actualAckSeq} is below requested ${ackSeq}`);
@@ -157,7 +157,7 @@ export class MessageDeliveryEngine {
             throw new Error(`${method} response must be an object`);
         }
         const client = this.runtime.client;
-        this.ensurePullOperationCurrent();
+        this.ensurePullOperationCurrent(ns);
         this.syncStarted(ns);
         const response = result;
         const messages = deduplicatePlainForwardPageMessages(response.messages, afterSeq);
@@ -189,20 +189,20 @@ export class MessageDeliveryEngine {
         let committed = false;
         try {
             for (const rawMessage of messages) {
-                this.ensurePullOperationCurrent();
+                this.ensurePullOperationCurrent(ns);
                 const seq = positiveSafeSequenceHint(rawMessage.seq);
                 if (method === 'message.pull') {
                     const appEvent = this.p2pAppEventForMessage(rawMessage);
                     if (await this.publishPulledMessage(appEvent.event, ns, seq, appEvent.payload, false)) {
                         publishedCount += 1;
                     }
-                    this.ensurePullOperationCurrent();
+                    this.ensurePullOperationCurrent(ns);
                     continue;
                 }
                 const message = normalizeGroupMentionMode(rawMessage);
                 if (this.recallEventFromGroupMessage(message)) {
                     if (await this.publishGroupRecallTombstone(groupId, seq, message, 'pull')) {
-                        this.ensurePullOperationCurrent();
+                        this.ensurePullOperationCurrent(ns);
                         this.markPublishedSeq(ns, seq);
                         publishedCount += 1;
                     }
@@ -211,11 +211,11 @@ export class MessageDeliveryEngine {
                     this.markPublishedSeq(ns, seq);
                 }
                 else if (await this.publishPulledMessage('group.message_created', ns, seq, message, false)) {
-                    this.ensurePullOperationCurrent();
+                    this.ensurePullOperationCurrent(ns);
                     publishedCount += 1;
                 }
             }
-            this.ensurePullOperationCurrent();
+            this.ensurePullOperationCurrent(ns);
             client._seqTracker.onPullResult(ns, messages, afterSeq, Number.isSafeInteger(result.contiguous_seq)
                 ? result.contiguous_seq
                 : undefined);
@@ -224,21 +224,21 @@ export class MessageDeliveryEngine {
                 client._seqTracker.forceContiguousSeq(ns, commitTarget);
             }
             if (client._seqTracker.getContiguousSeq(ns) !== pageContigBefore) {
-                this.ensurePullOperationCurrent();
+                this.ensurePullOperationCurrent(ns);
                 await this.drainOrderedMessages(ns, undefined, false, false, 'pull');
-                this.ensurePullOperationCurrent();
+                this.ensurePullOperationCurrent(ns);
                 await client._commitSeqTrackerState(ns);
             }
             committed = true;
         }
         catch (exc) {
-            if (this.isPullOperationCurrent() && !committed && typeof client._seqTracker.restoreNamespaceSnapshot === 'function') {
+            if (this.isPullOperationCurrent(ns) && !committed && typeof client._seqTracker.restoreNamespaceSnapshot === 'function') {
                 client._seqTracker.restoreNamespaceSnapshot(ns, pageTrackerSnapshot);
                 this.dropSeqTrackerPending(ns);
             }
             throw exc;
         }
-        this.ensurePullOperationCurrent();
+        this.ensurePullOperationCurrent(ns);
         const committedAck = client._seqTracker.getContiguousSeq(ns);
         if (deferredServerCursor > 0 && committedAck >= deferredServerCursor) {
             coordinator.clearForwardCursor(ns, committedAck);
@@ -269,7 +269,7 @@ export class MessageDeliveryEngine {
             if (clampedAckSeq < pendingAckSeq) {
                 throw new Error(`${ackMethod} cannot confirm pending Forward watermark ${pendingAckSeq}`);
             }
-            this.ensurePullOperationCurrent();
+            this.ensurePullOperationCurrent(ns);
             await this.confirmPlainForwardAck(ns, ackMethod, pendingAckSeq, groupId);
         }
         this.syncProgress(ns, {
@@ -654,15 +654,19 @@ export class MessageDeliveryEngine {
     }
     async publishOrderedQueueItem(ns, event, seq, payload, source, pullResponse = false, deliveryContext) {
         const client = this.runtime.client;
-        this.ensurePullOperationCurrent();
+        const pullScoped = this.isPullScopedSource(source);
+        if (pullScoped)
+            this.ensurePullOperationCurrent(ns);
         if (event === 'group.changed' && this.isGroupEventNamespace(ns)) {
             await this.publishOrderedGroupChanged(payload, source);
-            this.ensurePullOperationCurrent();
+            if (pullScoped)
+                this.ensurePullOperationCurrent(ns);
             return;
         }
         if (event === 'message.recalled') {
             await this.publishMessageRecallTombstone(seq, payload, source);
-            this.ensurePullOperationCurrent();
+            if (pullScoped)
+                this.ensurePullOperationCurrent(ns);
             return;
         }
         if (pullResponse) {
@@ -675,7 +679,8 @@ export class MessageDeliveryEngine {
             if (isPromiseLike(published))
                 await published;
         }
-        this.ensurePullOperationCurrent();
+        if (pullScoped)
+            this.ensurePullOperationCurrent(ns);
     }
     async publishOrderedGroupChanged(payload, source = 'ordered') {
         const client = this.runtime.client;
@@ -1272,7 +1277,10 @@ export class MessageDeliveryEngine {
         };
         if (opts.extra)
             record.extra = opts.extra;
-        client._clientLog.debug(`message.debug ${client._debugJson(record)}`);
+        const direction = event === 'message.send' || event === 'group.send'
+            || event === 'message.thought.put' || event === 'group.thought.put'
+            ? 'outbound' : 'inbound';
+        withLogContext(client._clientLog, trafficLogContext(direction, message)).debug(`message.debug ${client._debugJson(record)}`);
     }
     logAppMessagePublish(event, payload, source) {
         if (!['message.received', 'message.undecryptable', 'group.message_created', 'group.message_undecryptable'].includes(event)) {
@@ -1594,8 +1602,7 @@ export class MessageDeliveryEngine {
         const afterSeq = client._seqTracker.getContiguousSeq(ns);
         client._clientLog.debug(`auto pull group messages start: group=${groupId}, after_seq=${afterSeq}, seq=${String(notification.seq ?? '')}`);
         const operation = async () => {
-            const pullAfterSeq = client._seqTracker.getContiguousSeq(ns);
-            const messages = await client._pullGroupV2(groupId, pullAfterSeq, 50, { gateLocked: true });
+            const messages = await client._pullGroupV2(groupId, afterSeq, 50, { gateLocked: true });
             this.prunePushedSeqs(ns);
             return messages.length;
         };
@@ -2194,6 +2201,7 @@ export class MessageDeliveryEngine {
         const run = async (request, background, forceForward = false) => {
             const invoke = async () => {
                 const live = this.syncState(ns);
+                const after = Number(request.after_seq ?? 0) || 0;
                 if (request.window_mode === 'tail' && !forceTail && typeof client._seqTracker.getSyncState === 'function' && pushSeq <= live.head)
                     return { messages: [], raw_count: 0 };
                 if (request.window_mode !== 'tail' && !forceForward && !headForward && live.ack >= live.tail - 1)
@@ -2203,13 +2211,12 @@ export class MessageDeliveryEngine {
                 if (request.window_mode === 'tail') {
                     const tailResult = await client._v2E2EE.pullV2TailInternal({
                         window_mode: 'tail',
-                        after_seq: live.ack,
+                        after_seq: after,
                         limit: pageLimit,
                     }, true);
                     tailHead = this.syncState(ns).head;
                     return tailResult;
                 }
-                const after = live.ack;
                 const opts = { gateLocked: true };
                 if (request.max_pages !== undefined)
                     opts.maxPages = request.max_pages;
@@ -2271,6 +2278,7 @@ export class MessageDeliveryEngine {
         const run = async (request, background, forceForward = false) => {
             const invoke = async () => {
                 const live = this.syncState(ns);
+                const after = Number(request.after_seq ?? 0) || 0;
                 if (request.window_mode === 'tail' && !forceTail && typeof client._seqTracker.getSyncState === 'function' && pushSeq <= live.head)
                     return { messages: [], raw_count: 0 };
                 if (request.window_mode !== 'tail' && !forceForward && !headForward && live.ack >= live.tail - 1)
@@ -2281,7 +2289,7 @@ export class MessageDeliveryEngine {
                     const tailResult = await client._v2E2EE.pullGroupV2TailInternal({
                         group_id: groupId,
                         window_mode: 'tail',
-                        after_seq: live.ack,
+                        after_seq: after,
                         limit: pageLimit,
                     }, true);
                     tailHead = this.syncState(ns).head;
@@ -2290,7 +2298,7 @@ export class MessageDeliveryEngine {
                 const opts = { gateLocked: true };
                 if (request.max_pages !== undefined)
                     opts.maxPages = request.max_pages;
-                const messages = await client._pullGroupV2(groupId, live.ack, pageLimit, opts);
+                const messages = await client._pullGroupV2(groupId, after, pageLimit, opts);
                 return { messages, raw_count: messages.length };
             };
             if (!client._rpcPipeline)
@@ -2333,8 +2341,7 @@ export class MessageDeliveryEngine {
         const client = this.runtime.client;
         const request = { after_seq: this.syncState(ns).ack, limit: pageLimit, max_pages: 1 };
         const invoke = async () => {
-            const after = this.syncState(ns).ack;
-            const messages = await client._pullV2(after, pageLimit, { gateLocked: true, maxPages: 1 });
+            const messages = await client._pullV2(Number(request.after_seq), pageLimit, { gateLocked: true, maxPages: 1 });
             return { messages, raw_count: messages.length };
         };
         if (!client._rpcPipeline)
@@ -2348,8 +2355,7 @@ export class MessageDeliveryEngine {
         const maxPages = Math.max(1, Math.ceil(Math.max(0, throughSeq - ack) / pageLimit));
         const request = { group_id: groupId, after_seq: ack, limit: pageLimit, max_pages: maxPages };
         const invoke = async () => {
-            const after = this.syncState(ns).ack;
-            const messages = await client._pullGroupV2(groupId, after, pageLimit, { gateLocked: true, maxPages });
+            const messages = await client._pullGroupV2(groupId, Number(request.after_seq), pageLimit, { gateLocked: true, maxPages });
             return { messages, raw_count: messages.length };
         };
         if (!client._rpcPipeline)
@@ -3489,7 +3495,9 @@ export class MessageDeliveryEngine {
     }
     async drainOrderedMessages(ns, beforeSeq, pullResponse = false, persist = true, source = 'push', context) {
         const client = this.runtime.client;
-        this.ensurePullOperationCurrent();
+        const pullScoped = this.isPullScopedSource(source);
+        if (pullScoped)
+            this.ensurePullOperationCurrent(ns);
         const queue = client._pendingOrderedMsgs.get(ns);
         if (!queue || queue.size === 0)
             return;
@@ -3498,7 +3506,8 @@ export class MessageDeliveryEngine {
         const drainContexts = new Map();
         try {
             while (true) {
-                this.ensurePullOperationCurrent();
+                if (pullScoped)
+                    this.ensurePullOperationCurrent(ns);
                 const contig = client._seqTracker.getContiguousSeq(ns);
                 const ready = [...queue.keys()]
                     .filter((seq) => seq <= contig && (beforeSeq === undefined || seq < beforeSeq))
@@ -3536,7 +3545,8 @@ export class MessageDeliveryEngine {
                     }
                 }
                 await this.publishOrderedQueueItem(ns, item.event, seq, item.payload, itemSource, pullResponse, itemContext);
-                this.ensurePullOperationCurrent();
+                if (pullScoped)
+                    this.ensurePullOperationCurrent(ns);
                 this.markPublishedSeq(ns, seq);
                 client._markOrderedSeqDelivered(ns, seq);
                 delivered = true;
@@ -3552,7 +3562,8 @@ export class MessageDeliveryEngine {
         if (queue.size === 0) {
             client._pendingOrderedMsgs.delete(ns);
             if (delivered && persist) {
-                this.ensurePullOperationCurrent();
+                if (pullScoped)
+                    this.ensurePullOperationCurrent(ns);
                 await this.saveSeqTrackerState();
             }
         }
@@ -3581,12 +3592,15 @@ export class MessageDeliveryEngine {
     }
     async publishOrderedMessageInternal(event, ns, seq, payload, source, context) {
         const client = this.runtime.client;
-        this.ensurePullOperationCurrent();
+        const pullScoped = this.isPullScopedSource(source);
+        if (pullScoped)
+            this.ensurePullOperationCurrent(ns);
         const seqNum = Number(seq);
         if (!Number.isFinite(seqNum) || !Number.isInteger(seqNum) || seqNum <= 0) {
             client._clientLog.debug(`publish ordered direct(no-seq): event=${event}, ns=${ns || '<none>'}, seq=${String(seq)}`);
             await this.publishOrderedQueueItem(ns, event, seqNum, payload, source, false, context);
-            this.ensurePullOperationCurrent();
+            if (pullScoped)
+                this.ensurePullOperationCurrent(ns);
             return true;
         }
         if (client._pushedSeqs.get(ns)?.has(seqNum)) {
@@ -3604,7 +3618,8 @@ export class MessageDeliveryEngine {
             return false;
         }
         await this.drainOrderedMessages(ns, seqNum, false, true, source, context);
-        this.ensurePullOperationCurrent();
+        if (pullScoped)
+            this.ensurePullOperationCurrent(ns);
         if (client._pushedSeqs.get(ns)?.has(seqNum)) {
             client._clientLog.debug(`publish ordered skipped after-drain duplicate: event=${event}, ns=${ns}, seq=${seqNum}`);
             return false;
@@ -3614,32 +3629,38 @@ export class MessageDeliveryEngine {
         if (queue && queue.size === 0)
             client._pendingOrderedMsgs.delete(ns);
         await this.publishOrderedQueueItem(ns, event, seqNum, payload, source, false, context);
-        this.ensurePullOperationCurrent();
+        if (pullScoped)
+            this.ensurePullOperationCurrent(ns);
         this.markPublishedSeq(ns, seqNum);
         client._markOrderedSeqDelivered(ns, seqNum);
         client._clientLog.debug(`publish ordered delivered: event=${event}, ns=${ns}, seq=${seqNum}`);
         await this.drainOrderedMessages(ns, undefined, false, true, source, context);
         if (!client._pendingOrderedMsgs.get(ns)) {
-            this.ensurePullOperationCurrent();
+            if (pullScoped)
+                this.ensurePullOperationCurrent(ns);
             await this.saveSeqTrackerState();
         }
         return true;
     }
     async publishPulledMessage(event, ns, seq, payload, persist = true, source = 'pull') {
         const client = this.runtime.client;
-        this.ensurePullOperationCurrent();
+        const pullScoped = this.isPullScopedSource(source);
+        if (pullScoped)
+            this.ensurePullOperationCurrent(ns);
         const seqNum = Number(seq);
         if (!Number.isFinite(seqNum) || !Number.isInteger(seqNum) || seqNum <= 0 || !ns) {
             client._clientLog.debug(`publish pulled direct(no-seq): event=${event}, ns=${ns || '<none>'}, seq=${String(seq)}`);
             if (event === 'message.recalled') {
                 const published = await this.publishMessageRecallTombstone(seq, payload, source);
-                this.ensurePullOperationCurrent();
+                if (pullScoped)
+                    this.ensurePullOperationCurrent(ns);
                 return published;
             }
             const published = client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload, source));
             if (isPromiseLike(published))
                 await published;
-            this.ensurePullOperationCurrent();
+            if (pullScoped)
+                this.ensurePullOperationCurrent(ns);
             return true;
         }
         const queue = client._pendingOrderedMsgs.get(ns);
@@ -3651,27 +3672,32 @@ export class MessageDeliveryEngine {
             return false;
         }
         await this.drainOrderedMessages(ns, seqNum, true, persist, source);
-        this.ensurePullOperationCurrent();
+        if (pullScoped)
+            this.ensurePullOperationCurrent(ns);
         queue?.delete(seqNum);
         if (queue && queue.size === 0)
             client._pendingOrderedMsgs.delete(ns);
         if (event === 'message.recalled') {
             const recallPublished = await this.publishMessageRecallTombstone(seqNum, payload, source);
-            this.ensurePullOperationCurrent();
+            if (pullScoped)
+                this.ensurePullOperationCurrent(ns);
             this.markPublishedSeq(ns, seqNum);
             client._clientLog.debug(`publish pulled delivered: event=${event}, ns=${ns}, seq=${seqNum}`);
             await this.drainOrderedMessages(ns, undefined, true, persist, source);
-            this.ensurePullOperationCurrent();
+            if (pullScoped)
+                this.ensurePullOperationCurrent(ns);
             return recallPublished;
         }
         const published = client._withPullResponseProcessing(ns, () => client._publishAppEvent(event, payload, source));
         if (isPromiseLike(published))
             await published;
-        this.ensurePullOperationCurrent();
+        if (pullScoped)
+            this.ensurePullOperationCurrent(ns);
         this.markPublishedSeq(ns, seqNum);
         client._clientLog.debug(`publish pulled delivered: event=${event}, ns=${ns}, seq=${seqNum}`);
         await this.drainOrderedMessages(ns, undefined, true, persist, source);
-        this.ensurePullOperationCurrent();
+        if (pullScoped)
+            this.ensurePullOperationCurrent(ns);
         return true;
     }
 }