npm - @adaptic/maestro - Versions diffs - 1.5.1 → 1.6.0 - Mend

@adaptic/maestro 1.5.1 → 1.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (25) hide show

package/bin/maestro.mjs +35 -16
package/package.json +1 -1
package/scaffold/config/agent.json +52 -0
package/scaffold/config/agent.ts.example +62 -192
package/scripts/archive-email.sh +16 -2
package/scripts/daemon/classifier.mjs +69 -59
package/scripts/daemon/dispatcher.mjs +6 -6
package/scripts/daemon/prompt-builder.mjs +30 -12
package/scripts/daemon/responder.mjs +41 -21
package/scripts/daemon/session-lock.mjs +4 -4
package/scripts/daemon/sophie-daemon.mjs +49 -26
package/scripts/local-triggers/run-trigger.sh +6 -6
package/scripts/pdf-generation/build-document.mjs +24 -7
package/scripts/poller/gmail-poller.mjs +32 -18
package/scripts/poller/utils.mjs +34 -14
package/scripts/send-email-threaded.py +30 -10
package/scripts/send-email-with-attachment.py +26 -9
package/scripts/send-email.sh +23 -10
package/scripts/setup/generate-agent-env.mjs +92 -0
package/scripts/setup/migrate-agent-to-sot.mjs +192 -0
package/scripts/slack-events-server.mjs +78 -44
package/scripts/slack-responded.sh +5 -2
package/scripts/slack-send.sh +25 -9
package/scripts/sms-handler.mjs +32 -18
package/scripts/whatsapp-handler.mjs +27 -14

package/scripts/send-email.sh CHANGED Viewed

@@ -1,8 +1,15 @@
 #!/bin/bash
-# send-email.sh — Send HTML email via SMTP as Sophie Nguyen
+# send-email.sh — Send HTML email via SMTP as the running agent
 # Usage: ./scripts/send-email.sh <to> <subject> <body> [cc] [in-reply-to] [references]
 set -e
+SCRIPT_DIR_INIT="$(cd "$(dirname "$0")" && pwd)"
+AGENT_REPO_DIR="${AGENT_DIR:-$(cd "$SCRIPT_DIR_INIT/.." && pwd)}"
+if [ -f "$AGENT_REPO_DIR/config/agent.env" ]; then
+  # shellcheck disable=SC1091
+  source "$AGENT_REPO_DIR/config/agent.env"
+fi
 TO="$1"
 SUBJECT="$2"
 BODY="$3"
@@ -25,7 +32,7 @@ if [ -x "$SCRIPT_DIR/outbound-dedup.sh" ]; then
   # Generate content-hash key and acquire lock
   CONTENT_KEY=$("$SCRIPT_DIR/outbound-dedup.sh" generate-key email "$TO" "$SUBJECT" "$BODY" 2>/dev/null) || true
   if [ -n "$CONTENT_KEY" ]; then
-    ACQUIRE_RESULT=$("$SCRIPT_DIR/outbound-dedup.sh" acquire email "$CONTENT_KEY" "${SOPHIE_SESSION_ID:-$$}" 2>/dev/null) || true
+    ACQUIRE_RESULT=$("$SCRIPT_DIR/outbound-dedup.sh" acquire email "$CONTENT_KEY" "${AGENT_SESSION_ID:-${SOPHIE_SESSION_ID:-${RAVI_SESSION_ID:-$$}}}" 2>/dev/null) || true
     if [ "$ACQUIRE_RESULT" = "DEDUP_SKIP" ]; then
       echo "DEDUP_SKIP"
       exit 0
@@ -39,7 +46,7 @@ fi
 # Build headers
 HEADERS="To: ${TO}
-From: Sophie Nguyen <sophie@adaptic.ai>
+From: ${AGENT_FULL_NAME:-Agent} <${AGENT_EMAIL:-agent@example.com}>
 Subject: ${SUBJECT}
 MIME-Version: 1.0
 Content-Type: text/html; charset=UTF-8"
@@ -61,23 +68,29 @@ References: <${IN_REPLY_TO}>"
   fi
 fi
-LOGO_URL="https://ci3.googleusercontent.com/mail-sig/AIorK4xNDnPN6a0MjSHV5urb9g11u2CzHIzwdJbwN21quGjzQFdbOdegCq1Wp6lq3NCqsARbi-ooqPfE9E1D"
+LOGO_URL="${EMAIL_SIGNATURE_LOGO_URL:-https://ci3.googleusercontent.com/mail-sig/AIorK4xNDnPN6a0MjSHV5urb9g11u2CzHIzwdJbwN21quGjzQFdbOdegCq1Wp6lq3NCqsARbi-ooqPfE9E1D}"
+SIG_ADDRESS="${EMAIL_SIGNATURE_ADDRESS:-Level 1, Innovation One, Dubai International Financial Centre, Dubai, UAE}"
+SIG_PHONE_HTML=""
+if [ -n "${AGENT_PHONE:-}" ]; then
+  PHONE_TEL=$(echo "$AGENT_PHONE" | tr -d ' ')
+  SIG_PHONE_HTML="<div style=\"font-size:small;\"><a href=\"tel:${PHONE_TEL}\" style=\"color:#1155cc;\">${AGENT_PHONE}</a></div>
+<div><br></div>
+"
+fi
-# Build HTML body — signature matches Mehran's format exactly
+# Build HTML body
 HTML_BODY="<html><body>
 <div style=\"font-family:Arial,Helvetica,sans-serif;font-size:small;color:#000;\">
 $(echo "$BODY" | sed 's/$/<br>/g')
 </div>
 <br>
 <div style=\"font-family:Arial,Helvetica,sans-serif;color:#000;\">
-<div style=\"font-size:small;\"><b>Sophie Nguyen</b></div>
-<div style=\"font-size:small;\">Chief of Staff</div>
+<div style=\"font-size:small;\"><b>${AGENT_FULL_NAME:-Agent}</b></div>
+<div style=\"font-size:small;\">${AGENT_TITLE:-}</div>
 <div><br></div>
 <div><img src=\"${LOGO_URL}\" width=\"125\"></div>
 <div><br></div>
-<div style=\"font-size:small;\"><a href=\"tel:+16282656712\" style=\"color:#1155cc;\">+1 628 265 6712</a> (USA)</div>
-<div><br></div>
-<div style=\"font-size:x-small;color:#000;\">Level 1, Innovation One, Dubai International Financial Centre, Dubai, UAE</div>
+${SIG_PHONE_HTML}<div style=\"font-size:x-small;color:#000;\">${SIG_ADDRESS}</div>
 <div style=\"font-size:x-small;color:#666;\">_________________________________________</div>
 <div><br></div>
 <div style=\"font-size:x-small;color:#999;\">This email and any files transmitted with it are confidential and intended solely for the use of the individual or entity to whom they are addressed. If you have received this email in error please notify the sender. This message contains confidential information and is intended only for the individual named. If you are not the named addressee you should not disseminate, distribute or copy this email. Please notify the sender immediately by email if you have received this email by mistake and delete this email from your system. If you are not the intended recipient you are notified that disclosing, copying, distributing, or taking any action in reliance on the contents of this information is strictly prohibited.</div>

package/scripts/setup/generate-agent-env.mjs ADDED Viewed

@@ -0,0 +1,92 @@
+#!/usr/bin/env node
+/**
+ * generate-agent-env.mjs — Generate config/agent.env from config/agent.json
+ *
+ * Shell scripts can't import TypeScript or parse JSON cheaply, so we
+ * pre-derive a flat env file that any bash script can source:
+ *
+ *   source "$AGENT_DIR/config/agent.env"
+ *   echo "Hello, $AGENT_FIRST_NAME"
+ *
+ * The generator is invoked:
+ *   - During `npm run init-agent` (initial setup)
+ *   - At the end of every `maestro upgrade` run
+ *   - On demand: `node scripts/setup/generate-agent-env.mjs`
+ *
+ * No TypeScript runtime required — we read agent.json directly.
+ */
+import { readFileSync, writeFileSync, existsSync } from "node:fs";
+import { resolve, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const AGENT_DIR = process.env.AGENT_DIR || resolve(__dirname, "../..");
+const JSON_PATH = resolve(AGENT_DIR, "config/agent.json");
+const ENV_PATH = resolve(AGENT_DIR, "config/agent.env");
+if (!existsSync(JSON_PATH)) {
+  console.error(`[generate-agent-env] config/agent.json not found at ${JSON_PATH}`);
+  console.error("[generate-agent-env] Run /init-maestro to configure identity, or migrate from config/agent.ts");
+  process.exit(1);
+}
+const agent = JSON.parse(readFileSync(JSON_PATH, "utf-8"));
+// Shell-quote: wrap in single quotes; replace ' with '\'' (close, escape, reopen).
+const q = (v) => {
+  const s = v === null || v === undefined ? "" : String(v);
+  return `'${s.replace(/'/g, "'\\''")}'`;
+};
+const repoDir = `$HOME/${agent.repoSlug}`;
+const firstUpper = (agent.firstName || "").toUpperCase();
+const firstLower = (agent.firstName || "").toLowerCase();
+const signature = `${agent.fullName} | ${agent.title} | ${agent.company}`;
+const lines = [
+  `# Auto-generated from config/agent.json by @adaptic/maestro.`,
+  `# DO NOT EDIT — regenerate with: node scripts/setup/generate-agent-env.mjs`,
+  `# Sourced by every shell script that needs agent identity.`,
+  ``,
+  `# ── Agent identity ─────────────────────────────────────────────────`,
+  `export AGENT_FIRST_NAME=${q(agent.firstName)}`,
+  `export AGENT_LAST_NAME=${q(agent.lastName)}`,
+  `export AGENT_FULL_NAME=${q(agent.fullName)}`,
+  `export AGENT_TITLE=${q(agent.title)}`,
+  `export AGENT_ARCHETYPE=${q(agent.archetype)}`,
+  `export AGENT_EMAIL=${q(agent.email)}`,
+  `export AGENT_PHONE=${q(agent.phone)}`,
+  `export AGENT_SLACK_USER_ID=${q(agent.slackMemberId)}`,
+  `export AGENT_REPO_SLUG=${q(agent.repoSlug)}`,
+  `export AGENT_REPO_DIR="${repoDir}"`,
+  `export AGENT_MACHINE_NAME=${q(agent.machineName)}`,
+  `export AGENT_LAUNCHD_PREFIX=${q(agent.launchdLabelPrefix)}`,
+  `export AGENT_TIMEZONE=${q(agent.timezone)}`,
+  `export AGENT_LOCALE=${q(agent.locale)}`,
+  `export AGENT_UPPER=${q(firstUpper)}`,
+  `export AGENT_LOWER=${q(firstLower)}`,
+  `export AGENT_EMAIL_SIGNATURE=${q(signature)}`,
+  ``,
+  `# ── Principal ──────────────────────────────────────────────────────`,
+  `export PRINCIPAL_FIRST_NAME=${q(agent.principal?.firstName)}`,
+  `export PRINCIPAL_LAST_NAME=${q(agent.principal?.lastName)}`,
+  `export PRINCIPAL_FULL_NAME=${q(agent.principal?.fullName)}`,
+  `export PRINCIPAL_TITLE=${q(agent.principal?.title)}`,
+  `export PRINCIPAL_EMAIL=${q(agent.principal?.email)}`,
+  `export PRINCIPAL_SLACK_USER_ID=${q(agent.principal?.slackMemberId)}`,
+  ``,
+  `# ── Company ────────────────────────────────────────────────────────`,
+  `export COMPANY_NAME=${q(agent.company)}`,
+  `export COMPANY_DOMAIN=${q(agent.companyDomain)}`,
+  `export COMPANY_DESCRIPTION=${q(agent.companyDescription)}`,
+  ``,
+  `# ── Schedule ───────────────────────────────────────────────────────`,
+  `export SCHEDULE_MORNING_BRIEF=${q(agent.schedule?.morningBrief)}`,
+  `export SCHEDULE_EVENING_WRAP=${q(agent.schedule?.eveningWrap)}`,
+  `export SCHEDULE_OVERNIGHT_MONITORING=${q(agent.schedule?.overnightMonitoring)}`,
+  ``,
+];
+writeFileSync(ENV_PATH, lines.join("\n"));
+console.log(`[generate-agent-env] wrote ${ENV_PATH}`);

package/scripts/setup/migrate-agent-to-sot.mjs ADDED Viewed

@@ -0,0 +1,192 @@
+#!/usr/bin/env node
+/**
+ * migrate-agent-to-sot.mjs — Migrate an existing maestro agent repo to the
+ * Source-of-Truth layout (`config/agent.json` canonical + `config/agent.ts`
+ * thin wrapper + `config/agent.env` generated).
+ *
+ * Before:
+ *   config/agent.ts  ← contains inline `export const agent = { firstName: "Ravi", ... }`
+ *
+ * After:
+ *   config/agent.json  ← canonical data extracted from agent.ts
+ *   config/agent.ts    ← thin wrapper that imports agent.json + provides types
+ *   config/agent.env   ← generated for shell scripts
+ *
+ * Run from inside an agent repo:
+ *   npx tsx scripts/setup/migrate-agent-to-sot.mjs
+ *
+ * Requires `tsx` in the agent's devDependencies (it is — the scaffold sets it).
+ *
+ * Safety:
+ *   - Backs up the existing config/agent.ts to config/agent.ts.bak
+ *   - Refuses to run if config/agent.json already exists
+ *   - Refuses to run if config/agent.ts can't be imported
+ */
+import { readFileSync, writeFileSync, copyFileSync, existsSync } from "node:fs";
+import { resolve, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
+import { execFileSync } from "node:child_process";
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const AGENT_DIR = process.env.AGENT_DIR || resolve(__dirname, "../..");
+const TS_PATH = resolve(AGENT_DIR, "config/agent.ts");
+const JSON_PATH = resolve(AGENT_DIR, "config/agent.json");
+const BAK_PATH = resolve(AGENT_DIR, "config/agent.ts.pre-sot-migration.bak");
+if (!existsSync(TS_PATH)) {
+  console.error(`[migrate] config/agent.ts not found at ${TS_PATH}`);
+  process.exit(1);
+}
+if (existsSync(JSON_PATH)) {
+  console.error(`[migrate] config/agent.json already exists — already migrated?`);
+  console.error(`[migrate] Delete it manually if you want to re-run.`);
+  process.exit(1);
+}
+// Use tsx to load the existing TS module. This is the most reliable way to
+// extract the data without writing a fragile parser.
+let agent;
+try {
+  const tsxBin = execFileSync("npx", ["--yes", "tsx", "-e", "console.log(0)"], {
+    encoding: "utf-8",
+    stdio: ["pipe", "pipe", "ignore"],
+  });
+  // tsx is available — load via inline eval.
+  const json = execFileSync(
+    "npx",
+    [
+      "--yes",
+      "tsx",
+      "-e",
+      `import("${TS_PATH}").then(m => { console.log(JSON.stringify(m.agent)); }).catch(e => { console.error(e.message); process.exit(1); });`,
+    ],
+    { encoding: "utf-8" }
+  );
+  agent = JSON.parse(json.trim());
+} catch (e) {
+  console.error(`[migrate] failed to import config/agent.ts: ${e.message}`);
+  console.error(`[migrate] ensure tsx is installed (npm install --save-dev tsx) and agent.ts has a default \`export const agent = ...\``);
+  process.exit(1);
+}
+// Sanity check
+if (!agent || typeof agent !== "object" || !agent.firstName) {
+  console.error("[migrate] extracted config doesn't look right (missing firstName)");
+  console.error("[migrate] received:", JSON.stringify(agent).slice(0, 200));
+  process.exit(1);
+}
+// Backup
+copyFileSync(TS_PATH, BAK_PATH);
+console.log(`[migrate] backed up agent.ts → ${BAK_PATH}`);
+// Write canonical JSON
+writeFileSync(JSON_PATH, JSON.stringify(agent, null, 2) + "\n");
+console.log(`[migrate] wrote config/agent.json (canonical)`);
+// Replace agent.ts with thin wrapper template (read from scaffold).
+// The wrapper is shipped alongside this migration script in the maestro
+// package, but we also fall back to writing it inline so the migration
+// works even without access to the scaffold.
+const wrapperTemplate = inlineWrapper();
+writeFileSync(TS_PATH, wrapperTemplate);
+console.log(`[migrate] rewrote config/agent.ts as thin JSON wrapper`);
+// Generate agent.env
+try {
+  execFileSync(
+    "node",
+    [resolve(__dirname, "generate-agent-env.mjs")],
+    { encoding: "utf-8", stdio: "inherit" }
+  );
+} catch (e) {
+  console.warn(`[migrate] could not auto-generate agent.env: ${e.message}`);
+  console.warn(`[migrate] run manually: node scripts/setup/generate-agent-env.mjs`);
+}
+console.log();
+console.log("[migrate] ✓ migration complete");
+console.log(`[migrate]   config/agent.json    canonical identity data`);
+console.log(`[migrate]   config/agent.ts      thin TS wrapper (imports agent.json)`);
+console.log(`[migrate]   config/agent.env     shell-sourceable identity vars`);
+console.log(`[migrate]   ${BAK_PATH.split("/").slice(-2).join("/")}  original (delete after verifying)`);
+function inlineWrapper() {
+  return `/**
+ * Maestro — Agent Configuration (TypeScript wrapper)
+ *
+ * The canonical source of truth is \`config/agent.json\`. Edit that file,
+ * then run \`node scripts/setup/generate-agent-env.mjs\` to regenerate the
+ * shell environment file.
+ *
+ * This wrapper exposes typed access plus a few computed convenience values.
+ */
+import agentData from './agent.json' with { type: 'json' };
+export interface VoiceMode {
+  id: string;
+  label: string;
+  description: string;
+}
+export interface PrincipalConfig {
+  firstName: string;
+  lastName: string;
+  fullName: string;
+  title: string;
+  email: string;
+  slackMemberId: string;
+}
+export interface AgentConfig {
+  firstName: string;
+  lastName: string;
+  fullName: string;
+  title: string;
+  archetype: string;
+  email: string;
+  phone: string;
+  slackMemberId: string;
+  company: string;
+  companyDomain: string;
+  companyDescription: string;
+  principal: PrincipalConfig;
+  machineName: string;
+  repoSlug: string;
+  launchdLabelPrefix: string;
+  timezone: string;
+  locale: string;
+  schedule: {
+    morningBrief: string;
+    commsTriage: string[];
+    eveningWrap: string;
+    overnightMonitoring: string;
+  };
+  communication: {
+    defaultTone: string;
+    externalTone: string;
+    voiceModes: VoiceMode[];
+  };
+  responsibilities: string[];
+  operatingPrinciples: string[];
+}
+export const agent: AgentConfig = agentData as AgentConfig;
+export const AGENT_UPPER = agent.firstName.toUpperCase();
+export const AGENT_LOWER = agent.firstName.toLowerCase();
+export const REPO_DIR = \`~/\${agent.repoSlug}\`;
+export const EMAIL_SIGNATURE = \`\${agent.fullName} | \${agent.title} | \${agent.company}\`;
+`;
+}

package/scripts/slack-events-server.mjs CHANGED Viewed

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * Slack Events API Server — Real-Time Event Receiver for Sophie
+ * Slack Events API Server — Real-Time Event Receiver
  *
  * Receives real-time events from Slack via the bot's Event Subscriptions.
  * Writes inbound events to state/inbox/slack/ in YAML format (matching poller output).
@@ -10,7 +10,7 @@
  *
  * Events handled:
  *   - message (DM, channel messages, thread replies — all channel types)
- *   - app_mention (Sophie @mentioned)
+ *   - app_mention (the agent @mentioned)
  *   - reaction_added (emoji reactions)
  *
  * Deduplication:
@@ -72,15 +72,45 @@ const POLLER_TRACKER_DIR = path.join(ROOT, "state/slack-thread-tracker");
 const TRIGGER_DIR = path.join(ROOT, "state/triggers/priority");
 const LOG_DIR = path.join(ROOT, "logs/polling");
-const SOPHIE_USER_ID = "U099N1JFPRQ";
-const MEHRAN_USER_ID = "U097N5R0M7U";
-const MEHRAN_DM_CHANNEL = "D099N1JGKRQ";
+// Load the running agent's identity (canonical SOT) so we can filter
+// self-messages and resolve the principal's user ID without hardcoding.
+let _agent = null;
+function loadAgent() {
+  if (_agent) return _agent;
+  try {
+    _agent = JSON.parse(fs.readFileSync(path.join(ROOT, "config/agent.json"), "utf-8"));
+  } catch {
+    _agent = { firstName: "Agent", slackMemberId: "", fullName: "Agent", principal: {} };
+  }
+  return _agent;
+}
-// Known users for name/privilege resolution (matches poller/utils.mjs)
-const KNOWN_USERS = {
-  U097N5R0M7U: { name: "mehran-granfar", privilege: "ceo" },
-  U099N1JFPRQ: { name: "sophie-nguyen", privilege: "system" },
-};
+const AGENT_USER_ID = loadAgent().slackMemberId || "";
+const PRINCIPAL_USER_ID = loadAgent().principal?.slackMemberId || "";
+// DM channel between the principal and the agent — resolved at runtime from
+// Slack API on first DM event. The hardcoded MEHRAN_DM_CHANNEL constant was
+// removed; the server detects DM channels via the Slack channel ID prefix
+// (channels starting with "D" are IM channels).
+// Known users for name/privilege resolution — built from agent.json so each
+// agent's principal gets `privilege: ceo` and the agent itself gets `system`.
+const KNOWN_USERS = (() => {
+  const a = loadAgent();
+  const map = {};
+  if (a.principal?.slackMemberId) {
+    map[a.principal.slackMemberId] = {
+      name: (a.principal.fullName || "").toLowerCase().replace(/\s+/g, "-"),
+      privilege: "ceo",
+    };
+  }
+  if (a.slackMemberId) {
+    map[a.slackMemberId] = {
+      name: (a.fullName || "").toLowerCase().replace(/\s+/g, "-"),
+      privilege: "system",
+    };
+  }
+  return map;
+})();
 // Monitored channels (matches poller/slack-poller.mjs)
 const CHANNEL_INFO = {
@@ -385,7 +415,7 @@ priority_signals:
   from_ceo: ${item.priority_signals?.from_ceo || false}
   tagged_urgent: ${item.priority_signals?.tagged_urgent || false}
   contains_deadline: ${item.priority_signals?.contains_deadline || false}
-  mentions_sophie: ${item.priority_signals?.mentions_sophie || false}
+  mentions_agent: ${item.priority_signals?.mentions_agent || false}
 raw_ref: "${item.raw_ref || ""}"
 source: "events-api"
 `;
@@ -446,20 +476,24 @@ content: |
  */
 function handleMessageEvent(event) {
   const userId = event.user || "";
-  // Skip Sophie's own messages — defensive check (outer dispatch also filters,
+  // Skip the agent's own messages — defensive check (outer dispatch also filters,
   // but message_changed normalization can bypass it)
-  if (userId === SOPHIE_USER_ID) return;
+  if (userId === AGENT_USER_ID) return;
   const msgText = event.text || "";
   const channelId = event.channel || "";
   const channelType = event.channel_type || "";
   const isThread = !!event.thread_ts && event.thread_ts !== event.ts;
   const isDM = channelType === "im";
-  const isMehran = userId === MEHRAN_USER_ID;
-  const isMehranDmChannel = channelId === MEHRAN_DM_CHANNEL;
-  const mentionsSophie =
-    msgText.toLowerCase().includes("sophie") ||
-    msgText.includes(`<@${SOPHIE_USER_ID}>`);
+  const isPrincipal = userId === PRINCIPAL_USER_ID;
+  // The principal's DM channel is whichever IM channel they happen to use to
+  // contact the agent — Slack assigns DM channel IDs dynamically. Detect
+  // principal-DM context from `isPrincipal && isDM` rather than a hardcode.
+  const isPrincipalDmChannel = isPrincipal && isDM;
+  const agentFirstName = (loadAgent().firstName || "").toLowerCase();
+  const mentionsAgent =
+    (agentFirstName && msgText.toLowerCase().includes(agentFirstName)) ||
+    (AGENT_USER_ID && msgText.includes(`<@${AGENT_USER_ID}>`));
   const isUrgent = /\b(urgent|emergency|asap|blocker|critical)\b/i.test(
     msgText,
   );
@@ -482,8 +516,8 @@ function handleMessageEvent(event) {
     channel: channelName,
     isDM,
     isThread,
-    isMehran,
-    mentionsSophie,
+    isPrincipal,
+    mentionsAgent,
     isUrgent,
   });
@@ -505,10 +539,10 @@ function handleMessageEvent(event) {
     is_reply: isThread,
     attachments: attachments.length > 0 ? attachments : undefined,
     priority_signals: {
-      from_ceo: isMehran,
+      from_ceo: isPrincipal,
       tagged_urgent: isUrgent,
       contains_deadline: false,
-      mentions_sophie: mentionsSophie || isDM,
+      mentions_agent: mentionsAgent || isDM,
     },
     raw_ref: `slack:${channelId}:${msgTs}`,
     _eventType: isThread ? "thread_reply" : isDM ? "dm" : "channel_message",
@@ -520,25 +554,25 @@ function handleMessageEvent(event) {
   markInPollerTracker(msgTs);
   // Write priority trigger for CEO DMs, @mentions, and urgent messages
-  if (isMehran && (isDM || isMehranDmChannel)) {
+  if (isPrincipal && (isDM || isPrincipalDmChannel)) {
     writePriorityTrigger(event, "CEO DM via Events API");
-  } else if (isMehran && !isDM) {
+  } else if (isPrincipal && !isDM) {
     writePriorityTrigger(event, "CEO channel message via Events API");
-  } else if (mentionsSophie) {
-    writePriorityTrigger(event, "Sophie @mentioned via Events API");
+  } else if (mentionsAgent) {
+    writePriorityTrigger(event, "Agent @mentioned via Events API");
   } else if (isUrgent) {
     writePriorityTrigger(event, "Urgent message via Events API");
   }
 }
 /**
- * Process an app_mention event (@Sophie or @Adaptic COO).
+ * Process an app_mention event (@-mention of the running agent).
  */
 function handleMentionEvent(event) {
   const msgText = event.text || "";
   const userId = event.user || "";
   const channelId = event.channel || "";
-  const isMehran = userId === MEHRAN_USER_ID;
+  const isPrincipal = userId === PRINCIPAL_USER_ID;
   const isUrgent = /\b(urgent|emergency|asap|blocker|critical)\b/i.test(
     msgText,
   );
@@ -557,15 +591,15 @@ function handleMentionEvent(event) {
     sender: resolveName(userId),
     sender_privilege: resolvePrivilege(userId),
     timestamp: new Date(parseFloat(msgTs) * 1000).toISOString(),
-    subject: `@Sophie in #${channelName}`,
+    subject: `@${loadAgent().firstName || "Agent"} in #${channelName}`,
     content: msgText,
     thread_id: event.thread_ts || "",
     is_reply: !!event.thread_ts && event.thread_ts !== event.ts,
     priority_signals: {
-      from_ceo: isMehran,
+      from_ceo: isPrincipal,
       tagged_urgent: isUrgent,
       contains_deadline: false,
-      mentions_sophie: true,
+      mentions_agent: true,
     },
     raw_ref: `slack:${channelId}:${msgTs}`,
     _eventType: "mention",
@@ -577,9 +611,9 @@ function handleMentionEvent(event) {
   // Mentions always get a priority trigger
   writePriorityTrigger(
     event,
-    isMehran
+    isPrincipal
       ? "CEO @mention via Events API"
-      : "Sophie @mentioned via Events API",
+      : "Agent @mentioned via Events API",
   );
 }
@@ -591,7 +625,7 @@ function handleReactionEvent(event) {
   const reaction = event.reaction || "";
   const itemTs = event.item?.ts || "";
   const itemChannel = event.item?.channel || "";
-  const isMehran = userId === MEHRAN_USER_ID;
+  const isPrincipal = userId === PRINCIPAL_USER_ID;
   const channelName = resolveChannelName(itemChannel, "channel");
   log("INFO", `Reaction event: :${reaction}: from ${resolveName(userId)}`, {
@@ -612,10 +646,10 @@ function handleReactionEvent(event) {
     thread_id: "",
     is_reply: false,
     priority_signals: {
-      from_ceo: isMehran,
+      from_ceo: isPrincipal,
       tagged_urgent: false,
       contains_deadline: false,
-      mentions_sophie: false,
+      mentions_agent: false,
     },
     raw_ref: `slack:${itemChannel}:${itemTs}:reaction:${reaction}`,
     _eventType: "reaction",
@@ -634,8 +668,8 @@ function handleHuddleEvent(event) {
   const userId = event.user || "";
   const huddleState = event.huddle_state || "";
-  // Don't react to Sophie's own huddle changes
-  if (userId === SOPHIE_USER_ID) return;
+  // Don't react to the agent's own huddle changes
+  if (userId === AGENT_USER_ID) return;
   const userName = resolveName(userId);
@@ -690,7 +724,7 @@ function handleEvent(payload) {
   stats.events_received++;
   stats.last_event_at = new Date().toISOString();
-  // Skip bot messages (including Sophie's own messages)
+  // Skip bot messages (including the agent's own messages)
   if (event.bot_id || event.subtype === "bot_message") {
     stats.events_skipped_bot++;
     log("DEBUG", `Bot message skipped`, {
@@ -701,8 +735,8 @@ function handleEvent(payload) {
     return;
   }
-  // Skip Sophie's own messages
-  if (event.user === SOPHIE_USER_ID) {
+  // Skip the agent's own messages
+  if (event.user === AGENT_USER_ID) {
     stats.events_skipped_bot++;
     markProcessed(eventId);
     return;
@@ -743,9 +777,9 @@ function handleEvent(payload) {
     // Re-check after normalization: the original event.user for
     // message_changed is often empty/system; the real author is in
-    // event.message.user. Without this, Sophie's own edited messages
-    // bypass the earlier SOPHIE_USER_ID filter and trigger self-replies.
-    if (event.user === SOPHIE_USER_ID) {
+    // event.message.user. Without this, the agent's own edited messages
+    // bypass the earlier AGENT_USER_ID filter and trigger self-replies.
+    if (event.user === AGENT_USER_ID) {
       stats.events_skipped_bot++;
       markProcessed(eventId);
       return;

package/scripts/slack-responded.sh CHANGED Viewed

@@ -24,8 +24,11 @@
 #     → purge entries older than 24h
 set -e
-LOCK_BASE_DIR="/Users/sophie/sophie-ai/state/locks/slack-response"
-LEGACY_DIR="/Users/sophie/sophie-ai/state/slack-responded"
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+AGENT_REPO_DIR="${AGENT_DIR:-$(cd "$SCRIPT_DIR/.." && pwd)}"
+LOCK_BASE_DIR="$AGENT_REPO_DIR/state/locks/slack-response"
+LEGACY_DIR="$AGENT_REPO_DIR/state/slack-responded"
 LOCK_TTL_MINUTES=1440  # 24 hours — thread-level dedup needs long TTL to prevent cross-session duplicates
 mkdir -p "$LOCK_BASE_DIR"