dev3000 0.0.174 → 0.0.175

package/README.md

@@ -62,9 +62,6 @@ d3k fix --time 30      # Analyze last 30 minutes (default: 10)
 d3k crawl              # Discover URLs by crawling the app
 d3k crawl --depth all  # Exhaustive crawl (default: 1 level)
 
-d3k find-component "nav.header"  # Find React component source
-d3k find-component "[data-testid='button']"
-
 d3k restart            # Restart the development server (rarely needed)
 ```
 
@@ -74,7 +71,6 @@ d3k restart            # Restart the development server (rarely needed)
 d3k skill [name]       # Get skill content or list available skills
 d3k upgrade            # Upgrade d3k to the latest version
 d3k agent-browser      # Run the bundled agent-browser CLI
-d3k cloud              # Cloud-based tools using Vercel Sandbox
 ```
 
 ## Options

package/dist/cdp-monitor.d.ts

@@ -17,6 +17,8 @@ export interface CDPTargetInfo {
     url?: string;
     webSocketDebuggerUrl?: string;
 }
+export declare const CHROME_CRASH_RESTORE_SUPPRESSION_FLAGS: string[];
+export declare function resetChromeCrashRestoreState(profileDir: string): number;
 export declare function getLoadingHtmlCandidates(currentDir: string, execPath?: string): string[];
 export declare function selectCDPTarget(targets: CDPTargetInfo[], options?: {
     appServerPort?: string;
@@ -114,6 +116,7 @@ export declare class CDPMonitor {
      */
     prepareShutdown(): void;
     private waitForBrowserExit;
+    private sendBrowserCloseCommand;
     shutdown(): Promise<void>;
     private killInstanceChromeProcesses;
 }

package/dist/cdp-monitor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cdp-monitor.d.ts","sourceRoot":"","sources":["../src/cdp-monitor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cdp-monitor.d.ts","sourceRoot":"","sources":["../src/cdp-monitor.ts"],"names":[],"mappings":"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"}

package/dist/cdp-monitor.js

@@ -1,5 +1,5 @@
 import { spawn } from "child_process";
-import { existsSync, mkdtempSync, readFileSync, writeFileSync } from "fs";
+import { existsSync, mkdtempSync, readdirSync, readFileSync, writeFileSync } from "fs";
 import { tmpdir } from "os";
 import { dirname, join } from "path";
 import { fileURLToPath } from "url";
@@ -45,6 +45,98 @@ const EMBEDDED_LOADING_HTML = `<!DOCTYPE html>
 </html>`;
 const DEFAULT_CDP_COMMAND_TIMEOUT_MS = 10000;
 const DEFAULT_NAVIGATION_TIMEOUT_MS = 60000;
+export const CHROME_CRASH_RESTORE_SUPPRESSION_FLAGS = [
+    "--disable-session-crashed-bubble",
+    "--disable-restore-session-state",
+    "--hide-crash-restore-bubble"
+];
+function isRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function patchChromePreferences(data) {
+    let changed = false;
+    const profile = isRecord(data.profile) ? data.profile : {};
+    if (data.profile !== profile) {
+        data.profile = profile;
+        changed = true;
+    }
+    if (profile.exit_type !== "Normal") {
+        profile.exit_type = "Normal";
+        changed = true;
+    }
+    if (profile.exited_cleanly !== true) {
+        profile.exited_cleanly = true;
+        changed = true;
+    }
+    return changed;
+}
+function patchChromeLocalState(data) {
+    let changed = false;
+    if (data.exit_type === "Crashed") {
+        data.exit_type = "Normal";
+        changed = true;
+    }
+    if (data.exited_cleanly === false) {
+        data.exited_cleanly = true;
+        changed = true;
+    }
+    if (isRecord(data.profile)) {
+        if (data.profile.exit_type === "Crashed") {
+            data.profile.exit_type = "Normal";
+            changed = true;
+        }
+        if (data.profile.exited_cleanly === false) {
+            data.profile.exited_cleanly = true;
+            changed = true;
+        }
+    }
+    return changed;
+}
+function patchJsonFile(filePath, patch) {
+    if (!existsSync(filePath)) {
+        return false;
+    }
+    try {
+        const data = JSON.parse(readFileSync(filePath, "utf-8"));
+        if (!isRecord(data) || !patch(data)) {
+            return false;
+        }
+        writeFileSync(filePath, JSON.stringify(data));
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function getChromePreferencesFiles(profileDir) {
+    const files = new Set([join(profileDir, "Default", "Preferences")]);
+    if (!existsSync(profileDir)) {
+        return Array.from(files);
+    }
+    try {
+        for (const entry of readdirSync(profileDir, { withFileTypes: true })) {
+            if (entry.isDirectory() && (entry.name === "Default" || entry.name.startsWith("Profile "))) {
+                files.add(join(profileDir, entry.name, "Preferences"));
+            }
+        }
+    }
+    catch {
+        // Ignore unreadable profile directories.
+    }
+    return Array.from(files);
+}
+export function resetChromeCrashRestoreState(profileDir) {
+    let changedFiles = 0;
+    for (const preferencesFile of getChromePreferencesFiles(profileDir)) {
+        if (patchJsonFile(preferencesFile, patchChromePreferences)) {
+            changedFiles++;
+        }
+    }
+    if (patchJsonFile(join(profileDir, "Local State"), patchChromeLocalState)) {
+        changedFiles++;
+    }
+    return changedFiles;
+}
 export function getLoadingHtmlCandidates(currentDir, execPath = process.execPath) {
     const candidates = [join(currentDir, "src/loading.html"), join(currentDir, "loading.html")];
     const packageRoot = dirname(dirname(execPath));
@@ -438,10 +530,21 @@ export class CDPMonitor {
      */
     async killExistingChromeWithProfile() {
         try {
-            // Find Chrome processes using this profile directory
+            // Build a set of PIDs that must never be killed: this Node process and
+            // its parent. d3k's own argv contains the profile path (via --profile-dir),
+            // which previously caused a substring match here and made d3k SIGTERM itself.
+            const selfPids = new Set();
+            if (typeof process.pid === "number")
+                selfPids.add(process.pid);
+            if (typeof process.ppid === "number")
+                selfPids.add(process.ppid);
+            // Find Chrome processes using this profile directory. We only match the
+            // canonical `--user-data-dir=<profile>` form Chrome consumes; matching the
+            // bare path was too loose and caught unrelated processes (including d3k itself).
             const processes = await this.listProcesses();
             const pids = processes
-                .filter((proc) => proc.command.includes(`--user-data-dir=${this.profileDir}`) || proc.command.includes(this.profileDir))
+                .filter((proc) => !selfPids.has(proc.pid))
+                .filter((proc) => proc.command.includes(`--user-data-dir=${this.profileDir}`))
                 .map((proc) => proc.pid)
                 .filter((pid) => pid !== this.browser?.pid);
             for (const pid of pids) {
@@ -465,6 +568,10 @@ export class CDPMonitor {
     async launchChrome() {
         // Kill any existing Chrome using this profile to prevent CDP conflicts
         await this.killExistingChromeWithProfile();
+        const resetProfileFiles = resetChromeCrashRestoreState(this.profileDir);
+        if (resetProfileFiles > 0) {
+            this.debugLog(`Reset Chrome crash restore state in ${resetProfileFiles} profile file(s)`);
+        }
         return new Promise((resolve, reject) => {
             // Use custom browser path if provided, otherwise try different Chrome executables based on platform
             const chromeCommands = this.browserPath
@@ -474,6 +581,8 @@ export class CDPMonitor {
                     "google-chrome",
                     "chrome",
                     "chromium",
+                    "brave",
+                    "brave-browser",
                     "/Applications/Arc.app/Contents/MacOS/Arc",
                     "/Applications/Comet.app/Contents/MacOS/Comet",
                     "/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge"
@@ -513,8 +622,7 @@ export class CDPMonitor {
                     "--disable-sync",
                     "--metrics-recording-only",
                     "--disable-default-apps",
-                    "--disable-session-crashed-bubble",
-                    "--disable-restore-session-state"
+                    ...CHROME_CRASH_RESTORE_SUPPRESSION_FLAGS
                 ];
                 if (shouldEnableReactDevTools && reactDevToolsExtensionPath) {
                     chromeArgs.push(`--disable-extensions-except=${reactDevToolsExtensionPath}`);
@@ -1774,49 +1882,128 @@ export class CDPMonitor {
             browser.once("exit", onExit);
         });
     }
+    async sendBrowserCloseCommand() {
+        try {
+            await this.sendCDPCommand("Browser.close", {}, 3000);
+            this.debugLog("Sent Browser.close command");
+            return;
+        }
+        catch (error) {
+            this.debugLog(`Browser.close on page target failed: ${error}`);
+        }
+        const versionResponse = await fetch(`http://localhost:${this.debugPort}/json/version`, {
+            signal: AbortSignal.timeout(1000)
+        });
+        if (!versionResponse.ok) {
+            throw new Error(`Failed to get browser CDP endpoint: HTTP ${versionResponse.status}`);
+        }
+        const version = (await versionResponse.json());
+        if (!version.webSocketDebuggerUrl) {
+            throw new Error("Browser CDP endpoint did not include webSocketDebuggerUrl");
+        }
+        await new Promise((resolve, reject) => {
+            const ws = new WebSocket(version.webSocketDebuggerUrl);
+            let commandSent = false;
+            let settled = false;
+            const settle = (callback) => {
+                if (settled)
+                    return;
+                settled = true;
+                clearTimeout(timeout);
+                try {
+                    ws.close();
+                }
+                catch {
+                    // Ignore close errors.
+                }
+                callback();
+            };
+            const timeout = setTimeout(() => {
+                settle(() => reject(new Error("Browser.close command timed out")));
+            }, 3000);
+            ws.on("open", () => {
+                commandSent = true;
+                ws.send(JSON.stringify({ id: 1, method: "Browser.close", params: {} }), (error) => {
+                    if (error) {
+                        settle(() => reject(error));
+                    }
+                });
+            });
+            ws.on("message", (data) => {
+                try {
+                    const message = JSON.parse(data.toString());
+                    if (message.id !== 1) {
+                        return;
+                    }
+                    const responseError = message.error;
+                    if (responseError) {
+                        settle(() => reject(new Error(responseError.message || "Browser.close failed")));
+                        return;
+                    }
+                    settle(resolve);
+                }
+                catch (error) {
+                    settle(() => reject(error instanceof Error ? error : new Error(String(error))));
+                }
+            });
+            ws.on("error", (error) => {
+                settle(() => reject(error));
+            });
+            ws.on("close", () => {
+                if (commandSent) {
+                    settle(resolve);
+                }
+                else {
+                    settle(() => reject(new Error("Browser CDP websocket closed before Browser.close was sent")));
+                }
+            });
+        });
+        this.debugLog("Sent Browser.close command via browser CDP endpoint");
+    }
     async shutdown() {
         this.isShuttingDown = true;
         let browserClosedCleanly = false;
         // Ask the browser process to exit first so Chrome doesn't think it crashed.
-        if (this.connection?.sessionId) {
+        if (this.connection) {
             try {
-                await this.sendCDPCommand("Browser.close");
-                this.debugLog("Sent Browser.close command");
-                browserClosedCleanly = await this.waitForBrowserExit(2000);
+                await this.sendBrowserCloseCommand();
+                browserClosedCleanly = await this.waitForBrowserExit(5000);
             }
             catch (_e) {
                 this.debugLog("Browser.close failed, trying page/tab close fallback");
             }
-            try {
-                // Try to close the page
-                await this.sendCDPCommand("Page.close");
-                this.debugLog("Sent Page.close command");
-                await new Promise((resolve) => setTimeout(resolve, 100));
-            }
-            catch (_e) {
-                this.debugLog("Page.close failed, trying Target.closeTarget");
-            }
-            try {
-                // Get the list of targets to find our specific tab
-                const targets = (await this.sendCDPCommand("Target.getTargets"));
-                this.debugLog(`Found ${targets.targetInfos?.length || 0} targets`);
-                // Find our page target
-                const pageTarget = targets.targetInfos?.find((t) => t.type === "page");
-                if (pageTarget) {
-                    this.debugLog(`Closing page target: ${pageTarget.targetId}`);
-                    await this.sendCDPCommand("Target.closeTarget", {
-                        targetId: pageTarget.targetId
-                    });
-                    this.debugLog("Closed Chrome tab via CDP");
-                }
-                // Give it more time for the tab to close
-                await new Promise((resolve) => setTimeout(resolve, 1000));
-            }
-            catch (_e) {
-                this.debugLog("Failed to close tab via CDP, will force close Chrome");
-            }
             if (!browserClosedCleanly) {
-                browserClosedCleanly = await this.waitForBrowserExit(1500);
+                try {
+                    // Try to close the page
+                    await this.sendCDPCommand("Page.close");
+                    this.debugLog("Sent Page.close command");
+                    await new Promise((resolve) => setTimeout(resolve, 100));
+                }
+                catch (_e) {
+                    this.debugLog("Page.close failed, trying Target.closeTarget");
+                }
+                try {
+                    // Get the list of targets to find our specific tab
+                    const targets = (await this.sendCDPCommand("Target.getTargets"));
+                    this.debugLog(`Found ${targets.targetInfos?.length || 0} targets`);
+                    // Find our page target
+                    const pageTarget = targets.targetInfos?.find((t) => t.type === "page");
+                    if (pageTarget) {
+                        this.debugLog(`Closing page target: ${pageTarget.targetId}`);
+                        await this.sendCDPCommand("Target.closeTarget", {
+                            targetId: pageTarget.targetId
+                        });
+                        this.debugLog("Closed Chrome tab via CDP");
+                    }
+                    // Give it more time for the tab to close
+                    await new Promise((resolve) => setTimeout(resolve, 1000));
+                }
+                catch (_e) {
+                    this.debugLog("Failed to close tab via CDP, will force close Chrome");
+                }
+                if (!browserClosedCleanly) {
+                    browserClosedCleanly = await this.waitForBrowserExit(1500);
+                }
             }
         }
         // Close CDP connection