@iamoberlin/chorus 2.2.1 → 2.4.0

package/README.md

@@ -8,6 +8,12 @@
 
 CHORUS implements the Nine Choirs architecture — hierarchical cognition modeled on Pseudo-Dionysius's *Celestial Hierarchy*. Illumination descends through the choirs; understanding ascends. The agent is sanctified through structure.
 
+## What's New in v2.3
+
+- **Unified delivery path.** Scheduler and manual commands now share one channel-aware delivery adapter for consistent formatting and routing.
+- **Channel-agnostic output.** Choir output adapts to the destination automatically (plain text for iMessage, markdown for webchat, etc.).
+- **Context passing fixed.** Illumination flow works correctly across all entry points — `run`, `vision`, and scheduled execution.
+
 ## The Core Idea
 
 Most AI agents are frozen. Same prompts, same limitations, no growth. CHORUS changes that through **architecture**:

package/index.ts

@@ -12,6 +12,7 @@ import { loadChorusConfig, type ChorusPluginConfig } from "./src/config.js";
 import { createSecurityHooks } from "./src/security.js";
 import { createChoirScheduler } from "./src/scheduler.js";
 import { CHOIRS, formatFrequency, CASCADE_ORDER } from "./src/choirs.js";
+import { deliverChoirOutput } from "./src/delivery.js";
 import {
   getTodayMetrics,
   getMetricsForDate,
@@ -21,8 +22,9 @@ import {
   formatMetricsSummary,
   formatWeeklySummary,
 } from "./src/metrics.js";
-import { createDaemon, DEFAULT_DAEMON_CONFIG, type DaemonConfig } from "./src/daemon.js";
+import { createDaemon, type DaemonConfig } from "./src/daemon.js";
 import { getInboxPath } from "./src/senses.js";
+import { formatEconomicsSummary, calculateAllROI } from "./src/economics.js";
 import {
   loadPurposes,
   addPurpose,
@@ -32,7 +34,6 @@ import {
 } from "./src/purposes.js";
 import {
   createPurposeResearchScheduler,
-  DEFAULT_PURPOSE_RESEARCH_CONFIG,
   type PurposeResearchConfig,
 } from "./src/purpose-research.js";
 // On-chain prayer imports are lazy-loaded in pray commands to avoid startup cost
@@ -69,11 +70,7 @@ const plugin = {
     }
 
     // Register daemon service
-    const daemonConfig: DaemonConfig = {
-      ...DEFAULT_DAEMON_CONFIG,
-      enabled: (pluginConfig as any)?.daemon?.enabled ?? true,
-      ...(pluginConfig as any)?.daemon,
-    };
+    const daemonConfig: DaemonConfig = config.daemon;
     
     let daemon: ReturnType<typeof createDaemon> | null = null;
     if (daemonConfig.enabled) {
@@ -85,13 +82,7 @@ const plugin = {
     }
 
     // Register purpose research service
-    const purposeResearchConfig: PurposeResearchConfig = {
-      ...DEFAULT_PURPOSE_RESEARCH_CONFIG,
-      enabled: config.purposeResearch.enabled,
-      dailyRunCap: config.purposeResearch.dailyRunCap,
-      defaultFrequency: config.purposeResearch.defaultFrequency,
-      defaultMaxFrequency: config.purposeResearch.defaultMaxFrequency,
-    };
+    const purposeResearchConfig: PurposeResearchConfig = config.purposeResearch;
 
     let purposeResearch: ReturnType<typeof createPurposeResearchScheduler> | null = null;
     if (purposeResearchConfig.enabled) {
@@ -130,68 +121,6 @@ const plugin = {
       return '';
     }
 
-    // Deliver choir output to user via OpenClaw messaging (channel-agnostic)
-    // Reads target from OpenClaw config (channels.*.allowFrom) — no hardcoded PII
-    function deliverIfNeeded(choir: typeof CHOIRS[string], text: string): void {
-      if (!choir.delivers || !text || text === 'HEARTBEAT_OK' || text === 'NO_REPLY') return;
-
-      // Resolve delivery target from OpenClaw channel config
-      const channels = api.config?.channels as Record<string, any> | undefined;
-      let target: string | undefined;
-      let channel: string | undefined;
-
-      if (channels) {
-        for (const [ch, cfg] of Object.entries(channels)) {
-          if (cfg?.enabled && cfg?.allowFrom?.[0]) {
-            target = cfg.allowFrom[0];
-            channel = ch;
-            break;
-          }
-        }
-      }
-
-      if (!target) {
-        console.log(`    ⚠ No delivery target found in OpenClaw config`);
-        return;
-      }
-
-      // Strip markdown for channels that don't support it
-      let deliveryText = text.slice(0, 4000);
-      if (channel === 'imessage') {
-        deliveryText = deliveryText
-          .replace(/\*\*(.+?)\*\*/g, '$1')    // bold
-          .replace(/\*(.+?)\*/g, '$1')          // italic
-          .replace(/__(.+?)__/g, '$1')          // bold alt
-          .replace(/_(.+?)_/g, '$1')            // italic alt
-          .replace(/`(.+?)`/g, '$1')            // inline code
-          .replace(/```[\s\S]*?```/g, '')       // code blocks
-          .replace(/^#{1,6}\s+/gm, '')          // headers
-          .replace(/^\s*[-*+]\s+/gm, '• ')     // bullet lists
-          .replace(/\[([^\]]+)\]\([^)]+\)/g, '$1'); // links
-      }
-
-      try {
-        const args = [
-          'message', 'send',
-          '--target', target,
-          '--message', deliveryText,
-        ];
-        if (channel) args.push('--channel', channel);
-
-        const deliveryResult = spawnSync('openclaw', args, {
-          encoding: 'utf-8',
-          timeout: 30000,
-        });
-        if (deliveryResult.status === 0) {
-          console.log(`    📨 Delivered to user via ${channel || 'default'}`);
-        } else {
-          console.log(`    ⚠ Delivery failed: ${(deliveryResult.stderr || '').slice(0, 80)}`);
-        }
-      } catch (err: any) {
-        console.log(`    ⚠ Delivery error: ${(err.message || '').slice(0, 80)}`);
-      }
-    }
-
     // Register CLI
     api.registerCli((ctx) => {
       const program = ctx.program.command("chorus").description("CHORUS Nine Choirs management");
@@ -315,7 +244,7 @@ const plugin = {
                   const preview = text.slice(0, 150).replace(/\n/g, ' ');
                   console.log(`    ${preview}${text.length > 150 ? '...' : ''}`);
                 }
-                deliverIfNeeded(choir, text);
+                await deliverChoirOutput(api, choir, text, api.logger);
               } catch (err) {
                 console.error(`  ✗ ${choir.name} failed:`, err);
               }
@@ -341,7 +270,7 @@ const plugin = {
                     const preview = text.slice(0, 150).replace(/\n/g, ' ');
                     console.log(`    ${preview}${text.length > 150 ? '...' : ''}`);
                   }
-                  deliverIfNeeded(choir, text);
+                  await deliverChoirOutput(api, choir, text, api.logger);
                 } else {
                   const errMsg = result.stderr || result.stdout || 'Unknown error';
                   if (errMsg.includes('ECONNREFUSED') || errMsg.includes('connect')) {
@@ -483,7 +412,7 @@ const plugin = {
                       console.log(` ✓`);
 
                       // Deliver output to user via OpenClaw messaging if choir is marked for delivery
-                      deliverIfNeeded(choir, text);
+                      void deliverChoirOutput(api, choir, text, api.logger);
                     } catch {
                       const fallback = result.stdout?.slice(-2000) || `[${choir.name} completed]`;
                       contextStore.set(choirId, fallback);
@@ -684,6 +613,80 @@ const plugin = {
           }
         });
 
+      // Economics commands
+      const econCmd = program.command("economics").alias("econ").description("Attention economics (Phase 1: observe)");
+
+      econCmd
+        .command("summary")
+        .description("Show ROI summary per choir")
+        .option("--days <n>", "Rolling window in days", "7")
+        .action((opts: any) => {
+          console.log("");
+          console.log(formatEconomicsSummary(parseInt(opts.days) || 7));
+          console.log("");
+        });
+
+      econCmd
+        .command("roi")
+        .description("Show ROI table for all choirs")
+        .option("--days <n>", "Rolling window in days", "7")
+        .action((opts: any) => {
+          const days = parseInt(opts.days) || 7;
+          const all = calculateAllROI(days);
+          console.log("");
+          console.log(`Choir ROI — ${days}d window`);
+          console.log("─".repeat(60));
+          for (const r of all) {
+            const roi = r.totalCostUsd > 0 ? `${r.roi.toFixed(1)}x` : "—";
+            const bar = r.totalCostUsd > 0 ? "█".repeat(Math.min(20, Math.round(r.roi * 2))) : "";
+            console.log(`  ${r.choirId.padEnd(16)} ${roi.padStart(6)}  $${r.totalCostUsd.toFixed(2).padStart(6)}  ${bar}`);
+          }
+          console.log("");
+        });
+
+      // ── Behavioral Sink Health (Universe 25) ──────────────────
+      program
+        .command("health")
+        .description("Behavioral sink health check (Universe 25 anti-collapse)")
+        .action(async () => {
+          const { getSinkHealthSummary } = await import("./src/behavioral-sink.js");
+          const health = getSinkHealthSummary();
+          console.log("");
+          console.log(health.healthy ? "🟢 CHORUS Health: HEALTHY" : "🔴 CHORUS Health: DEGRADED");
+          console.log("═".repeat(50));
+          console.log("");
+
+          if (Object.keys(health.choirHealth).length === 0) {
+            console.log("  No quality data yet. Run some choir cycles first.");
+          } else {
+            console.log("  Choir Quality (avg over last 10 runs):");
+            for (const [id, h] of Object.entries(health.choirHealth) as any) {
+              const bar = "█".repeat(Math.round(h.avgQuality / 5)) + "░".repeat(20 - Math.round(h.avgQuality / 5));
+              const trendIcon = h.trend === "improving" ? "📈" : h.trend === "declining" ? "📉" : "➡️";
+              const boAlert = h.beautifulOneCount > 0 ? ` 🪞×${h.beautifulOneCount}` : "";
+              console.log(`    ${id.padEnd(16)} [${bar}] ${h.avgQuality}  ${trendIcon}${boAlert}`);
+            }
+          }
+
+          if (health.starvingPurposes.length > 0) {
+            console.log("");
+            console.log("  🏚️ Starving Purposes:");
+            for (const p of health.starvingPurposes) {
+              console.log(`    - ${p}`);
+            }
+          }
+
+          if (health.recentIncidents.length > 0) {
+            console.log("");
+            console.log("  🪞 Recent Beautiful One Incidents:");
+            for (const i of health.recentIncidents) {
+              console.log(`    ${i.timestamp.slice(0, 16)} ${i.choirId} (score: ${i.score})`);
+            }
+          }
+
+          console.log("");
+        });
+
       // Daemon commands
       const daemonCmd = program.command("daemon").description("Autonomous attention daemon");
 

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "chorus",
   "name": "CHORUS",
   "description": "CHORUS: Hierarchy Of Recursive Unified Self-improvement",
-  "version": "2.2.1",
+  "version": "2.3.0",
   "author": "Oberlin",
   "homepage": "https://chorus.oberlin.ai",
   "repository": "https://github.com/iamoberlin/chorus",
@@ -48,10 +48,40 @@
             "type": "boolean",
             "description": "Enable the daemon"
           },
+          "senses": {
+            "type": "object",
+            "description": "Enable/disable daemon input senses",
+            "properties": {
+              "inbox": {
+                "type": "boolean",
+                "description": "Watch inbox filesystem signals"
+              },
+              "purposes": {
+                "type": "boolean",
+                "description": "Watch purpose-state signals"
+              },
+              "time": {
+                "type": "boolean",
+                "description": "Watch time-based signals"
+              }
+            }
+          },
           "thinkThreshold": {
             "type": "number",
             "description": "Minimum priority to invoke cognition (0-100)"
           },
+          "pollIntervalMs": {
+            "type": "number",
+            "description": "Polling interval in milliseconds"
+          },
+          "minSleepMs": {
+            "type": "number",
+            "description": "Minimum sleep during high queue pressure in milliseconds"
+          },
+          "maxSleepMs": {
+            "type": "number",
+            "description": "Maximum sleep during quiet hours in milliseconds"
+          },
           "quietHoursStart": {
             "type": "number",
             "description": "Hour to start quiet mode (0-23)"
@@ -81,6 +111,44 @@
           "defaultMaxFrequency": {
             "type": "number",
             "description": "Maximum frequency when deadline is urgent"
+          },
+          "researchTimeoutMs": {
+            "type": "number",
+            "description": "Research run timeout in milliseconds"
+          },
+          "checkIntervalMs": {
+            "type": "number",
+            "description": "Research scheduler check interval in milliseconds"
+          }
+        }
+      },
+      "prayers": {
+        "type": "object",
+        "description": "On-chain prayer chain configuration",
+        "properties": {
+          "enabled": {
+            "type": "boolean",
+            "description": "Enable prayer chain commands"
+          },
+          "rpcUrl": {
+            "type": "string",
+            "description": "Solana RPC endpoint URL"
+          },
+          "autonomous": {
+            "type": "boolean",
+            "description": "Allow autonomous prayer actions without manual approval"
+          },
+          "maxBountySOL": {
+            "type": "number",
+            "description": "Maximum bounty per prayer in SOL"
+          },
+          "defaultTTL": {
+            "type": "number",
+            "description": "Default prayer time-to-live in seconds"
+          },
+          "keypairPath": {
+            "type": "string",
+            "description": "Path to Solana keypair file"
           }
         }
       }
@@ -118,6 +186,11 @@
     "purposeResearch": {
       "label": "Purpose Research",
       "help": "Configure purpose-derived research scheduler"
+    },
+    "prayers": {
+      "label": "Prayer Chain",
+      "advanced": true,
+      "help": "Configure on-chain prayer settings (RPC, autonomy, bounty limits, keypair)"
     }
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@iamoberlin/chorus",
-  "version": "2.2.1",
-  "description": "CHORUS: Hierarchy Of Recursive Unified Self-improvement — with on-chain Prayer Chain (Solana)",
+  "version": "2.4.0",
+  "description": "CHORUS: Hierarchy Of Recursive Unified Self-improvement \u2014 with on-chain Prayer Chain (Solana)",
   "author": "Oberlin <iam@oberlin.ai>",
   "license": "MIT",
   "repository": {