takomi 2.1.2 → 2.1.3

package/.pi/extensions/takomi-subagents/agents.ts

@@ -1,113 +1,113 @@
-import * as fs from "node:fs";
-import * as path from "node:path";
-import { getAgentDir, parseFrontmatter } from "@mariozechner/pi-coding-agent";
-import type { TakomiThinkingLevel } from "../../../src/pi-takomi-core";
-
-export type TakomiAgentScope = "user" | "project" | "both";
-
-export type TakomiAgentConfig = {
-  name: string;
-  description: string;
-  tools?: string[];
-  model?: string;
-  fallbackModels?: string[];
-  thinking?: TakomiThinkingLevel;
-  systemPrompt: string;
-  filePath: string;
-  source: "user" | "project";
-};
-
-function splitList(value?: string): string[] | undefined {
-  const parts = value
-    ?.split(",")
-    .map((part) => part.trim())
-    .filter(Boolean);
-  return parts?.length ? parts : undefined;
-}
-
-function normalizeThinking(value?: string): TakomiThinkingLevel | undefined {
-  if (
-    value === "off"
-    || value === "minimal"
-    || value === "low"
-    || value === "medium"
-    || value === "high"
-    || value === "xhigh"
-  ) {
-    return value;
-  }
-  return undefined;
-}
-
-function loadAgentsFromDirectory(agentsDir: string, source: "user" | "project"): TakomiAgentConfig[] {
-  if (!fs.existsSync(agentsDir)) return [];
-
-  const entries = fs.readdirSync(agentsDir, { withFileTypes: true });
-  const agents: TakomiAgentConfig[] = [];
-
-  for (const entry of entries) {
-    if (!entry.name.endsWith(".md")) continue;
-    const filePath = path.join(agentsDir, entry.name);
-    const content = fs.readFileSync(filePath, "utf8");
-    const { frontmatter, body } = parseFrontmatter<Record<string, string>>(content);
-    if (!frontmatter.name || !frontmatter.description) continue;
-
-    agents.push({
-      name: frontmatter.name,
-      description: frontmatter.description,
-      tools: splitList(frontmatter.tools),
-      model: frontmatter.model,
-      fallbackModels: splitList(frontmatter.fallbackModels ?? frontmatter.fallback_models),
-      thinking: normalizeThinking(frontmatter.thinking),
-      systemPrompt: body,
-      filePath,
-      source,
-    });
-  }
-
-  return agents;
-}
-
-function isDirectory(target: string): boolean {
-  try {
-    return fs.statSync(target).isDirectory();
-  } catch {
-    return false;
-  }
-}
-
-function findNearestProjectAgentsDirs(cwd: string): string[] {
-  let current = cwd;
-  while (true) {
-    const candidates = [
-      path.join(current, ".pi", "agents"),
-      path.join(current, ".agents"),
-    ].filter(isDirectory);
-    if (candidates.length > 0) return candidates;
-    const parent = path.dirname(current);
-    if (parent === current) return [];
-    current = parent;
-  }
-}
-
-export function discoverTakomiAgents(cwd: string, scope: TakomiAgentScope = "both"): TakomiAgentConfig[] {
-  const projectAgentsDirs = findNearestProjectAgentsDirs(cwd);
-  const localAgents = scope === "user"
-    ? []
-    : projectAgentsDirs.flatMap((agentsDir) => loadAgentsFromDirectory(agentsDir, "project"));
-  const globalAgents = scope === "project" ? [] : loadAgentsFromDirectory(path.join(getAgentDir(), "agents"), "user");
-  const merged = new Map<string, TakomiAgentConfig>();
-
-  for (const agent of globalAgents) {
-    merged.set(agent.name, agent);
-  }
-  for (const agent of localAgents) {
-    merged.set(agent.name, agent);
-  }
-
-  return [...merged.values()];
-}
-
-export function discoverProjectAgents(cwd: string): TakomiAgentConfig[] {
-  return discoverTakomiAgents(cwd, "both");
-}
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { getAgentDir, parseFrontmatter } from "@mariozechner/pi-coding-agent";
+import type { TakomiThinkingLevel } from "../../../src/pi-takomi-core";
+
+export type TakomiAgentScope = "user" | "project" | "both";
+
+export type TakomiAgentConfig = {
+  name: string;
+  description: string;
+  tools?: string[];
+  model?: string;
+  fallbackModels?: string[];
+  thinking?: TakomiThinkingLevel;
+  systemPrompt: string;
+  filePath: string;
+  source: "user" | "project";
+};
+
+function splitList(value?: string): string[] | undefined {
+  const parts = value
+    ?.split(",")
+    .map((part) => part.trim())
+    .filter(Boolean);
+  return parts?.length ? parts : undefined;
+}
+
+function normalizeThinking(value?: string): TakomiThinkingLevel | undefined {
+  if (
+    value === "off"
+    || value === "minimal"
+    || value === "low"
+    || value === "medium"
+    || value === "high"
+    || value === "xhigh"
+  ) {
+    return value;
+  }
+  return undefined;
+}
+
+function loadAgentsFromDirectory(agentsDir: string, source: "user" | "project"): TakomiAgentConfig[] {
+  if (!fs.existsSync(agentsDir)) return [];
+
+  const entries = fs.readdirSync(agentsDir, { withFileTypes: true });
+  const agents: TakomiAgentConfig[] = [];
+
+  for (const entry of entries) {
+    if (!entry.name.endsWith(".md")) continue;
+    const filePath = path.join(agentsDir, entry.name);
+    const content = fs.readFileSync(filePath, "utf8");
+    const { frontmatter, body } = parseFrontmatter<Record<string, string>>(content);
+    if (!frontmatter.name || !frontmatter.description) continue;
+
+    agents.push({
+      name: frontmatter.name,
+      description: frontmatter.description,
+      tools: splitList(frontmatter.tools),
+      model: frontmatter.model,
+      fallbackModels: splitList(frontmatter.fallbackModels ?? frontmatter.fallback_models),
+      thinking: normalizeThinking(frontmatter.thinking),
+      systemPrompt: body,
+      filePath,
+      source,
+    });
+  }
+
+  return agents;
+}
+
+function isDirectory(target: string): boolean {
+  try {
+    return fs.statSync(target).isDirectory();
+  } catch {
+    return false;
+  }
+}
+
+function findNearestProjectAgentsDirs(cwd: string): string[] {
+  let current = cwd;
+  while (true) {
+    const candidates = [
+      path.join(current, ".pi", "agents"),
+      path.join(current, ".agents"),
+    ].filter(isDirectory);
+    if (candidates.length > 0) return candidates;
+    const parent = path.dirname(current);
+    if (parent === current) return [];
+    current = parent;
+  }
+}
+
+export function discoverTakomiAgents(cwd: string, scope: TakomiAgentScope = "both"): TakomiAgentConfig[] {
+  const projectAgentsDirs = findNearestProjectAgentsDirs(cwd);
+  const localAgents = scope === "user"
+    ? []
+    : projectAgentsDirs.flatMap((agentsDir) => loadAgentsFromDirectory(agentsDir, "project"));
+  const globalAgents = scope === "project" ? [] : loadAgentsFromDirectory(path.join(getAgentDir(), "agents"), "user");
+  const merged = new Map<string, TakomiAgentConfig>();
+
+  for (const agent of globalAgents) {
+    merged.set(agent.name, agent);
+  }
+  for (const agent of localAgents) {
+    merged.set(agent.name, agent);
+  }
+
+  return [...merged.values()];
+}
+
+export function discoverProjectAgents(cwd: string): TakomiAgentConfig[] {
+  return discoverTakomiAgents(cwd, "both");
+}

package/.pi/extensions/takomi-subagents/delegation-plan.ts

@@ -1,95 +1,95 @@
-import type {
-  TakomiDelegationPlan,
-  TakomiDelegationPlanTask,
-  TakomiDispatchPolicy,
-  TakomiLaunchMode,
-  TakomiProfile,
-  TakomiRole,
-  TakomiThinkingLevel,
-  TakomiWorkflowId,
-  VibeLifecycleStage,
-} from "../../../src/pi-takomi-core";
-import type { ChecklistInput } from "../takomi-runtime/shared";
-
-type PlanTaskInput = {
-  id?: string;
-  title?: string;
-  agent: string;
-  task: string;
-  role?: TakomiRole;
-  stage?: VibeLifecycleStage;
-  workflow?: TakomiWorkflowId | string;
-  model?: string;
-  fallbackModels?: string[];
-  thinking?: TakomiThinkingLevel;
-  conversationId?: string;
-  checklist?: ChecklistInput;
-  dispatchPolicy?: TakomiDispatchPolicy;
-  review?: boolean;
-};
-
-type PlanInput = {
-  source: TakomiDelegationPlan["source"];
-  sessionId?: string;
-  launchMode: TakomiLaunchMode;
-  profile: TakomiProfile;
-  tasks: PlanTaskInput[];
-};
-
-function normalizeChecklist(checklist?: ChecklistInput): TakomiDelegationPlanTask["checklist"] {
-  if (!checklist?.length) return undefined;
-  return checklist.map((item) => typeof item === "string" ? { text: item, done: false } : { text: item.text, done: item.done ?? false });
-}
-
-export function createTakomiDelegationPlan(input: PlanInput): TakomiDelegationPlan {
-  const reviewAfterImplementation = input.profile.reviewAfterImplementation ?? input.profile.review?.enabled ?? true;
-  return {
-    planId: `takomi-plan-${Date.now()}`,
-    source: input.source,
-    launchMode: input.launchMode,
-    placement: input.profile.background ? "background" : "foreground",
-    reviewAfterImplementation,
-    createdAt: new Date().toISOString(),
-    sessionId: input.sessionId,
-    tasks: input.tasks.map((task, index) => ({
-      id: task.id ?? `plan-task-${index + 1}`,
-      title: task.title ?? task.task.split(/\r?\n/).find(Boolean)?.slice(0, 80) ?? `Task ${index + 1}`,
-      agent: task.agent,
-      task: task.task,
-      role: task.role,
-      stage: task.stage,
-      workflow: task.workflow,
-      model: task.model,
-      fallbackModels: task.fallbackModels,
-      thinking: task.thinking,
-      conversationId: task.conversationId,
-      checklist: normalizeChecklist(task.checklist),
-      dispatchPolicy: task.dispatchPolicy,
-      review: task.review ?? reviewAfterImplementation,
-      status: "planned",
-    })),
-  };
-}
-
-export function renderTakomiDelegationPlan(plan: TakomiDelegationPlan): string {
-  const lines = [
-    `Takomi delegation plan ${plan.planId}`,
-    `mode=${plan.launchMode} | placement=${plan.placement} | reviewAfterImplementation=${plan.reviewAfterImplementation ? "on" : "off"}`,
-  ];
-  for (const task of plan.tasks) {
-    const checklist = task.checklist?.length ? ` | checklist=${task.checklist.filter((item) => item.done).length}/${task.checklist.length}` : "";
-    const fallback = task.fallbackModels?.length ? ` | fallbacks=${task.fallbackModels.length}` : "";
-    lines.push([
-      `${task.id}: ${task.agent}`,
-      task.model ? `model=${task.model}` : "model=default",
-      task.thinking ? `thinking=${task.thinking}` : "thinking=default",
-      task.workflow ? `workflow=${task.workflow}` : "",
-      task.review ? "review=on" : "review=off",
-      `task=${task.title}${fallback}${checklist}`,
-    ].filter(Boolean).join(" | "));
-  }
-  if (plan.launchMode === "manual") {
-    lines.push("", "Manual launch mode: review or edit agent/task/model/thinking/review settings, then rerun with confirmLaunch=true. Use previewOnly=true to keep reviewing without launch.");
-  }
-  return lines.join("\n");
-}
+import type {
+  TakomiDelegationPlan,
+  TakomiDelegationPlanTask,
+  TakomiDispatchPolicy,
+  TakomiLaunchMode,
+  TakomiProfile,
+  TakomiRole,
+  TakomiThinkingLevel,
+  TakomiWorkflowId,
+  VibeLifecycleStage,
+} from "../../../src/pi-takomi-core";
+import type { ChecklistInput } from "../takomi-runtime/shared";
+
+type PlanTaskInput = {
+  id?: string;
+  title?: string;
+  agent: string;
+  task: string;
+  role?: TakomiRole;
+  stage?: VibeLifecycleStage;
+  workflow?: TakomiWorkflowId | string;
+  model?: string;
+  fallbackModels?: string[];
+  thinking?: TakomiThinkingLevel;
+  conversationId?: string;
+  checklist?: ChecklistInput;
+  dispatchPolicy?: TakomiDispatchPolicy;
+  review?: boolean;
+};
+
+type PlanInput = {
+  source: TakomiDelegationPlan["source"];
+  sessionId?: string;
+  launchMode: TakomiLaunchMode;
+  profile: TakomiProfile;
+  tasks: PlanTaskInput[];
+};
+
+function normalizeChecklist(checklist?: ChecklistInput): TakomiDelegationPlanTask["checklist"] {
+  if (!checklist?.length) return undefined;
+  return checklist.map((item) => typeof item === "string" ? { text: item, done: false } : { text: item.text, done: item.done ?? false });
+}
+
+export function createTakomiDelegationPlan(input: PlanInput): TakomiDelegationPlan {
+  const reviewAfterImplementation = input.profile.reviewAfterImplementation ?? input.profile.review?.enabled ?? true;
+  return {
+    planId: `takomi-plan-${Date.now()}`,
+    source: input.source,
+    launchMode: input.launchMode,
+    placement: input.profile.background ? "background" : "foreground",
+    reviewAfterImplementation,
+    createdAt: new Date().toISOString(),
+    sessionId: input.sessionId,
+    tasks: input.tasks.map((task, index) => ({
+      id: task.id ?? `plan-task-${index + 1}`,
+      title: task.title ?? task.task.split(/\r?\n/).find(Boolean)?.slice(0, 80) ?? `Task ${index + 1}`,
+      agent: task.agent,
+      task: task.task,
+      role: task.role,
+      stage: task.stage,
+      workflow: task.workflow,
+      model: task.model,
+      fallbackModels: task.fallbackModels,
+      thinking: task.thinking,
+      conversationId: task.conversationId,
+      checklist: normalizeChecklist(task.checklist),
+      dispatchPolicy: task.dispatchPolicy,
+      review: task.review ?? reviewAfterImplementation,
+      status: "planned",
+    })),
+  };
+}
+
+export function renderTakomiDelegationPlan(plan: TakomiDelegationPlan): string {
+  const lines = [
+    `Takomi delegation plan ${plan.planId}`,
+    `mode=${plan.launchMode} | placement=${plan.placement} | reviewAfterImplementation=${plan.reviewAfterImplementation ? "on" : "off"}`,
+  ];
+  for (const task of plan.tasks) {
+    const checklist = task.checklist?.length ? ` | checklist=${task.checklist.filter((item) => item.done).length}/${task.checklist.length}` : "";
+    const fallback = task.fallbackModels?.length ? ` | fallbacks=${task.fallbackModels.length}` : "";
+    lines.push([
+      `${task.id}: ${task.agent}`,
+      task.model ? `model=${task.model}` : "model=default",
+      task.thinking ? `thinking=${task.thinking}` : "thinking=default",
+      task.workflow ? `workflow=${task.workflow}` : "",
+      task.review ? "review=on" : "review=off",
+      `task=${task.title}${fallback}${checklist}`,
+    ].filter(Boolean).join(" | "));
+  }
+  if (plan.launchMode === "manual") {
+    lines.push("", "Manual launch mode: review or edit agent/task/model/thinking/review settings, then rerun with confirmLaunch=true. Use previewOnly=true to keep reviewing without launch.");
+  }
+  return lines.join("\n");
+}

package/.pi/extensions/takomi-subagents/dispatch-helpers.ts

@@ -1,26 +1,26 @@
-import type { TakomiDispatchInput } from "./dispatch";
-
-export function uniqueStrings(values: Array<string | undefined>): string[] {
-  return [...new Set(values.filter((value): value is string => Boolean(value?.trim())))];
-}
-
-export function hasThinkingSuffix(model?: string): boolean {
-  return /:(off|minimal|low|medium|high|xhigh)$/i.test(model ?? "");
-}
-
-export function buildFallbackModels(input: TakomiDispatchInput): string[] {
-  return uniqueStrings([
-    input.agent.model,
-    ...(input.fallbackModels ?? []),
-    ...(input.agent.fallbackModels ?? []),
-  ]);
-}
-
-export function buildSystemPrompt(input: TakomiDispatchInput): string {
-  return [
-    input.agent.systemPrompt,
-    input.workflow ? `\nUse the ${input.workflow} workflow for this task.` : "",
-    input.skills?.length ? `\nUse these skills when relevant: ${input.skills.join(", ")}.` : "",
-    input.thinking ? `\nUse Pi thinking level '${input.thinking}' for this delegated run when the selected model supports it.` : "",
-  ].filter(Boolean).join("\n");
-}
+import type { TakomiDispatchInput } from "./dispatch";
+
+export function uniqueStrings(values: Array<string | undefined>): string[] {
+  return [...new Set(values.filter((value): value is string => Boolean(value?.trim())))];
+}
+
+export function hasThinkingSuffix(model?: string): boolean {
+  return /:(off|minimal|low|medium|high|xhigh)$/i.test(model ?? "");
+}
+
+export function buildFallbackModels(input: TakomiDispatchInput): string[] {
+  return uniqueStrings([
+    input.agent.model,
+    ...(input.fallbackModels ?? []),
+    ...(input.agent.fallbackModels ?? []),
+  ]);
+}
+
+export function buildSystemPrompt(input: TakomiDispatchInput): string {
+  return [
+    input.agent.systemPrompt,
+    input.workflow ? `\nUse the ${input.workflow} workflow for this task.` : "",
+    input.skills?.length ? `\nUse these skills when relevant: ${input.skills.join(", ")}.` : "",
+    input.thinking ? `\nUse Pi thinking level '${input.thinking}' for this delegated run when the selected model supports it.` : "",
+  ].filter(Boolean).join("\n");
+}