chatccc 0.2.270 → 0.2.276

package/dist/deepccc-agent/src/index.js

@@ -5,7 +5,7 @@
  */
 import { createOpenAICompatible } from "@ai-sdk/openai-compatible";
 import { createAnthropic } from "@ai-sdk/anthropic";
-import { generateText, isLoopFinished, stepCountIs, streamText } from "ai";
+import { generateText, isLoopFinished, stepCountIs, streamText, } from "ai";
 import { existsSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { isAbsolute, join, resolve } from "node:path";
@@ -77,6 +77,7 @@ const COMPACTION_RECOVERY_HINT_DISABLED = [
 ].join("\n");
 export const DEFAULT_COMPACTION_TIMEOUT_MS = 5 * 60 * 1000;
 const MAX_COMPACTION_OUTPUT_TOKENS = 16_384;
+const OPENAI_COMPATIBLE_PROVIDER_NAME = "deepccc";
 /** task 子代理工具：子代理单轮对话的最大工具步数（防失控循环，结果收敛后即结束） */
 const TASK_MAX_STEPS = 20;
 /** 子代理最终输出截断：保留前 MAX_TASK_OUTPUT_CHARS 字符，尾部注明截断信息 */
@@ -143,7 +144,7 @@ function addAnthropicToolJsonCompatibilityNote(messages) {
     // 部分 Anthropic→OpenAI/Ark 转换器会用 response_format=json_object
     // 实现工具调用，却只在 messages 中校验 JSON 关键词、不读取顶层 system。
     // 这里仅声明工具参数的编码方式，并明确不要求普通最终回复输出 JSON。
-    return messages.map((message, index) => (index === lastUserIndex
+    return messages.map((message, index) => (index === lastUserIndex && message.role === "user" && typeof message.content === "string"
         ? {
             ...message,
             content: `${message.content}\n\n${ANTHROPIC_TOOL_JSON_COMPATIBILITY_NOTE}`,
@@ -160,11 +161,13 @@ function addAnthropicToolJsonCompatibilityNote(messages) {
 function maybeAppendCompactionRecoveryHint(messages, summary, rawLogsEnabled, sessionId) {
     if (!summary.trim())
         return messages;
-    const summaryIndex = messages.findIndex((message) => message.role === "user" && message.content.startsWith("以下是更早的对话摘要"));
+    const summaryIndex = messages.findIndex((message) => message.role === "user"
+        && typeof message.content === "string"
+        && message.content.startsWith("以下是更早的对话摘要"));
     if (summaryIndex < 0)
         return messages;
     const hint = rawLogsEnabled ? buildCompactionRecoveryHint(sessionId) : COMPACTION_RECOVERY_HINT_DISABLED;
-    return messages.map((message, index) => (index === summaryIndex
+    return messages.map((message, index) => (index === summaryIndex && message.role === "user" && typeof message.content === "string"
         ? { ...message, content: `${message.content}\n\n${hint}` }
         : message));
 }
@@ -219,6 +222,14 @@ function normalizeMaxSteps(value) {
     }
     return value;
 }
+function normalizeMaxOutputTokens(value) {
+    if (value === undefined)
+        return undefined;
+    if (!Number.isFinite(value) || !Number.isInteger(value) || value <= 0) {
+        throw new Error("maxOutputTokens must be a positive integer when provided");
+    }
+    return value;
+}
 function normalizeAnthropicBaseURL(baseURL) {
     // 完全按用户填写的地址使用，不自动补 /v1（AI SDK 仅对官方 api.anthropic.com
     // 特判补一次 /v1，其他地址原样拼接 /messages）。
@@ -239,6 +250,8 @@ export class ChatSession {
     compactionTimeoutMs;
     maxSteps;
     effort;
+    maxOutputTokens;
+    streaming;
     permissionMode;
     permissionResolver;
     permissionGate;
@@ -267,6 +280,7 @@ export class ChatSession {
                 baseURL: this.baseURL,
                 model: this.subModelId || this.modelId,
                 effort: this.effort,
+                maxOutputTokens: this.maxOutputTokens,
             }, {
                 cwd: taskCwd,
                 persist: false,
@@ -304,6 +318,8 @@ export class ChatSession {
         this.subModelId = (overrides.subModel ?? appConfig.subModel ?? "").trim();
         this.provider = normalizeDeepCccProvider(overrides.provider ?? appConfig.provider);
         this.effort = (overrides.effort ?? appConfig.effort ?? "").trim();
+        this.maxOutputTokens = normalizeMaxOutputTokens(overrides.maxOutputTokens ?? appConfig.maxOutputTokens);
+        this.streaming = overrides.streaming ?? appConfig.streaming;
         this.apiKey = apiKey;
         this.baseURL = baseURL;
         const provider = this.provider === "anthropic"
@@ -312,7 +328,7 @@ export class ChatSession {
                 apiKey,
             })
             : createOpenAICompatible({
-                name: "deepccc",
+                name: OPENAI_COMPATIBLE_PROVIDER_NAME,
                 baseURL,
                 apiKey,
                 includeUsage: true,
@@ -339,6 +355,7 @@ export class ChatSession {
             cwd: this.cwd,
             contextWindow: options.contextWindow ?? appConfig.contextWindow,
             compactAtTokens: options.compactAtTokens,
+            maxToolContextTokens: options.maxToolContextTokens,
             keepRecentMessages: options.keepRecentMessages,
         });
         this.permissionGate = new PermissionGate(this.permissionMode, this.permissionResolver);
@@ -379,6 +396,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" };
@@ -415,14 +434,14 @@ export class ChatSession {
                 ? addAnthropicToolJsonCompatibilityNote(hintedMessages)
                 : hintedMessages;
             // effort 按协议映射：
-            // - OpenAI 兼容：providerOptions.deepseek.reasoningEffort 由 @ai-sdk/openai-compatible
-            //   自动映射为请求体 reasoning_effort 字段（DeepSeek 原生支持）；
+            // - OpenAI 兼容：providerOptions 的 key 必须与 createOpenAICompatible.name 一致；
+            //   reasoningEffort 由 SDK 映射为请求体 reasoning_effort 字段；
             // - Anthropic：providerOptions.anthropic.effort 由 @ai-sdk/anthropic 组装为请求体
             //   output_config.effort（官方 Effort API，见 platform.claude.com/docs/en/build-with-claude/effort）
             let effortProviderOptions;
             if (this.effort) {
                 effortProviderOptions = this.provider === "openai"
-                    ? { deepseek: { reasoningEffort: this.effort } }
+                    ? { [OPENAI_COMPATIBLE_PROVIDER_NAME]: { reasoningEffort: this.effort } }
                     : { anthropic: { effort: this.effort } };
             }
             const baseGenerationOptions = {
@@ -438,14 +457,18 @@ export class ChatSession {
                 }),
                 stopWhen: maxSteps !== undefined ? stepCountIs(maxSteps) : isLoopFinished(),
                 abortSignal: signal,
+                ...(this.maxOutputTokens !== undefined
+                    ? { maxOutputTokens: this.maxOutputTokens }
+                    : {}),
                 ...(effortProviderOptions ? { providerOptions: effortProviderOptions } : {}),
             };
             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
@@ -455,7 +478,7 @@ export class ChatSession {
                     messages: attemptMessages,
                 };
                 let stream;
-                if (appConfig.streaming) {
+                if (this.streaming) {
                     const result = streamText(generationOptions);
                     stream = result.fullStream ?? textStreamToFullStream(result.textStream);
                 }
@@ -476,6 +499,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);
@@ -483,9 +511,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, { 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,
@@ -494,10 +524,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,
@@ -514,6 +546,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,
@@ -529,7 +562,7 @@ export class ChatSession {
                     }
                 }
                 if (hasMalformedToolProtocolText(fullText)) {
-                    console.warn(`[DeepCCC] malformed DSML tool output detected for ${this.context.sessionId} `
+                    console.warn(`[DeepCCC] malformed tool protocol text detected for ${this.context.sessionId} `
                         + `(attempt ${attempt + 1}/2, structuredToolCalls=${toolCallOrder.length})`);
                     rawLog?.writeLine(safeRawStreamJson({
                         type: "deepccc_tool_protocol_recovery",
@@ -542,8 +575,8 @@ export class ChatSession {
                         continue;
                     }
                     throw new Error(toolCallOrder.length > 0
-                        ? "工具调用协议异常：检测到混合的结构化与 DSML 文本调用，为避免重复执行工具，本轮已安全终止"
-                        : "工具调用协议异常：模型重试后仍输出了无效的 DSML 工具调用");
+                        ? "工具调用协议异常：检测到混合的结构化调用与伪造工具文本，为避免重复执行工具，本轮已安全终止"
+                        : "工具调用协议异常：模型重试后仍输出了无效或伪造的工具调用文本");
                 }
                 completed = true;
                 const collectedToolCalls = toolCallOrder
@@ -553,6 +586,7 @@ export class ChatSession {
                     fullText,
                     transcriptLines: toolContext,
                     toolCalls: collectedToolCalls,
+                    timeline,
                 }));
                 yield { type: "done", text: safeAccumulated };
                 return;
@@ -564,9 +598,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;
@@ -630,7 +677,7 @@ export class ChatSession {
                 // output_config.effort=low），避免继承主对话的高 effort 拖慢"压缩上下文中"阶段。
                 maxOutputTokens: MAX_COMPACTION_OUTPUT_TOKENS,
                 providerOptions: this.provider === "openai"
-                    ? { deepseek: { reasoningEffort: "none" } }
+                    ? { [OPENAI_COMPATIBLE_PROVIDER_NAME]: { reasoningEffort: "none" } }
                     : { anthropic: { effort: "low" } },
             });
             if (!result.text.trim()) {

package/dist/deepccc-agent/src/tool-protocol.js

@@ -6,12 +6,23 @@
 const MALFORMED_DSML_TRAILER = /<\/[|｜]{2}DSML[|｜]{2}(?:parameter|invoke)>\s*$/iu;
 const RENDERED_TOOL_CALL = /\[调用\s+[A-Za-z_][\w.-]*\]/u;
 const DSML_INVOKE_TAG = /<[|｜]{2}DSML[|｜]{2}invoke\b/iu;
+const TOOL_TRANSCRIPT_HEADER = /(?:^|\n)\s*\[工具记录\]\s*(?:\n|$)/u;
+const TOOL_TRANSCRIPT_EVENT = /(?:^|\n)\s*tool_(?:call|result|error)\s+[A-Za-z_][\w.-]*\s*:/u;
+/**
+ * Detects a model copying DeepCCC's persisted/debug transcript syntax into
+ * normal assistant text. Both the dedicated header and an event line are
+ * required so documentation and ordinary discussion remain valid.
+ */
+export function hasImitatedToolTranscriptText(text) {
+    return TOOL_TRANSCRIPT_HEADER.test(text) && TOOL_TRANSCRIPT_EVENT.test(text);
+}
 export function hasMalformedToolProtocolText(text) {
-    return MALFORMED_DSML_TRAILER.test(text)
+    const malformedDsml = MALFORMED_DSML_TRAILER.test(text)
         && (RENDERED_TOOL_CALL.test(text) || DSML_INVOKE_TAG.test(text));
+    return malformedDsml || hasImitatedToolTranscriptText(text);
 }
 export const TOOL_PROTOCOL_RECOVERY_PROMPT = [
     "[系统恢复提示] 上一次响应泄漏了内部工具调用协议，因此已被丢弃。",
-    "请重新完成当前用户请求。需要调用工具时，只能使用 API 提供的结构化工具调用；不要把 DSML 或工具参数作为普通文本输出。",
-    "不要提及本恢复提示，也不要假装工具已经执行。",
+    "请重新完成当前用户请求。需要调用工具时，只能使用 API 提供的结构化工具调用；不要把 DSML、[工具调用]、[工具记录] 或工具参数作为普通文本输出。",
+    "不要提及本恢复提示，不要伪造工具已执行，也不要根据未执行的命令声称得到了结果。",
 ].join("\n");

package/dist/deepccc-agent/src/web-entry.js

@@ -0,0 +1,72 @@
+import { fileURLToPath } from "node:url";
+import { resolve } from "node:path";
+import { startDeepCccWebServer } from "./web-server.js";
+const WEB_FLAGS = new Set(["web", "--reuse-existing", "--port", "--no-open", "--help", "-h"]);
+export function isLegacyCliInvocation(args) {
+    if (!args.length)
+        return false;
+    if (args[0] === "web")
+        return false;
+    return !WEB_FLAGS.has(args[0]);
+}
+export function parseWebEntryArgs(rawArgs) {
+    const args = rawArgs[0] === "web" ? rawArgs.slice(1) : [...rawArgs];
+    if (args.includes("--help") || args.includes("-h"))
+        return {};
+    let port;
+    let openBrowser;
+    let reuseExisting = false;
+    for (let index = 0; index < args.length; index++) {
+        const arg = args[index];
+        if (arg === "--reuse-existing")
+            reuseExisting = true;
+        else if (arg === "--no-open")
+            openBrowser = false;
+        else if (arg === "--port") {
+            const value = Number(args[++index]);
+            if (!Number.isInteger(value) || value < 1 || value > 65_535)
+                throw new Error("--port must be an integer between 1 and 65535");
+            port = value;
+        }
+        else {
+            throw new Error(`Unknown DeepCCC Web option: ${arg}`);
+        }
+    }
+    return {
+        reuseExisting,
+        ...(port ? { port } : {}),
+        ...(openBrowser === false ? { openBrowser: false } : {}),
+    };
+}
+export function printWebHelp() {
+    console.log([
+        "DeepCCC Web UI",
+        "",
+        "Usage: deepccc [web] [options]",
+        "",
+        "  --reuse-existing   Reuse an existing verified DeepCCC Web instance",
+        "  --port <port>      Override config.web.port for this run",
+        "  --no-open          Do not open the browser automatically",
+        "  --help             Show this help",
+        "",
+        "Terminal CLI: deepccc-cli [options]",
+    ].join("\n"));
+}
+export async function runWebEntry(rawArgs = process.argv.slice(2)) {
+    if (rawArgs.includes("--help") || rawArgs.includes("-h")) {
+        printWebHelp();
+        return;
+    }
+    const options = parseWebEntryArgs(rawArgs);
+    const handle = await startDeepCccWebServer(options);
+    console.log(`DeepCCC Web UI: ${handle.url}${handle.reused ? " (reused existing server)" : ""}`);
+}
+function isDirectInvocation() {
+    return resolve(fileURLToPath(import.meta.url)) === resolve(process.argv[1] ?? "");
+}
+if (isDirectInvocation()) {
+    runWebEntry().catch((err) => {
+        console.error(`DeepCCC Web startup failed: ${err.message}`);
+        process.exit(1);
+    });
+}