fix: resolve merge conflicts with upstream/main

Author: RheagalFire

.github/workflows/checks.yml

@@ -17,7 +17,7 @@ jobs:
       - name: "Set up Python"
         uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: "3.14"
 
       - name: Install the project
         run: |
@@ -39,7 +39,7 @@ jobs:
       - name: "Set up Python"
         uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: "3.14"
 
       - name: Install the project
         run: |
@@ -67,7 +67,7 @@ jobs:
       - name: "Set up Python"
         uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: "3.14"
 
       - name: Install the project
         run: |
@@ -141,7 +141,14 @@ jobs:
       - name: "Set up Python"
         uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: "3.14"
+
+      - name: Install the project
+        run: |
+          uv sync --locked --group dev
+
+      - name: Run plugin CLI env smoke test
+        run: FAST_AGENT_BIN="$PWD/.venv/bin/fast-agent" bash scripts/test_plugins_cli_env.sh
 
       - name: Run package install test
         run: bash scripts/test_package_install.sh

.gitmodules

@@ -2,7 +2,3 @@
 	path = skills-repo
 	url = https://github.com/fast-agent-ai/skills
 	branch = main
-[submodule "docs"]
-	path = docs
-	url = https://github.com/evalstate/fast-agent-docs
-	branch = main

README.md

@@ -92,19 +92,8 @@ Recent features include:
 
 > [!IMPORTANT]
 >
-> Documentation is included as a submodule. When cloning, use `--recurse-submodules` to get everything:
->
-> ```bash
-> git clone --recurse-submodules https://github.com/evalstate/fast-agent.git
-> ```
->
-> Or if you've already cloned:
->
-> ```bash
-> git submodule update --init --recursive
-> ```
->
-> The documentation source is also available at: https://github.com/evalstate/fast-agent-docs
+> Documentation is included in this repository under `docs/`. Use the docs helper script from the
+> repository root to install, generate, build, serve, screenshot, and assess the site.
 
 ### Agent Application Development
 
@@ -207,15 +196,15 @@ is accepted for backward compatibility but is unnecessary there.
 
 ### Combining Agents and using MCP Servers
 
-_To generate examples use `fast-agent quickstart workflow`. This example can be run with `uv run workflow/chaining.py`. fast-agent looks for configuration files in the current directory before checking parent directories recursively._
+_To generate examples use `fast-agent quickstart workflow`. This example can be run with `uv run workflow/chaining.py`. Place `fast-agent.yaml` in the active fast-agent home, or pass an explicit config path when needed._
 
-Agents can be chained to build a workflow, using MCP Servers defined in the `fastagent.config.yaml` file:
+Agents can be chained to build a workflow, using MCP Servers defined in the `fast-agent.yaml` file:
 
 ```python
 @fast.agent(
     "url_fetcher",
     "Given a URL, provide a complete and comprehensive summary",
-    servers=["fetch"], # Name of an MCP Server defined in fastagent.config.yaml
+    servers=["fetch"], # Name of an MCP Server defined in fast-agent.yaml
 )
 @fast.agent(
     "social_media",
@@ -316,7 +305,7 @@ Extended example and all params sample is available in the repository as
 
 For SSE and HTTP MCP servers, OAuth is enabled by default with minimal configuration. A local callback server is used to capture the authorization code, with a paste-URL fallback if the port is unavailable.
 
-- Minimal per-server settings in `fastagent.config.yaml`:
+- Minimal per-server settings in `fast-agent.yaml`:
 
 ```yaml
 mcp:
@@ -668,7 +657,7 @@ Prompts can also be applied interactively through the interactive interface by u
 
 ### Sampling
 
-Sampling LLMs are configured per Client/Server pair. Specify the model name in fastagent.config.yaml as follows:
+Sampling LLMs are configured per Client/Server pair. Specify the model name in fast-agent.yaml as follows:
 
 ```yaml
 mcp:
@@ -683,15 +672,15 @@ mcp:
 ### Secrets File
 
 > [!TIP]
-> fast-agent will look recursively for a fastagent.secrets.yaml file, so you only need to manage this at the root folder of your agent definitions.
+> Put `fast-agent.secrets.yaml` alongside `fast-agent.yaml` in your active fast-agent home. Select a different home with `--env` or `FAST_AGENT_HOME`.
 
 ### Interactive Shell
 
 ![fast-agent](https://github.com/user-attachments/assets/3e692103-bf97-489a-b519-2d0fee036369)
 
 ## Documentation
 
-The documentation site is included as a submodule in `docs/`. To work with the docs locally:
+The documentation site lives in `docs/`. To work with the docs locally:
 
 ```bash
 # Install docs dependencies (first time only)
@@ -703,6 +692,10 @@ uv run scripts/docs.py generate
 # Run the dev server (http://127.0.0.1:8000)
 uv run scripts/docs.py serve
 
+# Capture and assess screenshots of the built docs
+uv run scripts/docs.py screenshot
+uv run scripts/docs.py assess
+
 # Or generate and serve in one command
 uv run scripts/docs.py all
 ```

docs

@@ -230,7 +230,7 @@ pytest tests/integration/acp/ -v
 Terminal support respects existing shell runtime configuration:
 
 ```yaml
-# fastagent.config.yaml
+# fast-agent.yaml
 shell_execution:
   timeout_seconds: 90  # Applies to both local and ACP terminals
   warning_interval_seconds: 30

docs-internal/ACP_TERMINAL_SUPPORT.md

@@ -276,7 +276,7 @@ export ANTHROPIC_API_KEY="your-key-here"
 **Solution:**
 
 - Set environment variable: `export ANTHROPIC_API_KEY=...` an
-- Or create config file: `~/.config/fast-agent/fastagent.secrets.yaml`
+- Or create config file: `~/.config/fast-agent/fast-agent.secrets.yaml`
 
 ## Integration with Editors