Merge da45531daccfafeebee5bf9a2013fcc887c7d515 into 598f1826d8b2bc969aace2c6459824737667218c
This commit is contained in:
commit
dd09fa8d22
@ -437,7 +437,6 @@ function registerPluginEntry(cfg: OpenClawConfig, pluginId: string): OpenClawCon
|
||||
...cfg.channels,
|
||||
[builtInChannelId]: {
|
||||
...existingRecord,
|
||||
enabled: true,
|
||||
},
|
||||
},
|
||||
};
|
||||
@ -516,7 +515,7 @@ export function applyPluginAutoEnable(params: {
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
return (channelConfig as { enabled?: unknown }).enabled === true;
|
||||
return (channelConfig as { enabled?: unknown }).enabled !== false;
|
||||
})()
|
||||
: next.plugins?.entries?.[entry.pluginId]?.enabled === true;
|
||||
if (alreadyEnabled && !allowMissing) {
|
||||
|
||||
@ -731,6 +731,7 @@ export const agentHandlers: GatewayRequestHandlers = {
|
||||
const agentIdRaw = typeof p.agentId === "string" ? p.agentId.trim() : "";
|
||||
const sessionKeyRaw = typeof p.sessionKey === "string" ? p.sessionKey.trim() : "";
|
||||
let agentId = agentIdRaw ? normalizeAgentId(agentIdRaw) : undefined;
|
||||
const cfg = loadConfig();
|
||||
if (sessionKeyRaw) {
|
||||
if (classifySessionKeyShape(sessionKeyRaw) === "malformed_agent") {
|
||||
respond(
|
||||
@ -743,7 +744,7 @@ export const agentHandlers: GatewayRequestHandlers = {
|
||||
);
|
||||
return;
|
||||
}
|
||||
const resolved = resolveAgentIdFromSessionKey(sessionKeyRaw);
|
||||
const resolved = resolveSessionAgentId({ sessionKey: sessionKeyRaw, config: cfg });
|
||||
if (agentId && resolved !== agentId) {
|
||||
respond(
|
||||
false,
|
||||
@ -757,7 +758,6 @@ export const agentHandlers: GatewayRequestHandlers = {
|
||||
}
|
||||
agentId = resolved;
|
||||
}
|
||||
const cfg = loadConfig();
|
||||
const identity = resolveAssistantIdentity({ cfg, agentId });
|
||||
const avatarValue =
|
||||
resolveAssistantAvatarUrl({
|
||||
|
||||
@ -114,6 +114,7 @@ export function resolveRuntimeServiceVersion(
|
||||
runtimeVersion,
|
||||
env["OPENCLAW_SERVICE_VERSION"],
|
||||
env["npm_package_version"],
|
||||
VERSION,
|
||||
) ?? fallback
|
||||
);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user