forked from farhoodlabs/paperclip
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>
201 lines
9.3 KiB
TypeScript
201 lines
9.3 KiB
TypeScript
import { execFile } from "node:child_process";
|
|
import { randomUUID } from "node:crypto";
|
|
import fs from "node:fs/promises";
|
|
import os from "node:os";
|
|
import path from "node:path";
|
|
import { promisify } from "node:util";
|
|
import { afterEach, describe, expect, it } from "vitest";
|
|
import type { PluginExecutionWorkspaceMetadata } from "@paperclipai/plugin-sdk";
|
|
import type { WorkspaceDiffQueryOptions } from "../src/contracts.js";
|
|
import { WORKSPACE_DIFF_CAPS, workspaceDiffService } from "../src/workspace-diff.js";
|
|
|
|
const execFileAsync = promisify(execFile);
|
|
const tempDirs = new Set<string>();
|
|
|
|
async function runGit(cwd: string, args: string[]) {
|
|
await execFileAsync("git", ["-C", cwd, ...args], { cwd });
|
|
}
|
|
|
|
async function createTempRepo() {
|
|
const repoRoot = await fs.mkdtemp(path.join(os.tmpdir(), "paperclip-plugin-workspace-diff-"));
|
|
tempDirs.add(repoRoot);
|
|
await runGit(repoRoot, ["init"]);
|
|
await runGit(repoRoot, ["config", "user.name", "Paperclip Test"]);
|
|
await runGit(repoRoot, ["config", "user.email", "test@paperclip.local"]);
|
|
await fs.writeFile(path.join(repoRoot, "tracked-staged.txt"), "alpha\n", "utf8");
|
|
await fs.writeFile(path.join(repoRoot, "tracked-unstaged.txt"), "bravo\n", "utf8");
|
|
await fs.writeFile(path.join(repoRoot, "delete-me.txt"), "charlie\n", "utf8");
|
|
await fs.writeFile(path.join(repoRoot, "rename-me.txt"), "delta\n", "utf8");
|
|
await fs.writeFile(path.join(repoRoot, "binary.bin"), Buffer.from([0, 1, 2, 3]));
|
|
await runGit(repoRoot, ["add", "."]);
|
|
await runGit(repoRoot, ["commit", "-m", "Initial commit"]);
|
|
await runGit(repoRoot, ["branch", "-M", "main"]);
|
|
return repoRoot;
|
|
}
|
|
|
|
function createWorkspace(cwd: string | null, overrides: Partial<PluginExecutionWorkspaceMetadata> = {}): PluginExecutionWorkspaceMetadata {
|
|
return {
|
|
id: randomUUID(),
|
|
companyId: randomUUID(),
|
|
projectId: randomUUID(),
|
|
projectWorkspaceId: null,
|
|
path: cwd,
|
|
cwd,
|
|
repoUrl: null,
|
|
baseRef: null,
|
|
branchName: "feature",
|
|
providerType: "git_worktree",
|
|
providerMetadata: null,
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
function workingTreeQuery(overrides: Partial<WorkspaceDiffQueryOptions> = {}): WorkspaceDiffQueryOptions {
|
|
return {
|
|
view: "working-tree",
|
|
baseRef: null,
|
|
includeUntracked: true,
|
|
paths: [],
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
afterEach(async () => {
|
|
for (const dir of tempDirs) {
|
|
await fs.rm(dir, { recursive: true, force: true });
|
|
}
|
|
tempDirs.clear();
|
|
});
|
|
|
|
describe("plugin workspace diff service", () => {
|
|
it("returns staged, unstaged, renamed, deleted, untracked, binary, and oversized working-tree changes", async () => {
|
|
const repoRoot = await createTempRepo();
|
|
await fs.writeFile(path.join(repoRoot, "tracked-staged.txt"), "alpha\nstaged\n", "utf8");
|
|
await runGit(repoRoot, ["add", "tracked-staged.txt"]);
|
|
await fs.writeFile(path.join(repoRoot, "tracked-unstaged.txt"), "bravo\nunstaged\n", "utf8");
|
|
await runGit(repoRoot, ["mv", "rename-me.txt", "renamed.txt"]);
|
|
await fs.rm(path.join(repoRoot, "delete-me.txt"));
|
|
await fs.writeFile(path.join(repoRoot, "binary.bin"), Buffer.from([0, 1, 2, 3, 4, 5]));
|
|
await fs.writeFile(path.join(repoRoot, "untracked.txt"), "brand new\n", "utf8");
|
|
await fs.writeFile(path.join(repoRoot, "empty-untracked.txt"), "", "utf8");
|
|
await fs.writeFile(path.join(repoRoot, "oversized.txt"), "x".repeat(WORKSPACE_DIFF_CAPS.maxFileBytes + 1), "utf8");
|
|
|
|
const diff = await workspaceDiffService().getDiff(createWorkspace(repoRoot), workingTreeQuery());
|
|
const byPath = new Map(diff.files.map((file) => [file.path, file]));
|
|
|
|
expect(diff.view).toBe("working-tree");
|
|
expect(byPath.get("tracked-staged.txt")).toMatchObject({ staged: true, unstaged: false, status: "modified", additions: 1 });
|
|
expect(byPath.get("tracked-staged.txt")?.patches.map((patch) => patch.kind)).toEqual(["staged"]);
|
|
expect(byPath.get("tracked-unstaged.txt")).toMatchObject({ staged: false, unstaged: true, status: "modified", additions: 1 });
|
|
expect(byPath.get("renamed.txt")).toMatchObject({ oldPath: "rename-me.txt", staged: true, status: "renamed" });
|
|
expect(byPath.get("delete-me.txt")).toMatchObject({ unstaged: true, status: "deleted", deletions: 1 });
|
|
expect(byPath.get("untracked.txt")).toMatchObject({ untracked: true, status: "untracked", additions: 1 });
|
|
expect(byPath.get("untracked.txt")?.patches[0]?.patch).toContain("+brand new");
|
|
expect(byPath.get("empty-untracked.txt")?.patches[0]?.patch).toBe([
|
|
"diff --git a/empty-untracked.txt b/empty-untracked.txt",
|
|
"new file mode 100644",
|
|
"--- /dev/null",
|
|
"+++ b/empty-untracked.txt",
|
|
"",
|
|
].join("\n"));
|
|
expect(byPath.get("binary.bin")).toMatchObject({ binary: true, unstaged: true });
|
|
expect(byPath.get("oversized.txt")).toMatchObject({ oversized: true, untracked: true });
|
|
expect(diff.warnings.map((item) => item.code)).toEqual(expect.arrayContaining(["binary_file", "file_oversized"]));
|
|
}, 20_000);
|
|
|
|
it("returns head diffs against the requested base ref", async () => {
|
|
const repoRoot = await createTempRepo();
|
|
await runGit(repoRoot, ["checkout", "-b", "feature"]);
|
|
await fs.writeFile(path.join(repoRoot, "tracked-staged.txt"), "alpha\ncommitted\n", "utf8");
|
|
await runGit(repoRoot, ["add", "tracked-staged.txt"]);
|
|
await runGit(repoRoot, ["commit", "-m", "Feature change"]);
|
|
|
|
const diff = await workspaceDiffService().getDiff(
|
|
createWorkspace(repoRoot, { baseRef: "main" }),
|
|
workingTreeQuery({ view: "head", includeUntracked: false }),
|
|
);
|
|
|
|
expect(diff.baseRef).toBe("main");
|
|
expect(diff.files).toHaveLength(1);
|
|
expect(diff.files[0]).toMatchObject({
|
|
path: "tracked-staged.txt",
|
|
staged: false,
|
|
unstaged: false,
|
|
untracked: false,
|
|
additions: 1,
|
|
deletions: 0,
|
|
});
|
|
expect(diff.files[0]?.patches.map((patch) => patch.kind)).toEqual(["head"]);
|
|
}, 20_000);
|
|
|
|
it("filters changed files by relative workspace paths", async () => {
|
|
const repoRoot = await createTempRepo();
|
|
await fs.writeFile(path.join(repoRoot, "tracked-staged.txt"), "alpha\none\n", "utf8");
|
|
await fs.writeFile(path.join(repoRoot, "tracked-unstaged.txt"), "bravo\ntwo\n", "utf8");
|
|
|
|
const diff = await workspaceDiffService().getDiff(
|
|
createWorkspace(repoRoot),
|
|
workingTreeQuery({ paths: ["tracked-staged.txt"] }),
|
|
);
|
|
|
|
expect(diff.paths).toEqual(["tracked-staged.txt"]);
|
|
expect(diff.files.map((file) => file.path)).toEqual(["tracked-staged.txt"]);
|
|
}, 20_000);
|
|
|
|
it("applies output caps to large workspace responses", async () => {
|
|
const repoRoot = await createTempRepo();
|
|
for (let index = 0; index < WORKSPACE_DIFF_CAPS.maxFiles + 1; index += 1) {
|
|
await fs.writeFile(path.join(repoRoot, `untracked-${String(index).padStart(3, "0")}.txt`), "", "utf8");
|
|
}
|
|
|
|
const diff = await workspaceDiffService().getDiff(createWorkspace(repoRoot), workingTreeQuery());
|
|
|
|
expect(diff.files).toHaveLength(WORKSPACE_DIFF_CAPS.maxFiles);
|
|
expect(diff.truncated).toBe(true);
|
|
expect(diff.warnings).toContainEqual(expect.objectContaining({ code: "file_count_truncated" }));
|
|
}, 20_000);
|
|
|
|
it("does not follow untracked symlinks outside the repo", async () => {
|
|
const repoRoot = await createTempRepo();
|
|
const outsideDir = await fs.mkdtemp(path.join(os.tmpdir(), "paperclip-plugin-workspace-diff-secret-"));
|
|
tempDirs.add(outsideDir);
|
|
const secretContent = "external secret should not appear\n";
|
|
const secretPath = path.join(outsideDir, "secret.txt");
|
|
await fs.writeFile(secretPath, secretContent, "utf8");
|
|
await fs.symlink(secretPath, path.join(repoRoot, "leak.txt"));
|
|
|
|
const diff = await workspaceDiffService().getDiff(createWorkspace(repoRoot), workingTreeQuery());
|
|
const leak = diff.files.find((file) => file.path === "leak.txt");
|
|
const serialized = JSON.stringify(diff);
|
|
|
|
expect(leak).toMatchObject({ untracked: true, status: "untracked", additions: 0, sizeBytes: null });
|
|
expect(leak?.patches[0]).toMatchObject({
|
|
kind: "untracked",
|
|
patch: null,
|
|
warnings: [expect.objectContaining({ code: "symlink_target_outside_workspace" })],
|
|
});
|
|
expect(diff.warnings).toContainEqual(expect.objectContaining({
|
|
code: "symlink_target_outside_workspace",
|
|
path: "leak.txt",
|
|
}));
|
|
expect(serialized).not.toContain(secretContent.trim());
|
|
}, 20_000);
|
|
|
|
it("surfaces missing cwd, non-git, invalid base refs, and unsafe path filters as plugin errors", async () => {
|
|
const svc = workspaceDiffService();
|
|
await expect(svc.getDiff(createWorkspace(null), workingTreeQuery()))
|
|
.rejects.toMatchObject({ status: 422, details: { code: "missing_cwd" } });
|
|
|
|
const nonGitDir = await fs.mkdtemp(path.join(os.tmpdir(), "paperclip-plugin-workspace-diff-non-git-"));
|
|
tempDirs.add(nonGitDir);
|
|
await expect(svc.getDiff(createWorkspace(nonGitDir), workingTreeQuery()))
|
|
.rejects.toMatchObject({ status: 422, details: { code: "non_git_workspace" } });
|
|
|
|
const repoRoot = await createTempRepo();
|
|
await expect(svc.getDiff(createWorkspace(repoRoot), workingTreeQuery({ paths: ["../secret"] })))
|
|
.rejects.toMatchObject({ status: 422, details: { code: "path_filter_invalid" } });
|
|
await expect(svc.getDiff(createWorkspace(repoRoot), workingTreeQuery({ view: "head", baseRef: "missing-ref" })))
|
|
.rejects.toMatchObject({ status: 422, details: { code: "base_ref_invalid" } });
|
|
}, 20_000);
|
|
});
|