vinta-ai-workflows 0.2.0-alpha5 → 0.2.0-alpha6

package/CHANGELOG.md

@@ -7,10 +7,43 @@ the project follows [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [0.2.0] — YYYY-MM-DD
 
-### Added
+<!-- pre-release: 0.2.0-alpha6 on 2026-07-13 -->
+
+### Changed
+
+- **`plan-feature` AI model tiers refreshed to the current model
+  generation.** `plan-feature/resources/ai-models.yaml` now cites the latest
+  IDs: tier 1 `gemini-2.5-flash-lite` → `gemini-3.1-flash-lite` and 
+  `gpt-5-nano` → `gpt-5.6-luna`; tier 2 `claude-sonnet-4-6` → `claude-sonnet-5` 
+  (incl. the Haiku step-up note) and `gemini-2.5-flash` → `gemini-3.5-flash`; tier 3 
+  `claude-sonnet-4-6` → `claude-sonnet-5` and the retired `gemini-2.5-pro` 
+  dropped in favor of `gemini-3-pro` and the retired `gpt-5` dropped in favor of
+  `gpt-5.6-terra`; tier 4 `claude-opus-4-7` → `claude-opus-4-8` and the retired
+  `o3` dropped in favor of `gpt-5.6-sol`. Tier *placement* is unchanged — only the
+  concrete IDs move. **Consumers**: re-sync to pick up the refreshed model
+  suggestions.
+
+### Fixed
+
+- **`implement-plan` stacked-branches now opens each phase PR against its
+  parent phase, not the default branch.** The git branch topology was already
+  stacked correctly (each phase branches off the previous phase's branch), but
+  nothing told the orchestrator what to write into the prs-context `base`
+  field, so it defaulted to `<BASE_BRANCH>` and **every stacked PR targeted the
+  default branch** — collapsing the stack and showing each PR the cumulative
+  diff. The stacked commit-strategy partial now spells out the PR base per
+  phase (first phase → default branch; every subsequent phase → the previous
+  phase's branch), the shared `pr-context` write step no longer defaults `base`
+  blindly, and the `prs-context` template comment states the rule. Modular /
+  single-PR strategies are unaffected (one PR against the default branch).
+  **Consumers**: re-sync to pick up the corrected `base` resolution; existing
+  PRs opened against the wrong base must be re-targeted manually.
 
 <!-- pre-release: 0.2.0-alpha5 on 2026-07-13 -->
 
+### Added
+
+
 - **`handoff` foundation skill — session-continuation handoff docs between
   agents.** Write mode captures the current task (goal, verified-vs-unverified
   state, decisions + rejected alternatives, landmines, single concrete next

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vinta-ai-workflows",
-  "version": "0.2.0-alpha5",
+  "version": "0.2.0-alpha6",
   "description": "Bootstrap AI tooling (AGENTS.md, skills, sub-agents) across Claude Code, Codex, Cursor, and VS Code + GitHub Copilot.",
   "type": "module",
   "bin": {

package/skills/vinta-derive-skills/resources/foundation-skills/plan-feature/resources/ai-models.yaml

@@ -11,7 +11,7 @@
 # Tier *placement* is human/LLM judgement — the job flags drift and proposes
 # edits, it does not blindly reassign tiers. See scripts/check-ai-models.mjs.
 schema_version: 1
-last_verified: 2026-06-22
+last_verified: 2026-07-13
 
 # Drift is checked against a free, no-key community aggregator (models.dev,
 # vendor-keyed with release dates + pricing), cross-checked against LiteLLM's
@@ -37,10 +37,10 @@ tiers:
       anthropic:
         - id: claude-haiku-4-5
       openai:
-        - id: gpt-5-nano
-          note: fall back to gpt-5-mini if file has any branching logic
+        - id: gpt-5.6-luna
+          note: optimized for cost-sensitive workloads
       google:
-        - id: gemini-2.5-flash-lite
+        - id: gemini-3.1-flash-lite
 
   - tier: 2
     label: standard pattern application
@@ -51,13 +51,13 @@ tiers:
     models:
       anthropic:
         - id: claude-haiku-4-5
-          note: with iteration; step up to claude-sonnet-4-6 if phase touches >3 files
-        - id: claude-sonnet-4-6
+          note: with iteration; step up to claude-sonnet-5 if phase touches >3 files
+        - id: claude-sonnet-5
           note: step-up target when phase touches >3 files
       openai:
         - id: gpt-5-mini
       google:
-        - id: gemini-2.5-flash
+        - id: gemini-3.5-flash
 
   - tier: 3
     label: multi-file orchestration, business logic, SQL views
@@ -68,11 +68,10 @@ tiers:
       covering concurrency edges.
     models:
       anthropic:
-        - id: claude-sonnet-4-6
+        - id: claude-sonnet-5
       openai:
-        - id: gpt-5
+        - id: gpt-5.6-terra
       google:
-        - id: gemini-2.5-pro
         - id: gemini-3-pro
           note: stronger code recall
 
@@ -84,15 +83,11 @@ tiers:
       tuning slow query against partitioned hot table, debugging heisenbug.
     models:
       anthropic:
-        - id: claude-opus-4-7
+        - id: claude-opus-4-8
           note: "[1m] 1M-context variant for large codebases"
       openai:
-        - id: gpt-5
-          note: with extended thinking
-        - id: o3
-          note: pure reasoning
-        - id: o4
-          note: pure reasoning
+        - id: gpt-5.6-sol
+          note: Frontier model for complex professional work
       google:
         - id: gemini-3-pro
           note: with thinking

package/skills/vinta-derive-skills/resources/plan-execution/partials/commit-strategy/stacked.md

@@ -19,6 +19,11 @@ git -C <WORKROOT> checkout plan/{plan-id-kebab}/phase-{prev.id}
 git -C <WORKROOT> checkout -b plan/{plan-id-kebab}/phase-{phase.id}
 git -C <WORKROOT> push -u origin plan/{plan-id-kebab}/phase-{phase.id}
 ```
+
+**PR base per phase** (the `base` field written into the prs-context frontmatter — this is what `gh pr create --base` / `glab mr create --target-branch` opens the PR against; getting it wrong makes every stacked PR target `<BASE_BRANCH>` instead of its parent phase):
+
+- **First executed phase** → `base = <BASE_BRANCH>`.
+- **Subsequent phases** → `base = plan/{plan-id-kebab}/phase-{prev.id}` (the previous phase's branch, **not** `<BASE_BRANCH>`). The PR must open against its parent phase so the diff shows only this phase's changes and the stack reviews cleanly.
 <!-- block-end: BRANCH_NAMING -->
 
 <!-- block-begin: PER_PHASE_COMMIT -->

package/skills/vinta-derive-skills/resources/plan-execution/partials/pr-context.md

@@ -39,7 +39,7 @@ Two project-level signals decide the actual behavior:
 
    When `generate_inline_comments = false`: skip this step. The file's `# Comments` block stays empty.
 
-4. **Write the prs-context file** at {{PRS_CONTEXT_FILE_PATH}}, following [resources/prs-context-template.md](../../prs-context-template.md). Frontmatter: `plan_id`, `feature_name`, `phase_id`, `phase_title`, `branch`, `base`, `created_at`, `status: pending`, empty `pr_url`. Body sections: `# Title` (single-line PR title), `# Description` (Markdown body — uses the project's PR template structure from step 2 when one exists), `# Comments` (YAML list of `{file, start_line, end_line?, side, body}` — empty list when comments are off).
+4. **Write the prs-context file** at {{PRS_CONTEXT_FILE_PATH}}, following [resources/prs-context-template.md](../../prs-context-template.md). Frontmatter: `plan_id`, `feature_name`, `phase_id`, `phase_title`, `branch`, `base`, `created_at`, `status: pending`, empty `pr_url`. **`base` is the branch the PR opens against — resolve it per the commit strategy, never default it to `<BASE_BRANCH>` blindly:** for stacked branches only the first executed phase bases on `<BASE_BRANCH>`; every subsequent phase bases on the **previous phase's branch** (see the PR-base rule under the {{BRANCH_PUSH_HEADING}} step above). For a single plan-level PR (modular / one-PR strategies) `base = <BASE_BRANCH>`. Body sections: `# Title` (single-line PR title), `# Description` (Markdown body — uses the project's PR template structure from step 2 when one exists), `# Comments` (YAML list of `{file, start_line, end_line?, side, body}` — empty list when comments are off).
 
 5. **Confirm `.vinta-ai-workflows/prs-context/` is in `.gitignore`.** [vinta-install-ai-tools-setup](../../../vinta-install-ai-tools-setup/SKILL.md) runs the multi-vendor setup script which appends `.vinta-ai-workflows/prs-context/` on its first invocation. If an older bootstrap missed it, append it now.
 

package/skills/vinta-derive-skills/resources/prs-context-template.md

@@ -6,7 +6,7 @@ feature_name: <FEATURE_NAME>             # UPPERCASE_WITH_UNDERSCORES, matches p
 phase_id: <phase-id>                     # e.g. "1", "4a"
 phase_title: <phase title>               # verbatim from the plan's Phased Rollout section
 branch: plan/<feature-kebab>/phase-<id>  # branch the PR opens from
-base: <main | plan/<feature-kebab>/phase-<prev-id>>  # target branch for the PR
+base: <main | plan/<feature-kebab>/phase-<prev-id>>  # PR target branch. Stacked: FIRST phase = default branch; every LATER phase = the PREVIOUS phase's branch (not the default branch). Modular / single-PR: default branch.
 created_at: <ISO 8601 timestamp>
 status: pending                          # `pending` until published; `published` after CLI run
 pr_url:                                  # set by open-pr-from-context after publishing