observal-cli 0.3.3__tar.gz → 0.3.4__tar.gz

observal_cli-0.3.4/.dockerignore

@@ -0,0 +1,60 @@
+# Version control
+**/.git
+
+# Python artifacts
+**/__pycache__
+**/.venv
+*.pyc
+.pytest_cache/
+.coverage
+htmlcov/
+
+# Node.js artifacts
+**/node_modules
+**/.next
+
+# Documentation (not copied by any Dockerfile)
+*.md
+LICENSE
+docs/
+screenshots/
+
+# Testing (not shipped in images)
+tests/
+
+# CLI tool (separate distribution, not in API or web image)
+observal_cli/
+
+# Development tooling
+.github/
+.vscode/
+.idea/
+*.code-workspace
+
+# Scripts and tools (not needed in containers)
+scripts/
+tools/
+
+# Demo configs
+demo/
+
+# Monitoring configs (volume-mounted at runtime, not baked in)
+grafana/
+prometheus.yml
+otel-collector-config.yaml
+
+# Docker sub-configs (not needed inside images)
+docker/docker-compose*.yml
+docker/clickhouse/
+docker/nginx*.conf
+docker/server-package/
+
+# Environment and logs
+.env
+.env.*
+!.env.example
+*.log
+
+# Misc
+renovate.json
+cliff.toml

{observal_cli-0.3.3 → observal_cli-0.3.4}/CHANGELOG.md

@@ -2,6 +2,51 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.3.4] - 2026-04-25
+
+### Added
+
+- add copilot-cli doctor checks and SLI repair ([fe8f91a](https://github.com/BlazeUp-AI/Observal/commit/fe8f91af37c6e3d354906c022aaba2e12eb4b816))
+- add copilot-cli scan and hook injection ([8956644](https://github.com/BlazeUp-AI/Observal/commit/8956644008e824ba59675be52448880170a544e8))
+- add copilot-cli server-side config generation ([7c71b94](https://github.com/BlazeUp-AI/Observal/commit/7c71b94b2bdeb3827ecfb48bda0180b065d4de8f))
+- add copilot-cli hook scripts ([4e22c5c](https://github.com/BlazeUp-AI/Observal/commit/4e22c5cf5907c30488e9cb73137495e057463535))
+- add copilot-cli to IDE constants and feature matrix ([065900b](https://github.com/BlazeUp-AI/Observal/commit/065900b63c6f7fd60c1c6d11d9e730d51732293e))
+
+### Documentation
+
+- add copilot-cli integration guide ([c459254](https://github.com/BlazeUp-AI/Observal/commit/c459254ee837e396e9d8dc3a9fc8b3c40d7c4cb6))
+
+### Fixed
+
+- add missing event name mappings for prompt counting (**copilot**) ([0a3acf7](https://github.com/BlazeUp-AI/Observal/commit/0a3acf7c0f135e79291915a9d5081996a7d54762))
+- auto-shim copilot/opencode MCP servers during login (**auth**) ([3d12220](https://github.com/BlazeUp-AI/Observal/commit/3d1222013fd0c2907ae82f5b346949c4bf673795))
+- match native agent config schema and fix prompt injection (**kiro**) ([cb773cc](https://github.com/BlazeUp-AI/Observal/commit/cb773cc090540150bc1284063d06b6b243c5e5fc))
+- replace fragile cat|sed|curl Unix pipelines with Python hook scripts (**kiro**) ([c304172](https://github.com/BlazeUp-AI/Observal/commit/c304172d8a96ed48e56b9f92d73fa5f876effe29))
+- use LB URL as Dockerfile build-time default for API rewrites (**docker**) ([af54ebd](https://github.com/BlazeUp-AI/Observal/commit/af54ebd826ea4789b88894d51136644c25a4e683))
+- preserve URL scheme in endpoint derivation and fix port issues (**config**) ([ef28cfe](https://github.com/BlazeUp-AI/Observal/commit/ef28cfe33e801c816ce529d6b827d84e14979340))
+- reformat test_ide_config_e2e.py to satisfy ruff (**lint**) ([4c065ba](https://github.com/BlazeUp-AI/Observal/commit/4c065ba732c07dd43326eb3d84bbe12be2b040d8))
+- rename camelCase test function to satisfy ruff N802 (**test**) ([77a57d4](https://github.com/BlazeUp-AI/Observal/commit/77a57d47a276495b8898dd2706fd6321cfda02ae))
+- add Copilot CLI platform detection and hide unsupported fields (**web**) ([2259794](https://github.com/BlazeUp-AI/Observal/commit/22597942a864c521e61d3d3f0d5fbf2cf97552c1))
+- add JSONC parsing and per-event hook names for Copilot CLI (**cli**) ([096fd3c](https://github.com/BlazeUp-AI/Observal/commit/096fd3c5092d0fa0e4d6e439d0e7c86ad85540a3))
+- normalize Copilot CLI payloads and inject event names (**hooks**) ([a9d47fa](https://github.com/BlazeUp-AI/Observal/commit/a9d47faa3e327c64bb8ba5cb7be34c9c212ae50e))
+- respect --ide filter in fallback home scan (**scan**) ([cf379dd](https://github.com/BlazeUp-AI/Observal/commit/cf379ddeaca9b24ab6b2f158e3711da433903520))
+- only trace registered Kiro agents, skip kiro_default (**scan**) ([db39514](https://github.com/BlazeUp-AI/Observal/commit/db3951494f61f3e724c6dfc3fb659badd6e916ba))
+- only trace registered Kiro agents, skip kiro_default (**scan**) ([63d2b5d](https://github.com/BlazeUp-AI/Observal/commit/63d2b5dc21b608e7039ddfbd8794afff5de58943))
+- only trace registered Kiro agents, skip kiro_default (**scan**) ([9cdc9c5](https://github.com/BlazeUp-AI/Observal/commit/9cdc9c5cd7b451c968696fd0dda288c7db8f97d1))
+- preserve host port in proxy headers to fix Kiro agent tracing (**nginx**) ([60dcda9](https://github.com/BlazeUp-AI/Observal/commit/60dcda95124b5e0e06307c66a43db2fde8056907))
+
+### Other
+
+- update dependency ruff to v0.15.12 (#575) (**deps**) ([a8a406d](https://github.com/BlazeUp-AI/Observal/commit/a8a406df83a1978b157c0c8d6aac359d70a2da7b))
+
+### Performance
+
+- multi-stage API build, expand dockerignore, add nginx gzip (**docker**) ([21fd2a4](https://github.com/BlazeUp-AI/Observal/commit/21fd2a461bd01709df7775655aedc91a07e608e6))
+
+### Testing
+
+- update assertions for new config format (**kiro**) ([550ade5](https://github.com/BlazeUp-AI/Observal/commit/550ade505fa9eb1658799bdce050cd140927a2d4))
+- add copilot-cli e2e tests ([dfabf02](https://github.com/BlazeUp-AI/Observal/commit/dfabf0215d6bdbb9bc1d0f0e2fb50e36dbe6f6d4))
 ## [0.3.3] - 2026-04-24
 
 ### Fixed

{observal_cli-0.3.3 → observal_cli-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: observal-cli
-Version: 0.3.3
+Version: 0.3.4
 Summary: Observal MCP Server Registry & Agent Registry CLI
 Project-URL: Homepage, https://github.com/BlazeUp-AI/Observal
 Project-URL: Repository, https://github.com/BlazeUp-AI/Observal

{observal_cli-0.3.3 → observal_cli-0.3.4}/docker/Dockerfile.api

@@ -1,4 +1,5 @@
-FROM python:3.14-slim
+# Build stage
+FROM python:3.14-slim AS builder
 
 COPY --from=ghcr.io/astral-sh/uv:0.11.7 /uv /uvx /bin/
 
@@ -9,16 +10,23 @@ RUN apt-get update && apt-get install -y --no-install-recommends git xmlsec1 lib
 COPY observal-server/pyproject.toml observal-server/uv.lock ./
 RUN uv sync --frozen --no-dev --no-install-project
 
-COPY observal-server/ .
-COPY ee/ ./ee/
-COPY docker/entrypoint.sh /app/entrypoint.sh
-RUN sed -i 's/\r$//' /app/entrypoint.sh
+# Runtime stage
+FROM python:3.14-slim
 
 RUN groupadd --system --gid 1001 appgroup && \
     useradd --system --uid 1001 --gid appgroup appuser && \
-    chown -R appuser:appgroup /app && \
     mkdir -p /data && chown appuser:appgroup /data
 
+RUN apt-get update && apt-get install -y --no-install-recommends git xmlsec1 && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app
+
+COPY --from=builder --chown=appuser:appgroup /app/.venv /app/.venv
+COPY --chown=appuser:appgroup observal-server/ .
+COPY --chown=appuser:appgroup ee/ ./ee/
+COPY --chown=appuser:appgroup docker/entrypoint.sh /app/entrypoint.sh
+RUN sed -i 's/\r$//' /app/entrypoint.sh
+
 USER appuser
 
 EXPOSE 8000

{observal_cli-0.3.3 → observal_cli-0.3.4}/docker/Dockerfile.web

@@ -10,7 +10,8 @@ WORKDIR /app
 COPY --from=deps /app/node_modules ./node_modules
 COPY web/ .
 ENV NEXT_TELEMETRY_DISABLED=1
-ENV NEXT_PUBLIC_API_URL=http://observal-api:8000
+ARG NEXT_PUBLIC_API_URL="http://observal-lb:80"
+ENV NEXT_PUBLIC_API_URL=$NEXT_PUBLIC_API_URL
 RUN corepack enable pnpm && pnpm run build
 
 FROM base AS runner

{observal_cli-0.3.3 → observal_cli-0.3.4}/docker/docker-compose.yml

@@ -189,7 +189,7 @@ services:
     ports:
       - "${WEB_HOST_PORT:-3000}:3000"
     environment:
-      - NEXT_PUBLIC_API_URL=http://observal-lb:80
+      - NEXT_PUBLIC_API_URL=${NEXT_PUBLIC_API_URL:-http://observal-lb:80}
     depends_on:
       observal-lb:
         condition: service_started

{observal_cli-0.3.3 → observal_cli-0.3.4}/docker/nginx.conf

@@ -5,9 +5,16 @@ upstream observal_api {
 server {
     listen 80;
 
+    gzip on;
+    gzip_types application/json application/javascript text/css text/plain text/xml application/xml;
+    gzip_min_length 256;
+    gzip_vary on;
+    gzip_proxied any;
+    gzip_comp_level 5;
+
     location / {
         proxy_pass http://observal_api;
-        proxy_set_header Host $host;
+        proxy_set_header Host $http_host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;

{observal_cli-0.3.3 → observal_cli-0.3.4}/docker/nginx.production.conf

@@ -21,9 +21,16 @@ server {
     ssl_protocols TLSv1.2 TLSv1.3;
     ssl_ciphers HIGH:!aNULL:!MD5;
 
+    gzip on;
+    gzip_types application/json application/javascript text/css text/plain text/xml application/xml;
+    gzip_min_length 256;
+    gzip_vary on;
+    gzip_proxied any;
+    gzip_comp_level 5;
+
     location /api/ {
         proxy_pass http://observal_api;
-        proxy_set_header Host $host;
+        proxy_set_header Host $http_host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
@@ -36,22 +43,22 @@ server {
 
     location /health {
         proxy_pass http://observal_api;
-        proxy_set_header Host $host;
+        proxy_set_header Host $http_host;
     }
 
     location /livez {
         proxy_pass http://observal_api;
-        proxy_set_header Host $host;
+        proxy_set_header Host $http_host;
     }
 
     location /readyz {
         proxy_pass http://observal_api;
-        proxy_set_header Host $host;
+        proxy_set_header Host $http_host;
     }
 
     location /graphql {
         proxy_pass http://observal_api;
-        proxy_set_header Host $host;
+        proxy_set_header Host $http_host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
@@ -62,7 +69,7 @@ server {
 
     location / {
         proxy_pass http://observal_web;
-        proxy_set_header Host $host;
+        proxy_set_header Host $http_host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;

observal_cli-0.3.4/docs/integrations/copilot-cli.md

@@ -0,0 +1,170 @@
+# Copilot CLI
+
+[Copilot CLI](https://docs.github.com/en/copilot/github-copilot-in-the-cli) is the standalone agentic coding CLI from GitHub (binary: `copilot`). Observal uses a hook-based bridge for session lifecycle events and `observal-shim` for MCP server instrumentation.
+
+## What you get
+
+* **MCP server instrumentation** via `observal-shim` (or `observal-proxy` for HTTP MCPs)
+* **Session lifecycle events** via hooks — session start/end, user prompts, tool use, errors
+* **Rules** (`.github/copilot-instructions.md`)
+
+## What you don't get (yet)
+
+| Limitation | Detail |
+| --- | --- |
+| **Token counts** | Copilot CLI does not expose token usage in hook payloads. |
+| **Cost per call** | No per-call cost data available. |
+| **Session enrichment** | No local conversation store to read turn counts or model info at session end. |
+
+## Setup
+
+### 1. Install Copilot CLI
+
+```bash
+curl -fsSL https://gh.io/copilot-install | bash
+copilot --version
+```
+
+### 2. Install the Observal CLI
+
+```bash
+curl -fsSL https://raw.githubusercontent.com/BlazeUp-AI/Observal/main/install.sh | bash
+observal auth login
+```
+
+### 3. Instrument Copilot CLI
+
+```bash
+observal scan --ide copilot-cli --home
+```
+
+This does three things:
+
+1. **Wraps MCP servers** in `~/.copilot/mcp-config.json` with `observal-shim`
+2. **Injects hooks** into `~/.copilot/config.json` for session lifecycle telemetry
+3. **Discovers** any project-level MCP servers in `.mcp.json`
+
+### 4. (Optional) Pull an agent from the registry
+
+```bash
+observal agent list
+observal pull <agent-id> --ide copilot-cli
+```
+
+This writes:
+
+| File | Purpose |
+| --- | --- |
+| `.github/copilot-instructions.md` | Rules / system instructions |
+| `.mcp.json` | MCP servers wrapped with `observal-shim` |
+
+### 5. Diagnose
+
+```bash
+observal doctor --ide copilot-cli
+```
+
+### 6. Repair hooks
+
+```bash
+observal doctor sli --ide copilot-cli
+```
+
+Then restart Copilot CLI.
+
+## Config locations
+
+| Purpose | Path |
+| --- | --- |
+| Settings + hooks | `~/.copilot/config.json` |
+| User MCP servers | `~/.copilot/mcp-config.json` |
+| Project MCP servers | `.mcp.json` (project root) |
+| Rules | `.github/copilot-instructions.md` |
+
+## How telemetry reaches Observal
+
+### Channel 1: MCP tool calls
+
+Same as everywhere else — `observal-shim` sits between Copilot CLI and each MCP server. Every call becomes a span.
+
+### Channel 2: Session lifecycle (via hooks)
+
+Observal installs hooks into `~/.copilot/config.json` under the `hooks` key. They fire at these events:
+
+| Copilot CLI event | What it captures |
+| --- | --- |
+| `sessionStart` | Session begins |
+| `userPromptSubmitted` | The user's prompt |
+| `preToolUse` | Tool name and input (before the call) |
+| `postToolUse` | Tool response (after the call) |
+| `sessionEnd` | Session ends |
+| `errorOccurred` | Errors during the session |
+
+Each hook runs a Python script that reads stdin JSON, injects Observal metadata (`service_name`, `session_id`, user identity), and POSTs to `http://localhost:8000/api/v1/otel/hooks`.
+
+### Example hook in config.json
+
+```json
+{
+  "hooks": {
+    "sessionStart": [
+      {
+        "type": "command",
+        "bash": "cat | python3 /path/to/copilot_cli_hook.py --url http://localhost:8000/api/v1/otel/hooks",
+        "powershell": "python /path/to/copilot_cli_hook.py --url http://localhost:8000/api/v1/otel/hooks",
+        "timeoutSec": 10
+      }
+    ]
+  }
+}
+```
+
+You don't write these by hand — `observal scan --ide copilot-cli --home` generates them.
+
+## View your traces
+
+Open `http://localhost:3000/traces` and filter by **IDE -> copilot-cli**.
+
+Or CLI:
+
+```bash
+observal ops traces --limit 20
+```
+
+## Troubleshooting
+
+### Hooks not firing — sessions not appearing in the dashboard
+
+1. Confirm hooks are in `~/.copilot/config.json`:
+   ```bash
+   cat ~/.copilot/config.json | python3 -m json.tool
+   ```
+2. Verify `disableAllHooks` is not `true` in the config.
+3. Confirm the URL in the hook commands matches your server.
+4. Re-inject hooks: `observal doctor sli --ide copilot-cli`
+
+### `observal scan` wraps 0 servers
+
+Your Copilot CLI MCP config may be empty. Check:
+
+```bash
+cat ~/.copilot/mcp-config.json    # user-level
+cat .mcp.json                      # project-level
+```
+
+Add at least one MCP server first, then re-run `scan`.
+
+### `observal-shim` not found
+
+Reinstall:
+
+```bash
+curl -fsSL https://raw.githubusercontent.com/BlazeUp-AI/Observal/main/install.sh | bash
+which observal-shim
+```
+
+## Related
+
+* [`observal pull`](../cli/pull.md)
+* [`observal scan`](../cli/scan.md)
+* [`observal doctor`](../cli/doctor.md)

{observal_cli-0.3.3 → observal_cli-0.3.4}/observal-server/api/routes/config.py

@@ -19,7 +19,7 @@ def derive_endpoints(request: Request | None = None) -> dict[str, str]:
 
     parsed = urlparse(public_url)
     hostname = parsed.hostname or "localhost"
-    scheme = "http" if hostname in ("localhost", "127.0.0.1") else "https"
+    scheme = parsed.scheme or ("http" if hostname in ("localhost", "127.0.0.1") else "https")
 
     otlp_http = settings.OTLP_HTTP_URL.rstrip("/") if settings.OTLP_HTTP_URL else f"{scheme}://{hostname}:4318"
     otlp_grpc = settings.OTLP_GRPC_URL.rstrip("/") if settings.OTLP_GRPC_URL else f"{scheme}://{hostname}:4317"

{observal_cli-0.3.3 → observal_cli-0.3.4}/observal-server/api/routes/otel_dashboard.py

@@ -982,11 +982,13 @@ _COPILOT_TO_CC_EVENT = {
     "onPostToolUse": "PostToolUse",
     "postToolUse": "PostToolUse",
     "onUserPromptSubmitted": "UserPromptSubmit",
+    "userPromptSubmitted": "UserPromptSubmit",
     "onSessionStart": "SessionStart",
     "sessionStart": "SessionStart",
     "onSessionEnd": "Stop",
     "sessionEnd": "Stop",
     "onErrorOccurred": "StopFailure",
+    "errorOccurred": "StopFailure",
     "subagent.started": "SubagentStart",
     "subagent.completed": "SubagentStop",
     "subagent.failed": "SubagentStop",

{observal_cli-0.3.3 → observal_cli-0.3.4}/observal-server/api/routes/telemetry.py

@@ -349,8 +349,9 @@ async def telemetry_status(current_user: User = Depends(require_role(UserRole.ad
     )
 
 
-# Kiro CLI uses camelCase event names; normalize to PascalCase
+# Kiro CLI and Copilot CLI use camelCase event names; normalize to PascalCase
 _KIRO_EVENT_MAP = {
+    # Kiro events
     "agentSpawn": "SessionStart",
     "userPromptSubmit": "UserPromptSubmit",
     "promptSubmit": "UserPromptSubmit",
@@ -358,12 +359,17 @@ _KIRO_EVENT_MAP = {
     "postToolUse": "PostToolUse",
     "stop": "Stop",
     "agentStop": "Stop",
+    # Copilot CLI events
+    "sessionStart": "SessionStart",
+    "sessionEnd": "Stop",
+    "userPromptSubmitted": "UserPromptSubmit",
+    "errorOccurred": "StopFailure",
 }
 
 
 @router.post("/hooks")
 async def ingest_hook(request: Request, current_user: User = Depends(require_role(UserRole.user))):
-    """Ingest raw hook JSON from Claude Code/Kiro."""
+    """Ingest raw hook JSON from Claude Code/Kiro/Copilot CLI."""
     project_id = get_project_id(current_user)
     body = await request.json()
 
@@ -407,7 +413,7 @@ async def ingest_hook(request: Request, current_user: User = Depends(require_rol
         "end_time": now,
         "latency_ms": None,
         "status": "success",
-        "ide": "",
+        "ide": body.get("service_name", ""),
         "environment": "default",
         "metadata": {},
         "token_count_input": None,

{observal_cli-0.3.3 → observal_cli-0.3.4}/observal-server/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "observal-server"
-version = "0.3.3"
+version = "0.3.4"
 description = "Observal API server"
 requires-python = ">=3.11"
 license = "Apache-2.0"

{observal_cli-0.3.3 → observal_cli-0.3.4}/observal-server/schemas/constants.py

@@ -22,6 +22,7 @@ VALID_IDES: list[str] = [
     "vscode",
     "codex",
     "copilot",
+    "copilot-cli",
     "opencode",
 ]
 
@@ -48,6 +49,7 @@ IDE_FEATURE_MATRIX: dict[str, set[str]] = {
     "gemini-cli": {"hook_bridge", "mcp_servers", "rules", "otlp_telemetry"},
     "codex": {"rules"},
     "copilot": {"mcp_servers", "rules"},
+    "copilot-cli": {"mcp_servers", "rules", "hook_bridge"},
     "opencode": {"mcp_servers", "rules"},
     "vscode": {"mcp_servers", "rules"},
 }

{observal_cli-0.3.3 → observal_cli-0.3.4}/observal-server/services/agent_builder.py

@@ -18,6 +18,7 @@ from typing import Literal
 
 from pydantic import BaseModel, Field
 
+from services.agent_config_generator import _wrap_kiro_prompt
 from services.agent_resolver import ResolvedAgent, ResolvedComponent
 
 logger = logging.getLogger(__name__)
@@ -99,6 +100,7 @@ class AgentManifest(BaseModel):
     model_name: str = ""
     components: ManifestComponents = Field(default_factory=ManifestComponents)
     errors: list[ManifestError] = Field(default_factory=list)
+    otlp_http_url: str = ""
 
     def model_dump_compact(self) -> dict:
         """Clean manifest output (no empty lists, no None values)."""
@@ -410,7 +412,7 @@ def _generate_claude_code(manifest: AgentManifest) -> IdeAgentConfig:
         mcp_servers=mcp_entries,
         env={
             "CLAUDE_CODE_ENABLE_TELEMETRY": "1",
-            "OTEL_EXPORTER_OTLP_ENDPOINT": getattr(manifest, "_otlp_http_url", "") or "http://localhost:4318",
+            "OTEL_EXPORTER_OTLP_ENDPOINT": manifest.otlp_http_url or "http://localhost:4318",
             "OTEL_EXPORTER_OTLP_PROTOCOL": "http/json",
         },
         setup_commands=setup_commands,
@@ -475,7 +477,7 @@ def _generate_gemini_cli(manifest: AgentManifest) -> IdeAgentConfig:
     """Generate Gemini CLI agent config (GEMINI.md + .gemini/settings.json)."""
     mcp_entries = _build_mcp_entries(manifest)
     rules_content = _build_rules_markdown(manifest)
-    otlp_url = getattr(manifest, "_otlp_http_url", "") or "http://localhost:4318"
+    otlp_url = manifest.otlp_http_url or "http://localhost:4318"
 
     settings: dict = {
         "telemetry": {
@@ -516,12 +518,21 @@ def _generate_kiro(manifest: AgentManifest) -> IdeAgentConfig:
     kiro_agent = {
         "name": safe_name,
         "description": manifest.description[:200] if manifest.description else "",
-        "prompt": manifest.prompt,
+        "prompt": _wrap_kiro_prompt(manifest.prompt, safe_name),
         "mcpServers": mcp_entries,
-        "tools": [f"@{n}" for n in mcp_entries] + ["read", "write", "shell"],
+        "tools": ["*"],
+        "toolAliases": {},
+        "allowedTools": [],
+        "resources": [
+            "file://AGENTS.md",
+            "file://README.md",
+            "skill://.kiro/skills/*/SKILL.md",
+            "skill://~/.kiro/skills/*/SKILL.md",
+        ],
         "hooks": {},
+        "toolsSettings": {},
         "includeMcpJson": True,
-        "model": manifest.model_name or "default",
+        "model": None,  # Kiro uses "auto" model selection; actual model captured via SQLite in hooks
     }
 
     skill_files = _build_skill_files(manifest, "kiro")
@@ -543,7 +554,7 @@ def _generate_kiro(manifest: AgentManifest) -> IdeAgentConfig:
 def _generate_codex(manifest: AgentManifest) -> IdeAgentConfig:
     """Generate Codex agent config (AGENTS.md + ~/.codex/config.toml)."""
     rules_content = _build_rules_markdown(manifest)
-    otlp_url = getattr(manifest, "_otlp_http_url", "") or "http://localhost:4318"
+    otlp_url = manifest.otlp_http_url or "http://localhost:4318"
 
     toml_snippet = (
         "[otel]\n"
@@ -610,6 +621,45 @@ def _generate_copilot(manifest: AgentManifest) -> IdeAgentConfig:
     )
 
 
+def _generate_copilot_cli(manifest: AgentManifest) -> IdeAgentConfig:
+    """Generate Copilot CLI agent config (.github/copilot-instructions.md + .mcp.json)."""
+    mcp_entries = _build_mcp_entries(manifest)
+    rules_content = _build_rules_markdown(manifest)
+
+    files = [
+        AgentFile(
+            path=".github/copilot-instructions.md",
+            content=rules_content,
+            format="markdown",
+        ),
+    ]
+
+    if mcp_entries:
+        copilot_cli_mcp_entries = {}
+        for k, v in mcp_entries.items():
+            copilot_cli_mcp_entries[k] = {
+                "type": "stdio",
+                "command": v["command"],
+                "args": v.get("args", []),
+                "tools": ["*"],
+            }
+            if v.get("env"):
+                copilot_cli_mcp_entries[k]["env"] = v["env"]
+        files.append(
+            AgentFile(
+                path=".mcp.json",
+                content={"mcpServers": copilot_cli_mcp_entries},
+                format="json",
+            ),
+        )
+
+    return IdeAgentConfig(
+        ide="copilot-cli",
+        files=files,
+        mcp_servers=mcp_entries,
+    )
+
+
 def _generate_opencode(manifest: AgentManifest) -> IdeAgentConfig:
     """Generate OpenCode agent config (AGENTS.md + opencode.json with flat command arrays)."""
     mcp_entries = _build_mcp_entries(manifest)
@@ -657,6 +707,8 @@ _IDE_GENERATORS = {
     "kiro": _generate_kiro,
     "codex": _generate_codex,
     "copilot": _generate_copilot,
+    "copilot-cli": _generate_copilot_cli,
+    "copilot_cli": _generate_copilot_cli,
     "opencode": _generate_opencode,
 }
 
@@ -669,6 +721,7 @@ SUPPORTED_IDES = list(
         "kiro",
         "codex",
         "copilot",
+        "copilot-cli",
         "opencode",
     }
 )
@@ -685,5 +738,5 @@ def generate_ide_agent_files(manifest: AgentManifest, ide: str, otlp_http_url: s
         raise ValueError(f"Unsupported IDE: {ide!r}. Supported: {', '.join(SUPPORTED_IDES)}")
     # Thread the OTLP URL to generators that need it
     if otlp_http_url:
-        manifest._otlp_http_url = otlp_http_url  # type: ignore[attr-defined]
+        manifest.otlp_http_url = otlp_http_url
     return generator(manifest)