@adaptic/maestro 1.5.1 → 1.6.0

package/bin/maestro.mjs

@@ -762,26 +762,28 @@ function loadMaestroignore(cwd) {
 }
 
 function patternToRegex(pat) {
-  // Directory prefix: `scripts/daemon/` matches scripts/daemon/* (recursive)
-  if (pat.endsWith("/")) {
-    const prefix = pat.replace(/[.+^${}()|[\]\\]/g, "\\$&");
-    return new RegExp("^" + prefix);
-  }
-  // Glob with * and **.
-  // Step order matters: ** must be captured before single * to preserve
-  // recursive semantics. * is intentionally NOT in the regex-escape char
-  // class so we can rewrite it after escaping the other specials.
-  if (pat.includes("*")) {
-    const escaped = pat
-      .replace(/[.+^${}()|[\]\\]/g, "\\$&")
+  // Helper: convert a glob-aware pattern to its regex source.
+  // ** must be substituted before single * so we don't double-rewrite it.
+  // * is intentionally outside the regex-escape char class so the
+  // glob substitution can find unescaped `*` characters afterward.
+  const globToRe = (p) =>
+    p.replace(/[.+^${}()|[\]\\]/g, "\\$&")
       .replace(/\*\*/g, "<DBL>")
       .replace(/\*/g, "[^/]*")
       .replace(/<DBL>/g, ".*");
-    return new RegExp("^" + escaped + "$");
+
+  // Directory prefix: `scripts/daemon/` or `agents/sophie-*/` match
+  // anything under that path (recursive).
+  if (pat.endsWith("/")) {
+    return new RegExp("^" + globToRe(pat));
   }
-  // Exact: also match anything underneath (a path like `scripts/daemon`
-  // without trailing slash should still protect the whole directory if
-  // it resolves to one — gitignore semantics).
+  // Single-line glob: must match in full (no trailing slash).
+  if (pat.includes("*")) {
+    return new RegExp("^" + globToRe(pat) + "$");
+  }
+  // Exact: also matches anything underneath (gitignore semantics — a
+  // pattern without trailing slash still protects a directory if it
+  // resolves to one).
   const escaped = pat.replace(/[.+^${}()|[\]\\]/g, "\\$&");
   return new RegExp("^" + escaped + "(/|$)");
 }
@@ -1013,6 +1015,23 @@ Per-file behaviour:
     }
   }
 
+  // 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
+  // yet don't have agent.json and that's fine.
+  if (!flags.dryRun && existsSync(join(cwd, "config", "agent.json"))) {
+    try {
+      execFileSync(
+        "node",
+        [join(MAESTRO_ROOT, "scripts/setup/generate-agent-env.mjs")],
+        { cwd, env: { ...process.env, AGENT_DIR: cwd }, stdio: "pipe" }
+      );
+      ok("regenerated config/agent.env");
+    } catch (e) {
+      warn(`could not regenerate config/agent.env: ${e.message}`);
+    }
+  }
+
   // Summary
   console.log();
   console.log(`${C.bold}Upgrade summary${C.reset}${flags.dryRun ? " (dry run, nothing written)" : ""}`);

package/package.json

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

package/scaffold/config/agent.json

@@ -0,0 +1,52 @@
+{
+  "firstName": "Sophie",
+  "lastName": "Nguyen",
+  "fullName": "Sophie Nguyen",
+  "title": "Chief of Staff",
+  "archetype": "executive-operator",
+
+  "email": "sophie@adaptic.ai",
+  "phone": "",
+  "slackMemberId": "",
+
+  "company": "Adaptic.ai",
+  "companyDomain": "adaptic.ai",
+  "companyDescription": "AI-native institutional asset management group",
+
+  "principal": {
+    "firstName": "Mehran",
+    "lastName": "Granfar",
+    "fullName": "Mehran Granfar",
+    "title": "CEO",
+    "email": "mehran@adaptic.ai",
+    "slackMemberId": ""
+  },
+
+  "machineName": "sophie-mini",
+  "repoSlug": "sophie-ai",
+  "launchdLabelPrefix": "ai.adaptic.sophie",
+
+  "timezone": "UTC",
+  "locale": "en-US",
+
+  "schedule": {
+    "morningBrief": "08:00",
+    "commsTriage": ["08:00", "12:00", "17:00"],
+    "eveningWrap": "18:00",
+    "overnightMonitoring": "22:00"
+  },
+
+  "communication": {
+    "defaultTone": "warm-professional",
+    "externalTone": "formal",
+    "voiceModes": [
+      { "id": "agent", "label": "Agent's voice", "description": "Default for all operational communications" },
+      { "id": "principal", "label": "Principal's voice", "description": "For communications attributed to the principal" },
+      { "id": "internal", "label": "Internal notes", "description": "Analysis, risk flags — not sent externally" },
+      { "id": "institutional", "label": "Institutional", "description": "Regulatory and legal correspondence" }
+    ]
+  },
+
+  "responsibilities": [],
+  "operatingPrinciples": []
+}

package/scaffold/config/agent.ts.example

@@ -1,219 +1,89 @@
 /**
- * Maestro — Agent Configuration
+ * Maestro — Agent Configuration (TypeScript wrapper)
  *
- * This is the single source of truth for the agent's identity, contact details,
- * organisational context, and operational parameters. Every file in the repo that
- * references the agent by name, email, phone, or role should import from here
- * instead of hardcoding values.
+ * The canonical source of truth is `config/agent.json` — every framework
+ * file (Python, shell, Node, YAML) reads from that file (or its sibling
+ * `config/agent.env` which is auto-generated for shell consumers).
  *
- * When deploying a new Maestro instance, run:
- *   claude "/init-maestro"
- * The wizard will populate this file interactively.
+ * This TypeScript wrapper exists ONLY to:
+ *   - Provide compile-time types for code that imports the config
+ *   - Expose computed convenience values (REPO_DIR, EMAIL_SIGNATURE, …)
  *
- * To use in scripts:
- *   import { agent } from '../config/agent.ts';
- *
- * To use in shell scripts, read the generated JSON:
- *   jq '.firstName' config/agent.json
+ * Do NOT add agent identity values here. Edit `config/agent.json` instead,
+ * then run `npx tsx scripts/setup/generate-agent-env.mjs` to regenerate
+ * `config/agent.env`.
  */
 
-// ---------------------------------------------------------------------------
-// Agent Identity
-// ---------------------------------------------------------------------------
-
-export const agent = {
-  /** Agent's first name — used in greetings, signatures, and voice references */
-  firstName: 'Sophie',
-
-  /** Agent's last name */
-  lastName: 'Nguyen',
-
-  /** Full display name — appears in email signatures, Slack profile, documents */
-  fullName: 'Sophie Nguyen',
-
-  /** Job title — used in CLAUDE.md identity section and email signatures */
-  title: 'Chief of Staff',
-
-  /**
-   * Role archetype — determines which operating principles, communication rules,
-   * and workflow templates are most appropriate. Used by /init-maestro to select
-   * defaults. Common archetypes:
-   *   'executive-operator'  — Chief of Staff, COO-type roles
-   *   'technical-leader'    — CTO, Head of Engineering, Chief Scientist
-   *   'commercial-leader'   — Head of Sales, IR, BD
-   *   'compliance-officer'  — Head of Compliance, Legal, Regulatory
-   *   'product-leader'      — Head of Product, UX
-   *   'operations-leader'   — Head of Ops, Fund Ops, HR
-   */
-  archetype: 'executive-operator' as const,
-
-  // ---------------------------------------------------------------------------
-  // Contact Details
-  // ---------------------------------------------------------------------------
-
-  /** Agent's primary email address */
-  email: 'sophie@adaptic.ai',
-
-  /** Agent's phone number (E.164 format) — used for Twilio SMS/voice/WhatsApp */
-  phone: '+16282656712',
+import agentData from './agent.json' with { type: 'json' };
 
-  /** Agent's Slack member ID (e.g. U097N5R0M7U) — used for mentions, DM routing,
-   *  and cross-agent message filtering (see config/known-agents.json) */
-  slackMemberId: '',
+export interface VoiceMode {
+  id: string;
+  label: string;
+  description: string;
+}
 
-  // ---------------------------------------------------------------------------
-  // Organisation
-  // ---------------------------------------------------------------------------
+export interface PrincipalConfig {
+  firstName: string;
+  lastName: string;
+  fullName: string;
+  title: string;
+  email: string;
+  slackMemberId: string;
+}
 
-  /** Company name — appears in CLAUDE.md, documents, email signatures */
-  company: 'Adaptic.ai',
+export interface AgentConfig {
+  firstName: string;
+  lastName: string;
+  fullName: string;
+  title: string;
+  archetype: string;
 
-  /** Company domain — used for email addresses, branding */
-  companyDomain: 'adaptic.ai',
+  email: string;
+  phone: string;
+  slackMemberId: string;
 
-  /** Brief company description — used in agent system prompts */
-  companyDescription: 'AI-native institutional asset management group',
+  company: string;
+  companyDomain: string;
+  companyDescription: string;
 
-  // ---------------------------------------------------------------------------
-  // Reporting Line
-  // ---------------------------------------------------------------------------
+  principal: PrincipalConfig;
 
-  /** The agent's primary principal — the person they report to and act on behalf of */
-  principal: {
-    firstName: 'Mehran',
-    lastName: 'Granfar',
-    fullName: 'Mehran Granfar',
-    title: 'CEO',
-    email: 'mehran@adaptic.ai',
-    slackMemberId: 'U097N5R0M7U',
-  },
+  machineName: string;
+  repoSlug: string;
+  launchdLabelPrefix: string;
 
-  // ---------------------------------------------------------------------------
-  // Machine & Deployment
-  // ---------------------------------------------------------------------------
+  timezone: string;
+  locale: string;
 
-  /** Hostname of the dedicated Mac mini this agent runs on */
-  machineName: 'sophie-mini',
-
-  /** Repository directory name (basename only, not full path) */
-  repoSlug: 'maestro',
-
-  /**
-   * LaunchD label prefix for all daemon processes.
-   * Processes will be named: {labelPrefix}-poller, {labelPrefix}-inbox-processor, etc.
-   */
-  launchdLabelPrefix: 'ai.adaptic.sophie',
+  schedule: {
+    morningBrief: string;
+    commsTriage: string[];
+    eveningWrap: string;
+    overnightMonitoring: string;
+  };
 
-  // ---------------------------------------------------------------------------
-  // Operational Parameters
-  // ---------------------------------------------------------------------------
+  communication: {
+    defaultTone: string;
+    externalTone: string;
+    voiceModes: VoiceMode[];
+  };
 
-  /** IANA timezone — all scheduled triggers use this */
-  timezone: 'Asia/Dubai',
+  responsibilities: string[];
+  operatingPrinciples: string[];
+}
 
-  /** Locale for date/number formatting */
-  locale: 'en-US',
+export const agent: AgentConfig = agentData as AgentConfig;
 
-  /** Daily schedule (times in HH:MM, agent's timezone) */
-  schedule: {
-    morningBrief: '06:00',
-    commsTriage: ['08:00', '12:00', '17:00'],
-    eveningWrap: '18:00',
-    overnightMonitoring: '22:00',
-  },
+// ── Derived values ──────────────────────────────────────────────────────
 
-  // ---------------------------------------------------------------------------
-  // Communication Style
-  // ---------------------------------------------------------------------------
-
-  communication: {
-    /**
-     * Default tone: 'formal' | 'warm-professional' | 'casual'
-     * This affects how the agent writes emails, Slack messages, and documents.
-     */
-    defaultTone: 'warm-professional' as const,
-
-    /** Tone used for external communications (partners, candidates, vendors) */
-    externalTone: 'formal' as const,
-
-    /**
-     * Voice modes available to this agent.
-     * The first entry is the default voice.
-     */
-    voiceModes: [
-      {
-        id: 'agent',
-        label: "Agent's voice",
-        description: 'Default for all operational communications',
-      },
-      {
-        id: 'principal',
-        label: "Principal's voice",
-        description: 'For communications attributed to the principal',
-      },
-      {
-        id: 'internal',
-        label: 'Internal notes',
-        description: 'Analysis, risk flags — not sent externally',
-      },
-      {
-        id: 'institutional',
-        label: 'Institutional',
-        description: 'Regulatory and legal correspondence',
-      },
-    ],
-  },
-
-  // ---------------------------------------------------------------------------
-  // Responsibilities
-  // ---------------------------------------------------------------------------
-
-  /**
-   * Core responsibilities — used to generate the CLAUDE.md identity section
-   * and to scope the agent's operating principles. Keep to 3-7 bullet points.
-   */
-  responsibilities: [
-    'Track every commitment until it closes',
-    'Coordinate 30+ specialist agent teams',
-    'Manage all inbound/outbound communications',
-    'Execute strategic priorities autonomously',
-    'Maintain institutional memory across sessions',
-  ],
-
-  /**
-   * Operating principles — the behavioural rules that define how the agent works.
-   * These are injected into CLAUDE.md and guide all decision-making.
-   */
-  operatingPrinciples: [
-    'Follow-through over brilliance — track every commitment until it closes',
-    'Concise over comprehensive — sharp recommendations, not exhaustive reports',
-    'Evidence over opinion — cite sources for recommendations',
-    'Bias to action — act decisively on operational matters; escalate only strategic commitments',
-    'Audit everything — every action is logged',
-    'Full autonomy, full accountability — operate independently with complete audit trail',
-  ],
-} as const;
-
-// ---------------------------------------------------------------------------
-// Derived Values (computed from the config above)
-// ---------------------------------------------------------------------------
-
-/** Uppercase first name for shell variable prefixes (e.g. SOPHIE_AI_DIR) */
+/** Uppercase first name for shell variable prefixes */
 export const AGENT_UPPER = agent.firstName.toUpperCase();
 
-/** Lowercase first name for file/directory naming (e.g. sophie-ai) */
+/** Lowercase first name for file/directory naming */
 export const AGENT_LOWER = agent.firstName.toLowerCase();
 
-/** The repo directory name in the user's home (e.g. ~/maestro) */
+/** Repo directory in the user's home (e.g. ~/sophie-ai) */
 export const REPO_DIR = `~/${agent.repoSlug}`;
 
-/** Email signature line */
+/** Email signature one-liner */
 export const EMAIL_SIGNATURE = `${agent.fullName} | ${agent.title} | ${agent.company}`;
-
-// ---------------------------------------------------------------------------
-// Type Exports
-// ---------------------------------------------------------------------------
-
-export type AgentConfig = typeof agent;
-export type VoiceMode = (typeof agent.communication.voiceModes)[number];
-export type Archetype = typeof agent.archetype;

package/scripts/archive-email.sh

@@ -4,14 +4,28 @@
 # Requires GMAIL_APP_PASSWORD environment variable
 set -e
 
-export GMAIL_APP_PASSWORD=nqinfcgnhzmjucho
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+AGENT_REPO_DIR="${AGENT_DIR:-$(cd "$SCRIPT_DIR/.." && pwd)}"
+
+# Pull AGENT_EMAIL + GMAIL_APP_PASSWORD from agent.env + .env
+[ -f "$AGENT_REPO_DIR/config/agent.env" ] && source "$AGENT_REPO_DIR/config/agent.env"
+[ -f "$AGENT_REPO_DIR/.env" ] && source "$AGENT_REPO_DIR/.env"
+
+if [ -z "${GMAIL_APP_PASSWORD:-}" ]; then
+  echo "ERROR: GMAIL_APP_PASSWORD not set" >&2
+  exit 1
+fi
+export AGENT_EMAIL
+export GMAIL_APP_PASSWORD
 
 python3 << 'PYEOF'
 import imaplib
 import os
 
-user = "sophie@adaptic.ai"
+user = os.environ.get("AGENT_EMAIL", "")
 password = os.environ["GMAIL_APP_PASSWORD"]
+if not user:
+    raise SystemExit("AGENT_EMAIL not set — check config/agent.env")
 
 mail = imaplib.IMAP4_SSL("imap.gmail.com")
 mail.login(user, password)