sudocode 1.1.17 → 1.1.18-dev.0

package/node_modules/@sudocode-ai/local-server/dist/execution/worktree/config.js

@@ -0,0 +1,280 @@
+/**
+ * Worktree Configuration
+ *
+ * Loads and validates worktree configuration from .sudocode/config.json
+ *
+ * @module execution/worktree/config
+ */
+import fs from 'fs';
+import path from 'path';
+/**
+ * Default worktree configuration
+ */
+export const DEFAULT_WORKTREE_CONFIG = {
+    worktreeStoragePath: '.sudocode/worktrees',
+    autoCreateBranches: true,
+    autoDeleteBranches: false,
+    enableSparseCheckout: false,
+    sparseCheckoutPatterns: undefined,
+    branchPrefix: 'sudocode',
+    cleanupOrphanedWorktreesOnStartup: false,
+};
+/**
+ * Validate and normalize worktree configuration
+ *
+ * @param rawConfig - Raw configuration object from config.json
+ * @returns Validated configuration with warnings
+ */
+export function validateWorktreeConfig(rawConfig) {
+    const warnings = [];
+    const config = { ...DEFAULT_WORKTREE_CONFIG };
+    // Validate worktreeStoragePath
+    if (rawConfig.worktreeStoragePath !== undefined) {
+        if (typeof rawConfig.worktreeStoragePath === 'string') {
+            config.worktreeStoragePath = rawConfig.worktreeStoragePath;
+        }
+        else {
+            warnings.push(`Invalid worktreeStoragePath: must be a string. Using default: ${DEFAULT_WORKTREE_CONFIG.worktreeStoragePath}`);
+        }
+    }
+    // Validate autoCreateBranches
+    if (rawConfig.autoCreateBranches !== undefined) {
+        if (typeof rawConfig.autoCreateBranches === 'boolean') {
+            config.autoCreateBranches = rawConfig.autoCreateBranches;
+        }
+        else {
+            warnings.push(`Invalid autoCreateBranches: must be a boolean. Using default: ${DEFAULT_WORKTREE_CONFIG.autoCreateBranches}`);
+        }
+    }
+    // Validate autoDeleteBranches
+    if (rawConfig.autoDeleteBranches !== undefined) {
+        if (typeof rawConfig.autoDeleteBranches === 'boolean') {
+            config.autoDeleteBranches = rawConfig.autoDeleteBranches;
+        }
+        else {
+            warnings.push(`Invalid autoDeleteBranches: must be a boolean. Using default: ${DEFAULT_WORKTREE_CONFIG.autoDeleteBranches}`);
+        }
+    }
+    // Validate enableSparseCheckout
+    if (rawConfig.enableSparseCheckout !== undefined) {
+        if (typeof rawConfig.enableSparseCheckout === 'boolean') {
+            config.enableSparseCheckout = rawConfig.enableSparseCheckout;
+        }
+        else {
+            warnings.push(`Invalid enableSparseCheckout: must be a boolean. Using default: ${DEFAULT_WORKTREE_CONFIG.enableSparseCheckout}`);
+        }
+    }
+    // Validate sparseCheckoutPatterns
+    if (rawConfig.sparseCheckoutPatterns !== undefined) {
+        if (Array.isArray(rawConfig.sparseCheckoutPatterns) &&
+            rawConfig.sparseCheckoutPatterns.every((p) => typeof p === 'string')) {
+            config.sparseCheckoutPatterns = rawConfig.sparseCheckoutPatterns;
+        }
+        else {
+            warnings.push('Invalid sparseCheckoutPatterns: must be an array of strings. Ignoring value.');
+            config.sparseCheckoutPatterns = undefined;
+        }
+    }
+    // Validate branchPrefix
+    if (rawConfig.branchPrefix !== undefined) {
+        if (typeof rawConfig.branchPrefix === 'string') {
+            // Validate git branch name characters (basic validation)
+            if (isValidGitBranchPrefix(rawConfig.branchPrefix)) {
+                config.branchPrefix = rawConfig.branchPrefix;
+            }
+            else {
+                warnings.push(`Invalid branchPrefix: contains invalid git branch name characters. Using default: ${DEFAULT_WORKTREE_CONFIG.branchPrefix}`);
+            }
+        }
+        else {
+            warnings.push(`Invalid branchPrefix: must be a string. Using default: ${DEFAULT_WORKTREE_CONFIG.branchPrefix}`);
+        }
+    }
+    // Validate cleanupOrphanedWorktreesOnStartup
+    if (rawConfig.cleanupOrphanedWorktreesOnStartup !== undefined) {
+        if (typeof rawConfig.cleanupOrphanedWorktreesOnStartup === 'boolean') {
+            config.cleanupOrphanedWorktreesOnStartup =
+                rawConfig.cleanupOrphanedWorktreesOnStartup;
+        }
+        else {
+            warnings.push(`Invalid cleanupOrphanedWorktreesOnStartup: must be a boolean. Using default: ${DEFAULT_WORKTREE_CONFIG.cleanupOrphanedWorktreesOnStartup}`);
+        }
+    }
+    return { config, warnings };
+}
+/**
+ * Validate git branch prefix characters
+ * Basic validation - checks for common invalid characters
+ *
+ * @param prefix - Branch prefix to validate
+ * @returns True if valid
+ */
+function isValidGitBranchPrefix(prefix) {
+    // Git branch names cannot contain: .., @{, \, ^, ~, :, ?, *, [, space, or control characters
+    // Also cannot start with / or end with .lock
+    const invalidPatterns = [
+        /\.\./,
+        /@\{/,
+        /\\/,
+        /\^/,
+        /~/,
+        /:/,
+        /\?/,
+        /\*/,
+        /\[/,
+        /\s/,
+        // eslint-disable-next-line no-control-regex
+        /[\x00-\x1f\x7f]/,
+    ];
+    if (prefix.startsWith('/') || prefix.endsWith('.lock')) {
+        return false;
+    }
+    return !invalidPatterns.some((pattern) => pattern.test(prefix));
+}
+/**
+ * Load worktree configuration from .sudocode/config.json
+ *
+ * @param projectRoot - Path to project root (default: current working directory)
+ * @returns Validated configuration with warnings
+ */
+export function loadWorktreeConfig(projectRoot = process.cwd()) {
+    const configPath = path.join(projectRoot, '.sudocode', 'config.json');
+    // If config file doesn't exist, return defaults
+    if (!fs.existsSync(configPath)) {
+        return {
+            config: DEFAULT_WORKTREE_CONFIG,
+            warnings: [
+                `Config file not found at ${configPath}. Using default configuration.`,
+            ],
+        };
+    }
+    try {
+        const rawFileContent = fs.readFileSync(configPath, 'utf-8');
+        const rawConfig = JSON.parse(rawFileContent);
+        // Extract worktree section
+        const worktreeConfig = rawConfig.worktree || {};
+        // Validate and return
+        return validateWorktreeConfig(worktreeConfig);
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        return {
+            config: DEFAULT_WORKTREE_CONFIG,
+            warnings: [
+                `Failed to load config from ${configPath}: ${errorMessage}. Using default configuration.`,
+            ],
+        };
+    }
+}
+/**
+ * Singleton instance of worktree configuration
+ */
+let cachedConfig = null;
+let cachedProjectRoot = null;
+/**
+ * Get worktree configuration (singleton pattern)
+ * Caches the configuration per project root
+ *
+ * @param projectRoot - Path to project root (default: current working directory)
+ * @param forceReload - Force reload from disk
+ * @returns Worktree configuration
+ */
+export function getWorktreeConfig(projectRoot = process.cwd(), forceReload = false) {
+    // Return cached config if same project root and not forcing reload
+    if (!forceReload && cachedConfig && cachedProjectRoot === projectRoot) {
+        return cachedConfig;
+    }
+    // Load and validate configuration
+    const { config, warnings } = loadWorktreeConfig(projectRoot);
+    // Log warnings
+    if (warnings.length > 0) {
+        console.warn('[Worktree Config] Configuration warnings:');
+        warnings.forEach((warning) => console.warn(`  - ${warning}`));
+    }
+    // Cache the configuration
+    cachedConfig = config;
+    cachedProjectRoot = projectRoot;
+    return config;
+}
+/**
+ * Clear the cached configuration (useful for testing)
+ */
+export function clearWorktreeConfigCache() {
+    cachedConfig = null;
+    cachedProjectRoot = null;
+}
+/**
+ * Update worktree configuration in .sudocode/config.json
+ * Preserves other configuration sections
+ *
+ * @param updates - Partial configuration to update
+ * @param projectRoot - Path to project root (default: current working directory)
+ * @returns Validation result with updated config
+ * @throws Error if unable to write config file
+ */
+export function updateWorktreeConfig(updates, projectRoot = process.cwd()) {
+    const configPath = path.join(projectRoot, '.sudocode', 'config.json');
+    // Load existing config (or create new one)
+    let existingConfig = {};
+    if (fs.existsSync(configPath)) {
+        try {
+            const rawFileContent = fs.readFileSync(configPath, 'utf-8');
+            existingConfig = JSON.parse(rawFileContent);
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            throw new Error(`Failed to read existing config from ${configPath}: ${errorMessage}`);
+        }
+    }
+    else {
+        // Create .sudocode directory if it doesn't exist
+        const sudocodeDir = path.dirname(configPath);
+        if (!fs.existsSync(sudocodeDir)) {
+            fs.mkdirSync(sudocodeDir, { recursive: true });
+        }
+    }
+    // Merge updates with existing worktree config
+    const mergedWorktreeConfig = {
+        ...(existingConfig.worktree || {}),
+        ...updates,
+    };
+    // Validate merged config
+    const validationResult = validateWorktreeConfig(mergedWorktreeConfig);
+    // Update config object
+    existingConfig.worktree = validationResult.config;
+    // Write to file
+    try {
+        fs.writeFileSync(configPath, JSON.stringify(existingConfig, null, 2), 'utf-8');
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        throw new Error(`Failed to write config to ${configPath}: ${errorMessage}`);
+    }
+    // Invalidate cache
+    if (cachedProjectRoot === projectRoot) {
+        cachedConfig = null;
+        cachedProjectRoot = null;
+    }
+    return validationResult;
+}
+/**
+ * Set a single worktree configuration property
+ *
+ * @param key - Configuration key to set
+ * @param value - Value to set
+ * @param projectRoot - Path to project root (default: current working directory)
+ * @returns Validation result with updated config
+ */
+export function setWorktreeConfigProperty(key, value, projectRoot = process.cwd()) {
+    return updateWorktreeConfig({ [key]: value }, projectRoot);
+}
+/**
+ * Reset worktree configuration to defaults
+ *
+ * @param projectRoot - Path to project root (default: current working directory)
+ * @returns Validation result with default config
+ */
+export function resetWorktreeConfig(projectRoot = process.cwd()) {
+    return updateWorktreeConfig(DEFAULT_WORKTREE_CONFIG, projectRoot);
+}
+//# sourceMappingURL=config.js.map

package/node_modules/@sudocode-ai/local-server/dist/execution/worktree/config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/execution/worktree/config.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAmBxB;;GAEG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAmB;IACrD,mBAAmB,EAAE,qBAAqB;IAC1C,kBAAkB,EAAE,IAAI;IACxB,kBAAkB,EAAE,KAAK;IACzB,oBAAoB,EAAE,KAAK;IAC3B,sBAAsB,EAAE,SAAS;IACjC,YAAY,EAAE,UAAU;IACxB,iCAAiC,EAAE,KAAK;CACzC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,UAAU,sBAAsB,CACpC,SAAkC;IAElC,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,MAAM,MAAM,GAAmB,EAAE,GAAG,uBAAuB,EAAE,CAAC;IAE9D,+BAA+B;IAC/B,IAAI,SAAS,CAAC,mBAAmB,KAAK,SAAS,EAAE,CAAC;QAChD,IAAI,OAAO,SAAS,CAAC,mBAAmB,KAAK,QAAQ,EAAE,CAAC;YACtD,MAAM,CAAC,mBAAmB,GAAG,SAAS,CAAC,mBAAmB,CAAC;QAC7D,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,IAAI,CACX,iEAAiE,uBAAuB,CAAC,mBAAmB,EAAE,CAC/G,CAAC;QACJ,CAAC;IACH,CAAC;IAED,8BAA8B;IAC9B,IAAI,SAAS,CAAC,kBAAkB,KAAK,SAAS,EAAE,CAAC;QAC/C,IAAI,OAAO,SAAS,CAAC,kBAAkB,KAAK,SAAS,EAAE,CAAC;YACtD,MAAM,CAAC,kBAAkB,GAAG,SAAS,CAAC,kBAAkB,CAAC;QAC3D,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,IAAI,CACX,iEAAiE,uBAAuB,CAAC,kBAAkB,EAAE,CAC9G,CAAC;QACJ,CAAC;IACH,CAAC;IAED,8BAA8B;IAC9B,IAAI,SAAS,CAAC,kBAAkB,KAAK,SAAS,EAAE,CAAC;QAC/C,IAAI,OAAO,SAAS,CAAC,kBAAkB,KAAK,SAAS,EAAE,CAAC;YACtD,MAAM,CAAC,kBAAkB,GAAG,SAAS,CAAC,kBAAkB,CAAC;QAC3D,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,IAAI,CACX,iEAAiE,uBAAuB,CAAC,kBAAkB,EAAE,CAC9G,CAAC;QACJ,CAAC;IACH,CAAC;IAED,gCAAgC;IAChC,IAAI,SAAS,CAAC,oBAAoB,KAAK,SAAS,EAAE,CAAC;QACjD,IAAI,OAAO,SAAS,CAAC,oBAAoB,KAAK,SAAS,EAAE,CAAC;YACxD,MAAM,CAAC,oBAAoB,GAAG,SAAS,CAAC,oBAAoB,CAAC;QAC/D,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,IAAI,CACX,mEAAmE,uBAAuB,CAAC,oBAAoB,EAAE,CAClH,CAAC;QACJ,CAAC;IACH,CAAC;IAED,kCAAkC;IAClC,IAAI,SAAS,CAAC,sBAAsB,KAAK,SAAS,EAAE,CAAC;QACnD,IACE,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,sBAAsB,CAAC;YAC/C,SAAS,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,EAC7E,CAAC;YACD,MAAM,CAAC,sBAAsB,GAAG,SAAS,CAAC,sBAAsB,CAAC;QACnE,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,IAAI,CACX,8EAA8E,CAC/E,CAAC;YACF,MAAM,CAAC,sBAAsB,GAAG,SAAS,CAAC;QAC5C,CAAC;IACH,CAAC;IAED,wBAAwB;IACxB,IAAI,SAAS,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;QACzC,IAAI,OAAO,SAAS,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;YAC/C,yDAAyD;YACzD,IAAI,sBAAsB,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,CAAC;gBACnD,MAAM,CAAC,YAAY,GAAG,SAAS,CAAC,YAAY,CAAC;YAC/C,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,IAAI,CACX,qFAAqF,uBAAuB,CAAC,YAAY,EAAE,CAC5H,CAAC;YACJ,CAAC;QACH,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,IAAI,CACX,0DAA0D,uBAAuB,CAAC,YAAY,EAAE,CACjG,CAAC;QACJ,CAAC;IACH,CAAC;IAED,6CAA6C;IAC7C,IAAI,SAAS,CAAC,iCAAiC,KAAK,SAAS,EAAE,CAAC;QAC9D,IAAI,OAAO,SAAS,CAAC,iCAAiC,KAAK,SAAS,EAAE,CAAC;YACrE,MAAM,CAAC,iCAAiC;gBACtC,SAAS,CAAC,iCAAiC,CAAC;QAChD,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,IAAI,CACX,gFAAgF,uBAAuB,CAAC,iCAAiC,EAAE,CAC5I,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;AAC9B,CAAC;AAED;;;;;;GAMG;AACH,SAAS,sBAAsB,CAAC,MAAc;IAC5C,6FAA6F;IAC7F,6CAA6C;IAC7C,MAAM,eAAe,GAAG;QACtB,MAAM;QACN,KAAK;QACL,IAAI;QACJ,IAAI;QACJ,GAAG;QACH,GAAG;QACH,IAAI;QACJ,IAAI;QACJ,IAAI;QACJ,IAAI;QACJ,4CAA4C;QAC5C,iBAAiB;KAClB,CAAC;IAEF,IAAI,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QACvD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;AAClE,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,kBAAkB,CAChC,cAAsB,OAAO,CAAC,GAAG,EAAE;IAEnC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;IAEtE,gDAAgD;IAChD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,OAAO;YACL,MAAM,EAAE,uBAAuB;YAC/B,QAAQ,EAAE;gBACR,4BAA4B,UAAU,gCAAgC;aACvE;SACF,CAAC;IACJ,CAAC;IAED,IAAI,CAAC;QACH,MAAM,cAAc,GAAG,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAC5D,MAAM,SAAS,GAAc,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAExD,2BAA2B;QAC3B,MAAM,cAAc,GAAG,SAAS,CAAC,QAAQ,IAAI,EAAE,CAAC;QAEhD,sBAAsB;QACtB,OAAO,sBAAsB,CAAC,cAAc,CAAC,CAAC;IAChD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,YAAY,GAChB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACzD,OAAO;YACL,MAAM,EAAE,uBAAuB;YAC/B,QAAQ,EAAE;gBACR,8BAA8B,UAAU,KAAK,YAAY,gCAAgC;aAC1F;SACF,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;GAEG;AACH,IAAI,YAAY,GAA0B,IAAI,CAAC;AAC/C,IAAI,iBAAiB,GAAkB,IAAI,CAAC;AAE5C;;;;;;;GAOG;AACH,MAAM,UAAU,iBAAiB,CAC/B,cAAsB,OAAO,CAAC,GAAG,EAAE,EACnC,WAAW,GAAG,KAAK;IAEnB,mEAAmE;IACnE,IAAI,CAAC,WAAW,IAAI,YAAY,IAAI,iBAAiB,KAAK,WAAW,EAAE,CAAC;QACtE,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,kCAAkC;IAClC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAE7D,eAAe;IACf,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,OAAO,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;QAC1D,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,OAAO,EAAE,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,0BAA0B;IAC1B,YAAY,GAAG,MAAM,CAAC;IACtB,iBAAiB,GAAG,WAAW,CAAC;IAEhC,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,wBAAwB;IACtC,YAAY,GAAG,IAAI,CAAC;IACpB,iBAAiB,GAAG,IAAI,CAAC;AAC3B,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,oBAAoB,CAClC,OAAgC,EAChC,cAAsB,OAAO,CAAC,GAAG,EAAE;IAEnC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;IAEtE,2CAA2C;IAC3C,IAAI,cAAc,GAAc,EAAE,CAAC;IAEnC,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC9B,IAAI,CAAC;YACH,MAAM,cAAc,GAAG,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YAC5D,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAC9C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,YAAY,GAChB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACzD,MAAM,IAAI,KAAK,CACb,uCAAuC,UAAU,KAAK,YAAY,EAAE,CACrE,CAAC;QACJ,CAAC;IACH,CAAC;SAAM,CAAC;QACN,iDAAiD;QACjD,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC7C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YAChC,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACjD,CAAC;IACH,CAAC;IAED,8CAA8C;IAC9C,MAAM,oBAAoB,GAAG;QAC3B,GAAG,CAAC,cAAc,CAAC,QAAQ,IAAI,EAAE,CAAC;QAClC,GAAG,OAAO;KACX,CAAC;IAEF,yBAAyB;IACzB,MAAM,gBAAgB,GAAG,sBAAsB,CAAC,oBAAoB,CAAC,CAAC;IAEtE,uBAAuB;IACvB,cAAc,CAAC,QAAQ,GAAG,gBAAgB,CAAC,MAAM,CAAC;IAElD,gBAAgB;IAChB,IAAI,CAAC;QACH,EAAE,CAAC,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IACjF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC5E,MAAM,IAAI,KAAK,CAAC,6BAA6B,UAAU,KAAK,YAAY,EAAE,CAAC,CAAC;IAC9E,CAAC;IAED,mBAAmB;IACnB,IAAI,iBAAiB,KAAK,WAAW,EAAE,CAAC;QACtC,YAAY,GAAG,IAAI,CAAC;QACpB,iBAAiB,GAAG,IAAI,CAAC;IAC3B,CAAC;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,yBAAyB,CACvC,GAAM,EACN,KAAwB,EACxB,cAAsB,OAAO,CAAC,GAAG,EAAE;IAEnC,OAAO,oBAAoB,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,EAAE,WAAW,CAAC,CAAC;AAC7D,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CACjC,cAAsB,OAAO,CAAC,GAAG,EAAE;IAEnC,OAAO,oBAAoB,CAAC,uBAAuB,EAAE,WAAW,CAAC,CAAC;AACpE,CAAC"}

package/node_modules/@sudocode-ai/local-server/dist/execution/worktree/conflict-detector.d.ts

@@ -0,0 +1,85 @@
+/**
+ * Conflict Detector
+ *
+ * Detects and classifies merge conflicts between branches without modifying the working tree.
+ * Distinguishes between auto-resolvable JSONL conflicts and manual code conflicts.
+ *
+ * @module execution/worktree/conflict-detector
+ */
+/**
+ * Comprehensive conflict report
+ */
+export interface ConflictReport {
+    hasConflicts: boolean;
+    codeConflicts: CodeConflict[];
+    jsonlConflicts: JSONLConflict[];
+    totalFiles: number;
+    summary: string;
+}
+/**
+ * Code conflict requiring manual resolution
+ */
+export interface CodeConflict {
+    filePath: string;
+    conflictType: 'content' | 'delete' | 'rename' | 'mode';
+    description: string;
+    canAutoResolve: boolean;
+    resolutionStrategy?: string;
+}
+/**
+ * JSONL conflict that can be auto-resolved using merge-resolver
+ */
+export interface JSONLConflict {
+    filePath: string;
+    entityType: 'issue' | 'spec';
+    conflictCount: number;
+    canAutoResolve: boolean;
+}
+/**
+ * ConflictDetector - Detects and classifies merge conflicts
+ *
+ * Uses GitSyncCli to perform dry-run merge detection and classifies
+ * conflicts as either auto-resolvable JSONL conflicts or manual code conflicts.
+ */
+export declare class ConflictDetector {
+    private gitSync;
+    constructor(repoPath: string);
+    /**
+     * Detect all conflicts between two branches
+     *
+     * @param sourceBranch - Source branch to merge from
+     * @param targetBranch - Target branch to merge into
+     * @returns Comprehensive conflict report
+     */
+    detectConflicts(sourceBranch: string, targetBranch: string): ConflictReport;
+    /**
+     * Check if file is a JSONL file in .sudocode directory
+     *
+     * @param filePath - File path to check
+     * @returns true if JSONL file in .sudocode/
+     */
+    private isJSONLFile;
+    /**
+     * Classify a JSONL conflict
+     *
+     * @param filePath - Path to JSONL file
+     * @returns JSONL conflict object
+     */
+    private classifyJSONLConflict;
+    /**
+     * Classify a code conflict
+     *
+     * @param filePath - Path to conflicting file
+     * @returns Code conflict object
+     */
+    private classifyCodeConflict;
+    /**
+     * Generate human-readable summary of conflicts
+     *
+     * @param codeConflicts - List of code conflicts
+     * @param jsonlConflicts - List of JSONL conflicts
+     * @returns Summary string
+     */
+    private generateSummary;
+}
+//# sourceMappingURL=conflict-detector.d.ts.map

package/node_modules/@sudocode-ai/local-server/dist/execution/worktree/conflict-detector.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflict-detector.d.ts","sourceRoot":"","sources":["../../../src/execution/worktree/conflict-detector.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,OAAO,CAAC;IACtB,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,cAAc,EAAE,aAAa,EAAE,CAAC;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,CAAC;IACvD,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,OAAO,CAAC;IACxB,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,OAAO,GAAG,MAAM,CAAC;IAC7B,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,OAAO,CAAC;CACzB;AAED;;;;;GAKG;AACH,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,OAAO,CAAa;gBAEhB,QAAQ,EAAE,MAAM;IAI5B;;;;;;OAMG;IACH,eAAe,CACb,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,GACnB,cAAc;IAyCjB;;;;;OAKG;IACH,OAAO,CAAC,WAAW;IAOnB;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAkB7B;;;;;OAKG;IACH,OAAO,CAAC,oBAAoB;IAa5B;;;;;;OAMG;IACH,OAAO,CAAC,eAAe;CAoBxB"}

package/node_modules/@sudocode-ai/local-server/dist/execution/worktree/conflict-detector.js

@@ -0,0 +1,129 @@
+/**
+ * Conflict Detector
+ *
+ * Detects and classifies merge conflicts between branches without modifying the working tree.
+ * Distinguishes between auto-resolvable JSONL conflicts and manual code conflicts.
+ *
+ * @module execution/worktree/conflict-detector
+ */
+import { GitSyncCli } from './git-sync-cli.js';
+/**
+ * ConflictDetector - Detects and classifies merge conflicts
+ *
+ * Uses GitSyncCli to perform dry-run merge detection and classifies
+ * conflicts as either auto-resolvable JSONL conflicts or manual code conflicts.
+ */
+export class ConflictDetector {
+    gitSync;
+    constructor(repoPath) {
+        this.gitSync = new GitSyncCli(repoPath);
+    }
+    /**
+     * Detect all conflicts between two branches
+     *
+     * @param sourceBranch - Source branch to merge from
+     * @param targetBranch - Target branch to merge into
+     * @returns Comprehensive conflict report
+     */
+    detectConflicts(sourceBranch, targetBranch) {
+        // Use GitSyncCli to check for merge conflicts
+        const conflictCheck = this.gitSync.checkMergeConflicts(sourceBranch, targetBranch);
+        if (!conflictCheck.hasConflicts) {
+            return {
+                hasConflicts: false,
+                codeConflicts: [],
+                jsonlConflicts: [],
+                totalFiles: 0,
+                summary: 'No conflicts detected',
+            };
+        }
+        // Classify each conflicting file
+        const codeConflicts = [];
+        const jsonlConflicts = [];
+        for (const filePath of conflictCheck.conflictingFiles) {
+            if (this.isJSONLFile(filePath)) {
+                jsonlConflicts.push(this.classifyJSONLConflict(filePath));
+            }
+            else {
+                codeConflicts.push(this.classifyCodeConflict(filePath));
+            }
+        }
+        const totalFiles = codeConflicts.length + jsonlConflicts.length;
+        const summary = this.generateSummary(codeConflicts, jsonlConflicts);
+        return {
+            hasConflicts: true,
+            codeConflicts,
+            jsonlConflicts,
+            totalFiles,
+            summary,
+        };
+    }
+    /**
+     * Check if file is a JSONL file in .sudocode directory
+     *
+     * @param filePath - File path to check
+     * @returns true if JSONL file in .sudocode/
+     */
+    isJSONLFile(filePath) {
+        return (filePath.endsWith('.jsonl') &&
+            (filePath.includes('.sudocode/') || filePath.startsWith('.sudocode/')));
+    }
+    /**
+     * Classify a JSONL conflict
+     *
+     * @param filePath - Path to JSONL file
+     * @returns JSONL conflict object
+     */
+    classifyJSONLConflict(filePath) {
+        // Determine entity type from file name
+        let entityType = 'issue';
+        if (filePath.includes('issues.jsonl')) {
+            entityType = 'issue';
+        }
+        else if (filePath.includes('specs.jsonl')) {
+            entityType = 'spec';
+        }
+        return {
+            filePath,
+            entityType,
+            conflictCount: 1, // We don't have line-level detail from merge-tree
+            canAutoResolve: true, // JSONL conflicts are always auto-resolvable
+        };
+    }
+    /**
+     * Classify a code conflict
+     *
+     * @param filePath - Path to conflicting file
+     * @returns Code conflict object
+     */
+    classifyCodeConflict(filePath) {
+        // Default to content conflict (most common)
+        // More sophisticated detection would require deeper merge-tree parsing
+        // to distinguish between delete, rename, and mode conflicts
+        return {
+            filePath,
+            conflictType: 'content',
+            description: 'Both branches modified the same lines',
+            canAutoResolve: false, // Code conflicts require manual resolution
+            resolutionStrategy: 'Manually review and merge changes, or choose one version',
+        };
+    }
+    /**
+     * Generate human-readable summary of conflicts
+     *
+     * @param codeConflicts - List of code conflicts
+     * @param jsonlConflicts - List of JSONL conflicts
+     * @returns Summary string
+     */
+    generateSummary(codeConflicts, jsonlConflicts) {
+        const parts = [];
+        if (jsonlConflicts.length > 0) {
+            parts.push(`${jsonlConflicts.length} JSONL conflict${jsonlConflicts.length > 1 ? 's' : ''} (auto-resolvable)`);
+        }
+        if (codeConflicts.length > 0) {
+            parts.push(`${codeConflicts.length} code conflict${codeConflicts.length > 1 ? 's' : ''} (manual resolution required)`);
+        }
+        return parts.join(', ');
+    }
+}
+//# sourceMappingURL=conflict-detector.js.map

package/node_modules/@sudocode-ai/local-server/dist/execution/worktree/conflict-detector.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflict-detector.js","sourceRoot":"","sources":["../../../src/execution/worktree/conflict-detector.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAkC/C;;;;;GAKG;AACH,MAAM,OAAO,gBAAgB;IACnB,OAAO,CAAa;IAE5B,YAAY,QAAgB;QAC1B,IAAI,CAAC,OAAO,GAAG,IAAI,UAAU,CAAC,QAAQ,CAAC,CAAC;IAC1C,CAAC;IAED;;;;;;OAMG;IACH,eAAe,CACb,YAAoB,EACpB,YAAoB;QAEpB,8CAA8C;QAC9C,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,mBAAmB,CACpD,YAAY,EACZ,YAAY,CACb,CAAC;QAEF,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,CAAC;YAChC,OAAO;gBACL,YAAY,EAAE,KAAK;gBACnB,aAAa,EAAE,EAAE;gBACjB,cAAc,EAAE,EAAE;gBAClB,UAAU,EAAE,CAAC;gBACb,OAAO,EAAE,uBAAuB;aACjC,CAAC;QACJ,CAAC;QAED,iCAAiC;QACjC,MAAM,aAAa,GAAmB,EAAE,CAAC;QACzC,MAAM,cAAc,GAAoB,EAAE,CAAC;QAE3C,KAAK,MAAM,QAAQ,IAAI,aAAa,CAAC,gBAAgB,EAAE,CAAC;YACtD,IAAI,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC/B,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC5D,CAAC;iBAAM,CAAC;gBACN,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC1D,CAAC;QACH,CAAC;QAED,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC;QAChE,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;QAEpE,OAAO;YACL,YAAY,EAAE,IAAI;YAClB,aAAa;YACb,cAAc;YACd,UAAU;YACV,OAAO;SACR,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACK,WAAW,CAAC,QAAgB;QAClC,OAAO,CACL,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAC3B,CAAC,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CACvE,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACK,qBAAqB,CAAC,QAAgB;QAC5C,uCAAuC;QACvC,IAAI,UAAU,GAAqB,OAAO,CAAC;QAE3C,IAAI,QAAQ,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;YACtC,UAAU,GAAG,OAAO,CAAC;QACvB,CAAC;aAAM,IAAI,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;YAC5C,UAAU,GAAG,MAAM,CAAC;QACtB,CAAC;QAED,OAAO;YACL,QAAQ;YACR,UAAU;YACV,aAAa,EAAE,CAAC,EAAE,kDAAkD;YACpE,cAAc,EAAE,IAAI,EAAE,6CAA6C;SACpE,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACK,oBAAoB,CAAC,QAAgB;QAC3C,4CAA4C;QAC5C,uEAAuE;QACvE,4DAA4D;QAC5D,OAAO;YACL,QAAQ;YACR,YAAY,EAAE,SAAS;YACvB,WAAW,EAAE,uCAAuC;YACpD,cAAc,EAAE,KAAK,EAAE,2CAA2C;YAClE,kBAAkB,EAAE,0DAA0D;SAC/E,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACK,eAAe,CACrB,aAA6B,EAC7B,cAA+B;QAE/B,MAAM,KAAK,GAAa,EAAE,CAAC;QAE3B,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9B,KAAK,CAAC,IAAI,CACR,GAAG,cAAc,CAAC,MAAM,kBAAkB,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,oBAAoB,CACnG,CAAC;QACJ,CAAC;QAED,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,KAAK,CAAC,IAAI,CACR,GAAG,aAAa,CAAC,MAAM,iBAAiB,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,+BAA+B,CAC3G,CAAC;QACJ,CAAC;QAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CACF"}