commit c1db822374ba4a235e024ffd2254ef5cc73c9a5b
Author: Coder Agent <coder@agents.omni>
Date: Wed Feb 11 18:48:14 2026
Omni/Task+Ide: standardize patchset JSON on taskPatchsetCount
- remove legacy patchset_count key from task show JSON augmentation
- update `task patchset --json` output to emit taskPatchsetCount only
- simplify dev-review-release jq parsing to use taskPatchsetCount only
- update workflow docs to reference taskPatchsetCount
Task-Id: t-587.6
diff --git a/Omni/Ide/DEV_REVIEW_RELEASE.md b/Omni/Ide/DEV_REVIEW_RELEASE.md
index 135a440c..0ba1eb3d 100644
--- a/Omni/Ide/DEV_REVIEW_RELEASE.md
+++ b/Omni/Ide/DEV_REVIEW_RELEASE.md
@@ -70,7 +70,7 @@ Omni/Ide/dev-review-release.sh cleanup-branches --apply
- integrator loop: picks `approved` tasks
When dev produces a new task-branch commit SHA, it automatically increments
-`patchset_count` via `task patchset <id> --increment`.
+`taskPatchsetCount` via `task patchset <id> --increment`.
Retry accounting and circuit-breaker behavior are patchset-aware:
- Failed attempts are tracked per role and patchset.
diff --git a/Omni/Ide/dev-review-release.sh b/Omni/Ide/dev-review-release.sh
index 20cad1a7..6b7c8b67 100755
--- a/Omni/Ide/dev-review-release.sh
+++ b/Omni/Ide/dev-review-release.sh
@@ -273,7 +273,7 @@ auto_stash_workspace() {
task_patchset_count() {
local tid="$1"
- task show "$tid" --json | jq -r '.taskPatchsetCount // .patchset_count // 0'
+ task show "$tid" --json | jq -r '.taskPatchsetCount // 0'
}
get_retry_count() {
@@ -476,7 +476,7 @@ build_prompt() {
status="$(jq -r '.taskStatus' <<<"$task_json")"
namespace="$(jq -r '.taskNamespace // ""' <<<"$task_json")"
trailer="$(jq -r '.trailer // (.taskId | "Task-Id: " + .)' <<<"$task_json")"
- patchset_count="$(jq -r '.patchset_count // .taskPatchsetCount // 0' <<<"$task_json")"
+ patchset_count="$(jq -r '.taskPatchsetCount // 0' <<<"$task_json")"
printf '%s\n\n---\n\n' "$workflow"
printf '## Runtime Task Context\n\n'
@@ -644,7 +644,7 @@ run_single_task() {
dev_changed_commit="true"
if patchset_json="$(task patchset "$tid" --increment --json 2>/dev/null)"; then
local new_patchset
- new_patchset="$(jq -r '.patchset_count // .patchsetCount // "?"' <<<"$patchset_json")"
+ new_patchset="$(jq -r '.taskPatchsetCount // "?"' <<<"$patchset_json")"
log "Bumped patchset for $tid to $new_patchset"
else
log "Failed to bump patchset for $tid"
diff --git a/Omni/Task.hs b/Omni/Task.hs
index fc47e708..7bef51f4 100644
--- a/Omni/Task.hs
+++ b/Omni/Task.hs
@@ -467,8 +467,7 @@ doPatchset GlobalOpts {..} tidStr shouldIncrement = do
outputJson
<| Aeson.object
[ "taskId" Aeson..= taskId task,
- "patchsetCount" Aeson..= count,
- "patchset_count" Aeson..= count,
+ "taskPatchsetCount" Aeson..= count,
"incremented" Aeson..= shouldIncrement,
"trailer" Aeson..= taskTrailer (taskId task)
]
@@ -750,16 +749,12 @@ taskJsonWithTrailer task =
Aeson.Object obj ->
Aeson.Object
<| KM.insert
- "patchset_count"
- (Aeson.Number (fromIntegral (taskPatchsetCount task)))
+ "trailer"
+ (Aeson.String (taskTrailer (taskId task)))
( KM.insert
- "trailer"
+ "taskTrailer"
(Aeson.String (taskTrailer (taskId task)))
- ( KM.insert
- "taskTrailer"
- (Aeson.String (taskTrailer (taskId task)))
- obj
- )
+ obj
)
other -> other