@code-yeongyu/senpi 2026.7.30-2 → 2026.7.31-2

package/dist/modes/interactive/interactive-mode.js

@@ -3822,7 +3822,7 @@ export class InteractiveMode {
                 this.updateEditorBorderColor();
                 const thinkingStr = result.model.reasoning && result.thinkingLevel !== "off" ? ` (thinking: ${result.thinkingLevel})` : "";
                 const systemPromptStr = result.systemPromptChange?.systemPromptName
-                    ? `, system prompt: ${result.systemPromptChange.systemPromptName}`
+                    ? `, optimized system prompt applied: ${result.systemPromptChange.systemPromptName}`
                     : "";
                 this.showStatus(`Switched to ${result.model.name || result.model.id}${thinkingStr}${systemPromptStr}`);
                 this.showRiskyMainModelWarning(result.model);
@@ -3965,8 +3965,17 @@ export class InteractiveMode {
      * Clear all queued messages and return their contents.
      * Clears both session queue and compaction queue.
      */
-    clearAllQueues() {
-        const { steering, followUp } = this.session.clearQueue();
+    clearAllQueues(options = { abortWillFollow: false }) {
+        const clearedNative = this.session.clearQueue(options);
+        const { steering, followUp } = clearedNative;
+        const nativeMessages = clearedNative.ordered ?? [
+            ...steering.map((text, enqueueOrder) => ({ text, mode: "steer", enqueueOrder })),
+            ...followUp.map((text, index) => ({
+                text,
+                mode: "followUp",
+                enqueueOrder: steering.length + index,
+            })),
+        ];
         const compactionMessages = [...this.compactionInFlightMessages, ...this.compactionQueuedMessages];
         const compactionSteering = compactionMessages.filter((msg) => msg.mode === "steer").map((msg) => msg.text);
         const compactionFollowUp = compactionMessages.filter((msg) => msg.mode === "followUp").map((msg) => msg.text);
@@ -3975,10 +3984,20 @@ export class InteractiveMode {
         this.compactionInFlightMessages = [];
         this.compactionTransferAbortControllers.clear();
         this.compactionQueuedMessages = [];
-        return {
+        const fallbackOrder = nativeMessages.reduce((maximum, message) => Math.max(maximum, message.enqueueOrder), 0);
+        const ordered = [
+            ...nativeMessages,
+            ...compactionMessages.map((message, index) => ({
+                ...message,
+                enqueueOrder: message.enqueueOrder ?? fallbackOrder + index + 1,
+            })),
+        ].sort((a, b) => a.enqueueOrder - b.enqueueOrder);
+        const cleared = {
             steering: [...steering, ...compactionSteering],
             followUp: [...followUp, ...compactionFollowUp],
         };
+        Object.defineProperty(cleared, "ordered", { value: ordered, enumerable: false });
+        return cleared;
     }
     updatePendingMessagesDisplay() {
         this.pendingMessagesContainer.clear();
@@ -3999,8 +4018,8 @@ export class InteractiveMode {
         }
     }
     restoreQueuedMessagesToEditor(options) {
-        const { steering, followUp } = this.clearAllQueues();
-        const allQueued = [...steering, ...followUp];
+        const { steering, followUp, ordered } = this.clearAllQueues({ abortWillFollow: options?.abort === true });
+        const allQueued = ordered?.map((message) => message.text) ?? [...steering, ...followUp];
         if (allQueued.length === 0) {
             this.updatePendingMessagesDisplay();
             if (options?.abort) {
@@ -4028,8 +4047,8 @@ export class InteractiveMode {
      * - The helper never auto-prompts restored queue text; the user decides whether to send it.
      */
     async abortAndFireQueuedMessages() {
-        const { steering, followUp } = this.clearAllQueues();
-        const allQueued = [...steering, ...followUp];
+        const { steering, followUp, ordered } = this.clearAllQueues({ abortWillFollow: true });
+        const allQueued = ordered?.map((message) => message.text) ?? [...steering, ...followUp];
         this.updatePendingMessagesDisplay();
         await this.session.abort();
         if (allQueued.length === 0) {
@@ -4042,7 +4061,7 @@ export class InteractiveMode {
         return allQueued.length;
     }
     queueCompactionMessage(text, mode) {
-        this.compactionQueuedMessages.push({ text, mode });
+        this.compactionQueuedMessages.push({ text, mode, enqueueOrder: this.session.reserveQueuedInputOrder() });
         this.getSessionLogger().debug("compaction_queue_enqueue", { mode, count: this.compactionQueuedMessages.length });
         this.editor.addToHistory?.(text);
         this.editor.setText("");
@@ -4109,7 +4128,14 @@ export class InteractiveMode {
                         return;
                     this.showError(`Queued prompt failed after acceptance: ${error instanceof Error ? error.message : String(error)}`);
                 }),
-                deliverQueued: (message) => message.mode === "followUp" ? session.followUp(message.text) : session.steer(message.text),
+                deliverQueued: (message) => {
+                    if (message.enqueueOrder === undefined) {
+                        return message.mode === "followUp" ? session.followUp(message.text) : session.steer(message.text);
+                    }
+                    return message.mode === "followUp"
+                        ? session.followUp(message.text, undefined, { enqueueOrder: message.enqueueOrder })
+                        : session.steer(message.text, undefined, { enqueueOrder: message.enqueueOrder });
+                },
                 reportFailure: (error, undeliveredCount) => {
                     this.showError(`Failed to send queued message${undeliveredCount === 1 ? "" : "s"}: ${error instanceof Error ? error.message : String(error)}`);
                 },
@@ -4405,7 +4431,7 @@ export class InteractiveMode {
             this.updateEditorBorderColor();
             done?.();
             const systemPromptStr = systemPromptChange?.systemPromptName
-                ? ` (system prompt: ${systemPromptChange.systemPromptName})`
+                ? ` (optimized system prompt applied: ${systemPromptChange.systemPromptName})`
                 : "";
             this.showStatus(`Model: ${model.id}${systemPromptStr}`);
             this.showRiskyMainModelWarning(model);