@cydm/happy-elves 0.1.0-beta.240 → 0.1.0-beta.241

package/apps/cli/dist/commands/lib/session-output.js

@@ -311,6 +311,7 @@ export function structuredOutputForRunningTurn(sessionId, turnId) {
     };
 }
 function foldAliasedRuntimeEvents(events) {
+    events = dedupeSyntheticHistoricalEvents(events);
     const profiles = new Map();
     const runtimeToRequest = new Map();
     for (const event of events) {
@@ -349,6 +350,57 @@ function foldAliasedRuntimeEvents(events) {
         runtimeToRequest: duplicateRuntimeToRequest,
     };
 }
+function dedupeSyntheticHistoricalEvents(events) {
+    const groups = new Map();
+    for (const event of events) {
+        const key = historicalComparableEventKey(event);
+        if (!key)
+            continue;
+        groups.set(key, [...(groups.get(key) ?? []), event]);
+    }
+    const keepIds = new Set();
+    const dropIds = new Set();
+    for (const group of groups.values()) {
+        if (group.length < 2 || !group.some(isSyntheticHistoricalEvent))
+            continue;
+        const preferred = group.find((event) => !isSyntheticHistoricalEvent(event)) ?? group[0];
+        if (preferred)
+            keepIds.add(preferred.id);
+        for (const event of group) {
+            if (event.id !== preferred?.id)
+                dropIds.add(event.id);
+        }
+    }
+    return events.filter((event) => !dropIds.has(event.id) || keepIds.has(event.id));
+}
+function isSyntheticHistoricalEvent(event) {
+    const messageId = event.messageId ?? "";
+    return messageId.startsWith("hist_") || messageId.startsWith("tail_");
+}
+function historicalComparableEventKey(event) {
+    const payload = event.decoded;
+    if (!payload)
+        return undefined;
+    if (payload.type === "user_prompt")
+        return [event.turnId, "user_prompt", comparableOutput(payload.text)].join("\0");
+    if (payload.type === "text_delta" && payload.stream !== "thought") {
+        return [event.turnId, "text_delta", payload.stream, comparableOutput(payload.text)].join("\0");
+    }
+    if (payload.type === "done") {
+        return [
+            event.turnId,
+            "done",
+            payload.status,
+            payload.currentHead ?? "",
+            payload.lastTurnId ?? "",
+            comparableOutput(payload.error ?? payload.stopReason ?? ""),
+        ].join("\0");
+    }
+    if (payload.type === "memory_used") {
+        return [event.turnId, "memory_used", payload.mode, payload.projectKey, JSON.stringify(payload.memories)].join("\0");
+    }
+    return undefined;
+}
 function isDuplicateRuntimeOutput(requestOutput, runtimeOutput) {
     const request = comparableOutput(requestOutput);
     if (!request)
@@ -384,7 +436,7 @@ export async function rebuildTurnOutput(client, sessionId, turnId) {
 }
 export function conciseEvents(events) {
     const result = [];
-    for (const event of events) {
+    for (const event of dedupeSyntheticHistoricalEvents(events)) {
         const payload = event.decoded;
         if (!payload)
             continue;

package/apps/cli/dist/commands/lib/usage.js

@@ -76,6 +76,8 @@ Session management:
   happy-elves turn result <sessionId> [<turnId>] [--verbose] [--json]
   happy-elves turn run <sessionId> (--text <prompt> | --text-file <path>) [--detach] [--timeout 1000s] [--inactivity-timeout 1000s] [--permission-mode approve-reads|approve-all|deny-all] [--memory off|readonly|readwrite] [--memory-project <key>] [--memory-top-n 3] [--json]
   happy-elves turn wait <sessionId> <turnId> [--timeout 1000s] --json
+  happy-elves turn reconcile <sessionId> [turnId] --json
+  happy-elves turn recover <sessionId> [turnId] --text <continuation> --confirm-risk [--detach] --json
   happy-elves turn cancel <sessionId> <turnId> [--reason <reason>] --json
   happy-elves turn rewind <sessionId> <turn-or-checkpoint-id> --json
   happy-elves turn fork <sessionId> <turn-or-checkpoint-id> --name <name> --json
@@ -84,6 +86,8 @@ Turn management:
   run starts one agent execution. It waits by default; use --detach for
   background execution.
   wait/result inspect a specific turn.
+  reconcile checks provider state without starting, resuming, or cancelling work.
+  recover creates a risk-confirmed recovery session and only sends the new continuation.
   rewind/fork operate on a turn or checkpoint id supplied by runtime history.
 `,
     collect: `Usage:
@@ -214,6 +218,8 @@ Core commands:
   turn run <sessionId> --text <prompt> [--timeout 1000s] [--json]
   turn wait <sessionId> <turnId> [--timeout 1000s] [--json]
   turn result <sessionId> [<turnId>] [--json]
+  turn reconcile <sessionId> [turnId] --json
+  turn recover <sessionId> [turnId] --text <continuation> --confirm-risk [--json]
   turn cancel <sessionId> <turnId> [--reason <reason>] --json
   turn rewind <sessionId> <turn-or-checkpoint-id> --json
   turn fork <sessionId> <turn-or-checkpoint-id> --name <name> --json

package/apps/cli/dist/commands/session.js

@@ -427,7 +427,7 @@ export async function handleSession({ domain, action, positional, flags }) {
         const latestCompletedTurn = turns.find((turn) => turn.status === "completed");
         const latestTerminalTurn = turns.find((turn) => turn.status !== "running");
         const orchestration = deriveOrchestration(session, recentEvents);
-        const latestOutput = await readStoredTurnOutput(session.id).catch(() => undefined);
+        const latestOutput = await readStoredTurnOutput(session.id, latestCompletedTurn?.turnId).catch(async () => await readStoredTurnOutput(session.id).catch(() => undefined));
         const terminalOutput = latestCompletedTurn?.output || latestCompletedTurn?.terminalText || latestTerminalTurn?.output || latestTerminalTurn?.terminalText || undefined;
         const data = {
             state: orchestration.state,

package/apps/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cydm/happy-elves-cli",
-  "version": "0.1.0-beta.240",
+  "version": "0.1.0-beta.241",
   "private": true,
   "type": "module"
 }

package/apps/daemon/dist/schedule/handler.d.ts

@@ -1,7 +1,9 @@
-import { type MachineCommand } from "../../../../packages/shared/dist/index.js";
+import { type MachineCommand, type ScheduleRecord } from "../../../../packages/shared/dist/index.js";
 import type { DaemonConfig } from "../types.js";
 type ScheduleCommand = Extract<MachineCommand, {
     type: "machine:schedule";
 }>;
 export declare function handleScheduleCommand(ws: WebSocket, config: DaemonConfig, command: ScheduleCommand): Promise<void>;
+declare function withSchedulePreview(schedule: ScheduleRecord): ScheduleRecord;
+export declare const __testWithSchedulePreview: typeof withSchedulePreview;
 export {};

package/apps/daemon/dist/schedule/handler.js

@@ -55,10 +55,16 @@ async function executeScheduleCommand(config, command) {
     }
     if (command.action === "pause" || command.action === "resume" || command.action === "delete") {
         const nextStatus = command.action === "pause" ? "paused" : command.action === "resume" ? "active" : "deleted";
+        const nowMs = Date.now();
         const store = await updateScheduleStore((current) => ({
             ...current,
             schedules: current.schedules.map((schedule) => schedule.id === command.scheduleId
-                ? { ...schedule, status: nextStatus, updatedAt: new Date().toISOString() }
+                ? {
+                    ...schedule,
+                    status: nextStatus,
+                    ...(nextStatus === "active" ? { nextRunAt: nextRunAtForSchedule(schedule, nowMs) } : { nextRunAt: undefined }),
+                    updatedAt: new Date(nowMs).toISOString(),
+                }
                 : schedule),
         }));
         return {
@@ -100,12 +106,20 @@ function requireSchedule(store, scheduleId) {
     return schedule;
 }
 function withSchedulePreview(schedule) {
+    if (schedule.status !== "active") {
+        return {
+            ...schedule,
+            nextRunAt: undefined,
+            previewRunAt: [],
+        };
+    }
     return {
         ...schedule,
         nextRunAt: schedule.nextRunAt ?? nextRunAtForSchedule(schedule, Date.now()),
         previewRunAt: nextRunPreviewForSchedule(schedule, 3, Date.now()),
     };
 }
+export const __testWithSchedulePreview = withSchedulePreview;
 function normalizeCreateInput(input) {
     const prompt = input.prompt?.trim();
     if (!prompt)

package/apps/daemon/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cydm/happy-elves-daemon",
-  "version": "0.1.0-beta.240",
+  "version": "0.1.0-beta.241",
   "private": true,
   "type": "module"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cydm/happy-elves",
-  "version": "0.1.0-beta.240",
+  "version": "0.1.0-beta.241",
   "description": "Remote controller for local coding agents with hosted or self-hosted relay support.",
   "type": "module",
   "bin": {