@sudocode-ai/local-server 0.1.8 → 0.1.10

package/dist/services/worktree-sync-service.d.ts

@@ -34,6 +34,23 @@ export declare class WorktreeSyncError extends Error {
     cause?: Error | undefined;
     constructor(message: string, code: WorktreeSyncErrorCode, cause?: Error | undefined);
 }
+/**
+ * Uncommitted file stats for preview
+ */
+export interface UncommittedFileStats {
+    files: string[];
+    additions: number;
+    deletions: number;
+}
+/**
+ * Info about potential local conflicts when including uncommitted files
+ */
+export interface PotentialLocalConflicts {
+    /** Number of files that may have merge conflicts */
+    count: number;
+    /** List of files that may have merge conflicts */
+    files: string[];
+}
 /**
  * Sync preview result
  */
@@ -43,7 +60,12 @@ export interface SyncPreviewResult {
     diff: DiffResult;
     commits: Commit[];
     mergeBase: string;
+    /** @deprecated Use uncommittedChanges instead */
     uncommittedJSONLChanges: string[];
+    /** Stats about uncommitted changes in worktree (not included in sync by default) */
+    uncommittedChanges?: UncommittedFileStats;
+    /** Files that may have merge conflicts if "include uncommitted" is selected */
+    potentialLocalConflicts?: PotentialLocalConflicts;
     executionStatus: ExecutionStatus;
     warnings: string[];
 }
@@ -54,8 +76,12 @@ export interface SyncResult {
     success: boolean;
     finalCommit?: string;
     filesChanged: number;
-    conflictsResolved: number;
-    uncommittedJSONLIncluded: boolean;
+    /** Whether there are unresolved merge conflicts (user must resolve manually) */
+    hasConflicts?: boolean;
+    /** List of files that have merge conflicts requiring manual resolution */
+    filesWithConflicts?: string[];
+    /** Number of uncommitted files copied from worktree (stage sync only) */
+    uncommittedFilesIncluded?: number;
     error?: string;
     cleanupOffered?: boolean;
 }
@@ -68,7 +94,6 @@ export declare class WorktreeSyncService {
     private db;
     private repoPath;
     private gitSync;
-    private conflictDetector;
     constructor(db: Database.Database, repoPath: string);
     /**
      * Preview sync without making changes
@@ -77,6 +102,16 @@ export declare class WorktreeSyncService {
      * @returns Preview result with conflicts, diff, and warnings
      */
     previewSync(executionId: string): Promise<SyncPreviewResult>;
+    /**
+     * Validate critical preconditions that prevent us from getting any sync info
+     *
+     * These are "hard" failures - if these fail, we can't get diff/commits info.
+     * Returns an error message if validation fails, null if validation passes.
+     *
+     * @param execution - Execution to validate
+     * @returns Error message if validation fails, null if validation passes
+     */
+    private _validateCriticalPreconditions;
     /**
      * Load execution from database and validate it exists
      *
@@ -115,14 +150,22 @@ export declare class WorktreeSyncService {
      */
     private _createSafetySnapshot;
     /**
-     * Get uncommitted JSONL files from worktree
+     * Get all uncommitted files from worktree
+     *
+     * @param worktreePath - Path to worktree
+     * @returns Array of all uncommitted file paths
+     */
+    private _getUncommittedFiles;
+    /**
+     * Get uncommitted file stats from worktree
      *
-     * Used by previewSync() and will be used in i-3wmx (JSONL conflict resolution)
+     * Returns list of files and aggregate additions/deletions stats
+     * for uncommitted changes in the worktree.
      *
      * @param worktreePath - Path to worktree
-     * @returns Array of uncommitted JSONL file paths
+     * @returns Uncommitted file stats
      */
-    private _getUncommittedJSONLFiles;
+    private _getUncommittedFileStats;
     /**
      * Check if local working tree is clean
      *
@@ -180,14 +223,98 @@ export declare class WorktreeSyncService {
      */
     commitUncommittedJSONL(worktreePath: string, uncommittedFiles: string[]): Promise<void>;
     /**
-     * Perform git merge --squash operation
+     * Perform git merge --squash operation, allowing conflicts
+     *
+     * This method doesn't throw on conflicts.
+     * Instead, it returns information about whether conflicts occurred.
      *
      * @param sourceBranch - Branch to merge from (worktree branch)
      * @param targetBranch - Branch to merge into
-     * @returns Object with filesChanged count
-     * @throws WorktreeSyncError if merge fails
+     * @returns Object with filesChanged count and hasConflicts flag
+     */
+    private _performSquashMergeAllowConflicts;
+    /**
+     * Check if a file has local uncommitted changes compared to HEAD
+     *
+     * @param filePath - Relative path to the file
+     * @returns true if file has uncommitted changes, false otherwise
+     */
+    private _hasLocalUncommittedChanges;
+    /**
+     * Detect potential local conflicts for uncommitted worktree files
+     *
+     * Checks which uncommitted worktree files also exist locally with changes
+     * or are untracked locally. These files may have merge conflicts when synced.
+     *
+     * @param worktreeFiles - List of uncommitted files in worktree
+     * @returns Info about files that may have conflicts
+     */
+    private _detectPotentialLocalConflicts;
+    /**
+     * Check if a file is untracked by git (not in the index)
+     *
+     * @param filePath - Relative path to the file
+     * @returns true if file is untracked, false if tracked
+     */
+    private _isFileUntracked;
+    /**
+     * Check if a file is a JSONL file in the .sudocode directory
+     *
+     * @param filePath - Relative path to the file
+     * @returns true if file is a .sudocode JSONL file
+     */
+    private _isJSONLFile;
+    /**
+     * Perform three-way merge on a file using git merge-file
+     *
+     * Uses HEAD as base, local working copy as "ours", and worktree version as "theirs".
+     * Modifies the local file in place, inserting conflict markers if needed.
+     *
+     * @param filePath - Relative path to the file in local repo
+     * @param worktreeFilePath - Absolute path to the file in worktree
+     * @returns true if there are conflicts, false if merge was clean
+     */
+    private _threeWayMergeFile;
+    /**
+     * Merge two JSONL files using UUID-based resolution
+     *
+     * Reads both local and worktree versions, merges entities by UUID,
+     * and writes the result back to the local file.
+     *
+     * @param localFilePath - Absolute path to local JSONL file
+     * @param worktreeFilePath - Absolute path to worktree JSONL file
      */
-    private _performSquashMerge;
+    private _mergeJSONLFiles;
+    /**
+     * Copy uncommitted files from worktree to local repo with safe merging
+     *
+     * For files with local uncommitted changes:
+     * - JSONL files: Uses UUID-based merge resolution
+     * - Other files: Uses git merge-file for three-way merge with conflict markers
+     *
+     * Files without local changes are copied directly.
+     *
+     * @param worktreePath - Path to the worktree
+     * @param options - Optional settings
+     * @param options.overrideLocalChanges - If true, skip merge and overwrite local changes
+     * @returns Object with filesCopied count and list of files with conflicts
+     */
+    private _copyUncommittedFiles;
+    /**
+     * Resolve JSONL merge conflicts in the local repository
+     *
+     * Checks for git conflict markers in issues.jsonl and specs.jsonl,
+     * and resolves them using the merge-resolver logic.
+     *
+     * @returns Number of files resolved
+     */
+    private _resolveJSONLConflicts;
+    /**
+     * Resolve conflicts in a single JSONL file
+     *
+     * @param filePath - Path to the JSONL file with conflicts
+     */
+    private _resolveJSONLFile;
     /**
      * Generate commit message for squash sync
      *
@@ -215,8 +342,9 @@ export declare class WorktreeSyncService {
     /**
      * Perform squash sync operation
      *
-     * Squashes all worktree commits into a single commit on the target branch.
-     * Auto-resolves JSONL conflicts but blocks on code conflicts.
+     * Squashes all committed worktree changes into a single commit on the target branch.
+     * Only includes committed changes - uncommitted changes are excluded.
+     * If merge conflicts occur, they are left for the user to resolve manually.
      *
      * @param executionId - Execution ID to sync
      * @param customCommitMessage - Optional custom commit message
@@ -224,5 +352,47 @@ export declare class WorktreeSyncService {
      * @throws WorktreeSyncError if sync fails
      */
     squashSync(executionId: string, customCommitMessage?: string): Promise<SyncResult>;
+    /**
+     * Perform stage sync operation
+     *
+     * Applies committed worktree changes to the working directory without committing.
+     * Changes are left staged, ready for the user to commit manually.
+     * Only includes committed changes by default - uncommitted changes are excluded
+     * unless includeUncommitted is true.
+     *
+     * @param executionId - Execution ID to sync
+     * @param options - Optional settings
+     * @param options.includeUncommitted - If true, also copy uncommitted files from worktree
+     * @param options.overrideLocalChanges - If true, overwrite local changes instead of merging
+     * @returns Sync result with details
+     * @throws WorktreeSyncError if sync fails
+     */
+    stageSync(executionId: string, options?: {
+        includeUncommitted?: boolean;
+        overrideLocalChanges?: boolean;
+    }): Promise<SyncResult>;
+    /**
+     * Check if worktree branch is an ancestor of target branch
+     *
+     * If the worktree branch is an ancestor, it means target already has all
+     * the commits from the worktree (e.g., via a previous sync).
+     *
+     * @param worktreeBranch - Worktree branch name
+     * @param targetBranch - Target branch name
+     * @returns true if worktree branch is an ancestor of target branch
+     */
+    private _isAncestor;
+    /**
+     * Perform preserve sync operation
+     *
+     * Merges all commits from worktree branch to target branch, preserving commit history.
+     * Only includes committed changes - uncommitted changes are excluded.
+     * If merge conflicts occur, they are left for the user to resolve manually.
+     *
+     * @param executionId - Execution ID to sync
+     * @returns Sync result with details
+     * @throws WorktreeSyncError if sync fails
+     */
+    preserveSync(executionId: string): Promise<SyncResult>;
 }
 //# sourceMappingURL=worktree-sync-service.d.ts.map

package/dist/services/worktree-sync-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worktree-sync-service.d.ts","sourceRoot":"","sources":["../../src/services/worktree-sync-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"worktree-sync-service.d.ts","sourceRoot":"","sources":["../../src/services/worktree-sync-service.ts"],"names":[],"mappings":"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"}