opencode-magi 0.0.0-dev-20260519012916 → 0.0.0-dev-20260519013159

package/dist/github/commands.js

@@ -41,7 +41,7 @@ async function withWorktreeCreateLock(key, run) {
 async function checkoutPullRequestWithRetry(exec, repository, pr, worktreePath) {
     for (let attempt = 0;; attempt += 1) {
         try {
-            await exec(`gh pr checkout ${pr} --repo ${shellQuote(repoSpecifier(repository))}`, {
+            await exec(`gh pr checkout ${pr} --repo ${shellQuote(repoSpecifier(repository))} --detach`, {
                 cwd: worktreePath,
             });
             return;
@@ -70,6 +70,9 @@ export function repoSpecifier(repository) {
         ? repoSlug(repository)
         : `${host}/${repoSlug(repository)}`;
 }
+function repositoryGitUrl(repository, owner, repo) {
+    return `https://${githubHost(repository)}/${owner}/${repo}.git`;
+}
 export function ghHostOption(repository) {
     const host = githubHost(repository);
     return host === "github.com" ? "" : ` --hostname ${shellQuote(host)}`;
@@ -78,7 +81,7 @@ export async function ghToken(exec, repository, account) {
     return (await exec(`gh auth token${ghHostOption(repository)} --user ${shellQuote(account)}`)).trim();
 }
 export async function fetchPullRequest(exec, repository, pr) {
-    const json = await exec(`gh pr view ${pr} --repo ${shellQuote(repoSpecifier(repository))} --json number,title,url,isDraft,baseRefOid,headRefOid,baseRefName,headRefName`);
+    const json = await exec(`gh pr view ${pr} --repo ${shellQuote(repoSpecifier(repository))} --json number,title,url,isDraft,baseRefOid,headRefOid,baseRefName,headRefName,headRepository,headRepositoryOwner`);
     return JSON.parse(json);
 }
 export async function fetchPullRequestReviews(exec, repository, pr) {
@@ -318,9 +321,10 @@ export async function closePullRequest(exec, repository, pr, account) {
     const token = await ghToken(exec, repository, account);
     return exec(`GH_TOKEN=${shellQuote(token)} gh pr close ${pr} --repo ${shellQuote(repoSpecifier(repository))}`);
 }
-export async function pushHead(exec, repository, worktreePath, account) {
+export async function pushHead(exec, repository, worktreePath, account, head) {
     const token = await ghToken(exec, repository, account);
-    await exec(`git -c credential.helper= -c credential.helper=${shellQuote(`!f() { echo username=x-access-token; echo password=${token}; }; f`)} push origin HEAD`, { cwd: worktreePath });
+    const url = repositoryGitUrl(repository, head.owner, head.repo);
+    await exec(`git -c credential.helper= -c credential.helper=${shellQuote(`!f() { echo username=x-access-token; echo password=${token}; }; f`)} push ${shellQuote(url)} ${shellQuote(`HEAD:refs/heads/${head.ref}`)}`, { cwd: worktreePath });
 }
 export async function configureGitIdentity(exec, worktreePath, identity) {
     if (identity.name) {

package/dist/orchestrator/merge.js

@@ -109,7 +109,13 @@ async function runEditor(input, worktreePath, cycle, unresolvedThreads) {
     await input.onProgress?.({ cycle, type: "editor_completed" });
     if (!input.dryRun) {
         if (result.value.mode === "EDITED") {
-            await pushHead(input.exec, input.repository, worktreePath, editor.account);
+            const meta = await fetchPullRequest(input.exec, input.repository, input.pr);
+            const headOwner = meta.headRepositoryOwner?.login;
+            const headRepo = meta.headRepository?.name;
+            if (!headOwner || !headRepo) {
+                throw new Error("Pull request head repository is missing");
+            }
+            await pushHead(input.exec, input.repository, worktreePath, editor.account, { owner: headOwner, ref: meta.headRefName, repo: headRepo });
         }
     }
     throwIfAborted(input.signal);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-magi",
-  "version": "0.0.0-dev-20260519012916",
+  "version": "0.0.0-dev-20260519013159",
   "description": "Multi-agent PR review and merge orchestration plugin for OpenCode.",
   "license": "MIT",
   "author": "Hirotomo Yamada <hirotomo.yamada@avap.co.jp>",