xiaozhou-chat 1.0.1 → 1.0.3

package/README.md

@@ -1,4 +1,4 @@
-
+```markdown
 # xiaozhou-chat
 
 CLI chatbot based on NewAPI.
@@ -8,7 +8,7 @@ CLI chatbot based on NewAPI.
 ## ✨ 特性
 - 基于 NewAPI 的命令行聊天工具
 - 支持自定义模型与 Base URL
-- 自动保存历史记录
+- 自动保存历史记录（项目根目录优先）
 - Node.js 18+ 支持
 
 ---
@@ -46,6 +46,40 @@ export NEWAPI_MODEL="gpt-3.5-turbo"
 
 ---
 
+## 📁 配置与历史记录位置
+
+**项目根目录判定规则：**
+从当前目录向上查找最近的 `package.json`，其所在目录为项目根目录。
+
+### ✅ 配置文件优先级
+1. 项目根目录：
+   - `.newapi-chat-config.json`
+   - `newapi-chat.config.json`
+2. 用户目录：
+   - `~/.newapi-chat-config.json`
+
+### ✅ 历史记录保存位置
+- 优先保存到项目根目录：
+  ```
+  <项目根>/.newapi-chat-history.json
+  ```
+- 无写入权限时回退：
+  ```
+  ~/.newapi-chat-history.json
+  ```
+
+### ✅ 历史导出（Markdown）
+- 优先导出到项目根目录：
+  ```
+  <项目根>/newapi-chat-history.md
+  ```
+- 无写入权限时回退：
+  ```
+  ~/newapi-chat-history.md
+  ```
+
+---
+
 ## 🚀 使用
 
 ### 基础启动
@@ -87,15 +121,6 @@ NewAPI 是一个兼容 OpenAI 接口的网关服务...
 
 ---
 
-## 📝 历史记录
-
-默认保存在：
-```
-~/.newapi-chat-history.json
-```
-
----
-
 ## 🪟 Windows 打包
 
 安装 pkg：

package/bin/cli.js

@@ -7,60 +7,193 @@ import minimist from "minimist";
 
 const args = minimist(process.argv.slice(2));
 
-const configFile = path.join(os.homedir(), ".newapi-chat-config.json");
-const historyFile = path.join(os.homedir(), ".newapi-chat-history.json");
+function findProjectRoot(startDir = process.cwd()) {
+  let dir = startDir;
+  while (true) {
+    if (fs.existsSync(path.join(dir, "package.json"))) {
+      return dir;
+    }
+    const parent = path.dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  return startDir;
+}
+
+const projectRoot = findProjectRoot();
+
+const homeConfigFile = path.join(os.homedir(), ".newapi-chat-config.json");
+const projectConfigFile = path.join(projectRoot, ".newapi-chat-config.json");
+const projectAltConfigFile = path.join(projectRoot, "newapi-chat.config.json");
+
+const homeHistoryFile = path.join(os.homedir(), ".newapi-chat-history.json");
+const projectHistoryFile = path.join(projectRoot, ".newapi-chat-history.json");
 
 function initConfigFile() {
-  if (fs.existsSync(configFile)) return;
+  if (fs.existsSync(homeConfigFile)) return;
 
   const defaultConfig = {
-    apiKey: "",
-    baseUrl: "https://api.newapi.pro/v1",
-    model: "gpt-3.5-turbo"
+    apiKey: "sk-KUDRAZivzcKUGWnfxAjskgX15uFmNPcKgPvxSWc5pCRwobnK",
+    baseUrl: "https://paid.tribiosapi.top/v1",
+    model: "claude-sonnet-4-5-20250929"
   };
 
-  fs.writeFileSync(configFile, JSON.stringify(defaultConfig, null, 2), "utf-8");
-  console.log(`✅ 已创建配置文件: ${configFile}`);
+  fs.writeFileSync(homeConfigFile, JSON.stringify(defaultConfig, null, 2), "utf-8");
+  console.log(`✅ 已创建配置文件: ${homeConfigFile}`);
   console.log("👉 请编辑该文件填入 apiKey");
 }
 
-function loadConfig() {
-  if (!fs.existsSync(configFile)) return {};
+function loadConfigFrom(file) {
+  if (!fs.existsSync(file)) return {};
   try {
-    return JSON.parse(fs.readFileSync(configFile, "utf-8"));
+    return JSON.parse(fs.readFileSync(file, "utf-8"));
   } catch {
     return {};
   }
 }
 
+function loadConfig() {
+  const home = loadConfigFrom(homeConfigFile);
+  const project =
+    loadConfigFrom(projectConfigFile) ||
+    loadConfigFrom(projectAltConfigFile);
+
+  return { ...home, ...project };
+}
+
+function canWriteProjectDir() {
+  try {
+    fs.accessSync(projectRoot, fs.constants.W_OK);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function getReadHistoryFile() {
+  return fs.existsSync(projectHistoryFile)
+    ? projectHistoryFile
+    : homeHistoryFile;
+}
+
+function getWriteHistoryFile() {
+  return canWriteProjectDir()
+    ? projectHistoryFile
+    : homeHistoryFile;
+}
+
+function getExportFile() {
+  const dir = canWriteProjectDir() ? projectRoot : os.homedir();
+  return path.join(dir, "newapi-chat-history.md");
+}
+
 function loadHistory() {
-  if (!fs.existsSync(historyFile)) return [];
+  const target = getReadHistoryFile();
+  if (!fs.existsSync(target)) return [];
   try {
-    return JSON.parse(fs.readFileSync(historyFile, "utf-8"));
+    return JSON.parse(fs.readFileSync(target, "utf-8"));
   } catch {
     return [];
   }
 }
 
 function saveHistory(messages) {
-  fs.writeFileSync(historyFile, JSON.stringify(messages, null, 2));
+  const target = getWriteHistoryFile();
+  fs.writeFileSync(target, JSON.stringify(messages, null, 2));
+}
+
+function clearHistory() {
+  const target = getWriteHistoryFile();
+  fs.writeFileSync(target, JSON.stringify([], null, 2));
+}
+
+function showHistory(messages, limit) {
+  if (!messages.length) {
+    console.log("（暂无历史）");
+    return;
+  }
+  const list = limit ? messages.slice(-limit) : messages;
+  list.forEach((m, i) => {
+    const role = m.role === "user" ? "你" : "助手";
+    console.log(`[${i + 1}] ${role}: ${m.content}`);
+  });
+}
+
+function exportHistory(messages) {
+  if (!messages.length) {
+    console.log("（暂无历史）");
+    return;
+  }
+  const md = messages.map((m) => {
+    const role = m.role === "user" ? "你" : "助手";
+    return `### ${role}\n\n${m.content}\n`;
+  }).join("\n");
+
+  const file = getExportFile();
+  fs.writeFileSync(file, md, "utf-8");
+  console.log(`✅ 已导出: ${file}`);
+}
+
+function showHelp() {
+  console.log(`
+可用命令：
+  /help           显示帮助
+  /config [set]   查看或修改配置
+  /system [prompt] 设置系统提示词
+  /load <file>    加载文件内容到上下文
+  /history [N]    显示历史（可选最近 N 条）
+  /clear          清空历史
+  /export         导出历史为 Markdown
+  exit            退出（或按 ESC）
+`);
 }
 
 initConfigFile();
 const config = loadConfig();
 
-const API_KEY = config.apiKey || process.env.NEWAPI_API_KEY;
-const BASE_URL =
+let API_KEY =
+  config.apiKey ||
+  args["api-key"] ||
+  process.env.NEWAPI_API_KEY;
+
+let BASE_URL =
   config.baseUrl ||
   args["base-url"] ||
   process.env.NEWAPI_BASE_URL ||
   "https://api.newapi.pro/v1";
-const MODEL =
+
+let MODEL =
   config.model ||
   args["model"] ||
   process.env.NEWAPI_MODEL ||
   "gpt-3.5-turbo";
 
+let SYSTEM_PROMPT =
+  config.systemPrompt ||
+  args["system-prompt"] ||
+  process.env.NEWAPI_SYSTEM_PROMPT ||
+  "";
+
+function getWriteConfigFile() {
+  if (fs.existsSync(projectConfigFile)) return projectConfigFile;
+  if (fs.existsSync(projectAltConfigFile)) return projectAltConfigFile;
+  return homeConfigFile;
+}
+
+function updateConfig(key, value) {
+  const target = getWriteConfigFile();
+  const current = loadConfigFrom(target);
+  current[key] = value;
+  fs.writeFileSync(target, JSON.stringify(current, null, 2), "utf-8");
+  console.log(`✅ 已更新 ${key} 到配置文件: ${target}`);
+  
+  // 更新运行时变量
+  if (key === "apiKey") API_KEY = value;
+  if (key === "baseUrl") BASE_URL = value;
+  if (key === "model") MODEL = value;
+  if (key === "systemPrompt") SYSTEM_PROMPT = value;
+}
+
 if (!API_KEY) {
   console.error("❌ 请在 ~/.newapi-chat-config.json 或环境变量中配置 NEWAPI_API_KEY");
   process.exit(1);
@@ -71,15 +204,47 @@ let messages = loadHistory();
 const rl = readline.createInterface({
   input: process.stdin,
   output: process.stdout,
-  prompt: "你> "
+  prompt: "小周> "
+});
+
+readline.emitKeypressEvents(process.stdin);
+if (process.stdin.isTTY) {
+  process.stdin.setRawMode(true);
+}
+
+process.stdin.on("keypress", (_, key) => {
+  if (key && key.name === "escape") {
+    rl.close();
+  }
+});
+
+rl.on("close", () => {
+  console.log("\n👋 已退出");
+  process.exit(0);
 });
 
-console.log("✅ NewAPI Chat CLI 已启动，输入 exit 退出");
+console.log("✅ NewAPI Chat CLI 已启动，输入 /help 查看命令");
 
 async function chatStream(userInput) {
   messages.push({ role: "user", content: userInput });
 
-  const res = await fetch(`${BASE_URL}/chat/completions`, {
+  // 自动修正 URL：如果 Base URL 不包含 /v1，尝试追加
+  const url = BASE_URL.endsWith("/v1") 
+    ? `${BASE_URL}/chat/completions` 
+    : `${BASE_URL}/v1/chat/completions`;
+
+  const apiMessages = [...messages];
+  if (SYSTEM_PROMPT) {
+    // 检查是否已经有 system prompt，如果没有则添加
+    if (!apiMessages.length || apiMessages[0].role !== "system") {
+      apiMessages.unshift({ role: "system", content: SYSTEM_PROMPT });
+    } else {
+      // 临时替换 system prompt 为当前配置的
+      apiMessages[0] = { role: "system", content: SYSTEM_PROMPT };
+    }
+  }
+
+  const res = await fetch(url, {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
@@ -87,7 +252,7 @@ async function chatStream(userInput) {
     },
     body: JSON.stringify({
       model: MODEL,
-      messages,
+      messages: apiMessages,
       stream: true
     })
   });
@@ -100,22 +265,26 @@ async function chatStream(userInput) {
   const reader = res.body.getReader();
   const decoder = new TextDecoder("utf-8");
   let reply = "";
+  let buffer = "";
 
   while (true) {
     const { done, value } = await reader.read();
     if (done) break;
 
-    const chunk = decoder.decode(value);
-    const lines = chunk.split("\n").filter(Boolean);
+    buffer += decoder.decode(value, { stream: true });
+    const lines = buffer.split("\n");
+    buffer = lines.pop() || "";
 
     for (const line of lines) {
       if (!line.startsWith("data:")) continue;
-      const data = line.replace("data: ", "").trim();
+      const data = line.slice(5).trim();
       if (data === "[DONE]") break;
 
       try {
         const json = JSON.parse(data);
-        const token = json.choices?.[0]?.delta?.content;
+        const token =
+          json.choices?.[0]?.delta?.content ??
+          json.choices?.[0]?.message?.content;
         if (token) {
           process.stdout.write(token);
           reply += token;
@@ -134,6 +303,94 @@ rl.prompt();
 rl.on("line", async (line) => {
   const input = line.trim();
   if (!input) return rl.prompt();
+
+  if (input === "/help") {
+    showHelp();
+    return rl.prompt();
+  }
+
+  if (input.startsWith("/system")) {
+    const prompt = input.slice(7).trim();
+    if (!prompt) {
+      console.log(`当前 System Prompt: ${SYSTEM_PROMPT || "(空)"}`);
+    } else {
+      updateConfig("systemPrompt", prompt);
+    }
+    return rl.prompt();
+  }
+
+  if (input.startsWith("/load")) {
+    const file = input.slice(5).trim();
+    if (!file) {
+      console.log("❌ 用法: /load <file_path>");
+      return rl.prompt();
+    }
+    try {
+      const content = fs.readFileSync(file, "utf-8");
+      const userMsg = `(Context from ${path.basename(file)}):\n\`\`\`\n${content}\n\`\`\``;
+      messages.push({ role: "user", content: userMsg });
+      saveHistory(messages);
+      console.log(`✅ 已加载文件: ${file} (${content.length} chars)`);
+      console.log("👉 该文件内容将作为上下文发送给 AI，请继续提问。");
+    } catch (e) {
+      console.error(`❌ 读取文件失败: ${e.message}`);
+    }
+    return rl.prompt();
+  }
+
+  if (input.startsWith("/config")) {
+    const parts = input.split(/\s+/);
+    const cmd = parts[1];
+    
+    if (!cmd || cmd === "list") {
+      console.log(`
+当前配置：
+  apiKey:  ${API_KEY ? API_KEY.slice(0, 8) + "..." : "未设置"}
+  baseUrl: ${BASE_URL}
+  model:   ${MODEL}
+  system:  ${SYSTEM_PROMPT ? SYSTEM_PROMPT.slice(0, 20) + "..." : "默认"}
+`);
+      return rl.prompt();
+    }
+
+    if (cmd === "set") {
+      const key = parts[2];
+      const value = parts[3];
+      if (!key || !value) {
+        console.log("❌ 用法: /config set <key> <value>");
+        return rl.prompt();
+      }
+      
+      if (["apiKey", "baseUrl", "model", "systemPrompt"].includes(key)) {
+        updateConfig(key, value);
+      } else {
+        console.log("❌ 仅支持修改: apiKey, baseUrl, model, systemPrompt");
+      }
+      return rl.prompt();
+    }
+    
+    console.log("❌ 未知命令，用法: /config [list|set]");
+    return rl.prompt();
+  }
+
+  if (input.startsWith("/history")) {
+    const n = Number(input.split(/\s+/)[1]);
+    showHistory(messages, Number.isFinite(n) && n > 0 ? n : undefined);
+    return rl.prompt();
+  }
+
+  if (input === "/clear") {
+    clearHistory();
+    messages = [];
+    console.log("✅ 历史已清空");
+    return rl.prompt();
+  }
+
+  if (input === "/export") {
+    exportHistory(messages);
+    return rl.prompt();
+  }
+
   if (input === "exit" || input === "quit") {
     rl.close();
     return;
@@ -147,3 +404,4 @@ rl.on("line", async (line) => {
 
   rl.prompt();
 });
+

package/package.json

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