nav/Dirigent
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev/fix-issues #12

Merged
hzhang merged 4 commits from dev/fix-issues into main 2026-03-03 18:41:27 +00:00
Conversation 0 Commits 4 Files Changed 2 +25 -32
2 changed files with 25 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugin/index.ts
View File

@@ -508,7 +508,8 @@ export default {
ensurePolicyStateLoaded(api, liveAtRegister); ensurePolicyStateLoaded(api, liveAtRegister);
// Resolve plugin directory for locating sibling modules (no-reply-api/) // Resolve plugin directory for locating sibling modules (no-reply-api/)
const pluginDir = path.dirname(new URL(import.meta.url).pathname); // Use api.resolvePath to get the actual plugin directory in OpenClaw environment
const pluginDir = api.resolvePath(".");
// Gateway lifecycle: start/stop no-reply API and moderator bot with the gateway // Gateway lifecycle: start/stop no-reply API and moderator bot with the gateway
api.on("gateway_start", () => { api.on("gateway_start", () => {

54
scripts/install-dirigent-openclaw.mjs
View File

@@ -279,22 +279,25 @@ else {
const delta = rec.delta || { added: {}, replaced: {}, removed: {} }; const delta = rec.delta || { added: {}, replaced: {}, removed: {} };
try { try {
// ── Handle ADDED entries: remove them ───────────────────────────────── // ── IMPORTANT: Order matters for OpenClaw config validation ────────────
if (delta.added[PATH_PLUGIN_ENTRY] !== undefined) { // 1. First remove from allow (before deleting entry, otherwise validation fails)
const plugins = getJson("plugins") || {}; if (delta.added[PATH_PLUGINS_ALLOW] !== undefined) {
plugins.entries = plugins.entries || {}; const allowList = getJson(PATH_PLUGINS_ALLOW) || [];
delete plugins.entries.dirigent; const idx = allowList.indexOf("dirigent");
setJson("plugins", plugins); if (idx !== -1) {
allowList.splice(idx, 1);
setJson(PATH_PLUGINS_ALLOW, allowList);
console.log("[dirigent] removed 'dirigent' from plugins.allow");
}
}
// 2. Then remove entry
if (delta.added[PATH_PLUGIN_ENTRY] !== undefined || delta.replaced[PATH_PLUGIN_ENTRY] !== undefined) {
unsetPath(PATH_PLUGIN_ENTRY);
console.log("[dirigent] removed plugins.entries.dirigent"); console.log("[dirigent] removed plugins.entries.dirigent");
} }
if (delta.added[PATH_PROVIDER_ENTRY] !== undefined) { // 3. Then remove plugin path (after entry is gone)
const providers = getJson(PATH_PROVIDERS) || {};
delete providers[NO_REPLY_PROVIDER_ID];
setJson(PATH_PROVIDERS, providers);
console.log(`[dirigent] removed models.providers.${NO_REPLY_PROVIDER_ID}`);
}
if (delta.added[PATH_PLUGINS_LOAD] !== undefined) { if (delta.added[PATH_PLUGINS_LOAD] !== undefined) {
const plugins = getJson("plugins") || {}; const plugins = getJson("plugins") || {};
const paths = plugins.load?.paths || []; const paths = plugins.load?.paths || [];
@@ -307,26 +310,15 @@ else {
} }
} }
// ── Handle plugins.allow ────────────────────────────────────────────── // 4. Finally remove provider
if (delta.added[PATH_PLUGINS_ALLOW] !== undefined) { if (delta.added[PATH_PROVIDER_ENTRY] !== undefined) {
const allowList = getJson(PATH_PLUGINS_ALLOW) || []; const providers = getJson(PATH_PROVIDERS) || {};
const idx = allowList.indexOf("dirigent"); delete providers[NO_REPLY_PROVIDER_ID];
if (idx !== -1) { setJson(PATH_PROVIDERS, providers);
allowList.splice(idx, 1); console.log(`[dirigent] removed models.providers.${NO_REPLY_PROVIDER_ID}`);
setJson(PATH_PLUGINS_ALLOW, allowList);
console.log("[dirigent] removed 'dirigent' from plugins.allow");
}
}
// ── Handle REPLACED entries: restore old value ────────────────────────
if (delta.replaced[PATH_PLUGIN_ENTRY] !== undefined) {
const plugins = getJson("plugins") || {};
plugins.entries = plugins.entries || {};
plugins.entries.dirigent = delta.replaced[PATH_PLUGIN_ENTRY];
setJson("plugins", plugins);
console.log("[dirigent] restored previous plugins.entries.dirigent");
} }
// ── Handle REPLACED provider: restore old value ───────────────────────
if (delta.replaced[PATH_PROVIDER_ENTRY] !== undefined) { if (delta.replaced[PATH_PROVIDER_ENTRY] !== undefined) {
const providers = getJson(PATH_PROVIDERS) || {}; const providers = getJson(PATH_PROVIDERS) || {};
providers[NO_REPLY_PROVIDER_ID] = delta.replaced[PATH_PROVIDER_ENTRY]; providers[NO_REPLY_PROVIDER_ID] = delta.replaced[PATH_PROVIDER_ENTRY];