@ghenya/clinn 0.7.13 → 0.7.14

package/Logos/StartLogo.txt

@@ -2,6 +2,6 @@
 ██      ██      ██ ████   ██ ████   ██ 
 ██      ██      ██ ██ ██  ██ ██ ██  ██ 
 ██      ██      ██ ██  ██ ██ ██  ██ ██ 
- ██████ ███████ ██ ██   ████ ██   █0.7.13 
+ ██████ ███████ ██ ██   ████ ██   █0.7.14 
                                        
                                        

package/config.json

@@ -1,7 +1,7 @@
 {
   "agent": {
     "name": "Clinn",
-    "version": "0.7.13",
+    "version": "0.7.14",
     "description": "控制台智能体助手"
   },
   "llm": {

package/install.js

@@ -6,12 +6,11 @@ const fs = require("fs");
 const path = require("path");
 const { execSync } = require("child_process");
 
-const VER = "0.7.13";
+const VER = "0.7.14";
 const G = "\x1b[0;32m", C = "\x1b[0;36m", Y = "\x1b[0;33m", R = "\x1b[0;31m", N = "\x1b[0m", D = "\x1b[2m";
 
 const IS_WIN = process.platform === "win32";
 const HOME = os.homedir();
-const SRC = __dirname;
 const CLINN_HOME = path.join(HOME, ".clinn");
 const CLINN_CONFIG = path.join(CLINN_HOME, "config.json");
 
@@ -58,48 +57,61 @@ function cleanOldShellRC() {
   }
 }
 
-function cleanOldPATH() {
-  if (!IS_WIN) return;
-  for (const level of ["User", "Machine"]) {
-    let raw = "";
-    try {
-      raw = execSync(`powershell -NoProfile -Command "[Environment]::GetEnvironmentVariable('Path', '${level}')"`, { encoding: "utf-8", windowsHide: true }).trim();
-    } catch (_) { continue; }
-    const parts = raw.split(";").filter(p => {
-      const lo = p.toLowerCase().replace(/\//g, "\\");
-      return lo && !lo.includes("clinn") && !lo.includes("\\Clinn\\");
-    });
-    const clean = parts.join(";");
-    try {
-      execSync(`powershell -NoProfile -Command "[Environment]::SetEnvironmentVariable('Path', '${clean.replace(/\\/g, "\\\\")}', '${level}')"`, { windowsHide: true });
-    } catch (_) {}
+function getNpmBinDir() {
+  if (IS_WIN) {
+    return path.join(process.env.APPDATA || "", "npm");
+  }
+  try {
+    const prefix = execSync("npm config get prefix", { encoding: "utf-8" }).trim();
+    return path.join(prefix, "bin");
+  } catch (_) {
+    return "/usr/local/bin";
   }
 }
 
-function addToPATH() {
-  if (!IS_WIN) return;
-  const dest = path.join(process.env.LOCALAPPDATA || "", "Programs", "Clinn");
-  for (const level of ["User"]) {
-    let raw = "";
-    try {
-      raw = execSync(`powershell -NoProfile -Command "[Environment]::GetEnvironmentVariable('Path', '${level}')"`, { encoding: "utf-8", windowsHide: true }).trim();
-    } catch (_) { continue; }
-    if (!raw.toLowerCase().includes(dest.toLowerCase())) {
-      raw = raw + ";" + dest;
+function ensureNpmBinInPATH() {
+  const npmBin = getNpmBinDir();
+  if (IS_WIN) {
+    const levels = ["User", "Machine"];
+    for (const level of levels) {
+      let raw = "";
       try {
-        execSync(`powershell -NoProfile -Command "[Environment]::SetEnvironmentVariable('Path', '${raw.replace(/\\/g, "\\\\")}', '${level}')"`, { windowsHide: true });
+        raw = execSync(`powershell -NoProfile -Command "[Environment]::GetEnvironmentVariable('Path', '${level}')"`, { encoding: "utf-8", windowsHide: true }).trim();
+      } catch (_) { continue; }
+      const norm = npmBin.toLowerCase().replace(/\//g, "\\");
+      const parts = raw.split(";").filter(p => {
+        const lo = p.toLowerCase().replace(/\//g, "\\");
+        return lo && !lo.includes("clinn") && !lo.includes("\\Clinn\\");
+      });
+      const has = parts.some(p => p.toLowerCase().replace(/\//g, "\\") === norm);
+      if (!has) parts.push(npmBin);
+      const clean = parts.join(";");
+      try {
+        execSync(`powershell -NoProfile -Command "[Environment]::SetEnvironmentVariable('Path', '${clean.replace(/\\/g, "\\\\")}', '${level}')"`, { windowsHide: true });
       } catch (_) {}
     }
+    console.log(`  ${G}PATH 已注入:${N} ${D}${npmBin}${N}`);
+  } else {
+    const shellRC = process.env.SHELL?.includes("zsh") ? ".zshrc" : ".bashrc";
+    const rcPath = path.join(HOME, shellRC);
+    let content = "";
+    if (fs.existsSync(rcPath)) content = fs.readFileSync(rcPath, "utf-8");
+    const marker = "# npm global bin";
+    if (!content.includes(`export PATH="${npmBin}:$PATH"`) && !content.includes(npmBin)) {
+      content += `\n${marker}\nexport PATH="${npmBin}:$PATH"\n`;
+      fs.writeFileSync(rcPath, content, "utf-8");
+      console.log(`  ${G}PATH 已注入:${N} ${D}${npmBin} → ${rcPath}${N}`);
+    }
   }
 }
 
 cleanOldShellRC();
-cleanOldPATH();
+ensureNpmBinInPATH();
 
 ensureClinnDir();
 
 if (!fs.existsSync(CLINN_CONFIG)) {
-  const pkgCfg = path.join(SRC, "config.json");
+  const pkgCfg = path.join(__dirname, "config.json");
   if (fs.existsSync(pkgCfg)) {
     const cfg = JSON.parse(fs.readFileSync(pkgCfg, "utf-8"));
     if (oldKey && oldKey !== "YOUR_API_KEY" && oldKey !== "YOUR_DEEPSEEK_API_KEY_HERE") {
@@ -108,22 +120,11 @@ if (!fs.existsSync(CLINN_CONFIG)) {
     fs.writeFileSync(CLINN_CONFIG, JSON.stringify(cfg, null, 2), "utf-8");
     console.log(`  ${G}配置文件已创建:${N} ${D}${CLINN_CONFIG}${N}`);
   }
-} else if (oldKey && oldKey !== "YOUR_API_KEY" && oldKey !== "YOUR_DEEPSEEK_API_KEY_HERE") {
-  try {
-    const cfg = JSON.parse(fs.readFileSync(CLINN_CONFIG, "utf-8"));
-    if (cfg.llm.apiKey !== oldKey) {
-      cfg.llm.apiKey = oldKey;
-      fs.writeFileSync(CLINN_CONFIG, JSON.stringify(cfg, null, 2), "utf-8");
-    }
-  } catch (_) {}
 }
 
-addToPATH();
-
-console.log(`  ${Y}npm bin shim 已由 npm 自动创建${N}`);
 console.log("");
 console.log(`  ${G}============================================${N}`);
-console.log(`  ${G}  安装完成! 输入 clinn 即可启动${N}`);
+console.log(`  ${G}  安装完成! 打开新终端输入 clinn 即可启动${N}`);
 console.log(`  ${G}============================================${N}`);
 console.log("");
 console.log(`  版本:    ${C}clinn --version${N}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ghenya/clinn",
-  "version": "0.7.13",
+  "version": "0.7.14",
   "description": "终端原生 AI 编程助手 — DeepSeek 驱动，50+ 工具，对话记忆，虚拟浏览器",
   "main": "Src/index.js",
   "bin": {