@blade-hq/agent-client 2610.0.0-beta.57 → 2610.0.0-beta.59

package/dist/index.js

@@ -4698,13 +4698,39 @@ var AgentSession = class _AgentSession {
   /**
    * 重排等待消息。`orderedIds` 必须是当前 pending 条目 id 的**完整集合**（顺序任意），
    * 服务端按 `expectedRevision` 校验后整体替换顺序。
+   *
+   * 拖动排序就该像本地操作一样落地：版本冲突（运行中的任务刚领走一条 / 另一个端也在
+   * 动队列）不甩给用户「刷新后重试」，而是拿冲突响应里那份**最新快照**重算一次再提交
+   * ——掉队的条目（已经被领取执行的）从顺序里剔除，剩下的保持用户拖出来的相对次序。
+   * 最多补两次；仍旧冲突才把结果交回调用方。
    */
   async reorderQueuedMessages(expectedRevision, orderedIds) {
-    return this.runQueueCommand("chat:queue:reorder", {
+    let revision = expectedRevision;
+    let ids = orderedIds;
+    let result = await this.runQueueCommand("chat:queue:reorder", {
       session_id: this.sessionId,
-      expected_revision: expectedRevision,
-      ordered_ids: orderedIds
+      expected_revision: revision,
+      ordered_ids: ids
     });
+    for (let attempt = 0; attempt < 2 && !result.ok && result.conflict; attempt++) {
+      const snapshot2 = result.snapshot;
+      if (!snapshot2) break;
+      const pending = snapshot2.items.filter(canEditQueuedMessage);
+      const live = new Set(pending.map((item) => item.id));
+      const next = ids.filter((id) => live.has(id));
+      for (const item of pending) if (!next.includes(item.id)) next.push(item.id);
+      if (next.length === 0) {
+        return { ok: true, conflict: false, snapshot: snapshot2, message: null };
+      }
+      revision = snapshot2.revision;
+      ids = next;
+      result = await this.runQueueCommand("chat:queue:reorder", {
+        session_id: this.sessionId,
+        expected_revision: revision,
+        ordered_ids: ids
+      });
+    }
+    return result;
   }
   /** 删除一条等待消息；不传版本时由服务端自行判定。 */
   async cancelQueuedMessage(itemId, expectedVersion) {
@@ -6588,7 +6614,7 @@ function resolveServiceUrl(endpoints, name, path = "") {
 
 // src/version.ts
 var SDK_NAME = "agent-client";
-var SDK_VERSION = true ? "2610.0.0-beta.57" : "1.1.1";
+var SDK_VERSION = true ? "2610.0.0-beta.59" : "1.1.1";
 
 // src/commands/protocol.ts
 function isCommandEnvelope(value) {