deepccc 0.2.7 → 0.2.8

package/README.md

@@ -155,7 +155,7 @@ deepccc
 
 Web UI 支持新建、恢复、重命名和删除多会话，多个会话可以同时运行，即使它们指向同一个工作目录。每个会话可独立选择 model、subModel 和 effort，并持续复用 CLI 已保存的历史。注意：当前版本不自动创建 Git worktree；同目录的多个运行中 Agent 直接修改同一组文件，页面会提示覆盖与冲突风险。
 
-模型文本、reasoning 心跳和工具事件通过 SSE 实时更新。每次工具调用与对应结果合并成一张卡片，折叠态显示 emoji、工具名、状态和关键参数；展开后调用参数默认保留前 8/后 4 行，工具结果保留前 12/后 6 行，省略内容可继续展开。工具卡及省略行的展开状态保存在当前浏览器标签页的 `sessionStorage`，持续生成、切换会话和刷新页面均不会自动收起。消息正文支持标题、表格、列表、引用、链接和代码块等常用 Markdown。
+模型文本、reasoning 心跳和工具事件通过 SSE 实时更新。每轮消息按真实发生顺序持久化和回放，因此刷新后仍会保持“阶段说明 → 工具调用 → 后续结论”的交错时间线；旧版会话没有顺序数据时，会兼容显示为“工具调用 → 最终回答”。每次工具调用与对应结果合并成一张卡片，折叠态显示 emoji、工具名、状态和关键参数；展开后调用参数默认保留前 8/后 4 行，工具结果保留前 12/后 6 行，省略内容可继续展开。工具卡及省略行的展开状态保存在当前浏览器标签页的 `sessionStorage`，持续生成、切换会话和刷新页面均不会自动收起。消息正文支持标题、表格、列表、引用、链接和代码块等常用 Markdown。
 
 图片始终按本地附件处理，不转换为 Provider 原生多模态消息。Web 支持文件选择、剪贴板粘贴和拖拽，每条消息最多 10 张 PNG/JPEG/WebP、单张最大 20 MB；附件复制到 `~/.deepccc/attachments/<session-id>/`，Agent 收到本地绝对路径后使用可用工具自行处理。Agent 可调用 `present_file` 把当前工作目录或会话附件目录中的图片直接展示在会话中；删除会话时对应附件一并清理。
 

package/dist/context.d.ts

@@ -13,11 +13,28 @@ export interface BuiltinContextToolCall {
     output?: string;
     is_error?: boolean;
 }
+export type BuiltinContextTimelineEntry = {
+    type: "text";
+    text: string;
+} | {
+    type: "tool_use";
+    id: string;
+    name: string;
+    input?: string;
+} | {
+    type: "tool_result";
+    tool_use_id: string;
+    name?: string;
+    output?: string;
+    is_error?: boolean;
+};
 export interface BuiltinContextMessage {
     role: BuiltinContextRole;
     content: string;
     /** 可选结构化工具调用记录（assistant 消息专用） */
     toolCalls?: BuiltinContextToolCall[];
+    /** 文本与工具事件的真实发生顺序，仅供 UI 回放；模型上下文仍使用 content。 */
+    timeline?: BuiltinContextTimelineEntry[];
 }
 export interface BuiltinContextState {
     version: 1;
@@ -90,6 +107,8 @@ export declare function buildPersistedAssistantMessage(params: {
     transcriptLines: readonly string[];
     /** 结构化工具调用（按调用顺序）；有则写入消息的 toolCalls 字段 */
     toolCalls?: readonly BuiltinContextToolCall[];
+    /** 文本和工具事件的有序时间线；不参与模型输入。 */
+    timeline?: readonly BuiltinContextTimelineEntry[];
     maxAssistantChars?: number;
     maxTranscriptChars?: number;
 }): BuiltinContextMessage;

package/dist/context.js

@@ -49,8 +49,42 @@ function normalizeMessage(value) {
     const toolCalls = normalizeToolCalls(raw.toolCalls);
     if (toolCalls.length > 0)
         message.toolCalls = toolCalls;
+    const timeline = normalizeTimeline(raw.timeline);
+    if (timeline.length > 0)
+        message.timeline = timeline;
     return message;
 }
+function normalizeTimeline(value) {
+    if (!Array.isArray(value))
+        return [];
+    const entries = [];
+    for (const item of value.slice(0, 1000)) {
+        if (!item || typeof item !== "object" || Array.isArray(item))
+            continue;
+        const raw = item;
+        if (raw.type === "text" && typeof raw.text === "string") {
+            entries.push({ type: "text", text: raw.text });
+        }
+        else if (raw.type === "tool_use" && typeof raw.id === "string" && typeof raw.name === "string") {
+            entries.push({
+                type: "tool_use",
+                id: raw.id,
+                name: raw.name,
+                ...(typeof raw.input === "string" ? { input: raw.input } : {}),
+            });
+        }
+        else if (raw.type === "tool_result" && typeof raw.tool_use_id === "string") {
+            entries.push({
+                type: "tool_result",
+                tool_use_id: raw.tool_use_id,
+                ...(typeof raw.name === "string" ? { name: raw.name } : {}),
+                ...(typeof raw.output === "string" ? { output: raw.output } : {}),
+                ...(typeof raw.is_error === "boolean" ? { is_error: raw.is_error } : {}),
+            });
+        }
+    }
+    return entries;
+}
 function normalizeToolCalls(value) {
     if (!Array.isArray(value))
         return [];
@@ -217,8 +251,54 @@ export function buildPersistedAssistantMessage(params) {
     const toolCalls = normalizeToolCalls(params.toolCalls);
     if (toolCalls.length > 0)
         message.toolCalls = toolCalls;
+    const timeline = truncatePersistedTimeline(normalizeTimeline(params.timeline));
+    if (timeline.length > 0)
+        message.timeline = timeline;
     return message;
 }
+function truncatePersistedTimeline(entries) {
+    const maxTextChars = DEFAULT_PERSISTED_ASSISTANT_TEXT_CHARS;
+    const maxToolChars = DEFAULT_PERSISTED_TOOL_TRANSCRIPT_CHARS;
+    const totalText = entries.reduce((sum, entry) => sum + (entry.type === "text" ? entry.text.length : 0), 0);
+    const textPayloads = entries.filter((entry) => entry.type === "text" && entry.text.length > 0).length;
+    const totalTool = entries.reduce((sum, entry) => {
+        if (entry.type === "tool_use")
+            return sum + (entry.input?.length ?? 0);
+        if (entry.type === "tool_result")
+            return sum + (entry.output?.length ?? 0);
+        return sum;
+    }, 0);
+    const toolPayloads = entries.filter((entry) => (entry.type === "tool_use" && (entry.input?.length ?? 0) > 0)
+        || (entry.type === "tool_result" && (entry.output?.length ?? 0) > 0)).length;
+    const payloadBudget = (length, total, count, maximum) => {
+        if (total <= maximum)
+            return length;
+        const sharedBudget = Math.max(0, maximum - count);
+        return length > 0 ? 1 + Math.floor(sharedBudget * length / Math.max(1, total)) : 0;
+    };
+    const truncatePayload = (value, budget, marker) => {
+        if (value.length <= budget)
+            return value;
+        if (budget <= marker.length + 2)
+            return value.slice(0, budget);
+        return truncateMiddle(value, budget, marker);
+    };
+    return entries.map((entry) => {
+        if (entry.type === "text") {
+            const budget = payloadBudget(entry.text.length, totalText, textPayloads, maxTextChars);
+            return { ...entry, text: truncatePayload(entry.text, budget, ASSISTANT_TRUNCATED_MARKER) };
+        }
+        if (entry.type === "tool_use" && entry.input !== undefined) {
+            const budget = payloadBudget(entry.input.length, totalTool, toolPayloads, maxToolChars);
+            return { ...entry, input: truncatePayload(entry.input, budget, TOOL_TRANSCRIPT_TRUNCATED_MARKER) };
+        }
+        if (entry.type === "tool_result" && entry.output !== undefined) {
+            const budget = payloadBudget(entry.output.length, totalTool, toolPayloads, maxToolChars);
+            return { ...entry, output: truncatePayload(entry.output, budget, TOOL_TRANSCRIPT_TRUNCATED_MARKER) };
+        }
+        return entry;
+    });
+}
 function serializeMessagesForCompaction(messages) {
     const sections = [];
     let remaining = MAX_COMPACTION_SOURCE_CHARS;

package/dist/index.js

@@ -393,6 +393,8 @@ export class ChatSession {
         // assistant 消息 toolCalls 字段；[Tool transcript] 文本视图仍按原格式生成。
         const toolCallsById = new Map();
         const toolCallOrder = [];
+        const timeline = [];
+        let toolContext = [];
         try {
             if (this.context.planCompaction()) {
                 yield { type: "status", phase: "compacting" };
@@ -460,9 +462,10 @@ export class ChatSession {
             for (let attempt = 0; attempt < 2; attempt += 1) {
                 fullText = "";
                 safeAccumulated = "";
-                const toolContext = [];
+                toolContext = [];
                 toolCallsById.clear();
                 toolCallOrder.length = 0;
+                timeline.length = 0;
                 let lastReasoningProgressAt;
                 const attemptMessages = attempt === 0
                     ? modelMessages
@@ -493,6 +496,11 @@ export class ChatSession {
                     }
                     else if (part.type === "text-delta") {
                         fullText += part.text;
+                        const previous = timeline[timeline.length - 1];
+                        if (previous?.type === "text")
+                            previous.text += part.text;
+                        else
+                            timeline.push({ type: "text", text: part.text });
                         // 隐私替换只在展示层：safeAccumulated 供事件消费者（终端/JSONL）使用，
                         // fullText 原文用于持久化上下文，避免替换结果回流污染上下文。
                         const safeText = applyPrivacy(part.text);
@@ -500,9 +508,11 @@ export class ChatSession {
                         yield { type: "text", text: safeText, accumulated: safeAccumulated };
                     }
                     else if (part.type === "tool-call") {
-                        toolContext.push(`tool_call ${part.toolName}: ${safeJson(part.input)}`);
-                        toolCallsById.set(part.toolCallId, { id: part.toolCallId, name: part.toolName, input: safeJson(part.input) });
+                        const input = safeJson(part.input);
+                        toolContext.push(`tool_call ${part.toolName}: ${input}`);
+                        toolCallsById.set(part.toolCallId, { id: part.toolCallId, name: part.toolName, input });
                         toolCallOrder.push(part.toolCallId);
+                        timeline.push({ type: "tool_use", id: part.toolCallId, name: part.toolName, input });
                         yield {
                             type: "tool_use",
                             id: part.toolCallId,
@@ -511,10 +521,12 @@ export class ChatSession {
                         };
                     }
                     else if (part.type === "tool-result") {
-                        toolContext.push(`tool_result ${part.toolName}: ${truncateToolContext(safeJson(part.output))}`);
+                        const output = truncateToolContext(safeJson(part.output));
+                        toolContext.push(`tool_result ${part.toolName}: ${output}`);
                         const call = toolCallsById.get(part.toolCallId);
                         if (call)
-                            call.output = truncateToolContext(safeJson(part.output));
+                            call.output = output;
+                        timeline.push({ type: "tool_result", tool_use_id: part.toolCallId, name: part.toolName, output });
                         yield {
                             type: "tool_result",
                             tool_use_id: part.toolCallId,
@@ -531,6 +543,7 @@ export class ChatSession {
                             call.output = message;
                             call.is_error = true;
                         }
+                        timeline.push({ type: "tool_result", tool_use_id: part.toolCallId, name: part.toolName, output: message, is_error: true });
                         yield {
                             type: "tool_result",
                             tool_use_id: part.toolCallId,
@@ -570,6 +583,7 @@ export class ChatSession {
                     fullText,
                     transcriptLines: toolContext,
                     toolCalls: collectedToolCalls,
+                    timeline,
                 }));
                 yield { type: "done", text: safeAccumulated };
                 return;
@@ -581,9 +595,22 @@ export class ChatSession {
             if (malformedProtocolOutput)
                 yield { type: "text_reset" };
             if (err.name === "AbortError" || signal?.aborted) {
-                // 被中断时，不保存不完整的助手消息
-                if (fullText && !malformedProtocolOutput) {
-                    this.context.appendMessage({ role: "assistant", content: `${fullText}\n[interrupted]` });
+                if ((fullText || toolCallOrder.length > 0) && !malformedProtocolOutput) {
+                    const collectedToolCalls = toolCallOrder
+                        .map((id) => toolCallsById.get(id))
+                        .filter((call) => call !== undefined);
+                    const interruptedTimeline = timeline.map((entry) => ({ ...entry }));
+                    const previous = interruptedTimeline[interruptedTimeline.length - 1];
+                    if (previous?.type === "text")
+                        previous.text += "\n[interrupted]";
+                    else
+                        interruptedTimeline.push({ type: "text", text: "[interrupted]" });
+                    this.context.appendMessage(buildPersistedAssistantMessage({
+                        fullText: `${fullText}\n[interrupted]`,
+                        transcriptLines: toolContext,
+                        toolCalls: collectedToolCalls,
+                        timeline: interruptedTimeline,
+                    }));
                 }
                 yield { type: "done", text: safeAccumulated };
                 return;

package/dist/web-page.js

@@ -325,7 +325,10 @@ export const DEEPCCC_WEB_PAGE = `<!DOCTYPE html>
   function setToolState(key,value){try{sessionStorage.setItem(toolStorageKey(key),value?'1':'0');}catch(error){}}
   function clearToolSessionState(sessionId){try{var prefix='deepccc:tool-ui:v1:'+sessionId+':';for(var index=sessionStorage.length-1;index>=0;index--){var key=sessionStorage.key(index);if(key&&key.indexOf(prefix)===0)sessionStorage.removeItem(key);}}catch(error){}}
   function toolSectionHtml(call,kind,value,headLines,tailLines){if(value===undefined)return'';var result=truncateToolPayload(value,headLines,tailLines);var stateKey=call.uiKey+':'+kind+'-full';var expanded=toolState(stateKey);var text=expanded?result.full:result.preview;var label=kind==='input'?'调用参数':'工具结果';var button=result.truncated?'<button type="button" class="tool-overflow-toggle" data-tool-overflow="'+escapeHtml(stateKey)+'">'+escapeHtml(expanded?'收起省略内容':(result.omittedLines>0?'展开省略的 '+result.omittedLines+' 行':'展开完整内容'))+'</button>':'';return'<section class="tool-section"><div class="tool-section-title">'+label+'</div><pre>'+escapeHtml(text)+'</pre>'+button+'</section>';}
-  function messageHtml(role,content,toolCalls,messageIndex){var decoded=role==='user'?decodeAttachmentMessage(content):{text:withoutToolTranscript(content),attachments:[]};var tools='';(toolCalls||[]).forEach(function(call,index){tools+=toolCardHtml({uiKey:call.id?'tool:'+call.id:'message:'+messageIndex+':tool:'+index,name:call.name,input:call.input,output:call.output,isError:!!call.is_error,pending:false});});return '<article class="message '+role+'"><div class="avatar">'+(role==='user'?'你':'D')+'</div><div class="bubble"><div class="role">'+(role==='user'?'YOU':'DEEPCCC')+'</div><div class="markdown">'+markdown(decoded.text)+'</div>'+attachmentGallery(decoded.attachments,state.detail.sessionId)+tools+'</div></article>';}
+  function timelineHtml(timeline,messageIndex){var results={};(timeline||[]).forEach(function(item){if(item&&item.type==='tool_result'&&item.tool_use_id)results[item.tool_use_id]=item;});var renderedCalls={};var html='';(timeline||[]).forEach(function(item,index){if(!item)return;if(item.type==='text'){if(item.text)html+='<div class="markdown">'+markdown(item.text)+'</div>';return;}if(item.type==='tool_use'){var id=item.id||('timeline-'+messageIndex+'-'+index);var result=results[id];renderedCalls[id]=true;html+=toolCardHtml({uiKey:'tool:'+id,name:item.name||'tool',input:item.input,output:result?result.output:undefined,isError:!!(result&&result.is_error),pending:!result});return;}if(item.type==='tool_result'&&!renderedCalls[item.tool_use_id]){var fallbackId=item.tool_use_id||('result-'+messageIndex+'-'+index);renderedCalls[fallbackId]=true;html+=toolCardHtml({uiKey:'tool:'+fallbackId,name:item.name||'tool',output:item.output,isError:!!item.is_error,pending:false});}});return html;}
+  function liveTimeline(events){var timeline=[];(events||[]).forEach(function(event){if(event.type!=='agent'||!event.data)return;var item=event.data;if(item.type==='text_reset'){timeline.length=0;return;}if(item.type==='text'){var previous=timeline[timeline.length-1];if(previous&&previous.type==='text')previous.text+=(item.text||'');else timeline.push({type:'text',text:item.text||''});return;}if(item.type==='tool_use')timeline.push({type:'tool_use',id:item.id,name:item.name,input:item.input});else if(item.type==='tool_result')timeline.push({type:'tool_result',tool_use_id:item.tool_use_id,name:item.name,output:item.content,is_error:!!item.is_error});});return timeline;}
+  function legacyToolsHtml(toolCalls,messageIndex){var tools='';(toolCalls||[]).forEach(function(call,index){tools+=toolCardHtml({uiKey:call.id?'tool:'+call.id:'message:'+messageIndex+':tool:'+index,name:call.name,input:call.input,output:call.output,isError:!!call.is_error,pending:false});});return tools;}
+  function messageHtml(role,content,toolCalls,messageIndex,timeline){var decoded=role==='user'?decodeAttachmentMessage(content):{text:withoutToolTranscript(content),attachments:[]};var body;if(role==='user')body='<div class="markdown">'+markdown(decoded.text)+'</div>'+attachmentGallery(decoded.attachments,state.detail.sessionId);else if(timeline&&timeline.length)body=timelineHtml(timeline,messageIndex);else body=legacyToolsHtml(toolCalls,messageIndex)+'<div class="markdown">'+markdown(decoded.text)+'</div>';return '<article class="message '+role+'"><div class="avatar">'+(role==='user'?'你':'D')+'</div><div class="bubble"><div class="role">'+(role==='user'?'YOU':'DEEPCCC')+'</div>'+body+'</div></article>';}
   function buildToolGroups(events){var groups=[];var byId={};var order=[];(events||[]).forEach(function(event){if(event.type!=='agent'||!event.data)return;var item=event.data;if(item.type==='tool_use'){var id=item.id||('call-'+order.length);var group={id:id,uiKey:'tool:'+id,name:item.name||'tool',input:item.input,output:undefined,isError:false,pending:true};byId[id]=group;order.push(id);groups.push(group);}else if(item.type==='tool_result'){var key=item.tool_use_id;var target=key?byId[key]:null;if(target){target.output=item.content;target.isError=!!item.is_error;target.pending=false;}}});return groups;}
   function toolCardHtml(call){var open=toolState(call.uiKey+':card');var present=call.name==='present_file'&&!call.pending?artifactFromOutput(call.output):null;var inputHtml=toolSectionHtml(call,'input',call.input,8,4);var outputHtml=call.pending?'':(present?'<section class="tool-section"><div class="tool-section-title">工具结果</div>'+artifactGallery([{name:'present_file',output:call.output}],state.detail.sessionId)+'</section>':toolSectionHtml(call,'output',call.output==null?'(无输出)':call.output,12,6));return'<details class="tool-card" data-tool-state="'+escapeHtml(call.uiKey+':card')+'"'+(open?' open':'')+'><summary><span class="tool-summary-text">'+escapeHtml(toolSummary(call))+'</span></summary>'+inputHtml+outputHtml+'</details>';}
   function toolCardsHtml(calls){return (calls||[]).map(toolCardHtml).join('');}
@@ -356,11 +359,10 @@ export const DEEPCCC_WEB_PAGE = `<!DOCTYPE html>
     renderAttachmentDrafts();
     var html='<div class="thread">';
     if(!(detail.messages||[]).length&&detail.status!=='running')html+='<div class="empty-thread"><strong>准备开始这个会话</strong><span>在下方输入任务，可附加截图。DeepCCC 会读取当前项目指令、调用工具并持续保存上下文。</span></div>';
-    (detail.messages||[]).forEach(function(message,index){html+=messageHtml(message.role,message.content,message.toolCalls,index);});
+    (detail.messages||[]).forEach(function(message,index){html+=messageHtml(message.role,message.content,message.toolCalls,index,message.timeline);});
     if(detail.status==='running'){
-      var live=(detail.events||[]).slice().reverse().find(function(event){return event.type==='agent'&&event.data&&event.data.type==='text';});
-      if(live)html+=messageHtml('assistant',live.data.accumulated||live.data.text||'',[],'live');
-      html+=toolCardsHtml(buildToolGroups(detail.events));
+      var currentTimeline=liveTimeline(detail.events);
+      if(currentTimeline.length)html+=messageHtml('assistant','',[],'live',currentTimeline);
     }
     var approvals=(detail.approvals||[]).slice();
     if(detail.pendingApproval&&!approvals.some(function(item){return item.approvalId===detail.pendingApproval.approvalId;}))approvals.push(Object.assign({status:'pending'},detail.pendingApproval));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deepccc",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "A lightweight coding agent with OpenAI-compatible and Anthropic Messages API support.",
   "license": "Apache-2.0",
   "keywords": [