dev3000 0.0.171 → 0.0.174

package/dist/cli.js

@@ -1,118 +1,196 @@
 #!/usr/bin/env bun
-// Intercept agent-browser command early, before Commander parses args.
-// This allows passing all args directly to agent-browser without Commander interference.
-const agentBrowserIndex = process.argv.indexOf("agent-browser");
-if (agentBrowserIndex >= 0 && (process.argv[1]?.includes("d3k") || process.argv[1]?.includes("dev3000"))) {
-    const args = process.argv.slice(agentBrowserIndex + 1);
-    // Intercept "errors" and "console" subcommands - redirect to d3k's superior commands
-    // These d3k commands show BOTH browser AND server logs, unlike agent-browser which only shows browser
-    const subcommandIndex = args.findIndex((arg) => !arg.startsWith("-") && !arg.startsWith("@") && arg !== "9222");
-    const subcommand = subcommandIndex >= 0 ? args[subcommandIndex] : null;
-    if (subcommand === "errors") {
-        console.log("\x1b[33m💡 Tip: Using `d3k errors` instead (shows browser + server errors)\x1b[0m\n");
-        const d3kBin = process.argv[1];
-        const result = spawnSync(d3kBin, ["errors"], { stdio: "inherit", shell: false });
-        process.exit(result.status ?? 0);
-    }
-    if (subcommand === "console") {
-        console.log("\x1b[33m💡 Tip: Using `d3k logs` instead (shows browser + server logs)\x1b[0m\n");
-        const d3kBin = process.argv[1];
-        const result = spawnSync(d3kBin, ["logs", "--type", "browser"], { stdio: "inherit", shell: false });
-        process.exit(result.status ?? 0);
-    }
-    // Find agent-browser native binary directly (avoids shell wrapper that needs node)
-    function findAgentBrowser() {
-        const os = process.platform === "darwin" ? "darwin" : process.platform === "win32" ? "win32" : "linux";
-        const arch = process.arch === "arm64" ? "arm64" : "x64";
-        const nativeName = `agent-browser-${os}-${arch}`;
-        const platformPkg = `${os}-${arch}`;
-        const cwd = process.cwd();
-        const home = homedir();
-        const getRunnablePath = (searchPath) => {
-            if (!existsSync(searchPath)) {
-                return null;
-            }
-            if (process.platform === "win32") {
-                return searchPath;
-            }
-            try {
-                accessSync(searchPath, constants.X_OK);
-                return searchPath;
-            }
-            catch {
-                try {
-                    chmodSync(searchPath, 0o755);
-                    accessSync(searchPath, constants.X_OK);
-                    return searchPath;
-                }
-                catch {
-                    return null;
-                }
-            }
-        };
-        // Prefer native binary to avoid shell wrapper needing node in PATH
-        const searchPaths = [
-            // Bun global install paths (native binary) - use homedir since compiled binary has virtual path
-            join(home, ".bun", "install", "global", "node_modules", "@d3k", platformPkg, "node_modules", ".bin", nativeName),
-            join(home, ".bun", "install", "global", "node_modules", "agent-browser", "bin", nativeName),
-            // Bun global dev3000 dependency path
-            join(home, ".bun", "install", "global", "node_modules", "dev3000", "node_modules", ".bin", nativeName),
-            // Local development paths (native binary)
-            join(cwd, "node_modules", ".bin", nativeName),
-            join(cwd, "node_modules", "agent-browser", "bin", nativeName),
-            // Fallback to wrapper script (needs node in PATH)
-            join(home, ".bun", "install", "global", "node_modules", "@d3k", platformPkg, "node_modules", ".bin", "agent-browser"),
-            join(home, ".bun", "install", "global", "node_modules", "dev3000", "node_modules", ".bin", "agent-browser"),
-            join(home, ".bun", "install", "global", "node_modules", ".bin", "agent-browser"),
-            join(home, ".bun", "install", "global", "node_modules", "agent-browser", "bin", "agent-browser.js"),
-            join(cwd, "node_modules", ".bin", "agent-browser"),
-            join(cwd, "node_modules", "agent-browser", "bin", "agent-browser.js")
-        ];
-        // npm/pnpm/yarn global install locations (best-effort)
-        const globalNodeModules = [
-            join("/usr", "local", "lib", "node_modules"),
-            join("/opt", "homebrew", "lib", "node_modules")
-        ];
-        for (const root of globalNodeModules) {
-            searchPaths.push(join(root, "dev3000", "node_modules", ".bin", nativeName));
-            searchPaths.push(join(root, "dev3000", "node_modules", ".bin", "agent-browser"));
-            searchPaths.push(join(root, "agent-browser", "bin", nativeName));
-            searchPaths.push(join(root, "agent-browser", "bin", "agent-browser.js"));
+function getRunnablePath(searchPath) {
+    if (!existsSync(searchPath)) {
+        return null;
+    }
+    if (process.platform === "win32") {
+        return searchPath;
+    }
+    try {
+        accessSync(searchPath, constants.X_OK);
+        return searchPath;
+    }
+    catch {
+        try {
+            chmodSync(searchPath, 0o755);
+            accessSync(searchPath, constants.X_OK);
+            return searchPath;
         }
-        for (const p of searchPaths) {
-            const runnablePath = getRunnablePath(p);
-            if (runnablePath)
-                return runnablePath;
+        catch {
+            return null;
         }
-        return "agent-browser"; // fallback to PATH
     }
-    const binaryPath = findAgentBrowser();
-    // Ensure PATH is set for child process (Claude Code can have empty PATH)
-    const env = { ...process.env };
+}
+function ensureCommandPath(env) {
     if (!env.PATH || env.PATH === "") {
         env.PATH = "/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin";
     }
-    // Capture output so we can show errors if command fails
-    const result = spawnSync(binaryPath, args, {
+}
+function findAgentBrowser() {
+    const os = process.platform === "darwin" ? "darwin" : process.platform === "win32" ? "win32" : "linux";
+    const arch = process.arch === "arm64" ? "arm64" : "x64";
+    const nativeName = `agent-browser-${os}-${arch}`;
+    const platformPkg = `${os}-${arch}`;
+    const cwd = process.cwd();
+    const home = homedir();
+    const searchPaths = [
+        join(home, ".bun", "install", "global", "node_modules", "@d3k", platformPkg, "node_modules", ".bin", nativeName),
+        join(home, ".bun", "install", "global", "node_modules", "agent-browser", "bin", nativeName),
+        join(home, ".bun", "install", "global", "node_modules", "dev3000", "node_modules", ".bin", nativeName),
+        join(cwd, "node_modules", ".bin", nativeName),
+        join(cwd, "node_modules", "agent-browser", "bin", nativeName),
+        join(home, ".bun", "install", "global", "node_modules", "@d3k", platformPkg, "node_modules", ".bin", "agent-browser"),
+        join(home, ".bun", "install", "global", "node_modules", "dev3000", "node_modules", ".bin", "agent-browser"),
+        join(home, ".bun", "install", "global", "node_modules", ".bin", "agent-browser"),
+        join(home, ".bun", "install", "global", "node_modules", "agent-browser", "bin", "agent-browser.js"),
+        join(cwd, "node_modules", ".bin", "agent-browser"),
+        join(cwd, "node_modules", "agent-browser", "bin", "agent-browser.js")
+    ];
+    const globalNodeModules = [
+        join("/usr", "local", "lib", "node_modules"),
+        join("/opt", "homebrew", "lib", "node_modules")
+    ];
+    for (const root of globalNodeModules) {
+        searchPaths.push(join(root, "dev3000", "node_modules", ".bin", nativeName));
+        searchPaths.push(join(root, "dev3000", "node_modules", ".bin", "agent-browser"));
+        searchPaths.push(join(root, "agent-browser", "bin", nativeName));
+        searchPaths.push(join(root, "agent-browser", "bin", "agent-browser.js"));
+    }
+    for (const p of searchPaths) {
+        const runnablePath = getRunnablePath(p);
+        if (runnablePath)
+            return runnablePath;
+    }
+    return "agent-browser";
+}
+function findNextBrowserCli() {
+    if (process.env.NEXT_BROWSER_PATH) {
+        const runnablePath = getRunnablePath(process.env.NEXT_BROWSER_PATH);
+        if (runnablePath) {
+            return runnablePath;
+        }
+    }
+    const cwd = process.cwd();
+    const home = homedir();
+    const searchPaths = [
+        join(home, ".bun", "install", "global", "node_modules", "dev3000", "node_modules", "@vercel", "next-browser", "dist", "cli.js"),
+        join(home, ".bun", "install", "global", "node_modules", "@vercel", "next-browser", "dist", "cli.js"),
+        join(cwd, "node_modules", "@vercel", "next-browser", "dist", "cli.js"),
+        join(cwd, "..", "node_modules", "@vercel", "next-browser", "dist", "cli.js")
+    ];
+    const globalNodeModules = [
+        join("/usr", "local", "lib", "node_modules"),
+        join("/opt", "homebrew", "lib", "node_modules")
+    ];
+    for (const root of globalNodeModules) {
+        searchPaths.push(join(root, "dev3000", "node_modules", "@vercel", "next-browser", "dist", "cli.js"));
+        searchPaths.push(join(root, "@vercel", "next-browser", "dist", "cli.js"));
+    }
+    for (const searchPath of searchPaths) {
+        if (existsSync(searchPath)) {
+            return searchPath;
+        }
+    }
+    return null;
+}
+function getProjectBrowserToolPreference() {
+    try {
+        const sessionFile = join(getProjectDir(), "session.json");
+        if (!existsSync(sessionFile)) {
+            return "agent-browser";
+        }
+        const sessionInfo = JSON.parse(readFileSync(sessionFile, "utf8"));
+        return sessionInfo.preferredBrowserTool === "next-browser" ? "next-browser" : "agent-browser";
+    }
+    catch {
+        return "agent-browser";
+    }
+}
+function runLocalBrowserTool(browserTool, args) {
+    const env = { ...process.env };
+    ensureCommandPath(env);
+    if (browserTool === "agent-browser") {
+        const subcommandIndex = args.findIndex((arg) => !arg.startsWith("-") && !arg.startsWith("@") && arg !== "9222");
+        const subcommand = subcommandIndex >= 0 ? args[subcommandIndex] : null;
+        if (subcommand === "errors") {
+            console.log("\x1b[33m💡 Tip: Using `d3k errors` instead (shows browser + server errors)\x1b[0m\n");
+            const d3kBin = process.argv[1];
+            const result = spawnSync(d3kBin, ["errors"], { stdio: "inherit", shell: false });
+            process.exit(result.status ?? 0);
+        }
+        if (subcommand === "console") {
+            console.log("\x1b[33m💡 Tip: Using `d3k logs` instead (shows browser + server logs)\x1b[0m\n");
+            const d3kBin = process.argv[1];
+            const result = spawnSync(d3kBin, ["logs", "--type", "browser"], { stdio: "inherit", shell: false });
+            process.exit(result.status ?? 0);
+        }
+        const binaryPath = findAgentBrowser();
+        const result = spawnSync(binaryPath, args, {
+            stdio: "pipe",
+            shell: false,
+            env
+        });
+        if (result.stdout?.length > 0) {
+            process.stdout.write(result.stdout);
+        }
+        if (result.stderr?.length > 0) {
+            process.stderr.write(result.stderr);
+        }
+        if (result.error) {
+            console.error(`\nError spawning agent-browser: ${result.error.message}`);
+            console.error(`Binary path: ${binaryPath}`);
+            process.exit(1);
+        }
+        process.exit(result.status ?? 1);
+    }
+    const nodeVersionCheck = spawnSync("node", ["-e", "process.stdout.write(process.versions.node)"], {
+        encoding: "utf-8",
+        env,
+        shell: false
+    });
+    const nodeVersion = nodeVersionCheck.stdout?.trim();
+    const nodeMajor = nodeVersion ? Number.parseInt(nodeVersion.split(".")[0] || "0", 10) : 0;
+    if (nodeVersionCheck.status !== 0 || Number.isNaN(nodeMajor) || nodeMajor < 20) {
+        console.error("\nnext-browser requires a system Node.js runtime >= 20.");
+        console.error("Install Node 20+ or keep using agent-browser for local d3k sessions.");
+        process.exit(1);
+    }
+    const cliPath = findNextBrowserCli();
+    const nextBrowserHome = join(getProjectDir(), "next-browser-home");
+    mkdirSync(nextBrowserHome, { recursive: true });
+    env.HOME = nextBrowserHome;
+    env.USERPROFILE = nextBrowserHome;
+    const result = spawnSync(cliPath ? "node" : "next-browser", cliPath ? [cliPath, ...args] : args, {
         stdio: "pipe",
         shell: false,
         env
     });
-    // Show output
     if (result.stdout?.length > 0) {
         process.stdout.write(result.stdout);
     }
     if (result.stderr?.length > 0) {
         process.stderr.write(result.stderr);
     }
-    // If spawn failed (e.g., binary not found), show the error
     if (result.error) {
-        console.error(`\nError spawning agent-browser: ${result.error.message}`);
-        console.error(`Binary path: ${binaryPath}`);
+        console.error(`\nError spawning next-browser: ${result.error.message}`);
+        if (cliPath) {
+            console.error(`CLI path: ${cliPath}`);
+        }
         process.exit(1);
     }
     process.exit(result.status ?? 1);
 }
+import { getBrowserCommandInvocation } from "./utils/browser-command-argv.js";
+const browserCommandInvocation = getBrowserCommandInvocation(process.argv.slice(2));
+if (browserCommandInvocation && (process.argv[1]?.includes("d3k") || process.argv[1]?.includes("dev3000"))) {
+    const { browserCommand, args } = browserCommandInvocation;
+    const browserTool = browserCommand === "browser"
+        ? getProjectBrowserToolPreference()
+        : browserCommand === "next-browser"
+            ? "next-browser"
+            : "agent-browser";
+    runLocalBrowserTool(browserTool, args);
+}
 import chalk from "chalk";
 import { execSync, spawnSync } from "child_process";
 import { Command } from "commander";
@@ -128,6 +206,7 @@ import { getBundledSkillsPath, getSkill, getSkillsInfo, listAvailableSkills } fr
 import { detectAIAgent } from "./utils/agent-detection.js";
 import { getAvailableAgents, getSkillsAgentId } from "./utils/agent-selection.js";
 import { ensureD3kHomeDir } from "./utils/d3k-dir.js";
+import { readProjectAgentName } from "./utils/project-metadata.js";
 import { getProjectDir, getProjectDisplayName } from "./utils/project-name.js";
 import { checkForSkillUpdates, getApplicablePackages, getSkillsPathForLocation, installSkillPackage, isPackageInstalled, updateSkills } from "./utils/skill-installer.js";
 import { DEFAULT_TMUX_CONFIG, generateSessionName, generateTmuxCommands, getTmuxInstallInstructions, isTmuxInstalled } from "./utils/tmux-helpers.js";
@@ -205,8 +284,13 @@ function buildD3kCommandWithOptions(options) {
         args.push(`--command "${options.command.replace(/"/g, '\\"')}"`);
     if (options.startupTimeout)
         args.push(`--startup-timeout ${options.startupTimeout}`);
+    if (options.browserNavigationTimeout) {
+        args.push(`--browser-navigation-timeout ${options.browserNavigationTimeout}`);
+    }
     if (options.profileDir)
         args.push(`--profile-dir "${options.profileDir}"`);
+    if (options.browserTool)
+        args.push(`--browser-tool ${options.browserTool}`);
     if (options.browser)
         args.push(`--browser "${options.browser}"`);
     if (options.serversOnly)
@@ -692,7 +776,9 @@ program
     .option("-s, --script <script>", "Script to run (e.g. dev, main.py) - auto-detected by project type")
     .option("-c, --command <command>", "Custom command to run (overrides auto-detection and --script)")
     .option("--startup-timeout <seconds>", "Seconds to wait for your app server to become reachable", "30")
+    .option("--browser-navigation-timeout <seconds>", "Seconds to wait for browser-initiated page navigation commands", "60")
     .option("--profile-dir <dir>", "Chrome profile directory")
+    .option("--browser-tool <tool>", "Preferred local browser CLI: 'agent-browser' (default) or 'next-browser'", "agent-browser")
     .option("--browser <path>", "Full path to browser executable (e.g. for Arc: '/Applications/Arc.app/Contents/MacOS/Arc')")
     .option("--servers-only", "Run servers only, skip browser launch")
     .option("--debug", "Enable debug logging to console (automatically disables TUI)")
@@ -721,7 +807,9 @@ program
             script: options.script,
             command: options.command,
             startupTimeout: options.startupTimeout,
+            browserNavigationTimeout: options.browserNavigationTimeout,
             profileDir: options.profileDir,
+            browserTool: options.browserTool,
             browser: browserOption,
             serversOnly: options.serversOnly,
             headless: options.headless,
@@ -749,7 +837,8 @@ program
         }
         else {
             // Always show prompt, pre-selecting the last-used option
-            selectedAgent = await promptAgentSelection(userConfig.defaultAgent?.name);
+            const preferredAgentName = readProjectAgentName() || userConfig.defaultAgent?.name;
+            selectedAgent = await promptAgentSelection(preferredAgentName);
             didPromptAgentSelection = true;
             if (selectedAgent) {
                 if (selectedAgent.name === "debug") {
@@ -880,11 +969,13 @@ program
                 command: options.command,
                 startupTimeout: options.startupTimeout,
                 profileDir: options.profileDir,
+                browserTool: options.browserTool,
                 browser: browserOption,
                 serversOnly: options.serversOnly,
                 headless: options.headless,
                 dateTime: options.dateTime,
-                pluginReactScan: options.pluginReactScan
+                pluginReactScan: options.pluginReactScan,
+                agentName: selectedAgent.name
             });
             return;
         }
@@ -922,10 +1013,16 @@ program
     const script = options.script || projectConfig.defaultScript;
     const userSetPort = options.port !== undefined;
     const startupTimeoutSeconds = Number.parseInt(options.startupTimeout, 10);
+    const browserNavigationTimeoutSeconds = Number.parseInt(options.browserNavigationTimeout, 10);
+    const browserTool = options.browserTool === "next-browser" ? "next-browser" : "agent-browser";
     if (Number.isNaN(startupTimeoutSeconds) || startupTimeoutSeconds <= 0) {
         console.error(chalk.red("\n❌ --startup-timeout must be a positive integer (seconds).\n"));
         process.exit(1);
     }
+    if (Number.isNaN(browserNavigationTimeoutSeconds) || browserNavigationTimeoutSeconds <= 0) {
+        console.error(chalk.red("\n❌ --browser-navigation-timeout must be a positive integer (seconds).\n"));
+        process.exit(1);
+    }
     // Generate server command based on custom command or project type
     let serverCommand;
     if (options.command) {
@@ -1007,6 +1104,7 @@ program
         await startDevEnvironment({
             ...options,
             browser: browserOption,
+            browserTool,
             port,
             debugPort: Number.parseInt(debugPort, 10),
             defaultPort: projectConfig.defaultPort,
@@ -1019,11 +1117,13 @@ program
             serversOnly: options.serversOnly,
             commandName,
             startupTimeoutSeconds,
+            browserNavigationTimeoutSeconds,
             tail: options.tail,
             tui: options.tui && !options.debug, // TUI is default unless --no-tui or --debug is specified
             portless: options.portless === true,
             dateTimeFormat: options.dateTime || "local",
             pluginReactScan: options.pluginReactScan || false,
+            agentName: options.agentName || undefined,
             skillsAgentId: skillsAgentId || undefined,
             autoSkills: options.skills !== false ? options.autoSkills || false : false,
             installSkills: options.skills !== false
@@ -1114,6 +1214,14 @@ program
     .command("agent-browser [args...]")
     .description("Run the bundled agent-browser CLI (e.g., d3k agent-browser screenshot /tmp/foo.png)")
     .allowUnknownOption(true);
+program
+    .command("next-browser [args...]")
+    .description("Run the bundled next-browser CLI (e.g., d3k next-browser open http://localhost:3000)")
+    .allowUnknownOption(true);
+program
+    .command("browser [args...]")
+    .description("Run the preferred local browser CLI for this session")
+    .allowUnknownOption(true);
 // Skill command - get skill content for use in prompts/workflows
 program
     .command("skill [name]")
@@ -1221,6 +1329,13 @@ program
     const { findComponent } = await import("./commands/find-component.js");
     await findComponent(selector);
 });
+program
+    .command("resume")
+    .description("Resume the last supported AI agent session for this project")
+    .action(async () => {
+    const { resumeLastAgent } = await import("./commands/resume.js");
+    await resumeLastAgent();
+});
 // CDP port command - get the CDP port from the session file
 program
     .command("cdp-port")