Skip to content

Commit aaa42fa

Browse files
authored
Merge branch 'main' into claude/add-remote-job-installer-Qrgcu
2 parents 02a114b + 98b823b commit aaa42fa

File tree

29 files changed

+934
-288
lines changed

29 files changed

+934
-288
lines changed

.claude/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,8 @@
130130
"Bash(deepwork:*)",
131131
"Bash(.claude/hooks/commit_job_git_commit.sh:*)",
132132
"Bash(./.deepwork/jobs/deepwork_jobs/make_new_job.sh:*)",
133-
"Skill(deepwork_jobs.clone_remote_job)"
133+
"Skill(deepwork_jobs.clone_remote_job)",
134+
"WebSearch"
134135
]
135136
},
136137
"hooks": {

.claude/skills/commit.commit_and_push/SKILL.md

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,11 @@ Check the list of changed files against what was modified during this session, e
9999

100100
## Quality Criteria
101101

102-
- Changed files list was reviewed by the agent
103-
- Files match what was modified during this session (or unexpected changes were investigated and handled)
104-
- CHANGELOG.md was updated with entries in the `[Unreleased]` section (if changes warrant documentation)
105-
- Version numbers were NOT modified (in pyproject.toml or CHANGELOG.md version headers)
106-
- Commit message follows project conventions
107-
- Commit was created successfully
102+
- Changed files were verified against expectations
103+
- CHANGELOG.md was updated with entries in [Unreleased] section (if changes warrant documentation)
104+
- Version numbers were NOT modified (pyproject.toml version and CHANGELOG version headers unchanged)
105+
- Commit was created with appropriate message
108106
- Changes were pushed to remote
109-
- When all criteria are met, include `<promise>✓ Quality Criteria Met</promise>` in your response
110107

111108
## Context
112109

@@ -149,6 +146,25 @@ Use branch format: `deepwork/commit-[instance]-YYYYMMDD`
149146
- Do NOT proceed without required inputs; ask the user if any are missing
150147
- Do NOT modify files outside the scope of this step's defined outputs
151148

149+
## Quality Validation
150+
151+
**Before completing this step, you MUST have your work reviewed against the quality criteria below.**
152+
153+
Use a sub-agent (Haiku model) to review your work against these criteria:
154+
155+
**Criteria (all must be satisfied)**:
156+
1. Changed files were verified against expectations
157+
2. CHANGELOG.md was updated with entries in [Unreleased] section (if changes warrant documentation)
158+
3. Version numbers were NOT modified (pyproject.toml version and CHANGELOG version headers unchanged)
159+
4. Commit was created with appropriate message
160+
5. Changes were pushed to remote
161+
**Review Process**:
162+
1. Once you believe your work is complete, spawn a sub-agent using Haiku to review your work against the quality criteria above
163+
2. The sub-agent should examine your outputs and verify each criterion is met
164+
3. If the sub-agent identifies valid issues, fix them
165+
4. Have the sub-agent review again until all valid feedback has been addressed
166+
5. Only mark the step complete when the sub-agent confirms all criteria are satisfied
167+
152168
## On Completion
153169

154170
1. Verify outputs are created

.claude/skills/commit.lint/SKILL.md

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,7 @@ Report the results of each command.
8484

8585
- ruff format was run successfully
8686
- ruff check was run with --fix flag
87-
- No remaining lint errors (or all are documented and intentional)
88-
- Sub-agent was used to conserve context
89-
- When all criteria are met, include `<promise>✓ Quality Criteria Met</promise>` in your response
87+
- No remaining lint errors
9088

9189
## Context
9290

@@ -129,6 +127,23 @@ Use branch format: `deepwork/commit-[instance]-YYYYMMDD`
129127
- Do NOT proceed without required inputs; ask the user if any are missing
130128
- Do NOT modify files outside the scope of this step's defined outputs
131129

130+
## Quality Validation
131+
132+
**Before completing this step, you MUST have your work reviewed against the quality criteria below.**
133+
134+
Use a sub-agent (Haiku model) to review your work against these criteria:
135+
136+
**Criteria (all must be satisfied)**:
137+
1. ruff format was run successfully
138+
2. ruff check was run with --fix flag
139+
3. No remaining lint errors
140+
**Review Process**:
141+
1. Once you believe your work is complete, spawn a sub-agent using Haiku to review your work against the quality criteria above
142+
2. The sub-agent should examine your outputs and verify each criterion is met
143+
3. If the sub-agent identifies valid issues, fix them
144+
4. Have the sub-agent review again until all valid feedback has been addressed
145+
5. Only mark the step complete when the sub-agent confirms all criteria are satisfied
146+
132147
## On Completion
133148

134149
1. Verify outputs are created

.claude/skills/commit.review/SKILL.md

Lines changed: 23 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -40,32 +40,11 @@ Use a sub-agent to review the staged/changed code and identify issues that shoul
4040

4141
Use the Task tool with these parameters:
4242
- `subagent_type`: "general-purpose"
43-
- `prompt`: Include the list of changed files and the review criteria below
44-
45-
The sub-agent should review each changed file for:
46-
47-
**General Issues**
48-
- Logic errors or potential bugs
49-
- Error handling gaps
50-
- Security concerns
51-
- Performance issues
52-
53-
**DRY Opportunities**
54-
- Duplicated code that should be extracted into functions
55-
- Repeated patterns that could be abstracted
56-
- Copy-pasted logic with minor variations
57-
58-
**Naming Clarity**
59-
- Variables, functions, and classes should have clear, descriptive names
60-
- Names should reflect purpose and intent
61-
- Avoid abbreviations that aren't universally understood
62-
- Consistent naming conventions throughout
63-
64-
**Test Coverage**
65-
- New functions or classes should have corresponding tests
66-
- New code paths should be tested
67-
- Edge cases should be covered
68-
- If tests are missing, note what should be tested
43+
- `prompt`: Instruct the sub-agent to:
44+
- Read the code review standards from `doc/code_review_standards.md`
45+
- Read each of the changed files
46+
- Review each file against the standards
47+
- Report issues found with file, line number, severity, and suggested fix
6948

7049
3. **Review sub-agent findings**
7150
- Examine each issue identified
@@ -82,40 +61,11 @@ Use a sub-agent to review the staged/changed code and identify issues that shoul
8261
- If you made substantial changes, consider running another review pass
8362
- Ensure fixes didn't introduce new issues
8463

85-
## Example Sub-Agent Prompt
86-
87-
```
88-
Review the following changed files for code quality issues:
89-
90-
Files to review:
91-
- src/module.py
92-
- src/utils.py
93-
- tests/test_module.py
94-
95-
For each file, check for:
96-
97-
1. **General issues**: Logic errors, bugs, error handling gaps, security concerns
98-
2. **DRY opportunities**: Duplicated code, repeated patterns that should be extracted
99-
3. **Naming clarity**: Are variable/function/class names clear and descriptive?
100-
4. **Test coverage**: Does new functionality have corresponding tests?
101-
102-
Read each file and provide a structured report of issues found, organized by category.
103-
For each issue, include:
104-
- File and line number
105-
- Description of the issue
106-
- Suggested fix
107-
108-
If no issues are found in a category, state that explicitly.
109-
```
110-
11164
## Quality Criteria
11265

11366
- Changed files were identified
114-
- Sub-agent reviewed all changed files
115-
- Issues were categorized (general, DRY, naming, tests)
67+
- Sub-agent read the code review standards and reviewed all changed files
11668
- All identified issues were addressed or documented as intentional
117-
- Sub-agent was used to conserve context
118-
- When all criteria are met, include `<promise>✓ Quality Criteria Met</promise>` in your response
11969

12070
## Context
12171

@@ -158,6 +108,23 @@ Use branch format: `deepwork/commit-[instance]-YYYYMMDD`
158108
- Do NOT proceed without required inputs; ask the user if any are missing
159109
- Do NOT modify files outside the scope of this step's defined outputs
160110

111+
## Quality Validation
112+
113+
**Before completing this step, you MUST have your work reviewed against the quality criteria below.**
114+
115+
Use a sub-agent (Haiku model) to review your work against these criteria:
116+
117+
**Criteria (all must be satisfied)**:
118+
1. Changed files were identified
119+
2. Sub-agent reviewed the code for general issues, DRY opportunities, naming clarity, and test coverage
120+
3. All identified issues were addressed or documented as intentional
121+
**Review Process**:
122+
1. Once you believe your work is complete, spawn a sub-agent using Haiku to review your work against the quality criteria above
123+
2. The sub-agent should examine your outputs and verify each criterion is met
124+
3. If the sub-agent identifies valid issues, fix them
125+
4. Have the sub-agent review again until all valid feedback has been addressed
126+
5. Only mark the step complete when the sub-agent confirms all criteria are satisfied
127+
161128
## On Completion
162129

163130
1. Verify outputs are created

.claude/skills/commit.test/SKILL.md

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@ Execute the test suite for the project and iteratively fix any failures until al
6565
## Quality Criteria
6666

6767
- Latest code was pulled from the branch
68-
- Test command was correctly identified or used from input
69-
- All tests are now passing
70-
- When all criteria are met, include `<promise>✓ Quality Criteria Met</promise>` in your response
68+
- All tests are passing
7169

7270
## Context
7371

@@ -90,11 +88,6 @@ Steps:
9088
4. commit_and_push - Review changes and commit/push
9189

9290

93-
## Required Inputs
94-
95-
**User Parameters** - Gather from user before starting:
96-
- **test_command**: Test command to run (optional - will auto-detect if not provided)
97-
9891

9992
## Work Branch
10093

@@ -115,6 +108,22 @@ Use branch format: `deepwork/commit-[instance]-YYYYMMDD`
115108
- Do NOT proceed without required inputs; ask the user if any are missing
116109
- Do NOT modify files outside the scope of this step's defined outputs
117110

111+
## Quality Validation
112+
113+
**Before completing this step, you MUST have your work reviewed against the quality criteria below.**
114+
115+
Use a sub-agent (Haiku model) to review your work against these criteria:
116+
117+
**Criteria (all must be satisfied)**:
118+
1. Latest code was pulled from the branch
119+
2. All tests are passing
120+
**Review Process**:
121+
1. Once you believe your work is complete, spawn a sub-agent using Haiku to review your work against the quality criteria above
122+
2. The sub-agent should examine your outputs and verify each criterion is met
123+
3. If the sub-agent identifies valid issues, fix them
124+
4. Have the sub-agent review again until all valid feedback has been addressed
125+
5. Only mark the step complete when the sub-agent confirms all criteria are satisfied
126+
118127
## On Completion
119128

120129
1. Verify outputs are created

.deepwork/jobs/commit/job.yml

Lines changed: 18 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -49,35 +49,23 @@ steps:
4949
outputs:
5050
- code_reviewed # implicit state: code has been reviewed and issues addressed
5151
dependencies: []
52-
hooks:
53-
after_agent:
54-
- prompt: |
55-
Verify the code review is complete:
56-
1. Changed files were identified
57-
2. Sub-agent reviewed the code for general issues, DRY opportunities, naming clarity, and test coverage
58-
3. All identified issues were addressed or documented as intentional
59-
If ALL criteria are met, include `<promise>✓ Quality Criteria Met</promise>`.
52+
quality_criteria:
53+
- "Changed files were identified"
54+
- "Sub-agent reviewed the code for general issues, DRY opportunities, naming clarity, and test coverage"
55+
- "All identified issues were addressed or documented as intentional"
6056

6157
- id: test
6258
name: "Run Tests"
6359
description: "Pulls latest code and runs tests until all pass. Use after code review passes to verify changes work correctly."
6460
instructions_file: steps/test.md
65-
inputs:
66-
- name: test_command
67-
description: "Test command to run (optional - will auto-detect if not provided)"
61+
inputs: []
6862
outputs:
6963
- tests_passing # implicit state: all tests pass
7064
dependencies:
7165
- review
72-
hooks:
73-
after_agent:
74-
- prompt: |
75-
Verify the tests are passing:
76-
1. Latest code was pulled from the branch
77-
2. All tests completed successfully
78-
3. No test failures or errors remain
79-
4. Test output shows passing status
80-
If ALL criteria are met, include `<promise>✓ Quality Criteria Met</promise>`.
66+
quality_criteria:
67+
- "Latest code was pulled from the branch"
68+
- "All tests are passing"
8169

8270
- id: lint
8371
name: "Lint Code"
@@ -88,14 +76,10 @@ steps:
8876
- code_formatted # implicit state: code formatted and linted
8977
dependencies:
9078
- test
91-
hooks:
92-
after_agent:
93-
- prompt: |
94-
Verify the linting is complete:
95-
1. ruff format was run successfully
96-
2. ruff check was run successfully (with --fix)
97-
3. No remaining lint errors
98-
If ALL criteria are met, include `<promise>✓ Quality Criteria Met</promise>`.
79+
quality_criteria:
80+
- "ruff format was run successfully"
81+
- "ruff check was run with --fix flag"
82+
- "No remaining lint errors"
9983

10084
- id: commit_and_push
10185
name: "Commit and Push"
@@ -106,14 +90,9 @@ steps:
10690
- changes_committed # implicit state: changes committed and pushed
10791
dependencies:
10892
- lint
109-
hooks:
110-
after_agent:
111-
- prompt: |
112-
Verify the commit is ready:
113-
1. Changed files list was reviewed by the agent
114-
2. Files match what was modified during this session (or unexpected changes were investigated)
115-
3. CHANGELOG.md was updated with entries in the [Unreleased] section (if changes warrant documentation)
116-
4. Version numbers were NOT modified (pyproject.toml version and CHANGELOG version headers must remain unchanged)
117-
5. Commit was created with appropriate message
118-
6. Changes were pushed to remote
119-
If ALL criteria are met, include `<promise>✓ Quality Criteria Met</promise>`.
93+
quality_criteria:
94+
- "Changed files were verified against expectations"
95+
- "CHANGELOG.md was updated with entries in [Unreleased] section (if changes warrant documentation)"
96+
- "Version numbers were NOT modified (pyproject.toml version and CHANGELOG version headers unchanged)"
97+
- "Commit was created with appropriate message"
98+
- "Changes were pushed to remote"

.deepwork/jobs/commit/steps/commit_and_push.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,11 @@ Check the list of changed files against what was modified during this session, e
7878

7979
## Quality Criteria
8080

81-
- Changed files list was reviewed by the agent
82-
- Files match what was modified during this session (or unexpected changes were investigated and handled)
83-
- CHANGELOG.md was updated with entries in the `[Unreleased]` section (if changes warrant documentation)
84-
- Version numbers were NOT modified (in pyproject.toml or CHANGELOG.md version headers)
85-
- Commit message follows project conventions
86-
- Commit was created successfully
81+
- Changed files were verified against expectations
82+
- CHANGELOG.md was updated with entries in [Unreleased] section (if changes warrant documentation)
83+
- Version numbers were NOT modified (pyproject.toml version and CHANGELOG version headers unchanged)
84+
- Commit was created with appropriate message
8785
- Changes were pushed to remote
88-
- When all criteria are met, include `<promise>✓ Quality Criteria Met</promise>` in your response
8986

9087
## Context
9188

.deepwork/jobs/commit/steps/lint.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,7 @@ Report the results of each command.
6363
6464
- ruff format was run successfully
6565
- ruff check was run with --fix flag
66-
- No remaining lint errors (or all are documented and intentional)
67-
- Sub-agent was used to conserve context
68-
- When all criteria are met, include `<promise>✓ Quality Criteria Met</promise>` in your response
66+
- No remaining lint errors
6967
7068
## Context
7169

0 commit comments

Comments
 (0)