Skip to content

fix: bump CLI version to 0.9.7-preview and relax E2E skill version check - #1155

Merged
tamirdresher merged 5 commits into
bradygaster:devfrom
obit91:obit91/1152-1153-fix-version-and-e2e-skill
May 26, 2026
Merged

fix: bump CLI version to 0.9.7-preview and relax E2E skill version check#1155
tamirdresher merged 5 commits into
bradygaster:devfrom
obit91:obit91/1152-1153-fix-version-and-e2e-skill

Conversation

@obit91

@obit91 obit91 commented May 22, 2026

Copy link
Copy Markdown
Contributor

Summary

Fixes two policy gate CI failures caused by an incorrect version stamp in packages/squad-cli/package.json, and aligns all copies of the e2e-template-testing skill and the CI policy gate itself with CONTRIBUTING.md guidance.

Closes #1152
Closes #1153

Changes

packages/squad-cli/package.json

The insider publish workflow stamped the CLI at 0.9.6-build.4, which contains a - but not the -preview suffix required by the policy gate. Bumped to 0.9.7-preview per CONTRIBUTING.md.

.github/workflows/squad-ci.yml — Prerelease Version Guard

The guard used /-/.test(version) which rejects any hyphenated version, including the CONTRIBUTING.md-sanctioned x.y.z-preview format. Updated to:

  • Allow x.y.z-preview (the canonical dev version per CONTRIBUTING.md)
  • Block all other prerelease tags: -build.N, -alpha, -beta, etc.

Before:

if (pkg.version && /-/.test(pkg.version))

After:

// Allow x.y.z-preview (CONTRIBUTING.md canonical dev suffix); block all other prerelease tags
if (pkg.version && /-/.test(pkg.version) && !/^\d+\.\d+\.\d+-preview$/.test(pkg.version))

All 4 copies of e2e-template-testing/SKILL.md

Affected locations:

  • .squad-templates/skills/e2e-template-testing/SKILL.md
  • templates/skills/e2e-template-testing/SKILL.md
  • packages/squad-sdk/templates/skills/e2e-template-testing/SKILL.md
  • packages/squad-cli/templates/skills/e2e-template-testing/SKILL.md

Build commands — aligned with CONTRIBUTING.md lines 253-256:

Before:

npm run build
cd packages/squad-cli && npm link

After:

npm run build -w packages/squad-sdk && npm run build -w packages/squad-cli
npm link -w packages/squad-cli

Version verify text — changed from hardcoded 0.9.7-preview to version-agnostic x.y.z-preview placeholder with explicit note that the -preview suffix is required, linking to CONTRIBUTING.md.

Validation

E2E skill steps verified end-to-end on this branch:

  • Build ✅, link ✅, squad version0.9.7-preview
  • squad init in a fresh repo stamps <!-- version: 0.9.7-preview -->

See validation comment for full details.

@obit91
obit91 marked this pull request as ready for review May 22, 2026 16:08
Copilot AI review requested due to automatic review settings May 22, 2026 16:08
@obit91

obit91 commented May 22, 2026

Copy link
Copy Markdown
Contributor Author

@bradygaster @tamirdresher — update on the CI policy gate failure.

The skip-version-check label is no longer needed. The policy gate has been fixed in this PR itself.

Root cause: The gate used /-/.test(version) which rejects any hyphenated version — including x.y.z-preview, which CONTRIBUTING.md explicitly mandates as the canonical dev version format.

Fix (in this PR): Updated the guard to allow x.y.z-preview specifically while still blocking unsanctioned suffixes like -build.4, -alpha, -beta:

// Before
if (pkg.version && /-/.test(pkg.version))

// After — allows CONTRIBUTING.md-sanctioned -preview, blocks everything else
if (pkg.version && /-/.test(pkg.version) && !/^\d+\.\d+\.\d+-preview$/.test(pkg.version))

The latest CI run on this branch should pass the version gate cleanly. The E2E skill steps were also validated end-to-end (see validation comment).

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

Updates the E2E template-testing skill documentation to clarify the squad version verification step and bumps the Squad CLI package version to a new preview release.

Changes:

  • Updated SKILL.md instructions to describe expected squad version output (with an example).
  • Bumped @bradygaster/squad-cli version to 0.9.7-preview.
  • Applied the same doc change across all mirrored template locations.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.

Show a summary per file
File Description
templates/skills/e2e-template-testing/SKILL.md Clarifies the squad version verification guidance in the base template.
packages/squad-sdk/templates/skills/e2e-template-testing/SKILL.md Mirrors the same verification wording in the SDK template copy.
packages/squad-cli/templates/skills/e2e-template-testing/SKILL.md Mirrors the same verification wording in the CLI template copy.
.squad-templates/skills/e2e-template-testing/SKILL.md Mirrors the same verification wording in the internal template copy.
packages/squad-cli/package.json Bumps the CLI version to 0.9.7-preview.

Comment thread templates/skills/e2e-template-testing/SKILL.md Outdated
Comment thread packages/squad-sdk/templates/skills/e2e-template-testing/SKILL.md Outdated
Comment thread packages/squad-cli/templates/skills/e2e-template-testing/SKILL.md Outdated
@obit91

obit91 commented May 22, 2026

Copy link
Copy Markdown
Contributor Author

E2E Skill Validation

Manually verified the updated SKILL.md build steps work end-to-end on this branch:

Step 1 — Build

npm run build -w packages/squad-sdk && npm run build -w packages/squad-cli

Both compiled cleanly (exit 0).

Step 2 — Link

npm link -w packages/squad-cli

Linked successfully.

Step 3 — Version check

squad version

Output: 0.9.7-preview-preview suffix confirmed.

Step 4 — squad init version stamp

Ran squad init in a fresh isolated repo. The generated .github/agents/squad.agent.md was stamped with:

<!-- version: 0.9.7-preview -->

Version flows correctly from package.json → build → link → init stamp. ✅

No regressions introduced by the SKILL.md build/link command changes.

obit91 and others added 5 commits May 25, 2026 23:59
The insider publish workflow stamped the CLI at 0.9.6-build.4, which
triggered the policy-gates 'PRERELEASE VERSION DETECTED' check in PR bradygaster#1035.

This commit:

1. Bumps packages/squad-cli/package.json from 0.9.6-build.4 to 0.9.7-preview
   - Per CONTRIBUTING.md convention, the local dev version should be
     {next-version}-preview (e.g. 0.9.7-preview for the next dev cycle)
   - The -build.N suffix was stamped by the insider publish workflow and
     should not appear on the dev branch
   - This PR uses the skip-version-check label as the designed escape hatch
     since 0.9.7-preview itself has a prerelease suffix required by convention

2. Updates all 4 copies of the e2e-template-testing SKILL.md to relax the
   version verification step from 'should show the -preview tag' to
   'outputs a version string (e.g., 0.9.7-preview on a dev branch)'
   - The original wording implied -preview is the only valid format
   - The new wording makes the intent clear: any valid version string is
     acceptable; -preview is the expected dev convention, not a requirement
   - All 4 copies updated to stay in sync:
     .squad-templates/skills/e2e-template-testing/SKILL.md
     templates/skills/e2e-template-testing/SKILL.md
     packages/squad-sdk/templates/skills/e2e-template-testing/SKILL.md
     packages/squad-cli/templates/skills/e2e-template-testing/SKILL.md

Closes bradygaster#1152
Closes bradygaster#1153

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
The e2e skill Step 1 used a different build/link approach than CONTRIBUTING.md:
- Was: npm run build + cd packages/squad-cli && npm link
- Now: npm run build -w packages/squad-sdk && npm run build -w packages/squad-cli
       + npm link -w packages/squad-cli (workspace flag, no directory change)

Also fixes version verification text:
- Was: hardcoded 0.9.7-preview example (stale, misleading)
- Now: version-agnostic x.y.z-preview placeholder; explicit that -preview suffix
  confirms the local build is active; links to CONTRIBUTING.md for full guidance.

Applied to all three copies of the skill file.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
- Update changeset to describe CONTRIBUTING.md build/link alignment and
  version-agnostic x.y.z-preview placeholder (not just version bump)
- Fix .squad-templates/skills/e2e-template-testing/SKILL.md which was
  not updated in the previous commit (was missing workspace-flag build
  commands and version-agnostic verify text)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
The policy gate used /-/.test(version) which rejects ANY hyphenated version,
including x.y.z-preview which CONTRIBUTING.md explicitly mandates as the
canonical local dev version format.

Updated regex to allow x.y.z-preview specifically while still blocking all
other prerelease suffixes (-build.N, -alpha, -beta, etc.).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@obit91
obit91 force-pushed the obit91/1152-1153-fix-version-and-e2e-skill branch from e216557 to b429254 Compare May 25, 2026 21:00
@tamirdresher
tamirdresher merged commit 8c33f9f into bradygaster:dev May 26, 2026
5 of 6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

3 participants