@adaptic/maestro 1.5.2 → 1.6.1

package/scripts/slack-send.sh

@@ -1,14 +1,29 @@
 #!/bin/bash
-# slack-send.sh — Send Slack message as Sophie via User OAuth Token (xoxp-)
-# Messages appear as Sophie's user account, NOT the bot app.
+# slack-send.sh — Send Slack message as the running agent via User OAuth Token (xoxp-)
+# Messages appear as the agent's own Slack user, NOT the bot app.
 # Usage: ./scripts/slack-send.sh <channel_id> <message> [--thread_ts <ts>]
 set -e
 
-source /Users/sophie/sophie-ai/.env
+# Resolve the agent repo dir so we can source env files regardless of cwd.
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+AGENT_REPO_DIR="${AGENT_DIR:-$(cd "$SCRIPT_DIR/.." && pwd)}"
+
+# Load identity vars (AGENT_FIRST_NAME, AGENT_FULL_NAME, AGENT_EMAIL, …) so
+# nothing in this script needs to hardcode the agent's name or paths.
+if [ -f "$AGENT_REPO_DIR/config/agent.env" ]; then
+  # shellcheck disable=SC1091
+  source "$AGENT_REPO_DIR/config/agent.env"
+fi
 
-# ENFORCEMENT: Must use User Token (xoxp-), never Bot Token (xoxb-)
+# Load secrets from the agent's .env (must live alongside agent.env).
+if [ -f "$AGENT_REPO_DIR/.env" ]; then
+  # shellcheck disable=SC1091
+  source "$AGENT_REPO_DIR/.env"
+fi
+
+# ENFORCEMENT: Must use User Token (xoxp-), never Bot Token (xoxb-).
 # Per CEO directive: all Slack sends must come from user scope so messages
-# appear as Sophie Nguyen, not the Adaptic COO bot.
+# appear as the running agent, not a generic bot app.
 SLACK_SEND_TOKEN="${SLACK_USER_TOKEN}"
 if [ -z "$SLACK_SEND_TOKEN" ]; then
   echo "ERROR: SLACK_USER_TOKEN not set in .env — cannot send as user scope" >&2
@@ -58,14 +73,15 @@ if [ -z "$CHANNEL" ] || [ -z "$MESSAGE" ]; then
 fi
 
 # Dedup check: if --responding_to is set, use atomic locking to prevent concurrent sends
-SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 DEDUP_ACQUIRED=""
 if [ -n "$RESPONDING_TO" ]; then
-  # Atomic lock acquisition (mkdir-based, race-safe)
+  # Atomic lock acquisition (mkdir-based, race-safe).
   # This is the primary dedup mechanism. mkdir is atomic on POSIX — if two sessions
   # race to respond to the same message, exactly one will succeed and the other will
   # get LOCKED and skip. This eliminates the check-then-write race condition.
-  SESSION_ID="${SOPHIE_SESSION_ID:-$$}"
+  # AGENT_SESSION_ID is the per-agent session identifier (used to be SOPHIE_SESSION_ID,
+  # RAVI_SESSION_ID, etc.); $$ is the fallback when running outside a daemon-spawned shell.
+  SESSION_ID="${AGENT_SESSION_ID:-${SOPHIE_SESSION_ID:-${RAVI_SESSION_ID:-$$}}}"
   ACQUIRE_RESULT=$("$SCRIPT_DIR/slack-responded.sh" acquire "$CHANNEL" "$RESPONDING_TO" "$SESSION_ID" 2>/dev/null) || true
   if [ "$ACQUIRE_RESULT" != "ACQUIRED" ]; then
     echo "DEDUP_SKIP"
@@ -75,7 +91,7 @@ if [ -n "$RESPONDING_TO" ]; then
 fi
 
 # Show typing indicator before sending (non-blocking, fire-and-forget)
-# This makes Sophie's presence feel human — the "Sophie is typing..." dots appear
+# This makes the agent's presence feel human — the "X is typing..." dots appear
 # before the message arrives. Requires rtm:stream scope on user token; degrades gracefully.
 TYPING_DURATION=2500
 MSG_LEN=${#MESSAGE}

package/scripts/sms-handler.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * Sophie SMS Handler — Twilio Inbound SMS Webhook
+ * Agent SMS Handler — Twilio Inbound SMS Webhook
  *
  * Receives inbound SMS/MMS via Twilio webhook, maps senders to known contacts,
  * writes messages to the inbox for the inbox processor, and logs everything.
@@ -31,13 +31,27 @@ import { URL } from "node:url";
 // ---------------------------------------------------------------------------
 
 const PORT = parseInt(process.env.SMS_PORT || "3001", 10);
-const SOPHIE_AI =
-  process.env.SOPHIE_AI_PATH ||
-  path.join(process.env.HOME || "/Users/sophie", "sophie-ai");
-const INBOX_DIR = path.join(SOPHIE_AI, "state", "inbox", "sms");
-const LOG_DIR = path.join(SOPHIE_AI, "logs", "sms");
-const CALLER_ID_MAP_PATH = path.join(SOPHIE_AI, "config", "caller-id-map.yaml");
-const SOPHIE_NUMBER = "+16282656712";
+const AGENT_REPO_DIR =
+  process.env.AGENT_DIR ||
+  process.env.AGENT_REPO_DIR ||
+  path.resolve(path.dirname(new URL(import.meta.url).pathname), "..");
+
+// Load identity from canonical SOT (config/agent.json).
+let _agent = null;
+function loadAgent() {
+  if (_agent) return _agent;
+  try {
+    _agent = JSON.parse(fs.readFileSync(path.join(AGENT_REPO_DIR, "config/agent.json"), "utf-8"));
+  } catch {
+    _agent = { firstName: "Agent", phone: "" };
+  }
+  return _agent;
+}
+
+const INBOX_DIR = path.join(AGENT_REPO_DIR, "state", "inbox", "sms");
+const LOG_DIR = path.join(AGENT_REPO_DIR, "logs", "sms");
+const CALLER_ID_MAP_PATH = path.join(AGENT_REPO_DIR, "config", "caller-id-map.yaml");
+const AGENT_NUMBER = loadAgent().phone || "";
 
 // ---------------------------------------------------------------------------
 // Utilities
@@ -166,10 +180,10 @@ function logSms(entry) {
 }
 
 /**
- * Log to the main audit trail (sophie-ai/logs/audit/).
+ * Log to the agent's main audit trail (logs/audit/).
  */
 function logAudit(action, details) {
-  const auditDir = path.join(SOPHIE_AI, "logs", "audit");
+  const auditDir = path.join(AGENT_REPO_DIR, "logs", "audit");
   ensureDir(auditDir);
 
   const auditFile = path.join(auditDir, `${today()}-actions.jsonl`);
@@ -229,13 +243,13 @@ function writeToInbox(smsData) {
     `subject: "SMS from ${senderName}"`,
     `content: |`,
     `  ${(smsData.Body || "").replace(/\n/g, "\n  ")}`,
-    `to: "${smsData.To || SOPHIE_NUMBER}"`,
+    `to: "${smsData.To || AGENT_NUMBER}"`,
     `is_reply: false`,
     `priority_signals:`,
     `  from_ceo: ${senderPrivilege === "ceo"}`,
     `  tagged_urgent: false`,
     `  contains_deadline: false`,
-    `  mentions_sophie: false`,
+    `  mentions_agent: false`,
   ];
 
   if (mediaUrls.length > 0) {
@@ -283,7 +297,7 @@ const server = http.createServer(async (req, res) => {
     res.end(
       JSON.stringify({
         status: "ok",
-        service: "sophie-sms-handler",
+        service: "agent-sms-handler",
         uptime: process.uptime(),
         timestamp: new Date().toISOString(),
         knownContacts: callerMap.size,
@@ -297,8 +311,8 @@ const server = http.createServer(async (req, res) => {
     res.writeHead(200, { "Content-Type": "application/json" });
     res.end(
       JSON.stringify({
-        service: "Sophie SMS Handler",
-        description: "Twilio inbound SMS webhook for sophie-ai inbox",
+        service: "Agent SMS Handler",
+        description: "Twilio inbound SMS webhook for the agent's inbox",
         endpoints: {
           health: "/health",
           sms: "/sms (POST)",
@@ -319,7 +333,7 @@ const server = http.createServer(async (req, res) => {
         const smsData = parseFormBody(body);
 
         const from = smsData.From || "unknown";
-        const to = smsData.To || SOPHIE_NUMBER;
+        const to = smsData.To || AGENT_NUMBER;
         const messageBody = smsData.Body || "";
         const messageSid = smsData.MessageSid || "unknown";
         const numMedia = parseInt(smsData.NumMedia || "0", 10);
@@ -357,7 +371,7 @@ const server = http.createServer(async (req, res) => {
 
           // Write priority trigger
           const priorityDir = path.join(
-            SOPHIE_AI,
+            AGENT_REPO_DIR,
             "state",
             "inbox",
             "processed",
@@ -415,7 +429,7 @@ ensureDir(LOG_DIR);
 
 server.listen(PORT, "0.0.0.0", () => {
   console.log(`\n========================================`);
-  console.log(`  Sophie SMS Handler`);
+  console.log(`  Agent SMS Handler`);
   console.log(`  Port: ${PORT}`);
   console.log(`  Health: http://0.0.0.0:${PORT}/health`);
   console.log(`  Webhook: POST /sms`);

package/scripts/whatsapp-handler.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * Sophie WhatsApp Handler — Twilio Inbound WhatsApp Webhook
+ * Agent WhatsApp Handler — Twilio Inbound WhatsApp Webhook
  *
  * Receives inbound WhatsApp messages via Twilio webhook, maps senders to known
  * contacts, writes messages to the inbox for the inbox processor, and logs everything.
@@ -37,13 +37,26 @@ import { URL } from "node:url";
 // ---------------------------------------------------------------------------
 
 const PORT = parseInt(process.env.WHATSAPP_PORT || "3002", 10);
-const SOPHIE_AI =
-  process.env.SOPHIE_AI_PATH ||
-  path.join(process.env.HOME || "/Users/sophie", "sophie-ai");
-const INBOX_DIR = path.join(SOPHIE_AI, "state", "inbox", "whatsapp");
-const LOG_DIR = path.join(SOPHIE_AI, "logs", "whatsapp");
-const CALLER_ID_MAP_PATH = path.join(SOPHIE_AI, "config", "caller-id-map.yaml");
-const SOPHIE_NUMBER = "+16282656712";
+const AGENT_REPO_DIR =
+  process.env.AGENT_DIR ||
+  process.env.AGENT_REPO_DIR ||
+  path.resolve(path.dirname(new URL(import.meta.url).pathname), "..");
+
+let _agent = null;
+function loadAgent() {
+  if (_agent) return _agent;
+  try {
+    _agent = JSON.parse(fs.readFileSync(path.join(AGENT_REPO_DIR, "config/agent.json"), "utf-8"));
+  } catch {
+    _agent = { firstName: "Agent", phone: "" };
+  }
+  return _agent;
+}
+
+const INBOX_DIR = path.join(AGENT_REPO_DIR, "state", "inbox", "whatsapp");
+const LOG_DIR = path.join(AGENT_REPO_DIR, "logs", "whatsapp");
+const CALLER_ID_MAP_PATH = path.join(AGENT_REPO_DIR, "config", "caller-id-map.yaml");
+const AGENT_NUMBER = loadAgent().phone || "";
 
 // ---------------------------------------------------------------------------
 // Utilities
@@ -190,7 +203,7 @@ function logWhatsApp(entry) {
  * Log to the main audit trail.
  */
 function logAudit(action, details) {
-  const auditDir = path.join(SOPHIE_AI, "logs", "audit");
+  const auditDir = path.join(AGENT_REPO_DIR, "logs", "audit");
   ensureDir(auditDir);
 
   const auditFile = path.join(auditDir, `${today()}-actions.jsonl`);
@@ -267,7 +280,7 @@ function writeToInbox(msgData) {
     `  from_ceo: ${senderPrivilege === "ceo"}`,
     `  tagged_urgent: ${body.toLowerCase().includes("urgent")}`,
     `  contains_deadline: false`,
-    `  mentions_sophie: ${body.toLowerCase().includes("sophie")}`,
+    `  mentions_agent: ${body.toLowerCase().includes((loadAgent().firstName || "agent").toLowerCase())}`,
   ];
 
   if (mediaUrls.length > 0) {
@@ -311,7 +324,7 @@ const server = http.createServer(async (req, res) => {
     res.end(
       JSON.stringify({
         status: "ok",
-        service: "sophie-whatsapp-handler",
+        service: "agent-whatsapp-handler",
         uptime: process.uptime(),
         timestamp: new Date().toISOString(),
         knownContacts: callerMap.size,
@@ -325,8 +338,8 @@ const server = http.createServer(async (req, res) => {
     res.writeHead(200, { "Content-Type": "application/json" });
     res.end(
       JSON.stringify({
-        service: "Sophie WhatsApp Handler",
-        description: "Twilio inbound WhatsApp webhook for sophie-ai inbox",
+        service: "Agent WhatsApp Handler",
+        description: "Twilio inbound WhatsApp webhook for the agent's inbox",
         endpoints: {
           health: "/health",
           whatsapp: "/whatsapp (POST)",
@@ -503,7 +516,7 @@ ensureDir(LOG_DIR);
 
 server.listen(PORT, "0.0.0.0", () => {
   console.log(`\n========================================`);
-  console.log(`  Sophie WhatsApp Handler`);
+  console.log(`  Agent WhatsApp Handler`);
   console.log(`  Port: ${PORT}`);
   console.log(`  Health: http://0.0.0.0:${PORT}/health`);
   console.log(`  Webhook: POST /whatsapp`);