@remixhq/core 0.1.17 → 0.1.18

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-CHmD-fMj.js';
+import { T as TurnUsage } from './contracts-DnNP-K3V.js';
 import 'zod';
 
 type HistoryImportProvider = "claude_code" | "cursor";
@@ -109,6 +109,8 @@ type MergeRequestReview = {
         commitId: string | null;
         baseCommitHash: string | null;
         headCommitHash: string | null;
+        baseRevisionId: string | null;
+        resultRevisionId: string | null;
         changedFilesCount: number | null;
         insertions: number | null;
         deletions: number | null;
@@ -507,6 +509,8 @@ type ApiClient = {
     getAppDelta(appId: string, payload: {
         baseHeadHash: string;
         targetHeadHash?: string;
+        baseRevisionId?: string | null;
+        targetRevisionId?: string | null;
         localSnapshotHash?: string;
         repoFingerprint?: string;
         remoteUrl?: string;
@@ -525,6 +529,7 @@ type ApiClient = {
         diff: string;
         baseCommitHash?: string | null;
         headCommitHash?: string | null;
+        baseRevisionId?: string | null;
         changedFilesCount?: number;
         insertions?: number;
         deletions?: number;
@@ -543,6 +548,8 @@ type ApiClient = {
         diff: string;
         baseCommitHash: string;
         targetHeadCommitHash: string;
+        baseRevisionId?: string | null;
+        targetRevisionId?: string | null;
         expectedPaths: string[];
         actor?: {
             type?: string;
@@ -684,6 +691,9 @@ type ApiClient = {
     syncUpstreamApp(appId: string): Promise<Json>;
     preflightAppReconcile(appId: string, payload: {
         localHeadCommitHash: string;
+        baseRevisionId?: string | null;
+        localRevisionId?: string | null;
+        targetRevisionId?: string | null;
         repoFingerprint?: string;
         remoteUrl?: string;
         defaultBranch?: string;
@@ -691,6 +701,9 @@ type ApiClient = {
     startAppReconcile(appId: string, payload: {
         uploadId: string;
         localHeadCommitHash: string;
+        baseRevisionId?: string | null;
+        localRevisionId?: string | null;
+        targetRevisionId?: string | null;
         repoFingerprint?: string;
         remoteUrl?: string;
         defaultBranch?: string;
@@ -704,6 +717,7 @@ type ApiClient = {
     }>;
     syncLocalApp(appId: string, payload: {
         baseCommitHash: string;
+        baseRevisionId?: string | null;
         repoFingerprint?: string;
         remoteUrl?: string;
         defaultBranch?: string;
@@ -739,6 +753,20 @@ type ApiClient = {
 declare function createApiClient(config: CoreConfig, opts?: {
     apiKey?: string | null;
     tokenProvider?: TokenProvider;
+    /**
+     * Per-request wall-clock budget applied to every call this client makes.
+     * When the deadline elapses the underlying fetch is aborted via
+     * `AbortSignal.timeout`, which surfaces as an `AbortError`/`TimeoutError`
+     * in the caller's catch block.
+     *
+     * Default: undefined (no timeout — same behavior as before this option
+     * existed). Long-tail callers like bundle uploads/downloads or history
+     * imports legitimately take longer than any reasonable hook budget, so
+     * we only opt-in for short-lived flows that have explicit recovery
+     * paths (e.g. plugin Stop hooks, where exceeding the budget triggers
+     * a deferred-turn defer + drainer retry).
+     */
+    defaultRequestTimeoutMs?: number;
 }): ApiClient;
 
 export { type AgentMemoryItem, type AgentMemoryKind, type AgentMemorySearchItem, type AgentMemorySearchResponse, type AgentMemorySummary, type AgentMemoryTimelineResponse, type ApiClient, type AppContext, type AppContextAccessPath, type AppReconcileResponse, type Bundle, type BundlePlatform, type BundleStatus, type ChangeStepDiffResponse, type HistoricalTurnRecord, type HistoryImportCaptureSource, type HistoryImportProvider, type HistoryImportRecordMetadata, type HistoryImportWorkspaceMetadata, type ImportHistoryRecordOutcome, type ImportHistoryRequest, type ImportHistoryResponse, type InitiateBundleRequest, type InvitationRecord, type MergeRequest, type MergeRequestReview, type MergeRequestStatus, type ReconcilePreflightResponse, type SyncLocalResponse, type SyncUpstreamResponse, createApiClient };

package/dist/api.js

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

package/dist/auth.js

@@ -4,8 +4,8 @@ import {
   createSupabaseAuthHelpers,
   shouldRefreshSoon,
   storedSessionSchema
-} from "./chunk-P6JHXOV4.js";
-import "./chunk-YZ34ICNN.js";
+} from "./chunk-XETDXVGM.js";
+import "./chunk-7XJGOKEO.js";
 export {
   createLocalSessionStore,
   createStoredSessionTokenProvider,

package/dist/binding.js

@@ -3,10 +3,10 @@ import {
   readCollabBinding,
   readCollabBindingState,
   writeCollabBinding
-} from "./chunk-YCFLOHJV.js";
-import "./chunk-WT6VRLXU.js";
+} from "./chunk-DBVN42RF.js";
+import "./chunk-S4ECO35X.js";
 import "./chunk-GC2MOT3U.js";
-import "./chunk-YZ34ICNN.js";
+import "./chunk-7XJGOKEO.js";
 export {
   getCollabBindingPath,
   readCollabBinding,

package/dist/chunk-7XJGOKEO.js

@@ -0,0 +1,23 @@
+// src/errors/cliError.ts
+var RemixError = class extends Error {
+  code;
+  exitCode;
+  hint;
+  // HTTP status code when this error originates from an API response.
+  // null for non-HTTP errors (validation, local IO, programming bugs).
+  // Callers use this to distinguish transient (5xx) from permanent (4xx)
+  // API failures without resorting to error-message string matching.
+  statusCode;
+  constructor(message, opts) {
+    super(message);
+    this.name = "RemixError";
+    this.code = opts?.code ?? null;
+    this.exitCode = opts?.exitCode ?? 1;
+    this.hint = opts?.hint ?? null;
+    this.statusCode = opts?.statusCode ?? null;
+  }
+};
+
+export {
+  RemixError
+};

package/dist/{chunk-YCFLOHJV.js → chunk-DBVN42RF.js}

@@ -1,9 +1,9 @@
 import {
   getCurrentBranch
-} from "./chunk-WT6VRLXU.js";
+} from "./chunk-S4ECO35X.js";
 import {
   RemixError
-} from "./chunk-YZ34ICNN.js";
+} from "./chunk-7XJGOKEO.js";
 
 // src/infrastructure/binding/collabBindingStore.ts
 import fs2 from "fs/promises";

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

@@ -1,6 +1,6 @@
 import {
   RemixError
-} from "./chunk-YZ34ICNN.js";
+} from "./chunk-7XJGOKEO.js";
 
 // src/api/client.ts
 async function readJsonSafe(res) {
@@ -15,8 +15,13 @@ async function readJsonSafe(res) {
 function createApiClient(config, opts) {
   const apiKey = (opts?.apiKey ?? "").trim();
   const tokenProvider = opts?.tokenProvider;
+  const defaultTimeoutMs = typeof opts?.defaultRequestTimeoutMs === "number" && opts.defaultRequestTimeoutMs > 0 ? opts.defaultRequestTimeoutMs : null;
   const CLIENT_KEY_HEADER = "x-comerge-api-key";
-  async function request(path, init) {
+  function makeTimeoutSignal(timeoutMs) {
+    const ms = typeof timeoutMs === "number" && timeoutMs > 0 ? timeoutMs : defaultTimeoutMs;
+    return ms != null ? AbortSignal.timeout(ms) : void 0;
+  }
+  async function request(path, init, opts2) {
     if (!tokenProvider) {
       throw new RemixError("API client is missing a token provider.", {
         exitCode: 1,
@@ -27,6 +32,7 @@ function createApiClient(config, opts) {
     const url = new URL(path, config.apiUrl).toString();
     const doFetch = async (bearer) => fetch(url, {
       ...init,
+      signal: makeTimeoutSignal(opts2?.timeoutMs),
       headers: {
         Accept: "application/json",
         "Content-Type": "application/json",
@@ -43,12 +49,16 @@ function createApiClient(config, opts) {
     if (!res.ok) {
       const body = await readJsonSafe(res);
       const msg = (body && typeof body === "object" && body && "message" in body && typeof body.message === "string" ? body.message : null) ?? `Request failed (status ${res.status})`;
-      throw new RemixError(msg, { exitCode: 1, hint: body ? JSON.stringify(body, null, 2) : null });
+      throw new RemixError(msg, {
+        exitCode: 1,
+        hint: body ? JSON.stringify(body, null, 2) : null,
+        statusCode: res.status
+      });
     }
     const json = await readJsonSafe(res);
     return json ?? null;
   }
-  async function requestBinary(path, init) {
+  async function requestBinary(path, init, opts2) {
     if (!tokenProvider) {
       throw new RemixError("API client is missing a token provider.", {
         exitCode: 1,
@@ -59,6 +69,7 @@ function createApiClient(config, opts) {
     const url = new URL(path, config.apiUrl).toString();
     const doFetch = async (bearer) => fetch(url, {
       ...init,
+      signal: makeTimeoutSignal(opts2?.timeoutMs),
       headers: {
         Accept: "*/*",
         ...init?.headers ?? {},
@@ -74,7 +85,11 @@ function createApiClient(config, opts) {
     if (!res.ok) {
       const body = await readJsonSafe(res);
       const msg = (body && typeof body === "object" && body && "message" in body && typeof body.message === "string" ? body.message : null) ?? `Request failed (status ${res.status})`;
-      throw new RemixError(msg, { exitCode: 1, hint: body ? JSON.stringify(body, null, 2) : null });
+      throw new RemixError(msg, {
+        exitCode: 1,
+        hint: body ? JSON.stringify(body, null, 2) : null,
+        statusCode: res.status
+      });
     }
     const contentDisposition = res.headers.get("content-disposition") ?? "";
     const fileNameMatch = contentDisposition.match(/filename=\"([^\"]+)\"/i);

package/dist/{chunk-WT6VRLXU.js → chunk-S4ECO35X.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-GC2MOT3U.js";
 import {
   RemixError
-} from "./chunk-YZ34ICNN.js";
+} from "./chunk-7XJGOKEO.js";
 
 // src/infrastructure/repo/gitRepo.ts
 import fs from "fs/promises";

package/dist/{chunk-VM3CGCNX.js → chunk-XCZRNB35.js}

@@ -1,6 +1,6 @@
 import {
   RemixError
-} from "./chunk-YZ34ICNN.js";
+} from "./chunk-7XJGOKEO.js";
 
 // src/config/model.ts
 import { z } from "zod";

package/dist/{chunk-P6JHXOV4.js → chunk-XETDXVGM.js}

@@ -1,6 +1,6 @@
 import {
   RemixError
-} from "./chunk-YZ34ICNN.js";
+} from "./chunk-7XJGOKEO.js";
 
 // src/auth/session.ts
 import { z } from "zod";

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-CHmD-fMj.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-CHmD-fMj.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-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 { B as BranchBindingMode } from './binding-WiIRI2fl.js';
 
 declare function collabFinalizeTurn(params: {
@@ -45,7 +45,7 @@ declare function collabFinalizeTurn(params: {
     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"];
+declare const FINALIZE_PREFLIGHT_FAILURE_CODES: readonly ["not_bound", "branch_binding_missing", "family_ambiguous", "metadata_conflict", "branch_mismatch", "missing_head", "remote_error", "pull_required", "reconcile_required", "baseline_missing"];
 type FinalizePreflightFailureCode = (typeof FINALIZE_PREFLIGHT_FAILURE_CODES)[number];
 declare function isFinalizePreflightFailureCode(value: unknown): value is FinalizePreflightFailureCode;
 
@@ -129,7 +129,7 @@ declare function collabUpdateMemberRole(params: {
     member: CollabMember;
 }>;
 
-type InitBaselineStatus = "seeded" | "existing" | "requires_re_anchor" | "requires_sync";
+type InitBaselineStatus = "seeded" | "existing" | "baseline_missing" | "requires_sync";
 type CollabInitQueuedResult = {
     queued: true;
     jobId: string;
@@ -271,90 +271,6 @@ declare function collabList(params: {
     };
 }>;
 
-declare function collabReAnchor(params: {
-    api: CollabApiClient;
-    cwd: string;
-    dryRun?: boolean;
-    allowBranchMismatch?: boolean;
-    asyncSubmit?: boolean;
-}): Promise<{
-    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;
-    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: "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;
-    targetHeadCommitHash: string;
-    warnings: string[];
-    dryRun: boolean;
-    applied: boolean;
-}>;
-
 declare function collabReconcile(params: {
     api: CollabApiClient;
     cwd: string;
@@ -372,41 +288,6 @@ declare function collabReconcile(params: {
     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;
-    targetHeadCommitHash: string;
-    warnings: string[];
-    dryRun: boolean;
-    applied: boolean;
 } | {
     status: string;
     repoRoot: string;
@@ -528,6 +409,7 @@ type PendingFinalizeJob = {
     prompt: string;
     assistantResponse: string;
     baselineSnapshotId: string | null;
+    baselineServerRevisionId: string | null;
     baselineServerHeadHash: string | null;
     currentSnapshotId: string;
     capturedAt: string;
@@ -584,9 +466,6 @@ type ProcessOutcome = {
 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;
@@ -697,4 +576,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, 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 };
+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 };