PR #77220: fix(cli): emit agent-tool diagnostic instead of plugins.allow suggestion

• Repository: openclaw/openclaw
• Author: hclsys
• State: closed | merged: False
• Link: https://github.com/openclaw/openclaw/pull/77220

Description (problem / solution / changelog)

Root cause

resolveMissingPluginCommandMessage in src/cli/run-main-policy.ts falls straight through to the plugins.allow suggestion branch when the user types an unrecognized subcommand. It has no awareness of contracts.tools — the tool names a plugin registers for agent model-use. So openclaw wecom_mcp (a tool name, not a CLI command) produces:

The `openclaw wecom_mcp` command is unavailable because `plugins.allow` excludes "wecom_mcp". Add "wecom_mcp" to `plugins.allow` if you want that bundled plugin CLI surface.

That's wrong: wecom_mcp is never a CLI subcommand, and adding it to plugins.allow does nothing useful.

Fix

• src/plugins/manifest-command-aliases.runtime.ts — adds resolveManifestToolOwner, which loads the manifest registry and searches each plugin's contracts.tools array for a matching tool name.
• src/cli/run-main-policy.ts — adds resolveToolOwner?: (toolName: string) => string | undefined to the options of resolveMissingPluginCommandMessage; calls it just before the plugins.allow branch. If it returns a plugin ID, emits a targeted diagnostic instead.
• src/cli/run-main.ts — wires resolveToolOwner: (toolName) => resolveManifestToolOwner({ toolName, config }) at the runtime call site alongside the existing resolveCommandAliasOwner.

Example output after fix

"wecom_mcp" is an agent tool registered by the "wecom" plugin, not a CLI subcommand. Use it from an agent session (model tool-use), not the CLI.

Tests

Two new unit tests in src/cli/run-main.test.ts:

• emits agent-tool message when resolveToolOwner identifies the tool owner
• falls through to plugins.allow message when resolveToolOwner returns undefined

All 29 existing tests continue to pass.

Fixes #77214.

Changed files

• CHANGELOG.md (modified, +1/-0)
• src/cli/run-main-policy.ts (modified, +8/-0)
• src/cli/run-main.test.ts (modified, +32/-0)
• src/cli/run-main.ts (modified, +2/-1)
• src/plugins/manifest-command-aliases.runtime.ts (modified, +28/-0)

PR #77221: fix(cli): clarify error when unknown subcommand is actually an agent tool name (#77214)

• Repository: openclaw/openclaw
• Author: 100yenadmin
• State: open | merged: False
• Link: https://github.com/openclaw/openclaw/pull/77221

Description (problem / solution / changelog)

Summary

• When openclaw <name> does not match a CLI subcommand or a plugin id, the unknown-subcommand handler now first looks up <name> against the runtime plugin tool registry. If <name> is an agent tool registered by a loaded plugin (e.g. lcm_recent from lossless-claw), emit a clear "this is an agent tool, not a CLI subcommand" error pointing at model tool-use instead of the misleading plugins.allow suggestion.
• The previous error told the user to add the tool name to plugins.allow, but plugins.allow accepts plugin ids (not tool names), and config patches against it are rejected by the protected-config-paths guard. In the wild this sent an agent down 3 restart cycles trying to "fix" config that was never the problem.
• Fall-throughs are preserved: if <name> is not a registered tool, the existing plugins.allow and plugins.entries.<id>.enabled suggestions are emitted unchanged. The new branch only fires when the tool-registry lookup matches.

Reproduction

Before:

[openclaw] Failed to start CLI: Error: The `openclaw lcm_recent` command is unavailable
because `plugins.allow` excludes "lcm_recent". Add "lcm_recent" to `plugins.allow`
if you want that bundled plugin CLI surface.

After:

"lcm_recent" is an agent tool registered by the "lossless-claw" plugin, not a CLI
subcommand. Use it from an agent turn (model tool-use), not the CLI. Run
`openclaw --help` to see available CLI subcommands.

Implementation

• New resolveManifestToolOwnerInRegistry in src/plugins/manifest-command-aliases.ts walks plugins[].contracts.tools (the same field the agent dispatch uses) and returns {toolName, pluginId} for the owning plugin.
• PluginManifestCommandAliasRegistry is extended with an optional contracts?: { tools?: readonly string[] } per plugin entry. The runtime PluginManifestRegistry already populates this, so production wiring is structural.
• resolveMissingPluginCommandMessage (in src/cli/run-main-policy.ts) gets a parallel resolveToolOwner callback hook (mirroring resolveCommandAliasOwner) and consults the tool registry just before the plugins.allow excludes branch.
• src/cli/run-main.ts passes the new resolveManifestToolOwner runtime resolver into the policy call.

Validation

• pnpm exec vitest run src/cli/run-main.test.ts src/plugins/manifest-command-aliases.test.ts -- 33 passed (3 new in run-main.test.ts, 1 new in manifest-command-aliases.test.ts).
• pnpm exec vitest run src/cli/run-main.exit.test.ts src/cli/run-main.profile-env.test.ts -- 79 passed (sanity check on adjacent test files).
• pnpm exec oxlint --type-aware src/cli/run-main-policy.ts src/cli/run-main.ts src/cli/run-main.test.ts src/plugins/manifest-command-aliases.ts src/plugins/manifest-command-aliases.runtime.ts src/plugins/manifest-command-aliases.test.ts -- 0 warnings, 0 errors.
• pnpm tsgo:core -- clean.
• pnpm check:changelog-attributions -- clean.

Closes #77214.

Changed files

• CHANGELOG.md (modified, +1/-0)
• src/cli/run-main-policy.ts (modified, +25/-0)
• src/cli/run-main.test.ts (modified, +51/-0)
• src/cli/run-main.ts (modified, +2/-1)
• src/plugins/manifest-command-aliases.runtime.ts (modified, +22/-0)
• src/plugins/manifest-command-aliases.test.ts (modified, +27/-0)
• src/plugins/manifest-command-aliases.ts (modified, +29/-0)