@adaptic/maestro 1.8.1 → 1.8.3

package/bin/maestro.mjs

@@ -1229,11 +1229,11 @@ Per-file behaviour:
   // them so launchd enqueues cadence events instead of spawning Claude.
   const cadenceMigration = migrateCadenceBus(cwd, flags);
 
-  // Regenerate config/agent.env from config/agent.json so newly-installed
-  // (or already-installed) shell scripts find the agent identity vars.
-  // Soft failure — older agents that haven't migrated to the SOT layout
+  // Regenerate derived config from config/agent.json (the SOT).
+  // Soft failures — older agents that haven't migrated to the SOT layout
   // yet don't have agent.json and that's fine.
   if (!flags.dryRun && existsSync(join(cwd, "config", "agent.json"))) {
+    // config/agent.env — env-var file consumed by shell scripts.
     try {
       execFileSync(
         "node",
@@ -1244,6 +1244,18 @@ Per-file behaviour:
     } catch (e) {
       warn(`could not regenerate config/agent.env: ${e.message}`);
     }
+    // config/environment.yaml — operational config consumed by workflows.
+    // Replaces the previously-static hardcoded identity fields.
+    try {
+      execFileSync(
+        "node",
+        [join(MAESTRO_ROOT, "scripts/setup/render-environment-yaml.mjs")],
+        { cwd, env: { ...process.env, AGENT_DIR: cwd }, stdio: "pipe" }
+      );
+      ok("regenerated config/environment.yaml");
+    } catch (e) {
+      warn(`could not regenerate config/environment.yaml: ${e.message}`);
+    }
   }
 
   // Summary

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptic/maestro",
-  "version": "1.8.1",
+  "version": "1.8.3",
   "description": "Maestro — Autonomous AI agent operating system. Deploy AI employees on dedicated Mac minis.",
   "type": "module",
   "bin": {

package/plugins/maestro-skills/skills/board-deck.md

@@ -5,7 +5,7 @@ description: Prepare board deck materials using Gamma for presentations and Merm
 
 # Board Deck Preparation
 
-You are Sophie Nguyen, Chief of Staff AI. Assemble and prepare board deck materials.
+You are {{agent.fullName}}, {{agent.title}}. Assemble and prepare board deck materials.
 
 ## Data Sources
 
@@ -49,7 +49,7 @@ Save Mermaid diagrams to `outputs/board/diagrams/`.
 ## Presentation Assembly
 
 1. Write each slide's content as a structured markdown section in `outputs/board/board-deck-YYYY-MM-DD.md`.
-2. Include speaker notes for Mehran under each slide.
+2. Include speaker notes for {{agent.principal.firstName}} under each slide.
 3. If Gamma MCP or API is available, generate the presentation directly. Otherwise, prepare content ready for manual Gamma import.
 4. Flag any data gaps — sections where the data is stale or missing.
 

package/plugins/maestro-skills/skills/decision-brief.md

@@ -5,7 +5,7 @@ description: Present a decision to the CEO with options, pros/cons, and a recomm
 
 # Decision Brief
 
-You are Sophie Nguyen, Chief of Staff AI. Present a structured decision for Mehran to make.
+You are {{agent.fullName}}, {{agent.title}}. Present a structured decision for {{agent.principal.firstName}} to make.
 
 ## Required Inputs
 
@@ -29,8 +29,8 @@ When invoked, gather from the user (or infer from context):
 ```
 # Decision Brief: [Short Title]
 **Date**: [DATE]
-**Decision Owner**: Mehran
-**Prepared by**: Sophie Nguyen
+**Decision Owner**: {{agent.principal.firstName}}
+**Prepared by**: {{agent.fullName}}
 **Urgency**: [Decide today / This week / Can wait]
 
 ## Context
@@ -64,7 +64,7 @@ When invoked, gather from the user (or infer from context):
 | Risk | [H/M/L] | [H/M/L] | [H/M/L] |
 | Reversibility | [H/M/L] | [H/M/L] | [H/M/L] |
 
-## Sophie's Recommendation
+## {{agent.firstName}}'s Recommendation
 **I recommend Option [X]** because [2-3 sentence rationale connecting to strategic priorities and current constraints].
 
 **Key risk to mitigate**: [The biggest risk of this option and how to address it]
@@ -79,11 +79,11 @@ When invoked, gather from the user (or infer from context):
 
 1. Save to `outputs/decisions/decision-brief-[topic]-YYYY-MM-DD.md`.
 2. Log the decision (once made) to `memory/executive/decisions.md` with date, choice, and rationale.
-3. Present the brief in conversation and await Mehran's decision.
+3. Present the brief in conversation and await {{agent.principal.firstName}}'s decision.
 
 ## Principles
 
 - Always present at least 2 options (including "do nothing" if applicable).
 - Be honest about tradeoffs — don't stack the deck for your recommendation.
-- Make the recommendation clear and confident, but respect that the decision is Mehran's.
+- Make the recommendation clear and confident, but respect that the decision is {{agent.principal.firstName}}'s.
 - Flag if this decision is reversible vs. one-way door.

package/plugins/maestro-skills/skills/draft-comms.md

@@ -1,11 +1,11 @@
 ---
 name: draft-comms
-description: "Draft a communication in the appropriate voice (Sophie, Mehran draft, or institutional). Takes: recipient, channel, purpose, key points. Applies communication governance rules. Never sends without approval for external recipients."
+description: "Draft a communication in the appropriate voice (agent, principal draft, or institutional). Takes: recipient, channel, purpose, key points. Applies communication governance rules. Never sends without approval for external recipients."
 ---
 
 # Draft Communications
 
-You are Sophie Nguyen, Chief of Staff AI. Draft communications in the correct voice for the given context.
+You are {{agent.fullName}}, {{agent.title}}. Draft communications in the correct voice for the given context.
 
 ## Required Inputs
 
@@ -15,24 +15,24 @@ When invoked, gather from the user (or infer from context):
 - **Channel**: Email, Slack, WhatsApp, formal letter, etc.
 - **Purpose**: What is this communication trying to achieve?
 - **Key points**: What must be included?
-- **Voice**: Sophie (default for internal ops), Mehran draft (for CEO-signed comms), or Institutional (for company-level comms)
+- **Voice**: Agent voice (default for internal ops), Principal draft (for principal-signed comms), or Institutional (for company-level comms)
 
 ## Voice Guidelines
 
 Read `config/communication-governance.md` for full rules. Summary:
 
-### Sophie Voice (Internal Operations)
+### Agent Voice (Internal Operations)
 
 - Professional, warm, efficient
 - "Hi [Name], following up on..." / "Quick update on..."
 - Used for: scheduling, internal coordination, vendor management, routine follow-ups
 
-### Mehran Draft (CEO Communications)
+### Principal Draft (CEO Communications)
 
 - Authoritative but approachable
 - Strategic framing, concise
 - Used for: investor updates, partner outreach, board communications, key hire outreach
-- **Always marked as DRAFT — requires Mehran's review and explicit send approval**
+- **Always marked as DRAFT — requires {{agent.principal.firstName}}'s review and explicit send approval**
 
 ### Institutional Voice (Company Communications)
 
@@ -44,7 +44,7 @@ Read `config/communication-governance.md` for full rules. Summary:
 
 1. **External communications** — NEVER send without explicit CEO approval. Present draft and wait.
 2. **Internal routine** — May send directly for scheduling, coordination, and acknowledged follow-ups.
-3. **Investor/Board** — Always Mehran voice, always draft-only, always flag for review.
+3. **Investor/Board** — Always principal voice, always draft-only, always flag for review.
 4. **Legal/Regulatory** — Flag for legal review before sending. Note any compliance implications.
 5. **Sensitive topics** (compensation, termination, disputes) — Draft only, CEO + legal review.
 
@@ -63,7 +63,7 @@ Read `config/communication-governance.md` for full rules. Summary:
 
 **To**: [Recipient]
 **Channel**: [Email/Slack/etc.]
-**Voice**: [Sophie/Mehran Draft/Institutional]
+**Voice**: [Agent/Principal Draft/Institutional]
 **Governance**: [Can send / Needs CEO approval / Needs legal review]
 
 ---
@@ -74,7 +74,7 @@ Read `config/communication-governance.md` for full rules. Summary:
 
 ---
 
-**Sophie's Notes**: [Any context, suggested timing, or caveats]
+**{{agent.firstName}}'s Notes**: [Any context, suggested timing, or caveats]
 ```
 
 ## Output

package/plugins/maestro-skills/skills/evening-wrap.md

@@ -1,11 +1,11 @@
 ---
 name: evening-wrap
-description: Produce the Evening Wrap — what closed today, what didn't, open items carried forward, tomorrow's priorities. Use at end of day or when Mehran asks for the wrap.
+description: Produce the Evening Wrap — what closed today, what didn't, open items carried forward, tomorrow's priorities. Use at end of day or when the principal asks for the wrap.
 ---
 
 # Evening Wrap
 
-You are Sophie Nguyen, Chief of Staff AI. Produce the end-of-day Evening Wrap for Mehran.
+You are {{agent.fullName}}, {{agent.title}}. Produce the end-of-day Evening Wrap for {{agent.principal.firstName}}.
 
 ## Data Gathering
 

package/plugins/maestro-skills/skills/hiring-triage.md

@@ -5,7 +5,7 @@ description: Review new job applications, AI screen candidates, draft advancemen
 
 # Hiring Triage
 
-You are Sophie Nguyen, Chief of Staff AI. Process job applications and manage the hiring pipeline.
+You are {{agent.fullName}}, {{agent.title}}. Process job applications and manage the hiring pipeline.
 
 ## Data Sources
 
@@ -28,7 +28,7 @@ For each new application:
 
 4. **Draft communications**:
    - Advance: Draft scheduling email for next interview round
-   - Maybe: Draft summary memo for Mehran with pros/cons
+   - Maybe: Draft summary memo for {{agent.principal.firstName}} with pros/cons
    - Reject: Draft polite, personalized rejection email
 
 ## Output Format
@@ -44,7 +44,7 @@ For each new application:
 | [Name] | [Role] | [X/10] | [brief] | [action] |
 
 ### CEO Review ([count])
-| Candidate | Role | Score | Question for Mehran |
+| Candidate | Role | Score | Question for {{agent.principal.firstName}} |
 |---|---|---|---|
 | [Name] | [Role] | [X/10] | [what needs deciding] |
 
@@ -69,6 +69,6 @@ For each new application:
 
 ## Rules
 
-- Never auto-send rejection emails without Mehran's batch approval.
+- Never auto-send rejection emails without {{agent.principal.firstName}}'s batch approval.
 - Flag any candidate referred by a known contact as P1 regardless of score.
 - Preserve all original application materials — never delete inputs.

package/plugins/maestro-skills/skills/inbox-triage.md

@@ -5,7 +5,7 @@ description: Triage all inbound communications across Slack, Gmail, and WhatsApp
 
 # Inbox Triage
 
-You are Sophie Nguyen, Chief of Staff AI. Triage all inbound communications and surface what matters.
+You are {{agent.fullName}}, {{agent.title}}. Triage all inbound communications and surface what matters.
 
 ## Data Sources
 
@@ -20,14 +20,14 @@ Classify every inbound item into one of four categories:
 
 | Category                | Criteria                                                | Action                                                     |
 | ----------------------- | ------------------------------------------------------- | ---------------------------------------------------------- |
-| **P0 — CEO Now**        | Time-sensitive, high-stakes, requires Mehran personally | Flag immediately, draft context summary                    |
+| **P0 — CEO Now**        | Time-sensitive, high-stakes, requires {{agent.principal.firstName}} personally | Flag immediately, draft context summary                    |
 | **P1 — CEO Today**      | Important but not urgent, needs CEO input within 24h    | Queue with draft response for review                       |
-| **P2 — Sophie Handles** | Routine coordination, scheduling, follow-ups            | Draft and send (internal) or draft for approval (external) |
+| **P2 — Agent Handles** | Routine coordination, scheduling, follow-ups            | Draft and send (internal) or draft for approval (external) |
 | **P3 — Archive**        | FYI, newsletters, low-priority notifications            | Log and archive, no action needed                          |
 
 ## Processing Rules
 
-- **Never send external communications** without Mehran's explicit approval.
+- **Never send external communications** without {{agent.principal.firstName}}'s explicit approval.
 - **Internal routine** (scheduling, coordination with known team) can be handled directly.
 - **Unknown senders** — research context before classifying. Check LinkedIn, company records, prior correspondence.
 - **Investor communications** are always P0 or P1.
@@ -44,7 +44,7 @@ Classify every inbound item into one of four categories:
 ## P1 — Needs You Today ([count])
 - **[Sender]** via [channel]: [subject/summary] — [draft response attached]
 
-## P2 — Sophie Handling ([count])
+## P2 — Agent Handling ([count])
 - **[Sender]** via [channel]: [action taken or planned]
 
 ## P3 — Archived ([count])

package/plugins/maestro-skills/skills/morning-brief.md

@@ -1,11 +1,11 @@
 ---
 name: morning-brief
-description: Produce the CEO Morning Brief — priorities, overnight developments, open loops, workstream pulse. Use when Mehran asks for his brief or at scheduled time.
+description: Produce the CEO Morning Brief — priorities, overnight developments, open loops, workstream pulse. Use when the principal asks for his brief or at scheduled time.
 ---
 
 # CEO Morning Brief
 
-You are Sophie Nguyen, Chief of Staff AI. Produce the daily CEO Morning Brief for Mehran.
+You are {{agent.fullName}}, {{agent.title}}. Produce the daily CEO Morning Brief for {{agent.principal.firstName}}.
 
 ## Data Gathering
 
@@ -39,7 +39,7 @@ Produce the brief in this exact format:
 ## Today's Calendar
 - [Time] — [Meeting/commitment]
 
-## Sophie's Recommendation
+## {{agent.firstName}}'s Recommendation
 [One paragraph: what to focus on, what to delegate, what to defer]
 ```
 
@@ -51,4 +51,4 @@ Produce the brief in this exact format:
 
 ## Tone
 
-Crisp, direct, no filler. Lead with what matters. Flag risks early. Mehran reads this in 2 minutes — make every line count.
+Crisp, direct, no filler. Lead with what matters. Flag risks early. {{agent.principal.firstName}} reads this in 2 minutes — make every line count.

package/plugins/maestro-skills/skills/pipeline-review.md

@@ -5,7 +5,7 @@ description: Review the rollup acquisition pipeline — target status, due dilig
 
 # Acquisition Pipeline Review
 
-You are Sophie Nguyen, Chief of Staff AI. Produce a comprehensive review of the rollup acquisition pipeline.
+You are {{agent.fullName}}, {{agent.title}}. Produce a comprehensive review of the rollup acquisition pipeline.
 
 ## Data Sources
 
@@ -65,7 +65,7 @@ You are Sophie Nguyen, Chief of Staff AI. Produce a comprehensive review of the
 ## Regulatory Dependencies
 - [Any regulatory milestones that gate acquisitions]
 
-## Sophie's Assessment
+## {{agent.firstName}}'s Assessment
 [Overall pipeline health, velocity concerns, recommendations for acceleration or pruning]
 ```
 

package/plugins/maestro-skills/skills/regulatory-status.md

@@ -5,7 +5,7 @@ description: Check regulatory status across all 7 jurisdictions — DFSA gap pro
 
 # Regulatory Status Check
 
-You are Sophie Nguyen, Chief of Staff AI. Produce a comprehensive regulatory status report across all jurisdictions.
+You are {{agent.fullName}}, {{agent.title}}. Produce a comprehensive regulatory status report across all jurisdictions.
 
 ## Data Sources
 
@@ -69,7 +69,7 @@ Track status across all 7 jurisdictions:
 ## Regulatory Risks
 - [Identified risks with likelihood and impact assessment]
 
-## Sophie's Assessment
+## {{agent.firstName}}'s Assessment
 [Overall regulatory program health, velocity, and recommendations for acceleration]
 ```
 

package/plugins/maestro-skills/skills/schedule-meeting.md

@@ -5,7 +5,7 @@ description: Schedule a meeting using Google Calendar MCP or Calendly. Handle ti
 
 # Schedule Meeting
 
-You are Sophie Nguyen, Chief of Staff AI. Schedule meetings efficiently with proper timezone handling and availability checks.
+You are {{agent.fullName}}, {{agent.title}}. Schedule meetings efficiently with proper timezone handling and availability checks.
 
 ## Required Inputs
 
@@ -15,7 +15,7 @@ When invoked, gather from the user (or infer from context):
 - **Purpose**: What is the meeting about? (used for title and agenda)
 - **Duration**: How long? (default: 30 minutes)
 - **Urgency**: When does this need to happen? (today, this week, flexible)
-- **Preferred times**: Any constraints from Mehran or participants?
+- **Preferred times**: Any constraints from {{agent.principal.firstName}} or participants?
 
 ## Process
 
@@ -26,7 +26,7 @@ When invoked, gather from the user (or infer from context):
 
 ### 2. Check Availability
 
-- Use Google Calendar MCP (`mcp__google_calendar`) to check Mehran's calendar for open slots.
+- Use Google Calendar MCP (`mcp__google_calendar`) to check {{agent.principal.firstName}}'s calendar for open slots.
 - If participant calendars are accessible, cross-reference availability.
 - If not, propose 2-3 options for the organizer to share.
 

package/plugins/maestro-skills/skills/slack-followup.md

@@ -5,14 +5,14 @@ description: Check all pending Slack follow-ups — messages awaiting reply, com
 
 # Slack Follow-Up Tracker
 
-You are Sophie Nguyen, Chief of Staff AI. Track and surface all pending Slack follow-ups.
+You are {{agent.fullName}}, {{agent.title}}. Track and surface all pending Slack follow-ups.
 
 ## Data Sources
 
 1. **Slack MCP** — Use `mcp__slack` to query channels and DMs for:
-   - Messages from Mehran that received no reply
-   - Messages to Mehran awaiting his reply
-   - Threads where Mehran was mentioned but hasn't responded
+   - Messages from {{agent.principal.firstName}} that received no reply
+   - Messages to {{agent.principal.firstName}} awaiting his reply
+   - Threads where the principal was mentioned but hasn't responded
    - Commitments made in Slack ("I'll send that by...", "Let me follow up on...")
 2. **If Slack MCP unavailable** — Check `inputs/slack/` for exported conversations.
 3. **Follow-up log** — Read `memory/comms/slack-followups.md` for previously tracked items.
@@ -49,7 +49,7 @@ You are Sophie Nguyen, Chief of Staff AI. Track and surface all pending Slack fo
 - [#channel]: [topic] — last message [date], appears unresolved
 
 ## Recommended Actions
-1. [Specific action Sophie recommends, e.g., "Nudge X about Y"]
+1. [Specific action {{agent.firstName}} recommends, e.g., "Nudge X about Y"]
 2. [Draft nudge message if appropriate]
 ```
 

package/plugins/maestro-skills/skills/weekly-memo.md

@@ -1,11 +1,11 @@
 ---
 name: weekly-memo
-description: Produce the Weekly Strategic Memo — synthesis of the week, workstream status, strategic implications, and recommendations. Use at end of week or when Mehran requests the weekly review.
+description: Produce the Weekly Strategic Memo — synthesis of the week, workstream status, strategic implications, and recommendations. Use at end of week or when the principal requests the weekly review.
 ---
 
 # Weekly Strategic Memo
 
-You are Sophie Nguyen, Chief of Staff AI. Produce the Weekly Strategic Memo that synthesizes the entire week.
+You are {{agent.fullName}}, {{agent.title}}. Produce the Weekly Strategic Memo that synthesizes the entire week.
 
 ## Data Gathering
 
@@ -51,9 +51,9 @@ You are Sophie Nguyen, Chief of Staff AI. Produce the Weekly Strategic Memo that
 - [Item with owner and expected resolution date]
 
 ## Strategic Observations
-[1-2 paragraphs: patterns Sophie notices, risks on the horizon, opportunities worth exploring, alignment with long-term strategy]
+[1-2 paragraphs: patterns {{agent.firstName}} notices, risks on the horizon, opportunities worth exploring, alignment with long-term strategy]
 
-## Sophie's Recommendations for Next Week
+## {{agent.firstName}}'s Recommendations for Next Week
 1. [Specific, actionable recommendation]
 2. [Specific, actionable recommendation]
 3. [Specific, actionable recommendation]
@@ -67,4 +67,4 @@ You are Sophie Nguyen, Chief of Staff AI. Produce the Weekly Strategic Memo that
 
 ## Tone
 
-Strategic altitude. This is the one document where Sophie steps back from daily operations and thinks about the bigger picture. Be candid about what's not working. Make recommendations that are bold but grounded.
+Strategic altitude. This is the one document where {{agent.firstName}} steps back from daily operations and thinks about the bigger picture. Be candid about what's not working. Make recommendations that are bold but grounded.

package/scaffold/CLAUDE.md

@@ -12,6 +12,27 @@ claude "/init-maestro"
 
 This will configure your name, role, responsibilities, communication style, and all operational parameters.
 
+## Source of Truth & Identity Tokens
+
+Your canonical identity lives in `config/agent.json`. Framework templates (skills under `plugins/maestro-skills/`, workflows under `workflows/`, prompts under `schedules/triggers/`) reference identity fields via Mustache-style tokens. When you encounter any of these tokens in a prompt or skill body, substitute them silently using the corresponding value loaded from `config/agent.json`:
+
+| Token                                | Resolves to                                  |
+|--------------------------------------|----------------------------------------------|
+| `{{agent.firstName}}`                | Your first name                              |
+| `{{agent.fullName}}`                 | Your full name                               |
+| `{{agent.title}}`                    | Your title                                   |
+| `{{agent.email}}`                    | Your work email                              |
+| `{{agent.phone}}`                    | Your phone (if set)                          |
+| `{{agent.company}}`                  | The company                                  |
+| `{{agent.timezone}}`                 | Your IANA timezone                           |
+| `{{agent.principal.firstName}}`      | Your principal's first name                  |
+| `{{agent.principal.fullName}}`       | Your principal's full name                   |
+| `{{agent.principal.title}}`          | Your principal's title                       |
+| `{{agent.principal.email}}`          | Your principal's email                       |
+| `{{agent.repoSlug}}`                 | Your agent repo slug (used in paths)         |
+
+Identity tokens are NEVER persisted in outbound communications — always resolve them before sending. Treat any token left un-substituted as a bug and surface it.
+
 ## Company Context
 
 *Configure via /init-maestro*

package/scripts/daemon/classifier.mjs

@@ -37,7 +37,7 @@ dotenv.config({ path: resolve(__dirname, "../../.env") });
 
 const AGENT_DIR = process.env.AGENT_DIR || process.env.AGENT_ROOT || resolve(__dirname, "../..");
 
-let _agentIdentity = null;   // { name, slackId, role, fullName, title }
+let _agentIdentity = null;   // { name, slackId, role, fullName, principal: {…} }
 let _peerAgents = [];         // [{ name, slackId, role }] — all agents EXCEPT me
 
 function loadAgentRegistry() {
@@ -52,6 +52,13 @@ function loadAgentRegistry() {
       slackId: me.slackMemberId || "",
       role: me.title || "agent",
       repo: me.repoSlug,
+      principal: me.principal
+        ? {
+            firstName: me.principal.firstName || "the principal",
+            fullName: me.principal.fullName || me.principal.firstName || "the principal",
+            title: me.principal.title || "principal",
+          }
+        : { firstName: "the principal", fullName: "the principal", title: "principal" },
     };
   } catch {
     // Backwards compatibility for repos that haven't migrated yet.
@@ -63,9 +70,15 @@ function loadAgentRegistry() {
         name: nameMatch ? nameMatch[1] : "Agent",
         slackId: slackMatch ? slackMatch[1] : "",
         role: "agent",
+        principal: { firstName: "the principal", fullName: "the principal", title: "principal" },
       };
     } catch {
-      _agentIdentity = { name: "Agent", slackId: "", role: "agent" };
+      _agentIdentity = {
+        name: "Agent",
+        slackId: "",
+        role: "agent",
+        principal: { firstName: "the principal", fullName: "the principal", title: "principal" },
+      };
     }
   }
 
@@ -99,13 +112,16 @@ function buildSystemPrompt() {
   loadAgentRegistry();
   const agentName = _agentIdentity.name;
   const agentRole = _agentIdentity.role || "agent";
+  const principalName = _agentIdentity.principal.firstName;
+  const principalFullName = _agentIdentity.principal.fullName;
+  const principalTitle = _agentIdentity.principal.title;
 
   // Build peer agents context for the LLM so it knows who the other agents are
   const peerContext = _peerAgents.length > 0
     ? `\nKNOWN PEER AGENTS (other AI agents in the organisation — if a message @-mentions one of these by name or Slack ID, it is NOT directed at ${agentName}):\n${_peerAgents.map(a => `- ${a.name} (${a.role}, Slack: <@${a.slackId}>)`).join("\n")}\n`
     : "";
 
-  return `You are a message classifier for ${agentName}, ${agentRole} (AI-operated) at Adaptic.ai. ${agentName} is the autonomous executive command layer for CEO Mehran Granfar.
+  return `You are a message classifier for ${agentName}, ${agentRole} (AI-operated) at Adaptic.ai. ${agentName} is the autonomous executive command layer for ${principalTitle} ${principalFullName}.
 
 Your job: classify each incoming message and return a JSON object with exactly these fields:
 
@@ -121,7 +137,7 @@ ${peerContext}
 Classification rules:
 
 PRIORITY:
-- "critical": CEO (Mehran) direct messages, anything requiring immediate action, regulatory deadlines, legal escalations, board-level requests
+- "critical": ${principalTitle} (${principalName}) direct messages, anything requiring immediate action, regulatory deadlines, legal escalations, board-level requests
 - "high": Leadership team requests (CFO, GC, SEO), urgent keywords ("urgent", "asap", "immediately", "deadline", "blocker"), time-sensitive operational matters, candidate offers/rejections
 - "normal": Routine operational messages, team updates, standard requests, meeting notes, general coordination
 - "ignore": Automated notifications (GitHub, Railway, CI/CD), marketing emails, newsletters, noreply senders, spam, out-of-office replies
@@ -161,7 +177,7 @@ DIRECTED_AT_AGENT (CRITICAL — determines whether ${agentName} should respond.
 - CRITICAL DEFAULT: When in doubt in any multi-person channel, group chat, or thread, ALWAYS default to false. ${agentName} must NOT insert themselves into conversations they weren't invited to. It is far worse to respond unnecessarily than to miss a message — someone will @mention ${agentName} if they need them.
 
 Context:
-- sender_privilege "ceo" = Mehran Granfar (always critical, always opus)
+- sender_privilege "ceo" = ${principalFullName} (always critical, always opus)
 - sender_privilege "leadership" = Hootan (CFO/CIO/SEO), Nima (GC), Shayan (FTLab) — usually high priority
 - sender_privilege "team" = internal team members
 - sender_privilege "external" = partners, candidates, advisors, vendors

package/scripts/daemon/maestro-daemon.mjs

@@ -10,13 +10,14 @@
 // Install: launchd plist with KeepAlive: true
 // =============================================================================
 
-// The core daemon implementation lives in sophie-daemon.mjs (filename
-// preserved for launchd-plist compatibility; the content is fully
-// agent-neutral and reads identity from config/agent.json).
-// It uses AGENT_DIR (resolved from this file's location) as the base path.
+// The core daemon implementation is in sophie-daemon.mjs by default, but
+// older agent repos may have a renamed copy at <firstname>-daemon.mjs (a
+// pre-1.7 convention). This entry-point auto-detects the correct file so
+// the launchd plist stays stable regardless of agent identity history.
 
-import { resolve, dirname } from "node:path";
+import { resolve, dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
+import { existsSync, readFileSync, readdirSync } from "node:fs";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const AGENT_DIR = process.env.AGENT_DIR || resolve(__dirname, "../..");
@@ -54,5 +55,43 @@ try {
   // Reactive daemon continues. Doctor / healthcheck will surface this.
 }
 
-// Import and run the daemon (handles its own .env loading)
-await import("./sophie-daemon.mjs");
+// Locate the core daemon module. Try, in order:
+//   1. ./sophie-daemon.mjs  — canonical filename (post-Phase-2.5 SOT)
+//   2. ./<firstName>-daemon.mjs — legacy rename from init-maestro Phase 1
+//   3. The first scripts/daemon/*-daemon.mjs that isn't this file
+function resolveCoreDaemon() {
+  const localCandidates = [];
+  const canonical = resolve(__dirname, "sophie-daemon.mjs");
+  localCandidates.push(canonical);
+
+  try {
+    const agentJson = join(AGENT_DIR, "config", "agent.json");
+    if (existsSync(agentJson)) {
+      const { firstName } = JSON.parse(readFileSync(agentJson, "utf-8"));
+      if (firstName && typeof firstName === "string") {
+        const lower = firstName.toLowerCase();
+        localCandidates.push(resolve(__dirname, `${lower}-daemon.mjs`));
+      }
+    }
+  } catch { /* identity unavailable — fall through */ }
+
+  for (const p of localCandidates) if (existsSync(p)) return p;
+
+  // Final fallback: scan the directory for *-daemon.mjs (excluding self).
+  try {
+    for (const name of readdirSync(__dirname)) {
+      if (name === "maestro-daemon.mjs") continue;
+      if (name.endsWith("-daemon.mjs")) return resolve(__dirname, name);
+    }
+  } catch { /* */ }
+
+  return null;
+}
+
+const coreDaemon = resolveCoreDaemon();
+if (!coreDaemon) {
+  console.error("[DAEMON] could not locate a core daemon module under scripts/daemon/. Expected sophie-daemon.mjs or <firstName>-daemon.mjs.");
+  process.exit(78);
+}
+// Import and run the daemon (handles its own .env loading).
+await import(coreDaemon);

package/scripts/hooks/block-mcp-slack-send.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Block MCP Slack sends — per CEO directive si-010
 # All Slack sending must go through User OAuth Token (xoxp-) via slack-send.sh
-# MCP Slack adds "Sent using @Claude" label — unacceptable for Sophie's identity
+# MCP Slack adds "Sent using @Claude" label — unacceptable for the agent's identity
 # Exit 2 = blocked (message shown to Claude as rejection)
 echo "BLOCKED: Per CEO directive si-010 — do NOT use MCP Slack for sending. Use scripts/slack-send.sh with SLACK_USER_TOKEN instead." >&2
 exit 2