policy: repair automatic narrowing findings by giodl73-repo · Pull Request #99690 · openclaw/openclaw

giodl73-repo · 2026-07-03T23:12:25Z

Summary

Add guarded automatic doctor --fix repairs for the first safe policy narrowing checks.
Require plugins.entries.policy.config.workspaceRepairs=true before policy config repairs mutate workspace config.
Keep review-required/manual findings detect-only and skip scoped data-handling repairs that would mutate shared config.
Preserve object-form diagnostics.otel.captureContent preferences by setting only captureContent.enabled=false.

Validation

node scripts/run-vitest.mjs extensions/policy/src/doctor/register.test.ts extensions/policy/src/doctor/metadata.test.ts src/flows/doctor-repair-flow.test.ts --reporter=dot passed: 2 Vitest shards / 299 tests.
node scripts/run-tsgo.mjs -p tsconfig.extensions.json --incremental --tsBuildInfoFile .artifacts/tsgo-cache/extensions.tsbuildinfo passed.
OPENCLAW_OXLINT_SKIP_PREPARE=1 node scripts/run-oxlint.mjs --tsconfig config/tsconfig/oxlint.extensions.json extensions/policy/src/doctor/automatic-repairs.ts extensions/policy/src/doctor/register.test.ts extensions/policy/src/doctor/metadata.test.ts passed.
git diff --check passed.

Real behavior proof

Behavior or issue addressed:
doctor --fix should repair automatic policy telemetry content-capture findings without discarding granular object-form telemetry preferences.

Real environment tested:
Windows PowerShell, source checkout C:\src\openclaw-fork, PR head 525e492752. The full dev CLI was invoked with an isolated OPENCLAW_CONFIG_PATH; local full doctor execution reached the policy repair and printed the expected repair, then stalled in a later unrelated post-security doctor stage before the final config writer. The persisted-config proof therefore uses the same registered policy health check, runDoctorHealthRepairs, and replaceConfigFile writer in-process.

Exact steps or command run after this patch:

Seeded isolated config with diagnostics.otel.captureContent={ enabled:true, toolInputs:true, toolOutputs:true } and policy dataHandling.telemetry.denyContentCapture=true.
Ran node --import tsx src/entry.ts doctor --fix --yes --non-interactive --no-workspace-suggestions with isolated OPENCLAW_CONFIG_PATH, OPENCLAW_STATE_DIR, and OPENCLAW_HOME.
Ran an in-process proof that registered the policy doctor checks, selected policy/data-handling-telemetry-content-capture, called runDoctorHealthRepairs, persisted with replaceConfigFile, and reread the config file.

Evidence after fix:
CLI transcript included Set diagnostics.otel.captureContent.enabled=false for policy conformance. The persisted proof printed:

PROOF_DIR=C:\Users\giodl\AppData\Local\Temp\openclaw-policy-repair-proof-saYFOJ
CHANGES=["Set diagnostics.otel.captureContent.enabled=false for policy conformance."]
FINDINGS=1
REMAINING_FINDINGS=0
AFTER_CAPTURE={"enabled":false,"toolInputs":true,"toolOutputs":true}

Observed result after fix:
The telemetry policy finding is repaired, no telemetry finding remains, and object-form captureContent subkeys are preserved while the master enabled switch is disabled.

What was not tested:
The packaged binary path and live LLM/provider calls were not tested. The full dev CLI did not reach final config persistence locally because it stalled after the Security doctor section in an unrelated later doctor probe.

Stack

Stacked on merged #99686. Downstream stack should be refreshed after this head: #99700, #99720, #99731, #99776.

Notes

Normal local build/prep wrappers hit the known Windows Rolldown boundary error (TypeError: Cannot convert undefined or null to object), so lint was run with the repo-supported OPENCLAW_OXLINT_SKIP_PREPARE=1 path after the focused source checks passed.

clawsweeper · 2026-07-03T23:13:46Z

Codex review: stale review; fresh review needed.

Summary
The latest durable ClawSweeper review was for head 809e94328044b6a262d77187262f90e39b3c64ba, but the PR head is now a5b42a57d6d55c1692e7050b22e50ff4fa56ff0b. Its old verdict and PR readiness labels are no longer current.

Next step
Run or wait for a fresh ClawSweeper review on the current PR head.

Review history (21 earlier review cycles; latest 8 shown)

reviewed 2026-07-05T03:24:47.568Z sha 525e492 :: needs maintainer review before merge. :: none
reviewed 2026-07-05T03:31:15.847Z sha 525e492 :: found issues before merge. :: [P3] Remove the duplicate surface-budget test
reviewed 2026-07-05T04:47:00.363Z sha d48b19d :: needs maintainer review before merge. :: none
reviewed 2026-07-05T04:52:50.764Z sha d48b19d :: needs changes before merge. :: [P2] Document the expanded policy repair surface
reviewed 2026-07-05T05:05:45.396Z sha d48b19d :: needs changes before merge. :: [P2] Document the expanded policy repair surface
reviewed 2026-07-05T08:16:02.668Z sha 468a474 :: needs changes before merge. :: [P1] Guard scoped elevated repairs from changing global tools config
reviewed 2026-07-05T13:36:07.793Z sha 24c1ded :: found issues before merge. :: [P3] Align scoped elevated repair guidance with skipped behavior
reviewed 2026-07-05T13:59:30.784Z sha 8343045 :: needs maintainer review before merge. :: none

giodl73-repo · 2026-07-04T14:19:14Z

@clawsweeper re-review

I restacked the policy series onto current upstream/main with non-force merge commits, resolved the test/scripts/plugin-sdk-surface-report.test.ts conflict, and added the exact Real behavior proof section to this PR body.

Fresh proof from the top of the stack (283c1bb4ca):

node scripts/run-vitest.mjs extensions/policy/src/doctor/metadata.test.ts extensions/policy/src/doctor/register.test.ts extensions/policy/src/doctor/strictness.test.ts src/flows/doctor-repair-flow.test.ts --reporter=dot passed: 10 core repair-flow tests + 297 policy doctor tests.
node scripts/run-vitest.mjs test/scripts/plugin-sdk-surface-report.test.ts --reporter=dot passed: 7 tests.
pnpm tsgo:extensions passed.
pnpm lint:extensions passed.
git diff --check passed.

clawsweeper · 2026-07-04T14:19:17Z

🦞🧹
ClawSweeper re-review requested.

I asked ClawSweeper to review this item again.
Action: item re-review queued (workflow sweep.yml, event repository_dispatch).
Result: the existing ClawSweeper review comment will be edited in place when the review finishes.

omarshahine · 2026-07-04T17:21:16Z

Codex review of the Automatic Narrowing PR.

Findings:

Agent-scoped data-handling repairs can mutate global logging/telemetry config. dataHandlingFindings() re-runs redaction and telemetry findings for every scoped agentIds policy in extensions/policy/src/doctor/register.ts:4124, and the new automatic repair metadata does not restrict those rules to global scope in extensions/policy/src/doctor/metadata.ts:452. The evidence paths are global, such as oc://openclaw.config/logging/redactSensitive and oc://openclaw.config/diagnostics/otel/captureContent, so doctor --fix can satisfy an agent-scoped policy by patching the shared global setting. That is broader than the scoped policy claim and needs either a scope-local target or a skip/review-required path.
disableRemoteGatewayMode writes more config than the finding reports. The detector reports gateway.mode and, when present, gateway.remote.url for remote mode findings in extensions/policy/src/policy-state.ts:933 and extensions/policy/src/doctor/scopes/gateway.ts:261; the test at extensions/policy/src/doctor/register.test.ts:7323 encodes that finding set. The repair in extensions/policy/src/doctor/automatic-repairs.ts:152 also writes gateway.remote.enabled = false whenever it is not already false. That extra mutation may be desirable, but it is not part of the reported finding path, so this is not an exact narrowed repair.
The workspace-repair opt-in skip message is returned as changes, so doctor --fix can drop the actionable guidance. The split repair flow forwards warnings for skipped repairs and ignores changes unless the status is repaired in src/flows/doctor-repair-flow.ts:130. Existing policy repair skips use warnings for this reason, for example extensions/policy/src/doctor/register.ts:5343. The new helper returns the opt-in guidance in changes in extensions/policy/src/doctor/automatic-repairs.ts:200, and the test only inspects the helper result rather than the end-to-end repair flow output.

Best-fix verdict: too broad for merge as automatic repair. The repair layer should prove the write target is the exact scoped config surface, or downgrade the unsafe cases to skipped/review-required with surfaced guidance.

Evidence checked: extensions/policy/src/doctor/automatic-repairs.ts, extensions/policy/src/doctor/metadata.ts, extensions/policy/src/doctor/register.ts, extensions/policy/src/doctor/scopes/gateway.ts, extensions/policy/src/policy-state.ts, src/flows/doctor-repair-flow.ts, and the adjacent repair tests.

giodl73-repo · 2026-07-04T20:50:33Z

Addressed Omar's automatic narrowing findings in 7341a15e7c: scoped data-handling repairs that would mutate shared logging/telemetry config now skip with warnings, remote gateway repair only changes the reported gateway.mode target, and workspace-repair opt-in guidance is surfaced via warnings so the repair flow does not drop it. Added regression coverage for scoped data-handling skip behavior.

giodl73-repo · 2026-07-04T20:50:49Z

@clawsweeper re-review

Reviewer-requested fixes are pushed on this updated head. Fresh local proof before push: focused policy/core/CLI/tooling Vitest passed, pnpm tsgo:extensions passed, pnpm lint:extensions passed, git diff --check passed, and node --import tsx scripts/check-policy-config-coverage.ts --check --json passed.

clawsweeper · 2026-07-04T20:50:52Z

🦞🧹
ClawSweeper re-review requested.

I asked ClawSweeper to review this item again.
Action: item re-review queued (workflow sweep.yml, event repository_dispatch).
Result: the existing ClawSweeper review comment will be edited in place when the review finishes.

giodl73-repo · 2026-07-05T00:58:59Z

Updated this PR body with current stack heads and final-stack proof after the #99686 proof refresh. The foundation proof now shows policy-owned policy.fixRecommendation in public policy JSON and recommendation-free attestation hashing, and this PR includes that fix via the forward-merged stack.

@clawsweeper re-review

clawsweeper · 2026-07-05T00:59:01Z

🦞🧹
ClawSweeper re-review requested.

I asked ClawSweeper to review this item again.
Action: item re-review queued (workflow sweep.yml, event repository_dispatch).
Result: the existing ClawSweeper review comment will be edited in place when the review finishes.

giodl73-repo · 2026-07-05T15:02:21Z

Restacked #99690 cleanly onto current main and dropped the stale merged policy stack history.

New head: a5b42a57d6d

Final diff is scoped back to the six policy/docs files:

docs/cli/policy.md
extensions/policy/src/doctor/automatic-repairs.ts
extensions/policy/src/doctor/register.test.ts
extensions/policy/src/doctor/scopes/data-auth.ts
extensions/policy/src/doctor/scopes/gateway.ts
extensions/policy/src/doctor/scopes/tools.ts

Validation on the clean restack:

node scripts/run-vitest.mjs extensions/policy/src/doctor/register.test.ts extensions/policy/src/doctor/metadata.test.ts src/flows/doctor-repair-flow.test.ts --reporter=dot
pnpm exec oxfmt --check docs/cli/policy.md extensions/policy/src/doctor/automatic-repairs.ts extensions/policy/src/doctor/register.test.ts extensions/policy/src/doctor/scopes/data-auth.ts extensions/policy/src/doctor/scopes/gateway.ts extensions/policy/src/doctor/scopes/tools.ts
git diff --check origin/main...HEAD
git diff --check
pnpm tsgo:extensions

@clawsweeper re-review

clawsweeper · 2026-07-05T15:02:23Z

🦞🧹
ClawSweeper re-review requested.

I asked ClawSweeper to review this item again.
Action: item re-review queued (workflow sweep.yml, event repository_dispatch).
Result: the existing ClawSweeper review comment will be edited in place when the review finishes.

giodl73-repo · 2026-07-05T15:11:53Z

Merged via squash.

Prepared head SHA: a5b42a57d6d55c1692e7050b22e50ff4fa56ff0b
Landed commit: 14b2ca11ffa97c8e98ee186a0300f563f88fdce6

openclaw-barnacle Bot added docs Improvements or additions to documentation scripts Repository scripts extensions: policy size: XL maintainer Maintainer-authored PR labels Jul 3, 2026

giodl73-repo mentioned this pull request Jul 3, 2026

policy: repair required deny tool findings #99700

Merged

clawsweeper Bot added the merge-risk: 🚨 security-boundary 🚨 May affect sandboxing, authorization, credentials, or sensitive data. label Jul 3, 2026

This was referenced Jul 4, 2026

policy: repair channel ingress findings #99720

Merged

policy: repair denied gateway http endpoints #99731

Merged

policy: preview review-required gateway repairs #99776

Merged

openclaw-barnacle Bot added the commands Command implementations label Jul 4, 2026

openclaw-barnacle Bot added commands Command implementations and removed commands Command implementations docs Improvements or additions to documentation scripts Repository scripts labels Jul 4, 2026

clawsweeper Bot mentioned this pull request Jul 5, 2026

policy: classify doctor fix recommendations #99686

Merged

openclaw-barnacle Bot removed the size: XL label Jul 5, 2026

openclaw-barnacle Bot added commands Command implementations agents Agent runtime and tooling extensions: device-pair size: XL and removed size: L labels Jul 5, 2026

policy: repair automatic narrowing findings

a5b42a5

giodl73-repo force-pushed the policy-doctor-automatic-narrowers branch from 809e943 to a5b42a5 Compare July 5, 2026 15:02

giodl73-repo merged commit 14b2ca1 into openclaw:main Jul 5, 2026
110 of 120 checks passed

github-actions Bot mentioned this pull request Jul 5, 2026

📡 Upstream Digest — 2026-07-05 16:58 UTC curtismercier/openclaw-mods#1216

Open

Uh oh!

Uh oh!

Conversation

giodl73-repo commented Jul 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Validation

Real behavior proof

Stack

Notes

Uh oh!

clawsweeper Bot commented Jul 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

giodl73-repo commented Jul 4, 2026

Uh oh!

clawsweeper Bot commented Jul 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

omarshahine commented Jul 4, 2026

Uh oh!

giodl73-repo commented Jul 4, 2026

Uh oh!

giodl73-repo commented Jul 4, 2026

Uh oh!

clawsweeper Bot commented Jul 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

giodl73-repo commented Jul 5, 2026

Uh oh!

clawsweeper Bot commented Jul 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

giodl73-repo commented Jul 5, 2026

Uh oh!

clawsweeper Bot commented Jul 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

giodl73-repo commented Jul 5, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

giodl73-repo commented Jul 3, 2026 •

edited

Loading

clawsweeper Bot commented Jul 3, 2026 •

edited

Loading

clawsweeper Bot commented Jul 4, 2026 •

edited

Loading

clawsweeper Bot commented Jul 4, 2026 •

edited

Loading

clawsweeper Bot commented Jul 5, 2026 •

edited

Loading

clawsweeper Bot commented Jul 5, 2026 •

edited

Loading