Compare commits
11 Commits
fix/schedu
...
refactor/i
| Author | SHA1 | Date | |
|---|---|---|---|
| 2977ab369e | |||
| c8998c6b0d | |||
| 686f2c7cb0 | |||
| 81d40ae63d | |||
| 65a3fb8d2d | |||
| c2d00c18a7 | |||
| 709f7e09ab | |||
| 1c4cf773e5 | |||
| ba420e858a | |||
| e42b6b04ee | |||
| 610f5961d1 |
175
plugin/index.ts
175
plugin/index.ts
@@ -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);
|
||||||
}
|
}
|
||||||
@@ -88,7 +128,9 @@ function register(api: PluginAPI): void {
|
|||||||
/** Resolve agent ID from env, config, or fallback. */
|
/** Resolve agent ID from env, config, or fallback. */
|
||||||
function resolveAgentId(): string {
|
function resolveAgentId(): string {
|
||||||
if (process.env.AGENT_ID) return process.env.AGENT_ID;
|
if (process.env.AGENT_ID) return process.env.AGENT_ID;
|
||||||
const cfg = api.runtime?.config?.loadConfig?.();
|
// Read from cached `api.config` first — see pushMetaToMonitor for why
|
||||||
|
// the deprecated `api.runtime?.config?.loadConfig?.()` path is heavy.
|
||||||
|
const cfg = (api as any).config ?? api.runtime?.config?.loadConfig?.();
|
||||||
return cfg?.agents?.list?.[0]?.id ?? cfg?.agents?.defaults?.id ?? 'unknown';
|
return cfg?.agents?.list?.[0]?.id ?? cfg?.agents?.defaults?.id ?? 'unknown';
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -127,7 +169,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(),
|
||||||
};
|
};
|
||||||
@@ -144,6 +186,25 @@ function register(api: PluginAPI): void {
|
|||||||
* Push OpenClaw metadata to the Monitor bridge.
|
* Push OpenClaw metadata to the Monitor bridge.
|
||||||
* This enriches Monitor heartbeats with OpenClaw version/plugin/agent info.
|
* This enriches Monitor heartbeats with OpenClaw version/plugin/agent info.
|
||||||
* Failures are non-fatal — Monitor continues to work without this data.
|
* Failures are non-fatal — Monitor continues to work without this data.
|
||||||
|
*
|
||||||
|
* IMPORTANT — read config from the cached `api.config` surface, NOT from
|
||||||
|
* the deprecated `api.runtime?.config?.loadConfig?.()` path. The
|
||||||
|
* deprecated path triggers a full plugin-metadata-snapshot rebuild on
|
||||||
|
* every call: realpathSync walks every plugin's package.json + manifest
|
||||||
|
* + source paths (lstats up the directory tree), `hashWatchedFiles`
|
||||||
|
* fingerprints all watched plugin files, and `discoverInDirectory`
|
||||||
|
* re-scans every `dist/extensions/<plugin>` dir. On t2 with ~100 plugins
|
||||||
|
* each rebuild costs ~6-7s of CPU; with this push firing every 30s
|
||||||
|
* (default reportIntervalSec) the chronic baseline was ~22-25% gateway
|
||||||
|
* CPU even with zero agent activity (V8 profile 2026-05-27 08:14:00 60s:
|
||||||
|
* lstat 44.2%, statSync 6.9%, hashWatchedFiles via memo key 1.7%, all
|
||||||
|
* routed through readPersistedInstalledPluginIndexInstallRecordsSync ->
|
||||||
|
* discoverInDirectory). Switching to `api.config` reads from the
|
||||||
|
* already-loaded snapshot cache; the elsewhere-in-this-file pattern was
|
||||||
|
* already `api.config ?? api.runtime?.config?.loadConfig?.()`.
|
||||||
|
*
|
||||||
|
* Same fix is applied to `resolveAgentId` below — that's read once at
|
||||||
|
* gateway start so the impact is smaller, but it's the same anti-pattern.
|
||||||
*/
|
*/
|
||||||
async function pushMetaToMonitor() {
|
async function pushMetaToMonitor() {
|
||||||
const bridgeClient = getBridgeClient();
|
const bridgeClient = getBridgeClient();
|
||||||
@@ -151,7 +212,7 @@ function register(api: PluginAPI): void {
|
|||||||
|
|
||||||
let agentNames: string[] = [];
|
let agentNames: string[] = [];
|
||||||
try {
|
try {
|
||||||
const cfg = api.runtime?.config?.loadConfig?.();
|
const cfg = (api as any).config ?? api.runtime?.config?.loadConfig?.();
|
||||||
const agentsList = cfg?.agents?.list;
|
const agentsList = cfg?.agents?.list;
|
||||||
if (Array.isArray(agentsList)) {
|
if (Array.isArray(agentsList)) {
|
||||||
agentNames = agentsList
|
agentNames = agentsList
|
||||||
@@ -162,7 +223,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 +328,22 @@ function register(api: PluginAPI): void {
|
|||||||
)}\n\`\`\``;
|
)}\n\`\`\``;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The wakeup dispatcher's `deliver` callback below only logs the
|
||||||
|
// reply text — it does NOT inspect any ack token. The earlier
|
||||||
|
// `WAKEUP_OK` first-line-ack convention was prompt-only theatre;
|
||||||
|
// nothing in this plugin or in openclaw acted on it. The only
|
||||||
|
// thing that ends a wake cycle is the slot transitioning out of
|
||||||
|
// `not_started`, which happens when the agent calls
|
||||||
|
// `harborforge_calendar_complete` or `harborforge_calendar_abort`.
|
||||||
|
// Tell the agent that plainly instead of asking for a fake ack.
|
||||||
const wakeupMessage =
|
const wakeupMessage =
|
||||||
`You have due slots. Follow the \`hf-wakeup\` workflow of skill ` +
|
`You have due slots. Drive the \`hf-wakeup\` workflow of skill ` +
|
||||||
`\`hf-hangman-lab\` to proceed. Only reply \`WAKEUP_OK\` in this ` +
|
`\`hf-hangman-lab\` to completion in this session — read slot ` +
|
||||||
`session.${slotBlock}`;
|
`context, call the harborforge_calendar_* tools, route to the ` +
|
||||||
|
`right sub-workflow, and finish with harborforge_calendar_complete ` +
|
||||||
|
`or harborforge_calendar_abort. The scheduler keeps re-waking you ` +
|
||||||
|
`every 30s until the slot transitions out of \`not_started\`, so ` +
|
||||||
|
`partial work or silence just produces another wake.${slotBlock}`;
|
||||||
|
|
||||||
const result = await dispatchInboundMessageWithDispatcher({
|
const result = await dispatchInboundMessageWithDispatcher({
|
||||||
ctx: {
|
ctx: {
|
||||||
@@ -345,6 +418,94 @@ function register(api: PluginAPI): void {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Cross-plugin exposure: agent status lookup for other plugins
|
||||||
|
// (currently Fabric.OpenclawPlugin uses this to skip delivering
|
||||||
|
// `announce` channel messages to busy agents — see DIALECTIC-V2
|
||||||
|
// design doc, Phase 1). Backed by calendarBridge.getAgentStatus
|
||||||
|
// with a small TTL cache to avoid hammering the HF backend.
|
||||||
|
type HfStatus = 'idle' | 'on_call' | 'busy' | 'exhausted' | 'offline';
|
||||||
|
const HF_STATUS_CACHE_TTL_MS = 30_000;
|
||||||
|
const hfStatusCache = new Map<string, { status: HfStatus; at: number }>();
|
||||||
|
const _G = globalThis as Record<string, unknown>;
|
||||||
|
_G['__hfAgentStatus'] = {
|
||||||
|
async get(agentId: string): Promise<HfStatus | undefined> {
|
||||||
|
if (!agentId) return undefined;
|
||||||
|
const cached = hfStatusCache.get(agentId);
|
||||||
|
if (cached && Date.now() - cached.at < HF_STATUS_CACHE_TTL_MS) {
|
||||||
|
return cached.status;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const status = await calendarBridge.getAgentStatus(agentId);
|
||||||
|
if (status) {
|
||||||
|
const typed = status as HfStatus;
|
||||||
|
hfStatusCache.set(agentId, { status: typed, at: Date.now() });
|
||||||
|
return typed;
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
/* fall through to cached-or-undefined */
|
||||||
|
}
|
||||||
|
return cached?.status;
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Approximate "does agent have an on_call slot covering [from, to]?"
|
||||||
|
* for cross-plugin pre-check use (currently:
|
||||||
|
* Dialectic.OpenclawPlugin's signup HF coverage).
|
||||||
|
*
|
||||||
|
* v1 honest scope: we only have today's slots in scheduleCache
|
||||||
|
* (synced from /calendar/sync which is today-only). Returns:
|
||||||
|
* - true iff window is same-day AND some cached on_call slot
|
||||||
|
* starts <= from AND ends >= to
|
||||||
|
* - false iff window is same-day AND no such slot
|
||||||
|
* - undefined for cross-day windows OR cache empty for this
|
||||||
|
* agent (caller treats undefined as "I don't know" — see
|
||||||
|
* Dialectic plugin's hf-precheck.ts which degrades to
|
||||||
|
* "skipped" gracefully)
|
||||||
|
*
|
||||||
|
* Phase TBD: when HF backend ships a `/calendar/slots?agent&from&to`
|
||||||
|
* endpoint, swap this to call it for arbitrary windows. Until then,
|
||||||
|
* same-day-only coverage gates ~all debates created by analyze-intel
|
||||||
|
* (which schedules <2h windows) without needing a backend change.
|
||||||
|
*/
|
||||||
|
async hasOnCallCovering(
|
||||||
|
agentId: string,
|
||||||
|
fromIso: string,
|
||||||
|
toIso: string,
|
||||||
|
): Promise<boolean | undefined> {
|
||||||
|
if (!agentId || !fromIso || !toIso) return undefined;
|
||||||
|
const from = new Date(fromIso);
|
||||||
|
const to = new Date(toIso);
|
||||||
|
if (isNaN(from.getTime()) || isNaN(to.getTime())) return undefined;
|
||||||
|
if (!(from < to)) return undefined;
|
||||||
|
// Cross-day → cache only has today; can't decide.
|
||||||
|
const fromDate = from.toISOString().slice(0, 10);
|
||||||
|
const toDate = to.toISOString().slice(0, 10);
|
||||||
|
if (fromDate !== toDate) return undefined;
|
||||||
|
// Cache's cachedDate must match our window's date.
|
||||||
|
const cacheStatus = scheduleCache.getStatus();
|
||||||
|
if (cacheStatus.cachedDate !== fromDate) return undefined;
|
||||||
|
const slots = scheduleCache.getAgentSlots(agentId);
|
||||||
|
if (slots.length === 0) return undefined; // cache empty for this agent — can't decide
|
||||||
|
for (const s of slots) {
|
||||||
|
if (s.slot_type !== 'on_call') continue;
|
||||||
|
// status: ignore aborted/cancelled, accept not_started / ongoing / finished
|
||||||
|
if (s.status === 'aborted' || s.status === 'cancelled') continue;
|
||||||
|
const startStr = s.scheduled_at;
|
||||||
|
if (typeof startStr !== 'string') continue;
|
||||||
|
// scheduled_at can be HH:MM:SS (cache-relative date) or full ISO
|
||||||
|
const start =
|
||||||
|
/^\d{2}:\d{2}(:\d{2})?$/.test(startStr)
|
||||||
|
? new Date(`${fromDate}T${startStr}Z`)
|
||||||
|
: new Date(startStr);
|
||||||
|
if (isNaN(start.getTime())) continue;
|
||||||
|
const dur = typeof s.estimated_duration === 'number' ? s.estimated_duration : 0;
|
||||||
|
const end = new Date(start.getTime() + dur * 60_000);
|
||||||
|
if (start <= from && end >= to) return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
// Track wakes already dispatched for a slot in the current sync
|
// Track wakes already dispatched for a slot in the current sync
|
||||||
// window — the simplified inline scheduler does not PATCH slot
|
// window — the simplified inline scheduler does not PATCH slot
|
||||||
// status server-side, so without dedupe the check loop re-wakes
|
// status server-side, so without dedupe the check loop re-wakes
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "harbor-forge-plugin",
|
"name": "harbor-forge-plugin",
|
||||||
"version": "0.3.3",
|
"version": "0.3.4",
|
||||||
"description": "OpenClaw plugin for HarborForge monitor bridge and CLI integration",
|
"description": "OpenClaw plugin for HarborForge monitor bridge and CLI integration",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "dist/index.js",
|
"main": "dist/index.js",
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ const OLD_PLUGIN_NAME = 'harborforge-monitor';
|
|||||||
const PLUGIN_SRC_DIR = join(__dirname, 'plugin');
|
const PLUGIN_SRC_DIR = join(__dirname, 'plugin');
|
||||||
const SKILLS_SRC_DIR = join(__dirname, 'skills');
|
const SKILLS_SRC_DIR = join(__dirname, 'skills');
|
||||||
const MONITOR_REPO_URL = 'https://git.hangman-lab.top/zhi/HarborForge.Monitor.git';
|
const MONITOR_REPO_URL = 'https://git.hangman-lab.top/zhi/HarborForge.Monitor.git';
|
||||||
|
const CLI_REPO_URL = 'https://git.hangman-lab.top/zhi/HarborForge.Cli.git';
|
||||||
|
|
||||||
const args = process.argv.slice(2);
|
const args = process.argv.slice(2);
|
||||||
const options = {
|
const options = {
|
||||||
@@ -43,6 +44,7 @@ const options = {
|
|||||||
installCli: args.includes('--install-cli'),
|
installCli: args.includes('--install-cli'),
|
||||||
installMonitor: 'no',
|
installMonitor: 'no',
|
||||||
monitorBranch: 'main',
|
monitorBranch: 'main',
|
||||||
|
cliBranch: 'main',
|
||||||
};
|
};
|
||||||
|
|
||||||
const profileIdx = args.indexOf('--openclaw-profile-path');
|
const profileIdx = args.indexOf('--openclaw-profile-path');
|
||||||
@@ -60,6 +62,11 @@ if (monitorBranchIdx !== -1 && args[monitorBranchIdx + 1]) {
|
|||||||
options.monitorBranch = String(args[monitorBranchIdx + 1]);
|
options.monitorBranch = String(args[monitorBranchIdx + 1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const cliBranchIdx = args.indexOf('--cli-branch');
|
||||||
|
if (cliBranchIdx !== -1 && args[cliBranchIdx + 1]) {
|
||||||
|
options.cliBranch = String(args[cliBranchIdx + 1]);
|
||||||
|
}
|
||||||
|
|
||||||
function resolveOpenclawPath() {
|
function resolveOpenclawPath() {
|
||||||
if (options.openclawProfilePath) return options.openclawProfilePath;
|
if (options.openclawProfilePath) return options.openclawProfilePath;
|
||||||
if (process.env.OPENCLAW_PATH) return resolve(process.env.OPENCLAW_PATH);
|
if (process.env.OPENCLAW_PATH) return resolve(process.env.OPENCLAW_PATH);
|
||||||
@@ -321,34 +328,35 @@ async function installCli() {
|
|||||||
const binDir = join(openclawPath, 'bin');
|
const binDir = join(openclawPath, 'bin');
|
||||||
mkdirSync(binDir, { recursive: true });
|
mkdirSync(binDir, { recursive: true });
|
||||||
|
|
||||||
// Find CLI source — look for HarborForge.Cli relative to project root
|
// Clone CLI repo to /tmp, build there, copy artifact out. Mirrors
|
||||||
const projectRoot = resolve(__dirname, '..');
|
// installManagedMonitor so the install never depends on a checked-out
|
||||||
const cliDir = join(projectRoot, 'HarborForge.Cli');
|
// sibling repo at a fixed path.
|
||||||
|
const tmpDir = join('/tmp', `harborforge-cli-${Date.now()}`);
|
||||||
if (!existsSync(cliDir)) {
|
const hfBinary = join(binDir, 'hf');
|
||||||
// Try parent directory (monorepo layout)
|
|
||||||
const monoCliDir = resolve(projectRoot, '..', 'HarborForge.Cli');
|
|
||||||
if (!existsSync(monoCliDir)) {
|
|
||||||
logErr(`Cannot find HarborForge.Cli at ${cliDir} or ${monoCliDir}`);
|
|
||||||
logWarn('Skipping CLI installation');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const effectiveCliDir = existsSync(cliDir)
|
|
||||||
? cliDir
|
|
||||||
: resolve(projectRoot, '..', 'HarborForge.Cli');
|
|
||||||
|
|
||||||
log(` Building hf from ${effectiveCliDir}...`, 'blue');
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const hfBinary = join(binDir, 'hf');
|
log(` Cloning ${CLI_REPO_URL} (branch ${options.cliBranch}) → ${tmpDir}...`, 'blue');
|
||||||
exec(`go build -o ${hfBinary} ./cmd/hf`, { cwd: effectiveCliDir, silent: !options.verbose });
|
exec(`git clone --branch ${shellEscape(options.cliBranch)} --depth 1 ${shellEscape(CLI_REPO_URL)} ${shellEscape(tmpDir)}`, { silent: !options.verbose });
|
||||||
|
|
||||||
|
// Stamp the binary with the version string the prod CLI surfaces in
|
||||||
|
// `hf version`. Fall back to a date-only label if rev-parse fails for
|
||||||
|
// any reason (shallow clone shouldn't, but be defensive).
|
||||||
|
let versionLabel = `${new Date().toISOString().slice(0, 10)}+install`;
|
||||||
|
try {
|
||||||
|
const sha = exec(`git rev-parse --short HEAD`, { cwd: tmpDir, silent: true }).trim();
|
||||||
|
if (sha) versionLabel = `${new Date().toISOString().slice(0, 10)}+${options.cliBranch}-${sha}`;
|
||||||
|
} catch { /* keep fallback */ }
|
||||||
|
|
||||||
|
log(` Building hf (version=${versionLabel})...`, 'blue');
|
||||||
|
const ldflags = `-X git.hangman-lab.top/zhi/HarborForge.Cli/internal/commands.Version=${versionLabel}`;
|
||||||
|
exec(`go build -ldflags ${shellEscape(ldflags)} -o ${shellEscape(hfBinary)} ./cmd/hf`, { cwd: tmpDir, silent: !options.verbose });
|
||||||
chmodSync(hfBinary, 0o755);
|
chmodSync(hfBinary, 0o755);
|
||||||
logOk(`hf binary → ${hfBinary}`);
|
logOk(`hf binary → ${hfBinary} (branch hint: ${options.cliBranch})`);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
logErr(`Failed to build hf CLI: ${err.message}`);
|
logErr(`Failed to build hf CLI: ${err.message}`);
|
||||||
logWarn('CLI installation failed, plugin still installed');
|
logWarn('CLI installation failed, plugin still installed');
|
||||||
|
} finally {
|
||||||
|
rmSync(tmpDir, { recursive: true, force: true });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user