@code-yeongyu/senpi 2026.6.10 → 2026.6.13

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

@@ -23,7 +23,7 @@ import { formatMissingSessionCwdPrompt, MissingSessionCwdError } from "../../cor
 import { SessionManager } from "../../core/session-manager.js";
 import { BUILTIN_SLASH_COMMANDS } from "../../core/slash-commands.js";
 import { isInstallTelemetryEnabled } from "../../core/telemetry.js";
-import { hasProjectConfigDir, hasProjectTrustInputs, ProjectTrustStore } from "../../core/trust-manager.js";
+import { hasTrustRequiringProjectResources, ProjectTrustStore } from "../../core/trust-manager.js";
 import { getChangelogPath, getNewEntries, normalizeChangelogLinks, parseChangelog } from "../../utils/changelog.js";
 import { copyToClipboard } from "../../utils/clipboard.js";
 import { extensionForImageMimeType, readClipboardImage } from "../../utils/clipboard-image.js";
@@ -32,6 +32,7 @@ import { getCwdRelativePath } from "../../utils/paths.js";
 import { getPiUserAgent } from "../../utils/pi-user-agent.js";
 import { killTrackedDetachedChildren } from "../../utils/shell.js";
 import { checkForNewPiVersion } from "../../utils/version-check.js";
+import { abortedErrorLabel } from "./aborted-error-label.js";
 import { ArminComponent } from "./components/armin.js";
 import { AssistantMessageComponent } from "./components/assistant-message.js";
 import { BashExecutionComponent } from "./components/bash-execution.js";
@@ -1299,7 +1300,7 @@ export class InteractiveMode {
         this.compactionQueuedMessages = [];
         this.streamingComponent = undefined;
         this.streamingMessage = undefined;
-        this.pendingTools.clear();
+        this.clearPendingTools();
         this.clearToolHookStatuses();
         this.renderInitialMessages();
     }
@@ -1481,6 +1482,12 @@ export class InteractiveMode {
         this.refreshWorkingLoaderMessage();
         this.applyTerminalTitle();
     }
+    clearPendingTools() {
+        for (const component of this.pendingTools.values()) {
+            component.stopAnimation();
+        }
+        this.pendingTools.clear();
+    }
     clearActiveToolExecutionStatus() {
         if (this.activeToolExecutions.size === 0 &&
             this.activeToolExecutionTerminalTitle === undefined &&
@@ -2415,7 +2422,7 @@ export class InteractiveMode {
         this.footer.invalidate();
         switch (event.type) {
             case "agent_start":
-                this.pendingTools.clear();
+                this.clearPendingTools();
                 this.clearActiveToolExecutionStatus();
                 this.clearToolHookStatuses();
                 if (this.settingsManager.getShowTerminalProgress()) {
@@ -2511,11 +2518,7 @@ export class InteractiveMode {
                     this.streamingMessage = event.message;
                     let errorMessage;
                     if (this.streamingMessage.stopReason === "aborted") {
-                        const retryAttempt = this.session.retryAttempt;
-                        errorMessage =
-                            retryAttempt > 0
-                                ? `Aborted after ${retryAttempt} retry attempt${retryAttempt > 1 ? "s" : ""}`
-                                : "Operation aborted";
+                        errorMessage = abortedErrorLabel(undefined, this.session.retryAttempt);
                         this.streamingMessage.errorMessage = errorMessage;
                     }
                     this.streamingComponent.updateContent(this.streamingMessage);
@@ -2529,7 +2532,7 @@ export class InteractiveMode {
                                 isError: true,
                             });
                         }
-                        this.pendingTools.clear();
+                        this.clearPendingTools();
                     }
                     else {
                         // Args are now complete - trigger diff computation for edit tools
@@ -2592,7 +2595,7 @@ export class InteractiveMode {
                     this.streamingComponent = undefined;
                     this.streamingMessage = undefined;
                 }
-                this.pendingTools.clear();
+                this.clearPendingTools();
                 await this.checkShutdownRequested();
                 this.ui.requestRender();
                 break;
@@ -2839,7 +2842,7 @@ export class InteractiveMode {
      * @param options.populateHistory Add user messages to editor history
      */
     renderSessionContext(sessionContext, options = {}) {
-        this.pendingTools.clear();
+        this.clearPendingTools();
         const renderedPendingTools = new Map();
         if (options.updateFooter) {
             this.footer.invalidate();
@@ -2861,11 +2864,7 @@ export class InteractiveMode {
                         if (message.stopReason === "aborted" || message.stopReason === "error") {
                             let errorMessage;
                             if (message.stopReason === "aborted") {
-                                const retryAttempt = this.session.retryAttempt;
-                                errorMessage =
-                                    retryAttempt > 0
-                                        ? `Aborted after ${retryAttempt} retry attempt${retryAttempt > 1 ? "s" : ""}`
-                                        : "Operation aborted";
+                                errorMessage = abortedErrorLabel(message.errorMessage, this.session.retryAttempt);
                             }
                             else {
                                 errorMessage = message.errorMessage || "Error";
@@ -2913,7 +2912,7 @@ export class InteractiveMode {
         }
     }
     renderProjectTrustWarningIfNeeded() {
-        if (this.settingsManager.isProjectTrusted() || !hasProjectTrustInputs(this.sessionManager.getCwd())) {
+        if (this.settingsManager.isProjectTrusted() || !hasTrustRequiringProjectResources(this.sessionManager.getCwd())) {
             return;
         }
         if (this.chatContainer.children.length > 0) {
@@ -3816,7 +3815,7 @@ export class InteractiveMode {
         if (this.autoTrustOnReloadCwd !== cwd) {
             return false;
         }
-        if (!this.settingsManager.isProjectTrusted() || !hasProjectConfigDir(cwd)) {
+        if (!this.settingsManager.isProjectTrusted() || !hasTrustRequiringProjectResources(cwd)) {
             return false;
         }
         const trustStore = new ProjectTrustStore(this.runtimeHost.services.agentDir);
@@ -5028,6 +5027,7 @@ export class InteractiveMode {
             this.ui.terminal.setProgress(false);
         }
         this.stopWorkingLoader();
+        this.clearPendingTools();
         this.clearActiveToolExecutionStatus();
         this.clearToolHookStatuses();
         this.clearExtensionTerminalInputListeners();