@getpaseo/server 0.6.0 → 0.6.1

package/dist/server/server/agent/providers/mock-load-test-agent.js

@@ -94,6 +94,17 @@ const MODELS = [
             intervalMs: 5,
         },
     },
+    {
+        provider: MOCK_LOAD_TEST_PROVIDER_ID,
+        id: "e2e-fast-stream",
+        label: "E2E fast stream",
+        description: "Short deterministic stream for browser tests.",
+        isSelectable: false,
+        metadata: {
+            durationMs: 2000,
+            intervalMs: 20,
+        },
+    },
 ];
 function shouldEmitPlanApprovalPrompt(prompt) {
     return /emit\s+(?:a\s+)?synthetic\s+plan\s+approval/i.test(promptToText(prompt));

package/dist/server/server/auto-archive-on-merge/index.js

@@ -1,5 +1,7 @@
 import { resolve } from "node:path";
+import { LRUCache } from "lru-cache";
 import { archiveIfSafe } from "./archive-if-safe.js";
+const OPEN_PULL_REQUEST_LATCH_MAX = 1024;
 const defaultDependencies = {
     archiveIfSafe,
     resolvePath: resolve,
@@ -7,14 +9,29 @@ const defaultDependencies = {
 export function setupAutoArchiveOnMerge(options, deps = defaultDependencies) {
     const log = options.logger.child({ module: "auto-archive-on-merge" });
     const inFlightCwds = new Set();
+    const openPullRequestUrlsByCwd = new LRUCache({
+        max: OPEN_PULL_REQUEST_LATCH_MAX,
+    });
     return options.workspaceGitService.onSnapshotUpdated((snapshot) => {
-        if (!snapshot.forge.pullRequest?.isMerged) {
+        const snapshotCwd = deps.resolvePath(snapshot.cwd);
+        if (options.daemonConfigStore.get().autoArchiveAfterMerge !== true) {
+            openPullRequestUrlsByCwd.delete(snapshotCwd);
             return;
         }
-        if (options.daemonConfigStore.get().autoArchiveAfterMerge !== true) {
+        const pullRequest = snapshot.forge.pullRequest;
+        if (!pullRequest?.isMerged) {
+            if (pullRequest?.state.toLowerCase() === "open") {
+                openPullRequestUrlsByCwd.set(snapshotCwd, pullRequest.url);
+            }
+            else {
+                openPullRequestUrlsByCwd.delete(snapshotCwd);
+            }
+            return;
+        }
+        if (openPullRequestUrlsByCwd.get(snapshotCwd) !== pullRequest.url) {
+            openPullRequestUrlsByCwd.delete(snapshotCwd);
             return;
         }
-        const snapshotCwd = deps.resolvePath(snapshot.cwd);
         if (inFlightCwds.has(snapshotCwd)) {
             return;
         }
@@ -30,7 +47,13 @@ export function setupAutoArchiveOnMerge(options, deps = defaultDependencies) {
                 log.warn({ err: error, cwd: snapshot.cwd }, "Failed to read snapshot for auto-archive; skipping");
                 return;
             }
-            if (!freshSnapshot?.forge.pullRequest?.isMerged) {
+            const freshPullRequest = freshSnapshot?.forge.pullRequest;
+            if (!freshPullRequest?.isMerged ||
+                freshPullRequest.url !== pullRequest.url ||
+                openPullRequestUrlsByCwd.get(snapshotCwd) !== pullRequest.url) {
+                if (openPullRequestUrlsByCwd.get(snapshotCwd) === pullRequest.url) {
+                    openPullRequestUrlsByCwd.delete(snapshotCwd);
+                }
                 return;
             }
             const attachedWorkspaces = (await options.listActiveWorkspaces()).filter((workspace) => deps.resolvePath(workspace.cwd) === snapshotCwd);

package/dist/server/utils/checkout-git.js

@@ -1218,11 +1218,6 @@ function buildInitialPullRequestLookupTarget(input) {
     if (!input.currentBranch) {
         return null;
     }
-    // Paseo worktree metadata owns PR identity. A checkout drift must not fall
-    // through to branch config and silently retarget the workspace.
-    if (input.metadata) {
-        return buildPullRequestLookupTargetFromMetadata(input.metadata, input.currentBranch);
-    }
     const hasConfiguredBranchTarget = Boolean(input.branchRemoteName && parseBranchMergeHeadRef(input.branchMergeRef));
     if (hasConfiguredBranchTarget) {
         return buildPullRequestLookupTargetFromBranchConfig({
@@ -1234,15 +1229,14 @@ function buildInitialPullRequestLookupTarget(input) {
             resolvedBaseRef: input.resolvedBaseRef,
         });
     }
-    return (buildPullRequestLookupTargetFromMetadata(input.metadata, input.currentBranch) ??
-        buildPullRequestLookupTargetFromBranchConfig({
-            currentBranch: input.currentBranch,
-            branchRemoteName: input.branchRemoteName,
-            branchMergeRef: input.branchMergeRef,
-            branchRemoteUrl: input.branchRemoteUrl,
-            originRemoteUrl: input.originRemoteUrl,
-            resolvedBaseRef: input.resolvedBaseRef,
-        }));
+    return buildPullRequestLookupTargetFromBranchConfig({
+        currentBranch: input.currentBranch,
+        branchRemoteName: input.branchRemoteName,
+        branchMergeRef: input.branchMergeRef,
+        branchRemoteUrl: input.branchRemoteUrl,
+        originRemoteUrl: input.originRemoteUrl,
+        resolvedBaseRef: input.resolvedBaseRef,
+    });
 }
 async function resolvePullRequestLookupTargetFromPushConfig(cwd, currentBranch, knownOriginRemoteUrl, knownResolvedBaseRef, context) {
     const pushRemoteName = await getGitConfigValue(cwd, `branch.${currentBranch}.pushRemote`, context);
@@ -1266,12 +1260,14 @@ async function resolvePullRequestLookupTargetFromPushConfig(cwd, currentBranch,
 }
 async function resolveFactsPullRequestLookupTarget(input) {
     const { cwd, inspected, metadata, context } = input;
-    if (inspected.paseoWorktree.isPaseoOwnedWorktree) {
-        return buildPullRequestLookupTargetFromMetadata(metadata, inspected.currentBranch ?? "");
+    const metadataTarget = inspected.currentBranch
+        ? buildPullRequestLookupTargetFromMetadata(metadata, inspected.currentBranch)
+        : null;
+    if (metadataTarget) {
+        return metadataTarget;
     }
     let target = buildInitialPullRequestLookupTarget({
         currentBranch: inspected.currentBranch,
-        metadata,
         branchRemoteName: input.branchRemoteName,
         branchMergeRef: input.branchMergeRef,
         branchRemoteUrl: input.branchRemoteUrl,