@yemi33/minions 0.1.2222 → 0.1.2223

package/engine/pr-action.js

@@ -155,7 +155,7 @@ function buildCreatePrFollowups({ project, branch, contextOnly = false } = {}) {
   if (!proj) return [];
   const br = branch && String(branch).trim() ? String(branch).trim() : '';
   const branchClause = br
-    ? `on the current branch ${br}`
+    ? `(the working tree is on branch ${br}; if ${br} is the project's default/main branch, create a new well-named branch off it and commit there rather than committing to ${br} directly)`
     : 'on a new well-named branch off the project main branch';
   const linkBody = contextOnly
     ? `{"url":"<new PR url>","project":"${proj}","contextOnly":true}`
@@ -163,11 +163,18 @@ function buildCreatePrFollowups({ project, branch, contextOnly = false } = {}) {
   const trackNote = contextOnly
     ? 'so it is tracked but not auto-reviewed'
     : 'so the engine auto-manages it (review -> fix -> re-review -> auto-merge)';
+  // The original branch CC must return to once the PR is open, so the new PR
+  // branch is never left checked out in the shared operator working tree.
+  const restoreClause = br
+    ? `switch the working tree back to the ORIGINAL branch (${br})`
+    : 'switch the working tree back to the original branch it started on';
   const message =
     `Create a PR from the local changes you just made in the ${proj} project. ` +
-    `Steps: (1) in that project's working tree, stage and commit the modified files ${branchClause} with a clear conventional-commit message; ` +
+    (br ? `Remember the working tree's current branch (${br}) as the ORIGINAL branch to return to when done. ` : '') +
+    `Steps: (1) in that project's working tree, stage and commit the modified files with a clear conventional-commit message ${branchClause}; ` +
     `(2) push the branch; (3) open a PR against the project's main branch using the right CLI for the repo host (gh for GitHub, az repos for ADO); ` +
-    `(4) link it to the tracker by calling POST /api/pull-requests/link with ${linkBody} ${trackNote}. ` +
+    `(4) link it to the tracker by calling POST /api/pull-requests/link with ${linkBody} ${trackNote}; ` +
+    `(5) finally, ${restoreClause} — do not leave the new PR branch checked out. ` +
     `Then show me the PR URL.`;
   return [{ kind: CREATE_PR_FOLLOWUP.kind, label: CREATE_PR_FOLLOWUP.label, project: proj, branch: br || null, message }];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yemi33/minions",
-  "version": "0.1.2222",
+  "version": "0.1.2223",
   "description": "Multi-agent AI dev team that runs from ~/.minions/ — five autonomous agents share a single engine, dashboard, and knowledge base",
   "bin": {
     "minions": "bin/minions.js"

package/prompts/cc-system.md

@@ -96,7 +96,7 @@ curl -s -X POST http://localhost:{{dashboard_port}}/api/pr-action/offer-create-p
   -H 'Content-Type: application/json' -H 'X-CC-Turn-Id: {{cc_turn_id}}' \
   -d '{"project":"<project name>"}'
 ```
-This checks the project's working tree (`git status --porcelain`) and, when there are uncommitted changes, returns a **`[Create PR]`** follow-up chip to the user (same chip mechanism as the `pr-action` `[Comment]`/`[Fix once]`/`[Track for auto-fix]` chips). When the user clicks it, you'll receive a turn instructing you to commit → push → open the PR → link it to the tracker. Pass `"contextOnly":true` if the PR should be tracked-but-not-auto-reviewed; omit it to have the engine auto-manage the PR (review → fix → re-review → auto-merge). If `hasChanges` is `false`, there's nothing to PR — skip the offer. Don't commit/push on your own initiative; surface the chip and let the user decide.
+This checks the project's working tree (`git status --porcelain`) and, when there are uncommitted changes, returns a **`[Create PR]`** follow-up chip to the user (same chip mechanism as the `pr-action` `[Comment]`/`[Fix once]`/`[Track for auto-fix]` chips). When the user clicks it, you'll receive a turn instructing you to commit → push → open the PR → link it to the tracker → switch the working tree back to the original branch (never leave the new PR branch checked out in the shared operator tree). Pass `"contextOnly":true` if the PR should be tracked-but-not-auto-reviewed; omit it to have the engine auto-manage the PR (review → fix → re-review → auto-merge). If `hasChanges` is `false`, there's nothing to PR — skip the offer. Don't commit/push on your own initiative; surface the chip and let the user decide.
 
 ## When to dispatch vs answer inline