cx-viewer 1.0.3 → 1.0.4

package/electron/tab-preload.js

@@ -0,0 +1,24 @@
+const { contextBridge, ipcRenderer } = require('electron');
+
+contextBridge.exposeInMainWorld('tabAPI', {
+  switchTab: (tabId) => ipcRenderer.send('tab-switch', tabId),
+  closeTab: (tabId) => ipcRenderer.send('tab-close', tabId),
+  newTab: () => ipcRenderer.send('tab-new'),
+  onTabsUpdated: (cb) => ipcRenderer.on('tabs-updated', (_, tabs) => cb(tabs)),
+  onTabActivated: (cb) => ipcRenderer.on('tab-activated', (_, tabId) => cb(tabId)),
+  onThemeChanged: (cb) => ipcRenderer.on('theme-changed', (_, theme) => cb(theme)),
+  onFullscreenChanged: (cb) => ipcRenderer.on('fullscreen-changed', (_, isFullscreen) => cb(isFullscreen)),
+  // iPad 模式：tab bar 上的窗口级开关。main 进程持有状态。
+  toggleDeviceMode: () => ipcRenderer.send('toggle-device-mode'),
+  requestDeviceMode: () => ipcRenderer.send('request-device-mode'),
+  onDeviceModeChange: (cb) => ipcRenderer.on('device-mode-changed', (_, on) => cb(on)),
+  // Header 控件迁移：接收 active tab 的 header 模型；把点击动作回传 main → active tab。
+  onHeaderModel: (cb) => ipcRenderer.on('header-model', (_, model, tabId) => cb(model, tabId)),
+  requestHeaderModel: () => ipcRenderer.send('request-header-model'),
+  headerAction: (payload) => ipcRenderer.send('header-action', payload),
+  // win32 自定义标题栏：HTML 菜单栏按 platform 渲染；菜单文案/tooltip 由 main 翻译后推过来。
+  platform: process.platform,
+  onMenuModel: (cb) => ipcRenderer.on('menu-model', (_, payload) => cb(payload)),
+  // React 下拉开/关状态回报:打开期间 hover 相邻顶级菜单即切换(原生菜单栏惯例)。
+  onMenuBarState: (cb) => ipcRenderer.on('menu-bar-state', (_, open) => cb(open)),
+});

package/electron/tab-worker.js

@@ -0,0 +1,142 @@
+/**
+ * Tab Worker — child process for each Electron tab.
+ * Launched via fork() from electron/main.js.
+ * Each worker runs an isolated proxy + server + Codex PTY.
+ *
+ * Uses workspace mode (CXV_WORKSPACE_MODE=1) so interceptor.js skips auto-init.
+ * Then manually: startViewer() → initForWorkspace() → spawnCodex().
+ * This mirrors the workspace-launch flow behind /api/workspaces/launch (cf. cli.js runCliMode).
+ */
+import { dirname, join } from 'path';
+import { fileURLToPath, pathToFileURL } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const rootDir = join(__dirname, '..');
+// Windows 下 import(绝对路径) 会被拒 (ERR_UNSUPPORTED_ESM_URL_SCHEME)；统一走 pathToFileURL。
+// POSIX 下等价 —— pathToFileURL('/abs/foo.js').href === 'file:///abs/foo.js'，Node ESM 对两种形式行为等价。
+const importAbs = (p) => import(pathToFileURL(p).href);
+
+// Set env BEFORE any imports of server.js / interceptor.js
+if (process.platform === 'win32' && !process.env.UV_THREADPOOL_SIZE) {
+  process.env.UV_THREADPOOL_SIZE = '16';
+}
+process.env.CXV_CLI_MODE = '1';
+process.env.CXV_WORKSPACE_MODE = '1';
+process.env.CXV_START_PORT = process.env.CXV_START_PORT || '7048';
+process.env.CXV_MAX_PORT = process.env.CXV_MAX_PORT || '7099';
+
+// 等首条 codex PTY 数据落入 outputBuffer 的兜底超时——超过仍 send ready 让前端开始加载。
+// codex TUI 启动通常 200-400ms 出首帧；600ms 留足空间又不至于让用户感受到明显延迟。
+const CODEX_STARTUP_TIMEOUT_MS = 600;
+
+// Receive launch command from parent
+process.on('message', async (msg) => {
+  if (msg.type === 'launch') {
+    try {
+      await launch(msg);
+    } catch (err) {
+      try { process.send({ type: 'error', message: err.message }); } catch {}
+      process.exit(1);
+    }
+  }
+  if (msg.type === 'shutdown') {
+    await shutdown();
+  }
+});
+
+// Safety net: parent died
+process.on('disconnect', async () => {
+  await shutdown();
+});
+
+let serverMod = null;
+let killPtyFn = null;
+
+async function launch({ path: projectPath, extraArgs = [], codexPath, isNpmVersion }) {
+  console.log('[worker] launch:', projectPath, 'codex:', codexPath, 'npm:', isNpmVersion);
+  // 1. Register hooks (idempotent)
+  const { ensureHooks } = await importAbs(join(rootDir, 'server', 'lib', 'ensure-hooks.js'));
+  ensureHooks();
+
+  // 2. Start proxy
+  const { startProxy } = await importAbs(join(rootDir, 'server', 'proxy.js'));
+  const proxyPort = await startProxy();
+  process.env.CXV_PROXY_PORT = String(proxyPort);
+  process.env.CXV_PROJECT_DIR = projectPath;
+
+  // 3. Import server.js (workspace mode → skips auto-start)
+  serverMod = await importAbs(join(rootDir, 'server', 'server.js'));
+
+  // 4. Manually start server
+  await serverMod.startViewer();
+
+  // 5. Get port
+  const port = serverMod.getPort();
+  if (!port) throw new Error('Server failed to bind port');
+
+  // 6. Store Codex path/args for potential later use by server APIs
+  if (codexPath) {
+    serverMod.setWorkspaceCodexArgs(extraArgs);
+    serverMod.setWorkspaceCodexPath(codexPath, isNpmVersion);
+  }
+
+  // 7. Initialize workspace log directory (sets LOG_FILE, _projectName, _logDir)
+  //    forceNew: false — 复用最近的日志文件以保留历史数据
+  const { initForWorkspace } = await importAbs(join(rootDir, 'server', 'interceptor.js'));
+  const result = initForWorkspace(projectPath, { forceNew: false });
+
+  // 7b. Mark workspace as launched so React app shows chat view instead of workspace selector
+  serverMod.setWorkspaceLaunched(true);
+
+  // 7c. Start log watcher, stats worker, streaming status (mirrors /api/workspaces/launch logic)
+  serverMod.initPostLaunch();
+
+  // 8. Spawn Codex PTY FIRST so its initial TUI lands in outputBuffer
+  // 之前是先 send ready 再 spawnCodex；那种顺序下前端 ws 可能在 PTY 启动前就连上，
+  // outputBuffer 为空 + codex 等待输入不再重绘 → 主 TerminalPanel 黑屏。
+  // 现在等 spawnCodex 完成且首条 PTY 数据落地（或 600ms 兜底超时）后再 send ready。
+  const { spawnCodex, killPty, onPtyExit, onPtyData } = await importAbs(join(rootDir, 'server', 'pty-manager.js'));
+  killPtyFn = killPty;
+
+  onPtyExit((code) => {
+    try { process.send({ type: 'pty-exit', code }); } catch {}
+  });
+
+  if (codexPath) {
+    try {
+      console.log('[worker] spawnCodex proxyPort:', proxyPort, 'serverPort:', port, 'path:', projectPath);
+      await spawnCodex(proxyPort, projectPath, extraArgs, codexPath, isNpmVersion, port, serverMod.getProtocol(), serverMod.getInternalToken());
+      // 等首条 PTY 数据 或 超时兜底（codex TUI 启动通常 200-400ms 内首帧）
+      await new Promise((resolve) => {
+        let done = false;
+        const finish = () => { if (done) return; done = true; clearTimeout(timer); remove(); resolve(); };
+        const timer = setTimeout(finish, CODEX_STARTUP_TIMEOUT_MS);
+        const remove = onPtyData(() => finish());
+      });
+    } catch (err) {
+      try { process.send({ type: 'pty-error', message: err.message }); } catch {}
+      // spawnCodex 失败时不再 send 'ready'：让 main.js 30s timeout 自动标 tab error，
+      // 避免前端激活一个无 PTY 的 tab 出现"看似可用但黑屏"的体验。
+      return;
+    }
+  }
+
+  // 9. Notify parent — view will load with outputBuffer already populated
+  const token = serverMod.getAccessToken();
+  console.log('[worker] sending ready:', port, result.projectName);
+  process.send({
+    type: 'ready',
+    port,
+    token,
+    projectName: result.projectName,
+  });
+}
+
+async function shutdown() {
+  try {
+    if (killPtyFn) killPtyFn();
+    if (serverMod) await serverMod.stopViewer().catch(() => {});
+  } catch {}
+  process.exit(0);
+}

package/electron/window-state.js

@@ -0,0 +1,60 @@
+/**
+ * 窗口位置/大小持久化(纯逻辑,fs 与 Electron screen 均由调用方注入,可被 node:test 直接单测)。
+ *
+ * 存储:LOG_DIR/window-state.json —— 不写 preferences.json(那个文件由 server 进程拥有写权,
+ * 主进程同写会产生竞争覆盖)。
+ * 形状:{ x, y, width, height, maximized }(x/y/width/height 为 getNormalBounds() 的非最大化几何)。
+ *
+ * 恢复前必须 validateState():显示器可能被拔掉/分辨率变化,盲目恢复会把窗口开到屏幕外。
+ */
+
+// 与 main.js BaseWindow 创建参数保持一致的下限
+const MIN_WIDTH = 800;
+const MIN_HEIGHT = 600;
+// 窗口与任一显示器 workArea 的最小可见交叠(px),低于此视为"基本不可见"→ 弃用存档
+const MIN_VISIBLE = 100;
+
+/** 读取持久化状态;文件缺失/损坏/形状非法 → null(回落默认窗口几何)。 */
+export function loadState(readFn, path) {
+  try {
+    const raw = readFn(path, 'utf-8');
+    const s = JSON.parse(raw);
+    if (!s || typeof s !== 'object') return null;
+    const { x, y, width, height, maximized } = s;
+    if (![x, y, width, height].every((n) => Number.isFinite(n))) return null;
+    return { x, y, width, height, maximized: !!maximized };
+  } catch {
+    return null;
+  }
+}
+
+/** 序列化写盘(写失败静默——窗口状态属 best-effort,不能影响主流程)。 */
+export function saveState(writeFn, path, state) {
+  try {
+    const { x, y, width, height, maximized } = state;
+    writeFn(path, JSON.stringify({ x, y, width, height, maximized: !!maximized }));
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * 校验存档对当前显示器布局是否仍然可用。
+ * @param {object|null} state loadState() 的产物
+ * @param {Array<{x:number,y:number,width:number,height:number}>} workAreas screen.getAllDisplays().map(d=>d.workArea)
+ * @returns 合法则返回(尺寸钳到下限后的)state,否则 null
+ */
+export function validateState(state, workAreas) {
+  if (!state || !Array.isArray(workAreas) || workAreas.length === 0) return null;
+  const width = Math.max(state.width, MIN_WIDTH);
+  const height = Math.max(state.height, MIN_HEIGHT);
+  // 至少与一个显示器 workArea 有 MIN_VISIBLE×MIN_VISIBLE 的交叠(标题栏可抓取),否则视为越界
+  const visible = workAreas.some((wa) => {
+    const ix = Math.min(state.x + width, wa.x + wa.width) - Math.max(state.x, wa.x);
+    const iy = Math.min(state.y + height, wa.y + wa.height) - Math.max(state.y, wa.y);
+    return ix >= MIN_VISIBLE && iy >= MIN_VISIBLE;
+  });
+  if (!visible) return null;
+  return { x: state.x, y: state.y, width, height, maximized: !!state.maximized };
+}

package/electron/workspace-preload.js

@@ -0,0 +1,19 @@
+const { contextBridge, ipcRenderer } = require('electron');
+
+console.log('[workspace-preload] loading...');
+
+contextBridge.exposeInMainWorld('electronAPI', {
+  launchWorkspace: (path, extraArgs) => {
+    console.log('[workspace-preload] launchWorkspace called:', path, extraArgs);
+    ipcRenderer.send('workspace-launch', { path, extraArgs });
+  },
+  // 工作区选择器浮层模式：close 收起浮层；requestWorkspaceMode 挂载即同步当前模式；
+  // onWorkspaceMode 监听 main 推来的 'full' | 'popup'。
+  closeWorkspacePopup: () => ipcRenderer.send('workspace-popup-close'),
+  requestWorkspaceMode: () => ipcRenderer.send('request-workspace-mode'),
+  onWorkspaceMode: (cb) => {
+    const listener = (_, mode) => cb(mode);
+    ipcRenderer.on('workspace-mode', listener);
+    return () => ipcRenderer.removeListener('workspace-mode', listener);
+  },
+});

package/findcx.js

@@ -27,6 +27,10 @@ function resolveLogDir() {
 // 使用 let 以支持运行时通过 setLogDir() 修改（ES module live binding）
 export let LOG_DIR = resolveLogDir();
 
+export function getCodexConfigDir() {
+  return join(homedir(), '.codex');
+}
+
 /**
  * 运行时修改日志存储根目录。
  * 支持 ~/... 展开。所有通过 `import { LOG_DIR }` 引用的模块会自动看到新值。