@getpaseo/server 0.1.97-beta.2 → 0.1.97

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

@@ -375,7 +375,6 @@ function buildGitDiffArgs(args) {
     return ["diff", ...(args.ignoreWhitespace ? ["-w"] : []), ...args.extra];
 }
 const TRACKED_DIFF_NUMSTAT_MAX_BYTES = 2 * 1024 * 1024; // 2MB
-const TRACKED_DIFF_PER_FILE_MAX_CHARS = 1024 * 1024;
 const EMPTY_TREE_OBJECT_ID = "4b825dc642cb6eb9a060e54bf8d69288fbee4904";
 function isUnbornHeadDiffError(error) {
     return (error instanceof Error &&
@@ -423,56 +422,20 @@ async function getTrackedNumstatByPath(cwd, refs, ignoreWhitespace = false) {
     }
     return stats;
 }
-function extractTrackedDiffMetadataPath(section, prefix) {
-    const line = section.split("\n").find((candidate) => candidate.startsWith(prefix));
-    if (!line) {
-        return null;
-    }
-    const path = line.slice(prefix.length).replace(/\t.*$/, "").trimEnd();
-    if (path === "/dev/null") {
-        return null;
-    }
-    return path.startsWith("a/") || path.startsWith("b/") ? path.slice(2) : path;
-}
-function extractTrackedDiffSectionPath(section) {
-    const firstLineEnd = section.indexOf("\n");
-    const firstLine = firstLineEnd === -1 ? section : section.slice(0, firstLineEnd);
-    const header = firstLine.startsWith("diff --git ") ? firstLine.slice("diff --git ".length) : "";
-    const prefixedPathMatch = header.match(/^a\/(.+) b\/(.+)$/);
-    if (prefixedPathMatch) {
-        return prefixedPathMatch[2] ?? null;
-    }
-    const metadataPath = extractTrackedDiffMetadataPath(section, "+++ ") ??
-        extractTrackedDiffMetadataPath(section, "--- ");
-    if (metadataPath) {
-        return metadataPath;
-    }
-    const pathMatch = header.match(/^(\S+)\s+(\S+)$/);
-    return pathMatch?.[2] ?? null;
-}
-function splitTrackedDiffSections(diffText) {
-    const starts = [];
-    const diffHeaderPattern = /^diff --git /gm;
-    let match;
-    while ((match = diffHeaderPattern.exec(diffText))) {
-        starts.push(match.index);
-    }
-    const sections = [];
-    for (let index = 0; index < starts.length; index += 1) {
-        const start = starts[index];
-        const end = starts[index + 1] ?? diffText.length;
-        const text = diffText.slice(start, end);
-        const path = extractTrackedDiffSectionPath(text);
-        if (!path) {
-            continue;
-        }
-        sections.push({
-            path,
-            text,
-            isTooLarge: text.length > TRACKED_DIFF_PER_FILE_MAX_CHARS,
-        });
-    }
-    return sections;
+async function getTrackedDiffTextForPath(input) {
+    const result = await runGitCommand(buildGitDiffArgs({
+        ignoreWhitespace: input.ignoreWhitespace,
+        extra: [...getCheckoutDiffRefArgs(input.refsForDiff), "--", input.path],
+    }), {
+        cwd: input.cwd,
+        envOverlay: READ_ONLY_GIT_ENV,
+        maxOutputBytes: PER_FILE_DIFF_MAX_BYTES,
+    });
+    return {
+        path: input.path,
+        text: result.stdout,
+        truncated: result.truncated,
+    };
 }
 export class NotGitRepoError extends Error {
     constructor(cwd) {
@@ -1441,7 +1404,7 @@ export function warmCheckoutShortstatInBackground(cwd, context, onComplete) {
     });
 }
 async function appendStructuredTrackedDiffs(input) {
-    const { cwd, trackedChanges, trackedChangeByPath, trackedNumstatByPath, trackedPlaceholderByPath, trackedDiffText, trackedDiffTruncated, refsForDiff, ignoreWhitespace, structured, appendTrackedPlaceholderComment, } = input;
+    const { cwd, trackedChanges, trackedChangeByPath, trackedNumstatByPath, trackedPlaceholderByPath, trackedDiffText, refsForDiff, ignoreWhitespace, structured, appendTrackedPlaceholderComment, } = input;
     const parsedTrackedFiles = trackedDiffText.length > 0
         ? await parseAndHighlightDiff(trackedDiffText, cwd, {
             getOldFileContent: async (file) => {
@@ -1487,7 +1450,6 @@ async function appendStructuredTrackedDiffs(input) {
         // whitespace-filtered patch and numstat are both empty. Skip emitting a
         // structured placeholder in that case so whitespace-only edits truly disappear.
         if (ignoreWhitespace &&
-            !trackedDiffTruncated &&
             change.status.startsWith("M") &&
             (!stat || (!stat.isBinary && stat.additions === 0 && stat.deletions === 0))) {
             continue;
@@ -1499,7 +1461,7 @@ async function appendStructuredTrackedDiffs(input) {
             additions: stat?.additions ?? 0,
             deletions: stat?.deletions ?? 0,
             hunks: [],
-            status: trackedDiffTruncated ? "too_large" : "ok",
+            status: "ok",
         });
     }
 }
@@ -1564,43 +1526,42 @@ async function processTrackedChanges(input) {
         trackedDiffPaths.push(change.path);
     }
     let trackedDiffText = "";
-    let trackedDiffTruncated = false;
+    let trackedDiffBytes = 0;
     if (trackedDiffPaths.length > 0) {
-        const trackedDiffResult = await runGitCommand(buildGitDiffArgs({
-            ignoreWhitespace,
-            extra: [...getCheckoutDiffRefArgs(refsForDiff), "--", ...trackedDiffPaths],
-        }), {
+        const trackedDiffs = await Promise.all(trackedDiffPaths.map((path) => getTrackedDiffTextForPath({
             cwd,
-            envOverlay: READ_ONLY_GIT_ENV,
-            maxOutputBytes: TOTAL_DIFF_MAX_BYTES,
-        });
-        trackedDiffTruncated = trackedDiffResult.truncated;
+            refsForDiff,
+            path,
+            ignoreWhitespace,
+        })));
         const visibleTrackedDiffs = [];
-        const sections = splitTrackedDiffSections(trackedDiffResult.stdout);
-        for (let index = 0; index < sections.length; index += 1) {
-            const section = sections[index];
-            const isTruncatedTail = trackedDiffTruncated && index === sections.length - 1;
-            if (section.isTooLarge || isTruncatedTail) {
-                trackedPlaceholderByPath.set(section.path, {
+        for (const fileDiff of trackedDiffs) {
+            if (fileDiff.truncated) {
+                trackedPlaceholderByPath.set(fileDiff.path, {
                     status: "too_large",
-                    stat: trackedNumstatByPath.get(section.path) ?? null,
+                    stat: trackedNumstatByPath.get(fileDiff.path) ?? null,
                 });
                 continue;
             }
-            visibleTrackedDiffs.push(section.text);
+            const diffBytes = Buffer.byteLength(fileDiff.text, "utf8");
+            if (trackedDiffBytes + diffBytes > TOTAL_DIFF_MAX_BYTES) {
+                trackedPlaceholderByPath.set(fileDiff.path, {
+                    status: "too_large",
+                    stat: trackedNumstatByPath.get(fileDiff.path) ?? null,
+                });
+                continue;
+            }
+            trackedDiffBytes += diffBytes;
+            visibleTrackedDiffs.push(fileDiff.text);
         }
         trackedDiffText = visibleTrackedDiffs.join("");
         appendDiff(trackedDiffText);
-        if (trackedDiffTruncated) {
-            appendDiff("# tracked diff truncated\n");
-        }
     }
     return {
         trackedChangeByPath,
         trackedNumstatByPath,
         trackedPlaceholderByPath,
         trackedDiffText,
-        trackedDiffTruncated,
     };
 }
 async function resolveCheckoutDiffRefs(cwd, compare, context) {
@@ -1690,7 +1651,6 @@ export async function getCheckoutDiff(cwd, compare, context) {
             trackedNumstatByPath: trackedDiff.trackedNumstatByPath,
             trackedPlaceholderByPath: trackedDiff.trackedPlaceholderByPath,
             trackedDiffText: trackedDiff.trackedDiffText,
-            trackedDiffTruncated: trackedDiff.trackedDiffTruncated,
             refsForDiff: effectiveRefsForDiff,
             ignoreWhitespace,
             structured,

package/dist/server/utils/worktree-metadata.d.ts

@@ -1,74 +1,22 @@
 import { z } from "zod";
-declare const PaseoWorktreeMetadataSchema: z.ZodUnion<[z.ZodObject<{
+declare const PaseoWorktreeMetadataSchema: z.ZodUnion<readonly [z.ZodObject<{
     version: z.ZodLiteral<1>;
     baseRefName: z.ZodString;
-}, "strip", z.ZodTypeAny, {
-    version: 1;
-    baseRefName: string;
-}, {
-    version: 1;
-    baseRefName: string;
-}>, z.ZodObject<{
+}, z.core.$strip>, z.ZodObject<{
     version: z.ZodLiteral<2>;
     baseRefName: z.ZodString;
-    firstAgentBranchAutoName: z.ZodOptional<z.ZodDiscriminatedUnion<"status", [z.ZodObject<{
+    firstAgentBranchAutoName: z.ZodOptional<z.ZodDiscriminatedUnion<[z.ZodObject<{
         status: z.ZodLiteral<"pending">;
         placeholderBranchName: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        status: "pending";
-        placeholderBranchName: string;
-    }, {
-        status: "pending";
-        placeholderBranchName: string;
-    }>, z.ZodObject<{
+    }, z.core.$strip>, z.ZodObject<{
         status: z.ZodLiteral<"attempted">;
         placeholderBranchName: z.ZodString;
         attemptedAt: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        status: "attempted";
-        placeholderBranchName: string;
-        attemptedAt: string;
-    }, {
-        status: "attempted";
-        placeholderBranchName: string;
-        attemptedAt: string;
-    }>]>>;
+    }, z.core.$strip>], "status">>;
     runtime: z.ZodOptional<z.ZodObject<{
         worktreePort: z.ZodNumber;
-    }, "strip", z.ZodTypeAny, {
-        worktreePort: number;
-    }, {
-        worktreePort: number;
-    }>>;
-}, "strip", z.ZodTypeAny, {
-    version: 2;
-    baseRefName: string;
-    firstAgentBranchAutoName?: {
-        status: "pending";
-        placeholderBranchName: string;
-    } | {
-        status: "attempted";
-        placeholderBranchName: string;
-        attemptedAt: string;
-    } | undefined;
-    runtime?: {
-        worktreePort: number;
-    } | undefined;
-}, {
-    version: 2;
-    baseRefName: string;
-    firstAgentBranchAutoName?: {
-        status: "pending";
-        placeholderBranchName: string;
-    } | {
-        status: "attempted";
-        placeholderBranchName: string;
-        attemptedAt: string;
-    } | undefined;
-    runtime?: {
-        worktreePort: number;
-    } | undefined;
-}>]>;
+    }, z.core.$strip>>;
+}, z.core.$strip>]>;
 export type PaseoWorktreeMetadata = z.infer<typeof PaseoWorktreeMetadataSchema>;
 export declare function getPaseoWorktreeMetadataPath(worktreeRoot: string): string;
 export declare function normalizeBaseRefName(input: string): string;

package/dist/src/server/persisted-config.js

@@ -213,7 +213,7 @@ export const PersistedConfigSchema = z
             // localhost service proxying remains always enabled.
             enabled: z.boolean().optional(),
             listen: z.string().optional(),
-            publicBaseUrl: z.string().url().optional(),
+            publicBaseUrl: z.url().optional(),
         })
             .strict()
             .optional(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/server",
-  "version": "0.1.97-beta.2",
+  "version": "0.1.97",
   "description": "Paseo backend server",
   "files": [
     "dist/server",
@@ -63,11 +63,12 @@
   },
   "dependencies": {
     "@agentclientprotocol/sdk": "^0.17.1",
-    "@anthropic-ai/claude-agent-sdk": "^0.2.133",
-    "@getpaseo/client": "0.1.97-beta.2",
-    "@getpaseo/highlight": "0.1.97-beta.2",
-    "@getpaseo/protocol": "0.1.97-beta.2",
-    "@getpaseo/relay": "0.1.97-beta.2",
+    "@anthropic-ai/claude-agent-sdk": "^0.3.181",
+    "@anthropic-ai/sdk": "^0.104.2",
+    "@getpaseo/client": "0.1.97",
+    "@getpaseo/highlight": "0.1.97",
+    "@getpaseo/protocol": "0.1.97",
+    "@getpaseo/relay": "0.1.97",
     "@isaacs/ttlcache": "^2.1.4",
     "@modelcontextprotocol/sdk": "^1.20.1",
     "@opencode-ai/sdk": "1.14.46",
@@ -81,7 +82,7 @@
     "lru-cache": "^11.5.1",
     "mnemonic-id": "^3.2.7",
     "node-pty": "1.2.0-beta.11",
-    "openai": "^4.20.0",
+    "openai": "^6.44.0",
     "p-limit": "^7.3.0",
     "p-memoize": "^8.0.0",
     "pino": "^10.2.0",
@@ -94,8 +95,7 @@
     "uuid": "^9.0.1",
     "which": "^5.0.0",
     "ws": "^8.14.2",
-    "zod": "^3.23.8",
-    "zod-to-json-schema": "^3.25.1"
+    "zod": "^4.4.3"
   },
   "devDependencies": {
     "@playwright/test": "^1.56.1",