@remixhq/core 0.1.10 → 0.1.12

package/dist/collab.d.ts

@@ -64,8 +64,8 @@ type MergeRequestReview = {
     };
 };
 type CollabApproveMode = "remote-only" | "sync-target-repo";
-type CollabStatusBlockedReason = "not_git_repo" | "not_bound" | "missing_head" | "detached_head" | "branch_mismatch" | "dirty_worktree" | "metadata_conflict" | "remote_error";
-type CollabStatusRecommendedAction = "init" | "sync" | "reconcile" | "review_queue" | "no_action";
+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 CollabStatus = {
     schemaVersion: 1;
     repo: {
@@ -93,7 +93,9 @@ type CollabStatus = {
         repoFingerprint: string | null;
         remoteUrl: string | null;
         defaultBranch: string | null;
-        preferredBranch: string | null;
+        laneId: string | null;
+        branchName: string | null;
+        bindingMode: "legacy" | "lane" | "explicit_root" | null;
     };
     remote: {
         checked: boolean;
@@ -146,13 +148,13 @@ type SyncUpstreamResponse = {
     status: "up-to-date" | "queued";
     mergeRequestId?: string;
 };
-type CollabRecordingPreflightStatus = "not_git_repo" | "not_bound" | "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" | "up_to_date" | "ready_to_fast_forward" | "reconcile_required";
 type CollabRecordingPreflight = {
     status: CollabRecordingPreflightStatus;
     repoRoot: string | null;
     appId: string | null;
     currentBranch: string | null;
-    preferredBranch: string | null;
+    branchName: string | null;
     headCommitHash: string | null;
     worktreeClean: boolean;
     syncStatus: SyncLocalResponse["status"] | null;
@@ -298,6 +300,30 @@ type CollabApiClient = {
     resolveProjectBinding(params: {
         repoFingerprint?: string;
         remoteUrl?: string;
+        branchName?: string;
+    }): Promise<unknown>;
+    resolveProjectLaneBinding(params: {
+        projectId?: string;
+        repoFingerprint?: string;
+        remoteUrl?: string;
+        defaultBranch?: string;
+        branchName: string;
+    }): Promise<unknown>;
+    ensureProjectLaneBinding(payload: {
+        projectId?: string;
+        repoFingerprint?: string;
+        remoteUrl?: string;
+        defaultBranch?: string;
+        branchName: string;
+        seedAppId?: string;
+    }): Promise<unknown>;
+    bootstrapFreshProjectLane(payload: {
+        projectId?: string;
+        repoFingerprint?: string;
+        remoteUrl?: string;
+        defaultBranch?: string;
+        branchName: string;
+        seedAppId: string;
     }): Promise<unknown>;
     getOrganization(orgId: string): Promise<unknown>;
     getProject(projectId: string): Promise<unknown>;
@@ -325,6 +351,7 @@ type CollabApiClient = {
         uploadId: string;
         appName?: string;
         threadId?: string;
+        branch?: string;
         path?: string;
         platform?: string;
         isPublic?: boolean;
@@ -337,6 +364,7 @@ type CollabApiClient = {
         name?: string;
         platform?: string;
         forkedFromCommitId?: string;
+        branchName?: string;
     }): Promise<unknown>;
     downloadAppBundle(appId: string): Promise<{
         data: Buffer;
@@ -345,6 +373,7 @@ type CollabApiClient = {
     }>;
     createChangeStep(appId: string, payload: {
         threadId?: string;
+        collabLaneId?: string;
         prompt: string;
         assistantResponse?: string;
         diff: string;
@@ -382,6 +411,7 @@ type CollabApiClient = {
     getChangeStepReplayDiff(appId: string, replayId: string): Promise<unknown>;
     createCollabTurn(appId: string, payload: {
         threadId?: string;
+        collabLaneId?: string;
         prompt: string;
         assistantResponse: string;
         actor?: {
@@ -404,6 +434,15 @@ type CollabApiClient = {
         limit?: number;
         offset?: number;
     }): Promise<unknown>;
+    listCollabTurns(appId: string, params?: {
+        limit?: number;
+        offset?: number;
+        changeStepId?: string;
+        threadId?: string;
+        collabLaneId?: string;
+        createdAfter?: string;
+        createdBefore?: string;
+    }): Promise<unknown>;
     openMergeRequest(sourceAppId: string): Promise<unknown>;
     getMergeRequestReview(mrId: string): Promise<unknown>;
     updateMergeRequest(mrId: string, payload: {
@@ -647,6 +686,8 @@ declare function collabInit(params: {
     upstreamAppId: string;
     bindingPath: string;
     repoRoot: string;
+    bindingMode: string;
+    createdCanonicalFamily: boolean;
 } | {
     warnings?: string[] | undefined;
     reused: boolean;
@@ -656,9 +697,10 @@ declare function collabInit(params: {
     upstreamAppId: string;
     bindingPath: string;
     repoRoot: string;
+    bindingMode: "lane" | "explicit_root";
+    createdCanonicalFamily: boolean;
     remoteUrl: string | null;
     defaultBranch: string | null;
-    preferredBranch: string | null;
 }>;
 
 declare function collabInvite(params: {
@@ -739,7 +781,7 @@ declare function collabReconcile(params: {
     applied: boolean;
     dryRun: boolean;
 } | {
-    status: "queued" | "pending" | "processing" | "succeeded" | "failed" | "manual_reconcile_required" | "cancelled";
+    status: "failed" | "queued" | "pending" | "processing" | "succeeded" | "manual_reconcile_required" | "cancelled";
     reconcileId: string;
     mergeBaseCommitHash: string | null;
     reconciledHeadCommitId: string | null;