@ashx-j/lunr 0.2.23 → 0.2.24

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

@@ -31,7 +31,7 @@ import { getModelTiersBridge } from "../../core/model-tiers.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";
-import { PLAN_MODE_ADDENDUM } from "../../core/plan-mode.js";
+import { READ_ONLY_MODE_ADDENDUM } from "../../core/plan-mode.js";
 import * as processRegistry from "../../core/process-registry.js";
 import { captureTreeChanges, clearRollback, disableRollbackForSession, enableRollbackForSession, initRollback, isRollbackEnabled, isRollbackSessionForceEnabled, migrateRollbackSession, peekRollbackTurnsConsumed, beginTurn as rollbackBeginTurn, rollbackLastTurn, setRollbackWarningHandler, } from "../../core/rollback.js";
 import { getSearchCuratorSetting, setSearchCuratorSetting } from "../../core/search-curator.js";
@@ -123,9 +123,9 @@ function isDeadTerminalError(error) {
     const code = error.code;
     return code !== undefined && DEAD_TERMINAL_ERROR_CODES.has(code);
 }
-const ANTHROPIC_SUBSCRIPTION_AUTH_WARNING = "Anthropic subscription auth is active. Third-party harness usage draws from extra usage and is billed per token, not your Claude plan limits. Manage extra usage at https://claude.ai/settings/usage.";
+const ANTHROPIC_SUBSCRIPTION_AUTH_WARNING = "Claude Code handles Anthropic subscription authentication. lunR retains tool execution and conversation state. Check your Claude account for usage and any extra charges.";
 // lunr: pre-connection ToS disclaimer for Anthropic subscription (OAuth) accounts.
-const ANTHROPIC_TOS_DISCLAIMER = "Connecting an Anthropic subscription (Claude Pro/Max) account to lunR may violate Anthropic's Terms of Service (https://www.anthropic.com/legal/consumer-terms). Third-party harness usage also draws from paid extra usage, not your plan limits. Continue?";
+const ANTHROPIC_TOS_DISCLAIMER = "Connecting an Anthropic subscription through Claude Code may be subject to Anthropic's Terms of Service (https://www.anthropic.com/legal/consumer-terms). Claude Code authenticates each lunR generation; lunR keeps its own tools and history. Continue?";
 const INIT_PROMPT = `Analyze this codebase and write a starter AGENTS.md in the project root.
 Scan: package manifests, directory layout, build/test/lint scripts, CI config,
 existing README/docs. Include only: project purpose (one paragraph), build &
@@ -279,8 +279,7 @@ export class InteractiveMode {
     signalCleanupHandlers = [];
     // Track if editor is in bash mode (text starts with !)
     isBashMode = 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.
+    // Restore the previous mode after approving a plan or leaving read-only via /plan.
     previousPermissionMode;
     // lunr: mode in effect before `/goal` forced session auto. Dedicated so it cannot
     // collide with plan restore.
@@ -611,23 +610,22 @@ export class InteractiveMode {
         time("ui.start");
         void this.maybeNotifyCliUpdate();
         this.startPlanUsagePolling();
-        // lunr: register the permission approval dialog handler so manual mode can prompt.
+        // Plans and large subagent launches use distinct approval dialogs.
         registerApprovalHandler(async (req) => {
             if (req.kind === "large-subagent-launch") {
                 return this.showLargeSubagentLaunchApprovalDialog(req);
             }
-            // lunr: plan approval (present_plan tool). Any approve leaves plan mode —
-            // restore runs BEFORE resolving so the model's next tool call already
-            // has full access. Decline keeps plan mode active.
+            // Approval restores writing access before the model's next tool call.
             if (req.kind === "plan") {
                 const resp = await this.showPlanApprovalDialog(req.detail);
                 const decision = typeof resp === "string" ? resp : resp.decision;
                 if (decision !== "reject") {
-                    this.applyPermissionMode(this.restoreTargetAfterPlan());
+                    const target = this.restoreTargetAfterPlan();
+                    this.applyPermissionMode(target === "read-only" ? "yolo" : target);
                 }
                 return resp;
             }
-            return this.showApprovalDialog(req);
+            return "reject";
         });
         // lunr: initialize rollback service for this session.
         initRollback(this.settingsManager, this.sessionManager.getSessionId());
@@ -2459,7 +2457,7 @@ export class InteractiveMode {
             if (text &&
                 !this.runtimeHost.isDetached &&
                 (!text.startsWith("/") ||
-                    /^\/(?:model|thinking|effort|reasoning|off|minimal|low|medium|high|xhigh|max|mode|plan|manual|yolo|auto|name|title|undo|edit|redo|tree|compact)(?:\s|$)/.test(text))) {
+                    /^\/(?:model|thinking|effort|reasoning|off|minimal|low|medium|high|xhigh|max|mode|plan|read|yolo|auto|name|title|undo|edit|redo|tree|compact)(?:\s|$)/.test(text))) {
                 recordTuiActivity(this.sessionManager, this.runtimeHost.services.agentDir);
             }
             if (!text) {
@@ -2585,9 +2583,9 @@ export class InteractiveMode {
                 this.handleModeCommand(text === "/mode" ? "" : text.slice(6).trim());
                 return;
             }
-            if (text === "/manual" || text === "/yolo" || text === "/auto") {
+            if (text === "/read" || text === "/yolo" || text === "/auto") {
                 this.editor.setText("");
-                this.applyPermissionMode(text.slice(1));
+                this.applyPermissionMode(text === "/read" ? "read-only" : text.slice(1));
                 return;
             }
             if (text === "/processes") {
@@ -4162,6 +4160,8 @@ export class InteractiveMode {
                 globalInstructionsPath: getGlobalInstructionsPath(getAgentDir()),
                 modelInstructionsPath: getModelInstructionsPath(getAgentDir(), this.session.model?.id ?? "no-model-selected"),
                 confirmLargeSubagentLaunches: this.settingsManager.getConfirmLargeSubagentLaunches(),
+                subagentCommunicationEnabled: this.settingsManager.getSubagentCommunicationEnabled(),
+                automaticSubagentDelegation: this.settingsManager.getAutomaticSubagentDelegation(),
                 browserEnabled: this.settingsManager.getBrowserEnabled(),
                 memoryEnabled: this.settingsManager.getMemoryEnabled(),
                 memoryCharCap: this.settingsManager.getMemoryCharCap(),
@@ -4371,6 +4371,13 @@ export class InteractiveMode {
                 onConfirmLargeSubagentLaunchesChange: (enabled) => {
                     this.settingsManager.setConfirmLargeSubagentLaunches(enabled);
                 },
+                onSubagentCommunicationChange: (enabled) => {
+                    this.settingsManager.setSubagentCommunicationEnabled(enabled);
+                },
+                onAutomaticSubagentDelegationChange: (enabled) => {
+                    this.settingsManager.setAutomaticSubagentDelegation(enabled);
+                    this.session.refreshToolRegistry();
+                },
                 getTierThinkingLevels: (tier) => {
                     const model = this.resolveModelReference(this.settingsManager.getTierModel(tier));
                     if (model)
@@ -5156,7 +5163,8 @@ export class InteractiveMode {
         // lunr: providers with a multi-key pool list one entry per subscription plus an
         // "all subscriptions" entry, encoding the target as "<providerId>#<subId|all>".
         const options = [];
-        for (const { providerId, type } of await this.session.modelRuntime.listCredentials()) {
+        for (const { providerId, type: credentialType } of await this.session.modelRuntime.listCredentials()) {
+            const type = credentialType === "external_claude_code" ? "oauth" : credentialType;
             const name = this.session.modelRuntime.getProvider(providerId)?.name ?? providerId;
             const status = { type, source: "stored credential" };
             if (type === "api_key") {
@@ -5770,6 +5778,32 @@ export class InteractiveMode {
             signal: dialog.signal,
             prompt: (prompt) => this.showAuthPrompt(dialog, prompt),
             notify: (event) => this.notifyAuthDialog(dialog, event),
+            handoff: async (command, args, env) => {
+                this.ui.stop();
+                try {
+                    await new Promise((resolve, reject) => {
+                        const child = spawn(command, [...args], { stdio: "inherit", env, windowsHide: false });
+                        const abort = () => child.kill();
+                        dialog.signal.addEventListener("abort", abort, { once: true });
+                        if (dialog.signal.aborted)
+                            abort();
+                        child.once("error", (error) => {
+                            dialog.signal.removeEventListener("abort", abort);
+                            reject(error);
+                        });
+                        child.once("close", (code) => {
+                            dialog.signal.removeEventListener("abort", abort);
+                            if (code === 0)
+                                resolve();
+                            else
+                                reject(new Error("Claude Code login did not complete"));
+                        });
+                    });
+                }
+                finally {
+                    this.ui.start();
+                }
+            },
         });
     }
     async showLoginDialog(providerId, providerName) {
@@ -6435,76 +6469,58 @@ export class InteractiveMode {
         this.chatContainer.addChild(new Text(lines.join("\n"), 1, 0));
         this.ui.requestRender();
     }
-    // lunr: /plan — shortcut onto the plan permission mode (not a second state machine).
+    // /plan is a shortcut into read-only mode for planning.
     async handlePlanCommand(args) {
         const sub = args.toLowerCase();
-        const inPlan = getPermissionMode() === "plan";
+        const inReadOnly = getPermissionMode() === "read-only";
         if (sub === "status") {
-            this.showStatus(inPlan
-                ? "Plan mode is active — edit/write and mutating bash are blocked. /plan off to implement."
-                : `Permission mode: ${getPermissionMode()}.`);
+            this.showStatus(inReadOnly ? "Read mode is active. /plan off to leave it." : `Permission mode: ${getPermissionMode()}.`);
             return;
         }
-        // lunr: `/plan <text>` — any arg other than on/off/status is task text.
-        // While not in plan: enter plan and send. While in plan: restore previous
-        // mode and send with full tool access ("looks good, go implement it").
         if (sub !== "" && sub !== "on" && sub !== "off") {
-            if (inPlan) {
-                this.applyPermissionMode(this.restoreTargetAfterPlan());
-            }
-            else {
-                this.applyPermissionMode("plan");
-            }
-            await this.sendUserMessageAfterDeferredBuiltins(args);
+            if (!inReadOnly)
+                this.applyPermissionMode("read-only");
+            await this.sendUserMessageAfterDeferredBuiltins(`Create a plan for: ${args}`);
             return;
         }
-        const next = sub === "" ? !inPlan : sub === "on";
-        if (next === inPlan) {
-            this.showStatus(next ? "Plan mode is already active." : "Plan mode is already off.");
+        const next = sub !== "off";
+        if (next === inReadOnly) {
+            this.showStatus(next ? "Read mode is already active." : "Read mode is already off.");
             return;
         }
-        if (next) {
-            this.applyPermissionMode("plan");
-        }
-        else {
-            this.applyPermissionMode(this.restoreTargetAfterPlan());
-        }
+        this.applyPermissionMode(next ? "read-only" : this.restoreTargetAfterPlan());
     }
-    // lunr: /mode — permission mode selector (manual / yolo / plan / auto). Per-session only.
     handleModeCommand(args) {
         const sub = args.toLowerCase();
         if (sub === "status") {
-            this.showStatus(`Permission mode: ${getPermissionMode()}`);
+            this.showStatus(`Permission mode: ${getPermissionMode() === "read-only" ? "read" : getPermissionMode()}`);
             return;
         }
-        if (sub === "manual" || sub === "yolo" || sub === "plan" || sub === "auto") {
-            this.applyPermissionMode(sub);
+        if (sub === "yolo" || sub === "auto" || sub === "read-only" || sub === "read") {
+            this.applyPermissionMode(sub === "read" ? "read-only" : sub);
             return;
         }
         if (sub !== "") {
-            this.showStatus("Usage: /mode [manual|yolo|plan|auto] — bare /mode opens the selector.");
+            this.showStatus("Usage: /mode [yolo|auto|read] — bare /mode opens the selector.");
             return;
         }
         const options = [
-            "Manual — approve every action",
             "YOLO — auto-approve tools, agent may still ask",
-            "Plan — read-only; present a plan for approval",
             "Auto — fully autonomous, no questions",
+            "Read — inspect without making changes",
         ];
         void this.showExtensionSelector("Permission mode", options).then((choice) => {
             if (!choice)
                 return;
-            if (choice.startsWith("Manual"))
-                this.applyPermissionMode("manual");
-            else if (choice.startsWith("YOLO"))
+            if (choice.startsWith("YOLO"))
                 this.applyPermissionMode("yolo");
-            else if (choice.startsWith("Plan"))
-                this.applyPermissionMode("plan");
             else if (choice.startsWith("Auto"))
                 this.applyPermissionMode("auto");
+            else if (choice.startsWith("Read"))
+                this.applyPermissionMode("read-only");
         });
     }
-    /** Destination when leaving plan via approve / `/plan off` / `/plan <text>`. */
+    /** Destination after plan approval or /plan off. */
     restoreTargetAfterPlan() {
         return restorePermissionModeAfterPlan(this.previousPermissionMode, this.settingsManager.getDefaultPermissionMode());
     }
@@ -6513,8 +6529,8 @@ export class InteractiveMode {
         if (this.runtimeHost.isDetached || this.transferInProgress)
             return;
         this.sessionManager.setPermissionMode(mode);
-        if (mode === "plan") {
-            this.session.setSystemPromptAppend(PLAN_MODE_ADDENDUM);
+        if (mode === "read-only") {
+            this.session.setSystemPromptAppend(READ_ONLY_MODE_ADDENDUM);
         }
         else if (mode === "auto") {
             this.session.setSystemPromptAppend(AUTO_MODE_ADDENDUM);
@@ -6545,13 +6561,13 @@ export class InteractiveMode {
         this.sessionManager.setPermissionMode(mode);
         recordTuiActivity(this.sessionManager, this.runtimeHost.services.agentDir);
         const prev = getPermissionMode();
-        if (mode === "plan" && prev !== "plan") {
+        if (mode === "read-only" && prev !== "read-only") {
             this.previousPermissionMode = prev;
         }
         setPermissionMode(mode);
         this.ui.requestRender();
-        if (mode === "plan") {
-            this.session.setSystemPromptAppend(PLAN_MODE_ADDENDUM);
+        if (mode === "read-only") {
+            this.session.setSystemPromptAppend(READ_ONLY_MODE_ADDENDUM);
         }
         else if (mode === "auto") {
             this.session.setSystemPromptAppend(AUTO_MODE_ADDENDUM);
@@ -6570,43 +6586,13 @@ export class InteractiveMode {
         if (mode === "auto" && prev !== "auto") {
             this.showStatus("Auto mode active — fully autonomous. Rollback enabled for this session.");
         }
-        else if (mode === "plan") {
-            this.showStatus("Plan mode active — edit/write and mutating bash are blocked. /plan off to implement.");
+        else if (mode === "read-only") {
+            this.showStatus("Read mode active. Changes are blocked.");
         }
         else {
             this.showStatus(`Permission mode: ${mode}`);
         }
     }
-    // lunr: approval dialog for manual permission mode.
-    // lunr: adds "Switch to auto" / "Switch to yolo" at the bottom so users can
-    // escape manual approval mid-turn without a separate /mode round-trip.
-    async showApprovalDialog(req) {
-        return new Promise((resolve) => {
-            this.showSelector((done) => {
-                const selector = new ExtensionSelectorComponent(`Approve ${req.action}?`, ["Approve once", "Approve for session", "Reject", "Switch to auto", "Switch to yolo"], (option) => {
-                    done();
-                    if (option === "Approve once")
-                        resolve("once");
-                    else if (option === "Approve for session")
-                        resolve("session");
-                    else if (option === "Switch to auto") {
-                        this.applyPermissionMode("auto");
-                        resolve("once");
-                    }
-                    else if (option === "Switch to yolo") {
-                        this.applyPermissionMode("yolo");
-                        resolve("once");
-                    }
-                    else
-                        resolve("reject");
-                }, () => {
-                    done();
-                    resolve("reject");
-                }, { message: req.detail.slice(0, 500) });
-                return { component: selector, focus: selector };
-            });
-        });
-    }
     // Approval dialog for one subagent call launching more than two children.
     // "Reject with feedback" collects a one-line
     // reason that becomes the block reason the model sees, so it can adjust the plan.
@@ -6635,7 +6621,7 @@ export class InteractiveMode {
             });
         });
     }
-    // lunr: approval dialog for present_plan (plan mode). The "with feedback"
+    // Approval dialog for present_plan (read-only mode). The "with feedback"
     // options collect a one-line note via showExtensionInput that becomes part of
     // the result text the model sees. Esc/close counts as Decline.
     showPlanInChat(summary) {