@hunter-harness/workflow-harness 0.2.80 → 0.2.81

package/harness/bundles/java/cursor/harness-review/SKILL.md

@@ -4,7 +4,7 @@ description: 6维度代码审查（架构/安全/规范/兼容/测试/性能）
   .harness/context-index.json）和测试场景表，在隔离上下文运行。仅当用户显式调用 /harness-review 时使用；不得在
   test 结束后自动接续执行。
 ---
-<!-- generated by harness_deploy.py; core=ad06ee73d8c86613; overlay=java; agent=cursor; do not edit -->
+<!-- generated by harness_deploy.py; core=718eb530eef010b8; overlay=java; agent=cursor; do not edit -->
 # harness-review — 代码审查
 
 ## Purpose
@@ -144,13 +144,23 @@ review 读取 `state-snapshot.json`（`harness_state.py` / state-layout-protocol
 
 `events.ndjson` 为唯一事实源（schema_version 3，兼容读取 v1/v2；`note` 承载人类可读摘要）；`logs/execution-log.md` 由 `harness_events.py` 渲染，**禁止用 Write/Edit 直接维护**。直接修改的内容会在 `phase.end` 或 finalize 时被完整重建覆盖，属于数据丢失；需要保留的详情必须进入事件 `note`。结构 → [[../protocols/report-pipeline-protocol.md|report-pipeline-protocol]]
 
+**`phase.start` 由 `harness_gate.py begin` 写，不要再手工追加一次。** 两条同 `run-id` 的
+`phase.start` 会让 `plan finalize` 以 `PHASE_START_DUPLICATE` 卡死，而且手工那次会先触发
+auto-seal、把正在开始的 attempt 封成 `RECOVERED`。要补触发指令说明就带 `--note` 跑 `gate begin`。
+（重复追加现已按 `(phase, run-id)` 判为幂等 no-op，但依赖它不如不写。）
+
 ```powershell
-python <skills-root>/scripts/harness_events.py append --change-dir ".harness/changes/<change-name>" --phase <phase> --type phase.start --run-id <phase-run-id> --attempt <n> --note "<触发指令>"
+# 阶段开始：gate begin 负责，note 在这里给
+python <skills-root>/scripts/harness_gate.py begin --change-dir ".harness/changes/<change-name>" --phase <phase> --note "<触发指令>"
+# 阶段中的其他事件才用 append
+python <skills-root>/scripts/harness_events.py append --change-dir ".harness/changes/<change-name>" --phase <phase> --type <command|issue|verification> --run-id <phase-run-id> --note "<摘要>"
 ```
 
 > **脚本接线**：`harness_events.py append`；`harness_archive.py finalize`；`harness_preflight.py check`；`harness_ledger.py can-reuse`；`harness_service.py ensure/stop`（须 `--files`/`serviceStart.inputFiles`）。JSON 输出按 D13 护栏解读。
 
 > **Task 4 §6.1 写入契约**：普通 `append` = 加锁 -> 追加一行 -> fsync -> 解锁，**不 load 历史、不渲染**（O(1)，跨进程锁 `events.ndjson.lock`，UUID 用完整 `uuid4().hex` 无需去重扫描）。仅 `--type phase.end` append 在追加成功后渲染一次 `execution-log.md`；显式 `harness_events.py render` 随时从完整 events 重建；`harness_archive.py finalize` 在 collect 前强制 render 一次。高频 command append 期间 log 可能滞后，phase 边界保持最新。
 
-每个阶段的 `phase.start` 与对应 `phase.end` 必须复用同一 `--run-id` / `--attempt`；阶段结束必须写 `--status OK|WARN|FAIL|BLOCKED`。重试同一阶段时生成新的 run-id 并增加 `--attempt <n>`，不得覆盖或伪装成一次执行。跨工具继续执行时写 `--executor-tool <codex|claude-code|codebuddy|cursor>`，并在接棒事件写 `--handoff-from-tool` / `--handoff-reason`；也可由 `HUNTER_HARNESS_TOOL/AGENT/MODEL/RUN_ID` 环境变量统一注入。
+每个阶段的 `phase.start` 与对应 `phase.end` 必须复用同一 `--run-id` / `--attempt`；阶段结束必须写 `--status OK|WARN|FAIL|BLOCKED`。重试同一阶段时生成新的 run-id 并增加 `--attempt <n>`，不得覆盖或伪装成一次执行。**`attempt` 按 phase 全局递增，不是按 run-id**：一个 run-id 只绑定一个 attempt，重试必须「新 run-id ＋ 下一个 attempt」两者同时换，只换其一会撞 `EVENT_ATTEMPT_CONFLICT` 或 `PHASE_ALREADY_CLOSED`。已发布的 plan 用 `harness_plan_finalize.py republish` 自动分配两者。
+
+阶段跑得久（plan/run 常见）时用 `harness_context.py renew --project . --change <cn> --executor <tool>` 续租；租约到期本身不再阻断 `close`（同一 owner 的过期租约不构成冲突，收据里记 `leaseLapsed`），但续租能让 `view` 的状态如实反映在跑。跨工具继续执行时写 `--executor-tool <codex|claude-code|codebuddy|cursor>`，并在接棒事件写 `--handoff-from-tool` / `--handoff-reason`；也可由 `HUNTER_HARNESS_TOOL/AGENT/MODEL/RUN_ID` 环境变量统一注入。
 > 片段：logging · phase=`review` · 事件：phase/decision/verification/issue/artifact

package/harness/bundles/java/cursor/harness-run/SKILL.md

@@ -3,7 +3,7 @@ name: harness-run
 description: 按变更簇执行 TDD 编码循环（RED→GREEN→REFACTOR→编译验证），逐变更簇实现计划中的任务。仅当用户显式调用
   /harness-run 时使用；不得因用户提到编码/实现就自动触发，也不得被其他阶段 skill 自动接续。
 ---
-<!-- generated by harness_deploy.py; core=ad06ee73d8c86613; overlay=java; agent=cursor; do not edit -->
+<!-- generated by harness_deploy.py; core=718eb530eef010b8; overlay=java; agent=cursor; do not edit -->
 # harness-run — 需求编码
 
 ## Purpose
@@ -156,13 +156,23 @@ python <skills-root>/scripts/harness_test_guard.py record --project . --change-d
 
 `events.ndjson` 为唯一事实源（schema_version 3，兼容读取 v1/v2；`note` 承载人类可读摘要）；`logs/execution-log.md` 由 `harness_events.py` 渲染，**禁止用 Write/Edit 直接维护**。直接修改的内容会在 `phase.end` 或 finalize 时被完整重建覆盖，属于数据丢失；需要保留的详情必须进入事件 `note`。结构 → [[../protocols/report-pipeline-protocol.md|report-pipeline-protocol]]
 
+**`phase.start` 由 `harness_gate.py begin` 写，不要再手工追加一次。** 两条同 `run-id` 的
+`phase.start` 会让 `plan finalize` 以 `PHASE_START_DUPLICATE` 卡死，而且手工那次会先触发
+auto-seal、把正在开始的 attempt 封成 `RECOVERED`。要补触发指令说明就带 `--note` 跑 `gate begin`。
+（重复追加现已按 `(phase, run-id)` 判为幂等 no-op，但依赖它不如不写。）
+
 ```powershell
-python <skills-root>/scripts/harness_events.py append --change-dir ".harness/changes/<change-name>" --phase <phase> --type phase.start --run-id <phase-run-id> --attempt <n> --note "<触发指令>"
+# 阶段开始：gate begin 负责，note 在这里给
+python <skills-root>/scripts/harness_gate.py begin --change-dir ".harness/changes/<change-name>" --phase <phase> --note "<触发指令>"
+# 阶段中的其他事件才用 append
+python <skills-root>/scripts/harness_events.py append --change-dir ".harness/changes/<change-name>" --phase <phase> --type <command|issue|verification> --run-id <phase-run-id> --note "<摘要>"
 ```
 
 > **脚本接线**：`harness_events.py append`；`harness_archive.py finalize`；`harness_preflight.py check`；`harness_ledger.py can-reuse`；`harness_service.py ensure/stop`（须 `--files`/`serviceStart.inputFiles`）。JSON 输出按 D13 护栏解读。
 
 > **Task 4 §6.1 写入契约**：普通 `append` = 加锁 -> 追加一行 -> fsync -> 解锁，**不 load 历史、不渲染**（O(1)，跨进程锁 `events.ndjson.lock`，UUID 用完整 `uuid4().hex` 无需去重扫描）。仅 `--type phase.end` append 在追加成功后渲染一次 `execution-log.md`；显式 `harness_events.py render` 随时从完整 events 重建；`harness_archive.py finalize` 在 collect 前强制 render 一次。高频 command append 期间 log 可能滞后，phase 边界保持最新。
 
-每个阶段的 `phase.start` 与对应 `phase.end` 必须复用同一 `--run-id` / `--attempt`；阶段结束必须写 `--status OK|WARN|FAIL|BLOCKED`。重试同一阶段时生成新的 run-id 并增加 `--attempt <n>`，不得覆盖或伪装成一次执行。跨工具继续执行时写 `--executor-tool <codex|claude-code|codebuddy|cursor>`，并在接棒事件写 `--handoff-from-tool` / `--handoff-reason`；也可由 `HUNTER_HARNESS_TOOL/AGENT/MODEL/RUN_ID` 环境变量统一注入。
+每个阶段的 `phase.start` 与对应 `phase.end` 必须复用同一 `--run-id` / `--attempt`；阶段结束必须写 `--status OK|WARN|FAIL|BLOCKED`。重试同一阶段时生成新的 run-id 并增加 `--attempt <n>`，不得覆盖或伪装成一次执行。**`attempt` 按 phase 全局递增，不是按 run-id**：一个 run-id 只绑定一个 attempt，重试必须「新 run-id ＋ 下一个 attempt」两者同时换，只换其一会撞 `EVENT_ATTEMPT_CONFLICT` 或 `PHASE_ALREADY_CLOSED`。已发布的 plan 用 `harness_plan_finalize.py republish` 自动分配两者。
+
+阶段跑得久（plan/run 常见）时用 `harness_context.py renew --project . --change <cn> --executor <tool>` 续租；租约到期本身不再阻断 `close`（同一 owner 的过期租约不构成冲突，收据里记 `leaseLapsed`），但续租能让 `view` 的状态如实反映在跑。跨工具继续执行时写 `--executor-tool <codex|claude-code|codebuddy|cursor>`，并在接棒事件写 `--handoff-from-tool` / `--handoff-reason`；也可由 `HUNTER_HARNESS_TOOL/AGENT/MODEL/RUN_ID` 环境变量统一注入。
 > 片段：logging · phase=`run`

package/harness/bundles/java/cursor/harness-submit/SKILL.md

@@ -3,7 +3,7 @@ name: harness-submit
 description: 最终提交封装：验证→中文 commit→提交/推送；worktree 模式含 --no-ff 合并回主分支。仅当用户显式调用
   /harness-submit（或 /harness-merge 重入合并段）时使用；用户口头说'提交/commit/push'时必须先确认，不得自动触发。
 ---
-<!-- generated by harness_deploy.py; core=ad06ee73d8c86613; overlay=java; agent=cursor; do not edit -->
+<!-- generated by harness_deploy.py; core=718eb530eef010b8; overlay=java; agent=cursor; do not edit -->
 # harness-submit — 最终提交（含 worktree 合并）
 
 ## Purpose
@@ -167,13 +167,23 @@ git 经 PowerShell；commit/报告不得含明文密钥。遵循 `../protocols/s
 
 `events.ndjson` 为唯一事实源（schema_version 3，兼容读取 v1/v2；`note` 承载人类可读摘要）；`logs/execution-log.md` 由 `harness_events.py` 渲染，**禁止用 Write/Edit 直接维护**。直接修改的内容会在 `phase.end` 或 finalize 时被完整重建覆盖，属于数据丢失；需要保留的详情必须进入事件 `note`。结构 → [[../protocols/report-pipeline-protocol.md|report-pipeline-protocol]]
 
+**`phase.start` 由 `harness_gate.py begin` 写，不要再手工追加一次。** 两条同 `run-id` 的
+`phase.start` 会让 `plan finalize` 以 `PHASE_START_DUPLICATE` 卡死，而且手工那次会先触发
+auto-seal、把正在开始的 attempt 封成 `RECOVERED`。要补触发指令说明就带 `--note` 跑 `gate begin`。
+（重复追加现已按 `(phase, run-id)` 判为幂等 no-op，但依赖它不如不写。）
+
 ```powershell
-python <skills-root>/scripts/harness_events.py append --change-dir ".harness/changes/<change-name>" --phase <phase> --type phase.start --run-id <phase-run-id> --attempt <n> --note "<触发指令>"
+# 阶段开始：gate begin 负责，note 在这里给
+python <skills-root>/scripts/harness_gate.py begin --change-dir ".harness/changes/<change-name>" --phase <phase> --note "<触发指令>"
+# 阶段中的其他事件才用 append
+python <skills-root>/scripts/harness_events.py append --change-dir ".harness/changes/<change-name>" --phase <phase> --type <command|issue|verification> --run-id <phase-run-id> --note "<摘要>"
 ```
 
 > **脚本接线**：`harness_events.py append`；`harness_archive.py finalize`；`harness_preflight.py check`；`harness_ledger.py can-reuse`；`harness_service.py ensure/stop`（须 `--files`/`serviceStart.inputFiles`）。JSON 输出按 D13 护栏解读。
 
 > **Task 4 §6.1 写入契约**：普通 `append` = 加锁 -> 追加一行 -> fsync -> 解锁，**不 load 历史、不渲染**（O(1)，跨进程锁 `events.ndjson.lock`，UUID 用完整 `uuid4().hex` 无需去重扫描）。仅 `--type phase.end` append 在追加成功后渲染一次 `execution-log.md`；显式 `harness_events.py render` 随时从完整 events 重建；`harness_archive.py finalize` 在 collect 前强制 render 一次。高频 command append 期间 log 可能滞后，phase 边界保持最新。
 
-每个阶段的 `phase.start` 与对应 `phase.end` 必须复用同一 `--run-id` / `--attempt`；阶段结束必须写 `--status OK|WARN|FAIL|BLOCKED`。重试同一阶段时生成新的 run-id 并增加 `--attempt <n>`，不得覆盖或伪装成一次执行。跨工具继续执行时写 `--executor-tool <codex|claude-code|codebuddy|cursor>`，并在接棒事件写 `--handoff-from-tool` / `--handoff-reason`；也可由 `HUNTER_HARNESS_TOOL/AGENT/MODEL/RUN_ID` 环境变量统一注入。
+每个阶段的 `phase.start` 与对应 `phase.end` 必须复用同一 `--run-id` / `--attempt`；阶段结束必须写 `--status OK|WARN|FAIL|BLOCKED`。重试同一阶段时生成新的 run-id 并增加 `--attempt <n>`，不得覆盖或伪装成一次执行。**`attempt` 按 phase 全局递增，不是按 run-id**：一个 run-id 只绑定一个 attempt，重试必须「新 run-id ＋ 下一个 attempt」两者同时换，只换其一会撞 `EVENT_ATTEMPT_CONFLICT` 或 `PHASE_ALREADY_CLOSED`。已发布的 plan 用 `harness_plan_finalize.py republish` 自动分配两者。
+
+阶段跑得久（plan/run 常见）时用 `harness_context.py renew --project . --change <cn> --executor <tool>` 续租；租约到期本身不再阻断 `close`（同一 owner 的过期租约不构成冲突，收据里记 `leaseLapsed`），但续租能让 `view` 的状态如实反映在跑。跨工具继续执行时写 `--executor-tool <codex|claude-code|codebuddy|cursor>`，并在接棒事件写 `--handoff-from-tool` / `--handoff-reason`；也可由 `HUNTER_HARNESS_TOOL/AGENT/MODEL/RUN_ID` 环境变量统一注入。
 > 片段：logging · phase=`submit`/`merge`

package/harness/bundles/java/cursor/harness-sync/SKILL.md

@@ -4,7 +4,7 @@ description: Use when the user asks to synchronize, refresh, or validate Harness
   metadata, adapters, remote knowledge ownership, instruction entrypoints,
   config origins, or CodeGraph status.
 ---
-<!-- generated by harness_deploy.py; core=ad06ee73d8c86613; overlay=java; agent=cursor; do not edit -->
+<!-- generated by harness_deploy.py; core=718eb530eef010b8; overlay=java; agent=cursor; do not edit -->
 # harness-sync
 
 ## Purpose

package/harness/bundles/java/cursor/harness-test/SKILL.md

@@ -3,7 +3,7 @@ name: harness-test
 description: 测试执行：读取场景表，执行单元测试+API接口测试+数据兼容验证，输出测试报告。仅当用户显式调用 /harness-test
   时使用；不得在 run 结束后自动接续执行。
 ---
-<!-- generated by harness_deploy.py; core=ad06ee73d8c86613; overlay=java; agent=cursor; do not edit -->
+<!-- generated by harness_deploy.py; core=718eb530eef010b8; overlay=java; agent=cursor; do not edit -->
 # harness-test — 测试执行
 
 ## Purpose
@@ -233,13 +233,23 @@ python <skills-root>/scripts/harness_test_guard.py record --project . --change-d
 
 `events.ndjson` 为唯一事实源（schema_version 3，兼容读取 v1/v2；`note` 承载人类可读摘要）；`logs/execution-log.md` 由 `harness_events.py` 渲染，**禁止用 Write/Edit 直接维护**。直接修改的内容会在 `phase.end` 或 finalize 时被完整重建覆盖，属于数据丢失；需要保留的详情必须进入事件 `note`。结构 → [[../protocols/report-pipeline-protocol.md|report-pipeline-protocol]]
 
+**`phase.start` 由 `harness_gate.py begin` 写，不要再手工追加一次。** 两条同 `run-id` 的
+`phase.start` 会让 `plan finalize` 以 `PHASE_START_DUPLICATE` 卡死，而且手工那次会先触发
+auto-seal、把正在开始的 attempt 封成 `RECOVERED`。要补触发指令说明就带 `--note` 跑 `gate begin`。
+（重复追加现已按 `(phase, run-id)` 判为幂等 no-op，但依赖它不如不写。）
+
 ```powershell
-python <skills-root>/scripts/harness_events.py append --change-dir ".harness/changes/<change-name>" --phase <phase> --type phase.start --run-id <phase-run-id> --attempt <n> --note "<触发指令>"
+# 阶段开始：gate begin 负责，note 在这里给
+python <skills-root>/scripts/harness_gate.py begin --change-dir ".harness/changes/<change-name>" --phase <phase> --note "<触发指令>"
+# 阶段中的其他事件才用 append
+python <skills-root>/scripts/harness_events.py append --change-dir ".harness/changes/<change-name>" --phase <phase> --type <command|issue|verification> --run-id <phase-run-id> --note "<摘要>"
 ```
 
 > **脚本接线**：`harness_events.py append`；`harness_archive.py finalize`；`harness_preflight.py check`；`harness_ledger.py can-reuse`；`harness_service.py ensure/stop`（须 `--files`/`serviceStart.inputFiles`）。JSON 输出按 D13 护栏解读。
 
 > **Task 4 §6.1 写入契约**：普通 `append` = 加锁 -> 追加一行 -> fsync -> 解锁，**不 load 历史、不渲染**（O(1)，跨进程锁 `events.ndjson.lock`，UUID 用完整 `uuid4().hex` 无需去重扫描）。仅 `--type phase.end` append 在追加成功后渲染一次 `execution-log.md`；显式 `harness_events.py render` 随时从完整 events 重建；`harness_archive.py finalize` 在 collect 前强制 render 一次。高频 command append 期间 log 可能滞后，phase 边界保持最新。
 
-每个阶段的 `phase.start` 与对应 `phase.end` 必须复用同一 `--run-id` / `--attempt`；阶段结束必须写 `--status OK|WARN|FAIL|BLOCKED`。重试同一阶段时生成新的 run-id 并增加 `--attempt <n>`，不得覆盖或伪装成一次执行。跨工具继续执行时写 `--executor-tool <codex|claude-code|codebuddy|cursor>`，并在接棒事件写 `--handoff-from-tool` / `--handoff-reason`；也可由 `HUNTER_HARNESS_TOOL/AGENT/MODEL/RUN_ID` 环境变量统一注入。
+每个阶段的 `phase.start` 与对应 `phase.end` 必须复用同一 `--run-id` / `--attempt`；阶段结束必须写 `--status OK|WARN|FAIL|BLOCKED`。重试同一阶段时生成新的 run-id 并增加 `--attempt <n>`，不得覆盖或伪装成一次执行。**`attempt` 按 phase 全局递增，不是按 run-id**：一个 run-id 只绑定一个 attempt，重试必须「新 run-id ＋ 下一个 attempt」两者同时换，只换其一会撞 `EVENT_ATTEMPT_CONFLICT` 或 `PHASE_ALREADY_CLOSED`。已发布的 plan 用 `harness_plan_finalize.py republish` 自动分配两者。
+
+阶段跑得久（plan/run 常见）时用 `harness_context.py renew --project . --change <cn> --executor <tool>` 续租；租约到期本身不再阻断 `close`（同一 owner 的过期租约不构成冲突，收据里记 `leaseLapsed`），但续租能让 `view` 的状态如实反映在跑。跨工具继续执行时写 `--executor-tool <codex|claude-code|codebuddy|cursor>`，并在接棒事件写 `--handoff-from-tool` / `--handoff-reason`；也可由 `HUNTER_HARNESS_TOOL/AGENT/MODEL/RUN_ID` 环境变量统一注入。
 > 片段：logging · phase=`test` · 事件：phase/command/verification/decision/issue/artifact

package/harness/bundles/java/cursor/scripts/harness_context.py

@@ -1165,9 +1165,11 @@ def close_transition(
             "holder": lease.get("owner"),
             "leasePhase": lease.get("phase"),
         }
+    # Owner and phase already matched above, so nobody took this lease over: a
+    # takeover rewrites the file and would have produced CONTEXT_LEASE_MISMATCH.
+    # A lapsed deadline therefore proves only that the phase outlived the TTL.
     expiry = _parse_time(lease.get("expiresAt"))
-    if expiry is None or _now() >= expiry:
-        return {"ok": False, "code": "CONTEXT_LEASE_EXPIRED"}
+    lease_lapsed = expiry is None or _now() >= expiry
 
     previous_hash = transitions[-1].get("receiptHash") if transitions else None
     attempt = (
@@ -1192,6 +1194,12 @@ def close_transition(
         "closedAt": _now().isoformat(),
         "previousReceiptHash": previous_hash,
     }
+    if lease_lapsed:
+        # Recorded, not hidden: the phase ran past its lease without a renewal.
+        receipt["leaseLapsed"] = {
+            "expiresAt": lease.get("expiresAt"),
+            "acquiredAt": lease.get("acquiredAt"),
+        }
     receipt["receiptHash"] = _payload_hash(receipt)
     _append_ndjson(paths["transitions"], receipt)
     paths["lease"].unlink(missing_ok=True)
@@ -1267,7 +1275,11 @@ def _begin_transition_unlocked(
             "legacyBootstrap": True,
             "message": (
                 "没有交接凭证。v2 计划应有 committed 的 meta/publication-journals/*.json "
-                "作为补录证据；legacy 计划需先完成 plan 阶段的 close"
+                "作为补录证据；legacy 计划需先完成 plan 阶段的 close。"
+                "首次进入某阶段（还没有任何 transition 凭证）时不要用 context begin——"
+                "改跑 `harness_gate.py begin --change-dir .harness/changes/<change> "
+                "--phase <phase> --run-id <phase>_<uuid4hex> --note \"<触发指令>\"`，"
+                "它会领取租约并写好 phase.start。"
             ),
         }
     receipt = transitions[-1]
@@ -1458,6 +1470,53 @@ def cancel_prepared_context(
     }
 
 
+def renew_lease(
+    project: Path,
+    change: str,
+    *,
+    executor: str,
+    ttl_seconds: int = 3600,
+) -> dict[str, Any]:
+    """Extend the current phase lease in place.
+
+    Only the recorded owner may renew, and only while no other executor has
+    taken the lease over. Renewal touches nothing but ``expiresAt``, so it is
+    safe to call on a heartbeat during a long phase.
+    """
+    project = project.resolve()
+    try:
+        _, _, state_root = _contract(project, change)
+    except ValueError as exc:
+        return {"ok": False, "code": _contract_error_code(exc), "error": str(exc)}
+    paths = _paths(state_root)
+    if not paths["lease"].is_file():
+        return {"ok": False, "code": "CONTEXT_LEASE_REQUIRED"}
+    with _exclusive_state_lock(paths["runtime"] / "branch-selection.lock"):
+        try:
+            lease = _read_json(paths["lease"])
+        except (OSError, ValueError, json.JSONDecodeError):
+            return {"ok": False, "code": "CONTEXT_LEASE_INVALID"}
+        if lease.get("owner") != executor:
+            return {
+                "ok": False,
+                "code": "CONTEXT_LEASE_MISMATCH",
+                "holder": lease.get("owner"),
+            }
+        expiry = _parse_time(lease.get("expiresAt"))
+        lapsed = expiry is None or _now() >= expiry
+        lease["expiresAt"] = (
+            _now() + dt.timedelta(seconds=max(1, int(ttl_seconds)))
+        ).isoformat()
+        lease["renewedAt"] = _now().isoformat()
+        _write_json_atomic(paths["lease"], lease)
+    return {
+        "ok": True,
+        "code": "CONTEXT_LEASE_RENEWED",
+        "lease": lease,
+        "wasLapsed": lapsed,
+    }
+
+
 def context_view(project: Path, change: str) -> dict[str, Any]:
     project = Path(project).resolve()
     try:
@@ -1536,6 +1595,14 @@ def build_parser() -> argparse.ArgumentParser:
     begin.add_argument("--change", required=True)
     begin.add_argument("--phase", required=True)
     begin.add_argument("--executor", required=True)
+    renew = sub.add_parser(
+        "renew", help="extend the current phase lease without touching context"
+    )
+    renew.add_argument("--json", action="store_true")
+    renew.add_argument("--project", required=True, type=Path)
+    renew.add_argument("--change", required=True)
+    renew.add_argument("--executor", required=True)
+    renew.add_argument("--ttl-seconds", type=int, default=3600)
     configure = sub.add_parser("configure-plan")
     configure.add_argument("--json", action="store_true")
     configure.add_argument("--project", required=True, type=Path)
@@ -1588,6 +1655,13 @@ def main(argv: list[str] | None = None) -> int:
             phase=args.phase,
             executor=args.executor,
         )
+    elif args.command == "renew":
+        result = renew_lease(
+            args.project,
+            args.change,
+            executor=args.executor,
+            ttl_seconds=args.ttl_seconds,
+        )
     elif args.command == "configure-plan":
         result = configure_phase_plan(
             args.project,

package/harness/bundles/java/cursor/scripts/harness_events.py

@@ -1904,6 +1904,7 @@ def cmd_append(args: argparse.Namespace) -> int:
             file=sys.stderr,
         )
     phase_closed = False
+    phase_start_duplicate = False
     projection_error: str | None = None
     attempt_error: str | None = None
     auto_sealed_events: list[dict[str, Any]] = []
@@ -1951,10 +1952,25 @@ def cmd_append(args: argparse.Namespace) -> int:
                 except ValueError as exc:
                     projection_error = str(exc)
             elif args.type == "phase.start":
+                # Re-appending the same (phase, run_id) is the caller restating a
+                # start that already exists — `gate begin` writes one, and the
+                # logging protocol used to ask for a second. Treat it as a no-op
+                # rather than a duplicate; two identical phase.start events make
+                # `plan finalize` unrecoverable via PHASE_START_DUPLICATE.
+                if run_id is not None and any(
+                    item.get("phase") == args.phase
+                    and item.get("type") == "phase.start"
+                    and item.get("run_id") == run_id
+                    for item in existing_events
+                ):
+                    phase_start_duplicate = True
                 # HH-WF-20260730-001: a new phase.start must not be appended
                 # while a prior attempt for the same phase is still open —
                 # auto-seal it first so timing never has two open attempts.
-                open_attempts = open_attempts_for_phase(existing_events, args.phase)
+                open_attempts = (
+                    [] if phase_start_duplicate
+                    else open_attempts_for_phase(existing_events, args.phase)
+                )
                 if open_attempts:
                     inferred_reason = infer_auto_seal_reason(
                         open_attempts[-1].get("events") or []
@@ -1964,7 +1980,12 @@ def cmd_append(args: argparse.Namespace) -> int:
                         phase=args.phase,
                         seal_reason=inferred_reason,
                     )
-            if not phase_closed and projection_error is None and attempt_error is None:
+            if (
+                not phase_closed
+                and not phase_start_duplicate
+                and projection_error is None
+                and attempt_error is None
+            ):
                 for seal_event in auto_sealed_events:
                     atomic_append_line(
                         path,
@@ -1976,6 +1997,18 @@ def cmd_append(args: argparse.Namespace) -> int:
                 )
     except (OSError, TimeoutError, ValueError) as exc:
         return emit_error(f"append failed: {exc}", as_json=as_json)
+    if phase_start_duplicate:
+        if as_json:
+            print(json.dumps({
+                "ok": True,
+                "skipped": True,
+                "reason": "phase-start-already-recorded",
+                "phase": args.phase,
+                "run_id": event.get("run_id"),
+            }, ensure_ascii=False))
+        else:
+            print("ok (phase.start already recorded for this run id)")
+        return 0
     if phase_closed:
         return emit_error(
             "PHASE_ALREADY_CLOSED: refusing a second phase.end for the same "

package/harness/bundles/java/cursor/scripts/harness_plan_finalize.py

@@ -735,7 +735,12 @@ def _validate_plan_start(
     if len(matching) > 1:
         return _result_error(
             "PHASE_START_DUPLICATE",
-            f"found {len(matching)} matching plan phase.start events",
+            f"found {len(matching)} matching plan phase.start events for run id "
+            f"{run_id}. `harness_gate.py begin` already appends phase.start; a "
+            "second manual append of the same run id creates this state. Recover "
+            "with a fresh run id and the next attempt number (attempts are global "
+            "per phase, not per run id): append phase.start with both, then "
+            "finalize with the same pair.",
         )
     return {"ok": True, "phaseStartCount": 1}
 

package/harness/manifests/general/claude-code.json

@@ -2,7 +2,7 @@
   "schema_version": 2,
   "profile": "general",
   "adapter": "claude-code",
-  "bundle_version": "0.2.69",
+  "bundle_version": "0.2.70",
   "requires": {
     "minimumCliVersion": "0.2.88",
     "capabilities": [
@@ -25,7 +25,7 @@
   "files": [
     {
       "path": ".harness-build.json",
-      "sha256": "0709912d6a1fe652fc76827d48d7305fd6ed392025da438c79f0c3d588317731"
+      "sha256": "ba966d7563aa4c5cf5a170d9af6c80a4a1c87613061d2e8bf7858a1f53001690"
     },
     {
       "path": "agents/harness-evaluator.md",
@@ -97,7 +97,7 @@
     },
     {
       "path": "harness-archive/SKILL.md",
-      "sha256": "787cdc6fb1fe8a56f06ed9f18572aa297d7da05810286bf2447491e48170973e"
+      "sha256": "cb5686f5044f3dcf580497d8081ae0d7a3742a83c6910dc92d9622b21c4e3e94"
     },
     {
       "path": "harness-archive/templates/summary-data-template.json",
@@ -113,7 +113,7 @@
     },
     {
       "path": "harness-codebase-map/SKILL.md",
-      "sha256": "a7e7d508d85578027d172b4fd1e1e27141d29b172f9267d362af66d70c20745c"
+      "sha256": "f60acc504b6227448a5879240ed75b5762e587a5908ac0207c558e20f81fc098"
     },
     {
       "path": "harness-codebase-map/templates/ARCHITECTURE.md",
@@ -153,11 +153,11 @@
     },
     {
       "path": "harness-knowledge-ingest/SKILL.md",
-      "sha256": "9c6c176b2e2246335a41d04bd85473db88c99ded2ce4d456caddbd5f49448c65"
+      "sha256": "c3a2cdadfb78f0b38503d117def71098a0a2919e3a8eb939e70b4796e3cd84cc"
     },
     {
       "path": "harness-knowledge-query/SKILL.md",
-      "sha256": "188ecf125fbd46e1011c4745832c531fd0a3e8d5ff2581eac781fa3091f18808"
+      "sha256": "46a06f2b9610093d11dfbe9d8a27fd8a62129d66c7aa6bb82e759b7893ad9e9b"
     },
     {
       "path": "harness-plan/checklist.md",
@@ -173,15 +173,15 @@
     },
     {
       "path": "harness-plan/SKILL.md",
-      "sha256": "3d271beff56b142cee880ff50cee2ee2dde87ff1f41cf39ab9d541c525122a79"
+      "sha256": "79e1c84a92a8bf6370cdc6691dc5cc92bd3e5ff4a720864949a1d3c7de7782a3"
     },
     {
       "path": "harness-pull/SKILL.md",
-      "sha256": "d64b8094e40121053f869d4681dbca28f98ff2b4f49211bf4bae277be8363ff0"
+      "sha256": "29df6f2b5b351c01c97c47db42f835706add2bfe84b4edd0968da1289a2e54c9"
     },
     {
       "path": "harness-push/SKILL.md",
-      "sha256": "5d6a668e73275c57bb2bb619e064971f1f1e234534b7deb39017503eca4e9aa8"
+      "sha256": "ee723583548b7fa73fe113bfbb73d840f144ba1bc059a627cb57289cd8518705"
     },
     {
       "path": "harness-review/checklist.md",
@@ -197,7 +197,7 @@
     },
     {
       "path": "harness-review/SKILL.md",
-      "sha256": "3fb87a1db89642a72962cc5cb34a85fc040933ae40b6466e0d17d9d3b9d4b2b3"
+      "sha256": "a70669bf6deabb442a855535283e22ea6edb6c2e3d50dc65543ab47f7e01f5f3"
     },
     {
       "path": "harness-run/checklist.md",
@@ -213,7 +213,7 @@
     },
     {
       "path": "harness-run/SKILL.md",
-      "sha256": "fe8c64a333cf99ab1ba611f82538efd72d631b8586ff56736e38fd71580eeddd"
+      "sha256": "ad7fefb8891068fd4fbaf1890e21abcbe1a1eed037f3ab1cd751dca56bd651d0"
     },
     {
       "path": "harness-submit/checklist.md",
@@ -225,7 +225,7 @@
     },
     {
       "path": "harness-submit/SKILL.md",
-      "sha256": "bf4d050815fb6f12ae97edf65839b77af71a2f2aed56436ca20ff528d24588f6"
+      "sha256": "3c222757ff63d702fb69002704931dc6cca246256ff2a2a5a7d093f04410844e"
     },
     {
       "path": "harness-sync/reference.md",
@@ -233,7 +233,7 @@
     },
     {
       "path": "harness-sync/SKILL.md",
-      "sha256": "791904da89523f03a92c62bfb3f75949999eaf482ca6113b97f614d17b2ce532"
+      "sha256": "3c755bf5732e7d1f9945b08527668a33cde6e24a593b0636359d89a21418173e"
     },
     {
       "path": "harness-test/checklist.md",
@@ -257,7 +257,7 @@
     },
     {
       "path": "harness-test/SKILL.md",
-      "sha256": "664585ffac4ed6bfa1912e0c1b40cb73261d43e6f46546d27c9f40947a2db099"
+      "sha256": "3b2cc724648e75fc310fc09e44a1737c669fc12d5d0933b278c564a72c7fd05a"
     },
     {
       "path": "protocols/archive-report-protocol.md",
@@ -341,7 +341,7 @@
     },
     {
       "path": "scripts/harness_context.py",
-      "sha256": "e61bbeb3073d77a34ac9aefb13421c187a8d16c8f95597d1ca50d91b0c6af1d2"
+      "sha256": "c7ad3199bda332e853a24e6268fa32dcc253adb6dfe7e0de7aa3b7f0ae7ae312"
     },
     {
       "path": "scripts/harness_deploy.py",
@@ -361,7 +361,7 @@
     },
     {
       "path": "scripts/harness_events.py",
-      "sha256": "3116137be32bd696adce47c79f2af99a8f1517a7555bd1bbaffe27e17fd12fbc"
+      "sha256": "e992498f7256d11ae98d6e71be4f88fc8e08331311ca74372bbc890a720eae43"
     },
     {
       "path": "scripts/harness_execution_contracts.py",
@@ -413,7 +413,7 @@
     },
     {
       "path": "scripts/harness_plan_finalize.py",
-      "sha256": "af12b53ab5503eb5c0ead5bd58e8da9d5389c649958ac678bf448e4c8a286d5b"
+      "sha256": "6f4dcee06f92f7ed7a3bd0ee615e9dd7e8fd921502b132305e37c4871b97537b"
     },
     {
       "path": "scripts/harness_preflight.py",

package/harness/manifests/general/codebuddy.json

@@ -2,7 +2,7 @@
   "schema_version": 2,
   "profile": "general",
   "adapter": "codebuddy",
-  "bundle_version": "0.2.69",
+  "bundle_version": "0.2.70",
   "requires": {
     "minimumCliVersion": "0.2.88",
     "capabilities": [
@@ -25,7 +25,7 @@
   "files": [
     {
       "path": ".harness-build.json",
-      "sha256": "9daf75dd4df259b9bff02aa0f088372ea9c8c96f39fba13cce05140696186f0d"
+      "sha256": "9ab6d7c436b5900ab0897bee47f5b21355a09ec516f7167607faa0943b8c36ad"
     },
     {
       "path": "agents/harness-evaluator.md",
@@ -97,7 +97,7 @@
     },
     {
       "path": "harness-archive/SKILL.md",
-      "sha256": "085514f0e48afb17fc6cec4cb1bd057b5d32af7580bc63b702d02eceed26adb5"
+      "sha256": "f98a149eb196638fbb531944c3dba7e0ac252867b8269d92a83c0bbbaf930d51"
     },
     {
       "path": "harness-archive/templates/summary-data-template.json",
@@ -113,7 +113,7 @@
     },
     {
       "path": "harness-codebase-map/SKILL.md",
-      "sha256": "e50091b3c44f31c0d2559c46760a1b07c2159dff8c918adee0e3c92f46616f95"
+      "sha256": "e941ccfbcf89d5a5aa53c3f49c43b702f8d75c3c6bfb4cf647cf76c6a5e98576"
     },
     {
       "path": "harness-codebase-map/templates/ARCHITECTURE.md",
@@ -153,11 +153,11 @@
     },
     {
       "path": "harness-knowledge-ingest/SKILL.md",
-      "sha256": "1efecf8ac5eacb0dbae7670de68fed3b632369b2b9bcc8697e585cca0673c6a5"
+      "sha256": "82169a60cd3dedc637b072f7941cd64404a6314731233329e33083292ea4751e"
     },
     {
       "path": "harness-knowledge-query/SKILL.md",
-      "sha256": "cbb4802bba062e59fce6d11ef0c15649c9f3242bf8f6d8fd6dc492a35964a73b"
+      "sha256": "13f50e255cb0f48aea12be4ad97ea9d84f260972088ef46aa1a923ef66035fa0"
     },
     {
       "path": "harness-plan/checklist.md",
@@ -173,15 +173,15 @@
     },
     {
       "path": "harness-plan/SKILL.md",
-      "sha256": "60136f87601ccaf68dfd98c5cd05f299ad6b57d2c26beeeb3f1344453347ccb2"
+      "sha256": "918cd2e29e85f7404358425764283fa2a0a2e9bb89fef004b3206378a2e32230"
     },
     {
       "path": "harness-pull/SKILL.md",
-      "sha256": "c03ff4e1d9e6c9db7f75334c997bcd3501364bffaf52d332acc66cd7c65c9d62"
+      "sha256": "bfdb39724415e798ef181d3dbb2cfd67c23aead486385168d5fbfb7d707084de"
     },
     {
       "path": "harness-push/SKILL.md",
-      "sha256": "db1b46a4d506ef8c4d89c54074b476792db2027fb55ce07e43a5cc72e8da8202"
+      "sha256": "b5745430c60a7223938b0651fc03db6987a6ad91b7ea2166745dda09833156da"
     },
     {
       "path": "harness-review/checklist.md",
@@ -197,7 +197,7 @@
     },
     {
       "path": "harness-review/SKILL.md",
-      "sha256": "64ccbc18fb31ddefbc60638507fdf86c9fa0ee5379abb3a1763283fda7388158"
+      "sha256": "320d3fa49650b78307c57dab6415596ce23ba4bdd70f6c94acae059f9e733a1d"
     },
     {
       "path": "harness-run/checklist.md",
@@ -213,7 +213,7 @@
     },
     {
       "path": "harness-run/SKILL.md",
-      "sha256": "727922a067fba9016d65171a06a6a554072a9e86652936e4929fae498f06fbd6"
+      "sha256": "0175fb228d9a813c02f9bdc4bbff8ac873adf3d6c89d79f51e4f8a94be573980"
     },
     {
       "path": "harness-submit/checklist.md",
@@ -225,7 +225,7 @@
     },
     {
       "path": "harness-submit/SKILL.md",
-      "sha256": "f56a332bf5a481f90bc293f351f07ef5ea0203391f0ed873a58d7dbe4503bfcc"
+      "sha256": "2d5d90af10f92347c2d88f6bfac01a0337ac2e413be352ba6a23353d5e9a0359"
     },
     {
       "path": "harness-sync/reference.md",
@@ -233,7 +233,7 @@
     },
     {
       "path": "harness-sync/SKILL.md",
-      "sha256": "8407bf7fc3bf16044f4ea2f46e816249ec857a31eb7664f650c386064eefe554"
+      "sha256": "65fee072033a9ec0865a237f97671b53b744b1c354c7a2313e77421618097662"
     },
     {
       "path": "harness-test/checklist.md",
@@ -257,7 +257,7 @@
     },
     {
       "path": "harness-test/SKILL.md",
-      "sha256": "4c262838b7619a78bd338d4eab453758b7b5aca237743cb205c407fad49c11a3"
+      "sha256": "5672497ba8022f01c97edf2991555160bdffadee6697e452dd44e35c7a100112"
     },
     {
       "path": "protocols/archive-report-protocol.md",
@@ -341,7 +341,7 @@
     },
     {
       "path": "scripts/harness_context.py",
-      "sha256": "e61bbeb3073d77a34ac9aefb13421c187a8d16c8f95597d1ca50d91b0c6af1d2"
+      "sha256": "c7ad3199bda332e853a24e6268fa32dcc253adb6dfe7e0de7aa3b7f0ae7ae312"
     },
     {
       "path": "scripts/harness_deploy.py",
@@ -361,7 +361,7 @@
     },
     {
       "path": "scripts/harness_events.py",
-      "sha256": "3116137be32bd696adce47c79f2af99a8f1517a7555bd1bbaffe27e17fd12fbc"
+      "sha256": "e992498f7256d11ae98d6e71be4f88fc8e08331311ca74372bbc890a720eae43"
     },
     {
       "path": "scripts/harness_execution_contracts.py",
@@ -413,7 +413,7 @@
     },
     {
       "path": "scripts/harness_plan_finalize.py",
-      "sha256": "af12b53ab5503eb5c0ead5bd58e8da9d5389c649958ac678bf448e4c8a286d5b"
+      "sha256": "6f4dcee06f92f7ed7a3bd0ee615e9dd7e8fd921502b132305e37c4871b97537b"
     },
     {
       "path": "scripts/harness_preflight.py",