dsh-monkeyai-sessions 0.1.1 → 0.1.2

package/README.md

@@ -61,7 +61,7 @@ From a checkout:
 npm install
 npm run build
 npm pack
-dsh plugin --profile web add ./dsh-monkeyai-sessions-0.1.1.tgz
+dsh plugin --profile web add ./dsh-monkeyai-sessions-0.1.2.tgz
 ```
 
 Verified against a real DSH `0.2.2-rc.1` web profile and a live MonkeyAI runtime: authorization, full history loading, prompt delivery, model switching, and turn cancellation all work end to end.

package/README.zh.md

@@ -28,7 +28,7 @@ https://artenx.github.io/dsh-monkeyai-sessions/index.json
 npm install
 npm run build
 npm pack
-dsh plugin --profile web add ./dsh-monkeyai-sessions-0.1.1.tgz
+dsh plugin --profile web add ./dsh-monkeyai-sessions-0.1.2.tgz
 ```
 
 已在真实的 DSH `0.2.2-rc.1` web profile 与在线 MonkeyAI runtime 上端到端验证：授权、完整历史加载、指令下发、模型切换、回合取消均正常工作。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-monkeyai-sessions",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "在 DeepSeek Harness 中读取和继续 MonkeyAI 会话：查看完整对话历史、下发新指令，无缝接续之前在 MonkeyAI 客户端上的工作",
   "type": "module",
   "license": "MIT",

package/src/host/monkeyai-remote.js

@@ -390,6 +390,45 @@ export class MonkeyAIRemoteService extends TypertRemoteService {
     return this.exchangeAuthorization(auth, callbackUrl)
   }
 
+  // The runtime requires an expectedRevision on every configuration write and
+  // rejects a stale one with configuration_conflict. The MonkeyAI client (or
+  // another panel) can advance the revision at any time, so read the current
+  // value from the conflict payload — or from the HTTP session state when we
+  // have none — and retry instead of failing the switch.
+  async setSessionModel({ acp, sessionId, model, httpBase, ticket, revision, signal, onRevision }) {
+    let expected = revision
+    for (let attempt = 0; attempt < 3; attempt += 1) {
+      if (!Number.isSafeInteger(expected)) {
+        expected = await readSessionConfigurationRevision({ httpBase, ticket, sessionId, signal })
+      }
+      if (!Number.isSafeInteger(expected)) throw new Error('无法读取会话配置版本，暂时不能切换模型')
+      try {
+        const result = await acp.request('_monkeyai/session/model/set', {
+          sessionId,
+          model,
+          _meta: { expectedRevision: expected },
+        }, { signal, timeoutMs: 120_000 })
+        const next = result?._meta?.configurationRevision
+        if (Number.isSafeInteger(next)) onRevision(next)
+        return typeof result?.model === 'string' ? result.model : model
+      } catch (error) {
+        if (signal?.aborted) throw error
+        const current = error?.data?.configurationRevision
+        if (error?.data?.reason === 'configuration_conflict' && Number.isSafeInteger(current) && current !== expected) {
+          expected = current
+          onRevision(current)
+          continue
+        }
+        if (error?.data?.reason === 'configuration_version_required') {
+          expected = undefined
+          continue
+        }
+        throw error
+      }
+    }
+    throw new Error('会话配置持续被其他客户端修改，请重试切换模型')
+  }
+
   async exchangeAuthorization(auth, callbackUrl) {
     const callback = parseAuthorizationCallback(callbackUrl, auth)
     const tokens = await requestJson(auth.serverOrigin, '/oauth/token', {
@@ -977,14 +1016,16 @@ export class MonkeyAIRemoteService extends TypertRemoteService {
 
             if (command.type === 'switch_model') {
               try {
-                const result = await currentAcp.request('_monkeyai/session/model/set', {
+                const model = await this.setSessionModel({
+                  acp: currentAcp,
                   sessionId: selectedSession,
                   model: command.model,
-                  ...(httpConfigurationRevision === undefined ? {} : { _meta: { expectedRevision: httpConfigurationRevision } }),
-                }, { signal, timeoutMs: 120_000 })
-                const nextRevision = result?._meta?.configurationRevision
-                if (Number.isSafeInteger(nextRevision)) httpConfigurationRevision = nextRevision
-                const model = typeof result?.model === 'string' ? result.model : command.model
+                  httpBase: ticket.httpBase,
+                  ticket: ticketValue,
+                  revision: httpConfigurationRevision,
+                  signal,
+                  onRevision: value => { httpConfigurationRevision = value },
+                })
                 currentLoadedModel = model
                 emit({ type: 'model_switched', sessionId: selectedSession, data: { model } })
               } catch (switchError) {
@@ -1223,6 +1264,16 @@ async function readHistoryBodyText(response, maxBytes = HISTORY_PAGE_MAX_BYTES)
   return new TextDecoder().decode(joined)
 }
 
+// Reads the session's current configuration revision over the HTTP read
+// channel. Configuration writes must carry it, and the value changes whenever
+// any client edits the session.
+async function readSessionConfigurationRevision({ httpBase, ticket, sessionId, signal }) {
+  const timeout = AbortSignal.any([AbortSignal.timeout(20_000), ...(signal ? [signal] : [])])
+  const result = await readSessionHistoryPage({ httpBase, ticket, sessionId, limit: 1, signal: timeout })
+  const revision = result.session?.configurationRevision
+  return Number.isSafeInteger(revision) ? revision : undefined
+}
+
 async function readSessionHistoryPage({ httpBase, ticket, sessionId, cursor, direction, limit = 50, signal }) {
   const params = { sessionId, limit, ...(cursor ? { cursor, direction } : {}) }
   const response = await fetch(`${httpBase.endsWith('/') ? httpBase : `${httpBase}/`}read/session`, {