apex-code 0.0.1-alpha.6 → 0.0.1-alpha.8

package/dist/core/agent-session.js

@@ -34,6 +34,7 @@ import { emitSessionShutdownEvent } from "./extensions/runner.js";
 import { ModelRegistry } from "./model-registry.js";
 import { evaluateToolCall } from "./permissions/gate.js";
 import { createInteractiveResponder } from "./permissions/responder.js";
+import { resolveEffectiveModeWithOrigin } from "./permissions/startup.js";
 import { expandPromptTemplate } from "./prompt-templates.js";
 import { CURRENT_SESSION_VERSION, getLatestCompactionEntry, TODO_CUSTOM_ENTRY_TYPE, } from "./session-manager.js";
 import { slugifySkillCommandName } from "./skills.js";
@@ -130,6 +131,7 @@ export class AgentSession {
     _evidenceSink;
     _diagnosticsOperations;
     _lspOperations;
+    _webSearchOperations;
     _extensionUIContext;
     _extensionMode = "print";
     _extensionCommandContextActions;
@@ -167,6 +169,7 @@ export class AgentSession {
         this._evidenceSink = config.evidenceSink ?? new SessionEvidenceSink(this.sessionManager);
         this._diagnosticsOperations = config.diagnosticsOperations;
         this._lspOperations = config.lspOperations;
+        this._webSearchOperations = config.webSearchOperations;
         // Always subscribe to agent events for internal handling
         // (session persistence, extensions, auto-compaction, retry logic)
         this._unsubscribeAgent = this.agent.subscribe(this._handleAgentEvent);
@@ -1185,7 +1188,7 @@ export class AgentSession {
         if (options?.deliverAs === "nextTurn") {
             this._pendingNextTurnMessages.push(appMessage);
         }
-        else if (this.isStreaming) {
+        else if (this.isStreaming && options?.triggerTurn !== false) {
             if (options?.deliverAs === "followUp") {
                 this.agent.followUp(appMessage);
             }
@@ -1209,6 +1212,7 @@ export class AgentSession {
      *
      * @param content User message content (string or content array)
      * @param options.deliverAs Delivery mode when streaming: "steer" or "followUp"
+     * @param options.expandPromptTemplates Whether to dispatch extension commands and expand skill commands and prompt templates. Default: false.
      */
     async sendUserMessage(content, options) {
         // Normalize content to text string + optional images
@@ -1232,9 +1236,8 @@ export class AgentSession {
             if (images.length === 0)
                 images = undefined;
         }
-        // Use prompt() with expandPromptTemplates: false to skip command handling and template expansion
         await this.prompt(text, {
-            expandPromptTemplates: false,
+            expandPromptTemplates: options?.expandPromptTemplates ?? false,
             streamingBehavior: options?.deliverAs,
             images,
             source: "extension",
@@ -1296,6 +1299,33 @@ export class AgentSession {
             source,
         });
     }
+    /** True when this session runs behind a permission gate at all. */
+    get hasPermissionGate() {
+        return this._permissionGate !== undefined;
+    }
+    /**
+     * The mode in force right now, and which source won. `getMode` in the gate
+     * config re-reads the store on every decision, so a mode written here applies
+     * to the next tool call with no restart.
+     */
+    async getPermissionMode() {
+        if (!this._permissionGate)
+            return undefined;
+        const snapshot = await this._permissionGate.store.snapshot();
+        return resolveEffectiveModeWithOrigin(this._permissionGate.flagMode, snapshot.modesBySource);
+    }
+    /**
+     * Persist a permission mode to user scope (`~/.apex-code/agent/permissions.json`).
+     * Returns the resolution that is actually in force afterwards, which is *not*
+     * necessarily `mode`: `flag`, `local`, and `project` all outrank `user`, so the
+     * caller has to be able to tell the user their choice was recorded but shadowed.
+     */
+    async setPermissionMode(mode) {
+        if (!this._permissionGate)
+            return undefined;
+        await this._permissionGate.store.apply({ type: "setMode", destination: "user", mode });
+        return this.getPermissionMode();
+    }
     /**
      * Set model directly.
      * Validates that auth is configured, saves to session and settings.
@@ -2144,6 +2174,7 @@ export class AgentSession {
                 edit: { diagnosticsOperations: this._diagnosticsOperations },
                 write: { diagnosticsOperations: this._diagnosticsOperations },
                 ...(this._lspOperations ? { lsp: { operations: this._lspOperations } } : {}),
+                ...(this._webSearchOperations ? { web_search: { operations: this._webSearchOperations } } : {}),
             });
         baseToolDefinitions.tool_schema = createToolSchemaToolDefinition({
             getTool: (name) => {
@@ -2725,11 +2756,11 @@ export class AgentSession {
     /**
      * Export session to HTML.
      * @param outputPath Optional output path (defaults to session directory)
+     * @param options Optional export presentation settings
      * @returns Path to exported file
      */
-    async exportToHtml(outputPath) {
-        const configuredThemeName = this.settingsManager.getTheme();
-        const themeName = configuredThemeName && getThemeByName(configuredThemeName) ? configuredThemeName : undefined;
+    async exportToHtml(outputPath, options = {}) {
+        const themeName = [options.themeName, this.settingsManager.getTheme()].find((candidate) => candidate !== undefined && getThemeByName(candidate) !== undefined);
         // Create tool renderer if we have an extension runner (for custom tool HTML rendering)
         const toolRenderer = createToolHtmlRenderer({
             getToolDefinition: (name) => this.getToolDefinition(name),