@bastani/atomic 0.8.28-alpha.1 → 0.8.28-alpha.3

package/dist/core/agent-session.js

@@ -33,7 +33,9 @@ import { CURRENT_SESSION_VERSION, getLatestCompactionBoundaryEntry } from "./ses
 import { createSyntheticSourceInfo } from "./source-info.js";
 import { buildSystemPrompt } from "./system-prompt.js";
 import { createLocalBashOperations } from "./tools/bash.js";
+import { evaluateBashCommandPolicy, formatBashCommandPolicyRejection, } from "./tools/bash-policy.js";
 import { createAllToolDefinitions, defaultToolNames } from "./tools/index.js";
+import { redirectOversizedToolResult } from "./tools/oversized-tool-result.js";
 import { createToolDefinitionFromAgentTool } from "./tools/tool-definition-wrapper.js";
 function deepFreeze(value) {
     if (value && typeof value === "object") {
@@ -158,6 +160,7 @@ export class AgentSession {
         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();
@@ -185,6 +188,7 @@ export class AgentSession {
         this._scopedModels = config.scopedModels ?? [];
         this._resourceLoader = config.resourceLoader;
         this._customTools = config.customTools ?? [];
+        this._bashPolicy = config.bashPolicy;
         this._cwd = config.cwd;
         this._modelRegistry = config.modelRegistry;
         this._extensionRunnerRef = config.extensionRunnerRef;
@@ -262,26 +266,43 @@ export class AgentSession {
         };
         this.agent.afterToolCall = async ({ toolCall, args, result, isError }) => {
             const runner = this._extensionRunner;
-            if (!runner.hasHandlers("tool_result")) {
-                return undefined;
-            }
-            const hookResult = await runner.emitToolResult({
-                type: "tool_result",
+            const hookResult = runner.hasHandlers("tool_result")
+                ? await runner.emitToolResult({
+                    type: "tool_result",
+                    toolName: toolCall.name,
+                    toolCallId: toolCall.id,
+                    input: args,
+                    content: result.content,
+                    details: result.details,
+                    isError,
+                })
+                : undefined;
+            const extensionReplacement = hookResult
+                ? {
+                    content: hookResult.content,
+                    details: hookResult.details,
+                    isError: hookResult.isError ?? isError,
+                }
+                : undefined;
+            const finalResult = hookResult
+                ? {
+                    content: hookResult.content ?? result.content,
+                    // Preserve original details when an extension hook rewrites only content;
+                    // the redirect check only replaces model-visible content blocks.
+                    details: hookResult.details ?? result.details,
+                }
+                : result;
+            const finalIsError = hookResult?.isError ?? isError;
+            const redirectReplacement = await redirectOversizedToolResult({
                 toolName: toolCall.name,
                 toolCallId: toolCall.id,
-                input: args,
-                content: result.content,
-                details: result.details,
-                isError,
+                result: finalResult,
+                isError: finalIsError,
+                sessionId: this.sessionManager.getSessionId(),
+                sessionDir: this.sessionManager.getSessionDir() || undefined,
+                maxResultSizeChars: this.getToolDefinition(toolCall.name)?.maxResultSizeChars,
             });
-            if (!hookResult) {
-                return undefined;
-            }
-            return {
-                content: hookResult.content,
-                details: hookResult.details,
-                isError: hookResult.isError ?? isError,
-            };
+            return redirectReplacement ?? extensionReplacement;
         };
     }
     // =========================================================================
@@ -633,6 +654,7 @@ export class AgentSession {
             name: definition.name,
             description: definition.description,
             parameters: definition.parameters,
+            promptGuidelines: definition.promptGuidelines,
             sourceInfo,
         }));
     }
@@ -797,7 +819,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;
@@ -905,8 +927,20 @@ export class AgentSession {
             return;
         }
         preflightResult?.(true);
+        await this._runAgentPrompt(messages);
+    }
+    async _runAgentPrompt(messages) {
         await this.agent.prompt(messages);
         await this.waitForRetry();
+        await this._continueQueuedAgentMessages();
+    }
+    async _continueQueuedAgentMessages() {
+        await this._agentEventQueue;
+        while (this.agent.hasQueuedMessages()) {
+            await this.agent.continue();
+            await this.waitForRetry();
+            await this._agentEventQueue;
+        }
     }
     /**
      * Try to execute a built-in slash command. Returns true if command was found and executed.
@@ -1110,7 +1144,7 @@ export class AgentSession {
             this._queueAgentMessage(appMessage, options?.deliverAs === "followUp" ? "followUp" : "steer");
         }
         else if (options?.triggerTurn) {
-            await this.agent.prompt(appMessage);
+            await this._runAgentPrompt(appMessage);
         }
         else {
             this._appendCustomMessage(appMessage);
@@ -1938,6 +1972,9 @@ 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;
         }
@@ -1992,7 +2029,7 @@ export class AgentSession {
         return `extension:${name}`;
     }
     _applyExtensionBindings(runner) {
-        runner.setUIContext(this._extensionUIContext);
+        runner.setUIContext(this._extensionUIContext, this._extensionMode);
         runner.bindCommandContext(this._extensionCommandContextActions);
         this._extensionErrorUnsubscriber?.();
         this._extensionErrorUnsubscriber = this._extensionErrorListener
@@ -2080,6 +2117,7 @@ export class AgentSession {
         }, {
             getModel: () => this.model,
             isIdle: () => !this.isStreaming,
+            isProjectTrusted: () => this.settingsManager.isProjectTrusted(),
             getSignal: () => this.agent.signal,
             abort: () => this.abort(),
             hasPendingMessages: () => this.pendingMessageCount > 0,
@@ -2100,6 +2138,7 @@ export class AgentSession {
                 })();
             },
             getSystemPrompt: () => this.systemPrompt,
+            getSystemPromptOptions: () => this._baseSystemPromptOptions,
         }, {
             registerProvider: (name, config) => {
                 this._modelRegistry.registerProvider(name, config);
@@ -2207,7 +2246,12 @@ export class AgentSession {
             ]))
             : createAllToolDefinitions(this._cwd, {
                 read: { autoResizeImages },
-                bash: { commandPrefix: shellCommandPrefix, shellPath },
+                bash: {
+                    commandPrefix: shellCommandPrefix,
+                    shellPath,
+                    policy: this._bashPolicy,
+                    policyLabel: "session bash policy",
+                },
             });
         this._baseToolDefinitions = new Map(Object.entries(baseToolDefinitions).map(([name, tool]) => [name, tool]));
         const extensionsResult = this._resourceLoader.getExtensions();
@@ -2385,6 +2429,10 @@ export class AgentSession {
      * @param options.operations Custom BashOperations for remote execution
      */
     async executeBash(command, onChunk, options) {
+        const policyDecision = evaluateBashCommandPolicy(command, this._bashPolicy);
+        if (!policyDecision.allowed) {
+            throw new Error(formatBashCommandPolicyRejection(policyDecision, "session bash policy"));
+        }
         this._bashAbortController = new AbortController();
         // Apply command prefix if configured (e.g., "shopt -s expand_aliases" for alias support)
         const prefix = this.settingsManager.getShellCommandPrefix();
@@ -2558,6 +2606,7 @@ export class AgentSession {
                     customInstructions,
                     replaceInstructions,
                     reserveTokens: branchSummarySettings.reserveTokens,
+                    streamFn: this.agent.streamFn,
                 });
                 if (result.aborted) {
                     return { cancelled: true, aborted: true };