prizmkit 1.1.191 → 1.1.193

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (165) hide show
  1. package/bundled/VERSION.json +3 -3
  2. package/bundled/adapters/antigravity/skill-adapter.js +13 -4
  3. package/bundled/adapters/codex/skill-adapter.js +28 -8
  4. package/bundled/adapters/cursor/skill-adapter.js +13 -4
  5. package/bundled/adapters/pi/skill-adapter.js +28 -7
  6. package/bundled/dev-pipeline/.env.example +4 -12
  7. package/bundled/dev-pipeline/README.md +28 -44
  8. package/bundled/dev-pipeline/assets/feature-list-example.json +0 -1
  9. package/bundled/dev-pipeline/assets/skill-subagent-integration.md +6 -6
  10. package/bundled/dev-pipeline/prizmkit_runtime/atomic_io.py +48 -0
  11. package/bundled/dev-pipeline/prizmkit_runtime/checkpoint_state.py +66 -23
  12. package/bundled/dev-pipeline/prizmkit_runtime/cli.py +10 -7
  13. package/bundled/dev-pipeline/prizmkit_runtime/commands.py +2 -21
  14. package/bundled/dev-pipeline/prizmkit_runtime/config.py +48 -78
  15. package/bundled/dev-pipeline/prizmkit_runtime/daemon.py +127 -67
  16. package/bundled/dev-pipeline/prizmkit_runtime/gitops.py +158 -462
  17. package/bundled/dev-pipeline/prizmkit_runtime/heartbeat.py +102 -50
  18. package/bundled/dev-pipeline/prizmkit_runtime/interoperability.py +1 -25
  19. package/bundled/dev-pipeline/prizmkit_runtime/paths.py +0 -6
  20. package/bundled/dev-pipeline/prizmkit_runtime/platform_detection.py +47 -21
  21. package/bundled/dev-pipeline/prizmkit_runtime/processes.py +217 -156
  22. package/bundled/dev-pipeline/prizmkit_runtime/reset.py +39 -27
  23. package/bundled/dev-pipeline/prizmkit_runtime/reset_preserve.py +34 -174
  24. package/bundled/dev-pipeline/prizmkit_runtime/results.py +25 -0
  25. package/bundled/dev-pipeline/prizmkit_runtime/runner_bookkeeping.py +133 -110
  26. package/bundled/dev-pipeline/prizmkit_runtime/runner_classification.py +15 -5
  27. package/bundled/dev-pipeline/prizmkit_runtime/runner_models.py +1 -95
  28. package/bundled/dev-pipeline/prizmkit_runtime/runner_prompts.py +0 -2
  29. package/bundled/dev-pipeline/prizmkit_runtime/runner_status.py +7 -2
  30. package/bundled/dev-pipeline/prizmkit_runtime/runners.py +540 -262
  31. package/bundled/dev-pipeline/prizmkit_runtime/runtime_commit.py +175 -135
  32. package/bundled/dev-pipeline/prizmkit_runtime/runtime_helper.py +90 -9
  33. package/bundled/dev-pipeline/prizmkit_runtime/sessions.py +214 -133
  34. package/bundled/dev-pipeline/prizmkit_runtime/status.py +1 -3
  35. package/bundled/dev-pipeline/prizmkit_runtime/stream_progress.py +2783 -0
  36. package/bundled/dev-pipeline/prizmkit_runtime/task_checkout.py +27 -102
  37. package/bundled/dev-pipeline/prizmkit_runtime/test_result.py +58 -4
  38. package/bundled/dev-pipeline/scripts/check-session-status.py +56 -20
  39. package/bundled/dev-pipeline/scripts/continuation.py +8 -7
  40. package/bundled/dev-pipeline/scripts/detect-stuck.py +47 -33
  41. package/bundled/dev-pipeline/scripts/generate-bootstrap-prompt.py +13 -16
  42. package/bundled/dev-pipeline/scripts/generate-bugfix-prompt.py +20 -10
  43. package/bundled/dev-pipeline/scripts/init-bugfix-pipeline.py +10 -7
  44. package/bundled/dev-pipeline/scripts/init-change-artifact.py +25 -4
  45. package/bundled/dev-pipeline/scripts/init-pipeline.py +14 -69
  46. package/bundled/dev-pipeline/scripts/parse-stream-progress.py +31 -2616
  47. package/bundled/dev-pipeline/scripts/patch-completion-notes.py +4 -24
  48. package/bundled/dev-pipeline/scripts/prompt_framework.py +85 -20
  49. package/bundled/dev-pipeline/scripts/status_common.py +591 -0
  50. package/bundled/dev-pipeline/scripts/update-bug-status.py +85 -463
  51. package/bundled/dev-pipeline/scripts/update-checkpoint.py +254 -65
  52. package/bundled/dev-pipeline/scripts/update-feature-status.py +76 -509
  53. package/bundled/dev-pipeline/scripts/utils.py +5 -12
  54. package/bundled/dev-pipeline/templates/bootstrap-tier3.md +5 -5
  55. package/bundled/dev-pipeline/templates/bug-fix-list-schema.json +7 -0
  56. package/bundled/dev-pipeline/templates/bugfix-bootstrap-prompt.md +7 -7
  57. package/bundled/dev-pipeline/templates/sections/artifact-manifest.md +1 -1
  58. package/bundled/dev-pipeline/templates/sections/bugfix-phase-manual-verification.md +1 -1
  59. package/bundled/dev-pipeline/templates/sections/bugfix-phase-review.md +1 -1
  60. package/bundled/dev-pipeline/templates/sections/bugfix-phase-test.md +2 -1
  61. package/bundled/dev-pipeline/templates/sections/checkpoint-system.md +1 -1
  62. package/bundled/dev-pipeline/templates/sections/phase-browser-verification-auto.md +1 -1
  63. package/bundled/dev-pipeline/templates/sections/phase-browser-verification-opencli.md +2 -2
  64. package/bundled/dev-pipeline/templates/sections/phase-browser-verification.md +2 -2
  65. package/bundled/dev-pipeline/templates/sections/phase-prizmkit-test.md +2 -1
  66. package/bundled/dev-pipeline/templates/sections/phase-review-full.md +1 -1
  67. package/bundled/dev-pipeline/templates/sections/phase-specify-plan-full.md +3 -6
  68. package/bundled/dev-pipeline/templates/session-status-schema.json +2 -5
  69. package/bundled/skills/_metadata.json +9 -63
  70. package/bundled/skills/app-planner/SKILL.md +32 -303
  71. package/bundled/skills/app-planner/references/app-design-guide.md +0 -4
  72. package/bundled/skills/app-planner/references/generated-plan-review.md +2 -1
  73. package/bundled/skills/app-planner/references/project-brief-guide.md +14 -0
  74. package/bundled/skills/app-planner/references/project-conventions-discovery.md +4 -6
  75. package/bundled/skills/app-planner/references/project-state-detection.md +2 -3
  76. package/bundled/skills/bug-fix-workflow/SKILL.md +1 -2
  77. package/bundled/skills/bug-fix-workflow/references/bug-diagnosis.md +4 -7
  78. package/bundled/skills/bug-planner/SKILL.md +54 -435
  79. package/bundled/skills/bug-planner/references/generated-plan-review.md +3 -2
  80. package/bundled/skills/bug-planner/references/input-formats.md +32 -0
  81. package/bundled/skills/bugfix-pipeline-launcher/SKILL.md +4 -6
  82. package/bundled/skills/bugfix-pipeline-launcher/references/configuration.md +4 -28
  83. package/bundled/skills/feature-pipeline-launcher/SKILL.md +4 -6
  84. package/bundled/skills/feature-pipeline-launcher/references/configuration.md +4 -28
  85. package/bundled/skills/feature-planner/SKILL.md +60 -439
  86. package/bundled/skills/feature-planner/assets/planning-guide.md +1 -1
  87. package/bundled/skills/feature-planner/references/completeness-review.md +34 -0
  88. package/bundled/skills/feature-planner/references/decomposition-patterns.md +2 -2
  89. package/bundled/skills/feature-planner/references/error-recovery.md +1 -1
  90. package/bundled/skills/feature-planner/references/generated-plan-review.md +3 -2
  91. package/bundled/skills/feature-planner/references/incremental-feature-planning.md +3 -1
  92. package/bundled/skills/feature-workflow/SKILL.md +1 -2
  93. package/bundled/skills/prizmkit/SKILL.md +7 -1
  94. package/bundled/skills/prizmkit-code-review/SKILL.md +14 -6
  95. package/bundled/skills/prizmkit-code-review/references/independent-code-review.md +7 -4
  96. package/bundled/skills/prizmkit-code-review/references/review-report-template.md +16 -0
  97. package/bundled/skills/prizmkit-code-review/scripts/render_review_report.py +58 -20
  98. package/bundled/skills/prizmkit-implement/SKILL.md +1 -1
  99. package/bundled/skills/prizmkit-init/SKILL.md +24 -127
  100. package/bundled/skills/prizmkit-init/assets/project-brief-template.md +3 -3
  101. package/bundled/skills/prizmkit-plan/SKILL.md +6 -8
  102. package/bundled/skills/prizmkit-plan/references/clarify-guide.md +1 -1
  103. package/bundled/skills/prizmkit-plan/references/independent-plan-review.md +5 -2
  104. package/bundled/skills/prizmkit-plan/references/review-plan-spec-loop.md +6 -5
  105. package/bundled/skills/prizmkit-prizm-docs/SKILL.md +1 -13
  106. package/bundled/skills/prizmkit-prizm-docs/references/op-update.md +1 -1
  107. package/bundled/skills/prizmkit-retrospective/SKILL.md +6 -4
  108. package/bundled/skills/prizmkit-test/SKILL.md +25 -133
  109. package/bundled/skills/prizmkit-test/references/independent-test-review.md +5 -2
  110. package/bundled/skills/prizmkit-test/references/test-coverage-model.md +6 -0
  111. package/bundled/skills/prizmkit-workflow/SKILL.md +2 -3
  112. package/bundled/skills/prizmkit-workflow/references/workflow-state-protocol.md +4 -3
  113. package/bundled/skills/recovery-workflow/SKILL.md +7 -7
  114. package/bundled/skills/recovery-workflow/evals/evals.json +1 -1
  115. package/bundled/skills/recovery-workflow/references/detection.md +1 -3
  116. package/bundled/skills/recovery-workflow/scripts/detect-recovery-state.py +0 -6
  117. package/bundled/templates/project-memory-template.md +1 -2
  118. package/package.json +1 -1
  119. package/src/scaffold.js +28 -7
  120. package/bundled/dev-pipeline/SCHEMA_ANALYSIS.md +0 -53
  121. package/bundled/dev-pipeline/scripts/generate-refactor-prompt.py +0 -649
  122. package/bundled/dev-pipeline/scripts/init-refactor-pipeline.py +0 -463
  123. package/bundled/dev-pipeline/scripts/update-refactor-status.py +0 -1512
  124. package/bundled/dev-pipeline/templates/refactor-bootstrap-prompt.md +0 -240
  125. package/bundled/dev-pipeline/templates/refactor-list-schema.json +0 -266
  126. package/bundled/dev-pipeline/templates/sections/refactor-critical-paths.md +0 -15
  127. package/bundled/dev-pipeline/templates/sections/refactor-mission.md +0 -9
  128. package/bundled/dev-pipeline/templates/sections/refactor-phase-commit-report.md +0 -24
  129. package/bundled/dev-pipeline/templates/sections/refactor-phase-implement.md +0 -16
  130. package/bundled/dev-pipeline/templates/sections/refactor-phase-init.md +0 -9
  131. package/bundled/dev-pipeline/templates/sections/refactor-phase-plan.md +0 -22
  132. package/bundled/dev-pipeline/templates/sections/refactor-phase-review.md +0 -19
  133. package/bundled/dev-pipeline/templates/sections/refactor-phase-test.md +0 -24
  134. package/bundled/dev-pipeline/templates/sections/refactor-reminders.md +0 -12
  135. package/bundled/dev-pipeline/templates/sections/refactor-session-context.md +0 -6
  136. package/bundled/dev-pipeline/templates/sections/refactor-task-contract.md +0 -52
  137. package/bundled/dev-pipeline/tests/conftest.py +0 -29
  138. package/bundled/dev-pipeline/tests/live_ai_cli_log_smoke.py +0 -208
  139. package/bundled/dev-pipeline/tests/test_auto_skip.py +0 -1871
  140. package/bundled/dev-pipeline/tests/test_checkpoint_state.py +0 -1314
  141. package/bundled/dev-pipeline/tests/test_generate_bootstrap_prompt.py +0 -1712
  142. package/bundled/dev-pipeline/tests/test_generate_bugfix_prompt.py +0 -627
  143. package/bundled/dev-pipeline/tests/test_generate_refactor_prompt.py +0 -478
  144. package/bundled/dev-pipeline/tests/test_python_runner_parity.py +0 -5641
  145. package/bundled/dev-pipeline/tests/test_recovery_workflow.py +0 -322
  146. package/bundled/dev-pipeline/tests/test_repository_bootstrap.py +0 -252
  147. package/bundled/dev-pipeline/tests/test_reset_modes.py +0 -1208
  148. package/bundled/dev-pipeline/tests/test_reset_preserve.py +0 -957
  149. package/bundled/dev-pipeline/tests/test_runtime_commit.py +0 -1113
  150. package/bundled/dev-pipeline/tests/test_runtime_helper.py +0 -303
  151. package/bundled/dev-pipeline/tests/test_unified_cli.py +0 -5504
  152. package/bundled/dev-pipeline/tests/test_utils.py +0 -170
  153. package/bundled/skills/feature-planner/assets/evaluation-guide.md +0 -44
  154. package/bundled/skills/refactor-pipeline-launcher/SKILL.md +0 -219
  155. package/bundled/skills/refactor-pipeline-launcher/references/configuration.md +0 -78
  156. package/bundled/skills/refactor-planner/SKILL.md +0 -467
  157. package/bundled/skills/refactor-planner/assets/planning-guide.md +0 -291
  158. package/bundled/skills/refactor-planner/references/behavior-preservation.md +0 -187
  159. package/bundled/skills/refactor-planner/references/error-recovery.md +0 -45
  160. package/bundled/skills/refactor-planner/references/fast-path.md +0 -59
  161. package/bundled/skills/refactor-planner/references/generated-plan-review.md +0 -107
  162. package/bundled/skills/refactor-planner/references/planning-phases.md +0 -172
  163. package/bundled/skills/refactor-planner/references/refactor-scoping-guide.md +0 -230
  164. package/bundled/skills/refactor-planner/scripts/validate-and-generate-refactor.py +0 -1120
  165. package/bundled/skills/refactor-workflow/SKILL.md +0 -205
@@ -1,5 +1,5 @@
1
1
  #!/usr/bin/env python3
2
- """Patch completion_notes into feature-list.json, refactor-list.json, or bug-fix-list.json.
2
+ """Patch completion_notes into feature-list.json or bug-fix-list.json.
3
3
 
4
4
  Reads a completion-summary.json file written by the AI session and patches
5
5
  the corresponding item in the task list with the completion_notes field.
@@ -13,11 +13,6 @@ Usage:
13
13
  --feature-list .prizmkit/plans/feature-list.json \
14
14
  --feature-id F-001 \
15
15
  --summary .prizmkit/specs/001-my-feature/completion-summary.json
16
-
17
- python3 patch-completion-notes.py \
18
- --refactor-list .prizmkit/plans/refactor-list.json \
19
- --refactor-id R-001 \
20
- --summary <path-to-summary>
21
16
  """
22
17
 
23
18
  import argparse
@@ -39,11 +34,6 @@ def parse_args():
39
34
  default=None,
40
35
  help="Path to .prizmkit/plans/feature-list.json",
41
36
  )
42
- parser.add_argument(
43
- "--refactor-list",
44
- default=None,
45
- help="Path to .prizmkit/plans/refactor-list.json",
46
- )
47
37
  parser.add_argument(
48
38
  "--bug-list",
49
39
  default=None,
@@ -54,11 +44,6 @@ def parse_args():
54
44
  default=None,
55
45
  help="Feature ID to patch (e.g. F-001)",
56
46
  )
57
- parser.add_argument(
58
- "--refactor-id",
59
- default=None,
60
- help="Refactor ID to patch (e.g. R-001)",
61
- )
62
47
  parser.add_argument(
63
48
  "--bug-id",
64
49
  default=None,
@@ -101,8 +86,8 @@ def patch_list(list_path, item_id, item_key, notes):
101
86
 
102
87
  Args:
103
88
  list_path: Path to the JSON list file
104
- item_id: ID of the item to patch (e.g. "F-001" or "R-001")
105
- item_key: Key for the items array (e.g. "features" or "refactors")
89
+ item_id: ID of the item to patch (e.g. "F-001" or "B-001")
90
+ item_key: Key for the items array (e.g. "features" or "bugs")
106
91
  notes: List of completion note strings
107
92
  """
108
93
  data, err = load_json_file(list_path)
@@ -137,15 +122,11 @@ def patch_list(list_path, item_id, item_key, notes):
137
122
  def main():
138
123
  args = parse_args()
139
124
 
140
- # Determine mode: feature, refactor, or bug
125
+ # Determine mode: feature or bug
141
126
  if args.feature_list and args.feature_id:
142
127
  list_path = args.feature_list
143
128
  item_id = args.feature_id
144
129
  item_key = "features"
145
- elif args.refactor_list and args.refactor_id:
146
- list_path = args.refactor_list
147
- item_id = args.refactor_id
148
- item_key = "refactors"
149
130
  elif args.bug_list and args.bug_id:
150
131
  list_path = args.bug_list
151
132
  item_id = args.bug_id
@@ -153,7 +134,6 @@ def main():
153
134
  else:
154
135
  print(
155
136
  "Error: must provide either (--feature-list + --feature-id) "
156
- "or (--refactor-list + --refactor-id) "
157
137
  "or (--bug-list + --bug-id)",
158
138
  file=sys.stderr,
159
139
  )
@@ -2,7 +2,7 @@
2
2
 
3
3
  This module intentionally stays small: prompt phase ordering remains explicit in
4
4
  family-specific generators, while common rendering/checkpoint mechanics live here
5
- so feature, bugfix, and refactor prompts do not drift.
5
+ so feature and bugfix prompts do not drift.
6
6
  """
7
7
 
8
8
  import glob
@@ -14,6 +14,7 @@ _PIPELINE_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
14
14
  if _PIPELINE_ROOT not in sys.path:
15
15
  sys.path.insert(0, _PIPELINE_ROOT)
16
16
 
17
+ from prizmkit_runtime.atomic_io import write_text_atomic # noqa: E402
17
18
  from prizmkit_runtime.checkpoint_state import ( # noqa: E402
18
19
  VALID_CHECKPOINT_STATUSES,
19
20
  VALID_REPAIR_SCOPES,
@@ -25,7 +26,7 @@ from prizmkit_runtime.test_result import valid_test_artifact_pair # noqa: E402
25
26
  MAX_OUTER_REPAIR_ROUNDS = 3
26
27
 
27
28
 
28
- def route_pipeline_repair(stage_result, repair_scope=None, repair_round=0):
29
+ def route_pipeline_repair(stage_result, repair_scope=None, repair_round=0, *, production_changed=False):
29
30
  """Map review/test outcomes to bounded, safe pipeline continuation routes."""
30
31
  try:
31
32
  current_round = int(repair_round)
@@ -48,12 +49,34 @@ def route_pipeline_repair(stage_result, repair_scope=None, repair_round=0):
48
49
  "terminal_status": None,
49
50
  }
50
51
  if stage_result == "TEST_PASS":
52
+ if not production_changed:
53
+ result.update(
54
+ resumable=True,
55
+ next_stage="family-report",
56
+ resume_from="family-report",
57
+ route=["family-report", "prizmkit-retrospective"],
58
+ reason="project-native tests passed; family reports precede retrospective",
59
+ )
60
+ return result
61
+ if current_round >= MAX_OUTER_REPAIR_ROUNDS:
62
+ result.update(
63
+ blocked=True,
64
+ reason="maximum outer repair rounds reached after test production repair",
65
+ blocked_reason="repair_round_limit",
66
+ terminal_status="WORKFLOW_BLOCKED",
67
+ )
68
+ return result
69
+ result["repair_round"] = current_round + 1
70
+ result["repair_scope"] = "production"
51
71
  result.update(
52
72
  resumable=True,
53
- next_stage="family-report",
54
- resume_from="family-report",
55
- route=["family-report", "prizmkit-retrospective"],
56
- reason="project-native tests passed; family reports precede retrospective",
73
+ next_stage="prizmkit-code-review",
74
+ resume_from="prizmkit-code-review",
75
+ route=["prizmkit-code-review", "prizmkit-test"],
76
+ reason=(
77
+ "test pass repaired production code; delta code review and fresh "
78
+ "test verification are required before completion"
79
+ ),
57
80
  )
58
81
  return result
59
82
  if stage_result == "TEST_BLOCKED":
@@ -208,18 +231,11 @@ def validate_rendered(content, required_markers=None, logger=None):
208
231
 
209
232
 
210
233
  def write_output(output_path, content):
211
- """Write rendered prompt content to output_path."""
234
+ """Write rendered prompt content atomically to output_path."""
212
235
  abs_path = os.path.abspath(output_path)
213
- output_dir = os.path.dirname(abs_path)
214
- if output_dir and not os.path.isdir(output_dir):
215
- try:
216
- os.makedirs(output_dir, exist_ok=True)
217
- except OSError as exc:
218
- return "Cannot create output directory: {}".format(str(exc))
219
236
  try:
220
- with open(abs_path, "w", encoding="utf-8") as f:
221
- f.write(content)
222
- except IOError as exc:
237
+ write_text_atomic(abs_path, content)
238
+ except OSError as exc:
223
239
  return "Cannot write output file: {}".format(str(exc))
224
240
  return None
225
241
 
@@ -405,7 +421,8 @@ def merge_checkpoint_state(existing, fresh, project_root, validator=None, logger
405
421
  return None
406
422
 
407
423
  chain_broken = False
408
- for step in fresh.get("steps", []):
424
+ first_break_index = None
425
+ for index, step in enumerate(fresh.get("steps", [])):
409
426
  if chain_broken:
410
427
  step["status"] = "pending"
411
428
  continue
@@ -441,16 +458,64 @@ def merge_checkpoint_state(existing, fresh, project_root, validator=None, logger
441
458
  step["status"] = "skipped"
442
459
  continue
443
460
  chain_broken = True
461
+ first_break_index = index
444
462
  step["status"] = "pending"
445
463
 
446
464
  workflow_type = fresh.get("workflow_type", "")
447
465
  state_key = {
448
466
  "feature-pipeline": "feature_state",
449
467
  "bugfix-pipeline": "bugfix_state",
450
- "refactor-pipeline": "refactor_state",
451
468
  }.get(workflow_type)
452
- if state_key and isinstance(existing.get(state_key), dict):
453
- fresh[state_key] = dict(existing[state_key])
469
+ if state_key:
470
+ existing_state = existing.get(state_key) if isinstance(existing.get(state_key), dict) else {}
471
+ merged_state = dict(fresh[state_key]) if isinstance(fresh.get(state_key), dict) else {}
472
+ if existing_state:
473
+ merged_state.update(existing_state)
474
+ if chain_broken and merged_state:
475
+ from prizmkit_runtime.checkpoint_state import (
476
+ SKILL_WORKFLOW_STAGES,
477
+ TERMINAL_STEP_STATUSES,
478
+ )
479
+
480
+ steps_list = fresh.get("steps", [])
481
+ first_active = next(
482
+ (s for s in steps_list if s.get("status") not in TERMINAL_STEP_STATUSES),
483
+ None,
484
+ )
485
+ next_skill = first_active.get("skill") if isinstance(first_active, dict) else None
486
+ repair_target = existing_state.get("next_stage")
487
+ repair_target_index = next(
488
+ (i for i, s in enumerate(steps_list) if s.get("skill") == repair_target),
489
+ None,
490
+ )
491
+ active_routed_repair = (
492
+ existing_state.get("stage_result") in {"REVIEW_NEEDS_FIXES", "TEST_NEEDS_FIXES"}
493
+ and repair_target == "prizmkit-implement"
494
+ and existing_state.get("terminal_status") is None
495
+ and repair_target_index is not None
496
+ and first_break_index is not None
497
+ and first_break_index >= repair_target_index
498
+ )
499
+ merged_state["terminal_status"] = None
500
+ merged_state["blocked_reason"] = None
501
+ merged_state.pop("runtime_base_head", None)
502
+ merged_state.pop("runtime_commit_hash", None)
503
+ if active_routed_repair:
504
+ merged_state["next_stage"] = repair_target
505
+ merged_state["resume_from"] = repair_target
506
+ if not merged_state.get("current_stage") and next_skill:
507
+ merged_state["current_stage"] = next_skill
508
+ else:
509
+ merged_state["repair_scope"] = None
510
+ merged_state.pop("stage_result", None)
511
+ merged_state["status"] = "pending"
512
+ merged_state["current_stage"] = next_skill
513
+ merged_state["next_stage"] = next_skill
514
+ merged_state["resume_from"] = next_skill
515
+ if next_skill:
516
+ merged_state["stage"] = SKILL_WORKFLOW_STAGES.get(next_skill, next_skill)
517
+ if merged_state:
518
+ fresh[state_key] = merged_state
454
519
 
455
520
  return fresh
456
521