takomi 2.1.45 → 2.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "takomi",
-  "version": "2.1.45",
+  "version": "2.5.1",
   "description": "🎯 Stop wrestling with AI. Start building with purpose. The artisan's toolkit for agent workflows, Codex skills, and original Takomi capabilities like 21st.dev integration.",
   "type": "module",
   "bin": {
@@ -39,7 +39,7 @@
     "postinstall": "node src/postinstall.js",
     "test": "npm run test:typecheck && npm run test:regressions && npm run test:context-manager && npm run test:skills",
     "test:typecheck": "tsc --noEmit",
-    "test:regressions": "node scripts/test-regressions.js && node scripts/test-subagent-renderers.js && node scripts/test-subagent-heartbeat.js && node scripts/test-subagent-production-lifecycle.js && node scripts/test-subagent-acceptance.js && node scripts/test-takomi-runtime-renderers.js && node scripts/test-workflow-catalog.js && node scripts/test-oauth-router-report-ui.js && node --experimental-specifier-resolution=node scripts/test-takomi-board-errors.js && node scripts/test-takomi-gate-provenance.js && node scripts/test-subagent-project-trust.js",
+    "test:regressions": "node scripts/test-regressions.js && node scripts/test-subagent-renderers.js && node scripts/test-subagent-heartbeat.js && node scripts/test-subagent-production-lifecycle.js && node scripts/test-subagent-acceptance.js && node scripts/test-takomi-runtime-renderers.js && node scripts/test-workflow-catalog.js && node scripts/test-oauth-router-report-ui.js && node --experimental-specifier-resolution=node scripts/test-takomi-board-errors.js && node scripts/test-takomi-gate-provenance.js && node scripts/test-takomi-routing-safety.js && node scripts/test-subagent-project-trust.js",
     "test:context-manager": "node --experimental-specifier-resolution=node scripts/test-context-manager-renderers.js",
     "test:skills": "node scripts/test-skill-selection.js",
     "takomi-flow:doctor": "node plugins/takomi-flow/scripts/takomi-flow.mjs doctor",

package/src/pi-takomi-core/orchestration.ts

@@ -5,7 +5,8 @@ import type {
   OrchestratorTask,
   OrchestratorTaskStatus,
   SessionIntent,
-  TakomiRole,
+  LegacyTakomiRole,
+  TakomiPersona,
   TaskChecklistItem,
   VibeLifecycleStage,
 } from "./types";
@@ -57,18 +58,24 @@ export function workflowToStage(workflow?: OrchestratorTask["workflow"]): VibeLi
   }
 }
 
-function defaultStageForRole(role: TakomiRole): VibeLifecycleStage | undefined {
+export function canonicalizeTakomiPersona(role: TakomiPersona | LegacyTakomiRole): TakomiPersona {
   switch (role) {
-    case "architect":
-      return "genesis";
-    case "design":
-      return "design";
-    case "code":
-    case "review":
-    case "orchestrator":
-      return "build";
-    default:
-      return undefined;
+    case "design": return "designer";
+    case "code": return "coder";
+    case "review": return "reviewer";
+    case "general": return "worker";
+    default: return role;
+  }
+}
+
+function defaultStageForRole(role: TakomiPersona): VibeLifecycleStage | undefined {
+  switch (role) {
+    case "architect": return "genesis";
+    case "designer": return "design";
+    case "coder":
+    case "worker":
+    case "reviewer":
+    case "orchestrator": return "build";
   }
 }
 
@@ -123,19 +130,21 @@ export function normalizeChecklist(checklist?: Array<string | TaskChecklistItem>
   return checklist.map((item) => typeof item === "string" ? { text: item, done: false } : { text: item.text, done: item.done ?? false });
 }
 
-export function createTask(id: string, title: string, role: TakomiRole, extras?: Partial<OrchestratorTask>): OrchestratorTask {
-  const preferredAgent = extras?.preferredAgent ?? (role === "design" ? "designer" : role === "architect" ? "architect" : role === "review" ? "reviewer" : role === "code" ? "coder" : "orchestrator");
-  const stage = extras?.stage ?? workflowToStage(extras?.workflow) ?? defaultStageForRole(role);
+export function createTask(id: string, title: string, role: TakomiPersona | LegacyTakomiRole, extras?: Partial<OrchestratorTask>): OrchestratorTask {
+  const persona = canonicalizeTakomiPersona(role);
+  const preferredAgent = extras?.preferredAgent ?? persona;
+  const stage = extras?.stage ?? workflowToStage(extras?.workflow) ?? defaultStageForRole(persona);
   return {
     id,
     title,
-    role,
+    role: persona,
     status: "pending",
     ...extras,
     stage,
     preferredAgent,
     conversationId: extras?.conversationId ?? createConversationId(preferredAgent, id),
     preferredModel: extras?.preferredModel,
+    preferredModelConfirmed: extras?.preferredModelConfirmed,
     preferredModelHint: extras?.preferredModelHint,
     preferredThinking: extras?.preferredThinking,
     fallbackModels: extras?.fallbackModels,
@@ -392,10 +401,13 @@ export function buildSessionState(
   title: string,
   tasks: OrchestratorTask[],
   now = new Date(),
-  extras?: Partial<Pick<OrchestratorSessionState, "sessionIntent" | "lifecycle">>,
+  extras?: Partial<Pick<OrchestratorSessionState, "sessionIntent" | "lifecycle" | "artifacts">>,
 ): OrchestratorSessionState {
   const stamp = now.toISOString();
-  const normalizedTasks = tasks.map((task) => ({ ...task, stage: task.stage ?? workflowToStage(task.workflow) ?? defaultStageForRole(task.role) }));
+  const normalizedTasks = tasks.map((task) => {
+    const role = canonicalizeTakomiPersona(task.role as TakomiPersona | LegacyTakomiRole);
+    return { ...task, role, preferredAgent: task.preferredAgent ?? role, stage: task.stage ?? workflowToStage(task.workflow) ?? defaultStageForRole(role) };
+  });
   return {
     sessionId,
     title,
@@ -404,6 +416,7 @@ export function buildSessionState(
     mode: "hybrid",
     lifecycle: deriveLifecycleFromTasks(normalizedTasks, extras?.lifecycle),
     sessionIntent: extras?.sessionIntent ?? "full-project",
+    artifacts: extras?.artifacts,
     tasks: normalizedTasks,
   };
 }
@@ -411,7 +424,10 @@ export function buildSessionState(
 export function normalizeSessionState(
   session: Partial<OrchestratorSessionState> & Pick<OrchestratorSessionState, "sessionId" | "title">,
 ): OrchestratorSessionState {
-  const tasks = (session.tasks ?? []).map((task) => ({ ...task, stage: task.stage ?? workflowToStage(task.workflow) ?? defaultStageForRole(task.role) }));
+  const tasks = (session.tasks ?? []).map((task) => {
+    const role = canonicalizeTakomiPersona(task.role as TakomiPersona | LegacyTakomiRole);
+    return { ...task, role, preferredAgent: task.preferredAgent ?? role, stage: task.stage ?? workflowToStage(task.workflow) ?? defaultStageForRole(role) };
+  });
   const normalized = buildSessionState(
     session.sessionId,
     session.title,
@@ -420,6 +436,7 @@ export function normalizeSessionState(
     {
       sessionIntent: session.sessionIntent ?? "full-project",
       lifecycle: session.lifecycle,
+      artifacts: session.artifacts,
     },
   );
 
@@ -428,6 +445,7 @@ export function normalizeSessionState(
     createdAt: session.createdAt ?? normalized.createdAt,
     updatedAt: session.updatedAt ?? normalized.updatedAt,
     mode: "hybrid",
+    artifacts: session.artifacts ?? normalized.artifacts,
   };
 }
 
@@ -458,10 +476,10 @@ export function createLifecycleStarterSession(
 ): OrchestratorSessionState {
   const sessionId = options?.sessionId ?? createSessionId(options?.now);
   const tasks = [
-    createTask("01", "Genesis foundation", "orchestrator", {
+    createTask("01", "Genesis foundation", "architect", {
       stage: "genesis",
       workflow: "vibe-genesis",
-      preferredAgent: "orchestrator",
+      preferredAgent: "architect",
       objective: "Establish the project foundation, produce the required planning docs, and decide what should split next.",
       scope: [
         "Clarify scope and mission",

package/src/pi-takomi-core/routing.ts

@@ -1,5 +1,5 @@
 import { getWorkflowDefinition } from "./workflows";
-import type { RouteDecision, TakomiRole, TakomiWorkflowId, VibeLifecycleStage } from "./types";
+import type { RouteDecision, TakomiPersona, TakomiWorkflowId, VibeLifecycleStage } from "./types";
 
 function stageToWorkflow(stage: VibeLifecycleStage): TakomiWorkflowId {
   switch (stage) {
@@ -15,19 +15,19 @@ function stageToWorkflow(stage: VibeLifecycleStage): TakomiWorkflowId {
 
 export function detectLifecycleStage(text: string): VibeLifecycleStage | undefined {
   const lowered = text.toLowerCase();
-  if (/(\bgenesis\b|\brequirements\b|\bprd\b|\bscope\b|\bplan first\b|\bblueprint\b)/.test(lowered)) return "genesis";
-  if (/(\bdesign\b|\bux\b|\bui\b|\bmockup\b|\bwireframe\b|\bvisual\b)/.test(lowered)) return "design";
+  if (/(\bgenesis\b|\brequirements\b|\bprd\b|\bscope\b|\bplan first\b|\bblueprint\b|\barchitecture\b|\bdesign the system\b|\btechnical plan\b)/.test(lowered)) return "genesis";
+  if (/(\bui\b|\bux\b|\bui design\b|\bux design\b|\buser interface\b|\bmockup\b|\bwireframe\b|\bvisual system\b)/.test(lowered)) return "design";
   if (/(\bbuild\b|\bimplement\b|\bcode\b|\bship\b|\bwire up\b|\bfeature\b)/.test(lowered)) return "build";
   return undefined;
 }
 
-export function detectRole(text: string): TakomiRole | undefined {
+export function detectRole(text: string): TakomiPersona | undefined {
   const lowered = text.toLowerCase();
   if (/(\borchestrate\b|\bcoordinate\b|\bbreak this down\b|\bmulti-step\b|\bmulti step\b|\borchestration session\b)/.test(lowered)) return "orchestrator";
   if (/(\barchitect\b|\bdesign the system\b|\bplan\b|\bspec\b)/.test(lowered)) return "architect";
-  if (/(\bdesign\b|\bdesigner\b|\bmockup\b|\bvisual\b)/.test(lowered)) return "design";
-  if (/(\bcode\b|\bimplement\b|\bbuild\b|\bfix\b)/.test(lowered)) return "code";
-  if (/(\breview\b|\baudit\b|\bcheck\b|\bqa\b)/.test(lowered)) return "review";
+  if (/(\bui\b|\bux\b|\bdesigner\b|\bmockup\b|\bwireframe\b|\bvisual system\b|\buser interface\b)/.test(lowered)) return "designer";
+  if (/(\bcode\b|\bimplement\b|\bbuild\b|\bfix\b)/.test(lowered)) return "coder";
+  if (/(\breview\b|\baudit\b|\bcheck\b|\bqa\b)/.test(lowered)) return "reviewer";
   return undefined;
 }
 
@@ -83,7 +83,7 @@ export function decideRoute(text: string): RouteDecision {
   }
 
   return {
-    role: "general",
+    role: "worker",
     executionMode: "direct",
     sessionRecommendation: followUp ? "consider" : "none",
     reason: followUp

package/src/pi-takomi-core/types.ts

@@ -1,4 +1,11 @@
-export type TakomiRole = "general" | "orchestrator" | "architect" | "design" | "code" | "review";
+export type TakomiPersona = "orchestrator" | "architect" | "designer" | "coder" | "worker" | "reviewer";
+
+/** @deprecated Runtime and persisted tasks should use TakomiPersona names. */
+export type LegacyTakomiRole = "general" | "design" | "code" | "review";
+
+export type TakomiRole = TakomiPersona | "general";
+
+export type TakomiMainMode = "idle" | "code" | "review" | "orchestrate";
 
 export type TakomiWorkflowId = "vibe-genesis" | "vibe-design" | "vibe-build";
 
@@ -38,7 +45,7 @@ export type TakomiProfile = {
   foreground?: boolean;
   background?: boolean;
   reviewAfterImplementation?: boolean;
-  roles?: Partial<Record<TakomiRole, TakomiDispatchDefaults>>;
+  roles?: Partial<Record<TakomiPersona, TakomiDispatchDefaults>>;
   stages?: Partial<Record<VibeLifecycleStage, TakomiDispatchDefaults>>;
   review?: TakomiReviewProfile;
 };
@@ -111,7 +118,7 @@ export type WorkflowDefinition = {
   stage: VibeLifecycleStage;
   title: string;
   purpose: string;
-  preferredRole: TakomiRole;
+  preferredRole: TakomiPersona;
   preferredAgent?: string;
   preferredModelHint?: string;
   nextStage?: VibeLifecycleStage;
@@ -119,7 +126,7 @@ export type WorkflowDefinition = {
 };
 
 export type RouteDecision = {
-  role: TakomiRole;
+  role: TakomiPersona;
   workflow?: TakomiWorkflowId;
   stage?: VibeLifecycleStage;
   executionMode: "direct" | "orchestrate";
@@ -137,13 +144,14 @@ export type TaskChecklistItem = {
 export type OrchestratorTask = {
   id: string;
   title: string;
-  role: TakomiRole;
+  role: TakomiPersona;
   stage?: VibeLifecycleStage;
   workflow?: TakomiWorkflowId;
   parentTaskId?: string;
   preferredAgent?: string;
   preferredModelHint?: string;
   preferredModel?: string;
+  preferredModelConfirmed?: boolean;
   preferredThinking?: TakomiThinkingLevel;
   fallbackModels?: string[];
   dispatchPolicy?: TakomiDispatchPolicy;
@@ -153,6 +161,7 @@ export type OrchestratorTask = {
   scope?: string[];
   definitionOfDone?: string[];
   expectedArtifacts?: string[];
+  requiredCapabilities?: string[];
   dependencies?: string[];
   reviewCheckpoint?: string;
   instructions?: string[];
@@ -171,6 +180,14 @@ export type LifecycleStageState = {
 
 export type SessionIntent = "full-project" | "feature-scope" | "follow-up-task";
 
+export type MasterPlanOwner = "human" | "board" | "caller";
+
+export type MasterPlanArtifactProvenance = {
+  owner: MasterPlanOwner;
+  sha256: string;
+  lastSeenAt: string;
+};
+
 export type OrchestratorSessionState = {
   sessionId: string;
   title: string;
@@ -179,5 +196,8 @@ export type OrchestratorSessionState = {
   mode: "hybrid";
   lifecycle: Record<VibeLifecycleStage, LifecycleStageState>;
   sessionIntent?: SessionIntent;
+  artifacts?: {
+    masterPlan?: MasterPlanArtifactProvenance;
+  };
   tasks: OrchestratorTask[];
 };

package/src/pi-takomi-core/workflows.ts

@@ -40,15 +40,15 @@ const WORKFLOW_IMPLEMENTATIONS: Record<TakomiWorkflowId, Omit<WorkflowDefinition
     playbook: VIBE_GENESIS_PLAYBOOK,
   },
   "vibe-design": {
-    preferredRole: "design",
+    preferredRole: "designer",
     preferredAgent: "designer",
     preferredModelHint: "Prefer Gemini 3.1 Pro Preview or another strong design-capable model actually available in Pi.",
     nextStage: "build",
     playbook: VIBE_DESIGN_PLAYBOOK,
   },
   "vibe-build": {
-    preferredRole: "orchestrator",
-    preferredAgent: "orchestrator",
+    preferredRole: "coder",
+    preferredAgent: "coder",
     playbook: VIBE_BUILD_PLAYBOOK,
   },
 };