@bastani/atomic 0.8.9 → 0.8.10

package/dist/core/agent-session.js

@@ -18,6 +18,7 @@ import { clampThinkingLevel, cleanupSessionResources, getSupportedThinkingLevels
 import { theme } from "../modes/interactive/theme/theme.js";
 import { stripFrontmatter } from "../utils/frontmatter.js";
 import { sleep } from "../utils/sleep.js";
+import { ATOMIC_GUIDE_COMMAND_NAME, ATOMIC_GUIDE_HELP_CHOICES, atomicGuideModeForChoice, getAtomicGuideMessage, isAtomicGuideHelpChoice, normalizeAtomicGuideMode, } from "./atomic-guide-command.js";
 import { formatNoApiKeyFoundMessage, formatNoModelSelectedMessage } from "./auth-guidance.js";
 import { executeBashWithOperations } from "./bash-executor.js";
 import { calculateContextTokens, collectEntriesForBranchSummary, compact, estimateContextTokens, generateBranchSummary, prepareCompaction, shouldCompact, } from "./compaction/index.js";
@@ -663,6 +664,7 @@ export class AgentSession {
         this._baseSystemPromptOptions = {
             cwd: this._cwd,
             selectedModel: this.model,
+            selectedThinkingLevel: this.thinkingLevel,
             skills: loadedSkills,
             contextFiles: loadedContextFiles,
             customPrompt: loaderSystemPrompt,
@@ -694,12 +696,16 @@ export class AgentSession {
         const preflightResult = options?.preflightResult;
         let messages;
         try {
-            // Handle extension commands first (execute immediately, even during streaming)
-            // Extension commands manage their own LLM interaction via pi.sendMessage()
+            // Handle slash commands first (execute immediately, even during streaming).
+            // Builtin and extension commands manage their own LLM interaction via custom messages.
             if (expandPromptTemplates && text.startsWith("/")) {
-                const handled = await this._tryExecuteExtensionCommand(text);
-                if (handled) {
-                    // Extension command executed, no prompt to send
+                const handledBuiltin = await this._tryExecuteBuiltinSlashCommand(text);
+                if (handledBuiltin) {
+                    preflightResult?.(true);
+                    return;
+                }
+                const handledExtension = await this._tryExecuteExtensionCommand(text);
+                if (handledExtension) {
                     preflightResult?.(true);
                     return;
                 }
@@ -810,6 +816,36 @@ export class AgentSession {
         await this.agent.prompt(messages);
         await this.waitForRetry();
     }
+    /**
+     * Try to execute a built-in slash command. Returns true if command was found and executed.
+     */
+    async _tryExecuteBuiltinSlashCommand(text) {
+        const spaceIndex = text.indexOf(" ");
+        const commandName = spaceIndex === -1 ? text.slice(1) : text.slice(1, spaceIndex);
+        if (commandName !== ATOMIC_GUIDE_COMMAND_NAME)
+            return false;
+        const args = spaceIndex === -1 ? "" : text.slice(spaceIndex + 1);
+        const mode = normalizeAtomicGuideMode(args);
+        if (mode === "help" && this._extensionUIContext) {
+            const choice = await this._extensionUIContext.select("Atomic. Select where to start:", [
+                ...ATOMIC_GUIDE_HELP_CHOICES,
+            ]);
+            if (!choice || !isAtomicGuideHelpChoice(choice))
+                return true;
+            await this.sendCustomMessage({
+                customType: "atomic",
+                content: getAtomicGuideMessage(atomicGuideModeForChoice(choice), this._cwd),
+                display: true,
+            }, { triggerTurn: false });
+            return true;
+        }
+        await this.sendCustomMessage({
+            customType: "atomic",
+            content: getAtomicGuideMessage(mode, this._cwd),
+            display: true,
+        }, { triggerTurn: false });
+        return true;
+    }
     /**
      * Try to execute an extension command. Returns true if command was found and executed.
      */
@@ -1168,6 +1204,7 @@ export class AgentSession {
         this.agent.state.thinkingLevel = effectiveLevel;
         if (isChanging) {
             this.sessionManager.appendThinkingLevelChange(effectiveLevel);
+            this._refreshBaseSystemPromptFromActiveTools();
             if (this.supportsThinking() || effectiveLevel !== "off") {
                 this.settingsManager.setDefaultThinkingLevel(effectiveLevel);
             }