@relayfile/sdk 0.10.36 → 0.10.38

package/dist/client.d.ts

@@ -1,4 +1,4 @@
-import { type AdminIngressStatusResponse, type AdminSyncStatusResponse, type BulkWriteInput, type BulkWriteResponse, type BackendStatusResponse, type AckResponse, type CommitForkInput, type CommitForkResponse, type AcceptDurableSubscriptionDeliveryInput, type CancelDurableResourceSubscriptionOptions, type ClaimDurableSubscriptionDeliveriesInput, type CreateOrRenewDurableResourceSubscriptionInput, type CreateForkInput, type DeleteFileInput, type DeadLetterItem, type DeadLetterFeedResponse, type DeleteWebhookOptions, type DiscardForkInput, type DurableResourceSubscription, type DurableResourceSubscriptionListResponse, type DurableSubscriptionDeliveryListResponse, type DurableSubscriptionDeliveryResponse, type EventFeedResponse, type ExportJsonResponse, type ExportOptions, type FileQueryResponse, type FileReadResponse, type FilesystemEvent, type GetEventsOptions, type GetAdminIngressStatusOptions, type GetAdminSyncStatusOptions, type GetOperationsOptions, type GetSyncDeadLettersOptions, type GetSyncIngressStatusOptions, type GetSyncStatusOptions, type GetWebhookDeadLettersOptions, type ListWebhooksOptions, type ListDurableResourceSubscriptionsOptions, type ListTreeOptions, type OperationFeedResponse, type OperationStatusResponse, type QueuedResponse, type ResourceAtEventResult, type ReadFileInput, type QueryFilesOptions, type RegisterWebhookInput, type RegisterWebhookResponse, type RelayFileReadCacheOptions, type Subscription, type SyncIngressStatusResponse, type SyncProviderStatus, type SyncStatusResponse, type TreeResponse, type WriteFileInput, type WriteQueuedResponse, type IngestWebhookInput, type WritebackItem, type WebhookDeliveryDeadLetterFeedResponse, type WebhookSubscription, type AckWritebackInput, type AckWritebackResponse, type SweepWritebackDraftsInput, type SweepWritebackDraftsResponse, type ChangeEvent, type ChangeLogQueryResult, type ChangeStreamConnection, type ChangeStreamConnectionOptions, type SubscribeOptions, type WaitForDataOptions } from "./types.js";
+import { type AdminIngressStatusResponse, type AdminSyncStatusResponse, type BulkWriteInput, type BulkWriteResponse, type BackendStatusResponse, type AckResponse, type CommitForkInput, type CommitForkResponse, type AcceptDurableSubscriptionDeliveryInput, type CancelDurableResourceSubscriptionOptions, type ClaimDurableSubscriptionDeliveriesInput, type CreateOrRenewDurableResourceSubscriptionInput, type CreateForkInput, type DeleteFileInput, type DeadLetterItem, type DeadLetterFeedResponse, type DeleteWebhookOptions, type DiscardForkInput, type DurableResourceSubscription, type DurableResourceSubscriptionListResponse, type DurableSubscriptionDeliveryListResponse, type DurableSubscriptionDeliveryResponse, type EventFeedResponse, type ExportJsonResponse, type ExportOptions, type FileQueryResponse, type FileReadResponse, type FilesystemEvent, type GetEventsOptions, type GetAdminIngressStatusOptions, type GetAdminSyncStatusOptions, type GetOperationsOptions, type GetSyncDeadLettersOptions, type GetSyncIngressStatusOptions, type GetSyncStatusOptions, type GetWebhookDeadLettersOptions, type ListWebhooksOptions, type ListDurableResourceSubscriptionsOptions, type ListTreeOptions, type MergeFileInput, type MergeFileResponse, type OperationFeedResponse, type OperationStatusResponse, type QueuedResponse, type ResourceAtEventResult, type ReadFileInput, type QueryFilesOptions, type RebaseForkInput, type RebaseForkResponse, type RegisterWebhookInput, type RegisterWebhookResponse, type RelayFileReadCacheOptions, type Subscription, type SyncIngressStatusResponse, type SyncProviderStatus, type SyncStatusResponse, type TreeResponse, type WriteFileInput, type WriteQueuedResponse, type IngestWebhookInput, type WritebackItem, type WebhookDeliveryDeadLetterFeedResponse, type WebhookSubscription, type AckWritebackInput, type AckWritebackResponse, type SweepWritebackDraftsInput, type SweepWritebackDraftsResponse, type ChangeEvent, type ChangeLogQueryResult, type ChangeStreamConnection, type ChangeStreamConnectionOptions, type SubscribeOptions, type WaitForDataOptions } from "./types.js";
 import type { ForkHandle } from "@relayfile/core";
 /**
  * Bearer token or token factory used for Relayfile API requests.
@@ -102,11 +102,13 @@ export declare class RelayFileClient {
     readFile(input: ReadFileInput): Promise<FileReadResponse>;
     queryFiles(workspaceId: string, options?: QueryFilesOptions): Promise<FileQueryResponse>;
     writeFile(input: WriteFileInput): Promise<WriteQueuedResponse>;
+    mergeFile(input: MergeFileInput): Promise<MergeFileResponse>;
     bulkWrite(input: BulkWriteInput): Promise<BulkWriteResponse>;
     deleteFile(input: DeleteFileInput): Promise<WriteQueuedResponse>;
     createFork(input: CreateForkInput): Promise<ForkHandle>;
     discardFork(input: DiscardForkInput): Promise<void>;
     commitFork(input: CommitForkInput): Promise<CommitForkResponse>;
+    rebaseFork(input: RebaseForkInput): Promise<RebaseForkResponse>;
     getEvents(workspaceId: string, options?: GetEventsOptions): Promise<EventFeedResponse>;
     createOrRenewDurableResourceSubscription(input: CreateOrRenewDurableResourceSubscriptionInput): Promise<DurableResourceSubscription>;
     listDurableResourceSubscriptions(workspaceId: string, options?: ListDurableResourceSubscriptionsOptions): Promise<DurableResourceSubscriptionListResponse>;

package/dist/client.js

@@ -1,5 +1,5 @@
 import { RelayFileSync, normalizeFilesystemEvent } from "./sync.js";
-import { InvalidStateError, PayloadTooLargeError, QueueFullError, RelayFileApiError, RevisionConflictError } from "./errors.js";
+import { InvalidStateError, MergeConflictError, ParentMovedError, PayloadTooLargeError, QueueFullError, RelayFileApiError, RevisionConflictError } from "./errors.js";
 /** Default base URL for the hosted Relayfile API */
 export const DEFAULT_RELAYFILE_BASE_URL = "https://api.relayfile.dev";
 const DEFAULT_RETRY_OPTIONS = {
@@ -1270,6 +1270,33 @@ export class RelayFileClient {
             cache.evict(workspaceId, path);
         return result;
     }
+    async mergeFile(input) {
+        const query = buildQuery({ path: input.path });
+        const result = await this.request({
+            method: "POST",
+            path: `/v1/workspaces/${encodeURIComponent(input.workspaceId)}/fs/merge${query}`,
+            correlationId: input.correlationId,
+            body: {
+                strategy: input.strategy,
+                content: input.content,
+                baseRevision: input.baseRevision,
+                baseContent: input.baseContent,
+                // Default per-strategy: go-top-level-functions-v1 is Go-only, so
+                // existing callers that omit contentType must keep getting
+                // "text/x-go" (changing this would silently rewrite their file's
+                // stored content type and provider-writeback metadata on every
+                // merge). three-way-lines-v1 has no language restriction, so
+                // "text/plain" is the right neutral default there.
+                contentType: input.contentType ?? (input.strategy === "go-top-level-functions-v1" ? "text/x-go" : "text/plain"),
+                contentIdentity: input.contentIdentity
+            },
+            signal: input.signal
+        });
+        const cache = getFileReadCache(this);
+        if (cache !== false)
+            cache.evict(input.workspaceId, input.path);
+        return result;
+    }
     async bulkWrite(input) {
         const query = buildQuery({ forkId: input.forkId });
         const response = await this.performRequest({
@@ -1337,6 +1364,14 @@ export class RelayFileClient {
             signal: input.signal
         });
     }
+    async rebaseFork(input) {
+        return this.request({
+            method: "POST",
+            path: `/v1/workspaces/${encodeURIComponent(input.workspaceId)}/forks/${encodeURIComponent(input.forkId)}/rebase`,
+            correlationId: input.correlationId,
+            signal: input.signal
+        });
+    }
     async getEvents(workspaceId, options = {}) {
         const query = buildQuery({
             provider: options.provider,
@@ -2101,6 +2136,26 @@ export class RelayFileClient {
         const rawData = (payload ?? {});
         const data = rawData;
         const details = normalizeErrorDetails(rawData, data.details);
+        if (status === 409 && data.code === "merge_conflict") {
+            const currentRevision = typeof data.currentRevision === "string"
+                ? data.currentRevision
+                : typeof details?.currentRevision === "string"
+                    ? details.currentRevision
+                    : "";
+            const conflicts = Array.isArray(data.conflicts)
+                ? data.conflicts
+                : Array.isArray(details?.conflicts)
+                    ? details.conflicts
+                    : [];
+            throw new MergeConflictError(status, {
+                code: data.code,
+                message: data.message ?? "Merge conflict",
+                correlationId: data.correlationId,
+                details,
+                currentRevision,
+                conflicts
+            });
+        }
         if (status === 409 &&
             typeof data.expectedRevision === "string" &&
             typeof data.currentRevision === "string") {
@@ -2122,6 +2177,20 @@ export class RelayFileClient {
                 details
             });
         }
+        if (status === 409 && data.code === "parent_moved") {
+            const currentRevision = typeof data.currentRevision === "string"
+                ? data.currentRevision
+                : typeof details?.currentRevision === "string"
+                    ? details.currentRevision
+                    : "";
+            throw new ParentMovedError(status, {
+                code: data.code,
+                message: data.message ?? "Parent moved",
+                correlationId: data.correlationId,
+                details,
+                currentRevision
+            });
+        }
         if (status === 429 && data.code === "queue_full") {
             const retryAfterRaw = headers.get("retry-after");
             let retryAfterSeconds;
@@ -2146,6 +2215,14 @@ export class RelayFileClient {
                 details
             });
         }
+        if (data.code === "merge_base_unavailable" || data.code === "merge_ineligible") {
+            throw new RelayFileApiError(status, {
+                code: data.code,
+                message: data.message ?? (data.code === "merge_base_unavailable" ? "Merge base unavailable" : "Merge ineligible"),
+                correlationId: data.correlationId,
+                details
+            });
+        }
         throw new RelayFileApiError(status, {
             code: data.code ?? "api_error",
             message: data.message ?? `HTTP ${status}`,

package/dist/errors.d.ts

@@ -1,4 +1,4 @@
-import type { ConflictErrorResponse, ErrorResponse } from "./types.js";
+import type { ConflictErrorResponse, ErrorResponse, MergeConflictDetail } from "./types.js";
 export declare class RelayFileApiError extends Error {
     readonly status: number;
     readonly code: string;
@@ -12,6 +12,20 @@ export declare class RevisionConflictError extends RelayFileApiError {
     readonly currentContentPreview?: string;
     constructor(status: number, payload: ConflictErrorResponse);
 }
+export declare class ParentMovedError extends RelayFileApiError {
+    readonly currentRevision: string;
+    constructor(status: number, payload: Partial<ErrorResponse> & {
+        currentRevision: string;
+    });
+}
+export declare class MergeConflictError extends RelayFileApiError {
+    readonly currentRevision: string;
+    readonly conflicts: MergeConflictDetail[];
+    constructor(status: number, payload: Partial<ErrorResponse> & {
+        currentRevision: string;
+        conflicts: MergeConflictDetail[];
+    });
+}
 export declare class QueueFullError extends RelayFileApiError {
     readonly retryAfterSeconds?: number;
     constructor(status: number, payload?: Partial<ErrorResponse>, retryAfterSeconds?: number);

package/dist/errors.js

@@ -24,6 +24,24 @@ export class RevisionConflictError extends RelayFileApiError {
         this.currentContentPreview = payload.currentContentPreview;
     }
 }
+export class ParentMovedError extends RelayFileApiError {
+    currentRevision;
+    constructor(status, payload) {
+        super(status, payload);
+        this.name = "ParentMovedError";
+        this.currentRevision = payload.currentRevision;
+    }
+}
+export class MergeConflictError extends RelayFileApiError {
+    currentRevision;
+    conflicts;
+    constructor(status, payload) {
+        super(status, payload);
+        this.name = "MergeConflictError";
+        this.currentRevision = payload.currentRevision;
+        this.conflicts = payload.conflicts;
+    }
+}
 export class QueueFullError extends RelayFileApiError {
     retryAfterSeconds;
     constructor(status, payload = {}, retryAfterSeconds) {

package/dist/index.d.ts

@@ -6,14 +6,14 @@ export { CloudAbortError, CloudApiError, CloudTimeoutError, InvalidLocalDirError
 export { type EnsureMountedWorkspaceInput, WORKSPACE_INTEGRATION_PROVIDERS, type AgentWorkspaceInvite, type AgentWorkspaceInviteOptions, type AgentWorkspaceScopedInviteOptions, type ConnectIntegrationOptions, type ConnectIntegrationResult, type CreateWorkspaceOptions, type JoinWorkspaceOptions, type MountLauncher, type MountLauncherEvent, type MountLauncherInstance, type MountLauncherStart, type MountLocalLayout, type MountMode, type MountSessionRequest, type MountSessionResponse, type MountSessionResult, type MountSyncMode, type MountSupervisorEvent, type MountedWorkspaceHandle, type MountedWorkspaceStatus, type MountWorkspaceInput, type ReadMountedWorkspaceStatusInput, type RelayfileSetupOptions, type RelayfileSetupRetryOptions, type WaitForConnectionOptions, type WorkspaceInfo, type WorkspaceIntegrationProvider, type WorkspaceMountEnv, type WorkspaceMountEnvOptions, type WorkspacePermissions } from "./setup-types.js";
 export { RelayFileSync, type RelayFileSyncOptions, type RelayFileSyncPong, type RelayFileSyncReconnectOptions, type RelayFileSyncSocket, type RelayFileSyncStart, type RelayFileSyncState, type RelayFileSyncTokenProvider } from "./sync.js";
 export { onWrite, pathMatches, type OnWriteClient, type OnWriteHandler, type OnWriteHandlerError, type OnWriteOptions } from "./onWrite.js";
-export { InvalidStateError, PayloadTooLargeError, QueueFullError, RelayFileApiError, RevisionConflictError } from "./errors.js";
+export { InvalidStateError, MergeConflictError, ParentMovedError, PayloadTooLargeError, QueueFullError, RelayFileApiError, RevisionConflictError } from "./errors.js";
 export { IntegrationProvider, computeCanonicalPath } from "./provider.js";
 export type { WebhookInput, ListProviderFilesOptions, WatchProviderEventsOptions } from "./provider.js";
 export type { ConnectCapableProvider, ConnectConnectionStatus, ConnectSession, ConnectionProvider, CreateConnectSessionInput, GetConnectConnectionStatusInput, NormalizedWebhook, ProviderConfigKeyMap, ProxyHeaders, ProxyMethod, ProxyQuery, ProxyRequest, ProxyResponse, } from "./connection.js";
 export { supportsConnect } from "./connection.js";
 export { SelfHostConnect } from "./self-host-connect.js";
 export type { SelfHostConnectOptions, SelfHostConnectResult, StartSelfHostConnectOptions, WaitForSelfHostConnectionOptions } from "./self-host-connect.js";
-export type { AckResponse, AcceptDurableSubscriptionDeliveryInput, AckWritebackInput, AckWritebackDraftDisposition, AckWritebackResponse, AdminIngressAlert, AdminIngressAlertProfile, AdminIngressEffectiveAlertProfile, AdminIngressAlertSeverity, AdminIngressAlertThresholds, AdminIngressAlertTotals, AdminIngressAlertType, AdminIngressStatusResponse, AdminSyncAlert, AdminSyncAlertSeverity, AdminSyncAlertThresholds, AdminSyncAlertTotals, AdminSyncAlertType, AdminSyncStatusResponse, BackendStatusResponse, BulkWriteFile, BulkWriteInput, BulkWriteResponse, CancelDurableResourceSubscriptionOptions, ChangeLogQueryResult, ChangeEvent, ChangeEventActor, ChangeEventResource, ChangeEventSummary, ChangeStreamConnection, ChangeStreamConnectionOptions, ClaimDurableSubscriptionDeliveriesInput, CommitForkInput, CommitForkResponse, ConflictErrorResponse, CreateOrRenewDurableResourceSubscriptionInput, CreateForkInput, ContentIdentity, DeleteFileInput, DeleteWebhookOptions, DeadLetterFeedResponse, DeadLetterItem, DigestBullet, DigestContext, DigestHandler, DigestSection, DigestWindow, DiscardForkInput, DurableResourceSubscription, DurableResourceSubscriptionListResponse, DurableResourceSubscriptionStatus, DurableSubscriptionDelivery, DurableSubscriptionDeliveryListResponse, DurableSubscriptionDeliveryResponse, DurableSubscriptionDeliveryStatus, DurableSubscriptionEvent, ErrorResponse, EventSummary, EventFeedResponse, ExportFormat, ExportJsonResponse, ExportOptions, FileQueryItem, FileQueryResponse, FileReadResponse, FileSemantics, FileWriteRequest, FilesystemEvent, FilesystemEventType, EventOrigin, Expansion, ExpansionLevel, GetEventsOptions, GetAdminSyncStatusOptions, GetAdminIngressStatusOptions, GetOperationsOptions, GetSyncDeadLettersOptions, GetSyncIngressStatusOptions, GetSyncStatusOptions, WaitForDataOptions, GetWebhookDeadLettersOptions, IngestWebhookInput, LayoutManifest, LayoutManifestAlias, LayoutManifestResource, ListWebhooksOptions, ListDurableResourceSubscriptionsOptions, ListTreeOptions, OperationFeedResponse, OperationStatus, OperationStatusResponse, QueuedResponse, QueryFilesOptions, ReadFileInput, RegisterWebhookInput, RegisterWebhookResponse, ReplayOptions, ResourceAtEventResult, SummaryExpansion, FullExpansion, DiffExpansion, ThreadExpansion, RelayFileJwtClaims, SubscribeOptions, Subscription, SyncIngressStatusResponse, SyncProviderStatus, SyncProviderStatusState, SyncRefreshRequest, SyncStatusResponse, SweepWritebackDraftsInput, SweepWritebackDraftsResponse, TreeEntry, TreeResponse, WebhookDeliveryDeadLetterFeedResponse, WebhookDeliveryDeadLetterItem, WebhookSubscription, WebhookSubscriptionHealth, WritebackActionType, WritebackDeadLetterError, WritebackDeadLetterErrorCode, WritebackListState, WritebackState, WritebackItem, WritebackItemDetail, WritebackSchemaRef, WriteFileInput, WriteQueuedResponse } from "./types.js";
+export type { AckResponse, AcceptDurableSubscriptionDeliveryInput, AckWritebackInput, AckWritebackDraftDisposition, AckWritebackResponse, AdminIngressAlert, AdminIngressAlertProfile, AdminIngressEffectiveAlertProfile, AdminIngressAlertSeverity, AdminIngressAlertThresholds, AdminIngressAlertTotals, AdminIngressAlertType, AdminIngressStatusResponse, AdminSyncAlert, AdminSyncAlertSeverity, AdminSyncAlertThresholds, AdminSyncAlertTotals, AdminSyncAlertType, AdminSyncStatusResponse, BackendStatusResponse, BulkWriteFile, BulkWriteInput, BulkWriteResponse, CancelDurableResourceSubscriptionOptions, ChangeLogQueryResult, ChangeEvent, ChangeEventActor, ChangeEventResource, ChangeEventSummary, ChangeStreamConnection, ChangeStreamConnectionOptions, ClaimDurableSubscriptionDeliveriesInput, CommitForkInput, CommitForkResponse, ConflictErrorResponse, CreateOrRenewDurableResourceSubscriptionInput, CreateForkInput, ContentIdentity, DeleteFileInput, DeleteWebhookOptions, DeadLetterFeedResponse, DeadLetterItem, DigestBullet, DigestContext, DigestHandler, DigestSection, DigestWindow, DiscardForkInput, DurableResourceSubscription, DurableResourceSubscriptionListResponse, DurableResourceSubscriptionStatus, DurableSubscriptionDelivery, DurableSubscriptionDeliveryListResponse, DurableSubscriptionDeliveryResponse, DurableSubscriptionDeliveryStatus, DurableSubscriptionEvent, ErrorResponse, EventSummary, EventFeedResponse, ExportFormat, ExportJsonResponse, ExportOptions, FileQueryItem, FileQueryResponse, FileReadResponse, FileSemantics, FileWriteRequest, FilesystemEvent, FilesystemEventType, EventOrigin, Expansion, ExpansionLevel, GetEventsOptions, GetAdminSyncStatusOptions, GetAdminIngressStatusOptions, GetOperationsOptions, GetSyncDeadLettersOptions, GetSyncIngressStatusOptions, GetSyncStatusOptions, WaitForDataOptions, GetWebhookDeadLettersOptions, IngestWebhookInput, LayoutManifest, LayoutManifestAlias, LayoutManifestResource, ListWebhooksOptions, ListDurableResourceSubscriptionsOptions, ListTreeOptions, MergeConflictDetail, MergeFileInput, MergeFileResponse, OperationFeedResponse, OperationStatus, OperationStatusResponse, QueuedResponse, QueryFilesOptions, RebaseConflict, RebaseForkInput, RebaseForkResponse, ReadFileInput, RegisterWebhookInput, RegisterWebhookResponse, ReplayOptions, ResourceAtEventResult, SummaryExpansion, FullExpansion, DiffExpansion, ThreadExpansion, RelayFileJwtClaims, SubscribeOptions, Subscription, SyncIngressStatusResponse, SyncProviderStatus, SyncProviderStatusState, SyncRefreshRequest, SyncStatusResponse, SweepWritebackDraftsInput, SweepWritebackDraftsResponse, TreeEntry, TreeResponse, WebhookDeliveryDeadLetterFeedResponse, WebhookDeliveryDeadLetterItem, WebhookSubscription, WebhookSubscriptionHealth, WritebackActionType, WritebackDeadLetterError, WritebackDeadLetterErrorCode, WritebackListState, WritebackState, WritebackItem, WritebackItemDetail, WritebackSchemaRef, WriteFileInput, WriteQueuedResponse } from "./types.js";
 export type { ForkHandle, ForkOptions } from "@relayfile/core";
 export type { WriteEvent, WriteEventActor, WriteEventOperation, WriteEventSource } from "@relayfile/core";
 export { WritebackConsumer } from "./writeback-consumer.js";

package/dist/index.js

@@ -4,7 +4,7 @@ export { CloudAbortError, CloudApiError, CloudTimeoutError, InvalidLocalDirError
 export { WORKSPACE_INTEGRATION_PROVIDERS } from "./setup-types.js";
 export { RelayFileSync } from "./sync.js";
 export { onWrite, pathMatches } from "./onWrite.js";
-export { InvalidStateError, PayloadTooLargeError, QueueFullError, RelayFileApiError, RevisionConflictError } from "./errors.js";
+export { InvalidStateError, MergeConflictError, ParentMovedError, PayloadTooLargeError, QueueFullError, RelayFileApiError, RevisionConflictError } from "./errors.js";
 // Integration providers
 export { IntegrationProvider, computeCanonicalPath } from "./provider.js";
 export { supportsConnect } from "./connection.js";

package/dist/types.d.ts

@@ -86,6 +86,13 @@ export interface BulkWriteFile {
     content: string;
     encoding?: "utf-8" | "base64";
     contentIdentity?: ContentIdentity;
+    /**
+     * Optional per-file optimistic-concurrency precondition, same semantics
+     * as the single-file write's If-Match header: "0" or "*" to create only
+     * if the path is absent, an exact revision to require an unchanged base,
+     * "*" to force. Omitted means no check (unconditional overwrite).
+     */
+    ifMatch?: string;
 }
 export interface BulkWriteInput {
     workspaceId: string;
@@ -101,6 +108,10 @@ export interface BulkWriteResponse {
         path: string;
         code: string;
         message: string;
+        /** Present when code is "conflict" — the ifMatch value that was sent. */
+        expectedRevision?: string;
+        /** Present when code is "conflict" and the path exists — the file's actual current revision. */
+        currentRevision?: string;
     }>;
     results?: Array<{
         path: string;
@@ -792,6 +803,31 @@ export interface WriteFileInput {
     correlationId?: string;
     signal?: AbortSignal;
 }
+export interface MergeFileInput {
+    workspaceId: string;
+    path: string;
+    strategy: "go-top-level-functions-v1" | "three-way-lines-v1";
+    content: string;
+    baseRevision: string;
+    baseContent: string;
+    contentType?: string;
+    contentIdentity?: ContentIdentity;
+    correlationId?: string;
+    signal?: AbortSignal;
+}
+export interface MergeFileResponse {
+    targetRevision: string;
+    strategy: "go-top-level-functions-v1" | "three-way-lines-v1";
+    baseRevision: string;
+    mergedAgainstRevision: string;
+}
+export interface MergeConflictDetail {
+    unit: string;
+    reason: string;
+    base?: string;
+    mine?: string;
+    theirs?: string;
+}
 export interface DeleteFileInput {
     workspaceId: string;
     path: string;
@@ -824,6 +860,24 @@ export interface CommitForkResponse {
     writtenCount: number;
     deletedCount: number;
 }
+export interface RebaseForkInput {
+    workspaceId: string;
+    forkId: string;
+    correlationId?: string;
+    signal?: AbortSignal;
+}
+export interface RebaseConflict {
+    path: string;
+    forkType: "write" | "delete";
+    liveExists: boolean;
+    liveRevision: string;
+    liveContentPreview?: string;
+}
+export interface RebaseForkResponse {
+    parentRevision: string;
+    cleanCount: number;
+    conflicts: RebaseConflict[];
+}
 export interface IngestWebhookInput {
     workspaceId: string;
     provider: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@relayfile/sdk",
-  "version": "0.10.36",
+  "version": "0.10.38",
   "description": "TypeScript SDK for relayfile — real-time filesystem for humans and agents",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -59,15 +59,15 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@relayfile/core": "0.10.36",
+    "@relayfile/core": "0.10.38",
     "ignore": "^7.0.5",
     "tar": "^7.5.10"
   },
   "optionalDependencies": {
-    "@relayfile/mount-darwin-arm64": "0.10.36",
-    "@relayfile/mount-darwin-x64": "0.10.36",
-    "@relayfile/mount-linux-arm64": "0.10.36",
-    "@relayfile/mount-linux-x64": "0.10.36"
+    "@relayfile/mount-darwin-arm64": "0.10.38",
+    "@relayfile/mount-darwin-x64": "0.10.38",
+    "@relayfile/mount-linux-arm64": "0.10.38",
+    "@relayfile/mount-linux-x64": "0.10.38"
   },
   "devDependencies": {
     "typescript": "^5.7.3",