xiaozhou-chat 1.0.26 → 1.0.27

package/bin/cli.js

@@ -37,6 +37,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import readline from "node:readline";
+import { execSync } from "node:child_process";
 import minimist from "minimist";
 import { MCPClient } from "../lib/mcp-lite.js";
 import { 
@@ -54,7 +55,8 @@ import {
   exportHistory 
 } from "../lib/history.js";
 import { 
-  chatStream 
+  chatStream,
+  generateCompletion
 } from "../lib/chat.js";
 import { 
   builtInTools, 
@@ -431,36 +433,71 @@ rl.on("line", async (line) => {
             console.log("⚠️ 历史记录太短，无需压缩。");
             return rl.prompt();
         }
-        // Logic similar to before, but calling chatStream with a summary prompt
-        // To simplify: we construct a temporary context just for summary
+        
         const toCompress = messages.slice(0, -2);
         const recent = messages.slice(-2);
         
         const summaryPrompt = `
 请总结以下对话的主要内容，提取关键信息、代码片段和决策。
 摘要应简洁明了，以便作为后续对话的上下文。
+保留所有重要的技术细节。
 
 对话内容:
 ${JSON.stringify(toCompress)}
 `;
-        // Temporary buffer for summary
-        let summary = "";
-        // Mock printer or capture output?
-        // chatStream prints to stdout. We might want to capture it instead.
-        // But our chatStream prints to StreamPrinter.
-        // For simplicity, let's just let it print the summary to user, then ask user if they want to apply it?
-        // Or just do it.
-        // To capture output, we'd need to modify chatStream or StreamPrinter.
-        // Let's skip modifying chatStream for now and just say:
-        // "Feature: /compress is simplified to just clearing old history for now in this refactor, or we need a non-printing mode."
-        // Actually, let's just keep the old history slice logic for now to save time, or use a "silent" mode.
-        // I'll add `silent: true` option to chatStream later if needed.
-        // For now:
-        messages = [
-            { role: "system", content: "Previous conversation summary: (Compressed)" }, 
-            ...recent
-        ];
-        console.log("✅ 已压缩历史 (Mock implementation)");
+        try {
+            const summary = await generateCompletion(activeConfig, [{role: "user", content: summaryPrompt}]);
+            messages = [
+                { role: "system", content: `Previous conversation summary:\n${summary}` }, 
+                ...recent
+            ];
+            saveHistory(messages);
+            console.log("✅ 历史记录已压缩");
+            console.log("摘要预览:", summary.slice(0, 100).replace(/\n/g, ' ') + "...");
+        } catch (e) {
+            console.error("❌ 压缩失败:", e.message);
+        }
+        return rl.prompt();
+    }
+
+    if (input === "/commit") {
+        try {
+            let diff;
+            try {
+                diff = execSync("git diff --cached", { stdio: ['ignore', 'pipe', 'ignore'] }).toString().trim();
+            } catch (e) {
+                console.log("❌ 获取 git diff 失败，请确认当前目录是 git 仓库");
+                return rl.prompt();
+            }
+
+            if (!diff) {
+                console.log("⚠️  暂存区为空，请先执行 'git add <file>'");
+                return rl.prompt();
+            }
+            
+            console.log("🤖 正在分析 Diff 并生成 Commit Message...");
+            const prompt = `
+你是一个资深的开发者。请根据以下的 Git Diff 内容，生成一个符合 Conventional Commits 规范的 Commit Message。
+只返回 Commit Message 本身，不要包含 markdown 代码块或其他解释。
+
+Diff 内容:
+${diff.slice(0, 8000)}
+`;
+            const msg = await generateCompletion(activeConfig, [{role: "user", content: prompt}]);
+            console.log("\n----- 建议的 Commit Message -----");
+            console.log(`\x1b[32m${msg.trim()}\x1b[0m`);
+            console.log("-----------------------------------");
+            
+            const ans = await askQuestion("提交吗? (y/n) ");
+            if (ans.trim().toLowerCase() === 'y') {
+                execSync(`git commit -m "${msg.trim().replace(/"/g, '\\"')}"`, { stdio: 'inherit' });
+                console.log("✅ 提交成功");
+            } else {
+                console.log("🚫 已取消");
+            }
+        } catch (e) {
+            console.error("❌ Commit 生成失败:", e.message);
+        }
         return rl.prompt();
     }
 

package/lib/chat.js

@@ -105,6 +105,44 @@ export async function requestWithRetry(url, options, maxRetries = 3) {
     throw lastError;
 }
 
+export async function generateCompletion(config, messages, options = {}) {
+    const { 
+        model = config.model, 
+        max_tokens = 4096,
+        jsonMode = false 
+    } = options;
+
+    const requestUrl = `${config.baseUrl}${config.baseUrl.endsWith('/') ? '' : '/'}chat/completions`;
+    
+    // 自动修正 v1
+    const finalUrl = (requestUrl.includes("/v1/") || requestUrl.endsWith("/v1")) 
+        ? requestUrl 
+        : requestUrl.replace("/chat/completions", "/v1/chat/completions");
+
+    const body = {
+        model,
+        messages,
+        stream: false,
+        max_tokens
+    };
+    
+    if (jsonMode) {
+        body.response_format = { type: "json_object" };
+    }
+
+    const res = await requestWithRetry(finalUrl, {
+        method: "POST",
+        headers: {
+            "Content-Type": "application/json",
+            Authorization: `Bearer ${config.apiKey}`
+        },
+        body: JSON.stringify(body)
+    });
+
+    const data = await res.json();
+    return data.choices?.[0]?.message?.content || "";
+}
+
 export async function chatStream(context, userInput = null, options = {}) {
     const { 
         messages, 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xiaozhou-chat",
-  "version": "1.0.26",
+  "version": "1.0.27",
   "description": "CLI chatbot based on NewAPI",
   "bin": {
     "xiaozhou-chat": "bin/cli.js"