@code-yeongyu/senpi 2026.5.29 → 2026.6.3

package/dist/core/agent-session.js

@@ -113,10 +113,13 @@ export class AgentSession {
     _extensionRunnerRef;
     _initialActiveToolNames;
     _allowedToolNames;
+    _excludedToolNames;
     _baseToolsOverride;
     _sessionStartEvent;
     _extensionUIContext;
+    _extensionMode = "print";
     _extensionCommandContextActions;
+    _extensionAbortHandler;
     _extensionShutdownHandler;
     _extensionErrorListener;
     _extensionErrorUnsubscriber;
@@ -144,6 +147,7 @@ export class AgentSession {
         this._extensionRunnerRef = config.extensionRunnerRef;
         this._initialActiveToolNames = config.initialActiveToolNames;
         this._allowedToolNames = config.allowedToolNames ? new Set(config.allowedToolNames) : undefined;
+        this._excludedToolNames = config.excludedToolNames ? new Set(config.excludedToolNames) : undefined;
         this._baseToolsOverride = config.baseToolsOverride;
         this._sessionStartEvent = config.sessionStartEvent ?? { type: "session_start", reason: "startup" };
         const initialModel = this.agent.state.model;
@@ -591,10 +595,16 @@ export class AgentSession {
      * Call this when completely done with the session.
      */
     dispose() {
-        this.abortRetry();
-        this.abortCompaction();
-        this.abortBranchSummary();
-        this.abortBash();
+        try {
+            this.abortRetry();
+            this.abortCompaction();
+            this.abortBranchSummary();
+            this.abortBash();
+            this.agent.abort();
+        }
+        catch {
+            // Dispose must succeed even if an abort hook throws.
+        }
         this._extensionRunner.invalidate("This extension ctx is stale after session replacement or reload. Do not use a captured pi or command ctx after ctx.newSession(), ctx.fork(), ctx.switchSession(), or ctx.reload(). For newSession, fork, and switchSession, move post-replacement work into withSession and use the ctx passed to withSession. For reload, do not use the old ctx after await ctx.reload().");
         this._disconnectFromAgent();
         this._eventListeners = [];
@@ -638,13 +648,14 @@ export class AgentSession {
         return this.agent.state.tools.map((t) => t.name);
     }
     /**
-     * Get all configured tools with name, description, parameter schema, and source metadata.
+     * Get all configured tools with name, description, parameter schema, prompt guidelines, and source metadata.
      */
     getAllTools() {
         return Array.from(this._toolDefinitions.values()).map(({ definition, sourceInfo }) => ({
             name: definition.name,
             description: definition.description,
             parameters: definition.parameters,
+            promptGuidelines: definition.promptGuidelines,
             sourceInfo,
         }));
     }
@@ -795,9 +806,6 @@ export class AgentSession {
         };
         return buildDynamicSystemPrompt(this._baseSystemPromptOptions);
     }
-    // =========================================================================
-    // Prompting
-    // =========================================================================
     /**
      * Send a prompt to the agent.
      * - Handles extension commands (registered via pi.registerCommand) immediately, even during streaming
@@ -835,7 +843,7 @@ export class AgentSession {
             let currentText = text;
             let currentImages = options?.images;
             if (this._extensionRunner.hasHandlers("input")) {
-                const inputResult = await this._extensionRunner.emitInput(currentText, currentImages, options?.source ?? "interactive");
+                const inputResult = await this._extensionRunner.emitInput(currentText, currentImages, options?.source ?? "interactive", this.isStreaming ? options?.streamingBehavior : undefined);
                 if (inputResult.action === "handled") {
                     preflightResult?.(true);
                     return;
@@ -1891,7 +1899,7 @@ export class AgentSession {
                 return await this._continueAgentAfterCurrentRun();
             }
             else if (this.agent.hasQueuedMessages()) {
-                return true;
+                return await this._continueAgentAfterCurrentRun();
             }
             return false;
         }
@@ -1933,9 +1941,15 @@ export class AgentSession {
         if (bindings.uiContext !== undefined) {
             this._extensionUIContext = bindings.uiContext;
         }
+        if (bindings.mode !== undefined) {
+            this._extensionMode = bindings.mode;
+        }
         if (bindings.commandContextActions !== undefined) {
             this._extensionCommandContextActions = bindings.commandContextActions;
         }
+        if (bindings.abortHandler !== undefined) {
+            this._extensionAbortHandler = bindings.abortHandler;
+        }
         if (bindings.shutdownHandler !== undefined) {
             this._extensionShutdownHandler = bindings.shutdownHandler;
         }
@@ -1987,7 +2001,7 @@ export class AgentSession {
         return `extension:${name}`;
     }
     _applyExtensionBindings(runner) {
-        runner.setUIContext(this._extensionUIContext);
+        runner.setUIContext(this._extensionUIContext, this._extensionMode);
         runner.setToolHookLifecycleObserver((event) => {
             this._emit(event);
         });
@@ -2079,7 +2093,13 @@ export class AgentSession {
             getServiceTier: () => this.serviceTier,
             isIdle: () => !this.isStreaming,
             getSignal: () => this.agent.signal,
-            abort: () => this.abort(),
+            abort: () => {
+                if (this._extensionAbortHandler) {
+                    this._extensionAbortHandler();
+                    return;
+                }
+                void this.abort();
+            },
             hasPendingMessages: () => this.pendingMessageCount > 0,
             shutdown: () => {
                 this._extensionShutdownHandler?.();
@@ -2131,6 +2151,7 @@ export class AgentSession {
             getMessageRevision: () => this.getMessageRevision(),
             applyCompaction: (precomputed, options) => this.applyCompaction(precomputed, options),
             getSystemPrompt: () => this.systemPrompt,
+            getSystemPromptOptions: () => this._baseSystemPromptOptions,
         }, {
             registerProvider: (name, config) => {
                 this._modelRegistry.registerProvider(name, config);
@@ -2146,7 +2167,8 @@ export class AgentSession {
         const previousRegistryNames = new Set(this._toolRegistry.keys());
         const previousActiveToolNames = this.getActiveToolNames();
         const allowedToolNames = this._allowedToolNames;
-        const isAllowedTool = (name) => !allowedToolNames || allowedToolNames.has(name);
+        const excludedToolNames = this._excludedToolNames;
+        const isAllowedTool = (name) => (!allowedToolNames || allowedToolNames.has(name)) && !excludedToolNames?.has(name);
         const registeredTools = this._extensionRunner.getAllRegisteredTools();
         const allCustomTools = [
             ...registeredTools,
@@ -2641,6 +2663,7 @@ export class AgentSession {
                     customInstructions,
                     replaceInstructions,
                     reserveTokens: branchSummarySettings.reserveTokens,
+                    streamFn: this.agent.streamFn,
                 });
                 if (result.aborted) {
                     return { cancelled: true, aborted: true };