@iamoberlin/chorus 1.2.6 → 1.2.8

package/index.ts

@@ -38,7 +38,7 @@ import {
 import * as prayers from "./src/prayers/prayers.js";
 import * as prayerStore from "./src/prayers/store.js";
 
-const VERSION = "1.2.6"; // Fixed: use --message flag instead of nonexistent stdin support
+const VERSION = "1.2.7"; // Fixed JSON parsing: extract JSON from output (plugin logs prefix it)
 
 const plugin = {
   id: "chorus",
@@ -208,7 +208,13 @@ const plugin = {
                   isolated: true,
                   timeoutSeconds: 300,
                 });
-                console.log(`  ✓ ${choir.name} complete`);
+                const text = result?.text || result?.payloads?.[0]?.text || '';
+                const duration = result?.meta?.durationMs || 0;
+                console.log(`  ✓ ${choir.name} complete (${(duration/1000).toFixed(1)}s)`);
+                if (text) {
+                  const preview = text.slice(0, 150).replace(/\n/g, ' ');
+                  console.log(`    ${preview}${text.length > 150 ? '...' : ''}`);
+                }
               } catch (err) {
                 console.error(`  ✗ ${choir.name} failed:`, err);
               }
@@ -228,7 +234,11 @@ const plugin = {
                 
                 if (result.status === 0) {
                   try {
-                    const json = JSON.parse(result.stdout || '{}');
+                    // Extract JSON from output (may have plugin logs before it)
+                    const stdout = result.stdout || '';
+                    const jsonStart = stdout.indexOf('{');
+                    const jsonStr = jsonStart >= 0 ? stdout.slice(jsonStart) : '{}';
+                    const json = JSON.parse(jsonStr);
                     const text = json.result?.payloads?.[0]?.text || '';
                     const duration = json.result?.meta?.durationMs || 0;
                     console.log(`  ✓ ${choir.name} complete (${(duration/1000).toFixed(1)}s)`);
@@ -236,8 +246,8 @@ const plugin = {
                       const preview = text.slice(0, 150).replace(/\n/g, ' ');
                       console.log(`    ${preview}${text.length > 150 ? '...' : ''}`);
                     }
-                  } catch {
-                    console.log(`  ✓ ${choir.name} complete`);
+                  } catch (parseErr) {
+                    console.log(`  ✓ ${choir.name} complete (parse error: ${parseErr})`);
                   }
                 } else {
                   const errMsg = result.stderr || result.stdout || 'Unknown error';
@@ -327,7 +337,10 @@ const plugin = {
                     });
                     if (result.status === 0 && result.stdout) {
                       try {
-                        const json = JSON.parse(result.stdout);
+                        const stdout = result.stdout;
+                        const jsonStart = stdout.indexOf('{');
+                        const jsonStr = jsonStart >= 0 ? stdout.slice(jsonStart) : '{}';
+                        const json = JSON.parse(jsonStr);
                         const text = json.result?.payloads?.[0]?.text || '';
                         contextStore.set(`${choirId}:d${day}`, text.slice(0, 500));
                         console.log(` ✓ (dry)`);
@@ -360,9 +373,12 @@ const plugin = {
                   });
 
                   if (result.status === 0) {
-                    // Parse the agent response
+                    // Parse the agent response (extract JSON from output)
                     try {
-                      const json = JSON.parse(result.stdout || '{}');
+                      const stdout = result.stdout || '';
+                      const jsonStart = stdout.indexOf('{');
+                      const jsonStr = jsonStart >= 0 ? stdout.slice(jsonStart) : '{}';
+                      const json = JSON.parse(jsonStr);
                       const text = json.result?.payloads?.[0]?.text || '';
                       const duration = json.result?.meta?.durationMs || 0;
                       contextStore.set(`${choirId}:d${day}`, text.slice(0, 2000)); // Keep 2KB of response

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iamoberlin/chorus",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "description": "CHORUS: Hierarchy Of Recursive Unified Self-improvement — with Prayer Requests social network",
   "author": "Oberlin <iam@oberlin.ai>",
   "license": "MIT",

package/src/scheduler.ts

@@ -9,6 +9,9 @@ import type { OpenClawPluginService, PluginLogger } from "openclaw/plugin-sdk";
 import type { ChorusConfig } from "./config.js";
 import { CHOIRS, shouldRunChoir, CASCADE_ORDER, type Choir } from "./choirs.js";
 import { recordExecution, type ChoirExecution } from "./metrics.js";
+import { readFileSync, writeFileSync, existsSync, mkdirSync } from "fs";
+import { join } from "path";
+import { homedir } from "os";
 
 interface ChoirContext {
   choirId: string;
@@ -22,6 +25,64 @@ interface ChoirRunState {
   runCount: number;
 }
 
+// State persistence path
+const CHORUS_DIR = join(homedir(), ".chorus");
+const RUN_STATE_PATH = join(CHORUS_DIR, "run-state.json");
+
+// Load persisted run state from disk
+function loadRunState(log: PluginLogger): Map<string, ChoirRunState> {
+  const state = new Map<string, ChoirRunState>();
+  
+  // Initialize all choirs with default state
+  for (const choirId of Object.keys(CHOIRS)) {
+    state.set(choirId, { runCount: 0 });
+  }
+  
+  // Try to load persisted state
+  if (existsSync(RUN_STATE_PATH)) {
+    try {
+      const data = JSON.parse(readFileSync(RUN_STATE_PATH, "utf-8"));
+      for (const [choirId, saved] of Object.entries(data)) {
+        const s = saved as any;
+        if (state.has(choirId)) {
+          state.set(choirId, {
+            lastRun: s.lastRun ? new Date(s.lastRun) : undefined,
+            lastOutput: s.lastOutput,
+            runCount: s.runCount || 0,
+          });
+        }
+      }
+      log.info(`[chorus] Loaded run state from disk (${Object.keys(data).length} choirs)`);
+    } catch (err) {
+      log.warn(`[chorus] Failed to load run state: ${err}`);
+    }
+  }
+  
+  return state;
+}
+
+// Save run state to disk
+function saveRunState(state: Map<string, ChoirRunState>, log: PluginLogger): void {
+  try {
+    // Ensure directory exists
+    if (!existsSync(CHORUS_DIR)) {
+      mkdirSync(CHORUS_DIR, { recursive: true });
+    }
+    
+    const obj: Record<string, any> = {};
+    for (const [choirId, s] of state) {
+      obj[choirId] = {
+        lastRun: s.lastRun?.toISOString(),
+        lastOutput: s.lastOutput,
+        runCount: s.runCount,
+      };
+    }
+    writeFileSync(RUN_STATE_PATH, JSON.stringify(obj, null, 2));
+  } catch (err) {
+    log.error(`[chorus] Failed to save run state: ${err}`);
+  }
+}
+
 export function createChoirScheduler(
   config: ChorusConfig,
   log: PluginLogger,
@@ -29,12 +90,9 @@ export function createChoirScheduler(
 ): OpenClawPluginService {
   let checkInterval: NodeJS.Timeout | null = null;
   const contextStore: Map<string, ChoirContext> = new Map();
-  const runState: Map<string, ChoirRunState> = new Map();
-
-  // Initialize run state for all choirs
-  for (const choirId of Object.keys(CHOIRS)) {
-    runState.set(choirId, { runCount: 0 });
-  }
+  
+  // Load persisted state instead of starting fresh
+  const runState = loadRunState(log);
 
   // Build the prompt with context injected
   function buildPrompt(choir: Choir): string {
@@ -101,6 +159,9 @@ export function createChoirScheduler(
         lastOutput: output.slice(0, 500),
         runCount: state.runCount + 1,
       });
+      
+      // Persist state to disk after each run
+      saveRunState(runState, log);
 
       log.info(`[chorus] ${choir.emoji} ${choir.name} completed (${(execution.durationMs/1000).toFixed(1)}s)`);