cc-viewer 1.9.8 → 1.9.10

package/server/lib/sdk-manager.js

@@ -30,7 +30,7 @@ import { ASK_TIMEOUT_MS } from './ask/ask-constants.js';
 import { withDefaultThinkingDisplay, resolveLaunchSystemPrompt, launchArgsToExtraArgs } from './launch-config.js';
 import { evaluateImDeny } from './im-deny.js';
 import { APPROVAL_TOOLS, isOverTrustDir, isPublishCommand } from './approval-policy.js';
-import { reportSwallowed } from '@ccv/core/error-report';
+import { reportSwallowed } from '../lib/error-report.js';
 import { resolve as _pathResolve, dirname as _pathDirname, sep as _pathSep } from 'node:path';
 import { createHash } from 'node:crypto';
 import { registerSdkSessionLister } from './sdk-session-index.js';
@@ -147,7 +147,7 @@ const MAX_QUEUE_ITEMS = 50;
 // Callbacks registered by cli.js (one wiring for the whole process; every session
 // reuses the same callbacks — they broadcast to the shared terminal WS).
 let _onTurnEnd = null; // SDK mode has no Stop hook (ensureHooks() skipped) — fire turnEnd directly when the SDK 'result' message arrives
-let _onQueryError = null; // query-level failure → (message: string) => void; cli.js forwards to a WS toast
+let _onQueryError = null; // query-level failure → (message: string, meta: {cwd, sessionId, instanceKey}) => void; cli.js forwards it as a scoped sdk-error WS frame (dialogue row + toast)
 let _broadcastWs = null;
 let _runWaterfallHook = null;
 
@@ -327,6 +327,13 @@ function _createSession(key, cwd) {
   let _sessionId = null;
   let _initAnnouncedSid = ''; // sessionId whose slash-command surface was already announced (reset on full reset)
   let _lastInitSnapshot = null; // last sdk-init payload for WS reconnect replay
+  // Last sdk-skills frame (supportedCommands() result) for WS reconnect replay, and the
+  // resident query it was loaded from (dedupes the once-per-query-generation fetch).
+  let _lastSkillsSnapshot = null;
+  let _skillsLoadedQuery = null;
+  // init 帧的 skills 白名单（name / plugin:skill / :suffix 形式），用于把 supportedCommands()
+  // 的全量命令面收敛为纯 skill 面；null = 该 init 帧未提供（不做过滤，保守放行）。
+  let _initSkills = null;
   // Last announced session state ('idle' | 'running' | 'requires_action' | null) — the
   // turn-level busy truth for the conversation spinner. Sources, most authoritative
   // first: CLI-emitted session_state_changed (gated behind CLAUDE_CODE_EMIT_SESSION_STATE_EVENTS,
@@ -690,6 +697,8 @@ function _createSession(key, cwd) {
     const inputQueue = _inputQueue;
     _activeQuery = null;
     _inputQueue = null;
+    _skillsLoadedQuery = null; // next resident query re-pulls supportedCommands() on init
+    _initSkills = null;        // re-captured from the next init frame
     _clearGraceTimer();
     _clearTurnWatchdog();
     _lateResultTombstones = 0;
@@ -701,10 +710,12 @@ function _createSession(key, cwd) {
     }
   }
 
-  /** Turn-level error toast (callback throw must never break the caller). */
+  /** Query-level error signal; the routing envelope always comes from this
+   * session's closure (callback throw must never break the caller). */
   function _notifyQueryError(err) {
     if (!_onQueryError) return;
-    try { _onQueryError(String(err?.message || err)); }
+    const context = { cwd: _cwd, sessionId: _sessionId || null, instanceKey };
+    try { _onQueryError(String(err?.message || err), context); }
     catch (cbErr) { console.warn('[sdk-manager] onQueryError threw:', cbErr?.message); }
   }
 
@@ -748,20 +759,33 @@ function _createSession(key, cwd) {
         // push/result fallbacks keep the spinner correct at result granularity.
         if (msg.subtype === 'session_state_changed') {
           _announceSessionState(msg.state);
-        } else if (msg.subtype === 'init' && _broadcastWs
-          && Array.isArray(msg.slash_commands) && msg.slash_commands.length > 0
-          && msg.session_id !== _initAnnouncedSid) {
-          _initAnnouncedSid = msg.session_id;
-          _lastInitSnapshot = {
-            type: 'sdk-init',
-            sessionId: msg.session_id,
-            model: msg.model,
-            slashCommands: msg.slash_commands,
-            tools: msg.tools,
-            cwd: _cwd,
-            instanceKey,
-          };
-          _broadcastWs(_lastInitSnapshot);
+        } else if (msg.subtype === 'init') {
+          if (_broadcastWs && Array.isArray(msg.slash_commands) && msg.slash_commands.length > 0
+            && msg.session_id !== _initAnnouncedSid) {
+            _initAnnouncedSid = msg.session_id;
+            _lastInitSnapshot = {
+              type: 'sdk-init',
+              sessionId: msg.session_id,
+              model: msg.model,
+              slashCommands: msg.slash_commands,
+              tools: msg.tools,
+              cwd: _cwd,
+              instanceKey,
+            };
+            _broadcastWs(_lastInitSnapshot);
+          }
+          // Skill menu surface: pull the full supportedCommands() (name + description +
+          // argumentHint) once per resident-query generation. Done even when slash_commands
+          // is empty/absent — a session with no TUI commands can still expose skills.
+          // supportedCommands() returns the whole command surface (incl. /clear, /compact,
+          // /model, /usage), so keep ONLY real skills: intersect with the init frame's
+          // `skills` allowlist (name / plugin:skill / :suffix forms) to honour the
+          // "slash menu indexes skills only" decision.
+          if (_broadcastWs && _activeQuery && _skillsLoadedQuery !== _activeQuery) {
+            _skillsLoadedQuery = _activeQuery;
+            _initSkills = Array.isArray(msg.skills) ? msg.skills : null;
+            _loadSupportedCommands();
+          }
         } else if (msg.subtype === 'compact_boundary' && _broadcastWs) {
           const meta = msg.compact_metadata;
           _broadcastWs({
@@ -861,7 +885,8 @@ function _createSession(key, cwd) {
 
   /**
    * Surface a failed turn to the Web UI — the wire path persists the failed entry but
-   * never pushes a toast, so a dead/errored turn would otherwise look like a hang.
+   * never signals it, so a dead/errored turn would otherwise look like a hang. The
+   * sdk-error frame renders as a persistent dialogue row plus a toast client-side.
    */
   function _notifyTurnError(resultMsg) {
     const isError = resultMsg.is_error === true || (resultMsg.subtype && resultMsg.subtype !== 'success');
@@ -953,6 +978,58 @@ function _createSession(key, cwd) {
     }
   }
 
+  /**
+   * Pull the SDK's supportedCommands() (skill surface: name + description + argumentHint)
+   * once per resident-query generation and broadcast it as an `sdk-skills` frame, retained
+   * for WS reconnect replay. Fire-and-forget from the init branch — never awaited. Bounded
+   * by CTX_USAGE_TIMEOUT_MS; on timeout/rejection/stale generation it reports and broadcasts
+   * nothing (clients fall back to /api/skills). Raw commands are passed through; the web
+   * client's normalizeSdkCommands does the safe-name filtering.
+   */
+  function _loadSupportedCommands() {
+    const q = _activeQuery;
+    if (!q || typeof q.supportedCommands !== 'function') return;
+    let timeoutId;
+    const timeout = new Promise((_, reject) => {
+      timeoutId = setTimeout(() => reject(new Error('supportedCommands timeout')), CTX_USAGE_TIMEOUT_MS);
+      if (timeoutId.unref) timeoutId.unref();
+    });
+    Promise.race([Promise.resolve().then(() => q.supportedCommands()), timeout]).then((commands) => {
+      if (_activeQuery !== q) return; // stale generation (session switch/death) — drop
+      // Keep only real skills: supportedCommands() also returns TUI built-ins (/clear,
+      // /compact, /model, /usage). When the init frame supplied a skills allowlist, filter
+      // by it (name, plugin:skill, or :suffix). No allowlist → pass through (conservative).
+      let filtered = Array.isArray(commands) ? commands : [];
+      if (Array.isArray(_initSkills) && _initSkills.length > 0) {
+        const allow = new Set();
+        for (const s of _initSkills) {
+          if (typeof s !== 'string' || !s) continue;
+          allow.add(s);                       // exact (name or plugin:skill)
+          const idx = s.lastIndexOf(':');
+          if (idx >= 0) allow.add(s.slice(idx + 1)); // :suffix form → bare name
+        }
+        filtered = filtered.filter(c => c && (allow.has(c.name)
+          || (typeof c.name === 'string' && allow.has(c.name.replace(/^plugin.*:/, '')))));
+      }
+      _lastSkillsSnapshot = {
+        type: 'sdk-skills',
+        sessionId: _sessionId || null,
+        ts: Date.now(),
+        cwd: _cwd,
+        instanceKey,
+        commands: filtered,
+      };
+      if (_broadcastWs) {
+        try { _broadcastWs(_lastSkillsSnapshot); }
+        catch (err) { reportSwallowed('sdk-manager.skills-broadcast', err); }
+      }
+    }).catch((err) => {
+      reportSwallowed('sdk-manager.supported-commands', err);
+    }).finally(() => {
+      if (timeoutId) clearTimeout(timeoutId);
+    });
+  }
+
   /**
    * Collect an MCP-server-status snapshot via the Query control surface (`mcp_status`).
    * Returns { ok:true, snapshot } | { ok:false, reason:'session-inactive'|'control-failed' }.
@@ -1464,6 +1541,7 @@ function _createSession(key, cwd) {
       _launchResume = null;
       _initAnnouncedSid = '';
       _lastInitSnapshot = null; // don't replay the OLD session's sdk-init to the new one
+      _lastSkillsSnapshot = null; // same for the skill surface
       _lastSessionState = null; // same for the session-state snapshot — new session starts idle
       _clearContextUsage('session-switched');
       _clearMcpStatus('session-switched');
@@ -1485,6 +1563,7 @@ function _createSession(key, cwd) {
     _turnInFlight = false;
     _initAnnouncedSid = '';
     _lastInitSnapshot = null;
+    _lastSkillsSnapshot = null;
     // Tell clients BEFORE nulling the snapshot: a re-init/launch mid-turn would
     // otherwise leave the spinner lit with no frame ever clearing it (the new
     // session starts idle and the state-change guard would swallow the first
@@ -1546,6 +1625,7 @@ function _createSession(key, cwd) {
     },
     getContextUsageSnapshot: () => _lastContextUsage,
     getMcpStatusSnapshot: () => _lastMcpStatus,
+    getSkillsSnapshot: () => _lastSkillsSnapshot,
     fetchContextUsage: async () => {
       // On-demand fetch for the HTTP route: refresh the snapshot, broadcast to all clients,
       // then reply. Unlike _refreshContextUsage this bypasses the in-flight gate (an explicit
@@ -1597,9 +1677,9 @@ export function isSdkAvailable() {
  * @param {string} projectName
  * @param {object} deps
  * @param {function} deps.onTurnEnd — ({sessionId, ts}) => void, fired on SDK 'result'
- * @param {function} [deps.onQueryError] — (message: string) => void, fired when the
- *   query itself fails (spawn/protocol/iterator errors) — until this existed the only
- *   surfacing was console.error, invisible in the Web UI
+ * @param {function} [deps.onQueryError] — (message: string, meta: {cwd, sessionId, instanceKey}) => void,
+ *   fired when the query itself fails (spawn/protocol/iterator errors); meta carries the session's
+ *   routing envelope so the sdk-error frame scopes to the owning workspace's viewers
  * @param {function} deps.broadcastWs — (msg) => void, terminal-WS broadcast for approvals
  * @param {string} [deps.permissionMode]
  * @param {function} [deps.runWaterfallHook] — plugin waterfall (onPlanRequest/onAskRequest/onPermRequest)
@@ -1650,7 +1730,11 @@ export async function sendUserMessage(text, anchor) {
       console.warn(`[sdk-manager] no SDK session registered for "${targetName}" — message dropped`);
       reportSwallowed('sdk-manager.route', new Error(`no SDK session for ${targetName}`));
       if (_onQueryError) {
-        try { _onQueryError(`Workspace "${targetName}" is no longer available — message not sent.`); }
+        // Module-level fallback has no session closure. Anchors never carry cwd
+        // (server.js builds {project, instanceKey} only) — pass the project key so
+        // broadcastWsMessage can scope the frame; instanceKey narrows further when present.
+        const meta = { cwd: anchor.cwd || null, sessionId: null, instanceKey: anchor.instanceKey || null, project: anchor.project || null };
+        try { _onQueryError(`Workspace "${targetName}" is no longer available — message not sent.`, meta); }
         catch (err) { console.warn('[sdk-manager] onQueryError threw:', err?.message); }
       }
       return;
@@ -1900,6 +1984,16 @@ export function getSdkInitSnapshot(anchor) {
   return sess ? sess.getSdkInitSnapshot() : null;
 }
 
+/**
+ * Last sdk-skills frame (supportedCommands() result) for WS reconnect replay. Null until
+ * the first init-driven pull resolves; an absent frame leaves the client on its /api/skills
+ * fallback. No anchor → active session.
+ */
+export function getSkillsSnapshot(anchor) {
+  const sess = anchor ? _sessionForAnchor(anchor) : _active();
+  return sess ? sess.getSkillsSnapshot() : null;
+}
+
 /**
  * Last announced session-state frame for WS reconnect replay (sdk-init snapshot
  * parity). Null until the first state transition — a fresh session is idle, and an

package/server/lib/sdk-session-index.js

@@ -1,6 +1,6 @@
 // Synchronous read-only projection of the SDK session registry. Generic view
 // routing must not import sdk-manager (and eagerly load the Agent SDK) in PTY mode.
-import { reportSwallowed } from '@ccv/core/error-report';
+import { reportSwallowed } from '../lib/error-report.js';
 
 let _listSessions = null;
 

package/server/lib/stats-worker.js

@@ -10,7 +10,7 @@ import { join, basename } from 'node:path';
 import { readJsonlTolerant, listSessionIds } from './v2/replay.js';
 import { dirSizeSync } from './v2/layout.js';
 import { isDiscardableSession } from './v2/session-select.js';
-import { reportSwallowed } from '@ccv/core/error-report';
+import { reportSwallowed } from '../lib/error-report.js';
 import {
   INTER_SESSION_TYPES, isSystemText, extractUserTexts, isSuggestionMode,
   collectPromptsFromEvents, sortEpochFiles,

package/server/lib/system-prompt-files.js

@@ -3,7 +3,7 @@ import { join } from 'node:path';
 import { MODEL_PROMPT_DIR, matchModelPrompt } from './model-system-prompts.js';
 import { isBuiltinDisabled, matchBuiltinModelPrompt, materializeBuiltinPrompt } from './builtin-model-prompts.js';
 import { isNonEmptyFile } from './file-api.js';
-import { reportSwallowed } from '@ccv/core/error-report';
+import { reportSwallowed } from '../lib/error-report.js';
 
 // isNonEmptyFile lives in file-api.js (shared leaf, cycle break:
 // model-system-prompts.js must not import this module). Re-exported here so

package/server/lib/system-prompt-live.js

@@ -19,7 +19,7 @@
 import { existsSync, readFileSync, writeFileSync, mkdirSync, unlinkSync, readdirSync, statSync } from 'node:fs';
 import { join } from 'node:path';
 import { randomBytes } from 'node:crypto';
-import { reportSwallowed } from '@ccv/core/error-report';
+import { reportSwallowed } from '../lib/error-report.js';
 import { LOG_DIR } from '../../findcc.js';
 import { renameSyncWithRetry } from './file-api.js';
 import { matchModelPrompt, MODEL_PROMPT_DIR, readModelPrompt } from './model-system-prompts.js';

package/server/lib/system-prompt-snapshots.js

@@ -33,7 +33,7 @@
 import { existsSync, readFileSync, writeFileSync, mkdirSync, unlinkSync, readdirSync, statSync, realpathSync, openSync, readSync, closeSync } from 'node:fs';
 import { join, basename, dirname } from 'node:path';
 import { randomBytes } from 'node:crypto';
-import { reportSwallowed } from '@ccv/core/error-report';
+import { reportSwallowed } from '../lib/error-report.js';
 import { LOG_DIR, getClaudeConfigDir } from '../../findcc.js';
 import { renameSyncWithRetry } from './file-api.js';
 

package/server/lib/v2/adapter.js

@@ -29,7 +29,7 @@
 
 import { existsSync, readdirSync, readFileSync, statSync } from 'node:fs';
 import { join, dirname, basename } from 'node:path';
-import { reportSwallowed } from '@ccv/core/error-report';
+import { reportSwallowed } from '../../lib/error-report.js';
 import { isMainAgentRequest } from '../interceptor-core.js';
 import { readSession } from './replay.js';
 import { iterateJsonlLines } from './jsonl-read.js';

package/server/lib/v2/convert.js

@@ -28,7 +28,7 @@ import { join, basename } from 'node:path';
 import { iterateRawEntriesAsync } from '../log-stream.js';
 import { createIncrementalReconstructor } from '@ccv/core/delta-reconstructor';
 import { isLogFileName, parseLogTs } from '../log-file-utils.js';
-import { reportSwallowed } from '@ccv/core/error-report';
+import { reportSwallowed } from '../../lib/error-report.js';
 import { V2Writer } from './v2-writer.js';
 import { verifyV1File } from './verify.js';
 import { parseUserId } from './identity.js';

package/server/lib/v2/jsonl-read.js

@@ -14,7 +14,7 @@
 // mirroring readJsonlTolerant's torn-tail tolerance (spec §14).
 
 import { existsSync, openSync, readSync, closeSync, statSync } from 'node:fs';
-import { reportSwallowed } from '@ccv/core/error-report';
+import { reportSwallowed } from '../../lib/error-report.js';
 
 const DEFAULT_CHUNK_BYTES = 8 * 1024 * 1024;
 // Node's max string length is 0x1fffffe8 (~512MiB) — a line this long can

package/server/lib/v2/live-feed.js

@@ -24,7 +24,7 @@
 
 import { watch, existsSync, readdirSync, readFileSync, statSync, openSync, readSync, closeSync } from 'node:fs';
 import { join } from 'node:path';
-import { reportSwallowed } from '@ccv/core/error-report';
+import { reportSwallowed } from '../../lib/error-report.js';
 import { createIncrementalReconstructor } from '@ccv/core/delta-reconstructor';
 import { processWatchedEntry, sendEventToClients, sendEventRawToClients } from '../log-watcher.js';
 import { filterClientsByInstance } from './view-router.js';

package/server/lib/v2/meta-rows.js

@@ -21,7 +21,7 @@ import { readJsonlTolerant } from './replay.js';
 import { iterateJsonlLines } from './jsonl-read.js';
 import { iterateV2Items, findTeammateSessionDirs } from './adapter.js';
 import { SingleFlight } from './singleflight.js';
-import { reportSwallowed } from '@ccv/core/error-report';
+import { reportSwallowed } from '../../lib/error-report.js';
 import { classifyRequest, withAgentNameSubType } from '@ccv/core/requestType';
 
 // KEEP IN SYNC: server/lib/v2/adapter.js itemKey — (sessionId, seq) identity.

package/server/lib/v2/resume-list.js

@@ -25,7 +25,7 @@ import { summarizeSessionPage } from './session-list.js';
 import { sessionHasMainOrTeammateReq } from './session-select.js';
 import { readPin } from '../session-pin-store.js';
 import { LIVE_SESSION_MTIME_MS } from '../log-file-utils.js';
-import { reportSwallowed } from '@ccv/core/error-report';
+import { reportSwallowed } from '../../lib/error-report.js';
 
 /**
  * Liveness heuristic for the "running" placeholder column. A session is

package/server/lib/v2/session-list.js

@@ -26,7 +26,7 @@ import { listSessionIds, readJsonlTolerant } from './replay.js';
 import { readPromptsHead, collectPromptsFromEvents } from '../user-prompt-extract.js';
 import { isDiscardableSession } from './session-select.js';
 import { isSupportedWireFormat, dirSizeSync } from './layout.js';
-import { reportSwallowed } from '@ccv/core/error-report';
+import { reportSwallowed } from '../../lib/error-report.js';
 
 const MAX_PROJECTS = 32;
 

package/server/lib/v2/session-owner.js

@@ -26,7 +26,7 @@
 import { readFileSync, writeFileSync, unlinkSync, existsSync } from 'node:fs';
 import { join } from 'node:path';
 import { isPidAlive } from '../pid-alive.js';
-import { reportSwallowed } from '@ccv/core/error-report';
+import { reportSwallowed } from '../../lib/error-report.js';
 
 export const OWNER_LOCK_NAME = 'owner.lock';
 

package/server/lib/v2/v2-writer.js

@@ -19,7 +19,7 @@
 import { statfsSync, existsSync, readdirSync, readFileSync } from 'node:fs';
 import { join, basename, sep } from 'node:path';
 import { AsyncWriteQueue } from '../async-write-queue.js';
-import { reportSwallowed } from '@ccv/core/error-report';
+import { reportSwallowed } from '../../lib/error-report.js';
 import { ensureSessionDirSync, compactLocalTs14, sanitizePathComponent, normalizeSessionCwd } from './layout.js';
 import { resolveSessionDirName, latestMainSession } from './session-select.js';
 import { acquireSessionClaim, releaseSessionClaim, isForeignLiveOwned } from './session-owner.js';

package/server/lib/wire-compress.js

@@ -19,7 +19,7 @@
  * knee on large sessions; q5 collapses to ~2.5x there).
  */
 import zlib from 'node:zlib';
-import { reportSwallowed } from '@ccv/core/error-report';
+import { reportSwallowed } from '../lib/error-report.js';
 import { awaitDrainOrClose } from './sse-backpressure.js';
 
 const C = zlib.constants;

package/server/lib/ws-mux.js

@@ -42,7 +42,7 @@
  */
 import { randomBytes } from 'node:crypto';
 import { EventEmitter } from 'node:events';
-import { reportSwallowed as defaultReport } from '@ccv/core/error-report';
+import { reportSwallowed as defaultReport } from '../lib/error-report.js';
 import { createBackpressureGate } from './ws-backpressure.js';
 
 const STREAM_ID_RE = /^[A-Za-z0-9_-]{1,64}$/;

package/server/proxy.js

@@ -13,7 +13,7 @@ import { parseAgentId, findHeader } from './lib/v2/agent-id.js';
 import { liveSystemPromptEnabled } from './lib/system-prompt-live.js';
 import { executeRequest, extractModel } from './lib/proxy/proxy-retry.js';
 import { buildRecord, appendRecord, dailyFilePath, todayStr, emitProxyStatsUpdate } from './lib/proxy/proxy-stats.js';
-import { reportSwallowed } from '@ccv/core/error-report';
+import { reportSwallowed } from './lib/error-report.js';
 import { LOG_DIR } from '../findcc.js';
 
 // Setup interceptor to patch fetch

package/server/pty-manager.js

@@ -17,7 +17,7 @@ import { randomBytes } from 'node:crypto';
 // (shared with the SDK link). Re-exported here for existing consumers/tests.
 import { withDefaultThinkingDisplay, resolveLaunchSystemPrompt, insertBeforeDashDash } from './lib/launch-config.js';
 export { withDefaultThinkingDisplay } from './lib/launch-config.js';
-import { reportSwallowed } from '@ccv/core/error-report';
+import { reportSwallowed } from './lib/error-report.js';
 import { t, tFor } from './i18n.js';
 
 const __filename = fileURLToPath(import.meta.url);

package/server/routes/ask-perm.js

@@ -6,7 +6,7 @@ import { filterClientsByScope } from '../lib/v2/view-router.js';
 import { _projectName } from '../interceptor.js';
 import { readPrefsRaw } from '../lib/prefs-store.js';
 import { getCurrentProjectKey, hasFork, resolveScoped } from '../lib/project-prefs.js';
-import { reportSwallowed } from '@ccv/core/error-report';
+import { reportSwallowed } from '../lib/error-report.js';
 
 function pendingAsks(req, res, parsedUrl, isLocal, deps) {
   try {

package/server/routes/events.js

@@ -5,7 +5,7 @@ import { _projectName, getLiveLogSource, isContinuedLaunch } from '../intercepto
 import { LOG_DIR } from '../../findcc.js';
 import { streamRawEntriesAsync } from '../lib/log-stream.js';
 import { migrationStatus } from '../lib/v2/migrate-prompt.js';
-import { reportSwallowed } from '@ccv/core/error-report';
+import { reportSwallowed } from '../lib/error-report.js';
 import { sseHead, sseWrite, needsDrain, wireEnd, awaitWireDrain, isWireV3Enabled } from '../lib/wire-compress.js';
 import { scopeKeyForProducer } from '../lib/scope-router.js';
 import { readV2ColdBundle } from '../lib/v2/meta-rows.js';

package/server/routes/expert.js

@@ -19,7 +19,7 @@ import {
   matchBuiltinModelPrompt, isBuiltinDisabled,
   readBuiltinDisabled, setBuiltinDisabled, listBuiltinModelPrompts,
 } from '../lib/builtin-model-prompts.js';
-import { reportSwallowed } from '@ccv/core/error-report';
+import { reportSwallowed } from '../lib/error-report.js';
 import { resolveSpawnModel } from '../lib/spawn-model-resolver.js';
 import { listSystemPromptPresets, groupPresetsByCategory, getSystemPromptVariablesDoc } from '../lib/system-prompt-presets.js';
 import { LOG_DIR } from '../../findcc.js';

package/server/routes/files-content.js

@@ -6,7 +6,7 @@ import { ERROR_STATUS_MAP } from '../lib/file-api.js';
 import { viewRootOrReply } from '../lib/view-root.js';
 import { loadWorkspaces } from '../workspace-registry.js';
 import { listLivePtys } from '../pty-manager.js';
-import { reportSwallowed } from '@ccv/core/error-report';
+import { reportSwallowed } from '../lib/error-report.js';
 import { discoverClaudeMdCandidates, readCandidateById } from '../lib/claude-md-discovery.js';
 import { getClaudeConfigDir } from '../../findcc.js';
 import { _projectName } from '../interceptor.js';

package/server/routes/files-fs.js

@@ -125,8 +125,10 @@ function importFile(req, res, parsedUrl, isLocal, deps) {
     res.end(JSON.stringify({ error: 'Missing boundary' }));
     return;
   }
-  const importUrl = new URL(req.url, `${deps.protocol}://${req.headers.host}`);
-  const dir = importUrl.searchParams.get('dir') || '';
+  // Reuse the parsedUrl that handleRequest already validated: req.headers.host may be a
+  // malformed value llhttp accepts but URL parsing rejects, and a fresh new URL() here
+  // would throw synchronously inside dispatch → unhandled rejection.
+  const dir = parsedUrl.searchParams.get('dir') || '';
   // 在 mkdirSync 之前纯字符串校验，防 symlink 副作用目录被创建在项目外
   const dirCheck = validateImportDir(dir);
   if (!dirCheck.ok) {

package/server/routes/misc.js

@@ -2,6 +2,8 @@
 import { getUserProfile } from '../lib/user-profile.js';
 import { runWaterfallHook } from '../lib/plugin-loader.js';
 import { normalizeBasePath } from '../lib/base-path.js';
+import { isAdminReq } from '../lib/is-admin.js';
+import { isSameOriginBrowserRequest } from '../lib/same-origin.js';
 
 async function userProfile(req, res) {
   const profile = await getUserProfile();
@@ -10,6 +12,15 @@ async function userProfile(req, res) {
 }
 
 async function localUrl(req, res, parsedUrl, isLocal, deps) {
+  // The response embeds the full ACCESS_TOKEN. Without this gate the permissive global
+  // CORS prelude would let any cross-site page read the token from a loopback server
+  // (loopback skips auth) and then bypass every Origin/admin check end-to-end.
+  // CLI/native clients (no Origin header) and same-origin admin pages stay allowed.
+  if (!isAdminReq(req, isLocal) || !isSameOriginBrowserRequest(req, parsedUrl)) {
+    res.writeHead(403, { 'Content-Type': 'application/json' });
+    res.end(JSON.stringify({ error: 'Forbidden: admin and same-origin required' }));
+    return;
+  }
   const localIp = deps.getLocalIp();
   // 反代子路径部署时分享/二维码 URL 也要带前缀，否则扫码绕过代理直连源站端口（与
   // server.startedNetwork 启动打印保持一致）。未设 CCV_BASE_PATH 时为空串，行为不变。

package/server/routes/plugin-services.js

@@ -0,0 +1,104 @@
+// Routes for service-plugin proxies (/plugins/<name>/*) and panel bundles
+// (/plugin-panels/<name>/*). Registered in server.js's _routes after pluginsRoutes.
+// Unknown plugin names return 404 here — requests must NOT fall through to the SPA
+// fallback (it would serve index.html as JS/JSON).
+import { getPluginEntries } from '../lib/plugin-loader.js';
+import { tryProxyHttp } from '../lib/plugin-runtime.js';
+import { servePanelFile } from '../lib/plugin-panels.js';
+import { reportSwallowed } from '../lib/error-report.js';
+import { isSameOriginBrowserRequest } from '../lib/same-origin.js';
+
+function findPanelEntry(name) {
+  for (const entry of getPluginEntries()) {
+    if (entry.shape === 'dir' && entry.enabled && !entry.loadError && entry.panel && entry.name === name) {
+      return entry;
+    }
+  }
+  return null;
+}
+
+function pluginProxyHandler(req, res, parsedUrl) {
+  try {
+    // Plugin services are same-machine capabilities reachable through the main origin.
+    // A cross-site browser page must not drive them just because loopback trusts the
+    // socket peer; CLI/native callers (no Origin) and same-origin pages pass.
+    if (!isSameOriginBrowserRequest(req, parsedUrl)) {
+      res.writeHead(403, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify({ error: 'Forbidden: cross-site plugin proxy request' }));
+      return;
+    }
+    const handled = tryProxyHttp(req, res, parsedUrl);
+    if (!handled) {
+      res.writeHead(404, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify({ error: 'unknown plugin service' }));
+    }
+  } catch (err) {
+    reportSwallowed('plugin-services.proxy-route', err);
+    try {
+      if (!res.headersSent) {
+        res.writeHead(502, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ error: 'plugin proxy failure' }));
+      } else {
+        res.destroy();
+      }
+    } catch { /* noop */ }
+  }
+}
+
+function pluginPanelHandler(req, res, parsedUrl) {
+  try {
+    if (req.method !== 'GET' && req.method !== 'HEAD') {
+      res.writeHead(405, { 'Content-Type': 'text/plain; charset=utf-8' });
+      res.end('method not allowed');
+      return;
+    }
+    // /plugin-panels/<name>/<rel...>
+    const rest = parsedUrl.pathname.slice('/plugin-panels/'.length);
+    const slash = rest.indexOf('/');
+    const name = slash === -1 ? rest : rest.slice(0, slash);
+    const relPath = slash === -1 ? '' : rest.slice(slash + 1);
+    let decodedName;
+    try {
+      decodedName = decodeURIComponent(name);
+    } catch {
+      res.writeHead(400, { 'Content-Type': 'text/plain; charset=utf-8' });
+      res.end('bad plugin name');
+      return;
+    }
+    const entry = findPanelEntry(decodedName);
+    if (!entry) {
+      res.writeHead(404, { 'Content-Type': 'text/plain; charset=utf-8' });
+      res.end('unknown plugin panel');
+      return;
+    }
+    if (!relPath) {
+      // Bare directory path -> entry bundle (relative rootDir = drop the first segment of entryRel)
+      const entryRel = entry.panel.entryRel;
+      const rel = entryRel.slice(entryRel.indexOf('/') + 1);
+      servePanelFile(req, res, entry, rel);
+      return;
+    }
+    servePanelFile(req, res, entry, relPath);
+  } catch (err) {
+    reportSwallowed('plugin-services.panel-route', err);
+    try {
+      if (!res.headersSent) {
+        res.writeHead(500, { 'Content-Type': 'text/plain; charset=utf-8' });
+        res.end('panel route failure');
+      } else {
+        res.destroy();
+      }
+    } catch { /* noop */ }
+  }
+}
+
+export const pluginServicesRoutes = [
+  {
+    predicate: (url) => url === '/plugins' || url.startsWith('/plugins/'),
+    handler: pluginProxyHandler,
+  },
+  {
+    predicate: (url) => url === '/plugin-panels' || url.startsWith('/plugin-panels/'),
+    handler: pluginPanelHandler,
+  },
+];