open-multi-agent-kit 0.90.7 → 0.90.9

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

@@ -24,6 +24,7 @@ import { DefaultPackageManager } from "../../core/package-manager.js";
 import { BUILT_IN_PROVIDER_DISPLAY_NAMES } from "../../core/provider-display-names.js";
 import { formatMissingSessionCwdPrompt, MissingSessionCwdError } from "../../core/session-cwd.js";
 import { SessionManager } from "../../core/session-manager.js";
+import { formatSessionTermination } from "../../core/session-termination.js";
 import { BUILTIN_SLASH_COMMANDS } from "../../core/slash-commands.js";
 import { isInstallTelemetryEnabled } from "../../core/telemetry.js";
 import { getChangelogPath, getNewEntries, parseChangelog } from "../../utils/changelog.js";
@@ -77,6 +78,33 @@ function disposeComponent(component) {
         component.dispose();
     }
 }
+function isRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isToolExecutionContent(value) {
+    if (!isRecord(value))
+        return false;
+    if (value.type === "text")
+        return typeof value.text === "string";
+    return value.type === "image" && typeof value.data === "string" && typeof value.mimeType === "string";
+}
+function isToolExecutionResult(value) {
+    return isRecord(value) && Array.isArray(value.content) && value.content.every(isToolExecutionContent);
+}
+function normalizeToolExecutionResult(result, isError) {
+    try {
+        if (isToolExecutionResult(result)) {
+            return { content: result.content, details: result.details, isError };
+        }
+    }
+    catch {
+        // Treat inaccessible or malformed extension payloads as invalid results.
+    }
+    return {
+        content: [{ type: "text", text: "Tool returned an invalid result." }],
+        isError: true,
+    };
+}
 class ExpandableText extends Text {
     getCollapsedText;
     getExpandedText;
@@ -196,6 +224,7 @@ export class InteractiveMode {
     // Status line tracking (for mutating immediately-sequential status updates)
     lastStatusSpacer = undefined;
     lastStatusText = undefined;
+    lastRenderedTermination;
     // Streaming message tracking
     streamingComponent = undefined;
     streamingMessage = undefined;
@@ -639,6 +668,9 @@ export class InteractiveMode {
      */
     async run() {
         await this.init();
+        if (this.session.lastTermination) {
+            this.showSessionTermination(this.session.lastTermination);
+        }
         // Start version check asynchronously
         checkForNewOmkVersion(this.version).then((newRelease) => {
             if (newRelease) {
@@ -672,34 +704,34 @@ export class InteractiveMode {
         void this.maybeWarnAboutAnthropicSubscriptionAuth();
         // Process initial messages
         if (initialMessage) {
+            const previousTermination = this.session.lastTermination;
             try {
                 await this.session.prompt(initialMessage, { images: initialImages });
             }
             catch (error) {
-                const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
-                this.showError(errorMessage);
+                this.showPromptError(error, previousTermination);
             }
         }
         if (initialMessages) {
             for (const message of initialMessages) {
+                const previousTermination = this.session.lastTermination;
                 try {
                     await this.session.prompt(message);
                 }
                 catch (error) {
-                    const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
-                    this.showError(errorMessage);
+                    this.showPromptError(error, previousTermination);
                 }
             }
         }
         // Main interactive loop
         while (true) {
             const userInput = await this.getUserInput();
+            const previousTermination = this.session.lastTermination;
             try {
                 await this.session.prompt(userInput);
             }
             catch (error) {
-                const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
-                this.showError(errorMessage);
+                this.showPromptError(error, previousTermination);
             }
         }
     }
@@ -2429,7 +2461,7 @@ export class InteractiveMode {
                 if (event.message.role === "user")
                     break;
                 if (this.streamingComponent && event.message.role === "assistant") {
-                    this.streamingMessage = event.message;
+                    this.streamingMessage = { ...event.message };
                     let errorMessage;
                     if (this.streamingMessage.stopReason === "aborted") {
                         const retryAttempt = this.session.retryAttempt;
@@ -2482,7 +2514,7 @@ export class InteractiveMode {
             case "tool_execution_update": {
                 const component = this.pendingTools.get(event.toolCallId);
                 if (component) {
-                    component.updateResult({ ...event.partialResult, isError: false }, true);
+                    component.updateResult(normalizeToolExecutionResult(event.partialResult, false), true);
                     this.ui.requestRender();
                 }
                 break;
@@ -2490,12 +2522,15 @@ export class InteractiveMode {
             case "tool_execution_end": {
                 const component = this.pendingTools.get(event.toolCallId);
                 if (component) {
-                    component.updateResult({ ...event.result, isError: event.isError });
+                    component.updateResult(normalizeToolExecutionResult(event.result, event.isError));
                     this.pendingTools.delete(event.toolCallId);
                     this.ui.requestRender();
                 }
                 break;
             }
+            case "session_termination":
+                this.showSessionTermination(event.termination);
+                break;
             case "agent_end":
                 if (this.settingsManager.getShowTerminalProgress()) {
                     this.ui.terminal.setProgress(false);
@@ -2627,6 +2662,20 @@ export class InteractiveMode {
             : message.content.filter((c) => c.type === "text");
         return textBlocks.map((c) => c.text).join("");
     }
+    showSessionTermination(termination) {
+        if (termination.kind === "completed" || this.lastRenderedTermination === termination)
+            return;
+        this.lastRenderedTermination = termination;
+        this.showError(formatSessionTermination(termination));
+    }
+    showPromptError(error, previousTermination) {
+        const termination = this.session.lastTermination;
+        if (termination && termination !== previousTermination) {
+            this.showSessionTermination(termination);
+            return;
+        }
+        this.showError(error instanceof Error ? error.message : "Unknown error occurred");
+    }
     /**
      * Show a status message in the chat.
      *
@@ -2933,6 +2982,7 @@ export class InteractiveMode {
         }
         for (const signal of signals) {
             const handler = () => {
+                this.session.recordProcessSignal(signal);
                 // SIGHUP no longer hard-exits: graceful shutdown emits session_shutdown
                 // first, then attempts terminal restore. A genuinely dead terminal
                 // surfaces as an EIO on the restore writes, which the stdout/stderr