@delegoapp/runner 0.5.2 → 0.5.5

package/dist/executor/prompt.js

@@ -1,6 +1,9 @@
 import { promptThinkingInstruction } from '../thinking.js';
 export function promptForJob(job) {
     const thinkingInstruction = promptThinkingInstruction(job.executionPreferences.thinking);
+    const pullRequestInstruction = job.publishingPolicy.autoCreatePr
+        ? 'Do NOT create a pull request yourself (do not run `gh pr create` or any equivalent), and do NOT create or switch git branches (no `git checkout -b`, no `git switch -c`). Leave your work on the branch that is already checked out. The runner will commit your changes and open the pull request automatically once you exit.'
+        : `If you create a pull request, start the PR title with: ${job.linearIssue.identifier}:`;
     return [
         // This directive must come first — before task content — so Claude enters
         // execution with the correct mental model. When placed at the end, Claude
@@ -19,7 +22,7 @@ export function promptForJob(job) {
         '',
         `Linear issue: ${job.linearIssue.identifier}${job.linearIssue.title ? ` - ${job.linearIssue.title}` : ''}`,
         job.linearIssue.url ? `URL: ${job.linearIssue.url}` : null,
-        `If you create a pull request, start the PR title with: ${job.linearIssue.identifier}:`,
+        pullRequestInstruction,
         '',
         `Requested executor: ${job.executionPreferences.executor}`,
         job.executionPreferences.model

package/dist/git/publish.js

@@ -20,12 +20,50 @@ function parsePrNumberFromUrl(url) {
     const value = Number(url.match(/\/pull\/(\d+)(?:\b|$)/)?.[1]);
     return Number.isFinite(value) ? value : null;
 }
+function isAlreadyExistsError(stderr, stdout) {
+    // `gh pr create` writes "a pull request for branch ... already exists" to
+    // stderr when the agent already opened a PR for this branch. Match on the
+    // signal phrase to avoid coupling to gh's exact formatting.
+    return /already exists/i.test(stderr) || /already exists/i.test(stdout);
+}
+async function viewExistingPr(repositoryPath, branchName) {
+    const view = await runCommand('gh', ['pr', 'view', branchName, '--json', 'url,number,title,isDraft'], repositoryPath);
+    if (view.code !== 0) {
+        return null;
+    }
+    try {
+        const parsed = JSON.parse(view.stdout);
+        const url = typeof parsed.url === 'string' ? parsed.url : null;
+        if (!url) {
+            return null;
+        }
+        return {
+            url,
+            number: typeof parsed.number === 'number' ? parsed.number : null,
+            title: typeof parsed.title === 'string' ? parsed.title : '',
+            isDraft: typeof parsed.isDraft === 'boolean' ? parsed.isDraft : false,
+        };
+    }
+    catch {
+        return null;
+    }
+}
 export async function publishBranchAndMaybePr(repositoryPath, job, branchName, commit) {
     validatePublishingPolicy(job.publishingPolicy);
     if (!job.publishingPolicy.autoPush) {
         return null;
     }
-    const push = await runCommand('git', ['push', '-u', 'origin', branchName], repositoryPath);
+    // Push the current HEAD to the runner's branch ref explicitly, rather than
+    // pushing `branchName` by name. An executor that ignores the "do not create
+    // branches" instruction may `git checkout -b` and commit its work on a
+    // different branch; HEAD then advances (so the pipeline sees new commits and
+    // reaches publishing) while the runner's named branch still points at the
+    // starting SHA. Pushing `branchName` by name would then upload a commitless
+    // branch and `gh pr create` fails with "No commits between main and <branch>".
+    // `HEAD:refs/heads/<branchName>` always carries the actual work onto the
+    // runner's branch; when HEAD already is `branchName` it behaves identically
+    // to pushing the branch by name.
+    const push = await runCommand('git', ['push', '-u', 'origin', `HEAD:refs/heads/${branchName}`], repositoryPath);
     if (push.code !== 0) {
         throw new Error(`Unable to push branch ${branchName}: ${push.stderr || push.stdout || 'unknown git error'}`);
     }
@@ -48,6 +86,20 @@ export async function publishBranchAndMaybePr(repositoryPath, job, branchName, c
     }
     const pr = await runCommand('gh', args, repositoryPath);
     if (pr.code !== 0) {
+        if (isAlreadyExistsError(pr.stderr, pr.stdout)) {
+            const existing = await viewExistingPr(repositoryPath, branchName);
+            if (existing) {
+                return {
+                    url: existing.url,
+                    number: existing.number ?? parsePrNumberFromUrl(existing.url),
+                    title: existing.title || title,
+                    branchName,
+                    draft: existing.isDraft,
+                    repositorySlug: job.repositorySlug,
+                    pushed: true,
+                };
+            }
+        }
         throw new Error(`Unable to create GitHub pull request: ${pr.stderr || pr.stdout || 'unknown gh error'}`);
     }
     const url = pr.stdout

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@delegoapp/runner",
-  "version": "0.5.2",
+  "version": "0.5.5",
   "private": false,
   "description": "Delego runner — polls the Delego relay and executes Linear-delegated coding jobs via Codex CLI or Claude Code.",
   "keywords": [
@@ -11,6 +11,11 @@
     "linear",
     "runner"
   ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/zietek/delego-saas.git",
+    "directory": "packages/runner"
+  },
   "license": "UNLICENSED",
   "bin": {
     "delego-runner": "dist/bin.js"