@remixhq/core 0.1.12 → 0.1.14

package/dist/collab.d.ts

@@ -1,562 +1,6 @@
-type JsonObject = Record<string, any>;
-type MergeRequestStatus = "open" | "approved" | "rejected" | "merged" | "closed";
-type MergeRequestQueue = "reviewable" | "created_by_me" | "app_reviewable" | "app_outgoing" | "app_related_visible";
-type MergeRequest = {
-    id: string;
-    sourceAppId: string;
-    sourceCommitId: string;
-    sourceTipCommitId: string | null;
-    targetAppId: string;
-    targetCommitId: string | null;
-    kind: "merge" | "sync";
-    status: MergeRequestStatus;
-    title: string | null;
-    description: string | null;
-    category: string | null;
-    tags: string[] | null;
-    createdBy: string;
-    reviewedBy: string | null;
-    mergedBy: string | null;
-    createdAt: string;
-    updatedAt: string;
-    mergedAt: string | null;
-    closedAt: string | null;
-};
-type MergeRequestReviewPrompt = {
-    commitId: string;
-    messageId: string | null;
-    prompt: string | null;
-};
-type MergeRequestReviewChangeStep = {
-    id: string;
-    appId: string;
-    threadId: string | null;
-    messageId: string | null;
-    commitId: string | null;
-    baseCommitHash: string | null;
-    headCommitHash: string | null;
-    changedFilesCount: number | null;
-    insertions: number | null;
-    deletions: number | null;
-    status: string | null;
-    statusError: string | null;
-    actor: {
-        type: string | null;
-        name: string | null;
-        version: string | null;
-        provider: string | null;
-    };
-    workspaceMetadata: JsonObject | null;
-    prompt: string | null;
-    diff: string;
-    createdAt: string;
-};
-type MergeRequestReview = {
-    mergeRequest: MergeRequest;
-    prompts: MergeRequestReviewPrompt[];
-    changeSteps: MergeRequestReviewChangeStep[];
-    unifiedDiff: string;
-    stats: {
-        changeStepCount: number;
-        changedFilesCount: number;
-        insertions: number;
-        deletions: number;
-    };
-};
-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 CollabStatus = {
-    schemaVersion: 1;
-    repo: {
-        isGitRepo: boolean;
-        repoRoot: string | null;
-        branch: string | null;
-        branchMismatch: boolean;
-        headCommitHash: string | null;
-        worktree: {
-            isClean: boolean;
-            entryCount: number;
-            hasTrackedChanges: boolean;
-            hasUntrackedFiles: boolean;
-            preview: string[];
-        };
-    };
-    binding: {
-        isBound: boolean;
-        path: string | null;
-        projectId: string | null;
-        currentAppId: string | null;
-        upstreamAppId: string | null;
-        isRemix: boolean | null;
-        threadId: string | null;
-        repoFingerprint: string | null;
-        remoteUrl: string | null;
-        defaultBranch: string | null;
-        laneId: string | null;
-        branchName: string | null;
-        bindingMode: "legacy" | "lane" | "explicit_root" | null;
-    };
-    remote: {
-        checked: boolean;
-        error: string | null;
-        appStatus: string | null;
-        incomingOpenMergeRequestCount: number | null;
-        outgoingOpenMergeRequestCount: number | null;
-    };
-    sync: {
-        checked: boolean;
-        error: string | null;
-        canApply: boolean;
-        status: "not_available" | SyncLocalResponse["status"];
-        blockedReasons: CollabStatusBlockedReason[];
-        warnings: string[];
-        targetCommitHash: string | null;
-        targetCommitId: string | null;
-        stats: SyncLocalResponse["stats"] | null;
-    };
-    reconcile: {
-        checked: boolean;
-        error: string | null;
-        canApply: boolean;
-        status: "not_available" | "not_needed" | ReconcilePreflightResponse["status"];
-        blockedReasons: CollabStatusBlockedReason[];
-        warnings: string[];
-        targetHeadCommitHash: string | null;
-        targetHeadCommitId: string | null;
-    };
-    recommendedAction: CollabStatusRecommendedAction;
-    warnings: string[];
-};
-type SyncLocalResponse = {
-    status: "up_to_date" | "ready_to_fast_forward" | "base_unknown" | "conflict_risk";
-    baseCommitHash: string;
-    targetCommitHash: string;
-    targetCommitId: string;
-    bundleRef: string | null;
-    bundleBase64: string | null;
-    bundleEncoding: "base64" | null;
-    bundleSizeBytes: number;
-    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 CollabRecordingPreflight = {
-    status: CollabRecordingPreflightStatus;
-    repoRoot: string | null;
-    appId: string | null;
-    currentBranch: string | null;
-    branchName: string | null;
-    headCommitHash: string | null;
-    worktreeClean: boolean;
-    syncStatus: SyncLocalResponse["status"] | null;
-    syncTargetCommitHash: string | null;
-    syncTargetCommitId: string | null;
-    reconcileTargetHeadCommitHash: string | null;
-    reconcileTargetHeadCommitId: string | null;
-    warnings: string[];
-    hint: string | null;
-};
-type ReconcilePreflightResponse = {
-    status: "up_to_date" | "ready_to_reconcile" | "metadata_conflict";
-    localHeadCommitHash: string;
-    targetHeadCommitId: string;
-    targetHeadCommitHash: string;
-    warnings: string[];
-};
-type AppReconcileResponse = {
-    id: string;
-    appId: string;
-    uploadId: string;
-    queueItemId: string | null;
-    requestedBy: string;
-    repoFingerprint: string | null;
-    remoteUrl: string | null;
-    defaultBranch: string | null;
-    localHeadCommitHash: string;
-    targetHeadCommitId: string | null;
-    targetHeadCommitHash: string | null;
-    mergeBaseCommitHash: string | null;
-    reconciledHeadCommitId: string | null;
-    reconciledHeadCommitHash: string | null;
-    localCommitHashes: string[];
-    reconciledCommitIds: string[];
-    reconciledCommitHashes: string[];
-    status: "pending" | "queued" | "processing" | "succeeded" | "failed" | "manual_reconcile_required" | "cancelled";
-    failureKind: string | null;
-    statusError: string | null;
-    idempotencyKey: string | null;
-    resultBundleRef: string | null;
-    queuePosition?: number | null;
-    runId?: string | null;
-    createdAt: string;
-    updatedAt: string;
-};
-type CollabApproveResult = {
-    mode: CollabApproveMode;
-    mergeRequestId: string;
-    terminalStatus: MergeRequestStatus;
-    targetAppId: string;
-    mergeRequest: MergeRequest;
-    repoRoot?: string;
-    localSync?: {
-        status: SyncLocalResponse["status"];
-        branch: string;
-        repoRoot: string;
-        baseCommitHash: string;
-        targetCommitHash: string;
-        targetCommitId: string;
-        stats: SyncLocalResponse["stats"];
-        bundleRef?: string | null;
-        bundleSizeBytes?: number;
-        localCommitHash: string;
-        applied: boolean;
-        dryRun: boolean;
-    };
-};
-type CollabTurn = {
-    id: string;
-    appId: string;
-    threadId: string;
-    humanMessageId: string;
-    assistantMessageId: string;
-    changeStepId: string | null;
-    actor: {
-        type: string;
-        name: string | null;
-        version: string | null;
-        provider: string | null;
-    };
-    workspaceMetadata: JsonObject | null;
-    idempotencyKey: string | null;
-    createdBy: string;
-    createdAt: string;
-    updatedAt: string;
-    prompt: string | null;
-    assistantResponse: string | null;
-};
-type CollabFinalizeTurnMode = "changed_turn" | "no_diff_turn";
-type CollabFinalizeTurnAutoSync = {
-    requested: boolean;
-    eligible: boolean;
-    attempted: boolean;
-    applied: boolean;
-    trackedChangesDiscarded: boolean;
-    capturedUntrackedPathsCandidate: string[];
-    localHeadBefore: string | null;
-    localHeadAfter: string | null;
-    localRepoMutated: boolean;
-};
-type CollabFinalizeTurnResult = {
-    mode: CollabFinalizeTurnMode;
-    idempotencyKey: string;
-    changeStep: JsonObject | null;
-    collabTurn: CollabTurn | null;
-    autoSync: CollabFinalizeTurnAutoSync | null;
-    warnings: string[];
-};
-type InvitationScopeType = "organization" | "project" | "app";
-type MembershipScopeType = InvitationScopeType;
-type OrganizationMemberRole = "owner" | "admin" | "member" | "viewer";
-type ProjectMemberRole = "owner" | "maintainer" | "editor" | "viewer";
-type AppMemberRole = "owner" | "maintainer" | "editor" | "viewer";
-type OrganizationMember = {
-    id: string;
-    userId: string;
-    organizationId: string;
-    role: OrganizationMemberRole;
-    invitedBy: string | null;
-    createdAt: string;
-    updatedAt: string;
-};
-type ProjectMember = {
-    id: string;
-    userId: string;
-    projectId: string;
-    role: ProjectMemberRole;
-    invitedBy: string | null;
-    createdAt: string;
-    updatedAt: string;
-};
-type AppMember = {
-    id: string;
-    userId: string;
-    appId: string;
-    role: AppMemberRole;
-    invitedBy: string | null;
-    createdAt: string;
-    updatedAt: string;
-};
-type CollabMember = OrganizationMember | ProjectMember | AppMember;
-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>;
-    listApps(params?: {
-        projectId?: string;
-        organizationId?: string;
-        ownership?: "mine" | "shared" | "all";
-        accessScope?: "all_readable" | "explicit_member";
-        createdBy?: "me" | string;
-        forked?: "only" | "exclude" | "all";
-        limit?: number;
-        offset?: number;
-    }): Promise<unknown>;
-    getApp(appId: string): Promise<unknown>;
-    getMergeRequest(mrId: string): Promise<unknown>;
-    presignImportUploadFirstParty(payload: {
-        file: {
-            name: string;
-            mimeType: string;
-            size: number;
-            checksumSha256?: string;
-        };
-    }): Promise<unknown>;
-    importFromUploadFirstParty(payload: {
-        uploadId: string;
-        appName?: string;
-        threadId?: string;
-        branch?: string;
-        path?: string;
-        platform?: string;
-        isPublic?: boolean;
-        remoteUrl?: string;
-        defaultBranch?: string;
-        repoFingerprint?: string;
-        headCommitHash?: string;
-    }): Promise<unknown>;
-    forkApp(appId: string, payload?: {
-        name?: string;
-        platform?: string;
-        forkedFromCommitId?: string;
-        branchName?: string;
-    }): Promise<unknown>;
-    downloadAppBundle(appId: string): Promise<{
-        data: Buffer;
-        fileName: string | null;
-        contentType: string | null;
-    }>;
-    createChangeStep(appId: string, payload: {
-        threadId?: string;
-        collabLaneId?: string;
-        prompt: string;
-        assistantResponse?: string;
-        diff: string;
-        baseCommitHash?: string | null;
-        headCommitHash?: string | null;
-        changedFilesCount?: number;
-        insertions?: number;
-        deletions?: number;
-        actor?: {
-            type?: string;
-            name?: string;
-            version?: string;
-            provider?: string;
-        };
-        workspaceMetadata?: Record<string, unknown>;
-        idempotencyKey?: string;
-    }): Promise<unknown>;
-    startChangeStepReplay(appId: string, payload: {
-        prompt: string;
-        assistantResponse?: string;
-        diff: string;
-        baseCommitHash: string;
-        targetHeadCommitHash: string;
-        expectedPaths: string[];
-        actor?: {
-            type?: string;
-            name?: string;
-            version?: string;
-            provider?: string;
-        };
-        workspaceMetadata?: Record<string, unknown>;
-        idempotencyKey?: string;
-    }): Promise<unknown>;
-    getChangeStepReplay(appId: string, replayId: string): Promise<unknown>;
-    getChangeStepReplayDiff(appId: string, replayId: string): Promise<unknown>;
-    createCollabTurn(appId: string, payload: {
-        threadId?: string;
-        collabLaneId?: string;
-        prompt: string;
-        assistantResponse: string;
-        actor?: {
-            type?: string;
-            name?: string;
-            version?: string;
-            provider?: string;
-        };
-        workspaceMetadata?: Record<string, unknown>;
-        idempotencyKey?: string;
-    }): Promise<unknown>;
-    getChangeStep(appId: string, changeStepId: string): Promise<unknown>;
-    listMergeRequests(params?: {
-        queue?: MergeRequestQueue;
-        appId?: string;
-        sourceAppId?: string;
-        targetAppId?: string;
-        status?: string | string[];
-        kind?: string;
-        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: {
-        title?: string;
-        description?: string;
-        status?: string;
-    }): Promise<unknown>;
-    createOrganizationInvite(orgId: string, payload: {
-        email: string;
-        role?: string;
-        ttlDays?: number;
-    }): Promise<unknown>;
-    createProjectInvite(projectId: string, payload: {
-        email: string;
-        role?: string;
-        ttlDays?: number;
-    }): Promise<unknown>;
-    createAppInvite(appId: string, payload: {
-        email: string;
-        role?: string;
-        ttlDays?: number;
-    }): Promise<unknown>;
-    listOrganizationMembers(orgId: string, params?: {
-        limit?: number;
-        offset?: number;
-    }): Promise<unknown>;
-    updateOrganizationMember(orgId: string, userId: string, payload: {
-        role: OrganizationMemberRole;
-    }): Promise<unknown>;
-    listProjectMembers(projectId: string, params?: {
-        limit?: number;
-        offset?: number;
-    }): Promise<unknown>;
-    updateProjectMember(projectId: string, userId: string, payload: {
-        role: ProjectMemberRole;
-    }): Promise<unknown>;
-    listAppMembers(appId: string, params?: {
-        limit?: number;
-        offset?: number;
-    }): Promise<unknown>;
-    updateAppMember(appId: string, userId: string, payload: {
-        role: AppMemberRole;
-    }): Promise<unknown>;
-    listOrganizationInvites(orgId: string, params?: {
-        limit?: number;
-        offset?: number;
-    }): Promise<unknown>;
-    listProjectInvites(projectId: string, params?: {
-        limit?: number;
-        offset?: number;
-    }): Promise<unknown>;
-    listAppInvites(appId: string, params?: {
-        limit?: number;
-        offset?: number;
-    }): Promise<unknown>;
-    resendOrganizationInvite(orgId: string, inviteId: string, payload?: {
-        ttlDays?: number;
-    }): Promise<unknown>;
-    resendProjectInvite(projectId: string, inviteId: string, payload?: {
-        ttlDays?: number;
-    }): Promise<unknown>;
-    resendAppInvite(appId: string, inviteId: string, payload?: {
-        ttlDays?: number;
-    }): Promise<unknown>;
-    revokeOrganizationInvite(orgId: string, inviteId: string): Promise<unknown>;
-    revokeProjectInvite(projectId: string, inviteId: string): Promise<unknown>;
-    revokeAppInvite(appId: string, inviteId: string): Promise<unknown>;
-    syncUpstreamApp(appId: string): Promise<unknown>;
-    preflightAppReconcile(appId: string, payload: {
-        localHeadCommitHash: string;
-        repoFingerprint?: string;
-        remoteUrl?: string;
-        defaultBranch?: string;
-    }): Promise<unknown>;
-    startAppReconcile(appId: string, payload: {
-        uploadId: string;
-        localHeadCommitHash: string;
-        repoFingerprint?: string;
-        remoteUrl?: string;
-        defaultBranch?: string;
-        idempotencyKey?: string;
-    }): Promise<unknown>;
-    getAppReconcile(appId: string, reconcileId: string): Promise<unknown>;
-    downloadAppReconcileBundle(appId: string, reconcileId: string): Promise<{
-        data: Buffer;
-        fileName: string | null;
-        contentType: string | null;
-    }>;
-    syncLocalApp(appId: string, payload: {
-        baseCommitHash: string;
-        repoFingerprint?: string;
-        remoteUrl?: string;
-        defaultBranch?: string;
-        dryRun?: boolean;
-    }): 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>;
+import { C as CollabApiClient, T as TurnUsagePayload, a as CollabFinalizeTurnResult, b as CollabRecordingPreflight, c as CollabApproveMode, d as CollabApproveResult, M as MergeRequestQueue, e as MergeRequest, I as InvitationScopeType, f as CollabMember, J as JsonObject, A as AppDeltaResponse, g as CollabStatus, h as MergeRequestReview } from './contracts-NbV3P_Rl.js';
+export { i as AppHeadResponse, j as AppMember, k as AppMemberRole, l as AppReconcileResponse, m as CollabFinalizeTurnAutoSync, n as CollabFinalizeTurnMode, o as CollabPendingFinalizeState, p as CollabPendingFinalizeSummary, q as CollabRecordingPreflightStatus, r as CollabRepoStateKind, s as CollabStatusBlockedReason, t as CollabStatusRecommendedAction, u as CollabTurn, v as MembershipScopeType, w as MergeRequestStatus, x as ModelCall, O as OrganizationMember, y as OrganizationMemberRole, P as ProjectMember, z as ProjectMemberRole, R as ReconcilePreflightResponse, S as ServerToolUsage, B as SyncLocalResponse, D as SyncUpstreamResponse, E as TurnUsage, F as TurnUsageCaptureSource, G as TurnUsageConfidence, H as TurnUsagePreviousPatch } from './contracts-NbV3P_Rl.js';
+import { B as BranchBindingMode } from './binding-WiIRI2fl.js';
 
 declare function collabFinalizeTurn(params: {
     api: CollabApiClient;
@@ -574,29 +18,43 @@ declare function collabFinalizeTurn(params: {
         version?: string;
         provider?: string;
     };
+    turnUsage?: TurnUsagePayload | null;
+    /**
+     * ISO-8601 timestamp of when the user actually typed/submitted this prompt
+     * on their local machine. Distinct from the server-side `created_at` that
+     * gets stamped at API ingestion time, which can drift by minutes (or longer)
+     * when:
+     *   - prompts ride the queued-prompt reconciler recovery path (Cursor's
+     *     queue holds prompts in memory while the agent is busy)
+     *   - prompts ride the deferred-turn drainer (branch was unbound at submit
+     *     time and finalization waits for `remix collab init` to land)
+     *   - prompts ride the orphan-prompt recovery path (a previous turn's
+     *     pending state was displaced before its afterAgentResponse fired)
+     *
+     * When provided, the dashboard sorts the timeline by this value (with a
+     * fallback to `created_at` for back-compat). When omitted, behaviour is
+     * unchanged. Stored under `workspace_metadata.promptedAt`.
+     */
+    promptedAt?: string | null;
+    /**
+     * When set and > 0, the enqueued job's `nextRetryAt` is offset this many ms into
+     * the future, blocking the drainer from claiming it until the deadline expires
+     * or another caller (typically the Stop hook) clears it after harvesting usage.
+     * When unset/null/0, behavior is unchanged: `nextRetryAt: null`, drain-immediately.
+     */
+    awaitingUsageDeadlineMs?: number | null;
 }): Promise<CollabFinalizeTurnResult>;
 
+declare const FINALIZE_PREFLIGHT_FAILURE_CODES: readonly ["not_bound", "branch_binding_missing", "family_ambiguous", "metadata_conflict", "branch_mismatch", "missing_head", "remote_error", "pull_required", "re_anchor_required"];
+type FinalizePreflightFailureCode = (typeof FINALIZE_PREFLIGHT_FAILURE_CODES)[number];
+declare function isFinalizePreflightFailureCode(value: unknown): value is FinalizePreflightFailureCode;
+
 declare function collabRecordingPreflight(params: {
     api: CollabApiClient;
     cwd: string;
     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,13 +129,91 @@ declare function collabUpdateMemberRole(params: {
     member: CollabMember;
 }>;
 
+type InitBaselineStatus = "seeded" | "existing" | "requires_re_anchor" | "requires_sync";
+type CollabInitQueuedResult = {
+    queued: true;
+    jobId: string;
+    repoRoot: string;
+    projectId: string;
+    appId: string;
+    upstreamAppId: string;
+    dashboardUrl: string;
+    bindingPath: string;
+    bindingMode: BranchBindingMode;
+    createdCanonicalFamily: boolean;
+    remoteUrl: string | null;
+    defaultBranch: string | null;
+    warnings?: string[];
+};
 declare function collabInit(params: {
     api: CollabApiClient;
     cwd: string;
     appName?: string | null;
     path?: string | null;
     forceNew?: boolean;
+    asyncSubmit?: boolean;
+}): Promise<{
+    warnings?: string[] | undefined;
+    queued: true;
+    jobId: string;
+    repoRoot: string;
+    projectId: string;
+    appId: string;
+    upstreamAppId: string;
+    dashboardUrl: string;
+    bindingPath: string;
+    bindingMode: string;
+    createdCanonicalFamily: boolean;
+    remoteUrl: string | null;
+    defaultBranch: string | null;
+} | {
+    warnings?: string[] | undefined;
+    reused: boolean;
+    projectId: string;
+    appId: string;
+    dashboardUrl: string;
+    upstreamAppId: string;
+    bindingPath: string;
+    repoRoot: string;
+    bindingMode: string;
+    createdCanonicalFamily: boolean;
+    baselineStatus: InitBaselineStatus;
+} | {
+    warnings?: string[] | undefined;
+    reused: boolean;
+    projectId: string;
+    appId: string;
+    dashboardUrl: string;
+    upstreamAppId: string;
+    bindingPath: string;
+    repoRoot: string;
+    bindingMode: "lane" | "explicit_root";
+    createdCanonicalFamily: boolean;
+    baselineStatus: InitBaselineStatus;
+    remoteUrl: string | null;
+    defaultBranch: string | null;
+}>;
+declare function collabInitSubmit(params: {
+    api: CollabApiClient;
+    cwd: string;
+    appName?: string | null;
+    path?: string | null;
+    forceNew?: boolean;
 }): Promise<{
+    warnings?: string[] | undefined;
+    queued: true;
+    jobId: string;
+    repoRoot: string;
+    projectId: string;
+    appId: string;
+    upstreamAppId: string;
+    dashboardUrl: string;
+    bindingPath: string;
+    bindingMode: string;
+    createdCanonicalFamily: boolean;
+    remoteUrl: string | null;
+    defaultBranch: string | null;
+} | {
     warnings?: string[] | undefined;
     reused: boolean;
     projectId: string;
@@ -688,6 +224,7 @@ declare function collabInit(params: {
     repoRoot: string;
     bindingMode: string;
     createdCanonicalFamily: boolean;
+    baselineStatus: InitBaselineStatus;
 } | {
     warnings?: string[] | undefined;
     reused: boolean;
@@ -699,6 +236,7 @@ declare function collabInit(params: {
     repoRoot: string;
     bindingMode: "lane" | "explicit_root";
     createdCanonicalFamily: boolean;
+    baselineStatus: InitBaselineStatus;
     remoteUrl: string | null;
     defaultBranch: string | null;
 }>;
@@ -733,69 +271,159 @@ declare function collabList(params: {
     };
 }>;
 
-declare function collabReconcile(params: {
+declare function collabReAnchor(params: {
     api: CollabApiClient;
     cwd: string;
-    dryRun: boolean;
+    dryRun?: boolean;
     allowBranchMismatch?: boolean;
+    asyncSubmit?: 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";
+    status: "queued";
+    queued: true;
+    jobId: string;
+    repoRoot: string;
     branch: string;
+    currentAppId: string;
+    dryRun: boolean;
+    applied: boolean;
+    localHeadCommitHash?: undefined;
+    targetHeadCommitHash?: undefined;
+    warnings?: undefined;
+} | {
+    status: "queued";
+    queued: true;
+    jobId: string;
     repoRoot: string;
-    baseCommitHash: string;
-    targetCommitHash: string;
-    targetCommitId: string;
-    stats: {
-        changedFilesCount: number;
-        insertions: number;
-        deletions: number;
-    };
-    localCommitHash: string;
+    branch: string;
+    currentAppId: string;
+    localHeadCommitHash: string;
+    targetHeadCommitHash: string;
+    warnings: string[];
+    dryRun: boolean;
+    applied: boolean;
+}>;
+declare function collabReAnchorSubmit(params: {
+    api: CollabApiClient;
+    cwd: string;
+    dryRun?: boolean;
+    allowBranchMismatch?: boolean;
+}): Promise<{
+    status: string;
+    repoRoot: string;
+    branch: string;
+    currentAppId: string;
+    localHeadCommitHash: string;
+    targetHeadCommitHash: string;
+    targetHeadCommitId: string;
+    warnings: string[];
     applied: boolean;
     dryRun: boolean;
 } | {
-    status: "ready_to_reconcile";
+    status: "queued";
+    queued: true;
+    jobId: string;
+    repoRoot: string;
     branch: string;
+    currentAppId: string;
+    dryRun: boolean;
+    applied: boolean;
+    localHeadCommitHash?: undefined;
+    targetHeadCommitHash?: undefined;
+    warnings?: undefined;
+} | {
+    status: "queued";
+    queued: true;
+    jobId: string;
     repoRoot: string;
+    branch: string;
+    currentAppId: string;
     localHeadCommitHash: string;
-    targetHeadCommitId: string;
     targetHeadCommitHash: string;
     warnings: string[];
+    dryRun: boolean;
     applied: boolean;
+}>;
+
+declare function collabReconcile(params: {
+    api: CollabApiClient;
+    cwd: string;
     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;
+    allowBranchMismatch?: boolean;
+}): Promise<{
+    status: "up_to_date" | "delta_ready" | "base_unknown" | "conflict_risk";
+    branch: string;
+    repoRoot: string;
+    baseCommitHash: string;
+    targetCommitHash: string;
+    targetCommitId: string | null;
+    stats: AppDeltaResponse["stats"];
+    localCommitHash: string | null;
     applied: boolean;
     dryRun: boolean;
+    warnings?: string[];
+} | {
+    status: string;
+    repoRoot: string;
+    branch: string;
+    currentAppId: string;
+    localHeadCommitHash: string;
+    targetHeadCommitHash: string;
+    targetHeadCommitId: string;
     warnings: string[];
+    applied: boolean;
+    dryRun: boolean;
+} | {
+    status: "queued";
+    queued: true;
+    jobId: string;
+    repoRoot: string;
     branch: string;
+    currentAppId: string;
+    dryRun: boolean;
+    applied: boolean;
+    localHeadCommitHash?: undefined;
+    targetHeadCommitHash?: undefined;
+    warnings?: undefined;
+} | {
+    status: "queued";
+    queued: true;
+    jobId: string;
     repoRoot: string;
+    branch: string;
+    currentAppId: string;
     localHeadCommitHash: string;
-    targetHeadCommitId: string;
     targetHeadCommitHash: string;
+    warnings: string[];
+    dryRun: boolean;
+    applied: boolean;
+} | {
+    status: string;
+    repoRoot: 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 +462,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 +493,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 +513,188 @@ 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 const FINALIZE_JOB_LOCK_STALE_MS: number;
+type PendingFinalizeJobStatus = "queued" | "processing" | "completed" | "failed";
+type PendingFinalizeJob = {
+    schemaVersion: 1;
+    id: string;
+    status: PendingFinalizeJobStatus;
+    repoRoot: string;
+    repoFingerprint: string | null;
+    currentAppId: string;
+    laneId: string | null;
+    threadId: string | null;
+    branchName: string | null;
+    prompt: string;
+    assistantResponse: string;
+    baselineSnapshotId: string | null;
+    baselineServerHeadHash: string | null;
+    currentSnapshotId: string;
+    capturedAt: string;
+    updatedAt: string;
+    idempotencyKey: string | null;
+    error: string | null;
+    retryCount: number;
+    lastAttemptAt: string | null;
+    nextRetryAt: string | null;
+    metadata: Record<string, unknown>;
+};
+declare function cleanStaleFinalizeJobLocks(): Promise<{
+    removed: string[];
+    skipped: Array<{
+        jobId: string;
+        reason: string;
+    }>;
+    errors: Array<{
+        jobId: string;
+        error: string;
+    }>;
+}>;
+declare function readPendingFinalizeJob(jobId: string): Promise<PendingFinalizeJob | null>;
+declare function listPendingFinalizeJobs(): Promise<PendingFinalizeJob[]>;
+declare function updatePendingFinalizeJob(jobId: string, update: Partial<Omit<PendingFinalizeJob, "schemaVersion" | "id" | "capturedAt">>): Promise<PendingFinalizeJob | null>;
+declare function removePendingFinalizeJob(jobId: string): Promise<void>;
+declare const forgetPendingFinalizeJob: typeof removePendingFinalizeJob;
+declare function requeuePendingFinalizeJob(jobId: string): Promise<PendingFinalizeJob | null>;
+
+declare function processPendingFinalizeJob(params: {
+    api: CollabApiClient;
+    jobId: string;
+}): Promise<CollabFinalizeTurnResult>;
+declare function drainPendingFinalizeQueue(params: {
+    api: CollabApiClient;
+}): Promise<CollabFinalizeTurnResult[]>;
+
+type ProcessOutcome = {
+    status: "completed";
+    jobId: string;
+} | {
+    status: "failed";
+    jobId: string;
+    error: string;
+} | {
+    status: "retry_scheduled";
+    jobId: string;
+    error: string;
+    retryCount: number;
+} | {
+    status: "skipped";
+    jobId: string;
+};
+declare function collabInitProcess(jobId: string, opts: {
+    api: CollabApiClient;
+}): Promise<ProcessOutcome>;
+declare function collabReAnchorProcess(jobId: string, opts: {
+    api: CollabApiClient;
+}): Promise<ProcessOutcome>;
+declare function drainAsyncJobs(opts: {
+    api: CollabApiClient;
+    respectPidLock?: boolean;
+}): Promise<ProcessOutcome[]>;
+
+type AsyncJobKind = "init" | "init_post" | "re_anchor";
+type AsyncJobStatus = "queued" | "submitting" | "uploading" | "server_processing" | "completed" | "failed";
+type AsyncJobBase = {
+    schemaVersion: 1;
+    id: string;
+    kind: AsyncJobKind;
+    status: AsyncJobStatus;
+    repoRoot: string;
+    repoFingerprint: string | null;
+    branchName: string | null;
+    laneId: string | null;
+    createdAt: string;
+    updatedAt: string;
+    retryCount: number;
+    error: string | null;
+    idempotencyKey: string | null;
+};
+type InitJobPayload = {
+    bundlePath: string;
+    bundleSha256: string;
+    appName: string | null;
+    forceNew: boolean;
+    path: string | null;
+    defaultBranch: string | null;
+    headCommitHash: string;
+    remoteUrl: string | null;
+};
+type ReAnchorJobPayload = {
+    bundlePath: string;
+    bundleSha256: string;
+    localHeadCommitHash: string;
+    targetHeadCommitHash: string;
+    appId: string;
+};
+type InitPostJobPayload = {
+    appId: string;
+    syncPhaseStartedAt: number;
+    syncPhaseFinishedAt: number;
+};
+type AsyncJob = (AsyncJobBase & {
+    kind: "init";
+    payload: InitJobPayload;
+}) | (AsyncJobBase & {
+    kind: "init_post";
+    payload: InitPostJobPayload;
+}) | (AsyncJobBase & {
+    kind: "re_anchor";
+    payload: ReAnchorJobPayload;
+});
+type AsyncJobSummary = {
+    state: "idle" | "queued" | "processing" | "failed";
+    activeJobCount: number;
+    queuedJobCount: number;
+    processingJobCount: number;
+    failedJobCount: number;
+    oldestCreatedAt: string | null;
+    newestCreatedAt: string | null;
+    latestError: string | null;
+    kinds: AsyncJobKind[];
+};
+declare function readAsyncJob(jobId: string): Promise<AsyncJob | null>;
+declare function listAsyncJobs(): Promise<AsyncJob[]>;
+declare function listAsyncJobsForRepo(params: {
+    repoRoot: string;
+    branchName?: string | null;
+    kind?: AsyncJobKind | null;
+}): Promise<AsyncJob[]>;
+declare function findPendingAsyncJob(params: {
+    repoRoot: string;
+    branchName: string | null;
+    kind: AsyncJobKind;
+}): Promise<AsyncJob | null>;
+declare function findFailedAsyncJob(params: {
+    repoRoot: string;
+    branchName: string | null;
+    kind: AsyncJobKind;
+}): Promise<AsyncJob | null>;
+declare function deleteAsyncJob(jobId: string): Promise<void>;
+declare function summarizeAsyncJobs(params: {
+    repoRoot: string;
+    branchName?: string | null;
+}): Promise<AsyncJobSummary>;
+declare function pruneTerminalAsyncJobs(): Promise<void>;
+type AwaitAsyncJobResult = {
+    status: "completed";
+    job: AsyncJob;
+} | {
+    status: "failed";
+    job: AsyncJob;
+} | {
+    status: "timeout";
+    job: AsyncJob | null;
+};
+declare function awaitAsyncJob(params: {
+    jobId: string;
+    timeoutMs: number;
+    pollIntervalMs?: number;
+}): Promise<AwaitAsyncJobResult>;
+
+type DrainerLogEvent = "submitted" | "claimed" | "uploading" | "server_accepted" | "server_completed" | "retrying" | "failed" | "completed" | "replaced" | "binding_cleared";
+declare function drainerLogPath(): string;
+
+declare function getDrainerLogPath(): string;
+declare function getDrainerPidPath(): string;
+
+export { AppDeltaResponse, type AsyncJob, type AsyncJobBase, type AsyncJobKind, type AsyncJobStatus, type AsyncJobSummary, type AwaitAsyncJobResult, CollabApiClient, CollabApproveMode, CollabApproveResult, CollabFinalizeTurnResult, type CollabInitQueuedResult, CollabMember, CollabRecordingPreflight, CollabStatus, type DrainerLogEvent, FINALIZE_JOB_LOCK_STALE_MS, FINALIZE_PREFLIGHT_FAILURE_CODES, type FinalizePreflightFailureCode, type InitJobPayload, InvitationScopeType, JsonObject, MergeRequest, MergeRequestQueue, MergeRequestReview, type PendingFinalizeJob, type ReAnchorJobPayload, TurnUsagePayload, awaitAsyncJob, cleanStaleFinalizeJobLocks, collabApprove, collabCheckout, collabFinalizeTurn, collabInit, collabInitProcess, collabInitSubmit, collabInvite, collabList, collabListMembers, collabListMergeRequests, collabReAnchor, collabReAnchorProcess, collabReAnchorSubmit, collabReconcile, collabRecordingPreflight, collabReject, collabRemix, collabRequestMerge, collabStatus, collabSync, collabSyncUpstream, collabUpdateMemberRole, collabView, deleteAsyncJob, drainAsyncJobs, drainPendingFinalizeQueue, drainerLogPath, findFailedAsyncJob, findPendingAsyncJob, forgetPendingFinalizeJob, getDrainerLogPath, getDrainerPidPath, getMemberRolesForScope, isFinalizePreflightFailureCode, listAsyncJobs, listAsyncJobsForRepo, listPendingFinalizeJobs, processPendingFinalizeJob, pruneTerminalAsyncJobs, readAsyncJob, readPendingFinalizeJob, requeuePendingFinalizeJob, summarizeAsyncJobs, updatePendingFinalizeJob, validateMemberRole };