easegit-cli 1.0.2 → 1.0.3

package/dist/init.js

@@ -43,10 +43,15 @@ async function init() {
     }
     const gitDir = (0, plumbing_1.getGitDir)();
     const hooksDir = path.join(gitDir, 'hooks');
+    const configPath = path.join(gitDir, 'easegit.json');
     // Ensure hooks directory exists
     if (!fs.existsSync(hooksDir)) {
         fs.mkdirSync(hooksDir, { recursive: true });
     }
+    // Write config file so hooks can find the package
+    const packageRoot = path.join(__dirname, '..');
+    const config = { packageRoot };
+    fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
     // Hook definitions
     const hooks = [
         'pre-rebase',
@@ -57,17 +62,14 @@ async function init() {
     // Get the hooks template directory (from installed package)
     // This will be in node_modules/easegit/hooks or local hooks/ during development
     const packageHooksDir = path.join(__dirname, '..', 'hooks');
-    const packageRoot = path.join(__dirname, '..');
     // Install hooks
     for (const hookName of hooks) {
         const hookPath = path.join(hooksDir, hookName);
         const templatePath = path.join(packageHooksDir, hookName);
         if (fs.existsSync(templatePath)) {
-            // Copy the hook template and stamp in the absolute package root so hooks work even when the
-            // package is installed globally (no node_modules in the target repo).
+            // Copy the hook template as-is; hooks will read .git/easegit.json for package root
             const hookContent = fs.readFileSync(templatePath, 'utf8');
-            const stampedContent = hookContent.replace(/__EASEGIT_PACKAGE_ROOT__/g, packageRoot.replace(/\\/g, '/'));
-            fs.writeFileSync(hookPath, stampedContent, { mode: 0o755 });
+            fs.writeFileSync(hookPath, hookContent, { mode: 0o755 });
         }
     }
     console.log('EaseGit initialized successfully');

package/hooks/post-checkout

@@ -2,26 +2,69 @@
 
 // Post-checkout hook - creates checkpoint after checkout
 // Also detects failures and warns user
-const path = require('path');
-const defaultRoot = path.join(__dirname, '..', '..');
-const configuredRoot = process.env.EASEGIT_PACKAGE_ROOT || "__EASEGIT_PACKAGE_ROOT__";
-const packageRoot = configuredRoot.startsWith('__EASEGIT_PACKAGE_ROOT__') ? defaultRoot : configuredRoot;
-const { createCheckpoint } = require(path.join(packageRoot, 'dist', 'snapshot', 'create'));
-const { hasMergeConflicts, isDetachedHead, isDirty } = require(path.join(packageRoot, 'dist', 'git', 'plumbing'));
+const fs = require("fs");
+const path = require("path");
 
-// Create checkpoint for the new state
-createCheckpoint('checkout');
-
-// Check for problems after checkout
 try {
-  const hasConflicts = hasMergeConflicts();
-  const detached = isDetachedHead();
-  const dirty = isDirty();
-  
-  if (hasConflicts || (detached && dirty)) {
-    console.error('⚠ EaseGit: last Git operation damaged your working state.');
-    console.error('Run `easegit undo` to restore the last safe checkpoint.');
+  // Find .git directory by walking up from cwd
+  let gitDir = ".git";
+  if (!fs.existsSync(gitDir)) {
+    let current = process.cwd();
+    while (current !== path.dirname(current)) {
+      const candidate = path.join(current, ".git");
+      if (fs.existsSync(candidate)) {
+        gitDir = candidate;
+        break;
+      }
+      current = path.dirname(current);
+    }
+  }
+
+  // Read config written by easegit init
+  const configPath = path.join(gitDir, "easegit.json");
+  const config = JSON.parse(fs.readFileSync(configPath, "utf8"));
+  const packageRoot = config.packageRoot;
+
+  if (!packageRoot || !fs.existsSync(packageRoot)) {
+    throw new Error(`Invalid easegit config: packageRoot=${packageRoot}`);
+  }
+
+  // Now require the modules using the known package root
+  const { createCheckpoint } = require(path.join(
+    packageRoot,
+    "dist",
+    "snapshot",
+    "create"
+  ));
+  const { hasMergeConflicts, isDetachedHead, isDirty } = require(path.join(
+    packageRoot,
+    "dist",
+    "git",
+    "plumbing"
+  ));
+
+  // Create checkpoint for the new state
+  createCheckpoint("checkout");
+
+  // Check for problems after checkout
+  try {
+    const hasConflicts = hasMergeConflicts();
+    const detached = isDetachedHead();
+    const dirty = isDirty();
+
+    if (hasConflicts || (detached && dirty)) {
+      console.error(
+        "⚠ EaseGit: last Git operation damaged your working state."
+      );
+      console.error("Run `easegit undo` to restore the last safe checkpoint.");
+    }
+  } catch {
+    // Silent fail
   }
-} catch {
-  // Silent fail
+} catch (err) {
+  console.error(
+    "EaseGit post-checkout hook failed. Run `easegit init` to reinstall hooks."
+  );
+  console.error(`Error: ${err.message}`);
+  process.exit(1);
 }

package/hooks/pre-merge-commit

@@ -1,10 +1,45 @@
 #!/usr/bin/env node
 
 // Pre-merge hook - creates checkpoint before merge
-const path = require('path');
-const defaultRoot = path.join(__dirname, '..', '..');
-const configuredRoot = process.env.EASEGIT_PACKAGE_ROOT || "__EASEGIT_PACKAGE_ROOT__";
-const packageRoot = configuredRoot.startsWith('__EASEGIT_PACKAGE_ROOT__') ? defaultRoot : configuredRoot;
-const { createCheckpoint } = require(path.join(packageRoot, 'dist', 'snapshot', 'create'));
+const fs = require("fs");
+const path = require("path");
 
-createCheckpoint('merge');
+try {
+  // Find .git directory by walking up from cwd
+  let gitDir = ".git";
+  if (!fs.existsSync(gitDir)) {
+    let current = process.cwd();
+    while (current !== path.dirname(current)) {
+      const candidate = path.join(current, ".git");
+      if (fs.existsSync(candidate)) {
+        gitDir = candidate;
+        break;
+      }
+      current = path.dirname(current);
+    }
+  }
+
+  // Read config written by easegit init
+  const configPath = path.join(gitDir, "easegit.json");
+  const config = JSON.parse(fs.readFileSync(configPath, "utf8"));
+  const packageRoot = config.packageRoot;
+
+  if (!packageRoot || !fs.existsSync(packageRoot)) {
+    throw new Error(`Invalid easegit config: packageRoot=${packageRoot}`);
+  }
+
+  // Now require the module using the known package root
+  const { createCheckpoint } = require(path.join(
+    packageRoot,
+    "dist",
+    "snapshot",
+    "create"
+  ));
+  createCheckpoint("merge");
+} catch (err) {
+  console.error(
+    "EaseGit pre-merge hook failed. Run `easegit init` to reinstall hooks."
+  );
+  console.error(`Error: ${err.message}`);
+  process.exit(1);
+}

package/hooks/pre-push

@@ -1,10 +1,45 @@
 #!/usr/bin/env node
 
 // Pre-push hook - creates checkpoint before push
-const path = require('path');
-const defaultRoot = path.join(__dirname, '..', '..');
-const configuredRoot = process.env.EASEGIT_PACKAGE_ROOT || "__EASEGIT_PACKAGE_ROOT__";
-const packageRoot = configuredRoot.startsWith('__EASEGIT_PACKAGE_ROOT__') ? defaultRoot : configuredRoot;
-const { createCheckpoint } = require(path.join(packageRoot, 'dist', 'snapshot', 'create'));
+const fs = require("fs");
+const path = require("path");
 
-createCheckpoint('push');
+try {
+  // Find .git directory by walking up from cwd
+  let gitDir = ".git";
+  if (!fs.existsSync(gitDir)) {
+    let current = process.cwd();
+    while (current !== path.dirname(current)) {
+      const candidate = path.join(current, ".git");
+      if (fs.existsSync(candidate)) {
+        gitDir = candidate;
+        break;
+      }
+      current = path.dirname(current);
+    }
+  }
+
+  // Read config written by easegit init
+  const configPath = path.join(gitDir, "easegit.json");
+  const config = JSON.parse(fs.readFileSync(configPath, "utf8"));
+  const packageRoot = config.packageRoot;
+
+  if (!packageRoot || !fs.existsSync(packageRoot)) {
+    throw new Error(`Invalid easegit config: packageRoot=${packageRoot}`);
+  }
+
+  // Now require the module using the known package root
+  const { createCheckpoint } = require(path.join(
+    packageRoot,
+    "dist",
+    "snapshot",
+    "create"
+  ));
+  createCheckpoint("push");
+} catch (err) {
+  console.error(
+    "EaseGit pre-push hook failed. Run `easegit init` to reinstall hooks."
+  );
+  console.error(`Error: ${err.message}`);
+  process.exit(1);
+}

package/hooks/pre-rebase

@@ -1,10 +1,45 @@
 #!/usr/bin/env node
 
 // Pre-rebase hook - creates checkpoint before rebase
-const path = require('path');
-const defaultRoot = path.join(__dirname, '..', '..');
-const configuredRoot = process.env.EASEGIT_PACKAGE_ROOT || "__EASEGIT_PACKAGE_ROOT__";
-const packageRoot = configuredRoot.startsWith('__EASEGIT_PACKAGE_ROOT__') ? defaultRoot : configuredRoot;
-const { createCheckpoint } = require(path.join(packageRoot, 'dist', 'snapshot', 'create'));
+const fs = require("fs");
+const path = require("path");
 
-createCheckpoint('rebase');
+try {
+  // Find .git directory by walking up from cwd
+  let gitDir = ".git";
+  if (!fs.existsSync(gitDir)) {
+    let current = process.cwd();
+    while (current !== path.dirname(current)) {
+      const candidate = path.join(current, ".git");
+      if (fs.existsSync(candidate)) {
+        gitDir = candidate;
+        break;
+      }
+      current = path.dirname(current);
+    }
+  }
+
+  // Read config written by easegit init
+  const configPath = path.join(gitDir, "easegit.json");
+  const config = JSON.parse(fs.readFileSync(configPath, "utf8"));
+  const packageRoot = config.packageRoot;
+
+  if (!packageRoot || !fs.existsSync(packageRoot)) {
+    throw new Error(`Invalid easegit config: packageRoot=${packageRoot}`);
+  }
+
+  // Now require the module using the known package root
+  const { createCheckpoint } = require(path.join(
+    packageRoot,
+    "dist",
+    "snapshot",
+    "create"
+  ));
+  createCheckpoint("rebase");
+} catch (err) {
+  console.error(
+    "EaseGit pre-rebase hook failed. Run `easegit init` to reinstall hooks."
+  );
+  console.error(`Error: ${err.message}`);
+  process.exit(1);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easegit-cli",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Automatic checkpoints before Git can hurt you",
   "main": "dist/index.js",
   "bin": {