@juicesharp/rpiv-pi 1.9.1 → 1.9.2

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

@@ -14,7 +14,6 @@ import { homedir, tmpdir } from "node:os";
 import { join } from "node:path";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import {
-	BUNDLED_AGENTS_DIR,
 	CLEANUP_SKIP_REASON,
 	cleanupPerCwdAgents,
 	isSafeDestructiveOp,
@@ -22,6 +21,7 @@ import {
 	summarizeCleanupSkips,
 	syncBundledAgents,
 } from "./agents.js";
+import { BUNDLED_AGENTS_DIR } from "./paths.js";
 
 const sha256 = (s: string | Buffer) => createHash("sha256").update(s).digest("hex");
 

package/extensions/rpiv-core/agents.ts

@@ -26,27 +26,11 @@ import {
 	unlinkSync,
 	writeFileSync,
 } from "node:fs";
-import { dirname, isAbsolute, join, resolve, sep } from "node:path";
-import { fileURLToPath } from "node:url";
+import { isAbsolute, join, resolve, sep } from "node:path";
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
+import { BUNDLED_AGENTS_DIR } from "./paths.js";
 import { isPlainObject, toErrorMessage } from "./utils.js";
 
-// ---------------------------------------------------------------------------
-// Package-root resolution
-// ---------------------------------------------------------------------------
-
-/**
- * Resolves the rpiv-pi package root from this module's file URL.
- * Walks up from `extensions/rpiv-core/agents.ts` to the repo root.
- */
-export const PACKAGE_ROOT = (() => {
-	const thisFile = fileURLToPath(import.meta.url);
-	// extensions/rpiv-core/agents.ts -> rpiv-pi/
-	return dirname(dirname(dirname(thisFile)));
-})();
-
-export const BUNDLED_AGENTS_DIR = join(PACKAGE_ROOT, "agents");
-
 // ---------------------------------------------------------------------------
 // Types
 // ---------------------------------------------------------------------------

package/extensions/rpiv-core/paths.ts

@@ -0,0 +1,24 @@
+/**
+ * Resolved filesystem paths for rpiv-pi's own bundled resources.
+ *
+ * `PACKAGE_ROOT` is computed at module load from this file's URL. The walk-up
+ * is anchored to this file's location (`extensions/rpiv-core/paths.ts`) — three
+ * `dirname` levels reach the rpiv-pi package root. Other resource directories
+ * mirror the `pi.skills` / `pi.extensions` declarations in package.json.
+ *
+ * Pi's SDK does not expose a "give me my own extension root" API, so this is
+ * the idiomatic resolution path (see also docs/packages.md on `pi.*` manifest
+ * paths being relative to the package root).
+ */
+
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+
+export const PACKAGE_ROOT = (() => {
+	const thisFile = fileURLToPath(import.meta.url);
+	// extensions/rpiv-core/paths.ts -> rpiv-pi/
+	return dirname(dirname(dirname(thisFile)));
+})();
+
+export const BUNDLED_AGENTS_DIR = join(PACKAGE_ROOT, "agents");
+export const BUNDLED_SKILLS_DIR = join(PACKAGE_ROOT, "skills");

package/extensions/rpiv-core/session-hooks.test.ts

@@ -56,10 +56,17 @@ afterEach(() => {
 });
 
 describe("registerSessionHooks — event wiring", () => {
-	it("registers 5 events", () => {
+	it("registers 6 events", () => {
 		const { pi, captured } = createMockPi();
 		registerSessionHooks(pi);
-		for (const ev of ["session_start", "session_compact", "session_shutdown", "tool_call", "before_agent_start"]) {
+		for (const ev of [
+			"session_start",
+			"session_compact",
+			"session_shutdown",
+			"tool_call",
+			"before_agent_start",
+			"agent_end",
+		]) {
 			expect(captured.events.has(ev)).toBe(true);
 		}
 	});
@@ -458,7 +465,7 @@ describe("before_agent_start hook", () => {
 		registerSessionHooks(pi);
 		const handler = captured.events.get("before_agent_start")?.[0];
 		const ctx = createMockCtx({ cwd: projectDir });
-		const r = await handler?.({} as never, ctx as never);
+		const r = await handler?.({ prompt: "" } as never, ctx as never);
 		expect(r).toHaveProperty("message");
 	});
 
@@ -469,8 +476,59 @@ describe("before_agent_start hook", () => {
 		registerSessionHooks(pi);
 		const handler = captured.events.get("before_agent_start")?.[0];
 		const ctx = createMockCtx({ cwd: projectDir });
-		await handler?.({} as never, ctx as never);
-		const second = await handler?.({} as never, ctx as never);
+		await handler?.({ prompt: "" } as never, ctx as never);
+		const second = await handler?.({ prompt: "" } as never, ctx as never);
 		expect(second).toBeUndefined();
 	});
+
+	it("sets status to 'rpiv: <name>' when prompt contains an owned rpiv-pi skill block", async () => {
+		const { pi, captured } = createMockPi({
+			exec: stubGitExec({ branch: "main", commit: "abc", user: "alice" }) as never,
+		});
+		registerSessionHooks(pi);
+		const handler = captured.events.get("before_agent_start")?.[0];
+		const ctx = createMockCtx({ cwd: projectDir });
+		const skillPrompt = `<skill name="discover" location="/some/path">\nbody\n</skill>`;
+		await handler?.({ prompt: skillPrompt } as never, ctx as never);
+		expect(ctx.ui.setStatus).toHaveBeenCalledWith("rpiv-skill", "rpiv: discover");
+	});
+
+	it("does not set status for a skill block whose name is not bundled with rpiv-pi", async () => {
+		// Foreign / user-supplied skills must not be branded as rpiv: — only names that
+		// match a directory under packages/rpiv-pi/skills/ get the rpiv-skill status.
+		const { pi, captured } = createMockPi({
+			exec: stubGitExec({ branch: "main", commit: "abc", user: "alice" }) as never,
+		});
+		registerSessionHooks(pi);
+		const handler = captured.events.get("before_agent_start")?.[0];
+		const ctx = createMockCtx({ cwd: projectDir });
+		const skillPrompt = `<skill name="not-an-rpiv-skill" location="/home/u/.pi/skills/not-an-rpiv-skill">\nbody\n</skill>`;
+		await handler?.({ prompt: skillPrompt } as never, ctx as never);
+		const setStatusCalls = (ctx.ui.setStatus as ReturnType<typeof vi.fn>).mock.calls.filter(
+			(c) => c[0] === "rpiv-skill",
+		);
+		expect(setStatusCalls).toHaveLength(0);
+	});
+
+	it("does not set status when prompt has no skill block", async () => {
+		const { pi, captured } = createMockPi({
+			exec: stubGitExec({ branch: "main", commit: "abc", user: "alice" }) as never,
+		});
+		registerSessionHooks(pi);
+		const handler = captured.events.get("before_agent_start")?.[0];
+		const ctx = createMockCtx({ cwd: projectDir });
+		await handler?.({ prompt: "just a normal chat message" } as never, ctx as never);
+		expect(ctx.ui.setStatus).not.toHaveBeenCalled();
+	});
+});
+
+describe("agent_end hook", () => {
+	it("clears the rpiv-skill status", async () => {
+		const { pi, captured } = createMockPi();
+		registerSessionHooks(pi);
+		const handler = captured.events.get("agent_end")?.[0];
+		const ctx = createMockCtx();
+		await handler?.({ messages: [] } as never, ctx as never);
+		expect(ctx.ui.setStatus).toHaveBeenCalledWith("rpiv-skill", undefined);
+	});
 });

package/extensions/rpiv-core/session-hooks.ts

@@ -8,9 +8,12 @@
 import { cpSync, existsSync, mkdirSync, readdirSync, rmSync } from "node:fs";
 import { join } from "node:path";
 import {
+	type AgentEndEvent,
+	type BeforeAgentStartEvent,
 	type ExtensionAPI,
 	type ExtensionContext,
 	isToolCallEventType,
+	parseSkillBlock,
 	type ToolCallEvent,
 } from "@earendil-works/pi-coding-agent";
 import {
@@ -29,6 +32,7 @@ import {
 } from "./git-context.js";
 import { ARTIFACTS_SUBDIR, clearInjectionState, handleToolCallGuidance, injectRootGuidance } from "./guidance.js";
 import { findMissingSiblings } from "./package-checks.js";
+import { BUNDLED_SKILLS_DIR } from "./paths.js";
 
 const msgAgentsAdded = (n: number) => `Copied ${n} rpiv-pi agent(s) to ~/.pi/agent/agents/`;
 const msgAgentsHealed = (parts: string[]) => `Synced bundled agent(s): ${parts.join(", ")}.`;
@@ -60,7 +64,8 @@ export function registerSessionHooks(pi: ExtensionAPI): void {
 	pi.on("session_compact", async (_event, ctx) => onSessionCompact(_event, ctx, pi));
 	pi.on("session_shutdown", async () => onSessionShutdown());
 	pi.on("tool_call", async (event, ctx) => onToolCall(event, ctx, pi));
-	pi.on("before_agent_start", async () => onBeforeAgentStart(pi));
+	pi.on("before_agent_start", async (event, ctx) => onBeforeAgentStart(event, ctx, pi));
+	pi.on("agent_end", async (_event, ctx) => onAgentEnd(_event, ctx));
 }
 
 // ---------------------------------------------------------------------------
@@ -107,17 +112,45 @@ async function onToolCall(event: ToolCallEvent, ctx: ExtensionContext, pi: Exten
 }
 
 async function onBeforeAgentStart(
+	event: BeforeAgentStartEvent,
+	ctx: ExtensionContext,
 	pi: ExtensionAPI,
 ): Promise<{ message: ReturnType<typeof buildGitContextMessage> } | undefined> {
+	const parsed = parseSkillBlock(event.prompt);
+	if (parsed && isOwnedSkill(parsed.name)) ctx.ui.setStatus("rpiv-skill", `rpiv: ${parsed.name}`);
 	const content = await takeGitContextIfChanged(pi);
 	if (!content) return undefined;
 	return { message: buildGitContextMessage(pi, content) };
 }
 
+async function onAgentEnd(_event: AgentEndEvent, ctx: ExtensionContext): Promise<void> {
+	ctx.ui.setStatus("rpiv-skill", undefined);
+}
+
 // ---------------------------------------------------------------------------
 // Helpers
 // ---------------------------------------------------------------------------
 
+// Allowlist of rpiv-pi's own skill names, generated at module load by reading
+// the package's bundled skills/ directory (see paths.ts — matches the
+// `pi.skills` manifest in package.json). Prevents the status bar from
+// claiming `rpiv:` ownership of user-supplied or third-party skills.
+const OWNED_SKILL_NAMES: ReadonlySet<string> = (() => {
+	try {
+		return new Set(
+			readdirSync(BUNDLED_SKILLS_DIR, { withFileTypes: true })
+				.filter((e) => e.isDirectory())
+				.map((e) => e.name),
+		);
+	} catch {
+		return new Set<string>();
+	}
+})();
+
+function isOwnedSkill(name: string): boolean {
+	return OWNED_SKILL_NAMES.has(name);
+}
+
 function resetInjectionState(): void {
 	clearInjectionState();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@juicesharp/rpiv-pi",
-  "version": "1.9.1",
+  "version": "1.9.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",