@clawos-dev/clawd 0.2.717 → 0.2.719

package/dist/cli.cjs

@@ -63286,6 +63286,26 @@ async function networkGit(exec, dir, auth, args, what) {
 async function gitPush(exec, dir, auth, refspec = "HEAD:refs/heads/integration") {
   await networkGit(exec, dir, auth, ["push", "-u", "origin", refspec], "\u63A8\u9001");
 }
+var REMOTE_INTEGRATION = "refs/remotes/origin/integration";
+async function fetchRemoteIntegration(exec, dir, auth) {
+  const origin = await git(exec, dir, ["remote", "get-url", "origin"]);
+  if (origin.spawnError || origin.code !== 0) return false;
+  const listed = await networkGit(exec, dir, auth, ["ls-remote", "--heads", "origin", "refs/heads/integration"], "\u68C0\u67E5\u8FDC\u7AEF\u6D4B\u8BD5\u5206\u652F");
+  if (!listed.trim()) return false;
+  await networkGit(exec, dir, auth, ["fetch", "origin", `+refs/heads/integration:${REMOTE_INTEGRATION}`], "\u8BFB\u53D6\u8FDC\u7AEF\u6D4B\u8BD5\u5206\u652F");
+  return true;
+}
+async function mergeRemoteIntegration(exec, dir) {
+  const before = await mustGit(exec, dir, ["rev-parse", "HEAD"], "\u8BFB\u53D6\u5185\u5BB9\u7248\u672C");
+  const identity = await identityArgs(exec, dir);
+  const merged = await git(exec, dir, [...identity, "merge", "--ff", "--no-edit", "-m", "clawd: \u5408\u5E76\u8FDC\u7AEF integration", REMOTE_INTEGRATION]);
+  if (merged.spawnError) throw new RepoError(`\u672C\u673A\u8DD1\u4E0D\u4E86 git\uFF1A${merged.spawnError}`);
+  if (merged.code === 0) return await mustGit(exec, dir, ["rev-parse", "HEAD"], "\u8BFB\u53D6\u5185\u5BB9\u7248\u672C") !== before;
+  const conflicts = (await git(exec, dir, ["diff", "--name-only", "--diff-filter=U"])).stdout.trim().split("\n").filter(Boolean);
+  await git(exec, dir, ["merge", "--abort"]);
+  if (conflicts.length) throw new RepoError(`\u672C\u5730\u4FEE\u6539\u548C\u8FDC\u7AEF integration \u6709\u51B2\u7A81\uFF08${conflicts.join("\u3001")}\uFF09\uFF0C\u5904\u7406\u540E\u518D\u8BD5\uFF1B\u672C\u5730\u5185\u5BB9\u5DF2\u9000\u56DE\u5408\u5E76\u524D`);
+  throw new RepoError(`\u5408\u5E76\u8FDC\u7AEF integration \u6CA1\u6210\uFF08git \u9000\u51FA\u7801 ${merged.code}\uFF09\uFF1A${tail(merged.stderr) || tail(merged.stdout)}`);
+}
 async function prepareIntegration(exec, dir, auth) {
   const branch = await mustGit(exec, dir, ["branch", "--show-current"], "\u8BFB\u53D6\u53D1\u5E03\u5206\u652F");
   if (branch !== "main" && branch !== "integration") throw new RepoError("\u5F53\u524D\u4E0D\u662F main \u6216 integration \u5206\u652F\uFF0C\u8BF7\u5148\u6574\u7406\u5230\u53D1\u5E03\u5206\u652F");
@@ -63301,24 +63321,21 @@ async function prepareIntegration(exec, dir, auth) {
   await mustGit(exec, dir, ["status", "--porcelain"], "\u68C0\u67E5\u5B8C\u6574\u5DE5\u4F5C\u533A");
   await writeGitignore(dir);
   await commitAll(exec, { dir, message: "clawd: \u4FDD\u5B58\u6D4B\u8BD5\u53D1\u5E03\u524D\u7684\u4FEE\u6539" });
-  if (branch === "integration") return;
-  const current = await mustGit(exec, dir, ["rev-parse", "HEAD"], "\u8BFB\u53D6\u5185\u5BB9\u7248\u672C");
-  const origin = await git(exec, dir, ["remote", "get-url", "origin"]);
-  if (origin.code === 0) {
-    const remote2 = await networkGit(exec, dir, auth, ["ls-remote", "--heads", "origin", "refs/heads/integration"], "\u68C0\u67E5\u8FDC\u7AEF\u6D4B\u8BD5\u5206\u652F");
-    if (remote2.trim()) await networkGit(exec, dir, auth, ["fetch", "origin", "refs/heads/integration:refs/remotes/origin/integration"], "\u8BFB\u53D6\u8FDC\u7AEF\u6D4B\u8BD5\u5206\u652F");
-  }
-  const local = await git(exec, dir, ["rev-parse", "--verify", "refs/heads/integration"]);
-  const remote = await git(exec, dir, ["rev-parse", "--verify", "refs/remotes/origin/integration"]);
-  const candidate = local.code === 0 ? local.stdout.trim() : remote.code === 0 ? remote.stdout.trim() : void 0;
-  if (!candidate) {
-    await mustGit(exec, dir, ["switch", "-c", "integration"], "\u5EFA\u7ACB\u6D4B\u8BD5\u5206\u652F");
-    return;
+  const hasRemote = await fetchRemoteIntegration(exec, dir, auth);
+  if (branch !== "integration") {
+    const current = await mustGit(exec, dir, ["rev-parse", "HEAD"], "\u8BFB\u53D6\u5185\u5BB9\u7248\u672C");
+    const local = await git(exec, dir, ["rev-parse", "--verify", "refs/heads/integration"]);
+    const remote = await git(exec, dir, ["rev-parse", "--verify", REMOTE_INTEGRATION]);
+    const candidate = local.code === 0 ? local.stdout.trim() : remote.code === 0 ? remote.stdout.trim() : void 0;
+    if (!candidate) await mustGit(exec, dir, ["switch", "-c", "integration"], "\u5EFA\u7ACB\u6D4B\u8BD5\u5206\u652F");
+    else {
+      const forward = await git(exec, dir, ["merge-base", "--is-ancestor", current, candidate]);
+      if (forward.code !== 0) throw new RepoError("\u5DF2\u6709 integration \u4E0E\u5F53\u524D main \u5185\u5BB9\u4E0D\u4E00\u81F4\uFF0C\u8BF7\u5148\u6574\u7406\u5206\u652F\uFF1B\u4E0D\u4F1A\u81EA\u52A8\u5408\u5E76\u6216\u4E22\u5F03\u4FEE\u6539");
+      if (local.code !== 0) await mustGit(exec, dir, ["branch", "integration", candidate], "\u5EFA\u7ACB\u672C\u5730\u6D4B\u8BD5\u5206\u652F");
+      await mustGit(exec, dir, ["switch", "integration"], "\u5207\u6362\u6D4B\u8BD5\u5206\u652F");
+    }
   }
-  const forward = await git(exec, dir, ["merge-base", "--is-ancestor", current, candidate]);
-  if (forward.code !== 0) throw new RepoError("\u5DF2\u6709 integration \u4E0E\u5F53\u524D main \u5185\u5BB9\u4E0D\u4E00\u81F4\uFF0C\u8BF7\u5148\u6574\u7406\u5206\u652F\uFF1B\u4E0D\u4F1A\u81EA\u52A8\u5408\u5E76\u6216\u4E22\u5F03\u4FEE\u6539");
-  if (local.code !== 0) await mustGit(exec, dir, ["branch", "integration", candidate], "\u5EFA\u7ACB\u672C\u5730\u6D4B\u8BD5\u5206\u652F");
-  await mustGit(exec, dir, ["switch", "integration"], "\u5207\u6362\u6D4B\u8BD5\u5206\u652F");
+  return hasRemote && await mergeRemoteIntegration(exec, dir);
 }
 async function pushRelease(exec, dir, auth, head) {
   if (!/^[a-f0-9]{40}$/.test(head)) throw new RepoError("\u53D1\u5E03\u63D0\u4EA4\u5FC5\u987B\u662F\u5B8C\u6574 SHA");
@@ -63527,7 +63544,7 @@ async function release(exec, api, args) {
   const info = await repoInfo(exec, args.dir);
   if (!info) throw new RepoError("\u8FD8\u6CA1\u6709\u4ED3\u5E93\uFF0C\u5148\u70B9\u4E00\u6B21\u300C\u53D1\u5E03\u5230\u4E91\u4E0A\u300D\u5EFA\u4ED3");
   const base = await readCurrentBase(api);
-  await prepareIntegration(exec, args.dir, args.auth);
+  if (await prepareIntegration(exec, args.dir, args.auth) && args.rescanOnRemoteChange) throw new RepoError("\u8FDC\u7AEF integration \u6709\u65B0\u63D0\u4EA4\uFF0C\u5DF2\u5408\u5230\u672C\u5730\u2014\u2014\u91CD\u65B0\u626B\u63CF\u540E\u518D\u53D1\u5E03");
   const before = await readDeployFileRaw(args.dir);
   let committed = false;
   try {
@@ -64852,9 +64869,9 @@ function buildDeployHandlers(deps) {
     }
     if (await deps.claimPublisher(cloudPersonaIdOf(repo2.url), "integration") === "taken") throw invalid("\u6D4B\u8BD5\u73AF\u5883\u91CC\u7684\u8FD9\u4E2A\u540D\u5B57\u5DF2\u7531\u522B\u4EBA\u53D1\u5E03");
     const releaseId = (0, import_node_crypto15.randomUUID)();
-    armUndo(void 0);
     try {
-      const result = await release(deps.exec, api, { dir, now: deps.now, auth, manifest, onPrepared: async (head) => {
+      const result = await release(deps.exec, api, { dir, now: deps.now, auth, manifest, rescanOnRemoteChange: !rollback2, onPrepared: async (head) => {
+        armUndo(void 0);
         const latest2 = await readHistory(dir);
         await writeScanFile(dir, { ...latest2, releases: [...latest2.releases, { id: releaseId, environment: "integration", head, contentHead: entry.head, scanId: entry.id, at: deps.now(), pushed: false, config: configOfPersona(deps.personaEngine(personaId2) ?? {}), workflowVersion: DEPLOY_WORKFLOW_VERSION }] });
       } });
@@ -76051,7 +76068,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.717".length > 0 ? "0.2.717" : "dev";
+var version = "0.2.719".length > 0 ? "0.2.719" : "dev";
 
 // src/cli-probe/probe.ts
 var fs87 = __toESM(require("fs"), 1);