cc-viewer 1.7.14 → 1.7.17

package/dist/index.html

@@ -21,7 +21,7 @@
     // 整体显示大小已弃用 CSS zoom：Electron 改用 webFrame.setZoomFactor（首屏抢占见
     // electron/tab-content-preload.js），纯浏览器交由用户用浏览器自带快捷键缩放，故此处不再设 zoom。
   </script>
-  <script type="module" crossorigin src="./assets/index-CPLS-pSI.js"></script>
+  <script type="module" crossorigin src="./assets/index-8EGcVOKG.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/vendor-antd-DADYo_zg.js">
   <link rel="modulepreload" crossorigin href="./assets/vendor-codemirror-tF6HNoR6.js">
   <link rel="modulepreload" crossorigin href="./assets/vendor-mdxeditor-CFAmRN3Y.js">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-viewer",
-  "version": "1.7.14",
+  "version": "1.7.17",
   "description": "Claude Code logging, visualization, and management toolkit — launch a web viewer alongside Claude Code with full request/response tracing, proxy, and mobile support",
   "license": "MIT",
   "main": "server.js",

package/server/lib/delta-reconstructor.js

@@ -244,6 +244,9 @@ export function reconstructEntries(entries) {
  */
 function _tryRepairFromCandidate(brokenEntry, expectedCount, candidate) {
   if (!candidate.mainAgent || candidate.teammate || !Array.isArray(candidate.body?.messages)) return false;
+  // V2 transcript synthetic entries are never a valid repair source for legacy
+  // delta rows — their messages are a different conversation's content.
+  if (candidate._syntheticV2) return false;
   const candidateMsgs = candidate.body.messages;
   const candidateTotal = candidate._totalMessageCount || candidateMsgs.length;
   const isFullEntry = !candidate._deltaFormat || isCheckpointEntry(candidate);

package/server/lib/v2/adapter.js

@@ -34,6 +34,7 @@ import { isMainAgentRequest } from '../interceptor-core.js';
 import { readSession } from './replay.js';
 import { iterateJsonlLines } from './jsonl-read.js';
 import { isDiscardableSession } from './session-select.js';
+import { LIVE_SESSION_MTIME_MS } from '../log-management.js';
 import { blobPath, isSupportedWireFormat } from './layout.js';
 import { SingleFlight } from './singleflight.js';
 import { listV2Sessions } from './session-list.js';
@@ -183,6 +184,29 @@ export class SessionSynthesizer {
     this._leader = opts.teammateOf || this._meta.leader || null;
     this._loadBlob = makeBlobLoader({ blobsDir: join(sessionDir, 'blobs') }, this.sessionId);
     this.unsupported = false;
+    // Liveness gate — KEEP IN SYNC with log-management.js deleteLogFiles
+    // (same pid(0)-probe + EPERM + LIVE_SESSION_MTIME_MS mtime triple; the
+    // constant is imported here so only the ordering can drift). Cold reads
+    // finalize crash orphans as completed deltas ONLY when the session is dead.
+    // A live writer may still emit an orphan's done later — its completed twin
+    // would then be replayed by the client's seq guard as stale (_staleReorder)
+    // and the tail of the chat would vanish (cold-read + live-feed race).
+    this._sessionLive = false;
+    try {
+      const meta = this._meta;
+      if (meta && typeof meta.pid === 'number' && meta.pid !== process.pid) {
+        try { process.kill(meta.pid, 0); this._sessionLive = true; } catch (err) {
+          // EPERM = the pid exists under another user — that IS live.
+          if (err && err.code === 'EPERM') this._sessionLive = true;
+        }
+      }
+    } catch { /* unreadable meta — fall through to the mtime guard */ }
+    if (!this._sessionLive) {
+      try {
+        const jStat = statSync(join(sessionDir, 'journal.jsonl'));
+        if (this._now() - jStat.mtimeMs < LIVE_SESSION_MTIME_MS) this._sessionLive = true;
+      } catch { /* no journal — nothing fresh to protect */ }
+    }
     if (meta && meta.wireFormat != null && !isSupportedWireFormat(meta.wireFormat)) {
       this._markUnsupported(meta.wireFormat);
     }
@@ -445,7 +469,11 @@ export class SessionSynthesizer {
       isHeartbeat: HEARTBEAT_URL_RE.test(req.url || ''),
       isCountTokens: COUNT_TOKENS_URL_RE.test(req.url || ''),
       mainAgent: false, // finalized below once messages are attached
-      ...(isTeammateEntry && { teammate: leader.agentName || true, ...(leader.teamName && { teamName: leader.teamName }) }),
+      ...(isTeammateEntry && { teammate: leader.agentName || req.agent?.agentName || true, ...(leader.teamName && { teamName: leader.teamName }) }),
+      // Wire agent identity persisted by the writer (see agent-id.js) — the
+      // client uses req.agent.agentName as the display name when the heuristic
+      // registry has nothing (native teammate, cold load).
+      ...(req.agent && { agent: req.agent }),
       ...(req.proxy && { proxyProfile: req.proxy.profile, ...(req.proxy.url && { proxyUrl: req.proxy.url }) }),
     };
 
@@ -508,9 +536,23 @@ export class SessionSynthesizer {
 
     if (this._dones.has(seq)) {
       this._tryComplete(seq);
+    } else if (this._deferMs === 0 && !this._sessionLive) {
+      // Cold read of a DEAD session: the orphan is definitively terminal. Emit
+      // it as a completed delta (no inProgress / requestId — the exact shape
+      // _complete produces) so the client batch reconstructor accumulates its
+      // message slice: inProgress rows are skipped by the reconstructor, which
+      // would otherwise drop the slice and fail every later completed entry's
+      // _totalMessageCount integrity check — blanking the whole chat.
+      entry.response = { body: null }; // mirrors _complete's no-response branch
+      // Push the SAME item reference (phase aside): _complete's dedup splice
+      // (this._out.indexOf(item)) depends on the queued object identity — a
+      // spread copy would dodge it and the twin completed frame would double.
+      item.phase = 'completed';
+      this._out.push(item);
     } else {
       // req without done — in-flight or the process died (spec §4). This IS the
-      // v1 placeholder, so it wears the same flags.
+      // v1 placeholder, so it wears the same flags. Live reads keep it so the
+      // incremental reconstructor can render the in-flight turn as it streams.
       entry.inProgress = true;
       entry.requestId = req.rid || `${seq}`;
       this._out.push(item);

package/server/lib/v2/agent-id.js

@@ -0,0 +1,55 @@
+// Agent identity parser — teammate/subagent names from the wire header.
+//
+// Claude Code 2.x sends an `x-claude-code-agent-id` request header on every
+// sub-agent (teammate or subagent) request. Two shapes appear in real data:
+//   - named teammate:    `frontend-reviewer@session-17e1f37a-...`
+//   - anonymous subagent: `a7eea0a140349f80d` (16-hex agent id, no @)
+// The header is absent on main-agent requests, so its presence alone marks a
+// sub-agent stream. We persist the NAME so display no longer depends on the
+// frontend's window-scoped heuristic registry (resolveTeammateNames), which
+// loses names when the lead's Agent tool_use falls outside the current window.
+
+const ANON_RE = /^[0-9a-f]{8,64}$/i; // pure hex id, any plausible length
+const MAX_NAME_LEN = 64;
+
+/**
+ * Parse an `x-claude-code-agent-id` header value.
+ *
+ * @param {string|null|undefined} header
+ * @returns {{agentName: string|null, named: boolean}|null}
+ *   - named teammate:  {agentName, named: true}
+ *   - anonymous agent: {agentName: null, named: false}
+ *   - null when the header is missing/empty or its shape is not an agent id
+ *     (never fabricate a name from an unrecognized value).
+ */
+export function parseAgentId(header) {
+  if (typeof header !== 'string') return null;
+  const h = header.trim();
+  if (h.length === 0) return null;
+  const at = h.indexOf('@');
+  if (at === -1) {
+    // Anonymous: a bare hex agent id. Anything else is not an agent id — do
+    // not guess.
+    return ANON_RE.test(h) ? { agentName: null, named: false } : null;
+  }
+  const name = h.slice(0, at).trim();
+  // The @-suffix is deliberately NOT validated (real shapes include
+  // `session-<uuid>` and possibly plain uuids) — presence of @ + a non-hex
+  // prefix is enough to treat it as a named agent. A hex prefix is treated as
+  // anonymous (guards against `<uuid>@session-...` being misread as a name).
+  if (name.length === 0) return null;
+  if (ANON_RE.test(name)) return { agentName: null, named: false };
+  return { agentName: name.slice(0, MAX_NAME_LEN), named: true };
+}
+
+/** Case-insensitive header lookup (undici folds to lowercase; plain objects
+ *  may keep the original casing). */
+export function findHeader(headers, key) {
+  if (!headers || typeof headers !== 'object') return undefined;
+  if (Object.prototype.hasOwnProperty.call(headers, key)) return headers[key];
+  const lower = key.toLowerCase();
+  for (const k of Object.keys(headers)) {
+    if (k.toLowerCase() === lower) return headers[k];
+  }
+  return undefined;
+}

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

@@ -32,7 +32,7 @@ import { isDiscardableSession } from './session-select.js';
 import { isForeignLiveOwned } from './session-owner.js';
 import { isConvertRunning } from './convert-manager.js';
 import { computeCacheLoss } from './meta-rows.js';
-import { classifyRequest } from '../../../src/utils/requestType.js';
+import { classifyRequest, withAgentNameSubType } from '../../../src/utils/requestType.js';
 
 const FSWATCH_DEBOUNCE_MS = 80;
 const SAFETY_POLL_MS = 5000;
@@ -679,6 +679,9 @@ export class V2LiveFeed {
       kind: item.kind || (item.isMain ? 'main' : (parsed.teammate ? 'teammate' : 'sub')),
       mainAgent: item.isMain === true,
       teammate: parsed.teammate || undefined,
+      // Wire agent identity (x-claude-code-agent-id) — display name for native
+      // teammates (see agent-id.js).
+      agent: parsed.agent,
       model: parsed.body?.model,
       proxyUrl: parsed.proxyUrl || undefined,
       status: parsed.response?.status,
@@ -698,8 +701,7 @@ export class V2LiveFeed {
   _emitRow(cur, item, parsed) {
     const row = this._rowFrom(item, parsed);
     try {
-      const tag = classifyRequest(parsed, null);
-      row.typeTag = tag ? { type: tag.type, subType: tag.subType ?? null } : null;
+      row.typeTag = withAgentNameSubType(classifyRequest(parsed, null), parsed);
     } catch (err) { reportSwallowed('v2-live.row-classify', err); }
     if (row.mainAgent && !row.inProgress) {
       const u = parsed.response?.body?.usage;
@@ -714,8 +716,7 @@ export class V2LiveFeed {
     const prev = cur._v3Last;
     if (prev && (prev.row.sessionId !== row.sessionId || prev.row.seq !== row.seq)) {
       try {
-        const tag = classifyRequest(prev.entry, parsed);
-        const corrected = tag ? { type: tag.type, subType: tag.subType ?? null } : null;
+        const corrected = withAgentNameSubType(classifyRequest(prev.entry, parsed), prev.entry);
         if (JSON.stringify(corrected) !== JSON.stringify(prev.row.typeTag)) {
           prev.row.typeTag = corrected;
           sendEventToClients(this._clients, 'v2_requests_delta', prev.row);

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

@@ -22,7 +22,7 @@ import { iterateJsonlLines } from './jsonl-read.js';
 import { iterateV2Items, findTeammateSessionDirs } from './adapter.js';
 import { SingleFlight } from './singleflight.js';
 import { reportSwallowed } from '../error-report.js';
-import { classifyRequest } from '../../../src/utils/requestType.js';
+import { classifyRequest, withAgentNameSubType } from '../../../src/utils/requestType.js';
 
 // KEEP IN SYNC: server/lib/v2/adapter.js itemKey — (sessionId, seq) identity.
 const itemKey = (sessionId, seq) => `${sessionId}\x00${seq}`;
@@ -113,6 +113,9 @@ function foldDir(dir) {
       mainAgent: r.kind === 'main' && !isTeammateDir,
       // v1 entry contract (adapter.js:427): teammate = agentName string | true
       teammate: isTeammateDir ? ((meta.leader && meta.leader.agentName) || true) : undefined,
+      // Wire agent identity (x-claude-code-agent-id) persisted on the journal
+      // req line — the display name for native teammates (see agent-id.js).
+      agent: r.agent,
       model: r.model,
       proxyUrl: r.proxy && r.proxy.url ? r.proxy.url : undefined,
       status: d && typeof d.http === 'number' ? d.http : undefined,
@@ -318,8 +321,7 @@ async function attachBodyFields(sessionDir, rows) {
   const finish = (slot, nextEntry) => {
     const { row, entry } = slot;
     try {
-      const tag = classifyRequest(entry, nextEntry);
-      row.typeTag = tag ? { type: tag.type, subType: tag.subType ?? null } : null;
+      row.typeTag = withAgentNameSubType(classifyRequest(entry, nextEntry), entry);
     } catch (err) {
       // Diagnostic-worthy (a throw silently mis-tags the row; the live path
       // reports the same failure) — CLAUDE.md swallow rule.

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

@@ -27,6 +27,7 @@ import { BlobStore } from './blob-store.js';
 import { Journal } from './journal.js';
 import { ConversationStore } from './conversation-store.js';
 import { parseUserId, classifyKind, ConvResolver } from './identity.js';
+import { parseAgentId, findHeader } from './agent-id.js';
 import { extractUserTexts, flattenPromptText, isSuggestionMode, readPromptsHead } from '../user-prompt-extract.js';
 
 // Below this many free bytes on the log volume, v2 skips writing and reports
@@ -505,6 +506,10 @@ export class V2Writer {
     }
 
     // 3. Journal req line — LAST, so it never references missing content.
+    // Persist the wire agent identity (x-claude-code-agent-id) so teammate
+    // names survive cold reads — display no longer depends on the frontend's
+    // window-scoped name registry (see agent-id.js).
+    const agent = parseAgentId(findHeader(entry.headers, 'x-claude-code-agent-id'));
     s.journal.writeReq({
       seq,
       rid,
@@ -517,6 +522,7 @@ export class V2Writer {
       ...(entry.body && entry.body.model && { model: entry.body.model }),
       ...(entry.isStream && { isStream: true }),
       ...(entry.headers && { headers: entry.headers }),
+      ...(agent && { agent }),
       ...(params && { params }),
       ...((toolsRef || sysRef) && { blobs: { ...(toolsRef && { tools: toolsRef }), ...(sysRef && { sys: sysRef }) } }),
       ...(convResult && { msgFrom: convResult.msgFrom, msgTo: convResult.msgTo }),