ccpanel 0.1.5 → 0.1.6

package/dist/cli.js

@@ -1508,6 +1508,18 @@ function blocksFromContent(content) {
   }
   return out;
 }
+function outputText(output) {
+  if (typeof output === "string") return output;
+  return textFromContent(output);
+}
+function summaryText(summary) {
+  if (!Array.isArray(summary)) return "";
+  return summary.map((raw) => {
+    if (!raw || typeof raw !== "object") return "";
+    const s = raw;
+    return typeof s.text === "string" ? s.text : "";
+  }).filter(Boolean).join("\n");
+}
 function parseFunctionArguments(args) {
   if (typeof args !== "string") return JSON.stringify(args ?? {}, null, 2);
   try {
@@ -1523,7 +1535,9 @@ var CodexSessionService = class {
       this.readIndex(paths)
     ]);
     const project = normalizeProjectPath(projectPath);
-    return rollouts.filter((r) => normalizeProjectPath(r.cwd) === project).map((r) => {
+    return rollouts.filter(
+      (r) => normalizeProjectPath(r.cwd) === project && r.threadSource !== "subagent"
+    ).map((r) => {
       const idx = index.get(r.id);
       const mtime = idx?.updatedAt ? Date.parse(idx.updatedAt) : r.mtime;
       return {
@@ -1538,12 +1552,38 @@ var CodexSessionService = class {
   async read(paths, projectPath, id) {
     assertSafeId2(id);
     const project = normalizeProjectPath(projectPath);
-    const found = (await this.scanRollouts(paths)).find(
+    const rollouts = await this.scanRollouts(paths);
+    const found = rollouts.find(
       (r) => r.id === id && normalizeProjectPath(r.cwd) === project
     );
     if (!found) throw new Error(`\u672A\u627E\u5230\u4F1A\u8BDD\uFF1A${id}`);
     const parsed = this.parseDetail(await readFile9(found.file, "utf8"));
-    return { messages: parsed.messages, subagents: [], skippedRecords: parsed.skipped };
+    const subagents = await this.readSubagents(rollouts, parsed.subagentRefs);
+    return { messages: parsed.messages, subagents, skippedRecords: parsed.skipped };
+  }
+  // 按 sub_agent_activity(started) 引用加载子会话；文件缺失或解析失败均跳过，
+  // 不影响主会话展示。只嵌套一层：子会话内部的 subagentRefs 不再展开。
+  async readSubagents(rollouts, refs) {
+    const out = [];
+    for (const ref of refs) {
+      const rollout = rollouts.find((r) => r.id === ref.threadId);
+      if (!rollout) continue;
+      let parsed;
+      try {
+        parsed = this.parseDetail(await readFile9(rollout.file, "utf8"));
+      } catch {
+        continue;
+      }
+      const firstUser = parsed.messages.find((m) => m.type === "user");
+      out.push({
+        toolUseId: ref.toolUseId,
+        agentId: ref.threadId,
+        agentType: ref.agentPath.split("/").filter(Boolean).pop() ?? "subagent",
+        description: (firstUser?.blocks[0]?.text ?? "").replace(/\s+/g, " ").trim().slice(0, 200),
+        messages: parsed.messages
+      });
+    }
+    return out;
   }
   async scanRollouts(paths) {
     const files = await this.rolloutFiles(paths.codexSessionsDir);
@@ -1580,6 +1620,7 @@ var CodexSessionService = class {
     let cwd = "";
     let firstPrompt = "";
     let messageCount = 0;
+    let threadSource;
     for (const line of raw.split("\n")) {
       if (!line.trim()) continue;
       let obj;
@@ -1592,6 +1633,7 @@ var CodexSessionService = class {
       if (obj.type === "session_meta" || payload.type === "session_meta") {
         id = String(payload.id ?? id);
         cwd = String(payload.cwd ?? cwd);
+        if (payload.thread_source) threadSource = String(payload.thread_source);
         continue;
       }
       if (payload.type === "message") {
@@ -1607,7 +1649,16 @@ var CodexSessionService = class {
       id = m?.[1] ?? "";
     }
     if (!id || !cwd) return void 0;
-    return { id, file, cwd, mtime: st.mtimeMs, size: st.size, firstPrompt, messageCount };
+    return {
+      id,
+      file,
+      cwd,
+      mtime: st.mtimeMs,
+      size: st.size,
+      firstPrompt,
+      messageCount,
+      threadSource
+    };
   }
   async readIndex(paths) {
     const out = /* @__PURE__ */ new Map();
@@ -1637,8 +1688,22 @@ var CodexSessionService = class {
   }
   parseDetail(raw) {
     const messages = [];
+    const subagentRefs = [];
     let skipped = 0;
     let currentAssistant;
+    let pendingReasoning = "";
+    const ensureAssistant = (timestamp) => {
+      if (!currentAssistant) {
+        currentAssistant = {
+          type: "assistant",
+          role: "assistant",
+          timestamp: timestamp ? String(timestamp) : void 0,
+          blocks: []
+        };
+        messages.push(currentAssistant);
+      }
+      return currentAssistant;
+    };
     for (const line of raw.split("\n")) {
       if (!line.trim()) continue;
       let obj;
@@ -1649,6 +1714,30 @@ var CodexSessionService = class {
         continue;
       }
       const payload = payloadOf(obj);
+      if (payload.type === "agent_reasoning") {
+        const text = String(payload.text ?? "").trim();
+        if (text) pendingReasoning = text;
+        continue;
+      }
+      if (payload.type === "reasoning") {
+        const text = pendingReasoning || summaryText(payload.summary);
+        pendingReasoning = "";
+        ensureAssistant(obj.timestamp).blocks.push({
+          kind: "thinking",
+          text: truncate2(text)
+        });
+        continue;
+      }
+      if (payload.type === "sub_agent_activity") {
+        if (payload.kind === "started" && payload.event_id && payload.agent_thread_id) {
+          subagentRefs.push({
+            toolUseId: String(payload.event_id),
+            threadId: String(payload.agent_thread_id),
+            agentPath: String(payload.agent_path ?? "")
+          });
+        }
+        continue;
+      }
       if (payload.type === "message") {
         const role = String(payload.role ?? "");
         if (role !== "user" && role !== "assistant") continue;
@@ -1663,45 +1752,26 @@ var CodexSessionService = class {
         currentAssistant = role === "assistant" ? msg : void 0;
         continue;
       }
-      if (payload.type === "function_call") {
-        const target = currentAssistant ?? {
-          type: "assistant",
-          role: "assistant",
-          timestamp: obj.timestamp ? String(obj.timestamp) : void 0,
-          blocks: []
-        };
-        if (!currentAssistant) {
-          messages.push(target);
-          currentAssistant = target;
-        }
-        target.blocks.push({
+      if (payload.type === "function_call" || payload.type === "custom_tool_call") {
+        const args = payload.type === "custom_tool_call" ? payload.input : payload.arguments;
+        ensureAssistant(obj.timestamp).blocks.push({
           kind: "tool_use",
           name: String(payload.name ?? "tool"),
-          text: truncate2(parseFunctionArguments(payload.arguments)),
+          text: truncate2(parseFunctionArguments(args)),
           toolUseId: payload.call_id ? String(payload.call_id) : void 0
         });
         continue;
       }
-      if (payload.type === "function_call_output") {
-        const target = currentAssistant ?? {
-          type: "assistant",
-          role: "assistant",
-          timestamp: obj.timestamp ? String(obj.timestamp) : void 0,
-          blocks: []
-        };
-        if (!currentAssistant) {
-          messages.push(target);
-          currentAssistant = target;
-        }
-        target.blocks.push({
+      if (payload.type === "function_call_output" || payload.type === "custom_tool_call_output") {
+        ensureAssistant(obj.timestamp).blocks.push({
           kind: "tool_result",
-          text: truncate2(String(payload.output ?? "")),
+          text: truncate2(outputText(payload.output)),
           isError: payload.is_error === true,
           toolUseId: payload.call_id ? String(payload.call_id) : void 0
         });
       }
     }
-    return { messages, skipped };
+    return { messages, skipped, subagentRefs };
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccpanel",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "本地图形化管理 Claude Code 配置：MCP、Skills、子 Agent、Commands、配置文件、Memory、Sessions、Plugins",
   "type": "module",
   "repository": {