Skip to content

Commit 209b127

Browse files
committed
Merge remote-tracking branch 'upstream/main'
# Conflicts: # .github/workflows/scripts/create-github-release.sh
2 parents d22b021 + 23e0c5c commit 209b127

File tree

8 files changed

+77
-45
lines changed

8 files changed

+77
-45
lines changed

.github/workflows/scripts/create-github-release.sh

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,29 @@ VERSION="$1"
1616
VERSION_NO_V=${VERSION#v}
1717

1818
gh release create "$VERSION" \
19-
.genreleases/agentic-sdlc-spec-kit-template-copilot-sh-"$VERSION".zip \
20-
.genreleases/agentic-sdlc-spec-kit-template-copilot-ps-"$VERSION".zip \
21-
.genreleases/agentic-sdlc-spec-kit-template-claude-sh-"$VERSION".zip \
22-
.genreleases/agentic-sdlc-spec-kit-template-claude-ps-"$VERSION".zip \
23-
.genreleases/agentic-sdlc-spec-kit-template-gemini-sh-"$VERSION".zip \
24-
.genreleases/agentic-sdlc-spec-kit-template-gemini-ps-"$VERSION".zip \
25-
.genreleases/agentic-sdlc-spec-kit-template-cursor-sh-"$VERSION".zip \
26-
.genreleases/agentic-sdlc-spec-kit-template-cursor-ps-"$VERSION".zip \
27-
.genreleases/agentic-sdlc-spec-kit-template-opencode-sh-"$VERSION".zip \
28-
.genreleases/agentic-sdlc-spec-kit-template-opencode-ps-"$VERSION".zip \
29-
.genreleases/agentic-sdlc-spec-kit-template-qwen-sh-"$VERSION".zip \
30-
.genreleases/agentic-sdlc-spec-kit-template-qwen-ps-"$VERSION".zip \
31-
.genreleases/agentic-sdlc-spec-kit-template-windsurf-sh-"$VERSION".zip \
32-
.genreleases/agentic-sdlc-spec-kit-template-windsurf-ps-"$VERSION".zip \
33-
.genreleases/agentic-sdlc-spec-kit-template-codex-sh-"$VERSION".zip \
34-
.genreleases/agentic-sdlc-spec-kit-template-codex-ps-"$VERSION".zip \
35-
.genreleases/agentic-sdlc-spec-kit-template-kilocode-sh-"$VERSION".zip \
36-
.genreleases/agentic-sdlc-spec-kit-template-kilocode-ps-"$VERSION".zip \
37-
.genreleases/agentic-sdlc-spec-kit-template-auggie-sh-"$VERSION".zip \
38-
.genreleases/agentic-sdlc-spec-kit-template-auggie-ps-"$VERSION".zip \
39-
.genreleases/agentic-sdlc-spec-kit-template-roo-sh-"$VERSION".zip \
40-
.genreleases/agentic-sdlc-spec-kit-template-roo-ps-"$VERSION".zip \
41-
--title "Agentic SDLC Spec Kit Templates - $VERSION_NO_V" \
19+
.genreleases/spec-kit-template-copilot-sh-"$VERSION".zip \
20+
.genreleases/spec-kit-template-copilot-ps-"$VERSION".zip \
21+
.genreleases/spec-kit-template-claude-sh-"$VERSION".zip \
22+
.genreleases/spec-kit-template-claude-ps-"$VERSION".zip \
23+
.genreleases/spec-kit-template-gemini-sh-"$VERSION".zip \
24+
.genreleases/spec-kit-template-gemini-ps-"$VERSION".zip \
25+
.genreleases/spec-kit-template-cursor-sh-"$VERSION".zip \
26+
.genreleases/spec-kit-template-cursor-ps-"$VERSION".zip \
27+
.genreleases/spec-kit-template-opencode-sh-"$VERSION".zip \
28+
.genreleases/spec-kit-template-opencode-ps-"$VERSION".zip \
29+
.genreleases/spec-kit-template-qwen-sh-"$VERSION".zip \
30+
.genreleases/spec-kit-template-qwen-ps-"$VERSION".zip \
31+
.genreleases/spec-kit-template-windsurf-sh-"$VERSION".zip \
32+
.genreleases/spec-kit-template-windsurf-ps-"$VERSION".zip \
33+
.genreleases/spec-kit-template-codex-sh-"$VERSION".zip \
34+
.genreleases/spec-kit-template-codex-ps-"$VERSION".zip \
35+
.genreleases/spec-kit-template-kilocode-sh-"$VERSION".zip \
36+
.genreleases/spec-kit-template-kilocode-ps-"$VERSION".zip \
37+
.genreleases/spec-kit-template-auggie-sh-"$VERSION".zip \
38+
.genreleases/spec-kit-template-auggie-ps-"$VERSION".zip \
39+
.genreleases/spec-kit-template-roo-sh-"$VERSION".zip \
40+
.genreleases/spec-kit-template-roo-ps-"$VERSION".zip \
41+
.genreleases/spec-kit-template-q-sh-"$VERSION".zip \
42+
.genreleases/spec-kit-template-q-ps-"$VERSION".zip \
43+
--title "Spec Kit Templates - $VERSION_NO_V" \
4244
--notes-file release_notes.md

.github/workflows/scripts/create-release-packages.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,13 +172,16 @@ build_variant() {
172172
roo)
173173
mkdir -p "$base_dir/.roo/commands"
174174
generate_commands roo md "\$ARGUMENTS" "$base_dir/.roo/commands" "$script" ;;
175+
q)
176+
mkdir -p "$base_dir/.amazonq/prompts"
177+
generate_commands q md "\$ARGUMENTS" "$base_dir/.amazonq/prompts" "$script" ;;
175178
esac
176179
( cd "$base_dir" && zip -r "../agentic-sdlc-spec-kit-template-${agent}-${script}-${NEW_VERSION}.zip" . )
177180
echo "Created $GENRELEASES_DIR/agentic-sdlc-spec-kit-template-${agent}-${script}-${NEW_VERSION}.zip"
178181
}
179182

180183
# Determine agent list
181-
ALL_AGENTS=(claude gemini copilot cursor qwen opencode windsurf codex kilocode auggie roo)
184+
ALL_AGENTS=(claude gemini copilot cursor qwen opencode windsurf codex kilocode auggie roo q)
182185
ALL_SCRIPTS=(sh ps)
183186

184187

AGENTS.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ Specify supports multiple AI agents by generating agent-specific command files a
3838
| **Qwen Code** | `.qwen/commands/` | TOML | `qwen` | Alibaba's Qwen Code CLI |
3939
| **opencode** | `.opencode/command/` | Markdown | `opencode` | opencode CLI |
4040
| **Windsurf** | `.windsurf/workflows/` | Markdown | N/A (IDE-based) | Windsurf IDE workflows |
41+
| **Amazon Q Developer CLI** | `.amazonq/prompts/` | Markdown | `q` | Amazon Q Developer CLI |
42+
4143

4244
### Step-by-Step Integration Guide
4345

@@ -55,7 +57,8 @@ AI_CHOICES = {
5557
"cursor": "Cursor",
5658
"qwen": "Qwen Code",
5759
"opencode": "opencode",
58-
"windsurf": "Windsurf" # Add new agent here
60+
"windsurf": "Windsurf",
61+
"q": "Amazon Q Developer CLI" # Add new agent here
5962
}
6063
```
6164

@@ -69,10 +72,11 @@ agent_folder_map = {
6972
"qwen": ".qwen/",
7073
"opencode": ".opencode/",
7174
"codex": ".codex/",
72-
"windsurf": ".windsurf/", # Add new agent folder here
75+
"windsurf": ".windsurf/",
7376
"kilocode": ".kilocode/",
7477
"auggie": ".auggie/",
75-
"copilot": ".github/"
78+
"copilot": ".github/",
79+
"q": ".amazonq/" # Add new agent folder here
7680
}
7781
```
7882

@@ -99,7 +103,7 @@ Modify `.github/workflows/scripts/create-release-packages.sh`:
99103

100104
##### Add to ALL_AGENTS array:
101105
```bash
102-
ALL_AGENTS=(claude gemini copilot cursor qwen opencode windsurf)
106+
ALL_AGENTS=(claude gemini copilot cursor qwen opencode windsurf q)
103107
```
104108

105109
##### Add case statement for directory structure:
@@ -206,7 +210,7 @@ Work within integrated development environments:
206210
## Command File Formats
207211

208212
### Markdown Format
209-
Used by: Claude, Cursor, opencode, Windsurf
213+
Used by: Claude, Cursor, opencode, Windsurf, Amazon Q Developer
210214

211215
```markdown
212216
---

README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ Want to see Spec Kit in action? Watch our [video overview](https://www.youtube.c
133133
| [Kilo Code](https://github.com/Kilo-Org/kilocode) || |
134134
| [Auggie CLI](https://docs.augmentcode.com/cli/overview) || |
135135
| [Roo Code](https://roocode.com/) || |
136+
| [Amazon Q Developer CLI](https://aws.amazon.com/developer/learning/q-developer-cli/) | ⚠️ | Amazon Q Developer CLI [does not support](https://github.com/aws/amazon-q-developer-cli/issues/3064) custom arguments for slash commands. |
136137
| [Codex CLI](https://github.com/openai/codex) | ⚠️ | Codex [does not support](https://github.com/openai/codex/issues/2890) custom arguments for slash commands. |
137138

138139
## 🔧 Specify CLI Reference
@@ -151,7 +152,7 @@ The `specify` command supports the following options:
151152
| Argument/Option | Type | Description |
152153
|------------------------|----------|------------------------------------------------------------------------------|
153154
| `<project-name>` | Argument | Name for your new project directory (optional if using `--here`, or use `.` for current directory) |
154-
| `--ai` | Option | AI assistant to use: `claude`, `gemini`, `copilot`, `cursor`, `qwen`, `opencode`, `codex`, `windsurf`, `kilocode`, `auggie`, or `roo` |
155+
| `--ai` | Option | AI assistant to use: `claude`, `gemini`, `copilot`, `cursor`, `qwen`, `opencode`, `codex`, `windsurf`, `kilocode`, `auggie`, `roo`, or `q` |
155156
| `--script` | Option | Script variant to use: `sh` (bash/zsh) or `ps` (PowerShell) |
156157
| `--ignore-agent-tools` | Flag | Skip checks for AI agent tools like Claude Code |
157158
| `--no-git` | Flag | Skip git repository initialization |
@@ -268,7 +269,7 @@ Our research and experimentation focus on:
268269
## 🔧 Prerequisites
269270

270271
- **Linux/macOS** (or WSL2 on Windows)
271-
- AI coding agent: [Claude Code](https://www.anthropic.com/claude-code), [GitHub Copilot](https://code.visualstudio.com/), [Gemini CLI](https://github.com/google-gemini/gemini-cli), [Cursor](https://cursor.sh/), [Qwen CLI](https://github.com/QwenLM/qwen-code), [opencode](https://opencode.ai/), [Codex CLI](https://github.com/openai/codex), or [Windsurf](https://windsurf.com/)
272+
- AI coding agent: [Claude Code](https://www.anthropic.com/claude-code), [GitHub Copilot](https://code.visualstudio.com/), [Gemini CLI](https://github.com/google-gemini/gemini-cli), [Cursor](https://cursor.sh/), [Qwen CLI](https://github.com/QwenLM/qwen-code), [opencode](https://opencode.ai/), [Codex CLI](https://github.com/openai/codex), [Windsurf](https://windsurf.com/), or [Amazon Q Developer CLI](https://aws.amazon.com/developer/learning/q-developer-cli/)
272273
- [uv](https://docs.astral.sh/uv/) for package management
273274
- [Python 3.11+](https://www.python.org/downloads/)
274275
- [Git](https://git-scm.com/downloads)
@@ -318,6 +319,7 @@ specify init <project_name> --ai qwen
318319
specify init <project_name> --ai opencode
319320
specify init <project_name> --ai codex
320321
specify init <project_name> --ai windsurf
322+
specify init <project_name> --ai q
321323
# Or in current directory:
322324
specify init . --ai claude
323325
specify init . --ai codex
@@ -330,7 +332,7 @@ specify init . --force --ai claude
330332
specify init --here --force --ai claude
331333
```
332334

333-
The CLI will check if you have Claude Code, Gemini CLI, Cursor CLI, Qwen CLI, opencode, or Codex CLI installed. If you do not, or you prefer to get the templates without checking for the right tools, use `--ignore-agent-tools` with your command:
335+
The CLI will check if you have Claude Code, Gemini CLI, Cursor CLI, Qwen CLI, opencode, Codex CLI, or Amazon Q Developer CLI installed. If you do not, or you prefer to get the templates without checking for the right tools, use `--ignore-agent-tools` with your command:
334336

335337
```bash
336338
specify init <project_name> --ai claude --ignore-agent-tools

scripts/bash/update-agent-context.sh

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
#
3131
# 5. Multi-Agent Support
3232
# - Handles agent-specific file paths and naming conventions
33-
# - Supports: Claude, Gemini, Copilot, Cursor, Qwen, opencode, Codex, Windsurf
33+
# - Supports: Claude, Gemini, Copilot, Cursor, Qwen, opencode, Codex, Windsurf, Kilo Code, Auggie CLI, or Amazon Q Developer CLI
3434
# - Can update single agents or all existing agent files
3535
# - Creates default Claude file if no agent files exist
3636
#
3737
# Usage: ./update-agent-context.sh [agent_type]
38-
# Agent types: claude|gemini|copilot|cursor|qwen|opencode|codex|windsurf
38+
# Agent types: claude|gemini|copilot|cursor|qwen|opencode|codex|windsurf|kilocode|auggie|q
3939
# Leave empty to update all existing agent files
4040

4141
set -e
@@ -69,6 +69,7 @@ WINDSURF_FILE="$REPO_ROOT/.windsurf/rules/specify-rules.md"
6969
KILOCODE_FILE="$REPO_ROOT/.kilocode/rules/specify-rules.md"
7070
AUGGIE_FILE="$REPO_ROOT/.augment/rules/specify-rules.md"
7171
ROO_FILE="$REPO_ROOT/.roo/rules/specify-rules.md"
72+
Q_FILE="$REPO_ROOT/AGENTS.md"
7273

7374
# Template file
7475
TEMPLATE_FILE="$REPO_ROOT/.specify/templates/agent-file-template.md"
@@ -580,9 +581,12 @@ update_specific_agent() {
580581
roo)
581582
update_agent_file "$ROO_FILE" "Roo Code"
582583
;;
584+
q)
585+
update_agent_file "$Q_FILE" "Amazon Q Developer CLI"
586+
;;
583587
*)
584588
log_error "Unknown agent type '$agent_type'"
585-
log_error "Expected: claude|gemini|copilot|cursor|qwen|opencode|codex|windsurf|kilocode|auggie|roo"
589+
log_error "Expected: claude|gemini|copilot|cursor|qwen|opencode|codex|windsurf|kilocode|auggie|roo|q"
586590
exit 1
587591
;;
588592
esac
@@ -641,6 +645,11 @@ update_all_existing_agents() {
641645
update_agent_file "$ROO_FILE" "Roo Code"
642646
found_agent=true
643647
fi
648+
649+
if [[ -f "$Q_FILE" ]]; then
650+
update_agent_file "$Q_FILE" "Amazon Q Developer CLI"
651+
found_agent=true
652+
fi
644653

645654
# If no agent files exist, create a default Claude file
646655
if [[ "$found_agent" == false ]]; then
@@ -665,7 +674,7 @@ print_summary() {
665674
fi
666675

667676
echo
668-
log_info "Usage: $0 [claude|gemini|copilot|cursor|qwen|opencode|codex|windsurf|kilocode|auggie|roo]"
677+
log_info "Usage: $0 [claude|gemini|copilot|cursor|qwen|opencode|codex|windsurf|kilocode|auggie|q]"
669678
}
670679

671680
#==============================================================================

scripts/powershell/update-agent-context.ps1

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Mirrors the behavior of scripts/bash/update-agent-context.sh:
99
2. Plan Data Extraction
1010
3. Agent File Management (create from template or update existing)
1111
4. Content Generation (technology stack, recent changes, timestamp)
12-
5. Multi-Agent Support (claude, gemini, copilot, cursor, qwen, opencode, codex, windsurf)
12+
5. Multi-Agent Support (claude, gemini, copilot, cursor, qwen, opencode, codex, windsurf, kilocode, auggie, roo, q)
1313
1414
.PARAMETER AgentType
1515
Optional agent key to update a single agent. If omitted, updates all existing agent files (creating a default Claude file if none exist).
@@ -25,7 +25,7 @@ Relies on common helper functions in common.ps1
2525
#>
2626
param(
2727
[Parameter(Position=0)]
28-
[ValidateSet('claude','gemini','copilot','cursor','qwen','opencode','codex','windsurf','kilocode','auggie','roo')]
28+
[ValidateSet('claude','gemini','copilot','cursor','qwen','opencode','codex','windsurf','kilocode','auggie','roo','q')]
2929
[string]$AgentType
3030
)
3131

@@ -54,6 +54,7 @@ $WINDSURF_FILE = Join-Path $REPO_ROOT '.windsurf/rules/specify-rules.md'
5454
$KILOCODE_FILE = Join-Path $REPO_ROOT '.kilocode/rules/specify-rules.md'
5555
$AUGGIE_FILE = Join-Path $REPO_ROOT '.augment/rules/specify-rules.md'
5656
$ROO_FILE = Join-Path $REPO_ROOT '.roo/rules/specify-rules.md'
57+
$Q_FILE = Join-Path $REPO_ROOT 'AGENTS.md'
5758

5859
$TEMPLATE_FILE = Join-Path $REPO_ROOT '.specify/templates/agent-file-template.md'
5960

@@ -376,7 +377,8 @@ function Update-SpecificAgent {
376377
'kilocode' { Update-AgentFile -TargetFile $KILOCODE_FILE -AgentName 'Kilo Code' }
377378
'auggie' { Update-AgentFile -TargetFile $AUGGIE_FILE -AgentName 'Auggie CLI' }
378379
'roo' { Update-AgentFile -TargetFile $ROO_FILE -AgentName 'Roo Code' }
379-
default { Write-Err "Unknown agent type '$Type'"; Write-Err 'Expected: claude|gemini|copilot|cursor|qwen|opencode|codex|windsurf|kilocode|auggie|roo'; return $false }
380+
'q' { Update-AgentFile -TargetFile $Q_FILE -AgentName 'Amazon Q Developer CLI' }
381+
default { Write-Err "Unknown agent type '$Type'"; Write-Err 'Expected: claude|gemini|copilot|cursor|qwen|opencode|codex|windsurf|kilocode|auggie|roo|q'; return $false }
380382
}
381383
}
382384

@@ -393,6 +395,7 @@ function Update-AllExistingAgents {
393395
if (Test-Path $KILOCODE_FILE) { if (-not (Update-AgentFile -TargetFile $KILOCODE_FILE -AgentName 'Kilo Code')) { $ok = $false }; $found = $true }
394396
if (Test-Path $AUGGIE_FILE) { if (-not (Update-AgentFile -TargetFile $AUGGIE_FILE -AgentName 'Auggie CLI')) { $ok = $false }; $found = $true }
395397
if (Test-Path $ROO_FILE) { if (-not (Update-AgentFile -TargetFile $ROO_FILE -AgentName 'Roo Code')) { $ok = $false }; $found = $true }
398+
if (Test-Path $Q_FILE) { if (-not (Update-AgentFile -TargetFile $Q_FILE -AgentName 'Amazon Q Developer CLI')) { $ok = $false }; $found = $true }
396399
if (-not $found) {
397400
Write-Info 'No existing agent files found, creating default Claude file...'
398401
if (-not (Update-AgentFile -TargetFile $CLAUDE_FILE -AgentName 'Claude Code')) { $ok = $false }
@@ -407,7 +410,7 @@ function Print-Summary {
407410
if ($NEW_FRAMEWORK) { Write-Host " - Added framework: $NEW_FRAMEWORK" }
408411
if ($NEW_DB -and $NEW_DB -ne 'N/A') { Write-Host " - Added database: $NEW_DB" }
409412
Write-Host ''
410-
Write-Info 'Usage: ./update-agent-context.ps1 [-AgentType claude|gemini|copilot|cursor|qwen|opencode|codex|windsurf|kilocode|auggie|roo]'
413+
Write-Info 'Usage: ./update-agent-context.ps1 [-AgentType claude|gemini|copilot|cursor|qwen|opencode|codex|windsurf|kilocode|auggie|roo|q]'
411414
}
412415

413416
function Main {

0 commit comments

Comments
 (0)