pi-messenger 0.14.0 → 0.15.0

package/crew/handlers/plan.ts

@@ -7,14 +7,14 @@
 
 import * as fs from "node:fs";
 import * as path from "node:path";
-import type { ExtensionContext } from "@mariozechner/pi-coding-agent";
-import type { CrewParams } from "../types.js";
-import { result } from "../utils/result.js";
-import { spawnAgents } from "../agents.js";
-import { discoverCrewAgents, discoverCrewSkills, type CrewSkillInfo } from "../utils/discover.js";
-import { loadCrewConfig } from "../utils/config.js";
-import { parseVerdict, type ParsedReview } from "../utils/verdict.js";
-import { logFeedEvent } from "../../feed.js";
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+import type { CrewParams } from "../types.ts";
+import { result } from "../utils/result.ts";
+import { spawnAgents } from "../agents.ts";
+import { discoverCrewAgents, discoverCrewSkills, type CrewSkillInfo } from "../utils/discover.ts";
+import { loadCrewConfig } from "../utils/config.ts";
+import { parseVerdict, type ParsedReview } from "../utils/verdict.ts";
+import { logFeedEvent } from "../../feed.ts";
 import {
   finishPlanningRun,
   isPlanningCancelled,
@@ -24,9 +24,12 @@ import {
   setPlanningPhase,
   startPlanningRun,
   type PlanningPhase,
-} from "../state.js";
-import { getLiveWorkers } from "../live-progress.js";
-import * as store from "../store.js";
+} from "../state.ts";
+import { getLiveWorkers } from "../live-progress.ts";
+import * as store from "../store.ts";
+import * as teamStore from "../team/store.ts";
+import type { TeamProfile, TeamRoleDefinition } from "../team/types.ts";
+import { taskMetadataMarkers } from "../utils/task-format.ts";
 
 const PRD_PATTERNS = [
   "PRD.md", "prd.md",
@@ -202,8 +205,9 @@ export async function execute(
   ctx: ExtensionContext,
   agentName: string,
   onProgress?: () => void,
+  sessionModel?: string,
 ) {
-  const cwd = ctx.cwd ?? process.cwd();
+  const cwd = ctx.cwd;
   const { prd, prompt } = params;
   const reportProgress = () => onProgress?.();
   resetPlanningCancellation();
@@ -299,6 +303,10 @@ export async function execute(
   const maxPasses = Math.max(1, config.planning.maxPasses);
   const hasReviewer = availableAgents.some(a => a.name === "crew-reviewer");
   const skills = discoverCrewSkills(cwd);
+  const activeTeam = teamStore.getActiveTeam(cwd);
+  const activeProfile = activeTeam ? teamStore.loadActiveProfile(cwd) : null;
+  const teamRoles = activeTeam ? teamStore.resolveRoles(cwd) : {};
+  const approvalLabels = activeTeam ? teamStore.activeApprovalLabels(cwd) : [];
 
   const existingProgress = readProgressForPrompt(cwd);
 
@@ -328,13 +336,13 @@ export async function execute(
     notify(ctx, `Planning pass ${pass}/${maxPasses} in progress`, "info");
 
     const plannerPrompt = pass === 1
-      ? buildFirstPassPrompt(prdPath, prdContent, existingProgress, isPromptBased, skills)
-      : buildRefinementPrompt(prdPath, prdContent, readProgressForPrompt(cwd), isPromptBased, skills);
+      ? buildFirstPassPrompt(prdPath, prdContent, existingProgress, isPromptBased, skills, activeTeam?.name, activeProfile, teamRoles, approvalLabels)
+      : buildRefinementPrompt(prdPath, prdContent, readProgressForPrompt(cwd), isPromptBased, skills, activeTeam?.name, activeProfile, teamRoles, approvalLabels);
 
     const [plannerResult] = await spawnAgents([{
       agent: PLANNER_AGENT,
       task: plannerPrompt,
-      modelOverride: config.models?.planner,
+      modelOverride: config.models?.planner ?? sessionModel,
       taskId: "__planner__",
     }], cwd);
 
@@ -387,7 +395,7 @@ export async function execute(
     const [reviewResult] = await spawnAgents([{
       agent: "crew-reviewer",
       task: reviewPrompt,
-      modelOverride: config.models?.reviewer,
+      modelOverride: config.models?.reviewer ?? sessionModel,
       taskId: "__reviewer__",
     }], cwd);
 
@@ -420,7 +428,7 @@ export async function execute(
   const outlineContent = sections
     ? `# Planning Outline\n\n## 1. PRD Understanding Summary\n${sections.prdSummary}\n\n## 2. Relevant Code/Docs/Resources Reviewed\n${sections.resourcesReviewed}\n\n## 3. Sequential Implementation Steps\n${sections.sequentialSteps}\n\n## 4. Parallelized Task Graph\n${sections.parallelTaskGraph}\n`
     : `# Planning Outline\n\nStructured sections were not detected. Full planner output is included below.\n\n${lastPlannerOutput}`;
-  try { setPlanningOutline(cwd, outlineContent); } catch {}
+  setPlanningOutline(cwd, outlineContent);
 
   if (tasks.length === 0) {
     store.setPlanSpec(cwd, lastPlannerOutput);
@@ -436,13 +444,21 @@ export async function execute(
     });
   }
 
-  const createdTasks: { id: string; title: string; dependsOn: string[]; skills?: string[] }[] = [];
+  const createdTasks: { id: string; title: string; dependsOn: string[] }[] = [];
   const titleToId = new Map<string, string>();
 
   for (let i = 0; i < tasks.length; i++) {
     const task = tasks[i];
-    const created = store.createTask(cwd, task.title, task.description);
-    createdTasks.push({ id: created.id, title: task.title, dependsOn: task.dependsOn, skills: task.skills });
+    const role = teamStore.canonicalRoleForTask(cwd, task.role);
+    const riskLabels = teamStore.normalizeRiskLabels(task.riskLabels);
+    const approval = teamStore.approvalForTask(cwd, role, riskLabels);
+    const created = store.createTask(cwd, task.title, task.description, undefined, {
+      ...(role ? { role } : {}),
+      ...(riskLabels && riskLabels.length > 0 ? { risk_labels: riskLabels } : {}),
+      ...(approval ? { approval } : {}),
+      ...(task.skills && task.skills.length > 0 ? { skills: task.skills } : {}),
+    });
+    createdTasks.push({ id: created.id, title: task.title, dependsOn: task.dependsOn });
     titleToId.set(task.title.toLowerCase(), created.id);
     titleToId.set(`task ${i + 1}`, created.id);
     titleToId.set(`task-${i + 1}`, created.id);
@@ -462,9 +478,6 @@ export async function execute(
       }
     }
 
-    if (task.skills && task.skills.length > 0) {
-      store.updateTask(cwd, task.id, { skills: task.skills });
-    }
   }
 
   pruneTransitiveDeps(cwd, createdTasks.map(t => t.id));
@@ -474,7 +487,8 @@ export async function execute(
   const taskList = createdTasks.map(t => {
     const task = store.getTask(cwd, t.id);
     const deps = task?.depends_on.length ? ` → deps: ${task.depends_on.join(", ")}` : "";
-    return `  - ${t.id}: ${t.title}${deps}`;
+    const markers = task ? taskMetadataMarkers(task) : "";
+    return `  - ${t.id}: ${t.title}${markers}${deps}`;
   }).join("\n");
 
   const passLabel = passesCompleted === 1 ? "pass" : "passes";
@@ -503,12 +517,20 @@ export async function execute(
 
   const successLabel = isPromptBased ? `"${runLabel}"` : `**${prdPath}**`;
   const shouldAutoWork = params.autoWork !== false;
-  const nextSteps = shouldAutoWork
-    ? `Workers will start automatically.`
-    : `**Next steps:**
+  let nextSteps = `**Next steps:**
 - Review tasks: \`pi_messenger({ action: "task.list" })\`
 - Start work: \`pi_messenger({ action: "work" })\`
 - Autonomous: \`pi_messenger({ action: "work", autonomous: true })\``;
+  if (shouldAutoWork) {
+    const ready = store.getReadyTasks(cwd, { advisory: config.dependencies === "advisory" });
+    const startable = ready.filter(t => !teamStore.taskNeedsApproval(t));
+    const needsApproval = ready.filter(teamStore.taskNeedsApproval);
+    nextSteps = startable.length > 0
+      ? `Workers will start automatically.`
+      : needsApproval.length > 0
+        ? `Ready tasks need lead approval before workers can start:\n${needsApproval.map(t => `- \`pi_messenger({ action: "task.approve", id: "${t.id}" })\` — ${t.title}`).join("\n")}`
+        : `No tasks are startable yet. Review dependencies with \`pi_messenger({ action: "task.ready" })\`.`;
+  }
 
   const text = `✅ Plan created from ${successLabel}
 
@@ -558,26 +580,60 @@ ${lines.join("\n")}
 `;
 }
 
-function tasksJsonFormatHint(skills: CrewSkillInfo[]): string {
-  return skills.length > 0
-    ? "title, description, dependsOn, and optionally skills (array of skill names from the Available Skills list that are relevant to the task)"
-    : "title, description, and dependsOn";
+function formatTeamForPlanner(teamName: string | undefined, profile: TeamProfile | null, roles: Record<string, TeamRoleDefinition>, approvalLabels: string[]): string {
+  if (!teamName) return "";
+  const roleLines = Object.values(roles)
+    .sort((a, b) => a.name.localeCompare(b.name))
+    .map(role => `  ${role.name}${role.description ? ` — ${role.description}` : ""}${role.model ? ` (model: ${role.model})` : ""}`);
+  const approvalLine = approvalLabels.length > 0
+    ? `\nHigh-risk labels requiring lead approval for editing roles: ${approvalLabels.join(", ")}\n`
+    : "";
+
+  return `
+## Active Team
+
+Team: ${teamName}${profile?.name ? `\nProfile: ${profile.name}` : ""}
+
+Available roles for task assignment:
+${roleLines.join("\n")}${approvalLine}
+These are Team role labels and prompt context; Crew still runs tasks through Crew agents and does not launch pi-subagents.
+When creating tasks, include optional \`role\` and \`riskLabels\` fields where useful. Use non-editing roles such as scout, researcher, reviewer, planner, oracle, and context-builder for investigation, planning, decision, or review tasks.
+
+`;
+}
+
+function tasksJsonFormatHint(skills: CrewSkillInfo[], teamActive: boolean): string {
+  const fields = ["title", "description", "dependsOn"];
+  if (skills.length > 0) fields.push("optionally skills (array of skill names from the Available Skills list that are relevant to the task)");
+  if (teamActive) fields.push("role", "riskLabels (array of high-risk labels such as auth or api-contract)");
+  return `${fields.slice(0, -1).join(", ")}${fields.length > 1 ? ", and " : ""}${fields[fields.length - 1]}`;
 }
 
-function buildFirstPassPrompt(prdPath: string, prdContent: string, existingProgress: string, isPromptBased: boolean, skills: CrewSkillInfo[]): string {
+function buildFirstPassPrompt(
+  prdPath: string,
+  prdContent: string,
+  existingProgress: string,
+  isPromptBased: boolean,
+  skills: CrewSkillInfo[],
+  teamName?: string,
+  profile: TeamProfile | null = null,
+  roles: Record<string, TeamRoleDefinition> = {},
+  approvalLabels: string[] = [],
+): string {
   const specType = isPromptBased ? "request" : "PRD";
   const specLabel = isPromptBased ? "Request" : `PRD: ${prdPath}`;
   const progressSection = existingProgress
     ? `\n## Previous Planning Context\n${existingProgress}\n`
     : "";
   const skillsSection = formatSkillsForPlanner(skills);
+  const teamSection = formatTeamForPlanner(teamName, profile, roles, approvalLabels);
 
   return `Create a task breakdown for implementing this ${specType}.
 
 ## ${specLabel}
 
 ${prdContent}
-${progressSection}${skillsSection}
+${progressSection}${skillsSection}${teamSection}
 You must follow this sequence strictly:
 1) Understand the ${specType}
 2) Review relevant code/docs/reference resources
@@ -592,7 +648,7 @@ Return output in this exact section order and headings:
 
 In section 4, include both:
 - markdown task breakdown
-- a \`tasks-json\` fenced block with task objects containing ${tasksJsonFormatHint(skills)}.`;
+- a \`tasks-json\` fenced block with task objects containing ${tasksJsonFormatHint(skills, !!teamName)}.`;
 }
 
 function buildRefinementPrompt(
@@ -601,14 +657,19 @@ function buildRefinementPrompt(
   progressFileContent: string,
   isPromptBased: boolean,
   skills: CrewSkillInfo[],
+  teamName?: string,
+  profile: TeamProfile | null = null,
+  roles: Record<string, TeamRoleDefinition> = {},
+  approvalLabels: string[] = [],
 ): string {
   const specLabel = isPromptBased ? "Request" : `PRD: ${prdPath}`;
   const skillsSection = formatSkillsForPlanner(skills);
+  const teamSection = formatTeamForPlanner(teamName, profile, roles, approvalLabels);
   return `Refine your task breakdown based on review feedback.
 
 ## ${specLabel}
 ${prdContent}
-${skillsSection}
+${skillsSection}${teamSection}
 ## Planning Progress
 ${progressFileContent}
 
@@ -624,7 +685,7 @@ Return output in this exact section order and headings:
 
 In section 4, include both:
 - markdown task breakdown
-- a \`tasks-json\` fenced block with task objects containing ${tasksJsonFormatHint(skills)}.`;
+- a \`tasks-json\` fenced block with task objects containing ${tasksJsonFormatHint(skills, !!teamName)}.`;
 }
 
 function buildPlanReviewPrompt(
@@ -681,6 +742,8 @@ interface ParsedTask {
   description: string;
   dependsOn: string[];
   skills?: string[];
+  role?: string;
+  riskLabels?: string[];
 }
 
 function extractPlanSections(output: string): PlanSections | null {
@@ -726,12 +789,15 @@ function parseJsonTaskBlock(output: string): ParsedTask[] | null {
     const parsed = JSON.parse(match[1]);
     if (!Array.isArray(parsed)) return null;
     const tasks = parsed
-      .filter((t: Record<string, unknown>) => typeof t.title === "string" && t.title.trim().length > 0)
-      .map((t: Record<string, unknown>) => ({
+      .filter((t: unknown): t is Record<string, unknown> => !!t && typeof t === "object" && !Array.isArray(t))
+      .filter(t => typeof t.title === "string" && t.title.trim().length > 0)
+      .map(t => ({
         title: (t.title as string).trim(),
         description: typeof t.description === "string" ? t.description : "",
         dependsOn: Array.isArray(t.dependsOn) ? t.dependsOn.filter((d: unknown) => typeof d === "string") : [],
         skills: Array.isArray(t.skills) ? t.skills.filter((s: unknown) => typeof s === "string") : undefined,
+        role: typeof t.role === "string" && t.role.trim().length > 0 ? t.role.trim() : undefined,
+        riskLabels: Array.isArray(t.riskLabels) ? t.riskLabels.filter((s: unknown) => typeof s === "string") : undefined,
       }));
     return tasks.length > 0 ? tasks : null;
   } catch {

package/crew/handlers/review.ts

@@ -6,23 +6,24 @@
  */
 
 import { execSync } from "node:child_process";
-import type { ExtensionContext } from "@mariozechner/pi-coding-agent";
-import type { CrewParams } from "../types.js";
-import { result } from "../utils/result.js";
-import { spawnAgents } from "../agents.js";
-import { discoverCrewAgents } from "../utils/discover.js";
-import { loadCrewConfig } from "../utils/config.js";
-import { parseVerdict, type ParsedReview } from "../utils/verdict.js";
-import * as store from "../store.js";
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+import type { CrewParams } from "../types.ts";
+import { result } from "../utils/result.ts";
+import { spawnAgents } from "../agents.ts";
+import { discoverCrewAgents } from "../utils/discover.ts";
+import { loadCrewConfig } from "../utils/config.ts";
+import { parseVerdict, type ParsedReview } from "../utils/verdict.ts";
+import * as store from "../store.ts";
 
 export async function execute(
   params: CrewParams,
-  ctx: ExtensionContext
+  ctx: ExtensionContext,
+  sessionModel?: string,
 ) {
-  const cwd = ctx.cwd ?? process.cwd();
+  const cwd = ctx.cwd;
   const { target, type } = params;
   const config = loadCrewConfig(store.getCrewDir(cwd));
-  const reviewerModel = config.models?.reviewer;
+  const reviewerModel = config.models?.reviewer ?? sessionModel;
 
   if (!target) {
     return result("Error: target (task ID) required for review action.\n\nUsage: pi_messenger({ action: \"review\", target: \"task-1\" })", {
@@ -41,6 +42,14 @@ export async function execute(
     });
   }
 
+  if (type && type !== "impl" && type !== "plan") {
+    return result("Error: review type must be 'impl' or 'plan'.", {
+      mode: "review",
+      error: "invalid_type",
+      type,
+    });
+  }
+
   // Determine review type: "impl" for task, "plan" for plan review
   const reviewType = type ?? (target.startsWith("task-") ? "impl" : "plan");
 

package/crew/handlers/revise.ts

@@ -1,14 +1,14 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
-import type { MessengerState } from "../../lib.js";
-import type { CrewParams, Task } from "../types.js";
-import { result } from "../utils/result.js";
-import * as store from "../store.js";
-import { logFeedEvent } from "../../feed.js";
-import { spawnAgents } from "../agents.js";
-import { getLiveWorkers } from "../live-progress.js";
-import { isAutonomousForCwd, isPlanningForCwd } from "../state.js";
-import { loadCrewConfig } from "../utils/config.js";
+import type { MessengerState } from "../../lib.ts";
+import type { CrewParams, Task } from "../types.ts";
+import { result } from "../utils/result.ts";
+import * as store from "../store.ts";
+import { logFeedEvent } from "../../feed.ts";
+import { spawnAgents } from "../agents.ts";
+import { getLiveWorkers } from "../live-progress.ts";
+import { isAutonomousForCwd, isPlanningForCwd } from "../state.ts";
+import { loadCrewConfig } from "../utils/config.ts";
 
 export interface ReviseResult {
   success: boolean;
@@ -24,6 +24,7 @@ export async function executeRevise(
   taskId: string,
   prompt: string | undefined,
   agentName: string,
+  sessionModel?: string,
 ): Promise<ReviseResult> {
   const task = store.getTask(cwd, taskId);
   if (!task) return { success: false, message: `Task ${taskId} not found` };
@@ -50,7 +51,7 @@ export async function executeRevise(
       agent: "crew-planner",
       task: revisePrompt,
       taskId: "__reviser__",
-      modelOverride: config.models?.planner,
+      modelOverride: config.models?.planner ?? sessionModel,
     }], cwd);
 
     if (agentResult.exitCode !== 0) {
@@ -84,7 +85,7 @@ export async function taskRevise(cwd: string, params: CrewParams, state: Messeng
   const { id, prompt } = params;
   if (!id) return result("Error: id required for task.revise", { mode: "task.revise", error: "missing_id" });
 
-  const r = await executeRevise(cwd, id, prompt ?? undefined, state.agentName || "unknown");
+  const r = await executeRevise(cwd, id, prompt ?? undefined, state.agentName || "unknown", state.model || undefined);
   if (!r.success) {
     return result(`Error: ${r.message}`, { mode: "task.revise", error: "revision_failed", id });
   }
@@ -100,6 +101,7 @@ export async function executeReviseTree(
   taskId: string,
   prompt: string | undefined,
   agentName: string,
+  sessionModel?: string,
 ): Promise<ReviseResult> {
   const target = store.getTask(cwd, taskId);
   if (!target) return { success: false, message: `Task ${taskId} not found` };
@@ -134,7 +136,7 @@ export async function executeReviseTree(
       agent: "crew-planner",
       task: revisePrompt,
       taskId: "__reviser__",
-      modelOverride: config.models?.planner,
+      modelOverride: config.models?.planner ?? sessionModel,
     }], cwd);
 
     if (agentResult.exitCode !== 0) {
@@ -227,7 +229,7 @@ export async function taskReviseTree(cwd: string, params: CrewParams, state: Mes
   const { id, prompt } = params;
   if (!id) return result("Error: id required for task.revise-tree", { mode: "task.revise-tree", error: "missing_id" });
 
-  const r = await executeReviseTree(cwd, id, prompt ?? undefined, state.agentName || "unknown");
+  const r = await executeReviseTree(cwd, id, prompt ?? undefined, state.agentName || "unknown", state.model || undefined);
   if (!r.success) {
     return result(`Error: ${r.message}`, { mode: "task.revise-tree", error: "revision_failed", id });
   }

package/crew/handlers/status.ts

@@ -4,20 +4,20 @@
  * Shows plan progress and task status.
  */
 
-import type { ExtensionContext } from "@mariozechner/pi-coding-agent";
-import { result } from "../utils/result.js";
-import { discoverCrewAgents } from "../utils/discover.js";
-import { uninstallAgents } from "../utils/install.js";
-import { loadCrewConfig } from "../utils/config.js";
-import { formatDuration } from "../../lib.js";
-import * as store from "../store.js";
-import { autonomousState, getPlanningUpdateAgeMs, isAutonomousForCwd, isPlanningForCwd, isPlanningStalled, planningState, PLANNING_STALE_TIMEOUT_MS } from "../state.js";
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { result } from "../utils/result.ts";
+import { discoverCrewAgents } from "../utils/discover.ts";
+import { uninstallAgents } from "../utils/install.ts";
+import { loadCrewConfig } from "../utils/config.ts";
+import { formatDuration } from "../../lib.ts";
+import * as store from "../store.ts";
+import { autonomousState, getPlanningUpdateAgeMs, isAutonomousForCwd, isPlanningForCwd, isPlanningStalled, planningState, PLANNING_STALE_TIMEOUT_MS } from "../state.ts";
 
 /**
  * Execute status action - shows plan progress.
  */
 export async function execute(ctx: ExtensionContext) {
-  const cwd = ctx.cwd ?? process.cwd();
+  const cwd = ctx.cwd;
   const plan = store.getPlan(cwd);
 
   if (!plan) {
@@ -197,7 +197,7 @@ export async function executeCrew(
   op: string,
   ctx: ExtensionContext
 ) {
-  const cwd = ctx.cwd ?? process.cwd();
+  const cwd = ctx.cwd;
 
   switch (op) {
     case "status": {

package/crew/handlers/sync.ts

@@ -5,19 +5,20 @@
  * Works with current plan's tasks.
  */
 
-import type { ExtensionContext } from "@mariozechner/pi-coding-agent";
-import type { CrewParams } from "../types.js";
-import { result } from "../utils/result.js";
-import { spawnAgents } from "../agents.js";
-import { discoverCrewAgents } from "../utils/discover.js";
-import { loadCrewConfig } from "../utils/config.js";
-import * as store from "../store.js";
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+import type { CrewParams } from "../types.ts";
+import { result } from "../utils/result.ts";
+import { spawnAgents } from "../agents.ts";
+import { discoverCrewAgents } from "../utils/discover.ts";
+import { loadCrewConfig } from "../utils/config.ts";
+import * as store from "../store.ts";
 
 export async function execute(
   params: CrewParams,
-  ctx: ExtensionContext
+  ctx: ExtensionContext,
+  sessionModel?: string,
 ) {
-  const cwd = ctx.cwd ?? process.cwd();
+  const cwd = ctx.cwd;
   const { target } = params;
 
   if (!target) {
@@ -126,7 +127,7 @@ Follow the output format in your instructions.`;
   const [syncResult] = await spawnAgents([{
     agent: "crew-plan-sync",
     task: prompt,
-    modelOverride: config.models?.analyst,
+    modelOverride: config.models?.analyst ?? sessionModel,
   }], cwd);
 
   if (syncResult.exitCode !== 0) {