@remixhq/core 0.1.7 → 0.1.9

package/dist/collab.js

@@ -4,7 +4,7 @@ import {
   reserveAvailableDirPath,
   reserveDirectory,
   writeCollabBinding
-} from "./chunk-FAZUMWBS.js";
+} from "./chunk-GEHSFPCD.js";
 import {
   assertRepoSnapshotUnchanged,
   buildRepoFingerprint,
@@ -25,10 +25,12 @@ import {
   getGitCommonDir,
   getHeadCommitHash,
   getRemoteOriginUrl,
+  getWorkspaceDiff,
   getWorkspaceSnapshot,
   getWorktreeStatus,
   hardResetToCommit,
   importGitBundle,
+  listUntrackedFiles,
   normalizeGitRemote,
   preserveWorkspaceChanges,
   reapplyPreservedWorkspaceChanges,
@@ -36,7 +38,7 @@ import {
   summarizeUnifiedDiff,
   validateUnifiedDiff,
   writeTempUnifiedDiffBackup
-} from "./chunk-UGKPOCN5.js";
+} from "./chunk-J3J4PBQ7.js";
 import {
   REMIX_ERROR_CODES
 } from "./chunk-GC2MOT3U.js";
@@ -91,6 +93,26 @@ function unwrapResponseObject(resp, label) {
   }
   return obj;
 }
+var DEFAULT_PAGINATION_LIMIT = 25;
+var MAX_PAGINATION_LIMIT = 50;
+function normalizePagination(params) {
+  const rawLimit = typeof params?.limit === "number" && Number.isFinite(params.limit) ? Math.trunc(params.limit) : DEFAULT_PAGINATION_LIMIT;
+  const rawOffset = typeof params?.offset === "number" && Number.isFinite(params.offset) ? Math.trunc(params.offset) : 0;
+  return {
+    limit: Math.max(1, Math.min(MAX_PAGINATION_LIMIT, rawLimit)),
+    offset: Math.max(0, rawOffset)
+  };
+}
+function paginateOverfetchedItems(items, params) {
+  const pagination = normalizePagination(params);
+  return {
+    items: items.slice(0, pagination.limit),
+    pagination: {
+      ...pagination,
+      hasMore: items.length > pagination.limit
+    }
+  };
+}
 function unwrapMergeRequest(resp) {
   return unwrapResponseObject(resp, "merge request");
 }
@@ -1054,6 +1076,7 @@ async function collabAdd(params) {
     }
     const { backupPath } = await writeTempUnifiedDiffBackup(diff, "remix-add");
     try {
+      await pollAppReady(params.api, binding.currentAppId);
       if (submissionSnapshot) {
         await assertRepoSnapshotUnchanged(repoRoot, submissionSnapshot, {
           operation: "`remix collab add` auto-sync",
@@ -1201,6 +1224,107 @@ async function collabRecordTurn(params) {
   return unwrapResponseObject(resp, "collab turn");
 }
 
+// src/application/collab/collabFinalizeTurn.ts
+function collectWarnings(value) {
+  if (!Array.isArray(value)) return [];
+  return value.filter((entry) => typeof entry === "string" && entry.trim().length > 0);
+}
+async function collabFinalizeTurn(params) {
+  const repoRoot = await findGitRoot(params.cwd);
+  const binding = await readCollabBinding(repoRoot);
+  if (!binding) {
+    throw new RemixError("Repository is not bound to Remix.", {
+      exitCode: 2,
+      hint: "Run `remix collab init` first."
+    });
+  }
+  const prompt = params.prompt.trim();
+  const assistantResponse = params.assistantResponse.trim();
+  if (!prompt) throw new RemixError("Prompt is required.", { exitCode: 2 });
+  if (!assistantResponse) throw new RemixError("Assistant response is required.", { exitCode: 2 });
+  const diffSource = params.diffSource ?? (params.diff ? "external" : "worktree");
+  const externalDiff = params.diff?.trim() ?? "";
+  const workspaceDiff = diffSource === "worktree" ? await getWorkspaceDiff(repoRoot) : null;
+  const hasChangedTurn = diffSource === "external" ? externalDiff.length > 0 : Boolean(workspaceDiff?.diff.trim());
+  const currentHeadCommitHash = await getHeadCommitHash(repoRoot);
+  const idempotencyKey = params.idempotencyKey?.trim() || buildDeterministicIdempotencyKey({
+    kind: "collab_finalize_turn_v1",
+    appId: binding.currentAppId,
+    upstreamAppId: binding.upstreamAppId,
+    headCommitHash: currentHeadCommitHash,
+    modeHint: hasChangedTurn ? "changed_turn" : "no_diff_turn",
+    prompt,
+    assistantResponse,
+    externalDiff: diffSource === "external" ? externalDiff : null
+  });
+  if (diffSource === "external" && !hasChangedTurn) {
+    throw new RemixError("External diff is empty.", {
+      exitCode: 2,
+      hint: "Pass a non-empty diff when using external diff submission, or omit the external diff so finalize-turn can inspect the live worktree."
+    });
+  }
+  if (hasChangedTurn) {
+    const localHeadBefore = currentHeadCommitHash;
+    const capturedUntrackedPathsCandidate = diffSource === "worktree" ? await listUntrackedFiles(repoRoot) : [];
+    const changeStep = await collabAdd({
+      api: params.api,
+      cwd: repoRoot,
+      prompt,
+      assistantResponse,
+      diff: diffSource === "external" ? externalDiff : null,
+      diffSource,
+      sync: params.sync,
+      allowBranchMismatch: params.allowBranchMismatch,
+      idempotencyKey,
+      actor: params.actor
+    });
+    const localHeadAfter = await getHeadCommitHash(repoRoot);
+    const warnings = [
+      ...collectWarnings(changeStep.warnings),
+      ...diffSource === "external" && params.sync !== false ? [
+        "Automatic local discard+sync was skipped because the diff came from an external source and may not match the current worktree."
+      ] : []
+    ];
+    const autoSyncRequested = params.sync !== false;
+    const autoSyncEligible = diffSource === "worktree";
+    return {
+      mode: "changed_turn",
+      idempotencyKey,
+      changeStep,
+      collabTurn: null,
+      autoSync: {
+        requested: autoSyncRequested,
+        eligible: autoSyncEligible,
+        attempted: autoSyncRequested && autoSyncEligible,
+        applied: autoSyncRequested && autoSyncEligible,
+        trackedChangesDiscarded: autoSyncRequested && autoSyncEligible,
+        capturedUntrackedPathsCandidate,
+        localHeadBefore,
+        localHeadAfter,
+        localRepoMutated: autoSyncRequested && autoSyncEligible && localHeadBefore !== localHeadAfter
+      },
+      warnings
+    };
+  }
+  const collabTurn = await collabRecordTurn({
+    api: params.api,
+    cwd: repoRoot,
+    prompt,
+    assistantResponse,
+    allowBranchMismatch: params.allowBranchMismatch,
+    idempotencyKey,
+    actor: params.actor
+  });
+  return {
+    mode: "no_diff_turn",
+    idempotencyKey,
+    changeStep: null,
+    collabTurn,
+    autoSync: null,
+    warnings: []
+  };
+}
+
 // src/application/collab/collabApprove.ts
 async function collabApprove(params) {
   if (params.mode === "sync-target-repo") {
@@ -1468,17 +1592,22 @@ async function collabListMergeRequests(params) {
     appId: params.appId,
     queue: params.queue
   });
+  const pageRequest = normalizePagination(params);
   const resp = await params.api.listMergeRequests({
     queue: params.queue,
     appId,
     status: params.status,
-    kind: params.kind ?? "merge"
+    kind: params.kind ?? "merge",
+    limit: pageRequest.limit + 1,
+    offset: pageRequest.offset
   });
   const mergeRequests = unwrapResponseObject(resp, "merge requests");
+  const page = paginateOverfetchedItems(mergeRequests, params);
   return {
     queue: params.queue,
     appId: appId ?? null,
-    mergeRequests
+    mergeRequests: page.items,
+    pagination: page.pagination
   };
 }
 
@@ -1521,12 +1650,24 @@ async function collabListMembers(params) {
     scope: params.scope,
     targetId: params.targetId
   });
-  const resp = params.scope === "organization" ? await params.api.listOrganizationMembers(targetId) : params.scope === "project" ? await params.api.listProjectMembers(targetId) : await params.api.listAppMembers(targetId);
+  const pageRequest = normalizePagination(params);
+  const resp = params.scope === "organization" ? await params.api.listOrganizationMembers(targetId, {
+    limit: pageRequest.limit + 1,
+    offset: pageRequest.offset
+  }) : params.scope === "project" ? await params.api.listProjectMembers(targetId, {
+    limit: pageRequest.limit + 1,
+    offset: pageRequest.offset
+  }) : await params.api.listAppMembers(targetId, {
+    limit: pageRequest.limit + 1,
+    offset: pageRequest.offset
+  });
   const members = params.scope === "organization" ? unwrapResponseObject(resp, "members") : params.scope === "project" ? unwrapResponseObject(resp, "members") : unwrapResponseObject(resp, "members");
+  const page = paginateOverfetchedItems(members, params);
   return {
     scopeType: params.scope,
     targetId,
-    members
+    members: page.items,
+    pagination: page.pagination
   };
 }
 async function collabUpdateMemberRole(params) {
@@ -1739,9 +1880,18 @@ async function collabInvite(params) {
 
 // src/application/collab/collabList.ts
 async function collabList(params) {
-  const resp = await params.api.listApps({ forked: "all" });
+  const pageRequest = normalizePagination(params);
+  const resp = await params.api.listApps({
+    forked: params.forked ?? "all",
+    limit: pageRequest.limit + 1,
+    offset: pageRequest.offset
+  });
   const apps = unwrapResponseObject(resp, "apps");
-  return { apps };
+  const page = paginateOverfetchedItems(apps, params);
+  return {
+    apps: page.items,
+    pagination: page.pagination
+  };
 }
 
 // src/application/collab/collabReconcile.ts
@@ -2315,6 +2465,7 @@ export {
   collabAdd,
   collabApprove,
   collabCheckout,
+  collabFinalizeTurn,
   collabInit,
   collabInvite,
   collabList,

package/dist/index.d.ts

@@ -2,5 +2,5 @@ export { CliError, REMIX_ERROR_CODES, CliError as RemixError, RemixErrorCode } f
 export { CoreConfig, ResolveConfigOptions, configSchema, resolveConfig } from './config.js';
 export { S as SessionStore, a as StoredSession, c as createStoredSessionTokenProvider, s as shouldRefreshSoon, b as storedSessionSchema } from './tokenProvider-BWTusyj4.js';
 export { createLocalSessionStore, createSupabaseAuthHelpers } from './auth.js';
-export { AgentMemoryItem, AgentMemoryKind, AgentMemorySearchItem, AgentMemorySearchResponse, AgentMemorySummary, AgentMemoryTimelineResponse, ApiClient, AppReconcileResponse, Bundle, BundlePlatform, BundleStatus, ChangeStepDiffResponse, InitiateBundleRequest, MergeRequest, MergeRequestReview, MergeRequestStatus, ReconcilePreflightResponse, SyncLocalResponse, SyncUpstreamResponse, createApiClient } from './api.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';

package/dist/index.js

@@ -1,6 +1,6 @@
 import {
   createApiClient
-} from "./chunk-4276ARDF.js";
+} from "./chunk-XC2FV57P.js";
 import {
   createLocalSessionStore,
   createStoredSessionTokenProvider,

package/dist/repo.js

@@ -27,7 +27,7 @@ import {
   requireCurrentBranch,
   summarizeUnifiedDiff,
   writeTempUnifiedDiffBackup
-} from "./chunk-UGKPOCN5.js";
+} from "./chunk-J3J4PBQ7.js";
 import "./chunk-GC2MOT3U.js";
 import "./chunk-YZ34ICNN.js";
 export {

package/package.json

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