takomi 2.1.32 → 2.1.34

package/assets/.agent/skills/youtube-pipeline/resources/prompts/Video QA Prompt.md

@@ -0,0 +1,133 @@
+**You are "QA Hawk" — a ruthless YouTube video quality auditor.**
+
+Your job is to watch my video (or the intro section I provide) and tear it apart before my audience does. You are not here to be nice. You are here to catch every weakness, every boring moment, every missed opportunity.
+
+---
+
+### **WHAT I WILL PROVIDE:**
+
+I will give you one of the following:
+- **Full video file** (or link)
+- **Intro clip only** (first 30-60 seconds)
+- **Key timestamps to review**
+- **Screenshots at specific moments**
+
+I may also provide:
+- The **title and thumbnail** (for consistency check)
+- The **script** (to compare intent vs. execution)
+
+---
+
+### **YOUR FRAMEWORK: THE 5 AUDITS**
+
+Run the video through these 5 audits and report issues for each.
+
+---
+
+## **1. THE HOOK AUDIT (0:00 - 0:45)**
+*Reference: Phase 3 Hook Structure*
+
+| Check | Pass/Fail | Notes |
+|-------|-----------|-------|
+| **First Frame Match** — Does the first frame match the thumbnail? | | |
+| **Scroll Stopper** — Is the first line compelling enough to stop a scroll? | | |
+| **Stakes Clear** — Do I know what I lose by leaving within 10 seconds? | | |
+| **Input Bias** — Is there a credibility flex ("I spent X doing Y")? | | |
+| **Payoff Promise** — Do I know what I'll get by the end? | | |
+| **No Wasted Time** — Is there any rambling, logos, or "hey guys" before the hook? | | |
+
+**The 5-Second Test:** If I was scrolling YouTube, would I stop on this? Why or why not?
+
+---
+
+## **2. THE RETENTION AUDIT (Full Video)**
+*Reference: Phase 3 Loop Architecture + Phase 4 Dopamine Machine*
+
+| Check | Pass/Fail | Notes |
+|-------|-----------|-------|
+| **Screen Change Frequency** — Does the visual change every 3-5 seconds? | | |
+| **Pattern Interrupts** — Is there a drastic change every 45-60 seconds? | | |
+| **Open Loops** — Are there forward hooks that make me want to keep watching? | | |
+| **Dead Air** — Are there any gaps, pauses, or boring stretches? | | |
+| **Mid-Video Dip** — Is there a section where I would click away? Mark the timestamp. | | |
+| **Pacing** — Does it feel too slow, too rushed, or just right? | | |
+
+**The Boredom Timestamp:** At what exact moment did my attention first wander? Why?
+
+---
+
+## **3. THE VISUAL AUDIT**
+*Reference: Phase 4 Filming Protocol + Dopamine Machine*
+
+| Check | Pass/Fail | Notes |
+|-------|-----------|-------|
+| **Lighting** — Is the face well-lit without harsh shadows? | | |
+| **Audio** — Is it clean, clear, and close? Any echo or distortion? | | |
+| **Eye Contact** — Does the speaker maintain lens lock? | | |
+| **Energy** — Is the delivery 110% or does it feel flat? | | |
+| **B-Roll Quality** — Is the B-roll relevant and high quality? | | |
+| **Text/Graphics** — Are they clean, readable, and not overwhelming? | | |
+| **Thumbnail Consistency** — Does the video match the thumbnail promise? | | |
+
+---
+
+## **4. THE TITLE/THUMBNAIL SYNC AUDIT**
+*Reference: Phase 2 Synergy Check*
+
+| Check | Pass/Fail | Notes |
+|-------|-----------|-------|
+| **Title Delivered** — Does the video actually deliver on the title promise? | | |
+| **Thumbnail Payoff** — Is the thumbnail moment in the video? | | |
+| **No Bait-and-Switch** — Would a viewer feel misled? | | |
+| **Curiosity Closed** — Is the curiosity gap from the title fully answered? | | |
+
+---
+
+## **5. THE OUTRO AUDIT**
+*Reference: Phase 3 Outro Strategy*
+
+| Check | Pass/Fail | Notes |
+|-------|-----------|-------|
+| **No Signal Words** — Did I say "in conclusion," "that's it," or "thanks for watching"? | | |
+| **Bridge to Next Video** — Is there a clear CTA to a specific next video? | | |
+| **Open Loop Forward** — Does the outro create curiosity for the next video? | | |
+| **Hard vs. Soft CTA** — Which was used and was it appropriate? | | |
+
+---
+
+### **OUTPUT FORMAT**
+
+After auditing, provide:
+
+```
+🔴 CRITICAL ISSUES (Fix before upload)
+- [Issue 1]
+- [Issue 2]
+
+🟡 WARNINGS (Should fix, but not fatal)
+- [Issue 1]
+- [Issue 2]
+
+🟢 WINS (What's working well)
+- [Strength 1]
+- [Strength 2]
+
+📍 BOREDOM TIMESTAMPS
+- [Timestamp 1]: [Why attention dropped]
+- [Timestamp 2]: [Why attention dropped]
+
+🎯 FINAL VERDICT
+[SHIP IT / NEEDS WORK / DO NOT UPLOAD]
+
+Reason: [One sentence summary]
+```
+
+---
+
+### **ATTITUDE REMINDER**
+
+You are not my friend. You are my harshest critic. If the video is mid, say it's mid. If the intro is boring, say it's boring. If the hook is weak, roast it.
+
+Better I hear it from you than from the comments section.
+
+**NOW PROVIDE THE VIDEO/CLIP TO AUDIT:**

package/assets/.agent/skills/youtube-pipeline/resources/youtube-phase1-strategy.md

@@ -7,9 +7,9 @@ description: Phase 1 of YouTube Pipeline - The Strategy Engine (Ideation & Resea
 > **Your Role**: You are a brutal expert YouTube strategist. You generate ideas, challenge weak concepts, and demand proof. You teach the "why" behind every step. Never yes-man.
 
 ## Step 0: Load Source Knowledge
-Before starting, read the full phase document to get undiluted context:
+Before starting, read the full phase document to get undiluted context (packaged locally):
 ```
-View file: c:\CreativeOS\Creator_Command_Hub_Obsidian\📁 YouTube Brain\📂 Processed_Notes\Workflow\Phase 1.md
+View file: knowledge/Phase 1.md
 ```
 
 ## Step 1: Gather Context
@@ -19,7 +19,7 @@ Ask the user:
 3. **Target Audience**: "Who exactly watches you? Age, situation, pain points?"
 4. **Mode**: "Do you want me to drive (Guided) or do you want more control (Manual)?"
 
-If user has prior notes/summaries in the vault, reference them to pre-fill answers.
+If the user provides prior notes, summaries, or project context, use them to pre-fill answers. Do not depend on a private vault path.
 
 ## Step 2: The Outlier Hunt (AI-Driven)
 Based on their niche, **you generate** potential outlier directions:
@@ -67,10 +67,11 @@ Guide the user through this process to extract bulk data:
 4. **User Action**: Right-click → Copy → Copy outerHTML
 5. **User Action**: Paste into a `.html` file (e.g., `ai_coding.html`)
 6. **Agent Action**: Parse the file:
-```powershell
-# Parse YouTube Studio HTML export
-powershell -ExecutionPolicy Bypass -File "$env:USERPROFILE\.gemini\antigravity\skills\youtube-pipeline\scripts\parse_yt_studio.ps1" -InputFile "ai_coding.html" -OutputFile "parsed_topics.md"
-```
+```powershell
+# Parse YouTube Studio HTML export
+$SkillRoot = "<path-to-installed-youtube-pipeline-skill>"
+powershell -ExecutionPolicy Bypass -File (Join-Path $SkillRoot "scripts/parse_yt_studio.ps1") -InputFile "ai_coding.html" -OutputFile "parsed_topics.md"
+```
 
 **Repeat for each topic category** (e.g., "Claude AI", "VibeCoding", "Design System") to build comprehensive demand data.
 
@@ -118,17 +119,26 @@ Ask them to go to their top 3 outlier videos and pull:
 ### 4b. Google Trends Deep Dive
 Don't just glance at a trend line. Use Google Trends properly:
 
-**⚡ AUTOMATED (Agent Use - Preferred):**
-Use the `google-trends` skill for CLI-based searching:
-```powershell
-# Search YouTube trends for a keyword
-node "$env:USERPROFILE\.gemini\antigravity\skills\google-trends\scripts\search.js" -k "Claude Cowork" -p youtube -t "now 7-d" -o table
-
-# Search multiple keywords
-node "$env:USERPROFILE\.gemini\antigravity\skills\google-trends\scripts\search.js" -k "Vibe Coding" -p youtube
-node "$env:USERPROFILE\.gemini\antigravity\skills\google-trends\scripts\search.js" -k "AI coding" -p youtube
-node "$env:USERPROFILE\.gemini\antigravity\skills\google-trends\scripts\search.js" -k "Cursor IDE" -p youtube
-```
+**Automated Method (Bundled CLI):**
+Use the packaged Google Trends CLI in this skill:
+```powershell
+# First-time dependency install
+$SkillRoot = "<path-to-installed-youtube-pipeline-skill>"
+$TrendRoot = Join-Path $SkillRoot "scripts/google-trends"
+Push-Location $TrendRoot
+pnpm install
+Pop-Location
+
+# Search YouTube trends for a keyword
+node (Join-Path $SkillRoot "scripts/google-trends/search.js") -k "Claude Cowork" -p youtube -t "now 7-d" -o table
+
+# Search multiple keywords
+node (Join-Path $SkillRoot "scripts/google-trends/search.js") -k "Vibe Coding" -p youtube
+node (Join-Path $SkillRoot "scripts/google-trends/search.js") -k "AI coding" -p youtube
+node (Join-Path $SkillRoot "scripts/google-trends/search.js") -k "Cursor IDE" -p youtube
+```
+
+Do not assume a specific install root such as `~/.gemini`, `~/.codex`, `~/.agents`, or any private project folder. If Node dependencies are unavailable, use the manual method below.
 
 **Key Signals:**
 - `BREAKOUT` = 5000%+ growth = **GOLD**

package/assets/.agent/skills/youtube-pipeline/resources/youtube-phase2-packaging.md

@@ -7,9 +7,9 @@ description: Phase 2 of YouTube Pipeline - The Packaging Lab (Title & Thumbnail)
 > **Your Role**: You are a brutal expert YouTube strategist. You generate titles and thumbnail concepts. You critique ruthlessly. The packaging MUST be irresistible before we move to scripting.
 
 ## Step 0: Load Source Knowledge
-Before starting, read the full phase document:
+Before starting, read the full phase document (packaged locally):
 ```
-View file: c:\CreativeOS\Creator_Command_Hub_Obsidian\📁 YouTube Brain\📂 Processed_Notes\Workflow\Phase 2.md
+View file: knowledge/Phase 2.md
 ```
 
 Also recall the Phase 1 output:

package/assets/.agent/skills/youtube-pipeline/resources/youtube-phase3-scripting.md

@@ -7,9 +7,9 @@ description: Phase 3 of YouTube Pipeline - The Scripting Forge (Retention & Psyc
 > **Your Role**: You are a brutal expert YouTube scriptwriter. You draft hooks, structure loops, and write copy. Every sentence must build tension, provide value, or move the story forward. If it does neither, delete it.
 
 ## Step 0: Load Source Knowledge
-Before starting, read the full phase document:
+Before starting, read the full phase document (packaged locally):
 ```
-View file: c:\CreativeOS\Creator_Command_Hub_Obsidian\📁 YouTube Brain\📂 Processed_Notes\Workflow\Phase 3.md
+View file: knowledge/Phase 3.md
 ```
 
 Also recall Phase 1 & 2 outputs:

package/assets/.agent/skills/youtube-pipeline/resources/youtube-phase3.5-shorts.md

@@ -16,9 +16,9 @@ Run this **after Phase 3 (Scripting)** is complete, or during Phase 3 if you wan
 
 ## Step 0: Load Source Knowledge
 
-Read the Phase 3 source document to get the full scripting framework:
+Read the Phase 3 source document to get the full scripting framework (packaged locally):
 ```
-View file: c:\CreativeOS\Creator_Command_Hub_Obsidian\📁 YouTube Brain\📂 Processed_Notes\Workflow\Phase 3.md
+View file: knowledge/Phase 3.md
 ```
 
 This gives you access to:

package/assets/.agent/skills/youtube-pipeline/resources/youtube-phase4-production.md

@@ -7,9 +7,9 @@ description: Phase 4 of YouTube Pipeline - Production & Post-Production. Film, e
 > **Your Role**: You are a brutal expert video producer. You create filming checklists, editing guides, and quality control passes. The script provides value; the edit provides dopamine.
 
 ## Step 0: Load Source Knowledge
-Before starting, read the full phase document:
+Before starting, read the full phase document (packaged locally):
 ```
-View file: c:\CreativeOS\Creator_Command_Hub_Obsidian\📁 YouTube Brain\📂 Processed_Notes\Workflow\Phase 4.md
+View file: knowledge/Phase 4.md
 ```
 
 Also recall all previous outputs:

package/assets/.agent/skills/youtube-pipeline/resources/youtube-pipeline.md

@@ -124,21 +124,21 @@ Status: FULLY DISTRIBUTED
 ---
 
 ## Phase Workflow References
-Each phase has its own detailed workflow:
-- Phase 1: `c:\CreativeOS\Creator_Command_Hub_Obsidian\📁 YouTube Brain\.agent\workflows\youtube-phase1-strategy.md`
-- Phase 2: `c:\CreativeOS\Creator_Command_Hub_Obsidian\📁 YouTube Brain\.agent\workflows\youtube-phase2-packaging.md`
-- Phase 3: `c:\CreativeOS\Creator_Command_Hub_Obsidian\📁 YouTube Brain\.agent\workflows\youtube-phase3-scripting.md`
-- Phase 3.5: `c:\CreativeOS\Creator_Command_Hub_Obsidian\📁 YouTube Brain\.agent\workflows\youtube-phase3.5-shorts.md`
-- Phase 4: `c:\CreativeOS\Creator_Command_Hub_Obsidian\📁 YouTube Brain\.agent\workflows\youtube-phase4-production.md`
-- Phase 5: `c:\CreativeOS\Creator_Command_Hub_Obsidian\📁 YouTube Brain\.agent\workflows\youtube-phase5-repurposing.md`
-
-Each workflow also reads from source knowledge:
-- Source 1: `c:\CreativeOS\Creator_Command_Hub_Obsidian\📁 YouTube Brain\📂 Processed_Notes\Workflow\Phase 1.md`
-- Source 2: `c:\CreativeOS\Creator_Command_Hub_Obsidian\📁 YouTube Brain\📂 Processed_Notes\Workflow\Phase 2.md`
-- Source 3: `c:\CreativeOS\Creator_Command_Hub_Obsidian\📁 YouTube Brain\📂 Processed_Notes\Workflow\Phase 3.md`
-- Source 4: `c:\CreativeOS\Creator_Command_Hub_Obsidian\📁 YouTube Brain\📂 Processed_Notes\Workflow\Phase 4.md`
-- Research: `c:\CreativeOS\Creator_Command_Hub_Obsidian\📁 YouTube Brain\📂 Processed_Notes\Workflow\Research.md`
-- Repurposing: `c:\CreativeOS\Creator_Command_Hub_Obsidian\📁 YouTube Brain\📂 Processed_Notes\Workflow\Repurposing.md`
+Each phase has its own detailed workflow (packaged locally):
+- Phase 1: `youtube-phase1-strategy.md`
+- Phase 2: `youtube-phase2-packaging.md`
+- Phase 3: `youtube-phase3-scripting.md`
+- Phase 3.5: `youtube-phase3.5-shorts.md`
+- Phase 4: `youtube-phase4-production.md`
+- Phase 5: `youtube-phase5-repurposing.md`
+
+Each workflow also reads from local source knowledge:
+- Source 1: `knowledge/Phase 1.md`
+- Source 2: `knowledge/Phase 2.md`
+- Source 3: `knowledge/Phase 3.md`
+- Source 4: `knowledge/Phase 4.md`
+- Research: `knowledge/Research.md`
+- Repurposing: `knowledge/Repurposing.md`
 
 ---
 

package/assets/.agent/skills/youtube-pipeline/scripts/google-trends/package.json

@@ -0,0 +1,17 @@
+{
+  "name": "google-trends-cli",
+  "version": "1.0.0",
+  "description": "CLI for Google Trends research automation",
+  "main": "search.js",
+  "type": "module",
+  "scripts": {
+    "search": "node search.js"
+  },
+  "keywords": ["google-trends", "youtube", "research"],
+  "author": "J STAR FILMS",
+  "license": "MIT",
+  "dependencies": {
+    "commander": "^12.0.0",
+    "google-trends-api": "^4.9.2"
+  }
+}

package/assets/.agent/skills/youtube-pipeline/scripts/google-trends/pnpm-lock.yaml

@@ -0,0 +1,31 @@
+lockfileVersion: '9.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+importers:
+
+  .:
+    dependencies:
+      commander:
+        specifier: ^12.0.0
+        version: 12.1.0
+      google-trends-api:
+        specifier: ^4.9.2
+        version: 4.9.2
+
+packages:
+
+  commander@12.1.0:
+    resolution: {integrity: sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==}
+    engines: {node: '>=18'}
+
+  google-trends-api@4.9.2:
+    resolution: {integrity: sha512-gjVSHCM8B7LyAAUpXb4B0/TfnmpwQ2z1w/mQ2bL0AKpr2j3gLS1j2YOnifpfsGJRxAGXB/NoC+nGwC5qSnZIiA==}
+
+snapshots:
+
+  commander@12.1.0: {}
+
+  google-trends-api@4.9.2: {}

package/assets/.agent/skills/youtube-pipeline/scripts/google-trends/search.js

@@ -0,0 +1,168 @@
+#!/usr/bin/env node
+import { program } from 'commander';
+import googleTrends from 'google-trends-api';
+
+program
+    .name('search')
+    .description('Google Trends CLI for topic research')
+    .requiredOption('-k, --keyword <string>', 'Topic to search')
+    .option('-p, --property <string>', 'youtube | web | images | news | froogle', 'youtube')
+    .option('-t, --time <string>', 'Time range (now 7-d, now 1-m, today 3-m, today 12-m)', 'now 7-d')
+    .option('-c, --category <number>', 'Category ID (5 = Tech)', '5')
+    .option('-o, --output <string>', 'Output format: table | json | markdown', 'table')
+    .option('-f, --file <path>', 'Output file path')
+    .option('--interest', 'Include interest-over-time data', false)
+    .parse();
+
+const opts = program.opts();
+
+// Parse time range string to date
+function getStartTime(timeStr) {
+    const now = Date.now();
+    const match = timeStr.match(/^(now|today)\s+(\d+)-([dmy])$/);
+    if (!match) return new Date(now - 7 * 24 * 60 * 60 * 1000); // default 7 days
+
+    const [, , num, unit] = match;
+    const amount = parseInt(num, 10);
+    switch (unit) {
+        case 'd': return new Date(now - amount * 24 * 60 * 60 * 1000);
+        case 'm': return new Date(now - amount * 30 * 24 * 60 * 60 * 1000);
+        case 'y': return new Date(now - amount * 365 * 24 * 60 * 60 * 1000);
+        default: return new Date(now - 7 * 24 * 60 * 60 * 1000);
+    }
+}
+
+async function fetchRelatedQueries() {
+    const result = await googleTrends.relatedQueries({
+        keyword: opts.keyword,
+        startTime: getStartTime(opts.time),
+        property: opts.property === 'web' ? '' : opts.property,
+        category: parseInt(opts.category, 10),
+    });
+    return JSON.parse(result);
+}
+
+async function fetchInterestOverTime() {
+    if (!opts.interest) return null;
+    const result = await googleTrends.interestOverTime({
+        keyword: opts.keyword,
+        startTime: getStartTime(opts.time),
+        property: opts.property === 'web' ? '' : opts.property,
+        category: parseInt(opts.category, 10),
+    });
+    return JSON.parse(result);
+}
+
+function formatTable(data, interest) {
+    const lines = [];
+    lines.push(`\n[TrendProbe] Searching: "${opts.keyword}" on ${opts.property} (${opts.time})\n`);
+
+    const ranked = data?.default?.rankedList || [];
+    ranked.forEach((list, idx) => {
+        const label = idx === 0 ? 'Top' : 'Rising';
+        lines.push(`--- Related Queries (${label}) ---`);
+
+        (list.rankedKeyword || []).forEach((item, i) => {
+            const value = typeof item.value === 'string' ? item.value : item.value;
+            const display = item.formattedValue || (value === 'Breakout' ? 'BREAKOUT' : value);
+            lines.push(`${i + 1}. ${item.query} (${display})`);
+        });
+        lines.push('');
+    });
+
+    if (interest?.default?.timelineData) {
+        lines.push('--- Interest Over Time ---');
+        const timeline = interest.default.timelineData.slice(-7); // Last 7 data points
+        timeline.forEach(point => {
+            lines.push(`${point.formattedTime}: ${point.value[0]}`);
+        });
+        lines.push('');
+    }
+
+    return lines.join('\n');
+}
+
+function formatJSON(data, interest) {
+    const ranked = data?.default?.rankedList || [];
+    const result = {
+        keyword: opts.keyword,
+        property: opts.property,
+        time: opts.time,
+        category: opts.category,
+        top: (ranked[0]?.rankedKeyword || []).map(q => ({ query: q.query, value: q.value })),
+        rising: (ranked[1]?.rankedKeyword || []).map(q => ({ query: q.query, value: q.formattedValue || q.value })),
+    };
+    if (interest?.default?.timelineData) {
+        result.interest = interest.default.timelineData.map(p => ({ time: p.formattedTime, value: p.value[0] }));
+    }
+    return JSON.stringify(result, null, 2);
+}
+
+function formatMarkdown(data, interest) {
+    const lines = [];
+    lines.push(`## ${opts.keyword} (${opts.property}, ${opts.time})`);
+    lines.push('');
+
+    const ranked = data?.default?.rankedList || [];
+    if (ranked[0]?.rankedKeyword?.length) {
+        lines.push('### Top Queries');
+        ranked[0].rankedKeyword.forEach((q, i) => {
+            lines.push(`${i + 1}. ${q.query} (${q.value})`);
+        });
+        lines.push('');
+    }
+
+    if (ranked[1]?.rankedKeyword?.length) {
+        lines.push('### Rising Queries');
+        ranked[1].rankedKeyword.forEach((q, i) => {
+            const display = q.formattedValue || q.value;
+            lines.push(`${i + 1}. ${q.query} (${display})`);
+        });
+        lines.push('');
+    }
+
+    if (interest?.default?.timelineData) {
+        lines.push('### Interest Over Time');
+        interest.default.timelineData.slice(-7).forEach(p => {
+            lines.push(`- ${p.formattedTime}: ${p.value[0]}`);
+        });
+        lines.push('');
+    }
+
+    return lines.join('\n');
+}
+
+async function main() {
+    try {
+        const [relatedData, interestData] = await Promise.all([
+            fetchRelatedQueries(),
+            fetchInterestOverTime(),
+        ]);
+
+        let output;
+        switch (opts.output) {
+            case 'json':
+                output = formatJSON(relatedData, interestData);
+                break;
+            case 'markdown':
+                output = formatMarkdown(relatedData, interestData);
+                break;
+            default:
+                output = formatTable(relatedData, interestData);
+        }
+
+        console.log(output);
+
+        if (opts.file) {
+            const fs = await import('fs');
+            fs.writeFileSync(opts.file, output, 'utf-8');
+            console.log(`\n[Saved to ${opts.file}]`);
+        }
+
+    } catch (err) {
+        console.error('[Error]', err.message);
+        process.exit(1);
+    }
+}
+
+main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "takomi",
-  "version": "2.1.32",
+  "version": "2.1.34",
   "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": {

package/src/cli.js

@@ -43,7 +43,7 @@ import {
   isStoreInitialized,
 } from './store.js';
 import { runDoctor } from './doctor.js';
-import { ensurePiInstalled, ensurePiSubagentsInstalled, launchTakomiHarness, printPiInstallResult, printPiSubagentsInstallResult, updatePiManagedPackages, printPiManagedPackageUpdateResult } from './pi-harness.js';
+import { ensurePiInstalled, ensurePiSubagentsInstalled, launchTakomiHarness, printPiInstallResult, printPiSubagentsInstallResult, updatePiCliPackage, updatePiManagedPackages, printPiManagedPackageUpdateResult } from './pi-harness.js';
 import { installPiHarnessAssets, printPiInstallSummary, syncPiHarnessAssets, validatePiHarnessInstall } from './pi-installer.js';
 import { offerPiOptionalFeatures } from './pi-optional-features.js';
 import {
@@ -459,7 +459,7 @@ async function installPiTarget(options = {}) {
       console.log(pc.cyan('\n🧩 Optional Takomi Pi feature packs...\n'));
       await offerPiOptionalFeatures({ interactive: true });
     }
-    console.log(pc.cyan('\n📦 Checking Pi-managed package updates...\n'));
+    console.log(pc.cyan('\n📦 Checking Pi-managed extension package updates...\n'));
     printPiManagedPackageUpdateResult(await updatePiManagedPackages());
     console.log(pc.dim('\nNext: cd <project> && takomi\n'));
   } catch (error) {
@@ -474,7 +474,7 @@ async function installPiOptionalFeaturesTarget() {
   printPiInstallResult(pi);
   if (!pi.ok) return;
   await offerPiOptionalFeatures({ interactive: true });
-  console.log(pc.cyan('\n📦 Checking Pi-managed package updates...\n'));
+  console.log(pc.cyan('\n📦 Checking Pi-managed extension package updates...\n'));
   printPiManagedPackageUpdateResult(await updatePiManagedPackages());
 }
 
@@ -484,7 +484,7 @@ async function syncPiTarget() {
     const result = await syncPiHarnessAssets(program.version());
     const validation = await validatePiHarnessInstall();
     printPiInstallSummary(result, validation);
-    console.log(pc.cyan('\n📦 Checking Pi-managed package updates...\n'));
+    console.log(pc.cyan('\n📦 Checking Pi-managed extension package updates...\n'));
     printPiManagedPackageUpdateResult(await updatePiManagedPackages());
   } catch (error) {
     console.log(pc.red('\nPi sync failed.'));
@@ -558,6 +558,8 @@ async function upgrade(target = 'all') {
   }
 
   if (normalizedTarget === 'pi') {
+    console.log(pc.cyan('\n📦 Updating Pi CLI...\n'));
+    printPiInstallResult(await updatePiCliPackage());
     await installPiTarget({ offerOptionalFeatures: false });
     return;
   }
@@ -567,6 +569,8 @@ async function upgrade(target = 'all') {
     return;
   }
 
+  console.log(pc.cyan('\n📦 Updating Pi CLI...\n'));
+  printPiInstallResult(await updatePiCliPackage());
   await installAllTargets({ offerOptionalFeatures: false });
   console.log(pc.magenta('\n✨ Fully upgraded. Next: run `takomi` from your project.\n'));
 }
@@ -1141,8 +1145,13 @@ program
   .command('stats [view]')
   .description('Show Takomi token, model, project, session, tool, and subagent usage stats')
   .option('--json', 'Print machine-readable JSON')
+  .option('--full', 'Print the detailed debug-style stats view')
   .option('--home <path>', 'Override home directory for Pi history scanning')
   .option('--cwd <path>', 'Override project directory for project-local stats')
+  .option('--sessions-root <paths>', 'Additional session JSONL root(s), separated by ; on Windows or : on POSIX')
+  .option('--project-root <paths>', 'Discover project-local .pi/takomi and .pi/agent/sessions roots under these path(s)')
+  .option('--run-history <path>', 'Additional subagent run-history JSONL file')
+  .option('--stats-config <path>', 'Local stats config JSON file (defaults to ~/.takomi/stats.local.json, then .takomi-stats.local.json)')
   .option('--since <date|range>', 'Filter from YYYY-MM-DD or relative range like 7d, 4w, 3m')
   .option('--limit <n>', 'Rows per section', '8')
   .action((view, options) => printTakomiStats({ ...options, view, limit: Number(options.limit) || 8 }));