@misterhuydo/sentinel 1.4.72 → 1.4.74

package/.cairn/session.json

@@ -1,6 +1,6 @@
 {
-  "message": "Auto-checkpoint at 2026-03-26T18:49:49.152Z",
-  "checkpoint_at": "2026-03-26T18:49:49.153Z",
+  "message": "Auto-checkpoint at 2026-03-26T19:12:24.024Z",
+  "checkpoint_at": "2026-03-26T19:12:24.038Z",
   "active_files": [],
   "notes": [],
   "mtime_snapshot": {}

package/lib/add.js

@@ -289,24 +289,46 @@ async function addFromGit(gitUrl, workspace) {
   if (existingAccess.ok) {
     ok(`${repoSlug}: reachable via existing SSH key — skipping deploy key generation`);
   } else {
+    const keyAlreadyExisted = fs.existsSync(path.join(os.homedir(), '.ssh', `${repoSlug}.key`));
     const { keyFile: generatedKey } = generateDeployKey(repoSlug);
     keyFile = generatedKey;
-    printDeployKeyInstructions(orgRepo, keyFile);
-
-    await prompts({
-      type: 'text', name: '_', format: () => '',
-      message: chalk.bold(`Press Enter once you've added the deploy key to GitHub…`),
-    }, { onCancel: () => process.exit(0) });
-
-    // Validate primary repo with deploy key
-    const primary = validateAccess(gitUrl, keyFile);
-    if (!primary.ok) {
-      console.error(chalk.red('  ✖ Cannot reach ' + gitUrl));
-      if (primary.stderr) console.error(chalk.red('    ' + primary.stderr));
-      console.error(chalk.yellow('  Check the deploy key has write access, then re-run.'));
-      process.exit(1);
+
+    // If key already existed, try it immediately — skip prompt if it works
+    if (keyAlreadyExisted) {
+      const primary = validateAccess(gitUrl, keyFile);
+      if (primary.ok) {
+        ok(`${repoSlug}: reachable (reusing existing deploy key)`);
+      } else {
+        // Key exists but doesn't work (e.g. not yet added to GitHub) — show instructions
+        printDeployKeyInstructions(orgRepo, keyFile);
+        await prompts({
+          type: 'text', name: '_', format: () => '',
+          message: chalk.bold(`Press Enter once you've added the deploy key to GitHub…`),
+        }, { onCancel: () => process.exit(0) });
+        const retry = validateAccess(gitUrl, keyFile);
+        if (!retry.ok) {
+          console.error(chalk.red('  ✖ Cannot reach ' + gitUrl));
+          if (retry.stderr) console.error(chalk.red('    ' + retry.stderr));
+          console.error(chalk.yellow('  Check the deploy key has write access, then re-run.'));
+          process.exit(1);
+        }
+        ok(`${repoSlug}: reachable`);
+      }
+    } else {
+      printDeployKeyInstructions(orgRepo, keyFile);
+      await prompts({
+        type: 'text', name: '_', format: () => '',
+        message: chalk.bold(`Press Enter once you've added the deploy key to GitHub…`),
+      }, { onCancel: () => process.exit(0) });
+      const primary = validateAccess(gitUrl, keyFile);
+      if (!primary.ok) {
+        console.error(chalk.red('  ✖ Cannot reach ' + gitUrl));
+        if (primary.stderr) console.error(chalk.red('    ' + primary.stderr));
+        console.error(chalk.yellow('  Check the deploy key has write access, then re-run.'));
+        process.exit(1);
+      }
+      ok(`${repoSlug}: reachable`);
     }
-    ok(`${repoSlug}: reachable`);
   }
 
   // ── 2. Clone primary repo and discover additional repos ────────────────────

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@misterhuydo/sentinel",
-  "version": "1.4.72",
+  "version": "1.4.74",
   "description": "Sentinel — Autonomous DevOps Agent installer and manager",
   "bin": {
     "sentinel": "./bin/sentinel.js"

package/python/sentinel/main.py

@@ -632,13 +632,14 @@ async def _send_startup_email_delayed(cfg, results: dict, delay: int = 300):
 
 # ── Config repo polling ──────────────────────────────────────────────────────────────────────────
 
-def _config_repo_git_env() -> dict:
+def _config_repo_git_env(project_dir: Path | None = None) -> dict:
     """Return env with GIT_SSH_COMMAND pointing to ~/.ssh/<slug>.key if it exists."""
     env = os.environ.copy()
     try:
+        cwd = str((project_dir or Path(".")).resolve())
         r = subprocess.run(
             ["git", "remote", "get-url", "origin"],
-            capture_output=True, text=True, timeout=5,
+            cwd=cwd, capture_output=True, text=True, timeout=5,
         )
         remote = r.stdout.strip()
         # Extract slug: git@github.com:org/repo.git or https://github.com/org/repo.git
@@ -662,7 +663,7 @@ def _poll_config_repo(cfg_loader: ConfigLoader) -> bool:
             ["git", "pull", "--rebase", "--autostash"],
             cwd=str(project_dir),
             capture_output=True, text=True, timeout=30,
-            env=_config_repo_git_env(),
+            env=_config_repo_git_env(project_dir),
         )
         if result.returncode != 0:
             logger.warning("Config repo git pull failed: %s", result.stderr.strip())