takomi 2.1.44 → 2.5.1

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;
 };
@@ -96,12 +103,22 @@ export type TakomiSubagentRunGroup = {
   sessionId?: string;
 };
 
+export type WorkflowAvailability = "embedded";
+
+export type WorkflowCatalogEntry = {
+  id: TakomiWorkflowId;
+  stage: VibeLifecycleStage;
+  name: string;
+  description: string;
+  availability: WorkflowAvailability;
+};
+
 export type WorkflowDefinition = {
   id: TakomiWorkflowId;
   stage: VibeLifecycleStage;
   title: string;
   purpose: string;
-  preferredRole: TakomiRole;
+  preferredRole: TakomiPersona;
   preferredAgent?: string;
   preferredModelHint?: string;
   nextStage?: VibeLifecycleStage;
@@ -109,7 +126,7 @@ export type WorkflowDefinition = {
 };
 
 export type RouteDecision = {
-  role: TakomiRole;
+  role: TakomiPersona;
   workflow?: TakomiWorkflowId;
   stage?: VibeLifecycleStage;
   executionMode: "direct" | "orchestrate";
@@ -127,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;
@@ -143,6 +161,7 @@ export type OrchestratorTask = {
   scope?: string[];
   definitionOfDone?: string[];
   expectedArtifacts?: string[];
+  requiredCapabilities?: string[];
   dependencies?: string[];
   reviewCheckpoint?: string;
   instructions?: string[];
@@ -161,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;
@@ -169,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

@@ -1,45 +1,86 @@
-import type { TakomiWorkflowId, WorkflowDefinition } from "./types";
-
-const VIBE_GENESIS_PLAYBOOK = `Genesis fallback summary: author the project foundation in markdown, with PRD, FR issues, coding guidelines, architecture decisions, data models, API contracts, implementation strategy, and a clean handoff. For broad projects, Genesis may also create the orchestration session that carries the work into UI/UX Design and Build. The runtime should prefer .pi/prompts/genesis-prompt.md; this string exists only as a compatibility fallback.`;
-const VIBE_DESIGN_PLAYBOOK = `Design fallback summary: define UI/UX only: visual system, user journeys, interaction flows, mockups, accessibility expectations, and frontend builder constraints in markdown. Technical architecture, data models, and API contracts belong in Genesis or Architect planning. The runtime should prefer .pi/prompts/design-prompt.md; this string exists only as a compatibility fallback.`;
-const VIBE_BUILD_PLAYBOOK = `Build fallback summary: implement the approved plan with FR-driven work, strict verification, mockup adherence, and explicit handoff reporting. The runtime should prefer .pi/prompts/build-prompt.md; this string exists only as a compatibility fallback.`;
-export const WORKFLOWS: Record<TakomiWorkflowId, WorkflowDefinition> = {
-  "vibe-genesis": {
-    id: "vibe-genesis",
-    stage: "genesis",
-    title: "Vibe Genesis",
-    purpose: "Initialize a project with markdown blueprints, technical planning, and a clean handoff into UI/UX Design or Build. See .pi/prompts/genesis-prompt.md for the canonical behavior.",
-    preferredRole: "architect",
-    preferredAgent: "architect",
-    nextStage: "design",
-    playbook: VIBE_GENESIS_PLAYBOOK,
-  },
-  "vibe-design": {
-    id: "vibe-design",
-    stage: "design",
-    title: "Vibe Design",
-    purpose: "Define UI/UX only: visual system, user journeys, interaction flows, mockups, accessibility expectations, and frontend builder constraints before implementation begins. See .pi/prompts/design-prompt.md for the canonical behavior.",
-    preferredRole: "design",
-    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": {
-    id: "vibe-build",
-    stage: "build",
-    title: "Vibe Build",
-    purpose: "Execute the approved plan with FR-based implementation, strict verification, mockup adherence, and explicit handoff reporting. See .pi/prompts/build-prompt.md for the canonical behavior.",
-    preferredRole: "orchestrator",
-    preferredAgent: "orchestrator",
-    playbook: VIBE_BUILD_PLAYBOOK,
-  },
-};
-
-export function listWorkflowDefinitions(): WorkflowDefinition[] {
-  return Object.values(WORKFLOWS);
-}
-
-export function getWorkflowDefinition(id: TakomiWorkflowId): WorkflowDefinition {
-  return WORKFLOWS[id];
-}
+import type { TakomiWorkflowId, WorkflowCatalogEntry, WorkflowDefinition } from "./types";
+
+const VIBE_GENESIS_PLAYBOOK = `Genesis fallback summary: author the project foundation in markdown, with PRD, FR issues, coding guidelines, architecture decisions, data models, API contracts, implementation strategy, and a clean handoff. For broad projects, Genesis may also create the orchestration session that carries the work into UI/UX Design and Build. The runtime should prefer .pi/prompts/genesis-prompt.md; this string exists only as a compatibility fallback.`;
+const VIBE_DESIGN_PLAYBOOK = `Design fallback summary: define UI/UX only: visual system, user journeys, interaction flows, mockups, accessibility expectations, and frontend builder constraints in markdown. Technical architecture, data models, and API contracts belong in Genesis or Architect planning. The runtime should prefer .pi/prompts/design-prompt.md; this string exists only as a compatibility fallback.`;
+const VIBE_BUILD_PLAYBOOK = `Build fallback summary: implement the approved plan with FR-driven work, strict verification, mockup adherence, and explicit handoff reporting. The runtime should prefer .pi/prompts/build-prompt.md; this string exists only as a compatibility fallback.`;
+
+/**
+ * Canonical model-facing lifecycle metadata. Runtime tools may frame this
+ * catalog differently, but must not maintain their own workflow wording.
+ */
+export const WORKFLOW_CATALOG: readonly WorkflowCatalogEntry[] = [
+  {
+    id: "vibe-genesis",
+    stage: "genesis",
+    name: "Vibe Genesis",
+    description: "Initialize a project with markdown blueprints, technical planning, and a clean handoff into UI/UX Design or Build. See .pi/prompts/genesis-prompt.md for the canonical behavior.",
+    availability: "embedded",
+  },
+  {
+    id: "vibe-design",
+    stage: "design",
+    name: "Vibe Design",
+    description: "Define UI/UX only: visual system, user journeys, interaction flows, mockups, accessibility expectations, and frontend builder constraints before implementation begins. See .pi/prompts/design-prompt.md for the canonical behavior.",
+    availability: "embedded",
+  },
+  {
+    id: "vibe-build",
+    stage: "build",
+    name: "Vibe Build",
+    description: "Execute the approved plan with FR-based implementation, strict verification, mockup adherence, and explicit handoff reporting. See .pi/prompts/build-prompt.md for the canonical behavior.",
+    availability: "embedded",
+  },
+] as const;
+
+const WORKFLOW_IMPLEMENTATIONS: Record<TakomiWorkflowId, Omit<WorkflowDefinition, "id" | "stage" | "title" | "purpose">> = {
+  "vibe-genesis": {
+    preferredRole: "architect",
+    preferredAgent: "architect",
+    nextStage: "design",
+    playbook: VIBE_GENESIS_PLAYBOOK,
+  },
+  "vibe-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: "coder",
+    preferredAgent: "coder",
+    playbook: VIBE_BUILD_PLAYBOOK,
+  },
+};
+
+export const WORKFLOWS: Record<TakomiWorkflowId, WorkflowDefinition> = Object.fromEntries(
+  WORKFLOW_CATALOG.map((workflow) => [
+    workflow.id,
+    {
+      ...WORKFLOW_IMPLEMENTATIONS[workflow.id],
+      id: workflow.id,
+      stage: workflow.stage,
+      title: workflow.name,
+      purpose: workflow.description,
+    },
+  ]),
+) as Record<TakomiWorkflowId, WorkflowDefinition>;
+
+export function listWorkflowCatalog(): readonly WorkflowCatalogEntry[] {
+  return WORKFLOW_CATALOG;
+}
+
+export function listWorkflowDefinitions(): WorkflowDefinition[] {
+  return Object.values(WORKFLOWS);
+}
+
+export function getWorkflowCatalogEntry(id: TakomiWorkflowId): WorkflowCatalogEntry {
+  const workflow = WORKFLOW_CATALOG.find((entry) => entry.id === id);
+  if (!workflow) throw new Error(`Unknown Takomi workflow: ${id}`);
+  return workflow;
+}
+
+/** Loads the direct-playbook payload for takomi_workflow without board framing. */
+export function getWorkflowDefinition(id: TakomiWorkflowId): WorkflowDefinition {
+  return WORKFLOWS[id];
+}

package/src/skills-catalog.js

@@ -2,209 +2,9 @@ import fs from 'fs-extra';
 import path from 'path';
 import pc from 'picocolors';
 import { PATHS } from './utils.js';
+import { CORE_SKILLS, SKILL_CATEGORIES } from '../.pi/extensions/takomi-context-manager/skill-categories.js';
 
-export const CORE_SKILLS = [
-  'takomi',
-  'sync-docs',
-  'code-review',
-  'security-audit',
-  'optimize-agent-context',
-  'agent-recovery',
-  'avoid-feature-creep',
-  'ai-sdk',
-  'git-commit-generation',
-];
-
-export const SKILL_CATEGORIES = [
-  {
-    id: 'core',
-    title: 'Core / Recommended',
-    color: 'cyan',
-    description: 'Essential skills for efficient Takomi usage.',
-    skills: CORE_SKILLS,
-  },
-  {
-    id: 'developer',
-    title: 'Developer / Frameworks',
-    color: 'blue',
-    description: 'Framework, repo, and developer workflow helpers.',
-    skills: [
-      'ai-sdk',
-      'nextjs-standards',
-      'context7',
-      'monorepo-management',
-      'upgrading-expo',
-      'github-ops',
-      'git-worktree',
-      'git-commit-generation',
-      'pr-comment-fix',
-      'jules',
-      'gemini',
-      'anti-gravity',
-    ],
-  },
-  {
-    id: 'security',
-    title: 'Security / Review',
-    color: 'red',
-    description: 'Security, audit, and review workflows.',
-    skills: [
-      'security-audit',
-      'audit-website',
-      'code-review',
-      'jstar-reviewer',
-      'convex-security-audit',
-      'convex-security-check',
-    ],
-  },
-  {
-    id: 'convex',
-    title: 'Convex',
-    color: 'green',
-    description: 'Convex framework skills and best practices.',
-    skills: [
-      'convex',
-      'convex-agents',
-      'convex-best-practices',
-      'convex-component-authoring',
-      'convex-cron-jobs',
-      'convex-file-storage',
-      'convex-functions',
-      'convex-http-actions',
-      'convex-migrations',
-      'convex-realtime',
-      'convex-schema-validator',
-      'convex-security-audit',
-      'convex-security-check',
-    ],
-  },
-  {
-    id: 'frontend',
-    title: 'Frontend / UI',
-    color: 'magenta',
-    description: 'Frontend implementation, UI/UX, components, and testing.',
-    skills: [
-      'frontend-design',
-      'web-design-guidelines',
-      'building-native-ui',
-      'ui-ux-pro-max',
-      'component-analysis',
-      '21st-dev-components',
-      'stitch',
-      'webapp-testing',
-      'figma',
-    ],
-  },
-  {
-    id: 'docs-office',
-    title: 'Docs / Office / Extraction',
-    color: 'yellow',
-    description: 'Document formats, extraction, and README support.',
-    skills: [
-      'pdf',
-      'docx',
-      'pptx',
-      'xlsx',
-      'high-fidelity-extraction',
-      'crafting-effective-readmes',
-      'exam-creator-skill',
-    ],
-  },
-  {
-    id: 'marketing',
-    title: 'Marketing / SEO / Copy',
-    color: 'green',
-    description: 'Marketing, SEO, naming, pricing, and social strategy.',
-    skills: [
-      'copywriting',
-      'marketing-ideas',
-      'pricing-strategy',
-      'programmatic-seo',
-      'seo-ready',
-      'social-content',
-      'twitter-automation',
-      'google-trends',
-      'domain-name-brainstormer',
-      'global-brand-namer',
-      'youtube-pipeline',
-    ],
-  },
-  {
-    id: 'ai-media',
-    title: 'AI Media / Content Creation',
-    color: 'magenta',
-    description: 'Optional AI media/content skills. Not installed by default.',
-    skills: [
-      'ai-avatar-video',
-      'ai-marketing-videos',
-      'ai-podcast-creation',
-      'ai-product-photography',
-      'ai-social-media-content',
-      'ai-voice-cloning',
-      'takomi-flow',
-    ],
-  },
-  {
-    id: 'creative-video',
-    title: 'Creative / Video / Art',
-    color: 'blue',
-    description: 'Creative visuals, video, animation, and art workflows.',
-    skills: [
-      'algorithmic-art',
-      'blender-mcp-scene-director',
-      'takomi-flow',
-      'remotion',
-      'remotion-real-ui-video',
-      'youtube-pipeline',
-      'ai-avatar-video',
-      'ai-marketing-videos',
-      'photo-book-builder',
-      'hyperframes',
-      'general-video',
-      'motion-graphics',
-    ],
-  },
-  {
-    id: 'hyperframes',
-    title: 'HyperFrames',
-    color: 'magenta',
-    description: 'HTML-native video creation and animation framework.',
-    skills: [
-      'hyperframes',
-      'hyperframes-core',
-      'hyperframes-keyframes',
-      'hyperframes-animation',
-      'hyperframes-creative',
-      'hyperframes-media',
-      'hyperframes-registry',
-      'hyperframes-cli',
-      'remotion-to-hyperframes',
-      'media-use',
-      'embedded-captions',
-      'faceless-explainer',
-      'general-video',
-      'motion-graphics',
-      'music-to-video',
-      'pr-to-video',
-      'product-launch-video',
-      'slideshow',
-      'talking-head-recut',
-      'website-to-video',
-    ],
-  },
-  {
-    id: 'skill-building',
-    title: 'Skill Building / Prompting / Orchestration',
-    color: 'cyan',
-    description: 'Skill authoring, prompt engineering, and optional orchestration helpers.',
-    skills: [
-      'skill-creator',
-      'prompt-engineering',
-      'subagent-driven-development',
-      'spawn-task',
-    ],
-  },
-];
+export { CORE_SKILLS, SKILL_CATEGORIES, getSkillCategory } from '../.pi/extensions/takomi-context-manager/skill-categories.js';
 
 const colorFns = {
   cyan: pc.cyan,

package/src/skills-installer.js

@@ -4,7 +4,7 @@ import path from 'path';
 import crypto from 'crypto';
 import pc from 'picocolors';
 import { PATHS } from './utils.js';
-import { getValidCoreSkills, listBundledSkillNames } from './skills-catalog.js';
+import { getSkillCategory, getValidCoreSkills, listBundledSkillNames } from './skills-catalog.js';
 
 const HOME = os.homedir();
 const TAKOMI_HOME = process.env.TAKOMI_HOME_DIR || path.join(HOME, '.takomi');
@@ -45,6 +45,7 @@ function normalizeOwnedEntry(name, entry) {
       targetPath: path.join(SKILLS_ROOT, name),
       installedAt: undefined,
       takomiVersion: undefined,
+      category: getSkillCategory(name),
     };
   }
   return {
@@ -53,6 +54,7 @@ function normalizeOwnedEntry(name, entry) {
     targetPath: entry.targetPath || path.join(SKILLS_ROOT, name),
     installedAt: entry.installedAt,
     takomiVersion: entry.takomiVersion,
+    category: entry.category || getSkillCategory(name),
   };
 }
 
@@ -163,6 +165,7 @@ export async function installBundledSkills(version = 'unknown', options = {}) {
       targetPath: dest,
       installedAt: new Date().toISOString(),
       takomiVersion: version,
+      category: getSkillCategory(name),
     };
     installed.push(name);
   }