@mduan/paseo-cli 0.11.0-fork.39 → 0.11.0-fork.40

package/node_modules/@getpaseo/server/dist/server/utils/checkout-git.js

@@ -420,9 +420,9 @@ export async function readDiffContextLines(input) {
         lineCount: input.lineCount,
     });
 }
-async function tryResolveMergeBase(cwd, baseRef) {
+async function tryResolveMergeBase(cwd, baseRef, ref = "HEAD") {
     try {
-        const { stdout } = await runGitCommand(["merge-base", baseRef, "HEAD"], {
+        const { stdout } = await runGitCommand(["merge-base", baseRef, ref], {
             cwd,
             envOverlay: READ_ONLY_GIT_ENV,
         });
@@ -506,9 +506,14 @@ async function getTrackedNumstatByPath(cwd, refs, ignoreWhitespace = false) {
     return stats;
 }
 async function getTrackedDiffTextForPath(input) {
+    const paths = input.oldPath ? [input.oldPath, input.path] : [input.path];
     const result = await runGitCommand(buildGitDiffArgs({
         ignoreWhitespace: input.ignoreWhitespace,
-        extra: [...getCheckoutDiffRefArgs(input.refsForDiff), "--", `:(literal)${input.path}`],
+        extra: [
+            ...getCheckoutDiffRefArgs(input.refsForDiff),
+            "--",
+            ...paths.map((path) => `:(literal)${path}`),
+        ],
     }), {
         cwd: input.cwd,
         envOverlay: READ_ONLY_GIT_ENV,
@@ -1732,6 +1737,33 @@ function parseNumstatLine(line, stats) {
     }
     stats.set(path, { additions, deletions });
 }
+// Merges interleaved `--raw` (status) and `--numstat` (counts) lines by destination path.
+function parseCommitFiles(lines) {
+    const stats = new Map();
+    const statuses = new Map();
+    for (const line of lines) {
+        if (!line) {
+            continue;
+        }
+        if (line.startsWith(":")) {
+            parseRawStatusLine(line, statuses);
+        }
+        else {
+            parseNumstatLine(line, stats);
+        }
+    }
+    const files = [];
+    for (const [path, stat] of stats) {
+        const status = statuses.get(path);
+        files.push({
+            path,
+            additions: stat.additions,
+            deletions: stat.deletions,
+            ...(status ? { status } : {}),
+        });
+    }
+    return files;
+}
 // Parses the single combined `git log ... --raw --numstat -M` stream. Each record
 // (split on the record separator) starts with the NUL-field-separated header line,
 // then a blank line, then the interleaved `--raw` (status) and `--numstat` (counts)
@@ -1749,30 +1781,7 @@ function parseCheckoutCommitRecords(stdout) {
         if (!sha) {
             continue;
         }
-        const stats = new Map();
-        const statuses = new Map();
-        for (let index = 1; index < lines.length; index += 1) {
-            const line = lines[index] ?? "";
-            if (!line) {
-                continue;
-            }
-            if (line.startsWith(":")) {
-                parseRawStatusLine(line, statuses);
-            }
-            else {
-                parseNumstatLine(line, stats);
-            }
-        }
-        const files = [];
-        for (const [path, stat] of stats) {
-            const status = statuses.get(path);
-            files.push({
-                path,
-                additions: stat.additions,
-                deletions: stat.deletions,
-                ...(status ? { status } : {}),
-            });
-        }
+        const files = parseCommitFiles(lines.slice(1));
         commits.push({
             sha,
             shortSha: (fields[1] ?? "").trim(),
@@ -1833,7 +1842,8 @@ async function tryResolveCheckoutCommitsBaseRef(cwd, baseRef, currentBranch) {
         return null;
     }
 }
-export async function listCheckoutCommits({ cwd, context, }) {
+/** The base ref the checkout's own commits are listed and diffed against. */
+async function resolveCheckoutCommitsBaseRef(cwd, context) {
     // A detached HEAD still has commits ahead of its base; compare from HEAD itself.
     const currentBranch = (await getCurrentBranch(cwd)) ?? "HEAD";
     const { resolvedBaseRef } = await resolveBaseRefForCwd(cwd, context);
@@ -1843,13 +1853,80 @@ export async function listCheckoutCommits({ cwd, context, }) {
         // Saved worktree metadata can outlive a renamed or deleted base branch.
         comparisonBaseRef = await tryResolveCheckoutCommitsBaseRef(cwd, await resolveBaseRef(cwd), currentBranch);
     }
+    return comparisonBaseRef;
+}
+/**
+ * The old side of the diff of the commits from `fromSha` through `toSha`: the parent of
+ * `fromSha`, plus the base branch changes that merges in the range brought in. Merging the base
+ * branch into a branch is not the branch's own work, so it should not show up as changes.
+ */
+async function resolveCommitRangeDiffBase(input) {
+    const { cwd, toSha } = input;
+    const parent = await tryResolveCommit(cwd, `${input.fromSha}^`);
+    // A root commit has no parent, so its changes are against the empty tree.
+    if (!parent)
+        return EMPTY_TREE_OBJECT_ID;
+    const git = (args) => runGitCommand(args, { cwd, envOverlay: READ_ONLY_GIT_ENV });
+    const { stdout: merges } = await git([
+        "rev-list",
+        "--merges",
+        "--max-count=1",
+        `${parent}..${toSha}`,
+    ]);
+    if (!merges.trim())
+        return parent;
+    const baseRef = await input.resolveBaseRef();
+    const mergedBase = baseRef ? await tryResolveMergeBase(cwd, baseRef, toSha) : null;
+    // A commit already on the base branch keeps its first-parent diff.
+    if (!mergedBase || mergedBase === toSha)
+        return parent;
+    try {
+        const { stdout } = await git(["merge-tree", "--write-tree", parent, mergedBase]);
+        return stdout.split("\n")[0]?.trim() || parent;
+    }
+    catch {
+        // ponytail: a conflicting replay falls back to the plain range diff, base changes included.
+        return parent;
+    }
+}
+/** A workspace merge commit's own changes: conflict resolutions, not the branch it merged in. */
+async function listMergeCommitFiles(input) {
+    const { cwd, sha, baseRef } = input;
+    const base = await resolveCommitRangeDiffBase({
+        cwd,
+        fromSha: sha,
+        toSha: sha,
+        resolveBaseRef: async () => baseRef,
+    });
+    const { stdout } = await runGitCommand(["diff", "--raw", "--numstat", "-M", base, sha], {
+        cwd,
+        envOverlay: READ_ONLY_GIT_ENV,
+    });
+    return parseCommitFiles(stdout.split("\n"));
+}
+export async function listCheckoutCommits({ cwd, context, }) {
+    const comparisonBaseRef = await resolveCheckoutCommitsBaseRef(cwd, context);
     let workspaceRecords = [];
     let baseRevision = "HEAD";
     if (comparisonBaseRef) {
-        const [records, mergeBase] = await Promise.all([
+        const [records, mergeBase, merges] = await Promise.all([
             getCheckoutCommitRecords({ cwd, revision: `${comparisonBaseRef}..HEAD` }),
             tryResolveMergeBase(cwd, comparisonBaseRef),
+            runGitCommand(["rev-list", "--merges", `${comparisonBaseRef}..HEAD`], {
+                cwd,
+                envOverlay: READ_ONLY_GIT_ENV,
+            }),
         ]);
+        const mergeShas = new Set(merges.stdout.split("\n").filter(Boolean));
+        await Promise.all(records
+            .filter((record) => mergeShas.has(record.sha))
+            .map(async (record) => {
+            record.files = await listMergeCommitFiles({
+                cwd,
+                sha: record.sha,
+                baseRef: comparisonBaseRef,
+            });
+        }));
         workspaceRecords = records;
         baseRevision = mergeBase ?? "";
     }
@@ -1878,28 +1955,51 @@ export async function listCheckoutCommits({ cwd, context, }) {
     }));
     return { baseRef: comparisonBaseRef, commits };
 }
+/** The combined diff of the commits from `fromSha` through `toSha`, both included. */
+export async function getCommitRangeDiff(input) {
+    const { cwd, fromSha, toSha } = input;
+    const [from, targetRef] = await Promise.all([
+        tryResolveCommit(cwd, fromSha),
+        tryResolveCommit(cwd, toSha),
+    ]);
+    if (!from || !targetRef) {
+        throw new Error(`Unknown commit range: ${fromSha}..${toSha}`);
+    }
+    const baseRef = await resolveCommitRangeDiffBase({
+        cwd,
+        fromSha: from,
+        toSha: targetRef,
+        resolveBaseRef: () => resolveCheckoutCommitsBaseRef(cwd, input.context),
+    });
+    const result = await getCheckoutDiff(cwd, {
+        mode: "range",
+        baseRef,
+        targetRef,
+        ignoreWhitespace: input.ignoreWhitespace,
+        includeStructured: true,
+    });
+    return { ...result, baseRef, targetRef };
+}
 /**
  * Fetches the unified diff of a single file as introduced by one commit and
  * parses it into the same {@link ParsedDiffFile} shape the diff subscription
  * emits (so the client can reuse its existing renderer).
  *
- * Compares merge commits to their first parent, matching the linear history shown
- * in the explorer. The text is parsed and highlighted by
+ * Compares a merge commit to its first parent plus the base branch changes it merged in, so
+ * only the merge's own changes show. The text is parsed and highlighted by
  * {@link parseAndHighlightDiff} — the exact parser the diff subscription uses.
  * Returns `null` when the file is absent from the commit or the change is
  * binary-only (no textual hunks). Throws on git failure (e.g. an unknown sha),
  * which the caller maps to a typed checkout error.
  */
-export async function getCommitFileDiff({ cwd, sha, path, }) {
-    const { stdout } = await runGitCommand([
-        "show",
-        sha,
-        "--format=",
-        "--diff-merges=first-parent",
-        ...STANDARD_DIFF_PREFIX_ARGS,
-        "--",
-        path,
-    ], {
+export async function getCommitFileDiff({ cwd, sha, path, context, }) {
+    const base = await resolveCommitRangeDiffBase({
+        cwd,
+        fromSha: sha,
+        toSha: sha,
+        resolveBaseRef: () => resolveCheckoutCommitsBaseRef(cwd, context),
+    });
+    const { stdout } = await runGitCommand(["diff", base, sha, ...STANDARD_DIFF_PREFIX_ARGS, "--", path], {
         cwd,
         envOverlay: READ_ONLY_GIT_ENV,
     });
@@ -1908,7 +2008,7 @@ export async function getCommitFileDiff({ cwd, sha, path, }) {
     }
     const newContents = new Map();
     const parsedFiles = await parseAndHighlightDiff(stdout, cwd, {
-        getOldFileContent: (file) => readGitFileContentAtRef(cwd, `${sha}^`, file.path),
+        getOldFileContent: (file) => readGitFileContentAtRef(cwd, base, file.path),
         getNewFileContent: async (file) => {
             const content = await readGitFileContentAtRef(cwd, sha, file.path);
             newContents.set(file.path, content);
@@ -2368,22 +2468,25 @@ async function processTrackedChanges(input) {
     }
     let trackedDiffText = "";
     let trackedDiffBytes = 0;
-    const renamedPaths = new Set(trackedChanges.filter((change) => change.oldPath).map((change) => change.path));
+    const oldPathByPath = new Map(trackedChanges
+        .filter((change) => change.oldPath)
+        .map((change) => [change.path, change.oldPath]));
     for (let start = 0; start < trackedDiffPaths.length; start += TRACKED_DIFF_BATCH_SIZE) {
         const paths = trackedDiffPaths.slice(start, start + TRACKED_DIFF_BATCH_SIZE);
-        // Keep rename/copy path filtering identical to the existing per-file command.
+        // Git needs both paths to recognize a rename instead of a whole-file addition.
         const ordinary = await getTrackedDiffTexts({
             cwd,
             refsForDiff,
-            paths: paths.filter((path) => !renamedPaths.has(path)),
+            paths: paths.filter((path) => !oldPathByPath.has(path)),
             ignoreWhitespace,
         });
         const renamed = await Promise.all(paths
-            .filter((path) => renamedPaths.has(path))
+            .filter((path) => oldPathByPath.has(path))
             .map((path) => getTrackedDiffTextForPath({
             cwd,
             refsForDiff,
             path,
+            oldPath: oldPathByPath.get(path),
             ignoreWhitespace,
         })));
         const byPath = new Map([...ordinary, ...renamed].map((file) => [file.path, file]));

package/node_modules/@getpaseo/server/dist/server/web-ui/_expo/static/js/web/{desktop-attachment-bridge-9f8115d584725a280c0334788152118e.js → desktop-attachment-bridge-033b357b5b3b822d4c1b8daa262768f7.js}

@@ -1 +1 @@
-__d(function(g,r,i,a,m,e,d){"use strict";Object.defineProperty(e,'__esModule',{value:!0}),e.createDesktopAttachmentBridge=function(){const l=(0,s.createDesktopPreviewUrlResolver)({reader:(0,s.createDesktopFileReader)(),objectUrls:(0,s.createBrowserObjectUrlMinter)()});return{copyFile:t.copyDesktopAttachmentFile,writeBase64:t.writeDesktopAttachmentBase64,writeBytes:t.writeDesktopAttachmentBytes,deleteFile:t.deleteDesktopAttachmentFile,garbageCollect:t.garbageCollectDesktopAttachmentFiles,readFileBase64:s.readDesktopFileBase64,resolvePreviewUrl:t=>l.resolve(t),releasePreviewUrl:t=>l.release(t)}};var t=r(d[0]),s=r(d[1])},5201,[4426,4427]);
+__d(function(g,r,i,a,m,e,d){"use strict";Object.defineProperty(e,'__esModule',{value:!0}),e.createDesktopAttachmentBridge=function(){const l=(0,s.createDesktopPreviewUrlResolver)({reader:(0,s.createDesktopFileReader)(),objectUrls:(0,s.createBrowserObjectUrlMinter)()});return{copyFile:t.copyDesktopAttachmentFile,writeBase64:t.writeDesktopAttachmentBase64,writeBytes:t.writeDesktopAttachmentBytes,deleteFile:t.deleteDesktopAttachmentFile,garbageCollect:t.garbageCollectDesktopAttachmentFiles,readFileBase64:s.readDesktopFileBase64,resolvePreviewUrl:t=>l.resolve(t),releasePreviewUrl:t=>l.release(t)}};var t=r(d[0]),s=r(d[1])},5196,[4426,4427]);

package/node_modules/@getpaseo/server/dist/server/web-ui/_expo/static/js/web/{desktop-attachment-store-97325a18e4df847b34f0f393227301fb.js → desktop-attachment-store-458d14dda83d8704346c02725cc150e4.js}

@@ -1 +1 @@
-__d(function(g,r,i,a,m,e,d){"use strict";Object.defineProperty(e,'__esModule',{value:!0}),e.createDesktopAttachmentStore=function(n){return{storageType:"desktop-file",async save(s){const o=s.id??(0,t.generateAttachmentId)(),l=s.fileName??null;if("file_uri"===s.source.kind)return await c(n,{id:o,uri:s.source.uri,mimeType:s.mimeType,fileName:l});if("data_url"===s.source.kind){const c=(0,t.parseDataUrl)(s.source.dataUrl),p=(0,t.normalizeMimeType)(s.mimeType??c.mimeType);return await y(n,{id:o,base64:c.base64,mimeType:p,fileName:l})}if("bytes"===s.source.kind){const c=(0,t.normalizeMimeType)(s.mimeType);return await p(n,{id:o,bytes:s.source.bytes,mimeType:c,fileName:l})}const f=(0,t.normalizeMimeType)(s.mimeType??s.source.blob.type),u=await(0,t.blobToBase64)(s.source.blob);return await y(n,{id:o,base64:u,mimeType:f,fileName:l})},encodeBase64:async({attachment:t})=>(f(t),await n.readFileBase64(t.storageKey)),resolvePreviewUrl:async({attachment:t})=>(f(t),await n.resolvePreviewUrl(t)),async releasePreviewUrl({attachment:t,url:s}){f(t),await n.releasePreviewUrl({url:s})},async delete({attachment:t}){f(t),await n.deleteFile({path:t.storageKey})},async garbageCollect({referencedIds:t}){await n.garbageCollect({referencedIds:Array.from(t)})}}};var t=r(d[0]);const n={"image/png":".png","image/jpeg":".jpg","image/jpg":".jpg","image/gif":".gif","image/webp":".webp","image/avif":".avif","image/heic":".heic","image/heif":".heif","image/tiff":".tiff","image/bmp":".bmp","image/svg+xml":".svg"};function s(t){const n=t.replace(/\\/g,"/").split("/"),s=n[n.length-1];return s&&s.length>0?s:null}function o(s){const o=(0,t.getFileExtensionFromName)(s.fileName);if(o)return o;const l=(0,t.getFileExtensionFromName)(s.sourcePath);return l||(n[s.mimeType]??".img")}function l(t){return{id:t.id,mimeType:t.mimeType,storageType:"desktop-file",storageKey:t.storagePath,fileName:t.fileName??null,byteSize:t.byteSize,createdAt:Date.now()}}async function c(n,c){const y=(0,t.fileUriToPath)(c.uri),p=c.fileName??s(y),f=(0,t.normalizeMimeType)(c.mimeType),u=o({fileName:p,sourcePath:y,mimeType:f}),T=await n.copyFile({attachmentId:c.id,sourcePath:y,extension:u});return l({id:c.id,mimeType:f,storagePath:T.path,byteSize:T.byteSize,fileName:p})}async function y(t,n){const s=o({fileName:n.fileName,mimeType:n.mimeType}),c=await t.writeBase64({attachmentId:n.id,base64:n.base64,extension:s});return l({id:n.id,mimeType:n.mimeType,storagePath:c.path,byteSize:c.byteSize,fileName:n.fileName})}async function p(t,n){const s=o({fileName:n.fileName,mimeType:n.mimeType}),c=await t.writeBytes({attachmentId:n.id,bytes:n.bytes,extension:s});return l({id:n.id,mimeType:n.mimeType,storagePath:c.path,byteSize:c.byteSize,fileName:n.fileName})}function f(t){if("desktop-file"!==t.storageType)throw new Error(`Unsupported desktop attachment storage type '${t.storageType}'.`)}},5200,[4301]);
+__d(function(g,r,i,a,m,e,d){"use strict";Object.defineProperty(e,'__esModule',{value:!0}),e.createDesktopAttachmentStore=function(n){return{storageType:"desktop-file",async save(s){const o=s.id??(0,t.generateAttachmentId)(),l=s.fileName??null;if("file_uri"===s.source.kind)return await c(n,{id:o,uri:s.source.uri,mimeType:s.mimeType,fileName:l});if("data_url"===s.source.kind){const c=(0,t.parseDataUrl)(s.source.dataUrl),p=(0,t.normalizeMimeType)(s.mimeType??c.mimeType);return await y(n,{id:o,base64:c.base64,mimeType:p,fileName:l})}if("bytes"===s.source.kind){const c=(0,t.normalizeMimeType)(s.mimeType);return await p(n,{id:o,bytes:s.source.bytes,mimeType:c,fileName:l})}const f=(0,t.normalizeMimeType)(s.mimeType??s.source.blob.type),u=await(0,t.blobToBase64)(s.source.blob);return await y(n,{id:o,base64:u,mimeType:f,fileName:l})},encodeBase64:async({attachment:t})=>(f(t),await n.readFileBase64(t.storageKey)),resolvePreviewUrl:async({attachment:t})=>(f(t),await n.resolvePreviewUrl(t)),async releasePreviewUrl({attachment:t,url:s}){f(t),await n.releasePreviewUrl({url:s})},async delete({attachment:t}){f(t),await n.deleteFile({path:t.storageKey})},async garbageCollect({referencedIds:t}){await n.garbageCollect({referencedIds:Array.from(t)})}}};var t=r(d[0]);const n={"image/png":".png","image/jpeg":".jpg","image/jpg":".jpg","image/gif":".gif","image/webp":".webp","image/avif":".avif","image/heic":".heic","image/heif":".heif","image/tiff":".tiff","image/bmp":".bmp","image/svg+xml":".svg"};function s(t){const n=t.replace(/\\/g,"/").split("/"),s=n[n.length-1];return s&&s.length>0?s:null}function o(s){const o=(0,t.getFileExtensionFromName)(s.fileName);if(o)return o;const l=(0,t.getFileExtensionFromName)(s.sourcePath);return l||(n[s.mimeType]??".img")}function l(t){return{id:t.id,mimeType:t.mimeType,storageType:"desktop-file",storageKey:t.storagePath,fileName:t.fileName??null,byteSize:t.byteSize,createdAt:Date.now()}}async function c(n,c){const y=(0,t.fileUriToPath)(c.uri),p=c.fileName??s(y),f=(0,t.normalizeMimeType)(c.mimeType),u=o({fileName:p,sourcePath:y,mimeType:f}),T=await n.copyFile({attachmentId:c.id,sourcePath:y,extension:u});return l({id:c.id,mimeType:f,storagePath:T.path,byteSize:T.byteSize,fileName:p})}async function y(t,n){const s=o({fileName:n.fileName,mimeType:n.mimeType}),c=await t.writeBase64({attachmentId:n.id,base64:n.base64,extension:s});return l({id:n.id,mimeType:n.mimeType,storagePath:c.path,byteSize:c.byteSize,fileName:n.fileName})}async function p(t,n){const s=o({fileName:n.fileName,mimeType:n.mimeType}),c=await t.writeBytes({attachmentId:n.id,bytes:n.bytes,extension:s});return l({id:n.id,mimeType:n.mimeType,storagePath:c.path,byteSize:c.byteSize,fileName:n.fileName})}function f(t){if("desktop-file"!==t.storageType)throw new Error(`Unsupported desktop attachment storage type '${t.storageType}'.`)}},5195,[4301]);