@cydm/happy-elves 0.1.0-beta.283 → 0.1.0-beta.285

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

@@ -29,7 +29,7 @@ export type TurnSummary = {
     checkpointId?: string;
     runtimeTurnId?: string;
     turnSeq?: number;
-    status: "running" | "completed" | "failed" | "cancelled";
+    status: "running" | "completed" | "failed" | "cancelled" | "unknown";
     prompt: string;
     output: string;
     terminalText: string;

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

@@ -243,6 +243,13 @@ export function summarizeTurns(events) {
             current.checkpointId = payload.currentHead;
             current.runtimeTurnId = payload.lastTurnId;
         }
+        else if (payload?.type === "status" && isReconcileUnknownTag(payload.tag)) {
+            if (current.status === "running") {
+                current.status = "unknown";
+                current.completedAt = event.createdAt;
+                current.terminalText = payload.text.trim();
+            }
+        }
         else if (payload?.type === "memory_used") {
             current.usedMemories = dedupeUsedMemories([...current.usedMemories, ...payload.memories]);
         }
@@ -472,6 +479,9 @@ function turnInProgressError(sessionId, turn, latestCompleted) {
         latestCompletedTurnId: latestCompleted?.turnId,
     });
 }
+function isReconcileUnknownTag(tag) {
+    return tag === "reconcile:unknown" || tag === "reconcile:not_found" || tag === "reconcile:uninspectable";
+}
 export async function rebuildTurnOutput(client, sessionId, turnId) {
     const events = await client.history(sessionId, 1000);
     const folded = foldAliasedRuntimeEvents(events);

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

@@ -34,7 +34,7 @@ function orchestrationStateFromStatus(status) {
         return "idle";
     if (status === "completed")
         return "completed";
-    if (status === "failed" || status === "offline")
+    if (status === "failed" || status === "offline" || status === "unknown")
         return "blocked";
     return "closed";
 }
@@ -70,6 +70,17 @@ export function deriveOrchestration(session, events = []) {
             completed: false,
         };
     }
+    if (latestTerminalTurn?.status === "unknown") {
+        return {
+            state: "blocked",
+            rawStatus: session.status,
+            needsUser: false,
+            blocked: true,
+            completed: false,
+            reason: "execution-unknown",
+            lastEventId: latestTerminalTurn.lastEventId,
+        };
+    }
     const state = orchestrationStateFromStatus(session.status);
     return {
         state,

package/apps/cli/package.json

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

package/apps/daemon/dist/session/reconcile.js

@@ -4,6 +4,7 @@ import { getRuntime } from "../runtime.js";
 import { sessions, sessionTurns } from "../state.js";
 import { sendCommandResponse } from "../relay/send.js";
 import { settleScheduleTurnTerminal } from "../schedule/runner.js";
+import { emitEvent } from "./events.js";
 import { commandSessionMetadata } from "./metadata.js";
 export async function handleReconcileTurn(ws, config, command) {
     if (command.type !== "machine:reconcileTurn")
@@ -89,11 +90,31 @@ export async function handleReconcileTurn(ws, config, command) {
             result,
         },
     });
+    if (isUnconfirmedReconcileResult(result) && result.turnId) {
+        await emitEvent(ws, config, command.sessionId, result.turnId, {
+            type: "status",
+            tag: `reconcile:${result.status}`,
+            text: reconcileStatusText(result),
+        });
+    }
     await sendReconcileResult(ws, config, command, result);
     if (result.status === "terminal" && result.terminalStatus && result.turnId) {
         await settleTerminalSideEffects(config, result);
     }
 }
+function isUnconfirmedReconcileResult(result) {
+    return result.status === "unknown" || result.status === "not_found" || result.status === "uninspectable";
+}
+function reconcileStatusText(result) {
+    const reason = result.reason ? ` Reason: ${result.reason}` : "";
+    if (result.status === "not_found") {
+        return `Unable to confirm whether the previous execution finished; provider reported authoritative not found.${reason}`;
+    }
+    if (result.status === "uninspectable") {
+        return `Unable to confirm whether the previous execution finished; this runtime cannot inspect the turn.${reason}`;
+    }
+    return `Unable to confirm whether the previous execution finished.${reason}`;
+}
 async function sendReconcileResult(ws, config, command, result) {
     await sendCommandResponse(ws, {
         type: "machine:turnReconciled",

package/apps/daemon/package.json

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

package/apps/relay/dist/machine-handlers.js

@@ -246,9 +246,9 @@ export function handleMachineMessage(context, connection, message) {
                 (!message.result.turnId || message.result.turnId === claim?.turn_id);
             if (claimMatches && turnId) {
                 db.prepare(`UPDATE sessions
-           SET status = 'failed',
+           SET status = 'unknown',
                current_head = COALESCE(current_head, ?),
-               last_turn_id = ?,
+               last_turn_id = COALESCE(last_turn_id, ?),
                updated_at = ?
            WHERE id = ? AND account_id = ? AND machine_id = ? AND status != 'closed'`).run(turnId, turnId, ts, message.result.sessionId, connection.accountId, connection.machineId);
                 if (requestId) {

package/apps/relay/dist/relay-context.js

@@ -230,21 +230,6 @@ export function createRelayContext(options) {
             .get(claim.account_id, claim.request_id);
         if (admission && (admission.finished_at !== null || admission.terminal_status !== null))
             return {};
-        const session = options.db
-            .prepare(`SELECT status, current_head, last_turn_id, updated_at
-         FROM sessions
-         WHERE account_id = ? AND id = ?`)
-            .get(claim.account_id, claim.session_id);
-        if (admission?.dispatch === "delivered" &&
-            session &&
-            isSettledSessionProjectionStatus(session.status) &&
-            session.updated_at > claim.created_at &&
-            (session.last_turn_id === claim.turn_id || (session.current_head !== claim.turn_id && session.last_turn_id !== claim.turn_id))) {
-            return {
-                terminalStatus: terminalStatusForSettledSessionStatus(session.status),
-                finishedAt: session.updated_at,
-            };
-        }
         const newerTerminal = options.db
             .prepare(`SELECT 1
          FROM relay_admissions
@@ -259,16 +244,6 @@ export function createRelayContext(options) {
             .get(claim.account_id, claim.session_id, claim.request_id, claim.created_at);
         return newerTerminal ? {} : undefined;
     }
-    function terminalStatusForSettledSessionStatus(status) {
-        if (status === "failed")
-            return "failed";
-        if (status === "cancelled" || status === "closed")
-            return "cancelled";
-        return "completed";
-    }
-    function isSettledSessionProjectionStatus(status) {
-        return status === "ready" || status === "completed" || status === "cancelled" || status === "closed";
-    }
     function claimSessionTurn(params) {
         const existing = activeSessionClaim(params.accountId, params.sessionId);
         if (existing && existing.request_id !== params.requestId)

package/package.json

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

package/packages/shared/dist/protocol-schemas.d.ts

@@ -211,6 +211,7 @@ export declare const sessionSnapshotSchema: z.ZodObject<{
         new: "new";
         ready: "ready";
         running: "running";
+        unknown: "unknown";
         completed: "completed";
         failed: "failed";
         cancelled: "cancelled";
@@ -457,9 +458,9 @@ export declare const daemonLifecycleResultSchema: z.ZodObject<{
     platform: z.ZodOptional<z.ZodString>;
     arch: z.ZodOptional<z.ZodString>;
     installMode: z.ZodOptional<z.ZodEnum<{
+        unknown: "unknown";
         "npm-global": "npm-global";
         "repo-dev": "repo-dev";
-        unknown: "unknown";
     }>>;
     updateSupported: z.ZodOptional<z.ZodBoolean>;
     updateUnsupportedReason: z.ZodOptional<z.ZodString>;

package/packages/shared/dist/protocol-schemas.js

@@ -79,7 +79,7 @@ export const sessionSnapshotSchema = z.object({
     agent: z.string().min(1),
     cwd: z.string(),
     name: z.string().min(1),
-    status: z.enum(["new", "ready", "running", "completed", "failed", "cancelled", "offline", "closed"]),
+    status: z.enum(["new", "ready", "running", "unknown", "completed", "failed", "cancelled", "offline", "closed"]),
     createdAt: z.number(),
     updatedAt: z.number(),
     encryptedMetadata: encryptedEnvelopeSchema.optional(),

package/packages/shared/dist/protocol-types.d.ts

@@ -57,7 +57,7 @@ export type SessionSnapshot = {
     agent: string;
     cwd: string;
     name: string;
-    status: "new" | "ready" | "running" | "completed" | "failed" | "cancelled" | "offline" | "closed";
+    status: "new" | "ready" | "running" | "unknown" | "completed" | "failed" | "cancelled" | "offline" | "closed";
     createdAt: number;
     updatedAt: number;
     encryptedMetadata?: EncryptedEnvelope;

package/packages/shared/dist/session-state.d.ts

@@ -1,4 +1,4 @@
-export declare const sessionStatuses: readonly ["new", "ready", "running", "completed", "failed", "cancelled", "offline", "closed"];
+export declare const sessionStatuses: readonly ["new", "ready", "running", "unknown", "completed", "failed", "cancelled", "offline", "closed"];
 export type SessionStatus = (typeof sessionStatuses)[number];
 export type ControllerSessionCommand = "prompt" | "cancel" | "resume" | "rewind" | "fork" | "rename" | "close";
 export type SessionCommandDecision = {

package/packages/shared/dist/session-state.js

@@ -2,6 +2,7 @@ export const sessionStatuses = [
     "new",
     "ready",
     "running",
+    "unknown",
     "completed",
     "failed",
     "cancelled",
@@ -15,7 +16,7 @@ export function isSessionClosed(status) {
     return status === "closed";
 }
 export function isSessionBusy(status) {
-    return status === "running";
+    return status === "running" || status === "unknown";
 }
 export function controllerSessionCommandDecision(status, command) {
     if (command === "close" && status === "closed")
@@ -27,11 +28,11 @@ export function controllerSessionCommandDecision(status, command) {
             message: "Session is closed",
         };
     }
-    if (command === "prompt" && status === "running") {
+    if (command === "prompt" && isSessionBusy(status)) {
         return {
             allowed: false,
             code: "SESSION_BUSY",
-            message: "Session already has a running turn",
+            message: status === "unknown" ? "Session has a turn whose execution status is unknown" : "Session already has a running turn",
         };
     }
     return { allowed: true };
@@ -43,6 +44,8 @@ export function statusAfterMachineDisconnect(status) {
         return "failed";
     if (status === "running")
         return "offline";
+    if (status === "unknown")
+        return "unknown";
     return status;
 }
 //# sourceMappingURL=session-state.js.map