@nahisaho/shikigami 2.0.5 → 2.0.6

package/CHANGELOG.md

@@ -5,6 +5,24 @@ All notable changes to SHIKIGAMI will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.6] - 2026-05-18
+
+### Changed
+
+- **Coworkプラグインビルダーをゼロから再構築**
+  - 公式ドキュメント「プラグインをゼロからビルドする」に完全準拠
+  - ASKILL検証コード（ASKILL-M001〜P008）によるバリデーション
+  - コンパニオンファイルパス検証（隠しファイル、パストラバーサル、Windows予約名、安全文字チェック）
+  - Cowork用SKILL.md自動リライト（cowork.category, cowork.icon, metadata追加）
+  - パス参照の自動更新（統合後のreferences/パスに変換）
+  - Additional Resources セクション自動生成
+  - セキュリティ改善: execSync → execFileSync（シェルインジェクション防止）
+  - SKILL.md本文サイズ警告（3000語超で警告）
+  - 統合ファイルの5MB超過時チャンキング対応
+  - マニフェスト検証（GUID形式、重複folder、スキル数上限）
+  - クロスプラットフォーム互換性表示（GitHub Copilot CLI / VS Code / Claude Code / Gemini CLI）
+  - 参照: https://learn.microsoft.com/microsoft-365/copilot/cowork/cowork-plugin-development
+
 ## [2.0.5] - 2026-05-18
 
 ### Changed
@@ -16,6 +34,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - manifest.json自動生成、アイコン生成、スキル検証機能
   - Companionファイル20制限への自動統合（63ファイル→14ファイル等）
   - 参照: https://learn.microsoft.com/microsoft-365/copilot/cowork/cowork-plugin-development
+- **README.md全面刷新**
+  - インストールコマンド修正（`@nahisaho/shikigami`）
+  - 全19プロンプトをカテゴリ別に一覧化
+  - Agent Skills: npmパッケージ含有4スキルに正確化
+  - 50+コンサルティングフレームワーク一覧を追加
+  - アーキテクチャ図をv2.0.5に更新
+  - CLIコマンド一覧を追加
 
 ### Removed
 

package/README.md

@@ -1,90 +1,66 @@
 # SHIKIGAMI
 
-**GitHub Copilot Agent Skills for Deep Research & McKinsey Consulting**
+**GitHub Copilot Agent Skills for Deep Research & Consulting**
 
-マッキンゼーのコンサルティング手法（仮説駆動、MECE、ピラミッド原則、7Sフレームワーク等）を活用した深層リサーチ自動化Agent Skillsパッケージです。GitHub Copilot CLI と連携し、Copilot CLI の組み込み機能を活用しつつ、SHIKIGAMI独自のリサーチ・コンサルティング機能を提供します。
+50+のコンサルティングフレームワーク（SWOT、PEST、5Forces、BCG Matrix、ピラミッド原則等）を活用した深層リサーチ自動化Agent Skillsパッケージです。GitHub Copilot CLI と連携し、Copilot CLI の組み込み機能を活用しつつ、SHIKIGAMI独自のリサーチ・コンサルティング機能を提供します。
 
 ## 🎯 できること
 
-- **対話的目的探索**: ユーザーの表層的な依頼から「真の目的」を探索
-- **Deep Research**: WebResearcherパラダイムに基づく反復的深層リサーチ
-- **マッキンゼー・フレームワーク分析**: 仮説駆動、イシューツリー、7S、ピラミッド原則等を適用
-- **高品質レポート生成**: ハルシネーション防止、ソース追跡、引用管理
+- **対話的目的探索**: ユーザーの表層的な依頼から「真の目的」を5 Whys/JTBDで探索
+- **Deep Research**: Think→Report→Actionサイクルに基づく反復的深層リサーチ
+- **コンサルティング・フレームワーク分析**: 50+フレームワーク（SWOT、PEST、5Forces、BCG Matrix、7S、ピラミッド原則等）を適用
+- **高品質レポート生成**: ハルシネーション防止、ソース追跡、引用管理、Qiita記事対応
 - **マルチポップ探索**: リサーチ中の分岐点を自動検出し、複数パスを同時探索
 - **ベクトル検索**: 過去のリサーチ資産をセマンティック検索で再利用
-- **品質検証ループ**: Build→Type→Lint→Test→Security→Diff の6フェーズ検証
+- **Copilot Cowork連携**: M365 Copilot Coworkプラグインとしてエクスポート可能
 
 ## 📦 インストール
 
 ```bash
-npm install @nahisaho/shikigami-mck
+npm install @nahisaho/shikigami
+npx shikigami init
 ```
 
-または、リポジトリをクローン:
+セットアップ後:
 
 ```bash
-git clone https://github.com/nahisaho/SHIKIGAMI.git
+cd mcp-server && npm install && npm run build
 ```
 
 ## 🏗️ アーキテクチャ
 
-SHIKIGAMI v2.0.0 は GitHub Copilot CLI の組み込み機能を最大限活用する設計に移行しました。
-
 ```
 ┌─────────────────────────────────────────────────┐
 │              GitHub Copilot CLI                  │
 │  web_search / web_fetch / store_memory / grep   │
 │  explore / research / rubber-duck agents        │
-│  /session / /context / /compact                 │
 ├─────────────────────────────────────────────────┤
-│              SHIKIGAMI v2.0.0                    │
+│              SHIKIGAMI v2.0.6                    │
 │  ┌──────────────┐  ┌───────────────────────┐    │
 │  │ Agent Skills  │  │ MCP Server (10 tools) │    │
-│  │ (15 skills)   │  │ embed / similarity    │    │
+│  │ (4 skills)    │  │ embed / similarity    │    │
 │  │               │  │ semantic_search       │    │
-│  │ Research      │  │ branch_detect/eval/   │    │
-│  │ Consulting    │  │   select              │    │
-│  │ Quality       │  │ set/get_project       │    │
-│  │ MUSUBIX SDD   │  │ save_prompt/research  │    │
-│  └──────────────┘  └───────────────────────┘    │
+│  │ Planner       │  │ branch_detect/eval/   │    │
+│  │ Deep Research │  │   select              │    │
+│  │ Framework     │  │ set/get_project       │    │
+│  │ Writing       │  │ save_prompt/research  │    │
+│  ├──────────────┤  └───────────────────────┘    │
+│  │ 19 Prompts   │                               │
+│  └──────────────┘                               │
+├─────────────────────────────────────────────────┤
+│           Copilot Cowork Plugin (.zip)           │
+│  npx shikigami cowork で M365 プラグイン生成     │
 └─────────────────────────────────────────────────┘
 ```
 
-## 🔧 Agent Skills（15スキル）
-
-### リサーチ・コンサルティング
+## 🔧 Agent Skills（4スキル）
 
 | スキル | 説明 |
 |--------|------|
 | `shikigami-planner` | 対話的目的探索・5 Whys・JTBD・リサーチ計画立案 |
 | `shikigami-deep-research` | Think→Report→Actionサイクルの反復的深層リサーチ |
-| `shikigami-consulting-framework` | マッキンゼー・フレームワーク分析（仮説駆動・7S・ピラミッド原則等） |
-| `shikigami-writing` | レポート生成・ハルシネーション検出・引用管理 |
-
-### 品質・検証
-
-| スキル | 説明 |
-|--------|------|
-| `build-fix` | ビルドエラーを分類・反復修正（TypeScript/ESLint/依存関係） |
-| `checkpoint` | セーフポイントの作成・復元・比較（Git統合） |
-| `e2e-runner` | Playwrightを使用したE2Eテスト生成・実行 |
-| `eval-harness` | pass@kメトリクスでAIコード生成品質を評価 |
-| `verification-loop` | Build→Type→Lint→Test→Security→Diff の6フェーズ検証 |
-
-### MUSUBIX SDD
-
-| スキル | 説明 |
-|--------|------|
-| `musubix-sdd-workflow` | 10憲法条項に従った仕様駆動開発ガイド |
-| `musubix-domain-inference` | 自動ドメイン検出・コンポーネント推論 |
-| `musubix-code-generation` | 設計仕様からのコード生成 |
-| `musubix-test-generation` | TDD/BDDによるテスト生成 |
-| `musubix-adr-generation` | Architecture Decision Records作成 |
-| `musubix-best-practices` | 学習済み17ベストプラクティスガイド |
-| `musubix-c4-design` | C4モデル設計ドキュメント作成 |
-| `musubix-technical-writing` | 技術ドキュメント作成 |
-| `musubix-ears-validation` | EARS形式要件の検証・作成 |
-| `musubix-traceability` | 要件・設計・コード・テスト間のトレーサビリティ管理 |
+| `shikigami-consulting-framework` | 50+コンサルティングフレームワーク分析 |
+| `shikigami-writing` | レポート生成・ハルシネーション検出・引用管理・Qiita対応 |
 
 ## 🔌 MCP Server（10ツール）
 
@@ -100,112 +76,72 @@ SHIKIGAMI v2.0.0 は GitHub Copilot CLI の組み込み機能を最大限活用
 | `branch_evaluate` | 分岐パスのスコアリング・評価 |
 | `branch_select` | 最適な探索パスの選択 |
 
-## 📝 Prompts
+## 📝 Prompts（19プロンプト）
+
+### コア
 
 | プロンプト | 説明 |
 |-----------|------|
+| `shikigami-full-research` | 統合リサーチ（Planner→Research→Framework→Writing） |
 | `shikigami-purpose-discovery` | 目的探索を開始 |
 | `shikigami-deep-research` | Deep Researchを実行 |
-| `shikigami-framework-analysis` | マッキンゼーフレームワーク分析を実行 |
-| `shikigami-report-writing` | ピラミッド原則に基づくレポートを生成 |
-| `shikigami-full-research` | 統合リサーチを実行 |
-
-## 📚 マッキンゼー・フレームワーク一覧
-
-### 問題解決・仮説思考
-| フレームワーク | 説明 |
-|--------------|------|
-| **仮説駆動アプローチ** | 仮説を立て、検証し、結論を導く問題解決手法 |
-| **イシューツリー** | 問題をMECEに分解し、解決の優先順位を明確化 |
-| **ピラミッド原則** | 結論先行で論理的にコミュニケーション（Barbara Minto） |
-| **MECE** | 漏れなくダブりなく整理 |
-
-### 組織・戦略
-| フレームワーク | 説明 |
-|--------------|------|
-| **マッキンゼーの7S** | 組織の7要素（Strategy, Structure, Systems, Shared Values, Style, Staff, Skills）の整合性分析 |
-| **3つの地平線** | 短期（H1）・中期（H2）・長期（H3）の成長を同時管理 |
-| **成長のグラニュラリティ** | 成長を詳細に分解して真の成長源を特定 |
-
-### 業績改善
-| フレームワーク | 説明 |
-|--------------|------|
-| **間接費価値分析（OVA）** | 間接部門のコストと価値を分析し最適化 |
-| **プロフィットプール分析** | バリューチェーン全体の利益分布を可視化 |
-| **SCP分析** | 産業構造→企業行動→業績の因果関係を分析 |
-
-## 🔄 マッキンゼー式ワークフロー
+| `shikigami-framework-analysis` | フレームワーク分析を実行 |
+| `shikigami-report-writing` | レポートを生成 |
 
-```mermaid
-flowchart TB
-    subgraph Phase1["Phase 1: 問題定義"]
-        P1A[クライアントの真の課題特定] --> P1B[成功の定義]
-        P1B --> P1C[スコープと制約の確認]
-    end
-    
-    subgraph Phase2["Phase 2: 仮説構築"]
-        P2A[初期仮説の設定] --> P2B[支持論拠の整理]
-        P2B --> P2C[反証可能な形式で表現]
-    end
-    
-    subgraph Phase3["Phase 3: イシュー分解"]
-        P3A[イシューツリー作成] --> P3B[優先順位付け]
-        P3B --> P3C[分析計画策定]
-    end
-    
-    subgraph Phase4["Phase 4: データ収集・分析"]
-        P4A[定量・定性データ収集] --> P4B[80/20分析]
-        P4B --> P4C[So What?で洞察抽出]
-    end
-    
-    subgraph Phase5["Phase 5: 統合・提言"]
-        P5A[ピラミッド原則で構造化] --> P5B[アクションプラン策定]
-        P5B --> P5C[インパクト評価]
-    end
-    
-    Phase1 --> Phase2
-    Phase2 --> Phase3
-    Phase3 --> Phase4
-    Phase4 --> Phase5
-```
+### 分析・評価
 
-## 🚀 使用例
+| プロンプト | 説明 |
+|-----------|------|
+| `shikigami-swot-generation` | SWOT分析を生成 |
+| `shikigami-matching-analysis` | マッチング分析（適合性評価） |
+| `shikigami-financial-analysis` | 財務分析 |
+| `shikigami-comparison-table` | 比較表の生成 |
+| `shikigami-trend-visualization` | トレンド可視化 |
 
-### 例1: 成長戦略の検討
+### 品質・検証
 
-```
-ユーザー: 「新規事業の方向性を検討したい」
+| プロンプト | 説明 |
+|-----------|------|
+| `shikigami-source-critique` | ソース信頼性の批評的評価 |
+| `shikigami-risk-sensitivity` | リスク感度分析 |
+| `shikigami-stakeholder-impact` | ステークホルダー影響分析 |
+| `shikigami-consistency-check` | 整合性チェック |
+| `shikigami-phase-gate` | フェーズゲート（品質関門）レビュー |
+| `shikigami-citation-formatter` | 引用フォーマット整形 |
+| `shikigami-executive-sync` | エグゼクティブ向け要約 |
 
-SHIKIGAMI:
-1. [Planner] 「成長の目標は何ですか？」→ 真の目的を探索
-2. [Deep Research] 市場情報を仮説駆動で収集（web_search / web_fetch 活用）
-3. [Framework] 3つの地平線、成長のグラニュラリティを適用
-4. [Writing] ピラミッド原則で構造化した提言レポートを生成
-```
+### 出力
 
-### 例2: 組織変革の診断
+| プロンプト | 説明 |
+|-----------|------|
+| `shikigami-qiita-article` | Qiita記事形式で出力 |
+| `shikigami-manifest` | リサーチマニフェスト生成 |
 
-```
-ユーザー: 「組織の問題点を分析して」
+## 📚 コンサルティング・フレームワーク一覧（50+）
 
-SHIKIGAMI:
-1. [Planner] 変革の目的・成功基準を確認
-2. [Deep Research] 組織情報を収集
-3. [Framework] マッキンゼーの7Sで整合性を分析
-4. [Writing] イシューツリーで課題を構造化したレポートを生成
-```
+### 戦略分析
+SWOT、PEST、5Forces、3C、BCG Matrix、GE Matrix、Ansoff Matrix、Blue Ocean、VRIO、Value Chain
 
-### 例3: コスト削減プロジェクト
+### マーケティング
+4P、4C、STP、AIDMA/AISAS、Customer Journey、Persona、Positioning Map
 
-```
-ユーザー: 「間接費を削減したい」
+### 問題解決
+MECE、5 Whys、Issue Tree、Logic Tree、Fishbone、As-Is/To-Be
 
-SHIKIGAMI:
-1. [Planner] 削減目標・制約を確認
-2. [Deep Research] 間接部門の機能・コストを調査
-3. [Framework] OVA（間接費価値分析）を適用
-4. [Writing] 優先順位付きの削減提言レポートを生成
-```
+### 組織・プロセス
+7S、RACI、PDCA、OODA、ECRS
+
+### イノベーション
+Business Model Canvas、Lean Canvas、Design Thinking、SCAMPER、TAM/SAM/SOM、AARRR、Value Proposition Canvas
+
+### 意思決定
+Decision Matrix、Cost-Benefit、Risk Matrix、Pros-Cons
+
+### 思考フレームワーク
+Pyramid Principle、So What/Why So、PREP
+
+### PwC固有
+BXT、Strategy&、Fit for Growth、Digital Maturity、ESG Integration、Three Lines of Defense、TIMM
 
 ## 🤝 Microsoft 365 Copilot Cowork 連携
 
@@ -226,6 +162,47 @@ npx shikigami cowork --out ./dist
 
 **参照**: [Cowork Plugin Development](https://learn.microsoft.com/microsoft-365/copilot/cowork/cowork-plugin-development)
 
+## 🚀 CLI コマンド
+
+```bash
+npx shikigami init                  # SHIKIGAMIファイルを初期化
+npx shikigami upgrade               # 最新版にアップグレード
+npx shikigami cowork                # Coworkプラグインをビルド
+npx shikigami new [name]            # 新規リサーチプロジェクト作成
+npx shikigami find-related [keyword] # 関連プロジェクト検索
+npx shikigami inherit [options]     # 過去レポートからナレッジ継承
+```
+
+## 🔄 リサーチワークフロー
+
+```mermaid
+flowchart TB
+    subgraph Phase1["Phase 1: 目的探索"]
+        P1A[ユーザーの依頼] --> P1B[5 Whys / JTBD で真の目的を発見]
+        P1B --> P1C[リサーチ計画策定]
+    end
+    
+    subgraph Phase2["Phase 2: Deep Research"]
+        P2A[Think: 仮説構築] --> P2B[Report: 情報収集・検証]
+        P2B --> P2C[Action: 次のリサーチ方向決定]
+        P2C --> P2A
+    end
+    
+    subgraph Phase3["Phase 3: フレームワーク分析"]
+        P3A[適切なフレームワーク選定] --> P3B[50+フレームワークから分析実行]
+        P3B --> P3C[洞察の抽出・統合]
+    end
+    
+    subgraph Phase4["Phase 4: レポート生成"]
+        P4A[ハルシネーション検証] --> P4B[引用・ソース管理]
+        P4B --> P4C[構造化レポート出力]
+    end
+    
+    Phase1 --> Phase2
+    Phase2 --> Phase3
+    Phase3 --> Phase4
+```
+
 ## 📄 ライセンス
 
 MIT License

package/mcp-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nahisaho/shikigami-pwc-mcp-server",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "SHIKIGAMI-PwC MCP Server - Deep Research tools with PwC Consulting Frameworks",
   "type": "module",
   "main": "dist/index.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nahisaho/shikigami",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "GitHub Copilot Agent Skills for Deep Research & Consulting - AI-Powered Research Assistant with 50+ Consulting Frameworks",
   "keywords": [
     "github-copilot",

package/scripts/build-cowork-plugin.js

@@ -3,7 +3,7 @@
  * SHIKIGAMI Cowork Plugin Builder
  * 
  * Builds a Microsoft 365 Copilot Cowork plugin package (.zip)
- * from SHIKIGAMI's Agent Skills.
+ * from SHIKIGAMI's Agent Skills following the official "Build from scratch" guide.
  * 
  * Usage: npx shikigami cowork [options]
  *   --out <dir>     Output directory (default: ./dist)
@@ -11,11 +11,14 @@
  *   --help          Show help
  * 
  * Reference: https://learn.microsoft.com/microsoft-365/copilot/cowork/cowork-plugin-development
+ * 
+ * Cross-platform: The same SKILL.md files work in GitHub Copilot CLI,
+ * VS Code Copilot, Claude Code, Gemini CLI, and Copilot Cowork.
  */
 
 const fs = require('fs');
 const path = require('path');
-const { execSync } = require('child_process');
+const { execFileSync } = require('child_process');
 
 // ── Constants ──────────────────────────────────────────────────────────────
 
@@ -23,16 +26,32 @@ const MAX_COMPANIONS_PER_SKILL = 20;
 const MAX_COMPANION_SIZE = 5 * 1024 * 1024; // 5 MB
 const MAX_COMPANION_TOTAL = 10 * 1024 * 1024; // 10 MB per skill
 const MAX_SKILLS = 20;
+const MAX_FOLDER_PATH = 256;
+const RECOMMENDED_BODY_WORDS = 3000;
 
 const PACKAGE_NAME = 'com.nahisaho.shikigami';
-const APP_ID = 'a1b2c3d4-e5f6-4a7b-8c9d-0e1f2a3b4c5d'; // Stable GUID
+const APP_ID = 'a1b2c3d4-e5f6-4a7b-8c9d-0e1f2a3b4c5d';
 const ACCENT_COLOR = '#6B46C1';
 
-// ── Minimal PNG generators (no dependencies) ──────────────────────────────
+const WINDOWS_RESERVED = new Set([
+  'CON', 'PRN', 'AUX', 'NUL',
+  'COM1', 'COM2', 'COM3', 'COM4', 'COM5', 'COM6', 'COM7', 'COM8', 'COM9',
+  'LPT1', 'LPT2', 'LPT3', 'LPT4', 'LPT5', 'LPT6', 'LPT7', 'LPT8', 'LPT9',
+]);
+
+const SAFE_FILENAME_RE = /^[a-zA-Z0-9\-_. !]+$/;
+
+// Cowork-specific frontmatter defaults per skill
+const COWORK_DEFAULTS = {
+  'shikigami-planner': { category: 'Research', icon: 'Lightbulb' },
+  'shikigami-deep-research': { category: 'Research', icon: 'Search' },
+  'shikigami-consulting-framework': { category: 'Analysis', icon: 'Briefcase' },
+  'shikigami-writing': { category: 'Writing', icon: 'DocumentBulletList' },
+};
+
+// ── Minimal PNG generator (no dependencies) ───────────────────────────────
 
 function createMinimalPNG(width, height, r, g, b) {
-  // Creates a minimal valid PNG with a solid color
-  // PNG signature
   const signature = Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]);
 
   function crc32(buf) {
@@ -53,26 +72,20 @@ function createMinimalPNG(width, height, r, g, b) {
     const len = Buffer.alloc(4);
     len.writeUInt32BE(data.length);
     const typeAndData = Buffer.concat([Buffer.from(type), data]);
-    const crc = Buffer.alloc(4);
-    crc.writeUInt32BE(crc32(typeAndData));
-    return Buffer.concat([len, typeAndData, crc]);
+    const crcBuf = Buffer.alloc(4);
+    crcBuf.writeUInt32BE(crc32(typeAndData));
+    return Buffer.concat([len, typeAndData, crcBuf]);
   }
 
-  // IHDR
   const ihdr = Buffer.alloc(13);
   ihdr.writeUInt32BE(width, 0);
   ihdr.writeUInt32BE(height, 4);
-  ihdr[8] = 8; // bit depth
-  ihdr[9] = 2; // color type RGB
-  ihdr[10] = 0; // compression
-  ihdr[11] = 0; // filter
-  ihdr[12] = 0; // interlace
-
-  // IDAT - raw image data
-  const rowSize = 1 + width * 3; // filter byte + RGB per pixel
+  ihdr[8] = 8; ihdr[9] = 2; ihdr[10] = 0; ihdr[11] = 0; ihdr[12] = 0;
+
+  const rowSize = 1 + width * 3;
   const rawData = Buffer.alloc(rowSize * height);
   for (let y = 0; y < height; y++) {
-    rawData[y * rowSize] = 0; // no filter
+    rawData[y * rowSize] = 0;
     for (let x = 0; x < width; x++) {
       const offset = y * rowSize + 1 + x * 3;
       rawData[offset] = r;
@@ -84,18 +97,15 @@ function createMinimalPNG(width, height, r, g, b) {
   const zlib = require('zlib');
   const compressed = zlib.deflateSync(rawData);
 
-  // IEND
-  const iend = Buffer.alloc(0);
-
   return Buffer.concat([
     signature,
     makeChunk('IHDR', ihdr),
     makeChunk('IDAT', compressed),
-    makeChunk('IEND', iend),
+    makeChunk('IEND', Buffer.alloc(0)),
   ]);
 }
 
-// ── SKILL.md Parser ────────────────────────────────────────────────────────
+// ── YAML Frontmatter Parser ───────────────────────────────────────────────
 
 function parseFrontmatter(content) {
   const match = content.match(/^---\n([\s\S]*?)\n---/);
@@ -103,58 +113,123 @@ function parseFrontmatter(content) {
 
   const yaml = match[1];
   const result = {};
-
-  // Simple YAML parser for frontmatter fields
   let currentKey = null;
-  let blockValue = [];
+  let blockLines = [];
   let inBlock = false;
+  let currentIndent = 0;
+  let mapKey = null;
+  let mapObj = null;
+
+  function flushBlock() {
+    if (inBlock && currentKey) {
+      result[currentKey] = blockLines.join('\n').trim();
+      inBlock = false;
+      blockLines = [];
+    }
+    if (mapKey && mapObj) {
+      result[mapKey] = mapObj;
+      mapKey = null;
+      mapObj = null;
+    }
+  }
 
   for (const line of yaml.split('\n')) {
+    // Handle block scalar continuation
     if (inBlock) {
       if (line.match(/^\s{2,}/) || line.trim() === '') {
-        blockValue.push(line.replace(/^\s{2}/, ''));
+        blockLines.push(line.replace(/^\s{2}/, ''));
         continue;
       } else {
-        result[currentKey] = blockValue.join('\n').trim();
-        inBlock = false;
+        flushBlock();
+      }
+    }
+
+    // Handle map continuation (metadata:, cowork: style)
+    if (mapKey && line.match(/^\s{2,}\w/)) {
+      const kvMatch = line.trim().match(/^(\w[\w.-]*)\s*:\s*(.*)/);
+      if (kvMatch) {
+        mapObj[kvMatch[1]] = kvMatch[2].trim().replace(/^["']|["']$/g, '');
+        continue;
       }
+    } else if (mapKey) {
+      flushBlock();
     }
 
+    // Top-level key: value
     const kvMatch = line.match(/^(\w[\w.-]*)\s*:\s*(.*)/);
     if (kvMatch) {
       currentKey = kvMatch[1];
       const value = kvMatch[2].trim();
       if (value === '|' || value === '>') {
         inBlock = true;
-        blockValue = [];
+        blockLines = [];
+      } else if (value === '') {
+        // Could be a map start (metadata:, cowork:)
+        mapKey = currentKey;
+        mapObj = {};
       } else {
         result[currentKey] = value.replace(/^["']|["']$/g, '');
       }
     }
   }
 
-  if (inBlock && currentKey) {
-    result[currentKey] = blockValue.join('\n').trim();
+  flushBlock();
+  return result;
+}
+
+function extractBody(content) {
+  const match = content.match(/^---\n[\s\S]*?\n---\n([\s\S]*)/);
+  return match ? match[1].trim() : content;
+}
+
+// ── Companion File Path Validation ────────────────────────────────────────
+
+function validateCompanionPath(relPath) {
+  const errors = [];
+  const parts = relPath.split('/');
+
+  // No absolute paths
+  if (path.isAbsolute(relPath)) {
+    errors.push(`Absolute path not allowed: ${relPath}`);
+  }
+  // No path traversal
+  if (parts.includes('..')) {
+    errors.push(`Path traversal (..) not allowed: ${relPath}`);
+  }
+  // No backslashes or null bytes
+  if (relPath.includes('\\') || relPath.includes('\0')) {
+    errors.push(`Backslash or null byte in path: ${relPath}`);
+  }
+
+  for (const part of parts) {
+    // No hidden files
+    if (part.startsWith('.')) {
+      errors.push(`Hidden file not allowed: ${relPath}`);
+    }
+    // No Windows reserved names
+    const baseName = part.replace(/\.[^.]*$/, '').toUpperCase();
+    if (WINDOWS_RESERVED.has(baseName)) {
+      errors.push(`Windows reserved name: ${part} in ${relPath}`);
+    }
+    // Safe characters only
+    if (!SAFE_FILENAME_RE.test(part)) {
+      errors.push(`Unsafe characters in filename: ${part} in ${relPath}`);
+    }
   }
 
-  return result;
+  return errors;
 }
 
-// ── Companion File Consolidation ───────────────────────────────────────────
+// ── Companion File Consolidation ──────────────────────────────────────────
 
-function consolidateCompanions(skillDir, skillName) {
-  /**
-   * If a skill has more than MAX_COMPANIONS_PER_SKILL companion files,
-   * consolidate them into category-level reference files.
-   * Returns an array of { relativePath, content } for the consolidated files.
-   */
-  const files = [];
+function discoverCompanions(skillDir) {
   const allFiles = [];
 
   function walkDir(dir, prefix) {
     if (!fs.existsSync(dir)) return;
     const entries = fs.readdirSync(dir, { withFileTypes: true });
     for (const entry of entries) {
+      if (entry.name.startsWith('.')) continue; // skip hidden
       const fullPath = path.join(dir, entry.name);
       const relPath = prefix ? `${prefix}/${entry.name}` : entry.name;
       if (entry.isDirectory()) {
@@ -166,46 +241,63 @@ function consolidateCompanions(skillDir, skillName) {
   }
 
   walkDir(skillDir, '');
+  return allFiles;
+}
 
+function consolidateCompanions(allFiles, skillName) {
   if (allFiles.length <= MAX_COMPANIONS_PER_SKILL) {
-    // No consolidation needed - return original files
     return allFiles.map(f => ({
       relativePath: f.relPath,
       content: fs.readFileSync(f.fullPath),
     }));
   }
 
+  const files = [];
+
   // Group by top-level directory
-  const groups = {};
+  const topGroups = {};
   for (const f of allFiles) {
-    const parts = f.relPath.split('/');
-    const topDir = parts.length > 1 ? parts[0] : '_root';
-    const subDir = parts.length > 2 ? parts.slice(0, 2).join('/') : topDir;
-    if (!groups[subDir]) groups[subDir] = [];
-    groups[subDir].push(f);
+    const topDir = f.relPath.split('/')[0] || '_root';
+    if (!topGroups[topDir]) topGroups[topDir] = [];
+    topGroups[topDir].push(f);
   }
 
-  // If groups are still too many, merge into top-level categories
-  if (Object.keys(groups).length > MAX_COMPANIONS_PER_SKILL) {
-    const topGroups = {};
-    for (const f of allFiles) {
-      const topDir = f.relPath.split('/')[0] || '_root';
-      if (!topGroups[topDir]) topGroups[topDir] = [];
-      topGroups[topDir].push(f);
+  for (const [dir, dirFiles] of Object.entries(topGroups)) {
+    if (dir === '_root') {
+      for (const f of dirFiles) {
+        files.push({
+          relativePath: f.relPath,
+          content: fs.readFileSync(f.fullPath),
+        });
+      }
+      continue;
     }
 
-    for (const [dir, dirFiles] of Object.entries(topGroups)) {
-      if (dir === '_root') {
-        for (const f of dirFiles) {
-          files.push({
-            relativePath: f.relPath,
-            content: fs.readFileSync(f.fullPath),
-          });
+    // Check if sub-directory grouping keeps within limits
+    const subGroups = {};
+    for (const f of dirFiles) {
+      const parts = f.relPath.split('/');
+      const subKey = parts.length > 1 ? parts[1] : '_direct';
+      if (!subGroups[subKey]) subGroups[subKey] = [];
+      subGroups[subKey].push(f);
+    }
+
+    // If sub-grouping fits, use it; otherwise consolidate entire directory
+    if (Object.keys(subGroups).length <= MAX_COMPANIONS_PER_SKILL - files.length) {
+      for (const [sub, subFiles] of Object.entries(subGroups)) {
+        let consolidated = `# ${dir}/${sub}\n\nConsolidated reference for ${skillName}.\n\n`;
+        for (const f of subFiles) {
+          const content = fs.readFileSync(f.fullPath, 'utf-8');
+          const basename = path.basename(f.name, path.extname(f.name));
+          consolidated += `---\n\n## ${basename}\n\n${content}\n\n`;
         }
-        continue;
+        files.push({
+          relativePath: `references/${dir}-${sub}.md`,
+          content: Buffer.from(consolidated, 'utf-8'),
+        });
       }
-
-      // Consolidate all files under this dir into one reference file
+    } else {
+      // Consolidate entire top-level directory into one file
       let consolidated = `# ${dir}\n\nConsolidated reference for ${skillName}.\n\n`;
       for (const f of dirFiles) {
         const content = fs.readFileSync(f.fullPath, 'utf-8');
@@ -213,52 +305,119 @@ function consolidateCompanions(skillDir, skillName) {
         consolidated += `---\n\n## ${basename}\n\n${content}\n\n`;
       }
 
-      files.push({
-        relativePath: `references/${dir}.md`,
-        content: Buffer.from(consolidated, 'utf-8'),
-      });
-    }
-  } else {
-    // Consolidate sub-directories into category files
-    for (const [subDir, subFiles] of Object.entries(groups)) {
-      if (subDir === '_root' || subFiles.length <= 1) {
-        for (const f of subFiles) {
+      const consolidatedBuf = Buffer.from(consolidated, 'utf-8');
+
+      // Chunk if exceeds 5MB
+      if (consolidatedBuf.length > MAX_COMPANION_SIZE) {
+        const lines = consolidated.split('\n');
+        let chunk = [];
+        let chunkSize = 0;
+        let chunkIdx = 1;
+        for (const line of lines) {
+          const lineSize = Buffer.byteLength(line + '\n', 'utf-8');
+          if (chunkSize + lineSize > MAX_COMPANION_SIZE * 0.9 && chunk.length > 0) {
+            files.push({
+              relativePath: `references/${dir}-${String(chunkIdx).padStart(2, '0')}.md`,
+              content: Buffer.from(chunk.join('\n'), 'utf-8'),
+            });
+            chunk = [];
+            chunkSize = 0;
+            chunkIdx++;
+          }
+          chunk.push(line);
+          chunkSize += lineSize;
+        }
+        if (chunk.length > 0) {
           files.push({
-            relativePath: f.relPath,
-            content: fs.readFileSync(f.fullPath),
+            relativePath: `references/${dir}-${String(chunkIdx).padStart(2, '0')}.md`,
+            content: Buffer.from(chunk.join('\n'), 'utf-8'),
           });
         }
-        continue;
+      } else {
+        files.push({
+          relativePath: `references/${dir}.md`,
+          content: consolidatedBuf,
+        });
       }
+    }
+  }
 
-      let consolidated = `# ${subDir}\n\n`;
-      for (const f of subFiles) {
-        const content = fs.readFileSync(f.fullPath, 'utf-8');
-        const basename = path.basename(f.name, path.extname(f.name));
-        consolidated += `---\n\n## ${basename}\n\n${content}\n\n`;
+  return files;
+}
+
+// ── SKILL.md Rewriter for Cowork ──────────────────────────────────────────
+
+function rewriteSkillMdForCowork(content, originalCompanions, packagedCompanions, skillName) {
+  /**
+   * Creates a Cowork-compatible version of SKILL.md:
+   * 1. Adds cowork.category and cowork.icon to frontmatter if missing
+   * 2. Adds metadata.author and metadata.version if missing
+   * 3. Updates file path references to match consolidated paths
+   * 4. Adds "Additional Resources" section listing companion files
+   */
+  let result = content;
+
+  // Update frontmatter with Cowork fields
+  const fmMatch = result.match(/^(---\n)([\s\S]*?)(\n---)/);
+  if (fmMatch) {
+    let fm = fmMatch[2];
+    const defaults = COWORK_DEFAULTS[skillName] || {};
+
+    if (!fm.includes('cowork.category') && defaults.category) {
+      fm += `\ncowork.category: ${defaults.category}`;
+    }
+    if (!fm.includes('cowork.icon') && defaults.icon) {
+      fm += `\ncowork.icon: ${defaults.icon}`;
+    }
+    if (!fm.includes('metadata:')) {
+      fm += `\nmetadata:\n  author: nahisaho\n  version: "2.0"`;
+    }
+
+    result = `${fmMatch[1]}${fm}${fmMatch[3]}${result.slice(fmMatch[0].length)}`;
+  }
+
+  // Build path mapping: original -> consolidated
+  if (originalCompanions.length > MAX_COMPANIONS_PER_SKILL) {
+    const pathMap = {};
+    for (const orig of originalCompanions) {
+      const topDir = orig.relPath.split('/')[0];
+      const consolidated = packagedCompanions.find(
+        p => p.relativePath.startsWith(`references/${topDir}`)
+      );
+      if (consolidated) {
+        pathMap[orig.relPath] = consolidated.relativePath;
       }
+    }
 
-      files.push({
-        relativePath: `references/${subDir.replace(/\//g, '-')}.md`,
-        content: Buffer.from(consolidated, 'utf-8'),
-      });
+    // Replace file path references in body
+    for (const [origPath, newPath] of Object.entries(pathMap)) {
+      result = result.replace(new RegExp(escapeRegex(origPath), 'g'), newPath);
     }
   }
 
-  return files;
+  // Add Additional Resources section if companions exist and not already present
+  if (packagedCompanions.length > 0 && !result.includes('## Additional Resources')) {
+    let resources = '\n\n## Additional Resources\n\n';
+    for (const c of packagedCompanions) {
+      const name = path.basename(c.relativePath, path.extname(c.relativePath));
+      resources += `- **\`${c.relativePath}\`** — ${name}\n`;
+    }
+    result += resources;
+  }
+
+  return result;
+}
+
+function escapeRegex(str) {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }
 
-// ── ZIP Builder (uses system zip or tar) ───────────────────────────────────
+// ── ZIP Builder ───────────────────────────────────────────────────────────
 
 function createZip(outputPath, files) {
-  /**
-   * Creates a zip file from an array of { path, content } entries.
-   * Uses a temp directory and system zip command.
-   */
   const tmpDir = fs.mkdtempSync(path.join(require('os').tmpdir(), 'shikigami-cowork-'));
 
   try {
-    // Write all files to temp directory
     for (const file of files) {
       const filePath = path.join(tmpDir, file.path);
       fs.mkdirSync(path.dirname(filePath), { recursive: true });
@@ -269,19 +428,18 @@ function createZip(outputPath, files) {
       }
     }
 
-    // Create zip
     const absOutput = path.resolve(outputPath);
     try {
-      execSync(`cd "${tmpDir}" && zip -r "${absOutput}" .`, { stdio: 'pipe' });
+      execFileSync('zip', ['-r', absOutput, '.'], { cwd: tmpDir, stdio: 'pipe' });
     } catch {
-      // Fallback: try PowerShell (Windows)
+      // Fallback: PowerShell (Windows)
       try {
-        execSync(
-          `powershell -Command "Compress-Archive -Path '${tmpDir}${path.sep}*' -DestinationPath '${absOutput}' -Force"`,
-          { stdio: 'pipe' }
-        );
+        execFileSync('powershell', [
+          '-Command',
+          `Compress-Archive -Path '${tmpDir}${path.sep}*' -DestinationPath '${absOutput}' -Force`
+        ], { stdio: 'pipe' });
       } catch {
-        console.error('❌ zip command not found. Install zip or use PowerShell.');
+        console.error('❌ zip command not found. Install zip or use PowerShell on Windows.');
         process.exit(1);
       }
     }
@@ -307,14 +465,15 @@ function generateManifest(skills, version) {
     },
     name: {
       short: 'SHIKIGAMI',
-      full: 'SHIKIGAMI - Deep Research & Consulting Agent Skills for Copilot Cowork',
+      full: 'SHIKIGAMI - Deep Research & Consulting Agent Skills',
     },
     description: {
       short: 'AI-powered deep research and consulting framework analysis',
-      full: 'SHIKIGAMI provides 4 specialized Agent Skills for Copilot Cowork: '
+      full: 'SHIKIGAMI provides 4 specialized Agent Skills: '
         + 'deep research with hallucination prevention, 50+ consulting frameworks '
         + '(SWOT, PEST, 5Forces, BCG Matrix, etc.), structured report writing, '
-        + 'and project planning with 5 Whys/JTBD purpose discovery.',
+        + 'and project planning with 5 Whys/JTBD purpose discovery. '
+        + 'Cross-platform compatible with GitHub Copilot CLI, VS Code, Claude Code, and Gemini CLI.',
     },
     icons: {
       color: 'color.png',
@@ -325,7 +484,44 @@ function generateManifest(skills, version) {
   };
 }
 
-// ── Validation ─────────────────────────────────────────────────────────────
+// ── Validation (ASKILL codes from official docs) ──────────────────────────
+
+function validateManifest(manifest) {
+  const errors = [];
+
+  // ASKILL-M001: folder required in each agentSkills entry
+  for (const skill of manifest.agentSkills || []) {
+    if (!skill.folder) {
+      errors.push('[ASKILL-M001] `folder` is required for each agentSkills entry');
+    }
+  }
+
+  // ASKILL-M002: max 20 skills
+  if ((manifest.agentSkills || []).length > MAX_SKILLS) {
+    errors.push(`[ASKILL-M002] Max ${MAX_SKILLS} agentSkills entries (found ${manifest.agentSkills.length})`);
+  }
+
+  // ASKILL-M003: folder path max 256 chars
+  for (const skill of manifest.agentSkills || []) {
+    if (skill.folder && skill.folder.length > MAX_FOLDER_PATH) {
+      errors.push(`[ASKILL-M003] Folder path exceeds ${MAX_FOLDER_PATH} chars: ${skill.folder}`);
+    }
+  }
+
+  // ASKILL-P008: no duplicate folder values
+  const folders = (manifest.agentSkills || []).map(s => s.folder);
+  const dupes = folders.filter((f, i) => folders.indexOf(f) !== i);
+  if (dupes.length > 0) {
+    errors.push(`[ASKILL-P008] Duplicate folder values: ${[...new Set(dupes)].join(', ')}`);
+  }
+
+  // GUID format
+  if (!manifest.id || !/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(manifest.id)) {
+    errors.push('[Manifest] Invalid GUID format for id');
+  }
+
+  return errors;
+}
 
 function validateSkill(skillDir, skillName) {
   const errors = [];
@@ -333,57 +529,87 @@ function validateSkill(skillDir, skillName) {
 
   const skillMdPath = path.join(skillDir, 'SKILL.md');
   if (!fs.existsSync(skillMdPath)) {
-    errors.push(`SKILL.md not found in ${skillName}`);
+    // ASKILL-P002
+    errors.push(`[ASKILL-P002] SKILL.md not found in ${skillName}`);
     return { errors, warnings };
   }
 
   const content = fs.readFileSync(skillMdPath, 'utf-8');
   const frontmatter = parseFrontmatter(content);
 
+  // ASKILL-P003: valid YAML frontmatter
   if (!frontmatter) {
-    errors.push(`${skillName}: No YAML frontmatter found`);
+    errors.push(`[ASKILL-P003] No valid YAML frontmatter in ${skillName}/SKILL.md`);
     return { errors, warnings };
   }
 
-  // Validate name
+  // ASKILL-P004: name field required
   if (!frontmatter.name) {
-    errors.push(`${skillName}: Missing 'name' field in frontmatter`);
+    errors.push(`[ASKILL-P004] Missing 'name' field in ${skillName}/SKILL.md frontmatter`);
   } else {
+    // ASKILL-P006: name matches folder name
     if (frontmatter.name !== skillName) {
-      errors.push(`${skillName}: Frontmatter name '${frontmatter.name}' doesn't match folder '${skillName}'`);
+      errors.push(`[ASKILL-P006] Frontmatter name '${frontmatter.name}' doesn't match folder '${skillName}'`);
     }
+    // ASKILL-P007: name is kebab-case, 1-64 chars
     if (frontmatter.name.length > 64) {
-      errors.push(`${skillName}: Name exceeds 64 characters`);
+      errors.push(`[ASKILL-P007] Name exceeds 64 characters: ${frontmatter.name}`);
     }
     if (!/^[a-z0-9]+(-[a-z0-9]+)*$/.test(frontmatter.name)) {
-      errors.push(`${skillName}: Name must be kebab-case`);
+      errors.push(`[ASKILL-P007] Name must be kebab-case: ${frontmatter.name}`);
     }
   }
 
-  // Validate description
+  // ASKILL-P005: description field required, 1-1024 chars
   if (!frontmatter.description) {
-    errors.push(`${skillName}: Missing 'description' field in frontmatter`);
+    errors.push(`[ASKILL-P005] Missing 'description' field in ${skillName}/SKILL.md frontmatter`);
   } else if (frontmatter.description.length > 1024) {
-    warnings.push(`${skillName}: Description exceeds 1024 characters (${frontmatter.description.length})`);
+    errors.push(`[ASKILL-P005] Description exceeds 1024 characters (${frontmatter.description.length}) in ${skillName}`);
+  }
+
+  // Body size warning
+  const body = extractBody(content);
+  const wordCount = body.split(/\s+/).filter(w => w.length > 0).length;
+  if (wordCount > RECOMMENDED_BODY_WORDS) {
+    warnings.push(`${skillName}: SKILL.md body is ~${wordCount} words (recommended <${RECOMMENDED_BODY_WORDS}). Consider moving details to references/`);
+  }
+
+  // Discover and validate companion files
+  const originalCompanions = discoverCompanions(skillDir);
+
+  // Validate companion file paths
+  for (const f of originalCompanions) {
+    const pathErrors = validateCompanionPath(f.relPath);
+    for (const e of pathErrors) {
+      errors.push(`[Companion] ${skillName}: ${e}`);
+    }
   }
 
-  // Count companion files
-  const companions = consolidateCompanions(skillDir, skillName);
-  if (companions.length > MAX_COMPANIONS_PER_SKILL) {
-    errors.push(`${skillName}: ${companions.length} companion files after consolidation (max ${MAX_COMPANIONS_PER_SKILL})`);
+  // Consolidate companions for packaging
+  const packagedCompanions = consolidateCompanions(originalCompanions, skillName);
+
+  // Validate consolidated results
+  if (packagedCompanions.length > MAX_COMPANIONS_PER_SKILL) {
+    errors.push(`[Companion] ${skillName}: ${packagedCompanions.length} files after consolidation (max ${MAX_COMPANIONS_PER_SKILL})`);
   }
 
-  const totalSize = companions.reduce((sum, f) => sum + f.content.length, 0);
+  const totalSize = packagedCompanions.reduce((sum, f) => sum + f.content.length, 0);
   if (totalSize > MAX_COMPANION_TOTAL) {
-    errors.push(`${skillName}: Total companion size ${(totalSize / 1024 / 1024).toFixed(1)}MB exceeds 10MB limit`);
+    errors.push(`[Companion] ${skillName}: Total size ${(totalSize / 1024 / 1024).toFixed(1)}MB exceeds 10MB limit`);
   }
 
-  const oversized = companions.filter(f => f.content.length > MAX_COMPANION_SIZE);
-  for (const f of oversized) {
-    errors.push(`${skillName}: ${f.relativePath} exceeds 5MB limit`);
+  for (const f of packagedCompanions) {
+    if (f.content.length > MAX_COMPANION_SIZE) {
+      errors.push(`[Companion] ${skillName}: ${f.relativePath} exceeds 5MB limit`);
+    }
+    // Validate packaged paths too
+    const pathErrors = validateCompanionPath(f.relativePath);
+    for (const e of pathErrors) {
+      errors.push(`[Companion] ${skillName}: ${e}`);
+    }
   }
 
-  return { errors, warnings, companions, frontmatter };
+  return { errors, warnings, originalCompanions, packagedCompanions, frontmatter, content };
 }
 
 // ── Main ───────────────────────────────────────────────────────────────────
@@ -402,6 +628,7 @@ function showHelp() {
 🎭 SHIKIGAMI Cowork Plugin Builder
 
 Builds a Microsoft 365 Copilot Cowork plugin package (.zip)
+following the official "Build a plugin from scratch" guide.
 
 Usage: npx shikigami cowork [options]
 
@@ -410,8 +637,17 @@ Options:
   --check         Validation only (dry-run)
   -h, --help      Show this help
 
-Output:
-  Creates shikigami-cowork-plugin.zip ready for M365 Admin Center upload.
+Steps (per official docs):
+  1. Discover & validate SKILL.md files (frontmatter, naming, paths)
+  2. Consolidate companion files (max 20 per skill)
+  3. Rewrite SKILL.md for Cowork (add cowork.category, cowork.icon, metadata)
+  4. Generate manifest.json (M365 Unified App Manifest devPreview)
+  5. Generate icons (color.png 192×192, outline.png 32×32)
+  6. Create .zip package
+
+Cross-platform:
+  Same SKILL.md files work in GitHub Copilot CLI, VS Code Copilot,
+  Claude Code, Gemini CLI, Cursor, JetBrains Junie, and Copilot Cowork.
 
 Reference:
   https://learn.microsoft.com/microsoft-365/copilot/cowork/cowork-plugin-development
@@ -431,15 +667,13 @@ function build() {
   console.log('====================================');
   console.log('');
 
-  // Locate skills directory
+  // ── Step 0: Locate skills directory ──
   const packageDir = path.resolve(__dirname, '..');
   let skillsRoot = path.join(packageDir, 'github-assets', 'skills');
 
-  // If running from installed package, check node_modules path
   if (!fs.existsSync(skillsRoot)) {
     skillsRoot = path.join(packageDir, '.github', 'skills');
   }
-  // Also check project's .github/skills (after init)
   if (!fs.existsSync(skillsRoot)) {
     skillsRoot = path.join(process.cwd(), '.github', 'skills');
   }
@@ -450,14 +684,17 @@ function build() {
     process.exit(1);
   }
 
-  // Read package version
   let version = '1.0.0';
   try {
     const pkg = JSON.parse(fs.readFileSync(path.join(packageDir, 'package.json'), 'utf-8'));
     version = pkg.version || version;
   } catch { /* ignore */ }
 
-  // Discover skills
+  // ── Step 1: Discover & validate skills ──
+  console.log('Step 1: Discovering and validating skills...');
+  console.log(`📂 Skills root: ${skillsRoot}`);
+  console.log('');
+
   const skillDirs = fs.readdirSync(skillsRoot, { withFileTypes: true })
     .filter(d => d.isDirectory() && d.name.startsWith('shikigami-'))
     .map(d => d.name);
@@ -467,11 +704,6 @@ function build() {
     process.exit(1);
   }
 
-  console.log(`📂 Skills root: ${skillsRoot}`);
-  console.log(`📦 Found ${skillDirs.length} skills`);
-  console.log('');
-
-  // Validate all skills
   let hasErrors = false;
   const validatedSkills = [];
 
@@ -486,13 +718,19 @@ function build() {
     for (const warn of result.warnings) console.log(`  ⚠️  ${warn}`);
 
     if (result.errors.length === 0) {
-      const companionCount = result.companions ? result.companions.length : 0;
-      console.log(`  ✅ ${skillName} (${companionCount} companion files)`);
+      const origCount = result.originalCompanions ? result.originalCompanions.length : 0;
+      const pkgCount = result.packagedCompanions ? result.packagedCompanions.length : 0;
+      const consolidatedNote = origCount > MAX_COMPANIONS_PER_SKILL
+        ? ` (consolidated ${origCount} → ${pkgCount})`
+        : '';
+      console.log(`  ✅ ${skillName} (${pkgCount} companion files${consolidatedNote})`);
       validatedSkills.push({
         name: skillName,
         dir: skillDir,
-        companions: result.companions,
+        originalCompanions: result.originalCompanions,
+        packagedCompanions: result.packagedCompanions,
         frontmatter: result.frontmatter,
+        content: result.content,
       });
     }
   }
@@ -505,63 +743,89 @@ function build() {
   }
 
   if (validatedSkills.length > MAX_SKILLS) {
-    console.error(`❌ Too many skills: ${validatedSkills.length} (max ${MAX_SKILLS})`);
+    console.error(`❌ [ASKILL-M002] Too many skills: ${validatedSkills.length} (max ${MAX_SKILLS})`);
+    process.exit(1);
+  }
+
+  // ── Manifest validation ──
+  const manifest = generateManifest(validatedSkills, version);
+  const manifestErrors = validateManifest(manifest);
+  if (manifestErrors.length > 0) {
+    hasErrors = true;
+    for (const err of manifestErrors) console.log(`  ❌ ${err}`);
+  }
+
+  if (hasErrors) {
+    console.error('❌ Manifest validation failed.');
     process.exit(1);
   }
 
   if (check) {
     console.log('✅ Validation passed (dry-run mode)');
     console.log(`   ${validatedSkills.length} skills ready for packaging`);
+    console.log('');
+    console.log('Cross-platform compatibility:');
+    console.log('   ✅ GitHub Copilot CLI');
+    console.log('   ✅ VS Code Copilot');
+    console.log('   ✅ Microsoft 365 Copilot Cowork');
+    console.log('   ✅ Claude Code / Gemini CLI / Cursor');
     process.exit(0);
   }
 
-  // Build package
-  console.log('📦 Building Cowork plugin package...');
+  // ── Step 2-5: Build package ──
+  console.log('Step 2: Building Cowork plugin package...');
 
   const zipFiles = [];
 
-  // 1. Generate manifest.json
-  const manifest = generateManifest(validatedSkills, version);
+  // Step 4: manifest.json
   zipFiles.push({
     path: 'manifest.json',
     content: JSON.stringify(manifest, null, 2),
   });
   console.log('  ✅ manifest.json');
 
-  // 2. Generate icons
-  const colorPng = createMinimalPNG(192, 192, 107, 70, 193); // Purple (#6B46C1)
+  // Step 5: Icons
+  const colorPng = createMinimalPNG(192, 192, 107, 70, 193);
   const outlinePng = createMinimalPNG(32, 32, 107, 70, 193);
   zipFiles.push({ path: 'color.png', content: colorPng });
   zipFiles.push({ path: 'outline.png', content: outlinePng });
   console.log('  ✅ color.png (192×192)');
   console.log('  ✅ outline.png (32×32)');
 
-  // 3. Copy skills with consolidation
+  // Steps 1-2: Skills with Cowork-specific SKILL.md
   for (const skill of validatedSkills) {
-    // Copy SKILL.md
-    const skillMd = fs.readFileSync(path.join(skill.dir, 'SKILL.md'));
+    // Rewrite SKILL.md for Cowork (add metadata, category, icon, update paths)
+    const rewrittenSkillMd = rewriteSkillMdForCowork(
+      skill.content,
+      skill.originalCompanions,
+      skill.packagedCompanions,
+      skill.name
+    );
+
     zipFiles.push({
       path: `skills/${skill.name}/SKILL.md`,
-      content: skillMd,
+      content: rewrittenSkillMd,
     });
 
     // Copy companion files (already consolidated)
-    for (const companion of skill.companions) {
+    for (const companion of skill.packagedCompanions) {
       zipFiles.push({
         path: `skills/${skill.name}/${companion.relativePath}`,
         content: companion.content,
       });
     }
 
-    console.log(`  ✅ skills/${skill.name}/ (${skill.companions.length + 1} files)`);
+    console.log(`  ✅ skills/${skill.name}/ (${skill.packagedCompanions.length + 1} files)`);
   }
 
-  // 4. Create ZIP
+  // ── Step 6: Create ZIP ──
+  console.log('');
+  console.log('Step 3: Creating ZIP package...');
+
   const outDir = path.resolve(out);
   fs.mkdirSync(outDir, { recursive: true });
   const zipPath = path.join(outDir, 'shikigami-cowork-plugin.zip');
 
-  // Remove old zip if exists
   if (fs.existsSync(zipPath)) {
     fs.unlinkSync(zipPath);
   }
@@ -570,15 +834,23 @@ function build() {
 
   const zipSize = fs.statSync(zipPath).size;
   console.log('');
-  console.log(`✅ Plugin package created: ${zipPath}`);
-  console.log(`   Size: ${(zipSize / 1024).toFixed(1)} KB`);
-  console.log(`   Skills: ${validatedSkills.length}`);
-  console.log(`   Version: ${version}`);
+  console.log('✅ Plugin package created!');
+  console.log('');
+  console.log(`  📦 ${zipPath}`);
+  console.log(`  📏 Size: ${(zipSize / 1024).toFixed(1)} KB`);
+  console.log(`  🔧 Skills: ${validatedSkills.length}`);
+  console.log(`  📋 Version: ${version}`);
+  console.log('');
+  console.log('Cross-platform compatibility:');
+  console.log('  ✅ GitHub Copilot CLI  — use `npx shikigami init`');
+  console.log('  ✅ VS Code Copilot    — same SKILL.md format');
+  console.log('  ✅ Copilot Cowork     — upload .zip to M365 Admin Center');
+  console.log('  ✅ Claude Code        — same SKILL.md format');
   console.log('');
-  console.log('📝 Next steps:');
-  console.log('   1. Open M365 Admin Center > Manage Apps > Upload Custom App');
-  console.log('   2. Upload shikigami-cowork-plugin.zip');
-  console.log('   3. Open Cowork > Sources & Skills to verify');
+  console.log('📝 Next steps (Copilot Cowork):');
+  console.log('  1. Open M365 Admin Center > Manage Apps > Upload Custom App');
+  console.log('  2. Upload shikigami-cowork-plugin.zip');
+  console.log('  3. Open Cowork > Sources & Skills to verify');
   console.log('');
   console.log('📖 https://learn.microsoft.com/microsoft-365/copilot/cowork/cowork-plugin-development');
   console.log('');