Skip to content

Commit f249e0c

Browse files
Merge branch 'worktree-20260318-154530'
2 parents e31f77f + 32f9426 commit f249e0c

File tree

4 files changed

+49
-55
lines changed

4 files changed

+49
-55
lines changed

.tickets/.index.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
"dso-bkqa"
178178
],
179179
"priority": 0,
180-
"status": "in_progress",
180+
"status": "closed",
181181
"title": "Remove commands.test_plugin from validate-config.sh KNOWN_KEYS",
182182
"type": "task"
183183
},
@@ -657,7 +657,7 @@
657657
"dso-jqin": {
658658
"deps": [],
659659
"priority": 0,
660-
"status": "open",
660+
"status": "in_progress",
661661
"title": "Remove Step 1.75 (Plugin Tests) from COMMIT-WORKFLOW.md and flip test assertion",
662662
"type": "task"
663663
},

.tickets/dso-jqin.md

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
id: dso-jqin
3-
status: open
3+
status: in_progress
44
deps: []
55
links: []
66
created: 2026-03-18T23:14:27Z
@@ -46,3 +46,47 @@ Files: plugins/dso/docs/workflows/COMMIT-WORKFLOW.md, tests/scripts/test-check-p
4646
## File Impact
4747
- `plugins/dso/docs/workflows/COMMIT-WORKFLOW.md` - remove Step 1.75 and Test Failure Delegation sections
4848
- `tests/scripts/test-check-plugin-test-needed.sh` - flip assertion to verify Step 1.75 is absent from workflow
49+
50+
## Notes
51+
52+
<!-- note-id: sv0ayv6t -->
53+
<!-- timestamp: 2026-03-19T00:06:07Z -->
54+
<!-- origin: agent -->
55+
<!-- sync: unsynced -->
56+
57+
CHECKPOINT 1/6: Task context loaded ✓
58+
59+
<!-- note-id: 26wmrnwt -->
60+
<!-- timestamp: 2026-03-19T00:06:17Z -->
61+
<!-- origin: agent -->
62+
<!-- sync: unsynced -->
63+
64+
CHECKPOINT 2/6: Code patterns understood ✓
65+
66+
<!-- note-id: 56rlwiga -->
67+
<!-- timestamp: 2026-03-19T00:06:34Z -->
68+
<!-- origin: agent -->
69+
<!-- sync: unsynced -->
70+
71+
CHECKPOINT 3/6: Tests written ✓
72+
73+
<!-- note-id: jshhmo24 -->
74+
<!-- timestamp: 2026-03-19T00:06:57Z -->
75+
<!-- origin: agent -->
76+
<!-- sync: unsynced -->
77+
78+
CHECKPOINT 4/6: Implementation complete ✓
79+
80+
<!-- note-id: qr7fzfnp -->
81+
<!-- timestamp: 2026-03-19T00:10:28Z -->
82+
<!-- origin: agent -->
83+
<!-- sync: unsynced -->
84+
85+
CHECKPOINT 5/6: Validation passed ✓
86+
87+
<!-- note-id: f3k1lu7u -->
88+
<!-- timestamp: 2026-03-19T00:10:45Z -->
89+
<!-- origin: agent -->
90+
<!-- sync: unsynced -->
91+
92+
CHECKPOINT 6/6: Done ✓

plugins/dso/docs/workflows/COMMIT-WORKFLOW.md

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -225,56 +225,6 @@ CHANGED_FILES=$(git diff --name-only)
225225

226226
5. **Fallback**: Sub-agent timeout (>5 min) or malformed output — fall back to inline fix attempt and restart from Step 1.
227227

228-
## Step 1.75: Plugin Tests
229-
230-
Run plugin tests to catch broken hooks and scripts before review. This gate is mandatory — config masking (`.conf` files hiding YAML parser bugs) can cause changes to pass locally but fail in CI where only YAML is available.
231-
232-
```bash
233-
REPO_ROOT=$(git rev-parse --show-toplevel)
234-
cd "$REPO_ROOT" && make test-plugin
235-
```
236-
237-
- **Tests pass**: Continue to Step 2.
238-
- **Tests fail**: See Test Failure Delegation (Step 1.75) below.
239-
240-
```bash
241-
echo "$(date -u +%Y-%m-%dT%H:%M:%SZ) step-1.75-plugin-tests" >> "$ARTIFACTS_DIR/commit-breadcrumbs.log"
242-
```
243-
244-
### Test Failure Delegation (Step 1.75)
245-
246-
When plugin tests fail, apply the same delegation decision gate as Step 1:
247-
248-
**Fix inline**: Single obvious failure (typo, missing import, one-line fix) — fix it and re-run `make test-plugin`.
249-
250-
**Delegate to sub-agent** (via [TEST-FAILURE-DISPATCH.md](TEST-FAILURE-DISPATCH.md)):
251-
- More than 1 test fails, OR
252-
- 1 test fails and an inline fix attempt did not resolve it.
253-
254-
Follow the same dispatch procedure as Step 1, with these differences:
255-
256-
1. **Build the input payload** using the plugin test command that failed:
257-
258-
```bash
259-
TEST_COMMAND="cd $REPO_ROOT && make test-plugin"
260-
# EXIT_CODE and STDERR_TAIL come from the ALREADY-FAILED test run above.
261-
# Do NOT re-run the tests — capture from the original failure.
262-
# EXIT_CODE=<exit code from the failed test run>
263-
# STDERR_TAIL=<last 50 lines of output from the failed test run>
264-
CHANGED_FILES=$(git diff HEAD --name-only)
265-
```
266-
267-
2. **Set context**: `context="commit-time"`
268-
269-
3. **Model selection, sub-agent type, prompt template, Task dispatch, and result parsing**: Same as Step 1 delegation procedure (steps 2-7).
270-
271-
4. **Parse the result**:
272-
- `RESULT: PASS` — re-run `make test-plugin` to confirm the fix, then continue to Step 2.
273-
- `RESULT: FAIL` — increment attempt counter and retry with escalated model. If attempt >= 3, escalate to user.
274-
- `RESULT: PARTIAL` — log concerns via `tk add-note`, continue to Step 2 with caveats.
275-
276-
5. **Fallback**: Sub-agent timeout (>5 min) or malformed output — fall back to inline fix attempt and restart from Step 1.75.
277-
278228
## Step 2: Format
279229

280230
Run formatting on modified files so file edits are complete before staging.

tests/scripts/test-check-plugin-test-needed.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ assert_eq "test_script_exists_and_executable: canonical exists and is executable
2727
assert_pass_if_clean "test_script_exists_and_executable"
2828

2929
# ── test_commit_workflow_has_plugin_test_step ─────────────────────────────────
30-
# (c) COMMIT-WORKFLOW.md has a mandatory plugin test step (Step 1.75)
30+
# (c) COMMIT-WORKFLOW.md does NOT have Step 1.75 (intentionally removed)
3131
_snapshot_fail
3232
workflow_has_step=0
3333
grep -q 'make test-plugin' "$WORKFLOW_FILE" 2>/dev/null && workflow_has_step=1
34-
assert_eq "test_commit_workflow_has_plugin_test_step: COMMIT-WORKFLOW.md has make test-plugin" "1" "$workflow_has_step"
34+
assert_eq "test_commit_workflow_has_plugin_test_step: COMMIT-WORKFLOW.md does not have make test-plugin" "0" "$workflow_has_step"
3535
assert_pass_if_clean "test_commit_workflow_has_plugin_test_step"
3636

3737
# ── test_exits_zero_for_lockpick_workflow_scripts ─────────────────────────────

0 commit comments

Comments
 (0)