chatccc 0.2.259 → 0.2.261

package/dist/src/orchestrator.js

@@ -298,6 +298,8 @@ async function resolveUsageTarget(chatId) {
             return { tool: "cursor", sessionId: record?.sessionId };
         if (tool === "ccc")
             return { tool: "ccc", sessionId: record?.sessionId };
+        if (tool === "dsh")
+            return { tool: "dsh", sessionId: record?.sessionId };
         return { tool: "codex", sessionId: record?.sessionId };
     }
     catch {
@@ -345,25 +347,28 @@ function refreshUsageAvatar(platform, chatId, tool, status, usageHints, sessionI
     });
 }
 async function sendUsageSummary(platform, chatId, tool, avatarStatus = "idle", sessionId) {
-    if (tool === "ccc") {
-        const baseURL = config.ccc.DEEPSEEK_BASE_URL;
+    if (tool === "ccc" || tool === "dsh") {
+        const isDsh = tool === "dsh";
+        const baseURL = isDsh ? config.dsh.baseUrl : config.ccc.DEEPSEEK_BASE_URL;
+        const apiKey = isDsh ? config.dsh.apiKey : config.ccc.DEEPSEEK_API_KEY;
+        const toolLabel = isDsh ? "DeepSeek Harness" : "CCC";
         if (!isOfficialDeepSeek(baseURL)) {
-            const msg = "CCC 用量查询仅支持官方 DeepSeek API (api.deepseek.com)，当前使用的非官方接口不支持余额查询。";
+            const msg = `${toolLabel} 用量查询仅支持官方 DeepSeek API (api.deepseek.com)，当前使用的非官方接口不支持余额查询。`;
             if (platform.kind === "wechat") {
                 await platform.sendText(chatId, msg).catch(() => { });
             }
             else {
-                await platform.sendCard(chatId, "CCC Usage", msg, "blue");
+                await platform.sendCard(chatId, `${toolLabel} Usage`, msg, "blue");
             }
             return;
         }
-        const balance = await fetchDeepSeekBalance(config.ccc.DEEPSEEK_API_KEY, baseURL);
+        const balance = await fetchDeepSeekBalance(apiKey, baseURL);
         const content = formatDeepSeekBalance(balance);
         if (platform.kind === "wechat") {
             await platform.sendText(chatId, content).catch(() => { });
         }
         else {
-            await platform.sendCard(chatId, "CCC Usage", content, "blue");
+            await platform.sendCard(chatId, `${toolLabel} Usage`, content, "blue");
         }
         return;
     }
@@ -396,7 +401,7 @@ async function sendUsageSummary(platform, chatId, tool, avatarStatus = "idle", s
     refreshUsageAvatar(platform, chatId, tool, avatarStatus, { codexUsage: usage }, sessionId);
 }
 async function sendUsageError(platform, chatId, tool, err) {
-    const toolLabel = tool === "cursor" ? "Cursor" : tool === "ccc" ? "CCC" : "Codex";
+    const toolLabel = tool === "cursor" ? "Cursor" : tool === "ccc" ? "CCC" : tool === "dsh" ? "DeepSeek Harness" : "Codex";
     const message = `${toolLabel} 用量获取失败：${err.message}`;
     if (platform.kind === "wechat") {
         await platform.sendText(chatId, message).catch(() => { });
@@ -985,10 +990,10 @@ export async function handleCommand(platform, text, chatId, openId, msgTimestamp
         const toolArg = text.slice(5).trim().toLowerCase();
         const tool = toolArg || resolveDefaultAgentTool();
         logTrace(tid, "BRANCH", { cmd: "/new", tool });
-        const validTools = ["claude", "cursor", "codex", "ccc"];
+        const validTools = ["claude", "cursor", "codex", "ccc", "dsh"];
         if (!validTools.includes(tool)) {
             logTrace(tid, "DONE", { outcome: "new_invalid_tool", tool });
-            await platform.sendCard(chatId, "Error", `未知的工具类型: "${toolArg}"。支持: claude (Claude Code), cursor (Cursor), codex (Codex), ccc (CCC Agent)。`, "red");
+            await platform.sendCard(chatId, "Error", `未知的工具类型: "${toolArg}"。支持: claude (Claude Code), cursor (Cursor), codex (Codex), ccc (CCC Agent), dsh (DeepSeek Harness)。`, "red");
             return;
         }
         const toolLabel = toolDisplayName(tool);
@@ -1525,13 +1530,17 @@ export async function handleCommand(platform, text, chatId, openId, msgTimestamp
             const index = parseInt(sessionMatch[1], 10) - 1;
             logTrace(tid, "BRANCH", { cmd: "/session", index: index + 1 });
             const allSessions = await getAllSessionsStatus();
-            const claudeOrdered = allSessions.filter((s) => s.tool !== "cursor" && s.tool !== "codex");
+            const claudeOrdered = allSessions.filter((s) => s.tool === "claude");
             const cursorOrdered = allSessions.filter((s) => s.tool === "cursor");
             const codexOrdered = allSessions.filter((s) => s.tool === "codex");
+            const cccOrdered = allSessions.filter((s) => s.tool === "ccc");
+            const dshOrdered = allSessions.filter((s) => s.tool === "dsh");
             const ordered = [
                 ...claudeOrdered,
                 ...cursorOrdered,
                 ...codexOrdered,
+                ...cccOrdered,
+                ...dshOrdered,
             ];
             if (ordered.length === 0) {
                 await platform.sendCard(chatId, "/session", "暂无历史会话。", "yellow");
@@ -1941,6 +1950,8 @@ export async function handleCommand(platform, text, chatId, openId, msgTimestamp
             currentModel = config.codex.model;
         else if (defaultTool === "ccc")
             currentModel = config.ccc.model;
+        else if (defaultTool === "dsh")
+            currentModel = config.dsh.model;
         else
             currentModel = CLAUDE_MODEL;
         if (platform.kind === "wechat") {

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";
@@ -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) {
@@ -536,6 +539,15 @@ export function getAdapterForTool(tool, sessionId) {
             ...(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,
@@ -852,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) {
@@ -2061,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)),