@laitszkin/apollo-toolkit 2.14.20 → 2.14.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -7,6 +7,11 @@ All notable changes to this repository are documented in this file.
7
7
  ### Changed
8
8
  - None yet.
9
9
 
10
+ ## [v2.14.21] - 2026-04-16
11
+
12
+ ### Changed
13
+ - Tighten `implement-specs-with-worktree` so branch/worktree setup uses direct `git` ref checks and requires an explicit re-check of repo state before retrying after ambiguous creation failures.
14
+
10
15
  ## [v2.14.20] - 2026-04-15
11
16
 
12
17
  ### Changed
@@ -24,8 +24,8 @@ description: >-
24
24
  ## Standards
25
25
 
26
26
  - Evidence: Read and understand the complete specs set before starting implementation, identify the authoritative parent branch that the worktree should inherit from, verify whether the requested scope is already implemented on that parent branch or current main working tree, and when the requested plan path is missing from the current worktree verify where the authoritative copy actually lives before substituting any nearby spec.
27
- - Execution: Create or use an isolated worktree for implementation only when the requested spec still needs work, sync the exact approved plan set into that worktree when it is missing there, create the worktree branch from the same parent branch as the worktree base, use the spec-set name as the canonical branch/worktree name, follow the implementation standards from the dependent skills, and commit to a local branch when done.
28
- - Quality: Complete all planned tasks, run relevant tests, backfill the spec documents with actual completion status, and avoid dragging unrelated sibling specs into the worktree just because they share a batch directory.
27
+ - Execution: Create or use an isolated worktree for implementation only when the requested spec still needs work, sync the exact approved plan set into that worktree when it is missing there, create the worktree branch from the same parent branch as the worktree base, use the spec-set name as the canonical branch/worktree name, prefer direct `git` ref checks over brittle shell inference when deciding whether a branch or worktree already exists, and commit to a local branch when done.
28
+ - Quality: Complete all planned tasks, run relevant tests, backfill the spec documents with actual completion status, avoid dragging unrelated sibling specs into the worktree just because they share a batch directory, and if branch/worktree creation reports ambiguous state re-check the actual git refs and worktree list before retrying.
29
29
  - Output: Keep the worktree branch clean with only the intended implementation commits.
30
30
 
31
31
  ## Goal
@@ -85,6 +85,12 @@ If not already in a worktree, or if the user explicitly requests a fresh worktre
85
85
  git worktree add ../<spec-name> <branch-name>
86
86
  ```
87
87
  - Move into the new worktree directory and begin work there.
88
+ - When checking whether the target branch or worktree already exists, use direct git evidence instead of shell heuristics:
89
+ ```bash
90
+ git show-ref --verify --quiet refs/heads/<branch-name>
91
+ git worktree list --porcelain
92
+ ```
93
+ - If branch creation or worktree creation fails in a way that leaves the state unclear, stop and re-read `git show-ref` plus `git worktree list --porcelain` before retrying; do not guess from wrapper output or compound shell conditionals.
88
94
 
89
95
  Use branch naming from `references/branch-naming.md`.
90
96
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@laitszkin/apollo-toolkit",
3
- "version": "2.14.20",
3
+ "version": "2.14.21",
4
4
  "description": "Apollo Toolkit npm installer for managed skill copying across Codex, OpenClaw, and Trae.",
5
5
  "license": "MIT",
6
6
  "author": "LaiTszKin",