@moxt-ai/mobius 0.0.144 → 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.144",
+  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()) {
@@ -44773,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) {
@@ -44805,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,
@@ -44830,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) {
@@ -44865,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
   };
 }
@@ -45316,6 +45371,7 @@ async function executePrompt({
   timer,
   signal,
   recordLiveEvent,
+  recordSteeringPrompt,
   cancellationRequested
 }) {
   const events = new CoalescingAgentEventPublisher(timer, (event) => {
@@ -45396,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,
@@ -46015,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);