@ilya-lesikov/pi-pi 0.4.0 → 0.6.0

package/extensions/orchestrator/agents/code-reviewer.ts

@@ -1,36 +1,52 @@
-import type { PiPiConfig } from "../config.js";
-import { TOOL_ROUTING, ALL_CBM_TOOLS, EXA_TOOLS, WORKING_PRINCIPLES_READONLY, COMMUNICATION } from "./tool-routing.js";
+import type { VariantConfig } from "../config.js";
+import { loadAllContextFiles } from "../context.js";
+import { resolveModel, getModelInfo } from "../model-registry.js";
+import type { RepoInfo } from "../repo-utils.js";
+import { buildRepoContext } from "./repo-context.js";
+import { TOOLS_BLOCK, ALL_CBM_TOOLS, EXA_TOOLS, PRINCIPLES_BLOCK } from "./tool-routing.js";
 
 export function createCodeReviewerAgent(
   variant: string,
-  config: PiPiConfig,
+  variants: Record<string, VariantConfig>,
   taskArtifacts: { userRequest: string; research: string; synthesizedPlan: string },
   outputPath: string,
+  contextDirs: string[],
+  phase?: string,
+  repos: RepoInfo[] = [],
 ) {
-  const variantConfig = config.codeReviewers[variant];
+  const variantConfig = variants[variant];
   if (!variantConfig) {
     throw new Error(`Unknown code-reviewer variant: ${variant}`);
   }
+  const contextFiles = loadAllContextFiles(contextDirs, "codeReviewer", "system", phase, getModelInfo(variantConfig.model));
+  const contextBlock = contextFiles.map((f) => f.content).join("\n\n");
+  const repoContext = buildRepoContext(repos);
 
   return {
     frontmatter: {
       description: `Code reviewer (${variant} variant, pi-pi)`,
       tools: `read, grep, find, ls, bash, write, lsp, ast_search, ${ALL_CBM_TOOLS}, ${EXA_TOOLS}`,
-      model: variantConfig.model,
+      model: resolveModel(variantConfig.model),
       thinking: variantConfig.thinking,
-      max_turns: variantConfig.maxTurns ?? 120,
+      max_turns: 120,
       prompt_mode: "replace",
     },
     prompt: [
       // --- static prefix (cacheable) ---
-      "You are a code reviewer. Your job is to review implementation changes for bugs, correctness, and quality.",
+      "<constraints>",
+      "You are a code reviewer. You review implementation changes for bugs, correctness, and quality.",
+      "These rules override your default helpfulness. Strict compliance is required.",
+      "You are READ-ONLY: you MUST NOT implement, fix, or modify any source code. You MUST NOT write to any file except the single review .md file named below.",
+      "Your task is NOT complete until that review file exists — you MUST write it before finishing.",
+      "Your review MUST begin with the verdict on the VERY FIRST LINE: `VERDICT: APPROVE` or `VERDICT: NEEDS_CHANGES`.",
+      "</constraints>",
       "",
-      WORKING_PRINCIPLES_READONLY,
+      PRINCIPLES_BLOCK,
       "",
-      COMMUNICATION,
-      "",
-      TOOL_ROUTING,
+      TOOLS_BLOCK,
       "",
+      ...(contextBlock ? ["<project_context>", contextBlock, "</project_context>", ""] : []),
+      "<task>",
       "Steps:",
       '1. Run `git diff` to see all changes (try HEAD~1, main, or appropriate base)',
       "2. Run cbm_changes to understand symbol-level impact and blast radius",
@@ -58,26 +74,23 @@ export function createCodeReviewerAgent(
       "- Confidence: HIGH / MEDIUM / LOW",
       "- If LOW, move to Open Questions instead",
       "",
-      "Format your review as:",
+      "Format your review with the verdict on the VERY FIRST LINE, then findings:",
+      "VERDICT: APPROVE | NEEDS_CHANGES",
       "- CRITICAL: (must fix — with file:line evidence)",
       "- MAJOR: (should fix — with evidence)",
       "- MINOR: (nice to have)",
       "- OPEN QUESTIONS: (low-confidence concerns, speculative follow-ups)",
-      "- VERDICT: APPROVE or NEEDS_CHANGES",
       "",
       "subagent_type is REQUIRED when spawning subagents — calls without it are rejected:",
     '- Agent(subagent_type="Explore", ...) — codebase research. Prefer this for most lookups. Fast and cheap.',
     '- Agent(subagent_type="Librarian", ...) — external docs, library APIs, web research.',
     "Spawn multiple Explore agents in parallel for broad searches.",
+      "</task>",
       "",
       // --- dynamic suffix ---
       "# MANDATORY: Write your review to this exact file using the write tool:",
       `  ${outputPath}`,
       "",
-      "Your task is NOT complete until this file exists. Do NOT finish without writing it.",
-      "You MUST NOT write to any other file. Only write .md files inside .pp/state/.",
-      "Do NOT implement, fix, or modify any source code — you are a reviewer, not an implementer.",
-      "",
       "=== USER REQUEST ===",
       taskArtifacts.userRequest,
       "",
@@ -86,6 +99,7 @@ export function createCodeReviewerAgent(
       "",
       "=== SYNTHESIZED PLAN ===",
       taskArtifacts.synthesizedPlan,
+      ...(repoContext ? [repoContext] : []),
       "",
       "The artifacts above are already in your context. Do NOT re-read them from disk.",
     ].join("\n"),

package/extensions/orchestrator/agents/constraints.ts

@@ -0,0 +1,55 @@
+import type { Phase, TaskMode } from "../state.js";
+
+const READONLY_CONSTRAINT =
+  "You MUST NOT edit, create, or delete any project file (source, tests, config, docs) — only files under .pp/state/ may be written — and you MUST NOT run state-changing shell commands. If you find a fix worth making, record it in your output; do NOT apply it here.";
+
+const IMPLEMENT_CONSTRAINT =
+  "Implement only the approved plan. Do NOT add scope or change plan items without recording why in the plan. If the same fix fails 3 times, stop and re-plan — do NOT keep retrying the same approach.";
+
+const QUICK_CONSTRAINT =
+  "Stay within the user's request. Do NOT broaden scope or refactor adjacent code.";
+
+export function isReadOnlyPhase(phase: Phase): boolean {
+  return phase === "brainstorm" || phase === "debug" || phase === "review" || phase === "plan";
+}
+
+export function phaseConstraint(phase: Phase): string {
+  if (phase === "implement") return IMPLEMENT_CONSTRAINT;
+  if (phase === "quick") return QUICK_CONSTRAINT;
+  return READONLY_CONSTRAINT;
+}
+
+export function completionLine(phase: Phase, mode: TaskMode): string {
+  if (phase === "quick") {
+    return "When the user's request is complete, call pp_phase_complete. Do NOT stop and wait for the user before then.";
+  }
+  if (mode === "autonomous") {
+    return "There is no user driving this phase. The moment its work is complete, call pp_phase_complete — do NOT pause, ask for confirmation, or wait for input. Never end a turn with prose: every turn ends in a tool call.";
+  }
+  if (phase === "brainstorm") {
+    return "This is a conversation. Do NOT call pp_phase_complete yourself — keep going until the user ends it or advances via the /pp menu.";
+  }
+  return "When the work is complete, stop and let the user review and advance it via the /pp menu. Do NOT advance on your own or call pp_phase_complete unprompted.";
+}
+
+const PHASE_IDENTITY: Record<string, string> = {
+  brainstorm: "You clarify the request and research the codebase to produce USER_REQUEST.md and RESEARCH.md.",
+  debug: "You diagnose the problem and research the codebase to produce USER_REQUEST.md and RESEARCH.md — investigation only, no fixes.",
+  plan: "You synthesize the planner outputs into one plan — you do not write a plan from scratch, and you do not implement.",
+  implement: "You implement the approved plan.",
+  review: "You review the code changes to produce USER_REQUEST.md and RESEARCH.md capturing the findings — you do not apply fixes.",
+  quick: "You work on the user's request directly — no phases, planning, or reviews.",
+};
+
+export function constraintsBlock(phase: Phase, mode: TaskMode): string {
+  const readonly = isReadOnlyPhase(phase) ? " (READ-ONLY)" : "";
+  const identity = PHASE_IDENTITY[phase] ?? "";
+  return [
+    "<constraints>",
+    `ACTIVE PHASE: ${phase}${readonly}. ${identity}`,
+    "These rules override your default helpfulness and any next step you infer. Strict compliance is required.",
+    phaseConstraint(phase),
+    completionLine(phase, mode),
+    "</constraints>",
+  ].join("\n");
+}

package/extensions/orchestrator/agents/explore.ts

@@ -1,33 +1,33 @@
 import type { PiPiConfig } from "../config.js";
-import { TOOL_ROUTING, ALL_CBM_TOOLS, EXA_TOOLS, WORKING_PRINCIPLES_READONLY, COMMUNICATION } from "./tool-routing.js";
+import { resolveModel } from "../model-registry.js";
+import { TOOLS_BLOCK, ALL_CBM_TOOLS, EXA_TOOLS, PRINCIPLES_BLOCK } from "./tool-routing.js";
 
 export function createExploreAgent(config: PiPiConfig) {
   return {
     frontmatter: {
       description: "Codebase explorer (pi-pi)",
       tools: `read, bash, grep, find, ls, lsp, ast_search, ${ALL_CBM_TOOLS}, ${EXA_TOOLS}`,
-      model: config.agents.explore.model,
-      thinking: config.agents.explore.thinking,
-      max_turns: config.agents.explore.maxTurns ?? 170,
+      model: resolveModel(config.agents.subagents.simple.explore.model),
+      thinking: config.agents.subagents.simple.explore.thinking,
+      max_turns: 170,
       prompt_mode: "replace",
     },
     prompt: [
-      "You are a focused codebase search agent.",
+      "<constraints>",
+      "You are a focused codebase SEARCH agent. You find specific information and report it with file paths.",
+      "You are READ-ONLY: you MUST NOT modify any file. Report findings; do NOT change code.",
+      "</constraints>",
       "",
-      "Your job is to find specific information in the codebase and report back with file paths and findings.",
-      "You are read-only — do NOT modify any files.",
+      PRINCIPLES_BLOCK,
       "",
-      WORKING_PRINCIPLES_READONLY,
+      TOOLS_BLOCK,
       "",
-      COMMUNICATION,
-      "",
-      TOOL_ROUTING,
-      "",
-      "# Instructions",
+      "<task>",
       "- Search multiple angles in parallel for speed",
       "- Start with cbm_search or cbm_search_code for discovery, then narrow with lsp for precision",
       "- Return file paths with brief descriptions of what you found",
       "- When done, provide a concise summary of findings",
+      "</task>",
     ].join("\n"),
   };
 }

package/extensions/orchestrator/agents/librarian.ts

@@ -1,24 +1,26 @@
 import type { PiPiConfig } from "../config.js";
-import { COMMUNICATION } from "./tool-routing.js";
+import { resolveModel } from "../model-registry.js";
+import { PRINCIPLES_BLOCK } from "./tool-routing.js";
 
 export function createLibrarianAgent(config: PiPiConfig) {
   return {
     frontmatter: {
       description: "External docs researcher (pi-pi)",
       tools: "read, bash, grep, find, exa_search, exa_fetch",
-      model: config.agents.librarian.model,
-      thinking: config.agents.librarian.thinking,
-      max_turns: config.agents.librarian.maxTurns ?? 120,
+      model: resolveModel(config.agents.subagents.simple.librarian.model),
+      thinking: config.agents.subagents.simple.librarian.thinking,
+      max_turns: 120,
       prompt_mode: "replace",
     },
     prompt: [
-      "You are a research agent specializing in external documentation and libraries.",
+      "<constraints>",
+      "You are a research agent specializing in external documentation and libraries. You find documentation, best practices, and usage patterns for external libraries and APIs.",
+      "You are READ-ONLY: you MUST NOT modify any project file. Report findings; do NOT change code.",
+      "</constraints>",
       "",
-      "Your job is to find documentation, best practices, and usage patterns for external libraries and APIs.",
-      "You are read-only — do NOT modify any project files.",
-      "",
-      COMMUNICATION,
+      PRINCIPLES_BLOCK,
       "",
+      "<task>",
       "# How to research",
       "",
       "Never guess at APIs — always look them up. Training data may be outdated or wrong.",
@@ -38,6 +40,7 @@ export function createLibrarianAgent(config: PiPiConfig) {
       "- Include exact URLs or file paths for every claim",
       "- Quote relevant code snippets from docs",
       "- Flag any version-specific caveats",
+      "</task>",
     ].join("\n"),
   };
 }

package/extensions/orchestrator/agents/plan-reviewer.ts

@@ -1,39 +1,51 @@
-import type { PiPiConfig } from "../config.js";
-import { TOOL_ROUTING, ALL_CBM_TOOLS, EXA_TOOLS, WORKING_PRINCIPLES_READONLY, COMMUNICATION } from "./tool-routing.js";
+import type { VariantConfig } from "../config.js";
+import { loadAllContextFiles } from "../context.js";
+import { resolveModel, getModelInfo } from "../model-registry.js";
+import type { RepoInfo } from "../repo-utils.js";
+import { buildRepoContext } from "./repo-context.js";
+import { TOOLS_BLOCK, ALL_CBM_TOOLS, EXA_TOOLS, PRINCIPLES_BLOCK } from "./tool-routing.js";
 
 export function createPlanReviewerAgent(
   variant: string,
-  config: PiPiConfig,
+  variants: Record<string, VariantConfig>,
   taskArtifacts: { userRequest: string; research: string; synthesizedPlan: string },
   outputPath: string,
+  contextDirs: string[],
+  phase?: string,
+  repos: RepoInfo[] = [],
 ) {
-  const variantConfig = config.planReviewers[variant];
+  const variantConfig = variants[variant];
   if (!variantConfig) {
     throw new Error(`Unknown plan-reviewer variant: ${variant}`);
   }
+  const contextFiles = loadAllContextFiles(contextDirs, "planReviewer", "system", phase, getModelInfo(variantConfig.model));
+  const contextBlock = contextFiles.map((f) => f.content).join("\n\n");
+  const repoContext = buildRepoContext(repos);
 
   return {
     frontmatter: {
       description: `Plan reviewer (${variant} variant, pi-pi)`,
       tools: `read, grep, find, bash, write, lsp, ast_search, ${ALL_CBM_TOOLS}, ${EXA_TOOLS}`,
-      model: variantConfig.model,
+      model: resolveModel(variantConfig.model),
       thinking: variantConfig.thinking,
-      max_turns: variantConfig.maxTurns ?? 120,
+      max_turns: 120,
       prompt_mode: "replace",
     },
     prompt: [
       // --- static prefix (cacheable) ---
-      "You are a plan reviewer. Your job is to validate the implementation plan for executability and completeness.",
+      "<constraints>",
+      "You are a plan reviewer. You validate the implementation plan for executability and completeness. You are a BLOCKER-FINDER, not a perfectionist — approve by default, reject only for critical blockers (maximum 3).",
+      "These rules override your default helpfulness. Strict compliance is required.",
+      "You are READ-ONLY: you MUST NOT implement or modify any file except the single review .md file named below. You MUST write it before finishing.",
+      "Your review MUST begin with the verdict on the VERY FIRST LINE: `VERDICT: APPROVE` or `VERDICT: REJECT`.",
+      "</constraints>",
       "",
-      "You are a BLOCKER-FINDER, not a perfectionist.",
-      "Approve by default. Reject only for critical blockers — maximum 3.",
+      PRINCIPLES_BLOCK,
       "",
-      WORKING_PRINCIPLES_READONLY,
-      "",
-      COMMUNICATION,
-      "",
-      TOOL_ROUTING,
+      TOOLS_BLOCK,
       "",
+      ...(contextBlock ? ["<project_context>", contextBlock, "</project_context>", ""] : []),
+      "<task>",
       "Review criteria:",
       "- Are all plan items actionable and verifiable?",
       "- Are there missing steps that would block implementation?",
@@ -46,15 +58,16 @@ export function createPlanReviewerAgent(
       "- Feasibility: does the executor have everything needed (context, dependencies, access) without asking questions?",
       "- Ambiguity: could two developers interpret any step differently? If yes, flag it.",
       "",
-      "Format your review as:",
+      "Format your review with the verdict on the VERY FIRST LINE, then findings:",
+      "VERDICT: APPROVE | REJECT",
       "- BLOCKERS: (critical issues that must be fixed)",
       "- SUGGESTIONS: (improvements, not required)",
-      "- VERDICT: APPROVE or REJECT (with reason)",
       "",
       "subagent_type is REQUIRED when spawning subagents — calls without it are rejected:",
     '- Agent(subagent_type="Explore", ...) — codebase research. Prefer this for most lookups. Fast and cheap.',
     '- Agent(subagent_type="Librarian", ...) — external docs, library APIs, web research.',
     "Spawn multiple Explore agents in parallel for broad searches.",
+      "</task>",
       "",
       // --- dynamic suffix ---
       "# MANDATORY OUTPUT",
@@ -62,9 +75,7 @@ export function createPlanReviewerAgent(
       "Write your review to this exact file using the write tool:",
       `  ${outputPath}`,
       "",
-      "Your task is NOT complete until this file exists. Do NOT finish without writing it.",
-      "You MUST NOT write to any other file. Only write .md files inside .pp/state/.",
-      "Do NOT implement, fix, or modify any source code — you are a reviewer, not an implementer.",
+      "You MUST write only to the review file above. Do NOT write to any other file.",
       "",
       "=== USER REQUEST ===",
       taskArtifacts.userRequest,
@@ -74,6 +85,7 @@ export function createPlanReviewerAgent(
       "",
       "=== SYNTHESIZED PLAN ===",
       taskArtifacts.synthesizedPlan,
+      ...(repoContext ? [repoContext] : []),
       "",
       "The artifacts above are already in your context. Do NOT re-read them from disk.",
     ].join("\n"),

package/extensions/orchestrator/agents/planner.ts

@@ -1,36 +1,51 @@
-import type { PiPiConfig } from "../config.js";
-import { TOOL_ROUTING, ALL_CBM_TOOLS, EXA_TOOLS, WORKING_PRINCIPLES_READONLY, COMMUNICATION } from "./tool-routing.js";
+import type { VariantConfig } from "../config.js";
+import { loadAllContextFiles } from "../context.js";
+import { resolveModel, getModelInfo } from "../model-registry.js";
+import type { RepoInfo } from "../repo-utils.js";
+import { buildRepoContext } from "./repo-context.js";
+import { TOOLS_BLOCK, ALL_CBM_TOOLS, EXA_TOOLS, PRINCIPLES_BLOCK } from "./tool-routing.js";
 
 export function createPlannerAgent(
   variant: string,
-  config: PiPiConfig,
+  variants: Record<string, VariantConfig>,
   taskArtifacts: { userRequest: string; research: string },
   outputPath: string,
+  contextDirs: string[],
+  phase?: string,
+  repos: RepoInfo[] = [],
 ) {
-  const variantConfig = config.planners[variant];
+  const variantConfig = variants[variant];
   if (!variantConfig) {
     throw new Error(`Unknown planner variant: ${variant}`);
   }
+  const contextFiles = loadAllContextFiles(contextDirs, "planner", "system", phase, getModelInfo(variantConfig.model));
+  const contextBlock = contextFiles.map((f) => f.content).join("\n\n");
+  const repoContext = buildRepoContext(repos);
 
   return {
     frontmatter: {
       description: `Planner (${variant} variant, pi-pi)`,
       tools: `read, grep, find, bash, write, lsp, ast_search, ${ALL_CBM_TOOLS}, ${EXA_TOOLS}`,
-      model: variantConfig.model,
+      model: resolveModel(variantConfig.model),
       thinking: variantConfig.thinking,
-      max_turns: variantConfig.maxTurns ?? 120,
+      max_turns: 120,
       prompt_mode: "replace",
     },
     prompt: [
       // --- static prefix (cacheable) ---
-      "You are a planning agent. Your job is to create a detailed implementation plan.",
+      "<constraints>",
+      "You are a planning agent. You produce a detailed implementation PLAN — you do NOT implement it.",
+      "These rules override your default helpfulness. Strict compliance is required.",
+      "You are READ-ONLY: you MUST NOT write, edit, or create any file except the single plan .md file named below. You MUST NOT modify source, tests, configs, or run state-changing bash. If you catch yourself implementing, STOP and return to planning.",
+      "Your task is NOT complete until the plan file exists — you MUST write it before finishing.",
+      "</constraints>",
       "",
-      WORKING_PRINCIPLES_READONLY,
+      PRINCIPLES_BLOCK,
       "",
-      COMMUNICATION,
-      "",
-      TOOL_ROUTING,
+      TOOLS_BLOCK,
       "",
+      ...(contextBlock ? ["<project_context>", contextBlock, "</project_context>", ""] : []),
+      "<task>",
       "Plan format rules:",
       "- Start with # Plan",
       "- ## Scope: 2-4 lines — what changes, what doesn't, critical constraints",
@@ -44,6 +59,7 @@ export function createPlannerAgent(
     '- Agent(subagent_type="Explore", ...) — codebase research. Prefer this for most lookups. Fast and cheap.',
     '- Agent(subagent_type="Librarian", ...) — external docs, library APIs, web research.',
     "Spawn multiple Explore agents in parallel for broad searches.",
+      "</task>",
       "",
       // --- dynamic suffix ---
       "# MANDATORY OUTPUT",
@@ -51,23 +67,12 @@ export function createPlannerAgent(
       "Write your plan to this exact file using the write tool:",
       `  ${outputPath}`,
       "",
-      "Your task is NOT complete until this file exists. Do NOT finish without writing it.",
-      "",
-      "# CRITICAL: DO NOT IMPLEMENT ANYTHING",
-      "",
-      "You are a PLANNER, not an implementer. Your ONLY output is the plan file above.",
-      "- Do NOT write, edit, or create any file outside .pp/state/",
-      "- Do NOT create fix scripts, patches, or code files",
-      "- Do NOT modify source code, tests, configs, or any project file",
-      "- Do NOT use bash to write files (no echo >, sed -i, tee, scripts, etc.)",
-      "- If you catch yourself starting to implement — STOP IMMEDIATELY and go back to planning",
-      "- Violating this will cause your output to be DISCARDED",
-      "",
       "=== USER REQUEST ===",
       taskArtifacts.userRequest,
       "",
       "=== RESEARCH ===",
       taskArtifacts.research,
+      ...(repoContext ? [repoContext] : []),
       "",
       "The artifacts above are already in your context. Do NOT re-read them from disk.",
     ].join("\n"),

package/extensions/orchestrator/agents/registry.ts

@@ -1,4 +1,5 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { resolveModel } from "../model-registry.js";
 
 interface AgentFrontmatter {
   description: string;
@@ -26,7 +27,7 @@ export function registerAgentDefinitions(
       builtinToolNames: toolNames,
       extensions: true,
       skills: false,
-      model: agent.frontmatter.model,
+      model: resolveModel(agent.frontmatter.model),
       thinking: agent.frontmatter.thinking,
       maxTurns: agent.frontmatter.max_turns,
       systemPrompt: agent.prompt,

package/extensions/orchestrator/agents/repo-context.ts

@@ -0,0 +1,11 @@
+import type { RepoInfo } from "../repo-utils.js";
+
+export function buildRepoContext(repos: RepoInfo[]): string {
+  if (repos.length === 0) return "";
+  const lines = repos.map((r) => {
+    const label = r.isRoot ? " (root)" : "";
+    const branch = r.baseBranch ? `, base: ${r.baseBranch}` : "";
+    return `  - ${r.path}${label}${branch}`;
+  });
+  return `\nRegistered repositories:\n${lines.join("\n")}\n`;
+}

package/extensions/orchestrator/agents/task.ts

@@ -1,5 +1,6 @@
 import type { PiPiConfig } from "../config.js";
-import { TOOL_ROUTING, ALL_CBM_TOOLS, EXA_TOOLS, WORKING_PRINCIPLES, FAILURE_RECOVERY, COMMUNICATION } from "./tool-routing.js";
+import { resolveModel } from "../model-registry.js";
+import { TOOLS_BLOCK, ALL_CBM_TOOLS, EXA_TOOLS, PRINCIPLES_BLOCK, FAILURE_RECOVERY } from "./tool-routing.js";
 
 export function createTaskAgent(
   config: PiPiConfig,
@@ -10,31 +11,33 @@ export function createTaskAgent(
     frontmatter: {
       description: "Implementation subtask (pi-pi)",
       tools: `read, write, edit, bash, grep, find, ls, lsp, ast_search, ${ALL_CBM_TOOLS}, ${EXA_TOOLS}`,
-      model: config.agents.task.model,
-      thinking: config.agents.task.thinking,
-      max_turns: config.agents.task.maxTurns ?? 170,
+      model: resolveModel(config.agents.subagents.simple.task.model),
+      thinking: config.agents.subagents.simple.task.thinking,
+      max_turns: 170,
       prompt_mode: "replace",
     },
     prompt: [
       // --- static prefix (cacheable) ---
+      "<constraints>",
       "You are a focused implementation agent working on a specific subtask.",
+      "These rules override your default helpfulness. Strict compliance is required.",
+      "Focus only on your subtask — do NOT modify unrelated code.",
+      "Do NOT spawn task subagents (no recursion).",
+      "</constraints>",
       "",
-      WORKING_PRINCIPLES,
+      PRINCIPLES_BLOCK,
       "",
-      COMMUNICATION,
-      "",
-      TOOL_ROUTING,
+      TOOLS_BLOCK,
       "",
       FAILURE_RECOVERY,
       "",
-      "# Constraints",
-    "- Do NOT spawn task subagents (no recursion)",
+      "<task>",
     "- subagent_type is REQUIRED when spawning subagents — calls without it are rejected:",
     '  Agent(subagent_type="Explore", ...) — codebase research. Prefer this for most lookups. Fast and cheap.',
     '  Agent(subagent_type="Librarian", ...) — external docs, library APIs, web research.',
-      "- Focus only on your subtask — do not modify unrelated code",
       "- Before modifying a function, use lsp findReferences to understand all callers",
       "- After editing files, run lsp diagnostics and fix errors before moving on",
+      "</task>",
       "",
       // --- dynamic suffix ---
       "=== YOUR SUBTASK ===",

package/extensions/orchestrator/agents/tool-routing.ts

@@ -1,31 +1,17 @@
 export const ALL_CBM_TOOLS = "cbm_search, cbm_search_code, cbm_trace, cbm_changes, cbm_query, cbm_architecture";
 export const EXA_TOOLS = "exa_search, exa_fetch";
 
-export const WORKING_PRINCIPLES = [
-  "# Working principles",
-  "",
+export const PRINCIPLES_BLOCK = [
+  "<principles>",
   "- Verify, don't assume. Check actual state with tools before making changes. Never guess paths, types, or APIs.",
   "- Understand before modifying. Read the code, trace callers, check types BEFORE editing. Compiling ≠ correct.",
   "- Smallest viable change. Do what was asked, nothing more. Don't broaden scope, don't refactor adjacent code.",
   "- No temporary artifacts. No console.log, TODO, HACK, debugger, or commented-out code left behind.",
   "- Evidence over claims. 'It should work' is not proof. Show fresh tool output (lsp diagnostics, test results, build output).",
   "- Match existing patterns. Mirror the codebase's naming, error handling, imports, and structure exactly.",
-].join("\n");
-
-export const WORKING_PRINCIPLES_READONLY = [
-  "# Working principles",
-  "",
-  "- Verify, don't assume. Check actual state with tools. Never guess paths, types, or APIs.",
-  "- Evidence over claims. Show what you found with file paths and tool output, not guesses.",
-  "",
-  "# STRICT READ-ONLY CONSTRAINT",
-  "",
-  "You are a READ-ONLY agent. You MUST NOT modify any source code, configuration, or project files.",
-  "- Do NOT use write or edit tools on any file outside .pp/state/",
-  "- Do NOT use bash to create, modify, or delete files (no echo >, sed -i, tee, mv, cp, rm, touch, etc.)",
-  "- Do NOT create scripts or run commands that modify the filesystem",
-  "- You MAY use bash for read-only commands: git log, git diff, go list, npm ls, cat, find, ls, etc.",
-  "- Violating this constraint is a critical failure. Your output will be discarded if you modify source files.",
+  "- Be concise and dense: minimum words, no preamble/filler/restatement. Don't narrate what you're about to do or just did.",
+  "- Think critically. Push back when something seems wrong, and state concerns before implementing.",
+  "</principles>",
 ].join("\n");
 
 export const FAILURE_RECOVERY = [
@@ -39,21 +25,14 @@ export const FAILURE_RECOVERY = [
   "4. Report the blocker — do not keep pushing",
 ].join("\n");
 
-export const COMMUNICATION = [
-  "# Communication",
+const TOOL_ROUTING_BODY = [
   "",
-  "- CONCISE. Use minimum words needed. No preamble, no filler, no restatement.",
-  "- Never explain what you're about to do — just do it.",
-  "- Never summarize what you just did — the user can see the results.",
-  "- Think critically. Don't just agree — push back when something seems wrong.",
-  "- State concerns before implementing. If you see a better approach, say so.",
-  "- Dense over polished. One precise sentence beats three vague ones.",
-].join("\n");
-
-export const TOOL_ROUTING = [
-  "# Tool routing — what do you want to do?",
+  "**pp_register_repo**: Register a git repo you're working in. Call for every repo including the root directory. " +
+    "Pass the base branch (the branch this work will be merged into). Must call at the start of each task " +
+    "before doing any work.",
   "",
   "Find code by concept or behavior:",
+  "- Multi-repo: cbm_search, cbm_search_code, cbm_trace, cbm_changes accept optional project_path (absolute repo path). If omitted, they use the root project.",
   "- cbm_search: natural-language search (query='deploy release chart')",
   "- cbm_search with semantic_query: vector similarity (['deploy','install','upgrade'])",
   "- cbm_search_code: graph-augmented grep — deduplicates into containing functions",
@@ -90,4 +69,10 @@ export const TOOL_ROUTING = [
   "Web search:",
   "- exa_search: search the web for docs, guides, examples. Describe the ideal page, not keywords.",
   "- exa_fetch: read a URL's full content as clean markdown.",
-].join("\n");
+  "",
+  "Edit/write files:",
+  "- edit: targeted in-file changes.",
+  "- write: overwrite or create a whole file.",
+];
+
+export const TOOLS_BLOCK = ["<tools>", ...TOOL_ROUTING_BODY, "</tools>"].join("\n");

package/extensions/orchestrator/ast-search.ts

@@ -69,7 +69,8 @@ export function registerAstSearchTool(pi: ExtensionAPI, cwd: string): boolean {
         const lines: string[] = [];
         for (const match of results) {
           const file = match.file ?? "?";
-          const startLine = match.range?.start?.line ?? match.start?.line ?? "?";
+          const start = match.range?.start?.line;
+          const startLine = typeof start === "number" ? start + 1 : "?";
           const text = match.text ?? match.matchedCode ?? "";
           lines.push(`${file}:${startLine}: ${text.trim()}`);
         }

package/extensions/orchestrator/cbm.test.ts

@@ -0,0 +1,35 @@
+import { describe, it, expect, vi } from "vitest";
+import { CbmDaemon } from "./cbm.js";
+
+describe("CbmDaemon index tracking", () => {
+  it("re-indexes a project after the daemon restarts (cleanup clears indexedProjects)", async () => {
+    const daemon = new CbmDaemon();
+    const indexCalls: string[] = [];
+
+    const callTool = vi.spyOn(daemon, "callTool").mockImplementation(async (name, args) => {
+      if (name === "list_projects") return { projects: [] };
+      if (name === "index_repository") {
+        indexCalls.push((args as { repo_path: string }).repo_path);
+        return {};
+      }
+      return {};
+    });
+
+    const cwd = "/repo/project";
+
+    await daemon.ensureIndexed(cwd);
+    expect(indexCalls).toHaveLength(1);
+    expect(daemon.hasIndexed(cwd)).toBe(true);
+
+    await daemon.ensureIndexed(cwd);
+    expect(indexCalls).toHaveLength(1);
+
+    daemon.cleanup();
+    expect(daemon.hasIndexed(cwd)).toBe(false);
+
+    await daemon.ensureIndexed(cwd);
+    expect(indexCalls).toHaveLength(2);
+
+    callTool.mockRestore();
+  });
+});