@cydm/happy-elves 0.1.0-beta.298 → 0.1.0-beta.299

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

@@ -315,7 +315,8 @@ 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: "", hasDone: false, firstEventId: event.id };
+        profile.firstEventId = Math.min(profile.firstEventId, event.id);
         const payload = event.decoded;
         if (payload?.type === "user_prompt" && profile.prompt === undefined) {
             profile.prompt = payload.text.trim();
@@ -324,6 +325,7 @@ function foldAliasedRuntimeEvents(events) {
             profile.output += payload.text;
         }
         else if (payload?.type === "done") {
+            profile.hasDone = true;
             const runtimeTurnId = payload.lastTurnId ?? payload.currentHead;
             if (runtimeTurnId && runtimeTurnId !== event.turnId && !runtimeTurnId.startsWith("event:")) {
                 runtimeToRequest.set(runtimeTurnId, event.turnId);
@@ -345,11 +347,83 @@ function foldAliasedRuntimeEvents(events) {
             duplicateRuntimeToRequest.set(runtimeTurnId, requestTurnId);
         }
     }
+    const inferredRuntimeToRequest = inferRuntimeToRequestAliases(profiles, runtimeToRequest);
+    const inferredRequestToRuntime = new Map();
+    for (const [runtimeTurnId, requestTurnId] of inferredRuntimeToRequest) {
+        runtimeToRequest.set(runtimeTurnId, requestTurnId);
+        inferredRequestToRuntime.set(requestTurnId, runtimeTurnId);
+    }
+    const foldedEvents = [];
+    for (const event of events) {
+        if (duplicateRuntimeTurns.has(event.turnId))
+            continue;
+        const inferredRequestTurnId = inferredRuntimeToRequest.get(event.turnId);
+        if (inferredRequestTurnId) {
+            foldedEvents.push({ ...event, turnId: inferredRequestTurnId });
+            continue;
+        }
+        const inferredRuntimeTurnId = inferredRequestToRuntime.get(event.turnId);
+        if (inferredRuntimeTurnId && shouldDropRequestSideDuplicateEvent(event, profiles.get(inferredRuntimeTurnId))) {
+            continue;
+        }
+        foldedEvents.push(event);
+    }
     return {
-        events: duplicateRuntimeTurns.size === 0 ? events : events.filter((event) => !duplicateRuntimeTurns.has(event.turnId)),
-        runtimeToRequest: duplicateRuntimeToRequest,
+        events: foldedEvents,
+        runtimeToRequest: new Map([...duplicateRuntimeToRequest, ...inferredRuntimeToRequest]),
     };
 }
+function inferRuntimeToRequestAliases(profiles, explicitRuntimeToRequest) {
+    const requestsByPrompt = new Map();
+    const runtimesByPrompt = new Map();
+    for (const [turnId, profile] of profiles) {
+        const promptKey = comparableOutput(profile.prompt ?? "");
+        if (!promptKey)
+            continue;
+        if (turnId.startsWith("turn_") && !profile.hasDone) {
+            requestsByPrompt.set(promptKey, [...(requestsByPrompt.get(promptKey) ?? []), { turnId, output: profile.output, firstEventId: profile.firstEventId }]);
+        }
+        else if (!turnId.startsWith("turn_") && profile.hasDone && !explicitRuntimeToRequest.has(turnId)) {
+            runtimesByPrompt.set(promptKey, [...(runtimesByPrompt.get(promptKey) ?? []), { turnId, output: profile.output, firstEventId: profile.firstEventId }]);
+        }
+    }
+    const inferred = new Map();
+    for (const [promptKey, requests] of requestsByPrompt) {
+        const runtimes = runtimesByPrompt.get(promptKey) ?? [];
+        if (requests.length !== 1 || runtimes.length !== 1)
+            continue;
+        const request = requests[0];
+        const runtime = runtimes[0];
+        if (!request || !runtime)
+            continue;
+        if (runtime.firstEventId <= request.firstEventId)
+            continue;
+        if (!outputsAreCompatible(request.output, runtime.output))
+            continue;
+        inferred.set(runtime.turnId, request.turnId);
+    }
+    return inferred;
+}
+function outputsAreCompatible(requestOutput, runtimeOutput) {
+    const request = comparableOutput(requestOutput);
+    const runtime = comparableOutput(runtimeOutput);
+    if (!request || !runtime)
+        return true;
+    return request.includes(runtime) || runtime.includes(request);
+}
+function shouldDropRequestSideDuplicateEvent(event, runtimeProfile) {
+    if (!runtimeProfile)
+        return false;
+    const payload = event.decoded;
+    if (payload?.type === "user_prompt") {
+        return comparableOutput(payload.text) === comparableOutput(runtimeProfile.prompt ?? "");
+    }
+    if (payload?.type === "text_delta" && payload.stream !== "thought" && payload.text) {
+        const chunk = comparableOutput(payload.text);
+        return Boolean(chunk) && comparableOutput(runtimeProfile.output).includes(chunk);
+    }
+    return false;
+}
 function dedupeSyntheticHistoricalEvents(events) {
     const groups = new Map();
     for (const event of events) {

package/apps/cli/package.json

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

package/apps/daemon/package.json

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

package/package.json

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