@orderful/droid 0.24.0 → 0.25.0

package/src/lib/migrations.ts

@@ -1,8 +1,22 @@
-import { existsSync, appendFileSync, mkdirSync, renameSync, rmSync } from 'fs';
+import {
+  existsSync,
+  appendFileSync,
+  mkdirSync,
+  renameSync,
+  rmSync,
+  readdirSync,
+} from 'fs';
 import { join, dirname } from 'path';
 import { loadConfig, saveConfig, getConfigDir } from './config';
-import { type Migration } from './types';
+import {
+  type Migration,
+  Platform,
+  getPlatformTools,
+  setPlatformTools,
+} from './types';
 import { compareSemver } from './version';
+import { getSkillsPath } from './platforms';
+import { getBundledTools } from './tools';
 
 const MIGRATIONS_LOG_FILE = '.migrations.log';
 
@@ -21,7 +35,7 @@ function logMigration(
   fromVersion: string,
   toVersion: string,
   status: 'OK' | 'FAILED',
-  error?: string
+  error?: string,
 ): void {
   const timestamp = new Date().toISOString();
   const logEntry = error
@@ -50,7 +64,10 @@ function logMigration(
  * This fixes a bug where config was saved to prefixed paths but SKILL.md
  * tells Claude to read from unprefixed paths.
  */
-function createConfigDirMigration(skillName: string, version: string): Migration {
+function createConfigDirMigration(
+  skillName: string,
+  version: string,
+): Migration {
   const unprefixedName = skillName.replace(/^droid-/, '');
   return {
     version,
@@ -75,6 +92,67 @@ function createConfigDirMigration(skillName: string, version: string): Migration
   };
 }
 
+/**
+ * Migration: Sync installed tools from disk to config
+ *
+ * Detects tools that are physically installed (skill directories exist) but not
+ * tracked in the platform's config. This handles platform switching scenarios.
+ */
+function createPlatformSyncMigration(version: string): Migration {
+  return {
+    version,
+    description: 'Sync installed tools from disk to config',
+    up: () => {
+      const config = loadConfig();
+      const bundledTools = getBundledTools();
+      let configChanged = false;
+      const originalPlatform = config.platform;
+
+      // Check both platforms
+      for (const platformKey of [Platform.ClaudeCode, Platform.OpenCode]) {
+        const skillsPath = getSkillsPath(platformKey);
+        if (!existsSync(skillsPath)) continue;
+
+        config.platform = platformKey;
+        const trackedTools = getPlatformTools(config);
+        const installedDirs = readdirSync(skillsPath, { withFileTypes: true })
+          .filter((dirent) => dirent.isDirectory())
+          .map((dirent) => dirent.name);
+
+        for (const skillName of installedDirs) {
+          const normalizedName = skillName.replace(/^droid-/, '');
+          const isTracked =
+            trackedTools[skillName] ||
+            trackedTools[`droid-${normalizedName}`] ||
+            trackedTools[normalizedName];
+          if (isTracked) continue;
+
+          const matchingTool = bundledTools.find((tool) =>
+            tool.includes.skills.some((s) => s.name === skillName),
+          );
+
+          if (matchingTool) {
+            trackedTools[skillName] = {
+              version: matchingTool.version,
+              installed_at: new Date().toISOString(),
+            };
+            configChanged = true;
+          }
+        }
+
+        if (configChanged) {
+          setPlatformTools(config, trackedTools);
+        }
+      }
+
+      config.platform = originalPlatform;
+      if (configChanged) {
+        saveConfig(config);
+      }
+    },
+  };
+}
+
 /**
  * Registry of all tool migrations
  * Key: tool name (e.g., "brain", "comments")
@@ -91,6 +169,8 @@ const TOOL_MIGRATIONS: Record<string, Migration[]> = {
   comments: [createConfigDirMigration('droid-comments', '0.2.6')],
   project: [createConfigDirMigration('droid-project', '0.1.5')],
   coach: [createConfigDirMigration('droid-coach', '0.1.3')],
+  // Global migration for the droid meta-tool
+  droid: [createPlatformSyncMigration('0.25.0')],
 };
 
 /**
@@ -111,7 +191,10 @@ export function getLastMigratedVersion(toolName: string): string {
 /**
  * Update the last migrated version for a tool
  */
-export function setLastMigratedVersion(toolName: string, version: string): void {
+export function setLastMigratedVersion(
+  toolName: string,
+  version: string,
+): void {
   const config = loadConfig();
   if (!config.migrations) {
     config.migrations = {};
@@ -127,7 +210,7 @@ export function setLastMigratedVersion(toolName: string, version: string): void
 export function runMigrations(
   toolName: string,
   fromVersion: string,
-  toVersion: string
+  toVersion: string,
 ): { success: boolean; error?: string } {
   const migrations = getToolMigrations(toolName);
 
@@ -151,10 +234,20 @@ export function runMigrations(
       migration.up(configDir);
       logMigration(toolName, fromVersion, migration.version, 'OK');
     } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : String(error);
-      logMigration(toolName, fromVersion, migration.version, 'FAILED', errorMessage);
+      const errorMessage =
+        error instanceof Error ? error.message : String(error);
+      logMigration(
+        toolName,
+        fromVersion,
+        migration.version,
+        'FAILED',
+        errorMessage,
+      );
       // Don't update version marker on failure - will retry next time
-      return { success: false, error: `Migration ${migration.version} failed: ${errorMessage}` };
+      return {
+        success: false,
+        error: `Migration ${migration.version} failed: ${errorMessage}`,
+      };
     }
   }
 
@@ -169,7 +262,7 @@ export function runMigrations(
  */
 export function runToolMigrations(
   toolName: string,
-  installedVersion: string
+  installedVersion: string,
 ): { success: boolean; error?: string } {
   const lastMigrated = getLastMigratedVersion(toolName);
 

package/src/lib/quotes.ts

@@ -5,13 +5,13 @@
 export const quotes = [
   "I'm probably the droid you are looking for.",
   "These are the skills you're looking for.",
-  "I have a bad feeling about this, we might be too efficient.",
-  "May the source be with you.",
-  "The Force is strong with this one.",
-  "This is the way.",
+  'I have a bad feeling about this, we might be too efficient.',
+  'May the source be with you.',
+  'The Force is strong with this one.',
+  'This is the way.',
   "I'm fluent in over six million forms of communication. - `/comments`",
-  "Much to learn, you still have. - `/coach`",
-  "If into the archives you go, only knowledge will you find. - `/project`",
+  'Much to learn, you still have. - `/coach`',
+  'If into the archives you go, only knowledge will you find. - `/project`',
 ];
 
 /**

package/src/lib/skills.ts

@@ -1,10 +1,29 @@
-import { existsSync, readdirSync, readFileSync, mkdirSync, writeFileSync, rmSync } from 'fs';
+import {
+  existsSync,
+  readdirSync,
+  readFileSync,
+  mkdirSync,
+  writeFileSync,
+  rmSync,
+} from 'fs';
 import { join, dirname, basename } from 'path';
 import { fileURLToPath } from 'url';
 import YAML from 'yaml';
 import { loadConfig, saveConfig } from './config';
-import { Platform, SkillStatus, type SkillManifest, type InstalledSkill, getPlatformTools, setPlatformTools } from './types';
-import { getInstalledAgentsDir, installAgentFromPath, uninstallAgent, isAgentInstalled } from './agents';
+import {
+  Platform,
+  SkillStatus,
+  type SkillManifest,
+  type InstalledSkill,
+  getPlatformTools,
+  setPlatformTools,
+} from './types';
+import {
+  getInstalledAgentsDir,
+  installAgentFromPath,
+  uninstallAgent,
+  isAgentInstalled,
+} from './agents';
 import { getSkillsPath, getCommandsPath, getConfigPath } from './platforms';
 import { loadToolManifest } from './tools';
 import { runToolMigrations } from './migrations';
@@ -47,7 +66,10 @@ export function getPlatformConfigPath(platform: Platform): string {
 /**
  * Update the platform's config file with skill registrations
  */
-export function updatePlatformConfigSkills(platform: Platform, installedSkills: string[]): void {
+export function updatePlatformConfigSkills(
+  platform: Platform,
+  installedSkills: string[],
+): void {
   const configPath = getPlatformConfigPath(platform);
 
   let content = '';
@@ -56,14 +78,15 @@ export function updatePlatformConfigSkills(platform: Platform, installedSkills:
   }
 
   // Generate skills section
-  const skillLines = installedSkills.map(name => {
+  const skillLines = installedSkills.map((name) => {
     const relativePath = `skills/${name}/SKILL.md`;
     return `- [${name}](${relativePath})`;
   });
 
-  const skillsSection = installedSkills.length > 0
-    ? `${DROID_SKILLS_START}\n## Droid Skills\n\n${skillLines.join('\n')}\n${DROID_SKILLS_END}`
-    : '';
+  const skillsSection =
+    installedSkills.length > 0
+      ? `${DROID_SKILLS_START}\n## Droid Skills\n\n${skillLines.join('\n')}\n${DROID_SKILLS_END}`
+      : '';
 
   // Check if section already exists
   const startIdx = content.indexOf(DROID_SKILLS_START);
@@ -71,7 +94,10 @@ export function updatePlatformConfigSkills(platform: Platform, installedSkills:
 
   if (startIdx !== -1 && endIdx !== -1) {
     // Replace existing section
-    content = content.slice(0, startIdx) + skillsSection + content.slice(endIdx + DROID_SKILLS_END.length);
+    content =
+      content.slice(0, startIdx) +
+      skillsSection +
+      content.slice(endIdx + DROID_SKILLS_END.length);
   } else if (skillsSection) {
     // Append new section
     content = content.trim() + '\n\n' + skillsSection + '\n';
@@ -89,7 +115,9 @@ export function updatePlatformConfigSkills(platform: Platform, installedSkills:
 /**
  * Parse YAML frontmatter from SKILL.md content
  */
-function parseSkillFrontmatter(content: string): Record<string, unknown> | null {
+function parseSkillFrontmatter(
+  content: string,
+): Record<string, unknown> | null {
   const trimmed = content.trimStart();
   if (!trimmed.startsWith('---')) {
     return null;
@@ -131,7 +159,7 @@ export function loadSkillManifest(skillDir: string): SkillManifest | null {
 
   return {
     name: frontmatter.name as string,
-    description: frontmatter.description as string || '',
+    description: (frontmatter.description as string) || '',
     version: toolManifest?.version || '0.0.0',
     status: toolManifest?.status,
     dependencies: toolManifest?.dependencies,
@@ -143,7 +171,9 @@ export function loadSkillManifest(skillDir: string): SkillManifest | null {
  * Find the path to a skill within the tools directory structure
  * Returns { toolDir, skillDir } or null if not found
  */
-export function findSkillPath(skillName: string): { toolDir: string; skillDir: string } | null {
+export function findSkillPath(
+  skillName: string,
+): { toolDir: string; skillDir: string } | null {
   if (!existsSync(BUNDLED_SKILLS_DIR)) {
     return null;
   }
@@ -257,7 +287,11 @@ export function getSkillsWithUpdates(): Array<{
 }> {
   const config = loadConfig();
   const tools = getPlatformTools(config);
-  const updates: Array<{ name: string; installedVersion: string; bundledVersion: string }> = [];
+  const updates: Array<{
+    name: string;
+    installedVersion: string;
+    bundledVersion: string;
+  }> = [];
 
   for (const skillName of Object.keys(tools)) {
     const status = getSkillUpdateStatus(skillName);
@@ -276,7 +310,10 @@ export function getSkillsWithUpdates(): Array<{
 /**
  * Update a skill to the latest bundled version
  */
-export function updateSkill(skillName: string): { success: boolean; message: string } {
+export function updateSkill(skillName: string): {
+  success: boolean;
+  message: string;
+} {
   const status = getSkillUpdateStatus(skillName);
 
   if (!status.installedVersion) {
@@ -284,11 +321,17 @@ export function updateSkill(skillName: string): { success: boolean; message: str
   }
 
   if (!status.bundledVersion) {
-    return { success: false, message: `Skill '${skillName}' not found in bundled skills` };
+    return {
+      success: false,
+      message: `Skill '${skillName}' not found in bundled skills`,
+    };
   }
 
   if (!status.hasUpdate) {
-    return { success: false, message: `Skill '${skillName}' is already at latest version (${status.installedVersion})` };
+    return {
+      success: false,
+      message: `Skill '${skillName}' is already at latest version (${status.installedVersion})`,
+    };
   }
 
   // Reinstall the skill (install handles overwriting existing files)
@@ -348,7 +391,10 @@ export function updateAllSkills(): {
 /**
  * Install a skill
  */
-export function installSkill(skillName: string): { success: boolean; message: string } {
+export function installSkill(skillName: string): {
+  success: boolean;
+  message: string;
+} {
   const config = loadConfig();
   const skillPath = findSkillPath(skillName);
 
@@ -359,7 +405,10 @@ export function installSkill(skillName: string): { success: boolean; message: st
   const { toolDir, skillDir } = skillPath;
   const manifest = loadSkillManifest(skillDir);
   if (!manifest) {
-    return { success: false, message: `Invalid skill manifest for '${skillName}'` };
+    return {
+      success: false,
+      message: `Invalid skill manifest for '${skillName}'`,
+    };
   }
 
   // Check dependencies
@@ -412,7 +461,9 @@ export function installSkill(skillName: string): { success: boolean; message: st
         rmSync(oldSkillDir, { recursive: true });
       } catch (error) {
         // Non-fatal: Log warning but continue installation
-        console.warn(`Warning: Could not remove old skill directory ${oldSkillDir}: ${error}`);
+        console.warn(
+          `Warning: Could not remove old skill directory ${oldSkillDir}: ${error}`,
+        );
       }
     }
 
@@ -433,14 +484,40 @@ export function installSkill(skillName: string): { success: boolean; message: st
   // Check for collisions BEFORE installing (only if not already installed by droid)
   // Note: If skill folder exists but skill isn't in config, we allow overwriting (stale state
   // from platform switch or manual cleanup). Command/agent collisions still checked.
-  if (!tools[skillName]) {
+  //
+  // Special handling for droid- prefix migration (temporary workaround for Claude Code bug #14945):
+  // If installing droid-comments, check if 'comments' is in config (old naming)
+  const oldSkillName = skillName.startsWith('droid-')
+    ? skillName.replace(/^droid-/, '')
+    : null;
+  const isAlreadyInstalled =
+    tools[skillName] || (oldSkillName && tools[oldSkillName]);
+
+  if (!isAlreadyInstalled) {
+    // For collision detection, also check if this is the same tool (with/without droid- prefix)
+    // E.g., installing droid-comments should be allowed to overwrite existing comments.md
+    //
+    // TO REVERSE WHEN BUG #14945 IS FIXED:
+    // Remove the normalizedToolName logic - tools will have original names without droid- prefix
+    const toolName = basename(toolDir);
+    const normalizedToolName = toolName.replace(/^droid-/, '');
+
     // Check command file collisions (these could conflict with other skills)
     if (existsSync(commandsSource)) {
-      const commandFiles = readdirSync(commandsSource).filter(f => f.endsWith('.md') && f.toLowerCase() !== 'readme.md');
+      const commandFiles = readdirSync(commandsSource).filter(
+        (f) => f.endsWith('.md') && f.toLowerCase() !== 'readme.md',
+      );
       for (const file of commandFiles) {
         const targetCommandPath = join(commandsPath, file);
         if (existsSync(targetCommandPath)) {
           const commandName = file.replace('.md', '');
+
+          // Allow overwrite if the command name matches the tool name (with/without prefix)
+          // E.g., installing 'comments' tool can overwrite 'comments.md'
+          if (commandName === toolName || commandName === normalizedToolName) {
+            continue; // Same tool, allow overwrite
+          }
+
           return {
             success: false,
             message: `Cannot install: command /${commandName} already exists at ${targetCommandPath}`,
@@ -451,10 +528,10 @@ export function installSkill(skillName: string): { success: boolean; message: st
 
     // Check bundled agent collisions
     if (existsSync(agentsSource)) {
-      const agentDirs = readdirSync(agentsSource, { withFileTypes: true })
-        .filter(dirent => dirent.isDirectory())
-        .map(dirent => dirent.name);
-      for (const agentName of agentDirs) {
+      const agentFiles = readdirSync(agentsSource, { withFileTypes: true })
+        .filter((dirent) => dirent.isFile() && dirent.name.endsWith('.md'))
+        .map((dirent) => dirent.name.replace('.md', ''));
+      for (const agentName of agentFiles) {
         if (isAgentInstalled(agentName)) {
           return {
             success: false,
@@ -488,7 +565,9 @@ export function installSkill(skillName: string): { success: boolean; message: st
     if (!existsSync(targetReferencesDir)) {
       mkdirSync(targetReferencesDir, { recursive: true });
     }
-    const referenceFiles = readdirSync(referencesSource).filter(f => f.endsWith('.md'));
+    const referenceFiles = readdirSync(referencesSource).filter((f) =>
+      f.endsWith('.md'),
+    );
     for (const file of referenceFiles) {
       const sourcePath = join(referencesSource, file);
       const targetPath = join(targetReferencesDir, file);
@@ -497,12 +576,32 @@ export function installSkill(skillName: string): { success: boolean; message: st
     }
   }
 
+  // Copy scripts if present (deterministic CLI scripts for the skill)
+  const scriptsSource = join(skillDir, 'scripts');
+  if (existsSync(scriptsSource)) {
+    const targetScriptsDir = join(targetSkillDir, 'scripts');
+    if (!existsSync(targetScriptsDir)) {
+      mkdirSync(targetScriptsDir, { recursive: true });
+    }
+    const scriptFiles = readdirSync(scriptsSource).filter(
+      (f) => f.endsWith('.ts') || f.endsWith('.js') || f.endsWith('.py'),
+    );
+    for (const file of scriptFiles) {
+      const sourcePath = join(scriptsSource, file);
+      const targetPath = join(targetScriptsDir, file);
+      const content = readFileSync(sourcePath, 'utf-8');
+      writeFileSync(targetPath, content);
+    }
+  }
+
   // Copy commands if present (from tool level)
   if (existsSync(commandsSource)) {
     if (!existsSync(commandsPath)) {
       mkdirSync(commandsPath, { recursive: true });
     }
-    const commandFiles = readdirSync(commandsSource).filter(f => f.endsWith('.md') && f.toLowerCase() !== 'readme.md');
+    const commandFiles = readdirSync(commandsSource).filter(
+      (f) => f.endsWith('.md') && f.toLowerCase() !== 'readme.md',
+    );
     for (const file of commandFiles) {
       const sourcePath = join(commandsSource, file);
       const targetPath = join(commandsPath, file);
@@ -514,13 +613,13 @@ export function installSkill(skillName: string): { success: boolean; message: st
   // Install bundled agents if present (from tool level)
   const installedAgents: string[] = [];
   if (existsSync(agentsSource)) {
-    const agentDirs = readdirSync(agentsSource, { withFileTypes: true })
-      .filter(dirent => dirent.isDirectory())
-      .map(dirent => dirent.name);
+    const agentFiles = readdirSync(agentsSource, { withFileTypes: true })
+      .filter((dirent) => dirent.isFile() && dirent.name.endsWith('.md'))
+      .map((dirent) => dirent.name.replace('.md', ''));
 
-    for (const agentName of agentDirs) {
-      const agentDir = join(agentsSource, agentName);
-      const result = installAgentFromPath(agentDir, agentName);
+    for (const agentName of agentFiles) {
+      const agentPath = join(agentsSource, `${agentName}.md`);
+      const result = installAgentFromPath(agentPath, agentName);
       if (result.success) {
         installedAgents.push(agentName);
       }
@@ -548,16 +647,24 @@ export function installSkill(skillName: string): { success: boolean; message: st
   const migrationResult = runToolMigrations(toolName, manifest.version);
   if (!migrationResult.success) {
     // Log warning but don't fail the install - migration will retry next time
-    console.warn(`Warning: Migration failed for ${toolName}: ${migrationResult.error}`);
+    console.warn(
+      `Warning: Migration failed for ${toolName}: ${migrationResult.error}`,
+    );
   }
 
-  return { success: true, message: `Installed ${skillName} v${manifest.version}` };
+  return {
+    success: true,
+    message: `Installed ${skillName} v${manifest.version}`,
+  };
 }
 
 /**
  * Uninstall a skill
  */
-export function uninstallSkill(skillName: string): { success: boolean; message: string } {
+export function uninstallSkill(skillName: string): {
+  success: boolean;
+  message: string;
+} {
   const config = loadConfig();
   const tools = getPlatformTools(config);
 
@@ -577,7 +684,9 @@ export function uninstallSkill(skillName: string): { success: boolean; message:
   const commandsPath = getCommandsInstallPath(config.platform);
   const commandsSource = skillPath ? join(skillPath.toolDir, 'commands') : null;
   if (commandsSource && existsSync(commandsSource)) {
-    const commandFiles = readdirSync(commandsSource).filter(f => f.endsWith('.md') && f.toLowerCase() !== 'readme.md');
+    const commandFiles = readdirSync(commandsSource).filter(
+      (f) => f.endsWith('.md') && f.toLowerCase() !== 'readme.md',
+    );
     for (const file of commandFiles) {
       const commandPath = join(commandsPath, file);
       if (existsSync(commandPath)) {
@@ -627,7 +736,10 @@ export function getSkillStatusDisplay(status?: SkillStatus): string {
  * @param commandName - The display name (e.g., "comments check")
  * @param skillName - The skill the command belongs to
  */
-export function isCommandInstalled(commandName: string, skillName: string): boolean {
+export function isCommandInstalled(
+  commandName: string,
+  skillName: string,
+): boolean {
   // If the parent skill is installed, the command is installed with it
   if (isSkillInstalled(skillName)) {
     return true;
@@ -652,7 +764,7 @@ export function isCommandInstalled(commandName: string, skillName: string): bool
  */
 export function installCommand(
   commandName: string,
-  skillName: string
+  skillName: string,
 ): { success: boolean; message: string } {
   const config = loadConfig();
 
@@ -664,7 +776,10 @@ export function installCommand(
 
   const commandsDir = join(skillPath.toolDir, 'commands');
   if (!existsSync(commandsDir)) {
-    return { success: false, message: `No commands found for skill '${skillName}'` };
+    return {
+      success: false,
+      message: `No commands found for skill '${skillName}'`,
+    };
   }
 
   // Find the source command file
@@ -672,14 +787,19 @@ export function installCommand(
     ? commandName.slice(skillName.length + 1)
     : commandName;
 
-  const files = readdirSync(commandsDir).filter(f => f.endsWith('.md') && f.toLowerCase() !== 'readme.md');
-  const sourceFile = files.find(f => {
+  const files = readdirSync(commandsDir).filter(
+    (f) => f.endsWith('.md') && f.toLowerCase() !== 'readme.md',
+  );
+  const sourceFile = files.find((f) => {
     const base = f.replace('.md', '');
     return base === cmdPart || base === cmdPart.replace(/\s+/g, '-');
   });
 
   if (!sourceFile) {
-    return { success: false, message: `Command file not found for: ${commandName}` };
+    return {
+      success: false,
+      message: `Command file not found for: ${commandName}`,
+    };
   }
 
   // Ensure commands directory exists
@@ -705,7 +825,7 @@ export function installCommand(
  */
 export function uninstallCommand(
   commandName: string,
-  skillName: string
+  skillName: string,
 ): { success: boolean; message: string } {
   const config = loadConfig();
 
@@ -737,7 +857,10 @@ export function uninstallCommand(
         rmSync(commandPath);
         return { success: true, message: `Uninstalled /${commandName}` };
       } catch (error) {
-        return { success: false, message: `Failed to uninstall command: ${error}` };
+        return {
+          success: false,
+          message: `Failed to uninstall command: ${error}`,
+        };
       }
     }
   }

package/src/tools/codex/TOOL.yaml

@@ -1,6 +1,6 @@
 name: codex
 description: "Shared organizational knowledge - PRDs, tech designs, domains, proposals, patterns, and explored topics. Use when loading project context, searching codex, capturing decisions, or creating new entries."
-version: 0.1.0
+version: 0.1.2
 status: beta
 
 includes: