@ashx-j/lunr 0.2.7 → 0.2.9

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

@@ -6,12 +6,14 @@ import * as crypto from "node:crypto";
 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 { CombinedAutocompleteProvider, Container, 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";
@@ -26,6 +28,8 @@ 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";
@@ -350,7 +354,7 @@ export class InteractiveMode {
             resetPermissions(this.settingsManager.getDefaultPermissionMode());
             // lunr: clear process registry and rollback state
             processRegistry.clearRegistry();
-            // lunr: on fork (/rollback, /undo, tree navigation) the snapshots SURVIVE —
+            // lunr: on fork (/rollback, tree navigation) the snapshots SURVIVE —
             // the caller migrates them to the forked session id (migrateRollbackSession).
             // Any other replacement wipes only the session being torn down.
             if (reason !== "fork") {
@@ -366,11 +370,6 @@ export class InteractiveMode {
         this.version = VERSION;
         this.ui = new TUI(new ProcessTerminal(), this.settingsManager.getShowHardwareCursor());
         this.ui.setClearOnShrink(this.settingsManager.getClearOnShrink());
-        this.ui.onTextSelected = (text) => {
-            void copyToClipboard(text)
-                .then(() => this.showStatus("Copied."))
-                .catch((error) => this.showError(error instanceof Error ? error.message : String(error)));
-        };
         // lunr: register the permission-mode footer bridge (provider-side: InteractiveMode owns the state).
         registerPermissionModeBridge(() => getPermissionMode());
         registerPermissionModeControlBridge({
@@ -594,6 +593,8 @@ export class InteractiveMode {
         this.ui.start();
         this.isInitialized = true;
         time("ui.start");
+        void this.maybeNotifyCliUpdate();
+        this.startPlanUsagePolling();
         // lunr: register the permission approval dialog handler so manual mode can prompt.
         registerApprovalHandler(async (req) => {
             // lunr: auto-activated agent swarms get their own dialog; on approval the
@@ -670,6 +671,38 @@ export class InteractiveMode {
             await this.deferredBuiltinAttachPromise;
         }
     }
+    planUsageTimer;
+    startPlanUsagePolling() {
+        const bridge = getUsageServiceBridge();
+        if (!bridge)
+            return;
+        bridge.setOnUpdate(() => this.ui.requestRender());
+        const tick = () => {
+            const provider = this.session.model?.provider;
+            if (provider)
+                bridge.prefetch(provider);
+        };
+        tick();
+        this.planUsageTimer = setInterval(tick, 60_000);
+        this.planUsageTimer.unref?.();
+    }
+    /** Background npm version check. Never blocks first paint. Workspace installs skip. */
+    async maybeNotifyCliUpdate() {
+        try {
+            const result = await checkForUpdate({
+                currentVersion: VERSION,
+                agentDir: getAgentDir(),
+                offline: process.env.PI_OFFLINE === "1",
+            });
+            if (!result?.notice)
+                return;
+            this.showStatus(result.notice);
+            markUpdateNotified(getAgentDir(), result.latest);
+        }
+        catch {
+            // Version check is best-effort.
+        }
+    }
     /**
      * Update terminal title with session name and cwd.
      */
@@ -2122,7 +2155,7 @@ export class InteractiveMode {
         // Global debug handler on TUI (works regardless of focus)
         this.ui.onDebug = () => this.handleDebugCommand();
         this.defaultEditor.onAction("app.model.select", () => void this.showModelSelector());
-        this.defaultEditor.onAction("app.tools.expand", () => this.toggleToolOutputExpansion());
+        // lunr: tool/thinking expand is per-item click; ctrl+o is not bound (tree filter still uses ctrl+o).
         this.defaultEditor.onAction("app.thinking.toggle", () => this.toggleThinkingBlockVisibility());
         this.defaultEditor.onAction("app.editor.external", () => this.openExternalEditor());
         this.defaultEditor.onAction("app.message.copy", () => void this.handleCopyCommand());
@@ -2300,6 +2333,11 @@ export class InteractiveMode {
                 await this.handleUndoCommand();
                 return;
             }
+            if (text === "/edit") {
+                this.editor.setText("");
+                await this.handleEditCommand();
+                return;
+            }
             if (text === "/redo") {
                 this.editor.setText("");
                 await this.handleRedoCommand();
@@ -2475,7 +2513,7 @@ export class InteractiveMode {
             return;
         const opts = this.getSmoothStreamingOptions();
         const revealed = sliceMessageContent(target, this.streamingDisplayedLength, opts);
-        this.streamingComponent.updateContent(revealed);
+        this.streamingComponent.updateContent(revealed, { thinkingSource: target });
         this.syncRevealedStreamingTools(revealed, target);
         this.ui.requestRender();
     }
@@ -2635,7 +2673,7 @@ export class InteractiveMode {
                     this.streamingDisplayedLength = 0;
                     this.chatContainer.addChild(this.streamingComponent);
                     if (this.settingsManager.getSmoothStreaming()) {
-                        this.streamingComponent.updateContent(sliceMessageContent(this.streamingMessage, 0, this.getSmoothStreamingOptions()));
+                        this.streamingComponent.updateContent(sliceMessageContent(this.streamingMessage, 0, this.getSmoothStreamingOptions()), { thinkingSource: this.streamingMessage });
                     }
                     else {
                         this.streamingComponent.updateContent(this.streamingMessage);
@@ -2721,9 +2759,7 @@ export class InteractiveMode {
             case "tool_execution_start": {
                 // If smooth streaming still has leading text unrevealed, flush through
                 // this tool so the running card is not hidden behind the typewriter.
-                if (this.settingsManager.getSmoothStreaming() &&
-                    this.streamingTargetMessage &&
-                    this.streamingComponent) {
+                if (this.settingsManager.getSmoothStreaming() && this.streamingTargetMessage && this.streamingComponent) {
                     const opts = this.getSmoothStreamingOptions();
                     const needed = countGraphemesBeforeToolCall(this.streamingTargetMessage, event.toolCallId, opts);
                     if (this.streamingDisplayedLength < needed) {
@@ -3196,6 +3232,11 @@ export class InteractiveMode {
             return;
         this.isShuttingDown = true;
         this.stopSmoothStreaming();
+        if (this.planUsageTimer) {
+            clearInterval(this.planUsageTimer);
+            this.planUsageTimer = undefined;
+        }
+        getUsageServiceBridge()?.setOnUpdate(undefined);
         // Keep signal handlers registered until terminal cleanup has completed.
         // `signal-exit` checks the listener list during the same SIGTERM/SIGHUP
         // dispatch and re-sends the signal if only its own listeners remain.
@@ -3803,6 +3844,7 @@ export class InteractiveMode {
                 showTerminalProgress: this.settingsManager.getShowTerminalProgress(),
                 modelTiers: this.settingsManager.getModelTiers(),
                 memoryCharCap: this.settingsManager.getMemoryCharCap(),
+                behaviorPreset: reconcileBehaviorPreset(this.settingsManager),
                 searchCurator: getSearchCuratorSetting(),
                 // lunr: TUI customize settings
                 gutterRail: this.settingsManager.getGutterRail(),
@@ -3812,6 +3854,10 @@ export class InteractiveMode {
                 footerContext: this.settingsManager.getFooterContext(),
                 footerTokens: this.settingsManager.getFooterTokens(),
                 footerStatuses: this.settingsManager.getFooterStatuses(),
+                footerGit: this.settingsManager.getFooterGit(),
+                footerPlan: this.settingsManager.getFooterPlan(),
+                footerPlanBar: this.settingsManager.getFooterPlanBar(),
+                planUsageWindow: this.settingsManager.getPlanUsageWindow(),
                 defaultPermissionMode: this.settingsManager.getDefaultPermissionMode(),
                 rollbackEnabled: this.settingsManager.getRollbackEnabled(),
                 rollbackTurns: this.settingsManager.getRollbackTurns(),
@@ -3975,9 +4021,28 @@ export class InteractiveMode {
                 onModelTierModelChange: (tier, model) => {
                     this.settingsManager.setTierModel(tier, model);
                 },
+                onModelTierThinkingChange: (tier, level) => {
+                    this.settingsManager.setTierThinking(tier, level);
+                },
+                getTierThinkingLevels: (tier) => {
+                    const model = this.resolveModelReference(this.settingsManager.getTierModel(tier));
+                    if (model)
+                        return getSupportedThinkingLevels(model);
+                    return this.session.getAvailableThinkingLevels();
+                },
                 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}`);
+                    }
+                },
                 onSearchCuratorChange: (setting) => {
                     if (!setSearchCuratorSetting(setting)) {
                         this.showError("pi-web-access is not loaded; curator setting unavailable.");
@@ -4005,6 +4070,18 @@ export class InteractiveMode {
                 onFooterStatusesChange: (enabled) => {
                     this.settingsManager.setFooterStatuses(enabled);
                 },
+                onFooterGitChange: (enabled) => {
+                    this.settingsManager.setFooterGit(enabled);
+                },
+                onFooterPlanChange: (enabled) => {
+                    this.settingsManager.setFooterPlan(enabled);
+                },
+                onFooterPlanBarChange: (enabled) => {
+                    this.settingsManager.setFooterPlanBar(enabled);
+                },
+                onPlanUsageWindowChange: (window) => {
+                    this.settingsManager.setPlanUsageWindow(window);
+                },
                 onDefaultPermissionModeChange: (mode) => {
                     this.settingsManager.setDefaultPermissionMode(mode);
                 },
@@ -5478,16 +5555,15 @@ export class InteractiveMode {
         this.setExtensionStatus("research", "research ● active");
         await this.sendUserMessageAfterDeferredBuiltins(buildResearchPrompt(question, depth, breadth));
     }
-    // lunr: /undo persists the rewind by forking the session to just before the
-    // last user message (same fork mechanism /rollback uses, but WITHOUT touching files).
-    // The branched session file survives restart/`-c`, so undone turns stay gone.
-    // /redo stays ephemeral and cannot redo across a fork, so the redo stack is cleared.
-    async handleUndoCommand() {
+    // 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.
+    async rewindLastTurn(command) {
         if (this.session.isStreaming) {
-            this.showWarning("Wait for the current response to finish before running /undo.");
-            return;
+            this.showWarning(`Wait for the current response to finish before running /${command}.`);
+            return undefined;
         }
-        // Find the last user message on the current branch (root → leaf order)
+        const nothingLabel = command === "undo" ? "Nothing to undo" : "Nothing to edit";
         const branch = this.sessionManager.getBranch();
         let lastUserIndex = -1;
         for (let i = branch.length - 1; i >= 0; i--) {
@@ -5498,17 +5574,16 @@ export class InteractiveMode {
             }
         }
         if (lastUserIndex === -1) {
-            this.showStatus("Nothing to undo");
-            return;
+            this.showStatus(nothingLabel);
+            return undefined;
         }
         const lastUser = branch[lastUserIndex];
         const leafId = this.sessionManager.getLeafId();
         let targetId;
         if (lastUser.id === leafId) {
-            // User message with no response yet (e.g. aborted stream) — undo to its parent.
             if (!lastUser.parentId) {
-                this.showStatus("Nothing to undo");
-                return;
+                this.showStatus(nothingLabel);
+                return undefined;
             }
             targetId = lastUser.parentId;
         }
@@ -5516,31 +5591,37 @@ export class InteractiveMode {
             targetId = lastUser.id;
         }
         try {
-            // Fork to just before the target — writes a branched session file so the
-            // rewind survives restart. Unlike /rollback, this must NOT touch files.
-            // lunr: fork teardown skips the rollback wipe (reason === "fork"), so carry
-            // the surviving snapshots over to the forked session id.
-            const oldSid = this.sessionManager.getSessionId();
-            const forkResult = await this.runtimeHost.fork(targetId, { position: "before" });
-            if (forkResult.cancelled) {
-                this.showStatus("Undo cancelled");
-                return;
+            const result = await this.session.navigateTree(targetId, {});
+            if (result.cancelled) {
+                this.showStatus(command === "undo" ? "Undo cancelled" : "Edit cancelled");
+                return undefined;
+            }
+            if (leafId) {
+                this.redoStack.push(leafId);
             }
-            migrateRollbackSession(oldSid, this.sessionManager.getSessionId());
-            // /redo cannot redo across a fork — clear the ephemeral redo stack.
-            this.redoStack.length = 0;
             this.chatContainer.clear();
             this.renderInitialMessages();
-            if (forkResult.selectedText && !this.editor.getText().trim()) {
-                this.editor.setText(forkResult.selectedText);
-            }
-            this.showStatus("Undone — branched session created (persistent). /redo unavailable after a fork.");
             void this.flushCompactionQueue({ willRetry: false });
+            return { editorText: result.editorText };
         }
         catch (error) {
             this.showError(error instanceof Error ? error.message : String(error));
+            return undefined;
         }
     }
+    async handleUndoCommand() {
+        const result = await this.rewindLastTurn("undo");
+        if (!result)
+            return;
+        this.showStatus("Undone. /redo to restore.");
+    }
+    async handleEditCommand() {
+        const result = await this.rewindLastTurn("edit");
+        if (!result)
+            return;
+        this.editor.setText(result.editorText ?? "");
+        this.showStatus("Editing last message. /redo to restore.");
+    }
     async handleRedoCommand() {
         if (this.session.isStreaming) {
             this.showWarning("Wait for the current response to finish before running /redo.");
@@ -6417,7 +6498,7 @@ export class InteractiveMode {
         const cyclePermissionMode = this.getAppKeyDisplay("app.mode.cycle");
         const cycleModelForward = this.getAppKeyDisplay("app.model.cycleForward");
         const selectModel = this.getAppKeyDisplay("app.model.select");
-        const expandTools = this.getAppKeyDisplay("app.tools.expand");
+        const expandTools = "click";
         const toggleThinking = this.getAppKeyDisplay("app.thinking.toggle");
         const externalEditor = this.getAppKeyDisplay("app.editor.external");
         const cycleModelBackward = this.getAppKeyDisplay("app.model.cycleBackward");
@@ -6462,7 +6543,7 @@ export class InteractiveMode {
 | \`${cyclePermissionMode}\` | Cycle permission mode |
 ${cycleThinkingLevel ? `| \`${cycleThinkingLevel}\` | Cycle thinking level |\n` : ""}| \`${cycleModelForward}\` / \`${cycleModelBackward}\` | Cycle models |
 | \`${selectModel}\` | Open model selector |
-| \`${expandTools}\` | Toggle tool output expansion |
+| \`${expandTools}\` | Expand or collapse a thinking/tool card |
 | \`${toggleThinking}\` | Toggle thinking block visibility |
 | \`${externalEditor}\` | Edit message in external editor |
 | \`${copyMessage}\` | Copy last assistant message |