@moxt-ai/mobius 0.0.143 → 0.0.145

package/dist/cli.js

@@ -3381,7 +3381,7 @@ var program = new Command();
 // package.json
 var package_default = {
   name: "@moxt-ai/mobius",
-  version: "0.0.143",
+  version: "0.0.145",
   description: "Mobius CLI for pairing and running local AI agent services.",
   type: "module",
   bin: {
@@ -29512,6 +29512,23 @@ var activeTurnActivitySchema = external_exports.strictObject({
   title: external_exports.string().max(500),
   toolKind: external_exports.string().max(64)
 }).readonly();
+var activeTurnUserMessageSchema = external_exports.strictObject({
+  id: identifierStringSchema,
+  images: external_exports.array(promptImageSchema).max(8).readonly().optional(),
+  role: external_exports.literal("user"),
+  text: external_exports.string().max(SESSION_HISTORY_CHARACTER_LIMIT)
+}).readonly();
+var activeTurnAssistantMessageSchema = external_exports.strictObject({
+  activities: external_exports.array(activeTurnActivitySchema).max(100).readonly().default([]),
+  content: external_exports.array(displayContentSchema).max(100).readonly().default([]),
+  id: identifierStringSchema,
+  role: external_exports.literal("assistant"),
+  text: external_exports.string().max(SESSION_HISTORY_CHARACTER_LIMIT)
+}).readonly();
+var activeTurnMessageSchema = external_exports.discriminatedUnion("role", [
+  activeTurnUserMessageSchema,
+  activeTurnAssistantMessageSchema
+]);
 var activeTurnSnapshotSchema = external_exports.strictObject({
   activities: external_exports.array(activeTurnActivitySchema).readonly(),
   commandId: identifierStringSchema,
@@ -29521,7 +29538,7 @@ var activeTurnSnapshotSchema = external_exports.strictObject({
   truncated: external_exports.boolean(),
   epoch: identifierStringSchema,
   interaction: external_exports.discriminatedUnion("kind", [sessionPermissionRequestedEventSchema, sessionElicitationRequestedEventSchema]).nullable(),
-  messages: external_exports.array(assistantHistoryMessageSchema).max(SESSION_HISTORY_MESSAGE_LIMIT).readonly(),
+  messages: external_exports.array(activeTurnMessageSchema).max(SESSION_HISTORY_MESSAGE_LIMIT).readonly(),
   sequence: external_exports.number().int().nonnegative(),
   state: external_exports.literal("running")
 }).readonly();
@@ -42099,7 +42116,7 @@ var ActiveDaemonTurn = class {
   #text = "";
   #activities = /* @__PURE__ */ new Map();
   #content = /* @__PURE__ */ new Map();
-  #timeline = [];
+  #timeline;
   #sequence = 0;
   #interaction = null;
   #epoch = decodeIdentifier(randomUUID2());
@@ -42108,6 +42125,9 @@ var ActiveDaemonTurn = class {
     this.command = command;
     this.#controller = new AbortController();
     this.#dispatch = { kind: "pending" };
+    this.#timeline = [
+      { id: decodeIdentifier(command.commandId), images: command.images, kind: "user", text: command.prompt }
+    ];
   }
   enqueue = () => {
     if (this.#dispatch.kind !== "pending") {
@@ -42151,7 +42171,10 @@ var ActiveDaemonTurn = class {
     }
     if (event.kind === AGENT_ACTIVITY_KIND) {
       if (!this.#activities.has(event.activityId)) {
-        this.#timeline = [...this.#timeline, { activityId: event.activityId, kind: "activity" }];
+        this.#timeline = [
+          ...this.#timeline,
+          { activityId: event.activityId, id: decodeIdentifier(randomUUID2()), kind: "activity" }
+        ];
       }
       this.#activities.set(event.activityId, {
         activityId: event.activityId,
@@ -42169,7 +42192,10 @@ var ActiveDaemonTurn = class {
     } else if (event.kind === AGENT_ACTIVITY_NARRATION_KIND) {
       const previous = this.#activities.get(event.activityId);
       if (previous === void 0) {
-        this.#timeline = [...this.#timeline, { activityId: event.activityId, kind: "activity" }];
+        this.#timeline = [
+          ...this.#timeline,
+          { activityId: event.activityId, id: decodeIdentifier(randomUUID2()), kind: "activity" }
+        ];
       }
       this.#activities.set(event.activityId, {
         activityId: event.activityId,
@@ -42187,15 +42213,16 @@ var ActiveDaemonTurn = class {
     } else if (event.kind === AGENT_CONTENT_KIND) {
       this.#content.set(event.contentId, event.content);
       const target = this.#timeline.findLastIndex(
-        (entry) => entry.kind === "message" && entry.messageId === event.messageId
+        (entry) => entry.kind === "message" && entry.sourceMessageId === event.messageId
       );
       if (target < 0) {
         this.#timeline = [
           ...this.#timeline,
           {
             content: /* @__PURE__ */ new Map([[event.contentId, event.content]]),
+            id: decodeIdentifier(randomUUID2()),
             kind: "message",
-            messageId: event.messageId,
+            sourceMessageId: event.messageId,
             text: ""
           }
         ];
@@ -42218,7 +42245,7 @@ var ActiveDaemonTurn = class {
     let remaining = text2;
     while (remaining.length > 0) {
       const latest = this.#timeline.at(-1);
-      if (latest?.kind === "message" && latest.messageId === messageId) {
+      if (latest?.kind === "message" && latest.sourceMessageId === messageId) {
         const available = SESSION_HISTORY_CHARACTER_LIMIT - latest.text.length;
         if (available > 0) {
           this.#timeline = [
@@ -42233,28 +42260,43 @@ var ActiveDaemonTurn = class {
         ...this.#timeline,
         {
           content: /* @__PURE__ */ new Map(),
+          id: decodeIdentifier(randomUUID2()),
           kind: "message",
-          messageId,
+          sourceMessageId: messageId,
           text: remaining.slice(0, SESSION_HISTORY_CHARACTER_LIMIT)
         }
       ];
       remaining = remaining.slice(SESSION_HISTORY_CHARACTER_LIMIT);
     }
   }
+  recordSteeringPrompt = (command) => {
+    if (this.#dispatch.kind !== "running" || command.sessionId !== this.command.sessionId || command.targetCommandId !== this.command.commandId) {
+      return null;
+    }
+    this.#timeline = [
+      ...this.#timeline,
+      { id: decodeIdentifier(command.commandId), images: command.images, kind: "user", text: command.prompt }
+    ];
+    return this.updated();
+  };
   timelineMessages() {
     return this.#timeline.flatMap((entry) => {
+      if (entry.kind === "user") {
+        return [{ id: entry.id, images: entry.images, role: "user", text: entry.text }];
+      }
       if (entry.kind === "message") {
         return [
           {
             activities: [],
             content: [...entry.content.values()],
+            id: entry.id,
             role: "assistant",
             text: entry.text
           }
         ];
       }
       const activity2 = this.#activities.get(entry.activityId);
-      return activity2 === void 0 ? [] : [{ activities: [activity2], content: [], role: "assistant", text: "" }];
+      return activity2 === void 0 ? [] : [{ activities: [activity2], content: [], id: entry.id, role: "assistant", text: "" }];
     });
   }
   updated = () => {
@@ -42364,6 +42406,10 @@ var DaemonTurnRegistry = class {
     }
     return event;
   };
+  recordSteeringPrompt = (command) => {
+    const target = this.#turns.get(command.targetCommandId);
+    return target?.recordSteeringPrompt(command) ?? null;
+  };
   executionSnapshot = async (matches) => {
     const matching = [];
     for (const turn of this.#turns.values()) {
@@ -42470,15 +42516,21 @@ var turnsSchema = external_exports.object({
 });
 var itemTypeSchema = external_exports.object({ type: external_exports.string().min(1).max(80) });
 var userMessageSchema = external_exports.object({
-  content: external_exports.array(external_exports.unknown()).max(1e4)
+  content: external_exports.array(external_exports.unknown()).max(1e4),
+  type: external_exports.literal("userMessage")
 });
 var textSchema = external_exports.object({ text: external_exports.string() });
 var imageSchema = external_exports.object({ url: external_exports.string() });
-var agentMessageSchema = textSchema.extend({ phase: external_exports.string().nullish() });
+var agentMessageSchema = textSchema.extend({
+  id: external_exports.string().optional(),
+  phase: external_exports.string().nullish(),
+  type: external_exports.literal("agentMessage")
+});
 var reasoningSchema = external_exports.object({
   id: external_exports.string(),
   summary: external_exports.array(external_exports.string()).max(1e4),
-  content: external_exports.array(external_exports.string()).max(1e4)
+  content: external_exports.array(external_exports.string()).max(1e4),
+  type: external_exports.literal("reasoning")
 });
 var commandExecutionSchema = external_exports.object({
   id: external_exports.string(),
@@ -42487,8 +42539,45 @@ var commandExecutionSchema = external_exports.object({
   status: external_exports.string(),
   commandActions: external_exports.array(external_exports.object({ type: external_exports.string() }).passthrough()).max(100),
   aggregatedOutput: external_exports.string().nullish(),
-  exitCode: external_exports.number().int().nullish()
+  exitCode: external_exports.number().int().nullish(),
+  type: external_exports.literal("commandExecution")
+});
+var fileChangeSchema = external_exports.object({
+  changes: external_exports.array(external_exports.object({ diff: external_exports.string(), path: external_exports.string() })).max(1e4),
+  id: external_exports.string(),
+  status: external_exports.string(),
+  type: external_exports.literal("fileChange")
+});
+var mcpToolCallSchema = external_exports.object({
+  arguments: external_exports.unknown().optional(),
+  error: external_exports.unknown().nullish(),
+  id: external_exports.string(),
+  result: external_exports.unknown().nullish(),
+  server: external_exports.string(),
+  status: external_exports.string(),
+  tool: external_exports.string(),
+  type: external_exports.literal("mcpToolCall")
 });
+var dynamicToolCallSchema = external_exports.object({
+  arguments: external_exports.unknown().optional(),
+  contentItems: external_exports.array(external_exports.unknown()).max(1e4).nullish(),
+  id: external_exports.string(),
+  namespace: external_exports.string().nullish(),
+  status: external_exports.string(),
+  tool: external_exports.string(),
+  type: external_exports.literal("dynamicToolCall")
+});
+var planSchema = external_exports.object({ id: external_exports.string(), text: external_exports.string(), type: external_exports.literal("plan") });
+var historyItemSchema = external_exports.discriminatedUnion("type", [
+  userMessageSchema,
+  agentMessageSchema,
+  reasoningSchema,
+  commandExecutionSchema,
+  fileChangeSchema,
+  mcpToolCallSchema,
+  dynamicToolCallSchema,
+  planSchema
+]);
 function bounded(value, maximum) {
   return value.slice(0, maximum);
 }
@@ -42519,6 +42608,33 @@ function errorMessage(value) {
   }
   return JSON.stringify(value) ?? "Codex stopped before completing this turn.";
 }
+function formatted(value) {
+  if (value === void 0) {
+    return "";
+  }
+  if (typeof value === "string") {
+    return value;
+  }
+  return JSON.stringify(value) ?? "";
+}
+function toolStatus(status) {
+  return status === "inProgress" ? "running" : status === "completed" ? "completed" : "failed";
+}
+function diffDisplayContent(path3, newText) {
+  return {
+    artifactId: "",
+    data: "",
+    mimeType: "",
+    name: "",
+    newText,
+    oldText: "",
+    path: path3,
+    terminalId: "",
+    text: "",
+    type: "diff",
+    uri: ""
+  };
+}
 function messageSize(message) {
   return message.text.length + (message.role === "assistant" ? JSON.stringify(message.activities).length + JSON.stringify(message.content).length : 0);
 }
@@ -42556,8 +42672,8 @@ function fitActivities(activities, maximumCharacters) {
   const maximumActivityCharacters = Math.floor(Math.max(0, maximumCharacters - arrayCharacters) / activities.length);
   return activities.map((activity2) => fitActivity(activity2, maximumActivityCharacters));
 }
-function fitHistoryMessage(message) {
-  const text2 = message.text.slice(-SESSION_HISTORY_MESSAGE_CHARACTER_LIMIT);
+function fitHistoryMessage(message, maximumCharacters = SESSION_HISTORY_MESSAGE_CHARACTER_LIMIT) {
+  const text2 = message.text.slice(-maximumCharacters);
   if (message.role === "user") {
     return {
       message: { ...message, text: text2 },
@@ -42567,12 +42683,12 @@ function fitHistoryMessage(message) {
   let activities = message.activities;
   const content = message.content;
   let fitted = { ...message, activities, content, text: text2 };
-  if (messageSize(fitted) > SESSION_HISTORY_MESSAGE_CHARACTER_LIMIT && activities.length > 0) {
-    const maximumCharacters = SESSION_HISTORY_MESSAGE_CHARACTER_LIMIT - text2.length - JSON.stringify(content).length;
-    activities = fitActivities(activities, maximumCharacters);
+  if (messageSize(fitted) > maximumCharacters && activities.length > 0) {
+    const maximumActivityCharacters = maximumCharacters - text2.length - JSON.stringify(content).length;
+    activities = fitActivities(activities, maximumActivityCharacters);
     fitted = { ...fitted, activities };
   }
-  const excess = Math.max(0, messageSize(fitted) - SESSION_HISTORY_MESSAGE_CHARACTER_LIMIT);
+  const excess = Math.max(0, messageSize(fitted) - maximumCharacters);
   if (excess > 0) {
     const maximumTextLength = Math.max(0, fitted.text.length - excess);
     fitted = {
@@ -42610,128 +42726,209 @@ function decodeHistory(thread, value, options) {
   let truncated = page.nextCursor != null;
   for (const turn of page.data.toReversed()) {
     const outcome = turnOutcome(turn.status);
-    const activities = [];
-    let assignedActivityCount = 0;
+    const turnMessageCharacterLimit = Math.max(
+      1,
+      Math.floor(SESSION_HISTORY_CHARACTER_LIMIT / Math.max(1, turn.items.length + (turn.error == null ? 0 : 1)))
+    );
     let sequence = 0;
     let assistantMessageIndex = null;
-    const activitySlice = () => {
-      const assigned = activities.slice(assignedActivityCount).slice(-100);
-      assignedActivityCount = activities.length;
-      return assigned;
+    const append = (message) => {
+      const fitted = fitHistoryMessage(message, turnMessageCharacterLimit);
+      if (fitted.message.text.length === 0 && (fitted.message.images?.length ?? 0) === 0 && (fitted.message.role === "user" || fitted.message.activities.length === 0 && fitted.message.content.length === 0)) {
+        return;
+      }
+      truncated ||= fitted.truncated;
+      messages.push(fitted.message);
+      if (fitted.message.role === "assistant") {
+        assistantMessageIndex = messages.length - 1;
+      }
+      characters += messageSize(fitted.message);
     };
     for (const item of turn.items) {
-      const { type } = itemTypeSchema.parse(item);
-      let message;
-      if (type === "userMessage") {
-        const { content } = userMessageSchema.parse(item);
-        const text2 = content.map((block) => {
-          const { type: type2 } = itemTypeSchema.parse(block);
-          if (type2 === "text") {
+      const decoded = historyItemSchema.safeParse(item);
+      if (!decoded.success) {
+        continue;
+      }
+      const historyItem = decoded.data;
+      if (historyItem.type === "userMessage") {
+        const text2 = historyItem.content.map((block) => {
+          const { type } = itemTypeSchema.parse(block);
+          if (type === "text") {
             return textSchema.parse(block).text;
           }
-          if (type2 === "image") {
+          if (type === "image") {
             return `[@image](${imageSchema.parse(block).url})`;
           }
           return "[Attachment]";
         }).join("");
-        message = {
+        append({
           role: "user",
           text: text2
-        };
-      } else if (type === "agentMessage") {
-        const agent = agentMessageSchema.parse(item);
-        if (agent.phase === "commentary") {
-          if (options.detail === "rich" && agent.text.length > 0) {
-            activities.push(
-              activity(`progress-${sequence.toString()}`, "progress", sequence, {
+        });
+      } else if (historyItem.type === "agentMessage") {
+        if (historyItem.phase === "commentary") {
+          if (options.detail === "rich" && historyItem.text.length > 0) {
+            append({
+              activities: [
+                activity(historyItem.id ?? `progress-${sequence.toString()}`, "progress", sequence, {
+                  input: "",
+                  locations: [],
+                  name: "",
+                  output: historyItem.text,
+                  status: "completed",
+                  title: "Progress",
+                  toolKind: ""
+                })
+              ],
+              content: [],
+              role: "assistant",
+              text: ""
+            });
+            sequence += 1;
+          }
+          continue;
+        }
+        append({ activities: [], content: [], role: "assistant", text: historyItem.text });
+      } else if (historyItem.type === "reasoning" && options.detail === "rich") {
+        const output2 = (historyItem.summary.length > 0 ? historyItem.summary : historyItem.content).join(
+          "\n\n"
+        );
+        if (output2.length > 0) {
+          append({
+            activities: [
+              activity(historyItem.id, "reasoning", sequence, {
                 input: "",
                 locations: [],
                 name: "",
-                output: agent.text,
+                output: output2,
                 status: "completed",
-                title: "Progress",
+                title: "Reasoning",
                 toolKind: ""
               })
-            );
-            sequence += 1;
-          }
-          continue;
+            ],
+            content: [],
+            role: "assistant",
+            text: ""
+          });
+          sequence += 1;
         }
-        message = { activities: activitySlice(), content: [], role: "assistant", text: agent.text };
-      } else if (type === "reasoning" && options.detail === "rich") {
-        const reasoning = reasoningSchema.parse(item);
-        const output2 = (reasoning.summary.length > 0 ? reasoning.summary : reasoning.content).join("\n\n");
-        if (output2.length > 0) {
-          activities.push(
-            activity(reasoning.id, "reasoning", sequence, {
+      } else if (historyItem.type === "commandExecution" && options.detail === "rich") {
+        const action = historyItem.commandActions[0]?.type ?? "execute";
+        append({
+          activities: [
+            activity(historyItem.id, "tool", sequence, {
+              input: JSON.stringify({ command: historyItem.command, cwd: historyItem.cwd }),
+              locations: [historyItem.cwd],
+              name: "",
+              output: JSON.stringify({
+                formatted_output: historyItem.aggregatedOutput ?? "",
+                ...historyItem.exitCode == null ? {} : { exit_code: historyItem.exitCode }
+              }),
+              status: toolStatus(historyItem.status),
+              title: historyItem.command,
+              toolKind: action
+            })
+          ],
+          content: [],
+          role: "assistant",
+          text: ""
+        });
+        sequence += 1;
+      } else if (historyItem.type === "fileChange" && options.detail === "rich") {
+        const paths = historyItem.changes.map((change) => change.path);
+        const content = historyItem.changes.map(
+          (change) => diffDisplayContent(change.path, change.diff)
+        );
+        append({
+          activities: [
+            activity(historyItem.id, "tool", sequence, {
+              input: JSON.stringify({ changes: paths }),
+              locations: paths,
+              name: "",
+              output: "",
+              status: toolStatus(historyItem.status),
+              title: paths.join(", "),
+              toolKind: "edit"
+            })
+          ].map((entry) => ({ ...entry, content })),
+          content: [],
+          role: "assistant",
+          text: ""
+        });
+        sequence += 1;
+      } else if (historyItem.type === "mcpToolCall" && options.detail === "rich") {
+        append({
+          activities: [
+            activity(historyItem.id, "tool", sequence, {
+              input: formatted(historyItem.arguments),
+              locations: [],
+              name: historyItem.tool,
+              output: formatted(historyItem.error ?? historyItem.result),
+              status: toolStatus(historyItem.status),
+              title: `${historyItem.server}/${historyItem.tool}`,
+              toolKind: "other"
+            })
+          ],
+          content: [],
+          role: "assistant",
+          text: ""
+        });
+        sequence += 1;
+      } else if (historyItem.type === "dynamicToolCall" && options.detail === "rich") {
+        append({
+          activities: [
+            activity(historyItem.id, "tool", sequence, {
+              input: formatted(historyItem.arguments),
+              locations: [],
+              name: historyItem.tool,
+              output: formatted(historyItem.contentItems),
+              status: toolStatus(historyItem.status),
+              title: historyItem.namespace == null ? historyItem.tool : `${historyItem.namespace}/${historyItem.tool}`,
+              toolKind: "other"
+            })
+          ],
+          content: [],
+          role: "assistant",
+          text: ""
+        });
+        sequence += 1;
+      } else if (historyItem.type === "plan" && options.detail === "rich") {
+        append({
+          activities: [
+            activity(historyItem.id, "plan", sequence, {
               input: "",
               locations: [],
               name: "",
-              output: output2,
+              output: historyItem.text,
               status: "completed",
-              title: "Reasoning",
+              title: "Plan",
               toolKind: ""
             })
-          );
-          sequence += 1;
-        }
-        continue;
-      } else if (type === "commandExecution" && options.detail === "rich") {
-        const command = commandExecutionSchema.parse(item);
-        const action = command.commandActions[0]?.type ?? "execute";
-        activities.push(
-          activity(command.id, "tool", sequence, {
-            input: JSON.stringify({ command: command.command, cwd: command.cwd }),
-            locations: [command.cwd],
-            name: "",
-            output: JSON.stringify({
-              formatted_output: command.aggregatedOutput ?? "",
-              ...command.exitCode == null ? {} : { exit_code: command.exitCode }
-            }),
-            status: command.status === "completed" ? "completed" : "failed",
-            title: command.command,
-            toolKind: action
-          })
-        );
+          ],
+          content: [],
+          role: "assistant",
+          text: ""
+        });
         sequence += 1;
-        continue;
-      } else {
-        continue;
       }
-      const fitted = fitHistoryMessage(message);
-      if (fitted.message.text.length === 0 && (fitted.message.images?.length ?? 0) === 0) {
-        continue;
-      }
-      truncated ||= fitted.truncated;
-      messages.push(fitted.message);
-      if (message.role === "assistant") {
-        assistantMessageIndex = messages.length - 1;
-      }
-      characters += messageSize(fitted.message);
     }
     if (options.detail === "rich" && turn.error != null) {
-      activities.push(
-        activity(`agent-error-${sequence.toString()}`, "tool", sequence, {
-          input: "",
-          locations: [],
-          name: "",
-          output: errorMessage(turn.error),
-          status: "failed",
-          title: "Agent error",
-          toolKind: "other"
-        })
-      );
-    }
-    if (options.detail === "rich" && activities.length > assignedActivityCount) {
-      const message = {
-        activities: activitySlice(),
+      append({
+        activities: [
+          activity(`agent-error-${sequence.toString()}`, "tool", sequence, {
+            input: "",
+            locations: [],
+            name: "",
+            output: errorMessage(turn.error),
+            status: "failed",
+            title: "Agent error",
+            toolKind: "other"
+          })
+        ],
         content: [],
         role: "assistant",
         text: ""
-      };
-      messages.push(message);
-      assistantMessageIndex = messages.length - 1;
-      characters += messageSize(message);
+      });
     }
     if (assistantMessageIndex !== null) {
       const assistant = messages[assistantMessageIndex];
@@ -42741,20 +42938,20 @@ function decodeHistory(thread, value, options) {
           ...assistant,
           ...outcome === void 0 ? {} : { outcome }
         };
-        const fitted = fitHistoryMessage(updated);
+        const fitted = fitHistoryMessage(updated, turnMessageCharacterLimit);
         truncated ||= fitted.truncated;
         messages[assistantMessageIndex] = fitted.message;
         characters += messageSize(fitted.message);
       }
-    } else if (activities.length > 0 || outcome !== void 0) {
+    } else if (outcome !== void 0) {
       const message = {
-        activities: activities.slice(-100),
+        activities: [],
         content: [],
         role: "assistant",
         ...outcome === void 0 ? {} : { outcome },
         text: ""
       };
-      const fitted = fitHistoryMessage(message);
+      const fitted = fitHistoryMessage(message, turnMessageCharacterLimit);
       truncated ||= fitted.truncated;
       messages.push(fitted.message);
       characters += messageSize(fitted.message);
@@ -44622,6 +44819,14 @@ function boundedActiveMessages(messages, messageLimit, characterLimit) {
     truncated: selected.length !== messages.length
   };
 }
+function nativeActiveMessage(message) {
+  return message.role === "user" ? { role: "user", text: message.text } : {
+    activities: message.activities,
+    content: message.content,
+    role: "assistant",
+    text: message.text
+  };
+}
 function paginateAcpSessionHistory(history, sessionId, cursor, limit) {
   if (history.status === "unavailable") {
     if (cursor !== null) {
@@ -44654,20 +44859,27 @@ function paginateLiveSessionHistory(history, activeTurn, sessionId, cursor, limi
   }
   if (history.status === "unavailable") {
     const bounded3 = boundedActiveMessages(
-      activeTurn.messages,
-      Math.max(0, limit - 1),
-      Math.max(0, SESSION_HISTORY_CHARACTER_LIMIT - activeTurn.prompt.length)
+      activeTurn.messages.map(nativeActiveMessage),
+      limit,
+      SESSION_HISTORY_CHARACTER_LIMIT
     );
     return {
       coveredCommandIds: [],
       coveredMessageIds: [],
-      messages: [{ role: "user", text: activeTurn.prompt }, ...bounded3.messages],
+      messages: bounded3.messages,
       nextCursor: null,
       status: "available",
       truncated: activeTurn.truncated || bounded3.truncated
     };
   }
-  const activeUserIndex = history.coveredCommandIds.includes(activeTurn.commandId) ? history.messages.findLastIndex((message) => message.role === "user") : -1;
+  const activeRoot = activeTurn.messages.find(
+    (message) => message.role === "user" && message.id === activeTurn.commandId
+  );
+  const coveredActiveRoot = history.coveredCommandIds.includes(activeTurn.commandId);
+  const matchingActiveUserIndex = coveredActiveRoot ? history.messages.findLastIndex(
+    (message) => message.role === "user" && message.text === (activeRoot?.text ?? activeTurn.prompt)
+  ) : -1;
+  const activeUserIndex = matchingActiveUserIndex >= 0 ? matchingActiveUserIndex : liveHistoryCoveredTurnRanges(history).find((range) => range.commandId === activeTurn.commandId)?.userIndex ?? -1;
   if (activeUserIndex >= 0) {
     history = {
       ...history,
@@ -44679,19 +44891,13 @@ function paginateLiveSessionHistory(history, activeTurn, sessionId, cursor, limi
     };
   }
   const latestNativeMessage = history.messages.at(-1);
-  const includeActivePrompt = activeUserIndex < 0 && !(latestNativeMessage?.role === "user" && latestNativeMessage.text === activeTurn.prompt);
-  const bounded2 = boundedActiveMessages(
-    activeTurn.messages,
-    Math.max(0, limit - (includeActivePrompt ? 1 : 0)),
-    Math.max(0, SESSION_HISTORY_CHARACTER_LIMIT - (includeActivePrompt ? activeTurn.prompt.length : 0))
-  );
-  const activeMessages = [
-    ...includeActivePrompt ? [{ role: "user", text: activeTurn.prompt }] : [],
-    ...bounded2.messages
-  ];
+  const firstActiveMessage = activeTurn.messages[0];
+  const preserveNativeRoot = activeUserIndex >= 0 || firstActiveMessage?.role === "user" && latestNativeMessage?.role === "user" && latestNativeMessage.text === firstActiveMessage.text;
+  const activeMessages = activeTurn.messages.slice(preserveNativeRoot ? 1 : 0).map(nativeActiveMessage);
+  const bounded2 = boundedActiveMessages(activeMessages, limit, SESSION_HISTORY_CHARACTER_LIMIT);
   let historicalMessageCount = 0;
-  let remainingCharacters = SESSION_HISTORY_CHARACTER_LIMIT - bounded2.characters - (includeActivePrompt ? activeTurn.prompt.length : 0);
-  const historicalMessageLimit = Math.max(0, limit - activeMessages.length);
+  let remainingCharacters = SESSION_HISTORY_CHARACTER_LIMIT - bounded2.characters;
+  const historicalMessageLimit = Math.max(0, limit - bounded2.messages.length);
   for (let index = history.messages.length - 1; index >= 0 && historicalMessageCount < historicalMessageLimit; index -= 1) {
     const message = history.messages[index];
     if (message === void 0) {
@@ -44714,7 +44920,7 @@ function paginateLiveSessionHistory(history, activeTurn, sessionId, cursor, limi
   } : paginateAcpSessionHistory(history, sessionId, null, historicalMessageCount);
   return {
     ...page,
-    messages: [...page.messages, ...activeMessages],
+    messages: [...page.messages, ...bounded2.messages],
     truncated: page.truncated || activeTurn.truncated || bounded2.truncated
   };
 }
@@ -45165,6 +45371,7 @@ async function executePrompt({
   timer,
   signal,
   recordLiveEvent,
+  recordSteeringPrompt,
   cancellationRequested
 }) {
   const events = new CoalescingAgentEventPublisher(timer, (event) => {
@@ -45245,6 +45452,17 @@ async function executePrompt({
       sessionId: command.sessionId
     });
     operations.transitionExecution(command.commandId, "running");
+    if (availability.disposition === SessionPromptDisposition.Steer) {
+      const updated = recordSteeringPrompt();
+      if (updated === null) {
+        throw new AcpExecutionError(
+          "The steering target is unavailable",
+          {},
+          "prompt_queue_target_unavailable"
+        );
+      }
+      publisher.publish(command.sessionId, updated);
+    }
     const stream = activateAttempt();
     publisher.publish(command.sessionId, {
       commandId: command.commandId,
@@ -45864,6 +46082,7 @@ function createDaemonCommandHandler({
         timer,
         signal: turn.signal,
         recordLiveEvent: turn.recordEvent,
+        recordSteeringPrompt: () => activeTurns.recordSteeringPrompt(command),
         cancellationRequested: turn.cancellationRequested
       }).catch((error62) => {
         console.error("Mobius daemon turn failed", error62);