@remixhq/core 0.1.17 → 0.1.18

package/dist/config.js

@@ -1,8 +1,8 @@
 import {
   configSchema,
   resolveConfig
-} from "./chunk-VM3CGCNX.js";
-import "./chunk-YZ34ICNN.js";
+} from "./chunk-XCZRNB35.js";
+import "./chunk-7XJGOKEO.js";
 export {
   configSchema,
   resolveConfig

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

@@ -91,6 +91,8 @@ type MergeRequestReviewChangeStep = {
     commitId: string | null;
     baseCommitHash: string | null;
     headCommitHash: string | null;
+    baseRevisionId: string | null;
+    resultRevisionId: string | null;
     changedFilesCount: number | null;
     insertions: number | null;
     deletions: number | null;
@@ -136,7 +138,7 @@ type CollabPendingFinalizeSummary = {
     nextRetryAt: string | null;
     latestError: string | null;
 };
-type CollabStatusRecommendedAction = "init" | "pull" | "re_anchor" | "reconcile" | "await_finalize" | "record" | "review_queue" | "choose_family" | "no_action";
+type CollabStatusRecommendedAction = "init" | "pull" | "reconcile" | "await_finalize" | "record" | "review_queue" | "choose_family" | "no_action";
 type CollabStatus = {
     schemaVersion: 1;
     repo: {
@@ -206,11 +208,15 @@ type CollabStatus = {
         baseline: {
             lastSnapshotId: string | null;
             lastSnapshotHash: string | null;
+            lastServerRevisionId: string | null;
+            lastServerTreeHash: string | null;
             lastServerHeadHash: string | null;
             lastSeenLocalCommitHash: string | null;
         };
         current: {
             snapshotHash: string | null;
+            serverRevisionId: string | null;
+            serverTreeHash: string | null;
             serverHeadHash: string | null;
             serverHeadCommitId: string | null;
             localCommitHash: string | null;
@@ -222,8 +228,11 @@ type CollabStatus = {
 type SyncLocalResponse = {
     status: "up_to_date" | "delta_ready" | "ready_to_fast_forward" | "base_unknown" | "conflict_risk";
     baseCommitHash: string;
+    baseRevisionId?: string | null;
     targetCommitHash: string;
     targetCommitId: string;
+    targetRevisionId?: string | null;
+    targetTreeHash?: string | null;
     bundleRef: string | null;
     bundleBase64: string | null;
     bundleEncoding: "base64" | null;
@@ -237,6 +246,8 @@ type SyncLocalResponse = {
 };
 type AppHeadResponse = {
     appId: string;
+    headRevisionId: string | null;
+    treeHash: string | null;
     headCommitId: string;
     headCommitHash: string;
     status: string;
@@ -246,6 +257,9 @@ type AppDeltaResponse = {
     status: "up_to_date" | "delta_ready" | "base_unknown" | "content_equivalent" | "conflict_risk";
     baseHeadHash: string;
     targetHeadHash: string;
+    baseRevisionId?: string | null;
+    targetRevisionId?: string | null;
+    targetTreeHash?: string | null;
     targetHeadCommitId: string | null;
     diff: string;
     diffSha256: string | null;
@@ -260,7 +274,7 @@ 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" | "ready" | "pull_required" | "re_anchor_required" | "reconcile_required";
+type CollabRecordingPreflightStatus = "not_git_repo" | "not_bound" | "branch_binding_missing" | "family_ambiguous" | "missing_head" | "branch_mismatch" | "metadata_conflict" | "ready" | "pull_required" | "baseline_missing" | "reconcile_required";
 type CollabRecordingPreflight = {
     status: CollabRecordingPreflightStatus;
     repoState: CollabRepoStateKind | null;
@@ -460,6 +474,8 @@ type CollabApiClient = {
     getAppDelta(appId: string, payload: {
         baseHeadHash: string;
         targetHeadHash?: string;
+        baseRevisionId?: string | null;
+        targetRevisionId?: string | null;
         localSnapshotHash?: string;
         repoFingerprint?: string;
         remoteUrl?: string;
@@ -507,6 +523,7 @@ type CollabApiClient = {
         diff: string;
         baseCommitHash?: string | null;
         headCommitHash?: string | null;
+        baseRevisionId?: string | null;
         changedFilesCount?: number;
         insertions?: number;
         deletions?: number;
@@ -525,6 +542,8 @@ type CollabApiClient = {
         diff: string;
         baseCommitHash: string;
         targetHeadCommitHash: string;
+        baseRevisionId?: string | null;
+        targetRevisionId?: string | null;
         expectedPaths: string[];
         actor?: {
             type?: string;
@@ -647,6 +666,9 @@ type CollabApiClient = {
     syncUpstreamApp(appId: string): Promise<unknown>;
     preflightAppReconcile(appId: string, payload: {
         localHeadCommitHash: string;
+        baseRevisionId?: string | null;
+        localRevisionId?: string | null;
+        targetRevisionId?: string | null;
         repoFingerprint?: string;
         remoteUrl?: string;
         defaultBranch?: string;
@@ -654,6 +676,9 @@ type CollabApiClient = {
     startAppReconcile(appId: string, payload: {
         uploadId: string;
         localHeadCommitHash: string;
+        baseRevisionId?: string | null;
+        localRevisionId?: string | null;
+        targetRevisionId?: string | null;
         repoFingerprint?: string;
         remoteUrl?: string;
         defaultBranch?: string;
@@ -667,6 +692,7 @@ type CollabApiClient = {
     }>;
     syncLocalApp(appId: string, payload: {
         baseCommitHash: string;
+        baseRevisionId?: string | null;
         repoFingerprint?: string;
         remoteUrl?: string;
         defaultBranch?: string;

package/dist/errors.d.ts

@@ -2,10 +2,12 @@ declare class RemixError extends Error {
     readonly code: string | null;
     readonly exitCode: number;
     readonly hint: string | null;
+    readonly statusCode: number | null;
     constructor(message: string, opts?: {
         code?: string | null;
         exitCode?: number;
         hint?: string | null;
+        statusCode?: number | null;
     });
 }
 

package/dist/errors.js

@@ -4,7 +4,7 @@ import {
 } from "./chunk-GC2MOT3U.js";
 import {
   RemixError
-} from "./chunk-YZ34ICNN.js";
+} from "./chunk-7XJGOKEO.js";
 export {
   RemixError as CliError,
   REMIX_ERROR_CODES,

package/dist/history.d.ts

@@ -1,4 +1,4 @@
-import { T as TurnUsage } from './contracts-CHmD-fMj.js';
+import { T as TurnUsage } from './contracts-DnNP-K3V.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-CHmD-fMj.js';
+import './contracts-DnNP-K3V.js';

package/dist/index.js

@@ -1,24 +1,24 @@
 import {
   createApiClient
-} from "./chunk-US5SM7ZC.js";
+} from "./chunk-RCNOSZP6.js";
 import {
   createLocalSessionStore,
   createStoredSessionTokenProvider,
   createSupabaseAuthHelpers,
   shouldRefreshSoon,
   storedSessionSchema
-} from "./chunk-P6JHXOV4.js";
+} from "./chunk-XETDXVGM.js";
 import {
   configSchema,
   resolveConfig
-} from "./chunk-VM3CGCNX.js";
+} from "./chunk-XCZRNB35.js";
 import "./chunk-4OCNZHHR.js";
 import {
   REMIX_ERROR_CODES
 } from "./chunk-GC2MOT3U.js";
 import {
   RemixError
-} from "./chunk-YZ34ICNN.js";
+} from "./chunk-7XJGOKEO.js";
 export {
   RemixError as CliError,
   REMIX_ERROR_CODES,

package/dist/repo.js

@@ -28,9 +28,9 @@ import {
   requireCurrentBranch,
   summarizeUnifiedDiff,
   writeTempUnifiedDiffBackup
-} from "./chunk-WT6VRLXU.js";
+} from "./chunk-S4ECO35X.js";
 import "./chunk-GC2MOT3U.js";
-import "./chunk-YZ34ICNN.js";
+import "./chunk-7XJGOKEO.js";
 export {
   assertRepoSnapshotUnchanged,
   buildRepoFingerprint,

package/package.json

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

package/dist/chunk-YZ34ICNN.js

@@ -1,17 +0,0 @@
-// src/errors/cliError.ts
-var RemixError = class extends Error {
-  code;
-  exitCode;
-  hint;
-  constructor(message, opts) {
-    super(message);
-    this.name = "RemixError";
-    this.code = opts?.code ?? null;
-    this.exitCode = opts?.exitCode ?? 1;
-    this.hint = opts?.hint ?? null;
-  }
-};
-
-export {
-  RemixError
-};