|
|
|
@@ -73,6 +73,30 @@ interface PluginAPI {
|
|
|
|
getAgentStatus?: () => Promise<{ status: string } | null>;
|
|
|
|
getAgentStatus?: () => Promise<{ status: string } | null>;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* Coerce a tool execute() return value into the MCP `{ content: [...] }`
|
|
|
|
|
|
|
|
* shape that the openclaw Codex tool dispatcher requires.
|
|
|
|
|
|
|
|
*
|
|
|
|
|
|
|
|
* Background: openclaw's `convertToolContents()` does `result.content.reduce(...)`
|
|
|
|
|
|
|
|
* to compute total text length before flattening. Every HF tool here returned a
|
|
|
|
|
|
|
|
* bare object (`{ running, processing, currentSlot, ... }`) which has no
|
|
|
|
|
|
|
|
* `.content` field, so `undefined.reduce` threw and every call to
|
|
|
|
|
|
|
|
* `harborforge_*` from a Codex-harness agent surfaced as the cryptic
|
|
|
|
|
|
|
|
* `Cannot read properties of undefined (reading 'reduce')`. The fix is to
|
|
|
|
|
|
|
|
* wrap every tool's execute return; doing it at the `registerTool` boundary
|
|
|
|
|
|
|
|
* keeps each tool body unchanged.
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
function ensureMcpContentShape(result: unknown): { content: Array<{ type: 'text'; text: string }> } {
|
|
|
|
|
|
|
|
if (
|
|
|
|
|
|
|
|
result && typeof result === 'object' &&
|
|
|
|
|
|
|
|
Array.isArray((result as { content?: unknown }).content)
|
|
|
|
|
|
|
|
) {
|
|
|
|
|
|
|
|
return result as { content: Array<{ type: 'text'; text: string }> };
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
const text = typeof result === 'string' ? result : JSON.stringify(result, null, 2);
|
|
|
|
|
|
|
|
return { content: [{ type: 'text', text }] };
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
function register(api: PluginAPI): void {
|
|
|
|
function register(api: PluginAPI): void {
|
|
|
|
const logger = api.logger || {
|
|
|
|
const logger = api.logger || {
|
|
|
|
info: (...args: any[]) => console.log('[HarborForge]', ...args),
|
|
|
|
info: (...args: any[]) => console.log('[HarborForge]', ...args),
|
|
|
|
@@ -81,6 +105,22 @@ function register(api: PluginAPI): void {
|
|
|
|
warn: (...args: any[]) => console.warn('[HarborForge]', ...args),
|
|
|
|
warn: (...args: any[]) => console.warn('[HarborForge]', ...args),
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Wrap api.registerTool so every tool's execute() return is coerced into
|
|
|
|
|
|
|
|
// the MCP `{ content: [...] }` shape openclaw expects. See
|
|
|
|
|
|
|
|
// `ensureMcpContentShape` above.
|
|
|
|
|
|
|
|
const _origRegisterTool = api.registerTool.bind(api);
|
|
|
|
|
|
|
|
api.registerTool = (factory: (ctx: any) => any) => {
|
|
|
|
|
|
|
|
_origRegisterTool((ctx: any) => {
|
|
|
|
|
|
|
|
const def = factory(ctx);
|
|
|
|
|
|
|
|
if (!def || typeof def.execute !== 'function') return def;
|
|
|
|
|
|
|
|
const origExecute = def.execute;
|
|
|
|
|
|
|
|
return {
|
|
|
|
|
|
|
|
...def,
|
|
|
|
|
|
|
|
execute: async (...args: any[]) => ensureMcpContentShape(await origExecute(...args)),
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
function resolveConfig() {
|
|
|
|
function resolveConfig() {
|
|
|
|
return getPluginConfig(api);
|
|
|
|
return getPluginConfig(api);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@@ -127,7 +167,7 @@ function register(api: PluginAPI): void {
|
|
|
|
},
|
|
|
|
},
|
|
|
|
openclaw: {
|
|
|
|
openclaw: {
|
|
|
|
version: api.runtime?.version || api.version || 'unknown',
|
|
|
|
version: api.runtime?.version || api.version || 'unknown',
|
|
|
|
pluginVersion: '0.3.3', // Bumped for PLG-CAL-004
|
|
|
|
pluginVersion: '0.3.4', // Bumped for PLG-CAL-004
|
|
|
|
},
|
|
|
|
},
|
|
|
|
timestamp: new Date().toISOString(),
|
|
|
|
timestamp: new Date().toISOString(),
|
|
|
|
};
|
|
|
|
};
|
|
|
|
@@ -162,7 +202,7 @@ function register(api: PluginAPI): void {
|
|
|
|
|
|
|
|
|
|
|
|
const meta: OpenClawMeta = {
|
|
|
|
const meta: OpenClawMeta = {
|
|
|
|
version: api.runtime?.version || api.version || 'unknown',
|
|
|
|
version: api.runtime?.version || api.version || 'unknown',
|
|
|
|
plugin_version: '0.3.3',
|
|
|
|
plugin_version: '0.3.4',
|
|
|
|
agents: agentNames.map(name => ({ name })),
|
|
|
|
agents: agentNames.map(name => ({ name })),
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
@@ -267,10 +307,21 @@ function register(api: PluginAPI): void {
|
|
|
|
)}\n\`\`\``;
|
|
|
|
)}\n\`\`\``;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// First-line ack `WAKEUP_OK` is the plugin's ack-receipt token; the
|
|
|
|
|
|
|
|
// agent MUST then continue in the same session and drive the
|
|
|
|
|
|
|
|
// `hf-wakeup` workflow to completion (calendar_status → task fetch →
|
|
|
|
|
|
|
|
// sub-workflow → calendar_complete/abort). Without that continuation
|
|
|
|
|
|
|
|
// the scheduler keeps re-waking every 30s because the slot stays
|
|
|
|
|
|
|
|
// `not_started` forever.
|
|
|
|
const wakeupMessage =
|
|
|
|
const wakeupMessage =
|
|
|
|
`You have due slots. Follow the \`hf-wakeup\` workflow of skill ` +
|
|
|
|
`You have due slots. **First line of your reply MUST be exactly ` +
|
|
|
|
`\`hf-hangman-lab\` to proceed. Only reply \`WAKEUP_OK\` in this ` +
|
|
|
|
`\`WAKEUP_OK\`** so the plugin records the ack. Then, **in this ` +
|
|
|
|
`session.${slotBlock}`;
|
|
|
|
`same session**, drive the \`hf-wakeup\` workflow of skill ` +
|
|
|
|
|
|
|
|
`\`hf-hangman-lab\` to completion — read slot context, call the ` +
|
|
|
|
|
|
|
|
`harborforge_calendar_* tools, route to the right sub-workflow, ` +
|
|
|
|
|
|
|
|
`and finish with harborforge_calendar_complete or abort. Do NOT ` +
|
|
|
|
|
|
|
|
`stop after the ack — the scheduler will re-wake you every 30s ` +
|
|
|
|
|
|
|
|
`until the slot transitions out of \`not_started\`.${slotBlock}`;
|
|
|
|
|
|
|
|
|
|
|
|
const result = await dispatchInboundMessageWithDispatcher({
|
|
|
|
const result = await dispatchInboundMessageWithDispatcher({
|
|
|
|
ctx: {
|
|
|
|
ctx: {
|
|
|
|
|