feat(extensions): reconcile managed plugins and skills
This commit is contained in:
fraujulian committed
1 parent
fb65c79f80
commit
80e1ab440e
6 files changed
+724
-293
No files matched your search
+69
-140
@@ -19,7 +19,7 @@ function Invoke-PluginCommand {
|
||||
$output = if ($script:PluginNonInteractive) { @($null | & $resolvedCommand @Arguments 2>&1) } else { @(& $resolvedCommand @Arguments 2>&1) }
|
||||
$exitCode = $LASTEXITCODE
|
||||
} finally { $ErrorActionPreference = $previousPreference }
|
||||
if (-not $Summary -or $env:AI_CONFIG_VERBOSE -eq '1') { $output | Write-Output } elseif ($exitCode -eq 0) { $output | Where-Object { "$_" -match '(?i)warn|error|fail|deprecat' } }
|
||||
if ($exitCode -ne 0 -or -not $Summary -or $env:AI_CONFIG_VERBOSE -eq '1') { $output | Write-Output } else { $output | Where-Object { "$_" -match '(?i)warn|error|fail|deprecat' } }
|
||||
if ($exitCode -ne 0) { throw "Plugin command failed: $display" }
|
||||
}
|
||||
|
||||
@@ -35,50 +35,30 @@ function Get-ConfiguredPluginEntries {
|
||||
}
|
||||
|
||||
function Get-InstalledPlugins {
|
||||
param([ValidateSet('Claude','Codex')][string]$Client)
|
||||
if ($Client -eq 'Claude') {
|
||||
if (-not (Get-Command claude -ErrorAction SilentlyContinue)) { throw 'Claude Code CLI is required to manage Claude plugins.' }
|
||||
$items = (claude plugin list --json | Out-String) | ConvertFrom-Json
|
||||
return @($items)
|
||||
}
|
||||
if (-not (Get-Command codex -ErrorAction SilentlyContinue)) { throw 'Codex CLI is required to manage Codex plugins.' }
|
||||
$items = (codex plugin list --json | Out-String) | ConvertFrom-Json
|
||||
return @($items.installed)
|
||||
}
|
||||
|
||||
function Ensure-CodexMarketplace {
|
||||
param(
|
||||
[Parameter(Mandatory=$true)][string]$Source,
|
||||
[Parameter(Mandatory=$true)][string]$MarketplaceName,
|
||||
[switch]$DryRun,
|
||||
[switch]$Summary
|
||||
[ValidateSet('Claude','Codex')][string]$Client,
|
||||
[string]$HomePath = [Environment]::GetFolderPath('UserProfile')
|
||||
)
|
||||
if ($DryRun) {
|
||||
if (-not $Summary) { Write-Output "DRYRUN codex plugin marketplace add $Source" }
|
||||
return
|
||||
$command = Get-Command $Client.ToLowerInvariant() -ErrorAction Stop
|
||||
$environment = @{
|
||||
HOME = $HomePath
|
||||
USERPROFILE = $HomePath
|
||||
CODEX_HOME = (Join-Path $HomePath '.codex')
|
||||
CLAUDE_CONFIG_DIR = (Join-Path $HomePath '.claude')
|
||||
}
|
||||
$previousErrorActionPreference = $ErrorActionPreference
|
||||
$previousEnvironment = @{}
|
||||
foreach ($name in $environment.Keys) { $previousEnvironment[$name] = [Environment]::GetEnvironmentVariable($name, 'Process') }
|
||||
try {
|
||||
$ErrorActionPreference = 'Continue'
|
||||
$output = if ($script:PluginNonInteractive) { @($null | & codex plugin marketplace add $Source 2>&1) } else { @(& codex plugin marketplace add $Source 2>&1) }
|
||||
$exitCode = $LASTEXITCODE
|
||||
} catch {
|
||||
$output = @($_)
|
||||
$exitCode = 1
|
||||
foreach ($name in $environment.Keys) { [Environment]::SetEnvironmentVariable($name, $environment[$name], 'Process') }
|
||||
$global:LASTEXITCODE = 0
|
||||
$output = $null | & $command plugin list --json | Out-String
|
||||
if ($LASTEXITCODE -ne 0) { throw "$Client plugin listing failed." }
|
||||
$items = $output | ConvertFrom-Json
|
||||
if ($Client -eq 'Claude') { return @($items) }
|
||||
return @($items.installed)
|
||||
} finally {
|
||||
$ErrorActionPreference = $previousErrorActionPreference
|
||||
foreach ($name in $previousEnvironment.Keys) { [Environment]::SetEnvironmentVariable($name, $previousEnvironment[$name], 'Process') }
|
||||
}
|
||||
if (-not $Summary -or $env:AI_CONFIG_VERBOSE -eq '1') { $output | Write-Output } elseif ($exitCode -eq 0) { $output | Where-Object { "$_" -match '(?i)warn|error|fail|deprecat' } }
|
||||
if ($exitCode -eq 0) { return }
|
||||
|
||||
$text = $output -join [Environment]::NewLine
|
||||
if ($text -match 'marketplace .* already added from a different source') {
|
||||
Write-Output "WARN Codex marketplace '$MarketplaceName' exists from another source; replacing it with: $Source"
|
||||
Invoke-PluginCommand -Command 'codex' -Arguments @('plugin','marketplace','remove',$MarketplaceName) -Summary:$Summary
|
||||
Invoke-PluginCommand -Command 'codex' -Arguments @('plugin','marketplace','add',$Source) -Summary:$Summary
|
||||
return
|
||||
}
|
||||
throw "Plugin command failed: codex plugin marketplace add $Source"
|
||||
}
|
||||
|
||||
function Read-PluginToggleSelection {
|
||||
@@ -91,12 +71,6 @@ function Read-PluginToggleSelection {
|
||||
$index=0; while($true){ Clear-Host; Write-Host 'Select plugins'; for($i=0;$i -lt $Names.Count;$i++){ $focus=if($i -eq $index){'>'}else{' '}; $mark=if($state[$i]){'x'}else{' '}; Write-Host "$focus [$mark] $($Names[$i])" }; Write-Host 'Up/Down Navigate Space Toggle Enter Confirm'; $key=[Console]::ReadKey($true); if($key.Key -eq 'UpArrow'){$index=($index+$Names.Count-1)%$Names.Count}elseif($key.Key -eq 'DownArrow'){$index=($index+1)%$Names.Count}elseif($key.Key -eq 'Spacebar'){$state[$index]= -not $state[$index]}elseif($key.Key -eq 'Enter'){Clear-Host;return $state} }
|
||||
}
|
||||
|
||||
function Update-CodexMarketplace {
|
||||
param([Parameter(Mandatory=$true)][string]$MarketplaceName,[Parameter(Mandatory=$true)][string]$Source,[switch]$DryRun,[switch]$Summary)
|
||||
try { Invoke-PluginCommand -Command 'codex' -Arguments @('plugin','marketplace','upgrade',$MarketplaceName) -DryRun:$DryRun -Summary:$Summary }
|
||||
catch { Ensure-CodexMarketplace -Source $Source -MarketplaceName $MarketplaceName -DryRun:$DryRun -Summary:$Summary }
|
||||
}
|
||||
|
||||
function Select-ConfiguredPlugins {
|
||||
<#
|
||||
.SYNOPSIS
|
||||
@@ -109,20 +83,23 @@ function Select-ConfiguredPlugins {
|
||||
[Parameter(Mandatory=$true)][string]$RepositoryRoot,
|
||||
[ValidateSet('Codex','Claude','Both')][Parameter(Mandatory=$true)][string]$Client,
|
||||
[ValidateSet('Install','Update')][Parameter(Mandatory=$true)][string]$Mode,
|
||||
[string]$HomePath = [Environment]::GetFolderPath('UserProfile'),
|
||||
[switch]$DryRun
|
||||
)
|
||||
$entries = @(Get-ConfiguredPluginEntries -RepositoryRoot $RepositoryRoot)
|
||||
$toggleable = @($entries | Where-Object { $Client -in @('Claude','Both') -or $_.codex_method -eq 'plugin' })
|
||||
$toggleable = @($entries)
|
||||
$fixed = @($entries | Where-Object { $toggleable -notcontains $_ })
|
||||
if ($DryRun -or $toggleable.Count -eq 0) { return @{ Selected = $entries; Deselected = @() } }
|
||||
|
||||
$referenceClient = if ($Client -eq 'Codex') { 'Codex' } else { 'Claude' }
|
||||
$installed = if ($Mode -eq 'Update') { @(Get-InstalledPlugins -Client $referenceClient) } else { @() }
|
||||
$installed = if ($Mode -eq 'Update') { @(Get-InstalledPlugins -Client $referenceClient -HomePath $HomePath) } else { @() }
|
||||
$idField = if ($referenceClient -eq 'Claude') { 'id' } else { 'pluginId' }
|
||||
$checked = @($toggleable | ForEach-Object {
|
||||
if ($Mode -eq 'Install') { $true; return }
|
||||
$selector = if ($referenceClient -eq 'Claude') { $_.claude_plugin } else { $_.codex_plugin }
|
||||
[bool](@($installed | Where-Object { $_.$idField -eq $selector }).Count)
|
||||
if ($referenceClient -eq 'Codex' -and $_.codex_method -ne 'plugin') {
|
||||
(Test-Path -LiteralPath (Join-Path $HomePath ('.agents/skills/' + $_.codex_skill))) -or (Test-Path -LiteralPath (Join-Path $HomePath ('.codex/skills/' + $_.codex_skill)))
|
||||
} else { [bool](@($installed | Where-Object { $_.$idField -eq $selector }).Count) }
|
||||
})
|
||||
$names = @($toggleable | ForEach-Object { $_.name })
|
||||
$checked = Read-PluginToggleSelection -Names $names -Checked $checked
|
||||
@@ -135,110 +112,62 @@ function Select-ConfiguredPlugins {
|
||||
return @{ Selected = ($selected + $fixed); Deselected = $deselected }
|
||||
}
|
||||
|
||||
function Uninstall-DeselectedPlugins {
|
||||
function Invoke-ManagedExtensions {
|
||||
param(
|
||||
[Parameter(Mandatory=$true)][AllowEmptyCollection()][object[]]$Entries,
|
||||
[ValidateSet('Codex','Claude','Both')][Parameter(Mandatory=$true)][string]$Client,
|
||||
[Parameter(Mandatory=$true)][string]$RepositoryRoot,
|
||||
[Parameter(Mandatory=$true)][string]$Client,
|
||||
[string]$HomePath = $HOME,
|
||||
[ValidateSet('sync','install','remove')][string]$Action = 'sync',
|
||||
[object[]]$Entries,
|
||||
[switch]$DryRun,
|
||||
[switch]$Update,
|
||||
[switch]$Summary
|
||||
)
|
||||
if ($Entries.Count -eq 0 -and $PSBoundParameters.ContainsKey('Entries')) { return }
|
||||
$clients = if ($Client -eq 'Both') { @('Claude','Codex') } else { @($Client) }
|
||||
foreach ($selectedClient in $clients) {
|
||||
$installed = if ($DryRun) { @() } else { @(Get-InstalledPlugins -Client $selectedClient) }
|
||||
$idField = if ($selectedClient -eq 'Claude') { 'id' } else { 'pluginId' }
|
||||
$removedCount = 0
|
||||
foreach ($entry in $Entries) {
|
||||
$plugin = if ($selectedClient -eq 'Claude') { $entry.claude_plugin } else { $entry.codex_plugin }
|
||||
if ([string]::IsNullOrWhiteSpace($plugin)) { continue }
|
||||
$isInstalled = [bool](@($installed | Where-Object { $_.$idField -eq $plugin }).Count)
|
||||
if (-not $isInstalled) { continue }
|
||||
if ($selectedClient -eq 'Claude') {
|
||||
Invoke-PluginCommand -Command 'claude' -Arguments @('plugin','uninstall',$plugin,'--scope','user') -DryRun:$DryRun -Summary:$Summary
|
||||
} else {
|
||||
Invoke-PluginCommand -Command 'codex' -Arguments @('plugin','remove',$plugin) -DryRun:$DryRun -Summary:$Summary
|
||||
}
|
||||
if (-not $Summary) { Write-Output "PASS $selectedClient plugin removed: $plugin" }
|
||||
$removedCount++
|
||||
}
|
||||
if ($Summary -and $removedCount -gt 0) { Write-Output "PLUGINS ${selectedClient}: $removedCount removed" }
|
||||
}
|
||||
$arguments = @((Join-Path $PSScriptRoot 'managed-extensions.py'), $Action, '--home', $HomePath, '--manifest', (Join-Path $RepositoryRoot 'adapters/plugins.tsv'), '--client', $Client.ToLowerInvariant())
|
||||
if ($DryRun) { $arguments += '--dry-run' }
|
||||
if ($Update) { $arguments += '--update' }
|
||||
if ($Summary) { $arguments += '--summary' }
|
||||
if ($PSBoundParameters.ContainsKey('Entries')) { $arguments += '--selected'; $arguments += @($Entries | ForEach-Object { $_.name }) }
|
||||
& python @arguments
|
||||
if ($LASTEXITCODE -ne 0) { throw 'Managed extension reconciliation failed.' }
|
||||
}
|
||||
|
||||
function Sync-ConfiguredPlugins {
|
||||
param(
|
||||
[Parameter(Mandatory=$true)][string]$RepositoryRoot,
|
||||
[ValidateSet('Codex','Claude','Both')][Parameter(Mandatory=$true)][string]$Client,
|
||||
[string]$HomePath = $HOME,
|
||||
[object[]]$Entries,
|
||||
[switch]$DryRun,
|
||||
[switch]$Update,
|
||||
[switch]$Summary
|
||||
)
|
||||
Invoke-ManagedExtensions @PSBoundParameters -Action sync
|
||||
}
|
||||
|
||||
function Install-ConfiguredPlugins {
|
||||
param(
|
||||
[Parameter(Mandatory=$true)][string]$RepositoryRoot,
|
||||
[ValidateSet('Codex','Claude','Both')][Parameter(Mandatory=$true)][string]$Client,
|
||||
[string]$HomePath = $HOME,
|
||||
[object[]]$Entries,
|
||||
[switch]$DryRun,
|
||||
[switch]$Update,
|
||||
[switch]$Summary,
|
||||
[object[]]$Entries
|
||||
[switch]$Summary
|
||||
)
|
||||
$entries = if ($PSBoundParameters.ContainsKey('Entries')) { $Entries } else { @(Get-ConfiguredPluginEntries -RepositoryRoot $RepositoryRoot) }
|
||||
if ($Entries.Count -eq 0 -and $PSBoundParameters.ContainsKey('Entries')) { return }
|
||||
$clients = if ($Client -eq 'Both') { @('Claude','Codex') } else { @($Client) }
|
||||
|
||||
foreach ($selectedClient in $clients) {
|
||||
$installed = if ($DryRun) { @() } else { @(Get-InstalledPlugins -Client $selectedClient) }
|
||||
$tally = @{ Ensured = 0; AlreadyInstalled = 0; Updated = 0 }
|
||||
foreach ($entry in $entries) {
|
||||
$marketplace = if ($selectedClient -eq 'Claude') { $entry.claude_marketplace.Trim() } else { $entry.codex_marketplace.Trim() }
|
||||
if ($marketplace -eq '-') { $marketplace = '' }
|
||||
$plugin = if ($selectedClient -eq 'Claude') { $entry.claude_plugin } else { $entry.codex_plugin }
|
||||
if ([string]::IsNullOrWhiteSpace($plugin)) { throw ('Plugin selector missing for {0}: {1}' -f $selectedClient, $entry.name) }
|
||||
|
||||
if ($selectedClient -eq 'Codex' -and $entry.codex_method -ne 'plugin') {
|
||||
if ($entry.codex_method -eq 'skill') {
|
||||
$arguments = @('-y','skills','add',$entry.codex_source,'--global','--agent','codex')
|
||||
if ($entry.codex_skill -ne '-') { $arguments = @('-y','skills','add',$entry.codex_source,'--skill',$entry.codex_skill,'--global','--agent','codex') }
|
||||
} elseif ($entry.codex_method -eq 'impeccable') {
|
||||
$arguments = @('-y','impeccable','install','-y','--providers=codex','--scope=global')
|
||||
} else {
|
||||
throw "Unknown Codex install method '$($entry.codex_method)' for $($entry.name)."
|
||||
}
|
||||
Invoke-PluginCommand -Command 'npx' -Arguments $arguments -DryRun:$DryRun -Summary:$Summary
|
||||
if (-not $Summary) { Write-Output "PASS Codex skill ensured: $($entry.name)" }
|
||||
$tally.Ensured++
|
||||
continue
|
||||
}
|
||||
|
||||
$installedItem = if ($selectedClient -eq 'Claude') { $installed | Where-Object { $_.id -eq $plugin } | Select-Object -First 1 } else { $installed | Where-Object { $_.pluginId -eq $plugin } | Select-Object -First 1 }
|
||||
if ($Update -and $selectedClient -eq 'Claude' -and $null -ne $installedItem) {
|
||||
Invoke-PluginCommand -Command 'claude' -Arguments @('plugin','update',$plugin) -DryRun:$DryRun -Summary:$Summary
|
||||
if (-not $installedItem.enabled) {
|
||||
Invoke-PluginCommand -Command 'claude' -Arguments @('plugin','enable',$plugin) -DryRun:$DryRun -Summary:$Summary
|
||||
}
|
||||
$tally.Updated++
|
||||
continue
|
||||
}
|
||||
if (-not $Update -and $null -ne $installedItem) {
|
||||
if ($selectedClient -eq 'Claude' -and -not $installedItem.enabled) {
|
||||
Invoke-PluginCommand -Command 'claude' -Arguments @('plugin','enable',$plugin) -DryRun:$DryRun -Summary:$Summary
|
||||
}
|
||||
if (-not $Summary) { Write-Output "PASS $selectedClient plugin already installed: $plugin" }
|
||||
$tally.AlreadyInstalled++
|
||||
continue
|
||||
}
|
||||
|
||||
if ($selectedClient -eq 'Claude') {
|
||||
if (-not [string]::IsNullOrWhiteSpace($marketplace)) {
|
||||
Invoke-PluginCommand -Command 'claude' -Arguments @('plugin','marketplace','add',$marketplace) -DryRun:$DryRun -Summary:$Summary
|
||||
}
|
||||
Invoke-PluginCommand -Command 'claude' -Arguments @('plugin','install',$plugin,'--scope','user') -DryRun:$DryRun -Summary:$Summary
|
||||
} else {
|
||||
if ($Update -and -not [string]::IsNullOrWhiteSpace($marketplace) -and $marketplace -ne 'openai-curated-remote') {
|
||||
Update-CodexMarketplace -MarketplaceName (($plugin -split '@')[-1]) -Source $marketplace -DryRun:$DryRun -Summary:$Summary
|
||||
}
|
||||
if (-not [string]::IsNullOrWhiteSpace($marketplace) -and $marketplace -ne 'openai-curated-remote') {
|
||||
$marketplaceName = ($plugin -split '@')[-1]
|
||||
Ensure-CodexMarketplace -Source $marketplace -MarketplaceName $marketplaceName -DryRun:$DryRun -Summary:$Summary
|
||||
}
|
||||
Invoke-PluginCommand -Command 'codex' -Arguments @('plugin','add',$plugin) -DryRun:$DryRun -Summary:$Summary
|
||||
}
|
||||
if (-not $Summary) { Write-Output "PASS $selectedClient plugin ensured: $plugin" }
|
||||
if ($Update -and $null -ne $installedItem) { $tally.Updated++ } else { $tally.Ensured++ }
|
||||
}
|
||||
if ($Summary) { Write-Output ("PLUGINS {0}: {1} ensured, {2} already installed, {3} updated" -f $selectedClient, $tally.Ensured, $tally.AlreadyInstalled, $tally.Updated) }
|
||||
}
|
||||
if ($PSBoundParameters.ContainsKey('Entries') -and $Entries.Count -eq 0) { return }
|
||||
Invoke-ManagedExtensions @PSBoundParameters -Action install
|
||||
}
|
||||
|
||||
function Uninstall-DeselectedPlugins {
|
||||
param(
|
||||
[Parameter(Mandatory=$true)][AllowEmptyCollection()][object[]]$Entries,
|
||||
[ValidateSet('Codex','Claude','Both')][Parameter(Mandatory=$true)][string]$Client,
|
||||
[string]$RepositoryRoot = (Split-Path (Split-Path $PSScriptRoot -Parent) -Parent),
|
||||
[string]$HomePath = $HOME,
|
||||
[switch]$DryRun,
|
||||
[switch]$Summary
|
||||
)
|
||||
if ($Entries.Count -eq 0) { return }
|
||||
Invoke-ManagedExtensions -RepositoryRoot $RepositoryRoot -Client $Client -HomePath $HomePath -Entries $Entries -Action remove -DryRun:$DryRun -Summary:$Summary
|
||||
}
|
||||
Reference in new issue
Block a user