thanh-kit 2.5.0 → 2.5.2

package/templates/scripts/generate_catalogs.py

@@ -7,7 +7,12 @@ Use --output to write to a specific file instead.
 
 import argparse
 import sys
-import yaml
+try:
+    import yaml
+except ModuleNotFoundError:
+    raise SystemExit(
+        "PyYAML is required. Install with: python3 -m pip install -r .claude/scripts/requirements.txt"
+    )
 from pathlib import Path
 from datetime import datetime
 
@@ -27,12 +32,25 @@ except ImportError:
 
 def load_yaml(filename):
     """Load YAML file from script directory with helpful error handling."""
-    path = SCRIPT_DIR / filename
-    if not path.exists():
-        print(f"Error: {path} not found", file=sys.stderr)
+    primary = SCRIPT_DIR / filename
+
+    # skills_data canonical source moved under ck-help skill.
+    # SCRIPT_DIR is .claude/scripts/, parent is .claude/
+    if filename == 'skills_data.yaml':
+        canonical = SCRIPT_DIR.parent / 'skills' / 'ck-help' / 'scripts' / 'skills_data.yaml'
+        if canonical.exists():
+            loaded = yaml.safe_load(canonical.read_text(encoding='utf-8'))
+            return loaded if loaded is not None else []
+
+    if not primary.exists():
+        print(f"Error: {primary} not found", file=sys.stderr)
         print(f"Hint: Run scan_skills.py or scan_commands.py first to generate data files", file=sys.stderr)
         sys.exit(1)
-    return yaml.safe_load(path.read_text(encoding='utf-8'))
+
+    loaded = yaml.safe_load(primary.read_text(encoding='utf-8'))
+    if loaded is None:
+        return []
+    return loaded
 
 
 def generate_commands_yaml():
@@ -114,11 +132,22 @@ def generate_skills_yaml():
             'multimedia': 'Multimedia & Processing',
             'frameworks': 'Frameworks & Platforms',
             'utilities': 'Utilities & Helpers',
+            'core': 'Core Workflow',
+            'plan': 'Planning & Delivery',
+            'review': 'Code Review',
+            'test': 'Testing & QA',
+            'docs': 'Documentation',
+            'tools': 'Tooling',
+            'infra': 'Infrastructure',
+            'kanban': 'Kanban & Planning Board',
+            'worktree': 'Git Worktree',
+            'journal': 'Journaling',
+            'watzup': 'Session Wrap-up',
             'other': 'Other'
         },
         'legend': {
-            'has_scripts': '📦 Has executable scripts',
-            'has_references': '📚 Has reference documentation'
+            'has_scripts': 'Has executable scripts',
+            'has_references': 'Has reference documentation'
         },
         'skills': categories
     }
@@ -132,7 +161,7 @@ def write_output(content, output_path=None, label=None):
         path = Path(output_path)
         path.parent.mkdir(parents=True, exist_ok=True)
         path.write_text(content, encoding='utf-8')
-        print(f"✓ Generated {output_path}", file=sys.stderr)
+        print(f"Generated {output_path}", file=sys.stderr)
     else:
         print(content)
 

package/templates/scripts/scan_commands.py

@@ -1,107 +1,25 @@
 #!/usr/bin/env python3
 """
-Scan .claude/commands directory and extract command metadata.
+Legacy command scanner (deprecated).
+
+Commands were migrated to skills. This script now writes an empty commands dataset
+for backward compatibility with older tooling.
 """
 
-import re
-import sys
-import io
 from pathlib import Path
-from typing import Dict, List
-import yaml
-
-if sys.platform == 'win32' and hasattr(sys.stdout, 'buffer'):
-    sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding='utf-8', errors='replace')
-
-def extract_frontmatter(content: str) -> Dict:
-    """Extract YAML frontmatter from markdown content."""
-    match = re.match(r'^---\s*\n(.*?)\n---\s*\n', content, re.DOTALL)
-    if match:
-        try:
-            return yaml.safe_load(match.group(1))
-        except:
-            return {}
-    return {}
-
-def scan_commands(base_path: Path) -> List[Dict]:
-    """Scan all command files and extract metadata."""
-    commands = []
-
-    for cmd_file in sorted(base_path.rglob('*.md')):
-        # Get relative path from commands directory
-        rel_path = cmd_file.relative_to(base_path)
-
-        # Build command name from path
-        parts = list(rel_path.parts[:-1]) + [rel_path.stem]
-        # Canonical command format: /fix, /fix/ui, /plan/fast, ...
-        command_name = '/' + '/'.join(parts)
-
-        # Read file and extract frontmatter
-        try:
-            content = cmd_file.read_text(encoding='utf-8', errors='replace')
-            frontmatter = extract_frontmatter(content)
-
-            description = frontmatter.get('description', '')
-            arg_hint = frontmatter.get('argument-hint', '')
-
-            # Extract power level (⚡ count)
-            power_level = description.count('⚡')
-            clean_desc = description.replace('⚡', '').strip()
-
-            commands.append({
-                'name': command_name,
-                'path': rel_path.as_posix(),
-                'description': clean_desc,
-                'argument_hint': arg_hint,
-                'power_level': power_level,
-                'category': parts[0] if len(parts) > 1 else 'core'
-            })
-        except Exception as e:
-            print(f"Error processing {cmd_file}: {e}")
 
-    return commands
 
-def group_by_category(commands: List[Dict]) -> Dict[str, List[Dict]]:
-    """Group commands by category."""
-    categories = {}
-
-    for cmd in commands:
-        category = cmd['category']
-        if category not in categories:
-            categories[category] = []
-        categories[category].append(cmd)
-
-    return categories
-
-def main():
-    """Main execution."""
-    base_path = Path('.claude/commands')
-
-    if not base_path.exists():
-        print(f"Error: {base_path} not found")
-        return
-
-    print("Scanning commands...")
-    commands = scan_commands(base_path)
-
-    print(f"\nFound {len(commands)} commands\n")
-
-    # Group by category
-    categories = group_by_category(commands)
-
-    for category, cmds in sorted(categories.items()):
-        print(f"\n{category.upper()}:")
-        for cmd in cmds:
-            power = '⚡' * cmd['power_level'] if cmd['power_level'] > 0 else ''
-            print(f"  {cmd['name']:40} {power:10} {cmd['description'][:80]}")
-
-    # Output YAML for processing (generate_catalogs.py expects YAML format)
-    output_path = Path('.claude/scripts/commands_data.yaml')
+def main() -> None:
+    output_path = Path(".claude/scripts/commands_data.yaml")
     output_path.write_text(
-        yaml.dump(commands, allow_unicode=True, default_flow_style=False),
-        encoding='utf-8',
+        "# Commands have been migrated to skills.\n"
+        "# See .claude/skills/ck-help/scripts/skills_data.yaml for the current catalog.\n"
+        "[]\n",
+        encoding="utf-8",
     )
-    print(f"\nSaved metadata to {output_path}")
+    print("Commands are deprecated; wrote empty commands catalog for compatibility.")
+    print(f"✓ Saved metadata to {output_path}")
+
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()

package/templates/scripts/scan_skills.py

@@ -4,16 +4,44 @@ Scan .claude/skills directory and extract skill metadata.
 """
 
 import re
-import sys
-import io
 from pathlib import Path
 from typing import Dict, List
-import yaml
+try:
+    import yaml
+except ModuleNotFoundError:
+    raise SystemExit(
+        "PyYAML is required. Install with: python3 -m pip install -r .claude/scripts/requirements.txt"
+    )
 
-# Ensure Unicode output works on Windows terminals
-if sys.platform == 'win32' and hasattr(sys.stdout, 'buffer'):
-    sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding='utf-8', errors='replace')
-    sys.stderr = io.TextIOWrapper(sys.stderr.buffer, encoding='utf-8', errors='replace')
+# Exact mappings for high-signal CK skills to avoid falling into "other".
+EXACT_CATEGORY_MAP = {
+    "ask": "utilities",
+    "code-review": "utilities",
+    "coding-level": "utilities",
+    "debug": "utilities",
+    "docs": "utilities",
+    "journal": "utilities",
+    "plan": "utilities",
+    "research": "utilities",
+    "sequential-thinking": "utilities",
+    "test": "utilities",
+    "watzup": "utilities",
+    "ck-help": "dev-tools",
+    "find-skills": "dev-tools",
+    "git": "dev-tools",
+    "kanban": "dev-tools",
+    "plans-kanban": "dev-tools",
+    "scout": "dev-tools",
+    "use-mcp": "dev-tools",
+    "worktree": "dev-tools",
+    "preview": "utilities",
+    "project-management": "utilities",
+    "bootstrap": "utilities",
+    "brainstorm": "utilities",
+    "cook": "utilities",
+    "fix": "utilities",
+    "team": "dev-tools",
+}
 
 def extract_frontmatter(content: str) -> Dict:
     """Extract YAML frontmatter from markdown content."""
@@ -69,7 +97,7 @@ def scan_skills(base_path: Path) -> List[Dict]:
             skill_name = f"{parent_name}/{skill_name}"
 
         try:
-            content = skill_file.read_text(encoding='utf-8', errors='replace')
+            content = skill_file.read_text()
             frontmatter = extract_frontmatter(content)
 
             description = frontmatter.get('description', '')
@@ -79,15 +107,21 @@ def scan_skills(base_path: Path) -> List[Dict]:
             # Categorize based on content/name
             category = categorize_skill(skill_name, description, content)
 
-            skills.append({
+            skill_entry = {
                 'name': skill_name,
-                'path': skill_file.relative_to(base_path).as_posix(),
+                'path': str(skill_file.relative_to(Path('.claude/skills'))),
                 'description': description,
                 'category': category,
                 'has_scripts': (skill_dir / 'scripts').exists(),
                 'has_references': (skill_dir / 'references').exists()
-            })
+            }
+
+            # Include argument-hint if present in frontmatter
+            argument_hint = frontmatter.get('argument-hint', '')
+            if argument_hint:
+                skill_entry['argument_hint'] = str(argument_hint)
 
+            skills.append(skill_entry)
         except Exception as e:
             print(f"Error processing {skill_file}: {e}")
 
@@ -96,8 +130,8 @@ def scan_skills(base_path: Path) -> List[Dict]:
 def categorize_skill(name: str, description: str, content: str) -> str:
     """Categorize skill based on name and content."""
     lower_name = name.lower()
-    lower_desc = description.lower()
-    lower_content = content[:500].lower()
+    if lower_name in EXACT_CATEGORY_MAP:
+        return EXACT_CATEGORY_MAP[lower_name]
 
     # AI/ML
     if any(x in lower_name for x in ['ai-', 'gemini', 'multimodal', 'adk']):
@@ -120,7 +154,7 @@ def categorize_skill(name: str, description: str, content: str) -> str:
         return 'database'
 
     # Development Tools
-    if any(x in lower_name for x in ['mcp', 'skill-creator', 'claude-code', 'repomix', 'docs-seeker']):
+    if any(x in lower_name for x in ['mcp', 'skill-creator', 'repomix', 'docs-seeker']):
         return 'dev-tools'
 
     # Multimedia
@@ -185,13 +219,19 @@ def main():
             refs = '📚' if skill['has_references'] else '  '
             print(f"  {scripts}{refs} {skill['name']:30} {skill['description'][:80]}")
 
-    # Output YAML for processing (generate_catalogs.py reads YAML)
-    output_path = Path('.claude/scripts/skills_data.yaml')
-    output_path.write_text(
-        yaml.dump(skills, allow_unicode=True, default_flow_style=False),
+    # Output YAML to ck-help scripts directory
+    output_path = Path('.claude/skills/ck-help/scripts/skills_data.yaml')
+    output_path.parent.mkdir(parents=True, exist_ok=True)
+    output_path.write_text(yaml.dump(skills, allow_unicode=True, default_flow_style=False))
+    print(f"\n✓ Saved metadata to {output_path}")
+
+    # Legacy location now points to canonical source to avoid data drift.
+    legacy_path = Path('.claude/scripts/skills_data.yaml')
+    legacy_path.write_text(
+        "# Skills catalog moved to .claude/skills/ck-help/scripts/skills_data.yaml\n"
+        "# Regenerate via: python3 .claude/scripts/scan_skills.py\n",
         encoding='utf-8',
     )
-    print(f"\n✓ Saved metadata to {output_path}")
 
 if __name__ == '__main__':
     main()

package/templates/scripts/set-active-plan.cjs

@@ -12,6 +12,7 @@
  * the initial snapshot from session start.
  */
 
+const path = require('path');
 const { writeSessionState, readSessionState } = require('../hooks/lib/ck-config-utils.cjs');
 
 const sessionId = process.env.CK_SESSION_ID;
@@ -24,21 +25,25 @@ if (!newPlan) {
   process.exit(1);
 }
 
+// Issue #335: Resolve to absolute path to support brownfield/subdirectory workflows
+// When agent navigates away from session origin, relative paths become invalid
+const absolutePlan = path.resolve(newPlan);
+
 if (!sessionId) {
   console.warn('Warning: CK_SESSION_ID not set - session state will not persist');
-  console.log(`Would set active plan to: ${newPlan}`);
+  console.log(`Would set active plan to: ${absolutePlan}`);
   process.exit(0);
 }
 
 const current = readSessionState(sessionId) || {};
 const success = writeSessionState(sessionId, {
   ...current,
-  activePlan: newPlan,
+  activePlan: absolutePlan,
   timestamp: Date.now()
 });
 
 if (success) {
-  console.log(`Active plan set to: ${newPlan}`);
+  console.log(`Active plan set to: ${absolutePlan}`);
 } else {
   console.error('Failed to update session state');
   process.exit(1);