diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 41a45df..0f73a1c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,6 +21,6 @@ jobs: - name: Codex and Cursor copies are current run: python3 scripts/build_agents.py --check - name: Project install - run: python3 skills/agent-setup/scripts/test_install.py + run: python3 skills/setup-agents/scripts/test_install.py - name: Catalog and interactive install - run: python3 skills/agent-setup/scripts/test_catalog.py + run: python3 skills/setup-agents/scripts/test_catalog.py diff --git a/AGENTS.md b/AGENTS.md index 9c32e90..63d3316 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -2,18 +2,18 @@ Public agent catalog and per-project agents for Claude Code, Codex, and Cursor. Keep credentials, machine-specific settings and runtime state out of this repository. -The project agents' source is `factory/claude/`; `scripts/build_agents.py` writes the Codex and Cursor copies beside it (the janitor agents are Claude-only and have none), and the per-host Codex models live in that script. `skills/agent-setup/scripts/install.py` copies `factory/` into one project, and installs the engineering catalog in `factory/catalog/` (one source file per agent, rendered per host by `catalog.py`) into a project or the user-wide folders. The orchestrator is the `orchestrate` skill, not an agent. Keep the `` / `# killall-agents` ownership markers stable. +The project agents' source is `factory/claude/`; `scripts/build_agents.py` writes the Codex and Cursor copies beside it (the janitor agents are Claude-only and have none), and the per-host Codex models live in that script. `skills/setup-agents/scripts/install.py` copies `factory/` into one project, and installs the engineering catalog in `factory/catalog/` (one source file per agent, rendered per host by `catalog.py`) into a project or the user-wide folders. The orchestrator is the `orchestrate` skill, not an agent. Keep the `` / `# killall-agents` ownership markers stable. Run from the repository root: ```sh python3 scripts/build_agents.py --check -python3 skills/agent-setup/scripts/test_install.py -python3 skills/agent-setup/scripts/test_catalog.py +python3 skills/setup-agents/scripts/test_install.py +python3 skills/setup-agents/scripts/test_catalog.py python3 skills/wrap-up/scripts/test_wrap_up.py git diff --check ``` -`skills/follow-the-rules/` is an independent copy from [killall-skills](https://github.com/killallgit/killall-skills/tree/a016d77ff5f86821f0292a5a00dbf4600b0d8a15/skills/follow-the-rules); preserve its relative reference links. Keep agents out of a root `agents/` folder, which Claude Code loads on plugin install; they belong in `factory/` so only `agent-setup` installs them. +`skills/follow-the-rules/` is an independent copy from [killall-skills](https://github.com/killallgit/killall-skills/tree/a016d77ff5f86821f0292a5a00dbf4600b0d8a15/skills/follow-the-rules); preserve its relative reference links. Keep agents out of a root `agents/` folder, which Claude Code loads on plugin install; they belong in `factory/` so only `setup-agents` installs them. Pending grunt and setup TUI work is tracked in `tasks/todo.md`. diff --git a/README.md b/README.md index 838b9e0..04001ba 100644 --- a/README.md +++ b/README.md @@ -26,19 +26,19 @@ Skills CLI (setup and rules only): npx skills add killallgit/killall-agents ``` -Includes `agent-setup`, `orchestrate`, `wrap-up`, `follow-the-rules`. +Includes `setup-agents`, `orchestrate`, `wrap-up`, `follow-the-rules`. ## Install agents Run installer in terminal, answer questions: ```sh -python3 skills/agent-setup/scripts/install.py +python3 skills/setup-agents/scripts/install.py ``` Asks where agents go (user-wide or current project), which tools (Claude Code, Codex, Cursor), which agents from multi-select, then model for each catalog tier. Confirms before writing anything. Type `q` to quit. Rerun starts from what is already installed; prompts make folders match selection: remove copies it wrote that you deselected, keep every other file. -In session, `/killall-agents:agent-setup` in Claude Code or `$agent-setup` in Codex runs same script with flags: `--scope user|project`, `--hosts claude,codex`, `--agents lanes,catalog,`, `--model codex:opus=`, `--remove`, and `--force` to replace same-named agent it did not write. Flags add to what is installed; `--prune` also removes copies you did not select. No `--scope`: flags install into current project, prompts suggest user-wide. +In session, `/killall-agents:setup-agents` in Claude Code or `$setup-agents` in Codex runs same script with flags: `--scope user|project`, `--hosts claude,codex`, `--agents lanes,catalog,`, `--model codex:opus=`, `--remove`, and `--force` to replace same-named agent it did not write. Flags add to what is installed; `--prune` also removes copies you did not select. No `--scope`: flags install into current project, prompts suggest user-wide. Project install copies agents into project's `.claude/agents/`, `.codex/agents/` and `.cursor/agents/`, keeps them out of Git through `.git/info/exclude`, lists them in `.worktreeinclude` so Claude Code worktrees get them too. User-wide install writes to `~/.claude/agents`, `~/.codex/agents` and `~/.cursor/agents` (or `CLAUDE_CONFIG_DIR` and `CODEX_HOME`). Lane agents below install per project only. @@ -88,8 +88,8 @@ Grunt needs `pi` on `PATH` with ready provider. Builders and hall-monitor need i ```sh python3 scripts/build_agents.py # write factory/codex and factory/cursor python3 scripts/build_agents.py --check # CI: copies are current and valid -python3 skills/agent-setup/scripts/test_install.py -python3 skills/agent-setup/scripts/test_catalog.py +python3 skills/setup-agents/scripts/test_install.py +python3 skills/setup-agents/scripts/test_catalog.py ``` See [pending work](tasks/todo.md) and [factory research](docs/research/agent-factory-patterns.md) for design background. \ No newline at end of file diff --git a/scripts/build_agents.py b/scripts/build_agents.py index 8d6e242..ca093a1 100644 --- a/scripts/build_agents.py +++ b/scripts/build_agents.py @@ -9,7 +9,7 @@ ROOT = Path(__file__).resolve().parent.parent FACTORY = ROOT / "factory" # Codex model, Codex reasoning effort, Cursor readonly; Cursor agents inherit the session model. -# The model ids repeat the tiers in skills/agent-setup/scripts/catalog.py; test_catalog.py checks that they agree. +# The model ids repeat the tiers in skills/setup-agents/scripts/catalog.py; test_catalog.py checks that they agree. HOSTS = { "planner": ("gpt-6-astra", "high", True), "grunt": ("gpt-6-luna", "low", False), diff --git a/skills/agent-setup/SKILL.md b/skills/setup-agents/SKILL.md similarity index 98% rename from skills/agent-setup/SKILL.md rename to skills/setup-agents/SKILL.md index 39f392c..479df3a 100644 --- a/skills/agent-setup/SKILL.md +++ b/skills/setup-agents/SKILL.md @@ -1,11 +1,11 @@ --- -name: agent-setup +name: setup-agents description: Install, refresh, or remove the packaged agents for Claude Code, Codex, and Cursor. The planner, grunt, builder, reviewer, hall-monitor, git-janitor, and comment-janitor lane agents go in one project; the engineering catalog of specialist agents goes in one project or user-wide. disable-model-invocation: true argument-hint: "[remove] [path]" --- -# Agent setup +# Set up agents Copy the packaged agents into a project, or the catalog into the user-wide folders. A person at a terminal can run `python3 scripts/install.py` from this skill's directory with no flags and answer its questions: where, which tools, a multi-select of agents, and the catalog models. The steps below drive the same script with flags, because a session cannot answer those prompts. diff --git a/skills/agent-setup/agents/openai.yaml b/skills/setup-agents/agents/openai.yaml similarity index 85% rename from skills/agent-setup/agents/openai.yaml rename to skills/setup-agents/agents/openai.yaml index 0bf532c..53829fd 100644 --- a/skills/agent-setup/agents/openai.yaml +++ b/skills/setup-agents/agents/openai.yaml @@ -1,5 +1,5 @@ interface: - display_name: "Agent setup" + display_name: "Set up agents" short_description: "Install or remove the packaged lane agents in a project and the engineering agent catalog in a project or user-wide." policy: allow_implicit_invocation: false diff --git a/skills/agent-setup/scripts/catalog.py b/skills/setup-agents/scripts/catalog.py similarity index 100% rename from skills/agent-setup/scripts/catalog.py rename to skills/setup-agents/scripts/catalog.py diff --git a/skills/agent-setup/scripts/install.py b/skills/setup-agents/scripts/install.py similarity index 100% rename from skills/agent-setup/scripts/install.py rename to skills/setup-agents/scripts/install.py diff --git a/skills/agent-setup/scripts/picker.py b/skills/setup-agents/scripts/picker.py similarity index 100% rename from skills/agent-setup/scripts/picker.py rename to skills/setup-agents/scripts/picker.py diff --git a/skills/agent-setup/scripts/test_catalog.py b/skills/setup-agents/scripts/test_catalog.py similarity index 100% rename from skills/agent-setup/scripts/test_catalog.py rename to skills/setup-agents/scripts/test_catalog.py diff --git a/skills/agent-setup/scripts/test_install.py b/skills/setup-agents/scripts/test_install.py similarity index 100% rename from skills/agent-setup/scripts/test_install.py rename to skills/setup-agents/scripts/test_install.py