@remixhq/core 0.1.12 → 0.1.13

package/dist/collab.d.ts

@@ -64,8 +64,22 @@ type MergeRequestReview = {
     };
 };
 type CollabApproveMode = "remote-only" | "sync-target-repo";
-type CollabStatusBlockedReason = "not_git_repo" | "not_bound" | "branch_binding_missing" | "family_ambiguous" | "missing_head" | "detached_head" | "branch_mismatch" | "dirty_worktree" | "metadata_conflict" | "remote_error";
-type CollabStatusRecommendedAction = "init" | "sync" | "reconcile" | "review_queue" | "choose_family" | "no_action";
+type CollabStatusBlockedReason = "not_git_repo" | "not_bound" | "branch_binding_missing" | "family_ambiguous" | "missing_head" | "detached_head" | "branch_mismatch" | "dirty_worktree" | "baseline_missing" | "metadata_conflict" | "remote_error";
+type CollabRepoStateKind = "idle" | "local_only_changed" | "server_only_changed" | "both_changed" | "external_local_base_changed" | "metadata_conflict" | "binding_problem";
+type CollabPendingFinalizeState = "idle" | "queued" | "processing" | "retry_scheduled" | "failed";
+type CollabPendingFinalizeSummary = {
+    state: CollabPendingFinalizeState;
+    activeJobCount: number;
+    queuedJobCount: number;
+    processingJobCount: number;
+    retryScheduledJobCount: number;
+    failedJobCount: number;
+    oldestCapturedAt: string | null;
+    newestCapturedAt: string | null;
+    nextRetryAt: string | null;
+    latestError: string | null;
+};
+type CollabStatusRecommendedAction = "init" | "pull" | "re_anchor" | "reconcile" | "await_finalize" | "record" | "review_queue" | "choose_family" | "no_action";
 type CollabStatus = {
     schemaVersion: 1;
     repo: {
@@ -125,11 +139,30 @@ type CollabStatus = {
         targetHeadCommitHash: string | null;
         targetHeadCommitId: string | null;
     };
+    alignment: {
+        checked: boolean;
+        error: string | null;
+        repoState: CollabRepoStateKind | null;
+        canRecordTurn: boolean;
+        pendingFinalize: CollabPendingFinalizeSummary;
+        baseline: {
+            lastSnapshotId: string | null;
+            lastSnapshotHash: string | null;
+            lastServerHeadHash: string | null;
+            lastSeenLocalCommitHash: string | null;
+        };
+        current: {
+            snapshotHash: string | null;
+            serverHeadHash: string | null;
+            serverHeadCommitId: string | null;
+            localCommitHash: string | null;
+        };
+    };
     recommendedAction: CollabStatusRecommendedAction;
     warnings: string[];
 };
 type SyncLocalResponse = {
-    status: "up_to_date" | "ready_to_fast_forward" | "base_unknown" | "conflict_risk";
+    status: "up_to_date" | "delta_ready" | "ready_to_fast_forward" | "base_unknown" | "conflict_risk";
     baseCommitHash: string;
     targetCommitHash: string;
     targetCommitId: string;
@@ -144,20 +177,42 @@ type SyncLocalResponse = {
     };
     warnings: string[];
 };
+type AppHeadResponse = {
+    appId: string;
+    headCommitId: string;
+    headCommitHash: string;
+    status: string;
+    updatedAt: string;
+};
+type AppDeltaResponse = {
+    status: "up_to_date" | "delta_ready" | "base_unknown" | "content_equivalent" | "conflict_risk";
+    baseHeadHash: string;
+    targetHeadHash: string;
+    targetHeadCommitId: string | null;
+    diff: string;
+    diffSha256: string | null;
+    stats: {
+        changedFilesCount: number;
+        insertions: number;
+        deletions: number;
+    };
+    warnings: string[];
+};
 type SyncUpstreamResponse = {
     status: "up-to-date" | "queued";
     mergeRequestId?: string;
 };
-type CollabRecordingPreflightStatus = "not_git_repo" | "not_bound" | "branch_binding_missing" | "family_ambiguous" | "missing_head" | "branch_mismatch" | "metadata_conflict" | "up_to_date" | "ready_to_fast_forward" | "reconcile_required";
+type CollabRecordingPreflightStatus = "not_git_repo" | "not_bound" | "branch_binding_missing" | "family_ambiguous" | "missing_head" | "branch_mismatch" | "metadata_conflict" | "ready" | "pull_required" | "re_anchor_required" | "reconcile_required";
 type CollabRecordingPreflight = {
     status: CollabRecordingPreflightStatus;
+    repoState: CollabRepoStateKind | null;
     repoRoot: string | null;
     appId: string | null;
     currentBranch: string | null;
     branchName: string | null;
     headCommitHash: string | null;
     worktreeClean: boolean;
-    syncStatus: SyncLocalResponse["status"] | null;
+    syncStatus: SyncLocalResponse["status"] | AppDeltaResponse["status"] | null;
     syncTargetCommitHash: string | null;
     syncTargetCommitId: string | null;
     reconcileTargetHeadCommitHash: string | null;
@@ -213,11 +268,11 @@ type CollabApproveResult = {
         repoRoot: string;
         baseCommitHash: string;
         targetCommitHash: string;
-        targetCommitId: string;
+        targetCommitId: string | null;
         stats: SyncLocalResponse["stats"];
         bundleRef?: string | null;
         bundleSizeBytes?: number;
-        localCommitHash: string;
+        localCommitHash: string | null;
         applied: boolean;
         dryRun: boolean;
     };
@@ -258,6 +313,9 @@ type CollabFinalizeTurnAutoSync = {
 type CollabFinalizeTurnResult = {
     mode: CollabFinalizeTurnMode;
     idempotencyKey: string;
+    queued: boolean;
+    jobId: string | null;
+    repoState: CollabRepoStateKind | null;
     changeStep: JsonObject | null;
     collabTurn: CollabTurn | null;
     autoSync: CollabFinalizeTurnAutoSync | null;
@@ -316,6 +374,7 @@ type CollabApiClient = {
         defaultBranch?: string;
         branchName: string;
         seedAppId?: string;
+        seedHeadCommitHash?: string;
     }): Promise<unknown>;
     bootstrapFreshProjectLane(payload: {
         projectId?: string;
@@ -324,6 +383,7 @@ type CollabApiClient = {
         defaultBranch?: string;
         branchName: string;
         seedAppId: string;
+        seedHeadCommitHash?: string;
     }): Promise<unknown>;
     getOrganization(orgId: string): Promise<unknown>;
     getProject(projectId: string): Promise<unknown>;
@@ -338,6 +398,15 @@ type CollabApiClient = {
         offset?: number;
     }): Promise<unknown>;
     getApp(appId: string): Promise<unknown>;
+    getAppHead(appId: string): Promise<unknown>;
+    getAppDelta(appId: string, payload: {
+        baseHeadHash: string;
+        targetHeadHash?: string;
+        localSnapshotHash?: string;
+        repoFingerprint?: string;
+        remoteUrl?: string;
+        defaultBranch?: string;
+    }): Promise<unknown>;
     getMergeRequest(mrId: string): Promise<unknown>;
     presignImportUploadFirstParty(payload: {
         file: {
@@ -540,24 +609,6 @@ type CollabApiClient = {
     }): Promise<unknown>;
 };
 
-declare function collabAdd(params: {
-    api: CollabApiClient;
-    cwd: string;
-    prompt: string;
-    assistantResponse?: string | null;
-    diff?: string | null;
-    diffSource?: "worktree" | "external";
-    sync?: boolean;
-    allowBranchMismatch?: boolean;
-    idempotencyKey?: string | null;
-    actor?: {
-        type?: string;
-        name?: string;
-        version?: string;
-        provider?: string;
-    };
-}): Promise<JsonObject>;
-
 declare function collabFinalizeTurn(params: {
     api: CollabApiClient;
     cwd: string;
@@ -582,21 +633,6 @@ declare function collabRecordingPreflight(params: {
     allowBranchMismatch?: boolean;
 }): Promise<CollabRecordingPreflight>;
 
-declare function collabRecordTurn(params: {
-    api: CollabApiClient;
-    cwd: string;
-    prompt: string;
-    assistantResponse: string;
-    allowBranchMismatch?: boolean;
-    idempotencyKey?: string | null;
-    actor?: {
-        type?: string;
-        name?: string;
-        version?: string;
-        provider?: string;
-    };
-}): Promise<CollabTurn>;
-
 declare function collabApprove(params: {
     api: CollabApiClient;
     mrId: string;
@@ -671,6 +707,7 @@ declare function collabUpdateMemberRole(params: {
     member: CollabMember;
 }>;
 
+type InitBaselineStatus = "seeded" | "existing" | "requires_re_anchor" | "requires_sync";
 declare function collabInit(params: {
     api: CollabApiClient;
     cwd: string;
@@ -688,6 +725,7 @@ declare function collabInit(params: {
     repoRoot: string;
     bindingMode: string;
     createdCanonicalFamily: boolean;
+    baselineStatus: InitBaselineStatus;
 } | {
     warnings?: string[] | undefined;
     reused: boolean;
@@ -699,6 +737,7 @@ declare function collabInit(params: {
     repoRoot: string;
     bindingMode: "lane" | "explicit_root";
     createdCanonicalFamily: boolean;
+    baselineStatus: InitBaselineStatus;
     remoteUrl: string | null;
     defaultBranch: string | null;
 }>;
@@ -733,69 +772,69 @@ declare function collabList(params: {
     };
 }>;
 
-declare function collabReconcile(params: {
+declare function collabReAnchor(params: {
     api: CollabApiClient;
     cwd: string;
-    dryRun: boolean;
+    dryRun?: boolean;
     allowBranchMismatch?: boolean;
 }): Promise<{
-    status: "ready_to_fast_forward";
-    branch: string;
+    status: string;
     repoRoot: string;
-    baseCommitHash: string;
-    targetCommitHash: string;
-    targetCommitId: string;
-    stats: {
-        changedFilesCount: number;
-        insertions: number;
-        deletions: number;
-    };
-    bundleRef: string | null;
-    bundleSizeBytes: number;
-    localCommitHash: string;
+    branch: string;
+    currentAppId: string;
+    localHeadCommitHash: string;
+    targetHeadCommitHash: string;
+    targetHeadCommitId: string;
+    warnings: string[];
     applied: boolean;
     dryRun: boolean;
-} | {
-    status: "up_to_date";
+}>;
+
+declare function collabReconcile(params: {
+    api: CollabApiClient;
+    cwd: string;
+    dryRun: boolean;
+    allowBranchMismatch?: boolean;
+}): Promise<{
+    status: "up_to_date" | "delta_ready" | "base_unknown" | "conflict_risk";
     branch: string;
     repoRoot: string;
     baseCommitHash: string;
     targetCommitHash: string;
-    targetCommitId: string;
-    stats: {
-        changedFilesCount: number;
-        insertions: number;
-        deletions: number;
-    };
-    localCommitHash: string;
+    targetCommitId: string | null;
+    stats: AppDeltaResponse["stats"];
+    localCommitHash: string | null;
     applied: boolean;
     dryRun: boolean;
+    warnings?: string[];
 } | {
-    status: "ready_to_reconcile";
-    branch: string;
+    status: string;
     repoRoot: string;
+    branch: string;
+    currentAppId: string;
     localHeadCommitHash: string;
-    targetHeadCommitId: string;
     targetHeadCommitHash: string;
+    targetHeadCommitId: string;
     warnings: string[];
     applied: boolean;
     dryRun: boolean;
 } | {
-    status: "failed" | "queued" | "pending" | "processing" | "succeeded" | "manual_reconcile_required" | "cancelled";
-    reconcileId: string;
-    mergeBaseCommitHash: string | null;
-    reconciledHeadCommitId: string | null;
-    reconciledHeadCommitHash: string | null;
-    backupBranchName: string;
-    localCommitHash: string;
-    applied: boolean;
-    dryRun: boolean;
-    warnings: string[];
-    branch: string;
+    status: string;
     repoRoot: string;
-    localHeadCommitHash: string;
-    targetHeadCommitId: string;
+    branch: string;
+    currentAppId: string;
+    localHeadCommitHash: string | null;
+    baseHeadCommitHash: string;
     targetHeadCommitHash: string;
+    targetHeadCommitId: string;
+    stats: {
+        changedFilesCount: number;
+        insertions: number;
+        deletions: number;
+    };
+    warnings: string[];
+    applied: boolean;
+    dryRun: boolean;
 }>;
 
 declare function collabReject(params: {
@@ -834,37 +873,17 @@ declare function collabSync(params: {
     dryRun: boolean;
     allowBranchMismatch?: boolean;
 }): Promise<{
-    status: "ready_to_fast_forward";
-    branch: string;
-    repoRoot: string;
-    baseCommitHash: string;
-    targetCommitHash: string;
-    targetCommitId: string;
-    stats: {
-        changedFilesCount: number;
-        insertions: number;
-        deletions: number;
-    };
-    bundleRef: string | null;
-    bundleSizeBytes: number;
-    localCommitHash: string;
-    applied: boolean;
-    dryRun: boolean;
-} | {
-    status: "up_to_date";
+    status: "up_to_date" | "delta_ready" | "base_unknown" | "conflict_risk";
     branch: string;
     repoRoot: string;
     baseCommitHash: string;
     targetCommitHash: string;
-    targetCommitId: string;
-    stats: {
-        changedFilesCount: number;
-        insertions: number;
-        deletions: number;
-    };
-    localCommitHash: string;
+    targetCommitId: string | null;
+    stats: AppDeltaResponse["stats"];
+    localCommitHash: string | null;
     applied: boolean;
     dryRun: boolean;
+    warnings?: string[];
 }>;
 
 declare function collabSyncUpstream(params: {
@@ -885,37 +904,15 @@ declare function collabSyncUpstream(params: {
     upstreamAppId: string;
     remoteHeadCommitId: string | null;
     localSync: {
-        warnings?: string[] | undefined;
-        status: "ready_to_fast_forward";
-        branch: string;
-        repoRoot: string;
-        baseCommitHash: string;
-        targetCommitHash: string;
-        targetCommitId: string;
-        stats: {
-            changedFilesCount: number;
-            insertions: number;
-            deletions: number;
-        };
-        bundleRef: string | null;
-        bundleSizeBytes: number;
-        localCommitHash: string;
-        applied: boolean;
-        dryRun: boolean;
-    } | {
-        warnings?: string[] | undefined;
-        status: "up_to_date";
+        warnings?: string[];
+        status: "up_to_date" | "delta_ready" | "base_unknown" | "conflict_risk";
         branch: string;
         repoRoot: string;
         baseCommitHash: string;
         targetCommitHash: string;
-        targetCommitId: string;
-        stats: {
-            changedFilesCount: number;
-            insertions: number;
-            deletions: number;
-        };
-        localCommitHash: string;
+        targetCommitId: string | null;
+        stats: AppDeltaResponse["stats"];
+        localCommitHash: string | null;
         applied: boolean;
         dryRun: boolean;
     };
@@ -927,4 +924,12 @@ declare function collabView(params: {
     mrId: string;
 }): Promise<MergeRequestReview>;
 
-export { type AppMember, type AppMemberRole, type AppReconcileResponse, type CollabApiClient, type CollabApproveMode, type CollabApproveResult, type CollabFinalizeTurnAutoSync, type CollabFinalizeTurnMode, type CollabFinalizeTurnResult, type CollabMember, type CollabRecordingPreflight, type CollabRecordingPreflightStatus, type CollabStatus, type CollabStatusBlockedReason, type CollabStatusRecommendedAction, type CollabTurn, type InvitationScopeType, type JsonObject, type MembershipScopeType, type MergeRequest, type MergeRequestQueue, type MergeRequestReview, type MergeRequestStatus, type OrganizationMember, type OrganizationMemberRole, type ProjectMember, type ProjectMemberRole, type ReconcilePreflightResponse, type SyncLocalResponse, type SyncUpstreamResponse, collabAdd, collabApprove, collabCheckout, collabFinalizeTurn, collabInit, collabInvite, collabList, collabListMembers, collabListMergeRequests, collabReconcile, collabRecordTurn, collabRecordingPreflight, collabReject, collabRemix, collabRequestMerge, collabStatus, collabSync, collabSyncUpstream, collabUpdateMemberRole, collabView, getMemberRolesForScope, validateMemberRole };
+declare function processPendingFinalizeJob(params: {
+    api: CollabApiClient;
+    jobId: string;
+}): Promise<CollabFinalizeTurnResult>;
+declare function drainPendingFinalizeQueue(params: {
+    api: CollabApiClient;
+}): Promise<CollabFinalizeTurnResult[]>;
+
+export { type AppDeltaResponse, type AppHeadResponse, type AppMember, type AppMemberRole, type AppReconcileResponse, type CollabApiClient, type CollabApproveMode, type CollabApproveResult, type CollabFinalizeTurnAutoSync, type CollabFinalizeTurnMode, type CollabFinalizeTurnResult, type CollabMember, type CollabPendingFinalizeState, type CollabPendingFinalizeSummary, type CollabRecordingPreflight, type CollabRecordingPreflightStatus, type CollabRepoStateKind, type CollabStatus, type CollabStatusBlockedReason, type CollabStatusRecommendedAction, type CollabTurn, type InvitationScopeType, type JsonObject, type MembershipScopeType, type MergeRequest, type MergeRequestQueue, type MergeRequestReview, type MergeRequestStatus, type OrganizationMember, type OrganizationMemberRole, type ProjectMember, type ProjectMemberRole, type ReconcilePreflightResponse, type SyncLocalResponse, type SyncUpstreamResponse, collabApprove, collabCheckout, collabFinalizeTurn, collabInit, collabInvite, collabList, collabListMembers, collabListMergeRequests, collabReAnchor, collabReconcile, collabRecordingPreflight, collabReject, collabRemix, collabRequestMerge, collabStatus, collabSync, collabSyncUpstream, collabUpdateMemberRole, collabView, drainPendingFinalizeQueue, getMemberRolesForScope, processPendingFinalizeJob, validateMemberRole };