takomi 2.0.7 → 2.1.0

package/package.json

@@ -1,46 +1,59 @@
-{
-  "name": "takomi",
-  "version": "2.0.7",
-  "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": {
-    "takomi": "./bin/takomi.js"
-  },
-  "files": [
-    "bin",
-    "src",
-    "assets"
-  ],
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/JStaRFilms/VibeCode-Protocol-Suite.git"
-  },
-  "keywords": [
-    "takomi",
-    "ai",
-    "skills",
-    "codex",
-    "agentic",
-    "21st.dev",
-    "vibecode",
-    "cursor",
-    "windsurf",
-    "protocols"
-  ],
-  "author": "J StaR Films Studios",
-  "license": "UNLICENSED",
-  "dependencies": {
-    "commander": "^13.1.0",
-    "figlet": "^1.8.0",
-    "fs-extra": "^11.3.0",
-    "picocolors": "^1.1.1",
-    "prompts": "^2.4.2"
-  },
-  "bugs": {
-    "url": "https://github.com/JStaRFilms/VibeCode-Protocol-Suite/issues"
-  },
-  "homepage": "https://github.com/JStaRFilms/VibeCode-Protocol-Suite#readme"
+{
+  "name": "takomi",
+  "version": "2.1.0",
+  "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": {
+    "takomi": "./bin/takomi.js"
+  },
+  "files": [
+    "bin",
+    "src",
+    "assets",
+    ".pi/README.md",
+    ".pi/agents",
+    ".pi/extensions",
+    ".pi/prompts",
+    ".pi/themes"
+  ],
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/JStaRFilms/VibeCode-Protocol-Suite.git"
+  },
+  "keywords": [
+    "takomi",
+    "ai",
+    "skills",
+    "codex",
+    "agentic",
+    "21st.dev",
+    "vibecode",
+    "cursor",
+    "windsurf",
+    "protocols"
+  ],
+  "author": "J StaR Films Studios",
+  "license": "ISC",
+  "dependencies": {
+    "commander": "^13.1.0",
+    "figlet": "^1.8.0",
+    "fs-extra": "^11.3.0",
+    "pi-subagents": "^0.24.0",
+    "picocolors": "^1.1.1",
+    "prompts": "^2.4.2"
+  },
+  "bugs": {
+    "url": "https://github.com/JStaRFilms/VibeCode-Protocol-Suite/issues"
+  },
+  "homepage": "https://github.com/JStaRFilms/VibeCode-Protocol-Suite#readme",
+  "devDependencies": {
+    "@mariozechner/pi-ai": "^0.70.2",
+    "@mariozechner/pi-coding-agent": "^0.70.2",
+    "@types/node": "^25.5.2",
+    "typebox": "^1.1.33",
+    "typescript": "^6.0.2"
+  }
 }

package/src/cli.js

@@ -15,6 +15,7 @@ import {
   copyAgentReadme,
   copyAgentYamls,
   copyLegacyManual,
+  copyBundledPiAssets,
   updateWorkflows,
   updateSkills,
   updateAgentYamls,
@@ -39,6 +40,10 @@ import {
   getStoreWorkflows,
   isStoreInitialized,
 } from './store.js';
+import { runDoctor } from './doctor.js';
+import { ensurePiInstalled, ensurePiSubagentsInstalled, launchTakomiHarness, printPiInstallResult, printPiSubagentsInstallResult } from './pi-harness.js';
+import { installPiHarnessAssets, printPiInstallSummary, syncPiHarnessAssets, validatePiHarnessInstall } from './pi-installer.js';
+import { installBundledSkills, printSkillsInstallSummary, validateSkillsInstall } from './skills-installer.js';
 
 const program = new Command();
 
@@ -124,6 +129,10 @@ async function init() {
     // 0. Install from local assets
     console.log(pc.cyan('📦 Installing from local bundle...\n'));
 
+    if (await copyBundledPiAssets(destRoot)) {
+      console.log(pc.green('✔ Installed Pi-native Takomi runtime (.pi).'));
+    }
+
     // 1. Handle .agent Folder
     if (response.components.includes('agent')) {
       const agentDest = path.join(destRoot, '.agent');
@@ -197,7 +206,8 @@ async function init() {
     console.log(pc.white(`\nNext steps:`));
     if (response.components.includes('agent')) {
       console.log(pc.gray(`1. Your .agent folder is armed and ready.`));
-      console.log(pc.gray(`2. In Codex, say "use takomi genesis" (slash command optional).`));
+      console.log(pc.gray(`2. Your Pi-native .pi Takomi runtime is installed.`));
+      console.log(pc.gray(`3. In Codex, say "use takomi genesis" (slash command optional).`));
     }
     console.log(pc.dim(`\n💡 Pro tip: Run "takomi install" to sync this toolkit across all your IDEs.\n`));
 
@@ -206,11 +216,125 @@ async function init() {
   }
 }
 
+async function installSkillsTarget() {
+  console.log(pc.magenta('🧰 Takomi Skills Install\n'));
+  try {
+    const result = await installBundledSkills(program.version());
+    const validation = await validateSkillsInstall();
+    printSkillsInstallSummary(result, validation);
+    console.log(pc.dim('\nGlobal skills are ready for Pi or other supported harnesses.\n'));
+  } catch (error) {
+    console.log(pc.red('\nSkills install failed.'));
+    console.log(pc.dim(String(error?.message || error)));
+  }
+}
+
+async function installAllTargets() {
+  await installPiTarget();
+  await installSkillsTarget();
+}
+
+async function installPiTarget() {
+  console.log(pc.magenta('🧭 Pi Harness Preflight\n'));
+  const report = await runDoctor({ version: program.version() });
+
+  if (!report.pi.installed) {
+    console.log(pc.cyan('\n📦 Installing Pi...\n'));
+    const installResult = await ensurePiInstalled();
+    printPiInstallResult(installResult);
+    if (!installResult.ok) {
+      console.log(pc.yellow('\nPi harness install stopped because Pi could not be installed.'));
+      console.log(pc.dim('Retry manually with: npm install -g @mariozechner/pi-coding-agent\n'));
+      return;
+    }
+  }
+
+  if (!report.piSubagents.localInstalled && !report.piSubagents.globalInstalled) {
+    console.log(pc.cyan('\n📦 Installing pi-subagents...\n'));
+    const installResult = await ensurePiSubagentsInstalled();
+    printPiSubagentsInstallResult(installResult);
+    if (!installResult.ok) {
+      console.log(pc.yellow('\nPi harness install stopped because pi-subagents could not be installed.'));
+      console.log(pc.dim('Retry manually with: npm install -g pi-subagents\n'));
+      return;
+    }
+  }
+
+  console.log(pc.cyan('\n📦 Installing Takomi Pi harness assets...\n'));
+  try {
+    const result = await installPiHarnessAssets(program.version());
+    const validation = await validatePiHarnessInstall();
+    printPiInstallSummary(result, validation);
+    console.log(pc.dim('\nNext: cd <project> && takomi\n'));
+  } catch (error) {
+    console.log(pc.red('\nPi harness asset install failed.'));
+    console.log(pc.dim(String(error?.message || error)));
+  }
+}
+
+async function syncPiTarget() {
+  console.log(pc.magenta('📡 Takomi Pi Sync\n'));
+  try {
+    const result = await syncPiHarnessAssets(program.version());
+    const validation = await validatePiHarnessInstall();
+    printPiInstallSummary(result, validation);
+  } catch (error) {
+    console.log(pc.red('\nPi sync failed.'));
+    console.log(pc.dim(String(error?.message || error)));
+  }
+}
+
+async function syncSkillsTarget() {
+  console.log(pc.magenta('📡 Takomi Skills Sync\n'));
+  try {
+    const result = await installBundledSkills(program.version());
+    const validation = await validateSkillsInstall();
+    printSkillsInstallSummary(result, validation);
+  } catch (error) {
+    console.log(pc.red('\nSkills sync failed.'));
+    console.log(pc.dim(String(error?.message || error)));
+  }
+}
+
+async function syncAllTargets() {
+  await syncPiTarget();
+  await syncSkillsTarget();
+}
+
+function printUnsupportedInstallTarget(target) {
+  console.log(pc.yellow(`Unsupported install target: ${target}`));
+  console.log(pc.dim('Supported targets right now: pi, skills, all'));
+  console.log(pc.dim('Use plain "takomi install" for the existing interactive global installer.\n'));
+}
+
+function printUnsupportedSyncTarget(target) {
+  console.log(pc.yellow(`Unsupported sync target: ${target}`));
+  console.log(pc.dim('Supported targets right now: pi, skills, all'));
+  console.log(pc.dim('Use plain "takomi sync" for the existing interactive global sync.\n'));
+}
+
 // ─────────────────────────────────────────────────────────────────────────────
 // takomi install (NEW — Global Setup + Harness Routing)
 // ─────────────────────────────────────────────────────────────────────────────
 
-async function install() {
+async function install(target) {
+  if (target) {
+    if (target === 'pi') {
+      await installPiTarget();
+      return;
+    }
+    if (target === 'skills') {
+      await installSkillsTarget();
+      return;
+    }
+    if (target === 'all') {
+      await installAllTargets();
+      return;
+    }
+
+    printUnsupportedInstallTarget(target);
+    return;
+  }
   console.log(pc.magenta(figlet.textSync('Takomi', { horizontalLayout: 'full' })));
   console.log(pc.cyan('   🌐 One install. Every IDE. Zero friction.\n'));
 
@@ -359,7 +483,23 @@ async function install() {
 // takomi sync (NEW — Re-sync store to all harnesses)
 // ─────────────────────────────────────────────────────────────────────────────
 
-async function sync() {
+async function sync(target) {
+  if (target) {
+    if (target === 'pi') {
+      await syncPiTarget();
+      return;
+    }
+    if (target === 'skills') {
+      await syncSkillsTarget();
+      return;
+    }
+    if (target === 'all') {
+      await syncAllTargets();
+      return;
+    }
+    printUnsupportedSyncTarget(target);
+    return;
+  }
   console.log(pc.magenta('📡 Syncing your toolkit to all connected IDEs...\n'));
 
   // Check if global store exists
@@ -545,14 +685,14 @@ program
 
 // Global installer (NEW)
 program
-  .command('install')
-  .description('Build your global command center')
+  .command('install [target]')
+  .description('Build your global command center or run a target-specific installer')
   .action(install);
 
 // Re-sync (NEW)
 program
-  .command('sync')
-  .description('Push updates to all connected IDEs')
+  .command('sync [target]')
+  .description('Push updates to all connected IDEs or sync a target-specific install')
   .action(sync);
 
 // Add remote skills (NEW)
@@ -567,6 +707,11 @@ program
   .description('See your toolkit status and connected IDEs')
   .action(harnesses);
 
+program
+  .command('doctor')
+  .description('Run Pi/Takomi installation diagnostics')
+  .action(() => runDoctor({ version: program.version() }));
+
 // Update from GitHub (EXISTING — enhanced)
 program
   .command('update')
@@ -636,4 +781,9 @@ program
     console.log(pc.magenta('\n✨ Your toolkit is fresh and ready to ship.'));
   });
 
-program.parse();
+if (process.argv.length <= 2) {
+  const exitCode = await launchTakomiHarness(process.cwd());
+  process.exitCode = exitCode;
+} else {
+  program.parse();
+}

package/src/doctor.js

@@ -0,0 +1,84 @@
+import fs from 'fs-extra';
+import pc from 'picocolors';
+import { inspectPiHarnessEnvironment } from './pi-harness.js';
+import { getStoreSkills, isStoreInitialized } from './store.js';
+import { PI_MANIFEST_PATH } from './pi-installer.js';
+import { SKILLS_MANIFEST_PATH, SKILLS_ROOT } from './skills-installer.js';
+
+function status(ok, label, value) {
+  const icon = ok ? pc.green('✔') : pc.yellow('✗');
+  const suffix = value ? ` ${pc.dim(value)}` : '';
+  return `  ${icon} ${label}${suffix}`;
+}
+
+export async function runDoctor({ version, cwd = process.cwd() } = {}) {
+  const report = await inspectPiHarnessEnvironment(cwd);
+  const storeReady = await isStoreInitialized();
+  const storeSkills = storeReady ? await getStoreSkills() : [];
+
+  console.log(pc.magenta('🩺 Takomi Doctor\n'));
+  console.log(status(true, 'Takomi CLI', version || 'unknown'));
+  console.log(status(report.pi.installed, 'Pi command', report.pi.installed ? `${report.pi.path}${report.pi.version ? ` (${report.pi.version})` : ''}` : 'missing'));
+  console.log(status(report.bundled.packageReady, 'Bundled .pi assets', report.bundled.targets.root));
+  console.log(status(report.bundled.checks.runtime, 'Bundled takomi-runtime', report.bundled.targets.runtime));
+  console.log(status(report.bundled.checks.subagents, 'Bundled takomi-subagents', report.bundled.targets.subagents));
+  console.log(status(report.bundled.packageIncluded, 'Package includes .pi assets', report.bundled.packageIncluded ? 'yes' : 'no'));
+  console.log(status(report.installed.runtimeInstalled, 'Installed takomi-runtime', report.installed.targets.extensions));
+  console.log(status(report.installed.subagentsInstalled, 'Installed takomi-subagents', report.installed.targets.extensions));
+  console.log(status(await fs.pathExists(`${report.installed.targets.extensions}/oauth-router`), 'Installed oauth-router', `${report.installed.targets.extensions}`));
+  console.log(status(report.installed.agentsInstalled, 'Installed agents dir', report.installed.targets.agents));
+  console.log(status(report.installed.themesInstalled, 'Installed themes dir', report.installed.targets.themes));
+  console.log(status(await fs.pathExists(PI_MANIFEST_PATH), 'Pi install manifest', PI_MANIFEST_PATH));
+  console.log(status(report.piSubagents.declaredVersion !== null, 'pi-subagents dependency declared', report.piSubagents.declaredVersion || 'missing'));
+  console.log(status(report.piSubagents.localInstalled || report.piSubagents.globalInstalled, 'pi-subagents package available', report.piSubagents.localInstalled
+    ? `${report.piSubagents.localPackageJson}${report.piSubagents.localVersion ? ` (${report.piSubagents.localVersion})` : ''}`
+    : report.piSubagents.globalInstalled
+      ? `${report.piSubagents.globalPackageJson}${report.piSubagents.globalVersion ? ` (${report.piSubagents.globalVersion})` : ''}`
+      : 'missing'));
+  console.log(status(report.piSubagents.binaryInstalled, 'pi-subagents installer binary', report.piSubagents.binaryPath || 'missing'));
+  console.log(status(report.installed.routingPolicyPresent || report.project.routingPolicyPresent, 'Routing policy', report.project.routingPolicyPresent ? report.project.targets.routingPolicy : report.installed.targets.routingPolicy));
+  console.log(status(await fs.pathExists(SKILLS_ROOT), 'Installed skills root', SKILLS_ROOT));
+  console.log(status(await fs.pathExists(SKILLS_MANIFEST_PATH), 'Skills install manifest', SKILLS_MANIFEST_PATH));
+  console.log(status(storeReady, 'Global Takomi store', storeReady ? `${storeSkills.length} skills` : 'missing'));
+
+  console.log(pc.cyan('\nRecommendations\n'));
+
+  if (!report.pi.installed) {
+    console.log(pc.white('  - Install Pi first: npm install -g @mariozechner/pi-coding-agent'));
+  }
+
+  if (!report.bundled.packageIncluded) {
+    console.log(pc.white('  - Package .pi assets before enabling takomi install pi in releases.'));
+  }
+
+  if (!report.installed.runtimeInstalled || !report.installed.subagentsInstalled) {
+    console.log(pc.white('  - Run takomi install pi after the package-safe Pi asset layout is finalized.'));
+  }
+
+  if (!report.piSubagents.declaredVersion) {
+    console.log(pc.white('  - Add pi-subagents to takomi package dependencies so subagent support is bundled intentionally.'));
+  }
+
+  if (!report.piSubagents.localInstalled && !report.piSubagents.globalInstalled) {
+    console.log(pc.white('  - Install pi-subagents: npm install -g pi-subagents'));
+  }
+
+  if (!report.project.routingPolicyPresent && !report.installed.routingPolicyPresent) {
+    console.log(pc.white('  - Add a routing policy at .pi/takomi/model-routing.md when ready.'));
+  }
+
+  if (!await fs.pathExists(PI_MANIFEST_PATH) && report.installed.runtimeInstalled) {
+    console.log(pc.white('  - Re-run takomi install pi to write the Pi asset manifest.'));
+  }
+
+  if (!await fs.pathExists(SKILLS_ROOT)) {
+    console.log(pc.white('  - Run takomi install skills to install the bundled Takomi skills.'));
+  }
+
+  if (!storeReady) {
+    console.log(pc.white('  - Legacy global command center is not initialized. Run takomi install for current behavior.'));
+  }
+
+  console.log('');
+  return report;
+}