gitee-ai-employee 1.2.5 → 1.2.7

package/dsh/client.js

@@ -359,16 +359,12 @@ window.__ModuleLoader__.load({
           var accepted = 0
           var skipped = 0
           var tasks = repos.map(function (spec) {
-            var platform = /^github:/i.test(spec) ? 'github' : /^gitee:/i.test(spec) ? 'gitee' : 'gitee'
-            var rest = spec.replace(/^(github|gitee):/i, '')
-            var idx = rest.indexOf('/')
-            var owner = rest.slice(0, idx)
-            var repo = rest.slice(idx + 1)
-            if (!owner || !repo) return Promise.resolve({ accepted: false })
+            // 原始仓库行交给服务端统一解析（owner/repo、gitee:owner/repo、完整克隆地址均可）。
+            // 客户端不再自己 indexOf 切分——全路径 URL 会被切成 owner='https:' 导致克隆失败。
             return fetch('/gitee-ai/scan', {
               method: 'POST',
               headers: { 'Content-Type': 'application/json' },
-              body: JSON.stringify({ platform: platform, owner: owner, repo: repo, dryRun: false }),
+              body: JSON.stringify({ spec: spec, dryRun: false }),
             }).then(function (r) { return r.json().catch(function () { return { accepted: false } }) })
               .then(function (b) {
                 if (b && b.accepted) accepted++

package/dsh/index.js

@@ -22,6 +22,15 @@ import { fileURLToPath } from "node:url";
 import { tmpdir, homedir } from "node:os";
 import { join } from "node:path";
 
+// 路径分隔符：Windows 用反斜杠，mac / linux 用正斜杠（保证跨平台路径正确）。
+const PATH_SEP = (typeof process !== "undefined" && process.platform === "win32") ? "\\" : "/";
+
+// 插件自身版本（读包内 package.json），用于启动日志 / 状态接口自报，
+// 便于在运行日志里一眼确认当前加载的到底是不是最新版。
+const PLUGIN_VERSION = (() => {
+  try { return JSON.parse(readFileSync(fileURLToPath(new URL("../package.json", import.meta.url)), "utf8")).version || "?"; } catch (e) { return "?"; }
+})();
+
 const DEFAULT_CONFIG = {
   giteeToken: "",
   githubToken: "",
@@ -168,7 +177,7 @@ export default {
     let webServer = ctx.get("webServer");
     const shell = ctx.shell;
     const timer = ctx.timer;
-    console.log("[gitee-ai] apply(composition) services ok: agents/shell/timer available; webServer=" + (webServer ? "yes" : "no") + " agentDefaultModel=" + (agentDefaultModel ? "yes" : "no"));
+    console.log("[gitee-ai] plugin v" + PLUGIN_VERSION + " loaded | " + ((typeof process !== "undefined" && process.platform) || "?") + " | node " + ((typeof process !== "undefined" && process.version) || "?"));
     ensureWorkerPreset();
 
     // ── 提示词归一化：兼容 {id:{name,prompt}} 与 [{id,name,prompt}] 两种形态 ──
@@ -371,12 +380,12 @@ export default {
         }
       }
       const stamp = Date.now() + "-" + (++apiSeq);
-      const outFile = config.tmpDir + "\\gitee-out-" + stamp + ".json";
-      const codeFile = config.tmpDir + "\\gitee-code-" + stamp + ".txt";
+      const outFile = config.tmpDir + PATH_SEP + "gitee-out-" + stamp + ".json";
+      const codeFile = config.tmpDir + PATH_SEP + "gitee-code-" + stamp + ".txt";
       let cmd;
       if (body !== undefined && body !== null) {
         const b64 = Buffer.from(JSON.stringify(body), "utf8").toString("base64");
-        const tmp = config.tmpDir + "\\gitee-body-" + stamp + ".json";
+        const tmp = config.tmpDir + PATH_SEP + "gitee-body-" + stamp + ".json";
         cmd = `[IO.File]::WriteAllText('${tmp}', [Text.Encoding]::UTF8.GetString([Convert]::FromBase64String('${b64}')), (New-Object System.Text.UTF8Encoding($false))); & 'C:\\Windows\\System32\\curl.exe' -sS -o '${outFile}' -w '%{http_code}' -X ${method} '${url}' -H 'Content-Type: application/json' -H 'Authorization: token ${token}' -d '@${tmp}' | Set-Content -Encoding ASCII '${codeFile}'`;
       } else {
         cmd = `& 'C:\\Windows\\System32\\curl.exe' -sS -o '${outFile}' -w '%{http_code}' '${url}' -H 'Authorization: token ${token}' | Set-Content -Encoding ASCII '${codeFile}'`;
@@ -480,10 +489,10 @@ export default {
       } catch (e) {
         diag.ok = false;
         diag.error = String((e && e.message) || e);
-        try { writeFileSync(config.tmpDir + "\\gitee-my-repos-" + p + "-last.json", JSON.stringify(diag, null, 2), "utf8"); } catch (e2) {}
+        try { writeFileSync(config.tmpDir + PATH_SEP + "gitee-my-repos-" + p + "-last.json", JSON.stringify(diag, null, 2), "utf8"); } catch (e2) {}
         return { ok: false, error: diag.error };
       }
-      try { writeFileSync(config.tmpDir + "\\gitee-my-repos-" + p + "-last.json", JSON.stringify(diag, null, 2), "utf8"); } catch (e2) {}
+      try { writeFileSync(config.tmpDir + PATH_SEP + "gitee-my-repos-" + p + "-last.json", JSON.stringify(diag, null, 2), "utf8"); } catch (e2) {}
       return { ok: true, repos: out };
     }
 
@@ -513,19 +522,16 @@ export default {
       return config.gitUser;
     }
 
-    function repoDir(owner, repo) { return config.workRoot + "\\" + owner + "\\" + repo; }
+    function repoDir(owner, repo) { return config.workRoot + PATH_SEP + owner + PATH_SEP + repo; }
     function shellQuote(v) { return `'${String(v).replace(/'/g, "''")}'`; }
     async function ensureRepo(platform, owner, repo) {
       const dir = repoDir(owner, repo);
-      try {
-        const probe = await sh(`if (Test-Path '${dir.replace(/'/g, "''")}\\.git') { 'yes' } else { 'no' }`, { timeoutMs: 15000 });
-        if ((probe.stdout.text || "").trim() === "yes") {
-          await sh(`git -C ${shellQuote(dir)} fetch origin --prune --tags`, { timeoutMs: 300000 });
-          return dir;
-        }
-      } catch (e) { /* fallthrough */ }
-      const parent = config.workRoot + "\\" + owner;
-      await sh(`New-Item -ItemType Directory -Force -Path ${shellQuote(parent)} | Out-Null`, { timeoutMs: 15000 });
+      // 跨平台检查是否已克隆：直接走文件系统，不依赖 PowerShell / shell 语法（mac / linux 亦可）
+      if (existsSync(dir + PATH_SEP + ".git")) {
+        await sh(`git -C ${shellQuote(dir)} fetch origin --prune --tags`, { timeoutMs: 300000 });
+        return dir;
+      }
+      mkdirSync(config.workRoot + PATH_SEP + owner, { recursive: true });
       const url = await cloneUrlFor(platform, owner, repo);
       const r = await sh(`git clone ${shellQuote(url)} ${shellQuote(dir)}`, { timeoutMs: 600000 });
       if (r.exitCode !== 0) {
@@ -677,8 +683,7 @@ export default {
     }
     async function readScanResult(resultFile) {
       try {
-        const r = await sh(`Get-Content -Raw -Path ${shellQuote(resultFile)} -ErrorAction SilentlyContinue`, { timeoutMs: 20000 });
-        const text = (r.stdout.text || "").trim();
+        const text = readFileSync(resultFile, "utf8").trim();
         if (!text) return { findings: [], note: "empty-result" };
         const parsed = JSON.parse(text);
         const arr = Array.isArray(parsed) ? parsed : (Array.isArray(parsed.findings) ? parsed.findings : []);
@@ -760,7 +765,6 @@ export default {
         const scanDir = join(dir, ".gitee-scan");
         const resultFile = join(scanDir, "result.json");
         try { mkdirSync(scanDir, { recursive: true }); } catch (e) {}
-        void sh(`New-Item -ItemType Directory -Force -Path ${shellQuote(scanDir)} | Out-Null`, { timeoutMs: 15000 }).catch(() => {});
         const taskText = buildScanTask({ p, owner, repo, dir, commit, prompts, resultFile });
         let summary;
         try {
@@ -1664,7 +1668,7 @@ ${["critical", "high", "medium", "low", "none"].map((s) => `<option value="${s}"
     }
 
     // ── 扫描 API（固定路径，client 设置卡片调用）──
-    //   POST /gitee-ai/scan {platform?,owner,repo,dryRun?,force?,prompts?,customPrompt?}
+    //   POST /gitee-ai/scan {spec}（原始仓库行，统一解析）或 {platform?,owner,repo,dryRun?,force?,prompts?,customPrompt?}
     //   GET  /gitee-ai/scan → 提示词清单 + 扫描任务 + 去重状态
     let scanApiDisposer = null;
     if (webServer) {
@@ -1682,9 +1686,22 @@ ${["critical", "high", "medium", "low", "none"].map((s) => `<option value="${s}"
                 if (ct.includes("application/json")) {
                   try { body = JSON.parse(raw || "{}"); } catch (e) { body = {}; }
                 } else if (raw) body = parseForm(raw);
-                const platform = normPlatform(body.platform || config.defaultPlatform);
-                const owner = String(body.owner || "").trim();
-                const repo = String(body.repo || "").trim();
+                let platform = normPlatform(body.platform || config.defaultPlatform);
+                let owner = String(body.owner || "").trim();
+                let repo = String(body.repo || "").trim();
+                // 支持直接传原始仓库行（client「立即扫描全部仓库」就是传 spec 行）：
+                // 统一走 parseRepoSpec，兼容 owner/repo、gitee:/github: 前缀、完整克隆地址。
+                // （不能在这里对 URL 用 indexOf('/') 切分——会把 https://… 切成 owner='https:'）
+                if (body.spec !== undefined && String(body.spec).trim()) {
+                  const parsed = parseRepoSpec(String(body.spec));
+                  if (!parsed) {
+                    send(res, 400, { ok: false, error: "无法解析仓库：" + String(body.spec) + "（支持 owner/repo、gitee:owner/repo、完整克隆地址）" });
+                    return;
+                  }
+                  platform = parsed.platform;
+                  owner = parsed.owner;
+                  repo = parsed.repo;
+                }
                 if (!owner || !repo) { send(res, 400, { ok: false, error: "owner/repo required" }); return; }
                 const opts = {
                   dryRun: body.dryRun === true || body.dryRun === "true",
@@ -1858,6 +1875,7 @@ ${["critical", "high", "medium", "low", "none"].map((s) => `<option value="${s}"
         workRoot: config.workRoot, autoMerge: config.autoMerge,
         autoCloseIssue: !!config.autoCloseIssue, tokenConfigured: tokenOk(),
         githubTokenConfigured: tokenOkFor("github"),
+        version: PLUGIN_VERSION,
         defaultPlatform: config.defaultPlatform || "gitee",
         gitUser: config.gitUser || "", pollEnabled: !!config.pollEnabled,
         pollIntervalMs: config.pollIntervalMs,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitee-ai-employee",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "description": "Gitee/GitHub AI 员工：issue 里 @ 机器人自动开发并提 PR；v1.2 新增代码安全扫描——配置仓库地址后按内置/自定义提示词扫描漏洞，去重后提交 issue。An issue-driven AI developer for DeepSeek Harness (Gitee & GitHub) with optional static security scanning (dedup + issue reporting).",
   "license": "MIT",
   "type": "module",