vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-06 09:00:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: keep channel command discovery read-only

Browse Source
This commit is contained in:
Shakker
2026-04-26 07:44:12 +01:00
parent fd97f530e3
commit 43557b16a6
2 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/commands/channels/capabilities.ts
View File

@@ -1,9 +1,9 @@
import { resolveChannelDefaultAccountId } from "../../channels/plugins/helpers.js";
import { listChannelPlugins } from "../../channels/plugins/index.js";
import {
createMessageActionDiscoveryContext,
resolveMessageActionDiscoveryForPlugin,
} from "../../channels/plugins/message-action-discovery.js";
import { listReadOnlyChannelPluginsForConfig } from "../../channels/plugins/read-only.js";
import type {
ChannelCapabilities,
ChannelCapabilitiesDiagnostics,
@@ -239,7 +239,9 @@ export async function channelsCapabilitiesCommand(
return;
}
const plugins = listChannelPlugins();
const plugins = listReadOnlyChannelPluginsForConfig(cfg, {
includeSetupRuntimeFallback: true,
});
const selected =
!rawChannel || rawChannel === "all"
? plugins

31
src/commands/channels/remove.ts
View File

@@ -1,9 +1,7 @@
import { resolveChannelDefaultAccountId } from "../../channels/plugins/helpers.js";
import {
getChannelPlugin,
listChannelPlugins,
normalizeChannelId,
} from "../../channels/plugins/index.js";
import { getChannelPlugin, normalizeChannelId } from "../../channels/plugins/index.js";
import { listReadOnlyChannelPluginsForConfig } from "../../channels/plugins/read-only.js";
import type { ChannelPlugin } from "../../channels/plugins/types.plugin.js";
import { commitConfigWithPendingPluginInstalls } from "../../cli/plugins-install-record-commit.js";
import { refreshPluginRegistryAfterConfigMutation } from "../../cli/plugins-registry-refresh.js";
import { replaceConfigFile, type OpenClawConfig } from "../../config/config.js";
@@ -24,8 +22,12 @@ export type ChannelsRemoveOptions = {
delete?: boolean;
};
function listAccountIds(cfg: OpenClawConfig, channel: ChatChannel): string[] {
const plugin = getChannelPlugin(channel);
function listAccountIds(
cfg: OpenClawConfig,
channel: ChatChannel,
plugin?: ChannelPlugin,
): string[] {
plugin ??= getChannelPlugin(channel);
if (!plugin) {
return [];
}
@@ -47,23 +49,29 @@ export async function channelsRemoveCommand(
const useWizard = shouldUseWizard(params);
const prompter = useWizard ? createClackPrompter() : null;
const rawChannel = normalizeOptionalString(opts.channel) ?? "";
let lookupChannel = rawChannel;
let channel: ChatChannel | null = normalizeChannelId(rawChannel);
let accountId = normalizeAccountId(opts.account);
const deleteConfig = Boolean(opts.delete);
if (useWizard && prompter) {
await prompter.intro("Remove channel account");
const readOnlyPlugins = listReadOnlyChannelPluginsForConfig(cfg, {
includeSetupRuntimeFallback: true,
});
const selectedChannel = await prompter.select({
message: "Channel",
options: listChannelPlugins().map((plugin) => ({
options: readOnlyPlugins.map((plugin) => ({
value: plugin.id,
label: plugin.meta.label,
})),
});
channel = selectedChannel;
lookupChannel = selectedChannel;
accountId = await (async () => {
const ids = listAccountIds(cfg, selectedChannel);
const readOnlyPlugin = readOnlyPlugins.find((plugin) => plugin.id === selectedChannel);
const ids = listAccountIds(cfg, selectedChannel, readOnlyPlugin);
const choice = await prompter.select({
message: "Account",
options: ids.map((id) => ({
@@ -102,8 +110,7 @@ export async function channelsRemoveCommand(
}
}
const shouldResolveInstallablePlugin =
!useWizard && rawChannel && (!channel || !getChannelPlugin(channel));
const shouldResolveInstallablePlugin = Boolean(lookupChannel || channel);
const resolvedPluginState = shouldResolveInstallablePlugin
? await (async () => {
const { resolveInstallableChannelPlugin } =
@@ -111,7 +118,7 @@ export async function channelsRemoveCommand(
return await resolveInstallableChannelPlugin({
cfg,
runtime,
rawChannel,
rawChannel: lookupChannel,
allowInstall: true,
});
})()