npm - @codeyam/codeyam-cli - Versions diffs - 0.1.6 → 0.1.8 - Mend

@codeyam/codeyam-cli 0.1.6 → 0.1.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (398) hide show

package/codeyam-cli/src/utils/queue/job.js CHANGED Viewed

@@ -6,6 +6,13 @@ import { getAnalyzerVersion } from "../versionInfo.js";
 import { killProcess } from "../../../../packages/utils/server.js";
 import { loadAnalysis, updateCommitMetadata, updateFreshAnalysisMetadata, updateFreshAnalysisStatus, } from "../../../../packages/database/index.js";
 import { ProjectFramework } from "../../../../packages/types/index.js";
+import { InteractiveSyncWatcher, } from "../interactiveSyncWatcher.js";
+import { devModeEventEmitter } from "../devModeEvents.js";
+import fs from 'fs';
+import path from 'path';
+import { execSync } from 'child_process';
+// Store active sync watchers by analysisId for cleanup on stop
+const activeSyncWatchers = new Map();
 export async function executeJob(job, projectRoot, notifier) {
     console.log(`[Queue] Executing job ${job.id} (${job.type})`);
     try {
@@ -589,11 +596,49 @@ async function executeInteractiveStartJob(job, projectRoot, notifier) {
     if (scenarioId) {
         analyzerEnvironment.SCENARIO_IDS = scenarioId;
     }
+    // Clean up stale processes from previous interactive sessions that weren't properly shut down
+    // (e.g., if the codeyam server was killed/restarted without stopping interactive mode)
+    const projectPath = getProjectPath(projectSlug);
+    const lockFile = path.join(projectPath, '.next', 'dev', 'lock');
+    if (fs.existsSync(lockFile)) {
+        console.log(`[Queue] Found stale .next/dev/lock, cleaning up old processes`);
+        try {
+            // Kill any next dev processes running in this tmp project directory
+            const pids = execSync(`pgrep -f ${JSON.stringify(projectPath)} 2>/dev/null || true`, { encoding: 'utf-8' }).trim();
+            if (pids) {
+                for (const pid of pids.split('\n').filter(Boolean)) {
+                    try {
+                        process.kill(parseInt(pid, 10), 'SIGTERM');
+                        console.log(`[Queue] Killed stale process ${pid}`);
+                    }
+                    catch {
+                        // Already exited
+                    }
+                }
+            }
+        }
+        catch {
+            // Best effort
+        }
+        // Remove the lock file
+        try {
+            fs.unlinkSync(lockFile);
+            console.log(`[Queue] Removed stale lock file`);
+        }
+        catch {
+            // Ignore
+        }
+    }
+    // Skip prepareRepo() if the project dir already exists from a prior analysis or interactive run.
+    // The InteractiveSyncWatcher handles any file changes that happened between runs.
+    const projectAlreadyPrepared = fs.existsSync(projectPath) &&
+        fs.existsSync(path.join(projectPath, 'package.json'));
     const analyzerStartArgs = {
         packageManager: project.metadata?.packageManager || 'npm',
-        absoluteProjectRootPath: getProjectPath(projectSlug),
+        absoluteProjectRootPath: projectPath,
         port: undefined, // Use random port to avoid conflicts
         noServer: false,
+        fast: projectAlreadyPrepared, // Skip prepareRepo when project dir exists
         framework: project.metadata?.webapps?.[0]?.framework || ProjectFramework.Next,
     };
     // Mark analysis as ready to be captured in the database before starting the process
@@ -611,6 +656,23 @@ async function executeInteractiveStartJob(job, projectRoot, notifier) {
         };
     });
     console.log(`[Queue] Interactive mode started for analysis ${analysisId}, PID: ${analysisResult.process.pid}`);
+    // Start file sync watcher to sync code changes from original project to tmp project
+    const tmpProjectPath = getProjectPath(projectSlug);
+    const syncWatcher = new InteractiveSyncWatcher({
+        projectRootPath: projectRoot,
+        tmpProjectPath,
+    });
+    syncWatcher.on('sync', (event) => {
+        if (event.type === 'file-synced') {
+            devModeEventEmitter.emitFileSynced(event.fileName, event.filePath);
+        }
+        else if (event.type === 'error') {
+            devModeEventEmitter.emitError(event.fileName, event.filePath);
+        }
+    });
+    syncWatcher.start();
+    activeSyncWatchers.set(analysisId, syncWatcher);
+    console.log(`[Queue] File sync watcher started for analysis ${analysisId}`);
     // Don't await - let the process run in background
     // The process will be killed when executeInteractiveStopJob is called
 }
@@ -633,6 +695,13 @@ async function executeInteractiveStopJob(job, projectRoot, notifier) {
         console.log(`[Queue] No interactive mode process found for analysis ${analysisId}`);
         return;
     }
+    // Stop the file sync watcher if running
+    const syncWatcher = activeSyncWatchers.get(analysisId);
+    if (syncWatcher) {
+        syncWatcher.stop();
+        activeSyncWatchers.delete(analysisId);
+        console.log(`[Queue] File sync watcher stopped for analysis ${analysisId}`);
+    }
     // Kill the process
     const pid = interactiveMode.pid;
     console.log(`[Queue] Stopping interactive mode for analysis ${analysisId}, killing PID: ${pid}`);

package/codeyam-cli/src/utils/queue/job.js.map CHANGED Viewed

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

package/codeyam-cli/src/utils/queue/manager.js CHANGED Viewed

@@ -23,13 +23,14 @@ export class AnalysisQueue {
     }
     start() {
         this.state = loadQueueState(this.projectRoot);
+        // Clear any stale currentlyExecuting job from previous session
+        // (if server was killed while job was running)
+        if (this.state.currentlyExecuting) {
+            console.log(`[Queue] Clearing stale currentlyExecuting job from previous session: ${this.state.currentlyExecuting.id}`);
+            this.state.currentlyExecuting = undefined;
+            this.save();
+        }
         if (this.state.jobs.length > 0) {
-            // Clear any stale currentlyExecuting job from previous session
-            // (if server was killed while job was running)
-            if (this.state.currentlyExecuting) {
-                console.log(`[Queue] Clearing stale currentlyExecuting job from previous session: ${this.state.currentlyExecuting.id}`);
-                this.state.currentlyExecuting = undefined;
-            }
             this.state.paused = true;
             this.save();
             console.log(`[Queue] Found ${this.state.jobs.length} queued jobs from previous session (paused)`);

package/codeyam-cli/src/utils/queue/manager.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../../../src/utils/queue/manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,cAAc,EACd,cAAc,GACf,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAkBpC,MAAM,OAAO,aAAa;IAQxB,YAAY,WAAmB,EAAE,QAAuC;QALhE,eAAU,GAAY,KAAK,CAAC;QAC5B,wBAAmB,GAAyC,IAAI,GAAG,EAAE,CAAC;QACtE,kBAAa,GAA2B,IAAI,GAAG,EAAE,CAAC;QAIxD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,KAAK,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;QAEzC,mEAAmE;QACnE,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE,CAAC;gBACnC,oDAAoD;gBACpD,IAAI,CAAC,QAAQ,GAAG;oBACd,YAAY,EAAE,GAAG,EAAE,CAAC,QAAQ,EAAE;iBAC/B,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;YAC3B,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK;QACH,IAAI,CAAC,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAE9C~~,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/B~~,+DAA+D;~~YAC~~/D,+CAA+C;~~YAC~~/C,IAAI,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,CAAC;~~gBAClC~~,OAAO,CAAC,GAAG,CACT,wEAAwE,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,EAAE,CAC3G,CAAC;~~gBACF~~,IAAI,CAAC,KAAK,CAAC,kBAAkB,GAAG,SAAS,CAAC;~~YAC5C~~,CAAC;~~YAED~~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"}
1	+ {"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../../../src/utils/queue/manager.ts"],"names":[],"mappings":"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"}

package/codeyam-cli/src/utils/scenarioMarkers.js ADDED Viewed

@@ -0,0 +1,134 @@
+/**
+ * Pure logic for transforming {{scenario:Name:ID}} markers into OSC 8
+ * clickable hyperlinks in terminal output.
+ *
+ * Extracted from terminalServer.ts for testability. Zero side-effects.
+ *
+ * Claude Code's renderer inserts ANSI escape codes (colors/styles) within the
+ * marker text, so we can't regex-match on raw PTY data directly. Instead,
+ * strip ANSI codes to find markers, then map positions back to the original
+ * string for replacement.
+ */
+// Matches CSI sequences: \x1b[ followed by params and a letter.
+// Also handles private-mode params (?) and colon-delimited SGR (e.g., 38:2:R:G:B).
+const ANSI_ESCAPE_RE = /\x1b\[[?]?[0-9;:]*[a-zA-Z]/g;
+// Additional non-CSI escapes: charset selection (\x1b(B), save/restore cursor, etc.
+const OTHER_ESCAPE_RE = /\x1b[()][A-Z0-9]/g;
+/**
+ * Strip all ANSI escape sequences from a string.
+ */
+function stripAnsi(data) {
+    return data.replace(ANSI_ESCAPE_RE, '').replace(OTHER_ESCAPE_RE, '');
+}
+/**
+ * Build a position map from ANSI-stripped indices to original indices.
+ * posMap[strippedIndex] = originalIndex, skipping over ANSI sequences.
+ */
+function buildAnsiPositionMap(data, stripped) {
+    const posMap = [];
+    for (let di = 0, si = 0; di < data.length; di++) {
+        if (data[di] === '\x1b') {
+            // Try CSI sequence (with optional ? for private mode, : for colon-delimited SGR)
+            const seqMatch = data.slice(di).match(/^\x1b\[?\??[0-9;:]*[a-zA-Z]/);
+            if (seqMatch) {
+                di += seqMatch[0].length - 1;
+                continue;
+            }
+            // Try charset selection: \x1b(B, \x1b)0, etc.
+            const charsetMatch = data.slice(di).match(/^\x1b[()][A-Z0-9]/);
+            if (charsetMatch) {
+                di += charsetMatch[0].length - 1;
+                continue;
+            }
+        }
+        posMap[si] = di;
+        si++;
+    }
+    posMap[stripped.length] = data.length; // sentinel for end-of-string markers
+    return posMap;
+}
+const MARKER_RE = /\{\{scenario:([^:}]+):([^}]+)\}\}/g;
+/**
+ * Transform {{scenario:Name:ID}} markers into OSC 8 hyperlinks.
+ * OSC 8 format: \x1b]8;;URL\x07VISIBLE_TEXT\x1b]8;;\x07
+ *
+ * Stateless — operates on a single string. For streaming PTY data,
+ * use createMarkerTransformer() which buffers partial markers.
+ */
+export function transformScenarioMarkers(data, port) {
+    const stripped = stripAnsi(data);
+    if (!stripped.includes('{{scenario:'))
+        return data;
+    const posMap = buildAnsiPositionMap(data, stripped);
+    const replacements = [];
+    let m;
+    while ((m = MARKER_RE.exec(stripped)) !== null) {
+        const url = `http://localhost:${port}/editor?scenario=${m[2]}&ref=link`;
+        const visibleName = m[1];
+        // Pad replacement to match the original marker's visible width so table
+        // columns stay aligned after the shorter hyperlink text replaces the marker.
+        const pad = ' '.repeat(Math.max(0, m[0].length - visibleName.length));
+        replacements.push({
+            origStart: posMap[m.index],
+            origEnd: posMap[m.index + m[0].length],
+            replacement: `\x1b]8;;${url}\x07${visibleName}\x1b]8;;\x07${pad}`,
+        });
+    }
+    if (replacements.length === 0)
+        return data;
+    // Replace from end to start so earlier positions stay valid
+    let result = data;
+    for (let i = replacements.length - 1; i >= 0; i--) {
+        const r = replacements[i];
+        result =
+            result.slice(0, r.origStart) + r.replacement + result.slice(r.origEnd);
+    }
+    return result;
+}
+/**
+ * Create a stateful scenario marker transformer that buffers partial markers
+ * across PTY chunks. Claude Code streams output token by token, so the PTY
+ * can split a {{scenario:Name:ID}} marker across two (or more) data events.
+ *
+ * Also handles Ink-style line rewrites where \r (carriage return) invalidates
+ * buffered content from the same line.
+ */
+export function createMarkerTransformer(port) {
+    let buffer = '';
+    return function transform(data) {
+        // If the incoming data contains \r (carriage return), Ink is rewriting
+        // the current line. Any buffered partial marker from that line is stale —
+        // discard it so the new content isn't confused with old fragments.
+        // The buffer only ever holds content after an unclosed {{ (i.e., a partial
+        // marker on the current line), so discarding it is always safe when the
+        // line is being rewritten.
+        if (buffer && data.includes('\r')) {
+            buffer = '';
+            return transform(data);
+        }
+        // Prepend any buffered partial-marker text from the previous chunk
+        const combined = buffer + data;
+        buffer = '';
+        // Strip ANSI to detect partial markers at the end
+        const stripped = stripAnsi(combined);
+        // Check for an unclosed {{ at the end — potential partial marker
+        const lastOpen = stripped.lastIndexOf('{{');
+        if (lastOpen !== -1 && !stripped.slice(lastOpen).includes('}}')) {
+            // Map the stripped position back to the original string
+            const posMap = buildAnsiPositionMap(combined, stripped);
+            const splitPos = posMap[lastOpen];
+            // Safety: if partial marker exceeds 500 chars, it's not a real marker — flush it
+            if (combined.length - splitPos > 500) {
+                return transformScenarioMarkers(combined, port);
+            }
+            buffer = combined.slice(splitPos);
+            const toSend = combined.slice(0, splitPos);
+            // If nothing to send yet (entire chunk is a partial marker), return empty
+            if (toSend.length === 0)
+                return '';
+            return transformScenarioMarkers(toSend, port);
+        }
+        return transformScenarioMarkers(combined, port);
+    };
+}
+//# sourceMappingURL=scenarioMarkers.js.map

package/codeyam-cli/src/utils/scenarioMarkers.js.map ADDED Viewed

@@ -0,0 +1 @@

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

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

@@ -125,32 +125,57 @@ 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;
 }
 //# sourceMappingURL=serverState.js.map

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

	@@ -1 +1 @@
1	- {"version":3,"file":"serverState.js","sourceRoot":"","sources":["../../../../src/utils/serverState.ts"],"names":[],"mappings":"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~~IAEtB~~,oCAAoC;IACpC,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;IAChC,IAAI,KAAK,EAAE,CAAC;QACV,IAAI,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;YACnC,~~gBAAgB~~,~~EAAE~~,CAAC;~~YACnB~~,SAAS,GAAG,IAAI,CAAC;QACnB,CAAC;QAAC,MAAM,CAAC;YACP,gCAAgC;~~YAChC~~,gBAAgB,EAAE,CAAC;~~QACrB~~,CAAC;~~IACH,CAAC;~~IAED,2CAA2C;IAC3C,MAAM,IAAI,GAAG,oBAAoB,EAAE,CAAC;IACpC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;YAC7B,SAAS,GAAG,IAAI,CAAC;QACnB,CAAC;QAAC,MAAM,CAAC;YACP,gDAAgD;QAClD,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}
1	+ {"version":3,"file":"serverState.js","sourceRoot":"","sources":["../../../../src/utils/serverState.ts"],"names":[],"mappings":"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"}

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

@@ -48,6 +48,8 @@ export function setupClaudeCodeSettings(projectRoot, options) {
             'Write(.codeyam/**)',
             'Glob(.codeyam/**)',
         ];
+        // Editor permissions — only in editor mode
+        const editorPermissions = ['Skill(codeyam-editor)'];
         // Simulation permissions — only in full mode
         const simulationPermissions = [
             'Skill(codeyam-setup)',
@@ -55,14 +57,35 @@ export function setupClaudeCodeSettings(projectRoot, options) {
             'Skill(codeyam-debug)',
             'Skill(codeyam-test)',
             'Skill(codeyam-verify)',
+            'Skill(codeyam-dev-mode)',
             'Read(/tmp/codeyam/**)',
             'Edit(/tmp/codeyam/**)',
             'Write(/tmp/codeyam/**)',
             'Glob(/tmp/codeyam/**)',
         ];
-        const codeyamPermissions = mode === 'full'
-            ? [...memoryPermissions, ...simulationPermissions]
-            : memoryPermissions;
+        const isEditorMode = mode === 'editor' || options?.editorMode === true;
+        let codeyamPermissions;
+        if (mode === 'full') {
+            codeyamPermissions = [...memoryPermissions, ...simulationPermissions];
+        }
+        else if (mode === 'editor') {
+            codeyamPermissions = [
+                ...memoryPermissions,
+                ...editorPermissions,
+                ...simulationPermissions,
+            ];
+        }
+        else {
+            codeyamPermissions = memoryPermissions;
+        }
+        // When editorMode flag is set (e.g. full mode + editor), ensure editor permissions are included
+        if (isEditorMode && mode !== 'editor') {
+            for (const perm of [...editorPermissions, ...simulationPermissions]) {
+                if (!codeyamPermissions.includes(perm)) {
+                    codeyamPermissions.push(perm);
+                }
+            }
+        }
         let updated = false;
         for (const permission of codeyamPermissions) {
             if (!settings.permissions.allow.includes(permission)) {
@@ -70,7 +93,25 @@ export function setupClaudeCodeSettings(projectRoot, options) {
                 updated = true;
             }
         }
-        // Write updated settings if any permissions were added
+        // 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']) {
+                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');
             return true;

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

	@@ -1 +1 @@
1	- {"version":3,"file":"setupClaudeCodeSettings.js","sourceRoot":"","sources":["../../../../src/utils/setupClaudeCodeSettings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;~~AAM7B~~;;;;;;;;;GASG;AACH,MAAM,UAAU,uBAAuB,CACrC,WAAmB,EACnB,OAAwC;IAExC,MAAM,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,QAAQ,CAAC;IAEvC,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QACpD,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,qBAAqB,CAAC,CAAC;QAEjE,+CAA+C;QAC/C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC9B,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/C,CAAC;QAED,8CAA8C;QAC9C,IAAI,QAAQ,GAAwB,EAAE,CAAC;QACvC,IAAI,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;YAChC,IAAI,CAAC;gBACH,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;gBACtD,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACjC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,IAAI,CACV,4BAA4B,YAAY,wBAAwB,CACjE,CAAC;YACJ,CAAC;QACH,CAAC;QAED,oEAAoE;QACpE,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;YAC1B,QAAQ,CAAC,WAAW,GAAG,EAAE,CAAC;QAC5B,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;YAChC,QAAQ,CAAC,WAAW,CAAC,KAAK,GAAG,EAAE,CAAC;QAClC,CAAC;QAED,uCAAuC;QACvC,MAAM,iBAAiB,GAAG;YACxB,uBAAuB;YACvB,yBAAyB;YACzB,eAAe;YACf,iBAAiB;YACjB,mBAAmB;YACnB,mBAAmB;YACnB,oBAAoB;YACpB,mBAAmB;SACpB,CAAC;QAEF,6CAA6C;QAC7C,MAAM,qBAAqB,GAAG;YAC5B,sBAAsB;YACtB,oBAAoB;YACpB,sBAAsB;YACtB,qBAAqB;YACrB,uBAAuB;YACvB,uBAAuB;YACvB,uBAAuB;YACvB,wBAAwB;YACxB,uBAAuB;SACxB,CAAC;QAEF,MAAM,~~kBAAkB~~,~~GACtB~~,IAAI,KAAK,~~MAAM~~;~~YACb~~,CAAC,CAAC,CAAC,GAAG,iBAAiB,EAAE,GAAG,qBAAqB,CAAC;~~YAClD~~,CAAC,CAAC,iBAAiB,CAAC;~~QAExB~~,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,KAAK,MAAM,UAAU,IAAI,kBAAkB,EAAE,CAAC;YAC5C,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;gBACrD,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBAC5C,OAAO,GAAG,IAAI,CAAC;YACjB,CAAC;QACH,CAAC;QAED,~~uDAAuD~~;~~QACvD~~,IAAI,OAAO,EAAE,CAAC;YACZ,EAAE,CAAC,aAAa,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;YAC1E,OAAO,IAAI,CAAC;QACd,CAAC;QAED,qBAAqB;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,IAAI,CACV,sDAAuD,KAAe,CAAC,OAAO,EAAE,CACjF,CAAC;QACF,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}
1	+ {"version":3,"file":"setupClaudeCodeSettings.js","sourceRoot":"","sources":["../../../../src/utils/setupClaudeCodeSettings.ts"],"names":[],"mappings":"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"}