@henryqw/pi-pr 2.1.1 → 2.1.2

package/README.md

@@ -41,8 +41,8 @@ Each footer entry is one linked `PR #number` plus one plain-language status: `N
 | --- | --- |
 | No current-branch pull request, including no upstream push target | Start pull-request creation. |
 | Base update required or merge conflict | Update from the base branch's current target when the tree is clean and local HEAD equals the PR head. |
-| Changes requested or unresolved review threads | Run the package comment sweep when the same local prerequisite holds. |
 | CI failed | Run the CI fix workflow when the same local prerequisite holds. |
+| Changes requested or unresolved review threads | Run the package comment sweep when the same local prerequisite holds. |
 | No-action state | Report the state without taking action. |
 | Merge-ready pull request | Ask for final confirmation, recheck fresh state, and merge directly if confirmed. |
 
@@ -68,8 +68,8 @@ A missing pull request uses creation. For an existing pull request, the first ma
 
 1. Merged, closed, or draft: no action.
 2. Base update required or merge conflict. Run only with a clean tree and equal local and PR heads.
-3. Changes requested or unresolved review threads. Apply the same local prerequisite.
-4. CI failure. Apply the same local prerequisite.
+3. CI failure. Apply the same local prerequisite.
+4. Changes requested or unresolved review threads. Apply the same local prerequisite.
 5. Waiting or local safety block: no action.
 6. Merge-ready: allow clean local HEAD equal to or behind the PR head. Confirm, then merge directly.
 

package/docs/pr-routing.svg

@@ -78,9 +78,9 @@
       <line x1="704" y1="360" x2="704" y2="392" stroke="rgba(16,24,40,0.141)" stroke-width="1"/>
       <text x="148" y="384" fill="#4c5665" font-size="12" font-family="'Geist Mono', monospace" text-anchor="middle">4</text>
       <text x="200" y="368" fill="#4c5665" font-size="8" font-weight="500" font-family="'Geist Mono', monospace" letter-spacing="0.12em">CONDITION</text>
-      <text x="200" y="388" fill="#101828" font-size="12" font-weight="600" font-family="'Geist', sans-serif">Changes requested or unresolved threads</text>
+      <text x="200" y="388" fill="#101828" font-size="12" font-weight="600" font-family="'Geist', sans-serif">CI failed</text>
       <text x="728" y="368" fill="#4c5665" font-size="8" font-weight="500" font-family="'Geist Mono', monospace" letter-spacing="0.12em">ROUTE</text>
-      <text x="728" y="388" fill="#101828" font-size="12" font-weight="600" font-family="'Geist', sans-serif">Sweep if clean + equal</text>
+      <text x="728" y="388" fill="#101828" font-size="12" font-weight="600" font-family="'Geist', sans-serif">Fix CI if clean + equal</text>
       <text x="1136" y="388" fill="#4c5665" font-size="8" font-family="'Geist Mono', monospace" text-anchor="end">otherwise no action</text>
 
       <!-- 5 -->
@@ -89,9 +89,9 @@
       <line x1="704" y1="424" x2="704" y2="456" stroke="rgba(16,24,40,0.141)" stroke-width="1"/>
       <text x="148" y="448" fill="#4c5665" font-size="12" font-family="'Geist Mono', monospace" text-anchor="middle">5</text>
       <text x="200" y="432" fill="#4c5665" font-size="8" font-weight="500" font-family="'Geist Mono', monospace" letter-spacing="0.12em">CONDITION</text>
-      <text x="200" y="452" fill="#101828" font-size="12" font-weight="600" font-family="'Geist', sans-serif">CI failed</text>
+      <text x="200" y="452" fill="#101828" font-size="12" font-weight="600" font-family="'Geist', sans-serif">Changes requested or unresolved threads</text>
       <text x="728" y="432" fill="#4c5665" font-size="8" font-weight="500" font-family="'Geist Mono', monospace" letter-spacing="0.12em">ROUTE</text>
-      <text x="728" y="452" fill="#101828" font-size="12" font-weight="600" font-family="'Geist', sans-serif">Fix CI if clean + equal</text>
+      <text x="728" y="452" fill="#101828" font-size="12" font-weight="600" font-family="'Geist', sans-serif">Sweep if clean + equal</text>
       <text x="1136" y="452" fill="#4c5665" font-size="8" font-family="'Geist Mono', monospace" text-anchor="end">otherwise no action</text>
 
       <!-- 6 -->

package/extensions/pr-routing.ts

@@ -45,10 +45,10 @@ export function deriveNextStep(pullRequest: PullRequest | null): NextStep {
 	if (conditions.baseUpdateRequired || conditions.conflict) {
 		return localMutationSafe(local) ? "update-branch" : "none";
 	}
+	if (conditions.ci === "failure") return localMutationSafe(local) ? "fix-ci" : "none";
 	if (conditions.changesRequested || conditions.unresolvedThreads > 0) {
 		return localMutationSafe(local) ? "sweep" : "none";
 	}
-	if (conditions.ci === "failure") return localMutationSafe(local) ? "fix-ci" : "none";
 	if (
 		conditions.ci === "running" ||
 		conditions.review === "pending" ||

package/extensions/pr-ui.ts

@@ -38,9 +38,9 @@ function footerStatus(input: PrDisplayInput, nextStep: NextStep): Pick<PrFooter,
 	if (conditions.draft) return { text: "draft", color: "warning" };
 	if (conditions.conflict) return { text: "merge conflict", color: "error" };
 	if (conditions.baseUpdateRequired) return { text: "base update required", color: "warning" };
+	if (conditions.ci === "failure") return { text: "CI failed", color: "error" };
 	if (conditions.unresolvedThreads > 0) return { text: `${conditions.unresolvedThreads} unresolved`, color: "warning" };
 	if (conditions.changesRequested) return { text: "changes requested", color: "error" };
-	if (conditions.ci === "failure") return { text: "CI failed", color: "error" };
 	if (conditions.ci === "running") return { text: "CI running", color: "warning" };
 	if (nextStep === "merge") return { text: "merge-ready", color: "success" };
 	if (input.approved) return { text: "approved", color: "success" };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryqw/pi-pr",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Run /pr to automatically choose the current pull request's next safe lifecycle step: create, update, address feedback, fix CI, or merge when ready.",
   "keywords": [
     "pi-package",

package/skills/pi-pr-create/SKILL.md

@@ -36,4 +36,23 @@ Create current branch GitHub pull request.
    Reuse one result only when its base matches. Refresh its title and body.
    Stop on a different base or multiple results. Otherwise create with explicit
    `--head <OWNER>:<ref>`, `--base <base>`, title, and body file.
-6. Reply only with PR URL.
+6. After successful create or reuse, retain the already validated PR URL. Parse
+   its PR path segment with Node's standard `URL` and derive `<number>`. Require
+   the positive decimal form `^[1-9][0-9]*$`.
+
+   Only when `HERDR_ENV=1` and trimmed `HERDR_WORKSPACE_ID` is non-empty, use
+   that trimmed value as `<workspace-id>`. Run `herdr workspace get
+   "<workspace-id>"`. Parse its default JSON with Node's standard library
+   (`node:fs` and `JSON.parse`), not `jq`. Require
+   `result.workspace.workspace_id` to exactly equal `<workspace-id>` and
+   `result.workspace.label` to be a non-empty string.
+   Remove every trailing suffix with `/(?: · PR #[1-9][0-9]*)+$/` from the
+   label, then append exactly one ` · PR #<number>` suffix. Run `herdr workspace
+   rename "<workspace-id>" "<normalized-label>"` only when the normalized label
+   differs from the current label. Rename only the workspace, never a pane, tab,
+   Pi session, or Git branch.
+
+   Otherwise, including outside Herdr, skip labeling silently. If any
+   workspace-label step fails after PR success, do not undo the PR; reply with
+   its URL and `Herdr workspace rename failed: <error>`. Otherwise reply only
+   with the PR URL.