@misterhuydo/sentinel 1.0.3 → 1.0.4

package/lib/generate.js

@@ -1,127 +1,141 @@
-'use strict';
-
-const fs = require('fs-extra');
-const path = require('path');
-
-// ── Per-project files ─────────────────────────────────────────────────────────
-
-function writeExampleProject(projectDir, codeDir, pythonBin, anthropicKey = '') {
-  const configDir = path.join(projectDir, 'config', 'log-configs');
-  const repoDir   = path.join(projectDir, 'config', 'repo-configs');
-  fs.ensureDirSync(configDir);
-  fs.ensureDirSync(repoDir);
-
-  const tplDir = path.join(__dirname, '..', 'templates');
-  // Inject API key into sentinel.properties if provided
-  let sentinelProps = fs.readFileSync(path.join(tplDir, 'sentinel.properties'), 'utf8');
-  if (anthropicKey) {
-    sentinelProps += `\n# Anthropic API key for Claude Code (headless server auth)\nANTHROPIC_API_KEY=${anthropicKey}\n`;
-  } else {
-    sentinelProps += `\n# Anthropic API key — set this if using API key auth, or leave blank for OAuth\n# ANTHROPIC_API_KEY=sk-ant-...\n`;
-  }
-  fs.writeFileSync(path.join(projectDir, 'config', 'sentinel.properties'), sentinelProps);
-  fs.copySync(path.join(tplDir, 'log-configs', '_example.properties'), path.join(configDir, '_example.properties'));
-  fs.copySync(path.join(tplDir, 'repo-configs', '_example.properties'), path.join(repoDir,   '_example.properties'));
-
-  generateProjectScripts(projectDir, codeDir, pythonBin);
-}
-
-function generateProjectScripts(projectDir, codeDir, pythonBin) {
-  const name = path.basename(projectDir);
-
-  // init.sh
-  fs.writeFileSync(path.join(projectDir, 'init.sh'), `#!/usr/bin/env bash
-# First-time setup for this Sentinel project instance.
-#
-# What this does:
-#   - Clones any repos defined in config/repo-configs/ that don't exist locally yet
-#     (skips repos that are already cloned — safe to run multiple times)
-#   - Indexes each repo with Cairn MCP for codebase context
-#   - Tests SSH connectivity to each configured log source
-#   - Sends a test email to verify SMTP settings
-#
-# Note: ongoing repo management (git pull, conflict resolution) is handled
-# automatically by Sentinel on each fix cycle — you don't need to do it manually.
-set -euo pipefail
-cd "$(dirname "$0")"
-PYTHONPATH="${codeDir}" "${pythonBin}" -m sentinel.main --config ./config --init
-`, { mode: 0o755 });
-
-  // start.sh
-  fs.writeFileSync(path.join(projectDir, 'start.sh'), `#!/usr/bin/env bash
-# Start this Sentinel instance
-set -euo pipefail
-DIR="$(cd "$(dirname "$0")" && pwd)"
-PID_FILE="$DIR/sentinel.pid"
-
-if [[ -f "$PID_FILE" ]] && kill -0 "$(cat "$PID_FILE")" 2>/dev/null; then
-  echo "[sentinel] ${name} already running (PID $(cat "$PID_FILE"))"
-  exit 0
-fi
-
-mkdir -p "$DIR/logs" "$DIR/workspace/fetched" "$DIR/workspace/patches"
-cd "$DIR"
-PYTHONPATH="${codeDir}" "${pythonBin}" -m sentinel.main --config ./config \\
-  >> "$DIR/logs/sentinel.log" 2>&1 &
-echo $! > "$PID_FILE"
-echo "[sentinel] ${name} started (PID $!)"
-`, { mode: 0o755 });
-
-  // stop.sh
-  fs.writeFileSync(path.join(projectDir, 'stop.sh'), `#!/usr/bin/env bash
-# Stop this Sentinel instance
-set -euo pipefail
-DIR="$(cd "$(dirname "$0")" && pwd)"
-PID_FILE="$DIR/sentinel.pid"
-
-if [[ ! -f "$PID_FILE" ]]; then
-  echo "[sentinel] ${name} — no PID file, not running"
-  exit 0
-fi
-
-PID=$(cat "$PID_FILE")
-if kill -0 "$PID" 2>/dev/null; then
-  kill "$PID"
-  echo "[sentinel] ${name} stopped (PID $PID)"
-else
-  echo "[sentinel] ${name} — PID $PID not running"
-fi
-rm -f "$PID_FILE"
-`, { mode: 0o755 });
-}
-
-// ── Workspace-level startAll / stopAll ────────────────────────────────────────
-
-function generateWorkspaceScripts(workspace) {
-  // startAll.sh
-  fs.writeFileSync(path.join(workspace, 'startAll.sh'), `#!/usr/bin/env bash
-# Start all Sentinel project instances
-WORKSPACE="$(cd "$(dirname "$0")" && pwd)"
-started=0
-for project_dir in "$WORKSPACE"/*/; do
-  name=$(basename "$project_dir")
-  [[ "$name" == "code" ]] && continue
-  [[ -f "$project_dir/start.sh" ]] || continue
-  bash "$project_dir/start.sh"
-  started=$((started + 1))
-done
-echo "[sentinel] $started project(s) started"
-`, { mode: 0o755 });
-
-  // stopAll.sh
-  fs.writeFileSync(path.join(workspace, 'stopAll.sh'), `#!/usr/bin/env bash
-# Stop all Sentinel project instances
-WORKSPACE="$(cd "$(dirname "$0")" && pwd)"
-stopped=0
-for project_dir in "$WORKSPACE"/*/; do
-  name=$(basename "$project_dir")
-  [[ "$name" == "code" ]] && continue
-  [[ -f "$project_dir/stop.sh" ]] || continue
-  bash "$project_dir/stop.sh"
-  stopped=$((stopped + 1))
-done
-echo "[sentinel] $stopped project(s) stopped"
-`, { mode: 0o755 });
-}
-
-module.exports = { writeExampleProject, generateProjectScripts, generateWorkspaceScripts };
+'use strict';
+
+const fs = require('fs-extra');
+const path = require('path');
+
+// ── Per-project files ─────────────────────────────────────────────────────────
+
+function writeExampleProject(projectDir, codeDir, pythonBin, anthropicKey = '') {
+  const configDir = path.join(projectDir, 'config', 'log-configs');
+  const repoDir   = path.join(projectDir, 'config', 'repo-configs');
+  fs.ensureDirSync(configDir);
+  fs.ensureDirSync(repoDir);
+
+  const tplDir = path.join(__dirname, '..', 'templates');
+  // Inject API key into sentinel.properties if provided
+  let sentinelProps = fs.readFileSync(path.join(tplDir, 'sentinel.properties'), 'utf8');
+  if (anthropicKey) {
+    sentinelProps += `\n# Anthropic API key for Claude Code (headless server auth)\nANTHROPIC_API_KEY=${anthropicKey}\n`;
+  } else {
+    sentinelProps += `\n# Anthropic API key — set this if using API key auth, or leave blank for OAuth\n# ANTHROPIC_API_KEY=sk-ant-...\n`;
+  }
+  fs.writeFileSync(path.join(projectDir, 'config', 'sentinel.properties'), sentinelProps);
+  fs.copySync(path.join(tplDir, 'log-configs', '_example.properties'), path.join(configDir, '_example.properties'));
+  fs.copySync(path.join(tplDir, 'repo-configs', '_example.properties'), path.join(repoDir,   '_example.properties'));
+
+  generateProjectScripts(projectDir, codeDir, pythonBin);
+}
+
+function generateProjectScripts(projectDir, codeDir, pythonBin) {
+  const name = path.basename(projectDir);
+
+  // init.sh
+  fs.writeFileSync(path.join(projectDir, 'init.sh'), `#!/usr/bin/env bash
+# First-time setup for this Sentinel project instance.
+#
+# What this does:
+#   - Clones any repos defined in config/repo-configs/ that don't exist locally yet
+#     (skips repos that are already cloned — safe to run multiple times)
+#   - Indexes each repo with Cairn MCP for codebase context
+#   - Tests SSH connectivity to each configured log source
+#   - Sends a test email to verify SMTP settings
+#
+# Note: ongoing repo management (git pull, conflict resolution) is handled
+# automatically by Sentinel on each fix cycle — you don't need to do it manually.
+set -euo pipefail
+cd "$(dirname "$0")"
+PYTHONPATH="${codeDir}" "${pythonBin}" -m sentinel.main --config ./config --init
+`, { mode: 0o755 });
+
+  // start.sh
+  fs.writeFileSync(path.join(projectDir, 'start.sh'), `#!/usr/bin/env bash
+# Start this Sentinel instance
+set -euo pipefail
+DIR="$(cd "$(dirname "$0")" && pwd)"
+PID_FILE="$DIR/sentinel.pid"
+
+if [[ -f "$PID_FILE" ]] && kill -0 "$(cat "$PID_FILE")" 2>/dev/null; then
+  echo "[sentinel] ${name} already running (PID $(cat "$PID_FILE"))"
+  exit 0
+fi
+
+# Check Claude Code authentication
+AUTH_OUT=$(claude --print \"hi\" 2>&1 || true)
+if echo "$AUTH_OUT" | grep -Eqi "not logged in|/login"; then
+  echo ""
+  echo "[sentinel] Claude Code is not authenticated."
+  echo "  1. Open a new terminal and run: claude"
+  echo "  2. Type /login at the prompt"
+  echo "  3. Open the URL in any browser and log in"
+  echo "  4. Type /exit when done"
+  echo "  5. Re-run this script"
+  echo ""
+  exit 1
+fi
+
+mkdir -p "$DIR/logs" "$DIR/workspace/fetched" "$DIR/workspace/patches"
+cd "$DIR"
+PYTHONPATH="${codeDir}" "${pythonBin}" -m sentinel.main --config ./config \\
+  >> "$DIR/logs/sentinel.log" 2>&1 &
+echo $! > "$PID_FILE"
+echo "[sentinel] ${name} started (PID $!)"
+`, { mode: 0o755 });
+
+  // stop.sh
+  fs.writeFileSync(path.join(projectDir, 'stop.sh'), `#!/usr/bin/env bash
+# Stop this Sentinel instance
+set -euo pipefail
+DIR="$(cd "$(dirname "$0")" && pwd)"
+PID_FILE="$DIR/sentinel.pid"
+
+if [[ ! -f "$PID_FILE" ]]; then
+  echo "[sentinel] ${name} — no PID file, not running"
+  exit 0
+fi
+
+PID=$(cat "$PID_FILE")
+if kill -0 "$PID" 2>/dev/null; then
+  kill "$PID"
+  echo "[sentinel] ${name} stopped (PID $PID)"
+else
+  echo "[sentinel] ${name} — PID $PID not running"
+fi
+rm -f "$PID_FILE"
+`, { mode: 0o755 });
+}
+
+// ── Workspace-level startAll / stopAll ────────────────────────────────────────
+
+function generateWorkspaceScripts(workspace) {
+  // startAll.sh
+  fs.writeFileSync(path.join(workspace, 'startAll.sh'), `#!/usr/bin/env bash
+# Start all Sentinel project instances
+WORKSPACE="$(cd "$(dirname "$0")" && pwd)"
+started=0
+for project_dir in "$WORKSPACE"/*/; do
+  name=$(basename "$project_dir")
+  [[ "$name" == "code" ]] && continue
+  [[ -f "$project_dir/start.sh" ]] || continue
+  bash "$project_dir/start.sh"
+  started=$((started + 1))
+done
+echo "[sentinel] $started project(s) started"
+`, { mode: 0o755 });
+
+  // stopAll.sh
+  fs.writeFileSync(path.join(workspace, 'stopAll.sh'), `#!/usr/bin/env bash
+# Stop all Sentinel project instances
+WORKSPACE="$(cd "$(dirname "$0")" && pwd)"
+stopped=0
+for project_dir in "$WORKSPACE"/*/; do
+  name=$(basename "$project_dir")
+  [[ "$name" == "code" ]] && continue
+  [[ -f "$project_dir/stop.sh" ]] || continue
+  bash "$project_dir/stop.sh"
+  stopped=$((stopped + 1))
+done
+echo "[sentinel] $stopped project(s) stopped"
+`, { mode: 0o755 });
+}
+
+module.exports = { writeExampleProject, generateProjectScripts, generateWorkspaceScripts };

package/lib/init.js

@@ -101,22 +101,9 @@ module.exports = async function init() {
   if (authMode === 'apikey' && anthropicKey) {
     ok('API key will be written to each project\'s sentinel.properties');
   } else if (authMode === 'oauth') {
-    console.log(chalk.yellow(
-      '\n  Launching Claude Code login — type /login at the prompt to get your auth URL.\n' +
-      '  Open the URL in any browser, log in with your Claude Pro account,\n' +
-      '  then type /exit (or Ctrl-C) to return here.\n'
-    ));
-    spawnSync('claude', [], { stdio: 'inherit' });
-    // Verify auth succeeded after the user exits claude
-    const authCheck = spawnSync('claude', ['--print', 'hi'], { encoding: 'utf8', timeout: 15000 });
-    const authOut = (authCheck.stdout || '') + (authCheck.stderr || '');
-    if (authOut.toLowerCase().includes('not logged in') || authOut.toLowerCase().includes('/login')) {
-      warn('Not authenticated yet — run "claude" and type /login when ready');
-    } else {
-      ok('Claude Code authenticated via OAuth');
-    }
+    info('OAuth selected — start.sh will prompt for login if not yet authenticated');
   } else {
-    warn('Skipping auth — set ANTHROPIC_API_KEY in sentinel.properties or run "claude" to authenticate');
+    info('Skipping auth — start.sh will prompt for login if needed');
   }
 
   // ── Workspace structure ─────────────────────────────────────────────────────

package/package.json

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