@cydm/happy-elves 0.1.0-beta.56 → 0.1.0-beta.58

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

@@ -127,6 +127,8 @@ export function handleCliError(error) {
         latestCompletedTurnId: enriched.latestCompletedTurnId,
         commandAcked: enriched.commandAcked,
         rawStatus: enriched.rawStatus,
+        lastTransientError: enriched.lastTransientError,
+        retryCount: enriched.retryCount,
     }, enriched.capability, enriched.retryable);
     process.exit(1);
 }

package/apps/cli/dist/commands/lib/orchestrator.d.ts

@@ -5,6 +5,9 @@ export type OrchestratorStatus = "idle" | "inProgress" | "completed" | "needsInp
 export type OrchestratorRequestRecord = {
     turnId: string;
     promptSha256: string;
+    inputSha256?: string;
+    sourceOutputSha256?: string;
+    runtimeTurnId?: string;
     model?: string | null;
     thoughtLevel?: string | null;
     createdAt: number;

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

@@ -78,6 +78,9 @@ export function readOrchestratorMetadata(metadata) {
                 requests[requestId] = {
                     turnId: candidate.turnId,
                     promptSha256: candidate.promptSha256,
+                    ...(typeof candidate.inputSha256 === "string" ? { inputSha256: candidate.inputSha256 } : {}),
+                    ...(typeof candidate.sourceOutputSha256 === "string" ? { sourceOutputSha256: candidate.sourceOutputSha256 } : {}),
+                    ...(typeof candidate.runtimeTurnId === "string" ? { runtimeTurnId: candidate.runtimeTurnId } : {}),
                     ...(candidate.model === null || typeof candidate.model === "string" ? { model: candidate.model } : {}),
                     ...(candidate.thoughtLevel === null || typeof candidate.thoughtLevel === "string" ? { thoughtLevel: candidate.thoughtLevel } : {}),
                     createdAt: candidate.createdAt,

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

@@ -234,7 +234,7 @@ export function summarizeTurns(events) {
         .map(({ order: _order, ...turn }) => turn);
 }
 export function structuredOutputForTurn(sessionId, turn) {
-    const finalOutput = turn.output || turn.terminalText || undefined;
+    const finalOutput = turn.status !== "running" ? turn.output || turn.terminalText || undefined : undefined;
     return {
         state: turn.status,
         sessionId,

package/apps/cli/dist/commands/lib/session-view.d.ts

@@ -1,11 +1,12 @@
 import type { ControllerClient, DecodedSessionEvent } from "../../../../../packages/client/dist/index.js";
 import type { MachineSnapshot, SessionSnapshot } from "../../../../../packages/shared/dist/index.js";
 import { type MachineMetadata, type OrchestrationSummary, type OrchestrationState } from "./types.js";
+import { type TurnSummary } from "./session-output.js";
 export declare function showMachine(client: ControllerClient, machine: MachineSnapshot): Promise<MachineSnapshot & {
     defaultCwd?: string;
     metadata: MachineMetadata;
 }>;
-export declare function deriveOrchestration(session: SessionSnapshot, events?: DecodedSessionEvent[]): OrchestrationSummary;
+export declare function deriveOrchestration(session: SessionSnapshot, events?: DecodedSessionEvent[], focusTurn?: Pick<TurnSummary, "turnId" | "status">): OrchestrationSummary;
 export declare function showSession(client: ControllerClient, session: SessionSnapshot, events?: DecodedSessionEvent[]): Promise<SessionSnapshot & {
     metadata: unknown;
     orchestration: OrchestrationSummary;

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

@@ -38,23 +38,44 @@ function orchestrationStateFromStatus(status) {
         return "blocked";
     return "closed";
 }
-export function deriveOrchestration(session, events = []) {
-    const turns = summarizeTurns(events);
-    const latestTurn = turns[0];
-    const activeTurn = turns.find((turn) => turn.status === "running");
-    if (session.status === "failed" && latestTurn?.status === "running") {
-        return {
-            state: "active",
-            rawStatus: session.status,
-            needsUser: false,
-            blocked: false,
-            completed: false,
+function canTrustVisibleRunningTurn(status) {
+    return status !== "closed" && status !== "offline" && status !== "cancelled";
+}
+function visibleRunningTurnSummary(session, turnId) {
+    return {
+        state: "active",
+        rawStatus: session.status,
+        needsUser: false,
+        blocked: false,
+        completed: false,
+        ...(session.status !== "running" ? {
             statusConflict: {
                 rawStatus: session.status,
                 evidence: "running-turn",
-                turnId: latestTurn.turnId,
+                turnId,
             },
-        };
+        } : {}),
+    };
+}
+export function deriveOrchestration(session, events = [], focusTurn) {
+    const turns = summarizeTurns(events);
+    const latestTurn = turns[0];
+    const activeTurn = turns.find((turn) => turn.status === "running") ?? (focusTurn?.status === "running" ? focusTurn : undefined);
+    const latestTerminalTurn = turns.find((turn) => turn.status !== "running");
+    const relevantTurnId = activeTurn?.turnId ?? latestTerminalTurn?.turnId;
+    const needsUserEvent = relevantTurnId
+        ? [...events].reverse().find((event) => event.turnId === relevantTurnId && eventNeedsUser(event))
+        : undefined;
+    if (needsUserEvent && activeTurn)
+        return needsUserSummary(session, needsUserEvent);
+    if (needsUserEvent && latestTerminalTurn && latestTerminalTurn.status !== "completed") {
+        return needsUserSummary(session, needsUserEvent);
+    }
+    if (latestTurn?.status === "running" && canTrustVisibleRunningTurn(session.status)) {
+        return visibleRunningTurnSummary(session, latestTurn.turnId);
+    }
+    if (focusTurn?.status === "running" && canTrustVisibleRunningTurn(session.status)) {
+        return visibleRunningTurnSummary(session, focusTurn.turnId);
     }
     if (session.status !== "running") {
         const state = orchestrationStateFromStatus(session.status);
@@ -66,16 +87,6 @@ export function deriveOrchestration(session, events = []) {
             completed: state === "completed",
         };
     }
-    const latestTerminalTurn = turns.find((turn) => turn.status !== "running");
-    const relevantTurnId = activeTurn?.turnId ?? latestTerminalTurn?.turnId;
-    const needsUserEvent = relevantTurnId
-        ? [...events].reverse().find((event) => event.turnId === relevantTurnId && eventNeedsUser(event))
-        : undefined;
-    if (needsUserEvent && activeTurn)
-        return needsUserSummary(session, needsUserEvent);
-    if (needsUserEvent && latestTerminalTurn && latestTerminalTurn.status !== "completed") {
-        return needsUserSummary(session, needsUserEvent);
-    }
     if (activeTurn) {
         return {
             state: "active",