eeymoo/claw-code
1
0
Fork 0
mirror of https://github.com/instructkr/claw-code.git synced 2026-04-13 11:34:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make recovery handoffs explain why a lane resumed instead of leaking control prose

Browse Source 
Recent OMX dogfooding kept surfacing raw `[OMX_TMUX_INJECT]`
messages as lane results, which told operators that tmux reinjection
happened but not why or what lane/state it applied to. The lane-finished
persistence path now recognizes that control prose, stores structured
recovery metadata, and emits a human-meaningful fallback summary instead
of preserving the raw marker as the primary result.

Constraint: Keep the fix in the existing lane-finished metadata surface rather than inventing a new runtime channel
Rejected: Treat all reinjection prose as ordinary quality-floor mush | loses the recovery cause and target lane operators actually need
Confidence: high
Scope-risk: narrow
Reversibility: clean
Directive: Recovery classification is heuristic; extend the parser only when new operator phrasing shows up in real dogfood evidence
Tested: cargo fmt --all --check
Tested: cargo clippy --workspace --all-targets -- -D warnings
Tested: cargo test --workspace
Tested: LSP diagnostics on rust/crates/tools/src/lib.rs (0 errors)
Tested: Architect review (APPROVE)
Not-tested: Additional reinjection phrasings beyond the currently observed `[OMX_TMUX_INJECT]` / current-mode-state variants
Related: ROADMAP #68
This commit is contained in:
Yeachan-Heo
2026-04-12 15:50:39 +00:00
parent 42bb6cdba6
commit 6a957560bd
2 changed files with 166 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ROADMAP.md
View File

@@ -496,7 +496,7 @@ Model name prefix now wins unconditionally over env-var presence. Regression tes
62. **Worker state file surface not implemented** — **done (verified 2026-04-12):** current `main` already wires `emit_state_file(worker)` into the worker transition path in `rust/crates/runtime/src/worker_boot.rs`, atomically writes `.claw/worker-state.json`, and exposes the documented reader surface through `claw state` / `claw state --output-format json` in `rust/crates/rusty-claude-cli/src/main.rs`. Fresh proof exists in `runtime` regression `emit_state_file_writes_worker_status_on_transition`, the end-to-end `tools` regression `recovery_loop_state_file_reflects_transitions`, and direct CLI parsing coverage for `state` / `state --output-format json`. Source: Jobdori dogfood.
**Scope note (verified 2026-04-12):** ROADMAP #31, #43, and #63-#68 currently appear to describe acpx/droid or upstream OMX/server orchestration behavior, not claw-code source already present in this repository. Repo-local searches for `acpx`, `use-droid`, `run-acpx`, `commit-wrapper`, `ultraclaw`, `roadmap-nudge-10min`, `OMX_TMUX_INJECT`, `/hooks/health`, and `/hooks/status` found no implementation hits outside `ROADMAP.md`, and the earlier state-surface note already records that the HTTP server is not owned by claw-code. With #45, #64-#67, and #69 now fixed, the remaining unresolved items in this section still look like external tracking notes rather than confirmed repo-local backlog; re-check if new repo-local evidence appears.
**Scope note (verified 2026-04-12):** ROADMAP #31, #43, and #63 currently appear to describe acpx/droid or upstream OMX/server orchestration behavior, not claw-code source already present in this repository. Repo-local searches for `acpx`, `use-droid`, `run-acpx`, `commit-wrapper`, `ultraclaw`, `/hooks/health`, and `/hooks/status` found no implementation hits outside `ROADMAP.md`, and the earlier state-surface note already records that the HTTP server is not owned by claw-code. With #45, #64-#69, and #75 now fixed, the remaining unresolved items in this section still look like external tracking notes rather than confirmed repo-local backlog; re-check if new repo-local evidence appears.
63. **Droid session completion semantics broken: code arrives after "status: completed"** — dogfooded 2026-04-12. Ultraclaw droid sessions (use-droid via acpx) report `session.status: completed` before file writes are fully flushed/synced to the working tree. Discovered +410 lines of "late-arriving" droid output that appeared after I had already assessed 8 sessions as "no code produced." This creates false-negative assessments and duplicate work. **Fix shape:** (a) droid agent should only report completion after explicit file-write confirmation (fsync or existence check); (b) or, claw-code should expose a `pending_writes` status that indicates "agent responded, disk flush pending"; (c) lane orchestrators should poll for file changes for N seconds after completion before final assessment. **Blocker:** none. Source: Jobdori ultraclaw dogfood 2026-04-12.
@@ -508,7 +508,7 @@ Model name prefix now wins unconditionally over env-var presence. Regression tes
67. **Scoped review lanes do not emit structured verdicts** — **done (verified 2026-04-12):** completed lane persistence in `rust/crates/tools/src/lib.rs` now recognizes review-style `APPROVE`/`REJECT`/`BLOCKED` results and records structured `reviewVerdict`, `reviewTarget`, and `reviewRationale` metadata on the `lane.finished` event while preserving existing non-review lane behavior. Regression coverage locks both the normal completion path and a scoped review-lane completion payload. **Original filing below.**
68. **Internal reinjection/resume paths leak opaque control prose** — dogfooded 2026-04-12. OMX lanes stopping with `Continue from current mode state. [OMX_TMUX_INJECT]` expose internal implementation details instead of operator-meaningful state. The event tells us *that* tmux reinjection happened, but not *why* (retry after failure? resume after idle? manual recovery?), *what state was preserved*, or *what the lane was trying to do*. **Fix shape:** recovery/reinject events should emit structured cause like: `resume_after_stop`, `retry_after_tool_failure`, `tmux_reinject_after_idle`, `manual_recovery` plus preserved state / target lane info. Never leak bare internal markers like `[OMX_TMUX_INJECT]` as the primary summary. Blocker: none. Source: gaebal-gajae dogfood analysis 2026-04-12.
68. **Internal reinjection/resume paths leak opaque control prose** — **done (verified 2026-04-12):** completed lane persistence in `rust/crates/tools/src/lib.rs` now recognizes `[OMX_TMUX_INJECT]`-style recovery control prose and records structured `recoveryOutcome` metadata on `lane.finished`, including `cause`, optional `targetLane`, and optional `preservedState`. Recovery-style summaries now normalize to a human-meaningful fallback instead of surfacing the raw internal marker as the primary lane result. Regression coverage locks both the tmux-idle reinjection path and the `Continue from current mode state` resume path. Source: gaebal-gajae / Jobdori dogfood 2026-04-12.
69. **Lane stop summaries have no minimum quality floor** — **done (verified 2026-04-12):** completed lane persistence in `rust/crates/tools/src/lib.rs` now normalizes vague/control-only stop summaries into a contextual fallback that includes the lane target and status, while preserving structured metadata about whether the quality floor fired (`qualityFloorApplied`, `rawSummary`, `reasons`, `wordCount`). Regression coverage locks both the pass-through path for good summaries and the fallback path for mushy summaries like `commit push everyting, keep sweeping $ralph`. **Original filing below.**

172
rust/crates/tools/src/lib.rs
View File

@@ -3845,6 +3845,8 @@ struct LaneFinishedSummaryData {
review_rationale: Option<String>,
#[serde(rename = "selectionOutcome", skip_serializing_if = "Option::is_none")]
selection_outcome: Option<SelectionOutcome>,
#[serde(rename = "recoveryOutcome", skip_serializing_if = "Option::is_none")]
recovery_outcome: Option<RecoveryOutcome>,
#[serde(rename = "artifactProvenance", skip_serializing_if = "Option::is_none")]
artifact_provenance: Option<ArtifactProvenance>,
#[serde(rename = "disabledCronIds", skip_serializing_if = "Vec::is_empty")]
@@ -3863,6 +3865,7 @@ struct LaneSummaryAssessment {
reasons: Vec<String>,
word_count: usize,
review_outcome: Option<ReviewLaneOutcome>,
recovery_outcome: Option<RecoveryOutcome>,
}
#[derive(Debug, Clone)]
@@ -3882,6 +3885,15 @@ struct SelectionOutcome {
rationale: Option<String>,
}
#[derive(Debug, Clone, Serialize)]
struct RecoveryOutcome {
cause: String,
#[serde(rename = "targetLane", skip_serializing_if = "Option::is_none")]
target_lane: Option<String>,
#[serde(rename = "preservedState", skip_serializing_if = "Option::is_none")]
preserved_state: Option<String>,
}
#[derive(Debug, Clone, Serialize)]
struct ArtifactProvenance {
#[serde(rename = "sourceLanes", skip_serializing_if = "Vec::is_empty")]
@@ -3906,10 +3918,15 @@ fn build_lane_finished_summary(
let assessment = assess_lane_summary_quality(raw_summary.unwrap_or_default());
let detail = match raw_summary {
Some(summary) if !assessment.apply_quality_floor => Some(compress_summary_text(summary)),
Some(summary) => Some(compose_lane_summary_fallback(manifest, Some(summary))),
None => Some(compose_lane_summary_fallback(manifest, None)),
Some(summary) => Some(compose_lane_summary_fallback(
manifest,
Some(summary),
assessment.recovery_outcome.as_ref(),
)),
None => Some(compose_lane_summary_fallback(manifest, None, None)),
};
let review_outcome = assessment.review_outcome.clone();
let recovery_outcome = assessment.recovery_outcome.clone();
let review_target = review_outcome
.as_ref()
.map(|_| manifest.description.trim())
@@ -3930,6 +3947,7 @@ fn build_lane_finished_summary(
review_target,
review_rationale: review_outcome.and_then(|outcome| outcome.rationale),
selection_outcome: extract_selection_outcome(raw_summary.unwrap_or_default()),
recovery_outcome,
artifact_provenance,
disabled_cron_ids: Vec::new(),
},
@@ -3950,6 +3968,10 @@ fn assess_lane_summary_quality(summary: &str) -> LaneSummaryAssessment {
}
let review_outcome = extract_review_outcome(summary);
let recovery_outcome = extract_recovery_outcome(summary);
if recovery_outcome.is_some() {
reasons.push(String::from("recovery_control_prose"));
}
let control_only = !words.is_empty()
&& words
@@ -3976,10 +3998,15 @@ fn assess_lane_summary_quality(summary: &str) -> LaneSummaryAssessment {
reasons,
word_count,
review_outcome,
recovery_outcome,
}
}
fn compose_lane_summary_fallback(manifest: &AgentOutput, raw_summary: Option<&str>) -> String {
fn compose_lane_summary_fallback(
manifest: &AgentOutput,
raw_summary: Option<&str>,
recovery_outcome: Option<&RecoveryOutcome>,
) -> String {
let target = manifest.description.trim();
let base = format!(
"Completed lane `{}` for target: {}. Status: completed.",
@@ -3990,6 +4017,25 @@ fn compose_lane_summary_fallback(manifest: &AgentOutput, raw_summary: Option<&st
target
}
);
if let Some(outcome) = recovery_outcome {
let mut detail = format!(
"{base} Recovery handoff observed via tmux reinjection (cause: `{}`).",
outcome.cause
);
if let Some(target_lane) = &outcome.target_lane {
let _ = std::fmt::Write::write_fmt(
&mut detail,
format_args!(" Target lane: `{target_lane}`."),
);
}
if let Some(preserved_state) = &outcome.preserved_state {
let _ = std::fmt::Write::write_fmt(
&mut detail,
format_args!(" Preserved state: {preserved_state}."),
);
}
return detail;
}
match raw_summary {
Some(summary) => format!(
"{base} Original stop summary was too vague to keep as the lane result: \"{}\".",
@@ -4086,6 +4132,59 @@ fn extract_selection_outcome(summary: &str) -> Option<SelectionOutcome> {
})
}
fn extract_recovery_outcome(summary: &str) -> Option<RecoveryOutcome> {
let trimmed = summary.trim();
if trimmed.is_empty() {
return None;
}
let lowered = trimmed.to_ascii_lowercase();
let has_tmux_inject_marker = lowered.contains("omx_tmux_inject");
let has_recovery_phrase = lowered.contains("continue from current mode state")
|| (lowered.starts_with("team ") && lowered.contains(" next:"));
if !has_tmux_inject_marker && !has_recovery_phrase {
return None;
}
let cause = if lowered.contains("current mode state") {
"resume_after_stop"
} else if lowered.contains("tool failure") {
"retry_after_tool_failure"
} else if lowered.contains("worker panes stalled")
|| lowered.contains("no progress")
|| lowered.contains("leader stale")
|| lowered.contains("all workers idle")
|| lowered.contains("all 1 worker idle")
|| lowered.contains("pane(s) active")
{
"tmux_reinject_after_idle"
} else {
"manual_recovery"
};
let target_lane = trimmed.lines().map(str::trim).find_map(|line| {
let lower = line.to_ascii_lowercase();
if !lower.starts_with("team ") {
return None;
}
line[5..]
.split_once(':')
.map(|(name, _)| name.trim())
.filter(|name| !name.is_empty())
.map(str::to_string)
});
let preserved_state = lowered
.contains("current mode state")
.then(|| String::from("current mode state"));
Some(RecoveryOutcome {
cause: cause.to_string(),
target_lane,
preserved_state,
})
}
fn extract_roadmap_items(line: &str) -> Vec<String> {
let mut items = Vec::new();
let mut chars = line.chars().peekable();
@@ -6028,11 +6127,11 @@ mod tests {
use super::{
agent_permission_policy, allowed_tools_for_subagent, classify_lane_failure,
derive_agent_state, execute_agent_with_spawn, execute_tool, final_assistant_text,
global_cron_registry, maybe_commit_provenance, mvp_tool_specs, permission_mode_from_plugin,
persist_agent_terminal_state, push_output_block, run_task_packet, AgentInput, AgentJob,
GlobalToolRegistry, LaneEventName, LaneFailureClass, ProviderRuntimeClient,
SubagentToolExecutor,
derive_agent_state, execute_agent_with_spawn, execute_tool, extract_recovery_outcome,
final_assistant_text, global_cron_registry, maybe_commit_provenance, mvp_tool_specs,
permission_mode_from_plugin, persist_agent_terminal_state, push_output_block,
run_task_packet, AgentInput, AgentJob, GlobalToolRegistry, LaneEventName, LaneFailureClass,
ProviderRuntimeClient, SubagentToolExecutor,
};
use api::OutputContentBlock;
use runtime::ProviderFallbackConfig;
@@ -7856,6 +7955,54 @@ mod tests {
"control_only"
);
let recovery = execute_agent_with_spawn(
AgentInput {
description: "Recover the stalled audit lane".to_string(),
prompt: "Normalize OMX reinjection control prose".to_string(),
subagent_type: Some("Explore".to_string()),
name: Some("recovery-lane".to_string()),
model: None,
},
|job| {
persist_agent_terminal_state(
&job.manifest,
"completed",
Some(
"Team read-only-audit-only-for-roadm: worker panes stalled, no progress 2m30s. Next: omx team status read-only-audit-only-for-roadm; read worker messages; unblock/reassign or shutdown. [OMX_TMUX_INJECT]",
),
None,
)
},
)
.expect("recovery agent should succeed");
let recovery_manifest = std::fs::read_to_string(&recovery.manifest_file)
.expect("recovery manifest should exist");
let recovery_manifest_json: serde_json::Value =
serde_json::from_str(&recovery_manifest).expect("recovery manifest json");
let recovery_detail = recovery_manifest_json["laneEvents"][1]["detail"]
.as_str()
.expect("recovery detail");
assert!(recovery_detail.contains("Recovery handoff observed via tmux reinjection"));
assert!(recovery_detail.contains("read-only-audit-only-for-roadm"));
assert!(!recovery_detail.contains("OMX_TMUX_INJECT"));
assert_eq!(
recovery_manifest_json["laneEvents"][1]["data"]["recoveryOutcome"]["cause"],
"tmux_reinject_after_idle"
);
assert_eq!(
recovery_manifest_json["laneEvents"][1]["data"]["recoveryOutcome"]["targetLane"],
"read-only-audit-only-for-roadm"
);
assert_eq!(
recovery_manifest_json["laneEvents"][1]["data"]["qualityFloorApplied"],
true
);
assert_eq!(
recovery_manifest_json["laneEvents"][1]["data"]["reasons"][0],
"recovery_control_prose"
);
let review = execute_agent_with_spawn(
AgentInput {
description: "Review commit 1234abcd for ROADMAP #67".to_string(),
@@ -8044,6 +8191,15 @@ mod tests {
.expect("cron should still exist");
assert!(!disabled_entry.enabled);
let resume_outcome =
extract_recovery_outcome("Continue from current mode state. [OMX_TMUX_INJECT]")
.expect("resume outcome should be detected");
assert_eq!(resume_outcome.cause, "resume_after_stop");
assert_eq!(
resume_outcome.preserved_state.as_deref(),
Some("current mode state")
);
let spawn_error = execute_agent_with_spawn(
AgentInput {
description: "Spawn error task".to_string(),