aegis-stack 0.9.0__tar.gz → 0.9.1__tar.gz

{aegis_stack-0.9.0 → aegis_stack-0.9.1}/.gitignore

@@ -148,3 +148,4 @@ demo-*/
 
 # Generated-project artifact if aegis init ever runs at repo root
 /.copier-answers.yml
+test-project/

{aegis_stack-0.9.0 → aegis_stack-0.9.1}/CHANGELOG.md

@@ -7,6 +7,72 @@
 
 ## [Unreleased]
 
+## [0.9.1] - 2026-07-12
+
+### Added
+
+- **Finance service (experimental)** (`aegis init --services finance`,
+  `aegis add-service finance`): a personal-finance aggregator service, marked
+  experimental in this release (schema, APIs, and CLI surface may change
+  between releases). Ships a 33-table schema
+  covering currencies and FX rates, institutions and connections (inline
+  AES-GCM-encrypted credentials), accounts, liabilities, valuations, balance
+  and net-worth snapshots, and a transaction ledger with splits, transfer
+  pairing, and two-lane provider/import dedup. Ships file import for CSV
+  (Chase and Quicken profiles), OFX/QFX, and QIF, a net-worth service, API
+  endpoints, seeded demo data, and a full test suite. Optional flags gate
+  Plaid (`finance_plaid`) and SnapTrade (`finance_snaptrade`) integration
+  scaffolding. Requires database and scheduler; recommends worker.
+- **Neon setup guide**: dedicated `components/database/neon.md` page in the
+  tool docs, plus expanded database component docs.
+
+### Fixed
+
+- **`aegis update` no longer invents merge conflicts on pristine projects**:
+  generated projects are ruff-formatted at init while template renders are
+  raw Jinja output, so the byte-level 3-way merge misread formatting as user
+  edits and conflicted wherever real template changes landed nearby. Python
+  files are now compared and merged through ruff normalization, matching
+  what the add/remove path already did, and the fallback path warns instead
+  of degrading silently.
+- **ruff is now a runtime dependency**: installs without dev extras (uvx,
+  pip) previously had no ruff binary, so every Python merge silently fell
+  back to the raw byte-level path. A test now guards the dependency.
+- **`find-free-port.sh` false-busy on macOS**: Darwin allocates ephemeral
+  source ports sequentially, so probing a port near a recent bind made
+  connect() pick source == destination and fail with EINVAL, which read as
+  busy for every candidate. The probe retries on EINVAL, keeping `make
+  serve` port autodiscovery reliable in and near the ephemeral range.
+
+## [0.9.0] - 2026-07-06
+
+### Added
+
+- **Neon Postgres provider**: new `postgres_provider` template question
+  (`container` or `neon`). Local development keeps the Postgres container;
+  production points at Neon, with pooler-safe connection arguments detected
+  from the URL. No new dependencies. Guided and interactive init prompt for
+  the provider on Postgres stacks.
+
+### Fixed
+
+- **`aegis update` backfills new template questions**: questions added by a
+  newer template version (such as `postgres_provider`) are reconciled into
+  the project's preserved answers file during update instead of being lost.
+- **Stripe webhook forwarder no longer stalls on chatty output**: the
+  dev-mode stripe-cli forwarder drains stdout in the background so a full
+  pipe cannot block secret capture, with timeout handling around reads.
+
+### Changed
+
+- **Dependency pins hardened**: `typer` pinned to 0.26.8 (newer releases
+  fail at class-body evaluation on Python 3.11/3.12); `copier` held below
+  9.15 (9.15 relocates the answers file out of the generated project, which
+  breaks `aegis update`), with a dependabot ignore rule so the ceiling is
+  not silently widened.
+
+## [0.8.1] - 2026-06-28
+
 ### Added
 
 - **Traffic monitor ("who's hammering you")**: Overseer's Backend modal gains a
@@ -34,6 +100,13 @@
   back by a wall clock, and no extra tooling needs to be installed on the
   deploy host. `--rollout-timeout` is now only a long runaway-guard ceiling.
 
+### Fixed
+
+- **`aegis update` records the correct template commit**: the commit stamped
+  into the answers file after an update could be wrong, which skewed the
+  starting point of the next update; it is now derived and verified
+  explicitly.
+
 ## [0.8.0] - 2026-06-15
 
 ### Added

{aegis_stack-0.9.0 → aegis_stack-0.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aegis-stack
-Version: 0.9.0
+Version: 0.9.1
 Summary: A production-ready FastAPI platform with modular components and a built-in control plane. Try: uvx aegis-stack init my-project
 Project-URL: Homepage, https://aegis-stack.io
 Project-URL: Documentation, https://docs.aegis-stack.io/
@@ -32,6 +32,7 @@ Requires-Dist: packaging>=24.0
 Requires-Dist: pillow>=12.2.0
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: rich>=13.0.0
+Requires-Dist: ruff>=0.9.0
 Requires-Dist: typer==0.26.8
 Requires-Dist: urllib3>=2.7.0
 Provides-Extra: dev
@@ -43,7 +44,6 @@ Requires-Dist: pre-commit>=3.7.0; extra == 'dev'
 Requires-Dist: pytest-asyncio>=0.23.0; extra == 'dev'
 Requires-Dist: pytest-xdist>=3.5.0; extra == 'dev'
 Requires-Dist: pytest>=9.0.3; extra == 'dev'
-Requires-Dist: ruff>=0.1.0; extra == 'dev'
 Requires-Dist: sqlalchemy>=2.0.0; extra == 'dev'
 Requires-Dist: ty>=0.0.8; extra == 'dev'
 Provides-Extra: docs

{aegis_stack-0.9.0 → aegis_stack-0.9.1}/aegis/__init__.py

@@ -2,4 +2,4 @@
 Aegis Stack CLI - Component generation and project management tools.
 """
 
-__version__ = "0.9.0"
+__version__ = "0.9.1"

{aegis_stack-0.9.0 → aegis_stack-0.9.1}/aegis/cli/guided.py

@@ -39,6 +39,7 @@ from dataclasses import dataclass
 
 import typer
 from rich.align import Align
+from rich.cells import cell_len
 from rich.console import Console, Group, RenderableType
 from rich.layout import Layout
 from rich.padding import Padding
@@ -171,6 +172,64 @@ def _docs_url(spec: PluginSpec) -> str | None:
     return f"{DOCS_BASE_URL}{spec.docs_path}/"
 
 
+# The postgres provider screen offers Neon by name, so it links the page
+# that explains it. Not a spec ``docs_path``: providers are choices inside
+# the database component, not plugins with pages of their own.
+_NEON_DOCS_URL = f"{DOCS_BASE_URL}components/database/neon/"
+
+
+def _fit_url(url: str, width: int) -> str:
+    """The deepest ancestor of ``url`` that fits in ``width`` cells.
+
+    Terminals without OSC 8 only linkify what they can SEE, so every form
+    this returns must be a complete, valid URL — scheme included, no
+    ellipsis, never wrapped. mkdocs directory-URLs make every ancestor of
+    a docs page a real page, so a narrow terminal degrades to a working
+    link one level up rather than a broken or dead one. Measures with
+    ``cell_len`` (URLs are ASCII today, but the contract is cells). The
+    origin is the floor: callers must give it at least that much room.
+    """
+    if cell_len(url) <= width:
+        return url
+    scheme, _, rest = url.partition("://")
+    host, _, path = rest.partition("/")
+    origin = f"{scheme}://{host}/"
+    segments = [s for s in path.split("/") if s]
+    while segments:
+        candidate = f"{origin}{'/'.join(segments)}/"
+        if cell_len(candidate) <= width:
+            return candidate
+        segments.pop()
+    return origin
+
+
+def _docs_line(url: str, width: int) -> Text:
+    """One-line plain-text URL the terminal's own detection can linkify.
+
+    NO OSC 8 hyperlink, ever: terminals that see one suppress their own
+    URL detection for that region, and terminals that don't render OSC 8
+    then show no link at all — plain text is the only mechanism that
+    proved reliable across terminals. ``_fit_url`` keeps the visible text
+    a complete, valid URL at any width so detection always has a working
+    target.
+    """
+    return Text(_fit_url(url, width), style=MUTED, justify="center", no_wrap=True)
+
+
+def _one_datastore_note() -> str:
+    """Shown on every screen whose engine pick doubles as the project default.
+
+    Picking postgres for the scheduler (or AI storage, or the database
+    itself) fixes the ONE datastore every later question reuses — the user
+    must learn that here, not when the AI storage screen silently skips.
+    """
+    return _g(
+        "note.one_datastore",
+        "One datastore per project: choosing an engine here sets the "
+        "project database, shared by anything else that stores data.",
+    )
+
+
 def _spec_blurb(spec: PluginSpec) -> str:
     """Localizable editorial paragraph for a spec.
 
@@ -222,6 +281,8 @@ class _Choice:
     value: str
     title: str
     body: str = ""
+    # Docs page for THIS choice; rendered only while the choice is focused.
+    docs_url: str = ""
 
 
 @dataclass
@@ -449,6 +510,7 @@ class GuidedSelectionUI:
                 ),
                 choices,
                 crumb="amend",
+                note=_one_datastore_note(),
             )
         ].value
 
@@ -515,14 +577,20 @@ class GuidedSelectionUI:
                 ),
                 choices,
                 crumb="amend",
+                note=_one_datastore_note(),
             )
         ].value
         if engine == StorageBackends.POSTGRES:
-            return engine, self._choose_postgres_provider(context)
+            return engine, self.choose_postgres_provider(context, crumb="amend")
         return engine, None
 
-    def _choose_postgres_provider(self, context: str) -> str:
-        """ONE screen for the PostgreSQL host: local container vs Neon (vs ...)."""
+    def choose_postgres_provider(self, context: str, *, crumb: str = "none") -> str:
+        """ONE screen for the PostgreSQL host: local container vs Neon (vs ...).
+
+        The direct database path amends the Database crumb; indirect paths
+        (scheduler persistence, AI storage) pass no crumb — their
+        ``note_auto_added`` call carries the chosen host into the sidebar.
+        """
         choices = [
             _Choice(
                 PostgresProviders.CONTAINER,
@@ -539,6 +607,7 @@ class GuidedSelectionUI:
                     "choice.db_provider.neon",
                     "Serverless Postgres: cloud in prod, local container in dev.",
                 ),
+                docs_url=_NEON_DOCS_URL,
             ),
         ]
         return choices[
@@ -549,7 +618,12 @@ class GuidedSelectionUI:
                     context=context,
                 ),
                 choices,
-                crumb="amend",
+                crumb=crumb,
+                note=_g(
+                    "note.one_database_host",
+                    "One database per project: this host serves everything "
+                    "that stores data.",
+                ),
             )
         ].value
 
@@ -623,6 +697,7 @@ class GuidedSelectionUI:
                 _g("prompt.ai_storage", "AI conversation storage"),
                 backend,
                 crumb="amend",
+                note=_one_datastore_note(),
             )
         ].value
         return self._configure_ai_extras(fw, be)
@@ -797,7 +872,7 @@ class GuidedSelectionUI:
             docs = _docs_url(spec)
             if docs:
                 grid.add_row(Text())
-                grid.add_row(Text(docs, style=MUTED, justify="center"))
+                grid.add_row(_docs_line(docs, width))
 
         hints = Text.assemble(
             ("enter", ACCENT),
@@ -1144,6 +1219,7 @@ class GuidedSelectionUI:
         compact: bool = False,
         crumb: str = "none",
         label: str = "",
+        note: str | None = None,
     ) -> int:
         # Replay path: hand back the journaled answer, render nothing.
         if self._cursor < len(self._journal):
@@ -1187,7 +1263,10 @@ class GuidedSelectionUI:
                     shortcuts.get("n", default_idx), choices, crumb, label
                 )
             self._paint(
-                self._frame(self._body(prompt, choices, idx, context, compact), hints)
+                self._frame(
+                    self._body(prompt, choices, idx, context, compact, note=note),
+                    hints,
+                )
             )
             key = self._key()
             if key in ("q", "\x03"):
@@ -1492,6 +1571,7 @@ class GuidedSelectionUI:
         cursor: int,
         context: PluginSpec | None,
         compact: bool,
+        note: str | None = None,
     ) -> RenderableType:
         width = self._content_width()
         grid = Table.grid(padding=(0, 0))
@@ -1536,12 +1616,20 @@ class GuidedSelectionUI:
             docs = _docs_url(context)
             if docs:
                 grid.add_row(Text())
-                grid.add_row(
-                    Text.assemble(
-                        (f"{_g('screen.docs', 'Docs:')}  ", LABEL),
-                        (docs, MUTED),
-                    )
-                )
+                # cell_len, not len: CJK locales render the label at two
+                # cells per character and an overflowing row ellipsizes
+                # the URL into a broken link. When even the shortest URL
+                # form can't fit beside the label, the URL gets its own
+                # full-width line instead.
+                label = f"{_g('screen.docs', 'Docs:')}  "
+                available = width - cell_len(label)
+                display = _fit_url(docs, available)
+                if cell_len(display) > available:
+                    grid.add_row(_docs_line(docs, width))
+                else:
+                    docs_line = Text.assemble((label, LABEL), (display, MUTED))
+                    docs_line.no_wrap = True
+                    grid.add_row(docs_line)
             grid.add_row(Text())
             # The engine prompt carries quick-mode hints like "(will
             # auto-add Redis)" that the Requires line already covers here,
@@ -1558,6 +1646,9 @@ class GuidedSelectionUI:
             )
         else:
             grid.add_row(Text(prompt, style="bold", justify="center"))
+            if note:
+                grid.add_row(Text())
+                grid.add_row(Text(note, style=MUTED, justify="center"))
 
         grid.add_row(Text())
         if compact:
@@ -1566,6 +1657,10 @@ class GuidedSelectionUI:
             grid.add_row(self._chip_row(choices, cursor))
             grid.add_row(Text())
             grid.add_row(Text(choices[cursor].body, style=MUTED, justify="center"))
+        docs_url = choices[cursor].docs_url
+        if docs_url:
+            grid.add_row(Text())
+            grid.add_row(_docs_line(docs_url, width))
         return grid
 
     def _choice_line(self, choices: list[_Choice], cursor: int) -> Text:

{aegis_stack-0.9.0 → aegis_stack-0.9.1}/aegis/cli/interactive.py

@@ -196,6 +196,16 @@ def clear_postgres_provider_selection() -> None:
     _postgres_provider_selection = None
 
 
+def set_postgres_provider_selection(provider: str | None) -> None:
+    """Pre-set the PostgreSQL host selection (for testing or CLI args).
+
+    Args:
+        provider: PostgresProviders value (container, neon) or None to clear
+    """
+    global _postgres_provider_selection
+    _postgres_provider_selection = provider
+
+
 def select_worker_backend() -> str:
     """
     Interactive worker backend selection using arrow keys.
@@ -305,6 +315,8 @@ class SelectionUI(Protocol):
 
     def choose_database_engine(self, context: str) -> tuple[str, str | None]: ...
 
+    def choose_postgres_provider(self, context: str) -> str: ...
+
     def choose_scheduler_backend(self) -> str: ...
 
     def configure_auth(self, service_name: str) -> str: ...
@@ -357,6 +369,9 @@ class TyperSelectionUI:
             return engine, select_postgres_provider(context=context)
         return engine, None
 
+    def choose_postgres_provider(self, context: str) -> str:
+        return select_postgres_provider(context=context)
+
     def choose_scheduler_backend(self) -> str:
         # Quick-mode shape preserved exactly: the persistence yes/no, then
         # the engine picker (which reuses a previously chosen engine).
@@ -416,16 +431,23 @@ def _step_scheduler(
 
     engine = ui.choose_scheduler_backend()
     if engine != StorageBackends.MEMORY:
+        token = engine
         if engine == StorageBackends.POSTGRES:
-            state.components.append(
-                f"{ComponentNames.DATABASE}[{StorageBackends.POSTGRES}]"
-            )
+            # The scheduler is what pulls the database in, so IT owns the
+            # container-vs-Neon question the skipped database step would
+            # have asked. Neon encodes as database[neon], same as the
+            # direct path.
+            provider = ui.choose_postgres_provider("Scheduler")
+            state.postgres_provider = provider
+            if provider == PostgresProviders.NEON:
+                token = PostgresProviders.NEON
+            state.components.append(f"{ComponentNames.DATABASE}[{token}]")
         else:
             state.components.append(ComponentNames.DATABASE)
         state.database_engine = engine
         state.database_added_by_scheduler = True
         state.scheduler_backend = engine
-        ui.note_auto_added(ComponentNames.DATABASE, engine)
+        ui.note_auto_added(ComponentNames.DATABASE, token)
         ui.success(t("interactive.scheduler_db_configured", engine=engine.upper()))
 
         # Bonus backup job only applies once a database is in the mix.
@@ -659,10 +681,18 @@ def _configure_ai_init(
         if database_already_selected:
             ui.success(f"  {t('interactive.ai_db_already')}")
         else:
-            state.components.append(f"{ComponentNames.DATABASE}[{backend}]")
+            token = backend
+            if backend == StorageBackends.POSTGRES:
+                # AI is what pulls the database in: ask the container-vs-Neon
+                # question the skipped database step would have asked.
+                provider = ui.choose_postgres_provider("AI")
+                state.postgres_provider = provider
+                if provider == PostgresProviders.NEON:
+                    token = PostgresProviders.NEON
+            state.components.append(f"{ComponentNames.DATABASE}[{token}]")
             # The AI choice just fixed the project's database engine.
             state.database_engine = backend
-            ui.note_auto_added(ComponentNames.DATABASE, backend)
+            ui.note_auto_added(ComponentNames.DATABASE, token)
             ui.success(f"  {t('interactive.ai_db_added', backend=backend)}")
 
     # Bracket syntax for TemplateGenerator:

{aegis_stack-0.9.0 → aegis_stack-0.9.1}/aegis/commands/init.py

@@ -32,12 +32,14 @@ from ..core.components import (
     ComponentType,
 )
 from ..core.service_resolver import ServiceResolver
+from ..core.services import SERVICES
 from ..core.template_generator import TemplateGenerator
 from ..i18n import lazy_t, t
 
 # Build services help text dynamically from constants
 _SERVICES_HELP = lazy_t(
     "init.help_opt_services",
+    services=", ".join(sorted(SERVICES)),
     frameworks="|".join(sorted(FRAMEWORKS)),
     backends="|".join(sorted(BACKENDS)),
     providers="|".join(sorted(PROVIDERS)),

{aegis_stack-0.9.0 → aegis_stack-0.9.1}/aegis/constants.py

@@ -170,6 +170,7 @@ class AnswerKeys:
     INSIGHTS = "include_insights"
     PAYMENT = "include_payment"
     BLOG = "include_blog"
+    FINANCE = "include_finance"
 
     # Service names (used for selection/lookup)
     SERVICE_AUTH = "auth"
@@ -178,6 +179,7 @@ class AnswerKeys:
     SERVICE_INSIGHTS = "insights"
     SERVICE_PAYMENT = "payment"
     SERVICE_BLOG = "blog"
+    SERVICE_FINANCE = "finance"
 
     # Insights source flags
     INSIGHTS_GITHUB = "insights_github"
@@ -186,6 +188,11 @@ class AnswerKeys:
     INSIGHTS_REDDIT = "insights_reddit"
     INSIGHTS_PER_USER = "insights_per_user"
 
+    # Finance source flags
+    FINANCE_PLAID = "finance_plaid"
+    FINANCE_SNAPTRADE = "finance_snaptrade"
+    FINANCE_IMPORT = "finance_import"
+
     # Payment configuration
     PAYMENT_PROVIDER = "payment_provider"
 

{aegis_stack-0.9.0 → aegis_stack-0.9.1}/aegis/core/copier_manager.py

@@ -186,6 +186,7 @@ def generate_with_copier(
         AnswerKeys.PAYMENT_PROVIDER: template_context.get(
             AnswerKeys.PAYMENT_PROVIDER, PaymentProviders.DEFAULT
         ),
+        AnswerKeys.FINANCE: template_context.get(AnswerKeys.FINANCE, "no") == "yes",
     }
 
     # Detect dev vs production mode for template sourcing
@@ -340,6 +341,8 @@ def generate_with_copier(
     is_sqlite = database_engine == StorageBackends.SQLITE
     is_payment_included: bool = copier_data.get(AnswerKeys.PAYMENT, False) is True
     needs_migration_files = needs_migration_files or is_payment_included
+    is_finance_included: bool = copier_data.get(AnswerKeys.FINANCE, False) is True
+    needs_migration_files = needs_migration_files or is_finance_included
     # Scheduler component: job_execution history table. Postgres only — the
     # table lives in a ``scheduler`` schema (CREATE SCHEMA), which SQLite
     # can't run; SQLite scheduler stacks get the table via create_all.
@@ -374,8 +377,12 @@ def generate_with_copier(
             is True,
             AnswerKeys.BLOG: is_blog_included,
             AnswerKeys.PAYMENT: is_payment_included,
+            AnswerKeys.FINANCE: is_finance_included,
             AnswerKeys.SCHEDULER: is_scheduler_included,
             AnswerKeys.SCHEDULER_BACKEND: scheduler_backend_str,
+            # Finance tables live in a dedicated Postgres ``finance`` schema
+            # (dropped on SQLite); the migration variant is engine-resolved.
+            AnswerKeys.DATABASE_ENGINE: database_engine,
         }
         services = get_services_needing_migrations(context)
         if services:

{aegis_stack-0.9.0 → aegis_stack-0.9.1}/aegis/core/manual_updater.py

@@ -8,8 +8,6 @@ and copies files to the target project.
 
 import shutil
 import subprocess
-import sys
-import tempfile
 from pathlib import Path
 from typing import Any
 
@@ -25,7 +23,11 @@ from ..cli import brand
 from .component_files import get_component_files, get_copier_defaults, get_template_path
 from .copier_manager import is_copier_project, load_copier_answers
 from .plugins.template_resolver import get_plugin_template_root
-from .template_cleanup import merge_three_way_text, run_resilient
+from .template_cleanup import (
+    merge_three_way_text,
+    normalize_for_compare,
+    run_ruff_on_text,
+)
 from .verbosity import verbose_print
 
 # Constants
@@ -76,28 +78,9 @@ def _is_empty_stub(path: Path) -> bool:
         return False
 
 
-def _normalize_for_compare(text: str) -> str:
-    """Canonicalize text for divergence comparison.
-
-    Strips per-line trailing whitespace and trailing blank lines, and
-    normalizes line endings. This absorbs the only difference between a
-    file as Copier wrote it at init and the same file as
-    ``_render_template_file`` re-renders it: blank-line whitespace, which
-    differs because Copier and this module configure Jinja differently.
-    """
-    lines = text.replace("\r\n", "\n").split("\n")
-    return "\n".join(line.rstrip() for line in lines).rstrip("\n")
-
-
-def _ruff_executable() -> str | None:
-    """Locate a ruff binary, preferring the one in the running interpreter's
-    environment. ``ruff`` is a runtime dependency of aegis, so this is
-    normally present; returns None if it cannot be found (callers then bias
-    toward preserving the file rather than overwriting it)."""
-    candidate = Path(sys.executable).parent / "ruff"
-    if candidate.is_file():
-        return str(candidate)
-    return shutil.which("ruff")
+# Canonicalization/ruff helpers live in template_cleanup so the update-sync
+# path can share them; imported above as normalize_for_compare / run_ruff_on_text.
+_normalize_for_compare = normalize_for_compare
 
 
 # Directories that should never be swept. Some contain authored content
@@ -690,68 +673,7 @@ class ManualUpdater:
         The temp file lives in the project so ruff discovers the project's
         ``[tool.ruff]`` config by walking up from the file's location.
         """
-        ruff = _ruff_executable()
-        if ruff is None:
-            return None
-        tmp_path = ""
-        try:
-            with tempfile.NamedTemporaryFile(
-                "w",
-                suffix=".py",
-                dir=str(self.project_path),
-                delete=False,
-                encoding="utf-8",
-            ) as handle:
-                handle.write(src)
-                tmp_path = handle.name
-            steps: list[list[str]] = []
-            if check_select == "":
-                steps.append([ruff, "check", "--fix", "--quiet", tmp_path])
-            elif check_select is not None:
-                steps.append(
-                    [
-                        ruff,
-                        "check",
-                        "--fix",
-                        "--select",
-                        check_select,
-                        "--quiet",
-                        tmp_path,
-                    ]
-                )
-            steps.append([ruff, "format", "--quiet", tmp_path])
-            for args in steps:
-                proc = run_resilient(
-                    args,
-                    cwd=str(self.project_path),
-                    capture_output=True,
-                    timeout=30,
-                    retry_on_signal_kill=True,
-                    # A merged .py file spawns ~6 ruff subprocesses; under a
-                    # parallel test/CI run that contends with uv/git/copier,
-                    # fork failures (EAGAIN) and timeouts spike briefly. A
-                    # wider retry budget rides out the spike instead of
-                    # silently degrading the merge to preserve+warn.
-                    retries=5,
-                    backoff=1.0,
-                )
-                # ``ruff check --fix`` exits 1 when fixable issues remain after
-                # fixing (normal — e.g. unfixable lint rules); only >=2 is a
-                # real error (bad config, unreadable file). ``ruff format``
-                # exits non-zero only on error (e.g. unparseable input). Either
-                # way, bail to None so the caller preserves the file rather than
-                # acting on partially/unformatted output.
-                is_format = args[1] == "format"
-                if (is_format and proc.returncode != 0) or (
-                    not is_format and proc.returncode >= 2
-                ):
-                    return None
-            return Path(tmp_path).read_text()
-        except (OSError, subprocess.SubprocessError):
-            return None
-        finally:
-            if tmp_path:
-                Path(tmp_path).unlink(missing_ok=True)
+        return run_ruff_on_text(src, self.project_path, check_select)
 
     def _ruff_normalize(self, src: str) -> str | None:
         """Return ``src`` run through the project's full ruff (check --fix + format).