@awak-app/simy-cli 0.7.21 → 0.7.22

package/README.md

@@ -60,6 +60,22 @@ Provider login is separate from model access; unverified model access remains
 files scoped to the Web/account/organization, rotate each writer's four 64 KiB
 segments, and keep lifetime failure counts after event rotation.
 
+Each AI app card separates **SIMY connection: on / stopped** from CLI, sign-in
+and plugin health. Disconnecting collapses those details and explains that SIMY
+monitoring and automatic continuation are stopped. Details can still be opened;
+reconnecting restores the item statuses. Plugin inspection failure never changes
+the connection setting or hides its disconnect action.
+
+Connection settings show **Repair automatically** beside a failed, missing or
+disabled SIMY plugin. Clicking it rechecks only that provider with a longer,
+bounded timeout; a missing or disabled managed plugin is installed or enabled,
+then its actual inventory is checked again. Success is shown only after that
+inventory confirms the plugin is enabled. Repair progress and failure reasons
+are displayed in the card; safe reason codes and elapsed times are saved in
+`$SIMY_HOME/logs/desktop-host.log`. Repair preserves SIMY connection consent,
+provider sign-in and native hook permissions. Project/managed settings and
+conflicting plugin sources require review instead of being overwritten.
+
 The desktop host continues sampling connection and access while optional
 conversation metadata is pending. It retains the last completed conversation
 metadata only within the same verified scope, clears it after access or account

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awak-app/simy-cli",
-  "version": "0.7.21",
+  "version": "0.7.22",
   "description": "Local SIMY executor for non-coding Local Tasks and Agentic Loop runs.",
   "type": "module",
   "bin": {
@@ -42,7 +42,7 @@
     "check:session-supervision-syntax": "node --check ./src/session-supervision/session-list.js && node --check ./src/console/sessions.js && node --check ./src/session-supervision/remote-hosts.js && node --check ./src/session-supervision/remote-entry.js && node --check ./src/session-supervision/index.js && node --check ./src/session-supervision/discovery-window.js && node --check ./src/session-supervision/codex-app-server.js && node --check ./src/session-supervision/claude-sessions.js && node --check ./src/session-supervision/original-session-target.js && node --check ./src/session-supervision/action-association.js && node --check ./src/session-supervision/action-association-host.js && node --check ./src/session-supervision/action-association-api.js && node --check ./src/session-supervision/association-store.js && node --check ./src/session-supervision/action-deadline.js && node --check ./src/session-supervision/action-deadline-store.js && node --check ./src/codex-plugins/simy/hooks/action-association.mjs && node --check ./src/session-supervision/purpose-instruction.js && node --check ./src/session-supervision/purpose-recovery.js && node --check ./src/session-supervision/purpose-candidate.js && node --check ./src/codex-plugins/simy/hooks/scene-reasoning.mjs && node --check ./src/codex-plugins/simy/hooks/purpose-cycle.mjs && node --check ./src/codex-plugins/simy/hooks/purpose-rule-review.mjs && node --check ./src/codex-plugins/simy/hooks/purpose-search.mjs && node --check ./src/codex-plugins/simy/hooks/purpose-evidence.mjs && node --check ./src/session-supervision/purpose-observer.js && node --check ./src/session-supervision/purpose-verification.js && node --check ./src/codex-plugins/simy/hooks/purpose-workspace.mjs && node --check ./scripts/purpose-search-live-e2e.js",
     "check:auto-update": "node --check ./src/auto-update.js && node --check ./scripts/auto-update-e2e.js && npm run check:sqm",
     "check:workflow-observation-sender": "node --check ./src/workflow-observation-sender.js",
-    "check:sqm": "node --check ./src/sqm/advisory-guidance.js && node --check ./src/sqm/canonical.js && node --check ./src/sqm/validation.js && node --check ./src/sqm/reliability.js && node --check ./src/sqm/repository.js && node --check ./src/sqm/checkers.js && node --check ./src/sqm/bundle-store.js && node --check ./src/sqm/proof.js && node --check ./src/sqm/evidence-client.js && node --check ./src/sqm/session.js && node --check ./src/sqm/index.js && node --check ./src/sqm/command.js && node --check ./src/sqm/agent-skill.js && node --check ./src/sqm/workflow-onboarding.js && node --check ./src/sqm/workflow-update.js && node --check ./src/sqm/history-store.js && node --check ./src/sqm/review-worker.js && node --check ./scripts/sqm-complete-loop-e2e.js && node --check ./scripts/sqm-local-review-e2e.js",
+    "check:sqm": "node --check ./src/sqm/provider-plugin-repair.js && node --check ./src/sqm/provider-plugin-status.js && node --check ./src/sqm/advisory-guidance.js && node --check ./src/sqm/canonical.js && node --check ./src/sqm/validation.js && node --check ./src/sqm/reliability.js && node --check ./src/sqm/repository.js && node --check ./src/sqm/checkers.js && node --check ./src/sqm/bundle-store.js && node --check ./src/sqm/proof.js && node --check ./src/sqm/evidence-client.js && node --check ./src/sqm/session.js && node --check ./src/sqm/index.js && node --check ./src/sqm/command.js && node --check ./src/sqm/agent-skill.js && node --check ./src/sqm/workflow-onboarding.js && node --check ./src/sqm/workflow-update.js && node --check ./src/sqm/history-store.js && node --check ./src/sqm/review-worker.js && node --check ./scripts/sqm-complete-loop-e2e.js && node --check ./scripts/sqm-local-review-e2e.js",
     "check:real-provider-syntax": "node --check ./scripts/real-codex-probe.js && node --check ./scripts/real-claude-probe.js && node --check ./scripts/real-provider-console-fixture.js && node --check ./scripts/real-provider-console-e2e.js && node --check ./scripts/claude-parity-runtime-e2e.js && node --check ./scripts/claude-plugin-runtime-e2e.js && node --check ./scripts/codex-plugin-runtime-e2e.js",
     "check:syntax": "node --check ./src/purpose-local-proof.js && node --check ./src/device-signing-identity.js && node --check ./src/index.js && node --check ./src/install-update.js && node --check ./src/agent.js && node --check ./src/connection-discovery.js && node --check ./src/connection-diagnostics.js && node --check ./src/launch-authorization.js && node --check ./src/codex-plugins/simy/hooks/connection-reminder.mjs && node --check ./src/codex-plugins/simy/hooks/dev-work.mjs && node --check ./src/dev-work-events.js && node --check ./src/browser.js && node --check ./src/web-api.js && node --check ./src/durable-local-task-worker.js && node --check ./src/durable-local-task-steps-contract.js && node --check ./src/bounded-local-task-subtasks-contract.js && node --check ./src/bounded-local-task-subtask-pool.js && node --check ./src/local-task-artifact-contract.js && node --check ./src/execution-capability-contract.js && node --check ./src/shutdown.js && node --check ./src/run-registry.js && node --check ./src/direct-executor.js && node --check ./src/execution-guardrail.js && node --check ./src/backend-executable.js && node --check ./src/login-shell-path.js && node --check ./src/hook-runtime.js && node --check ./src/provider-stream.js && node --check ./src/console/index.js && node --check ./src/console/app.js && node --check ./src/console/commands.js && node --check ./src/local-attachments.js && node --check ./src/repository-inventory.js && node --check ./src/session-store.js && node --check ./src/web-origin.js && node --check ./src/workspace-context.js && node --check ./src/orchestrator/index.js && node --check ./src/orchestrator/shared.js && node --check ./src/orchestrator/recovery.js && node --check ./src/orchestrator/risk.js && node --check ./src/orchestrator/contract.js && node --check ./src/orchestrator/completion-contract.js && node --check ./src/orchestrator/pr-preparation.js && node --check ./src/orchestrator/minimum-completion.js && node --check ./src/orchestrator/delivery/scripts/check-minimum-completion.mjs && node --check ./src/orchestrator/instruction.js && node --check ./src/orchestrator/problem-solving.js && node --check ./src/orchestrator/budget.js && node --check ./src/orchestrator/execution-io.js && node --check ./src/orchestrator/presentation.js && node --check ./src/orchestrator/result.js && node --check ./src/orchestrator/retry.js && node --check ./src/orchestrator/evidence.js && node --check ./src/orchestrator/independent-audit.js && node --check ./src/orchestrator/audit.js && node --check ./src/orchestrator/loop.js && node --check ./src/runner.js && node --check ./src/coding-run-store.js && node --check ./scripts/fixtures/completion-contract-fixture.js && node --check ./scripts/fixtures/fake-coding-backend.js && node --check ./scripts/e2e-terminal-evidence.js && node --check ./scripts/audit-gate-e2e.js && node --check ./scripts/completion-contract-e2e.js && node --check ./scripts/retry-circuit-e2e.js && node --check ./scripts/follow-up-charter-e2e.js && node --check ./scripts/task-routing-e2e.js && node --check ./scripts/executor-version-preflight-e2e.js && node --check ./scripts/blocked-recovery-e2e.js && node --check ./scripts/process-localization-e2e.js && node --check ./scripts/hypothesis-retries-e2e.js && node --check ./scripts/budget-enforcement-e2e.js && node --check ./scripts/local-task-default-workspace-e2e.js && node --check ./scripts/local-task-idempotency-e2e.js && node --check ./scripts/console-e2e-fixture.js && node --check ./scripts/console-e2e.js && node --check ./scripts/console-recovery-e2e-fixture.js && node --check ./scripts/console-recovery-e2e.js && node --check ./scripts/real-provider-console-fixture.js && node --check ./scripts/real-provider-console-e2e.js && node --check ./scripts/fullstack-cli-smoke.js && node --check ./scripts/check-package-contents.js && node --check ./src/codex-plugins/simy/hooks/delivery-loop.mjs && node --check ./src/delivery-hooks/command.js && node --check ./src/delivery-hooks/desktop.js && node --check ./src/delivery-hooks/supervisor.js && node --check ./src/delivery-hooks/recovery.js && node --check ./src/delivery-hooks/supervisor-owner.js && node --check ./src/delivery-hooks/supervisor-watchdog.js && node --check ./src/delivery-hooks/supervisor-service.js && node --check ./scripts/supervisor-watchdog-live-e2e.js && node --check ./src/codex-plugins/simy/hooks/recovery-incident.mjs && node --check ./src/session-supervision/automatic-continuation.js && node --check ./src/session-supervision/stop-notifications.js",
     "check:package": "node ./scripts/check-package-contents.js",

package/src/cli-contract.js

@@ -14,7 +14,7 @@ import {
 } from "./durable-local-task-steps-contract.js";
 import { buildExecutionCapabilityContract } from "./execution-capability-contract.js";
 
-export const CLI_VERSION = "0.7.21";
+export const CLI_VERSION = "0.7.22";
 export const CLI_API_CONTRACT_VERSION = 10;
 
 export function narrativeImageCapabilityMetadata() {

package/src/desktop-host.js

@@ -15,6 +15,7 @@ import { randomUUID } from "node:crypto";
 import { readCodexStatistics, unavailableStatistics } from './session-supervision/statistics.js';
 import { readClaudeStatistics } from './session-supervision/claude-sessions.js';
 import { inspectProviderPlugins, unavailablePluginStatus } from './sqm/provider-plugin-status.js';
+import { repairProviderPlugin } from './sqm/provider-plugin-repair.js';
 import { openCodexAppServer } from './session-supervision/codex-app-server.js';
 import { conversationSqmChecks } from './session-supervision/sqm-presentation.js';
 import { stopOwnedDesktopHost } from "./desktop-force-quit.js";
@@ -503,6 +504,7 @@ export async function startDesktopHost({ input = process.stdin, output = process
   const changeProviderLink = async (provider, connected) => {
     if (!PROVIDER_LINKS.includes(provider)) throw new Error("Unsupported SIMY provider connection.");
     if (providerLinkBusy.has(provider)) throw new Error("SIMY connection is already changing.");
+    providerRepairControllers.get(provider)?.abort();
     providerLinkBusy.add(provider);
     providerLinkFeedback[provider] = { state: connected ? "connecting" : "disconnecting" };
     let phase = "read_settings";
@@ -575,6 +577,11 @@ export async function startDesktopHost({ input = process.stdin, output = process
   const providerAuthBusy = new Set();
   let pluginInstallationActive = false, pluginSetupEpoch = 0;
   let providerPlugins = { codex: { state: 'checking' }, claude: { state: 'checking' } };
+  const providerRepairs = {}, providerRepairControllers = new Map(), providerRepairJobs = new Set();
+  const providerPluginEpochs = { codex: 0, claude: 0 };
+  const pluginDiagnostic = ({ provider, reason, elapsedMs }) => {
+    diagnostics.write(`provider plugin inspection provider=${provider} reason=${reason} elapsedMs=${elapsedMs}`);
+  };
   let pluginInspection = null, lastPluginInspectionAt = -Infinity;
   let pluginInspectionAbort = new AbortController();
   const refreshProviderPlugins = () => {
@@ -582,9 +589,17 @@ export async function startDesktopHost({ input = process.stdin, output = process
     if (pluginInspection) return pluginInspection;
     if (pluginInspectionAbort.signal.aborted) pluginInspectionAbort = new AbortController();
     lastPluginInspectionAt = Date.now();
-    pluginInspection = Promise.resolve().then(() => (dependencies.inspectProviderPlugins || inspectProviderPlugins)({ signal: pluginInspectionAbort.signal }))
-      .then(value => { providerPlugins = value; })
-      .catch(() => { providerPlugins = { codex: unavailablePluginStatus(), claude: unavailablePluginStatus() }; })
+    const epochs = { ...providerPluginEpochs };
+    const apply = value => {
+      for (const provider of PROVIDER_LINKS) {
+        if (!providerRepairControllers.has(provider) && epochs[provider] === providerPluginEpochs[provider]) {
+          providerPlugins[provider] = value[provider] || unavailablePluginStatus();
+        }
+      }
+    };
+    pluginInspection = Promise.resolve().then(() => (dependencies.inspectProviderPlugins || inspectProviderPlugins)({ signal: pluginInspectionAbort.signal, details: true, onDiagnostic: pluginDiagnostic }))
+      .then(apply)
+      .catch(() => apply({ codex: unavailablePluginStatus(), claude: unavailablePluginStatus() }))
       .finally(() => { pluginInspection = null; if (!closed && !relay) void publish().catch(() => {}); });
     return pluginInspection;
   };
@@ -608,6 +623,7 @@ export async function startDesktopHost({ input = process.stdin, output = process
     }]));
     status.pluginSetup = { ...pluginSetup };
     status.providerPlugins = structuredClone(providerPlugins);
+    status.providerRepairs = structuredClone(providerRepairs);
     for (const provider of ["codex", "claude"]) {
       if (providerAuth[provider]?.state === "awaiting_sign_in" && !providerAuthBusy.has(provider) && status.providers?.[provider]?.state === "ready") delete providerAuth[provider];
     }
@@ -804,6 +820,7 @@ export async function startDesktopHost({ input = process.stdin, output = process
     clearInterval(timer);
     teamThreads?.close();
     pluginInspectionAbort.abort();
+    for (const controller of providerRepairControllers.values()) controller.abort();
     activeStatisticsRead?.controller.abort();
     discoveryStopped = true;
     encodedStatus = null; lastStatus = null;
@@ -812,6 +829,7 @@ export async function startDesktopHost({ input = process.stdin, output = process
     // reader must never postpone cancellation of an owned Provider process.
     const results = await Promise.allSettled([stopDiscovery({ drain: true }), publishing, connectionPublishing,
       pluginInspection,
+      ...providerRepairJobs,
       remoteHosts?.close(), actionAssociations.close(), automaticContinuation?.close(), analysisManager?.close(),
       managedSupervisor.close(), recordReader.close(), stopWorkflows(),
       agent ? createAgentShutdown(agent)() : undefined]);
@@ -1163,7 +1181,7 @@ export async function startDesktopHost({ input = process.stdin, output = process
         }
 
         let commandProviderLink;
-        if (command.provider && !["refresh", "provider_connect", "provider_disconnect", "delivery_stop", "delivery_pause", "delivery_reject", "session_untrack", "session_unmonitor"].includes(action) &&
+        if (command.provider && !["provider_repair", "refresh", "provider_connect", "provider_disconnect", "delivery_stop", "delivery_pause", "delivery_reject", "session_untrack", "session_unmonitor"].includes(action) &&
           !(action === "session_set_auto_continue" && command.enabled === false)) {
           commandProviderLink = await requireProviderLink({ root: deliveryRoot, provider: command.provider });
         }
@@ -1188,7 +1206,48 @@ export async function startDesktopHost({ input = process.stdin, output = process
           await remoteHosts.save({ alias: command.alias, label: command.label }, action === 'remote_host_remove');
           emit({ type: 'result', id: command.id, ok: true }); await publish(); return;
         }
-        if (action === "provider_connect" || action === "provider_disconnect") {
+        if (action === 'provider_repair') {
+          const provider = command.provider;
+          if (!PROVIDER_LINKS.includes(provider)) throw new Error('Unsupported provider.');
+          if (providerRepairControllers.has(provider) || providerLinkBusy.has(provider)) throw new Error('Provider repair is already running.');
+          const controller = new AbortController();
+          providerRepairControllers.set(provider, controller);
+          providerPluginEpochs[provider]++;
+          providerRepairs[provider] = { state: 'repairing' };
+          const beganAt = Date.now();
+          let repairJob;
+          try {
+            await publish();
+            repairJob = Promise.resolve().then(() => (dependencies.repairProviderPlugin || repairProviderPlugin)({
+              provider, signal: controller.signal, onDiagnostic: pluginDiagnostic,
+              authorize: async () => {
+                if (closed || relay || controller.signal.aborted) throw Object.assign(new Error('Repair cancelled.'), { reason: 'cancelled' });
+                await authorizeWork(commandScope);
+              },
+            }));
+            providerRepairJobs.add(repairJob);
+            const result = await repairJob;
+            if (closed || controller.signal.aborted) throw Object.assign(new Error('Repair cancelled.'), { reason: 'cancelled' });
+            await authorizeWork(commandScope);
+            if (result?.plugin?.state !== 'enabled') throw Object.assign(new Error('Repair was not verified.'), { reason: 'verification_failed' });
+            providerPlugins[provider] = result.plugin;
+            providerRepairs[provider] = { state: 'repaired' };
+            diagnostics.write(`provider plugin repair provider=${provider} result=repaired elapsedMs=${Date.now() - beganAt}`);
+          } catch (error) {
+            const reasons = ['timeout', 'cli_missing', 'invalid_inventory', 'command_failed', 'verification_failed',
+              'scope_requires_attention', 'source_conflict', 'busy', 'permission_denied', 'cancelled'];
+            const reason = reasons.includes(error?.reason) ? error.reason : 'command_failed';
+            providerRepairs[provider] = { state: 'failed', reason };
+            diagnostics.write(`provider plugin repair provider=${provider} result=failed reason=${reason} elapsedMs=${Date.now() - beganAt}`);
+            throw error;
+          } finally {
+            providerRepairJobs.delete(repairJob);
+            providerRepairControllers.delete(provider);
+            await publish();
+          }
+          emit({ type: 'result', id: command.id, ok: true });
+          return;
+        } else if (action === "provider_connect" || action === "provider_disconnect") {
           await changeProviderLink(command.provider, action === "provider_connect");
           emit({ type: "result", id: command.id, ok: true });
           return;
@@ -1598,7 +1657,7 @@ export async function startDesktopHost({ input = process.stdin, output = process
       void execute();
     } else if (["login", "organization_select", "organization_cancel", "authorization_open"].includes(command.action)) {
       authorizationQueue = authorizationQueue.then(execute).catch(() => {});
-    } else if (/^(codex|claude)_login$/.test(command.action || "") || ["provider_connect", "provider_disconnect"].includes(command.action)) {
+    } else if (/^(codex|claude)_login$/.test(command.action || "") || ["provider_repair", "provider_connect", "provider_disconnect"].includes(command.action)) {
       // Opening an auth terminal must not wait for an unrelated provider turn.
       // Per-provider busy guards prevent overlapping connection changes.
       void execute();

package/src/sqm/agent-skill.js

@@ -100,14 +100,16 @@ export async function inspectSqmAgentSkill({ home = homedir() } = {}) {
   };
 }
 
-export async function installSqmAgentSkill({ home = homedir(), platforms = Object.keys(TARGETS) } = {}) {
+export async function installSqmAgentSkill({ home = homedir(), platforms = Object.keys(TARGETS), migrateLegacyGate = true } = {}) {
   const requested = [...new Set(platforms)];
   if (!requested.length || requested.some((platform) => !Object.hasOwn(TARGETS, platform))) {
     throw new Error("platforms must contain codex and/or claude");
   }
   if (requested.includes("codex")) await installCodexPlugin({ home });
   if (requested.includes("claude")) await installClaudePlugin({ home });
-  await retireLegacySqmGate({ home });
+  // Explicit single-provider repair must not migrate another provider's hooks.
+  // Ordinary setup and workflow updates retain the existing migration behavior.
+  if (migrateLegacyGate) await retireLegacySqmGate({ home });
   for (const platform of requested) {
     await atomicText(path.join(home, ...TARGETS[platform]), SKILL_CONTENT, 0o600);
   }

package/src/sqm/provider-command.js

@@ -16,7 +16,7 @@ export function runProviderCommand(command, args, { env, cwd, timeout = 10_000,
     };
     const timer = setTimeout(() => {
       child.kill("SIGTERM");
-      finish(new Error("Provider plugin command timed out."));
+      finish(Object.assign(new Error("Provider plugin command timed out."), { code: 'provider_timeout' }));
     }, timeout);
     timer.unref?.();
     const capture = (stream, append) => {

package/src/sqm/provider-plugin-repair.js

@@ -0,0 +1,105 @@
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+import { mkdir, readFile, realpath, rm } from 'node:fs/promises';
+import { resolveBackendExecutable } from '../backend-executable.js';
+import { inspectProviderPlugins } from './provider-plugin-status.js';
+import { runProviderCommand } from './provider-command.js';
+import { inspectSqmAgentSkill, installSqmAgentSkill } from './agent-skill.js';
+import { CLAUDE_MARKETPLACE, CLAUDE_PLUGIN_SELECTOR } from './claude-plugin.js';
+
+const fail = reason => Object.assign(new Error('SIMY plugin repair could not be verified.'), { code: 'plugin_repair_failed', reason });
+
+// Explicit user action only. Repair one provider, under the same lock as the
+// background workflow updater. Never change SIMY consent, login or hook trust.
+export async function repairProviderPlugin({ provider, home = homedir(),
+  codexHome = process.env.CODEX_HOME || join(home, '.codex'),
+  claudeHome = process.env.CLAUDE_CONFIG_DIR || join(home, '.claude'),
+  signal, authorize = async () => {}, onDiagnostic = () => {},
+  inspect = inspectProviderPlugins, inspectSources = inspectSqmAgentSkill,
+  prepare = installSqmAgentSkill, resolveExecutable = resolveBackendExecutable,
+  run = runProviderCommand,
+} = {}) {
+  if (!['codex', 'claude'].includes(provider)) throw fail('unsupported_provider');
+  const startedAt = Date.now();
+  const check = async () => {
+    if (signal?.aborted) throw fail('cancelled');
+    await authorize();
+    if (signal?.aborted) throw fail('cancelled');
+  };
+  const options = { home, codexHome, claudeHome, providers: [provider], details: true,
+    timeoutMs: 20_000, signal, onDiagnostic, resolveExecutable, run };
+  const inventory = async () => (await inspect(options))[provider];
+  const command = async args => {
+    await check();
+    const executable = await resolveExecutable(provider, { signal, timeoutMs: 5_000 });
+    if (!executable) throw fail('cli_missing');
+    return run(executable, args, { cwd: home, signal, timeout: 20_000, maxBuffer: 1024 * 1024,
+      env: { ...process.env, HOME: home, ...(provider === 'codex' ? { CODEX_HOME: codexHome } : { CLAUDE_CONFIG_DIR: claudeHome }) } });
+  };
+  let locked = false;
+  const lock = join(home, '.simy', 'integrations', 'workflow-update.lock');
+  try {
+    await check();
+    let current = await inventory();
+    if (current?.state === 'enabled') return { state: 'repaired', plugin: current };
+    if (!['missing', 'disabled'].includes(current?.state)) throw fail(current?.reason || 'verification_failed');
+    if (provider === 'claude' && current.scope && current.scope !== 'user') throw fail('scope_requires_attention');
+    await mkdir(join(home, '.simy', 'integrations'), { recursive: true });
+    try { await mkdir(lock); locked = true; }
+    catch (error) { if (error.code === 'EEXIST') throw fail('busy'); throw error; }
+    await check();
+    // Reinspect after obtaining the lock; another updater may have finished.
+    current = await inventory();
+    if (current?.state === 'enabled') return { state: 'repaired', plugin: current };
+    if (!['missing', 'disabled'].includes(current?.state)) throw fail(current?.reason || 'verification_failed');
+    if (provider === 'claude' && current.scope && current.scope !== 'user') throw fail('scope_requires_attention');
+    let sources = await inspectSources({ home });
+    if (provider === 'codex' && current.state === 'disabled') {
+      const payload = JSON.parse((await command(['plugin', 'list', '--json'])).stdout);
+      const entry = payload.installed?.find(item => item.pluginId === current.selector);
+      if (entry?.source?.source !== 'local' || !entry.source.path ||
+          await realpath(entry.source.path) !== await realpath(sources.codex_plugin.path)) throw fail('source_conflict');
+      const marketplace = JSON.parse(await readFile(sources.codex_plugin.marketplace_path, 'utf8'));
+      if (current.selector !== `simy@${marketplace.name}`) throw fail('source_conflict');
+    }
+    if (provider === 'claude') {
+      const marketplaces = JSON.parse((await command(['plugin', 'marketplace', 'list', '--json'])).stdout);
+      if (!Array.isArray(marketplaces)) throw fail('invalid_inventory');
+      const existing = marketplaces.find(item => item.name === CLAUDE_MARKETPLACE);
+      if (existing && (existing.source !== 'directory' || !existing.path ||
+          await realpath(existing.path) !== await realpath(sources.claude_plugin.marketplace_root))) throw fail('source_conflict');
+    }
+    await check();
+    sources = await prepare({ home, platforms: [provider], migrateLegacyGate: false });
+    if (provider === 'codex') {
+      const marketplace = JSON.parse(await readFile(sources.codex_plugin.marketplace_path, 'utf8'));
+      if (!/^[A-Za-z0-9_-]+$/.test(marketplace.name || '')) throw fail('source_conflict');
+      const selector = `simy@${marketplace.name}`;
+      if (current.selector && current.selector !== selector) throw fail('source_conflict');
+      await command(['plugin', 'add', selector, '--json']);
+    } else {
+      // The managed marketplace installer preserves unrelated provider settings.
+      const marketplaces = JSON.parse((await command(['plugin', 'marketplace', 'list', '--json'])).stdout);
+      if (!Array.isArray(marketplaces)) throw fail('invalid_inventory');
+      const existing = marketplaces.find(item => item.name === CLAUDE_MARKETPLACE);
+      if (existing && (existing.source !== 'directory' || !existing.path ||
+          await realpath(existing.path) !== await realpath(sources.claude_plugin.marketplace_root))) throw fail('source_conflict');
+      if (!existing) {
+        await command(['plugin', 'marketplace', 'add', sources.claude_plugin.marketplace_root]);
+      }
+      await command(['plugin', current.state === 'missing' ? 'install' : 'enable', CLAUDE_PLUGIN_SELECTOR, '--scope', 'user']);
+    }
+    await check();
+    const verified = await inventory();
+    if (verified?.state !== 'enabled') throw fail(verified?.reason || 'verification_failed');
+    return { state: 'repaired', plugin: verified };
+  } catch (error) {
+    const reason = error?.reason || (signal?.aborted ? 'cancelled' : error?.code === 'provider_timeout' ? 'timeout' :
+      error instanceof SyntaxError ? 'invalid_inventory' :
+      ['EACCES', 'EPERM', 'EROFS'].includes(error?.code) ? 'permission_denied' : 'command_failed');
+    onDiagnostic({ provider, reason, elapsedMs: Date.now() - startedAt });
+    throw fail(reason);
+  } finally {
+    if (locked) await rm(lock, { recursive: true, force: true });
+  }
+}

package/src/sqm/provider-plugin-status.js

@@ -14,13 +14,22 @@ export async function inspectProviderPlugins({ home = homedir(),
   codexHome = process.env.CODEX_HOME || join(home, '.codex'),
   claudeHome = process.env.CLAUDE_CONFIG_DIR || join(home, '.claude'),
   resolveExecutable = resolveBackendExecutable, run = runProviderCommand,
-  timeoutMs = 5_000, signal,
+  timeoutMs = 5_000, signal, providers = ['codex', 'claude'], details = false,
+  onDiagnostic = () => {},
 } = {}) {
+  if (providers.some(provider => !['codex', 'claude'].includes(provider))) throw new Error('Unsupported provider.');
   const inspect = async provider => {
+    const startedAt = Date.now();
+    const unavailable = reason => {
+      const elapsedMs = Date.now() - startedAt;
+      onDiagnostic({ provider, reason, elapsedMs });
+      return { ...unavailablePluginStatus(), ...(details ? { reason, elapsedMs } : {}) };
+    };
     try {
-      if (signal?.aborted) return unavailablePluginStatus();
+      if (signal?.aborted) return unavailable('cancelled');
       const executable = await resolveExecutable(provider, { signal, timeoutMs });
-      if (!executable || signal?.aborted) return unavailablePluginStatus();
+      if (signal?.aborted) return unavailable('cancelled');
+      if (!executable) return unavailable('cli_missing');
       const { stdout } = await run(executable, ['plugin', 'list', '--json'], {
         timeout: timeoutMs, maxBuffer: 1024 * 1024, signal, cwd: home,
         env: { ...process.env, HOME: home,
@@ -28,7 +37,7 @@ export async function inspectProviderPlugins({ home = homedir(),
       });
       const payload = JSON.parse(stdout);
       const entries = provider === 'codex' ? payload?.installed : payload;
-      if (!Array.isArray(entries)) return unavailablePluginStatus();
+      if (!Array.isArray(entries)) return unavailable('invalid_inventory');
       const matches = entries.filter(entry => provider === 'codex'
         ? typeof entry?.pluginId === 'string' && /^simy@[A-Za-z0-9_-]+$/.test(entry.pluginId)
         : entry?.id === CLAUDE_PLUGIN_SELECTOR);
@@ -42,11 +51,14 @@ export async function inspectProviderPlugins({ home = homedir(),
       const entry = matches[0];
       if (!entry || provider === 'codex' && entry.installed === false) return { state: 'missing', installed: false, enabled: false };
       if (typeof entry.enabled !== 'boolean' || provider === 'codex' && entry.installed !== true ||
-        provider === 'claude' && !scopes.includes(entry.scope)) return unavailablePluginStatus();
+        provider === 'claude' && !scopes.includes(entry.scope)) return unavailable('invalid_inventory');
       return { state: entry.enabled ? 'enabled' : 'disabled', installed: true, enabled: entry.enabled,
+        ...(details ? { selector: provider === 'codex' ? entry.pluginId : entry.id } : {}),
         ...(provider === 'claude' ? { scope: entry.scope, enablementContext: 'home' } : {}) };
-    } catch { return unavailablePluginStatus(); }
+    } catch (error) {
+      return unavailable(signal?.aborted ? 'cancelled' : error?.code === 'provider_timeout' ? 'timeout' :
+        error instanceof SyntaxError ? 'invalid_inventory' : 'command_failed');
+    }
   };
-  const [codex, claude] = await Promise.all([inspect('codex'), inspect('claude')]);
-  return { codex, claude };
+  return Object.fromEntries(await Promise.all(providers.map(async provider => [provider, await inspect(provider)])));
 }