@remixhq/core 0.1.31 → 0.1.32

package/dist/api.d.ts

@@ -1,6 +1,6 @@
 import { CoreConfig } from './config.js';
 import { T as TokenProvider } from './tokenProvider-BWTusyj4.js';
-import { T as TurnUsage } from './contracts-BV67NVwV.js';
+import { T as TurnUsage } from './contracts-WCYiMqwB.js';
 import 'zod';
 
 type HistoryImportProvider = "claude_code" | "cursor";
@@ -997,6 +997,7 @@ type ApiClient = {
         title?: string;
         description?: string;
         status?: string;
+        approvalStrategy?: "ai_patch_apply" | "git_merge_auto_resolve" | "git_merge_manual_resolution";
     }): Promise<Json>;
     createOrganizationInvite(orgId: string, payload: {
         email: string;

package/dist/collab.d.ts

@@ -1,5 +1,5 @@
-import { C as CollabApiClient, a as TurnUsagePayload, b as CollabFinalizeTurnResult, c as CollabRecordingPreflight, d as CollabApproveMode, e as CollabApproveResult, M as MergeRequestQueue, f as MergeRequest, I as InvitationScopeType, g as CollabMember, A as AppProfileInput, J as JsonObject, h as AppDeltaResponse, i as CollabStatus, j as MergeRequestReview } from './contracts-BV67NVwV.js';
-export { k as AppHeadResponse, l as AppMember, m as AppMemberRole, n as AppReconcileResponse, o as CollabFinalizeTurnAutoSync, p as CollabFinalizeTurnMode, q as CollabPendingFinalizeState, r as CollabPendingFinalizeSummary, s as CollabRecordingPreflightStatus, t as CollabRepoStateKind, u as CollabStatusBlockedReason, v as CollabStatusRecommendedAction, w as CollabTurn, x as MembershipScopeType, y as MergeRequestStatus, z as ModelCall, O as OrganizationMember, B as OrganizationMemberRole, P as ProjectMember, D as ProjectMemberRole, R as ReconcilePreflightResponse, S as ServerToolUsage, E as SyncLocalResponse, F as SyncUpstreamResponse, T as TurnUsage, G as TurnUsageCaptureSource, H as TurnUsageConfidence, K as TurnUsagePreviousPatch } from './contracts-BV67NVwV.js';
+import { C as CollabApiClient, a as TurnUsagePayload, b as CollabFinalizeTurnResult, c as CollabRecordingPreflight, d as CollabApproveMode, e as CollabApprovalStrategy, f as CollabApproveResult, M as MergeRequestQueue, g as MergeRequest, I as InvitationScopeType, h as CollabMember, A as AppProfileInput, J as JsonObject, i as AppDeltaResponse, j as CollabStatus, k as MergeRequestReview } from './contracts-WCYiMqwB.js';
+export { l as AppHeadResponse, m as AppMember, n as AppMemberRole, o as AppReconcileResponse, p as CollabFinalizeTurnAutoSync, q as CollabFinalizeTurnMode, r as CollabPendingFinalizeState, s as CollabPendingFinalizeSummary, t as CollabRecordingPreflightStatus, u as CollabRepoStateKind, v as CollabStatusBlockedReason, w as CollabStatusRecommendedAction, x as CollabTurn, y as MembershipScopeType, z as MergeRequestStatus, B as ModelCall, O as OrganizationMember, D as OrganizationMemberRole, P as ProjectMember, E as ProjectMemberRole, R as ReconcilePreflightResponse, S as ServerToolUsage, F as SyncLocalResponse, G as SyncUpstreamResponse, T as TurnUsage, H as TurnUsageCaptureSource, K as TurnUsageConfidence, L as TurnUsagePreviousPatch } from './contracts-WCYiMqwB.js';
 import { B as BranchBindingMode } from './binding-WiIRI2fl.js';
 
 declare function collabFinalizeTurn(params: {
@@ -149,6 +149,7 @@ declare function collabApprove(params: {
     api: CollabApiClient;
     mrId: string;
     mode: CollabApproveMode;
+    approvalStrategy?: CollabApprovalStrategy;
     cwd?: string;
     allowBranchMismatch?: boolean;
 }): Promise<CollabApproveResult>;

package/dist/collab.js

@@ -1425,6 +1425,12 @@ async function pollMergeRequestCompletion(api, mrId, params) {
     const review = unwrapMergeRequestReview(reviewResp);
     const mergeRequest = review.mergeRequest;
     if (mergeRequest.status === "merged") return mergeRequest;
+    if (mergeRequest.status === "manual_resolution_required") {
+      throw new RemixError("Merge approval requires manual conflict resolution.", {
+        exitCode: 2,
+        hint: "Merge request ended in status=manual_resolution_required."
+      });
+    }
     if (mergeRequest.status === "rejected" || mergeRequest.status === "closed") {
       throw new RemixError("Merge approval did not complete successfully.", {
         exitCode: 1,
@@ -3839,6 +3845,10 @@ async function collabSync(params) {
 
 // src/application/collab/collabApprove.ts
 async function collabApprove(params) {
+  const approvePayload = {
+    status: "approved",
+    ...params.approvalStrategy ? { approvalStrategy: params.approvalStrategy } : {}
+  };
   const transition = planApproveWorkflowTransition({
     mode: params.mode,
     hasCwd: Boolean(params.cwd?.trim())
@@ -3878,7 +3888,7 @@ async function collabApprove(params) {
             hint: `Run the command from the repository bound to app ${targetAppId}, or use --remote-only.`
           });
         }
-        const resp2 = await params.api.updateMergeRequest(params.mrId, { status: "approved" });
+        const resp2 = await params.api.updateMergeRequest(params.mrId, approvePayload);
         const approvedMergeRequest2 = unwrapMergeRequest(resp2);
         const completedMergeRequest2 = await pollMergeRequestCompletion(params.api, params.mrId, {
           targetAppId: targetAppId ?? approvedMergeRequest2.targetAppId
@@ -3910,7 +3920,7 @@ async function collabApprove(params) {
       exitCode: 2
     });
   }
-  const resp = await params.api.updateMergeRequest(params.mrId, { status: "approved" });
+  const resp = await params.api.updateMergeRequest(params.mrId, approvePayload);
   const approvedMergeRequest = unwrapMergeRequest(resp);
   const completedMergeRequest = await pollMergeRequestCompletion(params.api, params.mrId, {
     targetAppId: approvedMergeRequest.targetAppId

package/dist/{contracts-BV67NVwV.d.ts → contracts-WCYiMqwB.d.ts}

@@ -66,7 +66,7 @@ type TurnUsagePayload = {
     currentTurn: TurnUsage | null;
     previousTurn: TurnUsagePreviousPatch | null;
 };
-type MergeRequestStatus = "open" | "approved" | "rejected" | "merged" | "closed";
+type MergeRequestStatus = "open" | "approved" | "rejected" | "merged" | "closed" | "manual_resolution_required";
 type MergeRequestQueue = "reviewable" | "created_by_me" | "app_reviewable" | "app_outgoing" | "app_related_visible";
 type MergeRequest = {
     id: string;
@@ -133,6 +133,7 @@ type MergeRequestReview = {
     };
 };
 type CollabApproveMode = "remote-only" | "sync-target-repo";
+type CollabApprovalStrategy = "ai_patch_apply" | "git_merge_auto_resolve" | "git_merge_manual_resolution";
 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" | "awaiting_usage" | "failed";
@@ -631,6 +632,7 @@ type CollabApiClient = {
         title?: string;
         description?: string;
         status?: string;
+        approvalStrategy?: CollabApprovalStrategy;
     }): Promise<unknown>;
     createOrganizationInvite(orgId: string, payload: {
         email: string;
@@ -732,4 +734,4 @@ type CollabApiClient = {
     }): Promise<unknown>;
 };
 
-export type { AppProfileInput as A, OrganizationMemberRole as B, CollabApiClient as C, ProjectMemberRole as D, SyncLocalResponse as E, SyncUpstreamResponse as F, TurnUsageCaptureSource as G, TurnUsageConfidence as H, InvitationScopeType as I, JsonObject as J, TurnUsagePreviousPatch as K, MergeRequestQueue as M, OrganizationMember as O, ProjectMember as P, ReconcilePreflightResponse as R, ServerToolUsage as S, TurnUsage as T, TurnUsagePayload as a, CollabFinalizeTurnResult as b, CollabRecordingPreflight as c, CollabApproveMode as d, CollabApproveResult as e, MergeRequest as f, CollabMember as g, AppDeltaResponse as h, CollabStatus as i, MergeRequestReview as j, AppHeadResponse as k, AppMember as l, AppMemberRole as m, AppReconcileResponse as n, CollabFinalizeTurnAutoSync as o, CollabFinalizeTurnMode as p, CollabPendingFinalizeState as q, CollabPendingFinalizeSummary as r, CollabRecordingPreflightStatus as s, CollabRepoStateKind as t, CollabStatusBlockedReason as u, CollabStatusRecommendedAction as v, CollabTurn as w, MembershipScopeType as x, MergeRequestStatus as y, ModelCall as z };
+export type { AppProfileInput as A, ModelCall as B, CollabApiClient as C, OrganizationMemberRole as D, ProjectMemberRole as E, SyncLocalResponse as F, SyncUpstreamResponse as G, TurnUsageCaptureSource as H, InvitationScopeType as I, JsonObject as J, TurnUsageConfidence as K, TurnUsagePreviousPatch as L, MergeRequestQueue as M, OrganizationMember as O, ProjectMember as P, ReconcilePreflightResponse as R, ServerToolUsage as S, TurnUsage as T, TurnUsagePayload as a, CollabFinalizeTurnResult as b, CollabRecordingPreflight as c, CollabApproveMode as d, CollabApprovalStrategy as e, CollabApproveResult as f, MergeRequest as g, CollabMember as h, AppDeltaResponse as i, CollabStatus as j, MergeRequestReview as k, AppHeadResponse as l, AppMember as m, AppMemberRole as n, AppReconcileResponse as o, CollabFinalizeTurnAutoSync as p, CollabFinalizeTurnMode as q, CollabPendingFinalizeState as r, CollabPendingFinalizeSummary as s, CollabRecordingPreflightStatus as t, CollabRepoStateKind as u, CollabStatusBlockedReason as v, CollabStatusRecommendedAction as w, CollabTurn as x, MembershipScopeType as y, MergeRequestStatus as z };

package/dist/history.d.ts

@@ -1,4 +1,4 @@
-import { T as TurnUsage } from './contracts-BV67NVwV.js';
+import { T as TurnUsage } from './contracts-WCYiMqwB.js';
 
 type TranscriptEvent = Record<string, unknown>;
 type ReadTranscriptResult = {

package/dist/index.d.ts

@@ -4,4 +4,4 @@ export { S as SessionStore, a as StoredSession, c as createStoredSessionTokenPro
 export { createLocalSessionStore, createSupabaseAuthHelpers } from './auth.js';
 export { AgentMemoryItem, AgentMemoryKind, AgentMemorySearchItem, AgentMemorySearchResponse, AgentMemorySummary, AgentMemoryTimelineResponse, ApiClient, AppContext, AppContextAccessPath, AppPreviewExpectedKind, AppPreviewProcessStatus, AppPreviewQuery, AppPreviewResponse, AppReconcileResponse, AppSandboxCommandRun, Bundle, BundlePlatform, BundleStatus, ChangeStepDiffResponse, DetectProjectRuntimeTargetsPayload, ImportProjectRuntimeEnvPayload, InitiateBundleRequest, InvitationRecord, MergeRequest, MergeRequestReview, MergeRequestStatus, ProjectRuntimeEnvMetadata, ProjectRuntimeEnvScope, ProjectRuntimeTargetMetadata, ProjectRuntimeTargetScope, ProjectTrigger, ProjectTriggerPayload, ProjectTriggerScope, ProjectTriggerStep, ProjectTriggerStepPayload, ReconcilePreflightResponse, ResolveProjectRuntimeEnvForLocalPullResponse, RunAppRuntimeTargetPayload, RunAppSandboxCommandPayload, RunAppTriggerEventPayload, RunAppTriggerPayload, RuntimeCommandKind, RuntimeTargetKind, SetProjectRuntimeEnvPayload, SetProjectRuntimeTargetPayload, SyncLocalResponse, SyncUpstreamResponse, TriggerEventMetadata, TriggerEventSource, TriggerIntegrationStatus, TriggerMode, TriggerRun, TriggerStepRun, TriggerStepType, UpdateProjectTriggerPayload, createApiClient } from './api.js';
 import 'zod';
-import './contracts-BV67NVwV.js';
+import './contracts-WCYiMqwB.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remixhq/core",
-  "version": "0.1.31",
+  "version": "0.1.32",
   "description": "Remix core library",
   "homepage": "https://github.com/RemixDotOne/remix-core",
   "license": "MIT",