Skip to content

Commit 522a126

Browse files
tzanko-matevtzanko-matev
committed
Human refactoring
1 parent 0e33813 commit 522a126

File tree

1 file changed

+27
-41
lines changed

1 file changed

+27
-41
lines changed

‎agents.just‎

Lines changed: 27 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
workspace_id:=""
1+
# Runs the given task in a workspace
2+
[private]
3+
run workspace_id workflow inner_workflow *ARGS:
4+
bash scripts/agent-workspace.sh run {{workspace_id}} --workflow {{workflow}} -- just --justfile .agent-tools/agents.just --set workspace_id {{workspace_id}} {{inner_workflow}} {{ARGS}}
25

3-
consolidate workspace_id start_change_id end_change_id:
4-
bash scripts/agent-workspace.sh run {{workspace_id}} --workflow consolidate -- just --justfile .agent-tools/agents.just --set workspace_id {{workspace_id}} consolidate-inner {{start_change_id}} {{end_change_id}}
6+
workspace_just := "just --justfile .agent-tools/agents.just"
7+
8+
consolidate workspace_id start_change_id end_change_id: (run workspace_id "consolidate" "consolidate-inner" start_change_id end_change_id)
59

610
consolidate-inner start_change_id end_change_id:
711
#!/usr/bin/env sh
@@ -45,8 +49,7 @@ workspace-clean workspace_id:
4549
workspace-sync-tools workspace_id:
4650
scripts/agent-workspace.sh sync-tools {{workspace_id}}
4751

48-
questions-for-pm workspace_id rev='@':
49-
bash scripts/agent-workspace.sh run {{workspace_id}} --workflow questions-for-pm -- just --justfile .agent-tools/agents.just --set workspace_id {{workspace_id}} questions-for-pm-inner {{rev}}
52+
questions-for-pm workspace_id rev='@': (run {{workspace_id}} "questions-for-pm" "questions-for-pm-inner" rev)
5053

5154
questions-for-pm-inner rev='@':
5255
#!/usr/bin/env sh
@@ -81,7 +84,7 @@ questions-for-pm-inner rev='@':
8184
# Optional manual edits
8285
jj edit $CURRENT_CHANGE && just --justfile .agent-tools/agents.just --set workspace_id {{workspace_id}} edit-inner $PM_CHANGE
8386
# Update issues based on PM responses
84-
just --justfile .agent-tools/agents.just --set workspace_id {{workspace_id}} pm-flow-update-inner $PM_CHANGE
87+
{{workspace_just}} pm-flow-update-inner $PM_CHANGE
8588

8689
# Start a new iteration change, include a counter in the message
8790
jj new -r @ -m "Questions for the PM (iteration ${ITERATION})"
@@ -96,8 +99,7 @@ questions-for-pm-inner rev='@':
9699
jj edit $CURRENT_CHANGE
97100

98101

99-
pm-flow-update workspace_id rev='@':
100-
bash scripts/agent-workspace.sh run {{workspace_id}} --workflow pm-flow-update -- just --justfile .agent-tools/agents.just --set workspace_id {{workspace_id}} pm-flow-update-inner {{rev}}
102+
pm-flow-update workspace_id rev='@': (run workspace_id "pm-flow-update" "pm-flow-update-inner" rev)
101103

102104
pm-flow-update-inner rev='@':
103105
#!/usr/bin/env sh
@@ -116,9 +118,7 @@ pm-flow-update-inner rev='@':
116118
echo "$INSTRUCTIONS_2" | codex exec --full-auto --config model_reasoning_effort=high
117119

118120

119-
next-issue workspace_id:
120-
bash scripts/agent-workspace.sh run {{workspace_id}} --workflow next-issue -- just --justfile .agent-tools/agents.just --set workspace_id {{workspace_id}} next-issue-inner
121-
121+
next-issue workspace_id: (run workspace_id "next-issue" "next-issue-inner")
122122

123123
next-issue-inner:
124124
#!/usr/bin/env sh
@@ -150,9 +150,7 @@ next-issue-inner:
150150
rm next-issue.md
151151

152152

153-
review-change workspace_id:
154-
bash scripts/agent-workspace.sh run {{workspace_id}} --workflow review-change -- just --justfile .agent-tools/agents.just --set workspace_id {{workspace_id}} review-change-inner
155-
153+
review-change workspace_id: (run workspace_id "review-change" "review-change-inner")
156154

157155
review-change-inner:
158156
#!/usr/bin/env sh
@@ -184,9 +182,7 @@ review-change-inner:
184182
EOF
185183

186184

187-
tidy-issues workspace_id:
188-
bash scripts/agent-workspace.sh run {{workspace_id}} --workflow tidy-issues -- just --justfile .agent-tools/agents.just --set workspace_id {{workspace_id}} tidy-issues-inner
189-
185+
tidy-issues workspace_id: (run workspace_id "tidy-issues" "tidy-issues-inner")
190186

191187
tidy-issues-inner:
192188
#!/usr/bin/env sh
@@ -202,9 +198,7 @@ tidy-issues-inner:
202198
`cat "${AGENT_TOOL_COPY_ROOT:-.}/rules/issues.md"`
203199
EOF
204200

205-
archive-issues workspace_id:
206-
bash scripts/agent-workspace.sh run {{workspace_id}} --workflow archive-issues -- just --justfile .agent-tools/agents.just --set workspace_id {{workspace_id}} archive-issues-inner
207-
201+
archive-issues workspace_id: (run workspace_id "archive-issues" "archive-issues-inner")
208202

209203
archive-issues-inner:
210204
#!/usr/bin/env sh
@@ -217,9 +211,7 @@ archive-issues-inner:
217211
5. Then move achived issues to '.archive/issues-yyyy-mm-dd.md' file. Use current date.
218212
6. Finally update the file '/issues-overview.md'. It is a table of issues and statuses
219213

220-
pick-next-issue workspace_id:
221-
bash scripts/agent-workspace.sh run {{workspace_id}} --workflow pick-next-issue -- just --justfile .agent-tools/agents.just --set workspace_id {{workspace_id}} pick-next-issue-inner
222-
214+
pick-next-issue workspace_id: (run workspace_id "pick-next-issue" "pick-next-issue-inner")
223215

224216
pick-next-issue-inner:
225217
#!/usr/bin/env sh
@@ -233,9 +225,7 @@ pick-next-issue-inner:
233225
EOF
234226

235227

236-
edit workspace_id rev='@':
237-
bash scripts/agent-workspace.sh run {{workspace_id}} --workflow edit -- just --justfile .agent-tools/agents.just --set workspace_id {{workspace_id}} edit-inner {{rev}}
238-
228+
edit workspace_id rev='@': (run workspace_id "edit" "edit-inner" rev)
239229

240230
edit-inner rev='@':
241231
#!/usr/bin/env sh
@@ -253,7 +243,7 @@ human-work-step workspace_id:
253243

254244
human-work-step-inner:
255245
#!/usr/bin/env sh
256-
just --justfile .agent-tools/agents.just --set workspace_id {{workspace_id}} edit-inner
246+
{{workspace_just}} edit-inner
257247
jj split issues.md -m "issues: Update after review"
258248
jj edit @-
259249

@@ -263,35 +253,31 @@ ai-work-step workspace_id:
263253

264254
ai-work-step-inner:
265255
#!/usr/bin/env sh
266-
just --justfile .agent-tools/agents.just --set workspace_id {{workspace_id}} next-issue-inner
267-
just --justfile .agent-tools/agents.just --set workspace_id {{workspace_id}} review-change-inner
256+
{{workspace_just}} next-issue-inner
257+
{{workspace_just}} review-change-inner
268258

269259
# Use this step when starting to work on a new issue
270-
work workspace_id:
271-
bash scripts/agent-workspace.sh run {{workspace_id}} --workflow work -- just --justfile .agent-tools/agents.just --set workspace_id {{workspace_id}} work-inner
272-
260+
work workspace_id: (run workspace_id "work" "work-inner")
273261

274262
work-inner:
275263
#!/usr/bin/env sh
276264
while true; do
277-
just --justfile .agent-tools/agents.just --set workspace_id {{workspace_id}} pick-next-issue-inner
265+
{{workspace_just}} pick-next-issue-inner
278266
[ -f next-issue.md ] || break
279-
just --justfile .agent-tools/agents.just --set workspace_id {{workspace_id}} ai-work-step-inner
280-
just --justfile .agent-tools/agents.just --set workspace_id {{workspace_id}} human-work-step-inner
267+
{{workspace_just}} ai-work-step-inner
268+
{{workspace_just}} human-work-step-inner
281269
done
282270

283271
# This should be started if you stop at editor phase and want to continue from where you left off
284272
# Current commit should be the last review commit
285-
continue-work workspace_id:
286-
bash scripts/agent-workspace.sh run {{workspace_id}} --workflow continue-work -- just --justfile .agent-tools/agents.just --set workspace_id {{workspace_id}} continue-work-inner
287-
273+
continue-work workspace_id: (run workspace_id "continue-work" "continue-work-inner")
288274

289275
continue-work-inner:
290276
#!/usr/bin/env sh
291277
while true; do
292-
just --justfile .agent-tools/agents.just --set workspace_id {{workspace_id}} human-work-step-inner
293-
just --justfile .agent-tools/agents.just --set workspace_id {{workspace_id}} pick-next-issue-inner
278+
{{workspace_just}} human-work-step-inner
279+
{{workspace_just}} pick-next-issue-inner
294280
[ -f next-issue.md ] || break
295-
just --justfile .agent-tools/agents.just --set workspace_id {{workspace_id}} ai-work-step-inner
281+
{{workspace_just}} ai-work-step-inner
296282
done
297283

0 commit comments

Comments
 (0)