@halcyonlabs/app 0.47.0-halcyon.216 → 0.47.0-halcyon.217

package/dist/index.d.ts

@@ -158,10 +158,10 @@ declare const uiPreferenceDefinitions: {
     }>>;
     readonly "sidebar.threadGrouping.environment": UiPreferenceDefinition<z$1.ZodUnion<readonly [z$1.ZodLiteral<"auto">, z$1.ZodBoolean]>>;
     readonly "sidebar.chronologicalSort": UiPreferenceDefinition<z$1.ZodEnum<{
+        none: "none";
         updated: "updated";
         created: "created";
         alpha: "alpha";
-        none: "none";
     }>>;
     readonly "sidebar.sortDirection": UiPreferenceDefinition<z$1.ZodEnum<{
         default: "default";
@@ -7339,8 +7339,8 @@ declare const hostDaemonCommandRegistry: {
                 providerInstallation: z$1.ZodBoolean;
                 supportsServiceTier: z$1.ZodBoolean;
                 permissionModes: z$1.ZodArray<z$1.ZodEnum<{
-                    "accept-edits": "accept-edits";
                     auto: "auto";
+                    "accept-edits": "accept-edits";
                     full: "full";
                 }>>;
                 supportsThreadArchive: z$1.ZodBoolean;
@@ -7366,16 +7366,16 @@ declare const hostDaemonCommandRegistry: {
             permissionScope: z$1.ZodLiteral<"workspace">;
             approvalReviewer: z$1.ZodLiteral<"user">;
             permissionEscalation: z$1.ZodEnum<{
-                ask: "ask";
                 deny: "deny";
+                ask: "ask";
             }>;
         }, z$1.core.$strip>, z$1.ZodObject<{
             permissionMode: z$1.ZodLiteral<"auto">;
             permissionScope: z$1.ZodLiteral<"workspace">;
             approvalReviewer: z$1.ZodLiteral<"automatic">;
             permissionEscalation: z$1.ZodEnum<{
-                ask: "ask";
                 deny: "deny";
+                ask: "ask";
             }>;
         }, z$1.core.$strip>, z$1.ZodObject<{
             permissionMode: z$1.ZodLiteral<"full">;
@@ -7488,8 +7488,8 @@ declare const hostDaemonCommandRegistry: {
                 providerInstallation: z$1.ZodBoolean;
                 supportsServiceTier: z$1.ZodBoolean;
                 permissionModes: z$1.ZodArray<z$1.ZodEnum<{
-                    "accept-edits": "accept-edits";
                     auto: "auto";
+                    "accept-edits": "accept-edits";
                     full: "full";
                 }>>;
                 supportsThreadArchive: z$1.ZodBoolean;
@@ -7515,16 +7515,16 @@ declare const hostDaemonCommandRegistry: {
             permissionScope: z$1.ZodLiteral<"workspace">;
             approvalReviewer: z$1.ZodLiteral<"user">;
             permissionEscalation: z$1.ZodEnum<{
-                ask: "ask";
                 deny: "deny";
+                ask: "ask";
             }>;
         }, z$1.core.$strip>, z$1.ZodObject<{
             permissionMode: z$1.ZodLiteral<"auto">;
             permissionScope: z$1.ZodLiteral<"workspace">;
             approvalReviewer: z$1.ZodLiteral<"automatic">;
             permissionEscalation: z$1.ZodEnum<{
-                ask: "ask";
                 deny: "deny";
+                ask: "ask";
             }>;
         }, z$1.core.$strip>, z$1.ZodObject<{
             permissionMode: z$1.ZodLiteral<"full">;
@@ -7660,8 +7660,8 @@ declare const hostDaemonCommandRegistry: {
                     }>;
                     origin: z$1.ZodEnum<{
                         builtin: "builtin";
-                        project: "project";
                         user: "user";
+                        project: "project";
                     }>;
                     label: z$1.ZodString;
                     argumentHint: z$1.ZodNullable<z$1.ZodString>;
@@ -7750,8 +7750,8 @@ declare const hostDaemonCommandRegistry: {
                     }>;
                     origin: z$1.ZodEnum<{
                         builtin: "builtin";
-                        project: "project";
                         user: "user";
+                        project: "project";
                     }>;
                     label: z$1.ZodString;
                     argumentHint: z$1.ZodNullable<z$1.ZodString>;
@@ -7853,8 +7853,8 @@ declare const hostDaemonCommandRegistry: {
                     }>;
                     origin: z$1.ZodEnum<{
                         builtin: "builtin";
-                        project: "project";
                         user: "user";
+                        project: "project";
                     }>;
                     label: z$1.ZodString;
                     argumentHint: z$1.ZodNullable<z$1.ZodString>;
@@ -7943,8 +7943,8 @@ declare const hostDaemonCommandRegistry: {
                     }>;
                     origin: z$1.ZodEnum<{
                         builtin: "builtin";
-                        project: "project";
                         user: "user";
+                        project: "project";
                     }>;
                     label: z$1.ZodString;
                     argumentHint: z$1.ZodNullable<z$1.ZodString>;
@@ -7998,16 +7998,16 @@ declare const hostDaemonCommandRegistry: {
             permissionScope: z$1.ZodLiteral<"workspace">;
             approvalReviewer: z$1.ZodLiteral<"user">;
             permissionEscalation: z$1.ZodEnum<{
-                ask: "ask";
                 deny: "deny";
+                ask: "ask";
             }>;
         }, z$1.core.$strip>, z$1.ZodObject<{
             permissionMode: z$1.ZodLiteral<"auto">;
             permissionScope: z$1.ZodLiteral<"workspace">;
             approvalReviewer: z$1.ZodLiteral<"automatic">;
             permissionEscalation: z$1.ZodEnum<{
-                ask: "ask";
                 deny: "deny";
+                ask: "ask";
             }>;
         }, z$1.core.$strip>, z$1.ZodObject<{
             permissionMode: z$1.ZodLiteral<"full">;
@@ -8026,8 +8026,8 @@ declare const hostDaemonCommandRegistry: {
                 providerInstallation: z$1.ZodBoolean;
                 supportsServiceTier: z$1.ZodBoolean;
                 permissionModes: z$1.ZodArray<z$1.ZodEnum<{
-                    "accept-edits": "accept-edits";
                     auto: "auto";
+                    "accept-edits": "accept-edits";
                     full: "full";
                 }>>;
                 supportsThreadArchive: z$1.ZodBoolean;
@@ -8045,6 +8045,9 @@ declare const hostDaemonCommandRegistry: {
             workspaceContext: z$1.ZodObject<{
                 workspacePath: z$1.ZodString;
             }, z$1.core.$strip>;
+            projectId: z$1.ZodString;
+            providerThreadId: z$1.ZodString;
+            providerId: z$1.ZodString;
             bridgeLaunch: z$1.ZodObject<{
                 pluginId: z$1.ZodString;
                 source: z$1.ZodObject<{
@@ -8056,8 +8059,8 @@ declare const hostDaemonCommandRegistry: {
                     providerInstallation: z$1.ZodBoolean;
                     supportsServiceTier: z$1.ZodBoolean;
                     permissionModes: z$1.ZodArray<z$1.ZodEnum<{
-                        "accept-edits": "accept-edits";
                         auto: "auto";
+                        "accept-edits": "accept-edits";
                         full: "full";
                     }>>;
                     supportsThreadArchive: z$1.ZodBoolean;
@@ -8075,8 +8078,6 @@ declare const hostDaemonCommandRegistry: {
                 replace: "replace";
                 append: "append";
             }>;
-            projectId: z$1.ZodString;
-            providerId: z$1.ZodString;
             instructions: z$1.ZodString;
             dynamicTools: z$1.ZodArray<z$1.ZodObject<{
                 name: z$1.ZodString;
@@ -8152,7 +8153,6 @@ declare const hostDaemonCommandRegistry: {
                 sourceRootPath: z$1.ZodString;
                 skillFilePath: z$1.ZodString;
             }, z$1.core.$strict>], "kind">>;
-            providerThreadId: z$1.ZodString;
         }, z$1.core.$strict>;
         target: z$1.ZodDiscriminatedUnion<[z$1.ZodObject<{
             mode: z$1.ZodLiteral<"start">;
@@ -8214,16 +8214,16 @@ declare const hostDaemonCommandRegistry: {
             permissionScope: z$1.ZodLiteral<"workspace">;
             approvalReviewer: z$1.ZodLiteral<"user">;
             permissionEscalation: z$1.ZodEnum<{
-                ask: "ask";
                 deny: "deny";
+                ask: "ask";
             }>;
         }, z$1.core.$strip>, z$1.ZodObject<{
             permissionMode: z$1.ZodLiteral<"auto">;
             permissionScope: z$1.ZodLiteral<"workspace">;
             approvalReviewer: z$1.ZodLiteral<"automatic">;
             permissionEscalation: z$1.ZodEnum<{
-                ask: "ask";
                 deny: "deny";
+                ask: "ask";
             }>;
         }, z$1.core.$strip>, z$1.ZodObject<{
             permissionMode: z$1.ZodLiteral<"full">;
@@ -8242,8 +8242,8 @@ declare const hostDaemonCommandRegistry: {
                 providerInstallation: z$1.ZodBoolean;
                 supportsServiceTier: z$1.ZodBoolean;
                 permissionModes: z$1.ZodArray<z$1.ZodEnum<{
-                    "accept-edits": "accept-edits";
                     auto: "auto";
+                    "accept-edits": "accept-edits";
                     full: "full";
                 }>>;
                 supportsThreadArchive: z$1.ZodBoolean;
@@ -8261,6 +8261,9 @@ declare const hostDaemonCommandRegistry: {
             workspaceContext: z$1.ZodObject<{
                 workspacePath: z$1.ZodString;
             }, z$1.core.$strip>;
+            projectId: z$1.ZodString;
+            providerThreadId: z$1.ZodString;
+            providerId: z$1.ZodString;
             bridgeLaunch: z$1.ZodObject<{
                 pluginId: z$1.ZodString;
                 source: z$1.ZodObject<{
@@ -8272,8 +8275,8 @@ declare const hostDaemonCommandRegistry: {
                     providerInstallation: z$1.ZodBoolean;
                     supportsServiceTier: z$1.ZodBoolean;
                     permissionModes: z$1.ZodArray<z$1.ZodEnum<{
-                        "accept-edits": "accept-edits";
                         auto: "auto";
+                        "accept-edits": "accept-edits";
                         full: "full";
                     }>>;
                     supportsThreadArchive: z$1.ZodBoolean;
@@ -8291,8 +8294,6 @@ declare const hostDaemonCommandRegistry: {
                 replace: "replace";
                 append: "append";
             }>;
-            projectId: z$1.ZodString;
-            providerId: z$1.ZodString;
             instructions: z$1.ZodString;
             dynamicTools: z$1.ZodArray<z$1.ZodObject<{
                 name: z$1.ZodString;
@@ -8368,7 +8369,6 @@ declare const hostDaemonCommandRegistry: {
                 sourceRootPath: z$1.ZodString;
                 skillFilePath: z$1.ZodString;
             }, z$1.core.$strict>], "kind">>;
-            providerThreadId: z$1.ZodString;
         }, z$1.core.$strict>;
     }, z$1.core.$strict>, z$1.ZodObject<{
         cleared: z$1.ZodBoolean;
@@ -8407,8 +8407,8 @@ declare const hostDaemonCommandRegistry: {
                 providerInstallation: z$1.ZodBoolean;
                 supportsServiceTier: z$1.ZodBoolean;
                 permissionModes: z$1.ZodArray<z$1.ZodEnum<{
-                    "accept-edits": "accept-edits";
                     auto: "auto";
+                    "accept-edits": "accept-edits";
                     full: "full";
                 }>>;
                 supportsThreadArchive: z$1.ZodBoolean;
@@ -8440,8 +8440,8 @@ declare const hostDaemonCommandRegistry: {
                 providerInstallation: z$1.ZodBoolean;
                 supportsServiceTier: z$1.ZodBoolean;
                 permissionModes: z$1.ZodArray<z$1.ZodEnum<{
-                    "accept-edits": "accept-edits";
                     auto: "auto";
+                    "accept-edits": "accept-edits";
                     full: "full";
                 }>>;
                 supportsThreadArchive: z$1.ZodBoolean;
@@ -8823,8 +8823,8 @@ declare const hostDaemonCommandRegistry: {
                 skills: z$1.ZodArray<z$1.ZodObject<{
                     path: z$1.ZodString;
                     origin: z$1.ZodEnum<{
-                        project: "project";
                         user: "user";
+                        project: "project";
                     }>;
                     recursive: z$1.ZodBoolean;
                     ancestors: z$1.ZodBoolean;
@@ -8842,8 +8842,8 @@ declare const hostDaemonCommandRegistry: {
                 commands: z$1.ZodArray<z$1.ZodObject<{
                     path: z$1.ZodString;
                     origin: z$1.ZodEnum<{
-                        project: "project";
                         user: "user";
+                        project: "project";
                     }>;
                     recursive: z$1.ZodBoolean;
                     ancestors: z$1.ZodBoolean;
@@ -8868,8 +8868,8 @@ declare const hostDaemonCommandRegistry: {
                 skill: "skill";
             }>;
             origin: z$1.ZodEnum<{
-                project: "project";
                 user: "user";
+                project: "project";
             }>;
             description: z$1.ZodNullable<z$1.ZodString>;
             argumentHint: z$1.ZodNullable<z$1.ZodString>;
@@ -8916,8 +8916,8 @@ declare const hostDaemonCommandRegistry: {
                 skills: z$1.ZodArray<z$1.ZodObject<{
                     path: z$1.ZodString;
                     origin: z$1.ZodEnum<{
-                        project: "project";
                         user: "user";
+                        project: "project";
                     }>;
                     recursive: z$1.ZodBoolean;
                     ancestors: z$1.ZodBoolean;
@@ -8935,8 +8935,8 @@ declare const hostDaemonCommandRegistry: {
                 commands: z$1.ZodArray<z$1.ZodObject<{
                     path: z$1.ZodString;
                     origin: z$1.ZodEnum<{
-                        project: "project";
                         user: "user";
+                        project: "project";
                     }>;
                     recursive: z$1.ZodBoolean;
                     ancestors: z$1.ZodBoolean;
@@ -8962,14 +8962,14 @@ declare const hostDaemonCommandRegistry: {
             realPath: z$1.ZodString;
             contentSha256: z$1.ZodString;
             rootKind: z$1.ZodEnum<{
+                plugin: "plugin";
                 "shared-user": "shared-user";
                 "shared-project": "shared-project";
-                plugin: "plugin";
                 "bb-project": "bb-project";
-                "provider-user": "provider-user";
-                "provider-project": "provider-project";
                 "bb-data-dir": "bb-data-dir";
                 "bb-builtin": "bb-builtin";
+                "provider-project": "provider-project";
+                "provider-user": "provider-user";
             }>;
             linked: z$1.ZodBoolean;
         }, z$1.core.$strip>>;
@@ -9023,14 +9023,14 @@ declare const hostDaemonCommandRegistry: {
             realPath: z$1.ZodString;
             contentSha256: z$1.ZodString;
             rootKind: z$1.ZodEnum<{
+                plugin: "plugin";
                 "shared-user": "shared-user";
                 "shared-project": "shared-project";
-                plugin: "plugin";
                 "bb-project": "bb-project";
-                "provider-user": "provider-user";
-                "provider-project": "provider-project";
                 "bb-data-dir": "bb-data-dir";
                 "bb-builtin": "bb-builtin";
+                "provider-project": "provider-project";
+                "provider-user": "provider-user";
             }>;
             linked: z$1.ZodBoolean;
         }, z$1.core.$strip>>;
@@ -9038,10 +9038,10 @@ declare const hostDaemonCommandRegistry: {
     "host.delete_skill": HostDaemonCommandDescriptor<"host.delete_skill", z$1.ZodObject<{
         type: z$1.ZodLiteral<"host.delete_skill">;
         scope: z$1.ZodEnum<{
-            "bb-user": "bb-user";
             "bb-project": "bb-project";
-            "provider-user": "provider-user";
             "provider-project": "provider-project";
+            "provider-user": "provider-user";
+            "bb-user": "bb-user";
         }>;
         name: z$1.ZodString;
         cwd: z$1.ZodNullable<z$1.ZodString>;
@@ -9052,8 +9052,8 @@ declare const hostDaemonCommandRegistry: {
     "host.write_skill": HostDaemonCommandDescriptor<"host.write_skill", z$1.ZodObject<{
         type: z$1.ZodLiteral<"host.write_skill">;
         scope: z$1.ZodEnum<{
-            "bb-user": "bb-user";
             "bb-project": "bb-project";
+            "bb-user": "bb-user";
         }>;
         name: z$1.ZodString;
         cwd: z$1.ZodNullable<z$1.ZodString>;
@@ -9150,8 +9150,8 @@ declare const hostDaemonCommandRegistry: {
         selectedBranch: z$1.ZodOptional<z$1.ZodString>;
         limit: z$1.ZodNumber;
         remoteRefresh: z$1.ZodEnum<{
-            none: "none";
             background: "background";
+            none: "none";
         }>;
     }, z$1.core.$strict>, z$1.ZodObject<{
         branches: z$1.ZodArray<z$1.ZodString>;
@@ -9190,14 +9190,14 @@ declare const hostDaemonCommandRegistry: {
         modifiedAtMs: z$1.ZodOptional<z$1.ZodNumber>;
         sha256: z$1.ZodString;
     }, z$1.core.$strip>, z$1.ZodObject<{
-        path: z$1.ZodString;
         contentEncoding: z$1.ZodEnum<{
             base64: "base64";
             utf8: "utf8";
         }>;
-        mimeType: z$1.ZodOptional<z$1.ZodString>;
-        sizeBytes: z$1.ZodNumber;
         sha256: z$1.ZodString;
+        sizeBytes: z$1.ZodNumber;
+        path: z$1.ZodString;
+        mimeType: z$1.ZodOptional<z$1.ZodString>;
         modifiedAtMs: z$1.ZodOptional<z$1.ZodNumber>;
         notModified: z$1.ZodLiteral<true>;
     }, z$1.core.$strip>]>, "onlineRpc", true>;
@@ -9272,8 +9272,8 @@ declare const hostDaemonCommandRegistry: {
                 providerInstallation: z$1.ZodBoolean;
                 supportsServiceTier: z$1.ZodBoolean;
                 permissionModes: z$1.ZodArray<z$1.ZodEnum<{
-                    "accept-edits": "accept-edits";
                     auto: "auto";
+                    "accept-edits": "accept-edits";
                     full: "full";
                 }>>;
                 supportsThreadArchive: z$1.ZodBoolean;
@@ -9402,8 +9402,8 @@ declare const hostDaemonCommandRegistry: {
                 providerInstallation: z$1.ZodBoolean;
                 supportsServiceTier: z$1.ZodBoolean;
                 permissionModes: z$1.ZodArray<z$1.ZodEnum<{
-                    "accept-edits": "accept-edits";
                     auto: "auto";
+                    "accept-edits": "accept-edits";
                     full: "full";
                 }>>;
                 supportsThreadArchive: z$1.ZodBoolean;
@@ -9439,8 +9439,8 @@ declare const hostDaemonCommandRegistry: {
                 providerInstallation: z$1.ZodBoolean;
                 supportsServiceTier: z$1.ZodBoolean;
                 permissionModes: z$1.ZodArray<z$1.ZodEnum<{
-                    "accept-edits": "accept-edits";
                     auto: "auto";
+                    "accept-edits": "accept-edits";
                     full: "full";
                 }>>;
                 supportsThreadArchive: z$1.ZodBoolean;
@@ -9462,10 +9462,10 @@ declare const hostDaemonCommandRegistry: {
         health: z$1.ZodObject<{
             status: z$1.ZodEnum<{
                 unknown: "unknown";
+                ready: "ready";
                 not_installed: "not_installed";
                 unauthenticated: "unauthenticated";
                 expired: "expired";
-                ready: "ready";
                 unsupported_version: "unsupported_version";
             }>;
             statusMessage: z$1.ZodNullable<z$1.ZodString>;
@@ -9493,8 +9493,8 @@ declare const hostDaemonCommandRegistry: {
                 providerInstallation: z$1.ZodBoolean;
                 supportsServiceTier: z$1.ZodBoolean;
                 permissionModes: z$1.ZodArray<z$1.ZodEnum<{
-                    "accept-edits": "accept-edits";
                     auto: "auto";
+                    "accept-edits": "accept-edits";
                     full: "full";
                 }>>;
                 supportsThreadArchive: z$1.ZodBoolean;
@@ -9554,8 +9554,8 @@ declare const hostDaemonCommandRegistry: {
                 providerInstallation: z$1.ZodBoolean;
                 supportsServiceTier: z$1.ZodBoolean;
                 permissionModes: z$1.ZodArray<z$1.ZodEnum<{
-                    "accept-edits": "accept-edits";
                     auto: "auto";
+                    "accept-edits": "accept-edits";
                     full: "full";
                 }>>;
                 supportsThreadArchive: z$1.ZodBoolean;
@@ -9608,8 +9608,8 @@ declare const hostDaemonCommandRegistry: {
                 providerInstallation: z$1.ZodBoolean;
                 supportsServiceTier: z$1.ZodBoolean;
                 permissionModes: z$1.ZodArray<z$1.ZodEnum<{
-                    "accept-edits": "accept-edits";
                     auto: "auto";
+                    "accept-edits": "accept-edits";
                     full: "full";
                 }>>;
                 supportsThreadArchive: z$1.ZodBoolean;
@@ -9961,8 +9961,8 @@ declare const hostDaemonCommandRegistry: {
         message: z$1.ZodNullable<z$1.ZodString>;
         state: z$1.ZodNullable<z$1.ZodEnum<{
             pending: "pending";
-            ready: "ready";
             activating: "activating";
+            ready: "ready";
         }>>;
     }, z$1.core.$strict>, "onlineRpc", true>;
     "server_move.prepare": HostDaemonCommandDescriptor<"server_move.prepare", z$1.ZodObject<{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@halcyonlabs/app",
-  "version": "0.47.0-halcyon.216",
+  "version": "0.47.0-halcyon.217",
   "description": "bb app launcher for npx",
   "keywords": [
     "bb",

package/server/dist/builtin-plugins/orbit/dist/assets/orbit/revision

@@ -1 +1 @@
-1adb9e813e6e0585aa75090d3450656376f40855
+6cbb93176e74118d1e8342e8e52ada55cda91682

package/server/dist/start-server.js

@@ -62884,6 +62884,60 @@ var init_timeline_noise_events = __esm({
   }
 });
 
+// ../../packages/thread-view/src/timeline-message-helpers.ts
+function isOwnerFacingMessage(message2) {
+  switch (message2.kind) {
+    case "assistant-text":
+      return message2.ownerMessagePluginId !== void 0 || message2.isLegacyUserMessage === true;
+    case "permission-grant-lifecycle":
+    case "user-question-lifecycle":
+    case "plugin-form-lifecycle":
+      return true;
+    default:
+      return false;
+  }
+}
+function isOwnerTurnMessage(message2) {
+  return isOwnerFacingMessage(message2) || message2.kind === "assistant-text" || message2.kind === "user" && message2.initiator === "user";
+}
+function isTimelineTerminalMessage(message2) {
+  return message2.kind === "assistant-text" && message2.rejection === void 0 || message2.kind === "error";
+}
+function isTimelineSummaryGroupableSteerMessage(message2) {
+  return message2.kind === "user" && message2.turnRequest.kind === "steer" && (message2.initiator === "agent" || message2.initiator === "system");
+}
+function isTimelineUngroupableMessage(message2) {
+  if (message2.kind === "user") {
+    return !isTimelineSummaryGroupableSteerMessage(message2);
+  }
+  if (message2.kind === "assistant-text") {
+    return message2.isLegacyUserMessage === true || message2.rejection !== void 0;
+  }
+  if (message2.kind === "command") {
+    return parseSentThreadMessage(message2) !== null;
+  }
+  return false;
+}
+function isSingletonContextManagementOperation(messages) {
+  const onlyMessage = messages.length === 1 ? messages[0] : void 0;
+  return onlyMessage?.kind === "operation" && (onlyMessage.opType === "compaction" || onlyMessage.opType === "context-clear");
+}
+function findLastTerminalTimelineMessage(messages) {
+  for (let index2 = messages.length - 1; index2 >= 0; index2 -= 1) {
+    const message2 = messages[index2];
+    if (message2 && isTimelineTerminalMessage(message2)) {
+      return message2;
+    }
+  }
+  return void 0;
+}
+var init_timeline_message_helpers = __esm({
+  "../../packages/thread-view/src/timeline-message-helpers.ts"() {
+    "use strict";
+    init_tool_call_parsing();
+  }
+});
+
 // ../../packages/thread-view/src/message-scope.ts
 function areThreadEventScopesEqual(left, right) {
   if (left.kind !== right.kind) {
@@ -64372,60 +64426,6 @@ var init_event_projection_flatten = __esm({
   }
 });
 
-// ../../packages/thread-view/src/timeline-message-helpers.ts
-function isOwnerFacingMessage(message2) {
-  switch (message2.kind) {
-    case "assistant-text":
-      return message2.ownerMessagePluginId !== void 0 || message2.isLegacyUserMessage === true;
-    case "permission-grant-lifecycle":
-    case "user-question-lifecycle":
-    case "plugin-form-lifecycle":
-      return true;
-    default:
-      return false;
-  }
-}
-function isOwnerTurnMessage(message2) {
-  return isOwnerFacingMessage(message2) || message2.kind === "assistant-text" || message2.kind === "user" && message2.initiator === "user";
-}
-function isTimelineTerminalMessage(message2) {
-  return message2.kind === "assistant-text" && message2.rejection === void 0 || message2.kind === "error";
-}
-function isTimelineSummaryGroupableSteerMessage(message2) {
-  return message2.kind === "user" && message2.turnRequest.kind === "steer" && (message2.initiator === "agent" || message2.initiator === "system");
-}
-function isTimelineUngroupableMessage(message2) {
-  if (message2.kind === "user") {
-    return !isTimelineSummaryGroupableSteerMessage(message2);
-  }
-  if (message2.kind === "assistant-text") {
-    return message2.isLegacyUserMessage === true || message2.rejection !== void 0;
-  }
-  if (message2.kind === "command") {
-    return parseSentThreadMessage(message2) !== null;
-  }
-  return false;
-}
-function isSingletonContextManagementOperation(messages) {
-  const onlyMessage = messages.length === 1 ? messages[0] : void 0;
-  return onlyMessage?.kind === "operation" && (onlyMessage.opType === "compaction" || onlyMessage.opType === "context-clear");
-}
-function findLastTerminalTimelineMessage(messages) {
-  for (let index2 = messages.length - 1; index2 >= 0; index2 -= 1) {
-    const message2 = messages[index2];
-    if (message2 && isTimelineTerminalMessage(message2)) {
-      return message2;
-    }
-  }
-  return void 0;
-}
-var init_timeline_message_helpers = __esm({
-  "../../packages/thread-view/src/timeline-message-helpers.ts"() {
-    "use strict";
-    init_tool_call_parsing();
-  }
-});
-
 // ../../packages/thread-view/src/apply-turn-message-detail.ts
 function getProjectionMessageSummaryCount(message2) {
   if (message2.kind === "file-edit") {
@@ -69238,13 +69238,15 @@ function planTurn(turn, completedTurnDisplay, rowIdPrefix, quiet, replyDisplay)
     return (turn.messages ?? []).filter(isOwnerFacingMessage).map(messagePlan);
   }
   const working = turn.status === "pending" || turn.completedAt === null;
-  if (replyDisplay === "owner-turns" && working) {
-    return (turn.messages ?? []).filter(isOwnerTurnMessage).map(messagePlan);
+  if (replyDisplay === "owner-turns") {
+    return (turn.messages ?? []).filter(
+      (message2) => isOwnerTurnMessage(message2) || !working && message2.kind === "error" && message2.id === turn.terminalMessage?.id
+    ).map(messagePlan);
   }
   if (working || completedTurnDisplay === "flat") {
     return (turn.messages ?? []).filter((message2) => !(quiet && isAgentReply(message2))).map(messagePlan);
   }
-  const { summaryItems, terminalMessages, trailingMessages } = groupCompletedTurnMessages(turn, quiet, replyDisplay === "owner-turns");
+  const { summaryItems, terminalMessages, trailingMessages } = groupCompletedTurnMessages(turn, quiet);
   const plan = [];
   for (const item of summaryItems) {
     if (item.kind === "ungrouped-message") {
@@ -69339,6 +69341,8 @@ function planTimelineRows(projection, completedTurnDisplay, rowIdPrefix, replyDi
         quiet.has(entry.turn.turnId),
         replyDisplay
       );
+    if (replyDisplay === "owner-turns" && !isOwnerTurnMessage(entry.message))
+      return [];
     const turnId = getEventProjectionMessageScopeTurnId(entry.message);
     return turnId !== null && quiet.has(turnId) && (replyDisplay === "owner-turns" ? !isOwnerFacingMessage(entry.message) : isAgentReply(entry.message)) ? [] : [messagePlan(entry.message)];
   });
@@ -70628,7 +70632,9 @@ function buildThreadTimelineFromEvents(args) {
       args.acceptedClientRequestContext,
       args.events,
       args.options
-    ).filter((message2) => !isSuppressedSystemMessage(message2)).map(
+    ).filter(
+      (message2) => !isSuppressedSystemMessage(message2) && (args.options.replyDisplay !== "owner-turns" || isOwnerTurnMessage(message2))
+    ).map(
       (message2) => convertSteerMessage(message2, ROOT_TIMELINE_ROW_ID_PREFIX)
     )
   ];
@@ -70731,6 +70737,7 @@ var ROOT_TIMELINE_ROW_ID_PREFIX;
 var init_build_thread_timeline = __esm({
   "../../packages/thread-view/src/build-thread-timeline.ts"() {
     "use strict";
+    init_timeline_message_helpers();
     init_src();
     init_assert_never();
     init_format_helpers();