@codeyam/codeyam-cli 0.1.0-staging.415103 → 0.1.0-staging.44b55c1

package/codeyam-cli/src/webserver/editorProxy.js

@@ -3,16 +3,157 @@ import net from 'net';
 import fs from 'fs';
 import path from 'path';
 import { getProjectRoot } from "../state.js";
+import { createMockStateManager, } from "../utils/editorMockState.js";
+import { computeEditorPorts } from "../utils/editorDevServer.js";
+/**
+ * Normalize a target URL by stripping trailing slashes for consistency.
+ *
+ * Previously this also replaced `localhost` with `127.0.0.1`, but that broke
+ * forwarding to dev servers that bind to IPv6 only (e.g. Vite 6 on macOS
+ * binds to `[::1]`). The hostname is now left as-is — `resolveLoopbackAddress`
+ * probes the actual target at startup to pick the right address.
+ */
+export function normalizeTargetUrl(url) {
+    try {
+        const parsed = new URL(url);
+        return parsed.toString().replace(/\/$/, '');
+    }
+    catch {
+        return url;
+    }
+}
+/**
+ * Probe a localhost port to determine the correct loopback address.
+ * Dev servers may bind to IPv4 (127.0.0.1), IPv6 (::1), or both.
+ * Returns the first address that accepts a TCP connection.
+ */
+export async function resolveLoopbackAddress(port) {
+    const candidates = ['127.0.0.1', '::1'];
+    for (const host of candidates) {
+        try {
+            const connected = await new Promise((resolve) => {
+                const socket = new net.Socket();
+                socket.setTimeout(1000);
+                socket.once('connect', () => {
+                    socket.destroy();
+                    resolve(true);
+                });
+                socket.once('error', () => {
+                    socket.destroy();
+                    resolve(false);
+                });
+                socket.once('timeout', () => {
+                    socket.destroy();
+                    resolve(false);
+                });
+                socket.connect(port, host);
+            });
+            if (connected) {
+                return host;
+            }
+        }
+        catch {
+            // Try next candidate
+        }
+    }
+    return null;
+}
 // Global key so the proxy survives HMR
 const GLOBAL_KEY = '__codeyam_editor_proxy__';
+// ─── Live Preview Health ─────────────────────────────────────────────
+const PREVIEW_HEALTH_KEY = '__codeyam_preview_health__';
+function getPreviewHealth() {
+    return globalThis[PREVIEW_HEALTH_KEY] ?? null;
+}
+function setPreviewHealth(report) {
+    globalThis[PREVIEW_HEALTH_KEY] = report;
+}
+/**
+ * Get the current live preview health report (read by API endpoint).
+ */
+export function getPreviewHealthReport() {
+    return getPreviewHealth();
+}
+/**
+ * Reset preview health state (called when a new HTML page is served).
+ */
+export function resetPreviewHealth() {
+    setPreviewHealth(null);
+}
+/**
+ * Error-catching script injected into HTML responses.
+ * Uses vanilla JS for maximum compatibility.
+ */
+export const PREVIEW_HEALTH_SCRIPT = `<script data-codeyam-health>
+(function() {
+  var errors = [];
+  var reported = false;
+  function report(type, msg, stack) {
+    errors.push({ type: type, message: msg, stack: stack, timestamp: Date.now() });
+    if (!reported) {
+      reported = true;
+      setTimeout(function() { flush(); }, 500);
+    }
+  }
+  function flush() {
+    fetch('/__codeyam__/preview-health', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ errors: errors, url: location.href })
+    }).catch(function(){});
+    reported = false;
+    errors = [];
+  }
+  window.addEventListener('error', function(e) {
+    report('error', e.message, e.error && e.error.stack);
+  });
+  window.addEventListener('unhandledrejection', function(e) {
+    report('unhandledrejection', String(e.reason), e.reason && e.reason.stack);
+  });
+  var origError = console.error;
+  console.error = function() {
+    report('console.error', Array.prototype.join.call(arguments, ' '));
+    origError.apply(console, arguments);
+  };
+  window.addEventListener('load', function() {
+    setTimeout(function() {
+      var hasContent = document.body && document.body.innerText.trim().length > 0;
+      fetch('/__codeyam__/preview-health', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          loaded: true,
+          hasContent: hasContent,
+          url: location.href,
+          errorCount: errors.length
+        })
+      }).catch(function(){});
+    }, 1000);
+  });
+})();
+</script>`;
 const CACHE_TTL_MS = 500;
 let scenarioCache = { data: null, timestamp: 0 };
+// Session config extracted from the active scenario — drives cookie injection
+let sessionConfig = undefined;
+// Max body size to buffer for mock matching (10MB)
+const MAX_BODY_SIZE = 10 * 1024 * 1024;
 function getProxyState() {
     return globalThis[GLOBAL_KEY] ?? null;
 }
 function setProxyState(state) {
     globalThis[GLOBAL_KEY] = state;
 }
+/**
+ * Get or create the mock state manager (survives HMR via globalThis).
+ */
+function getMockStateManager() {
+    const key = '__codeyam_mock_state__';
+    if (!globalThis[key]) {
+        globalThis[key] = createMockStateManager();
+    }
+    return globalThis[key];
+}
 /**
  * Get the proxy URL if the proxy is running.
  */
@@ -24,6 +165,13 @@ export function getProxyUrl() {
 }
 /**
  * Read the active scenario's mock data from disk, with brief caching.
+ * Feeds the data into the MockStateManager.
+ *
+ * For application/user scenarios (type-aware): only loads `externalApis`
+ * into the mock state manager. All DB-backed routes flow through to the
+ * real app (database is seeded with real data).
+ *
+ * For component scenarios (or legacy): loads all routes as before.
  */
 function readScenarioData() {
     const now = Date.now();
@@ -50,9 +198,31 @@ function readScenarioData() {
             scenarioCache = { data: null, timestamp: now };
             return null;
         }
-        const data = JSON.parse(fs.readFileSync(dataFilePath, 'utf-8'));
-        scenarioCache = { data, timestamp: now };
-        return data;
+        const rawData = JSON.parse(fs.readFileSync(dataFilePath, 'utf-8'));
+        // Extract session config for cookie injection
+        sessionConfig = rawData.session || null;
+        // Type-aware: for seed-based scenarios, only serve externalApis via proxy
+        const scenarioType = active.type || rawData.type || null;
+        let mockData;
+        if ((scenarioType === 'application' || scenarioType === 'user') &&
+            rawData.seed) {
+            // Seed-based scenario: only load externalApis as routes for the proxy
+            if (rawData.externalApis && typeof rawData.externalApis === 'object') {
+                mockData = { routes: rawData.externalApis };
+            }
+            else {
+                // No external APIs — proxy passes everything through
+                mockData = {};
+            }
+        }
+        else {
+            // Component/legacy scenario: load all data
+            mockData = rawData;
+        }
+        scenarioCache = { data: mockData, timestamp: now };
+        // Feed into mock state manager (smart reload handles dedup)
+        getMockStateManager().loadScenario(mockData);
+        return mockData;
     }
     catch (err) {
         console.warn('[editorProxy] Error reading scenario data:', err);
@@ -61,50 +231,153 @@ function readScenarioData() {
     }
 }
 /**
- * Find a matching route in the scenario data.
- *
- * Supports two formats:
- * - New route-keyed: { "routes": { "/api/drinks": { "body": [...] } } }
- * - Legacy key-based: { "drinks": [...] } → matches /api/drinks
+ * Buffer the request body, up to MAX_BODY_SIZE.
+ * Returns null if the body exceeds the limit.
  */
-export function findMatchingRoute(pathname, scenarioData) {
-    // New format: check routes map
-    const routes = scenarioData.routes;
-    if (routes && typeof routes === 'object') {
-        const routeEntry = routes[pathname];
-        if (routeEntry && typeof routeEntry === 'object') {
-            const entry = routeEntry;
-            return {
-                body: entry.body ?? routeEntry,
-                status: typeof entry.status === 'number' ? entry.status : 200,
-            };
-        }
+function bufferRequestBody(req) {
+    return new Promise((resolve) => {
+        const chunks = [];
+        let totalSize = 0;
+        req.on('data', (chunk) => {
+            totalSize += chunk.length;
+            if (totalSize > MAX_BODY_SIZE) {
+                resolve(null); // Too large — skip mock matching
+                req.resume(); // Drain remaining
+            }
+            else {
+                chunks.push(chunk);
+            }
+        });
+        req.on('end', () => {
+            if (totalSize > MAX_BODY_SIZE)
+                return; // Already resolved
+            resolve(Buffer.concat(chunks));
+        });
+        req.on('error', () => {
+            resolve(null);
+        });
+    });
+}
+/**
+ * Strip IPv6 bracket notation for use with http.request hostname.
+ * URL.hostname returns `[::1]` for IPv6 but http.request needs `::1`.
+ */
+function stripIPv6Brackets(hostname) {
+    if (hostname.startsWith('[') && hostname.endsWith(']')) {
+        return hostname.slice(1, -1);
+    }
+    return hostname;
+}
+/**
+ * Forward a buffered request to the target dev server.
+ * Unlike the streaming forwardRequest, this replays a buffered body.
+ */
+function forwardBufferedRequest(req, res, targetUrl, bodyBuffer) {
+    const target = new URL(targetUrl);
+    const hostname = stripIPv6Brackets(target.hostname);
+    const headers = { ...req.headers, host: `${target.hostname}:${target.port}` };
+    // Remove accept-encoding so the dev server returns uncompressed responses.
+    // The proxy injects a health script into HTML — this fails on compressed bodies.
+    delete headers['accept-encoding'];
+    // Update content-length if we have the body buffer
+    if (bodyBuffer) {
+        headers['content-length'] = String(bodyBuffer.length);
     }
-    // Legacy format: key "drinks" matches "/api/drinks"
-    // Extract the last segment of the path after /api/
-    const apiMatch = pathname.match(/^\/api\/(.+)$/);
-    if (apiMatch) {
-        const key = apiMatch[1];
-        if (key in scenarioData && key !== 'routes') {
-            return { body: scenarioData[key], status: 200 };
+    const options = {
+        hostname,
+        port: target.port,
+        path: req.url,
+        method: req.method,
+        headers,
+    };
+    const proxyReq = http.request(options, (proxyRes) => {
+        const status = proxyRes.statusCode || 200;
+        if (status >= 400) {
+            console.warn(`[editorProxy] Target returned ${status} for ${req.method} ${req.url}`);
+        }
+        const headers = { ...proxyRes.headers };
+        injectSessionCookie(headers);
+        // Check if response is HTML — if so, buffer and inject health script
+        const contentType = proxyRes.headers['content-type'] || '';
+        if (contentType.includes('text/html')) {
+            resetPreviewHealth();
+            const chunks = [];
+            proxyRes.on('data', (chunk) => chunks.push(chunk));
+            proxyRes.on('end', () => {
+                const body = Buffer.concat(chunks).toString('utf-8');
+                const injected = injectHealthScript(body);
+                delete headers['content-length'];
+                delete headers['content-encoding'];
+                res.writeHead(status, headers);
+                res.end(injected);
+            });
+            return;
         }
+        res.writeHead(status, headers);
+        proxyRes.pipe(res, { end: true });
+    });
+    proxyReq.on('error', (err) => {
+        console.warn(`[editorProxy] Forward error for ${req.method} ${req.url}: ${err.message}`);
+        if (!res.headersSent) {
+            res.writeHead(502, { 'Content-Type': 'text/plain' });
+            res.end('Bad Gateway — dev server unreachable');
+        }
+    });
+    if (bodyBuffer && bodyBuffer.length > 0) {
+        proxyReq.end(bodyBuffer);
+    }
+    else {
+        proxyReq.end();
     }
-    return null;
 }
 /**
  * Forward an HTTP request to the target dev server.
+ * For HTML responses: buffers body to inject health-check script.
+ * For non-HTML responses: pipes directly (no buffering).
  */
 function forwardRequest(req, res, targetUrl) {
     const target = new URL(targetUrl);
+    const hostname = stripIPv6Brackets(target.hostname);
+    // Build headers, stripping accept-encoding so the dev server returns uncompressed
+    // responses. The proxy injects a health script into HTML — this fails on compressed bodies.
+    const { 'accept-encoding': _ae, ...forwardHeaders } = req.headers;
     const options = {
-        hostname: target.hostname,
+        hostname,
         port: target.port,
         path: req.url,
         method: req.method,
-        headers: { ...req.headers, host: `${target.hostname}:${target.port}` },
+        headers: {
+            ...forwardHeaders,
+            host: `${target.hostname}:${target.port}`,
+        },
     };
     const proxyReq = http.request(options, (proxyRes) => {
-        res.writeHead(proxyRes.statusCode || 200, proxyRes.headers);
+        const status = proxyRes.statusCode || 200;
+        if (status >= 400) {
+            console.warn(`[editorProxy] Target returned ${status} for ${req.method} ${req.url}`);
+        }
+        const headers = { ...proxyRes.headers };
+        injectSessionCookie(headers);
+        // Check if response is HTML — if so, buffer and inject health script
+        const contentType = proxyRes.headers['content-type'] || '';
+        if (contentType.includes('text/html')) {
+            // Reset health state for new page loads
+            resetPreviewHealth();
+            const chunks = [];
+            proxyRes.on('data', (chunk) => chunks.push(chunk));
+            proxyRes.on('end', () => {
+                const body = Buffer.concat(chunks).toString('utf-8');
+                const injected = injectHealthScript(body);
+                // Remove content-length since body size changed; use chunked transfer
+                delete headers['content-length'];
+                // Remove content-encoding since we're serving uncompressed
+                delete headers['content-encoding'];
+                res.writeHead(status, headers);
+                res.end(injected);
+            });
+            return;
+        }
+        res.writeHead(status, headers);
         proxyRes.pipe(res, { end: true });
     });
     proxyReq.on('error', (err) => {
@@ -116,14 +389,100 @@ function forwardRequest(req, res, targetUrl) {
     });
     req.pipe(proxyReq, { end: true });
 }
+/**
+ * Inject or clear the session-token cookie on proxied responses.
+ * When a scenario has session.cookieValue, sets the cookie to auto-log the user in.
+ * When a scenario has no session field (null), clears any existing session cookie.
+ * When sessionConfig is undefined (no scenario loaded yet), does nothing.
+ */
+function injectSessionCookie(headers) {
+    if (sessionConfig === undefined)
+        return;
+    let cookie;
+    if (sessionConfig?.cookieValue) {
+        cookie = `session-token=${sessionConfig.cookieValue}; Path=/; SameSite=Lax`;
+    }
+    else {
+        // No session config — clear any existing session cookie
+        cookie = `session-token=; Path=/; Max-Age=0`;
+    }
+    const existing = headers['set-cookie'];
+    if (existing) {
+        headers['set-cookie'] = [
+            ...(Array.isArray(existing) ? existing : [existing]),
+            cookie,
+        ];
+    }
+    else {
+        headers['set-cookie'] = [cookie];
+    }
+}
+/**
+ * Get the current session config (for testing).
+ */
+export function getSessionConfig() {
+    return sessionConfig;
+}
+/**
+ * Inject the health-check script into an HTML response body.
+ * Inserts before </head> if present, otherwise before </body>, otherwise appends.
+ */
+export function injectHealthScript(html) {
+    if (html.includes('</head>')) {
+        return html.replace('</head>', PREVIEW_HEALTH_SCRIPT + '</head>');
+    }
+    if (html.includes('</body>')) {
+        return html.replace('</body>', PREVIEW_HEALTH_SCRIPT + '</body>');
+    }
+    return html + PREVIEW_HEALTH_SCRIPT;
+}
+/**
+ * Handle POST /__codeyam__/preview-health — store health data in globalThis.
+ */
+function handlePreviewHealthPost(req, res) {
+    const chunks = [];
+    req.on('data', (chunk) => chunks.push(chunk));
+    req.on('end', () => {
+        try {
+            const body = JSON.parse(Buffer.concat(chunks).toString('utf-8'));
+            const current = getPreviewHealth() || {
+                errors: [],
+                loaded: false,
+                hasContent: false,
+                url: '',
+                lastUpdated: 0,
+            };
+            if (body.errors && Array.isArray(body.errors)) {
+                current.errors = current.errors.concat(body.errors);
+            }
+            if (body.loaded !== undefined) {
+                current.loaded = body.loaded;
+            }
+            if (body.hasContent !== undefined) {
+                current.hasContent = body.hasContent;
+            }
+            if (body.url) {
+                current.url = body.url;
+            }
+            current.lastUpdated = Date.now();
+            setPreviewHealth(current);
+        }
+        catch {
+            // Ignore malformed JSON
+        }
+        res.writeHead(204);
+        res.end();
+    });
+}
 /**
  * Handle WebSocket upgrade by piping to the target dev server.
  */
 function handleUpgrade(req, socket, head, targetUrl) {
     const target = new URL(targetUrl);
+    const hostname = stripIPv6Brackets(target.hostname);
     const port = parseInt(target.port, 10) || 80;
-    console.log(`[editorProxy] WebSocket upgrade: ${req.url} → ${target.hostname}:${port}`);
-    const proxySocket = net.connect(port, target.hostname, () => {
+    console.log(`[editorProxy] WebSocket upgrade: ${req.url} → ${hostname}:${port}`);
+    const proxySocket = net.connect(port, hostname, () => {
         // Reconstruct the HTTP upgrade request
         const requestLine = `${req.method} ${req.url} HTTP/${req.httpVersion}\r\n`;
         const headers = Object.entries(req.headers)
@@ -146,38 +505,144 @@ function handleUpgrade(req, socket, head, targetUrl) {
         proxySocket.destroy();
     });
 }
+/**
+ * Write proxy-config.json so the preload module can discover the proxy.
+ */
+function writeProxyConfig(proxyPort, targetUrl) {
+    const projectRoot = getProjectRoot() || process.env.CODEYAM_ROOT_PATH || process.cwd();
+    const configPath = path.join(projectRoot, '.codeyam', 'proxy-config.json');
+    try {
+        fs.mkdirSync(path.dirname(configPath), { recursive: true });
+        fs.writeFileSync(configPath, JSON.stringify({
+            proxyUrl: `http://localhost:${proxyPort}`,
+            devServerUrl: targetUrl,
+        }), 'utf-8');
+        console.log(`[editorProxy] Wrote proxy config to ${configPath}`);
+    }
+    catch (err) {
+        console.warn('[editorProxy] Failed to write proxy-config.json:', err);
+    }
+}
+/**
+ * Remove proxy-config.json on proxy stop.
+ */
+function removeProxyConfig() {
+    const projectRoot = getProjectRoot() || process.env.CODEYAM_ROOT_PATH || process.cwd();
+    const configPath = path.join(projectRoot, '.codeyam', 'proxy-config.json');
+    try {
+        if (fs.existsSync(configPath)) {
+            fs.unlinkSync(configPath);
+        }
+    }
+    catch {
+        // Best effort
+    }
+}
 /**
  * Start the editor proxy server.
- * Intercepts GET requests to API routes matching the active scenario, forwards everything else.
+ * Intercepts requests to API routes matching the active scenario, forwards everything else.
+ * Supports all HTTP methods (GET, POST, PUT, DELETE, PATCH) with body buffering.
  */
 export async function startEditorProxy(options) {
     // Stop existing proxy first
     await stopEditorProxy();
-    const { targetUrl } = options;
+    let targetUrl = normalizeTargetUrl(options.targetUrl);
     let port = options.port;
+    // When the target is localhost, probe to find the correct loopback address.
+    // Dev servers may bind to IPv4 (127.0.0.1) or IPv6 (::1) — Vite 6 on macOS
+    // binds to ::1 by default. We need to match the actual binding.
+    try {
+        const parsed = new URL(targetUrl);
+        if (parsed.hostname === 'localhost') {
+            const targetPort = parseInt(parsed.port || '80', 10);
+            const resolvedHost = await resolveLoopbackAddress(targetPort);
+            if (resolvedHost) {
+                parsed.hostname = resolvedHost;
+                targetUrl = parsed.toString().replace(/\/$/, '');
+                console.log(`[editorProxy] Resolved localhost to ${resolvedHost} for port ${targetPort}`);
+            }
+        }
+    }
+    catch {
+        // Keep original targetUrl
+    }
     console.log(`[editorProxy] Starting proxy (requested port ${port}, target ${targetUrl})`);
+    const mockState = getMockStateManager();
     const server = http.createServer((req, res) => {
-        const parsedUrl = new URL(req.url || '/', `http://localhost:${port}`);
-        const pathname = parsedUrl.pathname;
-        // Only intercept GET requests
-        if (req.method === 'GET') {
-            const scenarioData = readScenarioData();
-            if (scenarioData) {
-                const match = findMatchingRoute(pathname, scenarioData);
+        void (async () => {
+            const parsedUrl = new URL(req.url || '/', `http://localhost:${port}`);
+            const pathname = parsedUrl.pathname;
+            const method = req.method || 'GET';
+            // CORS preflight — permissive 204 for browser cross-origin requests
+            if (method === 'OPTIONS') {
+                res.writeHead(204, {
+                    'Access-Control-Allow-Origin': '*',
+                    'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, PATCH, OPTIONS',
+                    'Access-Control-Allow-Headers': 'Content-Type, Authorization, X-Requested-With',
+                    'Access-Control-Max-Age': '86400',
+                });
+                res.end();
+                return;
+            }
+            // Intercept preview health reports from the injected script
+            if (method === 'POST' && pathname === '/__codeyam__/preview-health') {
+                handlePreviewHealthPost(req, res);
+                return;
+            }
+            // Load scenario data (also feeds MockStateManager)
+            readScenarioData();
+            // For methods that may carry a body, buffer it first
+            const needsBody = method === 'POST' ||
+                method === 'PUT' ||
+                method === 'DELETE' ||
+                method === 'PATCH';
+            if (needsBody) {
+                const bodyBuffer = await bufferRequestBody(req);
+                if (bodyBuffer === null) {
+                    // Body too large — forward without mock matching
+                    forwardBufferedRequest(req, res, targetUrl, null);
+                    return;
+                }
+                // Try to parse body as JSON for mock matching
+                let parsedBody = undefined;
+                if (bodyBuffer.length > 0) {
+                    try {
+                        parsedBody = JSON.parse(bodyBuffer.toString('utf-8'));
+                    }
+                    catch {
+                        // Not JSON — that's fine, still try mock matching without parsed body
+                    }
+                }
+                const match = mockState.matchRequest(method, pathname, parsedBody);
                 if (match) {
-                    console.log(`[editorProxy] Intercepted ${req.method} ${pathname} → scenario data (status ${match.status})`);
+                    console.log(`[editorProxy] Intercepted ${method} ${pathname} → mock response (status ${match.status})`);
                     res.writeHead(match.status, {
                         'Content-Type': 'application/json',
                         'Access-Control-Allow-Origin': '*',
                         'X-CodeYam-Proxy': 'scenario-data',
                     });
-                    res.end(JSON.stringify(match.body));
+                    res.end(match.body != null ? JSON.stringify(match.body) : '');
                     return;
                 }
+                // No mock match — forward with buffered body
+                forwardBufferedRequest(req, res, targetUrl, bodyBuffer);
+                return;
             }
-        }
-        // Forward everything else to the dev server
-        forwardRequest(req, res, targetUrl);
+            // GET, HEAD, etc. — try mock matching (no body)
+            const match = mockState.matchRequest(method, pathname);
+            if (match) {
+                console.log(`[editorProxy] Intercepted ${method} ${pathname} → mock response (status ${match.status})`);
+                res.writeHead(match.status, {
+                    'Content-Type': 'application/json',
+                    'Access-Control-Allow-Origin': '*',
+                    'X-CodeYam-Proxy': 'scenario-data',
+                });
+                res.end(match.body != null ? JSON.stringify(match.body) : '');
+                return;
+            }
+            // Forward everything else to the dev server
+            forwardRequest(req, res, targetUrl);
+        })();
     });
     // Handle WebSocket upgrades (for HMR)
     server.on('upgrade', (req, socket, head) => {
@@ -195,9 +660,14 @@ export async function startEditorProxy(options) {
                     resolve();
                 });
             });
-            port = currentPort;
+            // When port 0 is requested, the OS assigns an ephemeral port
+            const addr = server.address();
+            port =
+                typeof addr === 'object' && addr !== null ? addr.port : currentPort;
             const state = { server, port, targetUrl };
             setProxyState(state);
+            // Write proxy-config.json for the preload module
+            writeProxyConfig(port, targetUrl);
             console.log(`[editorProxy] Proxy started on port ${port}, forwarding to ${targetUrl}`);
             return { port };
         }
@@ -220,6 +690,7 @@ export async function stopEditorProxy() {
     if (!state)
         return;
     console.log(`[editorProxy] Stopping proxy on port ${state.port}`);
+    removeProxyConfig();
     return new Promise((resolve) => {
         state.server.close(() => {
             console.log('[editorProxy] Proxy stopped');
@@ -235,6 +706,37 @@ export async function stopEditorProxy() {
  */
 export function invalidateScenarioCache() {
     scenarioCache = { data: null, timestamp: 0 };
+    sessionConfig = undefined;
+}
+/**
+ * Verify that the proxy can successfully forward a request to the target dev server.
+ * Makes a HEAD request through the proxy and checks that it gets a response (any status).
+ * Returns false if the proxy isn't running or if the request fails entirely.
+ */
+export async function verifyProxyForwarding() {
+    const state = getProxyState();
+    if (!state) {
+        console.warn('[editorProxy] Cannot verify — proxy is not running');
+        return false;
+    }
+    try {
+        const response = await fetch(`http://127.0.0.1:${state.port}/`, {
+            method: 'HEAD',
+            signal: AbortSignal.timeout(5000),
+        });
+        // Any response from the target (even 404) means forwarding works.
+        // Only 502 (our own Bad Gateway) means the target is unreachable.
+        if (response.status === 502) {
+            console.warn(`[editorProxy] Verification failed — proxy returned 502 (target unreachable)`);
+            return false;
+        }
+        console.log(`[editorProxy] Verification passed — proxy forwarding to ${state.targetUrl} (status ${response.status})`);
+        return true;
+    }
+    catch (err) {
+        console.warn(`[editorProxy] Verification failed — could not reach proxy on port ${state.port}`);
+        return false;
+    }
 }
 /**
  * Ensure the proxy is running. If it's not, start it using the current dev server URL.
@@ -256,9 +758,10 @@ export async function ensureProxyRunning() {
         return null;
     }
     const codeyamPort = parseInt(process.env.CODEYAM_PORT || '3111', 10);
-    console.log(`[editorProxy] Proxy not running, starting on-demand (port ${codeyamPort + 1}, target ${devServer.url})`);
+    const { proxyPort } = computeEditorPorts(codeyamPort);
+    console.log(`[editorProxy] Proxy not running, starting on-demand (port ${proxyPort}, target ${devServer.url})`);
     const result = await startEditorProxy({
-        port: codeyamPort + 1,
+        port: proxyPort,
         targetUrl: devServer.url,
     });
     if (result) {
@@ -269,4 +772,8 @@ export async function ensureProxyRunning() {
     console.error('[editorProxy] Failed to start on-demand proxy');
     return null;
 }
+/**
+ * Test-only export: trigger readScenarioData so tests can verify session config extraction.
+ */
+export const _readScenarioDataForTest = readScenarioData;
 //# sourceMappingURL=editorProxy.js.map