Merge branch '0.6'

Author: codedmonkey

.claude/commands/code-review.md

@@ -1,23 +1,29 @@
 ---
-allowed-tools: Bash(git diff:*), Bash(git log:*), Bash(git merge-base:*), Bash(git rev-parse:*)
+allowed-tools: Bash(git branch:*), Bash(git diff:*), Bash(git log:*), Bash(git merge-base:*), Bash(git rev-parse:*)
 description: Code review changes since branch diverged from default branch
 ---
 
-Review the code changes introduced since this branch diverged from the default branch (main).
+Review the code changes introduced since this branch diverged from its base branch.
 
 **Agent assumptions (applies to all agents and subagents):**
 - All tools are functional and will work without error. Do not test tools or make exploratory calls. Make sure this is clear to every subagent that is launched.
 - Only call a tool if it is required to complete the task. Every tool call should have a clear purpose.
 
 To do this, follow these steps precisely:
 
-1. Run `git diff main...HEAD` to get the diff and `git log main..HEAD --oneline` to get the commit list. If the diff is empty, stop and report there are no changes to review.
+1. Determine the base branch to diff against:
+   - The default base branch is `main`.
+   - Run `git branch` to list local branches and find any version branches (branches whose name matches the pattern `X.Y`, e.g. `0.6`, `1.2`).
+   - For each version branch found, compare how close the current branch is to it vs. `main` by counting commits since divergence: `git log <branch>..HEAD --oneline | wc -l`. Pick the branch with the fewest commits (i.e. the most recent common ancestor). If a version branch is closer than `main`, use it as the base branch instead.
+   - Store the chosen base branch name as BASE_BRANCH.
 
-2. Launch a haiku agent to return a list of file paths (not their contents) for all relevant CLAUDE.md files including:
+2. Run `git diff BASE_BRANCH...HEAD` to get the diff and `git log BASE_BRANCH..HEAD --oneline` to get the commit list. If the diff is empty, stop and report there are no changes to review.
+
+3. Launch a haiku agent to return a list of file paths (not their contents) for all relevant CLAUDE.md files including:
    - The root CLAUDE.md file, if it exists
    - Any CLAUDE.md files in directories containing files modified in the diff
 
-3. Launch 4 agents in parallel to independently review the changes. Each agent should return the list of issues, where each issue includes a description and the reason it was flagged (e.g. "CLAUDE.md adherence", "bug"). The agents should do the following:
+4. Launch 4 agents in parallel to independently review the changes. Each agent should return the list of issues, where each issue includes a description and the reason it was flagged (e.g. "CLAUDE.md adherence", "bug"). The agents should do the following:
 
    Agents 1 + 2: CLAUDE.md compliance sonnet agents
    Audit changes for CLAUDE.md compliance in parallel. Note: When evaluating CLAUDE.md compliance for a file, you should only consider CLAUDE.md files that share a file path with the file or parents.
@@ -40,11 +46,11 @@ To do this, follow these steps precisely:
 
    If you are not certain an issue is real, do not flag it. False positives erode trust and waste reviewer time.
 
-4. For each issue found in the previous step by agents 3 and 4, launch parallel subagents to validate the issue. The agent's job is to review the issue to validate that the stated issue is truly an issue with high confidence. For example, if an issue such as "variable is not defined" was flagged, the subagent's job would be to validate that is actually true in the code. Another example would be CLAUDE.md issues. The agent should validate that the CLAUDE.md rule that was violated is scoped for this file and is actually violated. Use Opus subagents for bugs and logic issues, and sonnet agents for CLAUDE.md violations.
+5. For each issue found in the previous step by agents 3 and 4, launch parallel subagents to validate the issue. The agent's job is to review the issue to validate that the stated issue is truly an issue with high confidence. For example, if an issue such as "variable is not defined" was flagged, the subagent's job would be to validate that is actually true in the code. Another example would be CLAUDE.md issues. The agent should validate that the CLAUDE.md rule that was violated is scoped for this file and is actually violated. Use Opus subagents for bugs and logic issues, and sonnet agents for CLAUDE.md violations.
 
-5. Filter out any issues that were not validated in step 4. This step will give us our list of high signal issues for our review.
+6. Filter out any issues that were not validated in step 4. This step will give us our list of high signal issues for our review.
 
-6. Output a summary of the review findings to the terminal:
+7. Output a summary of the review findings to the terminal:
    - If issues were found, list each issue with a brief description and the file/line it occurs in.
    - If no issues were found, state: "No issues found. Checked for bugs and CLAUDE.md compliance."
 

.claude/settings.json

@@ -0,0 +1,14 @@
+{
+    "permissions": {
+        "allow": [
+            "Bash(symfony composer run *)"
+        ],
+        "deny": [
+            "Read(.env)",
+            "Read(.env.dirigent.local)",
+            "Read(.env.dirigent.local.php)",
+            "Read(.env.dirigent.*.local)",
+            "Read(./config/secrets/prod/prod.decrypt.private.php)"
+        ]
+    }
+}

AGENTS.md

@@ -48,7 +48,7 @@ tests/
 - Always use strict comparisons (`===`, `!==`).
 - Enforce the use of DateTimeImmutable over DateTime.
 - Always use spaces in concatenation (`$a . $b`).
-- Always use imports. Use aliases when collisions occur or the imported name is unclear.
+- Always use imports. Use aliases when collisions occur or the imported name is unclear. Do not import classes from the root namespace (e.g. `\RuntimeException`, `\Stringable`); use the fully-qualified backslash prefix inline instead.
 - Don't use blank lines between import groups.
 
 ## Commands
@@ -57,30 +57,30 @@ tests/
 
 ```shell
 # Run all linting jobs
-symfony composer lint
+symfony composer run lint
 
 # Individual linters
-symfony composer lint:refactor        # Rector (automatically applies changes)
-symfony composer lint:coding-style    # PHP-CS-Fixer (automatically applies changes)
-symfony composer lint:static-analysis # PHPStan level 5
-symfony composer lint:container       # Symfony container validation
-symfony composer lint:templates       # Twig template validation
+symfony composer run lint:refactor        # Rector (automatically applies changes)
+symfony composer run lint:coding-style    # PHP-CS-Fixer (automatically applies changes)
+symfony composer run lint:static-analysis # PHPStan level 5
+symfony composer run lint:container       # Symfony container validation
+symfony composer run lint:templates       # Twig template validation
 ```
 
 ### Testing
 
 ```shell
 # Prepare the Symfony test environment for tests (if the database schema changed)
-symfony composer tests:setup
+symfony composer run tests:setup
 
 # Run all tests
-symfony composer tests
+symfony composer run tests
 
 # Run only PHP tests
-symfony composer tests:php
-symfony composer tests:php:unit
-symfony composer tests:php:functional
+symfony composer run tests:php
+symfony composer run tests:php:unit
+symfony composer run tests:php:functional
 
 # Run tests for Docker images
-symfony composer tests:docker
+symfony composer run tests:docker
 ```

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+* 0.6.2 (2026-03-31)
+  * Improved sorting of package keywords by adding an index to the stored metadata
+
 * 0.6.1 (2026-03-30)
   * Fixed loading of encryption module in dashboard pages which prevented changes to existing credentials
   * Disabled autocomplete on credentials information

migrations/Version20260323085127.php

@@ -0,0 +1,96 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260323085127 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add index to version keyword association';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql(<<<'SQL'
+            ALTER TABLE version_keyword DROP CONSTRAINT fk_a65a946f115d4552
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE version_keyword DROP CONSTRAINT fk_a65a946f4bbc2705
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE version_keyword DROP CONSTRAINT version_keyword_pkey
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE version_keyword ADD id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE version_keyword ADD index INT DEFAULT NULL
+        SQL);
+        $this->addSql(<<<'SQL'
+            UPDATE version_keyword
+            SET index = sub.row_num - 1
+            FROM (
+                SELECT version_id, keyword_id, ROW_NUMBER() OVER (PARTITION BY version_id ORDER BY keyword_id) AS row_num
+                FROM version_keyword
+            ) sub
+            WHERE version_keyword.version_id = sub.version_id AND version_keyword.keyword_id = sub.keyword_id
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE version_keyword ALTER COLUMN index SET NOT NULL
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE
+                version_keyword
+            ADD
+                CONSTRAINT FK_A65A946F115D4552 FOREIGN KEY (keyword_id) REFERENCES keyword (id) NOT DEFERRABLE
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE
+                version_keyword
+            ADD
+                CONSTRAINT FK_A65A946F4BBC2705 FOREIGN KEY (version_id) REFERENCES version (id) NOT DEFERRABLE
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE version_keyword ADD PRIMARY KEY (id)
+        SQL);
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql(<<<'SQL'
+            ALTER TABLE version_keyword DROP CONSTRAINT FK_A65A946F4BBC2705
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE version_keyword DROP CONSTRAINT FK_A65A946F115D4552
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE version_keyword DROP CONSTRAINT version_keyword_pkey
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE version_keyword DROP id
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE version_keyword DROP index
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE
+                version_keyword
+            ADD
+                CONSTRAINT fk_a65a946f4bbc2705 FOREIGN KEY (version_id) REFERENCES version (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE
+                version_keyword
+            ADD
+                CONSTRAINT fk_a65a946f115d4552 FOREIGN KEY (keyword_id) REFERENCES keyword (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE version_keyword ADD PRIMARY KEY (version_id, keyword_id)
+        SQL);
+    }
+}

src/Doctrine/Entity/Keyword.php

@@ -3,8 +3,6 @@
 namespace CodedMonkey\Dirigent\Doctrine\Entity;
 
 use CodedMonkey\Dirigent\Doctrine\Repository\KeywordRepository;
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity(repositoryClass: KeywordRepository::class)]
@@ -18,13 +16,9 @@ class Keyword
     #[ORM\Column(length: 191)]
     private string $name;
 
-    #[ORM\ManyToMany(targetEntity: Version::class, mappedBy: 'keywords')]
-    protected Collection $versions;
-
     public function __construct(string $name)
     {
         $this->name = $name;
-        $this->versions = new ArrayCollection();
     }
 
     public function getId(): ?int

src/Doctrine/Entity/Version.php

@@ -79,7 +79,8 @@ class Version extends TrackedEntity implements \Stringable
     #[ORM\OrderBy(['index' => 'ASC'])]
     private Collection $suggest;
 
-    #[ORM\ManyToMany(targetEntity: Keyword::class, inversedBy: 'versions', cascade: ['persist', 'detach', 'remove'])]
+    #[ORM\OneToMany(mappedBy: 'version', targetEntity: VersionKeyword::class, cascade: ['persist', 'detach', 'remove'])]
+    #[ORM\OrderBy(['index' => 'ASC'])]
     private Collection $keywords;
 
     #[ORM\Column]
@@ -354,16 +355,16 @@ public function addSuggestLink(VersionSuggestLink $suggest): void
     }
 
     /**
-     * @return Collection<int, Keyword>
+     * @return Collection<int, VersionKeyword>
      */
     public function getKeywords(): Collection
     {
         return $this->keywords;
     }
 
-    public function addKeyword(Keyword $keyword): void
+    public function addKeyword(VersionKeyword $versionKeyword): void
     {
-        $this->keywords[] = $keyword;
+        $this->keywords[] = $versionKeyword;
     }
 
     public function getAutoload(): array
@@ -642,8 +643,8 @@ public function getBrowsableRepositoryUrl(): ?string
     public function toComposerArray(): array
     {
         $keywords = [];
-        foreach ($this->getKeywords() as $keyword) {
-            $keywords[] = $keyword->getName();
+        foreach ($this->getKeywords() as $versionKeyword) {
+            $keywords[] = $versionKeyword->getKeyword()->getName();
         }
 
         $authors = $this->getAuthors();

src/Doctrine/Entity/VersionKeyword.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace CodedMonkey\Dirigent\Doctrine\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+#[ORM\Entity]
+class VersionKeyword
+{
+    #[ORM\Id]
+    #[ORM\Column]
+    #[ORM\GeneratedValue]
+    private ?int $id = null;
+
+    #[ORM\ManyToOne(targetEntity: Version::class, inversedBy: 'keywords')]
+    #[ORM\JoinColumn(nullable: false)]
+    private Version $version;
+
+    #[ORM\ManyToOne(targetEntity: Keyword::class)]
+    #[ORM\JoinColumn(nullable: false)]
+    private Keyword $keyword;
+
+    #[ORM\Column]
+    private int $index;
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getVersion(): Version
+    {
+        return $this->version;
+    }
+
+    public function setVersion(Version $version): void
+    {
+        $this->version = $version;
+    }
+
+    public function getKeyword(): Keyword
+    {
+        return $this->keyword;
+    }
+
+    public function setKeyword(Keyword $keyword): void
+    {
+        $this->keyword = $keyword;
+    }
+
+    public function getIndex(): int
+    {
+        return $this->index;
+    }
+
+    public function setIndex(int $index): void
+    {
+        $this->index = $index;
+    }
+
+    public function getName(): string
+    {
+        return $this->keyword->getName();
+    }
+}