opencode-swarm 7.71.2 → 7.71.3
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.
|
@@ -82,6 +82,14 @@ tree:
|
|
|
82
82
|
|
|
83
83
|
- If `head_ref` is a remote branch that is not checked out locally, fetch it
|
|
84
84
|
(`git fetch origin <head_ref>`).
|
|
85
|
+
- **Check for parallel work first.** Before checkout, run the
|
|
86
|
+
[`parallel-work-check`](../generated/parallel-work-check/SKILL.md) protocol to
|
|
87
|
+
detect concurrent pushes from other agents (e.g., `hermes-pr-review` bot
|
|
88
|
+
following up, maintainer pushing fixes, parallel swarm work). If remote has new
|
|
89
|
+
commits: read `git log local..remote`, evaluate whether the parallel work
|
|
90
|
+
supersedes your planned fixes, and prefer the parallel work if it's more
|
|
91
|
+
comprehensive (more tests, better edge coverage, clearer error handling).
|
|
92
|
+
Abort your rebase, take the remote state, then add minor improvements on top.
|
|
85
93
|
- Verify the working tree is clean first (`git status --porcelain`). If uncommitted
|
|
86
94
|
changes exist, stash them or abort to prevent data loss.
|
|
87
95
|
- **Check out the head branch locally.** Feedback verification reads the working-tree
|
|
@@ -238,6 +238,75 @@ When the PR has merge conflicts:
|
|
|
238
238
|
- ✗ Pushing resolution without running tests on the merged result
|
|
239
239
|
- ✗ Reviewing a conflicted PR without resolving first — review effort is wasted if the merge changes the code
|
|
240
240
|
|
|
241
|
+
## Phase 0B-bis: Pre-Fix Parallel Work Check
|
|
242
|
+
|
|
243
|
+
When the review surfaces findings that need fixes, and before dispatching
|
|
244
|
+
coder for fix work, re-check for **parallel work** since the last fetch. The PR
|
|
245
|
+
author, the bot reviewer, or another swarm may have pushed commits while you
|
|
246
|
+
were reviewing.
|
|
247
|
+
|
|
248
|
+
### Step 1 — Refetch and compare
|
|
249
|
+
|
|
250
|
+
```bash
|
|
251
|
+
git fetch origin <pr-branch>
|
|
252
|
+
git log HEAD..origin/<pr-branch> --oneline
|
|
253
|
+
```
|
|
254
|
+
|
|
255
|
+
### Step 2 — Evaluate new commits
|
|
256
|
+
|
|
257
|
+
For each new commit on the remote:
|
|
258
|
+
|
|
259
|
+
1. **Read the commit message and diff.** Use `git show <commit> --stat` to see
|
|
260
|
+
file scope, then `git show <commit> -- <file>` to see the actual changes.
|
|
261
|
+
2. **Compare against your planned fixes:**
|
|
262
|
+
- Does the remote commit touch the same files your coder delegation is about to
|
|
263
|
+
modify?
|
|
264
|
+
- Does the remote commit apply a different approach to the same finding?
|
|
265
|
+
- Does the remote commit include more comprehensive fixes (more tests, better
|
|
266
|
+
edge coverage, cleaner error handling)?
|
|
267
|
+
3. **Default stance: prefer the parallel work if it supersedes your plan.** Run
|
|
268
|
+
the [`parallel-work-check`](../generated/parallel-work-check/SKILL.md)
|
|
269
|
+
protocol for the formal decision template.
|
|
270
|
+
|
|
271
|
+
### Step 3 — Three outcomes
|
|
272
|
+
|
|
273
|
+
- **Parallel work supersedes:** Abort your rebase. First verify the working tree
|
|
274
|
+
is clean (`git status --porcelain`); stash or discard any uncommitted changes
|
|
275
|
+
before proceeding. Then `git reset --hard origin/<pr-branch>` to take the
|
|
276
|
+
remote state, then re-verify that all your findings are addressed. If the
|
|
277
|
+
remote missed any, add minor improvements on top. Do NOT waste effort redoing
|
|
278
|
+
work the parallel agent already did better.
|
|
279
|
+
- **Parallel work complements:** Cherry-pick or merge the remote commits into
|
|
280
|
+
your local branch, then continue with your fix.
|
|
281
|
+
- **Parallel work unrelated:** Continue with your planned fix.
|
|
282
|
+
|
|
283
|
+
### Anti-patterns
|
|
284
|
+
|
|
285
|
+
- ✗ Pushing your fix without checking if the remote already fixed it — causes
|
|
286
|
+
duplicate work and may even fail the push if the commits conflict
|
|
287
|
+
- ✗ Force-pushing over parallel work because "I started this first" — the
|
|
288
|
+
parallel agent may have access to context you don't (different swarm
|
|
289
|
+
configuration, different model, different time budget)
|
|
290
|
+
- ✗ Blindly taking remote work without verifying it's actually better — the
|
|
291
|
+
parallel work may be incomplete or take a different approach that doesn't
|
|
292
|
+
match the original finding's intent
|
|
293
|
+
|
|
294
|
+
### Example: parallel swarm superseded local fix work
|
|
295
|
+
|
|
296
|
+
```
|
|
297
|
+
PARALLEL WORK CHECK (pre-fix):
|
|
298
|
+
- Branch: copilot/fix-legacy-hive-data-migration
|
|
299
|
+
- Local HEAD: 3c04997c fix: resolve PR #1238 review findings
|
|
300
|
+
- Remote HEAD: 79d7ec64 fix(knowledge-migrator): harden legacy migration loop
|
|
301
|
+
- Diverged: yes (remote is 2 commits ahead with more comprehensive fix)
|
|
302
|
+
- New commits on remote: 2
|
|
303
|
+
- Parallel swarm work detected: yes (different author)
|
|
304
|
+
- Decision: abandon-use-remote
|
|
305
|
+
- Rationale: Remote added 17 unit tests + try/catch error handling that
|
|
306
|
+
surpassed my planned batch-rewrite. Verified by re-running the test suite:
|
|
307
|
+
remote has 25/25 passing, my local plan would have produced 9/9.
|
|
308
|
+
```
|
|
309
|
+
|
|
241
310
|
---
|
|
242
311
|
|
|
243
312
|
# Default Review Workflow
|
package/dist/cli/index.js
CHANGED
|
@@ -52,7 +52,7 @@ var package_default;
|
|
|
52
52
|
var init_package = __esm(() => {
|
|
53
53
|
package_default = {
|
|
54
54
|
name: "opencode-swarm",
|
|
55
|
-
version: "7.71.
|
|
55
|
+
version: "7.71.3",
|
|
56
56
|
description: "Architect-centric agentic swarm plugin for OpenCode - hub-and-spoke orchestration with SME consultation, code generation, and QA review",
|
|
57
57
|
main: "dist/index.js",
|
|
58
58
|
types: "dist/index.d.ts",
|
package/dist/index.js
CHANGED
|
@@ -69,7 +69,7 @@ var package_default;
|
|
|
69
69
|
var init_package = __esm(() => {
|
|
70
70
|
package_default = {
|
|
71
71
|
name: "opencode-swarm",
|
|
72
|
-
version: "7.71.
|
|
72
|
+
version: "7.71.3",
|
|
73
73
|
description: "Architect-centric agentic swarm plugin for OpenCode - hub-and-spoke orchestration with SME consultation, code generation, and QA review",
|
|
74
74
|
main: "dist/index.js",
|
|
75
75
|
types: "dist/index.d.ts",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "opencode-swarm",
|
|
3
|
-
"version": "7.71.
|
|
3
|
+
"version": "7.71.3",
|
|
4
4
|
"description": "Architect-centric agentic swarm plugin for OpenCode - hub-and-spoke orchestration with SME consultation, code generation, and QA review",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|