fips-agents-cli 0.6.2__tar.gz → 0.8.2__tar.gz

fips_agents_cli-0.8.2/.github/CODEOWNERS

@@ -0,0 +1,2 @@
+# Code Owners - all PRs require approval from @rdwj
+*       @rdwj

{fips_agents_cli-0.6.2 → fips_agents_cli-0.8.2}/.gitignore

@@ -25,6 +25,7 @@ MANIFEST
 
 # Virtual environments
 venv/
+.venv/
 env/
 ENV/
 env.bak/
@@ -88,3 +89,6 @@ tokens.txt
 
 # Project specific
 setup_structure.sh
+
+# Session handoff notes (local-only — content lives in MEMORY.md)
+NEXT_SESSION.md

{fips_agents_cli-0.6.2 → fips_agents_cli-0.8.2}/CLAUDE.md

@@ -6,7 +6,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 
 **fips-agents-cli** is a Python-based CLI tool for scaffolding FIPS-compliant AI agent projects. It scaffolds MCP (Model Context Protocol) servers and AI agent projects from production-ready templates, customizes them for new projects, and prepares them for immediate development use.
 
-**Current Status:** `create mcp-server` and `create agent` commands implemented.
+**Current Status:** Scaffolding commands implemented: `create mcp-server`, `create agent`, `create gateway`, `create ui`, `create sandbox`, `create model-car`. Post-scaffolding commands: `generate` (tool, resource, prompt, middleware), `patch` (check, generators, core, docs, build, all), `add` (code-executor), `vendor`. Note: `create workflow` exists in code but is not yet working.
 
 ## Development Commands
 
@@ -91,18 +91,25 @@ This command will:
 
 ```bash
 # 1. Update version in both files manually or use the script:
-./scripts/release.sh <version> "<commit-message>"
+./scripts/release.sh <version> [<summary>]
 
-# Example:
+# Examples:
+./scripts/release.sh 0.1.2
 ./scripts/release.sh 0.1.2 "Add new generator features"
 
 # The script handles:
 # - Updating version.py and pyproject.toml
+# - Constructing the release commit message from the project convention
 # - Committing changes (including README.md changelog)
 # - Creating and pushing tag
 # - Triggering GitHub Actions
 ```
 
+**Release commit message convention**: `chore: Release fips-agents-cli vX.Y.Z`,
+optionally followed by ` — <summary>`. The script always constructs the message
+from the version argument; callers only supply the summary, never the full
+message. This keeps `git log --grep "Release fips-agents-cli"` reliable.
+
 **Note**: Always update the changelog in README.md before running the script.
 
 See `RELEASE_CHECKLIST.md` for detailed release procedures and troubleshooting.
@@ -141,7 +148,7 @@ Two cloning strategies exist:
 1. Clone monorepo, extract `templates/agent-loop/` subdirectory
 2. Update `pyproject.toml` name field via tomlkit
 3. String-replace `agent-template` → new name in Chart.yaml, values.yaml, AGENTS.md, Containerfile, Makefile
-4. Source directories are NOT renamed — `base_agent` is a framework component
+4. Source directories are NOT renamed — the agent-loop template ships with `src/agent.py` directly, not a project-named module
 5. Initialize fresh git repository with initial commit
 
 **Rich Console Output**: All user-facing output uses Rich library for:
@@ -272,7 +279,7 @@ def test_something(temp_dir):
 
 **Agent Template** (`fips-agents/agent-template` — monorepo, `templates/agent-loop/`):
 - `pyproject.toml` with project name (no entry point scripts)
-- `src/base_agent/` framework (NOT renamed during customization)
+- `src/agent.py` user agent subclass (lives at this path directly — no project-named module wrapper)
 - `chart/` Helm chart for OpenShift deployment
 - `agent.yaml` configuration (customized via `/plan-agent`, not during scaffolding)
 - `.claude/commands/` with agent development slash commands
@@ -325,6 +332,10 @@ Common causes:
 2. Dependencies not installed: `pip install -e .[dev]`
 3. Git not configured globally: `git config --global user.email "test@example.com"`
 
+## Release Process Notes
+
+When creating a new release, always update the changelog in README.md *before* running the release script. The changelog lives in the README under the `## Changelog` heading. Each version should have its own section with the version number and date, listing new features, fixes, and breaking changes. Forgetting the changelog entry leads to patch releases (like v0.8.1) that exist solely to backfill documentation — avoid that by treating the changelog update as a required step in every release.
+
 ## Repository-Specific Notes
 
 - The main branch is `main` (not `master`)

{fips_agents_cli-0.6.2 → fips_agents_cli-0.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fips-agents-cli
-Version: 0.6.2
+Version: 0.8.2
 Summary: CLI tool for creating and managing FIPS-compliant AI agent projects
 Project-URL: Homepage, https://github.com/fips-agents/fips-agents-cli
 Project-URL: Repository, https://github.com/fips-agents/fips-agents-cli
@@ -141,9 +141,11 @@ fips-agents patch all --dry-run
 ```bash
 fips-agents --version
 fips-agents --help
+fips-agents add --help
 fips-agents create --help
 fips-agents generate --help
 fips-agents patch --help
+fips-agents vendor --help
 ```
 
 ---
@@ -215,6 +217,12 @@ Creates an AI agent project from the [agent-template](https://github.com/fips-ag
 
 **Options:** Same as `create mcp-server` (see shared options table above).
 
+**Additional option:**
+
+| Option | Description |
+|--------|-------------|
+| `--vendored` | Copy fipsagents source into the project instead of using PyPI dependency |
+
 **Examples:**
 
 ```bash
@@ -226,6 +234,9 @@ fips-agents create agent my-agent --github --org fips-agents
 
 # Non-interactive mode
 fips-agents create agent my-agent --yes --local
+
+# Create with vendored fipsagents source
+fips-agents create agent my-agent --vendored --local
 ```
 
 #### `create gateway`
@@ -338,7 +349,7 @@ fips-agents create model-car https://huggingface.co/ibm-granite/granite-3.1-2b-i
 
 ### Generate Commands
 
-The `generate` command group scaffolds MCP components (tools, resources, prompts, middleware) in existing MCP server projects created with `fips-agents create mcp-server`.
+The `generate` command group creates individual components (tools, resources, prompts, middleware) in existing projects.
 
 **Run these commands from within your MCP server project directory.** The CLI locates the project root by looking for `pyproject.toml` with a `fastmcp` dependency.
 
@@ -600,6 +611,79 @@ Update all patchable file categories at once. Prompts for confirmation before st
 
 All patch subcommands (except `check`) accept `--dry-run` to preview changes without modifying files.
 
+---
+
+### Add Commands
+
+The `add` command group wires optional capabilities into existing agent projects created with `fips-agents create agent`.
+
+**Run these commands from within your agent project directory.** The CLI locates the project root by looking for `agent.yaml`.
+
+#### `add code-executor`
+
+```bash
+fips-agents add code-executor
+```
+
+Adds the `code_executor` tool to your agent's `tools/` directory and enables the sandbox sidecar in `chart/values.yaml`. The tool sends Python code to a sandbox container for isolated execution.
+
+**What it does:**
+
+1. Writes `tools/code_executor.py` with the sandbox client tool
+2. Sets `sandbox.enabled: true` in `chart/values.yaml` (if the section exists)
+3. Prints deployment guidance for sidecar and remote service modes
+
+**Deployment modes:**
+
+- **Sidecar** (default): The sandbox runs as a container in the same pod. The tool connects to `http://localhost:8000`.
+- **Remote service**: The sandbox runs as a separate deployment. Set `SANDBOX_URL` to point to it.
+
+**Example:**
+
+```bash
+cd my-research-agent
+fips-agents add code-executor
+```
+
+---
+
+### Vendor Commands
+
+The `vendor` command copies the fipsagents source into your agent project, replacing the PyPI dependency. This gives you full control over the fipsagents code.
+
+#### `vendor`
+
+```bash
+fips-agents vendor [OPTIONS]
+```
+
+Copies fipsagents source into `src/fipsagents/` and rewrites `pyproject.toml` to use individual dependencies instead of the fipsagents package.
+
+**Options:**
+
+| Option | Description |
+|--------|-------------|
+| `--update` | Update an already-vendored project with the latest upstream source |
+| `--version TEXT` | Vendor a specific version tag (e.g., `fipsagents-v0.7.0`). Default: latest main |
+
+**Examples:**
+
+```bash
+# Vendor into current project
+fips-agents vendor
+
+# Vendor a specific version
+fips-agents vendor --version fipsagents-v0.7.0
+
+# Update vendored source from upstream
+fips-agents vendor --update
+```
+
+**When to use vendored vs. PyPI:**
+
+- **PyPI dependency** (default): Best for teams running multiple agents that share the same fipsagents version. Centralized updates.
+- **Vendored source**: Best for agents that need custom BaseAgent modifications, environments with no PyPI access, or when you want to read and debug the fipsagents source locally.
+
 ## Project Name Requirements
 
 Project names must follow these rules:
@@ -628,10 +712,9 @@ pytest
 
 ```bash
 cd my-research-agent
-python -m venv venv
-source venv/bin/activate
-pip install -e .[dev]
-pytest
+make install         # Create venv, install dependencies
+make run-local       # Start HTTP server on port 8080
+make test            # Run tests
 # See AGENTS.md for the /plan-agent slash command workflow
 ```
 
@@ -739,10 +822,12 @@ fips-agents-cli/
 │       ├── cli.py          # Main CLI application
 │       ├── version.py      # Version information
 │       ├── commands/       # CLI command implementations
+│       │   ├── add.py      # add code-executor (wire capabilities)
 │       │   ├── create.py   # create mcp-server, agent, gateway, ui
 │       │   ├── generate.py # generate tool/resource/prompt/middleware
 │       │   ├── model_car.py # create model-car
-│       │   └── patch.py    # patch command
+│       │   ├── patch.py    # patch command
+│       │   └── vendor.py   # vendor fipsagents source
 │       └── tools/          # Utility modules
 │           ├── filesystem.py
 │           ├── git.py
@@ -861,6 +946,54 @@ MIT License - see LICENSE file for details
 
 ## Changelog
 
+### Version 0.8.2
+
+- Test: New `TestGenerateMiddlewareRealTemplate` integration test renders the real v3.x middleware Jinja2 template against each `--hook-type` and the no-flag case, with templates committed under `tests/fixtures/middleware_template/` so the suite runs offline (#3)
+- Chore: `scripts/release.sh` now constructs the release commit message from the version argument using the project convention (`chore: Release fips-agents-cli vX.Y.Z` with optional ` — <summary>`); convention documented in CLAUDE.md (#4)
+- Docs: Drop broken `See Also` links from `.fips-agents-cli/README.md` in scaffolded MCP projects (#5, fixed in `fips-agents/mcp-server-template`)
+- Docs: Updated CLAUDE.md release section to reflect the new release-script signature
+
+### Version 0.8.1
+
+- Docs: Updated CLAUDE.md current-status line and added release-process notes
+- Chore: Repository hardening — added CODEOWNERS and enabled main branch protection
+- Chore: Black formatting drift cleanup; removed remaining "framework" language from docs in favor of "toolkit"
+- Chore: `.venv/` and `NEXT_SESSION.md` gitignored
+
+### Version 0.8.0
+
+- Feature: New `--vendored` flag on `create agent` copies fipsagents source instead of PyPI dependency
+- Feature: New `fips-agents vendor` command for post-scaffold vendoring of existing projects
+- Feature: `fips-agents vendor --update` refreshes vendored source from upstream
+- Feature: `fips-agents vendor --version` pins to a specific fipsagents release tag
+- Fix: `customize_agent_project` now removes monorepo Makefile install line (matching workflow template behavior)
+- Fix: Added `redeploy.sh` to agent project customization file list
+
+### Version 0.7.0
+
+- Feature: New `add` command group for composable agent capabilities
+- Feature: `fips-agents add code-executor` wires sandbox code execution into existing agent projects (tool + Helm chart sidecar config)
+- Improvement: Updated `generate` group description to reflect broader scope beyond MCP
+
+### Version 0.6.2
+
+- Fix: Go project scaffolding now updates import paths in all `.go` source files
+- Fix: Go project scaffolding now updates Helm template references (`chart/templates/*.yaml`)
+
+### Version 0.6.1
+
+- Chore: Updated all project URLs from `rdwj/` to `fips-agents/` org
+- Chore: Post-transfer PyPI publishing verification release
+
+### Version 0.6.0
+
+- Feature: Added `create sandbox` command for scaffolding code execution sandbox projects from fips-agents/code-sandbox template
+- Feature: All template URLs consolidated under `github.com/fips-agents/` organization
+
+### Version 0.5.1
+
+- Fix: SSE streaming tool call ID tracking by `call_id` not array index
+
 ### Version 0.5.0
 
 - Feature: Added `create gateway` command for scaffolding Go HTTP gateway projects from the gateway-template

{fips_agents_cli-0.6.2 → fips_agents_cli-0.8.2}/README.md

@@ -108,9 +108,11 @@ fips-agents patch all --dry-run
 ```bash
 fips-agents --version
 fips-agents --help
+fips-agents add --help
 fips-agents create --help
 fips-agents generate --help
 fips-agents patch --help
+fips-agents vendor --help
 ```
 
 ---
@@ -182,6 +184,12 @@ Creates an AI agent project from the [agent-template](https://github.com/fips-ag
 
 **Options:** Same as `create mcp-server` (see shared options table above).
 
+**Additional option:**
+
+| Option | Description |
+|--------|-------------|
+| `--vendored` | Copy fipsagents source into the project instead of using PyPI dependency |
+
 **Examples:**
 
 ```bash
@@ -193,6 +201,9 @@ fips-agents create agent my-agent --github --org fips-agents
 
 # Non-interactive mode
 fips-agents create agent my-agent --yes --local
+
+# Create with vendored fipsagents source
+fips-agents create agent my-agent --vendored --local
 ```
 
 #### `create gateway`
@@ -305,7 +316,7 @@ fips-agents create model-car https://huggingface.co/ibm-granite/granite-3.1-2b-i
 
 ### Generate Commands
 
-The `generate` command group scaffolds MCP components (tools, resources, prompts, middleware) in existing MCP server projects created with `fips-agents create mcp-server`.
+The `generate` command group creates individual components (tools, resources, prompts, middleware) in existing projects.
 
 **Run these commands from within your MCP server project directory.** The CLI locates the project root by looking for `pyproject.toml` with a `fastmcp` dependency.
 
@@ -567,6 +578,79 @@ Update all patchable file categories at once. Prompts for confirmation before st
 
 All patch subcommands (except `check`) accept `--dry-run` to preview changes without modifying files.
 
+---
+
+### Add Commands
+
+The `add` command group wires optional capabilities into existing agent projects created with `fips-agents create agent`.
+
+**Run these commands from within your agent project directory.** The CLI locates the project root by looking for `agent.yaml`.
+
+#### `add code-executor`
+
+```bash
+fips-agents add code-executor
+```
+
+Adds the `code_executor` tool to your agent's `tools/` directory and enables the sandbox sidecar in `chart/values.yaml`. The tool sends Python code to a sandbox container for isolated execution.
+
+**What it does:**
+
+1. Writes `tools/code_executor.py` with the sandbox client tool
+2. Sets `sandbox.enabled: true` in `chart/values.yaml` (if the section exists)
+3. Prints deployment guidance for sidecar and remote service modes
+
+**Deployment modes:**
+
+- **Sidecar** (default): The sandbox runs as a container in the same pod. The tool connects to `http://localhost:8000`.
+- **Remote service**: The sandbox runs as a separate deployment. Set `SANDBOX_URL` to point to it.
+
+**Example:**
+
+```bash
+cd my-research-agent
+fips-agents add code-executor
+```
+
+---
+
+### Vendor Commands
+
+The `vendor` command copies the fipsagents source into your agent project, replacing the PyPI dependency. This gives you full control over the fipsagents code.
+
+#### `vendor`
+
+```bash
+fips-agents vendor [OPTIONS]
+```
+
+Copies fipsagents source into `src/fipsagents/` and rewrites `pyproject.toml` to use individual dependencies instead of the fipsagents package.
+
+**Options:**
+
+| Option | Description |
+|--------|-------------|
+| `--update` | Update an already-vendored project with the latest upstream source |
+| `--version TEXT` | Vendor a specific version tag (e.g., `fipsagents-v0.7.0`). Default: latest main |
+
+**Examples:**
+
+```bash
+# Vendor into current project
+fips-agents vendor
+
+# Vendor a specific version
+fips-agents vendor --version fipsagents-v0.7.0
+
+# Update vendored source from upstream
+fips-agents vendor --update
+```
+
+**When to use vendored vs. PyPI:**
+
+- **PyPI dependency** (default): Best for teams running multiple agents that share the same fipsagents version. Centralized updates.
+- **Vendored source**: Best for agents that need custom BaseAgent modifications, environments with no PyPI access, or when you want to read and debug the fipsagents source locally.
+
 ## Project Name Requirements
 
 Project names must follow these rules:
@@ -595,10 +679,9 @@ pytest
 
 ```bash
 cd my-research-agent
-python -m venv venv
-source venv/bin/activate
-pip install -e .[dev]
-pytest
+make install         # Create venv, install dependencies
+make run-local       # Start HTTP server on port 8080
+make test            # Run tests
 # See AGENTS.md for the /plan-agent slash command workflow
 ```
 
@@ -706,10 +789,12 @@ fips-agents-cli/
 │       ├── cli.py          # Main CLI application
 │       ├── version.py      # Version information
 │       ├── commands/       # CLI command implementations
+│       │   ├── add.py      # add code-executor (wire capabilities)
 │       │   ├── create.py   # create mcp-server, agent, gateway, ui
 │       │   ├── generate.py # generate tool/resource/prompt/middleware
 │       │   ├── model_car.py # create model-car
-│       │   └── patch.py    # patch command
+│       │   ├── patch.py    # patch command
+│       │   └── vendor.py   # vendor fipsagents source
 │       └── tools/          # Utility modules
 │           ├── filesystem.py
 │           ├── git.py
@@ -828,6 +913,54 @@ MIT License - see LICENSE file for details
 
 ## Changelog
 
+### Version 0.8.2
+
+- Test: New `TestGenerateMiddlewareRealTemplate` integration test renders the real v3.x middleware Jinja2 template against each `--hook-type` and the no-flag case, with templates committed under `tests/fixtures/middleware_template/` so the suite runs offline (#3)
+- Chore: `scripts/release.sh` now constructs the release commit message from the version argument using the project convention (`chore: Release fips-agents-cli vX.Y.Z` with optional ` — <summary>`); convention documented in CLAUDE.md (#4)
+- Docs: Drop broken `See Also` links from `.fips-agents-cli/README.md` in scaffolded MCP projects (#5, fixed in `fips-agents/mcp-server-template`)
+- Docs: Updated CLAUDE.md release section to reflect the new release-script signature
+
+### Version 0.8.1
+
+- Docs: Updated CLAUDE.md current-status line and added release-process notes
+- Chore: Repository hardening — added CODEOWNERS and enabled main branch protection
+- Chore: Black formatting drift cleanup; removed remaining "framework" language from docs in favor of "toolkit"
+- Chore: `.venv/` and `NEXT_SESSION.md` gitignored
+
+### Version 0.8.0
+
+- Feature: New `--vendored` flag on `create agent` copies fipsagents source instead of PyPI dependency
+- Feature: New `fips-agents vendor` command for post-scaffold vendoring of existing projects
+- Feature: `fips-agents vendor --update` refreshes vendored source from upstream
+- Feature: `fips-agents vendor --version` pins to a specific fipsagents release tag
+- Fix: `customize_agent_project` now removes monorepo Makefile install line (matching workflow template behavior)
+- Fix: Added `redeploy.sh` to agent project customization file list
+
+### Version 0.7.0
+
+- Feature: New `add` command group for composable agent capabilities
+- Feature: `fips-agents add code-executor` wires sandbox code execution into existing agent projects (tool + Helm chart sidecar config)
+- Improvement: Updated `generate` group description to reflect broader scope beyond MCP
+
+### Version 0.6.2
+
+- Fix: Go project scaffolding now updates import paths in all `.go` source files
+- Fix: Go project scaffolding now updates Helm template references (`chart/templates/*.yaml`)
+
+### Version 0.6.1
+
+- Chore: Updated all project URLs from `rdwj/` to `fips-agents/` org
+- Chore: Post-transfer PyPI publishing verification release
+
+### Version 0.6.0
+
+- Feature: Added `create sandbox` command for scaffolding code execution sandbox projects from fips-agents/code-sandbox template
+- Feature: All template URLs consolidated under `github.com/fips-agents/` organization
+
+### Version 0.5.1
+
+- Fix: SSE streaming tool call ID tracking by `call_id` not array index
+
 ### Version 0.5.0
 
 - Feature: Added `create gateway` command for scaffolding Go HTTP gateway projects from the gateway-template

{fips_agents_cli-0.6.2 → fips_agents_cli-0.8.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "fips-agents-cli"
-version = "0.6.2"
+version = "0.8.2"
 description = "CLI tool for creating and managing FIPS-compliant AI agent projects"
 readme = "README.md"
 requires-python = ">=3.10"

{fips_agents_cli-0.6.2 → fips_agents_cli-0.8.2}/scripts/release.sh

@@ -2,9 +2,20 @@
 #
 # release.sh - Automated release script for fips-agents-cli
 #
-# Usage: ./scripts/release.sh <version> <commit-message>
+# Usage: ./scripts/release.sh <version> [<summary>]
 #
-# Example: ./scripts/release.sh 0.1.2 "Add new feature for X"
+# The release commit message is always constructed from the version using
+# the project convention:
+#
+#     chore: Release fips-agents-cli vX.Y.Z
+#
+# If a summary is provided, it is appended after an em-dash:
+#
+#     chore: Release fips-agents-cli vX.Y.Z — <summary>
+#
+# Examples:
+#   ./scripts/release.sh 0.1.2
+#   ./scripts/release.sh 0.1.2 "Add new generator features"
 #
 
 set -e  # Exit on error
@@ -29,14 +40,16 @@ print_info() {
 }
 
 # Check arguments
-if [ $# -ne 2 ]; then
-    print_error "Usage: $0 <version> <commit-message>"
-    echo "Example: $0 0.1.2 \"Add new feature for X\""
+if [ $# -lt 1 ] || [ $# -gt 2 ]; then
+    print_error "Usage: $0 <version> [<summary>]"
+    echo "Examples:"
+    echo "  $0 0.1.2"
+    echo "  $0 0.1.2 \"Add new generator features\""
     exit 1
 fi
 
 VERSION=$1
-COMMIT_MSG=$2
+SUMMARY=${2:-}
 
 # Validate version format (x.y.z)
 if ! [[ $VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
@@ -45,6 +58,14 @@ if ! [[ $VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
     exit 1
 fi
 
+# Construct the conventional release commit message.
+# Convention: "chore: Release fips-agents-cli vX.Y.Z" with optional " — <summary>".
+if [ -n "$SUMMARY" ]; then
+    COMMIT_MSG="chore: Release fips-agents-cli v${VERSION} — ${SUMMARY}"
+else
+    COMMIT_MSG="chore: Release fips-agents-cli v${VERSION}"
+fi
+
 print_info "Preparing release v$VERSION"
 echo
 

{fips_agents_cli-0.6.2 → fips_agents_cli-0.8.2}/src/fips_agents_cli/cli.py

@@ -3,9 +3,11 @@
 import click
 from rich.console import Console
 
+from fips_agents_cli.commands.add import add
 from fips_agents_cli.commands.create import create
 from fips_agents_cli.commands.generate import generate
 from fips_agents_cli.commands.patch import patch
+from fips_agents_cli.commands.vendor import vendor
 from fips_agents_cli.version import __version__
 
 console = Console()
@@ -24,9 +26,11 @@ def cli(ctx):
 
 
 # Register commands
+cli.add_command(add)
 cli.add_command(create)
 cli.add_command(generate)
 cli.add_command(patch)
+cli.add_command(vendor)
 
 
 def main():