fix: correct misleading comment and quote RUN: line in validate.sh (dso-w20r, dso-xhhv) (merge worktree-20260324-164324)

Author: JoeOakhartNava

.test-index

@@ -46,7 +46,7 @@ plugins/dso/scripts/runners/bash-runner.sh:tests/scripts/test-test-batched.sh
 plugins/dso/scripts/capture-review-diff.sh:tests/hooks/test-merge-aware-diff.sh
 plugins/dso/scripts/agent-batch-lifecycle.sh:tests/scripts/test-validate-phase-v2-removal.sh [test_validate_phase_no_TK_variable]
 plugins/dso/scripts/validate-phase.sh:tests/test-validate-phase-portability.sh,tests/scripts/test-validate-phase-v2-removal.sh [test_validate_phase_no_TK_variable]
-plugins/dso/scripts/validate.sh:tests/plugin/test-validate-work-portability.sh,tests/hooks/test-validate-review-output.sh,tests/hooks/test-validate-crash-detection.sh,tests/scripts/test-validate-test-batched-integration.sh,tests/scripts/test-validate-flock-timeout.sh,tests/scripts/test-validate-background.sh,tests/scripts/test-validate-skip-ci-flag.sh,tests/scripts/test-validate-issues.sh,tests/scripts/test-validate-config.sh,tests/scripts/test-validate-script-writes-integration.sh,tests/scripts/test-validate-config-driven.sh,tests/scripts/test-validate-state-lifecycle.sh,tests/test-validate-phase-portability.sh
+plugins/dso/scripts/validate.sh:tests/plugin/test-validate-work-portability.sh,tests/hooks/test-validate-review-output.sh,tests/hooks/test-validate-crash-detection.sh,tests/scripts/test-validate-test-batched-integration.sh,tests/scripts/test-validate-flock-timeout.sh,tests/scripts/test-validate-background.sh,tests/scripts/test-validate-skip-ci-flag.sh,tests/scripts/test-validate-issues.sh,tests/scripts/test-validate-config.sh,tests/scripts/test-validate-script-writes-integration.sh,tests/scripts/test-validate-config-driven.sh,tests/scripts/test-validate-state-lifecycle.sh,tests/test-validate-phase-portability.sh,tests/scripts/test-validate-comment-accuracy.sh
 plugins/dso/scripts/worktree-cleanup.sh:tests/scripts/test_worktree_cleanup_startup_config.py
 plugins/dso/skills/batch-overlap-check/SKILL.md:plugins/dso/tests/test-sprint-skill-step10-no-merge-to-main.sh,tests/plugin/test-audit-skill-resolution.sh,tests/hooks/test-fix-bug-skill.sh,tests/hooks/test-generate-claude-md-skill.sh,tests/hooks/test-init-skill.sh,tests/scripts/test-qualify-skill-refs.sh,tests/scripts/test-skill-path-refs.sh,tests/scripts/test-check-skill-refs.sh,tests/skills/test_end_skill_final_verification_step.py,tests/skills/test_implementation_plan_skill_tdd_enforcement.py,tests/skills/test-quick-ref-skill.sh,tests/skills/test_project_setup_skill_conditional_prompts.py,tests/skills/test_fix_bug_skill.py,tests/skills/test_end_skill_summary_displays_stored_learnings.py,tests/skills/test_end_skill_learnings_step_before_commit.py,tests/skills/test-design-skills-cross-stack.sh,tests/skills/test_end_skill_dirty_worktree_resolution.py,tests/skills/test_fix_bug_skill_escalated_section.py,tests/skills/test_end_skill_bug_tickets_before_commit.py
 plugins/dso/skills/brainstorm/SKILL.md:plugins/dso/tests/test-sprint-skill-step10-no-merge-to-main.sh,tests/plugin/test-audit-skill-resolution.sh,tests/hooks/test-fix-bug-skill.sh,tests/hooks/test-generate-claude-md-skill.sh,tests/hooks/test-init-skill.sh,tests/scripts/test-qualify-skill-refs.sh,tests/scripts/test-skill-path-refs.sh,tests/scripts/test-check-skill-refs.sh,tests/skills/test_end_skill_final_verification_step.py,tests/skills/test_implementation_plan_skill_tdd_enforcement.py,tests/skills/test-quick-ref-skill.sh,tests/skills/test_project_setup_skill_conditional_prompts.py,tests/skills/test_fix_bug_skill.py,tests/skills/test_end_skill_summary_displays_stored_learnings.py,tests/skills/test_end_skill_learnings_step_before_commit.py,tests/skills/test-design-skills-cross-stack.sh,tests/skills/test_end_skill_dirty_worktree_resolution.py,tests/skills/test_fix_bug_skill_escalated_section.py,tests/skills/test_end_skill_bug_tickets_before_commit.py,tests/hooks/test-sub-agent-guard.sh

plugins/dso/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "dso",
-  "version": "0.26.8",
+  "version": "0.26.9",
   "description": "Workflow infrastructure plugin for Claude Code projects",
   "commands": "./commands/",
   "skills": "./skills/",

plugins/dso/scripts/validate.sh

@@ -552,9 +552,9 @@ run_test_check() {
     if [ -x "$batched_script" ]; then
         local rc=0
         # Run test-batched.sh with the session state file; capture both stdout+stderr.
-        # We do NOT use run_with_timeout here — test-batched.sh manages its own
-        # internal timeout budget (--timeout=45). The outer timeout is the full
-        # TIMEOUT_TESTS as a safety backstop for truly hung processes.
+        # test-batched.sh manages its own internal timeout budget (--timeout=45).
+        # The outer run_with_timeout uses the full TIMEOUT_TESTS as a safety
+        # backstop for truly hung processes that exceed the internal budget.
         TEST_BATCHED_STATE_FILE="$VALIDATE_TEST_STATE_FILE" \
             run_with_timeout "$timeout" "$name" \
             bash "$batched_script" --timeout="$batched_timeout" "$test_cmd" \
@@ -1178,7 +1178,7 @@ elif [ $TESTS_PENDING -eq 1 ] && [ $FAILED -eq 0 ]; then
     echo "════════════════════════════════════════════════════════════"
     echo "  ⚠  ACTION REQUIRED — TESTS NOT COMPLETE  ⚠"
     echo "════════════════════════════════════════════════════════════"
-    echo "RUN: bash $0 $*"
+    printf 'RUN: bash %s' "$0"; printf ' %q' "$@"; printf '\n'
     echo "DO NOT PROCEED until the command above prints a final summary."
     echo "════════════════════════════════════════════════════════════"
     _state_content="pending

tests/scripts/test-validate-comment-accuracy.sh

@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+# tests/scripts/test-validate-comment-accuracy.sh
+# Bug dso-w20r: Comment says "do NOT use run_with_timeout" but code does use it.
+# Bug dso-xhhv: Unquoted $* in RUN: line produces broken resume command.
+#
+# Usage: bash tests/scripts/test-validate-comment-accuracy.sh
+# Returns: exit 0 if all tests pass, exit 1 if any fail
+
+set -uo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+REPO_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
+
+source "$REPO_ROOT/tests/lib/assert.sh"
+
+echo "=== test-validate-comment-accuracy.sh ==="
+echo ""
+
+VALIDATE_SCRIPT="$REPO_ROOT/plugins/dso/scripts/validate.sh"
+
+# ── Test 1: No "do NOT use run_with_timeout" comment near run_with_timeout call ─
+echo "--- test_no_contradictory_run_with_timeout_comment ---"
+_snapshot_fail
+_has_contradiction=0
+# Look for "do NOT use run_with_timeout" — this contradicts the actual code
+if grep -qiF "do NOT use run_with_timeout" "$VALIDATE_SCRIPT"; then
+    _has_contradiction=1
+fi
+assert_eq "test_no_contradictory_run_with_timeout_comment: must not say 'do NOT use run_with_timeout' when code uses it" \
+    "0" "$_has_contradiction"
+assert_pass_if_clean "test_no_contradictory_run_with_timeout_comment"
+
+# ── Test 2: RUN: line uses proper quoting (not bare $*) ─────────────────────
+echo ""
+echo "--- test_run_line_proper_quoting ---"
+_snapshot_fail
+_has_unquoted=0
+# Check for 'echo "RUN:...$*"' pattern which loses quoting on space-containing args
+if grep -qE 'echo.*RUN:.*\$\*' "$VALIDATE_SCRIPT"; then
+    _has_unquoted=1
+fi
+assert_eq "test_run_line_proper_quoting: RUN: line must not use unquoted \$* (use printf %q instead)" \
+    "0" "$_has_unquoted"
+assert_pass_if_clean "test_run_line_proper_quoting"
+
+# ── Summary ───────────────────────────────────────────────────────────────────
+print_summary