Merge pull request #5 from 23blocks-OS/refactor/module-split

refactor: split aimaestro-agent.sh into modular architecture

Author: jpelaez-23blocks

CHANGELOG.md

@@ -0,0 +1,33 @@
+# Changelog
+
+All notable changes to AI Maestro Plugins are documented in this file.
+Format follows [Keep a Changelog](https://keepachangelog.com/).
+
+## [1.0.1] - 2026-02-20
+
+### Changed
+- **Modular CLI architecture** -- Split `aimaestro-agent.sh` (3,879 lines) into 6 focused modules:
+  - `agent-core.sh` -- Shared infrastructure: security scanning, validation, JSON editing, Claude CLI helpers
+  - `agent-commands.sh` -- CRUD: list, show, create, delete, update, rename, export, import
+  - `agent-session.sh` -- Session lifecycle: add, remove, exec, hibernate, wake, restart
+  - `agent-skill.sh` -- Skill management: list, add, remove, install, uninstall
+  - `agent-plugin.sh` -- Plugin management (10 subcommands) + marketplace (4 subcommands)
+  - `aimaestro-agent.sh` -- Thin 108-line dispatcher that sources all modules
+- Each module has a double-source guard and uses the fallback path pattern (`SCRIPT_DIR` then `~/.local/bin/`)
+- No functional changes -- all commands work identically
+
+## [1.0.0] - 2026-02-09
+
+### Added
+- Initial plugin release with 6 skills and CLI scripts
+- Agent lifecycle management (create, delete, hibernate, wake, rename, export, import)
+- Plugin and marketplace management (install, uninstall, update, enable, disable)
+- Skill management (list, add, remove, install, uninstall)
+- AMP messaging integration
+- Code graph querying
+- Memory search
+- Documentation search
+- Planning skill with persistent task tracking
+- ToxicSkills security scanner for skill installation
+- Auto-trust mechanism for agent creation
+- `AIM_AGENT_*` environment variables (replacing `CLAUDE_AGENT_*` with backward compat)

plugins/ai-maestro/README.md

@@ -2,8 +2,8 @@
 
 Built from plugin.manifest.json with 2 sources.
 
-**Skills:** 6 | **Scripts:** 39
+**Skills:** 6 | **Scripts:** 44
 
-Built at: 2026-02-20T16:20:40Z
+Built at: 2026-02-20T18:24:27Z
 
 See the [main repo](https://github.com/23blocks-OS/ai-maestro-plugins) for source files and build instructions.

plugins/ai-maestro/skills/ai-maestro-agents-management/SKILL.md

@@ -919,11 +919,19 @@ aimaestro-agent.sh skill uninstall backend-api debug-skill --scope local
 
 ---
 
-## Helper Scripts
+## Script Architecture
 
-This skill relies on an internal helper script that provides shared utility functions:
+The CLI is split into focused modules, all sourced by the main dispatcher:
 
-- **`agent-helper.sh`** - Sourced by `aimaestro-agent.sh`. Provides agent-specific utilities including API base URL resolution, agent name/ID lookups, tmux session management, and dependency checks (bash 4.0+, curl, jq). Located alongside the CLI script in `~/.local/bin/` (installed) or `plugin/src/scripts/` (source). If the CLI script fails with dependency or API errors, check that `agent-helper.sh` is present in the same directory.
+- **`aimaestro-agent.sh`** - Thin dispatcher (~108 lines). Sources all modules below, sets up cleanup trap, and routes commands.
+- **`agent-helper.sh`** - Shared utilities: colors, `print_*`, `resolve_agent`, `get_api_base`, API URL resolution, agent name/ID lookups.
+- **`agent-core.sh`** - Shared infrastructure: security scanning (ToxicSkills), validation, Claude CLI helpers, `safe_json_edit`, temp file management.
+- **`agent-commands.sh`** - CRUD commands: `list`, `show`, `create`, `delete`, `update`, `rename`, `export`, `import`.
+- **`agent-session.sh`** - Session lifecycle: `session add/remove/exec`, `hibernate`, `wake`, `restart`.
+- **`agent-skill.sh`** - Skill management: `skill list/add/remove/install/uninstall`.
+- **`agent-plugin.sh`** - Plugin management (10 subcommands) + marketplace (4 subcommands).
+
+All modules are located alongside the CLI script in `~/.local/bin/` (installed) or `plugin/src/scripts/` (source). Each module has a double-source guard to prevent re-sourcing. If the CLI fails with sourcing errors, verify all `agent-*.sh` files are present in the same directory.
 
 ---