cherry-files-toolkit 0.1.0__py3-none-any.whl

cherry_files_toolkit/main.py

@@ -0,0 +1,39 @@
+from textual.app import App, ComposeResult
+from textual.binding import Binding
+from textual.widgets import Header, Footer
+from textual.containers import Horizontal
+
+from cherry_files_toolkit.modules.cherry_files_diff import CherryFilesDiff
+from cherry_files_toolkit.modules.cherry_files_picker import CherryFilesPicker
+
+
+class MyApp(App):
+    CSS = """
+        CherryFilesDiff {
+            width: 40%;
+        }
+
+        CherryFilesPicker {
+            width: 60%;
+        }
+    """
+
+    BINDINGS = [
+        Binding(key="ctrl+q", action="quit", description="[Ctrl+q]Quit the app")
+    ]
+
+    def compose(self) -> ComposeResult:
+        with Horizontal():
+            yield Header(icon="🍒")
+            yield CherryFilesDiff()
+            yield CherryFilesPicker()
+            yield Footer(show_command_palette=True)
+
+    def on_mount(self) -> None:
+        self.title = "Cherry Files Toolkit"
+
+def run() -> None:
+    MyApp().run()
+
+if __name__ == "__main__":
+    run()

cherry_files_toolkit/modules/__init__.py

@@ -0,0 +1,2 @@
+"""Textual UI modules."""
+

cherry_files_toolkit/modules/cherry_files_diff.py

@@ -0,0 +1,244 @@
+from textual.app import ComposeResult
+from textual import on
+from textual.containers import Horizontal, Vertical, VerticalScroll
+from textual.widgets import Button, Label
+
+from cherry_files_toolkit.utilities.git_functions import (
+    get_branches,
+    get_divergence_point,
+    get_all_changed_files,
+)
+from cherry_files_toolkit.widgets.filterable_option_picker import FilterableOptionPicker
+
+
+class CherryFilesDiff(Vertical):
+    DEFAULT_CSS = """
+    #cherry_files_diff_summary_label,
+    #divergent_branch Label,
+    #base_branch Label {
+        text-style: bold;
+        padding-bottom: 1;
+        padding-top: 1;
+    }
+
+    #cherry_files_diff_summary_header {
+        height: 1;
+        margin-bottom: 0;
+    }
+
+    #files_scroll_container {
+        margin-top: 1;
+        padding-bottom: 1;
+    }
+
+    #files_scroll_container .cherry_files_diff_added_files,
+    #files_scroll_container .cherry_files_diff_modified_files,
+    #files_scroll_container .cherry_files_diff_deleted_files {
+        text-style: bold;
+        padding-bottom: 1;
+        padding-top: 1;
+    }
+    """
+
+    def compose(self) -> ComposeResult:
+        with Vertical(id="cherry_files_diff"):
+            yield Label(
+                "Cherry Files Diff", classes="header", variant="primary", expand=True
+            )
+            with Vertical(classes="branches_selector"):
+                with Horizontal():
+                    yield FilterableOptionPicker(
+                        label="[1] Divergent Branch",
+                        id="divergent_branch",
+                        classes="container",
+                    )
+                    yield FilterableOptionPicker(
+                        label="[2] Base Branch", id="base_branch", classes="container"
+                    )
+                yield Button(
+                    "Start Diff Checker",
+                    id="start_diff_checker",
+                    variant="primary",
+                    flat=True,
+                )
+            with Vertical(id="cherry_files_diff_summary"):
+                yield Label("[3] Summary", id="cherry_files_diff_summary_label")
+                with Horizontal(id="cherry_files_diff_summary_header"):
+                    yield Label(
+                        id="cherry_files_diff_summary_added",
+                        classes="cherry_files_diff_added_files",
+                    )
+                    yield Label(
+                        id="cherry_files_diff_summary_modified",
+                        classes="cherry_files_diff_modified_files",
+                    )
+                    yield Label(
+                        id="cherry_files_diff_summary_deleted",
+                        classes="cherry_files_diff_deleted_files",
+                    )
+                    yield Label(id="cherry_files_diff_summary_counter")
+                yield VerticalScroll(id="files_scroll_container")
+
+    def on_mount(self) -> None:
+        branches = get_branches()
+        if len(branches) == 0:
+            self.notify(
+                "No branches found. Please make sure to be in a git repo",
+                severity="error",
+            )
+            return
+        self.query_one("#base_branch", FilterableOptionPicker).set_items(branches)
+        self.query_one("#divergent_branch", FilterableOptionPicker).set_items(branches)
+
+    @on(Button.Pressed, "#start_diff_checker")
+    async def start_diff_checker_handler(self) -> None:
+        base_branch = self.query_one(
+            "#base_branch", FilterableOptionPicker
+        ).get_search_value()
+        divergent_branch = self.query_one(
+            "#divergent_branch", FilterableOptionPicker
+        ).get_search_value()
+
+        if base_branch.strip() == "":
+            self.notify(
+                "Please select a Base Branch",
+                title="Cherry Diff Files",
+                severity="warning",
+            )
+            return
+
+        if divergent_branch.strip() == "":
+            self.notify(
+                "Please select a Divergent Branch",
+                title="Cherry Diff Files",
+                severity="warning",
+            )
+            return
+
+        if base_branch.strip() == divergent_branch.strip():
+            self.notify(
+                "Base and Divergent branches must be different",
+                severity="error",
+                title="Cherry Diff Files",
+            )
+            return
+
+        await self.files_diff(base_branch, divergent_branch)
+
+    async def files_diff(self, base: str, divergent: str) -> None:
+        commit_id = get_divergence_point(base=base, branch=divergent)
+        changed_files = get_all_changed_files(divergent=divergent, commit_id=commit_id)
+        added_files, modified_files, deleted_files = self.parsed_files(changed_files)
+        await self.render_files(added_files, modified_files, deleted_files)
+
+    async def render_files(self, added_files, modified_files, deleted_files) -> None:
+        files_container = self.query_one("#files_scroll_container", VerticalScroll)
+        cherry_files_diff_summary_added = self.query_one(
+            "#cherry_files_diff_summary_added", Label
+        )
+        cherry_files_diff_summary_modified = self.query_one(
+            "#cherry_files_diff_summary_modified", Label
+        )
+        cherry_files_diff_summary_deleted = self.query_one(
+            "#cherry_files_diff_summary_deleted", Label
+        )
+        cherry_files_diff_summary_counter = self.query_one(
+            "#cherry_files_diff_summary_counter", Label
+        )
+
+        added_files_counter = len(added_files)
+        modified_files_counter = len(modified_files)
+        deleted_files_counter = len(deleted_files)
+
+        # SUMMARY
+        cherry_files_diff_summary_added.update(f"+{added_files_counter} created || ")
+        cherry_files_diff_summary_modified.update(
+            f"~{modified_files_counter} modified || "
+        )
+        cherry_files_diff_summary_deleted.update(
+            f"-{deleted_files_counter} deleted || "
+        )
+        cherry_files_diff_summary_counter.update(
+            f"Total: {added_files_counter + modified_files_counter + deleted_files_counter} files touched"
+        )
+
+        # Render trees
+        await files_container.remove_children()
+        await self.render_tree_files(
+            "CREATED FILES", "cherry_files_diff_added_files", added_files
+        )
+        await self.render_tree_files(
+            "MODIFIED FILES", "cherry_files_diff_modified_files", modified_files
+        )
+        await self.render_tree_files(
+            "DELETED FILES", "cherry_files_diff_deleted_files", deleted_files
+        )
+
+    async def render_tree_files(
+        self, label: str, label_class: str, files: list[str]
+    ) -> None:
+        files_container = self.query_one("#files_scroll_container", VerticalScroll)
+        await files_container.mount(Label(label, classes=label_class))
+        if len(files) == 0:
+            return
+        await files_container.mount(Label("📂 root", classes="parent_directory"))
+        tree = self.build_tree(files)
+        await self.render_tree(tree)
+
+    async def render_tree(self, tree, prefix=""):
+        files_container = self.query_one("#files_scroll_container", VerticalScroll)
+        entries = list(tree.items())
+        for i, (name, subtree) in enumerate(entries):
+            is_last = i == len(entries) - 1
+            connector = ""
+            if is_last and not subtree:
+                connector = "└── "
+            elif subtree:
+                connector = "├── 📂 "
+            else:
+                connector = "├── "
+            #            connector = if is_last and not subtree elif subtree "-" else "├── "
+            classes = "parent_directory" if subtree else ""
+            await files_container.mount(
+                Label(prefix + connector + name, classes=classes)
+            )
+            self.log(prefix + connector + name)
+            if subtree:
+                extension = "    " if is_last else "│   "
+                await self.render_tree(subtree, prefix + extension)
+
+    def parsed_files(self, changed_files):
+        added_files = []
+        modified_files = []
+        deleted_files = []
+
+        for line in changed_files:
+            parts = line.split("\t")
+
+            if len(parts) < 2:
+                continue
+
+            status = parts[0]
+            path = parts[-1]
+
+            if status == "A":
+                added_files.append(path)
+            if status == "M":
+                modified_files.append(path)
+            if status == "D":
+                deleted_files.append(path)
+            if status.startswith(("R", "C")):
+                modified_files.append(path)
+
+        return added_files, modified_files, deleted_files
+
+    def build_tree(self, files: list[str]):
+        tree = {}
+        for path in files:
+            node = tree
+            parts = path.split("/")
+            for part in parts:
+                if part not in node:
+                    node[part] = {}
+                node = node[part]
+        return tree

cherry_files_toolkit/modules/cherry_files_picker.py

@@ -0,0 +1,227 @@
+from pathlib import Path
+from textual import on
+from textual.app import ComposeResult
+from textual.containers import Vertical, Horizontal, VerticalScroll
+from textual.widgets import Button, Input, Label, SelectionList
+
+from cherry_files_toolkit.utilities.git_functions import get_branches, get_current_branch, cherry_pick_files
+from cherry_files_toolkit.widgets.filterable_option_picker import FilterableOptionPicker
+
+
+class CherryFilesPicker(Vertical):
+    DEFAULT_CSS = """
+        /* Fills the screen and never scrolls itself: one child (#body)
+           is 1fr and absorbs all the leftover height. */
+        #cherry_files_picker {
+            height: 1fr;
+        }
+
+        /* Top chrome: as tall as its content. The row and its columns must
+           be auto, otherwise the containers default to height: 1fr and eat
+           the whole panel, pushing #body off-screen. */
+        .branches_selector {
+            height: auto;
+        }
+
+        #branch_row {
+            height: auto;
+        }
+
+        #source_branch_col {
+            height: auto;
+            width: 1fr;
+        }
+
+        #target_branch {
+            width: 1fr;
+        }
+
+        /* Numbered section headings are bold. */
+        .section_label,
+        #target_branch Label {
+            text-style: bold;
+        }
+
+        /* The flexible body: two columns sharing all remaining height. */
+        #body {
+            height: 1fr;
+        }
+
+        /* Left column flexes to fill width; its list absorbs the column
+           height and scrolls internally instead of growing to every row. */
+        #files_panel {
+            width: 1fr;
+            height: 1fr;
+        }
+
+        #files_scroll_container {
+            height: 1fr;
+        }
+
+        /* Right column: fixed-width commit form. */
+        #commit_container {
+            width: 45;
+            height: 1fr;
+            margin-left: 1;
+        }
+
+        /* Form fields size to content; the selected-files list soaks up
+           whatever height is left in the column and scrolls internally. */
+        .commit_section_item {
+            height: auto;
+        }
+
+        #selected_files_item {
+            height: 1fr;
+        }
+
+        #selected_files_container {
+            height: 1fr;
+            border: solid white;
+        }
+    """
+
+    def compose(self) -> ComposeResult:
+        with Vertical(id="cherry_files_picker"):
+            yield Label(
+                "Cherry Files Picker", classes="header", variant="success", expand=True
+            )
+            with Vertical(classes="branches_selector"):
+                with Horizontal(id="branch_row"):
+                    with Vertical(id="source_branch_col"):
+                        yield Label("[1] Source Branch", classes="section_label")
+                        yield Input(id="source_branch", disabled=True)
+                    yield FilterableOptionPicker(
+                        label="[2] Target Branch",
+                        id="target_branch",
+                        classes="container",
+                    )
+            with Horizontal(id="body"):
+                with Vertical(id="files_panel", classes="container"):
+                    yield Label("[3] Files", classes="section_label")
+                    yield Input(
+                        placeholder="Type to search files", id="search_files_input"
+                    )
+                    yield SelectionList(id="files_scroll_container")
+                with Vertical(id="commit_container", classes="container"):
+                    yield Label("[4] Commit", classes="section_label")
+                    with Vertical(classes="commit_section_item"):
+                        yield Label("Commit title")
+                        yield Input(id="commit_title")
+                    with Vertical(classes="commit_section_item"):
+                        yield Label("Commit description")
+                        yield Input(id="commit_description")
+                    with Vertical(
+                        id="selected_files_item", classes="commit_section_item"
+                    ):
+                        yield Label("Selected files")
+                        yield VerticalScroll(id="selected_files_container")
+                    yield Button(
+                        label="Cherry Pick Files",
+                        id="cta_cherry_pick_files",
+                        variant="success",
+                        compact=True,
+                        flat=True,
+                    )
+
+    def on_mount(self) -> None:
+        branches = get_branches()
+        if len(branches) == 0:
+            self.notify(
+                "No branches found. Please make sure to be in a git repo",
+                severity="error",
+            )
+            return
+        self.query_one("#target_branch", FilterableOptionPicker).set_items(branches)
+        current_branch = get_current_branch()
+        if current_branch:
+            self.query_one("#source_branch", Input).value = current_branch
+        self.selected_files = []
+        self.all_files = self.get_all_project_files()
+        self.render_file_options(self.all_files)
+
+    @on(Input.Changed, "#search_files_input")
+    def filter(self, event: Input.Changed):
+        text = event.value.strip().lower()
+        if len(text) < 4:
+            self.render_file_options(self.all_files)
+            return
+
+        filtered_files = [x for x in self.all_files if text in x.lower()]
+        self.render_file_options(filtered_files)
+
+    @on(SelectionList.SelectedChanged, "#files_scroll_container")
+    async def files_selected_changed(
+        self, event: SelectionList.SelectedChanged[str]
+    ) -> None:
+        currently_selected = set(event.selection_list.selected)
+        visible = getattr(self, "_visible_files", set())
+        updated = [f for f in self.selected_files if f not in visible]
+        updated.extend(currently_selected)
+        self.selected_files = updated
+        await self.render_selected_files_list()
+
+    @on(Button.Pressed, "#cta_cherry_pick_files")
+    def cta_cherry_pick_files_handler(self) -> None:
+        target_branch = self.query_one(
+            "#target_branch", FilterableOptionPicker
+        ).get_search_value()
+        source_branch = self.query_one("#source_branch", Input).value
+        selected_files = self.selected_files
+        commit_title = self.query_one("#commit_title", Input).value
+        commit_description = self.query_one("#commit_description", Input).value
+
+        if target_branch.strip() == "":
+            self.notify("Please select a Target Branch", severity="warning")
+            return
+        if len(selected_files) == 0:
+            self.notify("Please select at least one file", severity="warning")
+            return
+
+        success, message = cherry_pick_files(
+            source_branch,
+            target_branch,
+            selected_files,
+            commit_title,
+            commit_description,
+        )
+        if success:
+            self.notify(message, severity="information")
+            self.reset_form()
+        else:
+            self.notify(message, severity="error")
+
+    def reset_form(self):
+        self.query_one("#target_branch").query_one("#search", Input).value = ""
+        self.query_one("#search_files_input", Input).value = ""
+        self.query_one("#commit_title", Input).value = ""
+        self.query_one("#commit_description", Input).value = ""
+        self.selected_files = []
+        self.render_file_options(self.all_files)
+        self.query_one("#selected_files_container", VerticalScroll).remove_children()
+
+    async def render_selected_files_list(self):
+        list_container = self.query_one("#selected_files_container", VerticalScroll)
+        await list_container.remove_children()
+        for item in self.selected_files:
+            await list_container.mount(Label(item))
+
+    def render_file_options(self, filtered_files):
+        selection_list = self.query_one("#files_scroll_container", SelectionList)
+        self._visible_files = set(filtered_files)
+        selection_list.clear_options()
+        selection_list.add_options(
+            (file_path, file_path, file_path in self.selected_files)
+            for file_path in filtered_files
+        )
+
+    def get_all_project_files(self) -> list[str]:
+        root_path = Path(".")
+        files: list[str] = []
+        skipped_directories = {".git", ".venv", "node_modules", "__pycache__"}
+        for path in root_path.rglob("*"):
+            if any(part in skipped_directories for part in path.parts):
+                continue
+            if path.is_file():
+                files.append(path.relative_to(root_path).as_posix())
+        return files

cherry_files_toolkit/utilities/__init__.py

@@ -0,0 +1,2 @@
+"""Utility helpers for cherry-files-toolkit."""
+

cherry_files_toolkit/utilities/git_functions.py

@@ -0,0 +1,67 @@
+import subprocess
+
+def is_git_repo() -> bool:
+    result = subprocess.run(["git","rev-parse", "--is-inside-work-tree"], capture_output=True, text=True)
+    if result.stdout.strip() == "true":
+        return True 
+    else: 
+        return False 
+
+def get_current_branch() -> str:
+    result = subprocess.run(["git", "rev-parse", "--abbrev-ref", "HEAD"], capture_output=True, text=True)
+    return result.stdout.strip()
+
+def get_branches() -> list[str]:
+    "Returns an array with the repository branches"
+    if not is_git_repo():
+        return []
+
+    result = subprocess.run(["git", "branch", "-l"], capture_output=True, text=True)
+    branches = [line.replace("*","").strip() for line in result.stdout.splitlines()]
+    return branches
+
+def get_divergence_point(base:str, branch:str) -> str:
+    result = subprocess.run(["git", "merge-base", base, branch], capture_output=True, text=True)
+    commit_id = result.stdout.strip()
+    commit_id = commit_id[:8]
+    return commit_id
+
+def get_all_changed_files(divergent:str, commit_id:str) -> list[str]:
+    result = subprocess.run(["git", "diff", "--name-status", f"{commit_id}..{divergent}"], capture_output=True, text=True)
+    lines = [line for line in result.stdout.splitlines() if line.strip()]
+    return lines
+
+
+def switch_branch(branch: str) -> subprocess.CompletedProcess:
+    return subprocess.run(["git", "checkout", branch], capture_output=True, text=True)
+
+def checkout_files_from_branch(branch:str, files:list[str]) -> subprocess.CompletedProcess:
+    return subprocess.run(["git", "checkout", branch, '--'] + files, capture_output=True, text=True)
+
+def stage_files(files: list[str]) -> subprocess.CompletedProcess:
+    return subprocess.run(["git", "add"] + files, capture_output=True, text=True)
+
+def commit(title: str, description:str = "") -> subprocess.CompletedProcess:
+    cmd = ["git", "commit", "-m", title]
+    if description.strip():
+        cmd += ["-m", description]
+    return subprocess.run(cmd, capture_output=True, text=True)
+
+def cherry_pick_files(source_branch:str, target_branch:str, files:list[str], commit_title:str, commit_description: str = "") -> tuple[bool, str]:
+    result = switch_branch(target_branch)
+    if result.returncode != 0:
+        return False, f"Failed to switch to {target_branch}: {result.stderr.strip()}"
+    result = checkout_files_from_branch(source_branch, files)
+    if result.returncode != 0:
+        switch_branch(source_branch)
+        return False, f"Failed to checkout files from {source_branch}: {result.stderr.strip()}"
+    result = stage_files(files)
+    if result.returncode != 0:
+        switch_branch(source_branch)
+        return False, f"Failed to stage files: {result.stderr.strip()}"
+    result = commit(commit_title, commit_description)
+    if result.returncode != 0:
+        switch_branch(source_branch)
+        return False, f"Failed to commit:{result.stderr.strip()}"
+    switch_branch(source_branch)
+    return True, "Cherry pick completed successfully"

cherry_files_toolkit/widgets/__init__.py

@@ -0,0 +1,2 @@
+"""Reusable Textual widgets."""
+

cherry_files_toolkit/widgets/filterable_option_picker.py

@@ -0,0 +1,74 @@
+from textual import on
+from textual.app import ComposeResult
+from textual.containers import Vertical
+from textual.suggester import SuggestFromList
+from textual.widgets import Input, Label, OptionList
+
+
+class FilterableOptionPicker(Vertical):
+    DEFAULT_CSS = """
+        FilterableOptionPicker {
+            height: auto;
+        }
+
+        .filterable_option_picker_unit {
+            height: auto;
+        }
+
+        /* Bound the list so it scrolls internally instead of growing to
+           fit every branch and inflating the row it lives in. */
+        FilterableOptionPicker #options {
+            height: auto;
+            max-height: 8;
+        }
+    """
+
+    def __init__(self, label:str, items: list[str] | None = None, **kwargs):
+        super().__init__(**kwargs)
+        self.label = label
+        self.items = items or []
+
+
+    def compose(self) -> ComposeResult:
+        with Vertical(classes="filterable_option_picker_unit"):
+            yield Label(self.label)
+            yield Input(suggester=SuggestFromList(self.items, case_sensitive=False), id="search")
+            yield OptionList(id="options")
+
+    def on_mount(self, ) -> None:
+        self.sync_input_suggestions()
+        self.sync_option_list()
+
+    def set_items(self, items: list[str]) -> None:
+        self.items = items
+        self.sync_option_list()
+        self.sync_input_suggestions()
+
+    def sync_option_list(self) -> None:
+        options = self.query_one("#options", OptionList)
+        options.set_options(self.items)
+        options.highlighted = 0 if self.items else None
+
+    def sync_input_suggestions(self) -> None:
+        search = self.query_one("#search", Input)
+        search.suggester = SuggestFromList(self.items, case_sensitive=False)
+
+    def get_search_value(self) -> str:
+        return self.query_one("#search", Input).value
+
+    @on(Input.Changed, "#search")
+    def filter(self, event:Input.Changed) -> None:
+        text = event.value.strip().lower()
+        filtered = self.items if not text else [x for x in self.items if text in x.lower()]
+        options = self.query_one("#options", OptionList)
+        options.set_options(filtered)
+        options.highlighted = 0 if filtered else None
+
+
+    @on(OptionList.OptionSelected, "#options")
+    def select(self, event: OptionList.OptionSelected) -> None:
+        chosen = str(event.option.prompt)
+        search = self.query_one("#search", Input)        
+        search.value = chosen
+        search.focus()
+        search.action_end()

cherry_files_toolkit-0.1.0.dist-info/METADATA

@@ -0,0 +1,103 @@
+Metadata-Version: 2.4
+Name: cherry-files-toolkit
+Version: 0.1.0
+Summary: TUI toolkit for cherry-picking files between git branches
+Project-URL: Repository, https://github.com/NelsonUrrutia/cherry-files-toolkit
+Author-email: Nelson Urrutia <nelurrutia15@gmail.com>
+License: MIT License
+        
+        Copyright (c) 2026 Nelson Urrutia
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+License-File: LICENSE
+Requires-Python: >=3.10
+Requires-Dist: textual
+Description-Content-Type: text/markdown
+
+# Cherry Files Toolkit
+
+> A terminal UI (built with [Textual](https://textual.textualize.io/)) for moving
+> work between git branches at the **file** level — pick the final state of the
+> files you want and apply them to another branch as one clean commit, no
+> commit-by-commit cherry-picking.
+
+It ships two tools side by side:
+
+- **Cherry Files Picker** — select files from your current branch and commit
+  their current content onto a target branch.
+- **Cherry Files Diff** — see every file added, modified, or deleted on a
+  branch since it diverged from its base, grouped as a scannable tree.
+
+## The idea
+
+This project is a new iteration of my previous
+[Cherry Files Picker](https://github.com/NelsonUrrutia/cherry-files-picker).
+The goal is the same — move the final state of selected files between branches
+as one clean commit — but this version upgrades the UI to a full TUI and adds
+a second module, **Cherry Files Diff**, for understanding branch divergence at
+a glance.
+
+## Install
+
+```bash
+pip install cherry-files-toolkit
+```
+
+Requires Python 3.10+ and `git` on your PATH.
+
+## Usage
+
+Run it from inside any git repository:
+
+```bash
+cherry-files-toolkit
+```
+
+Press `Ctrl+Q` to quit.
+
+### Cherry Files Picker (right panel)
+
+Transfers the final approved state of selected files from your working branch
+to another branch:
+
+1. **Source branch** is pre-filled with your current branch.
+2. Pick a **target branch** — where the work should land.
+3. Search and select the **files** to move. Selections persist while you
+   filter.
+4. Write a **commit title and description**, review the selected files, and
+   hit **Cherry Pick Files**. The toolkit commits those files' current
+   content onto the target branch in a single commit.
+
+Use it when you know which files are done and want them on another branch
+without replaying the messy commit history that produced them.
+
+### Cherry Files Diff (left panel)
+
+Explains branch divergence at the file level, so you can recover context on a
+branch you don't know well:
+
+1. Pick the **divergent branch** (the one with the work) and its **base
+   branch**.
+2. **Start Diff Checker** finds the point where they diverged and lists every
+   file created, modified, or deleted since — with per-category counts and a
+   directory tree for fast scanning.
+
+## License
+
+[MIT](LICENSE)

cherry_files_toolkit-0.1.0.dist-info/RECORD

@@ -0,0 +1,14 @@
+cherry_files_toolkit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cherry_files_toolkit/main.py,sha256=6GBuIeHUpVq2u4XwVxodL-VkWmRTCCbrxI5q_qUFbaA,974
+cherry_files_toolkit/modules/__init__.py,sha256=2pwGtfoyl_EXpnjFYrQk67OyEMSAWC4_90LwvVgdwZ0,27
+cherry_files_toolkit/modules/cherry_files_diff.py,sha256=LZRKEMKsrg-iou5NzXkOzbF4ZGmif32Os2yqjgBgsJ4,9050
+cherry_files_toolkit/modules/cherry_files_picker.py,sha256=oYgvMsq92fUGjf_0Q0DhK8OMgEF5PTOIrOEyvD4Sv4Y,8663
+cherry_files_toolkit/utilities/__init__.py,sha256=8c-2vaDTq2X25O5hLJl8OenE8onyGtALOSHP5eGpLBk,49
+cherry_files_toolkit/utilities/git_functions.py,sha256=9AL9kJmqU3WpQ5x_NTAsuf-Xfn-fiGfEXngEMXiMHeg,2985
+cherry_files_toolkit/widgets/__init__.py,sha256=Gctk3ynphsTfNsQwqM7yVf_mij3d6jnNP6LuVo0bx3U,33
+cherry_files_toolkit/widgets/filterable_option_picker.py,sha256=UwYqcrLpS-TLXQ4vssqd03tO81qbbsC3I2eUgGYMb1g,2500
+cherry_files_toolkit-0.1.0.dist-info/METADATA,sha256=OjNqdnD3kVkK6PCdiZsODargXj033SFYGicnLZv_jT8,3953
+cherry_files_toolkit-0.1.0.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
+cherry_files_toolkit-0.1.0.dist-info/entry_points.txt,sha256=IGOTge0nlH_71lb1QJLHf5r3FYn6ak4beV0sSrkHYEs,71
+cherry_files_toolkit-0.1.0.dist-info/licenses/LICENSE,sha256=6delUBIrArl5odqkcUbmjKxo3gdAJ2L7lBolWK1Pxv8,1071
+cherry_files_toolkit-0.1.0.dist-info/RECORD,,

cherry_files_toolkit-0.1.0.dist-info/WHEEL

@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: hatchling 1.30.1
+Root-Is-Purelib: true
+Tag: py3-none-any

cherry_files_toolkit-0.1.0.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+cherry-files-toolkit = cherry_files_toolkit.main:run

cherry_files_toolkit-0.1.0.dist-info/licenses/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Nelson Urrutia
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.