cc-viewer 1.9.5 → 1.9.6

package/server/routes/proxy-stats.js

@@ -19,10 +19,11 @@ import { listLivePtys } from '../pty-manager.js';
 // not become a presence oracle over LOG_DIR — `?project=` is accepted ONLY
 // when it resolves to a registered workspace / live PTY (or the bound
 // project), never an arbitrary sanitized name.
-function _resolveStatsName(projectParam, res) {
-  if (!projectParam) return _projectName || '';
+function _resolveStatsName(projectParam, instanceParam, res) {
+  if (!projectParam && !instanceParam) return _projectName || '';
   const r = resolveViewRoot({
     projectParam,
+    instanceParam,
     boundCwd: process.env.CCV_PROJECT_DIR || process.cwd(),
     loadWorkspaces,
     listLivePtys,
@@ -32,7 +33,9 @@ function _resolveStatsName(projectParam, res) {
     res.end(JSON.stringify({ error: r.error }));
     return null;
   }
-  return sanitizePathComponent(projectParam);
+  // Same contract as project-meta: the store name derives from the resolver's
+  // RAW matched path, never the raw request name nor the realpath'd root.
+  return sanitizePathComponent(r.projectName);
 }
 
 // GET /api/proxy-stats — returns the VIEWED project's proxy retry stats
@@ -41,7 +44,8 @@ function _resolveStatsName(projectParam, res) {
 function getProxyStats(req, res, parsedUrl) {
   try {
     const projectParam = parsedUrl && parsedUrl.searchParams ? parsedUrl.searchParams.get('project') : null;
-    const name = _resolveStatsName(projectParam, res);
+    const instanceParam = parsedUrl && parsedUrl.searchParams ? parsedUrl.searchParams.get('instance') : null;
+    const name = _resolveStatsName(projectParam, instanceParam, res);
     if (name === null) return; // error already replied
     if (!name) {
       res.writeHead(404, { 'Content-Type': 'application/json' });

package/server/routes/resume.js

@@ -54,6 +54,7 @@ import { isAdminReq } from '../lib/is-admin.js';
 import { isSameOriginBrowserRequest } from '../lib/same-origin.js';
 import { sseWrite } from '../lib/wire-compress.js';
 import { reportSwallowed } from '@ccv/core/error-report';
+import { findSdkSessionByInstance, listSdkSessionInstances } from '../lib/sdk-session-index.js';
 
 function sendJson(res, code, obj) {
   res.writeHead(code, { 'Content-Type': 'application/json' });
@@ -128,21 +129,22 @@ async function getLiveProcessesHandler(req, res, parsedUrl) {
   // first launch's PTY-less list collapsed to just the new project. Enumerate the per-cwd SDK
   // session registry (multi-session) as `kind:'main'` entries so each launched workspace shows
   // up exactly like a PTY project. `active` marks the session the SDK composer is bound to;
-  // `closable:false` (no PTY to kill) tells the header to suppress the ×.
+  // a cwd-stable instanceKey drives exact view routing and the per-session × close path.
   if (process.env.CCV_SDK_MODE === '1') {
     try {
       const sdk = await import('../lib/sdk-manager.js');
       for (const e of sdk.listSdkSessions()) {
         if (!e || !e.cwd) continue;
         if (processes.some((p) => p && p.cwd === e.cwd)) continue; // a real PTY already covers this cwd
+        const boundCwd = process.env.CCV_PROJECT_DIR || process.cwd();
+        if (!currentInstanceKey && e.instanceKey && e.cwd === boundCwd) currentInstanceKey = e.instanceKey;
         processes.push({
           kind: 'main',
           project: projectKeyForCwd(e.cwd),
           cwd: e.cwd,
           pid: null,
           active: e.active === true,
-          instanceKey: null,
-          closable: false, // SDK resident query — killed via session switch, not the × close path
+          instanceKey: e.instanceKey || null,
         });
       }
     } catch (err) { reportSwallowed('resume-route.live-sdk', err); }
@@ -176,6 +178,25 @@ function postLiveProcessAttachHandler(req, res, parsedUrl, isLocal, deps) {
       return;
     }
     try {
+      const sdkAnchor = instanceKey && findSdkSessionByInstance(instanceKey)
+        ? { instanceKey }
+        : (!instanceKey && listSdkSessionInstances().length ? { project: project || undefined } : null);
+      if (sdkAnchor) {
+        const sdk = await import('../lib/sdk-manager.js');
+        const r = sdk.attachSdkSession(sdkAnchor);
+        if (r.ok) {
+          sendJson(res, 200, { ok: true, project, instanceKey: r.instanceKey, running: true, ptyKind: 'sdk', switched: r.switched });
+          return;
+        }
+        if (r.reason === 'ambiguous') {
+          sendJson(res, 409, { ok: false, reason: 'ambiguous', candidates: r.candidates || [] });
+          return;
+        }
+        if (instanceKey) {
+          sendJson(res, 404, { ok: false, reason: 'not-found' });
+          return;
+        }
+      }
       const { attachPtyFor } = await import('../pty-manager.js');
       const r = attachPtyFor({ project: project || undefined, instanceKey: instanceKey || undefined });
       if (!r.ok) {
@@ -238,8 +259,22 @@ function postLiveProcessCloseHandler(req, res, parsedUrl, isLocal, deps) {
       return;
     }
     try {
-      const { killPtyFor } = await import('../pty-manager.js');
-      const r = killPtyFor({ project: project || undefined, instanceKey: instanceKey || undefined });
+      const sdkByInstance = instanceKey ? findSdkSessionByInstance(instanceKey) : null;
+      let r;
+      let survivorRecords = null;
+      if (sdkByInstance) {
+        const sdk = await import('../lib/sdk-manager.js');
+        r = sdk.closeSdkSession({ instanceKey });
+        survivorRecords = listSdkSessionInstances().map((s) => ({ key: s.instanceKey, cwd: s.cwd, isActive: s.active === true }));
+      } else {
+        const { killPtyFor } = await import('../pty-manager.js');
+        r = killPtyFor({ project: project || undefined, instanceKey: instanceKey || undefined });
+        if (!r.ok && r.reason === 'not-found' && listSdkSessionInstances().length) {
+          const sdk = await import('../lib/sdk-manager.js');
+          r = sdk.closeSdkSession({ project: project || undefined, instanceKey: instanceKey || undefined });
+          if (r.ok) survivorRecords = listSdkSessionInstances().map((s) => ({ key: s.instanceKey, cwd: s.cwd, isActive: s.active === true }));
+        }
+      }
       if (!r.ok) {
         // Multi-instance: an ambiguous project-name-only close (2+ live same-basename
         // instances) is a 409 with the live candidates, so the client re-issues with an
@@ -260,7 +295,7 @@ function postLiveProcessCloseHandler(req, res, parsedUrl, isLocal, deps) {
       // CCV_PROJECT_DIR — never by basename, or a same-name twin close would false-hit.
       let rebound = null;
       try {
-        rebound = _maybeRebindAfterClose(r, deps);
+        rebound = _maybeRebindAfterClose(r, deps, survivorRecords);
       } catch (err) { reportSwallowed('resume-route.close-rebind', err); }
       // A PTY killed here fires no Stop POST, so its scope's streaming/turn
       // bucket would stay `active:true` forever — the heartbeat/streaming timer
@@ -311,7 +346,7 @@ function postLiveProcessCloseHandler(req, res, parsedUrl, isLocal, deps) {
           }
         }
       } catch (err) { reportSwallowed('resume-route.close-kill-scratch', err); }
-      sendJson(res, 200, { ok: true, project, instanceKey: r.key || instanceKey || null, killedActive: r.killedActive === true, rebound });
+      sendJson(res, 200, { ok: true, project, instanceKey: r.instanceKey || r.key || instanceKey || null, killedActive: r.killedActive === true, rebound });
     } catch (err) {
       reportSwallowed('resume-route.close', err);
       sendJson(res, 500, { ok: false, reason: 'close-failed' });
@@ -339,7 +374,7 @@ function postLiveProcessCloseHandler(req, res, parsedUrl, isLocal, deps) {
 // request can observe a half-applied rebind, and a throwing side-effect can no
 // longer strand the "binding moved but nobody was told" state (the broadcast
 // has already gone out by then).
-function _maybeRebindAfterClose(killResult, deps) {
+function _maybeRebindAfterClose(killResult, deps, survivorRecords = null) {
   // Electron multi-tab: the manager process does NOT own log init (the tab
   // workers do); mirroring workspaces.js:56, skip rebind entirely there.
   if (process.env.CCV_ELECTRON_MULTITAB === '1') return null;
@@ -355,7 +390,7 @@ function _maybeRebindAfterClose(killResult, deps) {
   // terminal attachment to (reattachedTo), then the terminal's live attachment
   // (isActive — preserves the launch-time invariant bound == attached), else
   // the first live claude record in Map order.
-  const live = listLivePtys().filter((p) => p && p.cwd && (!p.ptyKind || p.ptyKind === 'claude'));
+  const live = survivorRecords || listLivePtys().filter((p) => p && p.cwd && (!p.ptyKind || p.ptyKind === 'claude'));
   if (!live.length) return null;
   // A same-cwd TWIN of the closed bound project still lives → the bound
   // identity (same project name, same log dir) is already correct for it;
@@ -492,7 +527,9 @@ function postResumeSessionHandler(req, res, parsedUrl, isLocal, deps) {
         const sdk = await import('../lib/sdk-manager.js');
         // Multi-session (2026-10-12): honor the requested workspace — resume the VIEWED
         // session, not always the active one. project is the workspace name from the client.
-        const anchor = (typeof project === 'string' && project) ? { project } : undefined;
+        const anchor = (project || instanceKey)
+          ? { project: project || undefined, instanceKey: instanceKey || undefined }
+          : undefined;
         const r = sdk.switchToSession(sessionUuid, anchor);
         if (r.ok) { sendJson(res, 200, { ok: true }); return; }
         if (r.reason === 'busy') { sendJson(res, 409, { ok: false, reason: 'busy' }); return; }

package/server/server.js

@@ -327,6 +327,9 @@ const _editorCleanupTimer = setInterval(() => {
 }, 60000);
 _editorCleanupTimer.unref(); // Don't keep process alive for cleanup
 let terminalWss = null; // WebSocketServer reference for broadcasting
+// Test seam: inject a stubbed client set so broadcastWsMessage's instance-narrowing
+// predicate is directly unit-testable (ws-instance-isolation.test.js).
+export function setTerminalWssForTests(wss) { terminalWss = wss; }
 let streamMux = null;   // /ws/mux dialogue-channel stream mux (SSE stays the fallback)
 let _writeToPty = null; // PTY write function reference (set by setupTerminalWebSocket)
 let _onPtyData = null;  // PTY data listener registration (set by setupTerminalWebSocket)
@@ -2060,6 +2063,7 @@ async function setupTerminalWebSocket(httpServer) {
           // 新视图的 sdk-session-state/审批/队列帧会被静默丢弃。
           if (msg.type === 'attach') {
             try { ws._ccvViewProject = (typeof msg.project === 'string' && msg.project) || null; } catch {}
+            try { ws._ccvViewInstance = (typeof msg.instanceKey === 'string' && msg.instanceKey) || null; } catch {}
             if (isSdkMode) return;
           } else if (isSdkMode && (msg.type === 'input' || msg.type === 'input-sequential'
               || msg.type === 'resync-request' || msg.type === 'resize')) {
@@ -2413,7 +2417,7 @@ async function setupTerminalWebSocket(httpServer) {
             // User message in SDK mode — relay to sdk-manager, addressed to the viewed
             // workspace's session (multi-session). msg.project is the workspace basename.
             if (_sdkSendUserMessage && msg.text) {
-              const anchor = (typeof msg.project === 'string' && msg.project) ? { project: msg.project } : undefined;
+              const anchor = ((typeof msg.project === 'string' && msg.project) || (typeof msg.instanceKey === 'string' && msg.instanceKey)) ? { project: msg.project, instanceKey: typeof msg.instanceKey === 'string' ? msg.instanceKey : undefined } : undefined;
               _sdkSendUserMessage(msg.text, anchor).catch(err => {
                 console.error('[SDK] sendUserMessage error:', err.message);
               });
@@ -2424,7 +2428,7 @@ async function setupTerminalWebSocket(httpServer) {
             // fetch hook → streamingState → SSE), same as PTY mode; sdk-manager
             // no longer emits its own streaming_status.
             if (isSdkMode && _sdkInterruptTurn) {
-              const anchor = (typeof msg.project === 'string' && msg.project) ? { project: msg.project } : undefined;
+              const anchor = ((typeof msg.project === 'string' && msg.project) || (typeof msg.instanceKey === 'string' && msg.instanceKey)) ? { project: msg.project, instanceKey: typeof msg.instanceKey === 'string' ? msg.instanceKey : undefined } : undefined;
               const cancelled = _sdkInterruptTurn(anchor) || [];
               _broadcastApprovalCloses(cancelled, 'Turn interrupted');
             } else {
@@ -2441,7 +2445,7 @@ async function setupTerminalWebSocket(httpServer) {
             if (typeof msg.text === 'string' && msg.text) {
               if (isSdkMode) {
                 if (_sdkSendUserMessage) {
-                  const anchor = (typeof msg.project === 'string' && msg.project) ? { project: msg.project } : undefined;
+                  const anchor = ((typeof msg.project === 'string' && msg.project) || (typeof msg.instanceKey === 'string' && msg.instanceKey)) ? { project: msg.project, instanceKey: typeof msg.instanceKey === 'string' ? msg.instanceKey : undefined } : undefined;
                   _sdkSendUserMessage(msg.text, anchor).catch(err => {
                     console.error('[SDK] queue-message relay error:', err.message);
                   });
@@ -2460,7 +2464,7 @@ async function setupTerminalWebSocket(httpServer) {
                 if (_sdkSendQueuedNow) {
                   // Multi-session: address the bubble's own workspace (the viewed project), not
                   // the global active session — bubbles are cwd-scoped, the action must match.
-                  const qAnchor = (typeof msg.project === 'string' && msg.project) ? { project: msg.project } : undefined;
+                  const qAnchor = ((typeof msg.project === 'string' && msg.project) || (typeof msg.instanceKey === 'string' && msg.instanceKey)) ? { project: msg.project, instanceKey: typeof msg.instanceKey === 'string' ? msg.instanceKey : undefined } : undefined;
                   try { _broadcastApprovalCloses(_sdkSendQueuedNow(qid, qAnchor) || [], 'Queued message sent now'); }
                   catch (err) { reportSwallowed('server.queue-send-now', err); }
                 }
@@ -2472,7 +2476,7 @@ async function setupTerminalWebSocket(httpServer) {
             const qid = (typeof msg.id === 'string' && /^[a-zA-Z0-9_-]{1,128}$/.test(msg.id)) ? msg.id : null;
             if (qid) {
               if (isSdkMode) {
-                if (_sdkRemoveQueued) { const qAnchor = (typeof msg.project === 'string' && msg.project) ? { project: msg.project } : undefined; try { _sdkRemoveQueued(qid, qAnchor); } catch (err) { reportSwallowed('server.queue-remove', err); } }
+                if (_sdkRemoveQueued) { const qAnchor = ((typeof msg.project === 'string' && msg.project) || (typeof msg.instanceKey === 'string' && msg.instanceKey)) ? { project: msg.project, instanceKey: typeof msg.instanceKey === 'string' ? msg.instanceKey : undefined } : undefined; try { _sdkRemoveQueued(qid, qAnchor); } catch (err) { reportSwallowed('server.queue-remove', err); } }
               } else {
                 try { chatQueue.remove(qid); } catch (err) { reportSwallowed('server.queue-remove', err); }
               }
@@ -2481,7 +2485,7 @@ async function setupTerminalWebSocket(httpServer) {
             // Session/workspace switch: drop the parked queue WITHOUT interrupting a running
             // turn. (Stop semantics live elsewhere: PTY queue-suppress, SDK sdk-interrupt.)
             if (isSdkMode) {
-              if (_sdkClearQueued) { const qAnchor = (typeof msg.project === 'string' && msg.project) ? { project: msg.project } : undefined; try { _sdkClearQueued(qAnchor); } catch (err) { reportSwallowed('server.queue-clear', err); } }
+              if (_sdkClearQueued) { const qAnchor = ((typeof msg.project === 'string' && msg.project) || (typeof msg.instanceKey === 'string' && msg.instanceKey)) ? { project: msg.project, instanceKey: typeof msg.instanceKey === 'string' ? msg.instanceKey : undefined } : undefined; try { _sdkClearQueued(qAnchor); } catch (err) { reportSwallowed('server.queue-clear', err); } }
             } else {
               try { chatQueue.clear(); } catch (err) { reportSwallowed('server.queue-clear', err); }
             }
@@ -3226,8 +3230,7 @@ async function _doStop() {
 // are intentionally no pushSdkEntry/setSdkStreamingState shortcuts anymore.
 
 /** Broadcast a message to all terminal WS clients (for SDK canUseTool). */
-export function broadcastWsMessage(msg) {
-  if (terminalWss) {
+export function broadcastWsMessage(msg) {  if (terminalWss) {
     // SDK multi-session (2026-10-12): a cwd-tagged frame belongs to one workspace's session.
     // Route it only to clients viewing that workspace (or the bound view with no ?project=),
     // so a background workspace's approval/queue/spinner never bleeds into the foreground.
@@ -3238,10 +3241,17 @@ export function broadcastWsMessage(msg) {
     // — every frame for such a workspace would be silently dropped for its viewer.
     let frameProj = null;
     if (frameCwd) frameProj = projectKeyForCwd(frameCwd) || null;
+    // Same-name twin isolation (review P2): a frame tagged with an instance key narrows
+    // delivery to clients viewing THAT instance — otherwise two same-basename workspaces
+    // (same frameProj) would cross-deliver (e.g. a close teardown's idle/queue-state wipe
+    // killing the surviving twin viewer's spinner and queue bubbles). Untagged/cwd-only
+    // frames keep the historical project-level behavior.
+    const frameInstance = (msg && typeof msg === 'object' && typeof msg.instanceKey === 'string' && msg.instanceKey) ? msg.instanceKey : null;
     const str = typeof msg === 'string' ? msg : JSON.stringify(msg);
     terminalWss.clients.forEach((c) => {
       if (c.readyState !== 1) return;
       if (frameProj && c._ccvViewProject && c._ccvViewProject !== frameProj) return; // other workspace's frame
+      if (frameInstance && c._ccvViewInstance && c._ccvViewInstance !== frameInstance) return; // other instance of the same project
       try { c.send(str); } catch {}
     });
   }