feat: add rescue lifecycle and primary recovery in Doctor by Keith-CY · Pull Request #15 · lay2dev/clawpal

Keith-CY · 2026-02-25T03:22:50Z

Summary

add full Rescue Bot lifecycle management in Tauri (local + SSH): set | activate | status | deactivate | unset
make rescue operations more robust and idempotent:
- activation restart-timeout fallback (restart -> stop/start)
- cleanup no-op tolerance for deactivate/unset (already stopped/uninstalled/unset)
add Rescue-driven primary health flow:
- diagnosis result with checks/issues panel
- safe auto-repair pipeline with re-check
remove manual dependency for primary doctor JSON mode:
- auto fallback from openclaw --profile <profile> doctor --json to openclaw --profile <profile> doctor when --json is unsupported
improve Doctor UI interactions:
- status-first Rescue card with Activate, Deactivate, Unset
- quick-fix actions directly on failed checks and auto-fixable issue items
- clearer localized messages (EN/ZH)

Test Plan

cargo check --quiet (in src-tauri/)
bun run tsc --noEmit
cargo test rescue_bot_tests --quiet blocked in this environment by DNS resolution to static.crates.io

Notes

Doctor remains the primary entrypoint for Rescue lifecycle operations.
Auto-repair still only applies to explicitly mapped safe primary issues.

dev01lay2

Review Summary

Solid feature addition — Rescue Bot lifecycle + primary recovery diagnostics are well-structured. The local/remote symmetry is clean. A few things to address:

Issues

1. run_openclaw_dynamic duplicates OpenclawCommandOutput fields unnecessarily
commands.rs — run_openclaw_dynamic takes the output from run_openclaw (which already returns OpenclawCommandOutput) and reconstructs it field-by-field. If the types match, just return it directly.

2. json.syntax fix is a no-op pretending to be a fix
build_primary_issue_fix_command maps json.syntax to the same command as field.agents (set agents.defaults.model). The original remote_fix_issues just marks it applied without doing anything meaningful either. If the intent is "normalize the config by rewriting it," consider a dedicated config normalize command or at least add a comment explaining why this works.

3. collect_model_summary moved but unchanged — noisy diff
The function and several hundred lines of helpers (RescueBotAction, utility fns) were inserted in the middle of existing code, causing a large delete+reinsert of fix_issues / collect_model_summary. The actual logic is unchanged — consider reordering to minimize churn (new code at end of file, before tests).

4. Missing use_effect cleanup / abort for async operations in Doctor.tsx
refreshRescueStatus fires on mount via useEffect but has no abort/cleanup. If the component unmounts mid-flight (instance switch), the setState calls will fire on an unmounted component. Consider an abort flag or AbortController.

5. State explosion in Doctor.tsx
15+ individual useState hooks for rescue/primary state. Consider grouping into a reducer or at least an object state to make resets cleaner and reduce the reset list in the instance-change effect.

Minor / Nits

let _ = new_text; in remote_fix_issues is dead code (was there before, but worth cleaning up since you're touching the file)
rescue_port in RescuePrimaryDiagnosisResult is Option<u16> on Rust side but rescuePort?: number in TS — fine, but document the mapping for optional fields vs undefined
Test test_suggest_rescue_port_prefers_large_gap only tests one case — consider edge cases (port near u16::MAX, port 0)
cargo test rescue_bot_tests blocked by DNS — noted in PR description, but ensure CI has the fix before merge

dev01lay2 · 2026-02-25T06:11:23Z

src-tauri/src/commands.rs

+            .and_then(Value::as_str)
+            .or_else(|| obj.get("fix_hint").and_then(Value::as_str))
+            .map(str::to_string);
+        items.push(RescuePrimaryIssue {


run_openclaw_dynamic reconstructs OpenclawCommandOutput field-by-field from the return of run_openclaw, which already returns the same struct. If the types truly match, just return it directly instead of destructuring and rebuilding.

dev01lay2 · 2026-02-25T06:11:24Z

src-tauri/src/commands.rs

+    if !output.stdout.trim().is_empty() {
+        return trim_for_detail(&output.stdout);
+    }
+    "no output".into()


This maps json.syntax to the exact same command as field.agents (config set agents.defaults.model). If the intent is "rewrite the config file to normalize JSON syntax," that's a side-effect of config set — worth a comment explaining why, otherwise it looks like a copy-paste error.

src/pages/Doctor.tsx

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: d6703a9173

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

src/pages/Doctor.tsx

Keith-CY · 2026-02-25T06:21:06Z

Addressed review feedback in commits 3299c53 and d06370a:

run_openclaw_dynamic now uses a From<CliOutput> conversion + direct map(Into::into) (no field-by-field rebuild).
Added explicit rationale for json.syntax normalization path and removed copy-paste shape via a shared command builder.
Refactored Doctor rescue/primary state into grouped object states (RescueUiState + PrimaryRecoveryState) so reset is single-call per group.
Added cancellation guard in the rescue status effect to prevent stale async state updates on instance switch.
Allowed Rescue re-activation after deactivation (removed configured==true early-return/disable guard).
Also removed dead code in remote_fix_issues (let _ = new_text).

Validation re-run:

cargo check --quiet
bun run tsc --noEmit

dev01lay2

All review feedback addressed:

✅ run_openclaw_dynamic now uses From trait (.map(Into::into))
✅ json.syntax fix has explanatory comment about canonical rewrite
✅ Dead let _ = new_text removed from remote_fix_issues
✅ State grouped into RescueUiState + PrimaryRecoveryState with updateRescueState/updatePrimaryState helpers
✅ useEffect cleanup with cancelled flag for refreshRescueStatus
✅ Bonus: removed rescueConfigured === true guard on Activate button (allows reactivation after deactivation)

LGTM 🚀

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: d06370a40a

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

src-tauri/src/commands.rs

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: bece945f7d

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-02-25T06:46:19Z

src-tauri/src/commands.rs

+        if ch == closer {
+            depth += 1;
+        } else if ch == opener {
+            depth -= 1;
+            if depth == 0 {


Handle braces in JSON strings when slicing trailing payload

The backward depth scan treats every }/{ byte as structural, so outputs like "[warn] ...\n{\"message\":\"expected } at ...\",...}" never reach depth 0 and extract_json_from_output returns None even though valid JSON is present. This is a regression from the previous find('{') behavior and causes parse_json_loose callers (including rescue diagnosis/status parsing) to silently drop valid reports whenever a JSON string contains brace characters after prefixed log lines.

Useful? React with 👍 / 👎.

Keith-CY changed the title ~~feat: add rescue bot activation from Doctor~~ feat: add rescue lifecycle and primary recovery in Doctor Feb 25, 2026

Keith-CY added 9 commits February 25, 2026 15:07

feat: add rescue bot activation with Doctor entry

3fb837d

feat: add prominent rescue bot entry in Doctor UI

584f975

fix: fallback when rescue gateway restart health-check times out

3da318e

fix: allow rescue restart-timeout fallback to inspect nonzero output

16a1b30

feat: improve rescue bot doctor UX with status-first flow

f8f5f74

feat: add rescue-based primary diagnosis and doctor result panel

0133a73

feat: add rescue safe auto-repair for primary with recheck

b6b7a44

feat: add rescue bot deactivate and unset flows

d8a0ccc

feat: add rescue primary quick-fix actions and doctor fallback

d6703a9

Keith-CY force-pushed the codex/rescue-bot-doctor-entry branch from eaf255a to d6703a9 Compare February 25, 2026 06:07

Keith-CY marked this pull request as ready for review February 25, 2026 06:10

dev01lay2 reviewed Feb 25, 2026

View reviewed changes

src/pages/Doctor.tsx Outdated Show resolved Hide resolved

dev01lay2 reviewed Feb 25, 2026

View reviewed changes

src/pages/Doctor.tsx Show resolved Hide resolved

chatgpt-codex-connector bot reviewed Feb 25, 2026

View reviewed changes

src/pages/Doctor.tsx Outdated Show resolved Hide resolved

Keith-CY added 2 commits February 25, 2026 15:18

fix: address review feedback for rescue doctor flow

3299c53

fix: allow rescue reactivation after deactivation

d06370a

dev01lay2 approved these changes Feb 25, 2026

View reviewed changes

chatgpt-codex-connector bot reviewed Feb 25, 2026

View reviewed changes

src-tauri/src/commands.rs Show resolved Hide resolved

fix: robustly parse trailing JSON payload from CLI output

bece945

Keith-CY merged commit ac927fd into lay2dev:main Feb 25, 2026

chatgpt-codex-connector bot reviewed Feb 25, 2026

View reviewed changes

zhixianio pushed a commit that referenced this pull request Feb 28, 2026

feat: add rescue lifecycle and primary recovery in Doctor (#15)

cabe7d8

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add rescue lifecycle and primary recovery in Doctor#15

feat: add rescue lifecycle and primary recovery in Doctor#15
Keith-CY merged 12 commits intolay2dev:mainfrom
Keith-CY:codex/rescue-bot-doctor-entry

Keith-CY commented Feb 25, 2026 •

edited

Loading

Uh oh!

dev01lay2 left a comment

Uh oh!

dev01lay2 Feb 25, 2026

Uh oh!

dev01lay2 Feb 25, 2026

Uh oh!

Uh oh!

Uh oh!

chatgpt-codex-connector bot left a comment

Uh oh!

Uh oh!

Keith-CY commented Feb 25, 2026

Uh oh!

dev01lay2 left a comment

Uh oh!

chatgpt-codex-connector bot left a comment

Uh oh!

Uh oh!

chatgpt-codex-connector bot left a comment

Uh oh!

chatgpt-codex-connector bot Feb 25, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

Keith-CY commented Feb 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Test Plan

Notes

Uh oh!

dev01lay2 left a comment

Choose a reason for hiding this comment

Review Summary

Issues

Minor / Nits

Uh oh!

dev01lay2 Feb 25, 2026

Choose a reason for hiding this comment

Uh oh!

dev01lay2 Feb 25, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Keith-CY commented Feb 25, 2026

Uh oh!

dev01lay2 left a comment

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Feb 25, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Keith-CY commented Feb 25, 2026 •

edited

Loading