@codeyam/codeyam-cli 0.1.0-staging.8e7b1bd → 0.1.0-staging.9574237

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

@@ -0,0 +1,249 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import { resolveViewportWithProjectDefault } from "./editorScenarios.js";
+/**
+ * Scan .codeyam/editor-scenarios/ for scenario files with embedded _metadata.
+ * Returns an array of { id, metadata } for each file that has _metadata.
+ */
+export function scanScenarioFiles(codeyamRoot) {
+    const scenariosDir = path.join(codeyamRoot, '.codeyam', 'editor-scenarios');
+    let files;
+    try {
+        files = fs.readdirSync(scenariosDir);
+    }
+    catch {
+        return [];
+    }
+    const results = [];
+    for (const file of files) {
+        // Only process {uuid}.json files, skip .seed.json and subdirectories
+        if (!file.endsWith('.json') || file.endsWith('.seed.json'))
+            continue;
+        if (file === 'client-errors.json')
+            continue;
+        const filePath = path.join(scenariosDir, file);
+        try {
+            const stat = fs.statSync(filePath);
+            if (!stat.isFile())
+                continue;
+            const content = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+            if (content._metadata) {
+                const id = file.replace(/\.json$/, '');
+                results.push({ id, metadata: content._metadata });
+            }
+        }
+        catch {
+            // Skip unparseable files
+        }
+    }
+    return results;
+}
+/**
+ * Write or update _metadata in a scenario data file.
+ * Preserves all existing data in the file, only adds/updates the _metadata key.
+ */
+export function writeScenarioMetadata(codeyamRoot, scenarioId, metadata) {
+    const filePath = path.join(codeyamRoot, '.codeyam', 'editor-scenarios', `${scenarioId}.json`);
+    let existing = {};
+    try {
+        existing = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+    }
+    catch {
+        // File doesn't exist yet — will be created by the caller
+        return;
+    }
+    existing._metadata = metadata;
+    fs.writeFileSync(filePath, JSON.stringify(existing, null, 2), 'utf8');
+}
+/**
+ * Backfill _metadata into scenario files that don't have it yet.
+ * Uses database rows as the source of truth for metadata.
+ * Returns the number of files updated.
+ */
+export function backfillScenarioMetadata(codeyamRoot, dbRows) {
+    const scenariosDir = path.join(codeyamRoot, '.codeyam', 'editor-scenarios');
+    let updated = 0;
+    for (const row of dbRows) {
+        const filePath = path.join(scenariosDir, `${row.id}.json`);
+        try {
+            const content = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+            if (content._metadata)
+                continue; // Already has metadata
+            const r = row;
+            content._metadata = {
+                name: row.name,
+                description: row.description,
+                componentName: row.component_name,
+                componentPath: row.component_path,
+                url: row.url,
+                type: row.type,
+                screenshotPath: row.screenshot_path ?? null,
+                viewportWidth: row.viewport_width ?? null,
+                viewportHeight: row.viewport_height ?? null,
+                dimensions: r.dimensions ? JSON.parse(r.dimensions) : null,
+                screenshotPaths: r.screenshot_paths
+                    ? JSON.parse(r.screenshot_paths)
+                    : null,
+                pageFilePath: r.page_file_path ?? null,
+                createdAt: row.created_at,
+                updatedAt: row.updated_at,
+            };
+            fs.writeFileSync(filePath, JSON.stringify(content, null, 2), 'utf8');
+            updated++;
+        }
+        catch {
+            // File doesn't exist or isn't valid JSON — skip
+        }
+    }
+    return updated;
+}
+/**
+ * Migrate scenario files with bad/legacy formats to the current format.
+ *
+ * Fixes:
+ * 1. Null viewport → resolved via dimension name / project default / 1280×720 fallback
+ * 2. Missing `dimensions` array → wrapped from single `dimension` string
+ * 3. Missing `screenshotPaths` map → built from single `screenshotPath` + dimension name
+ *
+ * This runs during editor startup to repair files created before viewport
+ * resolution was mandatory and before multi-dimension support was added.
+ * It is idempotent — files already in the correct format are skipped.
+ */
+export function migrateScenarioFormats(codeyamRoot) {
+    const entries = scanScenarioFiles(codeyamRoot);
+    if (entries.length === 0) {
+        return { scanned: 0, fixed: 0 };
+    }
+    const scenariosDir = path.join(codeyamRoot, '.codeyam', 'editor-scenarios');
+    let fixed = 0;
+    for (const { id, metadata } of entries) {
+        let needsWrite = false;
+        const updated = { ...metadata };
+        // Legacy files may still have a `dimension` property (removed from type)
+        const legacyDimension = metadata.dimension;
+        // Fix 1: Null viewport → resolve from dimensions[0] / project default / fallback
+        if (!updated.viewportWidth || !updated.viewportHeight) {
+            const resolved = resolveViewportWithProjectDefault({
+                dimension: updated.dimensions?.[0] ?? legacyDimension ?? undefined,
+                codeyamRoot,
+            });
+            updated.viewportWidth = resolved.width;
+            updated.viewportHeight = resolved.height;
+            needsWrite = true;
+        }
+        // Fix 2: Missing dimensions array → wrap legacy single dimension
+        if (!updated.dimensions && legacyDimension) {
+            updated.dimensions = [legacyDimension];
+            needsWrite = true;
+        }
+        // Fix 3: Missing screenshotPaths map → build from single screenshotPath
+        const primaryDimension = updated.dimensions?.[0] ?? legacyDimension;
+        if (!updated.screenshotPaths &&
+            updated.screenshotPath &&
+            primaryDimension) {
+            updated.screenshotPaths = { [primaryDimension]: updated.screenshotPath };
+            needsWrite = true;
+        }
+        // Fix 4: Strip legacy `dimension` field from metadata
+        if (legacyDimension !== undefined) {
+            delete updated.dimension;
+            needsWrite = true;
+        }
+        if (needsWrite) {
+            // Bump updatedAt so the next syncScenarioFilesToDatabase picks up the fix
+            updated.updatedAt = new Date().toISOString();
+            const filePath = path.join(scenariosDir, `${id}.json`);
+            try {
+                const content = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+                content._metadata = updated;
+                fs.writeFileSync(filePath, JSON.stringify(content, null, 2), 'utf8');
+                fixed++;
+            }
+            catch {
+                // Non-fatal — skip files that can't be read/written
+            }
+        }
+    }
+    return { scanned: entries.length, fixed };
+}
+/**
+ * Remove a scenario data file (and its .seed.json if present).
+ */
+export function deleteScenarioFiles(codeyamRoot, scenarioId) {
+    const scenariosDir = path.join(codeyamRoot, '.codeyam', 'editor-scenarios');
+    for (const suffix of ['.json', '.seed.json']) {
+        const filePath = path.join(scenariosDir, `${scenarioId}${suffix}`);
+        try {
+            fs.unlinkSync(filePath);
+        }
+        catch {
+            // File might not exist
+        }
+    }
+}
+/**
+ * Sync scenario files (with _metadata) to database.
+ * Scans the editor-scenarios/ directory for files with embedded _metadata.
+ */
+export async function syncScenarioFilesToDatabase(codeyamRoot, projectId, existingRows, onInsert, onUpdate) {
+    const entries = scanScenarioFiles(codeyamRoot);
+    if (entries.length === 0) {
+        return { inserted: 0, updated: 0, skipped: 0 };
+    }
+    const existingMap = new Map(existingRows.map((r) => [r.id, r.updated_at]));
+    let inserted = 0;
+    let updated = 0;
+    let skipped = 0;
+    for (const { id, metadata } of entries) {
+        const existingUpdatedAt = existingMap.get(id);
+        if (existingUpdatedAt === undefined) {
+            await onInsert({
+                id,
+                project_id: projectId,
+                name: metadata.name,
+                description: metadata.description,
+                component_name: metadata.componentName,
+                component_path: metadata.componentPath,
+                url: metadata.url,
+                type: metadata.type,
+                screenshot_path: metadata.screenshotPath,
+                viewport_width: metadata.viewportWidth,
+                viewport_height: metadata.viewportHeight,
+                dimensions: metadata.dimensions
+                    ? JSON.stringify(metadata.dimensions)
+                    : null,
+                screenshot_paths: metadata.screenshotPaths
+                    ? JSON.stringify(metadata.screenshotPaths)
+                    : null,
+                page_file_path: metadata.pageFilePath ?? null,
+            });
+            inserted++;
+        }
+        else if (metadata.updatedAt > existingUpdatedAt) {
+            await onUpdate(id, {
+                name: metadata.name,
+                description: metadata.description,
+                component_name: metadata.componentName,
+                component_path: metadata.componentPath,
+                url: metadata.url,
+                type: metadata.type,
+                screenshot_path: metadata.screenshotPath,
+                viewport_width: metadata.viewportWidth,
+                viewport_height: metadata.viewportHeight,
+                dimensions: metadata.dimensions
+                    ? JSON.stringify(metadata.dimensions)
+                    : null,
+                screenshot_paths: metadata.screenshotPaths
+                    ? JSON.stringify(metadata.screenshotPaths)
+                    : null,
+                page_file_path: metadata.pageFilePath ?? null,
+            });
+            updated++;
+        }
+        else {
+            skipped++;
+        }
+    }
+    return { inserted, updated, skipped };
+}
+//# sourceMappingURL=scenariosManifest.js.map

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

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

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

@@ -53,21 +53,48 @@ export function isProcessRunning(pid) {
  */
 export function findCodeYamProcesses() {
     try {
-        // Use ps to find processes with 'codeyam-server' in the command
-        const output = execSync('ps aux | grep codeyam-server | grep -v grep', {
+        const isWindows = process.platform === 'win32';
+        const command = isWindows
+            ? 'tasklist /FI "IMAGENAME eq node.exe" /FO CSV /NH'
+            : 'ps aux | grep codeyam-server | grep -v grep';
+        const output = execSync(command, {
             encoding: 'utf8',
+            stdio: ['pipe', 'pipe', 'pipe'],
         }).trim();
         if (!output)
             return [];
-        // Parse ps output to extract PIDs
         const pids = [];
-        for (const line of output.split('\n')) {
-            // ps aux format: USER PID %CPU %MEM VSZ RSS TTY STAT START TIME COMMAND
-            const parts = line.trim().split(/\s+/);
-            if (parts.length >= 2) {
-                const pid = parseInt(parts[1], 10);
-                if (!isNaN(pid)) {
-                    pids.push(pid);
+        if (isWindows) {
+            // tasklist CSV format: "node.exe","12345","Console","1","50,000 K"
+            // We get all node processes, then filter by checking their command line
+            for (const line of output.split('\n')) {
+                const match = line.match(/"[^"]*","(\d+)"/);
+                if (match) {
+                    const pid = parseInt(match[1], 10);
+                    if (!isNaN(pid)) {
+                        // Check if this node process is a codeyam-server
+                        try {
+                            const cmdline = execSync(`wmic process where "ProcessId=${pid}" get CommandLine /FORMAT:LIST`, { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] });
+                            if (cmdline.includes('codeyam-server')) {
+                                pids.push(pid);
+                            }
+                        }
+                        catch {
+                            // Can't inspect this process, skip it
+                        }
+                    }
+                }
+            }
+        }
+        else {
+            for (const line of output.split('\n')) {
+                // ps aux format: USER PID %CPU %MEM VSZ RSS TTY STAT START TIME COMMAND
+                const parts = line.trim().split(/\s+/);
+                if (parts.length >= 2) {
+                    const pid = parseInt(parts[1], 10);
+                    if (!isNaN(pid)) {
+                        pids.push(pid);
+                    }
                 }
             }
         }
@@ -98,32 +125,87 @@ export function isServerRunning() {
     }
     return { running: false };
 }
+/**
+ * Wait for processes to exit, polling every 100ms up to the given timeout.
+ * Returns true if all processes exited, false if timed out.
+ */
+export function waitForProcessExit(pids, timeoutMs = 5000) {
+    if (pids.length === 0)
+        return true;
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline) {
+        const stillRunning = pids.some((pid) => isProcessRunning(pid));
+        if (!stillRunning)
+            return true;
+        // Synchronous sleep 100ms (can't use async in this context)
+        Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 100);
+    }
+    return false;
+}
 export function killServer() {
     let killedAny = false;
+    const pidsToWait = [];
     // First try to kill from state file
     const state = loadServerState();
     if (state) {
         try {
             process.kill(state.pid, 'SIGTERM');
-            clearServerState();
+            pidsToWait.push(state.pid);
             killedAny = true;
         }
         catch {
             // Process might already be dead
-            clearServerState();
         }
+        clearServerState();
     }
     // Also find and kill any processes by name
     const pids = findCodeYamProcesses();
     for (const pid of pids) {
         try {
             process.kill(pid, 'SIGTERM');
+            if (!pidsToWait.includes(pid)) {
+                pidsToWait.push(pid);
+            }
             killedAny = true;
         }
         catch {
             // Process might already be dead or not killable
         }
     }
+    // Wait for killed processes to actually exit (up to 5 seconds)
+    // Without this, a new server can be spawned while the old one is still dying,
+    // causing port conflicts and memory pressure from two concurrent Node processes.
+    waitForProcessExit(pidsToWait);
     return killedAny;
 }
+/**
+ * Find an available port starting from `startPort`.
+ * Uses step=10 to leave room for proxy (+1) and dev server (+2) on adjacent ports.
+ * The `isPortFree` callback should return true when no process is listening on the port.
+ */
+export function findFreePort(startPort, isPortFree, step = 10, maxAttempts = 10) {
+    if (isPortFree(startPort))
+        return startPort;
+    for (let i = 1; i <= maxAttempts; i++) {
+        const port = startPort + i * step;
+        if (isPortFree(port))
+            return port;
+    }
+    throw new Error(`Could not find a free port starting from ${startPort} (tried ${maxAttempts} candidates)`);
+}
+/**
+ * Check if a port is free (no process listening on it).
+ */
+export function checkPortFree(port) {
+    try {
+        execSync(`lsof -ti:${port}`, {
+            encoding: 'utf8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        return false; // lsof found something — port is in use
+    }
+    catch {
+        return true; // lsof failed — port is free
+    }
+}
 //# sourceMappingURL=serverState.js.map

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

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

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

@@ -3,13 +3,15 @@ import * as path from 'path';
 /**
  * Configure Claude Code settings to auto-approve CodeYam skills and commands
  *
- * Adds CodeYam skills and CLI commands explicitly to the allow list in .claude/settings.local.json
- * This prevents Claude from asking permission every time it uses CodeYam
+ * In memory mode (default), only memory-related permissions are added.
+ * In full mode, simulation permissions are also added.
  *
  * @param projectRoot - The root directory of the project
+ * @param options - Configuration options (mode defaults to 'memory')
  * @returns True if successfully configured, false otherwise
  */
-export function setupClaudeCodeSettings(projectRoot) {
+export function setupClaudeCodeSettings(projectRoot, options) {
+    const mode = options?.mode ?? 'memory';
     try {
         const claudeDir = path.join(projectRoot, '.claude');
         const settingsPath = path.join(claudeDir, 'settings.local.json');
@@ -35,27 +37,82 @@ export function setupClaudeCodeSettings(projectRoot) {
         if (!settings.permissions.allow) {
             settings.permissions.allow = [];
         }
-        // Add CodeYam skills and CLI commands to allow list
-        const codeyamPermissions = [
-            // Skills
-            'Skill(codeyam-setup)',
-            'Skill(codeyam-sim)',
-            'Skill(codeyam-debug)',
-            'Skill(codeyam-test)',
-            'Skill(codeyam-verify)',
-            // CodeYam CLI commands
+        // Memory permissions — always included
+        const basePermissions = [
+            'Skill(codeyam-memory)',
+            'Skill(codeyam-new-rule)',
             'Bash(codeyam)',
             'Bash(codeyam:*)',
-            // File operations for .codeyam directory
             'Read(.codeyam/**)',
             'Edit(.codeyam/**)',
             'Write(.codeyam/**)',
             'Glob(.codeyam/**)',
-            'Read(/tmp/codeyam/**)',
-            'Edit(/tmp/codeyam/**)',
-            'Write(/tmp/codeyam/**)',
-            'Glob(/tmp/codeyam/**)',
         ];
+        // Simulation permissions — project setup, analysis, and capture (full + editor modes)
+        const simAndEditorExtraPermissions = [
+            'Skill(codeyam-setup)',
+            'Skill(codeyam-sim)',
+            'Skill(codeyam-debug)',
+            'Skill(codeyam-test)',
+            'Skill(codeyam-verify)',
+            'Skill(codeyam-dev-mode)',
+            'Read(/tmp/**)',
+            'Edit(/tmp/**)',
+            'Write(/tmp/**)',
+            'Glob(/tmp/**)',
+            'Bash(npm install:*)',
+            'Bash(npm run:*)',
+            'Bash(npx:*)',
+            'Bash(node:*)',
+            'Bash(cp:*)',
+            'Bash(mkdir:*)',
+            'Bash(chmod:*)',
+            'Bash(rm:*)',
+            'Bash(curl:*)',
+            'Bash(sleep:*)',
+            'Bash(echo:*)',
+            'Bash(grep:*)',
+            'Bash(python3:*)',
+            'Bash(cat:*)',
+            'Bash(printf:*)',
+            'Bash(ls:*)',
+        ];
+        // Editor permissions — git ops and skill for dev mode (editor mode only)
+        const editorExtraPermissions = [
+            'Skill(codeyam-editor)',
+            'Bash(git:*)',
+            'Edit(**)',
+            'Write(**)',
+        ];
+        const isEditorMode = mode === 'editor' || options?.editorMode === true;
+        let codeyamPermissions;
+        if (mode === 'full') {
+            codeyamPermissions = [
+                ...basePermissions,
+                ...simAndEditorExtraPermissions,
+            ];
+        }
+        else if (mode === 'editor') {
+            codeyamPermissions = [
+                ...basePermissions,
+                ...editorExtraPermissions,
+                ...simAndEditorExtraPermissions,
+            ];
+        }
+        else {
+            codeyamPermissions = basePermissions;
+        }
+        // When editorMode flag is set (e.g. full mode + editor), ensure editor permissions are included
+        if (isEditorMode && mode !== 'editor') {
+            for (const perm of [
+                ...editorExtraPermissions,
+                ...simAndEditorExtraPermissions,
+            ]) {
+                if (!codeyamPermissions.includes(perm)) {
+                    codeyamPermissions.push(perm);
+                }
+            }
+        }
         let updated = false;
         for (const permission of codeyamPermissions) {
             if (!settings.permissions.allow.includes(permission)) {
@@ -63,34 +120,28 @@ export function setupClaudeCodeSettings(projectRoot) {
                 updated = true;
             }
         }
-        // // Configure Stop hook for automatic verification
-        // if (!settings.hooks) {
-        //   settings.hooks = {};
-        // }
-        // if (!settings.hooks.Stop) {
-        //   settings.hooks.Stop = [];
-        // }
-        // // Install CodeYam stop hook that returns JSON to trigger verification
-        // const hookScriptPath = path.join(
-        //   projectRoot,
-        //   '.codeyam',
-        //   'bin',
-        //   'codeyam-stop-hook.sh',
-        // );
-        // const hookExists = settings.hooks.Stop.some((hook: any) =>
-        //   hook.hooks?.some((h: any) => h.command?.includes('codeyam-stop-hook.sh')),
-        // );
-        // if (!hookExists) {
-        //   settings.hooks.Stop.push({
-        //     hooks: [
-        //       {
-        //         type: 'command',
-        //         command: `bash "${hookScriptPath}"`,
-        //       },
-        //     ],
-        //   });
-        //   updated = true;
-        // }
+        // Editor mode: register PostToolUse + Stop hooks for step tracking
+        if (isEditorMode) {
+            if (!settings.hooks) {
+                settings.hooks = {};
+            }
+            const hookCommand = 'test -f "$CLAUDE_PROJECT_DIR"/.codeyam/bin/editor-step-hook.py && python3 "$CLAUDE_PROJECT_DIR"/.codeyam/bin/editor-step-hook.py || true';
+            for (const event of [
+                'PostToolUse',
+                'Stop',
+                'UserPromptSubmit',
+            ]) {
+                const existing = settings.hooks[event] || [];
+                const alreadyRegistered = existing.some((entry) => entry.hooks?.some((h) => h.command?.includes('editor-step-hook')));
+                if (!alreadyRegistered) {
+                    existing.push({
+                        hooks: [{ type: 'command', command: hookCommand, timeout: 5 }],
+                    });
+                    settings.hooks[event] = existing;
+                    updated = true;
+                }
+            }
+        }
         // Write updated settings if any permissions or hooks were added
         if (updated) {
             fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2), 'utf8');

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

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