Skip to content

🧹 Janitor: Refactor canonical checking to use new is_canonical API - #301

Open
matta wants to merge 1 commit into
mainfrom
janitor/refactor-is-canonical-14174081800138709368
Open

🧹 Janitor: Refactor canonical checking to use new is_canonical API#301
matta wants to merge 1 commit into
mainfrom
janitor/refactor-is-canonical-14174081800138709368

Conversation

@matta

@matta matta commented Mar 16, 2026

Copy link
Copy Markdown
Owner

📉 Diff: +11 lines, -11 lines
🎯 Goal: Factoring common logic into modular APIs
💡 Before: The logic to check if a task's disk content matched its canonical string form was duplicated verbatim across commands_diagnostics.rs and commands_fix.rs. This leaked model logic into the command implementations.
✨ After: A new is_canonical API exists directly on TaskNode, keeping command implementations clean and semantic.
✅ Verification: cargo check, cargo fmt, cargo clippy, and just test all pass. Architecture learning logged in .jules/janitor.md.


PR created automatically by Jules for task 14174081800138709368 started by @matta

Extracted duplicated logic for checking if a task file matches its
canonical format (reading disk, generating canonical, comparing) out
of `commands_diagnostics.rs` and `commands_fix.rs`.

Added `is_canonical` method to `TaskNode` model in `models.rs`
to serve as a clean API.

Co-authored-by: matta <37314+matta@users.noreply.github.com>
@google-labs-jules

Copy link
Copy Markdown
Contributor

👋 Jules, reporting for duty! I'm here to lend a hand with this pull request.

When you start a review, I'll add a 👀 emoji to each comment to let you know I've read it. I'll focus on feedback directed at me and will do my best to stay out of conversations between you and other bots or reviewers to keep the noise down.

I'll push a commit with your requested changes shortly after. Please note there might be a delay between these steps, but rest assured I'm on the job!

For more direct control, you can switch me to Reactive Mode. When this mode is on, I will only act on comments where you specifically mention me with @jules. You can find this option in the Pull Request section of your global Jules UI settings. You can always switch back!

New to Jules? Learn more at jules.google/docs.


For security, I will only act on instructions from the user who triggered this task.

@trunk-io

trunk-io Bot commented Mar 16, 2026

Copy link
Copy Markdown
Contributor

Merging to main in this repository is managed by Trunk.

  • To merge this pull request, check the box to the left or comment /trunk merge below.

@gemini-code-assist

Copy link
Copy Markdown
Contributor

Summary of Changes

Hello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request significantly improves the codebase's modularity by extracting and centralizing the logic for verifying the canonical state of task files. By introducing a dedicated is_canonical method on the TaskNode model, it removes redundant code from command implementations and ensures that model-specific logic resides within the model itself, making the system more maintainable and easier to understand.

Highlights

  • Refactored Canonical Check: Centralized the logic for checking if a task's disk content matches its canonical string form into a new is_canonical API on the TaskNode model.
  • Code Duplication Removed: Eliminated duplicated canonical checking logic previously found in commands_diagnostics.rs and commands_fix.rs, leading to cleaner command implementations.
  • Architectural Learning Documented: Documented the architectural learning and rationale behind this refactoring in a new .jules/janitor.md file.
Changelog
  • .jules/janitor.md
    • Added a new architectural learning log entry detailing the rationale for centralizing canonical checks.
  • crates/pebble/src/commands_diagnostics.rs
    • Removed direct file system access and replaced the manual canonical content check with a call to node.is_canonical().
    • Removed unused std::fs import.
  • crates/pebble/src/commands_fix.rs
    • Removed direct file system access and replaced the manual canonical content check with a call to node.is_canonical().
    • Removed unused std::fs import.
  • crates/pebble/src/models.rs
    • Added a new public method is_canonical to the TaskNode struct, encapsulating the logic for comparing disk content with canonical content.
    • Implemented file system read operations within the new is_canonical method.
Activity
  • PR created automatically by Jules for task 14174081800138709368, initiated by @matta.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request is a good refactoring that centralizes the logic for checking if a task's on-disk representation is canonical. The new TaskNode::is_canonical method simplifies the call sites in commands_diagnostics.rs and commands_fix.rs and improves code clarity. I have one minor suggestion to optimize the implementation of the new method to fail faster on I/O errors.

Comment on lines +355 to +357
let canonical_content = self.get_content_for_disk()?;
let disk_content = fs::read_to_string(&self.path)?;
Ok(disk_content == canonical_content)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

To improve performance and fail faster, it's better to read from disk before generating the canonical content. If reading the file fails, we can avoid the CPU work of serializing the task content. This also aligns with the order of operations in the original code before this refactoring.

Suggested change
let canonical_content = self.get_content_for_disk()?;
let disk_content = fs::read_to_string(&self.path)?;
Ok(disk_content == canonical_content)
let disk_content = fs::read_to_string(&self.path)?;
let canonical_content = self.get_content_for_disk()?;
Ok(disk_content == canonical_content)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant