plain.postgres 0.90.0__tar.gz → 0.91.0__tar.gz

{plain_postgres-0.90.0 → plain_postgres-0.91.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain.postgres
-Version: 0.90.0
+Version: 0.91.0
 Summary: Model your data and store it in a database.
 Author-email: Dave Gaeddert <dave.gaeddert@dropseed.dev>
 License-Expression: BSD-3-Clause
@@ -447,7 +447,7 @@ Migrations track changes to your models and update the database schema according
 ### Creating migrations
 
 ```bash
-plain makemigrations
+plain migrations create
 ```
 
 Key flags:
@@ -463,12 +463,11 @@ Only write migrations by hand if they are custom data migrations.
 ### Running migrations
 
 ```bash
-plain migrate --backup
+plain migrations apply
 ```
 
 Key flags:
 
-- `--backup` / `--no-backup` — Create a database backup before applying (default: on in DEBUG)
 - `--plan` — Show what migrations would run without applying them
 - `--check` — Exit non-zero if unapplied migrations exist (for CI)
 - `--fake` — Mark migrations as applied without running them
@@ -479,7 +478,7 @@ Key flags:
 plain migrations list
 ```
 
-`migrate` has no `--list` or `--status` flag. Use `plain migrations list`.
+`migrations apply` has no `--list` or `--status` flag. Use `plain migrations list`.
 
 - `--format plan` — Show in dependency order instead of grouped by package
 
@@ -493,8 +492,8 @@ Use this when migrations exist only in your local dev environment and haven't be
 
 1. Delete the intermediate migration files (keep the initial 0001 and any previously committed migrations)
 2. `plain migrations prune --yes` — removes stale DB records for the deleted files
-3. `plain makemigrations` — creates a single fresh migration with all the changes
-4. `plain migrate --fake` — marks the new migration as applied (the schema is already correct from the old migrations)
+3. `plain migrations create` — creates a single fresh migration with all the changes
+4. `plain migrations apply --fake` — marks the new migration as applied (the schema is already correct from the old migrations)
 
 **Consolidating committed migrations (squash):**
 
@@ -523,16 +522,16 @@ Over time a package can accumulate dozens of migrations. Once **every environmen
 
 1. Run `plain migrations list` locally and verify everything is applied.
 2. Delete every file in the package's `migrations/` directory except `__init__.py`.
-3. Run `plain makemigrations` to generate a fresh `0001_initial`.
+3. Run `plain migrations create` to generate a fresh `0001_initial`.
 4. Run `plain migrations prune --yes` to remove stale DB records. The existing `0001_initial` record matches the new file, so the database is immediately up to date.
-5. Verify with `plain postgres schema` (zero issues means the reset is clean) and `plain makemigrations --check` (no pending changes).
+5. Verify with `plain postgres schema` (zero issues means the reset is clean) and `plain migrations create --check` (no pending changes).
 6. Commit and deploy. On every other environment, run `plain migrations prune --yes`. No actual SQL runs — it only cleans up migration history records. If `migrations prune` is already in your deploy steps, no changes are needed.
 
 **Things to keep in mind:**
 
 - If resetting multiple packages, process depended-on packages first — the new `0001_initial` may have cross-package FK dependencies.
 - Data migrations (`RunPython`) in the deleted history are gone, which is fine since they've already run everywhere.
-- If CI runs `makemigrations --check` or `migrate --check`, the reset PR must be merged and deployed before those checks pass in other branches.
+- If CI runs `migrations create --check` or `migrations apply --check`, the reset PR must be merged and deployed before those checks pass in other branches.
 
 ### Other migration commands
 
@@ -578,9 +577,6 @@ class Product(postgres.Model):
 - [`IntegerField`](./fields/__init__.py#IntegerField) - Integer
 - [`BigIntegerField`](./fields/__init__.py#BigIntegerField) - Big (8 byte) integer
 - [`SmallIntegerField`](./fields/__init__.py#SmallIntegerField) - Small integer
-- [`PositiveIntegerField`](./fields/__init__.py#PositiveIntegerField) - Positive integer
-- [`PositiveBigIntegerField`](./fields/__init__.py#PositiveBigIntegerField) - Positive big integer
-- [`PositiveSmallIntegerField`](./fields/__init__.py#PositiveSmallIntegerField) - Positive small integer
 - [`FloatField`](./fields/__init__.py#FloatField) - Floating point number
 - [`DecimalField`](./fields/__init__.py#DecimalField) - Fixed precision decimal
 
@@ -1038,7 +1034,7 @@ See [`default_settings.py`](./default_settings.py) for more details.
 
 #### How do I add a field to an existing model?
 
-Add the field to your model class, then run `plain makemigrations` to create a migration. If the field is required (no default value and not nullable), you'll be prompted to provide a default value for existing rows.
+Add the field to your model class, then run `plain migrations create` to create a migration. If the field is required (no default value and not nullable), you'll be prompted to provide a default value for existing rows.
 
 #### How do I create a unique constraint on multiple fields?
 

{plain_postgres-0.90.0 → plain_postgres-0.91.0}/plain/postgres/CHANGELOG.md

@@ -1,5 +1,35 @@
 # plain-postgres changelog
 
+## [0.91.0](https://github.com/dropseed/plain/releases/plain-postgres@0.91.0) (2026-03-29)
+
+### What's changed
+
+- **New `postgres sync` command** — the primary command for both development and deployment. In DEBUG mode it creates migrations, applies them, and converges. In production it applies migrations and converges. Use `--check` in CI to verify the database is fully synced. ([b026895edc4c](https://github.com/dropseed/plain/commit/b026895edc4c), [b348a5af0867](https://github.com/dropseed/plain/commit/b348a5af0867))
+
+- **Indexes and constraints are now managed by convergence, not migrations.** The migration autodetector no longer generates `AddIndex`, `RemoveIndex`, `RenameIndex`, `AddConstraint`, or `RemoveConstraint` operations — these classes have been removed. Convergence (`postgres sync` or `postgres converge`) creates, renames, rebuilds, and validates indexes and constraints using safe strategies: `CREATE INDEX CONCURRENTLY`, `NOT VALID` + `VALIDATE CONSTRAINT` for check constraints, and `CONCURRENTLY` + `USING INDEX` for unique constraints. ([c58b4ba1fec9](https://github.com/dropseed/plain/commit/c58b4ba1fec9), [f6506d263f3f](https://github.com/dropseed/plain/commit/f6506d263f3f), [1f15538b008f](https://github.com/dropseed/plain/commit/1f15538b008f))
+
+- **Command renames**: `makemigrations` → `migrations create`, `migrate` → `migrations apply`. The old top-level `makemigrations` and `migrate` shortcuts have been removed. ([adf021688bf3](https://github.com/dropseed/plain/commit/adf021688bf3))
+
+- **Removed `--backup` flag from `migrations apply`** — database backups have moved to `plain-dev`. ([50773a50f674](https://github.com/dropseed/plain/commit/50773a50f674))
+
+- **Removed `PositiveIntegerField`, `PositiveBigIntegerField`, and `PositiveSmallIntegerField`** — use `IntegerField`, `BigIntegerField`, or `SmallIntegerField` with a `CheckConstraint` if you need positivity enforcement. The `db_check` pipeline has also been removed. ([738a1efbca59](https://github.com/dropseed/plain/commit/738a1efbca59))
+
+- **Convergence overhaul** — rewritten into analysis, planning, and execution layers. Now detects index/constraint renames, stale definitions, INVALID indexes, and NOT VALID constraints. Each fix is applied and committed independently so partial failures don't block subsequent fixes. The `--prune` flag has been renamed to `--drop-undeclared`, which distinguishes between indexes (non-blocking) and constraints (blocking) when undeclared objects remain. ([987791d345cb](https://github.com/dropseed/plain/commit/987791d345cb), [66ac1152be0d](https://github.com/dropseed/plain/commit/66ac1152be0d), [f2f46e1a6054](https://github.com/dropseed/plain/commit/f2f46e1a6054), [5bb1472acf0f](https://github.com/dropseed/plain/commit/5bb1472acf0f))
+
+- Fixed test database names exceeding Postgres's 63-character identifier limit. ([4a8937ba2758](https://github.com/dropseed/plain/commit/4a8937ba2758))
+
+### Upgrade instructions
+
+1. **Replace `migrate` with `postgres sync` in deploy scripts and CI.** `postgres sync` applies migrations and runs convergence in a single step. For CI checks, use `postgres sync --check` instead of `migrate --check` / `makemigrations --check`. The lower-level commands are still available as `migrations create` and `migrations apply`.
+
+2. **Remove index/constraint operations from migration files.** Delete any `AddIndex`, `RemoveIndex`, `RenameIndex`, `AddConstraint`, and `RemoveConstraint` operations from your migration files — these classes no longer exist and will cause import errors. If removing an operation leaves `operations = []`, delete the migration file and run `plain migrations prune --yes`. Indexes and constraints declared on your models will be created automatically by convergence.
+
+3. **Replace `PositiveIntegerField`** (and `PositiveBigIntegerField`, `PositiveSmallIntegerField`) with `IntegerField` (or `BigIntegerField`, `SmallIntegerField`) in both models and migration files. Add a `CheckConstraint` if you need to enforce positive values.
+
+4. **Run `plain postgres sync`** after upgrading to create indexes and constraints via convergence.
+
+5. If you used `plain postgres backups`, install `plain-dev>=0.60.0` — backups have moved to `plain dev backups`.
+
 ## [0.90.0](https://github.com/dropseed/plain/releases/plain-postgres@0.90.0) (2026-03-28)
 
 ### What's changed

{plain_postgres-0.90.0 → plain_postgres-0.91.0}/plain/postgres/README.md

@@ -435,7 +435,7 @@ Migrations track changes to your models and update the database schema according
 ### Creating migrations
 
 ```bash
-plain makemigrations
+plain migrations create
 ```
 
 Key flags:
@@ -451,12 +451,11 @@ Only write migrations by hand if they are custom data migrations.
 ### Running migrations
 
 ```bash
-plain migrate --backup
+plain migrations apply
 ```
 
 Key flags:
 
-- `--backup` / `--no-backup` — Create a database backup before applying (default: on in DEBUG)
 - `--plan` — Show what migrations would run without applying them
 - `--check` — Exit non-zero if unapplied migrations exist (for CI)
 - `--fake` — Mark migrations as applied without running them
@@ -467,7 +466,7 @@ Key flags:
 plain migrations list
 ```
 
-`migrate` has no `--list` or `--status` flag. Use `plain migrations list`.
+`migrations apply` has no `--list` or `--status` flag. Use `plain migrations list`.
 
 - `--format plan` — Show in dependency order instead of grouped by package
 
@@ -481,8 +480,8 @@ Use this when migrations exist only in your local dev environment and haven't be
 
 1. Delete the intermediate migration files (keep the initial 0001 and any previously committed migrations)
 2. `plain migrations prune --yes` — removes stale DB records for the deleted files
-3. `plain makemigrations` — creates a single fresh migration with all the changes
-4. `plain migrate --fake` — marks the new migration as applied (the schema is already correct from the old migrations)
+3. `plain migrations create` — creates a single fresh migration with all the changes
+4. `plain migrations apply --fake` — marks the new migration as applied (the schema is already correct from the old migrations)
 
 **Consolidating committed migrations (squash):**
 
@@ -511,16 +510,16 @@ Over time a package can accumulate dozens of migrations. Once **every environmen
 
 1. Run `plain migrations list` locally and verify everything is applied.
 2. Delete every file in the package's `migrations/` directory except `__init__.py`.
-3. Run `plain makemigrations` to generate a fresh `0001_initial`.
+3. Run `plain migrations create` to generate a fresh `0001_initial`.
 4. Run `plain migrations prune --yes` to remove stale DB records. The existing `0001_initial` record matches the new file, so the database is immediately up to date.
-5. Verify with `plain postgres schema` (zero issues means the reset is clean) and `plain makemigrations --check` (no pending changes).
+5. Verify with `plain postgres schema` (zero issues means the reset is clean) and `plain migrations create --check` (no pending changes).
 6. Commit and deploy. On every other environment, run `plain migrations prune --yes`. No actual SQL runs — it only cleans up migration history records. If `migrations prune` is already in your deploy steps, no changes are needed.
 
 **Things to keep in mind:**
 
 - If resetting multiple packages, process depended-on packages first — the new `0001_initial` may have cross-package FK dependencies.
 - Data migrations (`RunPython`) in the deleted history are gone, which is fine since they've already run everywhere.
-- If CI runs `makemigrations --check` or `migrate --check`, the reset PR must be merged and deployed before those checks pass in other branches.
+- If CI runs `migrations create --check` or `migrations apply --check`, the reset PR must be merged and deployed before those checks pass in other branches.
 
 ### Other migration commands
 
@@ -566,9 +565,6 @@ class Product(postgres.Model):
 - [`IntegerField`](./fields/__init__.py#IntegerField) - Integer
 - [`BigIntegerField`](./fields/__init__.py#BigIntegerField) - Big (8 byte) integer
 - [`SmallIntegerField`](./fields/__init__.py#SmallIntegerField) - Small integer
-- [`PositiveIntegerField`](./fields/__init__.py#PositiveIntegerField) - Positive integer
-- [`PositiveBigIntegerField`](./fields/__init__.py#PositiveBigIntegerField) - Positive big integer
-- [`PositiveSmallIntegerField`](./fields/__init__.py#PositiveSmallIntegerField) - Positive small integer
 - [`FloatField`](./fields/__init__.py#FloatField) - Floating point number
 - [`DecimalField`](./fields/__init__.py#DecimalField) - Fixed precision decimal
 
@@ -1026,7 +1022,7 @@ See [`default_settings.py`](./default_settings.py) for more details.
 
 #### How do I add a field to an existing model?
 
-Add the field to your model class, then run `plain makemigrations` to create a migration. If the field is required (no default value and not nullable), you'll be prompted to provide a default value for existing rows.
+Add the field to your model class, then run `plain migrations create` to create a migration. If the field is required (no default value and not nullable), you'll be prompted to provide a default value for existing rows.
 
 #### How do I create a unique constraint on multiple fields?
 

{plain_postgres-0.90.0 → plain_postgres-0.91.0}/plain/postgres/__init__.py

@@ -21,9 +21,6 @@ from .fields import (
     FloatField,
     GenericIPAddressField,
     IntegerField,
-    PositiveBigIntegerField,
-    PositiveIntegerField,
-    PositiveSmallIntegerField,
     PrimaryKeyField,
     SmallIntegerField,
     TextField,
@@ -70,9 +67,6 @@ __all__ = [
     "FloatField",
     "GenericIPAddressField",
     "IntegerField",
-    "PositiveBigIntegerField",
-    "PositiveIntegerField",
-    "PositiveSmallIntegerField",
     "PrimaryKeyField",
     "SmallIntegerField",
     "TextField",

{plain_postgres-0.90.0 → plain_postgres-0.91.0}/plain/postgres/agents/.claude/rules/plain-postgres.md

@@ -33,12 +33,13 @@ Get approval before writing any model code or generating migrations.
 
 ## Migrations
 
-- `uv run plain makemigrations` — create migrations (`--dry-run` to preview, `--check` for CI)
-- `uv run plain migrate --backup` — apply migrations
-- `uv run plain migrations list` — view status (not `migrate --list`)
+- `uv run plain postgres sync` — the primary command: makes migrations (in DEBUG), applies them, and converges
+- `uv run plain migrations create` — create migrations (`--dry-run` to preview, `--check` for CI)
+- `uv run plain migrations apply` — apply migrations
+- `uv run plain migrations list` — view status
 - Before committing, consolidate multiple uncommitted migrations into one:
   delete the intermediate files, run `migrations prune --yes` to clean stale DB records,
-  run `makemigrations` fresh, then `migrate --fake` to mark it applied
+  run `migrations create` fresh, then `migrations apply --fake` to mark it applied
 - Use `migrations squash` only for already-committed/deployed migrations — never for dev cleanup
 - Only write migrations by hand for custom data migrations
 

{plain_postgres-0.90.0 → plain_postgres-0.91.0}/plain/postgres/agents/.claude/skills/plain-postgres-doctor/SKILL.md

@@ -7,7 +7,7 @@ description: Check overall database health — schema correctness and operationa
 
 Check database health by running schema and operational checks, then fix any issues found.
 
-**All checks are read-only.** Fixes are local code changes. Never run database mutations (`migrate`, direct SQL) without explicit user approval.
+**All checks are read-only.** Fixes are local code changes. Never run database mutations (`migrations apply`, direct SQL) without explicit user approval.
 
 ## 1. Dev only or production too?
 
@@ -37,7 +37,7 @@ The JSON output includes `suggestion` fields for each finding. If findings are o
 
 ## 3. Fix issues
 
-Make code and migration changes in the local codebase. For app-owned items, this is typically model changes + `uv run plain makemigrations`. For unknown tables, present `uv run plain postgres drop-unknown-tables` to the user — it shows what will be dropped and asks for confirmation. Use `--yes` to skip the prompt if the user wants the agent to run it directly. For other unmanaged items, the suggestions include exact DDL — present these to the user for review, do not run SQL directly.
+Make code and migration changes in the local codebase. For app-owned items, this is typically model changes + `uv run plain migrations create`. For unknown tables, present `uv run plain postgres drop-unknown-tables` to the user — it shows what will be dropped and asks for confirmation. Use `--yes` to skip the prompt if the user wants the agent to run it directly. For other unmanaged items, the suggestions include exact DDL — present these to the user for review, do not run SQL directly.
 
 ## 4. Verify
 

plain_postgres-0.91.0/plain/postgres/cli/converge.py

@@ -0,0 +1,99 @@
+from __future__ import annotations
+
+import sys
+
+import click
+
+from ..convergence import execute_plan, plan_convergence
+
+
+@click.command()
+@click.option(
+    "--yes",
+    "-y",
+    is_flag=True,
+    help="Skip confirmation prompt.",
+)
+@click.option(
+    "--drop-undeclared",
+    is_flag=True,
+    help="Drop indexes and constraints not declared on any model.",
+)
+def converge(yes: bool, drop_undeclared: bool) -> None:
+    """Fix schema mismatches between models and the database.
+
+    Detects and fixes:
+    - Missing indexes (using CONCURRENTLY)
+    - Missing constraints (check, unique)
+    - NOT VALID constraints needing validation
+
+    With --drop-undeclared, also drops indexes and constraints that exist in the
+    database but are not declared on any model.
+
+    Without --drop-undeclared, exits non-zero if undeclared constraints remain
+    (constraints affect database behavior). Undeclared indexes are reported but
+    do not block success.
+
+    Each fix is applied and committed independently so partial
+    failures don't block subsequent fixes.
+    """
+    plan = plan_convergence()
+    items = plan.executable(drop_undeclared=drop_undeclared)
+    success = True
+
+    if items:
+        click.secho(
+            f"{len(items)} fix{'es' if len(items) != 1 else ''} to apply:\n",
+            bold=True,
+        )
+        for item in items:
+            click.echo(f"  {item.describe()}")
+
+        click.echo()
+
+        if not yes:
+            if not click.confirm("Apply these changes?"):
+                return
+
+        click.echo()
+
+        result = execute_plan(items)
+
+        for r in result.results:
+            if r.ok:
+                click.echo(f"  {r.sql}")
+            else:
+                click.secho(f"  FAILED: {r.item.describe()} — {r.error}", fg="red")
+
+        click.echo()
+        click.secho(result.summary, fg="green" if result.ok else "yellow")
+        if not result.ok_for_sync:
+            success = False
+
+    if plan.blocked:
+        click.echo()
+        click.secho("Schema changes require a staged rollout:", fg="red", bold=True)
+        for item in plan.blocked:
+            click.secho(f"  {item.drift.describe()}", fg="red")
+            if item.guidance:
+                click.secho(f"    {item.guidance}", fg="red", dim=True)
+        success = False
+
+    if not drop_undeclared and plan.blocking_cleanup:
+        click.echo()
+        click.secho("Undeclared constraints still in database:", fg="red", bold=True)
+        for item in plan.blocking_cleanup:
+            click.secho(f"  {item.describe()}", fg="red")
+        click.secho("Rerun with --drop-undeclared to remove them.", fg="red")
+        success = False
+
+    if not drop_undeclared and plan.optional_cleanup:
+        click.echo()
+        for item in plan.optional_cleanup:
+            click.echo(f"  {item.describe()}")
+        click.echo("Run with --drop-undeclared to remove undeclared indexes.")
+
+    if not success:
+        sys.exit(1)
+    elif not items:
+        click.secho("Schema is converged — nothing to fix.", fg="green")

{plain_postgres-0.90.0 → plain_postgres-0.91.0}/plain/postgres/cli/core.py

@@ -10,12 +10,12 @@ import psycopg
 
 from plain.cli import register_cli
 
-from ..backups.cli import cli as backups_cli
 from ..db import get_connection
 from ..dialect import quote_name
 from .converge import converge
 from .diagnose import diagnose
 from .schema import schema
+from .sync import sync
 
 
 @register_cli("postgres")
@@ -24,10 +24,10 @@ def cli() -> None:
     """Postgres operations"""
 
 
-cli.add_command(backups_cli)
 cli.add_command(converge)
 cli.add_command(diagnose)
 cli.add_command(schema)
+cli.add_command(sync)
 
 
 @cli.command()

{plain_postgres-0.90.0 → plain_postgres-0.91.0}/plain/postgres/cli/migrations.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import os
 import sys
-import time
 from typing import TYPE_CHECKING, Any
 
 import click
@@ -10,11 +9,9 @@ import click
 from plain.cli import register_cli
 from plain.cli.runtime import common_command
 from plain.packages import packages_registry
-from plain.runtime import settings
 from plain.utils.text import Truncator
 
 from .. import migrations
-from ..backups.core import DatabaseBackups
 from ..db import get_connection
 from ..migrations.autodetector import MigrationAutodetector
 from ..migrations.executor import MigrationExecutor
@@ -42,8 +39,7 @@ def cli() -> None:
 
 
 @common_command
-@register_cli("makemigrations", shortcut_for="migrations make")
-@cli.command("make")
+@cli.command("create")
 @click.argument("package_labels", nargs=-1)
 @click.option(
     "--dry-run",
@@ -71,7 +67,7 @@ def cli() -> None:
     default=1,
     help="Verbosity level; 0=minimal output, 1=normal output, 2=verbose output, 3=very verbose output",
 )
-def make(
+def create(
     package_labels: tuple[str, ...],
     dry_run: bool,
     empty: bool,
@@ -273,7 +269,7 @@ def make(
 
     # Warn about packages that have models but no migrations directory.
     # These are silently skipped by the autodetector, which can be confusing
-    # when setting up a new app (makemigrations says "No changes detected").
+    # when setting up a new app ("No changes detected").
     unmigrated_with_models = []
     for package_label in sorted(loader.unmigrated_packages):
         module_name, _explicit = MigrationLoader.migrations_module(package_label)
@@ -296,13 +292,12 @@ def make(
         click.echo()
         click.echo(
             "To create initial migrations, add the directory and run "
-            + click.style("plain makemigrations", bold=True)
+            + click.style("plain migrations create", bold=True)
             + " again."
         )
 
 
 @common_command
-@register_cli("migrate", shortcut_for="migrations apply")
 @cli.command("apply")
 @click.argument("package_label", required=False)
 @click.argument("migration_name", required=False)
@@ -320,13 +315,6 @@ def make(
     is_flag=True,
     help="Exits with a non-zero status if unapplied migrations exist and does not actually apply migrations.",
 )
-@click.option(
-    "--backup/--no-backup",
-    "backup",
-    is_flag=True,
-    default=None,
-    help="Explicitly enable/disable pre-migration backups.",
-)
 @click.option(
     "--no-input",
     "--noinput",
@@ -350,7 +338,6 @@ def apply(
     fake: bool,
     plan: bool,
     check_unapplied: bool,
-    backup: bool | None,
     no_input: bool,
     atomic_batch: bool | None,
     quiet: bool,
@@ -553,26 +540,8 @@ def apply(
                     if len(migration_plan) > 1:
                         atomic_batch_message = f"Running {len(migration_plan)} migrations separately (some have atomic=False)"
 
-        if backup or (backup is None and settings.DEBUG):
-            backup_name = time.strftime("%Y%m%d_%H%M%S")
-            if not quiet:
-                click.secho("Creating backup: ", bold=True, nl=False)
-                click.secho(f"{backup_name}", dim=True, nl=False)
-                click.secho("... ", dim=True, nl=False)
-
-            backups_handler = DatabaseBackups()
-            backups_handler.create(
-                backup_name,
-                source="migrate",
-                pg_dump=os.environ.get("PG_DUMP", "pg_dump"),
-            )
-
-            if not quiet:
-                click.echo(click.style("OK", fg="green"))
-                click.echo()  # Add blank line after backup output
-        else:
-            if not quiet:
-                click.echo()  # Add blank line after packages/target info
+        if not quiet:
+            click.echo()  # Add blank line before applying
 
         if not quiet:
             if atomic_batch_message:
@@ -625,7 +594,7 @@ def apply(
                     f"Your models have changes that are not yet reflected in migrations ({packages})."
                 )
                 click.echo(
-                    "Run 'plain makemigrations' to create migrations for these changes."
+                    "Run 'plain migrations create' to create migrations for these changes."
                 )
 
 
@@ -706,7 +675,9 @@ def list_migrations(
                             if plan_node in recorded_migrations:
                                 output = f" [X] {title}"
                             else:
-                                title += " Run `plain migrate` to finish recording."
+                                title += (
+                                    " Run `plain migrations apply` to finish recording."
+                                )
                                 output = f" [-] {title}"
                             if verbosity >= 2 and hasattr(applied_migration, "applied"):
                                 output += f" (applied at {applied_migration.applied.strftime('%Y-%m-%d %H:%M:%S')})"