@sudocode-ai/local-server 0.1.7 → 0.1.9

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

@@ -0,0 +1,326 @@
+/**
+ * Worktree Sync Service
+ *
+ * Orchestrates worktree sync operations including conflict detection,
+ * JSONL resolution, git operations, and database updates.
+ *
+ * @module services/worktree-sync-service
+ */
+import type Database from "better-sqlite3";
+import type { Execution, ExecutionStatus } from "@sudocode-ai/types";
+import { type DiffResult, type Commit } from "../execution/worktree/git-sync-cli.js";
+import { type ConflictReport, type JSONLConflict } from "../execution/worktree/conflict-detector.js";
+/**
+ * Worktree sync error codes
+ */
+export declare enum WorktreeSyncErrorCode {
+    NO_WORKTREE = "NO_WORKTREE",
+    WORKTREE_MISSING = "WORKTREE_MISSING",
+    BRANCH_MISSING = "BRANCH_MISSING",
+    DIRTY_WORKING_TREE = "DIRTY_WORKING_TREE",
+    TARGET_BRANCH_MISSING = "TARGET_BRANCH_MISSING",
+    NO_COMMON_BASE = "NO_COMMON_BASE",
+    CODE_CONFLICTS = "CODE_CONFLICTS",
+    MERGE_FAILED = "MERGE_FAILED",
+    JSONL_RESOLUTION_FAILED = "JSONL_RESOLUTION_FAILED",
+    DATABASE_SYNC_FAILED = "DATABASE_SYNC_FAILED",
+    EXECUTION_NOT_FOUND = "EXECUTION_NOT_FOUND"
+}
+/**
+ * Worktree sync error class
+ */
+export declare class WorktreeSyncError extends Error {
+    code: WorktreeSyncErrorCode;
+    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;
+}
+/**
+ * Sync preview result
+ */
+export interface SyncPreviewResult {
+    canSync: boolean;
+    conflicts: ConflictReport;
+    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;
+    executionStatus: ExecutionStatus;
+    warnings: string[];
+}
+/**
+ * Squash sync result
+ */
+export interface SyncResult {
+    success: boolean;
+    finalCommit?: string;
+    filesChanged: number;
+    /** Whether there are unresolved merge conflicts (user must resolve manually) */
+    hasConflicts?: boolean;
+    /** Number of uncommitted files copied from worktree (stage sync only) */
+    uncommittedFilesIncluded?: number;
+    error?: string;
+    cleanupOffered?: boolean;
+}
+/**
+ * WorktreeSyncService
+ *
+ * Main service class for orchestrating worktree sync operations
+ */
+export declare class WorktreeSyncService {
+    private db;
+    private repoPath;
+    private gitSync;
+    constructor(db: Database.Database, repoPath: string);
+    /**
+     * Preview sync without making changes
+     *
+     * @param executionId - Execution ID to preview sync for
+     * @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
+     *
+     * Used by previewSync() and will be used in i-9gz4 (squash sync)
+     *
+     * @param executionId - Execution ID to load
+     * @returns Execution record
+     * @throws WorktreeSyncError if execution not found
+     */
+    private _loadAndValidateExecution;
+    /**
+     * Validate preconditions for sync
+     *
+     * Used by previewSync() and will be used in i-9gz4 (squash sync)
+     *
+     * Checks:
+     * - Worktree exists
+     * - Worktree branch exists
+     * - Local working tree is clean
+     * - Target branch exists
+     * - Branches have common base
+     *
+     * @param execution - Execution to validate
+     * @throws WorktreeSyncError if any precondition fails
+     */
+    private _validateSyncPreconditions;
+    /**
+     * Create safety snapshot before sync
+     *
+     * Creates a git tag pointing to current target branch HEAD
+     * for rollback capability
+     *
+     * @param executionId - Execution ID
+     * @param targetBranch - Target branch name
+     * @returns Tag name created
+     */
+    private _createSafetySnapshot;
+    /**
+     * 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
+     *
+     * Returns list of files and aggregate additions/deletions stats
+     * for uncommitted changes in the worktree.
+     *
+     * @param worktreePath - Path to worktree
+     * @returns Uncommitted file stats
+     */
+    private _getUncommittedFileStats;
+    /**
+     * Check if local working tree is clean
+     *
+     * TODO: Will be used in i-7ya6 (sync preview)
+     *
+     * @returns true if clean, false if dirty
+     */
+    private _isLocalTreeClean;
+    /**
+     * Get list of branches in repository
+     *
+     * @returns Array of branch names
+     */
+    private _getBranches;
+    /**
+     * Get current commit SHA for a branch
+     *
+     * @param branchName - Branch name
+     * @returns Commit SHA
+     */
+    private _getCurrentCommit;
+    /**
+     * Escape shell argument for safe command execution
+     *
+     * @param arg - Argument to escape
+     * @returns Escaped argument
+     */
+    private _escapeShellArg;
+    /**
+     * Resolve JSONL conflicts using three-way merge
+     *
+     * Used in squash sync to auto-resolve JSONL conflicts
+     *
+     * @param execution - Execution record
+     * @param jsonlConflicts - List of JSONL conflicts to resolve
+     * @throws WorktreeSyncError if resolution fails
+     */
+    resolveJSONLConflicts(execution: Execution, jsonlConflicts: JSONLConflict[]): Promise<void>;
+    /**
+     * Read JSONL file at a specific git revision
+     *
+     * @param filePath - Relative path to JSONL file
+     * @param revision - Git revision (commit SHA or branch name)
+     * @returns Array of JSONL entities
+     */
+    private _readJSONLVersion;
+    /**
+     * Commit uncommitted JSONL files in worktree
+     *
+     * Used during sync to include uncommitted JSONL changes
+     *
+     * @param worktreePath - Path to worktree
+     * @param uncommittedFiles - List of uncommitted JSONL file paths
+     * @throws WorktreeSyncError if commit fails
+     */
+    commitUncommittedJSONL(worktreePath: string, uncommittedFiles: string[]): Promise<void>;
+    /**
+     * 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 and hasConflicts flag
+     */
+    private _performSquashMergeAllowConflicts;
+    /**
+     * Copy uncommitted files from worktree to local repo
+     *
+     * Copies files that are modified or untracked in the worktree
+     * to the local repository working directory.
+     *
+     * @param worktreePath - Path to the worktree
+     * @returns Number of files copied
+     */
+    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
+     *
+     * @param execution - Execution record
+     * @param commitCount - Number of commits being squashed
+     * @returns Generated commit message
+     */
+    private _generateCommitMessage;
+    /**
+     * Create commit with staged changes
+     *
+     * @param message - Commit message
+     * @returns Commit SHA
+     * @throws WorktreeSyncError if commit fails
+     */
+    private _createCommit;
+    /**
+     * Rollback to safety snapshot
+     *
+     * @param targetBranch - Target branch to reset
+     * @param tagName - Safety tag to rollback to
+     * @throws WorktreeSyncError if rollback fails
+     */
+    private _rollbackToSnapshot;
+    /**
+     * Perform squash sync operation
+     *
+     * 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
+     * @returns Sync result with details
+     * @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
+     * @returns Sync result with details
+     * @throws WorktreeSyncError if sync fails
+     */
+    stageSync(executionId: string, options?: {
+        includeUncommitted?: 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

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