takomi 2.1.26 → 2.1.28

package/.pi/README.md

@@ -45,6 +45,7 @@ Inside Pi, use:
 - The old standalone commands (`/takomi-genesis`, `/takomi-design`, `/takomi-build`, `/takomi-kickoff`, `/autoorch`, `/orch`, `/architect`, `/code`, `/review`, and the `/takomi-subagent*` variants) are folded into `/takomi` subcommands so slash autocomplete stays small.
 - prompt shortcuts are suffixed with `-prompt` to avoid collisions with runtime commands, e.g. `/orch-prompt`, `/build-prompt`, `/design-prompt`, `/genesis-prompt`, `/takomi-prompt`, `/prime-prompt`
 - a project-local theme is available at `.pi/themes/takomi-noir.json`; select `takomi-noir` in `/settings` to use the Takomi UI palette
+- optional Pi feature packs are managed by `takomi setup pi` or `takomi setup pi-features` and refreshed by `takomi refresh`; current defaults install Takomi Interview (`npm:@juicesharp/rpiv-ask-user-question`) while Takomi Todo (`npm:@juicesharp/rpiv-todo`), Browser QA (`npm:pi-chrome`), and Doc Preview (`npm:pi-markdown-preview`) stay opt-in
 - additional workflow prompts are available as direct slash commands:
   - `/vibe-primeAgent`
   - `/vibe-spawnTask`
@@ -128,3 +129,12 @@ So when working on packaging, agents should distinguish between:
   - rewrite JSON machine state
   - keep task docs organized in `pending/`, `in-progress/`, `completed/`, and `blocked/`
 - `takomi_board` intentionally cannot dispatch or redispatch agents. Use `takomi_subagent` for single, parallel, or chain execution, then call `takomi_board update_task` with the result.
+
+## Attribution Notes
+
+- Pi-native Takomi runs on [Pi](https://github.com/earendil-works/pi) / `@earendil-works/pi-coding-agent`, authored by Mario Zechner and Earendil Works.
+- Takomi subagent execution builds on [`pi-subagents`](https://github.com/nicobailon/pi-subagents) by Nico Bailon, with Takomi adding lifecycle orchestration, board/state artifacts, model-routing policy, and review-loop conventions.
+- Optional Takomi Interview and Todo feature packs integrate [`@juicesharp/rpiv-ask-user-question`](https://github.com/juicesharp/rpiv-mono/tree/main/packages/rpiv-ask-user-question) and [`@juicesharp/rpiv-todo`](https://github.com/juicesharp/rpiv-mono/tree/main/packages/rpiv-todo) by juicesharp.
+- Optional Browser QA can use [`pi-chrome`](https://github.com/tianrendong/pi-chrome) by tianrendong.
+- Optional Doc Preview can use [`pi-markdown-preview`](https://github.com/omaclaren/pi-markdown-preview) by omaclaren.
+- [`context-mode`](https://github.com/mksglu/context-mode) by Mert Koseoğlu is credited as external research/power-user context tooling; it is not a Takomi default bundle.

package/.pi/agents/architect.md

@@ -2,7 +2,6 @@
 name: architect
 description: Gather requirements, design architecture, and create implementation-ready plans.
 tools: read,bash,grep,find,ls
-model: gpt-5.4
 ---
 You are the Takomi Architect.
 

package/.pi/agents/coder.md

@@ -2,7 +2,6 @@
 name: coder
 description: Implement, fix, and refactor code with verification and controlled scope.
 tools: read,bash,edit,write,grep,find,ls
-model: gpt-5.4-mini
 ---
 You are the Takomi Code Specialist.
 

package/.pi/agents/designer.md

@@ -2,7 +2,6 @@
 name: designer
 description: Translate requirements into build-ready UI, UX, visual systems, and interaction direction.
 tools: read,bash,grep,find,ls
-model: gemini-3.1-pro-preview
 ---
 You are the Takomi Design Specialist.
 

package/.pi/agents/orchestrator.md

@@ -2,7 +2,6 @@
 name: orchestrator
 description: Coordinate complex projects by decomposing, sequencing, delegating, and synthesizing specialist work.
 tools: read,bash,grep,find,ls
-model: gpt-5.4
 ---
 You are the Takomi Orchestrator.
 

package/.pi/agents/reviewer.md

@@ -2,7 +2,6 @@
 name: reviewer
 description: Review changes for correctness, risk, security, maintainability, and spec compliance.
 tools: read,bash,grep,find,ls
-model: gpt-5.4-mini
 ---
 You are the Takomi Review Specialist.
 

package/.pi/extensions/takomi-context-manager/diagnostics.ts

@@ -41,7 +41,7 @@ export function renderReport(state: ContextManagerState, verbose = false): strin
     lines.push("- Candidates: none");
   }
   if (report.duplicateExtensionWarnings.length > 0 || verbose) {
-    lines.push("", "Extension Conflict Diagnostics:", ...renderDuplicateExtensionGuidance(report.duplicateExtensionWarnings));
+    lines.push("", "Extension Conflict Diagnostics:", ...renderDuplicateExtensionGuidance(report.duplicateExtensionWarnings, report.cwd));
   }
   if (verbose) {
     lines.push("", "Skill Index:", ...sortedSkills(state.skills).map((skill) => `- ${skill.name}`));

package/.pi/extensions/takomi-context-manager/extension-conflicts.ts

@@ -1,7 +1,7 @@
 import { access } from "node:fs/promises";
+import { existsSync } from "node:fs";
 import os from "node:os";
 import path from "node:path";
-import type { ContextManagerState } from "./state";
 
 type KnownTakomiExtension = {
   toolName: string;
@@ -43,9 +43,20 @@ export async function detectDuplicateTakomiExtensions(cwd: string): Promise<Arra
   return warnings;
 }
 
-export function renderDuplicateExtensionGuidance(warnings: Array<{ toolName: string; paths: string[] }>): string[] {
+function isTakomiSourceRepo(cwd: string): boolean {
+  return [
+    path.join(cwd, "package.json"),
+    path.join(cwd, "scripts", "pi-dev.ps1"),
+    path.join(cwd, ".pi", "extensions", "takomi-runtime", "index.ts"),
+  ].every((filePath) => existsSync(filePath));
+}
+
+export function renderDuplicateExtensionGuidance(warnings: Array<{ toolName: string; paths: string[] }>, cwd?: string): string[] {
   if (warnings.length === 0) return ["- Duplicate Takomi extensions: none detected"];
-  const lines = ["- Duplicate Takomi extensions detected:"];
+  const sourceRepo = cwd ? isTakomiSourceRepo(cwd) : false;
+  const lines = [sourceRepo
+    ? "- Duplicate Takomi extensions detected (expected when running normal Pi inside the Takomi source repo):"
+    : "- Duplicate Takomi extensions detected:"];
   for (const warning of warnings) {
     lines.push(`  - ${warning.toolName}`);
     for (const filePath of warning.paths) lines.push(`    - ${filePath}`);

package/.pi/extensions/takomi-context-manager/index.ts

@@ -11,6 +11,7 @@ import { registerDiagnostics } from "./diagnostics-tools";
 import { installPrerequisiteGates } from "./prerequisite-gates";
 import { installModelPolicyGate } from "./model-policy-gate";
 import { detectDuplicateTakomiExtensions } from "./extension-conflicts";
+import { loadTakomiModelRoutingSnapshot, renderCompactTakomiModelRoutingSummary } from "../takomi-runtime/model-routing-defaults";
 import type { ContextManagerConfig } from "./types";
 
 export default function takomiContextManager(pi: ExtensionAPI) {
@@ -33,6 +34,8 @@ export default function takomiContextManager(pi: ExtensionAPI) {
 
     const candidates = findCandidates(event.prompt, state.skills, config);
     const rewrite = rewritePrompt(event.systemPrompt, state.skills, candidates, config);
+    const routingSummary = renderCompactTakomiModelRoutingSummary(await loadTakomiModelRoutingSnapshot(ctx.cwd));
+    const rewrittenPrompt = routingSummary ? `${rewrite.prompt}\n\n${routingSummary}` : rewrite.prompt;
     state.report = {
       ...state.report,
       timestamp: new Date().toISOString(),
@@ -43,14 +46,14 @@ export default function takomiContextManager(pi: ExtensionAPI) {
       duplicateExtensionWarnings,
       promptRewrite: {
         attempted: true,
-        changed: rewrite.changed,
+        changed: rewrite.changed || Boolean(routingSummary),
         originalLength: event.systemPrompt.length,
-        rewrittenLength: rewrite.prompt.length,
+        rewrittenLength: rewrittenPrompt.length,
         removedSections: rewrite.removedSections,
         warnings: rewrite.warnings,
       },
     };
 
-    return { systemPrompt: rewrite.prompt };
+    return { systemPrompt: rewrittenPrompt };
   });
 }

package/.pi/extensions/takomi-context-manager/model-policy-gate.ts

@@ -5,6 +5,7 @@ import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
 import type { ContextManagerState } from "./state";
 import { recordBlocked } from "./state";
 import { resolveTakomiRoutingPolicy } from "../takomi-runtime/routing-policy";
+import { approvedModelEquivalent, isTakomiModelApproved } from "../takomi-runtime/model-routing-defaults";
 
 type Settings = {
   takomi?: { modelRoutingPolicyFile?: string };
@@ -79,12 +80,21 @@ function isModelLike(value: string): boolean {
     || lower.includes("lmstudio/");
 }
 
+function extractPreferredProvider(text: string): string | undefined {
+  const match = text.match(/(?:preferred|default)\s+(?:provider|router)(?:\s*\/\s*(?:provider|router))?\s*:\s*([a-z0-9-]+)/i)
+    ?? text.match(/use\s+([a-z0-9-]+)\s+as\s+(?:the\s+)?(?:provider|router)/i);
+  return match?.[1];
+}
+
 function collectModelsFromPolicy(text: string): string[] {
+  // Providerless names such as "GPT-5.5" are intent labels unless the policy
+  // declares a preferred provider/router header.
   const explicit = (text.match(/[a-z0-9-]+\/[a-z0-9._-]+/gi) ?? []).filter(isModelLike);
+  const preferredProvider = extractPreferredProvider(text);
   const inferred: string[] = [];
-  if (/gpt[- ]?5\.5/i.test(text)) inferred.push("oauth-router/gpt-5.5");
-  if (/gpt[- ]?5\.4(?!\s*mini)/i.test(text)) inferred.push("oauth-router/gpt-5.4");
-  if (/gpt[- ]?5\.4\s*mini/i.test(text)) inferred.push("oauth-router/gpt-5.4-mini");
+  if (preferredProvider && /gpt[- ]?5\.5/i.test(text)) inferred.push(`${preferredProvider}/gpt-5.5`);
+  if (preferredProvider && /gpt[- ]?5\.4(?!\s*mini)/i.test(text)) inferred.push(`${preferredProvider}/gpt-5.4`);
+  if (preferredProvider && /gpt[- ]?5\.4\s*mini/i.test(text)) inferred.push(`${preferredProvider}/gpt-5.4-mini`);
   return unique([...explicit, ...inferred]);
 }
 
@@ -98,8 +108,8 @@ async function loadSnapshot(cwd: string): Promise<ModelPolicySnapshot> {
   return { approvedModels, preferredModels: settingsModels.length ? unique(settingsModels) : approvedModels, sourceFiles };
 }
 
-function collectRequestedModelRefs(input: unknown): Array<{ holder: Record<string, unknown>; key: string; value: string }> {
-  const refs: Array<{ holder: Record<string, unknown>; key: string; value: string }> = [];
+function collectRequestedModelRefs(input: unknown): Array<{ holder: Record<string, unknown>; key: string; value: string; index?: number }> {
+  const refs: Array<{ holder: Record<string, unknown>; key: string; value: string; index?: number }> = [];
   function visit(value: unknown): void {
     if (!value || typeof value !== "object") return;
     if (Array.isArray(value)) {
@@ -111,7 +121,9 @@ function collectRequestedModelRefs(input: unknown): Array<{ holder: Record<strin
       if (typeof record[key] === "string") refs.push({ holder: record, key, value: record[key] });
     }
     if (Array.isArray(record.fallbackModels)) {
-      record.fallbackModels = record.fallbackModels.filter((item) => typeof item === "string");
+      const fallbackModels = record.fallbackModels.filter((item): item is string => typeof item === "string");
+      record.fallbackModels = fallbackModels;
+      fallbackModels.forEach((value: string, index: number) => refs.push({ holder: record, key: "fallbackModels", value, index }));
     }
     for (const key of ["tasks", "chain"]) visit(record[key]);
   }
@@ -119,9 +131,12 @@ function collectRequestedModelRefs(input: unknown): Array<{ holder: Record<strin
   return refs;
 }
 
-function approvedEquivalent(requested: string, approved: string[]): string | undefined {
-  const requestedFamily = modelFamily(requested);
-  return approved.find((candidate) => modelFamily(candidate) === requestedFamily);
+function setModelRef(ref: { holder: Record<string, unknown>; key: string; value: string; index?: number }, value: string): void {
+  if (ref.key === "fallbackModels" && typeof ref.index === "number" && Array.isArray(ref.holder.fallbackModels)) {
+    ref.holder.fallbackModels[ref.index] = value;
+    return;
+  }
+  ref.holder[ref.key] = value;
 }
 
 function isModelFailure(text: string): boolean {
@@ -170,16 +185,16 @@ export function installModelPolicyGate(pi: ExtensionAPI, state: ContextManagerSt
     const refs = collectRequestedModelRefs(event.input);
     const corrections: string[] = [];
     for (const ref of refs) {
-      if (approved.includes(ref.value)) continue;
-      const equivalent = approvedEquivalent(ref.value, approved);
+      if (isTakomiModelApproved(ref.value, approved)) continue;
+      const equivalent = approvedModelEquivalent(ref.value, approved);
       if (equivalent) {
-        ref.holder[ref.key] = equivalent;
+        setModelRef(ref, equivalent);
         corrections.push(`${ref.value} -> ${equivalent}`);
         continue;
       }
       const recovery = await askForInvalidModelRecovery(ctx, ref.value, approved);
       if (recovery.action === "retry") {
-        ref.holder[ref.key] = recovery.model;
+        setModelRef(ref, recovery.model);
         corrections.push(`${ref.value} -> ${recovery.model} (user selected recovery)`);
         continue;
       }

package/.pi/extensions/takomi-runtime/commands.ts

@@ -7,7 +7,7 @@ import type {
 } from "../../../src/pi-takomi-core";
 import { commandHelp, completions, statusText, workflowPrompt } from "./command-text";
 import type { TakomiSubagentController } from "./subagent-types";
-import { installTakomiRoutingPolicy, resolveTakomiRoutingPolicy, type RoutingPolicyInstallScope } from "./routing-policy";
+import { previewTakomiRoutingPolicy, renderRoutingPolicyPreview, resolveTakomiRoutingPolicy, type RoutingPolicyInstallScope } from "./routing-policy";
 import { collectTakomiStats, renderTakomiStats } from "./takomi-stats.js";
 
 export type TakomiRuntimeCommandState = {
@@ -158,12 +158,29 @@ export function registerTakomiCommands(pi: ExtensionAPI, options: RegisterTakomi
     const policyText = scopeMatch?.[2] ?? trimmed.replace(/^set\s+/i, "");
 
     try {
-      const result = await installTakomiRoutingPolicy(ctx.cwd, policyText, { scope });
-      const detected = result.detectedDefaults.length ? `\n\nDetected defaults:\n- ${result.detectedDefaults.join("\n- ")}` : "\n\nNo model names were auto-detected; saved policy only.";
-      const overrideNote = scope === "global"
-        ? "\n\nThis will be used by every project unless that project has its own .pi/takomi/model-routing.md override."
-        : "\n\nThis project-local policy overrides the global policy for the current project.";
-      ctx.ui.notify(`Takomi routing policy updated (${scope}).\n\nPolicy: ${result.policyPath}\nSettings: ${result.settingsPath}${detected}${overrideNote}`, "info");
+      const preview = previewTakomiRoutingPolicy(ctx.cwd, policyText, { scope });
+      const reviewPrompt = [
+        "Review this Takomi routing policy extraction before it is saved.",
+        "",
+        "Rules:",
+        "- Do not invent providers or model IDs not grounded in the policy.",
+        "- Providerless names like GPT-5.5 are routing intent unless a preferred provider/router is declared.",
+        "- Valid Takomi roles are: general, orchestrator, architect, designer, coder, reviewer.",
+        "- If the extraction is correct and safe, call takomi_apply_routing_policy with the exact policyText and scope below.",
+        "- If it is ambiguous or wrong, explain what the user should clarify and do not call the tool.",
+        "",
+        "Deterministic extraction:",
+        renderRoutingPolicyPreview(preview),
+        "",
+        "Original policy text:",
+        "```",
+        preview.policy,
+        "```",
+        "",
+        `Tool call to apply if safe: takomi_apply_routing_policy({ scope: ${JSON.stringify(scope)}, policyText: <original policy text> })`,
+      ].join("\n");
+      ctx.ui.notify("Takomi routing extraction prepared. Sending it to the active model for review before saving.", "info");
+      pi.sendUserMessage(reviewPrompt);
     } catch (error) {
       ctx.ui.notify(error instanceof Error ? error.message : String(error), "error");
     }