@code-yeongyu/senpi 2026.9.19 → 2026.9.20

package/dist/core/resource-loader.js

@@ -16,6 +16,7 @@ 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 { memoizeResolvedPaths, resolvedPathsMemoKey } from "./resolved-paths-memo.js";
 import { SettingsManager } from "./settings-manager.js";
 import { loadSkills } from "./skills.js";
 import { createSourceInfo } from "./source-info.js";
@@ -340,22 +341,26 @@ export class DefaultResourceLoader {
             this.loadedHookSources = this.buildLoadedHookSources(runtimeHookSourcePaths);
         }
     }
-    async loadProjectTrustExtensions() {
+    async loadProjectTrustExtensions(options = {}) {
         // Force untrusted project settings for the bootstrap pass. This keeps project-local
         // extensions/packages out while still loading user/global and temporary CLI extensions.
         this.settingsManager.setProjectTrusted(false);
         await this.settingsManager.reload();
-        return this.loadCurrentExtensionSet({ includeInlineFactories: true });
+        return this.loadCurrentExtensionSet({ includeInlineFactories: true, ...options });
     }
     async reload(options) {
         resetTimings("extensions");
-        if (this.loaded) {
+        // A re-load of this loader is the signal that disk may have changed - it
+        // discards the extension cache, and it must not read package resolution
+        // through the host memo either (a package's own manifest is not in the key).
+        const refresh = this.loaded;
+        if (refresh) {
             clearExtensionCache();
         }
         this.ensureGlobalDefaultExtensions();
         let preTrustExtensions;
         if (options?.resolveProjectTrust) {
-            preTrustExtensions = await this.loadProjectTrustExtensions();
+            preTrustExtensions = await this.loadProjectTrustExtensions({ refresh });
             const projectTrusted = await options.resolveProjectTrust({ extensionsResult: preTrustExtensions });
             this.settingsManager.setProjectTrusted(projectTrusted);
         }
@@ -364,10 +369,7 @@ export class DefaultResourceLoader {
         if (!settingsAreFresh) {
             await this.settingsManager.reload();
         }
-        const resolvedPaths = await this.packageManager.resolve();
-        const cliExtensionPaths = await this.packageManager.resolveExtensionSources(this.additionalExtensionPaths, {
-            temporary: true,
-        });
+        const { resolvedPaths, cliExtensionPaths } = await this.resolvePackagePaths({ refresh });
         time("packageResolve", "extensions");
         // Keep package metadata available for later extendResources() passes.
         this.resourceMetadataByPath = new Map();
@@ -530,6 +532,20 @@ export class DefaultResourceLoader {
             writeFileSync(targetPath, shim, "utf-8");
         }
     }
+    resolvePackagePaths(options = {}) {
+        return memoizeResolvedPaths(resolvedPathsMemoKey({
+            agentDir: this.agentDir,
+            cwd: this.cwd,
+            globalSettings: this.settingsManager.getGlobalSettings(),
+            projectSettings: this.settingsManager.getProjectSettings(),
+            additionalExtensionPaths: this.additionalExtensionPaths,
+        }), async () => ({
+            resolvedPaths: await this.packageManager.resolve(),
+            cliExtensionPaths: await this.packageManager.resolveExtensionSources(this.additionalExtensionPaths, {
+                temporary: true,
+            }),
+        }), options);
+    }
     buildGlobalDefaultExtensionLoadOptions() {
         return {
             factoryResolver: (_extensionPath, resolvedPath) => resolveGeneratedGlobalDefaultExtensionFactory(resolvedPath, this.agentDir),
@@ -537,10 +553,7 @@ export class DefaultResourceLoader {
         };
     }
     async loadCurrentExtensionSet(options) {
-        const resolvedPaths = await this.packageManager.resolve();
-        const cliExtensionPaths = await this.packageManager.resolveExtensionSources(this.additionalExtensionPaths, {
-            temporary: true,
-        });
+        const { resolvedPaths, cliExtensionPaths } = await this.resolvePackagePaths({ refresh: options.refresh });
         const enabledExtensions = resolvedPaths.extensions.filter((r) => r.enabled).map((r) => r.path);
         const cliEnabledExtensions = cliExtensionPaths.extensions.filter((r) => r.enabled).map((r) => r.path);
         const extensionPaths = this.noExtensions