@walkhi/code-relax 0.1.0-beta.34 → 0.1.0-beta.35

package/dist/build-platform.json

@@ -1 +1 @@
-{"layout":"npm-platform-packages","version":"0.1.0-beta.34"}
+{"layout":"npm-platform-packages","version":"0.1.0-beta.35"}

package/dist/src/managed-app-server.mjs

@@ -35,6 +35,7 @@ export class ManagedAppServer extends EventEmitter {
     this.recordPath = path.join(stateRoot, 'managed-app-server.json');
     this.client = client;
     this.state = { state: 'absent', ready: false, error: null };
+    this.client.diagnosticIdentity = () => ({ kernelPid: this.state.pid ?? null, kernelCreated: this.state.created ?? null });
     this.restartStatus = null;
     this.stopped = true;
     this.restarting = false;

package/dist/src/shared-app-server.mjs

@@ -13,7 +13,7 @@ const writerConflictMessages = ['already has an active writer', 'already has a l
 
 export class ThreadWriterConflictError extends Error {
   constructor(threadId, message) {
-    super('该对话正在另一个 Codex 实例中使用。');
+    super('该对话存在写入冲突，请稍后重试。');
     this.name = 'ThreadWriterConflictError';
     this.code = 'thread_writer_owned_elsewhere';
     this.threadId = threadId;
@@ -37,6 +37,7 @@ export class SharedAppServer extends EventEmitter {
     this.serverVersion = '';
     this.epoch = randomUUID();
     this.sequence = 0;
+    this.connectionId = null;
     this.pending = new Map();
     this.serverRequests = new serverRequests.Store(randomUUID(), id => {
       this.emit('requests-changed', id);
@@ -64,6 +65,7 @@ export class SharedAppServer extends EventEmitter {
   async open() {
     const socket = await this.openSocket();
     this.socket = socket;
+    this.connectionId = randomUUID();
     this.ready = false;
     this.serverVersion = '';
     this.serverRequests.reset(randomUUID());
@@ -78,12 +80,16 @@ export class SharedAppServer extends EventEmitter {
       clearTimeout(pending.timer);
       if (message.error) {
         const text = String(message.error.message || 'app-server 请求失败');
+        this.traceLifecycle('error', pending, { rpcCode: message.error.code,
+          writerError: writerConflictMessages.find(value => text.toLowerCase().includes(value)) || null });
         pending.reject(writerConflictMessages.some(value => text.toLowerCase().includes(value))
           ? new ThreadWriterConflictError(pending.threadId, text)
           : Object.assign(new Error(text), { rpcCode: message.error.code, details: message.error.data,
             ...(/^invalid cursor:/i.test(text) ? { code: 'history_cursor_expired' } : {}) }));
       }
       else {
+        this.traceLifecycle('complete', pending, { status: message.result?.status,
+          resultThreadId: message.result?.thread?.id });
         try { pending.resolve(pending.transform(message.result)); }
         catch (error) { pending.reject(error); }
       }
@@ -93,6 +99,7 @@ export class SharedAppServer extends EventEmitter {
       this.serverVersion = '';
       for (const pending of this.pending.values()) {
         clearTimeout(pending.timer);
+        this.traceLifecycle('disconnected', pending);
         pending.reject(new Error('Codex 内核连接断开；发送结果可能未确认，请检查对话后再操作。'));
       }
       this.pending.clear();
@@ -121,24 +128,44 @@ export class SharedAppServer extends EventEmitter {
 
   request(method, params, transform = value => value) {
     const id = ++this.sequence;
+    const diagnostic = { method, requestId: id, threadId: params?.threadId, connectionId: this.connectionId,
+      ...(method === 'thread/settings/update' && params?.serviceTier !== undefined ? { serviceTier: params.serviceTier } : {}) };
+    this.traceLifecycle('begin', diagnostic);
     return new Promise((resolve, reject) => {
       const timer = setTimeout(() => {
         const error = Object.assign(new Error(`${method} 超时；不会自动重发，请先检查对话。`),
           { code: 'app_server_request_timeout' });
+        this.traceLifecycle('timeout', diagnostic);
         if ((method === 'turn/start' || method === 'turn/steer') && this.pending.has(id)) {
           messageDelivery.retainLateResult(this.pending.get(id), error);
         } else { this.pending.delete(id); reject(error); }
       }, 30000);
-      this.pending.set(id, { resolve, reject, timer, transform, threadId: params?.threadId });
+      this.pending.set(id, { resolve, reject, timer, transform, ...diagnostic });
       this.socket.send(JSON.stringify({ id, method, params }), error => {
         const pending = this.pending.get(id);
         if (!error || !pending) return;
+        this.traceLifecycle('send-error', diagnostic);
         this.pending.delete(id);
         clearTimeout(timer); pending.reject(error);
       });
     });
   }
 
+  traceLifecycle(phase, request, extra = {}) {
+    if (!['thread/start', 'thread/resume', 'thread/unsubscribe', 'thread/settings/update', 'thread/settings/updated'].includes(request.method)) return;
+    const threadId = value => typeof value === 'string' && /^[\w-]{1,80}$/.test(value) ? value : null;
+    const identity = this.diagnosticIdentity?.() || {};
+    console.info('[thread-lifecycle]', JSON.stringify({ time: new Date().toISOString(), bridgePid: process.pid,
+      kernelPid: identity.kernelPid ?? null, kernelCreated: identity.kernelCreated ?? null,
+      connectionId: request.connectionId, serverVersion: this.serverVersion, phase,
+      method: request.method, requestId: request.requestId, threadId: threadId(request.threadId),
+      ...([null, 'default', 'priority', 'fast'].includes(request.serviceTier) ? { serviceTier: request.serviceTier } : {}),
+      ...(extra.resultThreadId ? { resultThreadId: threadId(extra.resultThreadId) } : {}),
+      ...(typeof extra.status === 'string' && /^[\w-]{1,40}$/.test(extra.status) ? { status: extra.status } : {}),
+      ...(typeof extra.rpcCode === 'number' ? { rpcCode: extra.rpcCode } : {}),
+      ...(extra.writerError ? { writerError: extra.writerError } : {}) }));
+  }
+
   async projects() {
     await this.connect();
     return events.readProjects((method, params) => this.request(method, params));
@@ -190,6 +217,7 @@ export class SharedAppServer extends EventEmitter {
     const id = params.threadId;
     if (method === 'thread/settings/updated') {
       const settings = params.threadSettings;
+      this.traceLifecycle('notification', { method, threadId: id, connectionId: this.connectionId, serviceTier: settings.serviceTier ?? null });
       this.contexts.set(id, { ...this.contexts.get(id), model: settings.model, thinking: settings.effort, serviceTier: settings.serviceTier ?? null,
         cwd: settings.cwd, ...events.permissionState(settings) });
       this.settingsNotifications.set(id, settings);
@@ -315,7 +343,7 @@ export class SharedAppServer extends EventEmitter {
         } catch (error) {
           snapshot?.close();
           if (!isThreadWriterConflict(error)) throw error;
-          record = await this.readOnlyRecord(threadId, pageOptions, '该对话正在另一个 Codex 实例中使用。');
+          record = await this.readOnlyRecord(threadId, pageOptions, '该对话存在写入冲突，请稍后重试。');
           result = null;
         }
         if (result) try {
@@ -390,11 +418,18 @@ export class SharedAppServer extends EventEmitter {
     slot.tail = slot.tail.then(async () => {
       if (this.subscriptions.get(threadId) !== slot) return;
       if (slot.users || slot.readers || this.threads.get(threadId)?.tokens.size || this.keepThreadLoaded(threadId, this.threads.get(threadId))) return;
-      this.threads.delete(threadId); this.contexts.delete(threadId); this.permissionOptions.delete(threadId);
-      this.subscriptions.delete(threadId); clearTimeout(slot.expiry);
       if (this.ready && !record?.readOnly) await this.unsubscribeThread(threadId);
+      // Keep this queue registered until unsubscribe completes. A returning reader
+      // must enqueue its resume behind it, rather than creating a second queue.
+      if (this.subscriptions.get(threadId) !== slot) return;
+      this.threads.delete(threadId); this.contexts.delete(threadId); this.permissionOptions.delete(threadId);
+      if (!slot.users && !slot.readers) this.subscriptions.delete(threadId);
+      clearTimeout(slot.expiry);
       this.serverRequests.forget(threadId);
-    }).catch(error => this.emit('subscription-error', error));
+    }).catch(error => {
+      if (this.subscriptions.get(threadId) === slot && this.threads.get(threadId) === record && record) record.needsReload = true;
+      this.emit('subscription-error', error);
+    });
   }
 
   keepThreadLoaded(threadId, record) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@walkhi/code-relax",
-  "version": "0.1.0-beta.34",
+  "version": "0.1.0-beta.35",
   "private": false,
   "license": "UNLICENSED",
   "type": "module",
@@ -41,8 +41,8 @@
     "tag": "beta"
   },
   "optionalDependencies": {
-    "@walkhi/code-relax-native-win32-x64": "0.1.0-beta.34",
-    "@walkhi/code-relax-native-darwin-arm64": "0.1.0-beta.34",
-    "@walkhi/code-relax-native-darwin-x64": "0.1.0-beta.34"
+    "@walkhi/code-relax-native-win32-x64": "0.1.0-beta.35",
+    "@walkhi/code-relax-native-darwin-arm64": "0.1.0-beta.35",
+    "@walkhi/code-relax-native-darwin-x64": "0.1.0-beta.35"
   }
 }