Compare commits
2 Commits
_main
...
7e4750fcc4
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7e4750fcc4 | ||
|
|
6d59741086 |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -4,5 +4,3 @@ plugin/**/*.js
|
|||||||
plugin/**/*.js.map
|
plugin/**/*.js.map
|
||||||
plugin/**/*.d.ts
|
plugin/**/*.d.ts
|
||||||
plugin/**/*.d.ts.map
|
plugin/**/*.d.ts.map
|
||||||
# Hand-written ambient declarations are tracked; only compiled .d.ts above is ignored.
|
|
||||||
!plugin/openclaw-sdk.d.ts
|
|
||||||
|
|||||||
192
README.md
192
README.md
@@ -1,107 +1,84 @@
|
|||||||
# HarborForge OpenClaw Plugin
|
# HarborForge OpenClaw Plugin
|
||||||
|
|
||||||
OpenClaw plugin that exposes OpenClaw-side metadata to the HarborForge Monitor, provides an optional local Monitor bridge, drives the HarborForge Calendar scheduler, and can optionally install the `hf` CLI.
|
OpenClaw 插件:向 HarborForge Monitor 暴露 OpenClaw 侧元数据,并提供可选的本地桥接能力;安装时也可顺带安装 `hf` CLI。
|
||||||
|
|
||||||
Part of the [HarborForge](../README.md) platform.
|
## 当前状态
|
||||||
|
|
||||||
- Role: OpenClaw integration layer for HarborForge (registered plugin id: `harbor-forge`).
|
- 插件注册名:`harbor-forge`
|
||||||
- Talks to the HarborForge backend (`backendUrl`, default `https://monitor.hangman-lab.top`) for Calendar APIs.
|
- 旧 sidecar `server/` 架构已移除
|
||||||
- Talks to a local HarborForge.Monitor bridge over `127.0.0.1:<monitor_port>` (no fixed default; commonly `9100`).
|
- 监控桥接走本地 `monitor_port`
|
||||||
|
- 安装脚本支持 `--install-cli`
|
||||||
|
- `skills/hf/` 仅在 `--install-cli` 时一并安装
|
||||||
|
|
||||||
## Current State
|
## 项目结构
|
||||||
|
|
||||||
- Plugin registration id: `harbor-forge` (was `harborforge-monitor`)
|
|
||||||
- Plugin version: `0.2.0` (package manifests); telemetry reports `pluginVersion` `0.3.1`
|
|
||||||
- Legacy sidecar `server/` architecture removed — telemetry is served directly by the plugin
|
|
||||||
- Monitor bridge runs over the local `monitor_port`
|
|
||||||
- Calendar scheduler integration (PLG-CAL-001 / 002 / 004)
|
|
||||||
- Installer supports `--install-cli` and an optional managed Monitor (`--install-monitor`)
|
|
||||||
- `skills/hf/` is installed only with `--install-cli`
|
|
||||||
|
|
||||||
## Project Structure
|
|
||||||
|
|
||||||
```text
|
```text
|
||||||
HarborForge.OpenclawPlugin/
|
HarborForge.OpenclawPlugin/
|
||||||
├── package.json
|
├── package.json
|
||||||
├── README.md
|
├── README.md
|
||||||
├── docs/ # design notes (calendar, monitor connector)
|
|
||||||
├── plugin/
|
├── plugin/
|
||||||
│ ├── openclaw.plugin.json # plugin manifest + config schema
|
│ ├── openclaw.plugin.json
|
||||||
│ ├── index.ts # plugin entry, tool registration
|
│ ├── index.ts
|
||||||
│ ├── tsconfig.json
|
|
||||||
│ ├── core/
|
│ ├── core/
|
||||||
│ │ ├── config.ts # config defaults / resolution
|
│ │ ├── config.ts
|
||||||
│ │ ├── managed-monitor.ts # optionally spawn HarborForge.Monitor
|
│ │ ├── managed-monitor.ts
|
||||||
│ │ ├── monitor-bridge.ts # client for the Monitor bridge
|
│ │ └── monitor-bridge.ts
|
||||||
│ │ └── openclaw-agents.ts # enumerate OpenClaw agents
|
|
||||||
│ ├── calendar/ # Calendar scheduler + bridge
|
|
||||||
│ │ ├── index.ts
|
|
||||||
│ │ ├── scheduler.ts
|
|
||||||
│ │ ├── calendar-bridge.ts
|
|
||||||
│ │ └── types.ts
|
|
||||||
│ ├── hooks/
|
│ ├── hooks/
|
||||||
│ │ ├── gateway-start.ts
|
│ │ ├── gateway-start.ts
|
||||||
│ │ └── gateway-stop.ts
|
│ │ └── gateway-stop.ts
|
||||||
│ └── package.json
|
│ └── package.json
|
||||||
├── skills/
|
├── skills/
|
||||||
│ └── hf/
|
│ └── hf/
|
||||||
│ └── SKILL.md # installed only with --install-cli
|
│ └── SKILL.md
|
||||||
└── scripts/
|
└── scripts/
|
||||||
└── install.mjs
|
└── install.mjs
|
||||||
```
|
```
|
||||||
|
|
||||||
## Installation
|
## 安装
|
||||||
|
|
||||||
### Standard Install
|
### 普通安装
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
node scripts/install.mjs
|
node scripts/install.mjs
|
||||||
```
|
```
|
||||||
|
|
||||||
This will:
|
这会:
|
||||||
- Build and install the OpenClaw plugin
|
- 构建并安装 OpenClaw 插件
|
||||||
- Copy regular skills
|
- 复制常规 skills
|
||||||
- **Not** install the `hf` binary
|
- **不会**安装 `hf` 二进制
|
||||||
- **Not** copy `skills/hf/`
|
- **不会**复制 `skills/hf/`
|
||||||
|
|
||||||
### Plugin + `hf` CLI
|
### 安装插件 + `hf` CLI
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
node scripts/install.mjs --install-cli
|
node scripts/install.mjs --install-cli
|
||||||
```
|
```
|
||||||
|
|
||||||
This additionally:
|
这会额外:
|
||||||
- Builds `HarborForge.Cli` (`go build ./cmd/hf`)
|
- 构建 `HarborForge.Cli`
|
||||||
- Installs `hf` to `<openclaw>/bin/hf` (default `~/.openclaw/bin/hf`) and `chmod +x`
|
- 安装 `hf` 到 `~/.openclaw/bin/hf`
|
||||||
- Copies `skills/hf/` into the OpenClaw skills directory
|
- `chmod +x ~/.openclaw/bin/hf`
|
||||||
|
- 复制 `skills/hf/` 到 OpenClaw profile skills 目录
|
||||||
|
|
||||||
### Common Options
|
### 常用选项
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Build only (no install / config)
|
# 仅构建
|
||||||
node scripts/install.mjs --build-only
|
node scripts/install.mjs --build-only
|
||||||
|
|
||||||
# Install only, skip dependency checks
|
# 指定 OpenClaw profile
|
||||||
node scripts/install.mjs --skip-check
|
|
||||||
|
|
||||||
# Specify OpenClaw profile path (also honors OPENCLAW_PATH env)
|
|
||||||
node scripts/install.mjs --openclaw-profile-path /custom/path/.openclaw
|
node scripts/install.mjs --openclaw-profile-path /custom/path/.openclaw
|
||||||
|
|
||||||
# Build and install a managed HarborForge.Monitor binary alongside the plugin
|
# 详细日志
|
||||||
node scripts/install.mjs --install-monitor yes --monitor-branch main
|
|
||||||
|
|
||||||
# Verbose logs
|
|
||||||
node scripts/install.mjs --verbose
|
node scripts/install.mjs --verbose
|
||||||
|
|
||||||
# Uninstall (plugin, config entries, hf binary, managed monitor)
|
# 卸载
|
||||||
node scripts/install.mjs --uninstall
|
node scripts/install.mjs --uninstall
|
||||||
```
|
```
|
||||||
|
|
||||||
The installer also updates OpenClaw config (`plugins.load.paths`, `plugins.allow`, `plugins.entries.harbor-forge.enabled`) via `openclaw config`.
|
## 配置
|
||||||
|
|
||||||
## Configuration
|
编辑 `~/.openclaw/openclaw.json`:
|
||||||
|
|
||||||
Edit `~/.openclaw/openclaw.json`:
|
|
||||||
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
@@ -117,9 +94,7 @@ Edit `~/.openclaw/openclaw.json`:
|
|||||||
"monitor_port": 9100,
|
"monitor_port": 9100,
|
||||||
"reportIntervalSec": 30,
|
"reportIntervalSec": 30,
|
||||||
"httpFallbackIntervalSec": 60,
|
"httpFallbackIntervalSec": 60,
|
||||||
"logLevel": "info",
|
"logLevel": "info"
|
||||||
"calendarEnabled": true,
|
|
||||||
"calendarHeartbeatIntervalSec": 60
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -127,72 +102,51 @@ Edit `~/.openclaw/openclaw.json`:
|
|||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
Then restart:
|
然后重启:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
openclaw gateway restart
|
openclaw gateway restart
|
||||||
```
|
```
|
||||||
|
|
||||||
## Config Options
|
## 配置项
|
||||||
|
|
||||||
| Option | Type | Default | Description |
|
| 选项 | 类型 | 默认值 | 说明 |
|
||||||
|--------|------|---------|-------------|
|
|------|------|--------|------|
|
||||||
| `enabled` | boolean | `true` | Enable the plugin |
|
| `enabled` | boolean | `true` | 是否启用插件 |
|
||||||
| `backendUrl` | string | `https://monitor.hangman-lab.top` | HarborForge backend base URL (Monitor + Calendar APIs) |
|
| `backendUrl` | string | `https://monitor.hangman-lab.top` | HarborForge Monitor 后端地址 |
|
||||||
| `identifier` | string | hostname | Server / claw identifier |
|
| `identifier` | string | 主机名 | 服务器标识符 |
|
||||||
| `apiKey` | string | (none) | Server API key from the HarborForge Monitor admin panel |
|
| `apiKey` | string | 无 | HarborForge Monitor 生成的服务器 API Key |
|
||||||
| `monitor_port` | number | (none) | Local bridge port; plugin talks to HarborForge.Monitor via `127.0.0.1:<monitor_port>` |
|
| `monitor_port` | number | 无 | 本地桥接端口;插件通过 `127.0.0.1:<monitor_port>` 与 HarborForge.Monitor 通信 |
|
||||||
| `reportIntervalSec` | number | `30` | Metadata push interval (seconds) |
|
| `reportIntervalSec` | number | `30` | 报告间隔(秒) |
|
||||||
| `httpFallbackIntervalSec` | number | `60` | HTTP heartbeat interval when WS unavailable |
|
| `httpFallbackIntervalSec` | number | `60` | HTTP 回退间隔(秒) |
|
||||||
| `logLevel` | string | `info` | Log level: `debug` / `info` / `warn` / `error` |
|
| `logLevel` | string | `info` | 日志级别:`debug` / `info` / `warn` / `error` |
|
||||||
| `calendarEnabled` | boolean | `true` | Enable Calendar scheduler integration (PLG-CAL-001) |
|
|
||||||
| `calendarHeartbeatIntervalSec` | number | `60` | Calendar heartbeat interval (seconds) |
|
|
||||||
| `calendarApiKey` | string | (none) | API key for Calendar API auth; falls back to `apiKey` / `X-Agent-ID` |
|
|
||||||
| `managedMonitor` | string | (none) | Absolute path to a HarborForge.Monitor binary; if set, gateway start/stop hooks spawn/stop it |
|
|
||||||
|
|
||||||
## Local Monitor Bridge
|
## 本地桥接说明
|
||||||
|
|
||||||
When the plugin has `monitor_port` configured and HarborForge.Monitor uses the same `MONITOR_PORT`:
|
当插件配置了 `monitor_port`,并且 HarborForge.Monitor 也使用相同的 `MONITOR_PORT` 时:
|
||||||
|
|
||||||
- Monitor serves a local bridge on `127.0.0.1:<MONITOR_PORT>`
|
- Monitor 在 `127.0.0.1:<MONITOR_PORT>` 提供本地桥接服务
|
||||||
- The plugin probes `GET /health`
|
- 插件可探测 `GET /health`
|
||||||
- The plugin tool `harborforge_monitor_telemetry` reads `GET /telemetry`
|
- 插件工具 `harborforge_monitor_telemetry` 可读取 `GET /telemetry`
|
||||||
- The plugin pushes OpenClaw metadata (version, plugin version, agents) via `POST /openclaw` on the `reportIntervalSec` cadence, enriching Monitor heartbeats
|
- 如果桥接端口未配置或不可达,插件仍可正常运行
|
||||||
- If the bridge port is unconfigured or unreachable, the plugin still works normally
|
|
||||||
|
|
||||||
This link is an **optional enhancement**, not a precondition for the plugin to start or for Monitor heartbeats.
|
也就是说,这条链路是**可选增强**,不是插件启动或 Monitor 心跳的前置条件。
|
||||||
|
|
||||||
## Managed Monitor
|
## 插件提供的信息
|
||||||
|
|
||||||
If `managedMonitor` points to an installed HarborForge.Monitor binary, the `gateway_start` hook spawns it (passing `--backend-url`, `--identifier`, `--api-key`, `--monitor-port`, `--report-interval`, `--log-level` from the plugin config) and `gateway_stop` terminates it. Use `install.mjs --install-monitor yes` to build and wire this automatically.
|
### OpenClaw 元数据
|
||||||
|
- OpenClaw version
|
||||||
|
- plugin version
|
||||||
|
- 标识符 / 主机名
|
||||||
|
- 时间戳
|
||||||
|
|
||||||
## Calendar Scheduler
|
### 系统快照
|
||||||
|
- uptime
|
||||||
|
- memory total/free/used/usagePercent
|
||||||
|
- load avg1/avg5/avg15
|
||||||
|
- platform
|
||||||
|
|
||||||
When `calendarEnabled` is true, on gateway start the plugin starts a Calendar scheduler that heartbeats the backend (`/calendar/agent/heartbeat`, `/calendar/agent/status`, `/calendar/agent/notify`) to receive and run scheduled TimeSlots, waking/spawning agents via the OpenClaw `spawn` API (with a notification fallback). Scheduler state is persisted to a state file; gateway restarts can be requested by the backend (PLG-CAL-004).
|
## 开发
|
||||||
|
|
||||||
## Tools Provided
|
|
||||||
|
|
||||||
| Tool | Description |
|
|
||||||
|------|-------------|
|
|
||||||
| `harborforge_status` | Plugin status, resolved config, Monitor bridge health, calendar status, telemetry snapshot |
|
|
||||||
| `harborforge_telemetry` | Current system telemetry snapshot from this host |
|
|
||||||
| `harborforge_monitor_telemetry` | Query the Monitor bridge for host hardware telemetry |
|
|
||||||
| `harborforge_calendar_status` | Calendar scheduler status and current slot |
|
|
||||||
| `harborforge_calendar_complete` | Complete the current calendar slot with actual duration |
|
|
||||||
| `harborforge_calendar_abort` | Abort the current calendar slot |
|
|
||||||
| `harborforge_calendar_pause` | Pause the current calendar slot |
|
|
||||||
| `harborforge_calendar_resume` | Resume the paused calendar slot |
|
|
||||||
| `harborforge_restart_status` | Check whether a gateway restart is pending |
|
|
||||||
|
|
||||||
### Telemetry Snapshot Fields
|
|
||||||
|
|
||||||
- `identifier`, `hostname`, `platform`, `timestamp`
|
|
||||||
- `uptime`
|
|
||||||
- `memory`: `total` / `free` / `used` / `usagePercent`
|
|
||||||
- `load`: `avg1` / `avg5` / `avg15`
|
|
||||||
- `openclaw`: `version` / `pluginVersion`
|
|
||||||
|
|
||||||
## Development
|
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
cd plugin
|
cd plugin
|
||||||
@@ -200,16 +154,14 @@ npm install
|
|||||||
npm run build
|
npm run build
|
||||||
```
|
```
|
||||||
|
|
||||||
The build runs `tsc` and emits `dist/` (`dist/index.js` is the plugin entry).
|
## 依赖
|
||||||
|
|
||||||
## Dependencies
|
|
||||||
|
|
||||||
- Node.js 18+
|
- Node.js 18+
|
||||||
- OpenClaw Gateway
|
- OpenClaw Gateway
|
||||||
- Go 1.20+ (only for `--install-cli` / `--install-monitor`)
|
- Go 1.20+(仅 `--install-cli` 需要)
|
||||||
|
|
||||||
## Tips
|
## 相关提示
|
||||||
|
|
||||||
- After installing `hf`, add `~/.openclaw/bin` to your `PATH`
|
- 安装 `hf` 后,建议把 `~/.openclaw/bin` 加到 `PATH`
|
||||||
- When an agent uses `hf`, try `hf --help-brief` first
|
- Agent 使用 `hf` 时,优先试 `hf --help-brief`
|
||||||
- For the full command tree, see `hf --help`
|
- 完整命令树看 `hf --help`
|
||||||
|
|||||||
190
REFACTOR_PLAN.md
190
REFACTOR_PLAN.md
@@ -1,118 +1,112 @@
|
|||||||
# CalendarScheduler Refactor Plan (v2)
|
# CalendarScheduler Refactor Plan
|
||||||
|
|
||||||
> Updated 2026-04-19 based on architecture discussion with hang
|
## Current Design
|
||||||
|
|
||||||
## Current Issues
|
```
|
||||||
|
Every 60s:
|
||||||
|
heartbeat() → POST /calendar/agent/heartbeat → returns pending slots
|
||||||
|
if idle → select highest priority → executeSlot → wakeAgent(spawn)
|
||||||
|
if busy → defer all pending slots
|
||||||
|
```
|
||||||
|
|
||||||
1. `process.env.AGENT_ID` doesn't exist in plugins subprocess — always 'unknown'
|
**Problems:**
|
||||||
2. Heartbeat is per-agent but should be per-claw-instance (global)
|
1. Every heartbeat queries backend for pending slots — no local awareness of full schedule
|
||||||
3. Scheduler only handles one agent — should manage all agents on this instance
|
2. Cannot detect slots assigned by other agents between heartbeats
|
||||||
4. wakeAgent used api.spawn (non-existent) → now uses dispatchInboundMessage (verified)
|
3. 60s interval is too frequent for sync but too infrequent for precise wakeup
|
||||||
|
4. Wakeup via `api.spawn()` creates a plain session, not a Discord private channel
|
||||||
|
|
||||||
## Target Design
|
## Target Design
|
||||||
|
|
||||||
### Plugin State
|
```
|
||||||
|
Every 5-10 min (sync interval):
|
||||||
|
syncSchedule() → GET /calendar/day → update local today cache
|
||||||
|
|
||||||
|
Every 30s (check interval):
|
||||||
|
checkDueSlots() → scan local cache for due slots
|
||||||
|
if due slot found:
|
||||||
|
confirmAgentStatus() → GET /calendar/agent/status
|
||||||
|
if not busy → wakeAgent (via Dirigent moderator bot private channel)
|
||||||
|
```
|
||||||
|
|
||||||
|
## Changes Required
|
||||||
|
|
||||||
|
### 1. Add Local Schedule Cache
|
||||||
|
|
||||||
|
New class `ScheduleCache`:
|
||||||
|
```typescript
|
||||||
|
class ScheduleCache {
|
||||||
|
private slots: Map<string, CalendarSlotResponse>; // slotId → slot
|
||||||
|
private lastSyncAt: Date | null;
|
||||||
|
|
||||||
|
async sync(bridge: CalendarBridgeClient): Promise<void>; // fetch today's full schedule
|
||||||
|
getDueSlots(now: Date): CalendarSlotResponse[]; // scheduled_at <= now && NOT_STARTED/DEFERRED
|
||||||
|
updateSlot(id: string, update: Partial<CalendarSlotResponse>): void; // local update
|
||||||
|
getAll(): CalendarSlotResponse[];
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 2. Add CalendarBridgeClient.getDaySchedule()
|
||||||
|
|
||||||
|
New endpoint call:
|
||||||
|
```typescript
|
||||||
|
async getDaySchedule(date: string): Promise<CalendarSlotResponse[]>
|
||||||
|
// GET /calendar/day?date=YYYY-MM-DD
|
||||||
|
```
|
||||||
|
|
||||||
|
This fetches ALL slots for the day, not just pending ones. The existing `heartbeat()` only returns NOT_STARTED/DEFERRED.
|
||||||
|
|
||||||
|
### 3. Split Heartbeat into Sync + Check
|
||||||
|
|
||||||
|
**Replace** single `runHeartbeat()` with two intervals:
|
||||||
|
|
||||||
```typescript
|
```typescript
|
||||||
// Local schedule cache: { agentId → [slots] }
|
// Sync: every 5 min — pull full schedule from backend
|
||||||
const schedules: Map<string, CalendarSlotResponse[]> = new Map();
|
this.syncInterval = setInterval(() => this.runSync(), 300_000);
|
||||||
|
|
||||||
|
// Check: every 30s — scan local cache for due slots
|
||||||
|
this.checkInterval = setInterval(() => this.runCheck(), 30_000);
|
||||||
```
|
```
|
||||||
|
|
||||||
### Sync Flow (every 5 min)
|
`runSync()`:
|
||||||
|
1. `bridge.getDaySchedule(today)` → update cache
|
||||||
|
2. Still send heartbeat to keep backend informed of agent liveness
|
||||||
|
|
||||||
```
|
`runCheck()`:
|
||||||
1. GET /calendar/sync?claw_identifier=xxx
|
1. `cache.getDueSlots(now)` → find due slots
|
||||||
- First call: server returns full { agentId → [slots] }
|
2. Filter out session-deferred slots
|
||||||
- Subsequent: server returns diff since last sync
|
3. If agent idle → select highest priority → execute
|
||||||
2. Update local schedules map
|
|
||||||
3. Scan schedules for due slots:
|
|
||||||
for each agentId in schedules:
|
|
||||||
if has slot where scheduled_at <= now && status == not_started:
|
|
||||||
getAgentStatus(agentId, clawIdentifier) → busy?
|
|
||||||
if not busy → wakeAgent(agentId)
|
|
||||||
```
|
|
||||||
|
|
||||||
### Heartbeat (every 60s)
|
### 4. Wakeup via Dirigent (future)
|
||||||
|
|
||||||
Simplified to liveness ping only:
|
Change `wakeAgent()` to create a private Discord channel via Dirigent moderator bot instead of `api.spawn()`. This requires:
|
||||||
```
|
- Access to Dirigent's moderator bot token or cross-plugin API
|
||||||
POST /monitor/server/heartbeat
|
- Creating a private channel with only the target agent
|
||||||
claw_identifier: xxx
|
- Posting the wakeup prompt as a message
|
||||||
→ server returns empty/ack
|
|
||||||
```
|
|
||||||
|
|
||||||
No slot data in heartbeat response.
|
**For now:** Keep `api.spawn()` as the wakeup method. The Dirigent integration can be added later as it requires cross-plugin coordination.
|
||||||
|
|
||||||
### Wake Flow
|
|
||||||
|
|
||||||
```
|
|
||||||
dispatchInboundMessage:
|
|
||||||
SessionKey: agent:{agentId}:hf-wakeup
|
|
||||||
Body: "You have due slots. Follow the hf-wakeup workflow of skill hf-hangman-lab to proceed. Only reply WAKEUP_OK in this session."
|
|
||||||
|
|
||||||
Agent reads workflow → calls hf tools → sets own status to busy
|
|
||||||
```
|
|
||||||
|
|
||||||
### Agent ID Resolution
|
|
||||||
|
|
||||||
- **Sync**: agentId comes from server response (dict keys)
|
|
||||||
- **Wake**: agentId from local schedules dict key
|
|
||||||
- **Tool calls by agent**: agentId from tool ctx (same as padded-cell)
|
|
||||||
|
|
||||||
## Backend API Changes Needed
|
|
||||||
|
|
||||||
### New: GET /calendar/sync
|
|
||||||
|
|
||||||
```
|
|
||||||
GET /calendar/sync?claw_identifier=xxx
|
|
||||||
Headers: X-Claw-Identifier
|
|
||||||
|
|
||||||
Response (first call):
|
|
||||||
{
|
|
||||||
"full": true,
|
|
||||||
"schedules": {
|
|
||||||
"developer": [slot1, slot2, ...],
|
|
||||||
"operator": [slot3, ...]
|
|
||||||
},
|
|
||||||
"syncToken": "abc123"
|
|
||||||
}
|
|
||||||
|
|
||||||
Response (subsequent, with ?since=abc123):
|
|
||||||
{
|
|
||||||
"full": false,
|
|
||||||
"diff": [
|
|
||||||
{ "op": "add", "agent": "developer", "slot": {...} },
|
|
||||||
{ "op": "update", "agent": "developer", "slotId": 5, "patch": {...} },
|
|
||||||
{ "op": "remove", "agent": "operator", "slotId": 3 }
|
|
||||||
],
|
|
||||||
"syncToken": "def456"
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### Existing: POST /calendar/agent/status
|
|
||||||
|
|
||||||
Keep as-is but ensure it accepts agentId + clawIdentifier as params:
|
|
||||||
```
|
|
||||||
POST /calendar/agent/status
|
|
||||||
{ agent_id, claw_identifier, status }
|
|
||||||
```
|
|
||||||
|
|
||||||
## Implementation Order
|
## Implementation Order
|
||||||
|
|
||||||
1. Backend: Add /calendar/sync endpoint
|
1. Add `ScheduleCache` class (new file: `plugin/calendar/schedule-cache.ts`)
|
||||||
2. Plugin: Replace CalendarBridgeClient single-agent design with multi-agent
|
2. Add `getDaySchedule()` to `CalendarBridgeClient`
|
||||||
3. Plugin: Replace CalendarScheduler with new sync+check loop
|
3. Refactor `CalendarScheduler`:
|
||||||
4. Plugin: wakeAgent uses dispatchInboundMessage (done)
|
- Replace single interval with sync + check intervals
|
||||||
5. Plugin: Tool handlers get agentId from ctx (like padded-cell)
|
- Use cache instead of heartbeat for slot discovery
|
||||||
|
- Keep heartbeat for agent liveness reporting (reduced frequency)
|
||||||
|
4. Update state persistence for new structure
|
||||||
|
5. Keep existing wakeAgent/completion/abort/pause/resume tools unchanged
|
||||||
|
|
||||||
## Files to Change
|
## Files to Modify
|
||||||
|
|
||||||
### Backend (HarborForge.Backend)
|
| File | Changes |
|
||||||
- New route: `/calendar/sync`
|
|------|---------|
|
||||||
- New service: schedule diff tracking per claw_identifier
|
| `plugin/calendar/schedule-cache.ts` | New file |
|
||||||
|
| `plugin/calendar/calendar-bridge.ts` | Add `getDaySchedule()` |
|
||||||
|
| `plugin/calendar/scheduler.ts` | Refactor heartbeat → sync + check |
|
||||||
|
| `plugin/calendar/index.ts` | Export new types |
|
||||||
|
|
||||||
### Plugin
|
## Risk Assessment
|
||||||
- `plugin/calendar/calendar-bridge.ts` — remove agentId binding, add sync()
|
|
||||||
- `plugin/calendar/scheduler.ts` — rewrite to multi-agent sync+check
|
- **Low risk:** ScheduleCache is additive, doesn't break existing behavior
|
||||||
- `plugin/calendar/schedule-cache.ts` — already exists, adapt to multi-agent
|
- **Medium risk:** Splitting heartbeat changes core scheduling logic
|
||||||
- `plugin/index.ts` — update wakeAgent, getAgentStatus to accept agentId
|
- **Mitigation:** Keep `heartbeat()` method intact, use it for liveness reporting alongside new sync
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ import {
|
|||||||
CalendarSlotResponse,
|
CalendarSlotResponse,
|
||||||
SlotAgentUpdate,
|
SlotAgentUpdate,
|
||||||
SlotStatus,
|
SlotStatus,
|
||||||
} from './types.js';
|
} from './types';
|
||||||
|
|
||||||
export interface CalendarBridgeConfig {
|
export interface CalendarBridgeConfig {
|
||||||
/** HarborForge backend base URL (e.g. "https://monitor.hangman-lab.top") */
|
/** HarborForge backend base URL (e.g. "https://monitor.hangman-lab.top") */
|
||||||
@@ -195,48 +195,6 @@ export class CalendarBridgeClient {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Sync today's schedules for all agents on this claw instance.
|
|
||||||
*
|
|
||||||
* Returns { agentId → slots[] } for all agents with matching claw_identifier.
|
|
||||||
* This is the primary data source for the multi-agent schedule cache.
|
|
||||||
*/
|
|
||||||
async syncSchedules(): Promise<{ schedules: Record<string, any[]>; date: string } | null> {
|
|
||||||
const url = `${this.baseUrl}/calendar/sync`;
|
|
||||||
try {
|
|
||||||
const response = await this.fetchJson<{ schedules: Record<string, any[]>; date: string }>(url, {
|
|
||||||
method: 'GET',
|
|
||||||
headers: {
|
|
||||||
'X-Claw-Identifier': this.config.clawIdentifier,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
return response;
|
|
||||||
} catch {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get a specific agent's status.
|
|
||||||
*
|
|
||||||
* @param agentId The agent ID to query
|
|
||||||
*/
|
|
||||||
async getAgentStatus(agentId: string): Promise<string | null> {
|
|
||||||
const url = `${this.baseUrl}/calendar/agent/status?agent_id=${encodeURIComponent(agentId)}`;
|
|
||||||
try {
|
|
||||||
const response = await this.fetchJson<{ status: string }>(url, {
|
|
||||||
method: 'GET',
|
|
||||||
headers: {
|
|
||||||
'X-Agent-ID': agentId,
|
|
||||||
'X-Claw-Identifier': this.config.clawIdentifier,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
return response?.status ?? null;
|
|
||||||
} catch {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// -------------------------------------------------------------------------
|
// -------------------------------------------------------------------------
|
||||||
// Internal helpers
|
// Internal helpers
|
||||||
// -------------------------------------------------------------------------
|
// -------------------------------------------------------------------------
|
||||||
@@ -292,7 +250,7 @@ export class CalendarBridgeClient {
|
|||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
import { hostname } from 'os';
|
import { hostname } from 'os';
|
||||||
import { getPluginConfig } from '../core/config.js';
|
import { getPluginConfig } from '../core/config';
|
||||||
|
|
||||||
export interface CalendarPluginConfig {
|
export interface CalendarPluginConfig {
|
||||||
/** Backend URL for calendar API (overrides monitor backendUrl) */
|
/** Backend URL for calendar API (overrides monitor backendUrl) */
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
* • AgentWakeContext — context passed to agent when waking
|
* • AgentWakeContext — context passed to agent when waking
|
||||||
*
|
*
|
||||||
* Usage in plugin/index.ts:
|
* Usage in plugin/index.ts:
|
||||||
* import { createCalendarBridgeClient, createCalendarScheduler } from './calendar.js';
|
* import { createCalendarBridgeClient, createCalendarScheduler } from './calendar';
|
||||||
*
|
*
|
||||||
* const agentId = process.env.AGENT_ID || 'unknown';
|
* const agentId = process.env.AGENT_ID || 'unknown';
|
||||||
* const calendar = createCalendarBridgeClient(api, 'https://monitor.hangman-lab.top', agentId);
|
* const calendar = createCalendarBridgeClient(api, 'https://monitor.hangman-lab.top', agentId);
|
||||||
@@ -28,7 +28,7 @@
|
|||||||
* scheduler.start();
|
* scheduler.start();
|
||||||
*/
|
*/
|
||||||
|
|
||||||
export * from './types.js';
|
export * from './types';
|
||||||
export * from './calendar-bridge.js';
|
export * from './calendar-bridge';
|
||||||
export * from './scheduler.js';
|
export * from './scheduler';
|
||||||
export * from './schedule-cache.js';
|
export * from './schedule-cache';
|
||||||
|
|||||||
@@ -1,97 +1,105 @@
|
|||||||
/**
|
/**
|
||||||
* Multi-agent local schedule cache.
|
* Local cache of today's calendar schedule.
|
||||||
*
|
* Synced periodically from HF backend, checked locally for due slots.
|
||||||
* Maintains today's schedule for all agents on this claw instance.
|
|
||||||
* Synced periodically from HF backend via /calendar/sync endpoint.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
export interface CachedSlot {
|
import type { CalendarSlotResponse } from "./types.js";
|
||||||
id: number | null;
|
|
||||||
virtual_id: string | null;
|
|
||||||
slot_type: string;
|
|
||||||
estimated_duration: number;
|
|
||||||
scheduled_at: string;
|
|
||||||
status: string;
|
|
||||||
priority: number;
|
|
||||||
event_type: string | null;
|
|
||||||
event_data: Record<string, unknown> | null;
|
|
||||||
[key: string]: unknown;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class MultiAgentScheduleCache {
|
export class ScheduleCache {
|
||||||
/** { agentId → slots[] } */
|
private slots: Map<string, CalendarSlotResponse> = new Map();
|
||||||
private schedules: Map<string, CachedSlot[]> = new Map();
|
|
||||||
private lastSyncAt: Date | null = null;
|
private lastSyncAt: Date | null = null;
|
||||||
private cachedDate: string | null = null;
|
private cachedDate: string | null = null; // YYYY-MM-DD
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Replace cache with data from /calendar/sync response.
|
* Replace the cache with a fresh schedule from backend.
|
||||||
*/
|
*/
|
||||||
sync(date: string, schedules: Record<string, CachedSlot[]>): void {
|
sync(date: string, slots: CalendarSlotResponse[]): void {
|
||||||
|
// If date changed, clear old data
|
||||||
if (this.cachedDate !== date) {
|
if (this.cachedDate !== date) {
|
||||||
this.schedules.clear();
|
this.slots.clear();
|
||||||
}
|
}
|
||||||
this.cachedDate = date;
|
this.cachedDate = date;
|
||||||
|
|
||||||
for (const [agentId, slots] of Object.entries(schedules)) {
|
// Merge: update existing slots, add new ones
|
||||||
this.schedules.set(agentId, slots);
|
const incomingIds = new Set<string>();
|
||||||
|
for (const slot of slots) {
|
||||||
|
const id = this.getSlotId(slot);
|
||||||
|
incomingIds.add(id);
|
||||||
|
this.slots.set(id, slot);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Remove slots that no longer exist on backend (cancelled etc.)
|
||||||
|
for (const id of this.slots.keys()) {
|
||||||
|
if (!incomingIds.has(id)) {
|
||||||
|
this.slots.delete(id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
this.lastSyncAt = new Date();
|
this.lastSyncAt = new Date();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get agents that have due (overdue or current) slots.
|
* Get slots that are due (scheduled_at <= now) and still pending.
|
||||||
* Returns [agentId, dueSlots[]] pairs.
|
|
||||||
*/
|
*/
|
||||||
getAgentsWithDueSlots(now: Date): Array<{ agentId: string; slots: CachedSlot[] }> {
|
getDueSlots(now: Date): CalendarSlotResponse[] {
|
||||||
const results: Array<{ agentId: string; slots: CachedSlot[] }> = [];
|
const results: CalendarSlotResponse[] = [];
|
||||||
|
for (const slot of this.slots.values()) {
|
||||||
|
if (slot.status !== "not_started" && slot.status !== "deferred") continue;
|
||||||
|
if (!slot.scheduled_at) continue;
|
||||||
|
|
||||||
for (const [agentId, slots] of this.schedules) {
|
const scheduledAt = this.parseScheduledTime(slot.scheduled_at);
|
||||||
const due = slots.filter((s) => {
|
if (scheduledAt && scheduledAt <= now) {
|
||||||
if (s.status !== 'not_started' && s.status !== 'deferred') return false;
|
results.push(slot);
|
||||||
const scheduledAt = this.parseScheduledTime(s.scheduled_at);
|
}
|
||||||
return scheduledAt !== null && scheduledAt <= now;
|
}
|
||||||
});
|
|
||||||
|
|
||||||
if (due.length > 0) {
|
|
||||||
// Sort by priority descending
|
// Sort by priority descending
|
||||||
due.sort((a, b) => (b.priority ?? 0) - (a.priority ?? 0));
|
results.sort((a, b) => (b.priority ?? 0) - (a.priority ?? 0));
|
||||||
results.push({ agentId, slots: due });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return results;
|
return results;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get all agent IDs in the cache.
|
* Update a slot locally (e.g., after status change).
|
||||||
*/
|
*/
|
||||||
getAgentIds(): string[] {
|
updateSlot(slotId: string, update: Partial<CalendarSlotResponse>): void {
|
||||||
return Array.from(this.schedules.keys());
|
const existing = this.slots.get(slotId);
|
||||||
|
if (existing) {
|
||||||
|
this.slots.set(slotId, { ...existing, ...update });
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get slots for a specific agent.
|
* Remove a slot from cache.
|
||||||
*/
|
*/
|
||||||
getAgentSlots(agentId: string): CachedSlot[] {
|
removeSlot(slotId: string): void {
|
||||||
return this.schedules.get(agentId) ?? [];
|
this.slots.delete(slotId);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get cache status for debugging.
|
* Get all cached slots.
|
||||||
*/
|
*/
|
||||||
getStatus(): { agentCount: number; totalSlots: number; lastSyncAt: string | null; cachedDate: string | null } {
|
getAll(): CalendarSlotResponse[] {
|
||||||
let totalSlots = 0;
|
return Array.from(this.slots.values());
|
||||||
for (const slots of this.schedules.values()) totalSlots += slots.length;
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get cache metadata.
|
||||||
|
*/
|
||||||
|
getStatus(): { slotCount: number; lastSyncAt: string | null; cachedDate: string | null } {
|
||||||
return {
|
return {
|
||||||
agentCount: this.schedules.size,
|
slotCount: this.slots.size,
|
||||||
totalSlots,
|
|
||||||
lastSyncAt: this.lastSyncAt?.toISOString() ?? null,
|
lastSyncAt: this.lastSyncAt?.toISOString() ?? null,
|
||||||
cachedDate: this.cachedDate,
|
cachedDate: this.cachedDate,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private getSlotId(slot: CalendarSlotResponse): string {
|
||||||
|
return slot.virtual_id ?? String(slot.id);
|
||||||
|
}
|
||||||
|
|
||||||
private parseScheduledTime(scheduledAt: string): Date | null {
|
private parseScheduledTime(scheduledAt: string): Date | null {
|
||||||
|
// scheduled_at can be "HH:MM:SS" (time only) or full ISO
|
||||||
if (/^\d{2}:\d{2}(:\d{2})?$/.test(scheduledAt)) {
|
if (/^\d{2}:\d{2}(:\d{2})?$/.test(scheduledAt)) {
|
||||||
|
// Time-only: combine with cached date
|
||||||
if (!this.cachedDate) return null;
|
if (!this.cachedDate) return null;
|
||||||
return new Date(`${this.cachedDate}T${scheduledAt}Z`);
|
return new Date(`${this.cachedDate}T${scheduledAt}Z`);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,7 +18,8 @@
|
|||||||
|
|
||||||
import { writeFileSync, readFileSync, existsSync, mkdirSync } from 'fs';
|
import { writeFileSync, readFileSync, existsSync, mkdirSync } from 'fs';
|
||||||
import { join, dirname } from 'path';
|
import { join, dirname } from 'path';
|
||||||
import { CalendarBridgeClient } from './calendar-bridge.js';
|
import { CalendarBridgeClient } from './calendar-bridge';
|
||||||
|
import { ScheduleCache } from './schedule-cache';
|
||||||
import {
|
import {
|
||||||
CalendarSlotResponse,
|
CalendarSlotResponse,
|
||||||
SlotStatus,
|
SlotStatus,
|
||||||
@@ -26,7 +27,7 @@ import {
|
|||||||
SlotAgentUpdate,
|
SlotAgentUpdate,
|
||||||
CalendarEventDataJob,
|
CalendarEventDataJob,
|
||||||
CalendarEventDataSystemEvent,
|
CalendarEventDataSystemEvent,
|
||||||
} from './types.js';
|
} from './types';
|
||||||
|
|
||||||
export interface CalendarSchedulerConfig {
|
export interface CalendarSchedulerConfig {
|
||||||
/** Calendar bridge client for backend communication */
|
/** Calendar bridge client for backend communication */
|
||||||
@@ -44,6 +45,8 @@ export interface CalendarSchedulerConfig {
|
|||||||
};
|
};
|
||||||
/** Heartbeat interval in milliseconds (default: 60000) */
|
/** Heartbeat interval in milliseconds (default: 60000) */
|
||||||
heartbeatIntervalMs?: number;
|
heartbeatIntervalMs?: number;
|
||||||
|
/** Schedule sync interval in milliseconds (default: 300000 = 5 min) */
|
||||||
|
syncIntervalMs?: number;
|
||||||
/** Enable verbose debug logging */
|
/** Enable verbose debug logging */
|
||||||
debug?: boolean;
|
debug?: boolean;
|
||||||
/** Directory for state persistence (default: plugin data dir) */
|
/** Directory for state persistence (default: plugin data dir) */
|
||||||
@@ -95,8 +98,10 @@ interface SchedulerState {
|
|||||||
currentSlot: CalendarSlotResponse | null;
|
currentSlot: CalendarSlotResponse | null;
|
||||||
/** Last heartbeat timestamp */
|
/** Last heartbeat timestamp */
|
||||||
lastHeartbeatAt: Date | null;
|
lastHeartbeatAt: Date | null;
|
||||||
/** Interval handle for cleanup */
|
/** Heartbeat interval handle */
|
||||||
intervalHandle: ReturnType<typeof setInterval> | null;
|
intervalHandle: ReturnType<typeof setInterval> | null;
|
||||||
|
/** Schedule sync interval handle */
|
||||||
|
syncIntervalHandle: ReturnType<typeof setInterval> | null;
|
||||||
/** Set of slot IDs that have been deferred in current session */
|
/** Set of slot IDs that have been deferred in current session */
|
||||||
deferredSlotIds: Set<string>;
|
deferredSlotIds: Set<string>;
|
||||||
/** Whether agent is currently processing a slot */
|
/** Whether agent is currently processing a slot */
|
||||||
@@ -117,10 +122,13 @@ export class CalendarScheduler {
|
|||||||
private config: Required<CalendarSchedulerConfig>;
|
private config: Required<CalendarSchedulerConfig>;
|
||||||
private state: SchedulerState;
|
private state: SchedulerState;
|
||||||
private stateFilePath: string;
|
private stateFilePath: string;
|
||||||
|
/** Local cache of today's full schedule, synced periodically from backend */
|
||||||
|
private scheduleCache: ScheduleCache = new ScheduleCache();
|
||||||
|
|
||||||
constructor(config: CalendarSchedulerConfig) {
|
constructor(config: CalendarSchedulerConfig) {
|
||||||
this.config = {
|
this.config = {
|
||||||
heartbeatIntervalMs: 60000, // 1 minute default
|
heartbeatIntervalMs: 60000, // 1 minute default
|
||||||
|
syncIntervalMs: 300_000, // 5 minutes default
|
||||||
debug: false,
|
debug: false,
|
||||||
stateDir: this.getDefaultStateDir(),
|
stateDir: this.getDefaultStateDir(),
|
||||||
...config,
|
...config,
|
||||||
@@ -133,6 +141,7 @@ export class CalendarScheduler {
|
|||||||
currentSlot: null,
|
currentSlot: null,
|
||||||
lastHeartbeatAt: null,
|
lastHeartbeatAt: null,
|
||||||
intervalHandle: null,
|
intervalHandle: null,
|
||||||
|
syncIntervalHandle: null,
|
||||||
deferredSlotIds: new Set(),
|
deferredSlotIds: new Set(),
|
||||||
isProcessing: false,
|
isProcessing: false,
|
||||||
isRestartPending: false,
|
isRestartPending: false,
|
||||||
@@ -327,14 +336,21 @@ export class CalendarScheduler {
|
|||||||
this.state.isRestartPending = false;
|
this.state.isRestartPending = false;
|
||||||
this.config.logger.info('Calendar scheduler started');
|
this.config.logger.info('Calendar scheduler started');
|
||||||
|
|
||||||
// Run initial heartbeat immediately
|
// Run initial sync + heartbeat immediately
|
||||||
|
this.runSync();
|
||||||
this.runHeartbeat();
|
this.runHeartbeat();
|
||||||
|
|
||||||
// Schedule periodic heartbeats
|
// Schedule periodic heartbeats (slot execution checks)
|
||||||
this.state.intervalHandle = setInterval(
|
this.state.intervalHandle = setInterval(
|
||||||
() => this.runHeartbeat(),
|
() => this.runHeartbeat(),
|
||||||
this.config.heartbeatIntervalMs
|
this.config.heartbeatIntervalMs
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// Schedule periodic schedule sync (full day schedule refresh)
|
||||||
|
this.state.syncIntervalHandle = setInterval(
|
||||||
|
() => this.runSync(),
|
||||||
|
this.config.syncIntervalMs
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -348,10 +364,41 @@ export class CalendarScheduler {
|
|||||||
clearInterval(this.state.intervalHandle);
|
clearInterval(this.state.intervalHandle);
|
||||||
this.state.intervalHandle = null;
|
this.state.intervalHandle = null;
|
||||||
}
|
}
|
||||||
|
if (this.state.syncIntervalHandle) {
|
||||||
|
clearInterval(this.state.syncIntervalHandle);
|
||||||
|
this.state.syncIntervalHandle = null;
|
||||||
|
}
|
||||||
|
|
||||||
this.config.logger.info('Calendar scheduler stopped');
|
this.config.logger.info('Calendar scheduler stopped');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sync today's full schedule from backend into local cache.
|
||||||
|
* Runs every syncIntervalMs (default: 5 min).
|
||||||
|
* Catches new slots assigned by other agents or the manager.
|
||||||
|
*/
|
||||||
|
async runSync(): Promise<void> {
|
||||||
|
if (!this.state.isRunning || this.state.isRestartPending) return;
|
||||||
|
|
||||||
|
const today = new Date().toISOString().slice(0, 10);
|
||||||
|
try {
|
||||||
|
const slots = await this.config.bridge.getDaySchedule(today);
|
||||||
|
if (slots) {
|
||||||
|
this.scheduleCache.sync(today, slots);
|
||||||
|
this.logDebug(`Schedule synced: ${slots.length} slots for ${today}`);
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
this.config.logger.warn(`Schedule sync failed: ${String(err)}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the local schedule cache (for status reporting / tools).
|
||||||
|
*/
|
||||||
|
getScheduleCache(): ScheduleCache {
|
||||||
|
return this.scheduleCache;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Execute a single heartbeat cycle.
|
* Execute a single heartbeat cycle.
|
||||||
* Fetches pending slots and handles execution logic.
|
* Fetches pending slots and handles execution logic.
|
||||||
@@ -611,13 +658,11 @@ Task Code: ${code}
|
|||||||
Estimated Duration: ${duration} minutes
|
Estimated Duration: ${duration} minutes
|
||||||
Slot Type: ${slot.slot_type}
|
Slot Type: ${slot.slot_type}
|
||||||
Priority: ${slot.priority}
|
Priority: ${slot.priority}
|
||||||
|
Working Sessions: ${jobData.working_sessions?.join(', ') || 'none recorded'}
|
||||||
|
|
||||||
Please focus on this task for the allocated time. When you finish or need to pause,
|
Follow the daily-routine skill's task-handson workflow to execute this task.
|
||||||
report your progress back to the calendar system.
|
Use harborforge_calendar_complete when finished, or harborforge_calendar_pause to pause.
|
||||||
|
Before going idle, check for overdue slots as described in the slot-complete workflow.`;
|
||||||
Working sessions: ${jobData.working_sessions?.join(', ') || 'none recorded'}
|
|
||||||
|
|
||||||
Start working on ${code} now.`;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -630,19 +675,15 @@ Start working on ${code} now.`;
|
|||||||
switch (sysData.event) {
|
switch (sysData.event) {
|
||||||
case 'ScheduleToday':
|
case 'ScheduleToday':
|
||||||
return `System Event: Schedule Today
|
return `System Event: Schedule Today
|
||||||
|
|
||||||
Please review today's calendar and schedule any pending tasks or planning activities.
|
|
||||||
Estimated time: ${slot.estimated_duration} minutes.
|
Estimated time: ${slot.estimated_duration} minutes.
|
||||||
|
|
||||||
Check your calendar and plan the day's work.`;
|
Follow the daily-routine skill's plan-schedule workflow to plan today's work.`;
|
||||||
|
|
||||||
case 'SummaryToday':
|
case 'SummaryToday':
|
||||||
return `System Event: Daily Summary
|
return `System Event: Daily Summary
|
||||||
|
|
||||||
Please provide a summary of today's activities and progress.
|
|
||||||
Estimated time: ${slot.estimated_duration} minutes.
|
Estimated time: ${slot.estimated_duration} minutes.
|
||||||
|
|
||||||
Review what was accomplished and prepare end-of-day notes.`;
|
Review today's completed, deferred, and abandoned slots. Write a summary to your daily note (memory/YYYY-MM-DD.md).`;
|
||||||
|
|
||||||
case 'ScheduledGatewayRestart':
|
case 'ScheduledGatewayRestart':
|
||||||
return `System Event: Scheduled Gateway Restart
|
return `System Event: Scheduled Gateway Restart
|
||||||
|
|||||||
@@ -1,3 +1,8 @@
|
|||||||
|
import { execFile } from 'child_process';
|
||||||
|
import { promisify } from 'util';
|
||||||
|
|
||||||
|
const execFileAsync = promisify(execFile);
|
||||||
|
|
||||||
export interface OpenClawAgentInfo {
|
export interface OpenClawAgentInfo {
|
||||||
name: string;
|
name: string;
|
||||||
isDefault?: boolean;
|
isDefault?: boolean;
|
||||||
@@ -9,38 +14,70 @@ export interface OpenClawAgentInfo {
|
|||||||
routing?: string;
|
routing?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function listOpenClawAgents(_logger?: { debug?: (...args: any[]) => void; warn?: (...args: any[]) => void }): Promise<OpenClawAgentInfo[]> {
|
export async function listOpenClawAgents(logger?: { debug?: (...args: any[]) => void; warn?: (...args: any[]) => void }): Promise<OpenClawAgentInfo[]> {
|
||||||
|
try {
|
||||||
|
const { stdout } = await execFileAsync('openclaw', ['agents', 'list'], {
|
||||||
|
timeout: 15000,
|
||||||
|
maxBuffer: 1024 * 1024,
|
||||||
|
});
|
||||||
|
return parseOpenClawAgents(stdout);
|
||||||
|
} catch (err) {
|
||||||
|
logger?.warn?.('Failed to run `openclaw agents list`', err);
|
||||||
return [];
|
return [];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export function parseOpenClawAgents(text: string): OpenClawAgentInfo[] {
|
export function parseOpenClawAgents(text: string): OpenClawAgentInfo[] {
|
||||||
const lines = text.split(/\r?\n/);
|
const lines = text.split(/\r?\n/);
|
||||||
const out: OpenClawAgentInfo[] = [];
|
const out: OpenClawAgentInfo[] = [];
|
||||||
let current: OpenClawAgentInfo | null = null;
|
let current: OpenClawAgentInfo | null = null;
|
||||||
const push = () => { if (current) out.push(current); current = null; };
|
|
||||||
|
const push = () => {
|
||||||
|
if (current) out.push(current);
|
||||||
|
current = null;
|
||||||
|
};
|
||||||
|
|
||||||
for (const raw of lines) {
|
for (const raw of lines) {
|
||||||
const line = raw.trimEnd();
|
const line = raw.trimEnd();
|
||||||
if (!line.trim() || line.startsWith("Agents:") || line.startsWith("Routing rules map") || line.startsWith("Channel status reflects")) continue;
|
if (!line.trim() || line.startsWith('Agents:') || line.startsWith('Routing rules map') || line.startsWith('Channel status reflects')) continue;
|
||||||
if (line.startsWith("- ")) {
|
if (line.startsWith('- ')) {
|
||||||
push();
|
push();
|
||||||
const m = line.match(/^-\s+(.+?)(?:\s+\((default)\))?$/);
|
const m = line.match(/^-\s+(.+?)(?:\s+\((default)\))?$/);
|
||||||
current = { name: m?.[1] || line.slice(2).trim(), isDefault: m?.[2] === "default" };
|
current = {
|
||||||
|
name: m?.[1] || line.slice(2).trim(),
|
||||||
|
isDefault: m?.[2] === 'default',
|
||||||
|
};
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (!current) continue;
|
if (!current) continue;
|
||||||
const trimmed = line.trim();
|
const trimmed = line.trim();
|
||||||
const idx = trimmed.indexOf(":");
|
const idx = trimmed.indexOf(':');
|
||||||
if (idx === -1) continue;
|
if (idx === -1) continue;
|
||||||
const key = trimmed.slice(0, idx).trim();
|
const key = trimmed.slice(0, idx).trim();
|
||||||
const value = trimmed.slice(idx + 1).trim();
|
const value = trimmed.slice(idx + 1).trim();
|
||||||
switch (key) {
|
switch (key) {
|
||||||
case "Identity": current.identity = value; break;
|
case 'Identity':
|
||||||
case "Workspace": current.workspace = value; break;
|
current.identity = value;
|
||||||
case "Agent dir": current.agentDir = value; break;
|
break;
|
||||||
case "Model": current.model = value; break;
|
case 'Workspace':
|
||||||
case "Routing rules": { const n = Number(value); current.routingRules = Number.isFinite(n) ? n : undefined; break; }
|
current.workspace = value;
|
||||||
case "Routing": current.routing = value; break;
|
break;
|
||||||
default: break;
|
case 'Agent dir':
|
||||||
|
current.agentDir = value;
|
||||||
|
break;
|
||||||
|
case 'Model':
|
||||||
|
current.model = value;
|
||||||
|
break;
|
||||||
|
case 'Routing rules': {
|
||||||
|
const n = Number(value);
|
||||||
|
current.routingRules = Number.isFinite(n) ? n : undefined;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case 'Routing':
|
||||||
|
current.routing = value;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
push();
|
push();
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { hostname } from 'os';
|
import { hostname } from 'os';
|
||||||
import { getPluginConfig } from '../core/config.js';
|
import { getPluginConfig } from '../core/config';
|
||||||
import { startManagedMonitor } from '../core/managed-monitor.js';
|
import { startManagedMonitor } from '../core/managed-monitor';
|
||||||
|
|
||||||
export function registerGatewayStartHook(api: any, deps: {
|
export function registerGatewayStartHook(api: any, deps: {
|
||||||
logger: any;
|
logger: any;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { stopManagedMonitor } from '../core/managed-monitor.js';
|
import { stopManagedMonitor } from '../core/managed-monitor';
|
||||||
|
|
||||||
export function registerGatewayStopHook(api: any, deps: {
|
export function registerGatewayStopHook(api: any, deps: {
|
||||||
logger: any;
|
logger: any;
|
||||||
|
|||||||
286
plugin/index.ts
286
plugin/index.ts
@@ -11,20 +11,18 @@
|
|||||||
* served directly by the plugin when Monitor queries via the
|
* served directly by the plugin when Monitor queries via the
|
||||||
* local monitor_port communication path.
|
* local monitor_port communication path.
|
||||||
*/
|
*/
|
||||||
import { hostname, freemem, totalmem, uptime, loadavg, platform } from 'node:os';
|
import { hostname, freemem, totalmem, uptime, loadavg, platform } from 'os';
|
||||||
import { definePluginEntry } from 'openclaw/plugin-sdk/plugin-entry';
|
import { getPluginConfig } from './core/config';
|
||||||
import { MultiAgentScheduleCache } from './calendar/schedule-cache.js';
|
import { MonitorBridgeClient, type OpenClawMeta } from './core/monitor-bridge';
|
||||||
import { getPluginConfig } from './core/config.js';
|
import { listOpenClawAgents } from './core/openclaw-agents';
|
||||||
import { MonitorBridgeClient, type OpenClawMeta } from './core/monitor-bridge.js';
|
import { registerGatewayStartHook } from './hooks/gateway-start';
|
||||||
import type { OpenClawAgentInfo } from './core/openclaw-agents.js';
|
import { registerGatewayStopHook } from './hooks/gateway-stop';
|
||||||
import { registerGatewayStartHook } from './hooks/gateway-start.js';
|
|
||||||
import { registerGatewayStopHook } from './hooks/gateway-stop.js';
|
|
||||||
import {
|
import {
|
||||||
createCalendarBridgeClient,
|
createCalendarBridgeClient,
|
||||||
createCalendarScheduler,
|
createCalendarScheduler,
|
||||||
CalendarScheduler,
|
CalendarScheduler,
|
||||||
AgentWakeContext,
|
AgentWakeContext,
|
||||||
} from './calendar/index.js';
|
} from './calendar';
|
||||||
|
|
||||||
interface PluginAPI {
|
interface PluginAPI {
|
||||||
logger: {
|
logger: {
|
||||||
@@ -34,12 +32,6 @@ interface PluginAPI {
|
|||||||
warn: (...args: any[]) => void;
|
warn: (...args: any[]) => void;
|
||||||
};
|
};
|
||||||
version?: string;
|
version?: string;
|
||||||
runtime?: {
|
|
||||||
version?: string;
|
|
||||||
config?: {
|
|
||||||
loadConfig?: () => any;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
config?: Record<string, unknown>;
|
config?: Record<string, unknown>;
|
||||||
pluginConfig?: Record<string, unknown>;
|
pluginConfig?: Record<string, unknown>;
|
||||||
on: (event: string, handler: () => void) => void;
|
on: (event: string, handler: () => void) => void;
|
||||||
@@ -55,7 +47,10 @@ interface PluginAPI {
|
|||||||
getAgentStatus?: () => Promise<{ status: string } | null>;
|
getAgentStatus?: () => Promise<{ status: string } | null>;
|
||||||
}
|
}
|
||||||
|
|
||||||
function register(api: PluginAPI): void {
|
export default {
|
||||||
|
id: 'harbor-forge',
|
||||||
|
name: 'HarborForge',
|
||||||
|
register(api: PluginAPI) {
|
||||||
const logger = api.logger || {
|
const logger = api.logger || {
|
||||||
info: (...args: any[]) => console.log('[HarborForge]', ...args),
|
info: (...args: any[]) => console.log('[HarborForge]', ...args),
|
||||||
error: (...args: any[]) => console.error('[HarborForge]', ...args),
|
error: (...args: any[]) => console.error('[HarborForge]', ...args),
|
||||||
@@ -67,13 +62,6 @@ function register(api: PluginAPI): void {
|
|||||||
return getPluginConfig(api);
|
return getPluginConfig(api);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Resolve agent ID from env, config, or fallback. */
|
|
||||||
function resolveAgentId(): string {
|
|
||||||
if (process.env.AGENT_ID) return process.env.AGENT_ID;
|
|
||||||
const cfg = api.runtime?.config?.loadConfig?.();
|
|
||||||
return cfg?.agents?.list?.[0]?.id ?? cfg?.agents?.defaults?.id ?? 'unknown';
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the monitor bridge client if monitor_port is configured.
|
* Get the monitor bridge client if monitor_port is configured.
|
||||||
*/
|
*/
|
||||||
@@ -108,7 +96,7 @@ function register(api: PluginAPI): void {
|
|||||||
avg15: load[2],
|
avg15: load[2],
|
||||||
},
|
},
|
||||||
openclaw: {
|
openclaw: {
|
||||||
version: api.runtime?.version || api.version || 'unknown',
|
version: api.version || 'unknown',
|
||||||
pluginVersion: '0.3.1', // Bumped for PLG-CAL-004
|
pluginVersion: '0.3.1', // Bumped for PLG-CAL-004
|
||||||
},
|
},
|
||||||
timestamp: new Date().toISOString(),
|
timestamp: new Date().toISOString(),
|
||||||
@@ -130,21 +118,10 @@ function register(api: PluginAPI): void {
|
|||||||
const bridgeClient = getBridgeClient();
|
const bridgeClient = getBridgeClient();
|
||||||
if (!bridgeClient) return;
|
if (!bridgeClient) return;
|
||||||
|
|
||||||
let agentNames: string[] = [];
|
|
||||||
try {
|
|
||||||
const cfg = api.runtime?.config?.loadConfig?.();
|
|
||||||
const agentsList = cfg?.agents?.list;
|
|
||||||
if (Array.isArray(agentsList)) {
|
|
||||||
agentNames = agentsList
|
|
||||||
.map((a: any) => typeof a === 'string' ? a : a?.name)
|
|
||||||
.filter(Boolean);
|
|
||||||
}
|
|
||||||
} catch { /* non-fatal */ }
|
|
||||||
|
|
||||||
const meta: OpenClawMeta = {
|
const meta: OpenClawMeta = {
|
||||||
version: api.runtime?.version || api.version || 'unknown',
|
version: api.version || 'unknown',
|
||||||
plugin_version: '0.3.1',
|
plugin_version: '0.3.1',
|
||||||
agents: agentNames.map(name => ({ name })),
|
agents: await listOpenClawAgents(logger),
|
||||||
};
|
};
|
||||||
|
|
||||||
const ok = await bridgeClient.pushOpenClawMeta(meta);
|
const ok = await bridgeClient.pushOpenClawMeta(meta);
|
||||||
@@ -174,7 +151,7 @@ function register(api: PluginAPI): void {
|
|||||||
|
|
||||||
// Fallback: query backend for agent status
|
// Fallback: query backend for agent status
|
||||||
const live = resolveConfig();
|
const live = resolveConfig();
|
||||||
const agentId = resolveAgentId();
|
const agentId = process.env.AGENT_ID || 'unknown';
|
||||||
try {
|
try {
|
||||||
const response = await fetch(`${live.backendUrl}/calendar/agent/status?agent_id=${agentId}`, {
|
const response = await fetch(`${live.backendUrl}/calendar/agent/status?agent_id=${agentId}`, {
|
||||||
headers: {
|
headers: {
|
||||||
@@ -194,88 +171,56 @@ function register(api: PluginAPI): void {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Wake agent via dispatchInboundMessage — same mechanism used by Discord plugin.
|
* Wake/spawn agent with task context for slot execution.
|
||||||
* Direct in-process call, no WebSocket or CLI needed.
|
* This is the callback invoked by CalendarScheduler when a slot is ready.
|
||||||
*/
|
*/
|
||||||
async function wakeAgent(
|
async function wakeAgent(context: AgentWakeContext): Promise<boolean> {
|
||||||
agentId: string,
|
logger.info(`Waking agent for slot: ${context.taskDescription}`);
|
||||||
dueSlots?: Array<{
|
|
||||||
id?: number | null;
|
|
||||||
virtual_id?: string | null;
|
|
||||||
event_data?: any;
|
|
||||||
scheduled_at?: string;
|
|
||||||
priority?: number;
|
|
||||||
slot_type?: string;
|
|
||||||
[k: string]: unknown;
|
|
||||||
}>
|
|
||||||
): Promise<boolean> {
|
|
||||||
logger.info(`Waking agent ${agentId}: has due slots`);
|
|
||||||
|
|
||||||
const sessionKey = `agent:${agentId}:hf-wakeup`;
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const sdkPath = 'openclaw/plugin-sdk/reply-runtime';
|
// Method 1: Use OpenClaw spawn API if available (preferred)
|
||||||
const { dispatchInboundMessageWithDispatcher } = await import(
|
if (api.spawn) {
|
||||||
/* webpackIgnore: true */ sdkPath
|
const result = await api.spawn({
|
||||||
);
|
task: context.prompt,
|
||||||
|
timeoutSeconds: context.slot.estimated_duration * 60, // Convert to seconds
|
||||||
// api.config first (current public API). Fall back to deprecated
|
|
||||||
// runtime.config.loadConfig() for older host versions. Both should
|
|
||||||
// contain agents.list / channels for dispatch routing.
|
|
||||||
const cfg = (api as any).config ?? api.runtime?.config?.loadConfig?.();
|
|
||||||
if (!cfg) {
|
|
||||||
logger.error('Cannot load OpenClaw config for dispatch');
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Inline the highest-priority due slot's context so the agent does
|
|
||||||
// not need a second round-trip to harborforge_calendar_status. The
|
|
||||||
// agent can read event_data.task_code / task_title etc. directly.
|
|
||||||
let slotBlock = '';
|
|
||||||
const top = dueSlots && dueSlots.length ? dueSlots[0] : undefined;
|
|
||||||
if (top) {
|
|
||||||
slotBlock = `\n\nMatching slot:\n\`\`\`json\n${JSON.stringify(
|
|
||||||
{
|
|
||||||
slot_id: top.id ?? null,
|
|
||||||
virtual_id: top.virtual_id ?? null,
|
|
||||||
scheduled_at: top.scheduled_at ?? null,
|
|
||||||
priority: top.priority ?? null,
|
|
||||||
slot_type: top.slot_type ?? null,
|
|
||||||
event_data: top.event_data ?? null,
|
|
||||||
},
|
|
||||||
null,
|
|
||||||
2
|
|
||||||
)}\n\`\`\``;
|
|
||||||
}
|
|
||||||
|
|
||||||
const wakeupMessage =
|
|
||||||
`You have due slots. Follow the \`hf-wakeup\` workflow of skill ` +
|
|
||||||
`\`hf-hangman-lab\` to proceed. Only reply \`WAKEUP_OK\` in this ` +
|
|
||||||
`session.${slotBlock}`;
|
|
||||||
|
|
||||||
const result = await dispatchInboundMessageWithDispatcher({
|
|
||||||
ctx: {
|
|
||||||
Body: wakeupMessage,
|
|
||||||
SessionKey: sessionKey,
|
|
||||||
From: 'harborforge-calendar',
|
|
||||||
Provider: 'harborforge',
|
|
||||||
},
|
|
||||||
cfg,
|
|
||||||
dispatcherOptions: {
|
|
||||||
deliver: async (payload: any) => {
|
|
||||||
const text = (payload.text || '').trim();
|
|
||||||
logger.info(`Agent ${agentId} wakeup reply: ${text.slice(0, 100)}`);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
|
|
||||||
logger.info(`Agent ${agentId} dispatched: ${result?.status || 'ok'}`);
|
if (result?.sessionId) {
|
||||||
return true;
|
logger.info(`Agent spawned for calendar slot: session=${result.sessionId}`);
|
||||||
|
|
||||||
} catch (err: any) {
|
// Track session completion
|
||||||
const msg = err?.message || err?.code || String(err);
|
trackSessionCompletion(result.sessionId, context);
|
||||||
const stack = err?.stack?.split('\n').slice(0, 3).join(' | ') || '';
|
return true;
|
||||||
logger.error(`Failed to dispatch agent for slot: ${msg} ${stack}`);
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Method 2: Send notification/alert to wake agent (fallback)
|
||||||
|
// This relies on the agent's heartbeat to check for notifications
|
||||||
|
logger.warn('OpenClaw spawn API not available, using notification fallback');
|
||||||
|
|
||||||
|
// Send calendar wakeup notification via backend
|
||||||
|
const live = resolveConfig();
|
||||||
|
const agentId = process.env.AGENT_ID || 'unknown';
|
||||||
|
|
||||||
|
const notifyResponse = await fetch(`${live.backendUrl}/calendar/agent/notify`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
'X-Agent-ID': agentId,
|
||||||
|
'X-Claw-Identifier': live.identifier || hostname(),
|
||||||
|
},
|
||||||
|
body: JSON.stringify({
|
||||||
|
agent_id: agentId,
|
||||||
|
message: context.prompt,
|
||||||
|
slot_id: context.slot.id || context.slot.virtual_id,
|
||||||
|
task_description: context.taskDescription,
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
|
||||||
|
return notifyResponse.ok;
|
||||||
|
|
||||||
|
} catch (err) {
|
||||||
|
logger.error('Failed to wake agent:', err);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -317,99 +262,27 @@ function register(api: PluginAPI): void {
|
|||||||
*/
|
*/
|
||||||
function startCalendarScheduler(): void {
|
function startCalendarScheduler(): void {
|
||||||
const live = resolveConfig();
|
const live = resolveConfig();
|
||||||
|
const agentId = process.env.AGENT_ID || 'unknown';
|
||||||
|
|
||||||
// Create bridge client (claw-instance level, not per-agent)
|
// Create calendar bridge client
|
||||||
const calendarBridge = createCalendarBridgeClient(
|
const calendarBridge = createCalendarBridgeClient(
|
||||||
api,
|
api,
|
||||||
live.backendUrl || 'https://monitor.hangman-lab.top',
|
live.backendUrl || 'https://monitor.hangman-lab.top',
|
||||||
'unused' // agentId no longer needed at bridge level
|
agentId
|
||||||
);
|
);
|
||||||
|
|
||||||
// Multi-agent sync + check loop
|
// Create and start scheduler
|
||||||
const scheduleCache = new MultiAgentScheduleCache();
|
calendarScheduler = createCalendarScheduler({
|
||||||
|
bridge: calendarBridge,
|
||||||
const SYNC_INTERVAL_MS = 300_000; // 5 min
|
getAgentStatus,
|
||||||
const CHECK_INTERVAL_MS = 30_000; // 30 sec
|
wakeAgent,
|
||||||
|
logger,
|
||||||
// Sync: pull all agent schedules from backend
|
heartbeatIntervalMs: 60000, // 1 minute
|
||||||
async function runSync() {
|
debug: live.logLevel === 'debug',
|
||||||
try {
|
|
||||||
const result = await calendarBridge.syncSchedules();
|
|
||||||
if (result) {
|
|
||||||
scheduleCache.sync(result.date, result.schedules);
|
|
||||||
const status = scheduleCache.getStatus();
|
|
||||||
logger.info(`Schedule synced: ${status.agentCount} agents, ${status.totalSlots} slots`);
|
|
||||||
}
|
|
||||||
} catch (err) {
|
|
||||||
logger.warn(`Schedule sync failed: ${String(err)}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Track wakes already dispatched for a slot in the current sync
|
|
||||||
// window — the simplified inline scheduler does not PATCH slot
|
|
||||||
// status server-side, so without dedupe the check loop re-wakes
|
|
||||||
// the same slot every 30s. Set is cleared by runSync (fresh wake
|
|
||||||
// budget per sync).
|
|
||||||
const wakedSlotKeys = new Set<string>();
|
|
||||||
|
|
||||||
// Check: find agents with due slots and wake them
|
|
||||||
async function runCheck() {
|
|
||||||
const now = new Date();
|
|
||||||
const agentsWithDue = scheduleCache.getAgentsWithDueSlots(now);
|
|
||||||
|
|
||||||
for (const { agentId, slots } of agentsWithDue) {
|
|
||||||
// Filter out slots we've already woken this sync window
|
|
||||||
const fresh = slots.filter((s) => {
|
|
||||||
const key = `${agentId}::${s.id ?? s.virtual_id ?? s.scheduled_at}`;
|
|
||||||
if (wakedSlotKeys.has(key)) return false;
|
|
||||||
return true;
|
|
||||||
});
|
});
|
||||||
if (fresh.length === 0) continue;
|
|
||||||
|
|
||||||
// Check if agent is busy (best effort; backend may 405 the GET
|
calendarScheduler.start();
|
||||||
// — treat unknown as not-busy so wakeup still fires)
|
logger.info('Calendar scheduler started');
|
||||||
let status: string | null = null;
|
|
||||||
try {
|
|
||||||
status = await calendarBridge.getAgentStatus(agentId);
|
|
||||||
} catch {
|
|
||||||
status = null;
|
|
||||||
}
|
|
||||||
if (status === 'busy' || status === 'offline' || status === 'exhausted') {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Wake the agent with the slot context inlined
|
|
||||||
const ok = await wakeAgent(agentId, fresh);
|
|
||||||
if (ok) {
|
|
||||||
for (const s of fresh) {
|
|
||||||
const key = `${agentId}::${s.id ?? s.virtual_id ?? s.scheduled_at}`;
|
|
||||||
wakedSlotKeys.add(key);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Initial sync (also resets the wake-dedupe window)
|
|
||||||
const runSyncReset = async () => {
|
|
||||||
wakedSlotKeys.clear();
|
|
||||||
await runSync();
|
|
||||||
};
|
|
||||||
runSyncReset();
|
|
||||||
|
|
||||||
// Start intervals
|
|
||||||
const syncHandle = setInterval(runSyncReset, SYNC_INTERVAL_MS);
|
|
||||||
const checkHandle = setInterval(runCheck, CHECK_INTERVAL_MS);
|
|
||||||
|
|
||||||
// Store handles for cleanup (reuse calendarScheduler variable)
|
|
||||||
(calendarScheduler as any) = {
|
|
||||||
stop() {
|
|
||||||
clearInterval(syncHandle);
|
|
||||||
clearInterval(checkHandle);
|
|
||||||
logger.info('Calendar scheduler stopped');
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
logger.info('Calendar scheduler started (multi-agent sync mode)');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -661,16 +534,5 @@ function register(api: PluginAPI): void {
|
|||||||
}));
|
}));
|
||||||
|
|
||||||
logger.info('HarborForge plugin registered (id: harbor-forge)');
|
logger.info('HarborForge plugin registered (id: harbor-forge)');
|
||||||
}
|
},
|
||||||
|
};
|
||||||
// HarborForge's local PluginAPI is broader than the standard OpenClawPluginApi
|
|
||||||
// (it surfaces optional `version`/`runtime`/`spawn` accessors that older
|
|
||||||
// OpenClaw builds exposed). The cast at the definePluginEntry boundary
|
|
||||||
// acknowledges that gap — the runtime api object is whatever the gateway
|
|
||||||
// passes us, and each access is guarded with optional chaining / fallbacks.
|
|
||||||
export default definePluginEntry({
|
|
||||||
id: 'harbor-forge',
|
|
||||||
name: 'HarborForge',
|
|
||||||
description: 'HarborForge plugin for OpenClaw - project management, monitoring, and CLI integration',
|
|
||||||
register: register as (api: any) => void,
|
|
||||||
});
|
|
||||||
|
|||||||
25
plugin/openclaw-sdk.d.ts
vendored
25
plugin/openclaw-sdk.d.ts
vendored
@@ -1,25 +0,0 @@
|
|||||||
// Ambient declarations for the focused subpaths of the openclaw plugin SDK
|
|
||||||
// that this plugin needs at compile time.
|
|
||||||
//
|
|
||||||
// We intentionally do NOT take a `dependencies` (or `devDependencies`) entry
|
|
||||||
// on the openclaw npm package itself: openclaw is provided by the host
|
|
||||||
// gateway at runtime, and listing it as a file:/.../openclaw devDep breaks
|
|
||||||
// the installer's `npm install --omit=dev` step because npm/arborist trips
|
|
||||||
// over openclaw's own (deeply nested) dependency graph.
|
|
||||||
//
|
|
||||||
// These declarations cover only what we use here. They are deliberately
|
|
||||||
// permissive — the runtime contract is whatever the gateway hands us, and
|
|
||||||
// we guard each api access with optional chaining or a fallback at call site.
|
|
||||||
|
|
||||||
declare module 'openclaw/plugin-sdk/plugin-entry' {
|
|
||||||
export function definePluginEntry<T extends {
|
|
||||||
id: string;
|
|
||||||
name: string;
|
|
||||||
description?: string;
|
|
||||||
register: (api: any) => void | Promise<void>;
|
|
||||||
}>(opts: T): T;
|
|
||||||
}
|
|
||||||
|
|
||||||
declare module 'openclaw/plugin-sdk/core' {
|
|
||||||
export type OpenClawPluginApi = unknown;
|
|
||||||
}
|
|
||||||
@@ -1,23 +1,9 @@
|
|||||||
{
|
{
|
||||||
"id": "harbor-forge",
|
"id": "harbor-forge",
|
||||||
"name": "HarborForge",
|
"name": "HarborForge",
|
||||||
|
"version": "0.2.0",
|
||||||
"description": "HarborForge plugin for OpenClaw - project management, monitoring, and CLI integration",
|
"description": "HarborForge plugin for OpenClaw - project management, monitoring, and CLI integration",
|
||||||
"activation": {
|
"entry": "./dist/index.js",
|
||||||
"onStartup": true
|
|
||||||
},
|
|
||||||
"contracts": {
|
|
||||||
"tools": [
|
|
||||||
"harborforge_status",
|
|
||||||
"harborforge_telemetry",
|
|
||||||
"harborforge_monitor_telemetry",
|
|
||||||
"harborforge_calendar_status",
|
|
||||||
"harborforge_calendar_complete",
|
|
||||||
"harborforge_calendar_abort",
|
|
||||||
"harborforge_calendar_pause",
|
|
||||||
"harborforge_calendar_resume",
|
|
||||||
"harborforge_restart_status"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"configSchema": {
|
"configSchema": {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"additionalProperties": false,
|
"additionalProperties": false,
|
||||||
|
|||||||
8
plugin/package-lock.json
generated
8
plugin/package-lock.json
generated
@@ -9,14 +9,14 @@
|
|||||||
"version": "0.2.0",
|
"version": "0.2.0",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/node": "^20.19.41",
|
"@types/node": "^20.0.0",
|
||||||
"typescript": "^5.0.0"
|
"typescript": "^5.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@types/node": {
|
"node_modules/@types/node": {
|
||||||
"version": "20.19.41",
|
"version": "20.19.37",
|
||||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.41.tgz",
|
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.37.tgz",
|
||||||
"integrity": "sha512-ECymXOukMnOoVkC2bb1Vc/w/836DXncOg5m8Xj1RH7xSHZJWNYY6Zh7EH477vcnD5egKNNfy2RpNOmuChhFPgQ==",
|
"integrity": "sha512-8kzdPJ3FsNsVIurqBs7oodNnCEVbni9yUEkaHbgptDACOPW04jimGagZ51E6+lXUwJjgnBw+hyko/lkFWCldqw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
"name": "harbor-forge-plugin",
|
"name": "harbor-forge-plugin",
|
||||||
"version": "0.2.0",
|
"version": "0.2.0",
|
||||||
"description": "OpenClaw plugin for HarborForge monitor bridge and CLI integration",
|
"description": "OpenClaw plugin for HarborForge monitor bridge and CLI integration",
|
||||||
"type": "module",
|
|
||||||
"main": "dist/index.js",
|
"main": "dist/index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "rm -rf dist",
|
"clean": "rm -rf dist",
|
||||||
@@ -10,7 +9,7 @@
|
|||||||
"watch": "tsc --watch"
|
"watch": "tsc --watch"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/node": "^20.19.41",
|
"@types/node": "^20.0.0",
|
||||||
"typescript": "^5.0.0"
|
"typescript": "^5.0.0"
|
||||||
},
|
},
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
{
|
{
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"target": "ES2022",
|
"target": "ES2022",
|
||||||
"module": "nodenext",
|
"module": "CommonJS",
|
||||||
"moduleResolution": "nodenext",
|
"moduleResolution": "node",
|
||||||
"esModuleInterop": true,
|
"esModuleInterop": true,
|
||||||
"strict": true,
|
"strict": true,
|
||||||
"skipLibCheck": true,
|
"skipLibCheck": true,
|
||||||
|
|||||||
Reference in New Issue
Block a user