cursor-guard 4.9.6 → 4.9.8

package/references/vscode-extension/dist/guard-version.json

@@ -1 +1 @@
-{"version":"4.9.6"}
+{"version":"4.9.8"}

package/references/vscode-extension/dist/lib/dashboard-manager.js

@@ -3,16 +3,18 @@
 const fs = require('fs');
 const path = require('path');
 const http = require('http');
-const { spawn } = require('child_process');
-const { guardPath } = require('./paths');
-
-const CONFIG_FILE = '.cursor-guard.json';
-
-class DashboardManager {
-  constructor() {
-    this._instance = null;
-    this._serverModule = null;
-  }
+const { spawn } = require('child_process');
+const { guardPath } = require('./paths');
+
+const CONFIG_FILE = '.cursor-guard.json';
+const WATCHER_START_GRACE_MS = 8000;
+
+class DashboardManager {
+  constructor() {
+    this._instance = null;
+    this._serverModule = null;
+    this._startingWatchers = new Map();
+  }
 
   get running() { return !!this._instance; }
   get port() { return this._instance?.port; }
@@ -83,7 +85,7 @@ class DashboardManager {
     return this.fetchApi(`/api/backup-files?id=${projectId}&hash=${hash}`);
   }
 
-  async snapshotNow(projectPath) {
+  async snapshotNow(projectPath) {
     if (!projectPath) return;
     try {
       const { createGitSnapshot } = require(guardPath('lib', 'core', 'snapshot'));
@@ -93,50 +95,98 @@ class DashboardManager {
     } catch (e) {
       return { status: 'error', error: e.message };
     }
-  }
-
-  startWatcher(projectPath) {
-    if (!projectPath) return null;
-    const existingPid = this.getWatcherPid(projectPath);
-    if (existingPid) return existingPid;
-    const cliScript = guardPath('bin', 'cursor-guard-backup.js');
+  }
+
+  _getWatcherLockPath(projectPath) {
+    try {
+      const { gitAvailable, isGitRepo, gitDir: getGitDir } = require(guardPath('lib', 'utils'));
+      const repo = gitAvailable() && isGitRepo(projectPath);
+      if (repo) {
+        const gDir = getGitDir(projectPath);
+        if (gDir) return path.join(gDir, 'cursor-guard.lock');
+      }
+    } catch { /* ignore */ }
+    return path.join(projectPath, '.cursor-guard-backup', 'cursor-guard.lock');
+  }
+
+  _getPendingWatcherPid(projectPath) {
+    const pending = this._startingWatchers.get(projectPath);
+    if (!pending) return null;
+    try {
+      process.kill(pending.pid, 0);
+      return pending.pid;
+    } catch {
+      this._startingWatchers.delete(projectPath);
+      return null;
+    }
+  }
+
+  _clearPendingWatcher(projectPath, pid) {
+    const pending = this._startingWatchers.get(projectPath);
+    if (!pending) return;
+    if (pid == null || pending.pid === pid) {
+      this._startingWatchers.delete(projectPath);
+    }
+  }
+
+  startWatcher(projectPath) {
+    if (!projectPath) return null;
+    const existingPid = this.getWatcherPid(projectPath);
+    if (existingPid) return existingPid;
+    const cliScript = guardPath('bin', 'cursor-guard-backup.js');
     const child = spawn(process.execPath, [cliScript, '--path', projectPath], {
       cwd: projectPath,
       stdio: 'ignore',
-      detached: true,
-      env: { ...process.env, GUARD_SPAWNED_BY_EXT: '1' },
-    });
-    child.unref();
-    return child.pid;
-  }
-
-  stopWatcher(projectPath) {
-    if (!projectPath) return false;
-    try {
-      const lockPath = path.join(projectPath, '.cursor-guard-backup.lock');
-      if (!fs.existsSync(lockPath)) return false;
-      const lockData = JSON.parse(fs.readFileSync(lockPath, 'utf-8'));
-      if (lockData.pid) {
-        process.kill(lockData.pid, 'SIGTERM');
-        try { fs.unlinkSync(lockPath); } catch { /* ok */ }
-        return true;
-      }
-    } catch { /* ok */ }
-    return false;
-  }
-
-  getWatcherPid(projectPath) {
-    try {
-      const lockPath = path.join(projectPath, '.cursor-guard-backup.lock');
-      if (!fs.existsSync(lockPath)) return null;
-      const lockData = JSON.parse(fs.readFileSync(lockPath, 'utf-8'));
-      if (lockData.pid) {
-        process.kill(lockData.pid, 0);
-        return lockData.pid;
-      }
-    } catch { /* not running */ }
-    return null;
-  }
+      detached: true,
+      env: { ...process.env, GUARD_SPAWNED_BY_EXT: '1' },
+    });
+    this._startingWatchers.set(projectPath, { pid: child.pid, startedAt: Date.now() });
+    const clearPending = () => this._clearPendingWatcher(projectPath, child.pid);
+    child.once('exit', clearPending);
+    child.once('error', clearPending);
+    setTimeout(clearPending, WATCHER_START_GRACE_MS);
+    child.unref();
+    return child.pid;
+  }
+
+  stopWatcher(projectPath) {
+    if (!projectPath) return false;
+    const pendingPid = this._getPendingWatcherPid(projectPath);
+    if (pendingPid) {
+      try { process.kill(pendingPid, 'SIGTERM'); } catch { /* ignore */ }
+      this._clearPendingWatcher(projectPath, pendingPid);
+    }
+    try {
+      const lockPath = this._getWatcherLockPath(projectPath);
+      if (!fs.existsSync(lockPath)) return false;
+      const content = fs.readFileSync(lockPath, 'utf-8');
+      const pidMatch = content.match(/pid=(\d+)/);
+      if (pidMatch) {
+        process.kill(parseInt(pidMatch[1], 10), 'SIGTERM');
+      }
+      try { fs.unlinkSync(lockPath); } catch { /* ok */ }
+      return true;
+    } catch { /* ok */ }
+    return !!pendingPid;
+  }
+
+  getWatcherPid(projectPath) {
+    const pendingPid = this._getPendingWatcherPid(projectPath);
+    if (pendingPid) return pendingPid;
+    try {
+      const lockPath = this._getWatcherLockPath(projectPath);
+      if (!fs.existsSync(lockPath)) return null;
+      const content = fs.readFileSync(lockPath, 'utf-8');
+      const pidMatch = content.match(/pid=(\d+)/);
+      if (pidMatch) {
+        const pid = parseInt(pidMatch[1], 10);
+        process.kill(pid, 0);
+        this._clearPendingWatcher(projectPath, pid);
+        return pid;
+      }
+    } catch { /* not running */ }
+    return null;
+  }
 
   dispose() {
     this._instance = null;

package/references/vscode-extension/dist/lib/locale.js

@@ -0,0 +1,36 @@
+'use strict';
+
+const vscode = require('vscode');
+
+const EXTENSION_LOCALE_KEY = 'cursorGuard.locale';
+
+function normalizeLocale(locale) {
+  return locale === 'zh-CN' ? 'zh-CN' : 'en-US';
+}
+
+function detectLocale() {
+  return normalizeLocale(
+    (vscode.env.language || '').toLowerCase().startsWith('zh') ? 'zh-CN' : 'en-US'
+  );
+}
+
+function getLocale(storage) {
+  if (!storage || typeof storage.get !== 'function') return detectLocale();
+  return normalizeLocale(storage.get(EXTENSION_LOCALE_KEY) || detectLocale());
+}
+
+async function setLocale(storage, locale) {
+  const normalized = normalizeLocale(locale);
+  if (storage && typeof storage.update === 'function') {
+    await storage.update(EXTENSION_LOCALE_KEY, normalized);
+  }
+  return normalized;
+}
+
+module.exports = {
+  EXTENSION_LOCALE_KEY,
+  normalizeLocale,
+  detectLocale,
+  getLocale,
+  setLocale,
+};