From 4a8dc3aee38cbbd7a1e8c34ce96e291480c3c759 Mon Sep 17 00:00:00 2001 From: Justin Dorfman Date: Thu, 16 Oct 2025 10:01:42 -0700 Subject: [PATCH 1/3] docs: update CLI documentation with new features and commands - Update visibility options to workspace/group (removed team) - Add new CLI flags: --jetbrains, --ide, --stream-json, --stream-json-input - Add new tool commands: make and use - Add MCP server management commands: add, remove, doctor - Add connect command for web interface integration - Include MCP server configuration examples - Add amp.updates.mode configuration option - Update last modified date to 2025-10-16 Amp-Thread-ID: https://ampcode.com/threads/T-f6b54b62-630e-48c7-8198-8bce005ed32a Co-authored-by: Amp --- docs/amp_cli_docs.md | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/docs/amp_cli_docs.md b/docs/amp_cli_docs.md index e70e897..23fb487 100644 --- a/docs/amp_cli_docs.md +++ b/docs/amp_cli_docs.md @@ -126,7 +126,7 @@ Amp CLI supports the following options: | Option | Description | | --------------------------- | ----------- | -| `--visibility ` | Set thread visibility (private, public, team) | +| `--visibility ` | Set thread visibility (private, public, workspace, group) | | `-V, --version` | output the version number | | `--notifications` | Enable sound notifications (enabled by default when not in execute mode) | | `--no-notifications` | Disable sound notifications (enabled by default when not in execute mode) | @@ -135,7 +135,12 @@ Amp CLI supports the following options: | `--log-file ` | Set log file location (overrides the default location) | | `--dangerously-allow-all` | Disable all command confirmation prompts (agent will execute all commands without asking) | | `--mcp-config ` | JSON configuration or file path for MCP servers to merge with existing settings | -| `--try-gpt5` | Try GPT-5 as the primary agent model (limited time; see `https://ampcode.com/news/`gpt-5) | +| `--jetbrains` | Enable JetBrains integration. When enabled, Amp automatically includes your open JetBrains file and text selection with every message. | +| `--no-jetbrains` | Disable JetBrains integration. | +| `--ide` | Enable IDE connection (default). When enabled, Amp automatically includes your open IDE's file and text selection with every message. | +| `--no-ide` | Disable IDE connection. | +| `--stream-json` | When used with --execute, output in Claude Code compatible stream JSON format instead of plain text. | +| `--stream-json-input` | Read JSON Lines user messages from stdin. Requires both --execute and --stream-json. | | `-x, --execute [message]` | Use execute mode, optionally with user message. In execute mode, agent will execute provided prompt (either as argument, or via stdin). Only last assistant message is printed. Enabled automatically when redirecting stdout. | ## Commands @@ -156,11 +161,18 @@ Amp CLI includes several subcommands for enhanced functionality: | `tools` | Tool management commands | | `tools list` | List all active tools (including MCP tools) | | `tools show` | Show details about an active tool | +| `tools make` | Sets up a skeleton tool in your toolbox | +| `tools use` | Invoke a tool with arguments or JSON input from stdin | | `permissions` | Manage permissions | | `permissions list` | List permissions | | `permissions test` | Test permissions | | `permissions edit` | Edit permissions | | `permissions add` | Add permission rule | +| `mcp` | Manage MCP servers | +| `mcp add` | Add an MCP server configuration | +| `mcp remove` | Remove an MCP server configuration | +| `mcp doctor` | Check MCP server status | +| `connect` | Connect CLI to web interface for multi-thread management | | `doctor` | Generate support bundle | | `update` | Update Amp CLI | @@ -249,6 +261,24 @@ Execute a prompt from a file and store final assistant message output in a file amp < prompt.txt > output.txt ``` +Add an MCP server with a local command: + +```bash +amp mcp add context7 -- npx -y @upstash/context7-mcp +``` + +Add an MCP server with environment variables: + +```bash +amp mcp add postgres --env PGUSER=orb -- npx -y @modelcontextprotocol/server-postgres postgresql://localhost/orbing +``` + +Add a remote MCP server: + +```bash +amp mcp add hugging-face https://huggingface.co/mcp +``` + ## Configuration Amp can be configured using a JSON settings file located at `~/.config/amp/settings.json`. All settings use the "amp." prefix. @@ -287,7 +317,8 @@ Sample configuration: "amp.guardedFiles.allowlist": [], "amp.dangerouslyAllowAll": false, "amp.git.commit.coauthor.enabled": true, - "amp.git.commit.ampThread.enabled": true + "amp.git.commit.ampThread.enabled": true, + "amp.updates.mode": "auto" } ``` @@ -303,6 +334,7 @@ Sample configuration: - **`amp.git.commit.coauthor.enabled`**: Enable adding Amp as co-author in git commits - **`amp.git.commit.ampThread.enabled`**: Enable adding Amp-Thread trailer in git commits - **`amp.proxy`**: Proxy URL used for both HTTP and HTTPS requests to the Amp server +- **`amp.updates.mode`**: Control update checking behavior: "warn" shows update notifications, "disabled" turns off checking, "auto" automatically runs update. ## Tool Usage @@ -372,4 +404,4 @@ If you see an "Out of free credits" message, visit [ampcode.com/settings](https: ## Last updated -2025-09-05 +2025-10-16 From 5abce1d157adb6ce062e3240a781694b129daac2 Mon Sep 17 00:00:00 2001 From: Justin Dorfman Date: Thu, 16 Oct 2025 10:07:36 -0700 Subject: [PATCH 2/3] Fix linting errors in amp_cli_docs.md: align tables and escape brackets Amp-Thread-ID: https://ampcode.com/threads/T-7330cdac-eeb6-482a-9423-c5a6b641cbc3 Co-authored-by: Amp --- docs/amp_cli_docs.md | 117 ++++++++++++++++++++----------------------- 1 file changed, 55 insertions(+), 62 deletions(-) diff --git a/docs/amp_cli_docs.md b/docs/amp_cli_docs.md index 23fb487..d19f6ab 100644 --- a/docs/amp_cli_docs.md +++ b/docs/amp_cli_docs.md @@ -124,68 +124,67 @@ export AMP_API_KEY=your_amp_api_key_here Amp CLI supports the following options: -| Option | Description | -| --------------------------- | ----------- | -| `--visibility ` | Set thread visibility (private, public, workspace, group) | -| `-V, --version` | output the version number | -| `--notifications` | Enable sound notifications (enabled by default when not in execute mode) | -| `--no-notifications` | Disable sound notifications (enabled by default when not in execute mode) | -| `--settings-file ` | Custom settings file path (overrides the default location) | -| `--log-level ` | Set log level (error, warn, info, debug, audit) | -| `--log-file ` | Set log file location (overrides the default location) | -| `--dangerously-allow-all` | Disable all command confirmation prompts (agent will execute all commands without asking) | -| `--mcp-config ` | JSON configuration or file path for MCP servers to merge with existing settings | -| `--jetbrains` | Enable JetBrains integration. When enabled, Amp automatically includes your open JetBrains file and text selection with every message. | -| `--no-jetbrains` | Disable JetBrains integration. | -| `--ide` | Enable IDE connection (default). When enabled, Amp automatically includes your open IDE's file and text selection with every message. | -| `--no-ide` | Disable IDE connection. | -| `--stream-json` | When used with --execute, output in Claude Code compatible stream JSON format instead of plain text. | -| `--stream-json-input` | Read JSON Lines user messages from stdin. Requires both --execute and --stream-json. | -| `-x, --execute [message]` | Use execute mode, optionally with user message. In execute mode, agent will execute provided prompt (either as argument, or via stdin). Only last assistant message is printed. Enabled automatically when redirecting stdout. | +| Option | Description | +| ------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| --visibility | Set thread visibility (private, public, workspace, group) | +| -V, --version | output the version number | +| --notifications | Enable sound notifications (enabled by default when not in execute mode) | +| --no-notifications | Disable sound notifications (enabled by default when not in execute mode) | +| --settings-file | Custom settings file path (overrides the default location) | +| --log-level | Set log level (error, warn, info, debug, audit) | +| --log-file | Set log file location (overrides the default location) | +| --dangerously-allow-all | Disable all command confirmation prompts (agent will execute all commands without asking) | +| --mcp-config | JSON configuration or file path for MCP servers to merge with existing settings | +| --jetbrains | Enable JetBrains integration. When enabled, Amp automatically includes your open JetBrains file and text selection with every message. | +| --no-jetbrains | Disable JetBrains integration. | +| --ide | Enable IDE connection (default). When enabled, Amp automatically includes your open IDE's file and text selection with every message. | +| --no-ide | Disable IDE connection. | +| --stream-json | When used with --execute, output in Claude Code compatible stream JSON format instead of plain text. | +| --stream-json-input | Read JSON Lines user messages from stdin. Requires both --execute and --stream-json. | +| -x, --execute \[message\] | Use execute mode, optionally with user message. In execute mode, agent will execute provided prompt (either as argument, or via stdin). Only last assistant message is printed. Enabled automatically when redirecting stdout. | ## Commands Amp CLI includes several subcommands for enhanced functionality: -| Command | Description | -| --------------------- | ----------- | -| `logout` | Log out by removing stored API key | -| `login` | Log in to Amp | -| `threads` | Manage threads | -| `threads new` | Create a new thread | -| `threads continue` | Continue an existing thread | -| `threads fork` | Fork an existing thread | -| `threads list` | List all threads | -| `threads share` | Share a thread | -| `threads compact` | Compact a thread | -| `tools` | Tool management commands | -| `tools list` | List all active tools (including MCP tools) | -| `tools show` | Show details about an active tool | -| `tools make` | Sets up a skeleton tool in your toolbox | -| `tools use` | Invoke a tool with arguments or JSON input from stdin | -| `permissions` | Manage permissions | -| `permissions list` | List permissions | -| `permissions test` | Test permissions | -| `permissions edit` | Edit permissions | -| `permissions add` | Add permission rule | -| `mcp` | Manage MCP servers | -| `mcp add` | Add an MCP server configuration | -| `mcp remove` | Remove an MCP server configuration | -| `mcp doctor` | Check MCP server status | -| `connect` | Connect CLI to web interface for multi-thread management | - -| `doctor` | Generate support bundle | -| `update` | Update Amp CLI | +| Command | Description | +| ------------------ | -------------------------------------------------------- | +| `logout` | Log out by removing stored API key | +| `login` | Log in to Amp | +| `threads` | Manage threads | +| `threads new` | Create a new thread | +| `threads continue` | Continue an existing thread | +| `threads fork` | Fork an existing thread | +| `threads list` | List all threads | +| `threads share` | Share a thread | +| `threads compact` | Compact a thread | +| `tools` | Tool management commands | +| `tools list` | List all active tools (including MCP tools) | +| `tools show` | Show details about an active tool | +| `tools make` | Sets up a skeleton tool in your toolbox | +| `tools use` | Invoke a tool with arguments or JSON input from stdin | +| `permissions` | Manage permissions | +| `permissions list` | List permissions | +| `permissions test` | Test permissions | +| `permissions edit` | Edit permissions | +| `permissions add` | Add permission rule | +| `mcp` | Manage MCP servers | +| `mcp add` | Add an MCP server configuration | +| `mcp remove` | Remove an MCP server configuration | +| `mcp doctor` | Check MCP server status | +| `connect` | Connect CLI to web interface for multi-thread management | +| `doctor` | Generate support bundle | +| `update` | Update Amp CLI | ## Environment Variables -| Variable | Description | -| ------------------- | ----------- | -| `AMP_API_KEY` | API key for Amp (see `https://ampcode.com/settings`) | -| `AMP_URL` | URL for the Amp service (default is `https://ampcode.com/`) | -| `AMP_LOG_LEVEL` | Set log level (can also use --log-level) | -| `AMP_LOG_FILE` | Set log file location (can also use --log-file) | -| `AMP_SETTINGS_FILE` | Set settings file path (can also use --settings-file, default: ~/.config/amp/settings.json) | +| Variable | Description | +| ----------------- | ------------------------------------------------------------------------------------------- | +| AMP_API_KEY | API key for Amp (see https://ampcode.com/settings) | +| AMP_URL | URL for the Amp service (default is https://ampcode.com/) | +| AMP_LOG_LEVEL | Set log level (can also use --log-level) | +| AMP_LOG_FILE | Set log file location (can also use --log-file) | +| AMP_SETTINGS_FILE | Set settings file path (can also use --settings-file, default: ~/.config/amp/settings.json) | ## Examples @@ -298,19 +297,13 @@ Sample configuration: ] } }, - "amp.tools.disable": [ - "browser_navigate", - "builtin:edit_file" - ], + "amp.tools.disable": ["browser_navigate", "builtin:edit_file"], "amp.permissions": [ { "tool": "Bash", "action": "ask", "matches": { - "cmd": [ - "git push*", - "git commit*" - ] + "cmd": ["git push*", "git commit*"] } } ], From 479c3dfbe150f5c95ed079a07451915958f1dd15 Mon Sep 17 00:00:00 2001 From: Justin Dorfman Date: Thu, 16 Oct 2025 10:13:26 -0700 Subject: [PATCH 3/3] Whitelist additional npm package URLs in CI workflow Amp-Thread-ID: https://ampcode.com/threads/T-e01d6513-cc25-4c19-b2e9-e85a49e44dba Co-authored-by: Amp --- .github/workflows/lint.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 775113c..8dea973 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -42,4 +42,4 @@ jobs: - name: "install awesome-bot" run: gem install awesome_bot - name: "linting: ${{ matrix.files }}" - run: awesome_bot --allow-redirect --white-list https://github.com/jdorfman/awesome-amp-cli,https://example.com,https://github.com/user-attachments/assets/44099391-3976-473d-bcf8-95fd7b980f99 ${{ matrix.files }} + run: awesome_bot --allow-redirect --white-list https://github.com/jdorfman/awesome-amp-cli,https://example.com,https://github.com/user-attachments/assets/44099391-3976-473d-bcf8-95fd7b980f99,https://www.npmjs.com/package/llm-rules,https://www.npmjs.com/package/@sourcegraph/amp ${{ matrix.files }}