deepccc 0.1.13 → 0.1.15

package/README.md

@@ -45,16 +45,18 @@ deepccc 的本地缓存优化实测命中率 **96.7%**，有效降低重复请
 
 ```bash
 export DEEPCCC_API_KEY="sk-..."
-export DEEPCCC_BASE_URL="https://api.deepseek.com/v1"
-export DEEPCCC_MODEL="deepseek-v4-pro"
+export DEEPCCC_BASE_URL="https://api.deepseek.com/v1"
+export DEEPCCC_MODEL="deepseek-v4-pro"
+export DEEPCCC_STREAMING="true"
 ```
 
 Windows PowerShell：
 
 ```powershell
 $env:DEEPCCC_API_KEY="sk-..."
-$env:DEEPCCC_BASE_URL="https://api.deepseek.com/v1"
-$env:DEEPCCC_MODEL="deepseek-v4-pro"
+$env:DEEPCCC_BASE_URL="https://api.deepseek.com/v1"
+$env:DEEPCCC_MODEL="deepseek-v4-pro"
+$env:DEEPCCC_STREAMING="true"
 ```
 
 也兼容这些 DeepSeek 别名：
@@ -70,16 +72,20 @@ $env:DEEPCCC_MODEL="deepseek-v4-pro"
 {
   "apiKey": "sk-...",
   "baseURL": "https://api.deepseek.com/v1",
-  "model": "deepseek-v4-pro",
-  "effort": "",
+  "model": "deepseek-v4-pro",
+  "effort": "",
+  "streaming": true,
   "rawStreamLogs": {
     "enabled": false,
     "maxBytesPerTurn": 1048576,
     "retentionDays": 7,
     "keepCompleted": false
   }
-}
-```
+}
+```
+
+`streaming` 控制主对话是否使用流式请求，默认 `true`；也可以通过
+`DEEPCCC_STREAMING=true|false` 覆盖。关闭后，终端会在整条模型响应完成后一次性显示结果。
 
 ## 命令行交互
 

package/dist/cli.js

@@ -11,7 +11,7 @@
  * 非 TTY（管道/CI）或 --plain 回退为纯文本流式输出；--stream-json 机器接口不变。
  */
 import * as readline from "node:readline";
-import * as process from "node:process";
+import process from "node:process";
 import { appendFileSync, existsSync, mkdirSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join, resolve as resolvePath } from "node:path";
@@ -595,7 +595,8 @@ async function main() {
     const args = parseArgs();
     if (args.streamJson) {
         const code = await runStreamJson(args);
-        process.exit(code);
+        process.exitCode = code;
+        return;
     }
     if (args.help) {
         const { appConfig } = await loadRuntime();

package/dist/config.d.ts

@@ -4,6 +4,8 @@ export interface DeepCccConfig {
     model: string;
     /** Reasoning effort（none/minimal/low/medium/high/xhigh/max），留空不传 reasoning_effort */
     effort: string;
+    /** 主对话是否使用流式请求；默认开启 */
+    streaming: boolean;
     rawStreamLogs: {
         enabled: boolean;
         maxBytesPerTurn: number;

package/dist/config.js

@@ -9,6 +9,7 @@ const DEFAULT_CONFIG = {
     baseURL: "https://api.deepseek.com/v1",
     model: "deepseek-v4-pro",
     effort: "",
+    streaming: true,
     rawStreamLogs: {
         enabled: false,
         maxBytesPerTurn: 1024 * 1024,
@@ -50,6 +51,7 @@ function loadConfig() {
         baseURL: env("DEEPCCC_BASE_URL") ?? env("DEEPSEEK_BASE_URL") ?? file.baseURL ?? DEFAULT_CONFIG.baseURL,
         model: env("DEEPCCC_MODEL") ?? env("DEEPSEEK_MODEL") ?? file.model ?? DEFAULT_CONFIG.model,
         effort: env("DEEPCCC_EFFORT") ?? env("DEEPSEEK_EFFORT") ?? file.effort ?? DEFAULT_CONFIG.effort,
+        streaming: boolEnv("DEEPCCC_STREAMING") ?? file.streaming ?? DEFAULT_CONFIG.streaming,
         rawStreamLogs: {
             enabled: boolEnv("DEEPCCC_RAW_STREAM_LOGS") ?? rawLogs.enabled ?? DEFAULT_CONFIG.rawStreamLogs.enabled,
             maxBytesPerTurn: numberEnv("DEEPCCC_RAW_STREAM_MAX_BYTES") ?? rawLogs.maxBytesPerTurn ?? DEFAULT_CONFIG.rawStreamLogs.maxBytesPerTurn,

package/dist/index.d.ts

@@ -5,6 +5,19 @@
  */
 import { type PermissionMode, type PermissionResolver } from "./permissions.js";
 export declare const DEFAULT_COMPACTION_TIMEOUT_MS: number;
+/**
+ * 各操作系统特有的命令行指引（文本资产，维护在 os-prompts/ 目录，而非硬编码）：
+ *
+ * - 内置文件：包内 os-prompts/<platform>.md（win32/darwin/linux），随 npm 包分发；
+ * - 用户覆盖：~/.deepccc/prompts/<platform>.md 存在时完全替代内置内容（可自定义）。
+ *
+ * 文件内容自带标题（如 "## Windows Command-Line Notes"），读取后 trim 直接作为
+ * 一个段落注入固定规则区（项目指令之前）。未知平台或文件缺失时返回空字符串。
+ */
+export declare function loadPlatformCommandPrompt(platform?: string, dirs?: {
+    builtinDir?: string;
+    userDir?: string;
+}): string;
 export interface ChatSessionConfig {
     /** OpenAI-compatible service base URL. Defaults to DEEPCCC_BASE_URL/config. */
     baseURL?: string;

package/dist/index.js

@@ -5,8 +5,10 @@
  */
 import { createOpenAICompatible } from "@ai-sdk/openai-compatible";
 import { generateText, isLoopFinished, stepCountIs, streamText } from "ai";
-import { readFileSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
+import { homedir } from "node:os";
 import { join } from "node:path";
+import { fileURLToPath } from "node:url";
 import { config as appConfig, RAW_STREAM_LOGS_DIR } from "./config.js";
 import { createRawStreamLog, } from "./raw-stream-log.js";
 import { buildPersistedAssistantMessage, buildSummaryPrompt, BuiltinContextManager, defaultBuiltinSessionId, } from "./context.js";
@@ -97,22 +99,45 @@ function buildRuntimeWorkspacePrompt(cwd) {
     ].join("\n");
 }
 /**
- * Windows 专属命令行指引（仅 win32 注入）：cmd.exe 的引号语义与 bash 不同，
- * 模型按 bash 习惯写命令时会被 cmd 拆坏（引号保留为字面量、单引号不生效、
- * 多行/嵌套引号脚本崩坏）。这段提示放在固定规则区（项目指令之前）。
+ * 各操作系统特有的命令行指引（文本资产，维护在 os-prompts/ 目录，而非硬编码）：
+ *
+ * - 内置文件：包内 os-prompts/<platform>.md（win32/darwin/linux），随 npm 包分发；
+ * - 用户覆盖：~/.deepccc/prompts/<platform>.md 存在时完全替代内置内容（可自定义）。
+ *
+ * 文件内容自带标题（如 "## Windows Command-Line Notes"），读取后 trim 直接作为
+ * 一个段落注入固定规则区（项目指令之前）。未知平台或文件缺失时返回空字符串。
  */
-function buildPlatformCommandPrompt() {
-    if (process.platform !== "win32")
+export function loadPlatformCommandPrompt(platform = process.platform, dirs = {}) {
+    const filename = platform === "win32" ? "win32.md" :
+        platform === "darwin" ? "darwin.md" :
+            platform === "linux" ? "linux.md" :
+                null;
+    if (!filename)
         return "";
-    return [
-        "## Windows Command-Line Notes",
-        "You are running on Windows. run_command executes through cmd.exe, not bash. cmd quoting differs from bash and breaks common habits:",
-        "- Double quotes are NOT stripped: `echo \"hello world\"` prints `\"hello world\"` (quotes included), and `\"a b\" \"c\"` passes the literal arguments `\"a b\"` and `\"c\"` (quotes included) to the program.",
-        "- Single quotes are NOT quoting characters in cmd.exe: `'a b'` is parsed as two arguments (`'a` and `b'`).",
-        "- Multi-line or quote-heavy inline scripts (python -c \"...\\n...\", ssh host \"bash -c '...'\") frequently break under cmd quoting; write the script to a temporary file and execute that file instead.",
-        "- PowerShell-only syntax (Get-Item, 2>$null, Select-Object) is unavailable; the shell is cmd.exe unless you explicitly invoke powershell.",
-        "- To pass an argument containing spaces, use double quotes and expect the quotes to reach the program literally; when the target accepts file input, prefer writing the value to a file.",
-    ].join("\n");
+    // import.meta.url 定位包根：chatccc 源码运行时指向 deepccc-agent/os-prompts/，
+    // deepccc dist 运行时指向包根 os-prompts/（dist/index.js 的 ../os-prompts/）。
+    const builtinDir = dirs.builtinDir ?? fileURLToPath(new URL("../os-prompts/", import.meta.url));
+    const userDir = dirs.userDir ?? join(homedir(), ".deepccc", "prompts");
+    // 用户覆盖优先；读取失败时静默回退内置，内置也失败则返回空。
+    const userFile = join(userDir, filename);
+    if (existsSync(userFile)) {
+        try {
+            return readFileSync(userFile, "utf-8").trim();
+        }
+        catch {
+            // fall through to builtin
+        }
+    }
+    const builtinFile = join(builtinDir, filename);
+    if (existsSync(builtinFile)) {
+        try {
+            return readFileSync(builtinFile, "utf-8").trim();
+        }
+        catch {
+            return "";
+        }
+    }
+    return "";
 }
 function normalizeMaxSteps(value) {
     if (value === undefined)
@@ -146,6 +171,7 @@ export class ChatSession {
             name: "deepccc",
             baseURL,
             apiKey,
+            includeUsage: true,
         });
         this.model = provider(modelId);
         this.cwd = options.cwd ?? process.cwd();
@@ -175,7 +201,7 @@ export class ChatSession {
      */
     buildSystemPrompt(skills) {
         const systemContent = [SYSTEM_PROMPT];
-        const platformPrompt = buildPlatformCommandPrompt();
+        const platformPrompt = loadPlatformCommandPrompt();
         if (platformPrompt) {
             systemContent.push("", platformPrompt);
         }
@@ -234,7 +260,7 @@ export class ChatSession {
             const skills = await scanSkillsDirs(this.skillDirs);
             const system = this.buildSystemPrompt(skills);
             this.systemPrompt = system;
-            const result = streamText({
+            const generationOptions = {
                 model: this.model,
                 system,
                 messages: this.context.buildModelMessages(),
@@ -244,8 +270,16 @@ export class ChatSession {
                 // DeepSeek OpenAI 兼容接口：providerOptions.deepseek.reasoningEffort
                 // 由 @ai-sdk/openai-compatible 自动映射为请求体 reasoning_effort 字段
                 ...(this.effort ? { providerOptions: { deepseek: { reasoningEffort: this.effort } } } : {}),
-            });
-            const stream = result.fullStream ?? textStreamToFullStream(result.textStream);
+            };
+            let stream;
+            if (appConfig.streaming) {
+                const result = streamText(generationOptions);
+                stream = result.fullStream ?? textStreamToFullStream(result.textStream);
+            }
+            else {
+                const result = await generateText(generationOptions);
+                stream = generateResultToFullStream(result);
+            }
             for await (const part of stream) {
                 rawLog?.writeLine(safeRawStreamJson(part));
                 if (part.type === "text-delta") {
@@ -407,6 +441,34 @@ async function* textStreamToFullStream(stream) {
         yield { type: "text-delta", text };
     }
 }
+async function* generateResultToFullStream(result) {
+    let emittedText = false;
+    for (const step of result.steps ?? []) {
+        for (const call of step.toolCalls ?? []) {
+            yield {
+                type: "tool-call",
+                toolCallId: call.toolCallId,
+                toolName: call.toolName,
+                input: call.input,
+            };
+        }
+        for (const toolResult of step.toolResults ?? []) {
+            yield {
+                type: "tool-result",
+                toolCallId: toolResult.toolCallId,
+                toolName: toolResult.toolName,
+                output: toolResult.output,
+            };
+        }
+        if (step.text) {
+            emittedText = true;
+            yield { type: "text-delta", text: step.text };
+        }
+    }
+    if (!emittedText && result.text) {
+        yield { type: "text-delta", text: result.text };
+    }
+}
 function safeJson(value) {
     try {
         return JSON.stringify(value);

package/os-prompts/darwin.md

@@ -0,0 +1,8 @@
+## macOS Command-Line Notes
+
+You are running on macOS. run_command executes through zsh, a POSIX shell. Quoting follows standard POSIX conventions (the same habits you already know from bash):
+
+- Double quotes are stripped and group an argument containing spaces: `echo "hello world"` prints `hello world`.
+- Single quotes are literal quoting characters: `'a b'` is a single argument `a b`.
+- Backticks and `$(...)` perform command substitution; quote them if you need literal text.
+- Paths use `/` separators and `~` expands to the home directory.

package/os-prompts/linux.md

@@ -0,0 +1,8 @@
+## Linux Command-Line Notes
+
+You are running on Linux. run_command executes through a POSIX shell (bash/sh). Quoting follows standard POSIX conventions (the same habits you already know from bash):
+
+- Double quotes are stripped and group an argument containing spaces: `echo "hello world"` prints `hello world`.
+- Single quotes are literal quoting characters: `'a b'` is a single argument `a b`.
+- Backticks and `$(...)` perform command substitution; quote them if you need literal text.
+- Paths use `/` separators and `~` expands to the home directory.

package/os-prompts/win32.md

@@ -0,0 +1,9 @@
+## Windows Command-Line Notes
+
+You are running on Windows. run_command executes through cmd.exe, not bash. cmd quoting differs from bash and breaks common habits:
+
+- Double quotes are NOT stripped: `echo "hello world"` prints `"hello world"` (quotes included), and `"a b" "c"` passes the literal arguments `"a b"` and `"c"` (quotes included) to the program.
+- Single quotes are NOT quoting characters in cmd.exe: `'a b'` is parsed as two arguments (`'a` and `b'`).
+- Multi-line or quote-heavy inline scripts (python -c "...\n...", ssh host "bash -c '...'") frequently break under cmd quoting; write the script to a temporary file and execute that file instead.
+- PowerShell-only syntax (Get-Item, 2>$null, Select-Object) is unavailable; the shell is cmd.exe unless you explicitly invoke powershell.
+- To pass an argument containing spaces, use double quotes and expect the quotes to reach the program literally; when the target accepts file input, prefer writing the value to a file.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deepccc",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "description": "A lightweight DeepSeek-optimized coding agent with OpenAI-compatible model support.",
   "license": "Apache-2.0",
   "keywords": [
@@ -34,6 +34,7 @@
     "dist/",
     "bin/",
     "docs/",
+    "os-prompts/",
     "package.json",
     "README.md",
     "LICENSE"