cc-viewer 1.9.4 → 1.9.6

package/server/lib/v2/view-router.js

@@ -38,6 +38,54 @@ export function filterClientsByViewProject(clientList, project, boundProject) {
   return clientList.filter((c) => c && ((c._ccvViewProject || bound) === project));
 }
 
+/**
+ * Instance-narrowed variant of filterClientsByViewProject (multi-instance,
+ * 2026-10-06 rule lifted from live-feed._clientsForInstance): a frame stamped
+ * with an instance is visible to every viewer of the project EXCEPT clients
+ * stamped with a DIFFERENT instance. Unset on either side ⇒ visible (a client
+ * with no `_ccvViewInstance` stamp sees every instance; a frame with no
+ * instance reaches all of the project's viewers).
+ *
+ * @param {Array} clientList - SSE response objects.
+ * @param {string} project - the frame's project ('' ⇒ bound).
+ * @param {string|null} instance - the frame's instance, when known.
+ * @param {string} boundProject - the server's bound project.
+ * @returns {Array} the subset of clients that should receive the frame.
+ */
+export function filterClientsByScope(clientList, project, instance, boundProject) {
+  // Composition over duplication: project half, then the shared instance rule —
+  // the two can never drift apart.
+  return filterClientsByInstance(filterClientsByViewProject(clientList, project, boundProject), instance);
+}
+
+/**
+ * Instance-only narrowing over an ALREADY project-filtered client list — the
+ * live-feed composes its own project filter (`opts.clientFilter`, which may be
+ * a server-supplied closure rather than the pure predicate) with this rule.
+ * Same semantics as the instance half of filterClientsByScope: unset on either
+ * side ⇒ visible; nobody instance-stamped ⇒ the input array (same reference).
+ *
+ * @param {Array} clientList - already project-filtered SSE responses.
+ * @param {string|null} instance - the frame's instance, when known.
+ * @returns {Array}
+ */
+export function filterClientsByInstance(clientList, instance) {
+  if (!instance) return clientList;
+  // Exclude ONLY clients explicitly stamped with a DIFFERENT instance. An
+  // UNSTAMPED (project-level) viewer of the same project must also receive the
+  // frame: if an earlier `active:true` frame reached it while no instance viewer
+  // was online, the matching `active:false` must reach it too or its spinner
+  // never clears (the clear would be narrowed away the moment a parallel
+  // instance chip connects). Keeping active/clear on the SAME recipient set
+  // avoids that split delivery.
+  // Fast path: nobody is excluded (no differently-stamped client) ⇒ return the
+  // SAME array reference (no filter alloc), preserving legacy identity.
+  let anyExcluded = false;
+  for (const c of clientList) { if (c && c._ccvViewInstance && c._ccvViewInstance !== instance) { anyExcluded = true; break; } }
+  if (!anyExcluded) return clientList;
+  return clientList.filter((c) => !c || !c._ccvViewInstance || c._ccvViewInstance === instance);
+}
+
 /**
  * Extract the owning project dir name from a session dir path of the form
  * `<LOG_DIR>/<projectSan>/sessions/<dirName>`. Returns the on-disk `<projectSan>`

package/server/lib/view-root.js

@@ -26,6 +26,7 @@
 
 import { realpathSync, existsSync, statSync } from 'node:fs';
 import { projectKeyForCwd } from './system-prompt-snapshots.js';
+import { listSdkSessionInstances } from './sdk-session-index.js';
 
 // A project name must be sanitizer-stable: projectKeyForCwd maps every legal
 // basename to [a-zA-Z0-9_\-\.] (collapsing only ALL-dot degenerate names to
@@ -49,11 +50,13 @@ function isValidProjectName(name) {
  * @param {string} opts.boundCwd - the bound project root (CCV_PROJECT_DIR || process.cwd()).
  * @param {() => Array<{path:string, projectName:string}>} opts.loadWorkspaces - registry reader.
  * @param {() => Array<{cwd:string, instanceKey?:string}>} opts.listLivePtys - live PTY records.
- * @returns {{ ok:true, root:string, via:'bound'|'registry'|'live'|'live-instance' } | { ok:false, status:number, error:string }}
+ * @returns {{ ok:true, root:string, projectName:string, via:'bound'|'registry'|'live'|'live-instance' } | { ok:false, status:number, error:string }}
+ *   `root` is the realpath'd real dir; `projectName` is the RAW-path store key
+ *   (basename of the matched candidate BEFORE realpath) — the wire/log-store name.
+ *   They differ for a leaf-symlinked workspace, and the store is keyed by the raw name.
  */
-export function resolveViewRoot({ projectParam, instanceParam, boundCwd, loadWorkspaces, listLivePtys } = {}) {
-  const bound = boundCwd || process.cwd();
-  // Multi-instance (2026-10-06): `instance` is the per-spawn instanceKey, the
+export function resolveViewRoot({ projectParam, instanceParam, boundCwd, loadWorkspaces, listLivePtys, listSdkSessions = listSdkSessionInstances } = {}) {
+  const bound = boundCwd || process.cwd();// Multi-instance (2026-10-06): `instance` is the per-spawn instanceKey, the
   // authoritative disambiguator when two same-basename projects run at once —
   // the name path below would 400 on that pair as "ambiguous". Resolve it FIRST
   // (before the empty-name bound short-circuit AND name validation): a valid live
@@ -67,13 +70,21 @@ export function resolveViewRoot({ projectParam, instanceParam, boundCwd, loadWor
       const rec = (listLivePtys() || []).find((p) => p && p.instanceKey === instance);
       if (rec && typeof rec.cwd === 'string' && rec.cwd) {
         if (existsSync(rec.cwd) && statSync(rec.cwd).isDirectory()) {
-          return { ok: true, root: realpathSync(rec.cwd), via: 'live-instance' };
+          return { ok: true, root: realpathSync(rec.cwd), projectName: projectKeyForCwd(rec.cwd), via: 'live-instance' };
         }
       }
     } catch { /* pty map unavailable / fs race → fall through to name path */ }
+    try {
+      const rec = (listSdkSessions() || []).find((s) => s && s.instanceKey === instance);
+      if (rec && typeof rec.cwd === 'string' && rec.cwd) {
+        if (existsSync(rec.cwd) && statSync(rec.cwd).isDirectory()) {
+          return { ok: true, root: realpathSync(rec.cwd), projectName: projectKeyForCwd(rec.cwd), via: 'live-instance' };
+        }
+      }
+    } catch { /* SDK registry unavailable / fs race → fall through to name path */ }
   }
   const name = (typeof projectParam === 'string' && projectParam) || '';
-  if (!name) return { ok: true, root: bound, via: 'bound' };
+  if (!name) return { ok: true, root: bound, projectName: projectKeyForCwd(bound), via: 'bound' };
   if (!isValidProjectName(name)) {
     return { ok: false, status: 400, error: 'invalid project name' };
   }
@@ -103,6 +114,14 @@ export function resolveViewRoot({ projectParam, instanceParam, boundCwd, loadWor
       }
     }
   } catch { /* pty map unavailable → registry-only */ }
+  try {
+    for (const s of listSdkSessions() || []) {
+      const cwd = s && s.cwd;
+      if (typeof cwd === 'string' && cwd && projectKeyForCwd(cwd) === name) {
+        candidates.push({ path: cwd, via: 'live' });
+      }
+    }
+  } catch { /* SDK registry unavailable → PTY/registry-only */ }
 
   // Dedupe by path string (a project live AND registered under the SAME path
   // is one candidate). Keys are the raw candidate paths — not realpathSync —
@@ -132,7 +151,7 @@ export function resolveViewRoot({ projectParam, instanceParam, boundCwd, loadWor
         if (!existsSync(root) || !statSync(root).isDirectory()) {
           return { ok: false, status: 404, error: 'project dir missing' };
         }
-        return { ok: true, root: realpathSync(root), via: 'live' };
+        return { ok: true, root: realpathSync(root), projectName: projectKeyForCwd(root), via: 'live' };
       } catch {
         return { ok: false, status: 404, error: 'project dir unreadable' };
       }
@@ -156,7 +175,7 @@ export function resolveViewRoot({ projectParam, instanceParam, boundCwd, loadWor
     }
     const root = alive[0].path;
     try {
-      return { ok: true, root: realpathSync(root), via: alive[0].via };
+      return { ok: true, root: realpathSync(root), projectName: projectKeyForCwd(root), via: alive[0].via };
     } catch {
       return { ok: false, status: 404, error: 'project dir unreadable' };
     }
@@ -166,7 +185,7 @@ export function resolveViewRoot({ projectParam, instanceParam, boundCwd, loadWor
     if (!existsSync(root) || !statSync(root).isDirectory()) {
       return { ok: false, status: 404, error: 'project dir missing' };
     }
-    return { ok: true, root: realpathSync(root), via: uniq[0].via };
+    return { ok: true, root: realpathSync(root), projectName: projectKeyForCwd(root), via: uniq[0].via };
   } catch {
     return { ok: false, status: 404, error: 'project dir unreadable' };
   }
@@ -192,13 +211,14 @@ export function resolveViewRoot({ projectParam, instanceParam, boundCwd, loadWor
  * @param {string} [opts.bodyInstance] - POST-body instance override (wins over query).
  * @returns {string|null} the resolved absolute root, or null (already replied).
  */
-export function viewRootOrReply(req, res, parsedUrl, { boundCwd, loadWorkspaces, listLivePtys, bodyProject, bodyInstance } = {}) {
+export function viewRootOrReply(req, res, parsedUrl, { boundCwd, loadWorkspaces, listLivePtys, listSdkSessions, bodyProject, bodyInstance } = {}) {
   const r = resolveViewRoot({
     projectParam: (typeof bodyProject === 'string' && bodyProject) || parsedUrl?.searchParams?.get('project'),
     instanceParam: (typeof bodyInstance === 'string' && bodyInstance) || parsedUrl?.searchParams?.get('instance'),
     boundCwd,
     loadWorkspaces,
     listLivePtys,
+    listSdkSessions,
   });
   if (!r.ok) {
     res.writeHead(r.status, { 'Content-Type': 'application/json' });

package/server/lib/workflow-watcher.js

@@ -39,7 +39,7 @@ function _signature(p) {
 function _isJournalFile(f) { return f.startsWith('wf_') && f.endsWith('.json'); }
 
 function _scan(state) {
-  const { workflowsDir, sessionId, project, clients, seen } = state;
+  const { workflowsDir, sessionId, project, clients, clientFilter, seen } = state;
   let files;
   try { files = readdirSync(workflowsDir); } catch { return; }
   for (const f of files) {
@@ -51,7 +51,11 @@ function _scan(state) {
     seen.set(f, sig);
     const data = readNormalizedJournal(p);
     if (!data) continue;
-    sendEventToClients(clients, 'workflow_update', {
+    // Per-workspace: a journal belongs to one project; when a client filter is
+    // installed the frame reaches only that project's viewers (legacy default:
+    // broadcast to all).
+    const target = typeof clientFilter === 'function' ? clientFilter(clients, project) : clients;
+    sendEventToClients(target, 'workflow_update', {
       sessionId,
       project: project || null,
       runId: data.runId,
@@ -99,7 +103,7 @@ function _baseline(state) {
  * 武装对某 workflows 目录的监视。同目录重复调用只刷新 clients 引用。
  * @param {{ workflowsDir: string, sessionId?: string, project?: string, clients: Array }} opts
  */
-export function armWorkflowWatch({ workflowsDir, sessionId, project, clients } = {}) {
+export function armWorkflowWatch({ workflowsDir, sessionId, project, clients, clientFilter } = {}) {
   if (!workflowsDir || !Array.isArray(clients)) return null;
 
   const existing = _armed.get(workflowsDir);
@@ -107,6 +111,7 @@ export function armWorkflowWatch({ workflowsDir, sessionId, project, clients } =
 
   const state = {
     workflowsDir, sessionId, project, clients,
+    clientFilter: typeof clientFilter === 'function' ? clientFilter : null,
     seen: new Map(), watcher: null,
     debounceTimer: null, safetyTimer: null, presenceTimer: null,
   };
@@ -177,13 +182,14 @@ function _authoritativeJournalExists(runDir, runId) {
 }
 
 function _scanLive(state) {
-  const { runDir, runId, sessionId, project, clients } = state;
+  const { runDir, runId, sessionId, project, clients, clientFilter } = state;
   const data = deriveLiveJournal(runDir, runId);
   if (data) {
     const sig = _liveSignature(data);
     if (sig !== state.lastSig) {  // 有实质变化才广播
       state.lastSig = sig;
-      sendEventToClients(clients, 'workflow_update', {
+      const target = typeof clientFilter === 'function' ? clientFilter(clients, project) : clients;
+      sendEventToClients(target, 'workflow_update', {
         sessionId,
         project: project || null,
         runId: data.runId,
@@ -228,7 +234,7 @@ function _startLiveWatch(state) {
  * 同 runDir 重复调用只刷新 clients。arm 时立即广播一次当前推导态（闭合 REST/arm 竞态）。
  * @param {{ runDir: string, runId: string, sessionId?: string, project?: string, clients: Array }} opts
  */
-export function armWorkflowLiveWatch({ runDir, runId, sessionId, project, clients } = {}) {
+export function armWorkflowLiveWatch({ runDir, runId, sessionId, project, clients, clientFilter } = {}) {
   if (!runDir || !runId || !Array.isArray(clients)) return null;
 
   const existing = _armedLive.get(runDir);
@@ -236,6 +242,7 @@ export function armWorkflowLiveWatch({ runDir, runId, sessionId, project, client
 
   const state = {
     runDir, runId, sessionId, project, clients,
+    clientFilter: typeof clientFilter === 'function' ? clientFilter : null,
     lastSig: null, watcher: null,
     debounceTimer: null, safetyTimer: null, presenceTimer: null,
   };