@cydm/happy-elves 0.1.0-beta.274 → 0.1.0-beta.277

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

@@ -315,7 +315,7 @@ function foldAliasedRuntimeEvents(events) {
     const profiles = new Map();
     const runtimeToRequest = new Map();
     for (const event of events) {
-        const profile = profiles.get(event.turnId) ?? { output: "" };
+        const profile = profiles.get(event.turnId) ?? { output: "", status: "running" };
         const payload = event.decoded;
         if (payload?.type === "user_prompt" && profile.prompt === undefined) {
             profile.prompt = payload.text.trim();
@@ -328,6 +328,7 @@ function foldAliasedRuntimeEvents(events) {
             if (runtimeTurnId && runtimeTurnId !== event.turnId && !runtimeTurnId.startsWith("event:")) {
                 runtimeToRequest.set(runtimeTurnId, event.turnId);
             }
+            profile.status = payload.status;
         }
         profiles.set(event.turnId, profile);
     }
@@ -345,11 +346,46 @@ function foldAliasedRuntimeEvents(events) {
             duplicateRuntimeToRequest.set(runtimeTurnId, requestTurnId);
         }
     }
+    const inferredRuntimeToRequest = inferRuntimeCompletionAliases(profiles);
+    const inferredRequestTurns = new Set(inferredRuntimeToRequest.values());
+    const foldedRuntimeToRequest = new Map([...duplicateRuntimeToRequest, ...inferredRuntimeToRequest]);
+    const foldedEvents = [];
+    for (const event of events) {
+        if (duplicateRuntimeTurns.has(event.turnId))
+            continue;
+        const inferredRequestTurnId = inferredRuntimeToRequest.get(event.turnId);
+        if (inferredRequestTurnId) {
+            if (event.decoded?.type === "user_prompt" && profiles.get(inferredRequestTurnId)?.prompt)
+                continue;
+            foldedEvents.push({ ...event, turnId: inferredRequestTurnId });
+            continue;
+        }
+        if (inferredRequestTurns.has(event.turnId) &&
+            event.decoded?.type === "text_delta" &&
+            event.decoded.stream !== "thought") {
+            continue;
+        }
+        foldedEvents.push(event);
+    }
     return {
-        events: duplicateRuntimeTurns.size === 0 ? events : events.filter((event) => !duplicateRuntimeTurns.has(event.turnId)),
-        runtimeToRequest: duplicateRuntimeToRequest,
+        events: foldedEvents,
+        runtimeToRequest: foldedRuntimeToRequest,
     };
 }
+function inferRuntimeCompletionAliases(profiles) {
+    const requestTurns = [...profiles.entries()].filter(([turnId, profile]) => turnId.startsWith("turn_") && profile.status === "running" && Boolean(profile.prompt?.trim()));
+    const runtimeTurns = [...profiles.entries()].filter(([turnId, profile]) => !turnId.startsWith("turn_") && profile.status !== "running" && Boolean(profile.prompt?.trim()));
+    const result = new Map();
+    for (const [runtimeTurnId, runtime] of runtimeTurns) {
+        const candidates = requestTurns.filter(([, request]) => promptCompatible(request.prompt ?? "", runtime.prompt ?? "") &&
+            outputCompatibleForInferredAlias(request.output, runtime.output, request.prompt ?? "", runtime.prompt ?? ""));
+        if (candidates.length !== 1)
+            continue;
+        const [requestTurnId] = candidates[0];
+        result.set(runtimeTurnId, requestTurnId);
+    }
+    return result;
+}
 function dedupeSyntheticHistoricalEvents(events) {
     const groups = new Map();
     for (const event of events) {
@@ -408,6 +444,23 @@ function isDuplicateRuntimeOutput(requestOutput, runtimeOutput) {
     const runtime = comparableOutput(runtimeOutput);
     return !runtime || request === runtime || request.includes(runtime);
 }
+function promptCompatible(requestPrompt, runtimePrompt) {
+    const request = comparableOutput(requestPrompt);
+    const runtime = comparableOutput(runtimePrompt);
+    if (!request || !runtime)
+        return false;
+    if (request === runtime)
+        return true;
+    return (request.length >= 40 && runtime.includes(request)) ||
+        (runtime.length >= 40 && request.includes(runtime));
+}
+function outputCompatibleForInferredAlias(requestOutput, runtimeOutput, requestPrompt, runtimePrompt) {
+    const request = comparableOutput(requestOutput);
+    const runtime = comparableOutput(runtimeOutput);
+    if (request && runtime)
+        return request.includes(runtime) || runtime.includes(request);
+    return comparableOutput(requestPrompt) === comparableOutput(runtimePrompt) && Boolean(request || runtime);
+}
 function comparableOutput(value) {
     return value.replace(/\s+/g, " ").trim();
 }

package/apps/cli/package.json

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

package/apps/daemon/dist/relay/release.js

@@ -248,7 +248,7 @@ async function runStage(stage) {
   await log("$ " + stage.command + " " + args.map(shellQuote).join(" "));
   const result = await run(stage.command, args, {
     cwd: input.repoCwd,
-    env: controllerEnv(),
+    env: envForStage(stage),
   });
   await log(result.stdout);
   if (result.stderr) await log(result.stderr);
@@ -300,16 +300,20 @@ async function run(command, args, options) {
   });
 }
 
-function controllerEnv() {
+function envForStage(stage) {
+  const env = { ...process.env };
+  if (stage.phase !== "update" && stage.phase !== "notify") {
+    delete env.HAPPY_ELVES_RELAY_URL;
+    delete env.HAPPY_ELVES_CONTROLLER_TOKEN;
+    delete env.HAPPY_ELVES_ACCOUNT_SECRET;
+    return env;
+  }
   const config = input.controllerConfig;
-  return {
-    ...process.env,
-    ...(config ? {
-      HAPPY_ELVES_RELAY_URL: config.relayUrl,
-      HAPPY_ELVES_CONTROLLER_TOKEN: config.controllerToken,
-      HAPPY_ELVES_ACCOUNT_SECRET: config.accountSecret,
-    } : {}),
-  };
+  if (!config) return env;
+  env.HAPPY_ELVES_RELAY_URL = config.relayUrl;
+  env.HAPPY_ELVES_CONTROLLER_TOKEN = config.controllerToken;
+  env.HAPPY_ELVES_ACCOUNT_SECRET = config.accountSecret;
+  return env;
 }
 
 async function setStage(name, patch) {

package/apps/daemon/package.json

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

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

@@ -396,13 +396,30 @@ export function handleMachineMessage(context, connection, message) {
             return;
         }
         const ts = now();
+        const promptTurnForRequest = message.requestId
+            ? promptTurnForRequestId(db, connection.accountId, message.sessionId, connection.machineId, message.requestId)
+            : undefined;
+        const activeClaim = activePromptClaim(db, connection.accountId, message.sessionId, connection.machineId);
+        const replacementRequestTurn = promptTurnForRequest?.turn_id ??
+            (sessionRow.status === "running" && message.status ? activeClaim?.turn_id : undefined);
+        const replacementRequestId = promptTurnForRequest?.request_id ??
+            (replacementRequestTurn === activeClaim?.turn_id ? activeClaim?.request_id : undefined);
         const inserted = [];
         db.exec("BEGIN");
         try {
             db.prepare(`DELETE FROM session_events
          WHERE account_id = ? AND session_id = ? AND machine_id = ?`).run(connection.accountId, message.sessionId, connection.machineId);
-            db.prepare(`DELETE FROM session_turn_aliases
-         WHERE account_id = ? AND session_id = ? AND machine_id = ?`).run(connection.accountId, message.sessionId, connection.machineId);
+            if (replacementRequestTurn) {
+                recordAliasesForRuntimeTurnIds({
+                    accountId: connection.accountId,
+                    sessionId: message.sessionId,
+                    machineId: connection.machineId,
+                    requestTurnId: replacementRequestTurn,
+                    requestId: replacementRequestId,
+                    runtimeTurnIds: [message.lastTurnId, message.currentHead, replacementBasis?.turnId],
+                    recordTurnAlias,
+                });
+            }
             clearPendingSessionHeadAdvances(db, connection.accountId, message.sessionId, connection.machineId);
             for (const event of message.events) {
                 const result = db
@@ -449,6 +466,16 @@ export function handleMachineMessage(context, connection, message) {
              encrypted_metadata = COALESCE(?, encrypted_metadata),
              updated_at = ?
          WHERE id = ? AND account_id = ? AND machine_id = ?`).run(message.status ?? null, message.currentHead ?? null, lastEvent ? `event:${lastEvent.id}` : sessionRow.current_head, message.lastTurnId ?? null, lastEvent?.turnId ?? sessionRow.last_turn_id, headBasisEvent?.id ?? null, headBasisEvent?.messageId ?? null, headBasisOrder?.time ?? null, headBasisOrder?.seq ?? null, message.encryptedMetadata ? JSON.stringify(message.encryptedMetadata) : null, ts, message.sessionId, connection.accountId, connection.machineId);
+            if (message.status && replacementRequestTurn) {
+                finishSessionClaim({
+                    accountId: connection.accountId,
+                    sessionId: message.sessionId,
+                    ...(replacementRequestId ? { requestId: replacementRequestId } : {}),
+                    turnId: replacementRequestTurn,
+                    terminalStatus: message.status,
+                    finishedAt: ts,
+                });
+            }
             db.exec("COMMIT");
         }
         catch (error) {
@@ -464,7 +491,7 @@ export function handleMachineMessage(context, connection, message) {
             broadcastControllers(connection.accountId, {
                 type: "server:sessionTranscriptReplaced",
                 session,
-                events: inserted,
+                events: inserted.map((event) => canonicalEventForControllers(db, connection.accountId, event)),
                 hasMoreBefore: message.hasMoreBefore,
                 nextBefore: message.nextBefore,
             });
@@ -540,6 +567,23 @@ export function handleMachineMessage(context, connection, message) {
     }
     if (message.type === "machine:sessionHeadAdvanced") {
         const ts = now();
+        const sessionBefore = db
+            .prepare("SELECT * FROM sessions WHERE id = ? AND account_id = ? AND machine_id = ?")
+            .get(message.sessionId, connection.accountId, connection.machineId);
+        const activeClaim = sessionBefore
+            ? activePromptClaim(db, connection.accountId, message.sessionId, connection.machineId)
+            : undefined;
+        if (sessionBefore?.status === "running" && activeClaim && message.status) {
+            recordAliasesForRuntimeTurnIds({
+                accountId: connection.accountId,
+                sessionId: message.sessionId,
+                machineId: connection.machineId,
+                requestTurnId: activeClaim.turn_id,
+                requestId: activeClaim.request_id,
+                runtimeTurnIds: [message.lastTurnId, message.currentHead, message.basis.turnId],
+                recordTurnAlias,
+            });
+        }
         const input = {
             accountId: connection.accountId,
             sessionId: message.sessionId,
@@ -580,7 +624,22 @@ export function handleMachineMessage(context, connection, message) {
             acknowledgeMachineMessage();
             return;
         }
-        const row = result.session ?? db.prepare("SELECT * FROM sessions WHERE id = ?").get(message.sessionId);
+        if (message.status && activeClaim && sessionBefore?.status === "running") {
+            db.prepare(`UPDATE sessions
+         SET status = ?,
+             last_turn_id = COALESCE(?, last_turn_id),
+             updated_at = ?
+         WHERE id = ? AND account_id = ? AND machine_id = ? AND status = 'running'`).run(message.status, message.lastTurnId ?? message.currentHead ?? message.basis.turnId, ts, message.sessionId, connection.accountId, connection.machineId);
+            finishSessionClaim({
+                accountId: connection.accountId,
+                sessionId: message.sessionId,
+                requestId: activeClaim.request_id,
+                turnId: activeClaim.turn_id,
+                terminalStatus: message.status,
+                finishedAt: ts,
+            });
+        }
+        const row = db.prepare("SELECT * FROM sessions WHERE id = ?").get(message.sessionId);
         if (row)
             broadcastControllers(connection.accountId, { type: "server:session", session: sessionSnapshot(row) });
         acknowledgeMachineMessage();
@@ -592,6 +651,17 @@ export function handleMachineMessage(context, connection, message) {
             .get(message.sessionId, connection.accountId, connection.machineId);
         if (!sessionRow)
             return;
+        maybeAliasHistoricalRuntimeEventToActiveClaim({
+            db,
+            accountId: connection.accountId,
+            sessionId: message.sessionId,
+            machineId: connection.machineId,
+            session: sessionRow,
+            turnId: message.turnId,
+            messageId: message.messageId,
+            occurredAt: message.occurredAt,
+            recordTurnAlias,
+        });
         const event = insertEvent({
             accountId: connection.accountId,
             sessionId: message.sessionId,
@@ -604,7 +674,7 @@ export function handleMachineMessage(context, connection, message) {
             payload: message.payload,
         });
         const pendingSessionRow = applyPendingSessionHeadAdvances(db, connection.accountId, message.sessionId, connection.machineId, now());
-        broadcastControllers(connection.accountId, { type: "server:event", event });
+        broadcastControllers(connection.accountId, { type: "server:event", event: canonicalEventForControllers(db, connection.accountId, event) });
         if (pendingSessionRow)
             broadcastControllers(connection.accountId, { type: "server:session", session: sessionSnapshot(pendingSessionRow) });
         acknowledgeMachineMessage();
@@ -903,4 +973,82 @@ function latestEventForTurn(db, accountId, sessionId, machineId, turnId) {
        LIMIT 1`)
         .get(accountId, sessionId, machineId, turnId);
 }
+function activePromptClaim(db, accountId, sessionId, machineId) {
+    return db
+        .prepare(`SELECT * FROM relay_session_claims
+       WHERE account_id = ? AND session_id = ? AND machine_id = ? AND state = 'active'
+       LIMIT 1`)
+        .get(accountId, sessionId, machineId);
+}
+function promptTurnForRequestId(db, accountId, sessionId, machineId, requestId) {
+    const claim = db
+        .prepare(`SELECT request_id, turn_id FROM relay_session_claims
+       WHERE account_id = ? AND session_id = ? AND machine_id = ? AND request_id = ? AND state = 'active'
+       LIMIT 1`)
+        .get(accountId, sessionId, machineId, requestId);
+    if (claim)
+        return claim;
+    return db
+        .prepare(`SELECT request_id, turn_id FROM relay_admissions
+       WHERE account_id = ? AND session_id = ? AND machine_id = ? AND request_id = ? AND kind = 'prompt' AND turn_id IS NOT NULL
+       LIMIT 1`)
+        .get(accountId, sessionId, machineId, requestId);
+}
+function maybeAliasHistoricalRuntimeEventToActiveClaim(input) {
+    if (input.session.status !== "running")
+        return;
+    if (!isHistoricalRuntimeBackfillMessage(input.messageId, input.occurredAt))
+        return;
+    const claim = activePromptClaim(input.db, input.accountId, input.sessionId, input.machineId);
+    if (!claim)
+        return;
+    recordAliasesForRuntimeTurnIds({
+        accountId: input.accountId,
+        sessionId: input.sessionId,
+        machineId: input.machineId,
+        requestTurnId: claim.turn_id,
+        requestId: claim.request_id,
+        runtimeTurnIds: [input.turnId],
+        recordTurnAlias: input.recordTurnAlias,
+    });
+}
+function isHistoricalRuntimeBackfillMessage(messageId, occurredAt) {
+    if (messageId?.startsWith("hist_") || messageId?.startsWith("tail_"))
+        return true;
+    return occurredAt !== undefined;
+}
+function recordAliasesForRuntimeTurnIds(input) {
+    for (const runtimeTurnId of input.runtimeTurnIds) {
+        if (!isRuntimeTurnAliasCandidate(input.requestTurnId, runtimeTurnId))
+            continue;
+        input.recordTurnAlias({
+            accountId: input.accountId,
+            sessionId: input.sessionId,
+            machineId: input.machineId,
+            requestTurnId: input.requestTurnId,
+            runtimeTurnId,
+            requestId: input.requestId,
+        });
+    }
+}
+function isRuntimeTurnAliasCandidate(requestTurnId, runtimeTurnId) {
+    if (!runtimeTurnId)
+        return false;
+    const value = runtimeTurnId.trim();
+    if (!value || value === requestTurnId)
+        return false;
+    if (value.startsWith("event:"))
+        return false;
+    return true;
+}
+function canonicalEventForControllers(db, accountId, event) {
+    const alias = db
+        .prepare(`SELECT request_turn_id FROM session_turn_aliases
+       WHERE account_id = ? AND session_id = ? AND machine_id = ? AND runtime_turn_id = ?
+       LIMIT 1`)
+        .get(accountId, event.sessionId, event.machineId, event.turnId);
+    return alias && alias.request_turn_id !== event.turnId
+        ? { ...event, turnId: alias.request_turn_id }
+        : event;
+}
 //# sourceMappingURL=machine-handlers.js.map

package/package.json

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