ccsini 0.1.24 → 0.1.26

package/dist/index.js

@@ -27996,7 +27996,7 @@ var {
 } = import__.default;
 
 // src/version.ts
-var VERSION = "0.1.24";
+var VERSION = "0.1.26";
 
 // 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,7 +28784,7 @@ 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;
   }
@@ -28805,13 +28811,18 @@ async function fixHooks(claudeDir) {
     if (!Array.isArray(settings.hooks[hookType]))
       continue;
     for (const hookEntry of settings.hooks[hookType]) {
-      if (!JSON.stringify(hookEntry).includes(HOOK_MARKER))
+      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") {
@@ -28819,6 +28830,11 @@ async function fixHooks(claudeDir) {
             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++;
+          }
         }
       }
     }
@@ -28850,16 +28866,22 @@ async function checkHooksHealth(claudeDir) {
     if (!Array.isArray(settings.hooks[hookType]))
       continue;
     for (const hookEntry of settings.hooks[hookType]) {
-      if (!JSON.stringify(hookEntry).includes(HOOK_MARKER))
+      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`);
+          }
         }
       }
     }
@@ -29338,6 +29360,8 @@ function chunkArray(arr, size) {
 }
 
 // src/commands/init.ts
+import { writeFile as writeFile6 } from "fs/promises";
+import { join as join7 } from "path";
 function registerInitCommand(program2) {
   program2.command("init").description("Connect this device to your ccsini account").option("--token <token>", "Setup token from dashboard").action(async (opts) => {
     const configDir = getConfigDir();
@@ -29368,24 +29392,6 @@ function registerInitCommand(program2) {
       ]);
       token = answer.token;
     }
-    const { password } = await dist_default12.prompt([
-      {
-        type: "password",
-        name: "password",
-        message: "Set your encryption password (encrypts data locally):",
-        mask: "*",
-        validate: (v) => v.length >= 8 || "Password must be at least 8 characters"
-      }
-    ]);
-    const { confirmPassword } = await dist_default12.prompt([
-      {
-        type: "password",
-        name: "confirmPassword",
-        message: "Confirm encryption password:",
-        mask: "*",
-        validate: (v) => v === password || "Passwords do not match"
-      }
-    ]);
     const { deviceName } = await dist_default12.prompt([
       {
         type: "input",
@@ -29395,30 +29401,105 @@ function registerInitCommand(program2) {
       }
     ]);
     const spinner = ora("Setting up...").start();
+    let keypair;
+    let publicKeyB64;
+    let privateKeyB64;
+    let deviceId;
+    let existingSalt;
     try {
       spinner.text = "Generating device keypair...";
-      const keypair = await generateDeviceKeypair();
-      const publicKeyB64 = await exportPublicKey(keypair.publicKey);
-      const privateKeyB64 = await exportPrivateKey(keypair.privateKey);
+      keypair = await generateDeviceKeypair();
+      publicKeyB64 = await exportPublicKey(keypair.publicKey);
+      privateKeyB64 = await exportPrivateKey(keypair.privateKey);
       spinner.text = "Registering device...";
       const client = new CcsiniClient("https://ccsini-api.anis-maisara190.workers.dev", "");
-      const { deviceId, salt: existingSalt } = await client.registerDevice(token, deviceName, publicKeyB64, detectPlatform());
-      spinner.text = "Setting up encryption...";
-      let salt;
-      if (existingSalt) {
-        salt = new Uint8Array(Buffer.from(existingSalt, "hex"));
-      } else {
-        salt = crypto.getRandomValues(new Uint8Array(32));
+      const result = await client.registerDevice(token, deviceName, publicKeyB64, detectPlatform());
+      deviceId = result.deviceId;
+      existingSalt = result.salt;
+      spinner.stop();
+    } catch (e) {
+      spinner.fail(e.message);
+      process.exit(1);
+    }
+    const isMultiDevice = !!existingSalt;
+    let masterKey;
+    let salt;
+    if (isMultiDevice) {
+      salt = new Uint8Array(Buffer.from(existingSalt, "hex"));
+      const MAX_ATTEMPTS = 3;
+      for (let attempt = 1;attempt <= MAX_ATTEMPTS; attempt++) {
+        const { password } = await dist_default12.prompt([
+          {
+            type: "password",
+            name: "password",
+            message: "Enter your encryption password (same as your first device):",
+            mask: "*",
+            validate: (v) => v.length >= 8 || "Password must be at least 8 characters"
+          }
+        ]);
+        const derivingSpinner = ora("Deriving encryption key...").start();
+        masterKey = await deriveKeyFromPassphrase(password, salt);
+        try {
+          const { importPrivateKey: importPrivateKey2, createDeviceJWT: createDeviceJWT2 } = await Promise.resolve().then(() => (init_auth(), exports_auth));
+          const privateKey = await importPrivateKey2(privateKeyB64);
+          const jwt = await createDeviceJWT2(privateKey, deviceId);
+          const authedClient = new CcsiniClient("https://ccsini-api.anis-maisara190.workers.dev", jwt);
+          derivingSpinner.text = "Validating password...";
+          const manifestEnc = await authedClient.getManifest();
+          if (manifestEnc) {
+            decryptFile(masterKey, "__manifest__", manifestEnc);
+          }
+          derivingSpinner.stop();
+          break;
+        } catch {
+          derivingSpinner.stop();
+          if (attempt < MAX_ATTEMPTS) {
+            console.log(source_default.red(`  Password doesn't match your first device. ${MAX_ATTEMPTS - attempt} attempt(s) remaining.`));
+          } else {
+            console.log(source_default.red(`
+  Too many failed attempts. Please verify your password and try again.`));
+            process.exit(1);
+          }
+        }
       }
-      await deriveKeyFromPassphrase(password, salt);
-      if (!existingSalt) {
+    } else {
+      const { password } = await dist_default12.prompt([
+        {
+          type: "password",
+          name: "password",
+          message: "Set your encryption password (encrypts data locally):",
+          mask: "*",
+          validate: (v) => v.length >= 8 || "Password must be at least 8 characters"
+        }
+      ]);
+      await dist_default12.prompt([
+        {
+          type: "password",
+          name: "confirmPassword",
+          message: "Confirm encryption password:",
+          mask: "*",
+          validate: (v) => v === password || "Passwords do not match"
+        }
+      ]);
+      salt = crypto.getRandomValues(new Uint8Array(32));
+      const derivingSpinner = ora("Deriving encryption key...").start();
+      masterKey = await deriveKeyFromPassphrase(password, salt);
+      derivingSpinner.stop();
+      const uploadSpinner = ora("Uploading encryption salt...").start();
+      try {
         const { importPrivateKey: importPrivateKey2, createDeviceJWT: createDeviceJWT2 } = await Promise.resolve().then(() => (init_auth(), exports_auth));
         const privateKey = await importPrivateKey2(privateKeyB64);
         const jwt = await createDeviceJWT2(privateKey, deviceId);
         const authedClient = new CcsiniClient("https://ccsini-api.anis-maisara190.workers.dev", jwt);
         await authedClient.putSalt(Buffer.from(salt).toString("hex"));
+        uploadSpinner.stop();
+      } catch (e) {
+        uploadSpinner.fail(e.message);
+        process.exit(1);
       }
-      spinner.text = "Saving configuration...";
+    }
+    const saveSpinner = ora("Saving configuration...").start();
+    try {
       await saveKeys(configDir, {
         salt,
         devicePrivateKey: privateKeyB64,
@@ -29427,10 +29508,13 @@ function registerInitCommand(program2) {
         deviceName,
         apiUrl: "https://ccsini-api.anis-maisara190.workers.dev"
       });
+      await writeFile6(join7(configDir, ".cached-key"), masterKey, {
+        mode: 384
+      });
       await saveDefaultSchema(configDir);
-      spinner.text = "Installing Claude Code hooks...";
+      saveSpinner.text = "Installing Claude Code hooks...";
       await installHooks(getClaudeDir());
-      spinner.succeed("Setup complete!");
+      saveSpinner.succeed("Setup complete!");
       console.log(source_default.green(`
   \u2713 Encryption keys generated`));
       console.log(source_default.green("  \u2713 Device registered"));
@@ -29440,7 +29524,7 @@ function registerInitCommand(program2) {
   Just use 'claude' as normal. Sync happens automatically.
 `));
     } catch (e) {
-      spinner.fail(e.message);
+      saveSpinner.fail(e.message);
       process.exit(1);
     }
   });
@@ -29457,10 +29541,10 @@ function detectPlatform() {
 // src/commands/auto.ts
 init_auth();
 init_auth();
-import { readFile as readFile7, writeFile as writeFile6 } from "fs/promises";
-import { join as join7 } from "path";
+import { readFile as readFile7, writeFile as writeFile7 } from "fs/promises";
+import { join as join8 } from "path";
 async function getMasterKey(configDir) {
-  const cachedKeyPath = join7(configDir, ".cached-key");
+  const cachedKeyPath = join8(configDir, ".cached-key");
   try {
     const cached = await readFile7(cachedKeyPath);
     return new Uint8Array(cached);
@@ -29520,7 +29604,7 @@ function registerAutoCommands(program2) {
     ]);
     const config = await loadKeys(configDir);
     const masterKey = await deriveKeyFromPassphrase(password, config.salt);
-    await writeFile6(join7(configDir, ".cached-key"), masterKey, {
+    await writeFile7(join8(configDir, ".cached-key"), masterKey, {
       mode: 384
     });
     console.log("Unlocked. Auto-sync is now active.");
@@ -29529,7 +29613,7 @@ function registerAutoCommands(program2) {
     const configDir = getConfigDir();
     const { rm } = await import("fs/promises");
     try {
-      await rm(join7(configDir, ".cached-key"));
+      await rm(join8(configDir, ".cached-key"));
       console.log("Locked. Auto-sync paused until next unlock.");
     } catch {
       console.log("Already locked.");
@@ -29540,7 +29624,7 @@ function registerAutoCommands(program2) {
 // src/commands/doctor.ts
 init_source();
 import { access as access2 } from "fs/promises";
-import { join as join8 } from "path";
+import { join as join9 } from "path";
 function registerDoctorCommand(program2) {
   program2.command("doctor").description("Diagnose ccsini setup and connectivity").action(async () => {
     const configDir = getConfigDir();
@@ -29582,7 +29666,7 @@ function registerDoctorCommand(program2) {
       allGood = false;
     }
     try {
-      await access2(join8(configDir, ".cached-key"));
+      await access2(join9(configDir, ".cached-key"));
       console.log(source_default.green("  \u2713 Auto-sync unlocked"));
     } catch {
       console.log(source_default.yellow("  \u26A0 Auto-sync locked (run 'ccsini unlock')"));
@@ -29690,9 +29774,9 @@ Uninstall failed. Try manually:`);
 // src/commands/sync.ts
 init_auth();
 import { readFile as readFile8 } from "fs/promises";
-import { join as join9 } from "path";
+import { join as join10 } from "path";
 async function getMasterKey2(configDir) {
-  const cachedKeyPath = join9(configDir, ".cached-key");
+  const cachedKeyPath = join10(configDir, ".cached-key");
   try {
     const cached = await readFile8(cachedKeyPath);
     return new Uint8Array(cached);
@@ -29708,8 +29792,8 @@ async function getMasterKey2(configDir) {
     ]);
     const config = await loadKeys(configDir);
     const masterKey = await deriveKeyFromPassphrase(password, config.salt);
-    const { writeFile: writeFile7 } = await import("fs/promises");
-    await writeFile7(cachedKeyPath, masterKey, { mode: 384 });
+    const { writeFile: writeFile8 } = await import("fs/promises");
+    await writeFile8(cachedKeyPath, masterKey, { mode: 384 });
     return masterKey;
   }
 }

package/package.json

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