@ashx-j/lunr 0.2.11 → 0.2.13

package/dist/modes/interactive/interactive-mode.js

@@ -7,13 +7,12 @@ import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import { getSupportedThinkingLevels, } from "@ashx-j/lunr-ai/compat";
-import { collectImageMarkerIds, CombinedAutocompleteProvider, Container, formatImageMarker, fuzzyFilter, isFocusable, Markdown, matchesKey, ProcessTerminal, Spacer, setKeybindings, Text, TruncatedText, TUI, visibleWidth, } from "@ashx-j/lunr-tui";
+import { CombinedAutocompleteProvider, Container, collectImageMarkerIds, formatImageMarker, fuzzyFilter, isFocusable, Markdown, matchesKey, ProcessTerminal, Spacer, setKeybindings, Text, TruncatedText, TUI, visibleWidth, } from "@ashx-j/lunr-tui";
 import chalk from "chalk";
 import { spawn, spawnSync } from "child_process";
 import { APP_NAME, APP_TITLE, appendDebugLog, CONFIG_DIR_NAME, getAgentDir, getAuthPath, getDebugLogPath, getDocsPath, getShareViewerUrl, VERSION, } from "../../config.js";
 import { parseSkillBlock } from "../../core/agent-session.js";
 import { SessionImportFileNotFoundError } from "../../core/agent-session-runtime.js";
-import { applyBehaviorPreset, reconcileBehaviorPreset } from "../../core/behavior-preset.js";
 import { CACHE_TTL_MS, collectCacheMisses, computeCacheWaste, detectCacheMiss, } from "../../core/cache-stats.js";
 import { formatCatalogRefreshSummary } from "../../core/catalog-merge.js";
 import { computeContextBreakdown } from "../../core/context-breakdown.js";
@@ -28,8 +27,6 @@ import { isValidProviderBaseUrl, parseModelIds, slugifyProviderId, upsertCustomP
 import { defaultModelPerProvider, findExactModelReferenceMatch, resolveModelScope } from "../../core/model-resolver.js";
 import { refreshModelCandidatesForInit } from "../../core/model-runtime.js";
 import { getModelTiersBridge } from "../../core/model-tiers.js";
-import { checkForUpdate, markUpdateNotified } from "../../core/update-check.js";
-import { getUsageServiceBridge } from "../../core/usage-service.js";
 import { registerPermissionModeBridge } from "../../core/permission-mode.js";
 import { nextModeForGoal, registerPermissionModeControlBridge } from "../../core/permission-mode-control.js";
 import { AUTO_MODE_ADDENDUM, getPermissionMode, nextPermissionMode, registerApprovalHandler, resetPermissions, restorePermissionModeAfterPlan, setPermissionMode, } from "../../core/permissions.js";
@@ -44,7 +41,8 @@ import { BUILTIN_SLASH_COMMANDS } from "../../core/slash-commands.js";
 import { buildSwarmPrompt } from "../../core/swarm.js";
 import { time } from "../../core/timings.js";
 import { hasTrustRequiringProjectResources, ProjectTrustStore } from "../../core/trust-manager.js";
-import { getPlanUsageResult } from "../../core/usage-service.js";
+import { checkForUpdate, markUpdateNotified } from "../../core/update-check.js";
+import { getAllPlanUsageResults, getUsageServiceBridge } from "../../core/usage-service.js";
 import { modelToUserEntry } from "../../core/user-models.js";
 import { copyToClipboard, readClipboardText } from "../../utils/clipboard.js";
 import { extensionForImageMimeType, readClipboardImage } from "../../utils/clipboard-image.js";
@@ -91,6 +89,7 @@ import { renderUsageBox } from "./components/usage-view.js";
 import { UserMessageComponent } from "./components/user-message.js";
 import { UserMessageSelectorComponent } from "./components/user-message-selector.js";
 import { getModelSearchText } from "./model-search.js";
+import { wrapSkillTagAutocomplete } from "./skill-tag-autocomplete.js";
 import { computeSmoothRevealStep, countGraphemesBeforeToolCall, countMessageGraphemes, sliceMessageContent, } from "./smooth-streaming.js";
 import { getAvailableThemes, getAvailableThemesWithPaths, getEditorTheme, getMarkdownTheme, getThemeByName, getThemeName, onThemeChange, setRegisteredThemes, stopThemeWatcher, Theme, theme, } from "./theme/theme.js";
 import { InteractiveThemeController } from "./theme/theme-controller.js";
@@ -134,21 +133,6 @@ const INIT_EXISTING_FILE_INSTRUCTIONS = {
     overwrite: "An AGENTS.md already exists — replace it entirely with the new content.",
     append: "An AGENTS.md already exists — keep the existing content and only add missing sections; do not rewrite what is already there.",
 };
-function buildResearchPrompt(question, depth, breadth) {
-    return `[DEEP RESEARCH] Question: ${question}
-Procedure: 1) Write a 3-line research brief decomposing this into ${breadth}
-subtopics. 2) Launch ${breadth} deep-researcher subagents in ONE parallel call, one
-per subtopic. 3) Reflect: list what's unanswered or conflicting. If gaps remain and
-this is not round ${depth}, launch one more parallel round targeting the gaps.
-4) Launch ONE research-writer subagent (chain after the last round) with all
-findings; its output is the final report. 5) Save the report to
-research-<yyyymmdd>-<slug>.md in the cwd and reply with the file path + the
-5-line summary. Hard caps: ≤3 parallel rounds, ≤8 researchers per round, cite or
-delete every claim. Failure rule: if web_search errors because no search provider
-is configured, stop immediately and tell the user to configure a search provider
-key (Brave/Tavily/Exa/OpenAI etc. in ~/.lunr settings or env vars) instead of
-writing a half-researched report.`;
-}
 function isAnthropicSubscriptionAuthKey(apiKey) {
     return typeof apiKey === "string" && apiKey.startsWith("sk-ant-oat");
 }
@@ -284,8 +268,6 @@ export class InteractiveMode {
     isBashMode = false;
     // Track whether a /swarm orchestration turn is in flight (footer status)
     swarmMode = false;
-    // Track whether a /research deep-research turn is in flight (footer status)
-    researchMode = false;
     // lunr: mode in effect before the current plan stretch. Used by approve / `/plan off`
     // / `/plan <text>` to leave plan. Shift+Tab and `/mode` pick the destination themselves.
     previousPermissionMode;
@@ -530,11 +512,17 @@ export class InteractiveMode {
                 });
             }
         }
-        return new CombinedAutocompleteProvider([...slashCommands, ...templateCommands, ...extensionCommands, ...skillCommandList], this.sessionManager.getCwd(), this.fdPath);
+        return wrapSkillTagAutocomplete(new CombinedAutocompleteProvider([...slashCommands, ...templateCommands, ...extensionCommands, ...skillCommandList], this.sessionManager.getCwd(), this.fdPath), {
+            character: this.settingsManager.getSkillTagCharacter(),
+            skills: this.session.resourceLoader.getSkills().skills.map((skill) => ({
+                name: skill.name,
+                description: this.prefixAutocompleteDescription(skill.description, skill.sourceInfo),
+            })),
+        });
     }
     setupAutocompleteProvider() {
         let provider = this.createBaseAutocompleteProvider();
-        const triggerCharacters = [];
+        const triggerCharacters = [...(provider.triggerCharacters ?? [])];
         for (const wrapProvider of this.autocompleteProviderWrappers) {
             provider = wrapProvider(provider);
             triggerCharacters.push(...(provider.triggerCharacters ?? []));
@@ -2390,6 +2378,11 @@ export class InteractiveMode {
                 await this.handleUsageCommand();
                 return;
             }
+            if (text === "/fast" || text.startsWith("/fast ")) {
+                this.editor.setText("");
+                this.handleFastCommand(text === "/fast" ? "" : text.slice(6).trim());
+                return;
+            }
             if (text === "/context") {
                 this.editor.setText("");
                 this.handleContextCommand();
@@ -2500,12 +2493,6 @@ export class InteractiveMode {
                 await this.handleSwarmCommand(task);
                 return;
             }
-            if (text === "/research" || text.startsWith("/research ")) {
-                const args = text.startsWith("/research ") ? text.slice(10).trim() : "";
-                this.editor.setText("");
-                await this.handleResearchCommand(args);
-                return;
-            }
             if (text === "/debug") {
                 this.handleDebugCommand();
                 this.editor.setText("");
@@ -2906,10 +2893,6 @@ export class InteractiveMode {
                     this.swarmMode = false;
                     this.setExtensionStatus("swarm", undefined);
                 }
-                if (this.researchMode) {
-                    this.researchMode = false;
-                    this.setExtensionStatus("research", undefined);
-                }
                 this.maybeAutoNameSession();
                 // lunr: capture tree-scope changes at turn boundary (bash side-effects).
                 captureTreeChanges(this.sessionManager.getCwd(), this.sessionManager.getSessionId());
@@ -3915,6 +3898,7 @@ export class InteractiveMode {
                 autoResizeImages: this.settingsManager.getImageAutoResize(),
                 blockImages: this.settingsManager.getBlockImages(),
                 enableSkillCommands: this.settingsManager.getEnableSkillCommands(),
+                skillTagCharacter: this.settingsManager.getSkillTagCharacter(),
                 steeringMode: this.session.steeringMode,
                 followUpMode: this.session.followUpMode,
                 transport: this.settingsManager.getTransport(),
@@ -3941,8 +3925,8 @@ export class InteractiveMode {
                 clearOnShrink: this.settingsManager.getClearOnShrink(),
                 showTerminalProgress: this.settingsManager.getShowTerminalProgress(),
                 modelTiers: this.settingsManager.getModelTiers(),
+                memoryEnabled: this.settingsManager.getMemoryEnabled(),
                 memoryCharCap: this.settingsManager.getMemoryCharCap(),
-                behaviorPreset: reconcileBehaviorPreset(this.settingsManager),
                 searchCurator: getSearchCuratorSetting(),
                 // lunr: TUI customize settings
                 gutterRail: this.settingsManager.getGutterRail(),
@@ -3951,6 +3935,7 @@ export class InteractiveMode {
                 footerLsp: this.settingsManager.getFooterLsp(),
                 footerContext: this.settingsManager.getFooterContext(),
                 footerTokens: this.settingsManager.getFooterTokens(),
+                footerCacheHitRate: this.settingsManager.getFooterCacheHitRate(),
                 footerTps: this.settingsManager.getFooterTps(),
                 footerStatuses: this.settingsManager.getFooterStatuses(),
                 footerGit: this.settingsManager.getFooterGit(),
@@ -3996,6 +3981,10 @@ export class InteractiveMode {
                     this.settingsManager.setEnableSkillCommands(enabled);
                     this.setupAutocompleteProvider();
                 },
+                onSkillTagCharacterChange: (character) => {
+                    this.settingsManager.setSkillTagCharacter(character);
+                    this.setupAutocompleteProvider();
+                },
                 onSteeringModeChange: (mode) => {
                     this.session.setSteeringMode(mode);
                 },
@@ -4132,15 +4121,10 @@ export class InteractiveMode {
                 onMemoryCharCapChange: (cap) => {
                     this.settingsManager.setMemoryCharCap(cap);
                 },
-                onBehaviorPresetChange: (preset) => {
-                    const result = applyBehaviorPreset(this.settingsManager, preset, getAgentDir(), {
-                        overwrite: true,
-                    });
-                    if (result.ok) {
-                        this.showStatus(preset === "custom"
-                            ? "Behavior preset: custom (file is source of truth)"
-                            : `Behavior preset: ${preset}`);
-                    }
+                onMemoryEnabledChange: (enabled) => {
+                    this.settingsManager.setMemoryEnabled(enabled);
+                    this.session.refreshToolRegistry();
+                    this.showStatus(`Agent memory: ${enabled ? "on" : "off"}`);
                 },
                 onSearchCuratorChange: (setting) => {
                     if (!setSearchCuratorSetting(setting)) {
@@ -4166,6 +4150,9 @@ export class InteractiveMode {
                 onFooterTokensChange: (enabled) => {
                     this.settingsManager.setFooterTokens(enabled);
                 },
+                onFooterCacheHitRateChange: (enabled) => {
+                    this.settingsManager.setFooterCacheHitRate(enabled);
+                },
                 onFooterTpsChange: (enabled) => {
                     this.settingsManager.setFooterTps(enabled);
                 },
@@ -5609,54 +5596,6 @@ export class InteractiveMode {
         this.setExtensionStatus("swarm", "swarm");
         await this.sendUserMessageAfterDeferredBuiltins(buildSwarmPrompt(task));
     }
-    async handleResearchCommand(args) {
-        const usage = "Usage: /research [--depth N] [--breadth N] <question> — deep research with cited sources. depth: reflection rounds (1-4, default 2); breadth: subtopics per round (1-8, default 4).";
-        let depth = 2;
-        let breadth = 4;
-        const questionParts = [];
-        const tokens = args.split(/\s+/).filter((t) => t.length > 0);
-        for (let i = 0; i < tokens.length; i++) {
-            const token = tokens[i];
-            if (token === "--depth" || token === "--breadth") {
-                const value = tokens[i + 1];
-                if (value === undefined || !/^\d+$/.test(value)) {
-                    this.showStatus(usage);
-                    return;
-                }
-                if (token === "--depth") {
-                    depth = Math.min(4, Math.max(1, Number.parseInt(value, 10)));
-                }
-                else {
-                    breadth = Math.min(8, Math.max(1, Number.parseInt(value, 10)));
-                }
-                i++;
-            }
-            else if (token.startsWith("--")) {
-                this.showStatus(usage);
-                return;
-            }
-            else {
-                questionParts.push(token);
-            }
-        }
-        const question = questionParts.join(" ").trim();
-        if (question.length === 0) {
-            if (this.researchMode) {
-                this.showStatus("Deep research is active — findings stream in as subagents report.");
-            }
-            else {
-                this.showStatus(usage);
-            }
-            return;
-        }
-        if (this.session.isStreaming) {
-            this.showWarning("Wait for the current response to finish before running /research.");
-            return;
-        }
-        this.researchMode = true;
-        this.setExtensionStatus("research", "research ● active");
-        await this.sendUserMessageAfterDeferredBuiltins(buildResearchPrompt(question, depth, breadth));
-    }
     // lunr: /undo and /edit rewind the same session via navigateTree (no fork).
     // /undo leaves the editor alone; /edit pastes the undone user text. /redo
     // pops the previous leaf and navigates back.
@@ -6196,8 +6135,28 @@ export class InteractiveMode {
             tools,
             messages: this.session.messages,
             contextWindow,
+            globalAgentsPath: path.join(getAgentDir(), "AGENTS.md"),
         });
     }
+    handleFastCommand(arg) {
+        if (this.session.model?.provider !== "openai-codex") {
+            this.showStatus("Fast mode is for OpenAI Codex subscriptions.");
+            return;
+        }
+        const normalized = arg.toLowerCase();
+        if (normalized === "status") {
+            this.showStatus(`Fast mode is ${this.session.openaiFastMode ? "on" : "off"}.`);
+            return;
+        }
+        if (normalized !== "" && normalized !== "on" && normalized !== "off") {
+            this.showStatus("Usage: /fast [on|off|status]");
+            return;
+        }
+        const enabled = normalized === "on" || (normalized === "" && !this.session.openaiFastMode);
+        this.session.setOpenAIFastMode(enabled);
+        this.showStatus(`Fast mode ${enabled ? "enabled" : "disabled"}.`);
+        this.ui.requestRender();
+    }
     // lunr: /usage — current session only: token totals, live context split,
     // context-window bar, and subscription plan usage.
     async handleUsageCommand() {
@@ -6213,13 +6172,13 @@ export class InteractiveMode {
             : undefined;
         const context = this.session.getContextUsage();
         const provider = this.session.model?.provider;
-        const planResult = provider ? await getPlanUsageResult(provider, this.session.modelRuntime) : {};
+        const planResult = await getAllPlanUsageResults(provider, this.session.modelRuntime);
         const breakdown = this.collectUsageBreakdown();
-        const lines = renderUsageBox({ sessionTotals, context, plan: planResult.usage, breakdown }, this.ui.terminal.columns);
+        const lines = renderUsageBox({ sessionTotals, context, plan: planResult.usages, breakdown }, this.ui.terminal.columns);
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new Text(lines.join("\n"), 1, 0));
-        if (planResult.error)
-            this.showStatus(planResult.error);
+        if (planResult.errors.length > 0)
+            this.showStatus(planResult.errors.join("\n"));
         this.ui.requestRender();
     }
     // lunr: /context — estimated breakdown of what consumes the context window