@ashx-j/lunr-dev 0.2.13-dev.8.1 → 0.2.16-dev.9.1

package/dist/main.js

@@ -11,12 +11,10 @@ import { lightBuiltinExtensions, loadAllBuiltinExtensions } from "./builtin-exte
 import { parseArgs, printHelp } from "./cli/args.js";
 import { processFileArguments } from "./cli/file-processor.js";
 import { buildInitialMessage } from "./cli/initial-message.js";
-import { handleInstallCli } from "./cli/install-cli.js";
 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";
@@ -38,7 +36,6 @@ import { printTimings, resetTimings, time } from "./core/timings.js";
 import { hasTrustRequiringProjectResources, ProjectTrustStore } from "./core/trust-manager.js";
 import { runMigrations, showDeprecationWarnings } from "./migrations.js";
 import { initTheme, stopThemeWatcher } from "./modes/interactive/theme/theme.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".`;
@@ -177,9 +174,9 @@ async function resolveSessionPath(sessionArg, cwd, sessionDir) {
     return { type: "not_found", arg: sessionArg };
 }
 /** Prompt user for yes/no confirmation */
-async function promptConfirm(message, startupShell) {
-    if (startupShell) {
-        return startupShell.confirm("Confirm", message);
+async function promptConfirm(message, startupView) {
+    if (startupView) {
+        return startupView.confirm("Confirm", message);
     }
     return new Promise((resolve) => {
         const rl = createInterface({
@@ -247,7 +244,7 @@ function forkSessionOrExit(sourcePath, cwd, sessionDir, sessionId) {
         process.exit(1);
     }
 }
-async function createSessionManager(parsed, cwd, sessionDir, settingsManager, startupShell) {
+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);
     }
@@ -278,7 +275,7 @@ async function createSessionManager(parsed, cwd, sessionDir, settingsManager, st
                 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?", startupShell);
+                const shouldFork = await promptConfirm("Fork this session into current directory?", startupView);
                 if (!shouldFork) {
                     console.log(chalk.dim("Aborted."));
                     process.exit(0);
@@ -294,8 +291,8 @@ async function createSessionManager(parsed, cwd, sessionDir, settingsManager, st
         try {
             const currentSessionsLoader = (onProgress) => SessionManager.list(cwd, sessionDir, onProgress);
             const allSessionsLoader = (onProgress) => SessionManager.listAll(sessionDir, onProgress);
-            const selectedPath = startupShell
-                ? await startupShell.selectSession(currentSessionsLoader, allSessionsLoader)
+            const selectedPath = startupView
+                ? await startupView.selectSession(currentSessionsLoader, allSessionsLoader)
                 : await selectSession(currentSessionsLoader, allSessionsLoader, settingsManager);
             if (!selectedPath) {
                 console.log(chalk.dim("No session selected"));
@@ -403,26 +400,26 @@ function buildSessionOptions(parsed, scopedModels, hasExistingSession, modelRunt
 function resolveCliPaths(cwd, paths) {
     return paths?.map((value) => (isLocalPath(value) ? resolvePath(value, cwd) : value));
 }
-function createStartupShellTrustContext(cwd, startupShell) {
+function createStartupViewTrustContext(cwd, startupView) {
     return {
         cwd,
         mode: "tui",
         hasUI: true,
         ui: {
-            select: (title, options) => startupShell.select(title, options.map((option) => ({ label: option, value: option }))),
-            confirm: (title, message) => startupShell.confirm(title, message),
-            input: (title, placeholder) => startupShell.input(title, placeholder),
+            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, startupShell) {
+async function promptForMissingSessionCwd(issue, settingsManager, startupView) {
     const options = [
         { label: "Continue", value: issue.fallbackCwd },
         { label: "Cancel", value: undefined },
     ];
-    return startupShell
-        ? startupShell.select(formatMissingSessionCwdPrompt(issue), options)
+    return startupView
+        ? startupView.select(formatMissingSessionCwdPrompt(issue), options)
         : showStartupSelector(settingsManager, formatMissingSessionCwdPrompt(issue), options);
 }
 export async function main(args, options) {
@@ -436,19 +433,24 @@ export async function main(args, options) {
     const bootstrapSettingsManager = SettingsManager.create(cwd, agentDir, { projectTrusted: false });
     applyHttpProxySettings(bootstrapSettingsManager.getGlobalSettings().httpProxy);
     configureHttpDispatcher();
-    if (await handleInstallCli(args)) {
-        return;
-    }
-    if (await handleUpdateCli(args)) {
-        return;
+    if (["setup", "features", "uninstall"].includes(args[0])) {
+        const { handleInstallCli } = await import("./cli/install-cli.js");
+        if (await handleInstallCli(args))
+            return;
     }
-    if (await handlePackageCommand(args, { extensionFactories: options?.extensionFactories })) {
-        const exitCode = process.exitCode ?? 0;
-        process.exit(exitCode);
-        return;
+    if (args[0] === "update") {
+        const { handleUpdateCli } = await import("./cli/update-cli.js");
+        if (await handleUpdateCli(args))
+            return;
     }
-    if (await handleConfigCommand(args, { extensionFactories: options?.extensionFactories })) {
-        return;
+    if (["install", "remove", "uninstall", "list", "config"].includes(args[0])) {
+        const { handleConfigCommand, handlePackageCommand } = await import("./package-manager-cli.js");
+        if (await handlePackageCommand(args, { extensionFactories: options?.extensionFactories })) {
+            process.exit(process.exitCode ?? 0);
+            return;
+        }
+        if (await handleConfigCommand(args, { extensionFactories: options?.extensionFactories }))
+            return;
     }
     if (args[0] === "gateway") {
         const { handleGatewayCommand } = await import("./gateway/command.js");
@@ -487,9 +489,9 @@ export async function main(args, options) {
     }
     let appMode = resolveAppMode(parsed, process.stdin.isTTY, process.stdout.isTTY);
     const interactiveModeImport = appMode === "interactive" ? import("./modes/interactive/interactive-mode.js") : undefined;
-    const startupShell = appMode === "interactive" ? options?.startupShell : undefined;
-    if (options?.startupShell && !startupShell)
-        options.startupShell.stop();
+    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();
@@ -521,9 +523,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()) {
-        startupShell?.pause();
+        startupView?.pause();
         await showFirstTimeSetup(startupSettingsManager);
-        startupShell?.resume();
+        startupView?.resume();
         time("firstTimeSetup");
     }
     // Decide the final runtime cwd before creating cwd-bound runtime services.
@@ -535,11 +537,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, startupShell);
+    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, startupShell);
+            const selectedCwd = await promptForMissingSessionCwd(missingSessionCwdIssue, startupSettingsManager, startupView);
             if (!selectedCwd) {
                 process.exit(0);
             }
@@ -632,8 +634,8 @@ export async function main(args, options) {
                             defaultProjectTrust: startupSettingsManager.getDefaultProjectTrust(),
                             extensionsResult,
                             projectTrustContext: projectTrustContext ??
-                                (isInitialRuntime && startupShell
-                                    ? createStartupShellTrustContext(cwd, startupShell)
+                                (isInitialRuntime && startupView
+                                    ? createStartupViewTrustContext(cwd, startupView)
                                     : createProjectTrustContext({
                                         cwd,
                                         mode: isInitialRuntime ? trustPromptMode : appMode,
@@ -730,7 +732,7 @@ export async function main(args, options) {
         sessionManager,
         onRuntimeApplied: bindRuntimeBridges,
     });
-    if (startupShell?.isExitRequested) {
+    if (startupView?.isExitRequested) {
         await runtime.dispose();
         return;
     }
@@ -769,18 +771,19 @@ export async function main(args, options) {
     time("prepareInitialMessage");
     initTheme(settingsManager.getTheme(), appMode === "interactive");
     time("initTheme");
-    if (appMode === "interactive" && !startupShell && deprecationWarnings.length > 0) {
+    if (appMode === "interactive" && !startupView && deprecationWarnings.length > 0) {
         await showDeprecationWarnings(deprecationWarnings);
     }
     time("resolveModelScope");
-    if (!(appMode === "interactive" && startupShell))
+    if (!(appMode === "interactive" && startupView))
         reportDiagnostics(runtime.diagnostics);
     if (runtime.diagnostics.some((diagnostic) => diagnostic.type === "error")) {
         const extensionHint = runtime.diagnostics.some((diagnostic) => diagnostic.message.includes("Failed to load extension"))
             ? `\n${EXTENSION_LOAD_FAILURE_HINT}`
             : "";
-        if (startupShell) {
-            await startupShell.fail(`${runtime.diagnostics.map((diagnostic) => diagnostic.message).join("\n")}${extensionHint}`);
+        if (startupView) {
+            process.exitCode = 1;
+            await startupView.fail(`${runtime.diagnostics.map((diagnostic) => diagnostic.message).join("\n")}${extensionHint}`);
             return;
         }
         if (extensionHint)
@@ -802,7 +805,7 @@ export async function main(args, options) {
         await runRpcMode(runtime);
     }
     else if (appMode === "interactive") {
-        const [{ InteractiveMode }, { loadDeferredBuiltinExtensionsResult }] = await Promise.all([
+        const [{ InteractiveMode }, { loadDeferredBuiltinExtensions }] = await Promise.all([
             interactiveModeImport,
             import("./builtin-extensions/index.js"),
         ]);
@@ -814,21 +817,27 @@ export async function main(args, options) {
             initialImages,
             initialMessages: parsed.messages,
             verbose: parsed.verbose,
-            deprecationWarnings: startupShell ? deprecationWarnings : undefined,
-            startupDiagnostics: startupShell
+            deprecationWarnings: startupView ? deprecationWarnings : undefined,
+            startupDiagnostics: startupView
                 ? runtime.diagnostics.filter((diagnostic) => diagnostic.type !== "error")
                 : undefined,
-            startupShellBinding: startupShell?.binding(),
+            startupView: startupView?.binding(),
             deferredMaintenance: runSessionRetention,
-            deferredBuiltinFactories: parsed.noExtensions ? undefined : loadDeferredBuiltinExtensionsResult,
+            deferredBuiltinFactories: parsed.noExtensions ? undefined : loadDeferredBuiltinExtensions,
             onDeferredBuiltinsAttached: rememberAttachedFactories,
         });
         if (startupBenchmark) {
+            const { prepareBenchmarkRequest } = await import("./startup/benchmark-request.js");
+            const request = await prepareBenchmarkRequest(session);
             await interactiveMode.init();
             time("interactiveMode.init");
-            await interactiveMode.waitForPromptBarrier();
+            await interactiveMode.waitForStartupReady();
             time("promptBarrier");
+            await request();
+            // Consume terminal-query replies before returning control to the shell.
+            await new Promise((resolve) => setTimeout(resolve, 150));
             interactiveMode.stop();
+            await runtime.dispose();
             stopThemeWatcher();
             printTimings();
             if (process.stdout.writableLength > 0) {