pi-orchestrator-config 4.2.1 → 4.3.2

package/extensions/orchestrator/cron.ts

@@ -11,6 +11,9 @@
  * Prompt tasks run as async agents with triggerTurn: true.
  */
 
+import { createLogger } from "../shared/logger.js";
+
+const log = createLogger("cron");
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
@@ -84,7 +87,7 @@ function saveCrons(tasks: CronTask[]): void {
   try {
     CRON_IGNORE_WATCH_UNTIL = Date.now() + 400;
     fs.writeFileSync(CRON_FILE, JSON.stringify(tasks), { mode: 0o600 });
-  } catch (e: any) { console.debug("[cron] save crons failed:", e?.message || e); }
+  } catch (e: any) { log.debug("save crons failed:", e?.message || e); }
 }
 
 function loadCrons(): CronTask[] {
@@ -137,7 +140,7 @@ function cleanupOrphanedCronFiles(): void {
         // If kill(pid, 0) succeeds but /proc is unreadable — skip (can't verify)
       }
     }
-  } catch (e: any) { console.debug("[cron] cleanup orphaned cron files failed:", e?.message || e); }
+  } catch (e: any) { log.debug("cleanup orphaned cron files failed:", e?.message || e); }
 }
 
 // ── Helpers ──────────────────────────────────────────────────────────
@@ -217,6 +220,7 @@ function registerCronTool(pi: ExtensionAPI, state: CronInternals): void {
         state.tasks.set(task.id, task);
         state.startTask(task);
         saveCrons([...state.tasks.values()]);
+        log.info("cron_add", task.description);
 
         state.updateCronStatus();
         return {
@@ -266,7 +270,7 @@ function registerCronTool(pi: ExtensionAPI, state: CronInternals): void {
             });
             sections.push(`**${label}:**\n${lines.join("\n")}`);
           }
-        } catch (e: any) { console.debug("[cron] list-all scan failed:", e?.message || e); }
+        } catch (e: any) { log.debug("list-all scan failed:", e?.message || e); }
         if (sections.length === 0) {
           return { content: [{ type: "text", text: "No scheduled tasks in any session." }] };
         }
@@ -284,6 +288,7 @@ function registerCronTool(pi: ExtensionAPI, state: CronInternals): void {
         state.stopTask(id);
         state.tasks.delete(id);
         saveCrons([...state.tasks.values()]);
+        log.info("cron_remove", id);
         state.updateCronStatus();
         return {
           content: [{ type: "text", text: `Cron #${id} removed: ${task.description}` }],
@@ -353,7 +358,7 @@ function listAllCronViews(state: CronInternals) {
       }
     }
   } catch (e: any) {
-    console.debug("[cron] list-all scan failed:", e?.message || e);
+    log.debug("list-all scan failed:", e?.message || e);
   }
   return views;
 }
@@ -383,7 +388,7 @@ function removeCronByOverlayId(state: CronInternals, overlayId: string): boolean
     fs.writeFileSync(view.cronFile, JSON.stringify(next), { mode: 0o600 });
     return true;
   } catch (e: any) {
-    console.debug("[cron] remote remove failed:", e?.message || e);
+    log.debug("remote remove failed:", e?.message || e);
     return false;
   }
 }
@@ -523,6 +528,7 @@ export function registerCron(
   }
 
   function executeCronTask(task: CronTask) {
+    log.info("cron_execute", task.id);
     task.lastRun = Date.now();
     saveCrons([...tasks.values()]);
 
@@ -541,7 +547,7 @@ export function registerCron(
         mustAsync: true,
       });
       if (dispatch.action === "skip") {
-        console.debug(`[cron] ${dispatch.note} (task #${task.id})`);
+        log.error("cron_error", task.id, dispatch.note);
         try {
           state.lastCtx?.ui?.notify?.(
             `Cron #${task.id} skipped: set internal_operations_provider/internal_operations_model for acpx`,
@@ -677,13 +683,13 @@ export function registerCron(
           try {
             syncTasksFromDisk();
           } catch (e: any) {
-            console.debug("[cron] sync from disk failed:", e?.message || e);
+            log.debug("sync from disk failed:", e?.message || e);
           }
         }, 150);
       });
       cronFileWatcher.unref?.();
     } catch (e: any) {
-      console.debug("[cron] watch setup failed:", e?.message || e);
+      log.debug("watch setup failed:", e?.message || e);
     }
   });
 

package/extensions/orchestrator/dreaming.ts

@@ -10,6 +10,9 @@
  * Users toggle with /dream-auto on|off.
  */
 
+import { createLogger } from "../shared/logger.js";
+
+const log = createLogger("dreaming");
 import { spawn } from "node:child_process";
 import * as fs from "node:fs";
 import * as os from "node:os";
@@ -23,13 +26,8 @@ import { setSlot } from "./status-bar.js";
 import { rebuildAndOrganize } from "./situation-report.js";
 import { runPromotionPass } from "./memory-promotion.js";
 import { mergeProvenancePending } from "./memory-provenance.js";
-import { getProjectTmpDir } from "./utils.js";
-import { dreamingLog } from "../shared/file-logger.js";
-
-// Default: 3 hours. Override with PI_DREAM_INTERVAL_HOURS env var (0.5–24).
-const _rawHours = parseFloat(process.env.PI_DREAM_INTERVAL_HOURS || "3");
-const DREAM_INTERVAL_HOURS = Number.isFinite(_rawHours) && _rawHours >= 0.5 && _rawHours <= 24 ? _rawHours : 3;
-const DREAM_INTERVAL_MS = DREAM_INTERVAL_HOURS * 60 * 60 * 1000;
+import { getProjectTmpDir, shouldSkipOneshotShutdownDream } from "./utils.js";
+import { fileLog } from "../shared/file-logger.js";
 
 // Scoring rebuild runs every 30 minutes (cheap, no LLM — just rescores and reorganizes)
 const REBUILD_INTERVAL_MS = 30 * 60 * 1000;
@@ -84,7 +82,7 @@ export function registerDreaming(
       mustAsync: true,
     });
     if (dreamDispatch.action === "skip") {
-      dreamingLog("warn", dreamDispatch.note || "dream skipped (no async LLM path)");
+      fileLog("dreaming", "warn", "dreaming", dreamDispatch.note || "dream skipped (no async LLM path)");
       try {
         lastCtx?.ui?.notify?.(
           "Dream skipped: set internal_operations_provider and internal_operations_model for acpx sessions",
@@ -99,6 +97,7 @@ export function registerDreaming(
     }
 
     dreamInFlight = true;
+    log.info("dream start", cwd);
     updateDreamStatus();
     currentDreamId = "";  // Reset until we get the ID from spawnAsyncAgent
     const { agents } = discoverAgents(cwd, "user");
@@ -168,9 +167,9 @@ export function registerDreaming(
       `   - discard: stale or superseded noise\n` +
       `   - Do not reopen entries already marked applied or rejected in promotions.md\n` +
       `11. Provenance sidecar (optional): for newly extracted entries, write\n` +
-      `   ${topicsDir}/../provenance-pending.json as JSON:\n` +
+      `   ${topicsDir}/../provenance-pending.jsonl as a single line of JSON (preferred):\n` +
       `   {"entries":[{"category":"lesson","text":"<exact topic text>","sourceSession":"<session basename>","derivedFrom":"<optional>","informs":["optional"]}]}\n` +
-      `   Do NOT edit memory-scores.json yourself — onComplete merges the sidecar.`,
+      `   Do NOT edit memory-scores.jsonl yourself — onComplete merges the sidecar.`,
       cwd,
       agents,
       {
@@ -180,23 +179,24 @@ export function registerDreaming(
         parentProvider: dreamProvider,
         onComplete: () => {
           dreamInFlight = false;
+          log.info("dream complete", cwd);
           updateDreamStatus();
           // File log only — console.* leaks into the chat text box.
           try {
             rebuildAndOrganize(cwd);
           } catch (err) {
-            dreamingLog("error", "rebuildAndOrganize failed", err);
+            fileLog("dreaming", "error", "dreaming", "rebuildAndOrganize failed", err);
           }
           try {
             const n = mergeProvenancePending(cwd);
-            if (n > 0) dreamingLog("info", `merged provenance for ${n} entries`);
+            if (n > 0) fileLog("dreaming", "info", "dreaming", `merged provenance for ${n} entries`);
           } catch (err) {
-            dreamingLog("error", "provenance merge failed", err);
+            fileLog("dreaming", "error", "dreaming", "provenance merge failed", err);
           }
           try {
             runPromotionPass(cwd);
           } catch (err) {
-            dreamingLog("error", "promotion pass failed", err);
+            fileLog("dreaming", "error", "dreaming", "promotion pass failed", err);
           }
         },
       },
@@ -216,8 +216,10 @@ export function registerDreaming(
         if (dreamInFlight && currentDreamId === dreamId) {
           dreamInFlight = false;
           updateDreamStatus();
-          dreamingLog(
+          fileLog(
+            "dreaming",
             "warn",
+            "dreaming",
             "fallback: reset dreamInFlight after 30 min (onComplete never fired)",
           );
         }
@@ -256,7 +258,7 @@ export function registerDreaming(
           try {
             rebuildAndOrganize(lastCwd);
           } catch (err) {
-            dreamingLog("error", "rebuildAndOrganize failed", err);
+            fileLog("dreaming", "error", "dreaming", "rebuildAndOrganize failed", err);
           }
         }
       }, REBUILD_INTERVAL_MS);
@@ -327,29 +329,34 @@ export function registerDreaming(
     lastCwd = ctx.cwd;
     lastCtx = ctx;
     dreamInFlight = false; // Reset — previous session's dream state doesn't carry over
-    // Skip dreaming in one-shot modes (print/json)
-    if (ctx.mode === "print" || ctx.mode === "json") return;
+    // Skip auto-dream timer in print/json; shutdown dream is skipped in
+    // session_shutdown via shouldSkipOneshotShutdownDream.
+    if (ctx.mode === "print" || ctx.mode === "json") {
+      log.debug("skip dream timer: print/json mode");
+      return;
+    }
     updateDreamStatus();
     if (enabled) startTimer(ctx.cwd);
   });
 
-  // Fire-and-forget dream on session shutdown.
-  // Uses detached spawn (not async agent) because the session is ending —
-  // async agents need the pi process alive to deliver results.
+  // Shutdown dream: runDreamAsync → spawnAsyncAgent (not detached/unref'd).
+  // Skip oneshot print/json or the child keeps the parent event loop alive.
   pi.on("session_shutdown", (event) => {
     stopTimer();
+    if (shouldSkipOneshotShutdownDream(lastCtx?.mode)) {
+      log.info("skip shutdown dream: oneshot print/json");
+      return;
+    }
     if (!enabled || !lastCwd || dreamInFlight) return;
 
     // Only dream on quit — skip for fork/new/resume/reload since the
     // session continues or transitions, not ending meaningfully.
     if ((event as any).reason && (event as any).reason !== "quit") return;
 
-    // On shutdown, run a lightweight dream via detached async runner
-    // (can't use spawnAsyncAgent since the session is ending)
     try {
       runDreamAsync(lastCwd);
     } catch (err) {
-      dreamingLog("error", "shutdown dream failed", err);
+      fileLog("dreaming", "error", "dreaming", "shutdown dream failed", err);
     }
   });
 }