takomi 2.1.13 → 2.1.15

package/.pi/extensions/takomi-context-manager/policy-tools.ts

@@ -1,35 +1,35 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
-import { Type } from "typebox";
-import type { ContextManagerState } from "./state";
-import { syncReportLedger } from "./state";
-import { renderPolicies, renderPolicyManifest } from "./policy-registry";
-
-export function registerPolicyTools(pi: ExtensionAPI, state: ContextManagerState): void {
-  pi.registerTool({
-    name: "policy_manifest",
-    label: "Policy Manifest",
-    description: "Return descriptions for available context policy packs without loading full policy content.",
-    promptSnippet: "Show available context policy pack descriptions",
-    parameters: Type.Object({ policies: Type.Optional(Type.Array(Type.String({ description: "Policy name to inspect" }))) }),
-    async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
-      state.report.cwd = ctx.cwd;
-      state.report.toolCalls.policyManifest += 1;
-      return { content: [{ type: "text", text: renderPolicyManifest(state.policies, params.policies ?? []) }], details: { requested: params.policies ?? [...state.policies.keys()] } };
-    },
-  });
-
-  pi.registerTool({
-    name: "policy_load",
-    label: "Policy Load",
-    description: "Load one or more context policy packs required before sensitive tools such as takomi_subagent.",
-    promptSnippet: "Load policy packs required before sensitive tool calls",
-    parameters: Type.Object({ policies: Type.Array(Type.String({ description: "Policy pack name to load" })) }),
-    async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
-      state.report.cwd = ctx.cwd;
-      state.report.toolCalls.policyLoad += 1;
-      const text = renderPolicies(state.policies, state.loadedPolicies, params.policies);
-      syncReportLedger(state);
-      return { content: [{ type: "text", text }], details: { requested: params.policies, loadedPolicies: [...state.loadedPolicies].sort() } };
-    },
-  });
-}
+import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import { Type } from "typebox";
+import type { ContextManagerState } from "./state";
+import { syncReportLedger } from "./state";
+import { renderPolicies, renderPolicyManifest } from "./policy-registry";
+
+export function registerPolicyTools(pi: ExtensionAPI, state: ContextManagerState): void {
+  pi.registerTool({
+    name: "policy_manifest",
+    label: "Policy Manifest",
+    description: "Return descriptions for available context policy packs without loading full policy content.",
+    promptSnippet: "Show available context policy pack descriptions",
+    parameters: Type.Object({ policies: Type.Optional(Type.Array(Type.String({ description: "Policy name to inspect" }))) }),
+    async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
+      state.report.cwd = ctx.cwd;
+      state.report.toolCalls.policyManifest += 1;
+      return { content: [{ type: "text", text: renderPolicyManifest(state.policies, params.policies ?? []) }], details: { requested: params.policies ?? [...state.policies.keys()] } };
+    },
+  });
+
+  pi.registerTool({
+    name: "policy_load",
+    label: "Policy Load",
+    description: "Load one or more context policy packs required before sensitive tools such as takomi_subagent.",
+    promptSnippet: "Load policy packs required before sensitive tool calls",
+    parameters: Type.Object({ policies: Type.Array(Type.String({ description: "Policy pack name to load" })) }),
+    async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
+      state.report.cwd = ctx.cwd;
+      state.report.toolCalls.policyLoad += 1;
+      const text = renderPolicies(state.policies, state.loadedPolicies, params.policies);
+      syncReportLedger(state);
+      return { content: [{ type: "text", text }], details: { requested: params.policies, loadedPolicies: [...state.loadedPolicies].sort() } };
+    },
+  });
+}

package/.pi/extensions/takomi-context-manager/prerequisite-gates.ts

@@ -1,39 +1,39 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
-import type { ContextManagerConfig } from "./types";
-import type { ContextManagerState } from "./state";
-import { recordBlocked, syncReportLedger } from "./state";
-import { renderPolicies } from "./policy-registry";
-
-function renderPolicyGateBlock(toolName: string, missing: string[], policyText: string): string {
-  return [
-    `Blocked ${toolName}: required policy context had not been loaded yet.`,
-    "",
-    "The required policy context is provided below and has now been marked as loaded for this session.",
-    "Retry the original tool call now, following the policy.",
-    "",
-    "Required policies:",
-    ...missing.map((policy) => `- ${policy}`),
-    "",
-    "Loaded policy context:",
-    policyText,
-  ].join("\n");
-}
-
-export function installPrerequisiteGates(pi: ExtensionAPI, state: ContextManagerState, getConfig: () => ContextManagerConfig): void {
-  pi.on("tool_call", async (event, ctx) => {
-    state.report.cwd = ctx.cwd;
-    const prereqs = getConfig().toolPrerequisites[event.toolName] ?? [];
-
-    for (const prereq of prereqs) {
-      if (prereq.type !== "policies") continue;
-      const missing = prereq.policies.filter((policy) => !state.loadedPolicies.has(policy));
-      if (missing.length === 0) continue;
-
-      const policyText = renderPolicies(state.policies, state.loadedPolicies, missing);
-      syncReportLedger(state);
-      const reason = renderPolicyGateBlock(event.toolName, missing, policyText);
-      recordBlocked(state, event.toolName, reason);
-      return { block: true, reason };
-    }
-  });
-}
+import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ContextManagerConfig } from "./types";
+import type { ContextManagerState } from "./state";
+import { recordBlocked, syncReportLedger } from "./state";
+import { renderPolicies } from "./policy-registry";
+
+function renderPolicyGateBlock(toolName: string, missing: string[], policyText: string): string {
+  return [
+    `Blocked ${toolName}: required policy context had not been loaded yet.`,
+    "",
+    "The required policy context is provided below and has now been marked as loaded for this session.",
+    "Retry the original tool call now, following the policy.",
+    "",
+    "Required policies:",
+    ...missing.map((policy) => `- ${policy}`),
+    "",
+    "Loaded policy context:",
+    policyText,
+  ].join("\n");
+}
+
+export function installPrerequisiteGates(pi: ExtensionAPI, state: ContextManagerState, getConfig: () => ContextManagerConfig): void {
+  pi.on("tool_call", async (event, ctx) => {
+    state.report.cwd = ctx.cwd;
+    const prereqs = getConfig().toolPrerequisites[event.toolName] ?? [];
+
+    for (const prereq of prereqs) {
+      if (prereq.type !== "policies") continue;
+      const missing = prereq.policies.filter((policy) => !state.loadedPolicies.has(policy));
+      if (missing.length === 0) continue;
+
+      const policyText = renderPolicies(state.policies, state.loadedPolicies, missing);
+      syncReportLedger(state);
+      const reason = renderPolicyGateBlock(event.toolName, missing, policyText);
+      recordBlocked(state, event.toolName, reason);
+      return { block: true, reason };
+    }
+  });
+}

package/.pi/extensions/takomi-context-manager/prompt-rewriter.ts

@@ -1,100 +1,100 @@
-import type { CandidateContext, ContextManagerConfig, SkillRecord } from "./types";
-import { renderCandidateHint } from "./context-router";
-import { sortedSkills } from "./skill-registry";
-
-function renderSkillNames(skills: SkillRecord[]): string {
-  return ["Available skills (names only):", ...skills.map((skill) => `- ${skill.name}`)].join("\n");
-}
-
-function renderSkillDisplay(skills: SkillRecord[], candidates: CandidateContext[], config: ContextManagerConfig): string {
-  const mode = config.skillDisplay.mode;
-  const countLine = skills.length === 0 ? "Skills: none discovered." : `Skills: ${skills.length} available.`;
-
-  if (mode === "hidden") return `${countLine} Use skill_index if this task may need a skill.`;
-  if (mode === "all-names") return skills.length === 0 ? countLine : renderSkillNames(skills);
-  if (mode === "auto" && skills.length <= config.skillDisplay.maxVisibleSkillNames) {
-    return skills.length === 0 ? countLine : renderSkillNames(skills);
-  }
-
-  const candidateHint = renderCandidateHint(candidates);
-  return [countLine, candidateHint || "Use skill_index if a specialized skill may help."].join("\n");
-}
-
-function renderProgressiveRule(config: ContextManagerConfig): string {
-  if (!config.skillDisplay.alwaysShowToolInstructions) return "";
-  return [
-    "Skill loading:",
-    "- Skills are optional capability packs that give you special instructions/tools for specialized, repetitive tasks.",
-    "- Do not preload skill descriptions into the prompt.",
-    "- Use skill_index to view all skill names when needed.",
-    "- For uncertain matches, request skill_manifest for likely skills; manifests include descriptions and locations.",
-    "- If a skill is clearly relevant or the user names it directly, use skill_load without requesting a manifest first.",
-    "- Load full skill instructions only for skills you will actually use.",
-    "",
-    "Policy loading:",
-    "- Model/subagent/lifecycle policies are lazy-loaded policy packs.",
-    "- The active routing policy may come from the project or the bundled Takomi harness default.",
-    "- Use policy_manifest or policy_load when you need to inspect or quote a policy explicitly.",
-    "- If takomi_subagent is blocked for missing policy context, the gate has already loaded the required policy for this session; retry the tool call and follow it.",
-  ].join("\n");
-}
-
-function compactHeavyPolicyBlocks(prompt: string, config: ContextManagerConfig): { prompt: string; removedSections: string[] } {
-  let next = prompt;
-  const removedSections: string[] = [];
-  if (config.promptCompaction.compactModelRouting) {
-    const modelRoutingRegex = /(Project|Bundled) Takomi model routing policy is active\. Apply it when choosing parent\/subagent models and escalation levels:\s*\n\n# Takomi Model Routing Policy[\s\S]*?(?=\nAvailable model context from Pi registry:)/;
-    if (modelRoutingRegex.test(next)) {
-      next = next.replace(modelRoutingRegex, [
-        "Project Takomi model routing policy is available as a lazy-loaded policy pack.",
-        "The subagent prerequisite gate can provide this policy automatically on first blocked takomi_subagent attempt, then the agent should retry.",
-        "",
-      ].join("\n"));
-      removedSections.push("full model routing policy");
-    }
-  }
-  if (config.promptCompaction.compactModelRegistry) {
-    const registryRegex = /Available model context from Pi registry:[^\n]*(?:\n|$)/;
-    if (registryRegex.test(next)) {
-      next = next.replace(registryRegex, "Available model registry context exists. The subagent policy gate will provide model routing context if needed.\n");
-      removedSections.push("verbose model registry list");
-    }
-  }
-  return { prompt: next, removedSections };
-}
-
-export function rewritePrompt(systemPrompt: string, skills: Map<string, SkillRecord>, candidates: CandidateContext[], config: ContextManagerConfig): {
-  prompt: string;
-  changed: boolean;
-  removedSections: string[];
-  warnings: string[];
-} {
-  const warnings: string[] = [];
-  const removedSections: string[] = [];
-  let next = systemPrompt;
-  let changed = false;
-
-  if (config.promptCompaction.compactSkillDescriptions) {
-    const sorted = sortedSkills(skills);
-    const replacement = [
-      renderSkillDisplay(sorted, candidates, config),
-      renderProgressiveRule(config),
-    ].filter(Boolean).join("\n\n");
-    const skillBlockRegex = /<available_skills>[\s\S]*?<\/available_skills>/i;
-    if (!skillBlockRegex.test(next)) {
-      warnings.push("No <available_skills> block found; appended progressive skill guidance instead.");
-      next = `${next}\n\n${replacement}`;
-      changed = true;
-    } else {
-      next = next.replace(skillBlockRegex, replacement);
-      changed = true;
-      removedSections.push(`available_skills descriptions (${config.skillDisplay.mode} display)`);
-    }
-  }
-
-  const compacted = compactHeavyPolicyBlocks(next, config);
-  next = compacted.prompt;
-  removedSections.push(...compacted.removedSections);
-  changed = changed || compacted.removedSections.length > 0;
-  return { prompt: next, changed, removedSections, warnings };
-}
+import type { CandidateContext, ContextManagerConfig, SkillRecord } from "./types";
+import { renderCandidateHint } from "./context-router";
+import { sortedSkills } from "./skill-registry";
+
+function renderSkillNames(skills: SkillRecord[]): string {
+  return ["Available skills (names only):", ...skills.map((skill) => `- ${skill.name}`)].join("\n");
+}
+
+function renderSkillDisplay(skills: SkillRecord[], candidates: CandidateContext[], config: ContextManagerConfig): string {
+  const mode = config.skillDisplay.mode;
+  const countLine = skills.length === 0 ? "Skills: none discovered." : `Skills: ${skills.length} available.`;
+
+  if (mode === "hidden") return `${countLine} Use skill_index if this task may need a skill.`;
+  if (mode === "all-names") return skills.length === 0 ? countLine : renderSkillNames(skills);
+  if (mode === "auto" && skills.length <= config.skillDisplay.maxVisibleSkillNames) {
+    return skills.length === 0 ? countLine : renderSkillNames(skills);
+  }
+
+  const candidateHint = renderCandidateHint(candidates);
+  return [countLine, candidateHint || "Use skill_index if a specialized skill may help."].join("\n");
+}
+
+function renderProgressiveRule(config: ContextManagerConfig): string {
+  if (!config.skillDisplay.alwaysShowToolInstructions) return "";
+  return [
+    "Skill loading:",
+    "- Skills are optional capability packs that give you special instructions/tools for specialized, repetitive tasks.",
+    "- Do not preload skill descriptions into the prompt.",
+    "- Use skill_index to view all skill names when needed.",
+    "- For uncertain matches, request skill_manifest for likely skills; manifests include descriptions and locations.",
+    "- If a skill is clearly relevant or the user names it directly, use skill_load without requesting a manifest first.",
+    "- Load full skill instructions only for skills you will actually use.",
+    "",
+    "Policy loading:",
+    "- Model/subagent/lifecycle policies are lazy-loaded policy packs.",
+    "- The active routing policy may come from the project or the bundled Takomi harness default.",
+    "- Use policy_manifest or policy_load when you need to inspect or quote a policy explicitly.",
+    "- If takomi_subagent is blocked for missing policy context, the gate has already loaded the required policy for this session; retry the tool call and follow it.",
+  ].join("\n");
+}
+
+function compactHeavyPolicyBlocks(prompt: string, config: ContextManagerConfig): { prompt: string; removedSections: string[] } {
+  let next = prompt;
+  const removedSections: string[] = [];
+  if (config.promptCompaction.compactModelRouting) {
+    const modelRoutingRegex = /(Project|Bundled) Takomi model routing policy is active\. Apply it when choosing parent\/subagent models and escalation levels:\s*\n\n# Takomi Model Routing Policy[\s\S]*?(?=\nAvailable model context from Pi registry:)/;
+    if (modelRoutingRegex.test(next)) {
+      next = next.replace(modelRoutingRegex, [
+        "Project Takomi model routing policy is available as a lazy-loaded policy pack.",
+        "The subagent prerequisite gate can provide this policy automatically on first blocked takomi_subagent attempt, then the agent should retry.",
+        "",
+      ].join("\n"));
+      removedSections.push("full model routing policy");
+    }
+  }
+  if (config.promptCompaction.compactModelRegistry) {
+    const registryRegex = /Available model context from Pi registry:[^\n]*(?:\n|$)/;
+    if (registryRegex.test(next)) {
+      next = next.replace(registryRegex, "Available model registry context exists. The subagent policy gate will provide model routing context if needed.\n");
+      removedSections.push("verbose model registry list");
+    }
+  }
+  return { prompt: next, removedSections };
+}
+
+export function rewritePrompt(systemPrompt: string, skills: Map<string, SkillRecord>, candidates: CandidateContext[], config: ContextManagerConfig): {
+  prompt: string;
+  changed: boolean;
+  removedSections: string[];
+  warnings: string[];
+} {
+  const warnings: string[] = [];
+  const removedSections: string[] = [];
+  let next = systemPrompt;
+  let changed = false;
+
+  if (config.promptCompaction.compactSkillDescriptions) {
+    const sorted = sortedSkills(skills);
+    const replacement = [
+      renderSkillDisplay(sorted, candidates, config),
+      renderProgressiveRule(config),
+    ].filter(Boolean).join("\n\n");
+    const skillBlockRegex = /<available_skills>[\s\S]*?<\/available_skills>/i;
+    if (!skillBlockRegex.test(next)) {
+      warnings.push("No <available_skills> block found; appended progressive skill guidance instead.");
+      next = `${next}\n\n${replacement}`;
+      changed = true;
+    } else {
+      next = next.replace(skillBlockRegex, replacement);
+      changed = true;
+      removedSections.push(`available_skills descriptions (${config.skillDisplay.mode} display)`);
+    }
+  }
+
+  const compacted = compactHeavyPolicyBlocks(next, config);
+  next = compacted.prompt;
+  removedSections.push(...compacted.removedSections);
+  changed = changed || compacted.removedSections.length > 0;
+  return { prompt: next, changed, removedSections, warnings };
+}

package/.pi/extensions/takomi-context-manager/skill-registry.ts

@@ -1,87 +1,87 @@
-import type { SkillRecord } from "./types";
-
-export function normalizeText(value: string): string {
-  return value.toLowerCase().replace(/[^a-z0-9]+/g, " ").replace(/\s+/g, " ").trim();
-}
-
-export function normalizeName(name: string): string {
-  return name.trim().toLowerCase();
-}
-
-function getString(input: unknown, keys: string[]): string | undefined {
-  if (!input || typeof input !== "object") return undefined;
-  const record = input as Record<string, unknown>;
-  for (const key of keys) {
-    const value = record[key];
-    if (typeof value === "string" && value.trim()) return value.trim();
-  }
-  return undefined;
-}
-
-export function collectSkillsFromOptions(options: unknown): SkillRecord[] {
-  if (!options || typeof options !== "object") return [];
-  const skills = (options as { skills?: unknown }).skills;
-  const rawList = Array.isArray(skills)
-    ? skills
-    : skills && typeof skills === "object"
-      ? Object.values(skills as Record<string, unknown>)
-      : [];
-  return rawList.flatMap((item): SkillRecord[] => {
-    const name = getString(item, ["name", "id", "title"]);
-    if (!name) return [];
-    return [{
-      name,
-      description: getString(item, ["description", "summary"]),
-      location: getString(item, ["location", "path", "file", "skillPath"]),
-      source: "systemPromptOptions",
-    }];
-  });
-}
-
-function decodeXmlEntities(value: string): string {
-  return value.replace(/&quot;/g, '"').replace(/&apos;/g, "'").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&amp;/g, "&");
-}
-
-function extractTag(block: string, tag: string): string | undefined {
-  const match = block.match(new RegExp(`<${tag}>([\\s\\S]*?)</${tag}>`, "i"));
-  return match?.[1]?.trim() ? decodeXmlEntities(match[1].trim()) : undefined;
-}
-
-export function collectSkillsFromXml(systemPrompt: string): SkillRecord[] {
-  const root = systemPrompt.match(/<available_skills>([\s\S]*?)<\/available_skills>/i);
-  if (!root) return [];
-  const skills: SkillRecord[] = [];
-  for (const match of root[1].matchAll(/<skill>([\s\S]*?)<\/skill>/gi)) {
-    const name = extractTag(match[1], "name");
-    if (!name) continue;
-    skills.push({ name, description: extractTag(match[1], "description"), location: extractTag(match[1], "location"), source: "xml" });
-  }
-  return skills;
-}
-
-export function mergeSkills(records: SkillRecord[]): Map<string, SkillRecord> {
-  const merged = new Map<string, SkillRecord>();
-  for (const skill of records) {
-    const key = normalizeName(skill.name);
-    const existing = merged.get(key);
-    merged.set(key, existing ? {
-      name: existing.name,
-      description: existing.description ?? skill.description,
-      location: existing.location ?? skill.location,
-      source: existing.source === "systemPromptOptions" ? existing.source : skill.source,
-    } : skill);
-  }
-  return merged;
-}
-
-export function sortedSkills(skills: Map<string, SkillRecord>): SkillRecord[] {
-  return [...skills.values()].sort((a, b) => a.name.localeCompare(b.name));
-}
-
-export function findSkill(skills: Map<string, SkillRecord>, name: string): SkillRecord | undefined {
-  const key = normalizeName(name);
-  const exact = skills.get(key);
-  if (exact) return exact;
-  const matches = sortedSkills(skills).filter((skill) => normalizeName(skill.name).includes(key));
-  return matches.length === 1 ? matches[0] : undefined;
-}
+import type { SkillRecord } from "./types";
+
+export function normalizeText(value: string): string {
+  return value.toLowerCase().replace(/[^a-z0-9]+/g, " ").replace(/\s+/g, " ").trim();
+}
+
+export function normalizeName(name: string): string {
+  return name.trim().toLowerCase();
+}
+
+function getString(input: unknown, keys: string[]): string | undefined {
+  if (!input || typeof input !== "object") return undefined;
+  const record = input as Record<string, unknown>;
+  for (const key of keys) {
+    const value = record[key];
+    if (typeof value === "string" && value.trim()) return value.trim();
+  }
+  return undefined;
+}
+
+export function collectSkillsFromOptions(options: unknown): SkillRecord[] {
+  if (!options || typeof options !== "object") return [];
+  const skills = (options as { skills?: unknown }).skills;
+  const rawList = Array.isArray(skills)
+    ? skills
+    : skills && typeof skills === "object"
+      ? Object.values(skills as Record<string, unknown>)
+      : [];
+  return rawList.flatMap((item): SkillRecord[] => {
+    const name = getString(item, ["name", "id", "title"]);
+    if (!name) return [];
+    return [{
+      name,
+      description: getString(item, ["description", "summary"]),
+      location: getString(item, ["location", "path", "file", "skillPath"]),
+      source: "systemPromptOptions",
+    }];
+  });
+}
+
+function decodeXmlEntities(value: string): string {
+  return value.replace(/&quot;/g, '"').replace(/&apos;/g, "'").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&amp;/g, "&");
+}
+
+function extractTag(block: string, tag: string): string | undefined {
+  const match = block.match(new RegExp(`<${tag}>([\\s\\S]*?)</${tag}>`, "i"));
+  return match?.[1]?.trim() ? decodeXmlEntities(match[1].trim()) : undefined;
+}
+
+export function collectSkillsFromXml(systemPrompt: string): SkillRecord[] {
+  const root = systemPrompt.match(/<available_skills>([\s\S]*?)<\/available_skills>/i);
+  if (!root) return [];
+  const skills: SkillRecord[] = [];
+  for (const match of root[1].matchAll(/<skill>([\s\S]*?)<\/skill>/gi)) {
+    const name = extractTag(match[1], "name");
+    if (!name) continue;
+    skills.push({ name, description: extractTag(match[1], "description"), location: extractTag(match[1], "location"), source: "xml" });
+  }
+  return skills;
+}
+
+export function mergeSkills(records: SkillRecord[]): Map<string, SkillRecord> {
+  const merged = new Map<string, SkillRecord>();
+  for (const skill of records) {
+    const key = normalizeName(skill.name);
+    const existing = merged.get(key);
+    merged.set(key, existing ? {
+      name: existing.name,
+      description: existing.description ?? skill.description,
+      location: existing.location ?? skill.location,
+      source: existing.source === "systemPromptOptions" ? existing.source : skill.source,
+    } : skill);
+  }
+  return merged;
+}
+
+export function sortedSkills(skills: Map<string, SkillRecord>): SkillRecord[] {
+  return [...skills.values()].sort((a, b) => a.name.localeCompare(b.name));
+}
+
+export function findSkill(skills: Map<string, SkillRecord>, name: string): SkillRecord | undefined {
+  const key = normalizeName(name);
+  const exact = skills.get(key);
+  if (exact) return exact;
+  const matches = sortedSkills(skills).filter((skill) => normalizeName(skill.name).includes(key));
+  return matches.length === 1 ? matches[0] : undefined;
+}