gitee-ai-employee 1.2.6 → 1.2.8

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

@@ -25,6 +25,12 @@ 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: "",
@@ -171,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}] 两种形态 ──
@@ -522,6 +528,10 @@ export default {
       const dir = repoDir(owner, repo);
       // 跨平台检查是否已克隆：直接走文件系统，不依赖 PowerShell / shell 语法（mac / linux 亦可）
       if (existsSync(dir + PATH_SEP + ".git")) {
+        // 复用旧克隆前，用「当前令牌」刷新 origin 地址。否则克隆时嵌入的旧令牌一旦失效，
+        // 后续 git push 会 401 失败（且曾被 sh() 静默吞掉 → PR 接口报“源分支不存在”）。
+        const fresh = await cloneUrlFor(platform, owner, repo);
+        await sh(`git -C ${shellQuote(dir)} remote set-url origin ${shellQuote(fresh)}`, { timeoutMs: 60000 }).catch(() => {});
         await sh(`git -C ${shellQuote(dir)} fetch origin --prune --tags`, { timeoutMs: 300000 });
         return dir;
       }
@@ -1064,7 +1074,14 @@ export default {
         }
 
         update({ step: "push" });
-        await sh(`git -C ${shellQuote(dir)} push -u origin ${shellQuote(branchName)}`, { workdir: dir, timeoutMs: 300000 });
+        // push 前再用当前令牌刷新 origin（克隆可能是旧令牌建的）；并检查 push 退出码，
+        // 失败立即抛明确错误，而不是静默继续导致 PR 接口报“源分支不存在”这类误导性 400。
+        const freshPushUrl = await cloneUrlFor(p, owner, repo);
+        await sh(`git -C ${shellQuote(dir)} remote set-url origin ${shellQuote(freshPushUrl)}`, { workdir: dir, timeoutMs: 60000 }).catch(() => {});
+        const pushRes = await sh(`git -C ${shellQuote(dir)} push -u origin ${shellQuote(branchName)}`, { workdir: dir, timeoutMs: 300000 });
+        if (pushRes && pushRes.exitCode !== 0) {
+          throw new Error("git push failed (" + pushRes.exitCode + "): " + ((pushRes.stderr.text || pushRes.stdout.text || "").slice(0, 300)));
+        }
 
         update({ step: "pr" });
         const prTitle = `[AI] ${(issue && issue.title) || ("Fix issue #" + number)} (#${number})`;
@@ -1662,7 +1679,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) {
@@ -1680,9 +1697,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",
@@ -1856,6 +1886,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.6",
+  "version": "1.2.8",
   "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",