chatccc 0.2.258 → 0.2.260

package/dist/src/progress/reducer.js

@@ -57,6 +57,10 @@ export function reduceProgress(prev, event) {
         case "text":
             // accumulated 是全文累积，直接全量替换，天然幂等
             return withProgressView(prev, { text: event.accumulated });
+        case "progress":
+            return withProgressView(prev, { headerTitle: "思考中..." });
+        case "text_reset":
+            return withProgressView(prev, { text: "", tools: [] });
         case "tool_use": {
             const tool = {
                 id: event.id ?? `tool-${prev.tools.length + 1}`,

package/dist/src/response-stall.js

@@ -2,10 +2,10 @@
  * Tracks how long the displayed output character count has remained unchanged.
  * Leaving a monitored phase clears the window; returning starts a fresh one.
  */
-export function observeResponseProgress(previous, isMonitoredPhase, totalChars, now = Date.now()) {
+export function observeResponseProgress(previous, isMonitoredPhase, totalChars, now = Date.now(), heartbeat = false) {
     if (!isMonitoredPhase)
         return undefined;
-    if (previous?.totalChars === totalChars)
+    if (!heartbeat && previous?.totalChars === totalChars)
         return previous;
     return { totalChars, unchangedSince: now };
 }

package/dist/src/session.js

@@ -10,6 +10,7 @@ import { createClaudeAdapter } from "./adapters/claude-adapter.js";
 import { createCursorAdapter } from "./adapters/cursor-adapter.js";
 import { createCodexAdapter } from "./adapters/codex-adapter.js";
 import { createCccAdapter } from "./adapters/ccc-adapter.js";
+import { createDshAdapter } from "./adapters/dsh-adapter.js";
 import { killProcessTree } from "./adapters/proc-tree-kill.js";
 import { resourceMonitor, registerProcess, unregisterProcess } from "./adapters/resource-monitor.js";
 import { buildImSkillsPromptCached, exportSkillSubDocs } from "./im-skills.js";
@@ -233,7 +234,7 @@ function formatAutoEndedReply(finalReply) {
  * 状态或资源保护，不能把它们消耗的时间算入回复停滞窗口。
  */
 function monitorsOutputProgress(kind) {
-    return kind === "responding";
+    return kind === "responding" || kind === "thinking";
 }
 function formatTerminalReply(status, finalReply, terminalError) {
     if (status === "auto_ended")
@@ -418,6 +419,8 @@ export function getEffectiveModelForTool(tool, sessionId) {
         return config.codex.model;
     if (tool === "ccc")
         return config.ccc.model;
+    if (tool === "dsh")
+        return config.dsh.model;
     return CLAUDE_MODEL;
 }
 export function getEffectiveEffortForTool(tool, sessionId) {
@@ -528,14 +531,23 @@ export function getAdapterForTool(tool, sessionId) {
             apiKey: config.ccc.DEEPSEEK_API_KEY,
             baseURL: config.ccc.DEEPSEEK_BASE_URL,
             model: effectiveModel || undefined,
-            effort: effectiveEffort || undefined,
             compactionTimeoutMs: config.ccc.compactionTimeoutMs,
             contextWindow: config.ccc.contextWindow,
+            ...(effectiveEffort ? { effort: effectiveEffort } : {}),
             // 留空（""）不传 → ChatSession 跟随 DeepCCC 内核配置（~/.deepccc/config.json 或 DEEPCCC_PROVIDER）
             ...(config.ccc.provider ? { provider: config.ccc.provider } : {}),
             ...(config.ccc.subModel ? { subModel: config.ccc.subModel } : {}),
         });
     }
+    else if (tool === "dsh") {
+        adapter = createDshAdapter({
+            apiKey: config.dsh.apiKey,
+            baseUrl: config.dsh.baseUrl,
+            model: effectiveModel || config.dsh.model,
+            provider: config.dsh.provider,
+            maxTokens: config.dsh.maxTokens,
+        });
+    }
     else {
         adapter = createClaudeAdapter({
             model: effectiveModel,
@@ -761,6 +773,14 @@ export function accumulateBlockContent(block, state, toolCallMap) {
             // 覆盖而非追加：适配器已保证这是一段完整最终文本（如 Cursor 流末快照）
             state.finalCompleteText = block.text;
             break;
+        case "text_reset":
+            state.accumulatedContent = "";
+            state.finalText = "";
+            state.finalCompleteText = "";
+            state.chunkCount = 0;
+            break;
+        case "agent_progress":
+            break;
         case "compact_boundary": {
             const triggerLabel = block.trigger === "manual" ? "手动" : "自动"; // 手动 / 自动
             state.accumulatedContent +=
@@ -844,6 +864,10 @@ function formatToolConfigForLog(tool, sessionModel, sessionId) {
         const modelStr = m.trim() !== "" ? m : "(not configured)";
         return `model=${modelStr}, baseURL=${config.ccc.DEEPSEEK_BASE_URL}`;
     }
+    if (tool === "dsh") {
+        const model = getEffectiveModelForTool(tool, sessionId);
+        return `model=${model || "(not configured)"}, baseURL=${config.dsh.baseUrl}`;
+    }
     return `model=${anthropicConfigDisplay(getModelForSession(sessionId))}, subagentModel=${anthropicConfigDisplay(CLAUDE_SUBAGENT_MODEL)}, effort=${anthropicConfigDisplay(getEffectiveEffortForTool(tool, sessionId))}`;
 }
 export async function initClaudeSession(tool, overrideCwd, chatId) {
@@ -1238,7 +1262,15 @@ export async function runAgentSession(sessionId, userText, platform, _chatId, ms
                 }
             }
             let activityChanged = false;
+            let progressHeartbeat = false;
+            let outputReset = false;
             for (const block of unifiedMsg.blocks) {
+                if (block.type === "agent_progress")
+                    progressHeartbeat = true;
+                if (block.type === "text_reset") {
+                    outputReset = true;
+                    toolCallMap.clear();
+                }
                 if (updateAgentActivity(activityTracker, block))
                     activityChanged = true;
                 accumulateBlockContent(block, state, toolCallMap);
@@ -1263,11 +1295,11 @@ export async function runAgentSession(sessionId, userText, platform, _chatId, ms
                 prompt.responseProgress = observeResponseProgress(
                 // starting → responding 本身是一次有效进展，即便首个文本块仍为空也应
                 // 重新计时；其它活动阶段会清空观察窗口。
-                activityChanged ? undefined : prompt.responseProgress, monitorsOutputProgress(activityTracker.activity.kind), totalChars, Date.now());
+                activityChanged ? undefined : prompt.responseProgress, monitorsOutputProgress(activityTracker.activity.kind), totalChars, Date.now(), progressHeartbeat);
             }
             // 定时写入文件
             const now2 = Date.now();
-            if (activityChanged || now2 - lastFileWrite >= FILE_WRITE_INTERVAL_MS) {
+            if (activityChanged || outputReset || now2 - lastFileWrite >= FILE_WRITE_INTERVAL_MS) {
                 lastFileWrite = now2;
                 await writeStreamState({
                     sessionId,
@@ -2045,6 +2077,13 @@ async function resolveModelEffort(tool, sessionId) {
             effort: null,
         };
     }
+    if (tool === "dsh") {
+        const model = getEffectiveModelForTool(tool, sessionId);
+        return {
+            model: model.trim() !== "" ? model : UNKNOWN_MODEL_PLACEHOLDER,
+            effort: null,
+        };
+    }
     return {
         model: anthropicConfigDisplay(getModelForSession(sessionId)),
         effort: anthropicConfigDisplay(getEffectiveEffortForTool(tool, sessionId)),