@juicesharp/rpiv-pi 1.18.0 → 1.18.2

package/extensions/rpiv-core/siblings.test.ts

@@ -44,6 +44,30 @@ describe("SIBLINGS registry", () => {
 		expect(i18nEntry?.matches.test("@juicesharp/rpiv-i18n")).toBe(true);
 	});
 
+	it("pi-subagents SIBLINGS[0] matches BOTH the @tintinweb/pi-subagents fork and the @gotgenes/pi-subagents fork", () => {
+		const subagentsEntry = SIBLINGS[0];
+		expect(subagentsEntry).toBeDefined();
+		// Upstream fork (default install target via /rpiv-setup)
+		expect(subagentsEntry?.matches.test("@tintinweb/pi-subagents")).toBe(true);
+		// @gotgenes/pi-subagents — API-compatible fork with the same tool surface
+		expect(subagentsEntry?.matches.test("@gotgenes/pi-subagents")).toBe(true);
+	});
+
+	it("pi-subagents SIBLINGS[0] regex is case-insensitive across both fork namespaces", () => {
+		const subagentsEntry = SIBLINGS[0];
+		expect(subagentsEntry?.matches.test("@TINTINWEB/PI-SUBAGENTS")).toBe(true);
+		expect(subagentsEntry?.matches.test("@GOTGENES/PI-SUBAGENTS")).toBe(true);
+	});
+
+	it("pi-subagents SIBLINGS[0] regex does NOT match unrelated @-scoped pi-subagents-* variants", () => {
+		const subagentsEntry = SIBLINGS[0];
+		// Word-boundary guard: must not over-match a hypothetical future sibling
+		// such as `@juicesharp/pi-subagents-utils` (a dash right after the
+		// `pi-subagents` token is excluded via `(?![-\w])`).
+		expect(subagentsEntry?.matches.test("@tintinweb/pi-subagents-utils")).toBe(false);
+		expect(subagentsEntry?.matches.test("@gotgenes/pi-subagents-utils")).toBe(false);
+	});
+
 	it("every entry has non-empty pkg + provides", () => {
 		for (const s of SIBLINGS) {
 			expect(s.pkg.length).toBeGreaterThan(0);

package/extensions/rpiv-core/siblings.ts

@@ -22,8 +22,10 @@ export interface SiblingPlugin {
 export const SIBLINGS: readonly SiblingPlugin[] = [
 	{
 		pkg: "npm:@tintinweb/pi-subagents",
-		matches: /@tintinweb\/pi-subagents/i,
-		provides: "Agent / get_subagent_result / steer_subagent tools",
+		// Detect both the upstream tintinweb fork and the API-compatible
+		// @gotgenes fork; pkg stays upstream so /rpiv-setup installs that.
+		matches: /@(tintinweb|gotgenes)\/pi-subagents(?![-\w])/i,
+		provides: "Agent / get_subagent_result / steer_subagent tools (tintinweb or gotgenes fork)",
 	},
 	{
 		pkg: "npm:@juicesharp/rpiv-ask-user-question",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@juicesharp/rpiv-pi",
-  "version": "1.18.0",
+  "version": "1.18.2",
   "description": "A skill-based development workflow for Pi Agent. Five skills (research, design, plan, implement, validate) and the shared subagents that compose its ship-loop.",
   "keywords": [
     "pi-package",

package/skills/blueprint/SKILL.md

@@ -142,8 +142,7 @@ Use the grounded-questions-one-at-a-time pattern. Use a **❓ Question:** prefix
 
   > Use the `ask_user_question` tool with the following question: "Found 2 mapping approaches — which should new code follow?". Header: "Pattern". Options: "Manual mapping (Recommended)" (Used in OrderService (src/services/OrderService.ts:45) — 8 occurrences); "AutoMapper" (Used in UserService (src/services/UserService.ts:12) — 2 occurrences).
 
-- **Free-text with ❓ Question: prefix** — when the question is open-ended and options can't be predicted (discovery, "what am I missing?", corrections). Example:
-  "❓ Question: Research's `## Integration Points` shows no background job registration for this area. Is that expected, or is there async processing not surfaced in the inbound/outbound sweep?"
+- **Open-ended** (discovery, "what am I missing?", corrections) — still `ask_user_question`; offer your best 1-2 guesses and let "Other" carry the unpredictable answer.
 
 **Batching**: When you have 2-4 independent questions (answers don't depend on each other), you MAY batch them in a single `ask_user_question` call. Keep dependent questions sequential.
 

package/skills/design/SKILL.md

@@ -143,8 +143,7 @@ Use the grounded-questions-one-at-a-time pattern. Use a **❓ Question:** prefix
 
   > Use the `ask_user_question` tool with the following question: "Found 2 mapping approaches — which should new code follow?". Header: "Pattern". Options: "Manual mapping (Recommended)" (Used in OrderService (src/services/OrderService.ts:45) — 8 occurrences); "AutoMapper" (Used in UserService (src/services/UserService.ts:12) — 2 occurrences).
 
-- **Free-text with ❓ Question: prefix** — when the question is open-ended and options can't be predicted (discovery, "what am I missing?", corrections). Example:
-  "❓ Question: Integration scanner found no background job registration for this area. Is that expected, or is there async processing I'm not seeing?"
+- **Open-ended** (discovery, "what am I missing?", corrections) — still `ask_user_question`; offer your best 1-2 guesses and let "Other" carry the unpredictable answer.
 
 **Batching**: When you have 2-4 independent questions (answers don't depend on each other), you MAY batch them in a single `ask_user_question` call. Keep dependent questions sequential.
 

package/skills/research/SKILL.md

@@ -147,7 +147,7 @@ Findings go into Precedents & Lessons. Otherwise skip and note "git history unav
    - **Pattern conflict**: "Found 2 implementations of {X} — which is canonical?" with options citing `file:line` + occurrence count
    - **Scope boundary**: "Question {N} references files {A,B,C} but analysis shows {D} is the real integration point. Extend scope?" with yes/no + "describe what I missed"
    - **Priority override**: "Questions Q1 and Q2 have competing implications for {area}. Which is load-bearing?" with options
-   - **Integration ambiguity**: "Found no connection between {X} and {Y}. Is there an indirect path?" (free-text — can't predict the answer)
+   - **Integration ambiguity**: "Found no connection between {X} and {Y}. Is there an indirect path?" — `ask_user_question`, "Other" carries the answer
 
    **Choosing question format:**
 
@@ -155,8 +155,7 @@ Findings go into Precedents & Lessons. Otherwise skip and note "git history unav
 
      > Use the `ask_user_question` tool with the following question: "Found 2 patterns for retry logic — which is canonical?". Header: "Pattern". Options: "Event-sourced retry (Recommended)" (`src/events/orders.ts:45-67` — 3 hooks, matches precedent commit `abc123`); "Direct retry loop" (`src/services/OrderService.ts:112` — single use, no event traceability).
 
-   - **Free-text with ❓ Question: prefix** — when the question is open-ended and options can't be predicted (discovery, "what am I missing?", corrections). Example:
-     "❓ Question: `src/events/orders.ts:45-67` has 3 event hooks but no error recovery path. Is there a retry mechanism elsewhere I'm not seeing?"
+   - **Open-ended** (discovery, "what am I missing?", corrections) — still `ask_user_question`; offer your best 1-2 guesses and let "Other" carry the unpredictable answer.
 
    **Anti-pattern** — do NOT dump a verbose paragraph mixing analysis with a trailing question:
 
@@ -183,7 +182,7 @@ Findings go into Precedents & Lessons. Otherwise skip and note "git history unav
    Inconsistencies: {count} found ({short names})
    ```
 
-   Wait for the developer's response before proceeding.
+   Gate the write with `ask_user_question`. Question: "Scan complete — write the doc, or adjust first?". Header: "Research". Options: "Write the doc (Recommended)"; "Add an area"; "Correct a finding".
 
 4. **Incorporate developer input:**