Skip to content

chore: eliminate insider branch — consolidate to dev-based npm tag - #1095

Merged
tamirdresher merged 1 commit into
devfrom
squad/consolidate-insider-branch
May 7, 2026
Merged

tamirdresher merged 1 commit into
devfrom
squad/consolidate-insider-branch

Conversation

@tamirdresher

Copy link
Copy Markdown
Collaborator

Summary

Eliminates the \insider\ branch, consolidating from 3 long-lived branches to 2 (main, dev). The npm \insider\ dist-tag remains active but publishes from \dev\ via manual workflow dispatch.

Why

  • Branch confusion — Contributors tried features on insider that only existed on dev
  • Effectively abandoned — Zero open PRs target insider; 4 commits ahead (release artifacts only), 25 behind dev
  • Version confusion — insider (v0.9.5-insider.2) has higher version than dev (v0.9.1) and main (v0.9.4) despite fewer features

Changes

CI Workflows

  • squad-ci.yml — Removed insider from branch triggers
  • squad-insider-release.yml — Deleted (insider GitHub releases)
  • squad-insider-publish.yml — Changed to workflow_dispatch from dev

Documentation (9 files)

  • Branch strategy, insider-program.md rewrite, self-upgrade.md, cli.md, README.md

What's Preserved

  • npm @insider\ tag still works
  • --insider\ CLI flag still works
  • insider branch archived to \�rchive/insider-legacy\

Follow-up (after merge)

  • Archive insider → archive/insider-legacy
  • Delete 7 stale insider-fix branches
  • Publish dev to npm insider tag

- Remove insider from CI branch triggers (squad-ci.yml)
- Delete squad-insider-release.yml (no longer needed)
- Convert squad-insider-publish.yml to workflow_dispatch from dev
- Update CONTRIBUTING.md and docs branch strategy (2 branches: main, dev)
- Rewrite insider-program.md for npm-tag-based model
- Update self-upgrade.md, cli.md, README.md references

The insider npm dist-tag (@bradygaster/squad-cli@insider) remains active
but publishes from dev via manual workflow dispatch instead of a
separate insider branch. This eliminates branch confusion and reduces
maintenance from 3 long-lived branches to 2 (main + dev).

Closes the insider branch consolidation plan discussed with Brady Gaster.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

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

This PR removes the long-lived insider branch from the project’s branching/CI/docs model while keeping the npm insider dist-tag available, now published from dev via manual workflow dispatch.

Changes:

  • Updated CI triggers to stop targeting insider, and removed the insider GitHub Release workflow.
  • Converted the insider npm publish workflow to workflow_dispatch and pinned it to publish from dev.
  • Updated documentation to describe the dev-based insider channel and revised branch strategy references.

Reviewed changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated 7 comments.

Show a summary per file
File Description
README.md Updates CLI self-upgrade description to frame --insider as dev-channel builds.
docs/src/content/docs/reference/cli.md Updates version management snippet to describe @insider as dev-channel prerelease builds.
docs/src/content/docs/insider-program.md Rewrites insider program docs to remove dependence on an insider branch and describe dev-based publishing.
docs/src/content/docs/guide/contributing.md Updates branch strategy notes to remove insider branch and describe insider dist-tag behavior.
docs/src/content/docs/features/self-upgrade.md Adds a note about insider publishing coming from dev via the insider dist-tag.
CONTRIBUTING.md Mirrors contributing branch strategy updates and insider dist-tag note.
.github/workflows/squad-insider-release.yml Deletes workflow that created GitHub Releases from insider branch pushes.
.github/workflows/squad-insider-publish.yml Switches insider publishing to manual dispatch and checks out dev for test/publish jobs.
.github/workflows/squad-ci.yml Removes insider from PR/push branch triggers and adjusts policy gate logic accordingly.

Comment on lines +4 to +11
workflow_dispatch:
inputs:
dry_run:
description: 'Dry run — validate build without publishing'
required: false
default: 'false'
type: choice
options: ['false', 'true']
&& steps.labels.outputs.skip_version != 'true'
&& vars.SQUAD_VERSION_CHECK != 'false'
&& github.event.pull_request.base.ref != 'insider'
&& true
Comment on lines +23 to +27
dev (development) → npm @insider tag (on demand)
↓
preview (staging) → release candidate validation
↓
main (stable) → npm @latest tag
Comment on lines 9 to 15
@@ -15,6 +15,20 @@ The Insider Program gives you continuous access to development builds of Squad.

```

Squad can upgrade itself to the latest stable or insider release, then automatically refresh your repo templates.
Squad can upgrade itself to the latest stable or insider release, then automatically refresh your repo templates. Insider builds are published from the `dev` branch to the npm `insider` dist-tag.
Comment on lines 252 to +260
## Branch Strategy

- **main** — Stable, published releases. All merges include changesets.
- **insider** — Pre-release features, edge cases. Tag releases as `@insider`.
- **preview** — Staging branch for release candidates (promote: dev → preview → main).
- **bradygaster/dev** — Integration branch. **All PRs from forks must target this branch**, not `main`.
- **user/issue-slug** — Feature branches from users or agents.

> **Note:** The `insider` npm tag (`@bradygaster/squad-cli@insider`) publishes from `dev` via manual workflow dispatch. There is no separate insider branch.

Comment thread CONTRIBUTING.md
Comment on lines 336 to +344
## Branch Strategy

- **main** — Stable, published releases. All merges include changesets.
- **insider** — Pre-release features, edge cases. Tag releases as `@insider`.
- **preview** — Staging branch for release candidates (promote: dev → preview → main).
- **bradygaster/dev** — Integration branch. **All PRs from forks must target this branch**, not `main`.
- **user/issue-slug** — Feature branches from users or agents.

> **Note:** The `insider` npm tag (`@bradygaster/squad-cli@insider`) publishes from `dev` via manual workflow dispatch. There is no separate insider branch.

@tamirdresher
tamirdresher merged commit 987ac9b into dev May 7, 2026
10 checks passed
@tamirdresher
tamirdresher deleted the squad/consolidate-insider-branch branch May 7, 2026 17:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants