fix: excessive git commits in data repo on every server startup

Author: dinhanhthi

docs/changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.1.1
+
+- Fix excessive git commits in data repo on every server startup (only `lastSeen` timestamp change in `machines.json`)
+
 ## v0.1.0
 
 - Add desktop notifications (macOS, Windows, Linux) when new conflicts are detected

landing/index.html

@@ -112,7 +112,7 @@
           AI Sync
           <span
             class="rounded-full bg-muted px-1.5 py-0.5 text-xs h-fit font-medium text-muted-foreground"
-            >v0.1.0</span
+            >v0.1.1</span
           >
         </a>
         <div class="flex items-center gap-3">

package.json

@@ -1,7 +1,7 @@
 {
   "name": "ai-sync",
   "author": "Anh-Thi Dinh",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "repository": "https://github.com/anhthiding/ai-sync",
   "private": true,
   "license": "MIT",

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ai-sync/server",
   "author": "Anh-Thi Dinh",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "repository": "https://github.com/anhthiding/ai-sync",
   "private": true,
   "license": "MIT",

packages/server/src/services/__tests__/machines.test.ts

@@ -146,16 +146,29 @@ describe('registerCurrentMachine', () => {
     expect(data.machines[MACHINE_ID].lastSeen).toBeTruthy();
   });
 
-  it('updates lastSeen on subsequent calls', async () => {
+  it('skips write when lastSeen is recent (within 1 day)', () => {
     registerCurrentMachine();
     const first = readMachinesFile().machines[MACHINE_ID].lastSeen;
 
-    // Small delay to ensure different timestamp
-    await new Promise((r) => setTimeout(r, 10));
     registerCurrentMachine();
     const second = readMachinesFile().machines[MACHINE_ID].lastSeen;
 
-    expect(second >= first).toBe(true);
+    // Should be identical since lastSeen is still fresh
+    expect(second).toBe(first);
+  });
+
+  it('updates lastSeen when it is older than 1 day', () => {
+    // Manually write an old lastSeen
+    const data = readMachinesFile();
+    const oldDate = new Date(Date.now() - 2 * 24 * 60 * 60 * 1000).toISOString();
+    data.machines[MACHINE_ID] = { name: MACHINE_NAME, lastSeen: oldDate };
+    writeMachinesFile(data);
+
+    registerCurrentMachine();
+    const updated = readMachinesFile().machines[MACHINE_ID].lastSeen;
+
+    expect(updated).not.toBe(oldDate);
+    expect(new Date(updated).getTime()).toBeGreaterThan(new Date(oldDate).getTime());
   });
 });
 

packages/server/src/services/machines.ts

@@ -63,13 +63,39 @@ function sortKeys<T>(obj: Record<string, T>): Record<string, T> {
   return sorted;
 }
 
+/**
+ * Register/update the current machine in machines.json.
+ * Only writes the file when something meaningful changed:
+ * - Machine is new (not in file yet)
+ * - Machine name changed
+ * - lastSeen is older than 1 day (UI only shows date, not time)
+ * This avoids creating a git commit on every server startup.
+ */
 export function registerCurrentMachine(): void {
   const data = readMachinesFile();
-  data.machines[config.machineId] = {
-    name: config.machineName,
-    lastSeen: new Date().toISOString(),
-  };
-  writeMachinesFile(data);
+  const existing = data.machines[config.machineId];
+  const now = new Date();
+
+  let needsWrite = false;
+  if (!existing) {
+    needsWrite = true;
+  } else if (existing.name !== config.machineName) {
+    needsWrite = true;
+  } else {
+    const lastSeen = new Date(existing.lastSeen);
+    const ageMs = now.getTime() - lastSeen.getTime();
+    if (ageMs > 24 * 60 * 60 * 1000) {
+      needsWrite = true;
+    }
+  }
+
+  if (needsWrite) {
+    data.machines[config.machineId] = {
+      name: config.machineName,
+      lastSeen: now.toISOString(),
+    };
+    writeMachinesFile(data);
+  }
 }
 
 export function setRepoMapping(storePath: string, localPath: string): void {

packages/ui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ai-sync/ui",
   "author": "Anh-Thi Dinh",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "repository": "https://github.com/anhthiding/ai-sync",
   "private": true,
   "license": "MIT",