codex-to-im 1.0.43 → 1.0.45

package/dist/ui-server.mjs

@@ -5446,6 +5446,18 @@ function recordBindingChange(store, input) {
   });
 }
 
+// src/lib/bridge/turns/turn-classifier.ts
+function normalizeThreadId(value) {
+  const normalized = value?.trim();
+  return normalized || void 0;
+}
+function getCodexThreadId(session, binding) {
+  return normalizeThreadId(session?.codex_thread_id) || normalizeThreadId(binding?.sdkSessionId) || normalizeThreadId(session?.sdk_session_id);
+}
+function getExplicitDesktopThreadId(session) {
+  return normalizeThreadId(session?.desktop_thread_id) || (session?.thread_origin === "desktop" ? normalizeThreadId(session.sdk_session_id) : void 0);
+}
+
 // src/session-bindings.ts
 function asChannelProvider(value) {
   return value === "feishu" || value === "weixin" ? value : void 0;
@@ -5497,15 +5509,31 @@ function getSessionName(session) {
 function getSessionMode(store, session) {
   return session.preferred_mode || store.getSetting("bridge_default_mode") || "code";
 }
+function getBindingResumeThreadId(session) {
+  return getCodexThreadId(session) || "";
+}
+function markSessionAsDesktopBacked(store, sessionId, desktopThreadId) {
+  store.updateSdkSessionId(sessionId, desktopThreadId);
+  store.updateSession(sessionId, {
+    sdk_session_id: desktopThreadId,
+    codex_thread_id: desktopThreadId,
+    desktop_thread_id: desktopThreadId,
+    thread_origin: "desktop"
+  });
+}
 function bindStoreToSession(store, channelType, chatId, sessionId, chatMeta) {
   const session = store.getSession(sessionId);
   if (!session) return null;
   assertBindingTargetAvailable(
     store,
     { channelType, chatId },
-    { sessionId: session.id, sdkSessionId: session.sdk_session_id || void 0 }
+    {
+      sessionId: session.id,
+      sdkSessionId: getCodexThreadId(session) || getExplicitDesktopThreadId(session)
+    }
   );
   const meta = resolveChannelMeta(channelType);
+  const sdkSessionId = getBindingResumeThreadId(session);
   return store.upsertChannelBinding({
     channelType,
     channelProvider: meta.provider,
@@ -5514,7 +5542,7 @@ function bindStoreToSession(store, channelType, chatId, sessionId, chatMeta) {
     chatUserId: chatMeta?.chatUserId,
     chatDisplayName: chatMeta?.chatDisplayName,
     codepilotSessionId: session.id,
-    sdkSessionId: session.sdk_session_id || "",
+    sdkSessionId,
     workingDirectory: session.working_directory,
     model: session.model,
     mode: getSessionMode(store, session)
@@ -5529,6 +5557,7 @@ function bindStoreToSdkSession(store, channelType, chatId, sdkSessionId, opts) {
   const meta = resolveChannelMeta(channelType);
   const existing = store.findSessionBySdkSessionId(sdkSessionId);
   if (existing) {
+    markSessionAsDesktopBacked(store, existing.id, sdkSessionId);
     return store.upsertChannelBinding({
       channelType,
       channelProvider: meta.provider,
@@ -5553,7 +5582,7 @@ function bindStoreToSdkSession(store, channelType, chatId, sdkSessionId, opts) {
     workingDirectory,
     "code"
   );
-  store.updateSdkSessionId(session.id, sdkSessionId);
+  markSessionAsDesktopBacked(store, session.id, sdkSessionId);
   return store.upsertChannelBinding({
     channelType,
     channelProvider: meta.provider,
@@ -5582,11 +5611,11 @@ function listBindingTargetOptions(_store, desktopLimit = 12) {
 function listBindingSummaries(store) {
   return store.listChannelBindings().map((binding) => {
     const session = store.getSession(binding.codepilotSessionId);
-    const currentThreadId = binding.sdkSessionId || session?.sdk_session_id || void 0;
-    const desktop = currentThreadId ? getDesktopSessionByThreadId(currentThreadId) : null;
-    const archived = currentThreadId ? isArchivedDesktopThread(currentThreadId) : false;
-    const currentTargetKey = currentThreadId ? `desktop:${currentThreadId}` : `session:${binding.codepilotSessionId}`;
-    const currentTargetLabel = currentThreadId ? desktop?.title || (archived ? `\u5DF2\u5F52\u6863\u684C\u9762\u7EBF\u7A0B ${currentThreadId.slice(0, 8)}...` : `Desktop thread ${currentThreadId.slice(0, 8)}...`) : getSessionName(session || {
+    const currentDesktopThreadId = session ? getExplicitDesktopThreadId(session) : void 0;
+    const desktop = currentDesktopThreadId ? getDesktopSessionByThreadId(currentDesktopThreadId) : null;
+    const archived = currentDesktopThreadId ? isArchivedDesktopThread(currentDesktopThreadId) : false;
+    const currentTargetKey = currentDesktopThreadId ? `desktop:${currentDesktopThreadId}` : `session:${binding.codepilotSessionId}`;
+    const currentTargetLabel = currentDesktopThreadId ? desktop?.title || (archived ? `\u5DF2\u5F52\u6863\u684C\u9762\u7EBF\u7A0B ${currentDesktopThreadId.slice(0, 8)}...` : `Desktop thread ${currentDesktopThreadId.slice(0, 8)}...`) : getSessionName(session || {
       id: binding.codepilotSessionId,
       working_directory: binding.workingDirectory,
       model: binding.model
@@ -5606,7 +5635,7 @@ function listBindingSummaries(store) {
       currentTargetLabel,
       currentSessionId: binding.codepilotSessionId,
       currentSessionName: session ? getSessionName(session) : binding.codepilotSessionId.slice(0, 8),
-      currentThreadId,
+      currentThreadId: currentDesktopThreadId || getCodexThreadId(session, binding),
       runtimeStatus: session?.runtime_status,
       queuedCount: session?.queued_count,
       mirrorStatus: session?.mirror_status,
@@ -6495,7 +6524,7 @@ var JsonFileStore = class {
   findSessionBySdkSessionId(sdkSessionId) {
     this.reloadSessions();
     for (const session of this.sessions.values()) {
-      if (session.sdk_session_id === sdkSessionId) {
+      if (session.sdk_session_id === sdkSessionId || session.codex_thread_id === sdkSessionId || session.desktop_thread_id === sdkSessionId) {
         return session;
       }
     }
@@ -6532,7 +6561,7 @@ var JsonFileStore = class {
       this.persistSessions();
     }
   }
-  updateSession(sessionId, updates) {
+  updateSession(sessionId, updates, options) {
     this.reloadSessions();
     const session = this.sessions.get(sessionId);
     if (!session) return;
@@ -6540,7 +6569,7 @@ var JsonFileStore = class {
       ...session,
       ...updates,
       id: session.id,
-      updated_at: now()
+      updated_at: options?.touch === false ? session.updated_at : now()
     };
     this.sessions.set(sessionId, next);
     this.persistSessions();
@@ -6629,6 +6658,15 @@ var JsonFileStore = class {
     const s = this.sessions.get(sessionId);
     if (s) {
       s.sdk_session_id = sdkSessionId;
+      if (sdkSessionId) {
+        s.codex_thread_id = sdkSessionId;
+        s.thread_origin = s.thread_origin || "bridge";
+      } else {
+        delete s.codex_thread_id;
+        if (s.thread_origin !== "desktop") {
+          delete s.thread_origin;
+        }
+      }
       s.updated_at = now();
       this.persistSessions();
     }