@remixhq/core 0.1.18 → 0.1.19

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-DnNP-K3V.js';
+import { T as TurnUsage } from './contracts-DiVLvPTG.js';
 import 'zod';
 
 type HistoryImportProvider = "claude_code" | "cursor";
@@ -542,6 +542,11 @@ type ApiClient = {
         workspaceMetadata?: Record<string, unknown>;
         idempotencyKey?: string;
     }): Promise<Json>;
+    listChangeSteps(appId: string, params?: {
+        limit?: number;
+        offset?: number;
+        idempotencyKey?: string;
+    }): Promise<Json>;
     startChangeStepReplay(appId: string, payload: {
         prompt: string;
         assistantResponse?: string;

package/dist/api.js

@@ -1,6 +1,6 @@
 import {
   createApiClient
-} from "./chunk-RCNOSZP6.js";
+} from "./chunk-C2FOZ3O7.js";
 import "./chunk-7XJGOKEO.js";
 export {
   createApiClient

package/dist/{chunk-RCNOSZP6.js → chunk-C2FOZ3O7.js}

@@ -196,6 +196,14 @@ function createApiClient(config, opts) {
       method: "POST",
       body: JSON.stringify(payload)
     }),
+    listChangeSteps: (appId, params) => {
+      const qs = new URLSearchParams();
+      if (params?.limit !== void 0) qs.set("limit", String(params.limit));
+      if (params?.offset !== void 0) qs.set("offset", String(params.offset));
+      if (params?.idempotencyKey) qs.set("idempotencyKey", params.idempotencyKey);
+      const suffix = qs.toString() ? `?${qs.toString()}` : "";
+      return request(`/v1/apps/${encodeURIComponent(appId)}/change-steps${suffix}`, { method: "GET" });
+    },
     createCollabTurn: (appId, payload) => request(`/v1/apps/${encodeURIComponent(appId)}/collab-turns`, {
       method: "POST",
       body: JSON.stringify(payload)

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, J as JsonObject, A as AppDeltaResponse, h as CollabStatus, i as MergeRequestReview } from './contracts-DnNP-K3V.js';
-export { j as AppHeadResponse, k as AppMember, l as AppMemberRole, m as AppReconcileResponse, n as CollabFinalizeTurnAutoSync, o as CollabFinalizeTurnMode, p as CollabPendingFinalizeState, q as CollabPendingFinalizeSummary, r as CollabRecordingPreflightStatus, s as CollabRepoStateKind, t as CollabStatusBlockedReason, u as CollabStatusRecommendedAction, v as CollabTurn, w as MembershipScopeType, x as MergeRequestStatus, y as ModelCall, O as OrganizationMember, z as OrganizationMemberRole, P as ProjectMember, B as ProjectMemberRole, R as ReconcilePreflightResponse, S as ServerToolUsage, D as SyncLocalResponse, E as SyncUpstreamResponse, T as TurnUsage, F as TurnUsageCaptureSource, G as TurnUsageConfidence, H as TurnUsagePreviousPatch } from './contracts-DnNP-K3V.js';
+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, J as JsonObject, A as AppDeltaResponse, h as CollabStatus, i as MergeRequestReview } from './contracts-DiVLvPTG.js';
+export { j as AppHeadResponse, k as AppMember, l as AppMemberRole, m as AppReconcileResponse, n as CollabFinalizeTurnAutoSync, o as CollabFinalizeTurnMode, p as CollabPendingFinalizeState, q as CollabPendingFinalizeSummary, r as CollabRecordingPreflightStatus, s as CollabRepoStateKind, t as CollabStatusBlockedReason, u as CollabStatusRecommendedAction, v as CollabTurn, w as MembershipScopeType, x as MergeRequestStatus, y as ModelCall, O as OrganizationMember, z as OrganizationMemberRole, P as ProjectMember, B as ProjectMemberRole, R as ReconcilePreflightResponse, S as ServerToolUsage, D as SyncLocalResponse, E as SyncUpstreamResponse, T as TurnUsage, F as TurnUsageCaptureSource, G as TurnUsageConfidence, H as TurnUsagePreviousPatch } from './contracts-DiVLvPTG.js';
 import { B as BranchBindingMode } from './binding-WiIRI2fl.js';
 
 declare function collabFinalizeTurn(params: {
@@ -447,6 +447,27 @@ declare function drainPendingFinalizeQueue(params: {
     api: CollabApiClient;
 }): Promise<CollabFinalizeTurnResult[]>;
 
+type SnapshotFileMode = "file" | "executable" | "symlink";
+type LocalSnapshotFile = {
+    path: string;
+    mode: SnapshotFileMode;
+    blobHash: string;
+    size: number;
+};
+type LocalSnapshotRecord = {
+    schemaVersion: 1;
+    id: string;
+    repoRoot: string;
+    repoFingerprint: string | null;
+    laneId: string | null;
+    branchName: string | null;
+    localCommitHash: string | null;
+    snapshotHash: string;
+    createdAt: string;
+    files: LocalSnapshotFile[];
+};
+declare function readLocalSnapshot(snapshotId: string | null | undefined): Promise<LocalSnapshotRecord | null>;
+
 type ProcessOutcome = {
     status: "completed";
     jobId: string;
@@ -576,4 +597,4 @@ 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, 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 };
+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, type LocalSnapshotRecord, MergeRequest, MergeRequestQueue, MergeRequestReview, type PendingFinalizeJob, type ReAnchorJobPayload, TurnUsagePayload, awaitAsyncJob, cleanStaleFinalizeJobLocks, collabApprove, collabCheckout, collabFinalizeTurn, collabInit, collabInitProcess, collabInitSubmit, collabInvite, collabList, collabListMembers, collabListMergeRequests, 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, readLocalSnapshot, readPendingFinalizeJob, requeuePendingFinalizeJob, summarizeAsyncJobs, updatePendingFinalizeJob, validateMemberRole };

package/dist/collab.js

@@ -1467,6 +1467,15 @@ function shouldRequireRemoteLaneForCurrentBranch(params) {
   if (params.currentBranch === defaultBranch) return false;
   return !params.binding.laneId || params.binding.currentAppId === params.binding.upstreamAppId;
 }
+function resolveLaneLookupProjectId(params) {
+  const currentBranch = normalizeBranchName(params.currentBranch);
+  const defaultBranch = normalizeBranchName(params.defaultBranch);
+  const localProjectId = params.localBinding.projectId ?? null;
+  if (currentBranch && currentBranch !== defaultBranch && localProjectId) {
+    return localProjectId;
+  }
+  return params.explicitRootProjectId ?? (params.requireRemoteLane ? void 0 : localProjectId ?? params.fallbackProjectId ?? void 0);
+}
 async function persistResolvedLane(repoRoot, binding) {
   await writeCollabBinding(repoRoot, {
     projectId: binding.projectId,
@@ -1545,7 +1554,14 @@ async function resolveActiveLaneBindingUncached(params, state) {
       };
     }
     const laneResp2 = await params.api.resolveProjectLaneBinding({
-      projectId: state.explicitRootBinding?.projectId ?? (requireRemoteLane ? void 0 : localBinding.projectId ?? state.projectId ?? void 0),
+      projectId: resolveLaneLookupProjectId({
+        explicitRootProjectId: state.explicitRootBinding?.projectId,
+        localBinding,
+        currentBranch,
+        defaultBranch: state.defaultBranch,
+        requireRemoteLane,
+        fallbackProjectId: state.projectId
+      }),
       repoFingerprint: state.repoFingerprint ?? void 0,
       remoteUrl: state.remoteUrl ?? void 0,
       defaultBranch: state.defaultBranch ?? void 0,
@@ -2403,6 +2419,59 @@ function buildWorkspaceMetadata(params) {
   }
   return metadata;
 }
+async function findExistingChangeStepByIdempotency(params) {
+  const idempotencyKey = params.idempotencyKey?.trim();
+  if (!idempotencyKey) return null;
+  const resp = await params.api.listChangeSteps(params.appId, { limit: 1, idempotencyKey });
+  const responseObject = unwrapResponseObject(
+    resp,
+    "change step list"
+  );
+  const steps = Array.isArray(responseObject) ? responseObject : Array.isArray(responseObject.items) ? responseObject.items : [];
+  return steps.find((step) => step.idempotencyKey === idempotencyKey) ?? null;
+}
+async function writeBaselineFromSucceededChangeStep(params) {
+  const nextServerHeadHash = typeof params.changeStep.headCommitHash === "string" ? params.changeStep.headCommitHash.trim() : "";
+  if (!nextServerHeadHash) {
+    throw buildFinalizeCliError({
+      message: "Backend returned a succeeded change step without a head commit hash.",
+      exitCode: 1,
+      hint: "This is a backend invariant violation; retry will not help. Run `remix collab status` before trying again.",
+      disposition: "terminal",
+      reason: "missing_head_commit_hash"
+    });
+  }
+  let nextServerRevisionId = typeof params.changeStep.resultRevisionId === "string" ? params.changeStep.resultRevisionId.trim() : "";
+  let nextServerTreeHash = null;
+  if (!nextServerRevisionId) {
+    const freshHeadResp = await params.api.getAppHead(params.job.currentAppId);
+    const freshHead = unwrapResponseObject(freshHeadResp, "app head");
+    if (freshHead.headCommitHash !== nextServerHeadHash || !freshHead.headRevisionId) {
+      throw buildFinalizeCliError({
+        message: "Backend returned a succeeded change step without a matching result revision.",
+        exitCode: 1,
+        hint: "The local baseline was not advanced because the post-step revision could not be verified. Restart the backend/CLI and retry after checking `remix collab status`.",
+        disposition: "terminal",
+        reason: "missing_result_revision_id"
+      });
+    }
+    nextServerRevisionId = freshHead.headRevisionId;
+    nextServerTreeHash = freshHead.treeHash ?? null;
+  }
+  await writeLocalBaseline({
+    repoRoot: params.job.repoRoot,
+    repoFingerprint: params.job.repoFingerprint,
+    laneId: params.job.laneId,
+    currentAppId: params.job.currentAppId,
+    branchName: params.job.branchName,
+    lastSnapshotId: params.snapshot.id,
+    lastSnapshotHash: params.snapshot.snapshotHash,
+    lastServerRevisionId: nextServerRevisionId,
+    lastServerTreeHash: nextServerTreeHash,
+    lastServerHeadHash: nextServerHeadHash,
+    lastSeenLocalCommitHash: params.snapshot.localCommitHash
+  });
+}
 async function harvestPreTurnEvents(repoRoot, fromCommit, toCommit) {
   if (!toCommit) return null;
   try {
@@ -2588,6 +2657,34 @@ async function processClaimedPendingFinalizeJobInner(params) {
     });
   }
   const replayNeeded = appHead.headCommitHash !== submissionBaseHeadHash || baselineDrifted;
+  if (replayNeeded) {
+    const existingChangeStep = await findExistingChangeStepByIdempotency({
+      api: params.api,
+      appId: job.currentAppId,
+      idempotencyKey: job.idempotencyKey
+    });
+    if (existingChangeStep) {
+      const changeStep2 = existingChangeStep.status === "succeeded" ? existingChangeStep : await pollChangeStep(params.api, job.currentAppId, existingChangeStep.id);
+      invalidateAppHeadCache(job.currentAppId);
+      invalidateAppDeltaCacheForApp(job.currentAppId);
+      await writeBaselineFromSucceededChangeStep({ api: params.api, job, snapshot, changeStep: changeStep2 });
+      await updatePendingFinalizeJob(job.id, {
+        status: "completed",
+        metadata: { changeStepId: String(changeStep2.id ?? "") }
+      });
+      return {
+        mode: "changed_turn",
+        idempotencyKey: job.idempotencyKey ?? "",
+        queued: false,
+        jobId: job.id,
+        repoState,
+        changeStep: changeStep2,
+        collabTurn: null,
+        autoSync: null,
+        warnings: []
+      };
+    }
+  }
   if (replayNeeded) {
     try {
       const replayResp = await params.api.startChangeStepReplay(job.currentAppId, {
@@ -2685,46 +2782,7 @@ async function processClaimedPendingFinalizeJobInner(params) {
   const changeStep = await pollChangeStep(params.api, job.currentAppId, String(createdStep.id));
   invalidateAppHeadCache(job.currentAppId);
   invalidateAppDeltaCacheForApp(job.currentAppId);
-  const nextServerHeadHash = typeof changeStep.headCommitHash === "string" ? changeStep.headCommitHash.trim() : "";
-  if (!nextServerHeadHash) {
-    throw buildFinalizeCliError({
-      message: "Backend returned a succeeded change step without a head commit hash.",
-      exitCode: 1,
-      hint: "This is a backend invariant violation; retry will not help. Run `remix collab status` before trying again.",
-      disposition: "terminal",
-      reason: "missing_head_commit_hash"
-    });
-  }
-  let nextServerRevisionId = typeof changeStep.resultRevisionId === "string" ? changeStep.resultRevisionId.trim() : "";
-  let nextServerTreeHash = null;
-  if (!nextServerRevisionId) {
-    const freshHeadResp = await params.api.getAppHead(job.currentAppId);
-    const freshHead = unwrapResponseObject(freshHeadResp, "app head");
-    if (freshHead.headCommitHash !== nextServerHeadHash || !freshHead.headRevisionId) {
-      throw buildFinalizeCliError({
-        message: "Backend returned a succeeded change step without a matching result revision.",
-        exitCode: 1,
-        hint: "The local baseline was not advanced because the post-step revision could not be verified. Restart the backend/CLI and retry after checking `remix collab status`.",
-        disposition: "terminal",
-        reason: "missing_result_revision_id"
-      });
-    }
-    nextServerRevisionId = freshHead.headRevisionId;
-    nextServerTreeHash = freshHead.treeHash ?? null;
-  }
-  await writeLocalBaseline({
-    repoRoot: job.repoRoot,
-    repoFingerprint: job.repoFingerprint,
-    laneId: job.laneId,
-    currentAppId: job.currentAppId,
-    branchName: job.branchName,
-    lastSnapshotId: snapshot.id,
-    lastSnapshotHash: snapshot.snapshotHash,
-    lastServerRevisionId: nextServerRevisionId,
-    lastServerTreeHash: nextServerTreeHash,
-    lastServerHeadHash: nextServerHeadHash,
-    lastSeenLocalCommitHash: snapshot.localCommitHash
-  });
+  await writeBaselineFromSucceededChangeStep({ api: params.api, job, snapshot, changeStep });
   await updatePendingFinalizeJob(job.id, {
     status: "completed",
     metadata: { changeStepId: String(changeStep.id ?? "") }
@@ -4207,27 +4265,21 @@ async function trySeedEquivalentBranchBaseline(params) {
     branchName: params.branchName,
     persistBlobs: false
   });
-  if (inspection.snapshotHash !== defaultBaseline.lastSnapshotHash) {
+  if (inspection.snapshotHash !== defaultBaseline.lastSnapshotHash && inspection.localCommitHash !== defaultBaseline.lastSeenLocalCommitHash) {
     return null;
   }
-  const snapshot = await captureLocalSnapshot({
-    repoRoot: params.repoRoot,
-    repoFingerprint: params.repoFingerprint,
-    laneId: params.laneId,
-    branchName: params.branchName
-  });
   await writeLocalBaseline({
     repoRoot: params.repoRoot,
     repoFingerprint: params.repoFingerprint,
     laneId: params.laneId,
     currentAppId: params.currentAppId,
     branchName: params.branchName,
-    lastSnapshotId: snapshot.id,
-    lastSnapshotHash: snapshot.snapshotHash,
+    lastSnapshotId: defaultBaseline.lastSnapshotId,
+    lastSnapshotHash: defaultBaseline.lastSnapshotHash,
     lastServerRevisionId: params.appHeadRevisionId,
     lastServerTreeHash: params.appTreeHash,
     lastServerHeadHash: params.appHeadHash,
-    lastSeenLocalCommitHash: snapshot.localCommitHash
+    lastSeenLocalCommitHash: inspection.localCommitHash
   });
   return "seeded";
 }
@@ -4276,6 +4328,21 @@ async function resolveInitBaselineStatus(params) {
     });
     const delta = unwrapResponseObject(deltaResp, "app delta");
     if (delta.status === "up_to_date" || delta.status === "delta_ready") {
+      const equivalentBaseline = await trySeedEquivalentBranchBaseline({
+        repoRoot: params.repoRoot,
+        repoFingerprint: params.repoFingerprint,
+        laneId: params.laneId,
+        currentAppId: params.currentAppId,
+        upstreamAppId: params.upstreamAppId ?? null,
+        branchName: params.branchName,
+        defaultBranch: params.defaultBranch,
+        appHeadHash: appHead.headCommitHash,
+        appHeadRevisionId: appHead.headRevisionId ?? null,
+        appTreeHash: appHead.treeHash ?? null
+      });
+      if (equivalentBaseline) {
+        return equivalentBaseline;
+      }
       return "requires_sync";
     }
     if (delta.status === "content_equivalent") {
@@ -6566,6 +6633,7 @@ export {
   processPendingFinalizeJob,
   pruneTerminalAsyncJobs,
   readAsyncJob,
+  readLocalSnapshot,
   readPendingFinalizeJob,
   requeuePendingFinalizeJob,
   summarizeAsyncJobs,

package/dist/{contracts-DnNP-K3V.d.ts → contracts-DiVLvPTG.d.ts}

@@ -536,6 +536,11 @@ type CollabApiClient = {
         workspaceMetadata?: Record<string, unknown>;
         idempotencyKey?: string;
     }): Promise<unknown>;
+    listChangeSteps(appId: string, params?: {
+        limit?: number;
+        offset?: number;
+        idempotencyKey?: string;
+    }): Promise<unknown>;
     startChangeStepReplay(appId: string, payload: {
         prompt: string;
         assistantResponse?: string;

package/dist/history.d.ts

@@ -1,4 +1,4 @@
-import { T as TurnUsage } from './contracts-DnNP-K3V.js';
+import { T as TurnUsage } from './contracts-DiVLvPTG.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, AppReconcileResponse, Bundle, BundlePlatform, BundleStatus, ChangeStepDiffResponse, InitiateBundleRequest, InvitationRecord, MergeRequest, MergeRequestReview, MergeRequestStatus, ReconcilePreflightResponse, SyncLocalResponse, SyncUpstreamResponse, createApiClient } from './api.js';
 import 'zod';
-import './contracts-DnNP-K3V.js';
+import './contracts-DiVLvPTG.js';

package/dist/index.js

@@ -1,6 +1,6 @@
 import {
   createApiClient
-} from "./chunk-RCNOSZP6.js";
+} from "./chunk-C2FOZ3O7.js";
 import {
   createLocalSessionStore,
   createStoredSessionTokenProvider,

package/package.json

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