@code-yeongyu/senpi 2026.6.4 → 2026.6.10

package/dist/core/agent-session.js

@@ -55,7 +55,6 @@ export function parseSkillBlock(text) {
     };
 }
 class CompactionRejectedError extends Error {
-    rejectionCause;
     constructor(rejectionCause) {
         super(rejectionCause === "cancelled-by-extension" ? "Compaction cancelled" : "Compaction rejected");
         this.name = "CompactionRejectedError";
@@ -71,70 +70,57 @@ const THINKING_LEVELS_WITH_MAX = ["off", "minimal", "low", "medium", "high", "xh
 // AgentSession Class
 // ============================================================================
 export class AgentSession {
-    agent;
-    sessionManager;
-    settingsManager;
-    _scopedModels;
-    _favoriteModels;
-    // Event subscription state
-    _unsubscribeAgent;
-    _eventListeners = [];
-    _agentEventQueue = Promise.resolve();
-    /** Tracks pending steering messages for UI display. Removed when delivered. */
-    _steeringMessages = [];
-    /** Tracks pending follow-up messages for UI display. Removed when delivered. */
-    _followUpMessages = [];
-    /** Messages queued to be included with the next user prompt as context ("asides"). */
-    _pendingNextTurnMessages = [];
-    // Compaction state
-    _compactionAbortController = undefined;
-    _autoCompactionAbortController = undefined;
-    _sessionWorkBarrier = new SessionWorkBarrier();
-    _overflowRecoveryAttempted = false;
-    _messageRevision = 0;
-    // Branch summarization state
-    _branchSummaryAbortController = undefined;
-    // Retry state
-    _retryAbortController = undefined;
-    _retryAttempt = 0;
-    _retryPromise = undefined;
-    _retryResolve = undefined;
-    _userAbortPromise = undefined;
-    // Bash execution state
-    _bashAbortController = undefined;
-    _pendingBashMessages = [];
-    // Extension system
-    _extensionRunner;
-    _turnIndex = 0;
-    _resourceLoader;
-    _customTools;
-    _baseToolDefinitions = new Map();
-    _cwd;
-    _extensionRunnerRef;
-    _initialActiveToolNames;
-    _allowedToolNames;
-    _excludedToolNames;
-    _baseToolsOverride;
-    _sessionStartEvent;
-    _extensionUIContext;
-    _extensionMode = "print";
-    _extensionCommandContextActions;
-    _extensionAbortHandler;
-    _extensionShutdownHandler;
-    _extensionErrorListener;
-    _extensionErrorUnsubscriber;
-    // Model registry for API key resolution
-    _modelRegistry;
-    // Tool registry for extension getTools/setTools
-    _toolRegistry = new Map();
-    _toolDefinitions = new Map();
-    _toolPromptSnippets = new Map();
-    _toolPromptGuidelines = new Map();
-    // Base system prompt (without extension appends) - used to apply fresh appends each turn
-    _baseSystemPrompt = "";
-    _currentServiceTier = undefined;
-    _baseSystemPromptOptions;
     constructor(config) {
+        this._eventListeners = [];
+        this._agentEventQueue = Promise.resolve();
+        /** Tracks pending steering messages for UI display. Removed when delivered. */
+        this._steeringMessages = [];
+        /** Tracks pending follow-up messages for UI display. Removed when delivered. */
+        this._followUpMessages = [];
+        /** Messages queued to be included with the next user prompt as context ("asides"). */
+        this._pendingNextTurnMessages = [];
+        // Compaction state
+        this._compactionAbortController = undefined;
+        this._autoCompactionAbortController = undefined;
+        this._sessionWorkBarrier = new SessionWorkBarrier();
+        this._overflowRecoveryAttempted = false;
+        this._messageRevision = 0;
+        // Branch summarization state
+        this._branchSummaryAbortController = undefined;
+        // Retry state
+        this._retryAbortController = undefined;
+        this._retryAttempt = 0;
+        this._retryPromise = undefined;
+        this._retryResolve = undefined;
+        this._userAbortPromise = undefined;
+        // Bash execution state
+        this._bashAbortController = undefined;
+        this._pendingBashMessages = [];
+        this._turnIndex = 0;
+        this._baseToolDefinitions = new Map();
+        this._extensionMode = "print";
+        // Tool registry for extension getTools/setTools
+        this._toolRegistry = new Map();
+        this._toolDefinitions = new Map();
+        this._toolPromptSnippets = new Map();
+        this._toolPromptGuidelines = new Map();
+        // Base system prompt (without extension appends) - used to apply fresh appends each turn
+        this._baseSystemPrompt = "";
+        this._currentServiceTier = undefined;
+        // Track last assistant message for auto-compaction check
+        this._lastAssistantMessage = undefined;
+        /** Internal handler for agent events - shared by subscribe and reconnect */
+        this._handleAgentEvent = (event) => {
+            // Create retry promise synchronously before queueing async processing.
+            // Agent.emit() calls this handler synchronously, and prompt() calls waitForRetry()
+            // as soon as agent.prompt() resolves. If _retryPromise is created only inside
+            // _processAgentEvent, slow earlier queued events can delay agent_end processing
+            // and waitForRetry() can miss the in-flight retry.
+            this._createRetryPromiseForAgentEnd(event);
+            this._agentEventQueue = this._agentEventQueue.then(() => this._processAgentEvent(event), () => this._processAgentEvent(event));
+            // Keep queue alive if an event handler fails
+            this._agentEventQueue.catch(() => { });
+        };
         this.agent = config.agent;
         this.sessionManager = config.sessionManager;
         this.settingsManager = config.settingsManager;
@@ -294,20 +280,6 @@ export class AgentSession {
         this.abortBranchSummary();
         this._incrementMessageRevision();
     }
-    // Track last assistant message for auto-compaction check
-    _lastAssistantMessage = undefined;
-    /** Internal handler for agent events - shared by subscribe and reconnect */
-    _handleAgentEvent = (event) => {
-        // Create retry promise synchronously before queueing async processing.
-        // Agent.emit() calls this handler synchronously, and prompt() calls waitForRetry()
-        // as soon as agent.prompt() resolves. If _retryPromise is created only inside
-        // _processAgentEvent, slow earlier queued events can delay agent_end processing
-        // and waitForRetry() can miss the in-flight retry.
-        this._createRetryPromiseForAgentEnd(event);
-        this._agentEventQueue = this._agentEventQueue.then(() => this._processAgentEvent(event), () => this._processAgentEvent(event));
-        // Keep queue alive if an event handler fails
-        this._agentEventQueue.catch(() => { });
-    };
     _createRetryPromiseForAgentEnd(event) {
         if (event.type !== "agent_end" || this._retryPromise) {
             return;
@@ -1428,6 +1400,10 @@ export class AgentSession {
     // =========================================================================
     // Queue Mode Management
     // =========================================================================
+    syncQueueModesFromSettings() {
+        this.agent.steeringMode = this.settingsManager.getSteeringMode();
+        this.agent.followUpMode = this.settingsManager.getFollowUpMode();
+    }
     /**
      * Set steering message mode.
      * Saves to settings.
@@ -1610,7 +1586,7 @@ export class AgentSession {
             }
             const compactionEntryId = this.sessionManager.appendCompaction(compactionResult.summary, compactionResult.firstKeptEntryId, compactionResult.tokensBefore, compactionResult.details, fromExtension);
             const savedEntry = this.sessionManager.getEntry(compactionEntryId);
-            if (!savedEntry || savedEntry.type !== "compaction") {
+            if (savedEntry?.type !== "compaction") {
                 throw new Error("Compaction entry was not saved");
             }
             const sessionContext = this.sessionManager.buildSessionContext();
@@ -2092,6 +2068,7 @@ export class AgentSession {
             getModel: () => this.model,
             getServiceTier: () => this.serviceTier,
             isIdle: () => !this.isStreaming,
+            isProjectTrusted: () => this.settingsManager.isProjectTrusted(),
             getSignal: () => this.agent.signal,
             abort: () => {
                 if (this._extensionAbortHandler) {
@@ -2279,6 +2256,7 @@ export class AgentSession {
         const previousFlagValues = this._extensionRunner.getFlagValues();
         await emitSessionShutdownEvent(this._extensionRunner, { type: "session_shutdown", reason: "reload" });
         await this.settingsManager.reload();
+        this.syncQueueModesFromSettings();
         resetApiProviders();
         this._modelRegistry.refresh();
         this.setScopedModels(await resolveModelScope(getModelNarrowingPatterns({