pi-crew 0.7.7 → 0.8.2

package/src/runtime/skill-instructions.ts

@@ -21,6 +21,8 @@ const PACKAGE_SKILLS_DIR = path.resolve(
 	"..",
 	"skills",
 );
+import * as os from "node:os";
+import { getAgentDir } from "@earendil-works/pi-coding-agent";
 const MAX_SKILL_CHARS = 1500;
 const MAX_TOTAL_CHARS = 6000;
 const MAX_SKILL_NAME_CHARS = 80;
@@ -139,16 +141,24 @@ export function resolveTaskSkillNames(input: ResolveTaskSkillsInput): string[] {
 
 function candidateSkillDirs(
 	cwd: string,
-): Array<{ root: string; source: "project" | "package" }> {
+): Array<{ root: string; source: "project" | "package" | "project-pi" | "user-pi" | "project-agents" | "user-agents" }> {
 	return [
 		{ root: PACKAGE_SKILLS_DIR, source: "package" }, // ✓ Trusted first
-		{ root: path.resolve(cwd, "skills"), source: "project" }, // ⚠️ Override second
+		// F6 (v0.7.9): same five roots as discover-skills, in the same precedence
+		// order. The first hit wins, so a project `.pi/skills/foo/SKILL.md`
+		// overrides both the bundled `foo` and any legacy `<cwd>/skills/foo`.
+		{ root: path.resolve(cwd, ".pi", "skills"), source: "project-pi" },
+		{ root: path.resolve(cwd, ".agents", "skills"), source: "project-agents" },
+		{ root: path.resolve(cwd, "skills"), source: "project" },
+		{ root: path.join(getAgentDir(), "skills"), source: "user-pi" },
+		{ root: path.join(os.homedir(), ".agents", "skills"), source: "user-agents" },
+		{ root: path.join(os.homedir(), ".pi", "skills"), source: "user-pi" },
 	];
 }
 
 interface CachedSkillMarkdown {
 	path: string;
-	source: "project" | "package";
+	source: "project" | "package" | "project-pi" | "user-pi" | "project-agents" | "user-agents";
 	content: string;
 	mtimeMs: number;
 	size: number;
@@ -187,7 +197,7 @@ function readSkillMarkdown(
 	cwd: string,
 	name: string,
 ):
-	| { path: string; source: "project" | "package"; content: string }
+	| { path: string; source: "project" | "package" | "project-pi" | "user-pi" | "project-agents" | "user-agents"; content: string }
 	| undefined {
 	if (!isValidSkillName(name)) return undefined;
 	const cacheKey = `${path.resolve(cwd)}:${name}`;

package/src/runtime/task-runner.ts

@@ -32,6 +32,8 @@ import {
 	isRetryableModelFailure,
 	type ModelAttemptSummary,
 } from "./model-fallback.ts";
+import { readEnabledModelsPatterns } from "./model-scope.ts";
+import { loadConfig } from "../config/config.ts";
 import { tailReadWithLineSnap } from "./task-runner/tail-read.ts";
 import {
 	parsePiJsonOutput,
@@ -385,6 +387,7 @@ export async function runTeamTask(
 				parentModel: input.parentModel,
 				modelRegistry: input.modelRegistry,
 				cwd: task.cwd,
+				scopeModelsPatterns: await resolveTaskScopeModelsPatterns(task.cwd),
 			});
 			const candidates = modelRoutingPlan.candidates;
 			const attemptModels =
@@ -1306,3 +1309,21 @@ export async function runTeamTask(
 		streamBridge?.dispose();
 	}
 }
+
+/**
+ * F7: resolve the enabledModels allowlist for the child-process spawn path,
+ * but only if `runtime.reliability.scopeModels` is ON. Returns [] (no-op)
+ * when the toggle is off or the allowlist is empty. Best-effort: any failure
+ * to read config or the allowlist silently disables the gate so spawn is
+ * never blocked by a misconfiguration.
+ */
+async function resolveTaskScopeModelsPatterns(cwd: string): Promise<string[]> {
+	let scopeModels = false;
+	try {
+		scopeModels = loadConfig(cwd).config.reliability?.scopeModels === true;
+	} catch {
+		return [];
+	}
+	if (!scopeModels) return [];
+	return readEnabledModelsPatterns(cwd);
+}

package/src/skills/discover-skills.ts

@@ -1,6 +1,8 @@
 import * as fs from "node:fs";
+import * as os from "node:os";
 import * as path from "node:path";
 import { fileURLToPath } from "node:url";
+import { getAgentDir } from "@earendil-works/pi-coding-agent";
 import { logInternalError } from "../utils/internal-error.ts";
 import { isSafePathId, resolveContainedPath, resolveRealContainedPath } from "../utils/safe-paths.ts";
 
@@ -12,13 +14,40 @@ let cache: { skills: SkillDescriptor[]; cachedAt: number; cwd: string } | null =
 export interface SkillDescriptor {
 	name: string;
 	description: string;
-	source: "project" | "package";
+	/**
+	 * Source of the skill. F6 (v0.7.9) adds the Agent Skills spec roots:
+	 * - `project-pi` / `user-pi` — Pi's standard `.pi/skills/`
+	 * - `project-agents` / `user-agents` — cross-tool Agent Skills spec (`.agents/skills/`)
+	 * The original `project` / `package` are kept for back-compat.
+	 */
+	source: "project" | "package" | "project-pi" | "user-pi" | "project-agents" | "user-agents";
 	path: string;
 }
 
-function listSkillDirs(cwd: string): Array<{ root: string; source: "project" | "package" }> {
+/**
+ * F6 (v0.7.9): discover skills from all five roots (matching pi-subagents'
+ * skill-loader so users authoring skills under either convention find them).
+ * Roots, in precedence order (first hit wins):
+ *   1. <cwd>/.pi/skills          (project, Pi standard)
+ *   2. <cwd>/.agents/skills      (project, Agent Skills spec — agentskills.io)
+ *   3. <cwd>/skills              (project, legacy pi-crew convention)
+ *   4. <getAgentDir>/skills      (user, Pi standard)
+ *   5. <homedir>/.agents/skills  (user, Agent Skills spec)
+ *   6. <homedir>/.pi/skills      (user, legacy Pi — pre-standard)
+ *   7. PACKAGE_SKILLS_DIR        (bundled, trusted)
+ * The `PACKAGE_SKILLS_DIR` (bundled) and the legacy `<cwd>/skills` root are
+ * kept as separate `source` values to preserve the existing capability
+ * inventory shape — callers that key on `source === "package"` / `source ===
+ * "project"` keep working.
+ */
+function listSkillDirs(cwd: string): Array<{ root: string; source: SkillDescriptor["source"] }> {
 	return [
+		{ root: path.resolve(cwd, ".pi", "skills"), source: "project-pi" },
+		{ root: path.resolve(cwd, ".agents", "skills"), source: "project-agents" },
 		{ root: path.resolve(cwd, "skills"), source: "project" },
+		{ root: path.join(getAgentDir(), "skills"), source: "user-pi" },
+		{ root: path.join(os.homedir(), ".agents", "skills"), source: "user-agents" },
+		{ root: path.join(os.homedir(), ".pi", "skills"), source: "user-pi" },
 		{ root: PACKAGE_SKILLS_DIR, source: "package" },
 	];
 }

package/src/ui/agent-management-overlay.ts

@@ -65,7 +65,7 @@ export interface AgentOverlayState {
 export function createAgentOverlayState(entries: AgentEntry[], maxVisible = 20): AgentOverlayState {
 	return {
 		entries: entries.sort((a, b) => {
-			const order: Record<ResourceSource, number> = { project: 0, user: 1, git: 2, builtin: 3, dynamic: 4 };
+			const order: Record<ResourceSource, number> = { project: 0, "project-pi": 1, user: 2, git: 3, builtin: 4, dynamic: 5 };
 			const diff = (order[a.source] ?? 4) - (order[b.source] ?? 4);
 			return diff !== 0 ? diff : a.name.localeCompare(b.name);
 		}),

package/src/utils/session-utils.ts

@@ -49,4 +49,34 @@ export function safeToPiSessionId(runId: string): string | undefined {
 	} catch {
 		return undefined;
 	}
+}
+
+/**
+ * Extract the current Pi session id from an ExtensionContext.
+ *
+ * `ExtensionContext` does not declare `sessionId` in its type, but the runtime
+ * attaches it as an own property. We read it via `getOwnPropertyDescriptor`
+ * to safely bypass any Proxy traps, then validate it as a non-empty string.
+ *
+ * This is the canonical accessor — every site that filters the SHARED
+ * per-project `.crew/state/` tree down to the current session MUST use this,
+ * otherwise cross-session state leaks (e.g. compaction-guard resuming another
+ * session's runs, ambient-status injecting another session's runs).
+ *
+ * Returns undefined when the session id is absent or unparseable — callers
+ * must decide whether to treat that as "no filter" (back-compat) or "no runs".
+ */
+export function extractSessionId(ctx: unknown): string | undefined {
+	if (typeof ctx !== "object" || ctx === null) return undefined;
+	let raw: unknown;
+	try {
+		raw = Object.getOwnPropertyDescriptor(ctx, "sessionId")?.value;
+	} catch {
+		// Defensive: a hostile Proxy or exotic object may trap descriptor
+		// access. Real Pi ExtensionContext objects are plain, so this is
+		// only hit by adversarial/degenerate inputs — treat as no session id.
+		return undefined;
+	}
+	if (typeof raw !== "string" || raw.length === 0) return undefined;
+	return raw;
 }