@humain/terminal 0.0.2 → 0.0.3-beta.0

package/dist/core/package-manager.js

@@ -25,16 +25,17 @@ import { globSync } from "glob";
 import ignore from "ignore";
 import { minimatch } from "minimatch";
 import { maxSatisfying, rcompare, satisfies, valid, validRange } from "semver";
-import { CONFIG_DIR_NAME, ENV_OFFLINE } from "../config.js";
+import { CONFIG_DIR_NAME } from "../config.js";
 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;
 function isOfflineModeEnabled() {
-    const value = process.env[ENV_OFFLINE];
+    const value = process.env.PI_OFFLINE;
     if (!value)
         return false;
     return value === "1" || value.toLowerCase() === "true" || value.toLowerCase() === "yes";
@@ -82,26 +83,19 @@ function getPackageSourceString(source) {
 }
 function getPackageSourceIdentity(source) {
     const rawSource = getPackageSourceString(source);
-    if (!rawSource.startsWith("npm:")) {
+    if (!rawSource.startsWith("npm:"))
         return rawSource;
-    }
     const spec = rawSource.slice("npm:".length);
-    if (spec.startsWith("@")) {
-        const versionSeparator = spec.indexOf("@", 1);
-        return `npm:${versionSeparator === -1 ? spec : spec.slice(0, versionSeparator)}`;
-    }
-    const versionSeparator = spec.indexOf("@");
+    const versionSeparator = spec.startsWith("@") ? spec.indexOf("@", 1) : spec.indexOf("@");
     return `npm:${versionSeparator === -1 ? spec : spec.slice(0, versionSeparator)}`;
 }
-export function mergeDefaultPackageSources(defaultPackageSources, configuredPackageSources) {
-    const mergedByIdentity = new Map();
-    for (const source of defaultPackageSources) {
-        mergedByIdentity.set(getPackageSourceIdentity(source), source);
-    }
-    for (const source of configuredPackageSources) {
-        mergedByIdentity.set(getPackageSourceIdentity(source), source);
-    }
-    return [...mergedByIdentity.values()];
+export function mergeDefaultPackageSources(defaults, configured) {
+    const merged = new Map();
+    for (const source of defaults)
+        merged.set(getPackageSourceIdentity(source), source);
+    for (const source of configured)
+        merged.set(getPackageSourceIdentity(source), source);
+    return [...merged.values()];
 }
 export function getExtensionTempFolder(agentDir) {
     const tempFolder = join(agentDir, "tmp", "extensions");
@@ -386,20 +380,10 @@ function collectAutoThemeEntries(dir) {
     }
     return entries;
 }
-function readPiManifestFile(packageJsonPath) {
-    try {
-        const content = readFileSync(packageJsonPath, "utf-8");
-        const pkg = JSON.parse(content);
-        return pkg.humainTerminal ?? 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) {
@@ -626,10 +610,10 @@ export class DefaultPackageManager {
     cwd;
     agentDir;
     settingsManager;
-    defaultPackageSources;
     globalNpmRoot;
     globalNpmRootCommandKey;
     progressCallback;
+    defaultPackageSources;
     constructor(options) {
         this.cwd = resolvePath(options.cwd);
         this.agentDir = resolvePath(options.agentDir);
@@ -728,8 +712,7 @@ export class DefaultPackageManager {
         for (const pkg of projectSettings.packages ?? []) {
             allPackages.push({ pkg, scope: "project" });
         }
-        const globalPackages = mergeDefaultPackageSources(this.defaultPackageSources, globalSettings.packages ?? []);
-        for (const pkg of globalPackages) {
+        for (const pkg of mergeDefaultPackageSources(this.defaultPackageSources, globalSettings.packages ?? [])) {
             allPackages.push({ pkg, scope: "user" });
         }
         // Dedupe: project scope wins over global for same package identity
@@ -1475,7 +1458,7 @@ export class DefaultPackageManager {
         if (configuredCommand && configuredCommand.length > 0) {
             return ["install", "--ignore-scripts"];
         }
-        return ["install", "--ignore-scripts", "--omit=dev"];
+        return ["install", "--omit=dev", "--ignore-scripts"];
     }
     runNpmCommandSync(args) {
         const npmCommand = this.getNpmCommand();
@@ -1483,7 +1466,7 @@ export class DefaultPackageManager {
     }
     getNpmInstallArgs(specs, installRoot) {
         const packageManagerName = this.getPackageManagerName();
-        // Extension packages run inside HUMAIN Terminal and resolve runtime APIs through loader aliases/virtual modules.
+        // Extension packages run inside pi and resolve pi APIs through loader aliases/virtual modules.
         // Disable peer dependency resolution for managed installs (npm's --legacy-peer-deps, and
         // equivalent bun/pnpm settings) so package managers do not install or solve host-provided
         // @earendil-works/pi-* peers. Stale auto-installed pi peers can otherwise block updates.
@@ -1541,6 +1524,7 @@ export class DefaultPackageManager {
             this.ensureGitIgnore(gitRoot);
         }
         mkdirSync(dirname(targetDir), { recursive: true });
+        rmSync(this.getGitUpdateMarkerPath(targetDir), { force: true });
         try {
             await this.runCommand("git", ["clone", source.repo, targetDir]);
             if (source.ref) {
@@ -1570,6 +1554,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 });
@@ -1582,16 +1613,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()) {
@@ -1608,9 +1642,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) {
@@ -1791,7 +1824,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];
@@ -1814,7 +1847,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);
@@ -1861,7 +1894,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);
@@ -1876,20 +1909,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.humainTerminal ?? pkg.pi ?? null;
-        }
-        catch {
-            return null;
-        }
-    }
     addManifestEntries(entries, root, resourceType, target, metadata) {
         if (!entries)
             return;
@@ -1999,9 +2018,9 @@ export class DefaultPackageManager {
             addResources("prompts", collectAutoPromptEntries(projectDirs.prompts), projectMetadata, projectOverrides.prompts, projectBaseDir);
             addResources("themes", collectAutoThemeEntries(projectDirs.themes), projectMetadata, projectOverrides.themes, projectBaseDir);
         }
-        // User extensions from ~/.humain-terminal/agent/
+        // User extensions from ~/.pi/agent/
         addResources("extensions", collectAutoExtensionEntries(userDirs.extensions), userMetadata, userOverrides.extensions, globalBaseDir);
-        // User skills from ~/.humain-terminal/agent/
+        // User skills from ~/.pi/agent/
         addResources("skills", collectAutoSkillEntries(userDirs.skills, "pi"), userMetadata, userOverrides.skills, globalBaseDir);
         // User skills from ~/.agents/ (with its own baseDir)
         const userAgentsBaseDir = dirname(userAgentsSkillsDir);