chatccc 0.2.160 → 0.2.162

package/README.md

@@ -313,6 +313,7 @@ Codex 的默认模型和推理强度可继续由 `~/.codex/config.toml` 管理
 | `/plan <内容>` | 只读计划模式：仅允许读文件和 stop-stuck-loop 请求，不执行任何写操作 |
 | `/ask <内容>` | 只读问答模式：与 /plan 相同，仅允许读文件和 stop-stuck-loop 请求 |
 | `/restart` | 重启机器人进程 |
+| `/updateg` | 更新 npm 全局包并重启（仅限 `npm install -g chatccc` 安装的全局进程） |
 
 > **模型切换**：`/model` 查看可选模型清单，`/model <名称>` 模糊匹配切换，`/model clear` 恢复默认。当前仅 Claude Code 支持模型切换（需同时填写 `claude.model` 和 `claude.subagentModel`），Cursor / Codex 切换正在开发中。
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatccc",
-  "version": "0.2.160",
+  "version": "0.2.162",
   "description": "Feishu bot bridge for Claude Code",
   "license": "Apache-2.0",
   "type": "module",

package/src/__tests__/card-plain-text.test.ts

@@ -17,6 +17,7 @@ describe("cardJsonToPlainText", () => {
     expect(text).toContain("/new cursor");
     expect(text).toContain("/new codex");
     expect(text).toContain("/restart");
+    expect(text).toContain("/updateg");
     expect(text).toContain("/cd");
   });
 

package/src/__tests__/cards.test.ts

@@ -46,6 +46,16 @@ describe("truncateContent", () => {
     expect(resultLines[resultLines.length - 1]).toBe("line 10");
     expect(resultLines.length).toBe(6); // 1 first + "..." + 4 last
   });
+
+  it("skips leading empty lines, preserves first non-empty line", () => {
+    const lines = Array.from({ length: 25 }, (_, i) => `line ${i + 1}`);
+    const text = "\n\n\n" + lines.join("\n");
+    const result = truncateContent(text);
+    const resultLines = result.split("\n");
+    expect(resultLines[0]).toBe("line 1");
+    expect(resultLines[1]).toBe("...");
+    expect(resultLines.length).toBe(21); // 1 first + "..." + 19 last
+  });
 });
 
 // ---------------------------------------------------------------------------
@@ -146,7 +156,7 @@ describe("buildHelpCard", () => {
     const parsed = JSON.parse(card);
     const action = parsed.elements[2];
     expect(action.tag).toBe("action");
-    expect(action.actions).toHaveLength(6);
+    expect(action.actions).toHaveLength(7);
   });
 });
 

package/src/cards.ts

@@ -32,10 +32,16 @@ export function isCodeBlockOpen(text: string): boolean {
 
 export function truncateContent(text: string, maxLines = 20, maxChars = 8000): string {
   const lines = text.split("\n");
+  // 跳过开头空行
+  let startIdx = 0;
+  while (startIdx < lines.length && lines[startIdx].trim() === "") {
+    startIdx++;
+  }
+  const effectiveLines = lines.slice(startIdx);
   let displayText: string;
-  if (lines.length > maxLines) {
-    const firstLine = lines[0];
-    const lastLines = lines.slice(-(maxLines - 1)).join("\n");
+  if (effectiveLines.length > maxLines) {
+    const firstLine = effectiveLines[0];
+    const lastLines = effectiveLines.slice(-(maxLines - 1)).join("\n");
     displayText = firstLine + "\n...\n" + lastLines;
   } else {
     displayText = text;
@@ -129,6 +135,8 @@ export function buildHelpCard(
     "发送 **/newh** 重置当前会话（沿用当前工作目录，不切换）",
     "发送 **/plan** 以规划模式提问（只读，不执行写操作）",
     "发送 **/ask** 以问答模式提问（只读，不执行写操作）",
+  "发送 **/restart** 重启 ChatCCC 进程",
+    "发送 **/updateg** 更新并重启（仅 npm 全局安装可用）",
   ].join("\n");
   return JSON.stringify({
     config: { wide_screen_mode: true },
@@ -142,6 +150,7 @@ export function buildHelpCard(
         { text: "新建 Cursor 会话（/new cursor）", value: JSON.stringify({ cmd: "new cursor" }), type: "primary" },
         { text: "新建 Codex 会话（/new codex）", value: JSON.stringify({ cmd: "new codex" }), type: "primary" },
         { text: "重启 ChatCCC（/restart）", value: JSON.stringify({ cmd: "restart" }), type: "danger" },
+        { text: "更新并重启（/updateg）", value: JSON.stringify({ cmd: "updateg" }), type: "danger" },
         { text: "切换工作路径（/cd）", value: JSON.stringify({ cmd: "cd" }), type: "default" },
       ]),
     ],

package/src/index.ts

@@ -213,7 +213,7 @@ function parseCardAction(data: unknown): CardActionResult | null {
   }
   if (!cmd) return null;
 
-  const CMD_MAP: Record<string, string> = { stop: "/stop", cancel: "/cancel", new: "/new", "new claude": "/new claude", "new cursor": "/new cursor", "new codex": "/new codex", restart: "/restart", state: "/state", cd: "/cd", sessions: "/sessions", newh: "/newh" };
+  const CMD_MAP: Record<string, string> = { stop: "/stop", cancel: "/cancel", new: "/new", "new claude": "/new claude", "new cursor": "/new cursor", "new codex": "/new codex", restart: "/restart", updateg: "/updateg", state: "/state", cd: "/cd", sessions: "/sessions", newh: "/newh" };
   let text = CMD_MAP[cmd] ?? "";
   if (cmd === "cd" && typeof action.value === "object" && action.value !== null) {
     const path = (action.value as Record<string, string>).path;

package/src/orchestrator.ts

@@ -5,9 +5,9 @@
  * 所有 IM 平台操作通过 PlatformAdapter 接口注入，不直接依赖 feishu-platform.ts。
  */
 
-import { spawn } from "node:child_process";
+import { execSync, spawn } from "node:child_process";
 import { readdir, stat } from "node:fs/promises";
-import { readFileSync, writeFileSync } from "node:fs";
+import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { resolve, dirname } from "node:path";
 
 import { makeTraceId, logTrace } from "./trace.ts";
@@ -159,6 +159,45 @@ async function cleanupNonWechatP2pBinding(
   }
 }
 
+/** 检测当前进程是否从 npm 全局安装启动 */
+function isRunningFromGlobalNpm(): boolean {
+  try {
+    const globalRoot = execSync("npm root -g", { encoding: "utf8", timeout: 5000, windowsHide: true }).trim();
+    return resolve(PROJECT_ROOT).startsWith(resolve(globalRoot));
+  } catch {
+    return false;
+  }
+}
+
+/** 更新并重启：spawn detached Node.js 中间脚本，轮询父进程退出后执行 npm update + chatccc */
+function scheduleUpdateRestart(): void {
+  const parentPid = process.pid;
+  const watcherScript = `
+    var spawn = require('child_process').spawn;
+    var execSync = require('child_process').execSync;
+    var parentPid = ${parentPid};
+    (function wait() {
+      try { process.kill(parentPid, 0); setTimeout(wait, 300); } catch (_) {
+        try {
+          var npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+          execSync(npmCmd + ' update -g chatccc', { stdio: 'inherit' });
+        } catch (e) {
+          console.error('npm update failed:', e.message);
+        }
+        var c = spawn('chatccc', [], { detached: true, stdio: 'ignore', shell: true });
+        c.unref();
+        process.exit(0);
+      }
+    })();
+  `;
+  const child = spawn("node", ["-e", watcherScript], {
+    detached: true,
+    stdio: "ignore",
+    shell: true,
+  });
+  child.unref();
+}
+
 // ---------------------------------------------------------------------------
 // handleCommand — 平台无关的命令分发
 // ---------------------------------------------------------------------------
@@ -212,6 +251,22 @@ export async function handleCommand(
     return;
   }
 
+  if (textLower === "/updateg") {
+    logTrace(tid, "BRANCH", { cmd: "/updateg" });
+    if (!isRunningFromGlobalNpm()) {
+      await platform.sendText(chatId, "当前进程非 npm 全局安装，无法使用 /updateg 更新。请通过 npm install -g chatccc 安装后使用。").catch(() => {});
+      logTrace(tid, "DONE", { outcome: "updateg_not_global" });
+      return;
+    }
+    await platform.sendText(chatId, "正在更新并重启，请稍候...").catch(() => {});
+    logTrace(tid, "DONE", { outcome: "updateg" });
+    appendStartupTrace("updateg: spawn watcher begin", { fromPid: process.pid });
+    scheduleUpdateRestart();
+    // 短暂延迟确保消息发送后再退出
+    setTimeout(() => process.exit(0), 500);
+    return;
+  }
+
   if (textLower === "/cd" || textLower.startsWith("/cd ")) {
     logTrace(tid, "BRANCH", {
       cmd: "/cd",