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

package/apps/cli/package.json

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

package/apps/daemon/package.json

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

package/apps/relay/dist/controller-handlers.d.ts

@@ -35,7 +35,7 @@ type ControllerHandlerContext = {
         sessionId: string;
         requestId?: string;
         turnId?: string;
-        terminalStatus: "completed" | "cancelled" | "failed" | "error";
+        terminalStatus: "completed" | "cancelled" | "failed" | "error" | "unknown";
         errorCode?: string;
         finishedAt?: number;
     }): unknown;

package/apps/relay/dist/machine-handlers.d.ts

@@ -16,7 +16,7 @@ type MachineHandlerContext = {
         sessionId: string;
         requestId?: string;
         turnId?: string;
-        terminalStatus: "completed" | "cancelled" | "failed" | "error";
+        terminalStatus: "completed" | "cancelled" | "failed" | "error" | "unknown";
         errorCode?: string;
         finishedAt?: number;
     }): {

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

@@ -208,6 +208,11 @@ export function handleMachineMessage(context, connection, message) {
                 broadcastControllers(connection.accountId, { type: "server:session", session: sessionSnapshot(row) });
         }
         if (message.result.status === "terminal" && message.result.terminalStatus) {
+            const activeClaim = activePromptClaim(db, connection.accountId, message.result.sessionId, connection.machineId);
+            const terminalMatchesActiveClaim = Boolean(activeClaim) &&
+                (!message.result.requestId || message.result.requestId === activeClaim?.request_id) &&
+                (!message.result.turnId || message.result.turnId === activeClaim?.turn_id);
+            const shouldProjectTerminal = !activeClaim || terminalMatchesActiveClaim;
             if (message.result.turnId || message.result.lastTurnId || message.result.currentHead || message.result.providerTurnId) {
                 recordTurnAlias({
                     accountId: connection.accountId,
@@ -218,12 +223,14 @@ export function handleMachineMessage(context, connection, message) {
                     requestId: message.result.requestId,
                 });
             }
-            db.prepare(`UPDATE sessions
-         SET status = ?,
-             current_head = COALESCE(?, current_head),
-             last_turn_id = COALESCE(?, last_turn_id),
-             updated_at = ?
-         WHERE id = ? AND account_id = ? AND machine_id = ? AND status != 'closed'`).run(message.result.terminalStatus, message.result.currentHead ?? null, message.result.lastTurnId ?? message.result.turnId ?? null, ts, message.result.sessionId, connection.accountId, connection.machineId);
+            if (shouldProjectTerminal) {
+                db.prepare(`UPDATE sessions
+           SET status = ?,
+               current_head = COALESCE(?, current_head),
+               last_turn_id = COALESCE(?, last_turn_id),
+               updated_at = ?
+           WHERE id = ? AND account_id = ? AND machine_id = ? AND status != 'closed'`).run(message.result.terminalStatus, message.result.currentHead ?? null, message.result.lastTurnId ?? message.result.turnId ?? null, ts, message.result.sessionId, connection.accountId, connection.machineId);
+            }
             finishSessionClaim({
                 accountId: connection.accountId,
                 sessionId: message.result.sessionId,
@@ -233,9 +240,11 @@ export function handleMachineMessage(context, connection, message) {
                 ...(message.result.error ? { errorCode: "TURN_ERROR" } : {}),
                 finishedAt: ts,
             });
-            const row = db.prepare("SELECT * FROM sessions WHERE id = ?").get(message.result.sessionId);
-            if (row)
-                broadcastControllers(connection.accountId, { type: "server:session", session: sessionSnapshot(row) });
+            if (shouldProjectTerminal) {
+                const row = db.prepare("SELECT * FROM sessions WHERE id = ?").get(message.result.sessionId);
+                if (row)
+                    broadcastControllers(connection.accountId, { type: "server:session", session: sessionSnapshot(row) });
+            }
         }
         if (message.result.status === "unknown" || message.result.status === "not_found" || message.result.status === "uninspectable") {
             const claim = activePromptClaim(db, connection.accountId, message.result.sessionId, connection.machineId);
@@ -251,11 +260,15 @@ export function handleMachineMessage(context, connection, message) {
                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) {
-                    db.prepare(`UPDATE relay_admissions
-             SET last_error_code = COALESCE(last_error_code, ?), updated_at = ?
-             WHERE account_id = ? AND session_id = ? AND request_id = ?`).run(message.result.status === "not_found" ? "EXECUTION_NOT_FOUND" : "EXECUTION_UNKNOWN", ts, connection.accountId, message.result.sessionId, requestId);
-                }
+                finishSessionClaim({
+                    accountId: connection.accountId,
+                    sessionId: message.result.sessionId,
+                    requestId,
+                    turnId,
+                    terminalStatus: "unknown",
+                    errorCode: message.result.status === "not_found" ? "EXECUTION_NOT_FOUND" : "EXECUTION_UNKNOWN",
+                    finishedAt: ts,
+                });
                 const row = db.prepare("SELECT * FROM sessions WHERE id = ?").get(message.result.sessionId);
                 if (row)
                     broadcastControllers(connection.accountId, { type: "server:session", session: sessionSnapshot(row) });

package/apps/relay/dist/relay-context.d.ts

@@ -109,7 +109,7 @@ export declare function createRelayContext(options: CreateRelayContextOptions):
         sessionId: string;
         requestId?: string;
         turnId?: string;
-        terminalStatus: "completed" | "cancelled" | "failed" | "error";
+        terminalStatus: "completed" | "cancelled" | "failed" | "error" | "unknown";
         errorCode?: string;
         finishedAt?: number;
     }) => RelaySessionClaimRow | undefined;

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

@@ -224,12 +224,15 @@ export function createRelayContext(options) {
     }
     function staleSessionClaimResolution(claim) {
         const admission = options.db
-            .prepare(`SELECT dispatch, finished_at, terminal_status
+            .prepare(`SELECT dispatch, finished_at, terminal_status, last_error_code
          FROM relay_admissions
          WHERE account_id = ? AND request_id = ?`)
             .get(claim.account_id, claim.request_id);
         if (admission && (admission.finished_at !== null || admission.terminal_status !== null))
             return {};
+        if (admission && isExecutionUnknownError(admission.last_error_code) && sessionIsExecutionUnknown(claim)) {
+            return { terminalStatus: "unknown", errorCode: admission.last_error_code ?? undefined };
+        }
         const newerTerminal = options.db
             .prepare(`SELECT 1
          FROM relay_admissions
@@ -244,6 +247,15 @@ export function createRelayContext(options) {
             .get(claim.account_id, claim.session_id, claim.request_id, claim.created_at);
         return newerTerminal ? {} : undefined;
     }
+    function isExecutionUnknownError(code) {
+        return code === "EXECUTION_UNKNOWN" || code === "EXECUTION_NOT_FOUND";
+    }
+    function sessionIsExecutionUnknown(claim) {
+        const row = options.db
+            .prepare("SELECT status FROM sessions WHERE account_id = ? AND id = ? AND machine_id = ?")
+            .get(claim.account_id, claim.session_id, claim.machine_id);
+        return row?.status === "unknown";
+    }
     function claimSessionTurn(params) {
         const existing = activeSessionClaim(params.accountId, params.sessionId);
         if (existing && existing.request_id !== params.requestId)

package/apps/relay/dist/types.d.ts

@@ -97,7 +97,7 @@ export type RelayAdmissionRow = {
     dispatch: "queued" | "delivered";
     started_at: number | null;
     finished_at: number | null;
-    terminal_status: "completed" | "cancelled" | "failed" | "error" | null;
+    terminal_status: "completed" | "cancelled" | "failed" | "error" | "unknown" | null;
     last_error_code: string | null;
     created_at: number;
     updated_at: number;

package/package.json

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

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

@@ -16,7 +16,7 @@ export function isSessionClosed(status) {
     return status === "closed";
 }
 export function isSessionBusy(status) {
-    return status === "running" || status === "unknown";
+    return status === "running";
 }
 export function controllerSessionCommandDecision(status, command) {
     if (command === "close" && status === "closed")
@@ -32,7 +32,7 @@ export function controllerSessionCommandDecision(status, command) {
         return {
             allowed: false,
             code: "SESSION_BUSY",
-            message: status === "unknown" ? "Session has a turn whose execution status is unknown" : "Session already has a running turn",
+            message: "Session already has a running turn",
         };
     }
     return { allowed: true };