From b5d6d91054b9ceef95aef0819bb5c4ef7db1abdd Mon Sep 17 00:00:00 2001
From: nsfisis <nsfisis@gmail.com>
Date: Sun, 2 Aug 2026 08:42:55 +0900
Subject: fix(repository): run lazy initialization in count/has_package

PHP's ArrayRepository::count()/hasPackage() call $this->initialize(),
which late-binds to the concrete repository class and lazily loads its
packages. The Rust pass-throughs skipped that: they ran ArrayRepository's
stub initialize instead, returning 0/false and marking the repository
initialized with an empty package list, which made ensure_initialized()
skip the real initialization forever after.

Take &mut self in RepositoryInterface::count/has_package so the lazy
repositories (Filesystem, Platform, Composer) can guard with their real
initialize, and return Result from has_package since that initialization
can fail (PHP propagates the exception). InstallerInterface::is_installed
and InstallationManager::is_package_installed/mark_alias_installed
propagate the same way, which also resolves the TODO(phase-d) markers on
Package/Path/Artifact/Vcs repositories about initialization errors being
swallowed.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 .../shirabe/src/installer/installation_manager.rs  | 27 +++++++++++-----------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'crates/shirabe/src/installer/installation_manager.rs')

diff --git a/crates/shirabe/src/installer/installation_manager.rs b/crates/shirabe/src/installer/installation_manager.rs
index 9517eada..3a04a8e9 100644
--- a/crates/shirabe/src/installer/installation_manager.rs
+++ b/crates/shirabe/src/installer/installation_manager.rs
@@ -198,22 +198,21 @@ impl InstallationManager {
     /// Checks whether provided package is installed in one of the registered installers.
     pub fn is_package_installed(
         &self,
-        repo: &dyn InstalledRepositoryInterface,
+        repo: &mut dyn InstalledRepositoryInterface,
         package: PackageInterfaceHandle,
     ) -> anyhow::Result<bool> {
         // For testing only (ref InstallationManagerMock::isPackageInstalled).
         if self.mock.is_some() {
-            return Ok(repo.has_package(package));
+            return repo.has_package(package);
         }
 
         if let Some(alias) = package.as_alias() {
             let alias_of: PackageInterfaceHandle = alias.get_alias_of().into();
-            return Ok(repo.has_package(package) && self.is_package_installed(repo, alias_of)?);
+            return Ok(repo.has_package(package)? && self.is_package_installed(repo, alias_of)?);
         }
 
-        Ok(self
-            .get_installer(&package.get_type())?
-            .is_installed(repo, package))
+        self.get_installer(&package.get_type())?
+            .is_installed(repo, package)
     }
 
     /// Install binary for the given package.
@@ -264,7 +263,7 @@ impl InstallationManager {
                         mock.updated.push((initial.clone(), target.clone()));
                         mock.trace.push(trace);
                         repo.remove_package(initial);
-                        if !repo.has_package(target.clone()) {
+                        if !repo.has_package(target.clone())? {
                             repo.add_package(PackageInterfaceHandle::dup(&target));
                         }
                     }
@@ -278,7 +277,7 @@ impl InstallationManager {
                         let package: PackageInterfaceHandle = op.get_package().into();
                         mock.installed.push(package.clone());
                         mock.trace.push(trace);
-                        if !repo.has_package(package.clone()) {
+                        if !repo.has_package(package.clone())? {
                             repo.add_package(PackageInterfaceHandle::dup(&package));
                         }
                     }
@@ -578,7 +577,7 @@ impl InstallationManager {
                 }
                 match &operation {
                     AnyOperation::MarkAliasInstalled(op) => {
-                        self.mark_alias_installed(&mut **repo.borrow_mut(), op);
+                        self.mark_alias_installed(&mut **repo.borrow_mut(), op)?;
                     }
                     AnyOperation::MarkAliasUninstalled(op) => {
                         self.mark_alias_uninstalled(&mut **repo.borrow_mut(), op);
@@ -760,12 +759,14 @@ impl InstallationManager {
         &self,
         repo: &mut dyn InstalledRepositoryInterface,
         operation: &MarkAliasInstalledOperation,
-    ) {
+    ) -> anyhow::Result<()> {
         let package = operation.get_package();
 
-        if !repo.has_package(package.clone().into()) {
+        if !repo.has_package(package.clone().into())? {
             repo.add_package(crate::package::PackageInterfaceHandle::dup(&package.into()));
         }
+
+        Ok(())
     }
 
     /// Executes markAlias operation.
@@ -1016,7 +1017,7 @@ pub trait InstallationManagerInterface: std::fmt::Debug {
     fn disable_plugins(&mut self);
     fn is_package_installed(
         &mut self,
-        repo: &dyn InstalledRepositoryInterface,
+        repo: &mut dyn InstalledRepositoryInterface,
         package: PackageInterfaceHandle,
     ) -> anyhow::Result<bool>;
     fn ensure_binaries_presence(&mut self, package: PackageInterfaceHandle);
@@ -1052,7 +1053,7 @@ impl InstallationManagerInterface for InstallationManager {
 
     fn is_package_installed(
         &mut self,
-        repo: &dyn InstalledRepositoryInterface,
+        repo: &mut dyn InstalledRepositoryInterface,
         package: PackageInterfaceHandle,
     ) -> anyhow::Result<bool> {
         InstallationManager::is_package_installed(self, repo, package)
-- 
cgit v1.3.1