@misterhuydo/sentinel 1.0.21 → 1.0.23

package/.cairn/session.json

@@ -1,6 +1,6 @@
 {
-  "message": "Auto-checkpoint at 2026-03-21T19:16:11.175Z",
-  "checkpoint_at": "2026-03-21T19:16:11.176Z",
+  "message": "Auto-checkpoint at 2026-03-21T19:29:35.017Z",
+  "checkpoint_at": "2026-03-21T19:29:35.026Z",
   "active_files": [],
   "notes": [],
   "mtime_snapshot": {}

package/lib/generate.js

@@ -92,7 +92,7 @@ rm -f "$PID_FILE"
 
 // ── Workspace-level startAll / stopAll ────────────────────────────────────────
 
-function generateWorkspaceScripts(workspace, smtpConfig = {}) {
+function generateWorkspaceScripts(workspace, smtpConfig = {}, slackConfig = {}) {
   // Write shared sentinel.properties once (never overwrite existing)
   const workspaceProps = path.join(workspace, 'sentinel.properties');
   if (!fs.existsSync(workspaceProps)) {
@@ -104,6 +104,15 @@ function generateWorkspaceScripts(workspace, smtpConfig = {}) {
     if (smtpConfig.password) tpl = tpl.replace('SMTP_PASSWORD=<app-password>',      'SMTP_PASSWORD=' + smtpConfig.password);
     fs.writeFileSync(workspaceProps, tpl);
   }
+  // Always upsert Slack tokens so re-runs persist them
+  if (slackConfig.botToken || slackConfig.appToken) {
+    let props = fs.readFileSync(workspaceProps, 'utf8');
+    if (slackConfig.botToken)
+      props = props.replace(/^#?\s*SLACK_BOT_TOKEN=.*/m, 'SLACK_BOT_TOKEN=' + slackConfig.botToken);
+    if (slackConfig.appToken)
+      props = props.replace(/^#?\s*SLACK_APP_TOKEN=.*/m, 'SLACK_APP_TOKEN=' + slackConfig.appToken);
+    fs.writeFileSync(workspaceProps, props);
+  }
   // startAll.sh
   fs.writeFileSync(path.join(workspace, 'startAll.sh'), `#!/usr/bin/env bash
 # Start all valid Sentinel project instances.

package/lib/init.js

@@ -84,14 +84,14 @@ module.exports = async function init() {
     {
       type: prev => prev ? 'password' : null,
       name: 'slackBotToken',
-      message: 'Slack Bot Token  (xoxb-...)',
-      validate: v => v.startsWith('xoxb-') ? true : 'Should start with xoxb-',
+      message: existing.SLACK_BOT_TOKEN ? 'Slack Bot Token  (press Enter to keep current)' : 'Slack Bot Token  (xoxb-...)',
+      validate: v => !v || v.startsWith('xoxb-') ? true : 'Should start with xoxb-',
     },
     {
-      type: (_, { slackBotToken }) => slackBotToken ? 'password' : null,
+      type: (_, { setupSlack }) => setupSlack ? 'password' : null,
       name: 'slackAppToken',
-      message: 'Slack App-Level Token  (xapp-...)',
-      validate: v => v.startsWith('xapp-') ? true : 'Should start with xapp-',
+      message: existing.SLACK_APP_TOKEN ? 'Slack App-Level Token  (press Enter to keep current)' : 'Slack App-Level Token  (xapp-...)',
+      validate: v => !v || v.startsWith('xapp-') ? true : 'Should start with xapp-',
     },
   ], { onCancel: () => process.exit(0) });
 
@@ -149,9 +149,9 @@ module.exports = async function init() {
   }
 
   // ── Slack Bot ────────────────────────────────────────────────────────────────
-  if (slackBotToken && slackAppToken) {
+  if (effectiveSlackBotToken && effectiveSlackAppToken) {
     step('Slack Bot (Sentinel Boss)…');
-    ok('Tokens will be written to the project sentinel.properties');
+    ok('Tokens will be written to workspace sentinel.properties');
     info('Sentinel Boss starts automatically when the project starts');
   } else if (setupSlack) {
     warn('Slack tokens not provided — add them to config/sentinel.properties later');
@@ -166,7 +166,7 @@ module.exports = async function init() {
   if (example) {
     step('Creating example project…');
     const exampleDir = path.join(workspace, 'my-project');
-    writeExampleProject(exampleDir, codeDir, pythonBin, anthropicKey || '', { botToken: slackBotToken || '', appToken: slackAppToken || '' });
+    writeExampleProject(exampleDir, codeDir, pythonBin, anthropicKey || '', { botToken: effectiveSlackBotToken, appToken: effectiveSlackAppToken });
     ok(`Example project: ${exampleDir}`);
   }
 
@@ -174,7 +174,9 @@ module.exports = async function init() {
   step('Generating scripts…');
   // If user left password blank (pressed Enter to keep), fall back to existing
   const effectiveSmtpPassword = smtpPassword || existing.SMTP_PASSWORD || '';
-  generateWorkspaceScripts(workspace, { host: smtpHost, user: smtpUser, password: effectiveSmtpPassword });
+  const effectiveSlackBotToken = slackBotToken || existing.SLACK_BOT_TOKEN || '';
+  const effectiveSlackAppToken = slackAppToken || existing.SLACK_APP_TOKEN || '';
+  generateWorkspaceScripts(workspace, { host: smtpHost, user: smtpUser, password: effectiveSmtpPassword }, { botToken: effectiveSlackBotToken, appToken: effectiveSlackAppToken });
   ok(`${workspace}/startAll.sh`);
   ok(`${workspace}/stopAll.sh`);
 
@@ -217,9 +219,26 @@ module.exports = async function init() {
 // ── Helpers ──────────────────────────────────────────────────────────────────
 
 function readExistingConfig(workspace) {
-  const propsPath = path.join(workspace, 'sentinel.properties');
-  if (!fs.existsSync(propsPath)) return {};
   const result = {};
+  _parsePropsInto(path.join(workspace, 'sentinel.properties'), result);
+  // Migrate: if Slack tokens not in workspace config, scan project configs as fallback
+  if (!result.SLACK_BOT_TOKEN || !result.SLACK_APP_TOKEN) {
+    try {
+      for (const entry of fs.readdirSync(workspace)) {
+        const p = path.join(workspace, entry, 'config', 'sentinel.properties');
+        const proj = {};
+        _parsePropsInto(p, proj);
+        if (!result.SLACK_BOT_TOKEN && proj.SLACK_BOT_TOKEN) result.SLACK_BOT_TOKEN = proj.SLACK_BOT_TOKEN;
+        if (!result.SLACK_APP_TOKEN && proj.SLACK_APP_TOKEN) result.SLACK_APP_TOKEN = proj.SLACK_APP_TOKEN;
+        if (result.SLACK_BOT_TOKEN && result.SLACK_APP_TOKEN) break;
+      }
+    } catch (_) {}
+  }
+  return result;
+}
+
+function _parsePropsInto(propsPath, result) {
+  if (!fs.existsSync(propsPath)) return;
   try {
     const lines = fs.readFileSync(propsPath, 'utf8').split(/\r?\n/);
     for (const raw of lines) {
@@ -230,7 +249,6 @@ function readExistingConfig(workspace) {
       result[line.slice(0, idx).trim()] = line.slice(idx + 1).trim();
     }
   } catch (_) {}
-  return result;
 }
 
 function findPython() {

package/package.json

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

package/templates/workspace-sentinel.properties

@@ -26,3 +26,8 @@ UPGRADE_CHECK_HOURS=6
 
 # Config repo polling: if the project dir is a git repo, pull for config changes every N seconds
 CONFIG_POLL_INTERVAL=60
+
+# Slack Bot (Sentinel Boss) — shared across all projects
+# SLACK_BOT_TOKEN=xoxb-...
+# SLACK_APP_TOKEN=xapp-...
+# SLACK_CHANNEL=devops-sentinel