ccsini 0.1.23 → 0.1.25

package/dist/index.js

@@ -27996,7 +27996,7 @@ var {
 } = import__.default;
 
 // src/version.ts
-var VERSION = "0.1.23";
+var VERSION = "0.1.25";
 
 // src/commands/init.ts
 init_source();
@@ -28737,7 +28737,13 @@ function buildDefaultSchema() {
 // src/hooks/installer.ts
 import { readFile as readFile3, writeFile as writeFile3 } from "fs/promises";
 import { join as join3 } from "path";
-var HOOK_MARKER = "ccsini-auto-sync";
+var HOOK_MARKER = "ccsini auto-";
+var OLD_HOOK_MARKER = "ccsini-auto-sync";
+var OLD_COMMAND_SUFFIX = /\s*#\s*ccsini-auto-sync$/;
+function isCcsiniHook(hookEntry) {
+  const s = JSON.stringify(hookEntry);
+  return s.includes(HOOK_MARKER) || s.includes(OLD_HOOK_MARKER);
+}
 async function installHooks(claudeDir) {
   const settingsPath = join3(claudeDir, "settings.json");
   let settings = {};
@@ -28747,26 +28753,26 @@ async function installHooks(claudeDir) {
   } catch {}
   settings.hooks = settings.hooks ?? {};
   settings.hooks.PreToolUse = [
-    ...(settings.hooks.PreToolUse ?? []).filter((h) => !h.command?.includes(HOOK_MARKER))
+    ...(settings.hooks.PreToolUse ?? []).filter((h) => !isCcsiniHook(h))
   ];
   settings.hooks.Stop = [
-    ...(settings.hooks.Stop ?? []).filter((h) => !JSON.stringify(h).includes(HOOK_MARKER)),
+    ...(settings.hooks.Stop ?? []).filter((h) => !isCcsiniHook(h)),
     {
       hooks: [
         {
           type: "command",
-          command: `ccsini auto-push # ${HOOK_MARKER}`
+          command: "ccsini auto-push"
         }
       ]
     }
   ];
   settings.hooks.Notification = [
-    ...(settings.hooks.Notification ?? []).filter((h) => !JSON.stringify(h).includes(HOOK_MARKER)),
+    ...(settings.hooks.Notification ?? []).filter((h) => !isCcsiniHook(h)),
     {
       hooks: [
         {
           type: "command",
-          command: `ccsini auto-pull # ${HOOK_MARKER}`
+          command: "ccsini auto-pull"
         }
       ]
     }
@@ -28778,11 +28784,110 @@ async function hooksInstalled(claudeDir) {
     const raw = await readFile3(join3(claudeDir, "settings.json"), "utf-8");
     const settings = JSON.parse(raw);
     const allHooks = JSON.stringify(settings.hooks ?? {});
-    return allHooks.includes(HOOK_MARKER);
+    return allHooks.includes(HOOK_MARKER) || allHooks.includes(OLD_HOOK_MARKER);
   } catch {
     return false;
   }
 }
+async function fixHooks(claudeDir) {
+  const settingsPath = join3(claudeDir, "settings.json");
+  const details = [];
+  let fixed = 0;
+  let raw;
+  try {
+    raw = await readFile3(settingsPath, "utf-8");
+  } catch {
+    return { fixed, details: ["No settings.json found"] };
+  }
+  let settings;
+  try {
+    settings = JSON.parse(raw);
+  } catch {
+    return { fixed, details: ["settings.json is not valid JSON"] };
+  }
+  if (!settings.hooks)
+    return { fixed, details };
+  for (const hookType of Object.keys(settings.hooks)) {
+    if (!Array.isArray(settings.hooks[hookType]))
+      continue;
+    for (const hookEntry of settings.hooks[hookType]) {
+      if (!isCcsiniHook(hookEntry))
+        continue;
+      if ("matcher" in hookEntry && typeof hookEntry.matcher !== "string") {
+        delete hookEntry.matcher;
+        details.push(`Removed invalid matcher from ${hookType} hook`);
+        fixed++;
+      }
+      if (typeof hookEntry.command === "string" && OLD_COMMAND_SUFFIX.test(hookEntry.command)) {
+        hookEntry.command = hookEntry.command.replace(OLD_COMMAND_SUFFIX, "");
+        details.push(`Stripped old marker suffix from ${hookType} command`);
+        fixed++;
+      }
+      if (Array.isArray(hookEntry.hooks)) {
+        for (const innerHook of hookEntry.hooks) {
+          if ("matcher" in innerHook && typeof innerHook.matcher !== "string") {
+            delete innerHook.matcher;
+            details.push(`Removed invalid matcher from ${hookType} inner hook`);
+            fixed++;
+          }
+          if (typeof innerHook.command === "string" && OLD_COMMAND_SUFFIX.test(innerHook.command)) {
+            innerHook.command = innerHook.command.replace(OLD_COMMAND_SUFFIX, "");
+            details.push(`Stripped old marker suffix from ${hookType} inner command`);
+            fixed++;
+          }
+        }
+      }
+    }
+  }
+  if (fixed > 0) {
+    await writeFile3(settingsPath, JSON.stringify(settings, null, 2));
+  }
+  return { fixed, details };
+}
+async function checkHooksHealth(claudeDir) {
+  const settingsPath = join3(claudeDir, "settings.json");
+  const issues = [];
+  let raw;
+  try {
+    raw = await readFile3(settingsPath, "utf-8");
+  } catch {
+    return { healthy: true, issues };
+  }
+  let settings;
+  try {
+    settings = JSON.parse(raw);
+  } catch {
+    issues.push("settings.json is not valid JSON");
+    return { healthy: false, issues };
+  }
+  if (!settings.hooks)
+    return { healthy: true, issues };
+  for (const hookType of Object.keys(settings.hooks)) {
+    if (!Array.isArray(settings.hooks[hookType]))
+      continue;
+    for (const hookEntry of settings.hooks[hookType]) {
+      if (!isCcsiniHook(hookEntry))
+        continue;
+      if ("matcher" in hookEntry && typeof hookEntry.matcher !== "string") {
+        issues.push(`${hookType}: matcher is ${typeof hookEntry.matcher}, expected string`);
+      }
+      if (typeof hookEntry.command === "string" && OLD_COMMAND_SUFFIX.test(hookEntry.command)) {
+        issues.push(`${hookType}: command has old marker suffix that causes argument errors`);
+      }
+      if (Array.isArray(hookEntry.hooks)) {
+        for (const innerHook of hookEntry.hooks) {
+          if ("matcher" in innerHook && typeof innerHook.matcher !== "string") {
+            issues.push(`${hookType} inner hook: matcher is ${typeof innerHook.matcher}, expected string`);
+          }
+          if (typeof innerHook.command === "string" && OLD_COMMAND_SUFFIX.test(innerHook.command)) {
+            issues.push(`${hookType} inner hook: command has old marker suffix that causes argument errors`);
+          }
+        }
+      }
+    }
+  }
+  return { healthy: issues.length === 0, issues };
+}
 
 // src/core/transport.ts
 class CcsiniClient {
@@ -29483,7 +29588,17 @@ function registerDoctorCommand(program2) {
     const config = await loadKeys(configDir);
     console.log(source_default.green(`  \u2713 Device: ${config.deviceName} (${config.deviceId.slice(0, 8)}...)`));
     if (await hooksInstalled(claudeDir)) {
-      console.log(source_default.green("  \u2713 Hooks installed correctly"));
+      console.log(source_default.green("  \u2713 Hooks installed"));
+      const { healthy, issues } = await checkHooksHealth(claudeDir);
+      if (healthy) {
+        console.log(source_default.green("  \u2713 Hooks format valid"));
+      } else {
+        for (const issue of issues) {
+          console.log(source_default.red(`  \u2717 ${issue}`));
+        }
+        console.log(source_default.yellow("    Run 'ccsini hooks fix' to repair"));
+        allGood = false;
+      }
     } else {
       console.log(source_default.yellow("  \u26A0 Hooks not installed (run 'ccsini init')"));
       allGood = false;
@@ -29556,6 +29671,12 @@ function registerSelfCommands(program2) {
       execSync(cmd, { stdio: "inherit" });
       console.log(`
 Updated to v${latest}`);
+      try {
+        const { fixed } = await fixHooks(getClaudeDir());
+        if (fixed > 0) {
+          console.log(`Repaired ${fixed} hook issue${fixed > 1 ? "s" : ""} in Claude Code settings.`);
+        }
+      } catch {}
       console.log("Restart your terminal to use the new version.");
     } catch {
       console.error(`
@@ -29822,6 +29943,30 @@ function registerSyncCommands(program2) {
   });
 }
 
+// src/commands/hooks.ts
+init_source();
+function registerHooksCommands(program2) {
+  const hooksCmd = program2.command("hooks").description("Manage Claude Code hooks");
+  hooksCmd.command("fix").description("Repair broken hook entries in Claude Code settings").action(async () => {
+    const claudeDir = getClaudeDir();
+    console.log(source_default.bold(`
+  Checking hooks...
+`));
+    const { fixed, details } = await fixHooks(claudeDir);
+    if (fixed === 0) {
+      console.log(source_default.green(`  Hooks are already healthy. Nothing to fix.
+`));
+      return;
+    }
+    for (const detail of details) {
+      console.log(source_default.yellow(`  Fixed: ${detail}`));
+    }
+    console.log(source_default.green(`
+  Repaired ${fixed} hook issue${fixed > 1 ? "s" : ""}.
+`));
+  });
+}
+
 // src/index.ts
 var program2 = new Command;
 program2.name("ccsini").description("Claude Code seamless sync across devices").version(VERSION);
@@ -29830,6 +29975,7 @@ registerAutoCommands(program2);
 registerDoctorCommand(program2);
 registerSelfCommands(program2);
 registerSyncCommands(program2);
+registerHooksCommands(program2);
 program2.command("version").description("Show current version").action(() => {
   console.log(VERSION);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccsini",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "description": "Claude Code seamless sync across devices",
   "type": "module",
   "bin": {