@ashx-j/lunr 0.2.12 → 0.2.14

package/dist/main.js

@@ -16,17 +16,16 @@ import { listModels } from "./cli/list-models.js";
 import { createProjectTrustContext } from "./cli/project-trust.js";
 import { selectSession } from "./cli/session-picker.js";
 import { shouldRunFirstTimeSetup, showFirstTimeSetup, showStartupSelector } from "./cli/startup-ui.js";
+import { handleUpdateCli } from "./cli/update-cli.js";
 import { APP_NAME, appendDebugLog, ENV_SESSION_DIR, expandTildePath, getAgentDir, getSessionsDir, VERSION, } from "./config.js";
 import { createAgentSessionRuntime } from "./core/agent-session-runtime.js";
 import { createAgentSessionFromServices, createAgentSessionServices, } from "./core/agent-session-services.js";
 import { formatNoModelsAvailableMessage } from "./core/auth-guidance.js";
 import { registerCustomizeBridge } from "./core/customize.js";
-import { exportFromFile } from "./core/export-html/index.js";
 import { applyHttpProxySettings, configureHttpDispatcher } from "./core/http-dispatcher.js";
 import { registerMemoryCapBridge } from "./core/memory-cap.js";
 import { resolveCliModel, resolveModelScope } from "./core/model-resolver.js";
 import { getModelTiersBridge, registerModelTierBridge } from "./core/model-tiers.js";
-import { registerUsageServiceBridge } from "./core/usage-service.js";
 import { restoreStdout, takeOverStdout } from "./core/output-guard.js";
 import { resolveProjectTrusted } from "./core/project-trust.js";
 import { formatMissingSessionCwdPrompt, getMissingSessionCwdIssue, MissingSessionCwdError, } from "./core/session-cwd.js";
@@ -36,12 +35,11 @@ import { SettingsManager } from "./core/settings-manager.js";
 import { applyInheritedSubagentPermissions } from "./core/subagent-permission-inherit.js";
 import { printTimings, resetTimings, time } from "./core/timings.js";
 import { hasTrustRequiringProjectResources, ProjectTrustStore } from "./core/trust-manager.js";
-import { handleGatewayCommand } from "./gateway/command.js";
+import { registerUsageServiceBridge } from "./core/usage-service.js";
 import { runMigrations, showDeprecationWarnings } from "./migrations.js";
-import { InteractiveMode } from "./modes/interactive/interactive-mode.js";
 import { initTheme, stopThemeWatcher } from "./modes/interactive/theme/theme.js";
-import { handleUpdateCli } from "./cli/update-cli.js";
 import { handleConfigCommand, handlePackageCommand } from "./package-manager-cli.js";
+import { markStartupMilestone } from "./startup/startup-milestones.js";
 import { isLocalPath, normalizePath, resolvePath } from "./utils/paths.js";
 const EXTENSION_LOAD_FAILURE_HINT = `Hint: Start without extensions using "${APP_NAME} -ne".`;
 /**
@@ -179,7 +177,10 @@ async function resolveSessionPath(sessionArg, cwd, sessionDir) {
     return { type: "not_found", arg: sessionArg };
 }
 /** Prompt user for yes/no confirmation */
-async function promptConfirm(message) {
+async function promptConfirm(message, startupView) {
+    if (startupView) {
+        return startupView.confirm("Confirm", message);
+    }
     return new Promise((resolve) => {
         const rl = createInterface({
             input: process.stdin,
@@ -246,7 +247,7 @@ function forkSessionOrExit(sourcePath, cwd, sessionDir, sessionId) {
         process.exit(1);
     }
 }
-async function createSessionManager(parsed, cwd, sessionDir, settingsManager) {
+async function createSessionManager(parsed, cwd, sessionDir, settingsManager, startupView) {
     if (parsed.noSession || parsed.help || parsed.listModels !== undefined) {
         return SessionManager.inMemory(cwd, parsed.sessionId !== undefined ? { id: parsed.sessionId } : undefined);
     }
@@ -277,7 +278,7 @@ async function createSessionManager(parsed, cwd, sessionDir, settingsManager) {
                 return openSessionOrExit(resolved.path, sessionDir);
             case "global": {
                 console.log(chalk.yellow(`Session found in different project: ${resolved.cwd}`));
-                const shouldFork = await promptConfirm("Fork this session into current directory?");
+                const shouldFork = await promptConfirm("Fork this session into current directory?", startupView);
                 if (!shouldFork) {
                     console.log(chalk.dim("Aborted."));
                     process.exit(0);
@@ -291,7 +292,11 @@ async function createSessionManager(parsed, cwd, sessionDir, settingsManager) {
     }
     if (parsed.resume) {
         try {
-            const selectedPath = await selectSession((onProgress) => SessionManager.list(cwd, sessionDir, onProgress), (onProgress) => SessionManager.listAll(sessionDir, onProgress), settingsManager);
+            const currentSessionsLoader = (onProgress) => SessionManager.list(cwd, sessionDir, onProgress);
+            const allSessionsLoader = (onProgress) => SessionManager.listAll(sessionDir, onProgress);
+            const selectedPath = startupView
+                ? await startupView.selectSession(currentSessionsLoader, allSessionsLoader)
+                : await selectSession(currentSessionsLoader, allSessionsLoader, settingsManager);
             if (!selectedPath) {
                 console.log(chalk.dim("No session selected"));
                 process.exit(0);
@@ -398,11 +403,27 @@ function buildSessionOptions(parsed, scopedModels, hasExistingSession, modelRunt
 function resolveCliPaths(cwd, paths) {
     return paths?.map((value) => (isLocalPath(value) ? resolvePath(value, cwd) : value));
 }
-async function promptForMissingSessionCwd(issue, settingsManager) {
-    return showStartupSelector(settingsManager, formatMissingSessionCwdPrompt(issue), [
+function createStartupViewTrustContext(cwd, startupView) {
+    return {
+        cwd,
+        mode: "tui",
+        hasUI: true,
+        ui: {
+            select: (title, options) => startupView.select(title, options.map((option) => ({ label: option, value: option }))),
+            confirm: (title, message) => startupView.confirm(title, message),
+            input: (title, placeholder) => startupView.input(title, placeholder),
+            notify: () => { },
+        },
+    };
+}
+async function promptForMissingSessionCwd(issue, settingsManager, startupView) {
+    const options = [
         { label: "Continue", value: issue.fallbackCwd },
         { label: "Cancel", value: undefined },
-    ]);
+    ];
+    return startupView
+        ? startupView.select(formatMissingSessionCwdPrompt(issue), options)
+        : showStartupSelector(settingsManager, formatMissingSessionCwdPrompt(issue), options);
 }
 export async function main(args, options) {
     resetTimings();
@@ -429,11 +450,10 @@ export async function main(args, options) {
     if (await handleConfigCommand(args, { extensionFactories: options?.extensionFactories })) {
         return;
     }
-    // lunr: `lunr gateway` daemon/subcommands — same interception seam as the
-    // package/config commands above (before parseArgs, which knows nothing
-    // about gateway args).
-    if (await handleGatewayCommand(args)) {
-        return;
+    if (args[0] === "gateway") {
+        const { handleGatewayCommand } = await import("./gateway/command.js");
+        if (await handleGatewayCommand(args))
+            return;
     }
     const parsed = parseArgs(args);
     if (parsed.diagnostics.length > 0) {
@@ -453,6 +473,7 @@ export async function main(args, options) {
     if (parsed.export) {
         let result;
         try {
+            const { exportFromFile } = await import("./core/export-html/index.js");
             const outputPath = parsed.messages.length > 0 ? parsed.messages[0] : undefined;
             result = await exportFromFile(parsed.export, outputPath);
         }
@@ -465,6 +486,10 @@ export async function main(args, options) {
         process.exit(0);
     }
     let appMode = resolveAppMode(parsed, process.stdin.isTTY, process.stdout.isTTY);
+    const interactiveModeImport = appMode === "interactive" ? import("./modes/interactive/interactive-mode.js") : undefined;
+    const startupView = appMode === "interactive" ? options?.startupView : undefined;
+    if (options?.startupView && !startupView)
+        options.startupView.stop();
     // lunr: parent-delegated children inherit plan or auto before any tool call.
     // Non-child print/json stays fail-closed (module default manual, no handler).
     applyInheritedSubagentPermissions();
@@ -496,7 +521,9 @@ export async function main(args, options) {
     // Experimental first-time setup: theme choice and analytics opt-in.
     // Runs before any runtime services are created so the chosen settings apply everywhere.
     if (appMode === "interactive" && !parsed.help && parsed.listModels === undefined && shouldRunFirstTimeSetup()) {
+        startupView?.pause();
         await showFirstTimeSetup(startupSettingsManager);
+        startupView?.resume();
         time("firstTimeSetup");
     }
     // Decide the final runtime cwd before creating cwd-bound runtime services.
@@ -508,11 +535,11 @@ export async function main(args, options) {
     const sessionDir = (parsed.sessionDir ? normalizePath(parsed.sessionDir) : undefined) ??
         (envSessionDir ? expandTildePath(envSessionDir) : undefined) ??
         startupSettingsManager.getSessionDir();
-    let sessionManager = await createSessionManager(parsed, cwd, sessionDir, startupSettingsManager);
+    let sessionManager = await createSessionManager(parsed, cwd, sessionDir, startupSettingsManager, startupView);
     const missingSessionCwdIssue = getMissingSessionCwdIssue(sessionManager, cwd);
     if (missingSessionCwdIssue) {
         if (appMode === "interactive") {
-            const selectedCwd = await promptForMissingSessionCwd(missingSessionCwdIssue, startupSettingsManager);
+            const selectedCwd = await promptForMissingSessionCwd(missingSessionCwdIssue, startupSettingsManager, startupView);
             if (!selectedCwd) {
                 process.exit(0);
             }
@@ -532,31 +559,27 @@ export async function main(args, options) {
         sessionManager.appendSessionInfo(name);
     }
     time("createSessionManager");
-    // lunr: session retention — delete session files older than sessionRetentionDays
-    // (default 30; 0 = keep forever). Best-effort: per-file errors are swallowed,
-    // deletions go to the debug log only, and the active session file is never deleted.
-    try {
-        const retentionDays = startupSettingsManager.getSessionRetentionDays();
-        if (retentionDays > 0) {
+    const runSessionRetention = async () => {
+        try {
+            const retentionDays = startupSettingsManager.getSessionRetentionDays();
+            if (retentionDays <= 0)
+                return;
             const activeSessionFile = sessionManager.getSessionFile();
             const { deleted } = await pruneOldSessions(getSessionsDir(), retentionDays, {
                 excludeFile: activeSessionFile,
             });
-            // Also cover a custom session dir (--session-dir / settings), which is a flat
-            // .jsonl directory outside the default sessions root.
             if (sessionDir) {
                 const extra = await pruneOldSessions(sessionDir, retentionDays, { excludeFile: activeSessionFile });
                 deleted.push(...extra.deleted);
             }
             if (deleted.length > 0) {
-                appendDebugLog(`session-retention: deleted ${deleted.length} file(s):\n${deleted.map((p) => `  ${p}`).join("\n")}`);
+                appendDebugLog(`session-retention: deleted ${deleted.length} file(s):\n${deleted.map((path) => `  ${path}`).join("\n")}`);
             }
         }
-    }
-    catch (error) {
-        appendDebugLog(`session-retention: prune failed: ${error instanceof Error ? error.message : String(error)}`);
-    }
-    time("pruneOldSessions");
+        catch (error) {
+            appendDebugLog(`session-retention: prune failed: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    };
     const trustStore = new ProjectTrustStore(agentDir);
     const sessionCwd = sessionManager.getCwd();
     const autoTrustOnReloadCwd = parsed.projectTrustOverride === undefined && !hasTrustRequiringProjectResources(sessionCwd)
@@ -568,7 +591,7 @@ export async function main(args, options) {
     const resolvedSkillPaths = resolveCliPaths(cwd, parsed.skills);
     const resolvedPromptTemplatePaths = resolveCliPaths(cwd, parsed.promptTemplates);
     const resolvedThemePaths = resolveCliPaths(cwd, parsed.themes);
-    let builtinRoster = appMode === "interactive" ? [...lightBuiltinExtensions] : await loadAllBuiltinExtensions();
+    const builtinRoster = appMode === "interactive" ? [...lightBuiltinExtensions] : await loadAllBuiltinExtensions();
     const rememberAttachedFactories = (factories) => {
         const seen = new Set(builtinRoster.map((entry) => (typeof entry === "function" ? undefined : entry.name)).filter(Boolean));
         for (const factory of factories) {
@@ -609,12 +632,14 @@ export async function main(args, options) {
                             defaultProjectTrust: startupSettingsManager.getDefaultProjectTrust(),
                             extensionsResult,
                             projectTrustContext: projectTrustContext ??
-                                createProjectTrustContext({
-                                    cwd,
-                                    mode: isInitialRuntime ? trustPromptMode : appMode,
-                                    settingsManager: startupSettingsManager,
-                                    hasUI: isInitialRuntime && trustPromptMode === "interactive",
-                                }),
+                                (isInitialRuntime && startupView
+                                    ? createStartupViewTrustContext(cwd, startupView)
+                                    : createProjectTrustContext({
+                                        cwd,
+                                        mode: isInitialRuntime ? trustPromptMode : appMode,
+                                        settingsManager: startupSettingsManager,
+                                        hasUI: isInitialRuntime && trustPromptMode === "interactive",
+                                    })),
                             onExtensionError: (message) => projectTrustDiagnostics.push({ type: "warning", message }),
                         });
                         projectTrustByCwd.set(cwd, trusted);
@@ -640,6 +665,15 @@ export async function main(args, options) {
             },
         });
         const { settingsManager, modelRuntime, resourceLoader } = services;
+        if (parsed.model &&
+            !resolveCliModel({
+                cliProvider: parsed.provider,
+                cliModel: parsed.model,
+                cliThinking: parsed.thinking,
+                modelRuntime,
+            }).model) {
+            await modelRuntime.refreshIfStale();
+        }
         const diagnostics = [
             ...projectTrustDiagnostics,
             ...services.diagnostics,
@@ -695,7 +729,14 @@ export async function main(args, options) {
         agentDir,
         sessionManager,
     });
+    if (startupView?.isExitRequested) {
+        await runtime.dispose();
+        return;
+    }
+    markStartupMilestone("runtime_hydrated");
     time("createAgentSessionRuntime");
+    if (appMode !== "interactive")
+        await runSessionRetention();
     const { services, session, modelFallbackMessage } = runtime;
     const { settingsManager, modelRuntime, resourceLoader } = services;
     applyHttpProxySettings(settingsManager.getGlobalSettings().httpProxy);
@@ -734,16 +775,23 @@ export async function main(args, options) {
     time("prepareInitialMessage");
     initTheme(settingsManager.getTheme(), appMode === "interactive");
     time("initTheme");
-    // Show deprecation warnings in interactive mode
-    if (appMode === "interactive" && deprecationWarnings.length > 0) {
+    if (appMode === "interactive" && !startupView && deprecationWarnings.length > 0) {
         await showDeprecationWarnings(deprecationWarnings);
     }
     time("resolveModelScope");
-    reportDiagnostics(runtime.diagnostics);
+    if (!(appMode === "interactive" && startupView))
+        reportDiagnostics(runtime.diagnostics);
     if (runtime.diagnostics.some((diagnostic) => diagnostic.type === "error")) {
-        if (runtime.diagnostics.some((diagnostic) => diagnostic.message.includes("Failed to load extension"))) {
-            console.error(chalk.yellow(EXTENSION_LOAD_FAILURE_HINT));
+        const extensionHint = runtime.diagnostics.some((diagnostic) => diagnostic.message.includes("Failed to load extension"))
+            ? `\n${EXTENSION_LOAD_FAILURE_HINT}`
+            : "";
+        if (startupView) {
+            process.exitCode = 1;
+            await startupView.fail(`${runtime.diagnostics.map((diagnostic) => diagnostic.message).join("\n")}${extensionHint}`);
+            return;
         }
+        if (extensionHint)
+            console.error(chalk.yellow(EXTENSION_LOAD_FAILURE_HINT));
         process.exit(1);
     }
     time("createAgentSession");
@@ -761,7 +809,10 @@ export async function main(args, options) {
         await runRpcMode(runtime);
     }
     else if (appMode === "interactive") {
-        const { loadDeferredBuiltinExtensions } = await import("./builtin-extensions/index.js");
+        const [{ InteractiveMode }, { loadDeferredBuiltinExtensions }] = await Promise.all([
+            interactiveModeImport,
+            import("./builtin-extensions/index.js"),
+        ]);
         const interactiveMode = new InteractiveMode(runtime, {
             migratedProviders,
             modelFallbackMessage,
@@ -770,16 +821,21 @@ export async function main(args, options) {
             initialImages,
             initialMessages: parsed.messages,
             verbose: parsed.verbose,
+            deprecationWarnings: startupView ? deprecationWarnings : undefined,
+            startupDiagnostics: startupView
+                ? runtime.diagnostics.filter((diagnostic) => diagnostic.type !== "error")
+                : undefined,
+            startupView: startupView?.binding(),
+            deferredMaintenance: runSessionRetention,
             deferredBuiltinFactories: parsed.noExtensions ? undefined : loadDeferredBuiltinExtensions,
             onDeferredBuiltinsAttached: rememberAttachedFactories,
         });
         if (startupBenchmark) {
             await interactiveMode.init();
             time("interactiveMode.init");
-            await interactiveMode.waitForDeferredBuiltins();
-            time("attachDeferredBuiltins");
-            // Give the TUI's stdin handler a brief chance to consume terminal query replies
-            // (Kitty keyboard protocol, device attributes, cell size) before restoring the terminal.
+            await interactiveMode.waitForStartupReady();
+            time("promptBarrier");
+            // Consume terminal-query replies before returning control to the shell.
             await new Promise((resolve) => setTimeout(resolve, 150));
             interactiveMode.stop();
             stopThemeWatcher();