@astralyn/pi 1.4.7 → 1.4.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +15 -0
- package/dist/bundle/chunks/{chunk-FYKNSJG6.js → chunk-5VIOGR76.js} +1 -1
- package/dist/bundle/chunks/{chunk-YJTSOLP2.js → chunk-I2COK45I.js} +89 -89
- package/dist/bundle/chunks/{virtual-modules-PKEOKGYI.js → virtual-modules-BBLD7YLS.js} +1 -1
- package/dist/bundle/cli.js +1 -1
- package/dist/bundle/index.js +1 -1
- package/dist/bundle/rpc-entry.js +1 -1
- package/dist/core/package-manager.d.ts +4 -8
- package/dist/core/package-manager.d.ts.map +1 -1
- package/dist/core/package-manager.js +11 -72
- package/dist/core/package-manager.js.map +1 -1
- package/dist/core/resource-loader.d.ts +2 -1
- package/dist/core/resource-loader.d.ts.map +1 -1
- package/dist/core/resource-loader.js +21 -24
- package/dist/core/resource-loader.js.map +1 -1
- package/dist/core/skill-invocation.d.ts +46 -0
- package/dist/core/skill-invocation.d.ts.map +1 -0
- package/dist/core/skill-invocation.js +128 -0
- package/dist/core/skill-invocation.js.map +1 -0
- package/dist/extensions/agent/settings-host.d.ts +33 -0
- package/dist/extensions/agent/settings-host.d.ts.map +1 -0
- package/dist/extensions/agent/settings-host.js +75 -0
- package/dist/extensions/agent/settings-host.js.map +1 -0
- package/dist/extensions/agent/settings.d.ts.map +1 -1
- package/dist/extensions/agent/settings.js +18 -7
- package/dist/extensions/agent/settings.js.map +1 -1
- package/dist/modes/interactive/components/config-selector.d.ts +10 -8
- package/dist/modes/interactive/components/config-selector.d.ts.map +1 -1
- package/dist/modes/interactive/components/config-selector.js +51 -121
- package/dist/modes/interactive/components/config-selector.js.map +1 -1
- package/docs/packages.md +1 -1
- package/docs/settings.md +1 -1
- package/docs/skills.md +1 -1
- package/npm-shrinkwrap.json +2 -2
- package/package.json +1 -1
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { createRequire as __piCreateRequire } from "node:module"; const require = __piCreateRequire(import.meta.url);
|
|
2
|
-
import{dist_exports as dist_exports3}from"./chunk-
|
|
2
|
+
import{dist_exports as dist_exports3}from"./chunk-5VIOGR76.js";import{all_exports,compat_exports,dist_exports as dist_exports2}from"./chunk-I2COK45I.js";import"./chunk-MG5XDTXV.js";import"./chunk-PU2IWWXV.js";import{build_exports,compile_exports,dist_exports,value_exports}from"./chunk-FODCTZXW.js";import"./chunk-6QGV3IWD.js";import{DISTRIBUTION_PACKAGE_NAME}from"./chunk-RLNMABLM.js";import"./chunk-JEIV47WR.js";import"./chunk-D3ZCGC4T.js";import"./chunk-RZ2V53SP.js";import"./chunk-5FDOJRDS.js";import"./chunk-SA2AQYEI.js";import"./chunk-OV2VMHBX.js";import{models_exports}from"./chunk-6JS2SOFO.js";import"./chunk-6VYRLG5F.js";import"./chunk-ANCZPKX7.js";import"./chunk-4L3WN2XY.js";var oauth_exports={};var VIRTUAL_MODULES={typebox:build_exports,"typebox/compile":compile_exports,"typebox/value":value_exports,"@sinclair/typebox":build_exports,"@sinclair/typebox/compile":compile_exports,"@sinclair/typebox/value":value_exports,"@earendil-works/pi-agent-core":dist_exports2,"@earendil-works/pi-tui":dist_exports,"@earendil-works/pi-ai":compat_exports,"@earendil-works/pi-ai/compat":compat_exports,"@earendil-works/pi-ai/models":models_exports,"@earendil-works/pi-ai/oauth":oauth_exports,"@earendil-works/pi-ai/providers/all":all_exports,"@earendil-works/pi-coding-agent":dist_exports3,[DISTRIBUTION_PACKAGE_NAME]:dist_exports3,"@mariozechner/pi-agent-core":dist_exports2,"@mariozechner/pi-tui":dist_exports,"@mariozechner/pi-ai":compat_exports,"@mariozechner/pi-ai/compat":compat_exports,"@mariozechner/pi-ai/models":models_exports,"@mariozechner/pi-ai/oauth":oauth_exports,"@mariozechner/pi-ai/providers/all":all_exports,"@mariozechner/pi-coding-agent":dist_exports3};export{VIRTUAL_MODULES};
|
package/dist/bundle/cli.js
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { createRequire as __piCreateRequire } from "node:module"; const require = __piCreateRequire(import.meta.url);
|
|
3
|
-
import{configureHttpDispatcher,main}from"./chunks/chunk-
|
|
3
|
+
import{configureHttpDispatcher,main}from"./chunks/chunk-I2COK45I.js";import"./chunks/chunk-MG5XDTXV.js";import"./chunks/chunk-PU2IWWXV.js";import"./chunks/chunk-FODCTZXW.js";import"./chunks/chunk-6QGV3IWD.js";import{APP_NAME}from"./chunks/chunk-RLNMABLM.js";import"./chunks/chunk-JEIV47WR.js";import"./chunks/chunk-D3ZCGC4T.js";import"./chunks/chunk-RZ2V53SP.js";import"./chunks/chunk-5FDOJRDS.js";import"./chunks/chunk-SA2AQYEI.js";import"./chunks/chunk-OV2VMHBX.js";import"./chunks/chunk-6JS2SOFO.js";import"./chunks/chunk-6VYRLG5F.js";import"./chunks/chunk-ANCZPKX7.js";import"./chunks/chunk-4L3WN2XY.js";function setupCli(){process.title=APP_NAME,process.env.PI_CODING_AGENT="true",process.env.AI_AGENT="pi",process.emitWarning=(()=>{}),configureHttpDispatcher()}setupCli();main(process.argv.slice(2));
|
package/dist/bundle/index.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { createRequire as __piCreateRequire } from "node:module"; const require = __piCreateRequire(import.meta.url);
|
|
2
|
-
import{ShowImagesSelectorComponent,ThemeSelectorComponent}from"./chunks/chunk-
|
|
2
|
+
import{ShowImagesSelectorComponent,ThemeSelectorComponent}from"./chunks/chunk-5VIOGR76.js";import{AgentSession,AgentSessionRuntime,ArminComponent,AssistantMessageComponent,BashExecutionComponent,BorderedLoader,BranchSummaryMessageComponent,CURRENT_SESSION_VERSION,CompactionSummaryMessageComponent,CredentialSynchronizationError,CustomEditor,CustomMessageComponent,DEFAULT_COMPACTION_SETTINGS,DefaultPackageManager,DefaultResourceLoader,DynamicBorder,ExtensionEditorComponent,ExtensionInputComponent,ExtensionRunner,ExtensionSelectorComponent,FooterComponent,InteractiveMode,LoginDialogComponent,ModelRegistry,ModelRuntime,ModelSelectorComponent,OAuthSelectorComponent,RpcClient,SessionManager,SessionSelectorComponent,SettingsManager,SettingsSelectorComponent,SkillInvocationMessageComponent,TaskRuntime,ThinkingSelectorComponent,ToolExecutionComponent,TreeSelectorComponent,UserMessageComponent,UserMessageSelectorComponent,VIRTUAL_MODEL_STATE_ENTRY,buildContextEntries,buildSessionContext,buildSessionProjection,calculateContextTokens,collectEntriesForBranchSummary,compact,convertToLlm,convertToPng,copyToClipboard,createAgentSession,createAgentSessionFromServices,createAgentSessionRuntime,createAgentSessionServices,createBashTool,createBashToolDefinition,createCodemodeExtension,createCodingTools,createEditTool,createEditToolDefinition,createEventBus,createExtensionRuntime,createFindTool,createFindToolDefinition,createGrepTool,createGrepToolDefinition,createLocalBashOperations,createLocalPowerShellOperations,createLsTool,createLsToolDefinition,createMcpExtension,createPowerShellTool,createPowerShellToolDefinition,createReadOnlyTools,createReadTool,createReadToolDefinition,createSyntheticSourceInfo,createToolSearchExtension,createWriteTool,createWriteToolDefinition,defineTool,detectSupportedImageMimeTypeFromFile,discoverAndLoadExtensions,estimateTokens,findCutPoint,findTurnStartIndex,formatDimensionNote,formatSkillsForPrompt,generateBranchSummary,generateDiffString,generateSummary,generateSummaryWithUsage,generateUnifiedPatch,getLastAssistantUsage,getLatestCompactionEntry,isBashToolResult,isEditToolResult,isFindToolResult,isGrepToolResult,isLsToolResult,isPowerShellToolResult,isReadToolResult,isToolCallEventType,isWriteToolResult,loadProjectContextFiles,loadSkills,loadSkillsFromDir,main,migrateSessionEntries,parseArgs,parseFrontmatter,parseSessionEntries,parseSkillBlock,prepareBranchEntries,renderDiff,resizeImage,resolveCliModel,resolveModelScopeWithDiagnostics,runPrintMode,runRpcMode,serializeConversation,sessionEntryToContextMessages,shouldCompact,stripFrontmatter,withFileMutationQueue,wrapRegisteredTool,wrapRegisteredTools}from"./chunks/chunk-I2COK45I.js";import{ProjectTrustStore,hasTrustRequiringProjectResources}from"./chunks/chunk-MG5XDTXV.js";import{readStoredCredential}from"./chunks/chunk-PU2IWWXV.js";import{DEFAULT_MAX_BYTES,DEFAULT_MAX_LINES,Theme,formatReadLineRange,formatSize,getLanguageFromPath,getMarkdownTheme,getSelectListTheme,getSettingsListTheme,highlightCode,initTheme,keyHint,keyText,rawKeyHint,truncateHead,truncateLine,truncateTail,truncateToVisualLines}from"./chunks/chunk-FODCTZXW.js";import"./chunks/chunk-6QGV3IWD.js";import{CONFIG_DIR_NAME,VERSION,getAgentDir,getDocsPath,getExamplesPath,getPackageDir,getPowerShellConfig,getReadmePath,getShellConfig}from"./chunks/chunk-RLNMABLM.js";import"./chunks/chunk-JEIV47WR.js";import"./chunks/chunk-D3ZCGC4T.js";import"./chunks/chunk-RZ2V53SP.js";import"./chunks/chunk-5FDOJRDS.js";import"./chunks/chunk-SA2AQYEI.js";import"./chunks/chunk-OV2VMHBX.js";import"./chunks/chunk-6JS2SOFO.js";import"./chunks/chunk-6VYRLG5F.js";import"./chunks/chunk-ANCZPKX7.js";import"./chunks/chunk-4L3WN2XY.js";export{AgentSession,AgentSessionRuntime,ArminComponent,AssistantMessageComponent,BashExecutionComponent,BorderedLoader,BranchSummaryMessageComponent,CONFIG_DIR_NAME,CURRENT_SESSION_VERSION,CompactionSummaryMessageComponent,CredentialSynchronizationError,CustomEditor,CustomMessageComponent,DEFAULT_COMPACTION_SETTINGS,DEFAULT_MAX_BYTES,DEFAULT_MAX_LINES,DefaultPackageManager,DefaultResourceLoader,DynamicBorder,ExtensionEditorComponent,ExtensionInputComponent,ExtensionRunner,ExtensionSelectorComponent,FooterComponent,InteractiveMode,LoginDialogComponent,ModelRegistry,ModelRuntime,ModelSelectorComponent,OAuthSelectorComponent,ProjectTrustStore,RpcClient,SessionManager,SessionSelectorComponent,SettingsManager,SettingsSelectorComponent,ShowImagesSelectorComponent,SkillInvocationMessageComponent,TaskRuntime,Theme,ThemeSelectorComponent,ThinkingSelectorComponent,ToolExecutionComponent,TreeSelectorComponent,UserMessageComponent,UserMessageSelectorComponent,VERSION,VIRTUAL_MODEL_STATE_ENTRY,buildContextEntries,buildSessionContext,buildSessionProjection,calculateContextTokens,collectEntriesForBranchSummary,compact,convertToLlm,convertToPng,copyToClipboard,createAgentSession,createAgentSessionFromServices,createAgentSessionRuntime,createAgentSessionServices,createBashTool,createBashToolDefinition,createCodemodeExtension,createCodingTools,createEditTool,createEditToolDefinition,createEventBus,createExtensionRuntime,createFindTool,createFindToolDefinition,createGrepTool,createGrepToolDefinition,createLocalBashOperations,createLocalPowerShellOperations,createLsTool,createLsToolDefinition,createMcpExtension,createPowerShellTool,createPowerShellToolDefinition,createReadOnlyTools,createReadTool,createReadToolDefinition,createSyntheticSourceInfo,createToolSearchExtension,createWriteTool,createWriteToolDefinition,defineTool,detectSupportedImageMimeTypeFromFile,discoverAndLoadExtensions,estimateTokens,findCutPoint,findTurnStartIndex,formatDimensionNote,formatReadLineRange,formatSize,formatSkillsForPrompt,generateBranchSummary,generateDiffString,generateSummary,generateSummaryWithUsage,generateUnifiedPatch,getAgentDir,getDocsPath,getExamplesPath,getLanguageFromPath,getLastAssistantUsage,getLatestCompactionEntry,getMarkdownTheme,getPackageDir,getPowerShellConfig,getReadmePath,getSelectListTheme,getSettingsListTheme,getShellConfig,hasTrustRequiringProjectResources,highlightCode,initTheme,isBashToolResult,isEditToolResult,isFindToolResult,isGrepToolResult,isLsToolResult,isPowerShellToolResult,isReadToolResult,isToolCallEventType,isWriteToolResult,keyHint,keyText,loadProjectContextFiles,loadSkills,loadSkillsFromDir,main,migrateSessionEntries,parseArgs,parseFrontmatter,parseSessionEntries,parseSkillBlock,prepareBranchEntries,rawKeyHint,readStoredCredential,renderDiff,resizeImage,resolveCliModel,resolveModelScopeWithDiagnostics,runPrintMode,runRpcMode,serializeConversation,sessionEntryToContextMessages,shouldCompact,stripFrontmatter,truncateHead,truncateLine,truncateTail,truncateToVisualLines,withFileMutationQueue,wrapRegisteredTool,wrapRegisteredTools};
|
package/dist/bundle/rpc-entry.js
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { createRequire as __piCreateRequire } from "node:module"; const require = __piCreateRequire(import.meta.url);
|
|
3
|
-
import{configureHttpDispatcher,main}from"./chunks/chunk-
|
|
3
|
+
import{configureHttpDispatcher,main}from"./chunks/chunk-I2COK45I.js";import"./chunks/chunk-MG5XDTXV.js";import"./chunks/chunk-PU2IWWXV.js";import"./chunks/chunk-FODCTZXW.js";import"./chunks/chunk-6QGV3IWD.js";import{APP_NAME}from"./chunks/chunk-RLNMABLM.js";import"./chunks/chunk-JEIV47WR.js";import"./chunks/chunk-D3ZCGC4T.js";import"./chunks/chunk-RZ2V53SP.js";import"./chunks/chunk-5FDOJRDS.js";import"./chunks/chunk-SA2AQYEI.js";import"./chunks/chunk-OV2VMHBX.js";import"./chunks/chunk-6JS2SOFO.js";import"./chunks/chunk-6VYRLG5F.js";import"./chunks/chunk-ANCZPKX7.js";import"./chunks/chunk-4L3WN2XY.js";process.title=`${APP_NAME}-rpc`;process.env.PI_CODING_AGENT="true";process.env.AI_AGENT="pi";process.emitWarning=(()=>{});configureHttpDispatcher();main(["--mode","rpc",...process.argv.slice(2)]);
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { SettingsManager
|
|
1
|
+
import type { SettingsManager } from "./settings-manager.ts";
|
|
2
2
|
export interface PathMetadata {
|
|
3
3
|
source: string;
|
|
4
4
|
scope: SourceScope;
|
|
@@ -10,7 +10,6 @@ export interface ResolvedResource {
|
|
|
10
10
|
path: string;
|
|
11
11
|
enabled: boolean;
|
|
12
12
|
metadata: PathMetadata;
|
|
13
|
-
skillInvocationOverride?: SkillInvocationOverride;
|
|
14
13
|
}
|
|
15
14
|
export interface ResolvedPaths {
|
|
16
15
|
extensions: ResolvedResource[];
|
|
@@ -147,7 +146,7 @@ export declare class DefaultPackageManager implements PackageManager {
|
|
|
147
146
|
* For git packages, uses normalized host/path to ensure SSH and HTTPS URLs
|
|
148
147
|
* for the same repository are treated as identical.
|
|
149
148
|
*/
|
|
150
|
-
|
|
149
|
+
getPackageIdentity(source: string, scope?: SourceScope): string;
|
|
151
150
|
/**
|
|
152
151
|
* Dedupe packages: if same package identity appears in both global and project,
|
|
153
152
|
* keep only the project one (project wins). A project entry with autoload=false
|
|
@@ -187,6 +186,8 @@ export declare class DefaultPackageManager implements PackageManager {
|
|
|
187
186
|
private getTemporaryDir;
|
|
188
187
|
private resolveManagedPath;
|
|
189
188
|
private getBaseDirForScope;
|
|
189
|
+
/** Directories that relative top-level resource paths of `scope` resolve against. */
|
|
190
|
+
getTopLevelBaseDirs(scope: "user" | "project"): string[];
|
|
190
191
|
private resolvePath;
|
|
191
192
|
private resolvePathFromBase;
|
|
192
193
|
private collectPackageResources;
|
|
@@ -207,11 +208,6 @@ export declare class DefaultPackageManager implements PackageManager {
|
|
|
207
208
|
private getTargetMap;
|
|
208
209
|
private addResource;
|
|
209
210
|
private createAccumulator;
|
|
210
|
-
private findSkillInvocationOverride;
|
|
211
|
-
private findSkillInvocationOverrideInBases;
|
|
212
|
-
private findPackageByIdentity;
|
|
213
|
-
private resolveSkillInvocationOverride;
|
|
214
|
-
private applySkillInvocationOverrides;
|
|
215
211
|
private toResolvedPaths;
|
|
216
212
|
private spawnCommand;
|
|
217
213
|
private spawnCaptureCommand;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-manager.d.ts","sourceRoot":"","sources":["../../src/core/package-manager.ts"],"names":[],"mappings":"AAoDA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"package-manager.d.ts","sourceRoot":"","sources":["../../src/core/package-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -734,7 +734,7 @@ export class DefaultPackageManager {
|
|
|
734
734
|
const projectEnabled = applyAutoloadDisabledPatterns([path], getOverridePatterns(projectSettings.extensions ?? []), projectBaseDir).get(path);
|
|
735
735
|
this.addResource(accumulator.extensions, path, { source: "builtin", scope: projectEnabled === undefined ? "user" : "project", origin: "top-level" }, projectEnabled ?? isEnabledByOverrides(path, globalSettings.extensions ?? [], globalBaseDir));
|
|
736
736
|
}
|
|
737
|
-
return this.
|
|
737
|
+
return this.toResolvedPaths(accumulator);
|
|
738
738
|
}
|
|
739
739
|
async resolveExtensionSources(sources, options) {
|
|
740
740
|
const accumulator = this.createAccumulator();
|
|
@@ -1832,6 +1832,16 @@ export class DefaultPackageManager {
|
|
|
1832
1832
|
}
|
|
1833
1833
|
return this.cwd;
|
|
1834
1834
|
}
|
|
1835
|
+
/** Directories that relative top-level resource paths of `scope` resolve against. */
|
|
1836
|
+
getTopLevelBaseDirs(scope) {
|
|
1837
|
+
const userAgentsDir = join(getHomeDir(), ".agents");
|
|
1838
|
+
if (scope === "user")
|
|
1839
|
+
return [this.agentDir, userAgentsDir];
|
|
1840
|
+
const projectAgentsDirs = collectAncestorAgentsSkillDirs(this.cwd)
|
|
1841
|
+
.map((dir) => dirname(dir))
|
|
1842
|
+
.filter((dir) => resolve(dir) !== resolve(userAgentsDir));
|
|
1843
|
+
return [join(this.cwd, CONFIG_DIR_NAME), ...projectAgentsDirs];
|
|
1844
|
+
}
|
|
1835
1845
|
resolvePath(input) {
|
|
1836
1846
|
return resolvePath(input, this.cwd, { homeDir: getHomeDir(), trim: true });
|
|
1837
1847
|
}
|
|
@@ -2107,77 +2117,6 @@ export class DefaultPackageManager {
|
|
|
2107
2117
|
themes: new Map(),
|
|
2108
2118
|
};
|
|
2109
2119
|
}
|
|
2110
|
-
findSkillInvocationOverride(filePath, overrides, baseDir) {
|
|
2111
|
-
if (!overrides)
|
|
2112
|
-
return undefined;
|
|
2113
|
-
let directoryMatch;
|
|
2114
|
-
for (const [pattern, override] of Object.entries(overrides)) {
|
|
2115
|
-
if (override !== "model-and-user" && override !== "user-only")
|
|
2116
|
-
continue;
|
|
2117
|
-
if (!matchesAnyExactPattern(filePath, [pattern], baseDir))
|
|
2118
|
-
continue;
|
|
2119
|
-
const normalized = normalizeExactPattern(pattern);
|
|
2120
|
-
if (normalized === toPosixPath(relative(baseDir, filePath)) || normalized === toPosixPath(filePath)) {
|
|
2121
|
-
return override;
|
|
2122
|
-
}
|
|
2123
|
-
directoryMatch = override;
|
|
2124
|
-
}
|
|
2125
|
-
return directoryMatch;
|
|
2126
|
-
}
|
|
2127
|
-
findSkillInvocationOverrideInBases(filePath, overrides, baseDirs) {
|
|
2128
|
-
for (const baseDir of new Set(baseDirs)) {
|
|
2129
|
-
const override = this.findSkillInvocationOverride(filePath, overrides, baseDir);
|
|
2130
|
-
if (override)
|
|
2131
|
-
return override;
|
|
2132
|
-
}
|
|
2133
|
-
return undefined;
|
|
2134
|
-
}
|
|
2135
|
-
findPackageByIdentity(packages, identity, scope) {
|
|
2136
|
-
return packages?.find((pkg) => this.getPackageIdentity(this.getPackageSourceString(pkg), scope) === identity);
|
|
2137
|
-
}
|
|
2138
|
-
resolveSkillInvocationOverride(resource, globalSettings, projectSettings) {
|
|
2139
|
-
const { metadata } = resource;
|
|
2140
|
-
const baseDir = metadata.baseDir ?? (metadata.scope === "project" ? join(this.cwd, CONFIG_DIR_NAME) : this.agentDir);
|
|
2141
|
-
const projectTrusted = this.settingsManager.isProjectTrusted();
|
|
2142
|
-
if (metadata.origin === "top-level") {
|
|
2143
|
-
const globalBaseDirs = metadata.scope === "user" ? [baseDir] : [this.agentDir, join(getHomeDir(), ".agents")];
|
|
2144
|
-
const projectBaseDirs = metadata.scope === "user" ? [baseDir] : [baseDir, this.agentDir, join(getHomeDir(), ".agents")];
|
|
2145
|
-
const projectOverride = projectTrusted
|
|
2146
|
-
? this.findSkillInvocationOverrideInBases(resource.path, projectSettings.skillInvocationOverrides, projectBaseDirs)
|
|
2147
|
-
: undefined;
|
|
2148
|
-
const globalOverride = this.findSkillInvocationOverrideInBases(resource.path, globalSettings.skillInvocationOverrides, globalBaseDirs);
|
|
2149
|
-
return projectOverride ?? globalOverride;
|
|
2150
|
-
}
|
|
2151
|
-
const sourceScope = metadata.scope === "project" ? "project" : "user";
|
|
2152
|
-
const identity = this.getPackageIdentity(metadata.source, sourceScope);
|
|
2153
|
-
const globalPackage = this.findPackageByIdentity(globalSettings.packages, identity, "user");
|
|
2154
|
-
const projectPackage = projectTrusted
|
|
2155
|
-
? this.findPackageByIdentity(projectSettings.packages, identity, "project")
|
|
2156
|
-
: undefined;
|
|
2157
|
-
const globalOverride = typeof globalPackage === "object"
|
|
2158
|
-
? this.findSkillInvocationOverride(resource.path, globalPackage.skillInvocationOverrides, baseDir)
|
|
2159
|
-
: undefined;
|
|
2160
|
-
const projectOverride = typeof projectPackage === "object"
|
|
2161
|
-
? this.findSkillInvocationOverride(resource.path, projectPackage.skillInvocationOverrides, baseDir)
|
|
2162
|
-
: undefined;
|
|
2163
|
-
if (metadata.scope === "project") {
|
|
2164
|
-
return typeof projectPackage === "object" && projectPackage.autoload === false
|
|
2165
|
-
? (projectOverride ?? globalOverride)
|
|
2166
|
-
: projectOverride;
|
|
2167
|
-
}
|
|
2168
|
-
return typeof projectPackage === "object" && projectPackage.autoload === false
|
|
2169
|
-
? (projectOverride ?? globalOverride)
|
|
2170
|
-
: globalOverride;
|
|
2171
|
-
}
|
|
2172
|
-
applySkillInvocationOverrides(resolved, globalSettings, projectSettings) {
|
|
2173
|
-
return {
|
|
2174
|
-
...resolved,
|
|
2175
|
-
skills: resolved.skills.map((resource) => {
|
|
2176
|
-
const override = this.resolveSkillInvocationOverride(resource, globalSettings, projectSettings);
|
|
2177
|
-
return override ? { ...resource, skillInvocationOverride: override } : resource;
|
|
2178
|
-
}),
|
|
2179
|
-
};
|
|
2180
|
-
}
|
|
2181
2120
|
toResolvedPaths(accumulator) {
|
|
2182
2121
|
const mapToResolved = (entries) => {
|
|
2183
2122
|
const resolved = Array.from(entries.entries()).map(([path, { metadata, enabled }]) => ({
|