cairn-ai 0.2.8 → 0.2.9

package/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "cairn",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "description": "Token-efficient agent harness with tool readiness for Codex, Claude Code, and Antigravity.",
   "author": {
     "name": "WkNam"

package/README.ko.md

@@ -109,7 +109,7 @@ cairn uninstall
 cairn toolcheck
 ```
 
-- `cairn install`: custom marketplace source, versioned Codex runtime cache, Cairn-owned config section, Claude Code mirror, 현재 Antigravity IDE/CLI skill 표면을 transaction으로 설치합니다.
+- `cairn install`: custom marketplace source, versioned Codex runtime cache, Cairn-owned config section, Claude Code mirror와 플러그인, 현재 Antigravity IDE/CLI skill 표면을 transaction으로 설치합니다.
 - `cairn upgrade`: ownership manifest의 installed digest와 현재 값이 같은 항목만 교체하며, staged validation과 역순 rollback을 적용합니다.
 - `cairn doctor`: ownership manifest, managed digest, 유효 Codex feature, 실제 plugin installed/enabled/version, mirror/runtime locator를 수정 없이 진단합니다.
 - `cairn uninstall`: 먼저 config 외 모든 ownership manifest 항목을 설치 digest와 대조하고, 수정되거나 삭제된 managed artifact가 하나라도 있으면 아무것도 바꾸지 않고 uninstall 전체를 거부합니다. 그렇지 않으면 managed 항목을 제거·복원하고 빈 managed cache scaffold를 정리하며, unmanaged target과 그 상위 디렉터리는 보존하고 commit 전 실패는 rollback합니다.
@@ -129,7 +129,9 @@ cairn toolcheck
 
 Clean uninstall은 모든 managed scaffold가 비었을 때만 recursive 삭제 없이 빈 디렉터리 제거로 Cairn marketplace cache root를 정리합니다. 소스 저장소와 저장소의 `MEMORY.md`/`PLAN.md`, 사용자 홈 Cairn goal 상태, 전역 `cairn-ai` package, package-manager download cache, legacy backup, 현재 ownership manifest 밖의 legacy shared setting은 지우지 않으며 별도의 명시적 정리 판단이 필요합니다.
 
-Codex는 `skills/`와 `commands/`를 사용합니다. Claude Code는 `.claude/` 아래의 mirror command와 agent definition을 사용합니다. Antigravity는 `.agents/workflows`와 global skills mirror를 사용합니다.
+Codex는 `skills/`와 `commands/`를 사용합니다. Claude Code는 `~/.claude/` 아래의 mirror command·agent definition과 Claude Code 플러그인 `cairn@cairn`을 사용합니다. Antigravity는 `.agents/workflows`와 global skills mirror를 사용합니다.
+
+Claude Code 플러그인은 Cairn이 소유한 로컬 marketplace `~/.codex/plugins/cache/cairn/claude`에 생성되며, Cairn skill 4개와 SessionStart·UserPromptSubmit·PostToolUse·Stop·SubagentStop hook을 담습니다. hook은 설치된 버전 런타임을 절대경로로 호출합니다. 파일 commit 뒤 `cairn install`/`upgrade`가 `claude plugin marketplace add`와 `claude plugin install cairn@cairn --scope user`로 등록하므로 다음 세션부터 Claude Code 터미널·데스크톱 앱·IDE 플러그인 목록에 표시됩니다. `claude` CLI가 없으면 등록을 건너뛰고 수동 명령을 안내하며, 이미 `cairn`이라는 다른 marketplace가 있으면 건드리지 않습니다. `cairn uninstall`은 파일 제거 전에 Cairn 소유 marketplace만 등록 해제하고, uninstall이 rollback되면 다시 등록합니다. `cairn doctor`는 `Claude plugin files`, `Claude plugin registered`, `Claude plugin enabled`를 보고합니다.
 
 ## Antigravity Compatibility
 

package/README.md

@@ -117,7 +117,7 @@ cairn uninstall
 cairn toolcheck
 ```
 
-- `cairn install`: transactionally installs the custom marketplace source, versioned Codex runtime cache, Cairn-owned config sections, Claude Code mirrors, and current Antigravity IDE/CLI skill surfaces.
+- `cairn install`: transactionally installs the custom marketplace source, versioned Codex runtime cache, Cairn-owned config sections, Claude Code mirrors and plugin, and current Antigravity IDE/CLI skill surfaces.
 - `cairn upgrade`: replaces only ownership-manifest entries whose installed digests still match, with staged validation and reverse-order rollback on failure.
 - `cairn doctor`: validates the ownership manifest, managed digests, effective Codex features, actual installed/enabled/version plugin state, and mirror/runtime locators without repairing them.
 - `cairn uninstall`: verifies every non-config ownership-manifest entry against its installed digest first and refuses the whole uninstall, changing nothing, if any managed artifact was modified or removed. Otherwise it removes or restores the managed entries, prunes empty managed cache scaffolds, preserves unmanaged targets and their parent directories, and rolls back pre-commit failures.
@@ -137,7 +137,9 @@ Install and upgrade keep the custom marketplace lifecycle; they do not invoke `c
 
 Clean uninstall removes the Cairn marketplace cache root only when every managed scaffold is empty, using empty-directory removal rather than recursive deletion. It does not delete the source repository, repository `MEMORY.md`/`PLAN.md`, user-home Cairn goal state, the global `cairn-ai` package, package-manager download caches, legacy backups, or legacy shared settings outside the current ownership manifest; those require a separate explicit cleanup decision.
 
-Codex uses `skills/` and `commands/`. Claude Code uses mirrored commands and agent definitions under `.claude/`. Antigravity uses `.agents/workflows` and global skills mirrors.
+Codex uses `skills/` and `commands/`. Claude Code uses mirrored commands and agent definitions under `~/.claude/` plus a Claude Code plugin, `cairn@cairn`. Antigravity uses `.agents/workflows` and global skills mirrors.
+
+The Claude Code plugin is generated in a Cairn-owned local marketplace at `~/.codex/plugins/cache/cairn/claude` and carries the four Cairn skills and the SessionStart, UserPromptSubmit, PostToolUse, Stop, and SubagentStop hooks, which call the installed versioned runtime by absolute path. After the files commit, `cairn install`/`upgrade` registers it through `claude plugin marketplace add` and `claude plugin install cairn@cairn --scope user`, so it appears in the Claude Code terminal, desktop app, and IDE plugin lists from the next session. Registration is skipped with a manual command when the `claude` CLI is missing, and a different marketplace already named `cairn` is never touched. `cairn uninstall` unregisters only Cairn's own marketplace before removing files, and re-registers it if the uninstall rolls back. `cairn doctor` reports `Claude plugin files`, `Claude plugin registered`, and `Claude plugin enabled`.
 
 ## Antigravity Compatibility
 

package/commands/cairn-install.md

@@ -16,6 +16,7 @@ Actions:
 - Add the `hooks/hooks.json` link to the installed manifest.
 - Register only Cairn-owned marketplace, plugin, and hook trust sections in `~/.codex/config.toml`; do not rewrite public feature or agent settings.
 - Install `cairn-*` commands and agents mirror files for Claude Code.
+- Generate the Claude Code plugin `cairn@cairn` (four skills plus hooks that call the installed runtime) in the Cairn-owned local marketplace, then register it with `claude plugin marketplace add` and `claude plugin install cairn@cairn --scope user` after the files commit. Skip with a manual command when the `claude` CLI is missing, and never touch a different marketplace named `cairn`.
 - Install `cairn-*` skills and workflows mirror files for Antigravity IDE/CLI.
 - Write runtime locators so all mirrors resolve scripts, templates, and model guidance from the installed plugin root.
 - Record every current managed destination and digest in the ownership manifest under the custom marketplace, and rollback committed phases in reverse order on failure.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cairn-ai",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "description": "Token-efficient agent harness with tool readiness for Codex, Claude Code, and Antigravity",
   "license": "MIT",
   "author": {

package/scripts/cairn-lifecycle-claude.mjs

@@ -0,0 +1,142 @@
+import { spawnSync } from "node:child_process";
+import { cp, mkdir, readFile, writeFile } from "node:fs/promises";
+import { dirname, join, resolve } from "node:path";
+import { quoteShellArg, renderMirrorFile, writeLocator } from "./cairn-lifecycle-mirror.mjs";
+
+// Claude Code loads a plugin's default hooks/hooks.json and merges any manifest hooks, and it only expands
+// ${CLAUDE_PLUGIN_ROOT}. The shared package hooks use Codex's ${PLUGIN_ROOT}, so Claude gets a separate thin
+// plugin whose hooks call the installed versioned runtime by absolute path. Commands and agents stay in the
+// existing ~/.claude mirrors so they are not listed twice.
+export async function stageClaudePlugin({
+  stageRoot, runtimeStage, destinationRoot, versionedPluginRoot, marketplaceName, pluginName,
+  releaseVersion, skillNames, platform = process.platform,
+}) {
+  const staged = join(stageRoot, "claude-plugin");
+  const pluginDir = join(staged, pluginName);
+  const packageJson = JSON.parse(await readFile(join(runtimeStage, "package.json"), "utf8"));
+  const description = packageJson.description ?? "Cairn agent harness";
+
+  await writeJson(join(staged, ".claude-plugin", "marketplace.json"), {
+    name: marketplaceName,
+    description: "Local Cairn marketplace managed by `cairn install`",
+    owner: { name: packageJson.author?.name ?? "Cairn" },
+    plugins: [{ name: pluginName, source: `./${pluginName}`, description, version: releaseVersion }],
+  });
+  await writeJson(join(pluginDir, ".claude-plugin", "plugin.json"), {
+    name: pluginName,
+    version: releaseVersion,
+    description,
+    author: { name: packageJson.author?.name ?? "Cairn" },
+    ...(packageJson.homepage ? { homepage: packageJson.homepage } : {}),
+    ...(packageJson.license ? { license: packageJson.license } : {}),
+  });
+  await writeJson(join(pluginDir, "hooks", "hooks.json"), await claudeHooks(runtimeStage, versionedPluginRoot, platform));
+
+  for (const name of skillNames) {
+    const skillStage = join(pluginDir, "skills", name);
+    await cp(join(runtimeStage, "skills", name), skillStage, { recursive: true });
+    const locatorPath = join(destinationRoot, pluginName, "skills", name, "references", "cairn-runtime.json");
+    await renderMirrorFile(join(runtimeStage, "skills", name, "SKILL.md"), join(skillStage, "SKILL.md"), {
+      locatorPath, runtimeRoot: versionedPluginRoot, includeLocatorNotice: true,
+    });
+    await writeLocator(join(skillStage, "references", "cairn-runtime.json"), versionedPluginRoot);
+  }
+  return staged;
+}
+
+async function claudeHooks(runtimeStage, versionedPluginRoot, platform) {
+  const source = JSON.parse(await readFile(join(runtimeStage, "hooks", "hooks.json"), "utf8"));
+  const stateScript = quoteShellArg(join(versionedPluginRoot, "scripts", "cairn-state.mjs"), platform);
+  const hooks = {};
+  for (const [eventName, groups] of Object.entries(source.hooks ?? {})) {
+    hooks[eventName] = groups.map((group) => ({
+      ...group,
+      hooks: (group.hooks ?? []).map((handler) => {
+        const event = String(handler.command ?? "").match(/cairn-state\.mjs"?\s+([a-z-]+)\s*$/)?.[1];
+        if (!event) throw new Error(`Unsupported Cairn hook command for Claude Code: ${handler.command}`);
+        return { ...handler, command: `node ${stateScript} ${event}` };
+      }),
+    }));
+  }
+  return { hooks };
+}
+
+async function writeJson(path, value) {
+  await mkdir(dirname(path), { recursive: true });
+  await writeFile(path, `${JSON.stringify(value, null, 2)}\n`);
+}
+
+// Registration goes through the documented `claude plugin` CLI. CLAUDE_CONFIG_DIR is only set when the caller
+// overrode the Claude home, because setting it for the default home would move Claude's global config file.
+export function createClaudeRegistration({ claudeHome, claudeHomeOverridden, marketplaceRoot, marketplaceName, pluginName }) {
+  const cli = process.env.CAIRN_CLAUDE_CLI ?? "claude";
+  const pluginId = `${pluginName}@${marketplaceName}`;
+  const env = claudeHomeOverridden ? { ...process.env, CLAUDE_CONFIG_DIR: claudeHome } : process.env;
+
+  // A .mjs/.js override runs through the current Node binary so tests can supply a portable stand-in CLI.
+  function run(args) {
+    if (/\.m?js$/.test(cli)) return spawnSync(process.execPath, [cli, ...args], { encoding: "utf8", env, timeout: 120_000 });
+    return spawnSync(cli, args, { encoding: "utf8", env, timeout: 120_000, shell: process.platform === "win32" });
+  }
+
+  function available() {
+    if (cli === "none") return false;
+    const result = run(["--version"]);
+    return !result.error && result.status === 0;
+  }
+
+  function json(args) {
+    const result = run([...args, "--json"]);
+    if (result.error || result.status !== 0) {
+      throw new Error(`claude ${args.join(" ")} failed: ${(result.stderr || result.stdout || result.error?.message || "").trim().split("\n").at(-1)}`);
+    }
+    const text = result.stdout.trim();
+    try {
+      return JSON.parse(text);
+    } catch {
+      return JSON.parse(text.split("\n").filter(Boolean).at(-1));
+    }
+  }
+
+  const ownsMarketplace = (entry) => entry?.name === marketplaceName
+    && typeof entry.path === "string" && resolve(entry.path) === resolve(marketplaceRoot);
+  const ownedPlugins = (list) => (Array.isArray(list) ? list : [])
+    .filter((entry) => entry?.id === pluginId && entry.scope === "user");
+
+  function status({ checked = false } = {}) {
+    if (!checked && !available()) return { available: false, marketplace: false, installed: false, enabled: false };
+    const marketplace = json(["plugin", "marketplace", "list"]).find((entry) => entry?.name === marketplaceName) ?? null;
+    const plugin = ownedPlugins(json(["plugin", "list"]))[0] ?? null;
+    return {
+      available: true,
+      marketplace: ownsMarketplace(marketplace),
+      foreignMarketplace: Boolean(marketplace) && !ownsMarketplace(marketplace),
+      installed: Boolean(plugin),
+      enabled: Boolean(plugin?.enabled),
+    };
+  }
+
+  function register() {
+    if (!available()) return { registered: false, reason: "claude CLI not found" };
+    const current = status({ checked: true });
+    if (current.foreignMarketplace) {
+      return { registered: false, reason: `a different Claude Code marketplace named "${marketplaceName}" already exists` };
+    }
+    if (!current.marketplace) json(["plugin", "marketplace", "add", marketplaceRoot, "--scope", "user"]);
+    if (!current.installed) json(["plugin", "install", pluginId, "--scope", "user"]);
+    else if (!current.enabled) json(["plugin", "enable", pluginId, "--scope", "user"]);
+    return { registered: true };
+  }
+
+  function unregister() {
+    if (!available()) return { unregistered: false, reason: "claude CLI not found" };
+    const current = status({ checked: true });
+    // Only remove a registration that points at Cairn's own marketplace directory.
+    if (!current.marketplace) return { unregistered: false, reason: "no Cairn-owned Claude Code marketplace is registered" };
+    if (current.installed) json(["plugin", "uninstall", pluginId, "--scope", "user"]);
+    json(["plugin", "marketplace", "remove", marketplaceName]);
+    return { unregistered: true };
+  }
+
+  return { available, register, status, unregister, pluginId };
+}

package/scripts/cairn-lifecycle-commands.mjs

@@ -5,11 +5,12 @@ import { hasSetting, readSharedConfigSnapshot, removeCairnConfig, splitSections
 import {
   installedSkillLocatorPath, validRuntimeLocator, validateAntigravitySkills,
 } from "./cairn-lifecycle-mirror.mjs";
+import { createClaudeRegistration } from "./cairn-lifecycle-claude.mjs";
 
 export function createCommands(context) {
   const {
-    antigravityCliHome, antigravityHome, claudeRuntimeLocatorPath,
-    codexHome, configPath, installedPluginRoot, installedRuntimeLocatorPath,
+    antigravityCliHome, antigravityHome, claudeHome, claudeHomeOverridden, claudePluginMarketplaceRoot,
+    claudeRuntimeLocatorPath, codexHome, marketplaceName, configPath, installedPluginRoot, installedRuntimeLocatorPath,
     marketplaceJsonPath, ownershipPath, phases, pluginName, pluginRoot,
     pruneUninstallScaffolds, releaseVersion, samePath, skillNames, t, transaction,
     versionedPluginRoot, staging, integrity,
@@ -19,6 +20,9 @@ export function createCommands(context) {
     removeManagedTarget, replaceTarget, rollback,
   } = transaction;
   const { legacyMigrationTargets, stageInstall } = staging;
+  const claudeRegistration = createClaudeRegistration({
+    claudeHome, claudeHomeOverridden, marketplaceRoot: claudePluginMarketplaceRoot, marketplaceName, pluginName,
+  });
   const {
     adoptLegacy, anyManagedArtifactExists, assertOwnershipDigests,
     assertTargetsReplaceable, ownershipDigestsValid, readOwnership, targetDigest,
@@ -80,6 +84,24 @@ async function install(mode) {
     if (transaction.state !== "committed") await rollback(transaction);
     throw error;
   }
+  reportClaudeRegistration();
+}
+
+// Files are committed first; registering with Claude Code is idempotent, and a failure leaves the files
+// installed with a manual command to finish, instead of rolling back a working Codex/Antigravity install.
+function reportClaudeRegistration() {
+  const manual = `claude plugin marketplace add ${JSON.stringify(claudePluginMarketplaceRoot)} && claude plugin install ${claudeRegistration.pluginId} --scope user`;
+  try {
+    const result = claudeRegistration.register();
+    if (result.registered) {
+      console.log(`Claude Code plugin: ${claudeRegistration.pluginId} (${claudePluginMarketplaceRoot})`);
+      return;
+    }
+    console.log(`Claude Code plugin not registered: ${result.reason}. To register: ${manual}`);
+  } catch (error) {
+    console.log(`Claude Code plugin registration failed: ${error.message}. To register: ${manual}`);
+    process.exitCode = 1;
+  }
 }
 
 async function uninstall() {
@@ -92,6 +114,8 @@ async function uninstall() {
     if (record.type !== "config" && current !== record.installedDigest) conflicts.push(record.path);
   }
   if (conflicts.length > 0) throw new Error(`Refusing to uninstall modified managed artifacts: ${conflicts.join(", ")}`);
+  // Unregister before removing files so Claude Code never points at a deleted plugin; a failure aborts with nothing changed.
+  const unregistered = claudeRegistration.unregister().unregistered;
   const transaction = await createTransaction();
   try {
     const configRecord = ownership.targets.find((record) => record.type === "config");
@@ -114,7 +138,13 @@ async function uninstall() {
     await finishTransaction(transaction);
     injectFailure("uninstall-after-commit");
   } catch (error) {
-    if (transaction.state !== "committed") await rollback(transaction);
+    if (transaction.state !== "committed") {
+      await rollback(transaction);
+      // The rollback restored the plugin files, so restore the Claude Code registration that preceded them.
+      if (unregistered) {
+        try { claudeRegistration.register(); } catch (registrationError) { console.error(`Claude Code plugin re-registration failed: ${registrationError.message}`); }
+      }
+    }
     throw error;
   }
   await pruneUninstallScaffolds();
@@ -141,6 +171,14 @@ async function doctor() {
   checks.push(["config marketplace", splitSections(config).some((section) => section.header === "marketplaces.cairn")]);
   checks.push(["config plugin enabled", hasSetting(config, 'plugins."cairn@cairn"', "enabled", "true")]);
   checks.push(["Claude runtime locator", await validRuntimeLocator(claudeRuntimeLocatorPath, versionedPluginRoot)]);
+  const claudePluginManifest = await readJson(join(claudePluginMarketplaceRoot, pluginName, ".claude-plugin", "plugin.json"));
+  checks.push(["Claude plugin files", claudePluginManifest?.version === releaseVersion
+    && await exists(join(claudePluginMarketplaceRoot, ".claude-plugin", "marketplace.json"))
+    && await exists(join(claudePluginMarketplaceRoot, pluginName, "hooks", "hooks.json"))]);
+  let claudeStatus = null;
+  try { claudeStatus = claudeRegistration.status(); } catch { claudeStatus = null; }
+  checks.push(["Claude plugin registered", Boolean(claudeStatus?.marketplace && claudeStatus.installed)]);
+  checks.push(["Claude plugin enabled", Boolean(claudeStatus?.enabled)]);
   checks.push(["Antigravity IDE skills", await exists(join(antigravityHome, "skills", "cairn-plan", "SKILL.md"))]);
   checks.push(["Antigravity CLI flat skills", await exists(join(antigravityCliHome, "skills", "cairn-plan.md"))]);
 

package/scripts/cairn-lifecycle-integrity.mjs

@@ -7,7 +7,7 @@ import { antigravityRuntimeLocatorPath } from "./cairn-lifecycle-mirror.mjs";
 
 export function createIntegrity(context) {
   const {
-    antigravityCliHome, antigravityHome, claudeHome, claudeRuntimeLocatorPath,
+    antigravityCliHome, antigravityHome, claudeHome, claudePluginMarketplaceRoot, claudeRuntimeLocatorPath,
     commandNames, configPath, installedPluginRoot, legacyAntigravityHome,
     marketplaceJsonPath, marketplaceRoot, ownershipPath, phases, pluginName,
     releaseVersion, skillNames,
@@ -97,13 +97,25 @@ function validateOwnershipShape(ownership, { required = false } = {}) {
     paths.add(record.path);
   }
   const requiredTargets = requiredOwnershipTargets(ownership.version);
-  if (ids.size !== requiredTargets.size || [...requiredTargets.keys()].some((id) => !ids.has(id))) {
+  const optionalIds = new Set(requiredTargets.has("claude-plugin") ? [] : ["claude-plugin"]);
+  if ([...ids].some((id) => !requiredTargets.has(id) && !optionalIds.has(id)) || [...requiredTargets.keys()].some((id) => !ids.has(id))) {
     throw new Error("Ownership manifest does not contain the complete managed target set.");
   }
 }
 
+const CLAUDE_PLUGIN_SINCE = "0.2.9";
+
+function compareVersions(left, right) {
+  const parse = (value) => String(value).split("-")[0].split(".").map(Number);
+  const [a, b] = [parse(left), parse(right)];
+  for (let index = 0; index < 3; index += 1) if (a[index] !== b[index]) return a[index] - b[index];
+  return 0;
+}
+
 function requiredOwnershipTargets(version = releaseVersion) {
   const ids = ["codex-source", "codex-runtime", "marketplace", "claude-runtime", "ide-runtime", "cli-runtime", "codex-config"];
+  // Manifests written before the Claude Code plugin existed must stay valid so those installs can upgrade.
+  if (compareVersions(version, CLAUDE_PLUGIN_SINCE) >= 0) ids.push("claude-plugin");
   for (const name of commandNames()) ids.push(`claude-command-${name}`, `ide-workflow-${name}`, `cli-workflow-${name}`);
   for (const name of ["explorer", "worker"]) ids.push(`claude-agent-${name}`);
   for (const name of skillNames()) ids.push(`ide-skill-${name}`, `cli-skill-${name}`);
@@ -116,6 +128,7 @@ function expectedManagedTarget(id, version = releaseVersion) {
     "codex-runtime": { phase: "codex", path: versionedRuntimeRoot(version), type: "tree" },
     marketplace: { phase: "codex", path: marketplaceJsonPath, type: "file" },
     "claude-runtime": { phase: "claude", path: claudeRuntimeLocatorPath, type: "file" },
+    "claude-plugin": { phase: "claude", path: claudePluginMarketplaceRoot, type: "tree" },
     "ide-runtime": { phase: "antigravity", path: antigravityRuntimeLocatorPath(antigravityHome), type: "file" },
     "cli-runtime": { phase: "antigravity", path: antigravityRuntimeLocatorPath(antigravityCliHome), type: "file" },
     "legacy-ide-runtime": { phase: "antigravity", path: antigravityRuntimeLocatorPath(legacyAntigravityHome), type: "file" },

package/scripts/cairn-lifecycle-staging.mjs

@@ -4,11 +4,12 @@ import { readSharedConfigSnapshot, trustedHookStates } from "./cairn-lifecycle-c
 import {
   antigravityRuntimeLocatorPath, antigravitySkillLocatorPath, renderMirrorFile, writeLocator,
 } from "./cairn-lifecycle-mirror.mjs";
+import { stageClaudePlugin } from "./cairn-lifecycle-claude.mjs";
 
 export function createStaging(context) {
   const {
-    agentNames, antigravityCliHome, antigravityHome, claudeHome,
-    claudeRuntimeLocatorPath, commandNames, configPath, installedPluginRoot,
+    agentNames, antigravityCliHome, antigravityHome, claudeHome, claudePluginMarketplaceRoot,
+    claudeRuntimeLocatorPath, commandNames, releaseVersion, configPath, installedPluginRoot,
     legacyAntigravityHome, marketplaceJsonPath, marketplaceName, pluginName,
     pluginRoot, skillNames, updateConfig, versionedPluginRoot, assertRegularTree,
   } = context;
@@ -44,6 +45,12 @@ async function stageInstall(stageRoot) {
     add(`claude-agent-${name}`, "claude", join(claudeHome, "agents", `cairn-${name}.md`), staged, "file");
   }
 
+  const claudePluginStage = await stageClaudePlugin({
+    stageRoot, runtimeStage, destinationRoot: claudePluginMarketplaceRoot, versionedPluginRoot,
+    marketplaceName, pluginName, releaseVersion, skillNames: skillNames(),
+  });
+  add("claude-plugin", "claude", claudePluginMarketplaceRoot, claudePluginStage);
+
   await stageAntigravity(targets, stageRoot, runtimeStage, antigravityHome, "ide", false);
   await stageAntigravity(targets, stageRoot, runtimeStage, antigravityCliHome, "cli", true);
 

package/scripts/cairn-lifecycle.mjs

@@ -30,6 +30,7 @@ export {
 const pluginRoot = resolvePluginRoot(import.meta.url);
 const homeRoot = process.env.HOME ?? process.env.USERPROFILE ?? homedir() ?? ".";
 const codexHome = resolve(process.env.CODEX_HOME ?? join(homeRoot, ".codex"));
+const claudeHomeOverridden = typeof process.env.CLAUDE_HOME === "string" && process.env.CLAUDE_HOME.length > 0;
 const claudeHome = resolve(process.env.CLAUDE_HOME ?? join(homeRoot, ".claude"));
 const antigravityHome = resolve(process.env.ANTIGRAVITY_HOME ?? join(homeRoot, ".gemini", "config"));
 const legacyAntigravityHome = resolve(process.env.CAIRN_LEGACY_ANTIGRAVITY_HOME ?? join(homeRoot, ".agents"));
@@ -45,6 +46,7 @@ const transactionPath = join(marketplaceRoot, ".cairn", "transaction.json");
 const transactionRoot = join(marketplaceRoot, ".cairn", "transactions");
 const lifecycleLockPath = join(marketplaceRoot, ".cairn", "lifecycle.lock");
 const claudeRuntimeLocatorPath = join(claudeHome, "cairn", "runtime.json");
+const claudePluginMarketplaceRoot = join(marketplaceRoot, "claude");
 const sourceManifest = JSON.parse(await readFile(join(pluginRoot, ".codex-plugin", "plugin.json"), "utf8"));
 const releaseVersion = sourceManifest.version;
 const versionedPluginRoot = join(marketplaceRoot, pluginName, releaseVersion);
@@ -53,7 +55,8 @@ const phases = ["codex", "claude", "antigravity", "config", "cleanup"];
 const MAX_LIFECYCLE_LOCK_TIMEOUT_MS = 2_147_483_647;
 
 const lifecycleContext = {
-  agentNames, antigravityCliHome, antigravityHome, claudeHome, claudeRuntimeLocatorPath,
+  agentNames, antigravityCliHome, antigravityHome, claudeHome, claudeHomeOverridden,
+  claudePluginMarketplaceRoot, claudeRuntimeLocatorPath,
   codexHome, commandNames, configPath, installedPluginRoot, installedRuntimeLocatorPath,
   legacyAntigravityHome, lifecycleLockPath, marketplaceJsonPath, marketplaceName,
   marketplaceRoot, ownershipPath, phases, pluginName, pluginRoot, releaseVersion,
@@ -105,7 +108,7 @@ function lifecycleLockTimeout() {
 async function assertLifecycleMutationPaths() {
   const roots = [
     [codexHome, lifecycleLockPath], [codexHome, installedPluginRoot], [codexHome, versionedPluginRoot],
-    [codexHome, marketplaceJsonPath], [isInside(codexHome, configPath) ? codexHome : dirname(configPath), configPath],
+    [codexHome, marketplaceJsonPath], [codexHome, claudePluginMarketplaceRoot], [isInside(codexHome, configPath) ? codexHome : dirname(configPath), configPath],
     [claudeHome, join(claudeHome, "commands")], [claudeHome, join(claudeHome, "agents")],
     [claudeHome, claudeRuntimeLocatorPath], [antigravityHome, join(antigravityHome, "skills")],
     ...skillNames().map((name) => [antigravityHome, join(antigravityHome, "skills", name)]),