apex-code 0.0.1-alpha.1 → 0.0.1-alpha.11

package/dist/core/package-manager.js

@@ -1,6 +1,7 @@
 import { createHash } from "node:crypto";
-import { chmodSync, existsSync, mkdirSync, readdirSync, readFileSync, rmSync, statSync, writeFileSync } from "node:fs";
+import { chmodSync, existsSync, globSync, mkdirSync, readdirSync, readFileSync, rmSync, statSync, writeFileSync, } from "node:fs";
 import { homedir } from "node:os";
+import { getApexEnvironment } from "./environment.js";
 function getEnv() {
     if (process.platform !== "linux" || Object.keys(process.env).length > 0) {
         return process.env;
@@ -21,21 +22,21 @@ function getEnv() {
     }
 }
 import { basename, dirname, join, relative, resolve, sep } from "node:path";
-import { globSync } from "glob";
 import ignore from "ignore";
 import { minimatch } from "minimatch";
-import { maxSatisfying, rcompare, satisfies, valid, validRange } from "semver";
+import { gt, maxSatisfying, rcompare, satisfies, valid, validRange } from "semver";
 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 { stripBom } from "../utils/text.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.PI_OFFLINE;
+    const value = getApexEnvironment("APEX_CODE_OFFLINE");
     if (!value)
         return false;
     return value === "1" || value.toLowerCase() === "true" || value.toLowerCase() === "yes";
@@ -134,6 +135,15 @@ function isOverridePattern(s) {
 function hasGlobPattern(s) {
     return s.includes("*") || s.includes("?");
 }
+/** Glob entries discover visible paths; exact entries can target dot paths or symlinked trees. */
+function expandPackageGlob(pattern, root) {
+    return globSync(pattern, { cwd: root })
+        .map((match) => resolve(root, match))
+        .filter((path) => relative(root, path)
+        .split(sep)
+        .every((segment) => segment === ".." || !segment.startsWith(".")))
+        .sort((a, b) => (a < b ? -1 : a > b ? 1 : 0));
+}
 function splitPatterns(entries) {
     const plain = [];
     const patterns = [];
@@ -239,7 +249,11 @@ function collectSkillEntries(dir, mode, ignoreMatcher, rootDir) {
                 }
             }
             const relPath = toPosixPath(relative(root, fullPath));
-            if (mode === "pi" && dir === root && isFile && entry.name.endsWith(".md") && !ig.ignores(relPath)) {
+            const shouldIncludeMarkdownFile = isFile &&
+                entry.name.endsWith(".md") &&
+                !ig.ignores(relPath) &&
+                ((mode === "pi" && dir === root) || (mode === "agents" && dir !== root));
+            if (shouldIncludeMarkdownFile) {
                 entries.push(fullPath);
                 continue;
             }
@@ -886,7 +900,7 @@ export class DefaultPackageManager {
         }
         try {
             const targetVersion = await this.getLatestNpmVersion(source.version ? source.spec : source.name, source.range);
-            return targetVersion !== installedVersion;
+            return gt(targetVersion, installedVersion);
         }
         catch {
             // Preserve existing update behavior when version lookup fails.
@@ -1172,7 +1186,7 @@ export class DefaultPackageManager {
         }
         try {
             const targetVersion = await this.getLatestNpmVersion(source.version ? source.spec : source.name, source.range);
-            return targetVersion !== installedVersion;
+            return gt(targetVersion, installedVersion);
         }
         catch {
             return false;
@@ -1184,7 +1198,7 @@ export class DefaultPackageManager {
             return undefined;
         try {
             const content = readFileSync(packageJsonPath, "utf-8");
-            const pkg = JSON.parse(content);
+            const pkg = JSON.parse(stripBom(content));
             return pkg.version;
         }
         catch {
@@ -1537,7 +1551,7 @@ export class DefaultPackageManager {
         if (!existsSync(packageJsonPath))
             return false;
         try {
-            const manifest = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+            const manifest = JSON.parse(stripBom(readFileSync(packageJsonPath, "utf-8")));
             if (!manifest.dependencies ||
                 typeof manifest.dependencies !== "object" ||
                 Array.isArray(manifest.dependencies)) {
@@ -1561,7 +1575,7 @@ export class DefaultPackageManager {
         await this.runNpmCommand(this.getGitDependencyInstallArgs(), { cwd: targetDir });
     }
     getGitUpdateMarkerPath(targetDir) {
-        return join(dirname(targetDir), `.${basename(targetDir)}.pi-update-incomplete`);
+        return join(dirname(targetDir), `.${basename(targetDir)}.apex-code-update-incomplete`);
     }
     async cleanAndInstallGitDependencies(targetDir, markerPath) {
         // Clean untracked files (extensions should be pristine). If this fails after
@@ -1905,12 +1919,7 @@ export class DefaultPackageManager {
             if (!hasGlobPattern(entry)) {
                 return [resolve(root, entry)];
             }
-            return globSync(entry, {
-                cwd: root,
-                absolute: true,
-                dot: false,
-                nodir: false,
-            }).map((match) => resolve(match));
+            return expandPackageGlob(entry, root);
         });
         return this.collectFilesFromPaths(resolved, resourceType);
     }
@@ -2007,6 +2016,21 @@ export class DefaultPackageManager {
             baseDir: userAgentsBaseDir,
         };
         addResources("skills", collectAutoSkillEntries(userAgentsSkillsDir, "agents"), userAgentsMetadata, userOverrides.skills, userAgentsBaseDir);
+        // User skills mounted in from the host by the sandbox supervisor
+        // (core/sandbox/cli-launch.ts's resolveHostSkillPaths/buildSandboxedCliLaunch).
+        // Outside the sandbox these variables are never set, so this is a no-op. The
+        // two roots keep the discovery mode ("pi" root-.md-as-skill vs "agents"
+        // root-.md-ignored) their host counterparts above use, matching docs/skills.md.
+        const mountedAgentSkillsDir = process.env.APEX_CODE_SKILL_PATH_AGENT;
+        if (mountedAgentSkillsDir) {
+            const mountedAgentBaseDir = dirname(mountedAgentSkillsDir);
+            addResources("skills", collectAutoSkillEntries(mountedAgentSkillsDir, "pi"), { ...userMetadata, baseDir: mountedAgentBaseDir }, userOverrides.skills, mountedAgentBaseDir);
+        }
+        const mountedAgentsHomeSkillsDir = process.env.APEX_CODE_SKILL_PATH_AGENTS_HOME;
+        if (mountedAgentsHomeSkillsDir) {
+            const mountedAgentsHomeBaseDir = dirname(mountedAgentsHomeSkillsDir);
+            addResources("skills", collectAutoSkillEntries(mountedAgentsHomeSkillsDir, "agents"), { ...userMetadata, baseDir: mountedAgentsHomeBaseDir }, userOverrides.skills, mountedAgentsHomeBaseDir);
+        }
         addResources("prompts", collectAutoPromptEntries(userDirs.prompts), userMetadata, userOverrides.prompts, globalBaseDir);
         addResources("themes", collectAutoThemeEntries(userDirs.themes), userMetadata, userOverrides.themes, globalBaseDir);
     }