codex-to-im 1.0.62 → 1.0.64

package/dist/ui-server.mjs

@@ -1,4 +1,4 @@
-import { createRequire } from 'module'; const require = createRequire(import.meta.url);
+import { createRequire as __ctiCreateRequire } from 'module'; const require = __ctiCreateRequire(import.meta.url);
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -5210,11 +5210,25 @@ import fs3 from "node:fs";
 import os2 from "node:os";
 import path2 from "node:path";
 import crypto3 from "node:crypto";
-import { DatabaseSync } from "node:sqlite";
+import { createRequire } from "node:module";
 var ACTIVE_WINDOW_MS = 15 * 60 * 1e3;
 var MAX_SESSION_META_BYTES = 4 * 1024 * 1024;
 var MAX_SESSION_TITLE_SCAN_BYTES = 512 * 1024;
+var INITIAL_HISTORY_TAIL_BYTES = 256 * 1024;
+var MAX_HISTORY_TAIL_BYTES = 64 * 1024 * 1024;
 var TITLE_MAX_CHARS = 72;
+var localRequire = createRequire(import.meta.url);
+var databaseSyncConstructor;
+function getDatabaseSyncConstructor() {
+  if (databaseSyncConstructor !== void 0) return databaseSyncConstructor;
+  try {
+    const sqlite = localRequire("node:sqlite");
+    databaseSyncConstructor = typeof sqlite.DatabaseSync === "function" ? sqlite.DatabaseSync : null;
+  } catch {
+    databaseSyncConstructor = null;
+  }
+  return databaseSyncConstructor;
+}
 function getCodexHome() {
   return process.env.CODEX_HOME || path2.join(os2.homedir(), ".codex");
 }
@@ -5357,10 +5371,37 @@ function walkSessionFiles(dirPath, target) {
     }
   }
 }
+function normalizeSourceKind(value) {
+  if (typeof value === "string") {
+    const normalized = value.trim();
+    if (!normalized) return "";
+    if (normalized.startsWith("{")) {
+      try {
+        return normalizeSourceKind(JSON.parse(normalized));
+      } catch {
+        return normalized.toLowerCase();
+      }
+    }
+    return normalized.toLowerCase();
+  }
+  if (!value || typeof value !== "object") return "";
+  const record = value;
+  if ("subagent" in record || "sub_agent" in record) return "subagent";
+  for (const key of ["type", "kind", "source", "name"]) {
+    const nested = normalizeSourceKind(record[key]);
+    if (nested) return nested;
+  }
+  return "";
+}
+function isSubagentThread(source, threadSource, parentThreadId) {
+  if (typeof parentThreadId === "string" && parentThreadId.trim()) return true;
+  return normalizeSourceKind(threadSource) === "subagent" || normalizeSourceKind(source) === "subagent";
+}
 function isDesktopLike(meta) {
   const originator = typeof meta?.originator === "string" ? meta.originator.toLowerCase() : "";
-  const source = typeof meta?.source === "string" ? meta.source.toLowerCase() : "";
+  const source = normalizeSourceKind(meta?.source);
   if (source === "exec") return false;
+  if (isSubagentThread(meta?.source, meta?.thread_source, meta?.parent_thread_id)) return false;
   return originator.includes("desktop") || source === "vscode" || source === "desktop";
 }
 function loadThreadIndexEntries(archivedThreadIds) {
@@ -5409,25 +5450,46 @@ function parseUpdatedAtValue(value) {
 function loadVisibleDesktopThreads(limit) {
   const dbPath = getDesktopStateDbPath();
   if (!dbPath || !fs3.existsSync(dbPath)) return null;
+  const DatabaseSync = getDatabaseSyncConstructor();
+  if (!DatabaseSync) return null;
   let db = null;
   try {
     db = new DatabaseSync(dbPath, { readOnly: true });
+    const columns = new Set(
+      db.prepare("PRAGMA table_info(threads)").all().map((row) => row && typeof row === "object" ? row.name : null).filter((name) => typeof name === "string")
+    );
+    if (!columns.has("id") || !columns.has("updated_at")) return null;
     const hasLimit = typeof limit === "number" && Number.isFinite(limit) && limit > 0;
+    const selectedColumns = [
+      "id",
+      "updated_at",
+      ...["updated_at_ms", "rollout_path", "title", "cwd", "source", "thread_source"].filter((column) => columns.has(column))
+    ];
+    const whereClauses = columns.has("archived") ? ["archived = 0"] : ["1 = 1"];
+    if (columns.has("source")) whereClauses.push("COALESCE(source, '') != 'exec'");
+    if (columns.has("thread_source")) whereClauses.push("COALESCE(thread_source, '') != 'subagent'");
     const sql = `
-      SELECT id, updated_at
+      SELECT ${selectedColumns.join(", ")}
       FROM threads
-      WHERE archived = 0
-        AND source != 'exec'
-      ORDER BY updated_at DESC
+      WHERE ${whereClauses.join("\n        AND ")}
+      ORDER BY ${columns.has("updated_at_ms") ? "updated_at_ms" : "updated_at"} DESC
       ${hasLimit ? "LIMIT ?" : ""}
     `;
     const rows = hasLimit ? db.prepare(sql).all(Math.max(1, Math.floor(limit))) : db.prepare(sql).all();
     const ids = rows.map((row) => {
-      const id = typeof row.id === "string" ? row.id.trim() : "";
+      if (!row || typeof row !== "object") return null;
+      const record = row;
+      const id = typeof record.id === "string" ? record.id.trim() : "";
       if (!id) return null;
+      if (isSubagentThread(record.source, record.thread_source)) return null;
       return {
         id,
-        updatedAtMs: parseUpdatedAtValue(row.updated_at)
+        updatedAtMs: parseUpdatedAtValue(record.updated_at_ms ?? record.updated_at),
+        ...typeof record.rollout_path === "string" && record.rollout_path.trim() ? { rolloutPath: record.rollout_path.trim() } : {},
+        ...typeof record.title === "string" && trimTitle(record.title) ? { title: trimTitle(record.title) } : {},
+        ...typeof record.cwd === "string" ? { cwd: record.cwd } : {},
+        ...typeof record.source === "string" ? { source: record.source } : {},
+        ...typeof record.thread_source === "string" ? { threadSource: record.thread_source } : {}
       };
     }).filter((row) => Boolean(row));
     return ids.length > 0 ? ids : null;
@@ -5458,7 +5520,7 @@ function buildFallbackTitle(threadId, filePath, cwd) {
   if (dirName) return dirName;
   return `Session ${threadId.slice(0, 8)}`;
 }
-function parseDesktopSession(filePath, threadIndexEntries, archivedThreadIds) {
+function parseDesktopSession(filePath, threadIndexEntries, archivedThreadIds, visibleThread) {
   const firstLine = readFirstLine(filePath);
   if (!firstLine) return null;
   let parsed;
@@ -5470,7 +5532,8 @@ function parseDesktopSession(filePath, threadIndexEntries, archivedThreadIds) {
   if (parsed.type !== "session_meta" || !parsed.payload?.id || !isDesktopLike(parsed.payload)) {
     return null;
   }
-  if (archivedThreadIds.has(parsed.payload.id)) {
+  const threadId = visibleThread?.id || parsed.payload.id;
+  if (archivedThreadIds.has(threadId)) {
     return null;
   }
   let stat;
@@ -5479,20 +5542,19 @@ function parseDesktopSession(filePath, threadIndexEntries, archivedThreadIds) {
   } catch {
     return null;
   }
-  const cwd = parsed.payload.cwd || "";
+  const cwd = visibleThread?.cwd || parsed.payload.cwd || "";
   if (isInternalSkillWorkspace(cwd)) {
     return null;
   }
-  const lastEventAt = stat.mtime.toISOString();
+  const lastEventAt = visibleThread?.updatedAtMs ? new Date(visibleThread.updatedAtMs).toISOString() : stat.mtime.toISOString();
   const firstSeenAt = parsed.payload.timestamp || parsed.timestamp || stat.birthtime.toISOString();
-  const threadId = parsed.payload.id;
-  const title = threadIndexEntries.get(threadId)?.title || buildFallbackTitle(threadId, filePath, cwd);
+  const title = visibleThread?.title || threadIndexEntries.get(threadId)?.title || buildFallbackTitle(threadId, filePath, cwd);
   return {
     threadId,
     filePath,
     cwd,
     originator: typeof parsed.payload.originator === "string" ? parsed.payload.originator : "Codex Desktop",
-    source: typeof parsed.payload.source === "string" ? parsed.payload.source : void 0,
+    source: visibleThread?.source || (typeof parsed.payload.source === "string" ? parsed.payload.source : void 0),
     cliVersion: typeof parsed.payload.cli_version === "string" ? parsed.payload.cli_version : void 0,
     firstSeenAt,
     lastEventAt,
@@ -5558,12 +5620,31 @@ function listDesktopSessions(limit) {
   const visibleThreadIds = visibleThreads?.map((thread) => thread.id) || null;
   const visibleThreadSet = visibleThreadIds ? new Set(visibleThreadIds) : null;
   const visibleThreadUpdatedAt = new Map(visibleThreads?.map((thread) => [thread.id, thread.updatedAtMs]) || []);
+  const visibleThreadRows = new Map(visibleThreads?.map((thread) => [thread.id, thread]) || []);
   const oldestVisibleUpdatedAtMs = visibleThreads && visibleThreads.length > 0 ? Math.min(...visibleThreads.map((thread) => thread.updatedAtMs || Number.MAX_SAFE_INTEGER)) : 0;
   const files = [];
   walkSessionFiles(root, files);
   const allSessions = /* @__PURE__ */ new Map();
+  for (const thread of visibleThreads || []) {
+    if (!thread.rolloutPath || !fs3.existsSync(thread.rolloutPath)) continue;
+    const session = parseDesktopSession(
+      thread.rolloutPath,
+      threadIndexEntries,
+      archivedThreadIds,
+      thread
+    );
+    if (!session || !isWithinSavedWorkspaceRoots(session.cwd, savedWorkspaceRoots)) continue;
+    allSessions.set(session.threadId, session);
+  }
   for (const filePath of files) {
-    const session = parseDesktopSession(filePath, threadIndexEntries, archivedThreadIds);
+    const threadId = extractThreadIdFromRolloutName(path2.basename(filePath));
+    if (threadId && allSessions.has(threadId)) continue;
+    const session = parseDesktopSession(
+      filePath,
+      threadIndexEntries,
+      archivedThreadIds,
+      threadId ? visibleThreadRows.get(threadId) : void 0
+    );
     if (!session) continue;
     if (!isWithinSavedWorkspaceRoots(session.cwd, savedWorkspaceRoots)) continue;
     allSessions.set(session.threadId, session);

package/docs/install-windows.md

@@ -64,6 +64,8 @@ npm -v
 - 已有可用的 Codex CLI 登录态
 - 已配置可用的 API Key（`CTI_CODEX_API_KEY`、`CODEX_API_KEY` 或 `OPENAI_API_KEY`）
 
+bridge 默认以 `CTI_CODEX_TRANSPORT=auto` 运行：纯 IM 会话使用包内 Codex app-server，Desktop thread 复用保持 SDK + JSONL 路径。即使显式设置 `CTI_CODEX_TRANSPORT=app-server`，Desktop thread 也不会被独立 app-server 接管。需要紧急回退时，可在服务环境中设置 `CTI_CODEX_TRANSPORT=sdk` 后按安全流程重启服务；不要直接连接或改写 Codex Desktop 的 Remote enrollment 数据。
+
 说明：
 
 - `codex-to-im` 现在已经随包带上运行 bridge 所需的 `@openai/codex-sdk` / Codex CLI 平台依赖

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codex-to-im",
-  "version": "1.0.62",
+  "version": "1.0.64",
   "description": "Installable Codex-to-IM bridge with local setup UI and background service",
   "license": "MIT",
   "homepage": "https://github.com/zhangle1987/codex-to-im#readme",

package/scripts/build.js

@@ -1,4 +1,5 @@
 import * as esbuild from 'esbuild';
+import { spawnSync } from 'node:child_process';
 
 const common = {
   bundle: true,
@@ -17,7 +18,9 @@ const common = {
     'stream', 'events', 'url', 'util', 'child_process', 'worker_threads',
     'node:*',
   ],
-  banner: { js: "import { createRequire } from 'module'; const require = createRequire(import.meta.url);" },
+  banner: {
+    js: "import { createRequire as __ctiCreateRequire } from 'module'; const require = __ctiCreateRequire(import.meta.url);",
+  },
 };
 
 async function build(entryPoint, outfile) {
@@ -26,6 +29,15 @@ async function build(entryPoint, outfile) {
     entryPoints: [entryPoint],
     outfile,
   });
+
+  const syntaxCheck = spawnSync(process.execPath, ['--check', outfile], {
+    encoding: 'utf8',
+  });
+  if (syntaxCheck.status !== 0) {
+    throw new Error(
+      `Generated bundle failed syntax validation: ${outfile}\n${syntaxCheck.stderr || syntaxCheck.stdout}`,
+    );
+  }
 }
 
 await build('src/main.ts', 'dist/daemon.mjs');