cx-viewer 1.0.0 → 1.0.1

package/lib/log-management.js

@@ -54,7 +54,9 @@ export function listLocalLogs(logDir, currentProjectName) {
         }
       } catch { }
       for (const f of files) {
-        const match = f.match(/^(.+?)_(\d{8}_\d{6})\.jsonl$/);
+        // Include active temp sessions so a first-run conversation is visible
+        // before it gets finalized to a permanent .jsonl file.
+        const match = f.match(/^(.+?)_(\d{8}_\d{6})(?:_temp)?\.jsonl$/);
         if (!match) continue;
         const ts = match[2];
         const filePath = join(projectDir, f);

package/lib/plugin-loader.js

@@ -1,5 +1,6 @@
-import { readdirSync, existsSync, readFileSync } from 'node:fs';
+import { readdirSync, existsSync, readFileSync, statSync } from 'node:fs';
 import { join } from 'node:path';
+import { pathToFileURL } from 'node:url';
 import { LOG_DIR } from '../findcx.js';
 
 // 动态获取（LOG_DIR 可能在运行时被 setLogDir 修改）
@@ -17,12 +18,56 @@ const HOOK_TYPES = {
 };
 
 let _plugins = [];
+let _pluginStates = new Map();
+
+function normalizeCapabilities(plugin) {
+  const capabilities = new Set(Array.isArray(plugin.capabilities) ? plugin.capabilities.filter(Boolean) : []);
+  if (plugin.hooks && typeof plugin.hooks.voiceInput === 'function') {
+    capabilities.add('voiceInput');
+  }
+  return Array.from(capabilities);
+}
+
+function normalizeVoiceInput(plugin) {
+  if (!plugin || typeof plugin !== 'object') return null;
+  const voiceInput = plugin.voiceInput;
+  if (!voiceInput || typeof voiceInput !== 'object') return null;
+  const appKey = typeof voiceInput.appKey === 'string' ? voiceInput.appKey.trim() : '';
+  const digestEndpoint = typeof voiceInput.digestEndpoint === 'string' ? voiceInput.digestEndpoint.trim() : '';
+  const normalized = {};
+  if (appKey) normalized.appKey = appKey;
+  if (digestEndpoint) normalized.digestEndpoint = digestEndpoint;
+  return Object.keys(normalized).length > 0 ? normalized : {};
+}
+
+function getModuleVersion(filePath) {
+  try {
+    return String(statSync(filePath).mtimeMs);
+  } catch {
+    return null;
+  }
+}
+
+function extractNameFromSource(content, fallback) {
+  const match = content.match(/name\s*:\s*['"]([^'"]+)['"]/);
+  return match ? match[1] : fallback;
+}
+
+function extractCapabilitiesFromSource(content) {
+  const match = content.match(/capabilities\s*:\s*\[([^\]]*)\]/);
+  if (!match) return [];
+  return match[1]
+    .split(',')
+    .map(s => s.trim().replace(/^['"]|['"]$/g, ''))
+    .filter(Boolean);
+}
 
 /**
  * 扫描 LOG_DIR/plugins/ 目录，动态 import 每个 .js/.mjs 文件
  */
 export async function loadPlugins() {
   _plugins = [];
+  _pluginStates = new Map();
 
   if (!existsSync(getPluginsDir())) return;
 
@@ -48,21 +93,90 @@ export async function loadPlugins() {
 
   for (const file of files) {
     const filePath = join(getPluginsDir(), file);
+    const moduleVersion = getModuleVersion(filePath);
     try {
-      const mod = await import(`file://${filePath}`);
+      const source = readFileSync(filePath, 'utf-8');
+      const fileUrl = pathToFileURL(filePath);
+      fileUrl.searchParams.set('v', moduleVersion || String(Date.now()));
+      const mod = await import(fileUrl.href);
       const plugin = mod.default || mod;
       const name = plugin.name || file;
+      const hooks = (plugin.hooks && typeof plugin.hooks === 'object') ? plugin.hooks : {};
+      const capabilities = normalizeCapabilities(plugin);
+      const voiceInput = normalizeVoiceInput(plugin);
+      const canLoad = Object.keys(hooks).length > 0 || capabilities.length > 0;
 
       if (disabledPlugins.includes(name)) {
+        _pluginStates.set(file, {
+          name,
+          file,
+          hooks: Object.keys(hooks),
+          capabilities,
+          voiceInput,
+          moduleVersion,
+          enabled: false,
+          loaded: false,
+          loadError: null,
+        });
         if (SHOULD_LOG) console.error(`[CX Viewer] Plugin "${name}" is disabled, skipping.`);
         continue;
       }
 
-      if (plugin.hooks && typeof plugin.hooks === 'object') {
-        _plugins.push({ name, hooks: plugin.hooks, file });
-        if (SHOULD_LOG) console.error(`[CX Viewer] Plugin loaded: ${name} (${file})`);
+      if (!canLoad) {
+        _pluginStates.set(file, {
+          name: extractNameFromSource(source, name),
+          file,
+          hooks: [],
+          capabilities: extractCapabilitiesFromSource(source),
+          voiceInput: null,
+          moduleVersion,
+          enabled: true,
+          loaded: false,
+          loadError: 'Plugin must export hooks or capabilities',
+        });
+        continue;
       }
+
+      _plugins.push({ name, hooks, file, capabilities, voiceInput, moduleVersion });
+      _pluginStates.set(file, {
+        name,
+        file,
+        hooks: Object.keys(hooks),
+        capabilities,
+        voiceInput,
+        moduleVersion,
+        enabled: true,
+        loaded: true,
+        loadError: null,
+      });
+      if (SHOULD_LOG) console.error(`[CX Viewer] Plugin loaded: ${name} (${file})`);
     } catch (err) {
+      try {
+        const source = readFileSync(filePath, 'utf-8');
+        _pluginStates.set(file, {
+          name: extractNameFromSource(source, file),
+          file,
+          hooks: [],
+          capabilities: extractCapabilitiesFromSource(source),
+          voiceInput: null,
+          moduleVersion,
+          enabled: true,
+          loaded: false,
+          loadError: err.message,
+        });
+      } catch {
+        _pluginStates.set(file, {
+          name: file,
+          file,
+          hooks: [],
+          capabilities: [],
+          voiceInput: null,
+          moduleVersion,
+          enabled: true,
+          loaded: false,
+          loadError: err.message,
+        });
+      }
       if (SHOULD_LOG) console.error(`[CX Viewer] Failed to load plugin "${file}":`, err.message);
     }
   }
@@ -133,6 +247,9 @@ export function getPluginsInfo() {
   }
 
   return files.map(file => {
+    const state = _pluginStates.get(file);
+    if (state) return state;
+
     const loaded = _plugins.find(p => p.file === file);
     let name = file;
 
@@ -155,7 +272,10 @@ export function getPluginsInfo() {
     }
 
     const hooks = loaded ? Object.keys(loaded.hooks) : [];
+    const capabilities = loaded ? loaded.capabilities : [];
+    const voiceInput = loaded ? loaded.voiceInput : null;
     const enabled = !disabledPlugins.includes(name);
-    return { name, file, hooks, enabled };
+    const moduleVersion = loaded?.moduleVersion || getModuleVersion(join(getPluginsDir(), file));
+    return { name, file, hooks, capabilities, voiceInput, moduleVersion, enabled, loaded: !!loaded, loadError: null };
   });
 }

package/lib/sdk-manager.js

@@ -6,6 +6,7 @@
  * - canUseTool callback for AskUserQuestion + permission approval
  * - Streaming status tracking
  * - Multi-turn conversation via session resume
+ * - Completed-entry fallback when a turn only exposes final assistant text via stream events
  */
 
 import { sdkToJSONLEntry, buildStreamingStatus } from './sdk-adapter.js';
@@ -40,6 +41,9 @@ let _streamingContent = [];
 let _currentBlockData = null;
 let _streamingRequestId = null;
 let _streamThrottleTimer = null;
+let _pendingFinalContent = null;
+let _pendingFinalRequestMessages = null;
+let _finalEntryEmittedThisTurn = false;
 
 // Callbacks registered by server.js
 let _onEntry = null;
@@ -105,6 +109,9 @@ async function _executeQuery(text) {
   // Generate stable timestamp for this turn — all entries share it for dedup
   _turnTimestamp = new Date().toISOString();
   _streamingRequestId = `sdk_${Date.now()}`;
+  _pendingFinalContent = null;
+  _pendingFinalRequestMessages = null;
+  _finalEntryEmittedThisTurn = false;
 
   // Accumulate user message BEFORE creating entries (this is the request)
   _accumulatedMessages.push({ role: 'user', content: text });
@@ -162,6 +169,8 @@ function _processMessage(msg) {
       // Main agent message (not sub-agent)
       if (!msg.parent_tool_use_id && msg.message) {
         _resetStreamingState();
+        _pendingFinalContent = null;
+        _pendingFinalRequestMessages = null;
 
         // Snapshot messages BEFORE adding assistant (body.messages = request history, unfiltered)
         const requestMessages = [..._accumulatedMessages];
@@ -186,6 +195,7 @@ function _processMessage(msg) {
           tools: _sdkTools,
         });
         if (_onEntry) _onEntry(entry);
+        _finalEntryEmittedThisTurn = true;
       }
       if (msg.session_id) _sessionId = msg.session_id;
       break;
@@ -213,6 +223,9 @@ function _processMessage(msg) {
       break;
 
     case 'result':
+      if (!_finalEntryEmittedThisTurn && _pendingFinalContent?.length > 0) {
+        _emitCompletedEntryFromStream();
+      }
       if (msg.session_id) _sessionId = msg.session_id;
       if (_onStreamingStatus) _onStreamingStatus(buildStreamingStatus(false));
       break;
@@ -281,6 +294,10 @@ function _processStreamEvent(event) {
       _pushStreamingEntry();
     }
   } else if (type === 'message_stop') {
+    if (_streamingContent.length > 0) {
+      _pendingFinalContent = [..._streamingContent];
+      _pendingFinalRequestMessages = [..._accumulatedMessages];
+    }
     _resetStreamingState();
   }
 }
@@ -336,6 +353,41 @@ function _resetStreamingState() {
   }
 }
 
+function _emitCompletedEntryFromStream() {
+  if (!_onEntry || !_pendingFinalContent?.length) return;
+
+  const requestMessages = _pendingFinalRequestMessages || [..._accumulatedMessages];
+  const content = _filterInteractiveContent(_pendingFinalContent);
+  const syntheticMsg = {
+    message: {
+      id: _streamingRequestId,
+      type: 'message',
+      role: 'assistant',
+      model: _model,
+      content,
+      stop_reason: 'end_turn',
+      usage: { input_tokens: 0, output_tokens: 0 },
+    },
+  };
+
+  const entry = sdkToJSONLEntry(syntheticMsg, requestMessages, _model, _projectName, {
+    timestamp: _turnTimestamp,
+    tools: _sdkTools,
+  });
+  _onEntry(entry);
+  _finalEntryEmittedThisTurn = true;
+
+  const lastMsg = _accumulatedMessages[_accumulatedMessages.length - 1];
+  if (lastMsg && lastMsg.role === 'assistant' && Array.isArray(lastMsg.content)) {
+    lastMsg.content = [...lastMsg.content, ...content];
+  } else {
+    _accumulatedMessages.push({ role: 'assistant', content });
+  }
+
+  _pendingFinalContent = null;
+  _pendingFinalRequestMessages = null;
+}
+
 /**
  * canUseTool callback — handles AskUserQuestion + permission approval.
  */
@@ -447,6 +499,9 @@ function _resetFullState() {
   _accumulatedMessages = [];
   _turnTimestamp = null;
   _messageQueue = [];
+  _pendingFinalContent = null;
+  _pendingFinalRequestMessages = null;
+  _finalEntryEmittedThisTurn = false;
   _resetStreamingState();
   _streamingRequestId = null;
   // Reject all pending approvals

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cx-viewer",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Codex Logger visualization management tool",
   "license": "MIT",
   "main": "server.js",

package/pty-manager.js

@@ -1,8 +1,8 @@
 import { resolveNativePath, BINARY_NAME } from './findcx.js';
 import { fileURLToPath } from 'node:url';
-import { join, dirname } from 'node:path';
-import { chmodSync, statSync } from 'node:fs';
-import { platform, arch } from 'node:os';
+import { join, dirname, basename } from 'node:path';
+import { chmodSync, statSync, mkdirSync, appendFileSync, readFileSync } from 'node:fs';
+import { platform, arch, homedir } from 'node:os';
 import { execSync } from 'node:child_process';
 
 const __filename = fileURLToPath(import.meta.url);
@@ -21,6 +21,16 @@ const MAX_BUFFER = 200000;
 let batchBuffer = '';
 let batchScheduled = false;
 let _ptyImportForTests = null;
+let outputHistoryPath = null;
+
+function ensureOutputHistory({ reset = false } = {}) {
+  const historyDir = join(homedir(), '.codex', 'cx-viewer', 'runtime');
+  mkdirSync(historyDir, { recursive: true });
+  if (reset || !outputHistoryPath) {
+    outputHistoryPath = join(historyDir, `terminal-history-${Date.now()}.log`);
+    appendFileSync(outputHistoryPath, '', 'utf8');
+  }
+}
 
 export function _setPtyImportForTests(fn) {
   _ptyImportForTests = fn;
@@ -78,6 +88,9 @@ function flushBatch() {
   if (!batchBuffer) return;
   const chunk = batchBuffer;
   batchBuffer = '';
+  if (outputHistoryPath) {
+    try { appendFileSync(outputHistoryPath, chunk, 'utf8'); } catch { }
+  }
   for (const cb of dataListeners) {
     try { cb(chunk); } catch { }
   }
@@ -187,6 +200,7 @@ export async function spawnCodex(proxyPort, cwd, extraArgs = [], codexPath = nul
 
   lastExitCode = null;
   outputBuffer = '';
+  ensureOutputHistory({ reset: true });
   currentWorkspacePath = cwd || process.cwd();
   lastWorkspacePath = currentWorkspacePath;
 
@@ -309,6 +323,7 @@ export async function spawnShell() {
 
   lastExitCode = null;
   currentWorkspacePath = cwd;
+  ensureOutputHistory();
 
   // Clean env: remove cx-viewer specific vars so child shells don't inherit them
   // (prevents CXVIEWER_PORT leaking to non-cx-viewer Codex instances)
@@ -403,5 +418,14 @@ export function getCurrentWorkspace() {
 }
 
 export function getOutputBuffer() {
+  if (outputHistoryPath) {
+    try {
+      return readFileSync(outputHistoryPath, 'utf8');
+    } catch { }
+  }
   return outputBuffer;
 }
+
+export function getOutputHistoryId() {
+  return outputHistoryPath ? basename(outputHistoryPath) : null;
+}