@cloudstreamsoftware/claude-tools 1.2.1 → 1.2.2

package/bin/cloudstream-setup.js

@@ -24,7 +24,8 @@ const CONFIG = {
   claudeDir: path.join(os.homedir(), '.claude'),
   knowledgeApiUrl: 'https://cloudstream-knowledge.broken-rain-0984.workers.dev',
   requiredDirs: [
-    'hooks/scripts',
+    'scripts/hooks',
+    'scripts/lib',
     'skills',
     'agents',
     'commands',
@@ -188,25 +189,43 @@ async function copyConfigWithMerge(sourceDir, targetDir) {
 }
 
 /**
- * Update hook paths to use absolute paths
+ * Merge hooks into ~/.claude/settings.json
+ * Claude Code reads hooks from settings.json, not from a separate hooks.json file
  */
-async function updateHookPaths() {
-  const hooksJsonPath = path.join(CONFIG.claudeDir, 'hooks', 'hooks.json');
+async function mergeHooksIntoSettings() {
+  const settingsPath = path.join(CONFIG.claudeDir, 'settings.json');
+  const packageHooksPath = path.join(__dirname, '..', 'hooks', 'hooks.json');
 
   try {
-    const content = await fs.readFile(hooksJsonPath, 'utf8');
-    let hooksConfig = JSON.parse(content);
+    // Read package hooks
+    const hooksContent = await fs.readFile(packageHooksPath, 'utf8');
+    const hooksConfig = JSON.parse(hooksContent);
 
-    // Replace ${CLAUDE_PLUGIN_ROOT} with actual home directory path
+    // Update paths to absolute (replace placeholders)
     const homeDir = os.homedir().replace(/\\/g, '/');
-    const updatedContent = JSON.stringify(hooksConfig, null, 2)
-      .replace(/\$\{CLAUDE_PLUGIN_ROOT\}/g, `${homeDir}/.claude`)
-      .replace(/\$\{HOME\}/g, homeDir);
+    const hooksWithAbsolutePaths = JSON.parse(
+      JSON.stringify(hooksConfig.hooks)
+        .replace(/\$\{CLAUDE_PLUGIN_ROOT\}/g, `${homeDir}/.claude`)
+        .replace(/\$\{HOME\}/g, homeDir)
+    );
+
+    // Read existing settings or create empty object
+    let settings = {};
+    try {
+      const existing = await fs.readFile(settingsPath, 'utf8');
+      settings = JSON.parse(existing);
+    } catch (e) {
+      // File doesn't exist, start fresh
+    }
 
-    await fs.writeFile(hooksJsonPath, updatedContent);
-    logSuccess('Hook paths updated to absolute paths');
+    // Merge hooks into settings
+    settings.hooks = hooksWithAbsolutePaths;
+
+    // Write back to settings.json
+    await fs.writeFile(settingsPath, JSON.stringify(settings, null, 2));
+    logSuccess('Hooks merged into settings.json');
   } catch (error) {
-    logWarning(`Could not update hook paths: ${error.message}`);
+    logWarning(`Could not merge hooks into settings: ${error.message}`);
   }
 }
 
@@ -405,26 +424,32 @@ async function setup() {
       logWarning(`Some configuration files could not be copied: ${error.message}`);
     }
 
-    // Copy hooks.json to ~/.claude/hooks/
-    const packageHooksJson = path.join(__dirname, '..', 'hooks', 'hooks.json');
-    const targetHooksJson = path.join(CONFIG.claudeDir, 'hooks', 'hooks.json');
+    // Merge hooks into settings.json (Claude Code reads hooks from settings.json)
     try {
-      await fs.copyFile(packageHooksJson, targetHooksJson);
-      await updateHookPaths();
+      await mergeHooksIntoSettings();
       logSuccess('Hooks configuration installed');
     } catch (error) {
-      logWarning(`Hooks configuration could not be copied: ${error.message}`);
+      logWarning(`Hooks configuration could not be installed: ${error.message}`);
     }
 
-    // Copy hook scripts to ~/.claude/hooks/scripts/
+    // Copy hook scripts to ~/.claude/scripts/hooks/ (where hooks.json expects them)
     const packageScriptsDir = path.join(__dirname, '..', 'scripts', 'hooks');
-    const targetScriptsDir = path.join(CONFIG.claudeDir, 'hooks', 'scripts');
+    const targetScriptsDir = path.join(CONFIG.claudeDir, 'scripts', 'hooks');
     try {
       await copyConfigWithMerge(packageScriptsDir, targetScriptsDir);
     } catch (error) {
       // Scripts directory may not exist, that's ok
     }
 
+    // Copy lib scripts to ~/.claude/scripts/lib/ (shared utilities for hooks)
+    const packageLibDir = path.join(__dirname, '..', 'scripts', 'lib');
+    const targetLibDir = path.join(CONFIG.claudeDir, 'scripts', 'lib');
+    try {
+      await copyConfigWithMerge(packageLibDir, targetLibDir);
+    } catch (error) {
+      // Lib directory may not exist, that's ok
+    }
+
     // Step 6: Configure MCP server
     logStep('6/7', 'Configuring MCP server connection...');
     await configureMcpServer(licenseKey);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudstreamsoftware/claude-tools",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "CloudStream Claude Code productivity tools - hooks, skills, agents, and knowledge server integration",
   "main": "dist/index.js",
   "bin": {