@laitszkin/apollo-toolkit 2.12.6 → 2.12.7

package/CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to this repository are documented in this file.
 
 ## [Unreleased]
 
+## [v2.12.7] - 2026-04-02
+
+### Added
+- Add `claude-code` install mode for copying skills into `~/.claude/skills`, with `CLAUDE_CODE_SKILLS_DIR` environment override support.
+
+### Changed
+- Move `codex-memory-manager` and `learn-skill-from-conversations` into `codex/` subdirectory to clarify agent-specific skill boundaries.
+- Update codex install mode to include skills from both root directory and the `codex/` subdirectory.
+
 ## [v2.12.6] - 2026-04-02
 
 ### Added

package/lib/installer.js

@@ -3,7 +3,7 @@ const fsp = require('node:fs/promises');
 const os = require('node:os');
 const path = require('node:path');
 
-const VALID_MODES = ['codex', 'openclaw', 'trae'];
+const VALID_MODES = ['codex', 'openclaw', 'trae', 'claude-code'];
 const COPY_FILES = new Set(['AGENTS.md', 'CHANGELOG.md', 'LICENSE', 'README.md', 'package.json']);
 const COPY_DIRS = new Set(['scripts']);
 
@@ -61,7 +61,7 @@ function normalizeModes(inputModes) {
   return modes;
 }
 
-async function listSkillNames(rootDir) {
+async function listSkillNames(rootDir, modes = []) {
   const entries = await fsp.readdir(rootDir, { withFileTypes: true });
   const skillNames = [];
 
@@ -75,6 +75,19 @@ async function listSkillNames(rootDir) {
     }
   }
 
+  // For codex mode, also include codex-specific skills
+  if (modes.includes('codex')) {
+    const codexDir = path.join(rootDir, 'codex');
+    if (fs.existsSync(codexDir)) {
+      const codexEntries = await fsp.readdir(codexDir, { withFileTypes: true });
+      for (const entry of codexEntries) {
+        if (entry.isDirectory() && fs.existsSync(path.join(codexDir, entry.name, 'SKILL.md'))) {
+          skillNames.push(entry.name);
+        }
+      }
+    }
+  }
+
   return skillNames.sort();
 }
 
@@ -125,10 +138,10 @@ async function stageToolkitContents({ sourceRoot, destinationRoot, version }) {
   return copiedEntries.sort();
 }
 
-async function syncToolkitHome({ sourceRoot, toolkitHome, version }) {
+async function syncToolkitHome({ sourceRoot, toolkitHome, version, modes = [] }) {
   const parentDir = path.dirname(toolkitHome);
   const tempDir = path.join(parentDir, `.apollo-toolkit.tmp-${process.pid}-${Date.now()}`);
-  const previousSkillNames = await listSkillNames(toolkitHome).catch(() => []);
+  const previousSkillNames = await listSkillNames(toolkitHome, modes).catch(() => []);
 
   await fsp.rm(tempDir, { recursive: true, force: true });
   await stageToolkitContents({ sourceRoot, destinationRoot: tempDir, version });
@@ -145,7 +158,7 @@ async function syncToolkitHome({ sourceRoot, toolkitHome, version }) {
   return {
     toolkitHome,
     previousSkillNames,
-    skillNames: await listSkillNames(toolkitHome),
+    skillNames: await listSkillNames(toolkitHome, modes),
   };
 }
 
@@ -197,6 +210,18 @@ async function getTargetRoots(modes, env = process.env) {
           root: path.join(openclawHome, workspaceName, 'skills'),
         });
       }
+      continue;
+    }
+
+    if (mode === 'claude-code') {
+      targets.push({
+        mode,
+        label: 'Claude Code',
+        root: env.CLAUDE_CODE_SKILLS_DIR
+          ? path.resolve(expandUserPath(env.CLAUDE_CODE_SKILLS_DIR, env))
+          : path.join(homeDir, '.claude', 'skills'),
+      });
+      continue;
     }
   }
 
@@ -214,8 +239,9 @@ async function replaceWithCopy(sourcePath, targetPath) {
 }
 
 async function installLinks({ toolkitHome, modes, env = process.env, previousSkillNames = [] }) {
-  const skillNames = await listSkillNames(toolkitHome);
-  const targets = await getTargetRoots(modes, env);
+  const normalizedModes = normalizeModes(modes);
+  const skillNames = await listSkillNames(toolkitHome, normalizedModes);
+  const targets = await getTargetRoots(normalizedModes, env);
   const copiedPaths = [];
   const staleSkillNames = previousSkillNames.filter((skillName) => !skillNames.includes(skillName));
 
@@ -225,7 +251,13 @@ async function installLinks({ toolkitHome, modes, env = process.env, previousSki
       await fsp.rm(path.join(target.root, staleSkillName), { recursive: true, force: true });
     }
     for (const skillName of skillNames) {
-      const sourcePath = path.join(toolkitHome, skillName);
+      // For codex skills, use the ./codex/ subdirectory as source
+      let sourcePath;
+      if (normalizedModes.includes('codex') && fs.existsSync(path.join(toolkitHome, 'codex', skillName))) {
+        sourcePath = path.join(toolkitHome, 'codex', skillName);
+      } else {
+        sourcePath = path.join(toolkitHome, skillName);
+      }
       const targetPath = path.join(target.root, skillName);
       await replaceWithCopy(sourcePath, targetPath);
       copiedPaths.push({ target: target.label, path: targetPath, skillName });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@laitszkin/apollo-toolkit",
-  "version": "2.12.6",
+  "version": "2.12.7",
   "description": "Apollo Toolkit npm installer for managed skill copying across Codex, OpenClaw, and Trae.",
   "license": "MIT",
   "author": "LaiTszKin",

package/scripts/install_skills.ps1

@@ -9,22 +9,24 @@ $ErrorActionPreference = "Stop"
 function Show-Usage {
   @"
 Usage:
-  ./scripts/install_skills.ps1 [codex|openclaw|trae|agents|all]...
+  ./scripts/install_skills.ps1 [codex|openclaw|trae|agents|claude-code|all]...
 
 Modes:
-  codex     Copy skills into ~/.codex/skills
-  openclaw  Copy skills into ~/.openclaw/workspace*/skills
-  trae      Copy skills into ~/.trae/skills
-  agents    Copy skills into ~/.agents/skills (for agent-skill-compatible software)
-  all       Install all supported targets
+  codex       Copy skills into ~/.codex/skills (includes ./codex/ agent-specific skills)
+  openclaw    Copy skills into ~/.openclaw/workspace*/skills
+  trae        Copy skills into ~/.trae/skills
+  agents      Copy skills into ~/.agents/skills (for agent-skill-compatible software)
+  claude-code Copy skills into ~/.claude/skills
+  all         Install all supported targets
 
 Optional environment overrides:
-  CODEX_SKILLS_DIR   Override codex skills destination path
-  OPENCLAW_HOME      Override openclaw home path
-  TRAE_SKILLS_DIR    Override trae skills destination path
-  AGENTS_SKILLS_DIR  Override agents skills destination path
-  APOLLO_TOOLKIT_HOME Override local install path used when repo root is unavailable
-  APOLLO_TOOLKIT_REPO_URL Override git repository URL used when repo root is unavailable
+  CODEX_SKILLS_DIR         Override codex skills destination path
+  OPENCLAW_HOME            Override openclaw home path
+  TRAE_SKILLS_DIR          Override trae skills destination path
+  AGENTS_SKILLS_DIR        Override agents skills destination path
+  CLAUDE_CODE_SKILLS_DIR   Override claude-code skills destination path
+  APOLLO_TOOLKIT_HOME       Override local install path used when repo root is unavailable
+  APOLLO_TOOLKIT_REPO_URL   Override git repository URL used when repo root is unavailable
 "@
 }
 
@@ -109,6 +111,8 @@ else {
 }
 
 function Get-SkillPaths {
+  param([string[]]$SelectedModes)
+
   $dirs = Get-ChildItem -Path $RepoRoot -Directory | Sort-Object Name
   $skills = @()
 
@@ -118,6 +122,19 @@ function Get-SkillPaths {
     }
   }
 
+  # For codex mode, also include codex-specific skills
+  if ($SelectedModes -contains "codex") {
+    $codexDir = Join-Path $RepoRoot "codex"
+    if (Test-Path -LiteralPath $codexDir -PathType Container) {
+      $codexDirs = Get-ChildItem -Path $codexDir -Directory | Sort-Object Name
+      foreach ($dir in $codexDirs) {
+        if (Test-Path -LiteralPath (Join-Path $dir.FullName "SKILL.md") -PathType Leaf) {
+          $skills += $dir.FullName
+        }
+      }
+    }
+  }
+
   if ($skills.Count -eq 0) {
     throw "No skill folders found in: $RepoRoot"
   }
@@ -145,12 +162,13 @@ function Resolve-Modes {
     Show-Banner
     Write-Host ""
     Write-Host "Select install options (comma-separated):"
-    Write-Host "1) codex (~/.codex/skills)"
+    Write-Host "1) codex (~/.codex/skills, includes ./codex/ agent-specific skills)"
     Write-Host "2) openclaw (~/.openclaw/workspace*/skills)"
     Write-Host "3) trae (~/.trae/skills)"
     Write-Host "4) agents (~/.agents/skills)"
-    Write-Host "5) all"
-    $inputValue = Read-Host "Enter choice(s) [1-5]"
+    Write-Host "5) claude-code (~/.claude/skills)"
+    Write-Host "6) all"
+    $inputValue = Read-Host "Enter choice(s) [1-6]"
 
     foreach ($rawChoice in ($inputValue -split ",")) {
       $choice = $rawChoice.Trim()
@@ -159,11 +177,13 @@ function Resolve-Modes {
         "2" { Add-ModeOnce -Selected $selected -Mode "openclaw" }
         "3" { Add-ModeOnce -Selected $selected -Mode "trae" }
         "4" { Add-ModeOnce -Selected $selected -Mode "agents" }
-        "5" {
+        "5" { Add-ModeOnce -Selected $selected -Mode "claude-code" }
+        "6" {
           Add-ModeOnce -Selected $selected -Mode "codex"
           Add-ModeOnce -Selected $selected -Mode "openclaw"
           Add-ModeOnce -Selected $selected -Mode "trae"
           Add-ModeOnce -Selected $selected -Mode "agents"
+          Add-ModeOnce -Selected $selected -Mode "claude-code"
         }
         default {
           throw "Invalid choice: $choice"
@@ -178,11 +198,13 @@ function Resolve-Modes {
         "openclaw" { Add-ModeOnce -Selected $selected -Mode "openclaw" }
         "trae" { Add-ModeOnce -Selected $selected -Mode "trae" }
         "agents" { Add-ModeOnce -Selected $selected -Mode "agents" }
+        "claude-code" { Add-ModeOnce -Selected $selected -Mode "claude-code" }
         "all" {
           Add-ModeOnce -Selected $selected -Mode "codex"
           Add-ModeOnce -Selected $selected -Mode "openclaw"
           Add-ModeOnce -Selected $selected -Mode "trae"
           Add-ModeOnce -Selected $selected -Mode "agents"
+          Add-ModeOnce -Selected $selected -Mode "claude-code"
         }
         default {
           Show-Usage
@@ -299,13 +321,29 @@ function Install-Agents {
   }
 }
 
+function Install-ClaudeCode {
+  param([string[]]$SkillPaths)
+
+  $target = if ($env:CLAUDE_CODE_SKILLS_DIR) {
+    Expand-UserPath $env:CLAUDE_CODE_SKILLS_DIR
+  }
+  else {
+    Join-Path $HOME ".claude/skills"
+  }
+
+  Write-Host "Installing to claude-code: $target"
+  foreach ($src in $SkillPaths) {
+    Copy-Skill -Source $src -TargetRoot $target
+  }
+}
+
 if ($Modes.Count -gt 0 -and ($Modes[0] -eq "-h" -or $Modes[0] -eq "--help")) {
   Show-Usage
   exit 0
 }
 
 $selectedModes = Resolve-Modes -Requested $Modes
-$skillPaths = Get-SkillPaths
+$skillPaths = Get-SkillPaths -SelectedModes $selectedModes
 
 foreach ($mode in $selectedModes) {
   switch ($mode) {
@@ -313,6 +351,7 @@ foreach ($mode in $selectedModes) {
     "openclaw" { Install-OpenClaw -SkillPaths $skillPaths }
     "trae" { Install-Trae -SkillPaths $skillPaths }
     "agents" { Install-Agents -SkillPaths $skillPaths }
+    "claude-code" { Install-ClaudeCode -SkillPaths $skillPaths }
     default { throw "Unknown mode: $mode" }
   }
 }

package/scripts/install_skills.sh

@@ -4,21 +4,23 @@ set -euo pipefail
 usage() {
   cat <<"USAGE"
 Usage:
-  ./scripts/install_skills.sh [codex|openclaw|trae|agents|all]...
+  ./scripts/install_skills.sh [codex|openclaw|trae|agents|claude-code|all]...
 
 Modes:
-  codex     Copy skills into ~/.codex/skills
-  openclaw  Copy skills into ~/.openclaw/workspace*/skills
-  trae      Copy skills into ~/.trae/skills
-  agents    Copy skills into ~/.agents/skills (for agent-skill-compatible software)
-  all       Install all supported targets
+  codex       Copy skills into ~/.codex/skills (includes ./codex/ agent-specific skills)
+  openclaw    Copy skills into ~/.openclaw/workspace*/skills
+  trae        Copy skills into ~/.trae/skills
+  agents      Copy skills into ~/.agents/skills (for agent-skill-compatible software)
+  claude-code Copy skills into ~/.claude/skills
+  all         Install all supported targets
 
 Optional environment overrides:
-  CODEX_SKILLS_DIR   Override codex skills destination path
-  OPENCLAW_HOME      Override openclaw home path
-  TRAE_SKILLS_DIR    Override trae skills destination path
-  AGENTS_SKILLS_DIR  Override agents skills destination path
-  APOLLO_TOOLKIT_HOME Override local install path used in curl/pipe mode
+  CODEX_SKILLS_DIR    Override codex skills destination path
+  OPENCLAW_HOME       Override openclaw home path
+  TRAE_SKILLS_DIR     Override trae skills destination path
+  AGENTS_SKILLS_DIR   Override agents skills destination path
+  CLAUDE_CODE_SKILLS_DIR Override claude-code skills destination path
+  APOLLO_TOOLKIT_HOME  Override local install path used in curl/pipe mode
   APOLLO_TOOLKIT_REPO_URL Override git repository URL used in curl/pipe mode
 USAGE
 }
@@ -87,6 +89,18 @@ collect_skills() {
     fi
   done < <(find "$REPO_ROOT" -mindepth 1 -maxdepth 1 -type d | sort)
 
+  # For codex mode, also include codex-specific skills
+  if [[ " ${SELECTED_MODES[*]} " =~ " codex " ]]; then
+    local codex_dir="$REPO_ROOT/codex"
+    if [[ -d "$codex_dir" ]]; then
+      while IFS= read -r dir; do
+        if [[ -f "$dir/SKILL.md" ]]; then
+          SKILL_PATHS+=("$dir")
+        fi
+      done < <(find "$codex_dir" -mindepth 1 -maxdepth 1 -type d | sort)
+    fi
+  fi
+
   if [[ ${#SKILL_PATHS[@]} -eq 0 ]]; then
     echo "No skill folders found in: $REPO_ROOT" >&2
     exit 1
@@ -164,6 +178,16 @@ install_agents() {
   done
 }
 
+install_claude_code() {
+  local claude_code_skills_dir
+  claude_code_skills_dir="$(expand_user_path "${CLAUDE_CODE_SKILLS_DIR:-$HOME/.claude/skills}")"
+
+  echo "Installing to claude-code: $claude_code_skills_dir"
+  for src in "${SKILL_PATHS[@]}"; do
+    replace_with_copy "$src" "$claude_code_skills_dir"
+  done
+}
+
 add_mode_once() {
   local mode="$1"
   local existing
@@ -182,7 +206,7 @@ parse_mode() {
   local mode="$1"
 
   case "$mode" in
-    codex|openclaw|trae|agents)
+    codex|openclaw|trae|agents|claude-code)
       add_mode_once "$mode"
       ;;
     all)
@@ -190,6 +214,7 @@ parse_mode() {
       add_mode_once "openclaw"
       add_mode_once "trae"
       add_mode_once "agents"
+      add_mode_once "claude-code"
       ;;
     *)
       echo "Invalid mode: $mode" >&2
@@ -222,12 +247,13 @@ choose_modes_interactive() {
   show_banner
   echo
   echo "Select install options (comma-separated):"
-  echo "1) codex (~/.codex/skills)"
+  echo "1) codex (~/.codex/skills, includes ./codex/ agent-specific skills)"
   echo "2) openclaw (~/.openclaw/workspace*/skills)"
   echo "3) trae (~/.trae/skills)"
   echo "4) agents (~/.agents/skills)"
-  echo "5) all"
-  choice="$(read_choice_from_user 'Enter choice(s) [1-5]: ')"
+  echo "5) claude-code (~/.claude/skills)"
+  echo "6) all"
+  choice="$(read_choice_from_user 'Enter choice(s) [1-6]: ')"
 
   IFS=',' read -r -a choices <<< "$choice"
   for raw_choice in "${choices[@]}"; do
@@ -237,7 +263,8 @@ choose_modes_interactive() {
       2) add_mode_once "openclaw" ;;
       3) add_mode_once "trae" ;;
       4) add_mode_once "agents" ;;
-      5) add_mode_once "codex"; add_mode_once "openclaw"; add_mode_once "trae"; add_mode_once "agents" ;;
+      5) add_mode_once "claude-code" ;;
+      6) add_mode_once "codex"; add_mode_once "openclaw"; add_mode_once "trae"; add_mode_once "agents"; add_mode_once "claude-code" ;;
       *)
         echo "Invalid choice: $raw_choice" >&2
         exit 1
@@ -282,6 +309,7 @@ main() {
       openclaw) install_openclaw ;;
       trae) install_trae ;;
       agents) install_agents ;;
+      claude-code) install_claude_code ;;
       *)
         usage
         exit 1