@earendil-works/pi-coding-agent 0.82.1 → 0.84.0

package/dist/core/package-manager.js

@@ -30,6 +30,7 @@ import { spawnProcess, spawnProcessSync } from "../utils/child-process.js";
 import { parseGitUrl } from "../utils/git.js";
 import { canonicalizePath, isLocalPath, markPathIgnoredByCloudSync, resolvePath } from "../utils/paths.js";
 import { isStdoutTakenOver } from "./output-guard.js";
+import { readPiManifest } from "./pi-manifest.js";
 const NETWORK_TIMEOUT_MS = 10000;
 const UPDATE_CHECK_CONCURRENCY = 4;
 const GIT_UPDATE_CONCURRENCY = 4;
@@ -360,20 +361,10 @@ function collectAutoThemeEntries(dir) {
     }
     return entries;
 }
-function readPiManifestFile(packageJsonPath) {
-    try {
-        const content = readFileSync(packageJsonPath, "utf-8");
-        const pkg = JSON.parse(content);
-        return pkg.pi ?? null;
-    }
-    catch {
-        return null;
-    }
-}
 function resolveExtensionEntries(dir) {
     const packageJsonPath = join(dir, "package.json");
     if (existsSync(packageJsonPath)) {
-        const manifest = readPiManifestFile(packageJsonPath);
+        const manifest = readPiManifest(packageJsonPath);
         if (manifest?.extensions?.length) {
             const entries = [];
             for (const extPath of manifest.extensions) {
@@ -1511,13 +1502,21 @@ export class DefaultPackageManager {
             this.ensureGitIgnore(gitRoot);
         }
         mkdirSync(dirname(targetDir), { recursive: true });
-        await this.runCommand("git", ["clone", source.repo, targetDir]);
-        if (source.ref) {
-            await this.runCommand("git", ["checkout", source.ref], { cwd: targetDir });
+        rmSync(this.getGitUpdateMarkerPath(targetDir), { force: true });
+        try {
+            await this.runCommand("git", ["clone", source.repo, targetDir]);
+            if (source.ref) {
+                await this.runCommand("git", ["checkout", source.ref], { cwd: targetDir });
+            }
+            const packageJsonPath = join(targetDir, "package.json");
+            if (existsSync(packageJsonPath)) {
+                await this.runNpmCommand(this.getGitDependencyInstallArgs(), { cwd: targetDir });
+            }
         }
-        const packageJsonPath = join(targetDir, "package.json");
-        if (existsSync(packageJsonPath)) {
-            await this.runNpmCommand(this.getGitDependencyInstallArgs(), { cwd: targetDir });
+        catch (error) {
+            rmSync(targetDir, { recursive: true, force: true });
+            this.pruneEmptyGitParents(targetDir, gitRoot);
+            throw error;
         }
     }
     async updateGit(source, scope) {
@@ -1533,6 +1532,53 @@ export class DefaultPackageManager {
         const target = await this.getLocalGitUpdateTarget(targetDir);
         await this.ensureGitRef(targetDir, target.fetchArgs, target.ref);
     }
+    hasMissingGitDependencies(targetDir) {
+        const packageJsonPath = join(targetDir, "package.json");
+        if (!existsSync(packageJsonPath))
+            return false;
+        try {
+            const manifest = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+            if (!manifest.dependencies ||
+                typeof manifest.dependencies !== "object" ||
+                Array.isArray(manifest.dependencies)) {
+                return false;
+            }
+            const nodeModulesDir = resolve(targetDir, "node_modules");
+            return Object.keys(manifest.dependencies).some((name) => {
+                const dependencyPath = resolve(nodeModulesDir, name);
+                if (!dependencyPath.startsWith(`${nodeModulesDir}${sep}`))
+                    return false;
+                return !existsSync(dependencyPath);
+            });
+        }
+        catch {
+            return false;
+        }
+    }
+    async repairMissingGitDependencies(targetDir) {
+        if (!this.hasMissingGitDependencies(targetDir))
+            return;
+        await this.runNpmCommand(this.getGitDependencyInstallArgs(), { cwd: targetDir });
+    }
+    getGitUpdateMarkerPath(targetDir) {
+        return join(dirname(targetDir), `.${basename(targetDir)}.pi-update-incomplete`);
+    }
+    async cleanAndInstallGitDependencies(targetDir, markerPath) {
+        // Clean untracked files (extensions should be pristine). If this fails after
+        // deleting dependencies, repair them so the existing extension still loads.
+        try {
+            await this.runCommand("git", ["clean", "-fdx"], { cwd: targetDir });
+        }
+        catch (error) {
+            await this.repairMissingGitDependencies(targetDir).catch(() => { });
+            throw error;
+        }
+        const packageJsonPath = join(targetDir, "package.json");
+        if (existsSync(packageJsonPath)) {
+            await this.runNpmCommand(this.getGitDependencyInstallArgs(), { cwd: targetDir });
+        }
+        rmSync(markerPath, { force: true });
+    }
     async ensureGitRef(targetDir, fetchArgs, ref) {
         // Fetch only the ref we will reset to, avoiding unrelated branch/tag noise.
         await this.runCommand("git", fetchArgs, { cwd: targetDir });
@@ -1545,16 +1591,19 @@ export class DefaultPackageManager {
             cwd: targetDir,
             timeoutMs: NETWORK_TIMEOUT_MS,
         });
+        const markerPath = this.getGitUpdateMarkerPath(targetDir);
         if (localHead.trim() === targetHead.trim()) {
+            if (existsSync(markerPath)) {
+                await this.cleanAndInstallGitDependencies(targetDir, markerPath);
+            }
+            else {
+                await this.repairMissingGitDependencies(targetDir);
+            }
             return;
         }
+        writeFileSync(markerPath, "", "utf-8");
         await this.runCommand("git", ["reset", "--hard", commitRef], { cwd: targetDir });
-        // Clean untracked files (extensions should be pristine)
-        await this.runCommand("git", ["clean", "-fdx"], { cwd: targetDir });
-        const packageJsonPath = join(targetDir, "package.json");
-        if (existsSync(packageJsonPath)) {
-            await this.runNpmCommand(this.getGitDependencyInstallArgs(), { cwd: targetDir });
-        }
+        await this.cleanAndInstallGitDependencies(targetDir, markerPath);
     }
     async refreshTemporaryGitSource(source, sourceStr) {
         if (isOfflineModeEnabled()) {
@@ -1571,9 +1620,8 @@ export class DefaultPackageManager {
     }
     async removeGit(source, scope) {
         const targetDir = this.getGitInstallPath(source, scope);
-        if (!existsSync(targetDir))
-            return;
         rmSync(targetDir, { recursive: true, force: true });
+        rmSync(this.getGitUpdateMarkerPath(targetDir), { force: true });
         this.pruneEmptyGitParents(targetDir, this.getGitInstallRoot(scope));
     }
     pruneEmptyGitParents(targetDir, installRoot) {
@@ -1754,7 +1802,7 @@ export class DefaultPackageManager {
             }
             return true;
         }
-        const manifest = this.readPiManifest(packageRoot);
+        const manifest = readPiManifest(join(packageRoot, "package.json"));
         if (manifest) {
             for (const resourceType of RESOURCE_TYPES) {
                 const entries = manifest[resourceType];
@@ -1777,7 +1825,7 @@ export class DefaultPackageManager {
         return hasAnyDir;
     }
     collectDefaultResources(packageRoot, resourceType, target, metadata) {
-        const manifest = this.readPiManifest(packageRoot);
+        const manifest = readPiManifest(join(packageRoot, "package.json"));
         const entries = manifest?.[resourceType];
         if (entries) {
             this.addManifestEntries(entries, packageRoot, resourceType, target, metadata);
@@ -1824,7 +1872,7 @@ export class DefaultPackageManager {
      * that pass the manifest's own patterns.
      */
     collectManifestFiles(packageRoot, resourceType) {
-        const manifest = this.readPiManifest(packageRoot);
+        const manifest = readPiManifest(join(packageRoot, "package.json"));
         const entries = manifest?.[resourceType];
         if (entries && entries.length > 0) {
             const allFiles = this.collectFilesFromManifestEntries(entries, packageRoot, resourceType);
@@ -1839,20 +1887,6 @@ export class DefaultPackageManager {
         const allFiles = collectResourceFiles(conventionDir, resourceType);
         return { allFiles, enabledByManifest: new Set(allFiles) };
     }
-    readPiManifest(packageRoot) {
-        const packageJsonPath = join(packageRoot, "package.json");
-        if (!existsSync(packageJsonPath)) {
-            return null;
-        }
-        try {
-            const content = readFileSync(packageJsonPath, "utf-8");
-            const pkg = JSON.parse(content);
-            return pkg.pi ?? null;
-        }
-        catch {
-            return null;
-        }
-    }
     addManifestEntries(entries, root, resourceType, target, metadata) {
         if (!entries)
             return;