- apps/cli/ is now the canonical CLI (was apps/cli-v2/). - apps/cli/ legacy v0 archived as branch 'legacy-cli-archive' and tag 'cli-v0-legacy-final' before deletion; git history preserves it too. - .github/workflows/release-cli.yml paths updated. - pnpm-lock.yaml regenerated. Broker-side peer-grant enforcement (spec: 2026-04-15-per-peer-capabilities): - 0020_peer-grants.sql adds peer_grants jsonb + GIN index on mesh.member. - handleSend in broker fetches recipient grant maps once per send, drops messages silently when sender lacks the required capability. - POST /cli/mesh/:slug/grants to update from CLI; broker_messages_dropped_by_grant_total metric. - CLI grant/revoke/block now mirror to broker via syncToBroker. Auto-migrate on broker startup: - apps/broker/src/migrate.ts runs drizzle migrate with pg_advisory_lock before the HTTP server binds. Exits non-zero on failure so Coolify healthcheck fails closed. - Dockerfile copies packages/db/migrations into /app/migrations. - postgres 3.4.5 added as direct broker dep. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
143 lines
5.3 KiB
TypeScript
143 lines
5.3 KiB
TypeScript
/**
|
|
* `claudemesh remind <message> --in <duration> | --at <time>`
|
|
* `claudemesh remind list`
|
|
* `claudemesh remind cancel <id>`
|
|
*
|
|
* Human-facing interface to the broker's scheduled message delivery.
|
|
*/
|
|
|
|
import { withMesh } from "./connect.js";
|
|
|
|
export interface RemindFlags {
|
|
mesh?: string;
|
|
in?: string; // e.g. "2h", "30m", "90s"
|
|
at?: string; // ISO or HH:MM
|
|
cron?: string; // 5-field cron expression for recurring
|
|
to?: string; // default: self
|
|
json?: boolean;
|
|
}
|
|
|
|
function parseDuration(raw: string): number | null {
|
|
const m = raw.trim().match(/^(\d+(?:\.\d+)?)\s*(s|sec|m|min|h|hr|d|day)?$/i);
|
|
if (!m) return null;
|
|
const n = parseFloat(m[1]!);
|
|
const unit = (m[2] ?? "s").toLowerCase();
|
|
if (unit.startsWith("d")) return n * 86_400_000;
|
|
if (unit.startsWith("h")) return n * 3_600_000;
|
|
if (unit.startsWith("m")) return n * 60_000;
|
|
return n * 1_000;
|
|
}
|
|
|
|
function parseDeliverAt(flags: RemindFlags): number | null {
|
|
if (flags.in) {
|
|
const ms = parseDuration(flags.in);
|
|
if (ms === null) return null;
|
|
return Date.now() + ms;
|
|
}
|
|
if (flags.at) {
|
|
// Try HH:MM first
|
|
const hm = flags.at.match(/^(\d{1,2}):(\d{2})$/);
|
|
if (hm) {
|
|
const now = new Date();
|
|
const target = new Date(now);
|
|
target.setHours(parseInt(hm[1]!, 10), parseInt(hm[2]!, 10), 0, 0);
|
|
if (target <= now) target.setDate(target.getDate() + 1); // next occurrence
|
|
return target.getTime();
|
|
}
|
|
const ts = Date.parse(flags.at);
|
|
return isNaN(ts) ? null : ts;
|
|
}
|
|
return null;
|
|
}
|
|
|
|
export async function runRemind(
|
|
flags: RemindFlags,
|
|
positional: string[],
|
|
): Promise<void> {
|
|
const useColor = !process.env.NO_COLOR && process.env.TERM !== "dumb" && process.stdout.isTTY;
|
|
const dim = (s: string) => (useColor ? `\x1b[2m${s}\x1b[22m` : s);
|
|
const bold = (s: string) => (useColor ? `\x1b[1m${s}\x1b[22m` : s);
|
|
|
|
const action = positional[0];
|
|
|
|
// claudemesh remind list
|
|
if (action === "list") {
|
|
await withMesh({ meshSlug: flags.mesh ?? null }, async (client) => {
|
|
const scheduled = await client.listScheduled();
|
|
if (flags.json) { console.log(JSON.stringify(scheduled, null, 2)); return; }
|
|
if (scheduled.length === 0) { console.log(dim("No pending reminders.")); return; }
|
|
for (const m of scheduled) {
|
|
const when = new Date(m.deliverAt).toLocaleString();
|
|
const to = m.to === client.getSessionPubkey() ? dim("(self)") : m.to;
|
|
console.log(` ${bold(m.id.slice(0, 8))} → ${to} at ${when}`);
|
|
console.log(` ${dim(m.message.slice(0, 80))}`);
|
|
console.log("");
|
|
}
|
|
});
|
|
return;
|
|
}
|
|
|
|
// claudemesh remind cancel <id>
|
|
if (action === "cancel") {
|
|
const id = positional[1];
|
|
if (!id) { console.error("Usage: claudemesh remind cancel <id>"); process.exit(1); }
|
|
await withMesh({ meshSlug: flags.mesh ?? null }, async (client) => {
|
|
const ok = await client.cancelScheduled(id);
|
|
if (ok) console.log(`✓ Cancelled ${id}`);
|
|
else { console.error(`✗ Not found or already fired: ${id}`); process.exit(1); }
|
|
});
|
|
return;
|
|
}
|
|
|
|
// claudemesh remind <message> --in <duration> | --at <time> | --cron <expr>
|
|
const message = action ?? positional.join(" ");
|
|
if (!message) {
|
|
console.error("Usage: claudemesh remind <message> --in <duration>");
|
|
console.error(" claudemesh remind <message> --at <time>");
|
|
console.error(' claudemesh remind <message> --cron "0 */2 * * *"');
|
|
console.error(" claudemesh remind list");
|
|
console.error(" claudemesh remind cancel <id>");
|
|
process.exit(1);
|
|
}
|
|
|
|
const isCron = !!flags.cron;
|
|
const deliverAt = isCron ? 0 : parseDeliverAt(flags);
|
|
if (!isCron && deliverAt === null) {
|
|
console.error('Specify when: --in <duration> (e.g. "2h", "30m"), --at <time> (e.g. "15:00"), or --cron <expression>');
|
|
process.exit(1);
|
|
}
|
|
|
|
await withMesh({ meshSlug: flags.mesh ?? null }, async (client) => {
|
|
// Determine target: --to flag or self
|
|
let targetSpec: string;
|
|
if (flags.to && flags.to !== "self") {
|
|
if (flags.to.startsWith("@") || flags.to === "*" || /^[0-9a-f]{64}$/i.test(flags.to)) {
|
|
targetSpec = flags.to;
|
|
} else {
|
|
const peers = await client.listPeers();
|
|
const match = peers.find((p) => p.displayName.toLowerCase() === flags.to!.toLowerCase());
|
|
if (!match) {
|
|
console.error(`Peer "${flags.to}" not found. Online: ${peers.map((p) => p.displayName).join(", ") || "(none)"}`);
|
|
process.exit(1);
|
|
}
|
|
targetSpec = match.pubkey;
|
|
}
|
|
} else {
|
|
targetSpec = client.getSessionPubkey() ?? "*";
|
|
}
|
|
|
|
const result = await client.scheduleMessage(targetSpec, message, deliverAt ?? 0, false, flags.cron);
|
|
if (!result) { console.error("✗ Broker did not acknowledge — check connection"); process.exit(1); }
|
|
|
|
if (flags.json) { console.log(JSON.stringify(result)); return; }
|
|
const toLabel = !flags.to || flags.to === "self" ? "yourself" : flags.to;
|
|
if (isCron) {
|
|
const nextFire = new Date(result.deliverAt).toLocaleString();
|
|
console.log(`✓ Recurring reminder set (${result.scheduledId.slice(0, 8)}): "${message}" → ${toLabel} — cron: ${flags.cron}, next fire: ${nextFire}`);
|
|
} else {
|
|
const when = new Date(result.deliverAt).toLocaleString();
|
|
console.log(`✓ Reminder set (${result.scheduledId.slice(0, 8)}): "${message}" → ${toLabel} at ${when}`);
|
|
}
|
|
});
|
|
}
|