5071c4c776
## Thinking Path > - Paperclip orchestrates AI agents for zero-human companies. > - Operators need to inspect what agents changed inside execution and project workspaces. > - The existing workspace detail views did not provide a first-party rich diff surface for staged, unstaged, head, renamed, binary, oversized, and untracked changes. > - The plugin system is the intended extension point for optional rich UI surfaces. > - This pull request adds a workspace diff plugin plus host services and shared contracts so Changes tabs can render workspace diffs through plugin slots. > - The diff-renderer dependency should stay owned by the plugin package rather than the core UI app. > - The dependency surface must stay aligned with repository PR policy, including intentionally omitting `pnpm-lock.yaml` from the PR. > - The benefit is a more reviewable workspace surface without hard-coding the renderer into every page. ## What Changed - Added `@paperclipai/plugin-workspace-diff`, including diff normalization, plugin manifest/worker/UI entrypoints, and focused plugin tests. - Kept `@pierre/diffs` scoped to `@paperclipai/plugin-workspace-diff`; removed the core UI lab diff-renderer surface and direct UI package dependency. - Added shared workspace diff types and validators, plus plugin SDK surface for workspace diff host services. - Added server workspace diff service support and route coverage for execution/project workspace diff flows. - Wired Execution Workspace and Project Workspace Changes tabs to load the diff plugin, including loading/error fallback behavior. - Added UI tests and fixtures for the Changes tabs and plugin bridge behavior. - Added the new plugin package manifest to the Docker deps stage so PR policy can validate dependency coverage. - Addressed review hardening around empty untracked patches, workspace path exposure, project workspace read capability checks, and default base refs. ## Verification - `pnpm --filter @paperclipai/plugin-workspace-diff test` - `pnpm exec vitest run packages/shared/src/validators/workspace-diff.test.ts server/src/__tests__/workspace-diff-service.test.ts ui/src/pages/ProjectWorkspaceDetail.test.tsx ui/src/pages/ExecutionWorkspaceDetail.test.tsx` - `pnpm exec vitest run ui/src/plugins/bridge.test.ts server/src/__tests__/workspace-runtime-routes-authz.test.ts` - `pnpm --filter @paperclipai/shared typecheck` - `pnpm --filter @paperclipai/plugin-workspace-diff typecheck` - `pnpm --filter @paperclipai/server typecheck` - `pnpm --filter @paperclipai/ui typecheck` - `node ./scripts/check-docker-deps-stage.mjs` - Browser screenshot captured from the local worktree dev server: https://files.catbox.moe/ofdpsp.png - Confirmed branch is rebased onto `public-gh/master`, `.github/workflows/pr.yml` is not included in the PR diff, `ui/package.json` is not included in the PR diff, and `pnpm-lock.yaml` is not included in the PR diff. ## Risks - Medium UI integration risk: the Changes tab depends on the plugin slot and host diff service path. - Medium dependency risk: this adds `@pierre/diffs` in the plugin package, but `pnpm-lock.yaml` is intentionally omitted per packaging instructions because repository automation manages lockfile updates. - Current CI blocker: downstream frozen installs fail until the repository policy path for new plugin package dependencies is chosen. - Diff rendering edge cases are covered for common working-tree and head diff states, but very large repositories may still expose performance limits. - No migrations are included. > For core feature work, check [`ROADMAP.md`](ROADMAP.md) first and discuss it in `#dev` before opening the PR. Feature PRs that overlap with planned core work may need to be redirected — check the roadmap first. See `CONTRIBUTING.md`. ## Model Used - OpenAI Codex, GPT-5 class coding model, tool-enabled local execution environment. Exact context window was not exposed by the runtime. ## Checklist - [x] I have included a thinking path that traces from project context to this change - [x] I have specified the model used (with version and capability details) - [x] I have checked ROADMAP.md and confirmed this PR does not duplicate planned core work - [x] I have run tests locally and they pass - [x] I have added or updated tests where applicable - [x] If this change affects the UI, I have included before/after screenshots - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented any risks above - [x] I will address all Greptile and reviewer comments before requesting merge --------- Co-authored-by: Paperclip <noreply@paperclip.ing>
194 lines
5.8 KiB
TypeScript
194 lines
5.8 KiB
TypeScript
import { describe, expect, it } from "vitest";
|
|
import {
|
|
buildFilePatch,
|
|
buildFilePatches,
|
|
diffSummary,
|
|
initialExpandedFileSet,
|
|
LONG_DIFF_LINE_THRESHOLD,
|
|
nextExpandedFileSet,
|
|
statusLabel,
|
|
toFileViewModels,
|
|
} from "../src/diff-model.js";
|
|
import { changedFile, diffResponse } from "./fixtures.js";
|
|
|
|
describe("workspace diff UI model", () => {
|
|
it("summarizes changed files and line counts", () => {
|
|
const diff = diffResponse();
|
|
|
|
expect(diffSummary(diff)).toMatchObject({
|
|
changedLabel: "1 file",
|
|
lineLabel: "+1 / -1",
|
|
warningCount: 0,
|
|
truncated: false,
|
|
});
|
|
expect(toFileViewModels(diff)[0]).toMatchObject({
|
|
path: "src/app.ts",
|
|
status: "modified",
|
|
patchKinds: ["unstaged"],
|
|
lineCount: 7,
|
|
longDiff: false,
|
|
});
|
|
});
|
|
|
|
it("represents empty workspace diffs", () => {
|
|
const diff = diffResponse({ files: [] });
|
|
|
|
expect(toFileViewModels(diff)).toEqual([]);
|
|
expect(diffSummary(diff).changedLabel).toBe("0 files");
|
|
});
|
|
|
|
it("surfaces truncation and file warnings", () => {
|
|
const warning = { code: "patch_truncated" as const, message: "Patch was truncated.", path: "src/app.ts" };
|
|
const file = changedFile({
|
|
truncated: true,
|
|
warnings: [warning],
|
|
patches: [],
|
|
});
|
|
const diff = diffResponse({ files: [file], truncated: true, warnings: [warning] });
|
|
|
|
expect(buildFilePatch(file)).toBeNull();
|
|
expect(toFileViewModels(diff)[0]?.warnings).toEqual([warning]);
|
|
expect(diffSummary(diff)).toMatchObject({
|
|
warningCount: 1,
|
|
truncated: true,
|
|
});
|
|
});
|
|
|
|
it("does not duplicate aggregated patch warnings", () => {
|
|
const warning = { code: "patch_truncated" as const, message: "Patch was truncated.", path: "src/app.ts" };
|
|
const file = changedFile({
|
|
warnings: [warning],
|
|
patches: [
|
|
{
|
|
kind: "unstaged",
|
|
patch: null,
|
|
additions: 0,
|
|
deletions: 0,
|
|
binary: false,
|
|
oversized: false,
|
|
truncated: true,
|
|
warnings: [warning],
|
|
},
|
|
],
|
|
});
|
|
const diff = diffResponse({ files: [file], warnings: [warning] });
|
|
|
|
expect(toFileViewModels(diff)[0]?.warnings).toEqual([warning]);
|
|
expect(diffSummary(diff).warningCount).toBe(1);
|
|
});
|
|
|
|
it("keeps staged and unstaged patches renderable as separate single-file diffs", () => {
|
|
const stagedPatch = [
|
|
"diff --git a/src/app.ts b/src/app.ts",
|
|
"index 1111111..2222222 100644",
|
|
"--- a/src/app.ts",
|
|
"+++ b/src/app.ts",
|
|
"@@ -1 +1 @@",
|
|
"-export const value = 1;",
|
|
"+export const value = 2;",
|
|
"",
|
|
].join("\n");
|
|
const unstagedPatch = [
|
|
"diff --git a/src/app.ts b/src/app.ts",
|
|
"index 2222222..3333333 100644",
|
|
"--- a/src/app.ts",
|
|
"+++ b/src/app.ts",
|
|
"@@ -3 +3 @@",
|
|
"-export const label = 'old';",
|
|
"+export const label = 'new';",
|
|
"",
|
|
].join("\n");
|
|
const file = changedFile({
|
|
staged: true,
|
|
unstaged: true,
|
|
patches: [
|
|
{
|
|
kind: "staged",
|
|
patch: stagedPatch,
|
|
additions: 1,
|
|
deletions: 1,
|
|
binary: false,
|
|
oversized: false,
|
|
truncated: false,
|
|
warnings: [],
|
|
},
|
|
{
|
|
kind: "unstaged",
|
|
patch: unstagedPatch,
|
|
additions: 1,
|
|
deletions: 1,
|
|
binary: false,
|
|
oversized: false,
|
|
truncated: false,
|
|
warnings: [],
|
|
},
|
|
],
|
|
});
|
|
|
|
const patches = buildFilePatches(file);
|
|
const viewModel = toFileViewModels(diffResponse({ files: [file] }))[0];
|
|
|
|
expect(buildFilePatch(file)).toBe(stagedPatch.trimEnd());
|
|
expect(patches.map((patch) => patch.kind)).toEqual(["staged", "unstaged"]);
|
|
expect(patches.map((patch) => patch.patch?.match(/^diff --git/gm)?.length ?? 0)).toEqual([1, 1]);
|
|
expect(viewModel?.patches).toHaveLength(2);
|
|
expect(viewModel?.patchKinds).toEqual(["staged", "unstaged"]);
|
|
});
|
|
|
|
it("marks long text diffs so the UI can fold them by default", () => {
|
|
const longPatch = [
|
|
"diff --git a/src/large.ts b/src/large.ts",
|
|
"index 1111111..2222222 100644",
|
|
"--- a/src/large.ts",
|
|
"+++ b/src/large.ts",
|
|
"@@ -1,1 +1,1 @@",
|
|
...Array.from({ length: LONG_DIFF_LINE_THRESHOLD }, (_, index) => `+export const value${index} = ${index};`),
|
|
"",
|
|
].join("\n");
|
|
const files = toFileViewModels(diffResponse({
|
|
files: [
|
|
changedFile({ path: "src/small.ts" }),
|
|
changedFile({
|
|
path: "src/large.ts",
|
|
additions: LONG_DIFF_LINE_THRESHOLD,
|
|
deletions: 0,
|
|
patches: [
|
|
{
|
|
kind: "unstaged",
|
|
patch: longPatch,
|
|
additions: LONG_DIFF_LINE_THRESHOLD,
|
|
deletions: 0,
|
|
binary: false,
|
|
oversized: false,
|
|
truncated: false,
|
|
warnings: [],
|
|
},
|
|
],
|
|
}),
|
|
],
|
|
}));
|
|
const longFile = files.find((file) => file.path === "src/large.ts");
|
|
const defaultExpanded = initialExpandedFileSet(files);
|
|
|
|
expect(longFile?.lineCount).toBeGreaterThan(LONG_DIFF_LINE_THRESHOLD);
|
|
expect(longFile?.longDiff).toBe(true);
|
|
expect(defaultExpanded.has("src/small.ts")).toBe(true);
|
|
expect(defaultExpanded.has("src/large.ts")).toBe(false);
|
|
});
|
|
|
|
it("toggles expanded file state without mutating the current set", () => {
|
|
const current = new Set(["a.ts"]);
|
|
const collapsed = nextExpandedFileSet(current, "a.ts");
|
|
const expanded = nextExpandedFileSet(current, "b.ts");
|
|
|
|
expect(current.has("a.ts")).toBe(true);
|
|
expect(collapsed.has("a.ts")).toBe(false);
|
|
expect(expanded.has("b.ts")).toBe(true);
|
|
});
|
|
|
|
it("labels file statuses for the sidebar", () => {
|
|
expect(statusLabel("untracked")).toBe("Untracked");
|
|
expect(statusLabel("type_changed")).toBe("Type changed");
|
|
});
|
|
});
|