@codeyam/codeyam-cli 0.1.0-staging.e2d4438 → 0.1.0-staging.e3d0ba6

package/codeyam-cli/src/utils/transcriptPruning.js.map

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

package/codeyam-cli/src/utils/versionInfo.js

@@ -89,6 +89,27 @@ function computeNpmPackageVersion() {
 export const cliVersion = computeCliVersion();
 /** The npm package version from package.json, e.g. "0.1.1" */
 export const npmPackageVersion = computeNpmPackageVersion();
+/**
+ * Version string for `codeyam --version`.
+ * CI-published builds show the npm semver; local dev builds show the build counter.
+ */
+export function getDisplayVersion() {
+    if (npmPackageVersion !== 'unknown' && npmPackageVersion !== '0.1.0') {
+        return npmPackageVersion;
+    }
+    const cliRoot = findCliPackageRoot();
+    if (cliRoot) {
+        for (const p of [
+            path.join(cliRoot, 'src/webserver/build-info.json'),
+            path.join(cliRoot, 'codeyam-cli/src/webserver/build-info.json'),
+        ]) {
+            const info = readBuildInfo(p);
+            if (info?.buildNumber)
+                return `dev (build ${info.buildNumber})`;
+        }
+    }
+    return 'dev';
+}
 /**
  * Get comprehensive version information for display
  */

package/codeyam-cli/src/utils/versionInfo.js.map

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

package/codeyam-cli/src/utils/webappDetection.js

@@ -16,10 +16,16 @@ function detectFrameworkFromPackageJson(packageJsonPath) {
         };
         if (deps.next)
             return ProjectFramework.Next;
-        if (deps['@remix-run/node'] || deps['@remix-run/react'] || deps['react-router'])
+        if (deps['@remix-run/node'] ||
+            deps['@remix-run/react'] ||
+            deps['react-router'])
             return ProjectFramework.Remix;
         if (deps['react-scripts'])
             return ProjectFramework.CRA;
+        if (deps.expo)
+            return ProjectFramework.Expo;
+        if (deps.vite)
+            return ProjectFramework.Vite;
         return ProjectFramework.Unknown;
     }
     catch (error) {
@@ -96,6 +102,7 @@ function isWebAppDirectory(dirPath) {
             'react-scripts',
             'webpack-dev-server',
             'parcel',
+            'expo',
         ];
         const possibleStartAndBuildScripts = Object.keys(scripts).filter((script) => ['dev', 'start', 'serve', 'build'].some((keyword) => script.includes(keyword)));
         const scriptsWithWebappPattern = possibleStartAndBuildScripts.filter((scriptName) => webappPatterns.some((pattern) => scripts[scriptName].includes(pattern)));
@@ -111,7 +118,8 @@ function isWebAppDirectory(dirPath) {
                 const actualWebappPath = path.join(dirPath, cdTarget);
                 // If the script explicitly cd's into a directory to run the webapp command,
                 // trust that directory as the actual webapp location
-                if (fs.existsSync(actualWebappPath) && fs.statSync(actualWebappPath).isDirectory()) {
+                if (fs.existsSync(actualWebappPath) &&
+                    fs.statSync(actualWebappPath).isDirectory()) {
                     // Return the actual webapp subdirectory path
                     return { isWebApp: true, actualPath: actualWebappPath };
                 }
@@ -186,18 +194,29 @@ export function detectWebApps(projectRoot) {
         // Detect app directory for frameworks that use one
         let appDirectory;
         if (framework === ProjectFramework.Remix ||
-            framework === ProjectFramework.Next) {
+            framework === ProjectFramework.Next ||
+            framework === ProjectFramework.Expo) {
             // Check if 'app' directory exists
             const appPath = path.join(fullPath, 'app');
             if (fs.existsSync(appPath) && fs.statSync(appPath).isDirectory()) {
                 appDirectory = 'app';
             }
         }
+        // Auto-detect startCommand from package.json scripts
+        const startScript = getDefaultStartScript(webappPath, projectRoot);
+        const portFlag = '-- --port $PORT';
+        const startCommand = startScript
+            ? {
+                command: 'sh',
+                args: ['-c', `${packageManager} run ${startScript} ${portFlag}`],
+            }
+            : undefined;
         return {
             path: webappPath,
             framework,
             packageManager,
             appDirectory,
+            startCommand,
         };
     });
     return webapps;
@@ -227,6 +246,22 @@ export function getDefaultStartScript(webappPath, projectRoot) {
         return null;
     }
 }
+/**
+ * Merge detected webapps with existing config webapps.
+ * Detected webapps take precedence, but manually-configured webapps
+ * (those with a startCommand that aren't in the detected set) are preserved.
+ */
+export function mergeWebApps(detected, existing) {
+    const detectedPaths = new Set(detected.map((w) => w.path));
+    const merged = [...detected];
+    for (const existingWebapp of existing) {
+        if (!detectedPaths.has(existingWebapp.path)) {
+            // Preserve manually-configured webapps not found by detection
+            merged.push(existingWebapp);
+        }
+    }
+    return merged;
+}
 /**
  * Find which webapp a component belongs to based on its file path
  * Returns the webapp that contains the component, or the first webapp as fallback

package/codeyam-cli/src/utils/webappDetection.js.map

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

package/codeyam-cli/src/webserver/__tests__/api.interactive-switch-scenario.test.js

@@ -0,0 +1,99 @@
+import { action } from "../app/routes/api.interactive-switch-scenario.js";
+import fs from 'fs';
+import path from 'path';
+import os from 'os';
+// Mock dependencies
+jest.mock('../../state', () => ({
+    getProjectRoot: jest.fn(),
+}));
+jest.mock('../../utils/editorSeedAdapter', () => ({
+    runSeedAdapter: jest.fn(),
+    detectSeedAdapter: jest.fn(),
+}));
+jest.mock('../editorProxy', () => ({
+    invalidateScenarioCache: jest.fn(),
+}));
+import { getProjectRoot } from "../../state.js";
+import { runSeedAdapter, detectSeedAdapter, } from "../../utils/editorSeedAdapter.js";
+import { invalidateScenarioCache } from "../editorProxy.js";
+const mockGetProjectRoot = getProjectRoot;
+const mockRunSeedAdapter = runSeedAdapter;
+const mockDetectSeedAdapter = detectSeedAdapter;
+const mockInvalidateScenarioCache = invalidateScenarioCache;
+const createActionArgs = (request) => ({
+    request,
+    params: {},
+    context: {},
+    unstable_pattern: '',
+    unstable_url: new URL(request.url),
+});
+describe('api.interactive-switch-scenario', () => {
+    let tempDir;
+    beforeEach(() => {
+        jest.clearAllMocks();
+        tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'interactive-switch-test-'));
+        mockGetProjectRoot.mockReturnValue(tempDir);
+        // Create .codeyam directory
+        fs.mkdirSync(path.join(tempDir, '.codeyam', 'editor-scenarios'), {
+            recursive: true,
+        });
+    });
+    afterEach(() => {
+        fs.rmSync(tempDir, { recursive: true, force: true });
+    });
+    it('should always seed even when same scenario is already in active-scenario.json', async () => {
+        const scenarioId = 'test-scenario-123';
+        // Write active-scenario.json with the SAME scenarioId (simulating stale state)
+        fs.writeFileSync(path.join(tempDir, '.codeyam', 'active-scenario.json'), JSON.stringify({ scenarioId, scenarioSlug: 'Test', type: 'application' }));
+        // Write scenario data file with application type
+        fs.writeFileSync(path.join(tempDir, '.codeyam', 'editor-scenarios', `${scenarioId}.json`), JSON.stringify({ type: 'application', seed: { flight: [] } }));
+        // Write seed data file
+        fs.writeFileSync(path.join(tempDir, '.codeyam', 'editor-scenarios', `${scenarioId}.seed.json`), JSON.stringify({ flight: [{ id: 1, name: 'test' }] }));
+        // Set up seed adapter
+        const adapterPath = path.join(tempDir, '.codeyam', 'seed-adapter.ts');
+        fs.writeFileSync(adapterPath, '');
+        mockDetectSeedAdapter.mockReturnValue(adapterPath);
+        mockRunSeedAdapter.mockResolvedValue({
+            success: true,
+            output: 'Seed complete',
+            durationMs: 100,
+        });
+        const request = new Request('http://localhost/api/interactive-switch-scenario', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ scenarioId, scenarioName: 'Test Scenario' }),
+        });
+        const response = await action(createActionArgs(request));
+        const body = await response.json();
+        expect(body.success).toBe(true);
+        expect(body.seeded).toBe(true);
+        // The key assertion: seed adapter was called even though same scenarioId was in active-scenario.json
+        expect(mockRunSeedAdapter).toHaveBeenCalledTimes(1);
+    });
+    it('should invalidate proxy cache after switching', async () => {
+        const scenarioId = 'test-scenario-456';
+        fs.writeFileSync(path.join(tempDir, '.codeyam', 'editor-scenarios', `${scenarioId}.json`), JSON.stringify({ type: 'component' }));
+        const request = new Request('http://localhost/api/interactive-switch-scenario', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ scenarioId }),
+        });
+        await action(createActionArgs(request));
+        expect(mockInvalidateScenarioCache).toHaveBeenCalledTimes(1);
+    });
+    it('should return 400 when scenarioId is missing', async () => {
+        const request = new Request('http://localhost/api/interactive-switch-scenario', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({}),
+        });
+        const response = await action(createActionArgs(request));
+        expect(response.status).toBe(400);
+    });
+    it('should return 405 for non-POST methods', async () => {
+        const request = new Request('http://localhost/api/interactive-switch-scenario', { method: 'GET' });
+        const response = await action(createActionArgs(request));
+        expect(response.status).toBe(405);
+    });
+});
+//# sourceMappingURL=api.interactive-switch-scenario.test.js.map

package/codeyam-cli/src/webserver/__tests__/api.interactive-switch-scenario.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"api.interactive-switch-scenario.test.js","sourceRoot":"","sources":["../../../../../src/webserver/__tests__/api.interactive-switch-scenario.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,+CAA+C,CAAC;AACvE,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,oBAAoB;AACpB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,EAAE,CAAC,CAAC;IAC9B,cAAc,EAAE,IAAI,CAAC,EAAE,EAAE;CAC1B,CAAC,CAAC,CAAC;AAEJ,IAAI,CAAC,IAAI,CAAC,+BAA+B,EAAE,GAAG,EAAE,CAAC,CAAC;IAChD,cAAc,EAAE,IAAI,CAAC,EAAE,EAAE;IACzB,iBAAiB,EAAE,IAAI,CAAC,EAAE,EAAE;CAC7B,CAAC,CAAC,CAAC;AAEJ,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,GAAG,EAAE,CAAC,CAAC;IACjC,uBAAuB,EAAE,IAAI,CAAC,EAAE,EAAE;CACnC,CAAC,CAAC,CAAC;AAEJ,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EACL,cAAc,EACd,iBAAiB,GAClB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAEzD,MAAM,kBAAkB,GAAG,cAE1B,CAAC;AACF,MAAM,kBAAkB,GAAG,cAE1B,CAAC;AACF,MAAM,qBAAqB,GAAG,iBAE7B,CAAC;AACF,MAAM,2BAA2B,GAC/B,uBAEC,CAAC;AAEJ,MAAM,gBAAgB,GAAG,CAAC,OAAgB,EAAE,EAAE,CAAC,CAAC;IAC9C,OAAO;IACP,MAAM,EAAE,EAAE;IACV,OAAO,EAAE,EAAE;IACX,gBAAgB,EAAE,EAAE;IACpB,YAAY,EAAE,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC;CACnC,CAAC,CAAC;AAEH,QAAQ,CAAC,iCAAiC,EAAE,GAAG,EAAE;IAC/C,IAAI,OAAe,CAAC;IAEpB,UAAU,CAAC,GAAG,EAAE;QACd,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,OAAO,GAAG,EAAE,CAAC,WAAW,CACtB,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,0BAA0B,CAAC,CACnD,CAAC;QACF,kBAAkB,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QAE5C,4BAA4B;QAC5B,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,kBAAkB,CAAC,EAAE;YAC/D,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+EAA+E,EAAE,KAAK,IAAI,EAAE;QAC7F,MAAM,UAAU,GAAG,mBAAmB,CAAC;QAEvC,+EAA+E;QAC/E,EAAE,CAAC,aAAa,CACd,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,sBAAsB,CAAC,EACtD,IAAI,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAC1E,CAAC;QAEF,iDAAiD;QACjD,EAAE,CAAC,aAAa,CACd,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,GAAG,UAAU,OAAO,CAAC,EACxE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,CAC9D,CAAC;QAEF,uBAAuB;QACvB,EAAE,CAAC,aAAa,CACd,IAAI,CAAC,IAAI,CACP,OAAO,EACP,UAAU,EACV,kBAAkB,EAClB,GAAG,UAAU,YAAY,CAC1B,EACD,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CACtD,CAAC;QAEF,sBAAsB;QACtB,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,iBAAiB,CAAC,CAAC;QACtE,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QAClC,qBAAqB,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QACnD,kBAAkB,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,eAAe;YACvB,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,IAAI,OAAO,CACzB,kDAAkD,EAClD;YACE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,YAAY,EAAE,eAAe,EAAE,CAAC;SACpE,CACF,CAAC;QAEF,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;QACzD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QAEnC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/B,qGAAqG;QACrG,MAAM,CAAC,kBAAkB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;QAC7D,MAAM,UAAU,GAAG,mBAAmB,CAAC;QAEvC,EAAE,CAAC,aAAa,CACd,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,GAAG,UAAU,OAAO,CAAC,EACxE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CACtC,CAAC;QAEF,MAAM,OAAO,GAAG,IAAI,OAAO,CACzB,kDAAkD,EAClD;YACE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,CAAC;SACrC,CACF,CAAC;QAEF,MAAM,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;QAExC,MAAM,CAAC,2BAA2B,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;QAC5D,MAAM,OAAO,GAAG,IAAI,OAAO,CACzB,kDAAkD,EAClD;YACE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;SACzB,CACF,CAAC;QAEF,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;QACzD,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;QACtD,MAAM,OAAO,GAAG,IAAI,OAAO,CACzB,kDAAkD,EAClD,EAAE,MAAM,EAAE,KAAK,EAAE,CAClB,CAAC;QAEF,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;QACzD,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/codeyam-cli/src/webserver/__tests__/buildPtyEnv.test.js

@@ -0,0 +1,35 @@
+import { buildPtyEnv } from "../terminalServer.js";
+describe('buildPtyEnv', () => {
+    const originalEnv = process.env;
+    beforeEach(() => {
+        process.env = { ...originalEnv };
+    });
+    afterEach(() => {
+        process.env = originalEnv;
+    });
+    test('sets CODEYAM_EDITOR_ACTIVE=1 when editorMode is true', () => {
+        const env = buildPtyEnv({ editorMode: true });
+        expect(env.CODEYAM_EDITOR_ACTIVE).toBe('1');
+    });
+    test('does not set CODEYAM_EDITOR_ACTIVE when editorMode is false', () => {
+        const env = buildPtyEnv({ editorMode: false });
+        expect(env.CODEYAM_EDITOR_ACTIVE).toBeUndefined();
+    });
+    test('does not set CODEYAM_EDITOR_ACTIVE when no options provided', () => {
+        const env = buildPtyEnv();
+        expect(env.CODEYAM_EDITOR_ACTIVE).toBeUndefined();
+    });
+    test('passes through PATH and HOME from process.env', () => {
+        process.env.PATH = '/usr/bin:/usr/local/bin';
+        process.env.HOME = '/Users/testuser';
+        const env = buildPtyEnv();
+        expect(env.PATH).toBe('/usr/bin:/usr/local/bin');
+        expect(env.HOME).toBe('/Users/testuser');
+    });
+    test('sets TERM to xterm-256color by default', () => {
+        delete process.env.TERM;
+        const env = buildPtyEnv();
+        expect(env.TERM).toBe('xterm-256color');
+    });
+});
+//# sourceMappingURL=buildPtyEnv.test.js.map

package/codeyam-cli/src/webserver/__tests__/buildPtyEnv.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildPtyEnv.test.js","sourceRoot":"","sources":["../../../../../src/webserver/__tests__/buildPtyEnv.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC;IAEhC,UAAU,CAAC,GAAG,EAAE;QACd,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,WAAW,EAAE,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,CAAC,GAAG,GAAG,WAAW,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,sDAAsD,EAAE,GAAG,EAAE;QAChE,MAAM,GAAG,GAAG,WAAW,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9C,MAAM,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,6DAA6D,EAAE,GAAG,EAAE;QACvE,MAAM,GAAG,GAAG,WAAW,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;QAC/C,MAAM,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,aAAa,EAAE,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,6DAA6D,EAAE,GAAG,EAAE;QACvE,MAAM,GAAG,GAAG,WAAW,EAAE,CAAC;QAC1B,MAAM,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,aAAa,EAAE,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACzD,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,yBAAyB,CAAC;QAC7C,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,iBAAiB,CAAC;QACrC,MAAM,GAAG,GAAG,WAAW,EAAE,CAAC;QAC1B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QACjD,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAClD,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;QACxB,MAAM,GAAG,GAAG,WAAW,EAAE,CAAC;QAC1B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/codeyam-cli/src/webserver/__tests__/clientErrors.test.js

@@ -0,0 +1,107 @@
+import { parseClientErrors, parseVisibleText } from "../app/lib/clientErrors.js";
+describe('parseClientErrors', () => {
+    it('extracts console.error lines', () => {
+        const output = `[JournalCapture] Page console.error: Uncaught TypeError: x is not a function`;
+        expect(parseClientErrors(output)).toEqual([
+            'Uncaught TypeError: x is not a function',
+        ]);
+    });
+    it('extracts network failure lines', () => {
+        const output = `[JournalCapture] Network failed: GET http://localhost:3113/api/products — net::ERR_CONNECTION_REFUSED`;
+        expect(parseClientErrors(output)).toEqual([
+            'Network failed: GET http://localhost:3113/api/products — net::ERR_CONNECTION_REFUSED',
+        ]);
+    });
+    it('filters out /api/health network failures', () => {
+        const output = [
+            `[JournalCapture] Network failed: GET http://127.0.0.1:3111/api/health — net::ERR_CONNECTION_REFUSED`,
+            `[JournalCapture] Network failed: GET http://localhost:3113/api/products — net::ERR_CONNECTION_REFUSED`,
+            `[JournalCapture] Page console.error: Something broke`,
+        ].join('\n');
+        expect(parseClientErrors(output)).toEqual([
+            'Network failed: GET http://localhost:3113/api/products — net::ERR_CONNECTION_REFUSED',
+            'Something broke',
+        ]);
+    });
+    it('filters out /__codeyam__/preview-health network failures', () => {
+        const output = [
+            `[JournalCapture] Network failed: POST http://localhost:3112/__codeyam__/preview-health — net::ERR_ABORTED`,
+            `[JournalCapture] Network failed: GET http://localhost:3113/api/products — net::ERR_CONNECTION_REFUSED`,
+        ].join('\n');
+        expect(parseClientErrors(output)).toEqual([
+            'Network failed: GET http://localhost:3113/api/products — net::ERR_CONNECTION_REFUSED',
+        ]);
+    });
+    it('returns empty array for clean output', () => {
+        const output = `[JournalCapture] Screenshot saved\n[JournalCapture] Done`;
+        expect(parseClientErrors(output)).toEqual([]);
+    });
+    it('extracts HTTP error status lines (e.g. 404)', () => {
+        const output = `[JournalCapture] HTTP error: status=404, url=http://localhost:3112/library/collections/col-1`;
+        expect(parseClientErrors(output)).toEqual([
+            'HTTP error: status=404, url=http://localhost:3112/library/collections/col-1',
+        ]);
+    });
+    it('extracts HTTP 500 error status lines', () => {
+        const output = `[JournalCapture] HTTP error: status=500, url=http://localhost:3112/api/crash`;
+        expect(parseClientErrors(output)).toEqual([
+            'HTTP error: status=500, url=http://localhost:3112/api/crash',
+        ]);
+    });
+    it('collects HTTP errors alongside console errors', () => {
+        const output = [
+            `[JournalCapture] HTTP error: status=404, url=http://localhost:3112/missing`,
+            `[JournalCapture] Page console.error: Cannot read properties of null`,
+        ].join('\n');
+        expect(parseClientErrors(output)).toEqual([
+            'HTTP error: status=404, url=http://localhost:3112/missing',
+            'Cannot read properties of null',
+        ]);
+    });
+    it('extracts API response error lines with response body', () => {
+        const output = `[JournalCapture] API response error: GET http://localhost:3112/api/items/abc-123 → 404 — {"error":"not found"}`;
+        expect(parseClientErrors(output)).toEqual([
+            'API response error: GET http://localhost:3112/api/items/abc-123 → 404 — {"error":"not found"}',
+        ]);
+    });
+    it('collects API response errors alongside HTTP errors and console errors', () => {
+        const output = [
+            `[JournalCapture] HTTP error: status=404, url=http://localhost:3112/page/abc`,
+            `[JournalCapture] API response error: GET http://localhost:3112/api/items/abc-123 → 404 — {"error":"Item not found"}`,
+            `[JournalCapture] Page console.error: Unhandled error in component`,
+        ].join('\n');
+        expect(parseClientErrors(output)).toEqual([
+            'HTTP error: status=404, url=http://localhost:3112/page/abc',
+            'API response error: GET http://localhost:3112/api/items/abc-123 → 404 — {"error":"Item not found"}',
+            'Unhandled error in component',
+        ]);
+    });
+});
+describe('parseVisibleText', () => {
+    it('extracts visible text from capture output', () => {
+        const output = '[JournalCapture] Visible text: Save to Library | Tech Chronicle';
+        expect(parseVisibleText(output)).toBe('Save to Library | Tech Chronicle');
+    });
+    it('returns null when no visible text line exists', () => {
+        const output = '[JournalCapture] Page loaded: status=200';
+        expect(parseVisibleText(output)).toBeNull();
+    });
+    it('extracts empty page marker', () => {
+        const output = '[JournalCapture] Visible text: (empty page)';
+        expect(parseVisibleText(output)).toBe('(empty page)');
+    });
+    it('extracts from multi-line output with other log lines', () => {
+        const output = [
+            '[JournalCapture] Page loaded: status=200, url=http://localhost:3113/',
+            '[JournalCapture] Page title: Margo',
+            '[JournalCapture] Visible text: Save to Library | Tech Chronicle | The Future of Web Dev',
+            '[JournalCapture] RESULT:{"success":true,"path":"/tmp/screenshot.png"}',
+        ].join('\n');
+        expect(parseVisibleText(output)).toBe('Save to Library | Tech Chronicle | The Future of Web Dev');
+    });
+    it('extracts extraction failure marker', () => {
+        const output = '[JournalCapture] Visible text: (extraction failed)';
+        expect(parseVisibleText(output)).toBe('(extraction failed)');
+    });
+});
+//# sourceMappingURL=clientErrors.test.js.map

package/codeyam-cli/src/webserver/__tests__/clientErrors.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"clientErrors.test.js","sourceRoot":"","sources":["../../../../../src/webserver/__tests__/clientErrors.test.ts"],"names":[],"mappings":"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"}