Skip to content

Commit 3fbb4f0

Browse files
JoeOakhartNavaclaude
JoeOakhartNava
and
claude
committed
fix(debug-everything): fix CI failures — hook tests, pytest, telemetry
- Update 6 hook test files to read from .claude-plugin/plugin.json instead of .claude/settings.json (post-plugin-extraction paths) - Fix test-format-fix.sh: use scripts/ path (not lockpick-workflow/scripts/) - Fix test_precompact_telemetry.py, test_analyze_precompact_telemetry.py: update COMPACT_HOOK and ANALYZE_SCRIPT to post-extraction paths - Fix active_task_count JSON corruption in pre-compact-checkpoint.sh: grep -c exits 1 on no-match, causing || echo -1 to append -1 to output; now uses if/else to distinguish tk failure from zero-result grep - Add set -uo pipefail to 10 scripts (no -e to avoid (( var++ )) falsy exit) - Fix config-paths.sh: derive _READ_CONFIG from BASH_SOURCE, not CLAUDE_PLUGIN_ROOT - Fix pre-bash-functions.sh: use CLAUDE_PLUGIN_ROOT:- to avoid unbound var - Add workflow-config.conf checkpoint keys, .gitignore sentinel entry - Bump version 0.4.2 → 0.4.3 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 4e43ad7 commit 3fbb4f0

25 files changed

+123
-50
lines changed

‎.claude-plugin/plugin.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "dso",
3-
"version": "0.4.2",
3+
"version": "0.4.3",
44
"description": "Workflow infrastructure plugin for Claude Code projects",
55
"commands": "./commands/",
66
"skills": "./skills/",

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ node_modules/
2222
# Project-specific config (created from docs/workflow-config.example.conf)
2323
workflow-config.conf
2424

25+
# Checkpoint marker — written by pre-compact-checkpoint.sh, cleaned after merge/review
26+
.checkpoint-pending-rollback
27+
2528
# macOS
2629
.DS_Store
2730

‎.tickets/.sync-state.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,6 @@
227227
"jira_hash": "b2fcb1e44695c32874c75055e4b8c9e8",
228228
"last_synced": "2026-03-17T18:34:36Z"
229229
},
230-
"last_sync_commit": "cfd4a0e2282da09d0ab69568c79a52836f5469e9",
231-
"last_pull_timestamp": "2026-03-18T04:33:35Z"
230+
"last_sync_commit": "4e43ad7f079ef9b7357534c03388d231e3966b15",
231+
"last_pull_timestamp": "2026-03-18T05:30:38Z"
232232
}

‎.tickets/dso-pmaj.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
id: dso-pmaj
3+
status: open
4+
deps: []
5+
links: []
6+
created: 2026-03-18T04:49:51Z
7+
type: bug
8+
priority: 2
9+
assignee: Joe Oakhart
10+
---
11+
# Fix pre-existing precompact telemetry test failures (18 pytest failures)
12+
13+
python3 -m pytest tests/plugin/ tests/scripts/ tests/skills/ -q reports 18 failures in test_precompact_telemetry.py and test_analyze_precompact_telemetry.py. Pre-existing — unrelated to any recent changes. Needs investigation.
14+

‎hooks/lib/config-paths.sh‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,28 @@
2222
[[ "${_CONFIG_PATHS_LOADED:-}" == "1" ]] && return 0
2323
_CONFIG_PATHS_LOADED=1
2424

25-
# Locate read-config.sh relative to this file
25+
# Locate read-config.sh relative to this file (always from the plugin root, not CLAUDE_PLUGIN_ROOT)
2626
_CONFIG_PATHS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
27-
_READ_CONFIG="${CLAUDE_PLUGIN_ROOT}/scripts/read-config.sh"
27+
_READ_CONFIG="$(cd "$_CONFIG_PATHS_DIR/../.." && pwd)/scripts/read-config.sh"
28+
29+
# Config file: when CLAUDE_PLUGIN_ROOT is set (e.g. in tests), read from that dir's
30+
# workflow-config.conf; otherwise let read-config.sh resolve via git rev-parse.
31+
if [[ -n "${CLAUDE_PLUGIN_ROOT:-}" && -f "${CLAUDE_PLUGIN_ROOT}/workflow-config.conf" ]]; then
32+
_CONFIG_FILE="${CLAUDE_PLUGIN_ROOT}/workflow-config.conf"
33+
else
34+
_CONFIG_FILE=""
35+
fi
2836

2937
# Helper: read a config key with a default fallback
3038
_cfg_read() {
3139
local key="$1"
3240
local default="$2"
3341
local val
34-
val=$("$_READ_CONFIG" "$key" 2>/dev/null) || true
42+
if [[ -n "$_CONFIG_FILE" ]]; then
43+
val=$("$_READ_CONFIG" "$key" "$_CONFIG_FILE" 2>/dev/null) || true
44+
else
45+
val=$("$_READ_CONFIG" "$key" 2>/dev/null) || true
46+
fi
3547
if [[ -n "$val" ]]; then
3648
echo "$val"
3749
else
@@ -44,7 +56,11 @@ _cfg_read_list() {
4456
local key="$1"
4557
local default="$2"
4658
local val
47-
val=$("$_READ_CONFIG" --list "$key" 2>/dev/null) || true
59+
if [[ -n "$_CONFIG_FILE" ]]; then
60+
val=$("$_READ_CONFIG" --list "$key" "$_CONFIG_FILE" 2>/dev/null) || true
61+
else
62+
val=$("$_READ_CONFIG" --list "$key" 2>/dev/null) || true
63+
fi
4864
if [[ -n "$val" ]]; then
4965
echo "$val"
5066
else

‎hooks/lib/pre-bash-functions.sh‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,19 +149,33 @@ hook_commit_failure_tracker() {
149149
local _SEARCH_CMD="${SEARCH_CMD:-grep -rl}"
150150
local _CREATE_CMD="${CREATE_CMD:-tk create}"
151151
local _READ_CONFIG=""
152-
if [[ -n "${CLAUDE_PLUGIN_ROOT}" && -f "$CLAUDE_PLUGIN_ROOT/scripts/read-config.sh" ]]; then
152+
if [[ -n "${CLAUDE_PLUGIN_ROOT:-}" && -f "$CLAUDE_PLUGIN_ROOT/scripts/read-config.sh" ]]; then
153153
_READ_CONFIG="$CLAUDE_PLUGIN_ROOT/scripts/read-config.sh"
154154
fi
155+
# Config file: prefer CLAUDE_PLUGIN_ROOT/workflow-config.conf when set and present,
156+
# so tests can pass an isolated config without affecting the real repo config.
157+
local _CT_CONFIG_FILE=""
158+
if [[ -n "${CLAUDE_PLUGIN_ROOT:-}" && -f "${CLAUDE_PLUGIN_ROOT}/workflow-config.conf" ]]; then
159+
_CT_CONFIG_FILE="${CLAUDE_PLUGIN_ROOT}/workflow-config.conf"
160+
fi
155161

156162
# Apply config overrides (defer Python spawn; don't override caller-supplied env vars)
157163
if [[ -n "$_READ_CONFIG" ]] && [[ -z "$_SEARCH_CMD_FROM_ENV" ]]; then
158164
local _SEARCH
159-
_SEARCH=$("$_READ_CONFIG" issue_tracker.search_cmd 2>/dev/null || echo '')
165+
if [[ -n "$_CT_CONFIG_FILE" ]]; then
166+
_SEARCH=$("$_READ_CONFIG" issue_tracker.search_cmd "$_CT_CONFIG_FILE" 2>/dev/null || echo '')
167+
else
168+
_SEARCH=$("$_READ_CONFIG" issue_tracker.search_cmd 2>/dev/null || echo '')
169+
fi
160170
[[ -n "$_SEARCH" ]] && _SEARCH_CMD="$_SEARCH"
161171
fi
162172
if [[ -n "$_READ_CONFIG" ]] && [[ -z "$_CREATE_CMD_FROM_ENV" ]]; then
163173
local _CREATE
164-
_CREATE=$("$_READ_CONFIG" issue_tracker.create_cmd 2>/dev/null || echo '')
174+
if [[ -n "$_CT_CONFIG_FILE" ]]; then
175+
_CREATE=$("$_READ_CONFIG" issue_tracker.create_cmd "$_CT_CONFIG_FILE" 2>/dev/null || echo '')
176+
else
177+
_CREATE=$("$_READ_CONFIG" issue_tracker.create_cmd 2>/dev/null || echo '')
178+
fi
165179
[[ -n "$_CREATE" ]] && _CREATE_CMD="$_CREATE"
166180
fi
167181

‎hooks/pre-compact-checkpoint.sh‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,10 @@ _write_telemetry() {
5151

5252
local active_task_count=-1
5353
if command -v tk &>/dev/null; then
54-
active_task_count=$(tk list 2>/dev/null | grep -c in_progress 2>/dev/null || echo -1)
54+
local _tk_list
55+
if _tk_list=$(tk list 2>/dev/null); then
56+
active_task_count=$(echo "$_tk_list" | grep -c in_progress 2>/dev/null || echo 0)
57+
fi
5558
fi
5659

5760
local git_dirty=false
@@ -127,21 +130,36 @@ fi
127130
# Read config-driven checkpoint label (with fallback default)
128131
CHECKPOINT_LABEL='checkpoint: pre-compaction auto-save'
129132
HOOK_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
130-
if [[ -z "${CLAUDE_PLUGIN_ROOT}" ]]; then
133+
if [[ -z "${CLAUDE_PLUGIN_ROOT:-}" ]]; then
131134
CLAUDE_PLUGIN_ROOT="$(cd "$HOOK_DIR/.." && pwd)"
132135
fi
133-
# Always use the read-config.sh from the actual plugin scripts dir (not from
136+
# Always use read-config.sh from the actual plugin scripts dir (not from
134137
# CLAUDE_PLUGIN_ROOT, which tests may override to a temp dir for config isolation).
135-
_READ_CONFIG="${CLAUDE_PLUGIN_ROOT}/scripts/read-config.sh"
138+
_READ_CONFIG="$HOOK_DIR/../scripts/read-config.sh"
139+
# Config file: prefer CLAUDE_PLUGIN_ROOT/workflow-config.conf (for test isolation),
140+
# otherwise let read-config.sh resolve via git rev-parse.
141+
if [[ -n "${CLAUDE_PLUGIN_ROOT:-}" && -f "${CLAUDE_PLUGIN_ROOT}/workflow-config.conf" ]]; then
142+
_CONFIG_FILE="${CLAUDE_PLUGIN_ROOT}/workflow-config.conf"
143+
else
144+
_CONFIG_FILE=""
145+
fi
136146
if [[ -f "$_READ_CONFIG" ]]; then
137-
_LABEL=$("$_READ_CONFIG" checkpoint.commit_label 2>/dev/null || echo '')
147+
if [[ -n "$_CONFIG_FILE" ]]; then
148+
_LABEL=$("$_READ_CONFIG" checkpoint.commit_label "$_CONFIG_FILE" 2>/dev/null || echo '')
149+
else
150+
_LABEL=$("$_READ_CONFIG" checkpoint.commit_label 2>/dev/null || echo '')
151+
fi
138152
[[ -n "$_LABEL" ]] && CHECKPOINT_LABEL="$_LABEL"
139153
fi
140154

141155
# Read config-driven rollback marker filename (with fallback default)
142156
CHECKPOINT_MARKER_FILE='.checkpoint-pending-rollback'
143157
if [[ -f "$_READ_CONFIG" ]]; then
144-
_MARKER=$("$_READ_CONFIG" checkpoint.marker_file 2>/dev/null || echo '')
158+
if [[ -n "$_CONFIG_FILE" ]]; then
159+
_MARKER=$("$_READ_CONFIG" checkpoint.marker_file "$_CONFIG_FILE" 2>/dev/null || echo '')
160+
else
161+
_MARKER=$("$_READ_CONFIG" checkpoint.marker_file 2>/dev/null || echo '')
162+
fi
145163
[[ -n "$_MARKER" ]] && CHECKPOINT_MARKER_FILE="$_MARKER"
146164
fi
147165

‎scripts/bulk-delete-stale-tickets.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env bash
2+
set -euo pipefail
23
# scripts/bulk-delete-stale-tickets.sh
34
# Bulk-delete auto-created duplicate bug tickets and stale marker files.
45
#

‎scripts/check-skill-refs.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env bash
2+
set -uo pipefail
23
# scripts/check-skill-refs.sh
34
# Detect unqualified DSO skill references in workflow files.
45
#

‎scripts/check-test-isolation.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env bash
2+
set -uo pipefail
23
# check-test-isolation.sh — Test isolation rule harness
34
#
45
# Scans scripts/test-isolation-rules/ for executable rule files (*.sh),

0 commit comments

Comments
 (0)