cc-viewer 1.7.15 → 1.7.18

package/src/utils/contentFilter.js

@@ -127,19 +127,33 @@ export function isTeammate(req) {
   if (!req) return false;
   const cached = _isTeammateCache.get(req);
   if (cached !== undefined) return cached;
+  // 【最高优先级】wire agent 身份信号（x-claude-code-agent-id / cc_is_subagent，
+  // 见 agent-id.js）。自 Claude Code 2.1.199 起普通 subagent 也被授予 SendMessage
+  // 工具，isNativeTeammate 的 SendMessage 判据不再可靠——这两个信号是硬判据：
+  //  - 持久化 agent 命名形态（name@session-…）→ 一定是 Teammate；
+  //  - 持久化 agent 匿名 hex 形态 → 一定是 SubAgent（否决下方 SendMessage 判据）；
+  //  - cc_is_subagent=true（CLI 自报 billing 标记，2.1.181+）→ 一定是 SubAgent。
+  const agent = req.agent;
+  if (agent) {
+    if (agent.named) { _isTeammateCache.set(req, true); return true; }
+    _isTeammateCache.set(req, false); return false;
+  }
+  const sysText = getSystemText(req.body || {});
+  if (SUBAGENT_BILLING_RE.test(sysText)) { _isTeammateCache.set(req, false); return false; }
   // interceptor 模式：通过 process.argv 写入的 teammate 字段
   if (req.teammate) { _isTeammateCache.set(req, true); return true; }
   // native teammate：同进程内 Agent 子代理（system prompt 包含 "You are a Claude agent"）
   if (isNativeTeammate(req)) {
-    // 注入 teammate 字段供下游 requestType.js 的 formatTeammateLabel 使用
+    // 注入 teammate 字段供下游 requestType.js 的 formatTeammateLabel 使用。
+    // 持久化的 wire agent 名（x-claude-code-agent-id，见 agent-id.js）优先——
+    // 它不依赖窗口内的注册表，冷加载/时序缺失时名字仍可靠。
     if (!req.teammate) {
-      req.teammate = extractNativeTeammateName(req) || null;
+      req.teammate = req.agent?.agentName || extractNativeTeammateName(req) || null;
     }
     _isTeammateCache.set(req, true);
     return true;
   }
   // proxy 模式：通过 system prompt 检测（外部进程 teammate）
-  const sysText = getSystemText(req.body || {});
   const result = TEAMMATE_SYSTEM_RE.test(sysText);
   _isTeammateCache.set(req, result);
   return result;

package/src/utils/identityHeal.js

@@ -76,6 +76,15 @@ export function refreshResolvedModelInfo(items, resolveModelInfo) {
 export function healUnresolvedTeammateEntries(entries) {
   for (const entry of entries) {
     if (!entry || !entry.unresolved || !entry.req || !entry.req.teammate) continue;
+    // Wire-v3 entries carry the SERVER-side typeTag (via _v3Row). When the
+    // tag has a real Teammate name (extractTeammateName / persisted agent
+    // name), it may differ from req.teammate (the heuristic registry) —
+    // overwriting would DOWNGRADE a good server label ("Teammate:
+    // frontend-reviewer" → "Teammate: X"), so skip those. When the tag is
+    // Teammate WITHOUT a name (old journals, no persisted agent), let the heal
+    // upgrade from the registry's real name.
+    const tag = entry.req._v3Row && entry.req._v3Row.typeTag;
+    if (tag && tag.type === 'Teammate' && tag.subType) continue;
     const label = formatTeammateLabel(entry.req.teammate, entry.req.body?.model);
     if (label !== entry.label) entry.label = label;
     entry.unresolved = false;

package/src/utils/requestType.js

@@ -148,6 +148,17 @@ function isPreflightRequest(req, nextReq) {
  * @param {object} [nextReq] - 下一条请求（用于 Preflight 判断）
  */
 export function classifyRequest(req, nextReq) {
+  // Wire-v3 assembled entry: the SERVER already classified this row on the
+  // full body (system/tools intact) — trust it verbatim. The assembled body
+  // strips system/tools, so a client re-derivation (isTeammate / isMainAgent /
+  // isPreflightRequest) would mis-tag every teammate as SubAgent. No
+  // Plan/Preflight exclusion: those need nextReq lookahead, which the server
+  // already applied (cold Pass B / live correction); the client cannot
+  // re-derive them from the stripped body either.
+  if (req && req._v3Row && req._v3Row.typeTag) {
+    return req._v3Row.typeTag;
+  }
+
   // Teammate 子进程的请求优先识别（收敛于 contentFilter.isTeammate）
   if (isTeammate(req)) {
     if (req.teammate) return { type: 'Teammate', subType: req.teammate };
@@ -206,3 +217,22 @@ export function formatTeammateLabel(name, model) {
   const short = model.replace(/^claude-/i, '').replace(/-\d{8}$/, '');
   return `Teammate: ${displayName}(${short})`;
 }
+
+/**
+ * Normalize a classifyRequest tag, then surface the persisted agent name as the
+ * Teammate subType (ONLY for Teammate rows — a SubAgent subType is a role tag
+ * like "Bash" and must not be overwritten). Shared by the server's meta-rows
+ * Pass B and live-feed row emission so the list/chat labels never drift.
+ * KEEP IN SYNC: both server callers import this from here.
+ *
+ * @param {{type: string, subType: string|null}|null} tag
+ * @param {object} [entry] - entry carrying `agent` ({agentName, named})
+ * @returns {{type: string, subType: string|null}|null}
+ */
+export function withAgentNameSubType(tag, entry) {
+  const base = tag ? { type: tag.type, subType: tag.subType ?? null } : null;
+  if (tag && tag.type === 'Teammate' && entry && entry.agent && entry.agent.agentName) {
+    return { type: tag.type, subType: entry.agent.agentName };
+  }
+  return base;
+}

package/src/utils/sessionMerge.js

@@ -18,6 +18,10 @@ export { messageFingerprint };
  *    无 live-port 配置下"提问气泡请求时即显示"依赖这一行为。
  * AppBase 的 SSE 与批量两个 merge 入口、以及单测共用此谓词，防三处逻辑漂移。
  *
+ * 批量路径的降级例外见 shouldDegradeBrokenMerge：当 broken 条目恰好是它那个
+ * session 的唯一载体（slim 只留最后一条 main）时，其 messages 是可信前缀，
+ * 降级合并比整会话空白更可取（会话打 _partialData 标记，ChatView 显示提示条）。
+ *
  * @param {object} entry
  * @param {object} [options]
  * @param {boolean} [options.batch=false] - 批量（强刷/历史加载）路径
@@ -30,6 +34,36 @@ export function isMergeBlockedEntry(entry, options = {}) {
   return false;
 }
 
+/**
+ * 批量路径降级例外：broken 载体能否以"可信前缀"身份合并进 mainAgentSessions。
+ *
+ * 仅在两条安全路径放行（两条都只会走进 mergeMainAgentSessions 的创建分支，
+ * 不会触发 anchor/rebuild 等可能翻倍的对齐逻辑）：
+ *  - prevSessions 为空：会话直接创建，无对齐风险；
+ *  - 双方都有 _seqEpoch 且不同：确定性会话边界，走 epochChanged append 分支
+ *    （三部分守卫防 v1 无 epoch 的条目被误放行）。
+ *
+ * `_staleReorder` 明确不降级（流内稍后有权威副本自建会话）；inProgress 不降级
+ * （批量下其 messages 是裸切片，不是可信前缀）。v1 / 无 epoch 会话的 broken
+ * 载体也刻意不降级（放松守卫会让 broken 条目掉进同会话分支，错位前缀 → 翻倍）。
+ *
+ * @param {object} entry
+ * @param {Array} prevSessions - 当前已合并的 sessions
+ * @returns {boolean} true = 允许降级合并
+ */
+export function shouldDegradeBrokenMerge(entry, prevSessions) {
+  if (!entry || !entry._reconstructBroken) return false;
+  if (entry._staleReorder || entry.inProgress) return false;
+  if (!Array.isArray(prevSessions) || prevSessions.length === 0) return true;
+  const e = entry._seqEpoch;
+  if (!e) return false; // v1 / epoch-less carriers never degrade
+  // Reject when ANY already-merged session shares the entry's epoch (a same-
+  // session broken carrier preceded by a healthy one must not degrade into the
+  // same-session merge branch). Today batches are single-session per epoch, so
+  // this is a defensive closure for future non-monotonic epoch streams.
+  return prevSessions.every((s) => !s._seqEpoch || s._seqEpoch !== e);
+}
+
 /**
  * 增量合并 mainAgent sessions。
  *
@@ -39,6 +73,8 @@ export function isMergeBlockedEntry(entry, options = {}) {
  *  - 命中且 overlapLen <  newLen：push `newMessages[overlapLen..]`，引用稳定。
  *  - 未命中：newLen<curLen → rebuild（/compact summary）；newLen===curLen → 整段 append（Plan Mode 全新片段）；
  *           newLen>curLen → 严格前缀扩展语义（push tail），fp 加固后真正存在重叠的窗口必被 anchor 命中。
+ *  - 降级 partial 基底（lastSession._partialData）且 anchor 未命中：任何长度的全量条目都整段替换
+ *    （partial 前缀有中段缺口、不可信，push tail 会翻倍）。
  *
  * 顶部守卫（isPostClearCheckpoint / userId / transient filter）维持 1.6.245 行为不变。
  *
@@ -68,7 +104,13 @@ export function mergeMainAgentSessions(prevSessions, entry, options = {}) {
   const entryModel = getEffectiveModel(entry);
 
   if (prevSessions.length === 0) {
-    return [{ userId, messages: newMessages, response: newResponse, entryTimestamp, model: entryModel, _seqEpoch: seqEpoch }];
+    return [{
+      userId, messages: newMessages, response: newResponse, entryTimestamp, model: entryModel, _seqEpoch: seqEpoch,
+      // Degraded-broken carrier: truthful prefix with a mid-session hole. Only
+      // the create branches carry it (a same-session merge onto a partial base
+      // is defused by the whole-replace below); ChatView renders the banner.
+      ...(entry._partialData === true && { _partialData: true }),
+    }];
   }
 
   const lastSession = prevSessions[prevSessions.length - 1];
@@ -90,7 +132,10 @@ export function mergeMainAgentSessions(prevSessions, entry, options = {}) {
     for (let i = 0; i < newMessages.length; i++) {
       if (!newMessages[i]._timestamp) newMessages[i]._timestamp = entryTimestamp;
     }
-    return [...prevSessions, { userId, messages: newMessages, response: newResponse, entryTimestamp, model: entryModel, _seqEpoch: seqEpoch }];
+    return [...prevSessions, {
+      userId, messages: newMessages, response: newResponse, entryTimestamp, model: entryModel, _seqEpoch: seqEpoch,
+      ...(entry._partialData === true && { _partialData: true }),
+    }];
   }
 
   if (!options.skipTransientFilter && isNewConversation && newMessages.length <= 4 && prevMsgCount > 4) {
@@ -119,6 +164,17 @@ export function mergeMainAgentSessions(prevSessions, entry, options = {}) {
           lastSession.messages.push(newMessages[i]);
         }
       }
+      // Anchor 对齐成功：新全量条目与 partial 前缀吻合，数据已恢复完整。
+      delete lastSession._partialData;
+    } else if (lastSession._partialData) {
+      // 降级合并的 partial 会话（中段缺口，前缀不可信）：anchor 未命中时任何
+      // 同长/更长的全量条目都是权威真值，整段替换而非前缀扩展——否则会 push 出
+      // 尾部重复（partial 里已含 416..418，新全量 419 会被 append 一遍）。
+      for (let i = 0; i < newLen; i++) {
+        if (!newMessages[i]._timestamp) newMessages[i]._timestamp = entryTimestamp;
+      }
+      lastSession.messages = newMessages;
+      delete lastSession._partialData;
     } else if (newLen < curLen) {
       // /compact summary 等真重建：替换 messages 引用。
       for (let i = 0; i < newLen; i++) {
@@ -175,6 +231,9 @@ export function mergeMainAgentSessions(prevSessions, entry, options = {}) {
     if (entryModel) lastSession.model = entryModel; // latest wins; model-less entries keep the stamp
     return [...prevSessions];
   } else {
-    return [...prevSessions, { userId, messages: newMessages, response: newResponse, entryTimestamp, model: entryModel, _seqEpoch: seqEpoch }];
+    return [...prevSessions, {
+      userId, messages: newMessages, response: newResponse, entryTimestamp, model: entryModel, _seqEpoch: seqEpoch,
+      ...(entry._partialData === true && { _partialData: true }),
+    }];
   }
 }

package/src/utils/v3Assembler.js

@@ -80,8 +80,20 @@ export function createV3Assembler() {
         _seqEpoch: `v2:${row.sessionId}`,
         _totalMessageCount: messages.length,
         _v3Assembled: true,
+        // The SOURCE row — lets chat classification read the server-side
+        // typeTag directly (same source the request list uses), instead of
+        // re-deriving from a body stripped of system/tools. Known limitation:
+        // AppBase._applyV3Delta dedups by (sessionId, seq, inProgress), so a
+        // classification-correction re-send (Preflight/Plan lookahead) does NOT
+        // rebuild this entry — the row ref stays the FIRST one until a cold
+        // reload. Only lookahead-dependent rows are affected (Teammate/SubAgent
+        // tags are lookahead-free); tracked as backlog.
+        _v3Row: row,
       };
       if (row.teammate) entry.teammate = row.teammate;
+      // Wire agent identity (x-claude-code-agent-id) — display name for native
+      // teammates, persisted server-side (see agent-id.js).
+      if (row.agent) entry.agent = row.agent;
       if (row.proxyUrl) entry.proxyUrl = row.proxyUrl;
       if (isSnapshot) entry._isCheckpoint = true;
       if (row.inProgress) {