@code-yeongyu/senpi 2026.9.5 → 2026.9.7-2

package/dist/core/resource-loader.js

@@ -1,6 +1,6 @@
 import { existsSync, mkdirSync, readdirSync, readFileSync, realpathSync, statSync, writeFileSync } from "node:fs";
 import { createRequire } from "node:module";
-import { basename, dirname, join, relative, resolve, sep } from "node:path";
+import { basename, dirname, join, resolve, sep } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import chalk from "chalk";
 import { CONFIG_DIR_NAME, getAgentDir, getPackageDir, isBunBinary } from "../config.js";
@@ -12,6 +12,7 @@ import { createEventBus } from "./event-bus.js";
 import { builtinExtensions, globalDefaultExtensionFactories, globalDefaultExtensionIds, } from "./extensions/builtin/index.js";
 import { clearExtensionCache, createExtensionRuntime, loadExtensionFromFactory, loadExtensions, } from "./extensions/loader.js";
 import { findGitPaths } from "./footer-data-provider.js";
+import { dedupePathsByPackageIdentity, findNearestPackageIdentity } from "./package-identity.js";
 import { DefaultPackageManager } from "./package-manager.js";
 import { loadPromptTemplates } from "./prompt-templates.js";
 import { SettingsManager } from "./settings-manager.js";
@@ -417,7 +418,7 @@ export class DefaultResourceLoader {
         const extensionPaths = this.noExtensions
             ? cliEnabledExtensions
             : this.mergePaths(cliEnabledExtensions, enabledExtensions);
-        const dedupedExtensionPaths = this.dedupeExtensionPathsByPackageName(this.shadowVendoredBuiltinExtensionPaths(extensionPaths, metadataByPath));
+        const dedupedExtensionPaths = dedupePathsByPackageIdentity(this.shadowVendoredBuiltinExtensionPaths(extensionPaths, metadataByPath));
         const extensionsResult = await this.loadFinalExtensionSet(dedupedExtensionPaths, preTrustExtensions);
         for (const p of this.additionalExtensionPaths) {
             if (isLocalPath(p)) {
@@ -429,9 +430,9 @@ export class DefaultResourceLoader {
         }
         this.extensionsResult = this.extensionsOverride ? this.extensionsOverride(extensionsResult) : extensionsResult;
         this.applyExtensionSourceInfo(this.extensionsResult.extensions, metadataByPath);
-        const skillPaths = this.noSkills
+        const skillPaths = dedupePathsByPackageIdentity(this.noSkills
             ? this.mergePaths(cliEnabledSkills, this.additionalSkillPaths)
-            : this.mergePaths([...cliEnabledSkills, ...enabledSkills], this.additionalSkillPaths);
+            : this.mergePaths([...cliEnabledSkills, ...enabledSkills], this.additionalSkillPaths));
         this.lastSkillPaths = skillPaths;
         this.updateSkillsFromPaths(skillPaths, metadataByPath);
         time("skills", "extensions");
@@ -812,59 +813,6 @@ export class DefaultResourceLoader {
     resolveResourcePath(p) {
         return resolvePath(p, this.cwd, { trim: true });
     }
-    findNearestPackageIdentity(resourcePath) {
-        if (resourcePath.startsWith("<")) {
-            return undefined;
-        }
-        const normalizedResourcePath = resolve(resourcePath);
-        let currentPath = resolve(resourcePath);
-        try {
-            if (!statSync(currentPath).isDirectory()) {
-                currentPath = resolve(currentPath, "..");
-            }
-        }
-        catch {
-            currentPath = resolve(currentPath, "..");
-        }
-        while (true) {
-            const packageJsonPath = join(currentPath, "package.json");
-            if (existsSync(packageJsonPath)) {
-                try {
-                    const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
-                    if (typeof packageJson.name !== "string" || packageJson.name.length === 0) {
-                        return undefined;
-                    }
-                    return {
-                        key: `${packageJson.name}:${relative(currentPath, normalizedResourcePath)}`,
-                        packageName: packageJson.name,
-                    };
-                }
-                catch {
-                    return undefined;
-                }
-            }
-            const parentPath = resolve(currentPath, "..");
-            if (parentPath === currentPath) {
-                return undefined;
-            }
-            currentPath = parentPath;
-        }
-    }
-    dedupeExtensionPathsByPackageName(extensionPaths) {
-        const dedupedPaths = [];
-        const seenPackageNames = new Set();
-        for (const extensionPath of extensionPaths) {
-            const packageIdentity = this.findNearestPackageIdentity(extensionPath);
-            if (packageIdentity) {
-                if (seenPackageNames.has(packageIdentity.key)) {
-                    continue;
-                }
-                seenPackageNames.add(packageIdentity.key);
-            }
-            dedupedPaths.push(extensionPath);
-        }
-        return dedupedPaths;
-    }
     getActiveBuiltinExtensionIds() {
         const enabledBuiltinExtensions = this.settingsManager.getEnabledBuiltinExtensions();
         const enabledBuiltinExtensionSet = enabledBuiltinExtensions ? new Set(enabledBuiltinExtensions) : undefined;
@@ -912,7 +860,7 @@ export class DefaultResourceLoader {
                 filteredPaths.push(extensionPath);
                 continue;
             }
-            const packageIdentity = this.findNearestPackageIdentity(extensionPath);
+            const packageIdentity = findNearestPackageIdentity(extensionPath);
             if (packageIdentity && shadowedPackageNames.has(packageIdentity.packageName)) {
                 continue;
             }
@@ -1154,8 +1102,8 @@ export class DefaultResourceLoader {
         if (this.isBuiltinExtensionPath(existingOwner) || this.isBuiltinExtensionPath(candidateOwner)) {
             return true;
         }
-        const existingPackageIdentity = this.findNearestPackageIdentity(existingOwner);
-        const candidatePackageIdentity = this.findNearestPackageIdentity(candidateOwner);
+        const existingPackageIdentity = findNearestPackageIdentity(existingOwner);
+        const candidatePackageIdentity = findNearestPackageIdentity(candidateOwner);
         return existingPackageIdentity !== undefined && existingPackageIdentity.key === candidatePackageIdentity?.key;
     }
     rebuildExtensionFlagDefaults(extensionsResult) {