Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/features/claude-code-plugin-loader/loader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import type { AgentFrontmatter } from "../claude-code-agent-loader/types"
import type { ClaudeCodeMcpConfig, McpServerConfig } from "../claude-code-mcp-loader/types"
import type {
InstalledPluginsDatabase,
PluginInstallation,
PluginManifest,
LoadedPlugin,
PluginLoadResult,
Expand Down Expand Up @@ -134,6 +135,15 @@ function isPluginEnabled(
return true
}

function extractPluginEntries(
db: InstalledPluginsDatabase
): Array<[string, PluginInstallation | undefined]> {
if (db.version === 1) {
return Object.entries(db.plugins).map(([key, installation]) => [key, installation])
}
return Object.entries(db.plugins).map(([key, installations]) => [key, installations[0]])
}

export function discoverInstalledPlugins(options?: PluginLoaderOptions): PluginLoadResult {
const db = loadInstalledPlugins()
const settings = loadClaudeSettings()
Expand All @@ -147,15 +157,14 @@ export function discoverInstalledPlugins(options?: PluginLoaderOptions): PluginL
const settingsEnabledPlugins = settings?.enabledPlugins
const overrideEnabledPlugins = options?.enabledPluginsOverride

for (const [pluginKey, installations] of Object.entries(db.plugins)) {
if (!installations || installations.length === 0) continue
for (const [pluginKey, installation] of extractPluginEntries(db)) {
if (!installation) continue

if (!isPluginEnabled(pluginKey, settingsEnabledPlugins, overrideEnabledPlugins)) {
log(`Plugin disabled: ${pluginKey}`)
continue
}

const installation = installations[0]
const { installPath, scope, version } = installation

if (!existsSync(installPath)) {
Expand Down
23 changes: 19 additions & 4 deletions src/features/claude-code-plugin-loader/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,29 @@ export interface PluginInstallation {
}

/**
* Installed plugins database structure
* Located at ~/.claude/plugins/installed_plugins.json
* Installed plugins database v1 (legacy)
* plugins stored as direct objects
*/
export interface InstalledPluginsDatabaseV1 {
version: 1
plugins: Record<string, PluginInstallation>
}

/**
* Installed plugins database v2 (current)
* plugins stored as arrays
*/
export interface InstalledPluginsDatabase {
version: number
export interface InstalledPluginsDatabaseV2 {
version: 2
plugins: Record<string, PluginInstallation[]>
}

/**
* Installed plugins database structure
* Located at ~/.claude/plugins/installed_plugins.json
*/
export type InstalledPluginsDatabase = InstalledPluginsDatabaseV1 | InstalledPluginsDatabaseV2

/**
* Plugin author information
*/
Expand Down