Repository navigation
feat(checkpoints): per-step change cards and changeCardDetail setting (B3a, #1375) #1411
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
easonLiangWorldedtech
wants to merge
1
commit into
Zoo-Code-Org:main
Choose a base branch
from
easonLiangWorldedtech:feat/change-cards-b3a
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| import { describe, expect, it } from "vitest" | ||
|
|
||
| import type { ChangeCardData } from "@roo-code/types" | ||
|
|
||
| import { | ||
| buildChangeCard, | ||
| buildChangeCardPayload, | ||
| isAutoApprovedStep, | ||
| resolveChangeCardDetail, | ||
| type ChangeCardWrite, | ||
| } from "../changeCard" | ||
|
|
||
| describe("changeCard (B3a)", () => { | ||
| function write(overrides: Partial<ChangeCardWrite> = {}): ChangeCardWrite { | ||
| return { | ||
| path: "src/a.ts", | ||
| diffStats: { additions: 2, deletions: 1 }, | ||
| diff: "--- a/src/a.ts\n+++ b/src/a.ts\n@@ -1 +1,2 @@\n-old\n+new-1\n+new-2", | ||
| ...overrides, | ||
| } | ||
| } | ||
|
|
||
| describe("isAutoApprovedStep", () => { | ||
| it("returns false for an empty step", () => { | ||
| expect(isAutoApprovedStep([])).toBe(false) | ||
| }) | ||
|
|
||
| it("returns true only when every write was auto-approved", () => { | ||
| expect(isAutoApprovedStep([write({ autoApproved: true }), write({ autoApproved: true })])).toBe(true) | ||
| expect(isAutoApprovedStep([write({ autoApproved: true }), write()])).toBe(false) | ||
| expect(isAutoApprovedStep([write()])).toBe(false) | ||
| }) | ||
| }) | ||
|
|
||
| describe("resolveChangeCardDetail", () => { | ||
| it("forces summary for auto-approved steps even when the setting is full", () => { | ||
| const writes = [write({ autoApproved: true })] | ||
| expect(resolveChangeCardDetail(writes, "full")).toBe("summary") | ||
| expect(resolveChangeCardDetail(writes, undefined)).toBe("summary") | ||
| }) | ||
|
|
||
| it("follows the setting for interactive steps, defaulting to summary when unset", () => { | ||
| const writes = [write()] | ||
| expect(resolveChangeCardDetail(writes, "full")).toBe("full") | ||
| expect(resolveChangeCardDetail(writes, "summary")).toBe("summary") | ||
| expect(resolveChangeCardDetail(writes, undefined)).toBe("summary") | ||
| }) | ||
| }) | ||
|
|
||
| describe("buildChangeCard", () => { | ||
| it("carries the inline diff per file for full detail on a multi-file step", () => { | ||
| const card = buildChangeCard( | ||
| "sha-1", | ||
| [write(), write({ path: "src/b.ts", diffStats: { additions: 1, deletions: 0 }, diff: "+b" })], | ||
| "full", | ||
| ) | ||
|
|
||
| expect(card).toEqual({ | ||
| checkpointIds: ["sha-1"], | ||
| files: [ | ||
| { | ||
| path: "src/a.ts", | ||
| additions: 2, | ||
| deletions: 1, | ||
| diff: "--- a/src/a.ts\n+++ b/src/a.ts\n@@ -1 +1,2 @@\n-old\n+new-1\n+new-2", | ||
| }, | ||
| { path: "src/b.ts", additions: 1, deletions: 0, diff: "+b" }, | ||
| ], | ||
| totalFiles: 2, | ||
| detail: "full", | ||
| }) | ||
| }) | ||
|
|
||
| it("omits the diff per file for summary detail (lazy fetch is B3b)", () => { | ||
| const card = buildChangeCard("sha-1", [write()], "summary") | ||
|
|
||
| expect(card.files).toEqual([{ path: "src/a.ts", additions: 2, deletions: 1 }]) | ||
| expect(card.files[0]).not.toHaveProperty("diff") | ||
| expect(card.detail).toBe("summary") | ||
| expect(card.totalFiles).toBe(1) | ||
| }) | ||
|
|
||
| it("defaults missing diffStats to zero counts and keeps full detail without diff for a write without one", () => { | ||
| const card = buildChangeCard("sha-1", [write({ diffStats: undefined, diff: undefined })], "full") | ||
|
|
||
| expect(card.files[0]).toEqual({ path: "src/a.ts", additions: 0, deletions: 0 }) | ||
| }) | ||
| }) | ||
|
|
||
| describe("buildChangeCardPayload", () => { | ||
| it("resolves the detail level and builds the payload in one call", () => { | ||
| // The expectations are typed against the shared ChangeCardData | ||
| // contract in @roo-code/types, so the builder's output is checked | ||
| // against the same single source of truth the webview consumes. | ||
| // Interactive step with the full setting: diff inline. | ||
| const full: ChangeCardData = buildChangeCardPayload("sha-1", [write()], "full") | ||
| expect(full.detail).toBe("full") | ||
| expect(full.files[0].diff).toBe("--- a/src/a.ts\n+++ b/src/a.ts\n@@ -1 +1,2 @@\n-old\n+new-1\n+new-2") | ||
|
coderabbitai[bot] marked this conversation as resolved.
Resolved
|
||
|
|
||
| // Auto-approved step with the full setting: compact summary, no diff. | ||
| const compact: ChangeCardData = buildChangeCardPayload("sha-1", [write({ autoApproved: true })], "full") | ||
| expect(compact.detail).toBe("summary") | ||
| expect(compact.files[0]).not.toHaveProperty("diff") | ||
| expect(compact.checkpointIds).toEqual(["sha-1"]) | ||
| expect(compact.totalFiles).toBe(1) | ||
| }) | ||
| }) | ||
| }) | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.