ccsini 0.1.58 → 0.1.60

package/dist/index.js

@@ -28005,6 +28005,42 @@ var init_auth = __esm(() => {
   init_src();
 });
 
+// src/core/schema.ts
+var exports_schema = {};
+__export(exports_schema, {
+  saveDefaultSchema: () => saveDefaultSchema,
+  loadSchema: () => loadSchema,
+  getEnabledCategories: () => getEnabledCategories
+});
+import { readFile as readFile2, writeFile as writeFile2 } from "fs/promises";
+import { join as join2 } from "path";
+async function saveDefaultSchema(configDir) {
+  const schema = buildDefaultSchema();
+  await writeFile2(join2(configDir, "schema.yaml"), JSON.stringify(schema, null, 2));
+}
+async function loadSchema(configDir) {
+  const raw = await readFile2(join2(configDir, "schema.yaml"), "utf-8");
+  return JSON.parse(raw);
+}
+function getEnabledCategories(schema) {
+  return Object.entries(schema.categories).filter(([, config]) => config.enabled).map(([name]) => name);
+}
+function buildDefaultSchema() {
+  const categories = {};
+  for (const [cat, patterns] of Object.entries(DEFAULT_CATEGORY_PATTERNS)) {
+    const category = cat;
+    categories[category] = {
+      enabled: true,
+      patterns,
+      merge: MERGE_STRATEGIES[category]
+    };
+  }
+  return { version: 1, categories };
+}
+var init_schema = __esm(() => {
+  init_src();
+});
+
 // ../../node_modules/.bun/commander@13.1.0/node_modules/commander/esm.mjs
 var import__ = __toESM(require_commander(), 1);
 var {
@@ -28022,7 +28058,7 @@ var {
 } = import__.default;
 
 // src/version.ts
-var VERSION = "0.1.58";
+var VERSION = "0.1.60";
 
 // src/commands/init.ts
 init_source();
@@ -28765,26 +28801,8 @@ async function saveSessionConfig(configDir, sessionConfig) {
   await writeFile(configPath, JSON.stringify(config, null, 2));
 }
 
-// src/core/schema.ts
-init_src();
-import { readFile as readFile2, writeFile as writeFile2 } from "fs/promises";
-import { join as join2 } from "path";
-async function saveDefaultSchema(configDir) {
-  const schema = buildDefaultSchema();
-  await writeFile2(join2(configDir, "schema.yaml"), JSON.stringify(schema, null, 2));
-}
-function buildDefaultSchema() {
-  const categories = {};
-  for (const [cat, patterns] of Object.entries(DEFAULT_CATEGORY_PATTERNS)) {
-    const category = cat;
-    categories[category] = {
-      enabled: true,
-      patterns,
-      merge: MERGE_STRATEGIES[category]
-    };
-  }
-  return { version: 1, categories };
-}
+// src/commands/init.ts
+init_schema();
 
 // src/hooks/installer.ts
 import { readFile as readFile3, writeFile as writeFile3 } from "fs/promises";
@@ -29082,12 +29100,27 @@ class CcsiniClient {
       throw new Error("Failed to reset account data");
     return res.json();
   }
-  async heartbeat(mode) {
-    await fetch(`${this.apiUrl}/api/sync/heartbeat`, {
+  async heartbeat(mode, stats) {
+    const res = await fetch(`${this.apiUrl}/api/sync/heartbeat`, {
       method: "POST",
       headers: this.getHeaders(),
-      body: JSON.stringify({ mode: mode ?? "hook" })
+      body: JSON.stringify({
+        mode: mode ?? "hook",
+        ...stats && {
+          pushCount: stats.pushCount,
+          pullCount: stats.pullCount,
+          lastError: stats.lastError,
+          conflicts: stats.conflicts,
+          version: stats.version,
+          categories: stats.categories,
+          conflictFiles: stats.conflictFiles
+        }
+      })
     });
+    if (res.ok) {
+      return res.json();
+    }
+    return {};
   }
   async logSyncEvent(event) {
     await fetch(`${this.apiUrl}/api/sync/log`, {
@@ -31758,10 +31791,53 @@ async function runDaemon() {
       log(configDir, `Pull error: ${e.message}`);
     }
   }
+  async function listConflictFiles() {
+    try {
+      const { readdir: readdir4 } = await import("fs/promises");
+      const files = await readdir4(configDir);
+      return files.filter((f) => f.endsWith(".conflict"));
+    } catch {
+      return [];
+    }
+  }
+  async function getCategories() {
+    try {
+      const { loadSchema: loadSchema2, getEnabledCategories: getEnabledCategories2 } = await Promise.resolve().then(() => (init_schema(), exports_schema));
+      const schema = await loadSchema2(configDir);
+      return getEnabledCategories2(schema);
+    } catch {
+      return [];
+    }
+  }
+  async function deleteConflictFiles() {
+    try {
+      const { unlink: unlink2 } = await import("fs/promises");
+      const files = await listConflictFiles();
+      for (const f of files) {
+        await unlink2(join11(configDir, f)).catch(() => {});
+      }
+      if (files.length > 0) {
+        log(configDir, `Resolved ${files.length} conflict file(s) via dashboard`);
+      }
+    } catch {}
+  }
   async function doHeartbeat() {
     try {
       const client = await getAuthenticatedClient(configDir);
-      await client.heartbeat("daemon");
+      const conflictFiles = await listConflictFiles();
+      const categories = await getCategories();
+      const result = await client.heartbeat("daemon", {
+        pushCount: status.pushCount,
+        pullCount: status.pullCount,
+        lastError: status.lastError,
+        conflicts: conflictFiles.length,
+        version: VERSION,
+        categories,
+        conflictFiles
+      });
+      if (result.resolveConflicts) {
+        await deleteConflictFiles();
+      }
     } catch (e) {
       log(configDir, `Heartbeat error: ${e.message}`);
     }
@@ -32675,19 +32751,18 @@ function registerDaemonCommands(program2) {
       console.log("Daemon is not running (cleaned up stale PID file).");
       return;
     }
-    const isWin = platform5() === "win32";
-    if (isWin) {
-      const { execSync: execSync3 } = await import("child_process");
-      try {
-        execSync3(`taskkill /PID ${pid} /F`, { stdio: "ignore" });
-      } catch {
-        console.error(`Failed to stop daemon (PID ${pid}).`);
-        return;
-      }
-    } else {
-      try {
-        process.kill(pid, "SIGTERM");
-      } catch {
+    try {
+      process.kill(pid, "SIGTERM");
+    } catch {
+      if (platform5() === "win32") {
+        const { execSync: execSync3 } = await import("child_process");
+        try {
+          execSync3(`taskkill /PID ${pid} /T /F`, { stdio: "ignore", timeout: 5000 });
+        } catch {
+          console.error(`Failed to stop daemon (PID ${pid}). Kill it manually via Task Manager.`);
+          return;
+        }
+      } else {
         console.error(`Failed to stop daemon (PID ${pid}).`);
         return;
       }

package/package.json

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