@cydm/happy-elves 0.1.0-beta.41 → 0.1.0-beta.42

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

@@ -125,6 +125,7 @@ function repairHeadInputForLatestCompletedEvent(events) {
     return {
         currentHead,
         lastTurnId,
+        status: "completed",
         basis: {
             turnId: doneEvent.turnId,
             eventMessageId: doneEvent.messageId,
@@ -487,9 +488,6 @@ export async function handleSession({ domain, action, positional, flags }) {
         if (!initialSession)
             throw new CliError("Session not found", "SESSION_NOT_FOUND");
         let session = initialSession;
-        if (flags["repair-head"] === true && session.status === "running") {
-            throw new CliError("Cannot repair a running session head", "SESSION_HEAD_REPAIR_RUNNING");
-        }
         const machine = snapshot.machines.find((item) => item.id === session.machineId);
         const metadata = await client.decodeSessionMetadata(session);
         const latestPage = await client.collectPage(session.id, { limit });
@@ -573,7 +571,9 @@ export async function handleSession({ domain, action, positional, flags }) {
             },
             repair: repair ? {
                 advanced: repair.advanced,
+                settled: repair.settled,
                 basis: repair.basis,
+                status: repair.session.status,
                 currentHead: repair.session.currentHead,
                 lastTurnId: repair.session.lastTurnId,
                 reason: repair.reason,

package/apps/daemon/dist/session/events.d.ts

@@ -4,7 +4,7 @@ import type { DaemonConfig } from "../types.js";
 export declare function emitEvent(ws: WebSocket, config: DaemonConfig, sessionId: string, turnId: string, payload: SessionEventPayload): Promise<void>;
 export declare function emitHistoricalEvents(ws: WebSocket, config: DaemonConfig, sessionId: string, events: RuntimeHistoricalEvent[], startIndex?: number): Promise<void>;
 export declare function emitRuntimeTailEvents(ws: WebSocket, config: DaemonConfig, sessionId: string, events: RuntimeHistoricalEvent[], startIndex?: number): Promise<void>;
-export declare function emitSessionHeadAdvanced(ws: WebSocket, sessionId: string, head: HistoricalSessionHead, encryptedMetadata?: EncryptedEnvelope): Promise<void>;
+export declare function emitSessionHeadAdvanced(ws: WebSocket, sessionId: string, head: HistoricalSessionHead, encryptedMetadata?: EncryptedEnvelope, status?: "completed" | "cancelled" | "failed"): Promise<void>;
 export declare function emitTranscriptReplacement(ws: WebSocket, config: DaemonConfig, sessionId: string, events: RuntimeHistoricalEvent[], input?: {
     requestId?: string;
     currentHead?: string;

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

@@ -32,13 +32,14 @@ export async function emitRuntimeTailEvents(ws, config, sessionId, events, start
         }, ws);
     }
 }
-export async function emitSessionHeadAdvanced(ws, sessionId, head, encryptedMetadata) {
+export async function emitSessionHeadAdvanced(ws, sessionId, head, encryptedMetadata, status) {
     await sendReliable({
         type: "machine:sessionHeadAdvanced",
         sessionId,
         currentHead: head.currentHead,
         lastTurnId: head.lastTurnId,
         basis: head.basis,
+        status,
         encryptedMetadata,
     }, ws);
 }

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

@@ -605,7 +605,7 @@ async function backfillHistoricalEvents(ws, config, session, runtimeSessionId =
         await emitSessionHeadAdvanced(ws, session.sessionId, head, await encryptedSessionMetadata(config, session.sessionId, backfilledSession, {
             ...historicalBackfillMetadata(result),
             historicalBackfilledAt: new Date().toISOString(),
-        }));
+        }), "completed");
     }
     return result;
 }

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

@@ -121,7 +121,7 @@ export async function handlePrompt(ws, config, command) {
                 currentHead: result.currentHead,
                 lastTurnId: result.lastTurnId,
             });
-        await refreshAuthoritativeTranscriptAfterTurn(ws, config, session, command.requestId, result.currentHead, result.lastTurnId);
+        await refreshAuthoritativeTranscriptAfterTurn(ws, config, session, command.requestId, result.currentHead, result.lastTurnId, result.status);
         releasePromptTurn();
         await sendReliable({
             type: "machine:turnDone",

package/apps/daemon/package.json

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

package/apps/relay/dist/http-routes.js

@@ -249,7 +249,7 @@ export function registerHttpRoutes(app, context, controllerInviteTtlMs) {
             .get(token.account_id, params.sessionId);
         if (!session)
             throw new HttpError(404, "SESSION_NOT_FOUND", "Session not found");
-        if (session.status === "running") {
+        if (session.status === "running" && !body.status) {
             throw new HttpError(409, "SESSION_HEAD_REPAIR_RUNNING", "Cannot repair a running session head");
         }
         const basisEvent = context.db
@@ -265,18 +265,28 @@ export function registerHttpRoutes(app, context, controllerInviteTtlMs) {
         const currentOrder = sessionHeadBasisOrderForRow(context.db, session);
         const rewriteFenced = typeof session.head_basis_message_id === "string" &&
             session.head_basis_message_id.startsWith("rewrite:");
-        const advanced = !rewriteFenced && compareHeadOrders(nextOrder, currentOrder) > 0;
-        if (advanced) {
+        const comparison = compareHeadOrders(nextOrder, currentOrder);
+        const currentHeadAlreadySettled = session.current_head === `event:${basisEvent.id}` ||
+            session.current_head === body.currentHead ||
+            session.last_turn_id === body.lastTurnId;
+        const advanced = !rewriteFenced && comparison > 0;
+        const statusChanged = !rewriteFenced &&
+            body.status !== undefined &&
+            session.status === "running" &&
+            comparison === 0 &&
+            currentHeadAlreadySettled;
+        if (advanced || statusChanged) {
             const ts = context.now();
             context.db.prepare(`UPDATE sessions
-         SET current_head = ?,
-             last_turn_id = ?,
-             head_basis_event_id = ?,
-             head_basis_message_id = ?,
-             head_basis_logical_time = ?,
-             head_basis_turn_seq = ?,
+         SET status = COALESCE(?, status),
+             current_head = COALESCE(?, current_head),
+             last_turn_id = COALESCE(?, last_turn_id),
+             head_basis_event_id = COALESCE(?, head_basis_event_id),
+             head_basis_message_id = COALESCE(?, head_basis_message_id),
+             head_basis_logical_time = COALESCE(?, head_basis_logical_time),
+             head_basis_turn_seq = COALESCE(?, head_basis_turn_seq),
              updated_at = ?
-         WHERE id = ? AND account_id = ?`).run(body.currentHead, body.lastTurnId, basisEvent.id, basisEvent.message_id, nextOrder.time, nextOrder.seq, ts, params.sessionId, token.account_id);
+         WHERE id = ? AND account_id = ?`).run(body.status && session.status === "running" ? body.status : null, advanced ? body.currentHead : null, advanced ? body.lastTurnId : null, advanced ? basisEvent.id : null, advanced ? basisEvent.message_id : null, advanced ? nextOrder.time : null, advanced ? nextOrder.seq : null, ts, params.sessionId, token.account_id);
         }
         const row = context.db
             .prepare("SELECT * FROM sessions WHERE account_id = ? AND id = ?")
@@ -294,6 +304,7 @@ export function registerHttpRoutes(app, context, controllerInviteTtlMs) {
                 logicalTime: nextOrder.time,
                 turnSeq: nextOrder.seq,
             },
+            ...(statusChanged ? { settled: true } : {}),
             ...(rewriteFenced ? { reason: "rewrite-fenced" } : {}),
         };
     });

package/apps/relay/dist/http-schemas.d.ts

@@ -49,6 +49,11 @@ export declare const sessionEventsQuerySchema: z.ZodObject<{
 export declare const sessionHeadAdvanceSchema: z.ZodObject<{
     currentHead: z.ZodString;
     lastTurnId: z.ZodString;
+    status: z.ZodOptional<z.ZodEnum<{
+        completed: "completed";
+        failed: "failed";
+        cancelled: "cancelled";
+    }>>;
     basis: z.ZodObject<{
         turnId: z.ZodString;
         eventMessageId: z.ZodString;

package/apps/relay/dist/http-schemas.js

@@ -56,6 +56,7 @@ export const sessionEventsQuerySchema = z.object({
 export const sessionHeadAdvanceSchema = z.object({
     currentHead: z.string().min(1),
     lastTurnId: z.string().min(1),
+    status: z.enum(["completed", "cancelled", "failed"]).optional(),
     basis: z.object({
         turnId: z.string().min(1),
         eventMessageId: z.string().min(1),

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

@@ -418,6 +418,7 @@ export function handleMachineMessage(context, connection, message) {
             currentHead: message.currentHead,
             lastTurnId: message.lastTurnId,
             basis: message.basis,
+            status: message.status,
             ...(message.encryptedMetadata ? { encryptedMetadata: message.encryptedMetadata } : {}),
         };
         const result = applySessionHeadAdvance(db, input, ts);
@@ -634,6 +635,7 @@ function pendingRowToHeadAdvanceInput(row) {
             turnSeq: row.basis_turn_seq,
             ...(row.basis_occurred_at !== null ? { occurredAt: row.basis_occurred_at } : {}),
         },
+        status: "completed",
         ...(row.encrypted_metadata ? { encryptedMetadata: JSON.parse(row.encrypted_metadata) } : {}),
     };
 }
@@ -655,19 +657,28 @@ function applySessionHeadAdvance(db, input, ts) {
         sessionRow.head_basis_message_id.startsWith(REWRITE_HEAD_BASIS_PREFIX);
     const comparison = compareHeadBasisOrder(nextOrder, currentOrder);
     const currentHeadIsBasisEvent = sessionRow.current_head === `event:${basisEvent.id}`;
+    const currentHeadAlreadySettled = currentHeadIsBasisEvent ||
+        sessionRow.current_head === input.currentHead ||
+        sessionRow.last_turn_id === input.lastTurnId;
     const shouldAdvance = !rewriteFenced && (comparison > 0 || (comparison === 0 && currentHeadIsBasisEvent));
-    if (!shouldAdvance)
+    const shouldSettleStatus = !rewriteFenced &&
+        input.status !== undefined &&
+        sessionRow.status === "running" &&
+        comparison === 0 &&
+        currentHeadAlreadySettled;
+    if (!shouldAdvance && !shouldSettleStatus)
         return { status: "noop", session: sessionRow };
     db.prepare(`UPDATE sessions
-     SET current_head = ?,
-         last_turn_id = ?,
-         head_basis_event_id = ?,
-         head_basis_message_id = ?,
-         head_basis_logical_time = ?,
-         head_basis_turn_seq = ?,
+     SET status = COALESCE(?, status),
+         current_head = COALESCE(?, current_head),
+         last_turn_id = COALESCE(?, last_turn_id),
+         head_basis_event_id = COALESCE(?, head_basis_event_id),
+         head_basis_message_id = COALESCE(?, head_basis_message_id),
+         head_basis_logical_time = COALESCE(?, head_basis_logical_time),
+         head_basis_turn_seq = COALESCE(?, head_basis_turn_seq),
          encrypted_metadata = COALESCE(?, encrypted_metadata),
          updated_at = ?
-     WHERE id = ? AND account_id = ? AND machine_id = ?`).run(input.currentHead, input.lastTurnId, basisEvent.id, basisEvent.message_id, nextOrder.time, nextOrder.seq, input.encryptedMetadata ? JSON.stringify(input.encryptedMetadata) : null, ts, input.sessionId, input.accountId, input.machineId);
+     WHERE id = ? AND account_id = ? AND machine_id = ?`).run(input.status && sessionRow.status === "running" ? input.status : null, shouldAdvance ? input.currentHead : null, shouldAdvance ? input.lastTurnId : null, shouldAdvance ? basisEvent.id : null, shouldAdvance ? basisEvent.message_id : null, shouldAdvance ? nextOrder.time : null, shouldAdvance ? nextOrder.seq : null, input.encryptedMetadata ? JSON.stringify(input.encryptedMetadata) : null, ts, input.sessionId, input.accountId, input.machineId);
     const session = db.prepare("SELECT * FROM sessions WHERE id = ?").get(input.sessionId);
     return { status: "applied", session };
 }

package/package.json

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

package/packages/client/dist/client.js

@@ -165,6 +165,7 @@ export class ControllerClient {
         const checkedSessionId = requireNonEmpty(sessionId, "sessionId");
         const currentHead = requireNonEmpty(input.currentHead, "currentHead");
         const lastTurnId = requireNonEmpty(input.lastTurnId, "lastTurnId");
+        const status = input.status;
         const turnId = requireNonEmpty(input.basis.turnId, "basis.turnId");
         const eventMessageId = requireNonEmpty(input.basis.eventMessageId, "basis.eventMessageId");
         return await authenticatedJson(this.config, `/api/sessions/${encodeURIComponent(checkedSessionId)}/head`, {
@@ -173,6 +174,7 @@ export class ControllerClient {
             body: JSON.stringify({
                 currentHead,
                 lastTurnId,
+                ...(status ? { status } : {}),
                 basis: {
                     turnId,
                     eventMessageId,

package/packages/client/dist/parsers.js

@@ -183,6 +183,7 @@ export function parseRepairSessionHeadResult(value) {
     const reason = record.reason;
     return {
         advanced: readBooleanField(record, "advanced", "Session head repair"),
+        ...(typeof record.settled === "boolean" ? { settled: record.settled } : {}),
         session: session,
         basis: {
             eventId: readNumberField(basis, "eventId", "Session head repair basis"),

package/packages/client/dist/types.d.ts

@@ -205,6 +205,7 @@ export type CollectInput = {
 export type RepairSessionHeadInput = {
     currentHead: string;
     lastTurnId: string;
+    status?: "completed" | "cancelled" | "failed";
     basis: {
         turnId: string;
         eventMessageId: string;
@@ -214,6 +215,7 @@ export type RepairSessionHeadInput = {
 };
 export type RepairSessionHeadResult = {
     advanced: boolean;
+    settled?: boolean;
     session: SessionSnapshot;
     basis: {
         eventId: number;

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

@@ -144,6 +144,7 @@ export type MachineClientMessage = {
     currentHead: string;
     lastTurnId: string;
     basis: SessionHeadAdvanceBasis;
+    status?: "completed" | "cancelled" | "failed";
     encryptedMetadata?: EncryptedEnvelope;
 } | {
     type: "machine:turnDone";

package/packages/shared/dist/protocol.js

@@ -169,6 +169,7 @@ const machineMessageSchema = z.discriminatedUnion("type", [
         messageId: z.string().min(1).optional(),
         currentHead: z.string().min(1),
         lastTurnId: z.string().min(1),
+        status: z.enum(["completed", "cancelled", "failed"]).optional(),
         basis: z.object({
             turnId: z.string().min(1),
             eventMessageId: z.string().min(1),