@remixhq/core 0.1.13 → 0.1.15

package/dist/api.d.ts

@@ -1,7 +1,76 @@
 import { CoreConfig } from './config.js';
 import { T as TokenProvider } from './tokenProvider-BWTusyj4.js';
+import { T as TurnUsage } from './contracts-CHmD-fMj.js';
 import 'zod';
 
+type HistoryImportProvider = "claude_code" | "cursor";
+type HistoryImportCaptureSource = "claude_local_v1" | "cursor_local_v1" | "cursor_local_v1_drift";
+type HistoryImportRecordMetadata = {
+    importBatchId: string;
+    importerVersion: string;
+    scannerSchemaFingerprint?: string;
+    rawCwd?: string;
+    driftDetected?: boolean;
+};
+type HistoryImportWorkspaceMetadata = {
+    turnUsage: TurnUsage;
+    branch?: string;
+} & Record<string, unknown>;
+type HistoricalTurnRecord = {
+    provider: HistoryImportProvider;
+    providerSessionId: string | null;
+    providerTurnId: string;
+    repoFingerprint: string;
+    captureSource: HistoryImportCaptureSource;
+    occurredAt: string;
+    promptText: string | null;
+    assistantText?: string | null;
+    workspaceMetadata: HistoryImportWorkspaceMetadata;
+    metadata: HistoryImportRecordMetadata;
+    dedupKey: string;
+};
+type ImportHistoryRequest = {
+    records: HistoricalTurnRecord[];
+};
+type ImportHistoryRecordOutcome = {
+    ok: true;
+    outcome: "inserted";
+    historicalRepoTurnId: string;
+} | {
+    ok: true;
+    outcome: "skipped_duplicate";
+} | {
+    ok: false;
+    outcome: "validation_failed";
+    reason: string;
+} | {
+    ok: false;
+    outcome: "dedup_key_mismatch";
+    expected: string;
+} | {
+    ok: false;
+    outcome: "insert_failed";
+    reason: string;
+};
+type ImportHistoryResponse = {
+    importBatchId: string;
+    processed: number;
+    inserted: number;
+    skipped: number;
+    failed: number;
+    perRepo: Array<{
+        repoFingerprint: string;
+        inserted: number;
+        skipped: number;
+        failed: number;
+    }>;
+    failures: Array<{
+        dedupKey: string;
+        outcome: Exclude<ImportHistoryRecordOutcome["outcome"], "inserted" | "skipped_duplicate">;
+        reason: string;
+    }>;
+};
+
 type Json = Record<string, unknown> | unknown[] | string | number | boolean | null;
 type MergeRequestStatus = "open" | "approved" | "rejected" | "merged" | "closed";
 type MergeRequest = {
@@ -413,6 +482,7 @@ type ApiClient = {
         defaultBranch?: string;
         repoFingerprint?: string;
         headCommitHash?: string;
+        forceNew?: boolean;
     }): Promise<Json>;
     importFromGithubFirstParty(payload: {
         repoFullName: string;
@@ -499,6 +569,10 @@ type ApiClient = {
         workspaceMetadata?: Record<string, unknown>;
         idempotencyKey?: string;
     }): Promise<Json>;
+    attachCollabTurnUsage(appId: string, payload: {
+        prompt: string;
+        workspaceMetadata: Record<string, unknown>;
+    }): Promise<Json>;
     listCollabTurns(appId: string, params?: {
         limit?: number;
         offset?: number;
@@ -660,10 +734,11 @@ type ApiClient = {
         createdBefore?: string;
     }): Promise<Json>;
     getSandboxStatus(appId: string): Promise<Json>;
+    importHistory(payload: ImportHistoryRequest): Promise<ImportHistoryResponse>;
 };
 declare function createApiClient(config: CoreConfig, opts?: {
     apiKey?: string | null;
     tokenProvider?: TokenProvider;
 }): 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 InitiateBundleRequest, type InvitationRecord, type MergeRequest, type MergeRequestReview, type MergeRequestStatus, type ReconcilePreflightResponse, type SyncLocalResponse, type SyncUpstreamResponse, createApiClient };
+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,6 +1,6 @@
 import {
   createApiClient
-} from "./chunk-R7FVSCQW.js";
+} from "./chunk-US5SM7ZC.js";
 import "./chunk-YZ34ICNN.js";
 export {
   createApiClient

package/dist/auth.js

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

package/dist/binding-WiIRI2fl.d.ts

@@ -0,0 +1,43 @@
+type BranchBindingMode = "legacy" | "lane" | "explicit_root";
+type BranchBinding = {
+    projectId: string | null;
+    currentAppId: string;
+    upstreamAppId: string;
+    threadId: string | null;
+    laneId: string | null;
+    bindingMode: BranchBindingMode;
+};
+type CollabBinding = {
+    schemaVersion: 3;
+    projectId: string | null;
+    currentAppId: string;
+    upstreamAppId: string;
+    threadId: string | null;
+    repoFingerprint: string | null;
+    remoteUrl: string | null;
+    defaultBranch: string | null;
+    laneId: string | null;
+    branchName: string | null;
+    bindingMode: BranchBindingMode;
+};
+declare function getCollabBindingPath(repoRoot: string): string;
+type CollabBindingState = {
+    schemaVersion: 1 | 2 | 3;
+    projectId: string | null;
+    repoFingerprint: string | null;
+    remoteUrl: string | null;
+    defaultBranch: string | null;
+    currentBranch: string | null;
+    binding: CollabBinding | null;
+    branchBindings: Record<string, BranchBinding>;
+    explicitRootBinding: CollabBinding | null;
+};
+declare function readCollabBindingState(repoRoot: string, options?: {
+    persist?: boolean;
+}): Promise<CollabBindingState | null>;
+declare function readCollabBinding(repoRoot: string): Promise<CollabBinding | null>;
+declare function writeCollabBinding(repoRoot: string, binding: Omit<CollabBinding, "schemaVersion" | "branchName"> & {
+    branchName?: string | null;
+}): Promise<string>;
+
+export { type BranchBindingMode as B, type CollabBinding as C, type CollabBindingState as a, readCollabBindingState as b, getCollabBindingPath as g, readCollabBinding as r, writeCollabBinding as w };

package/dist/binding.d.ts

@@ -1,21 +1 @@
-type BranchBindingMode = "legacy" | "lane" | "explicit_root";
-type CollabBinding = {
-    schemaVersion: 3;
-    projectId: string | null;
-    currentAppId: string;
-    upstreamAppId: string;
-    threadId: string | null;
-    repoFingerprint: string | null;
-    remoteUrl: string | null;
-    defaultBranch: string | null;
-    laneId: string | null;
-    branchName: string | null;
-    bindingMode: BranchBindingMode;
-};
-declare function getCollabBindingPath(repoRoot: string): string;
-declare function readCollabBinding(repoRoot: string): Promise<CollabBinding | null>;
-declare function writeCollabBinding(repoRoot: string, binding: Omit<CollabBinding, "schemaVersion" | "branchName"> & {
-    branchName?: string | null;
-}): Promise<string>;
-
-export { type CollabBinding, getCollabBindingPath, readCollabBinding, writeCollabBinding };
+export { C as CollabBinding, a as CollabBindingState, g as getCollabBindingPath, r as readCollabBinding, b as readCollabBindingState, w as writeCollabBinding } from './binding-WiIRI2fl.js';

package/dist/binding.js

@@ -1,6 +1,7 @@
 import {
   getCollabBindingPath,
   readCollabBinding,
+  readCollabBindingState,
   writeCollabBinding
 } from "./chunk-YCFLOHJV.js";
 import "./chunk-WT6VRLXU.js";
@@ -9,5 +10,6 @@ import "./chunk-YZ34ICNN.js";
 export {
   getCollabBindingPath,
   readCollabBinding,
+  readCollabBindingState,
   writeCollabBinding
 };

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

@@ -65,40 +65,53 @@ function createLocalSessionStore(params) {
   const service = params?.service?.trim() || "remix-cli";
   const account = params?.account?.trim() || "default";
   const filePath = params?.filePath?.trim() || path.join(xdgConfigHome(), "remix", "session.json");
+  async function readKeytar() {
+    const keytar = await maybeLoadKeytar();
+    if (!keytar) return null;
+    const raw = await keytar.getPassword(service, account).catch(() => null);
+    if (!raw) return null;
+    try {
+      const parsed = storedSessionSchema.safeParse(JSON.parse(raw));
+      return parsed.success ? parsed.data : null;
+    } catch {
+      return null;
+    }
+  }
+  async function readFile() {
+    const raw = await fs.readFile(filePath, "utf8").catch(() => null);
+    if (!raw) return null;
+    try {
+      const parsed = storedSessionSchema.safeParse(JSON.parse(raw));
+      if (!parsed.success) return null;
+      await ensurePathPermissions(filePath);
+      return parsed.data;
+    } catch {
+      return null;
+    }
+  }
+  function pickFreshest(a, b) {
+    if (!a) return b;
+    if (!b) return a;
+    return a.expires_at >= b.expires_at ? a : b;
+  }
   return {
     async getSession() {
-      const keytar = await maybeLoadKeytar();
-      if (keytar) {
-        const raw2 = await keytar.getPassword(service, account);
-        if (!raw2) return null;
-        try {
-          const parsed = storedSessionSchema.safeParse(JSON.parse(raw2));
-          return parsed.success ? parsed.data : null;
-        } catch {
-          return null;
-        }
-      }
-      const raw = await fs.readFile(filePath, "utf8").catch(() => null);
-      if (!raw) return null;
-      try {
-        const parsed = storedSessionSchema.safeParse(JSON.parse(raw));
-        if (!parsed.success) return null;
-        await ensurePathPermissions(filePath);
-        return parsed.data;
-      } catch {
-        return null;
-      }
+      const [k, f] = await Promise.all([readKeytar(), readFile()]);
+      return pickFreshest(k, f);
     },
     async setSession(session) {
       const parsed = storedSessionSchema.safeParse(session);
       if (!parsed.success) {
         throw new Error("Session data is invalid and was not stored.");
       }
+      await writeSessionFileFallback(filePath, parsed.data);
       const keytar = await maybeLoadKeytar();
       if (keytar) {
-        await keytar.setPassword(service, account, JSON.stringify(parsed.data));
+        try {
+          await keytar.setPassword(service, account, JSON.stringify(parsed.data));
+        } catch {
+        }
       }
-      await writeSessionFileFallback(filePath, parsed.data);
     }
   };
 }

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

@@ -185,6 +185,10 @@ function createApiClient(config, opts) {
       method: "POST",
       body: JSON.stringify(payload)
     }),
+    attachCollabTurnUsage: (appId, payload) => request(`/v1/apps/${encodeURIComponent(appId)}/collab-turns/attach-usage`, {
+      method: "POST",
+      body: JSON.stringify(payload)
+    }),
     listCollabTurns: (appId, params) => {
       const qs = new URLSearchParams();
       if (params?.limit !== void 0) qs.set("limit", String(params.limit));
@@ -406,7 +410,21 @@ function createApiClient(config, opts) {
         method: "GET"
       });
     },
-    getSandboxStatus: (appId) => request(`/v1/apps/${encodeURIComponent(appId)}/sandbox/status`, { method: "GET" })
+    getSandboxStatus: (appId) => request(`/v1/apps/${encodeURIComponent(appId)}/sandbox/status`, { method: "GET" }),
+    importHistory: async (payload) => {
+      const res = await request("/v1/history/import", {
+        method: "POST",
+        body: JSON.stringify(payload)
+      });
+      const envelope = res;
+      if (!envelope || typeof envelope !== "object" || !envelope.responseObject) {
+        throw new RemixError("Malformed importHistory response from server.", {
+          exitCode: 1,
+          hint: "Expected `{ responseObject: ImportHistoryResponse }`."
+        });
+      }
+      return envelope.responseObject;
+    }
   };
 }