thufir 2.1.0 → 2.1.1

package/dist/commands/init.js

@@ -1,7 +1,7 @@
 import * as p from '@clack/prompts';
 import pc from 'picocolors';
 import { execSync } from 'node:child_process';
-import { writeFileSync } from 'node:fs';
+import { existsSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { showVersionCheck } from '../version-check.js';
 import { analyzeRepo } from '../analyze.js';
@@ -162,6 +162,57 @@ export async function runInit() {
     const result = scaffold(cwd, answers, analysis);
     createInitialCommit(cwd, result.filesCreated, answers.colleagueName);
     s.stop(`${answers.colleagueName} is ready.`);
+    // Install skill packages
+    if (answers.skillPackages.length > 0) {
+        const skillSpinner = p.spinner();
+        for (const pkg of answers.skillPackages) {
+            if (pkg === 'gstack') {
+                const gstackPath = join(process.env.HOME || '~', '.claude', 'skills', 'gstack');
+                if (existsSync(gstackPath)) {
+                    p.log.info('gstack already installed at ~/.claude/skills/gstack');
+                }
+                else {
+                    skillSpinner.start('Installing gstack (headless browser, QA, shipping)...');
+                    try {
+                        execSync('git clone https://github.com/garrytan/gstack.git ~/.claude/skills/gstack', { stdio: 'ignore', timeout: 60000 });
+                        // Run setup if bun is available
+                        try {
+                            execSync('cd ~/.claude/skills/gstack && ./setup', { stdio: 'ignore', timeout: 30000 });
+                        }
+                        catch { /* setup is optional — browse binary may not build without bun */ }
+                        skillSpinner.stop('gstack installed.');
+                    }
+                    catch (err) {
+                        skillSpinner.stop('gstack installation failed.');
+                        p.log.warn('Install manually: git clone https://github.com/garrytan/gstack.git ~/.claude/skills/gstack');
+                    }
+                }
+            }
+            if (pkg === 'superpowers') {
+                const skillsDir = join(process.env.HOME || '~', '.claude', 'skills');
+                const spSkills = ['superpowers-brainstorming', 'superpowers-systematic-debugging', 'superpowers-test-driven-development'];
+                const installed = spSkills.filter(s => existsSync(join(skillsDir, s)));
+                if (installed.length >= spSkills.length) {
+                    p.log.info(`Superpowers already installed (${installed.length} skills detected)`);
+                }
+                else if (installed.length > 0) {
+                    p.log.info(`Superpowers partially installed (${installed.length}/${spSkills.length} core skills)`);
+                    p.log.warn('Run `claude /install-skills superpowers` to install missing skills');
+                }
+                else {
+                    // Try installing via superpowers-extended-cc if available
+                    const extPath = join(skillsDir, 'superpowers-extended-cc');
+                    if (existsSync(extPath)) {
+                        p.log.info('Superpowers Extended (CC) detected — skills available');
+                    }
+                    else {
+                        p.log.warn('Superpowers not found. Install via Claude Code:');
+                        console.log(pc.dim('  Open Claude Code and run: /install superpowers'));
+                    }
+                }
+            }
+        }
+    }
     // GitHub setup
     if (answers.setupGitHub !== 'skip' && analysis.hasGhCli) {
         setupGitHub(cwd, answers.setupGitHub, answers.repoName);

package/dist/scaffold.js

@@ -156,7 +156,55 @@ const THUFIR_DOCS = [
     'plans/_meta.md',
     'workflows/_meta.md',
     'workflows/getting-started.md',
+    'entities/_meta.md',
 ];
+/**
+ * Merge existing AGENTS.md with new template.
+ * Strategy: Use the new template as the base, then append any sections
+ * from the existing file that don't exist in the new template.
+ * This preserves user-added sections (like "Data Querying") while
+ * updating Thufir-managed sections (personality, triggers, etc.)
+ */
+function mergeAgentsMd(existing, fresh) {
+    // Extract H2 sections from both
+    const sectionPattern = /^## .+$/gm;
+    const extractSections = (content) => {
+        const sections = new Map();
+        const lines = content.split('\n');
+        let currentHeading = '__preamble__';
+        let currentContent = [];
+        for (const line of lines) {
+            if (line.match(/^## /)) {
+                if (currentContent.length > 0) {
+                    sections.set(currentHeading, currentContent.join('\n').trim());
+                }
+                currentHeading = line.trim();
+                currentContent = [line];
+            }
+            else {
+                currentContent.push(line);
+            }
+        }
+        if (currentContent.length > 0) {
+            sections.set(currentHeading, currentContent.join('\n').trim());
+        }
+        return sections;
+    };
+    const existingSections = extractSections(existing);
+    const freshSections = extractSections(fresh);
+    // Start with the fresh template
+    let result = fresh.trimEnd();
+    // Append any sections from existing that aren't in fresh
+    for (const [heading, content] of existingSections) {
+        if (heading === '__preamble__')
+            continue; // Skip preamble — use fresh version
+        if (!freshSections.has(heading)) {
+            // This is a user-added section — preserve it
+            result += '\n\n' + content;
+        }
+    }
+    return result + '\n';
+}
 export function scaffold(cwd, answers, analysis, isRealign = false) {
     const files = [];
     let gitInitialized = false;
@@ -166,7 +214,22 @@ export function scaffold(cwd, answers, analysis, isRealign = false) {
     }
     // AGENTS.md
     const agentsTemplate = readTemplate('agents/base.md');
-    writeFile(cwd, 'AGENTS.md', substitute(agentsTemplate, answers));
+    const newAgents = substitute(agentsTemplate, answers);
+    if (isRealign) {
+        // Merge: keep user-added sections from existing AGENTS.md
+        const existingPath = join(cwd, 'AGENTS.md');
+        if (existsSync(existingPath)) {
+            const existing = readFileSync(existingPath, 'utf-8');
+            const merged = mergeAgentsMd(existing, newAgents);
+            writeFile(cwd, 'AGENTS.md', merged);
+        }
+        else {
+            writeFile(cwd, 'AGENTS.md', newAgents);
+        }
+    }
+    else {
+        writeFile(cwd, 'AGENTS.md', newAgents);
+    }
     files.push('AGENTS.md');
     // CLAUDE.md
     writeFile(cwd, 'CLAUDE.md', readTemplate('claude-md.md'));
@@ -220,7 +283,7 @@ export function scaffold(cwd, answers, analysis, isRealign = false) {
     // .thufir marker — full settings
     const date = new Date().toISOString().split('T')[0];
     const marker = JSON.stringify({
-        version: '1.3.0',
+        version: '2.1.0',
         initialized: isRealign ? answers._originalInitialized || date : date,
         last_realigned: date,
         colleague_name: answers.colleagueName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thufir",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "AI Colleague — give your repository a brain",
   "type": "module",
   "bin": {