@openparachute/agent 0.2.3-rc.7 → 0.2.3-rc.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openparachute/agent",
-  "version": "0.2.3-rc.7",
+  "version": "0.2.3-rc.8",
   "description": "Vault-native agents for Claude Code — a #agent/definition note + an inbound message becomes a sandboxed claude turn; the reply is written back as a note. Messaging gateway on :1941.",
   "license": "AGPL-3.0",
   "type": "module",

package/src/daemon.ts

@@ -66,6 +66,7 @@ import {
   DEFAULT_HUB_ORIGIN,
 } from "./def-vaults.ts";
 import { mintScopedToken, vaultScope } from "./mint-token.ts";
+import { registerAllDefVaultTriggers } from "./def-vault-triggers.ts";
 import { GrantsClient } from "./grants.ts";
 import { resolveEffectiveEnv } from "./effective-env.ts";
 import { VaultJobStore, validateJob, vaultTransportFor, type Job } from "./jobs.ts";
@@ -3531,6 +3532,29 @@ function main(): void {
     const bindings = await resolveDefVaults({ hubOrigin: getHubOrigin(), managerBearer });
     for (const b of bindings) agentDefs.addVault(b);
     if (bindings.length === 0) return; // nothing bound — vault-native path idle.
+
+    // AUTO-REGISTER the per-def-vault runtime triggers (agent#157) so "define an
+    // agent → it runs" needs NO manual trigger setup + NO restart-to-pick-up:
+    //   - the def-watch create/edit triggers, BARE-keyed (`agent/definition`) so a
+    //     created/edited def auto-fires the rescan — upsert-by-name REPLACES any
+    //     stale `#agent/definition`-keyed `conn_agentdefs-*` row the hub provisioned;
+    //   - the inbound trigger (`agent/message/inbound` + has_metadata:[agent]) so a
+    //     new inbound note wakes the agent without a hand-registered trigger.
+    // Mints the admin (triggers API) + agent:send (webhook bearer) tokens the same
+    // way the hub's Connections engine does (attenuated to the operator bearer).
+    // Best-effort: a mint refusal / unreachable vault is logged, never fatal — the
+    // 60s loadAll poll below stays the correctness floor. Skipped with no operator
+    // bearer (can't mint) — the vault-native path still runs own-vault.
+    if (managerBearer) {
+      await registerAllDefVaultTriggers(bindings, { hubOrigin: getHubOrigin(), managerBearer }).catch(
+        (err) => {
+          console.warn(
+            `parachute-agent: def-vault trigger auto-registration failed (continuing): ${(err as Error).message}`,
+          );
+        },
+      );
+    }
+
     const n = await agentDefs.loadAll();
     console.log(
       `parachute-agent: vault-native agent defs — ${n} instantiated from ${bindings.length} def-vault(s).`,

package/src/def-vault-triggers.ts

@@ -0,0 +1,317 @@
+/**
+ * Auto-register the per-def-vault runtime triggers the daemon needs so that
+ * "just define an agent in the vault and it works" — no manual trigger setup, no
+ * `parachute restart agent` to pick up a new/edited def (agent#157).
+ *
+ * Two wiring gaps this closes:
+ *
+ *  1. **Def-watch triggers were stale `#`-keyed.** A def-vault carried
+ *     `conn_agentdefs-create-<vault>` / `conn_agentdefs-edit-<vault>` triggers
+ *     keyed on the PRE-canonicalization tag `#agent/definition`. Since defs are
+ *     now bare `agent/definition`, those triggers never fired → creating/editing
+ *     a def did NOT auto-rescan; only the 60s `loadAll` poll converged it. We
+ *     re-register them BARE-keyed on (re)start, upsert-by-name, so the stale
+ *     `#`-keyed rows are REPLACED in place (the runtime triggers API is an upsert
+ *     by `name`, and we reuse the hub's `conn_agentdefs-{create,edit}-<vault>`
+ *     names so our POST overwrites the hub-provisioned ones).
+ *
+ *  2. **The inbound trigger was never auto-registered.** Defining a def + the
+ *     daemon discovering it (the channel appears) is NOT enough — nothing wakes
+ *     the agent until an `agent_inbound` trigger fires the inbound webhook. The
+ *     hub provisioned it only via the operator's explicit "Connect" click (or the
+ *     hub Connections builder); a fresh box needed it registered BY HAND. We now
+ *     register ONE inbound trigger per def-vault on (re)start (one trigger routes
+ *     ALL agents in the vault by `metadata.agent`).
+ *
+ * ## How this mirrors the hub's provisioning path
+ *
+ * The hub's Connections engine (`parachute-hub/src/admin-connections.ts`) already
+ * registers these triggers by:
+ *   - minting a `vault:<v>:admin` token (the triggers API is ADMIN-scoped — a
+ *     webhook trigger exfiltrates note data, so even listing is admin, not write),
+ *   - minting an `agent:send` webhook bearer for `action.auth.bearer`,
+ *   - POSTing `{ name, events, when, action }` to
+ *     `<vaultUrl>/vault/<v>/api/triggers` (upsert by name),
+ *   - naming the def-watch triggers `conn_agentdefs-{create,edit}-<vault>`.
+ *
+ * We do the SAME thing, daemon-side, on boot — reusing the daemon's own
+ * `mintScopedToken` (attenuated to the operator bearer) for BOTH mints. This is
+ * the credential the hub uses too; the daemon already holds the operator bearer
+ * (it mints the def-vault `vault:<v>:write` token the same way), so the admin mint
+ * succeeds exactly when the operator's authority covers it.
+ *
+ * ## Scope caveat (admin mint)
+ *
+ * The triggers API requires `vault:<v>:admin`. The def-vault token the daemon
+ * persists in `agent-vaults.json` is only `vault:<v>:write`, so we CANNOT register
+ * triggers with that token — we MINT a short-lived `vault:<v>:admin` token against
+ * the operator bearer instead. If the operator bearer's own authority doesn't cover
+ * `vault:<v>:admin`, the hub returns `invalid_scope` on the mint (the same bound the
+ * hub's own provisioning hits) — we log + skip, never crash boot. The 60s `loadAll`
+ * poll remains the correctness floor either way.
+ *
+ * ## Webhook URL
+ *
+ * The webhook points at `<hub-origin>/agent/api/vault/{inbound,agent-def}` — the
+ * hub origin + the agent module's `/agent` proxy mount + the action endpoint
+ * (mirrors the hub's `buildWebhook` and the `AGENT_*_VAULT_TRIGGER_TEMPLATE`
+ * placeholders). The hub reverse-proxies `/agent/*` to the loopback daemon, so
+ * this works co-located AND exposed; and the daemon validates the webhook bearer's
+ * `iss` against the hub origin anyway, so the hub origin is the right base.
+ *
+ * Best-effort throughout: every failure is caught + logged, never thrown — a
+ * def-vault with no admin authority (or an unreachable vault) must never block the
+ * daemon from serving, and the poll fallback covers reactivity.
+ */
+
+import type { DefVaultBinding } from "./agent-defs.ts";
+import { mintScopedToken, vaultScope, MintError } from "./mint-token.ts";
+import { DEFAULT_DEF_VAULT_URL } from "./def-vaults.ts";
+import { AGENT_VAULT_TRIGGER_TEMPLATE } from "./transports/vault.ts";
+
+/** The bare def-discriminator tag the def-watch triggers filter on (post-canonicalization). */
+export const DEFINITION_TAG = "agent/definition";
+/**
+ * The inbound trigger's `when` predicate. SOURCED from the existing
+ * {@link AGENT_VAULT_TRIGGER_TEMPLATE} (`src/transports/vault.ts`) — the
+ * module-owned shape the hub already substitutes — so the daemon's
+ * auto-registration produces a SEMANTICALLY IDENTICAL trigger to the
+ * hub-Connections path (bare `agent/message/inbound` tag, `has_metadata:[agent]`,
+ * `missing_metadata:[channel_inbound_rendered_at]`). Reusing the one source of
+ * truth keeps the two registration paths from drifting on the field names.
+ *
+ * (The real loop guard is the vault engine's own `<triggerName>_rendered_at`
+ * marker, checked unconditionally regardless of `missing_metadata`. The
+ * `missing_metadata` clause is the module-owned belt — kept identical so both
+ * paths upsert cleanly over the same trigger.)
+ */
+const INBOUND_WHEN = AGENT_VAULT_TRIGGER_TEMPLATE.when;
+/** The bare inbound-message child tag the inbound trigger fires on (from the template). */
+export const INBOUND_TAG = INBOUND_WHEN.tags[0];
+
+/** The `agent:send` scope minted for every webhook `action.auth.bearer`. */
+const WEBHOOK_SCOPE = "agent:send";
+/** Short TTL for the throwaway `vault:<v>:admin` registration token. */
+const ADMIN_MINT_TTL_SECONDS = 60;
+
+/**
+ * The shape POSTed to `<vaultUrl>/vault/<v>/api/triggers`. The vault validates
+ * `events` ⊆ {created, updated} (NO `deleted` — so the def-watch is two triggers,
+ * create + edit, not one create/updated/deleted trigger).
+ */
+export interface VaultTriggerInput {
+  name: string;
+  events: Array<"created" | "updated">;
+  when: {
+    tags: string[];
+    has_metadata?: string[];
+    missing_metadata?: string[];
+  };
+  action: {
+    webhook: string;
+    send: "json";
+    auth?: { bearer: string };
+  };
+}
+
+/**
+ * The stable def-watch trigger name for a (vault, kind). MUST match the hub's
+ * `conn_${defReloadId(vault, kind)}` (web/ui/src/lib/hub.ts → `agentdefs-<kind>-<vault>`,
+ * hub admin-connections → `conn_<id>`) so our upsert REPLACES any stale `#`-keyed
+ * trigger the hub provisioned, rather than orphaning it alongside a new one.
+ */
+export function defWatchTriggerName(vault: string, kind: "create" | "edit"): string {
+  return `conn_agentdefs-${kind}-${vault}`;
+}
+
+/**
+ * The inbound trigger name for a vault. ONE per def-vault — it routes ALL agents
+ * by `metadata.agent`, so it isn't per-agent. Stable so the POST upserts in place.
+ */
+export function inboundTriggerName(vault: string): string {
+  return `conn_agentinbound-${vault}`;
+}
+
+/** Build the webhook URL `<hub-origin>/agent/api/vault/<endpoint>`. */
+function buildWebhook(hubOrigin: string, endpoint: string): string {
+  const origin = hubOrigin.replace(/\/+$/, "");
+  const ep = endpoint.startsWith("/") ? endpoint : `/${endpoint}`;
+  return `${origin}/agent${ep}`;
+}
+
+/**
+ * The three triggers a def-vault needs, bare-keyed, with the webhook bearer filled.
+ * Exported for tests (asserts the bare tag + the trigger shapes without the live mints).
+ */
+export function buildDefVaultTriggers(
+  vault: string,
+  hubOrigin: string,
+  webhookBearer: string,
+): VaultTriggerInput[] {
+  const defWebhook = buildWebhook(hubOrigin, "/api/vault/agent-def");
+  const inboundWebhook = buildWebhook(hubOrigin, "/api/vault/inbound");
+  const auth = { bearer: webhookBearer };
+  return [
+    // Def-watch CREATE — a new bare `agent/definition` note instantiates its agent live.
+    {
+      name: defWatchTriggerName(vault, "create"),
+      events: ["created"],
+      when: { tags: [DEFINITION_TAG] },
+      action: { webhook: defWebhook, send: "json", auth },
+    },
+    // Def-watch EDIT — an edited bare `agent/definition` note re-instantiates its agent.
+    {
+      name: defWatchTriggerName(vault, "edit"),
+      events: ["updated"],
+      when: { tags: [DEFINITION_TAG] },
+      action: { webhook: defWebhook, send: "json", auth },
+    },
+    // INBOUND — a new bare `agent/message/inbound` note (routed by metadata.agent,
+    // not yet rendered) wakes the agent. One trigger routes every agent in the vault.
+    // `when` is the module-owned shape from AGENT_VAULT_TRIGGER_TEMPLATE (copied so
+    // the predicate matches the hub-Connections path exactly).
+    {
+      name: inboundTriggerName(vault),
+      events: ["created"],
+      when: {
+        tags: [...INBOUND_WHEN.tags],
+        has_metadata: [...INBOUND_WHEN.has_metadata],
+        missing_metadata: [...INBOUND_WHEN.missing_metadata],
+      },
+      action: { webhook: inboundWebhook, send: "json", auth },
+    },
+  ];
+}
+
+/** Dependencies for {@link registerDefVaultTriggers} (injected for tests). */
+export interface RegisterTriggersDeps {
+  /** Hub public origin (the webhook base + the mint endpoint + the JWT `iss`). */
+  hubOrigin: string;
+  /** The operator bearer the per-resource mints attenuate against. */
+  managerBearer: string;
+  /** Inject fetch for tests. Defaults to global fetch. */
+  fetchFn?: typeof fetch;
+}
+
+/** The outcome of registering one def-vault's triggers (for logging/tests). */
+export interface RegisterTriggersResult {
+  vault: string;
+  /** Trigger names that registered (HTTP 200). */
+  registered: string[];
+  /** `name: reason` for each failure (mint refusal, vault non-2xx, fetch error). */
+  failures: string[];
+}
+
+/**
+ * Register (idempotent upsert) the def-watch + inbound triggers for ONE def-vault.
+ * Mints a `vault:<v>:admin` token for the triggers API and an `agent:send` token
+ * for the webhook bearer, then POSTs each trigger. Best-effort: never throws — a
+ * mint refusal (insufficient operator authority) or an unreachable vault is logged
+ * and returned in `failures`. The poll fallback is the correctness floor.
+ */
+export async function registerDefVaultTriggers(
+  binding: DefVaultBinding,
+  deps: RegisterTriggersDeps,
+): Promise<RegisterTriggersResult> {
+  const vault = binding.vault;
+  const vaultUrl = (binding.vaultUrl ?? DEFAULT_DEF_VAULT_URL).replace(/\/+$/, "");
+  const fetchFn = deps.fetchFn ?? fetch;
+  const result: RegisterTriggersResult = { vault, registered: [], failures: [] };
+
+  const mintDeps = {
+    hubOrigin: deps.hubOrigin,
+    managerBearer: deps.managerBearer,
+    ...(deps.fetchFn ? { fetchFn: deps.fetchFn } : {}),
+  };
+
+  // 1. Mint the ADMIN token for the triggers API FIRST (the def-vault write token
+  //    can't register triggers — admin-scoped endpoint). This is the mint most
+  //    likely to be refused (a `vault:<v>:write`-only operator can't mint admin), so
+  //    minting it first short-circuits a restricted install before the second mint.
+  //    On `invalid_scope` the hub refuses here — log + skip, never crash boot.
+  let adminToken: string;
+  try {
+    const minted = await mintScopedToken(
+      { scope: vaultScope(vault, "admin"), expiresIn: ADMIN_MINT_TTL_SECONDS },
+      mintDeps,
+    );
+    adminToken = minted.token;
+  } catch (err) {
+    const detail = err instanceof MintError ? err.message : (err as Error).message;
+    result.failures.push(`mint ${vaultScope(vault, "admin")}: ${detail}`);
+    return result; // No admin token → can't POST triggers.
+  }
+
+  // 2. Mint the webhook bearer (agent:send) — the trigger fires this at the daemon.
+  //    Long-lived (the hub's default ~90d, matching the hub's own provisioning) since
+  //    it lives in the trigger's persistent `action.auth.bearer`; re-minted on each
+  //    restart's re-registration. A refusal here also skips (no bearer → no trigger).
+  let webhookBearer: string;
+  try {
+    const minted = await mintScopedToken({ scope: WEBHOOK_SCOPE }, mintDeps);
+    webhookBearer = minted.token;
+  } catch (err) {
+    const detail = err instanceof MintError ? err.message : (err as Error).message;
+    result.failures.push(`mint ${WEBHOOK_SCOPE}: ${detail}`);
+    return result; // No bearer → no trigger can be registered.
+  }
+
+  // 3. POST each trigger (upsert by name).
+  const triggers = buildDefVaultTriggers(vault, deps.hubOrigin, webhookBearer);
+  const url = `${vaultUrl}/vault/${vault}/api/triggers`;
+  for (const trigger of triggers) {
+    try {
+      const res = await fetchFn(url, {
+        method: "POST",
+        headers: {
+          "content-type": "application/json",
+          authorization: `Bearer ${adminToken}`,
+        },
+        body: JSON.stringify(trigger),
+      });
+      if (res.ok) {
+        result.registered.push(trigger.name);
+      } else {
+        const detail = await res.text().catch(() => "");
+        result.failures.push(`${trigger.name}: HTTP ${res.status} ${detail}`.trim());
+      }
+    } catch (err) {
+      result.failures.push(`${trigger.name}: ${(err as Error).message}`);
+    }
+  }
+  return result;
+}
+
+/**
+ * Register triggers for EVERY def-vault binding. Best-effort + sequential (a
+ * handful of vaults at most); a per-vault failure never blocks the others. Logs a
+ * one-line summary per vault. Returns the per-vault results (for tests).
+ */
+export async function registerAllDefVaultTriggers(
+  bindings: DefVaultBinding[],
+  deps: RegisterTriggersDeps,
+): Promise<RegisterTriggersResult[]> {
+  const results: RegisterTriggersResult[] = [];
+  for (const binding of bindings) {
+    const r = await registerDefVaultTriggers(binding, deps).catch(
+      (err): RegisterTriggersResult => ({
+        vault: binding.vault,
+        registered: [],
+        failures: [`unexpected: ${(err as Error).message}`],
+      }),
+    );
+    results.push(r);
+    if (r.failures.length === 0) {
+      console.log(
+        `parachute-agent: def-vault "${r.vault}" — auto-registered ${r.registered.length} trigger(s) ` +
+          `(def-watch create/edit + inbound, bare-keyed).`,
+      );
+    } else {
+      console.warn(
+        `parachute-agent: def-vault "${r.vault}" — registered ${r.registered.length}, ` +
+          `${r.failures.length} failed (continuing; the 60s poll is the correctness floor): ${r.failures.join("; ")}`,
+      );
+    }
+  }
+  return results;
+}