@openparachute/hub 0.7.0 → 0.7.2-rc.1

package/src/grants-store.ts

@@ -0,0 +1,272 @@
+/**
+ * `agent-grants.json` — the persisted registry of approval-gated **agent
+ * connector grants** (Phase 4b-1, agent-connectors design 2026-06-17).
+ *
+ * NOT to be confused with `grants.ts` (the OAuth consent skip-list, one row per
+ * `(user_id, client_id)` in the SQLite `grants` table). THIS store is the
+ * agent-connector subsystem: an agent (a `#agent/definition` note in the agent
+ * module) declares connections it WANTS beyond its own def-vault; the agent
+ * module registers each as a PENDING grant here; the operator approves
+ * per-connection in hub admin; the hub mints/stores the secret; the agent
+ * module fetches the material at spawn and injects it.
+ *
+ * The one invariant (from the design): **a vault note can only REQUEST; it can
+ * never GRANT.** A grant created by the module sits `pending` and grants nothing
+ * until the operator approves in the hub. The minted/pasted secret (`material`)
+ * is the only sensitive field — it lives here on disk (0600), is NEVER logged,
+ * and is NEVER returned by the list endpoint (only by the approved-only
+ * `/material` endpoint).
+ *
+ * One file, a flat array. Cardinality is "a handful of grants per agent", not a
+ * hot path — small + synchronous Bun file I/O, mirroring `connections-store.ts`.
+ * Unlike `connections.json`, this file IS written 0600 because it holds the
+ * granted secrets.
+ */
+import { chmodSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { dirname } from "node:path";
+
+/** Verb for a vault grant. Service/mcp grants carry no access verb. */
+export type GrantAccess = "read" | "write";
+
+/** Where the agent side injects a resolved grant. */
+export type GrantInject = "env" | "mcp";
+
+/**
+ * A **connection spec** — what the agent WANTS. The wire shape the agent module
+ * sends to `PUT /admin/grants` and the shape echoed back by the list endpoint.
+ *
+ *   - `vault`   — a LOCAL vault other than the def-vault. `target` is the vault
+ *     name; `access` the verb; optional `tags` narrow the grant to a tag set
+ *     (rides the vault's `scoped_tags` tokens). Grant = a hub-minted
+ *     `vault:<target>:<access>` token.
+ *   - `service` — an external service credential (`github`, `cloudflare`).
+ *     `target` is the service key; `inject` hints how the agent side wires it
+ *     (`env` → an env var, `mcp` → the service's MCP server, or both). Grant =
+ *     an operator-pasted API token.
+ *   - `mcp`     — a remote MCP / remote vault. `target` is the MCP URL. Grant =
+ *     an OAuth token — NOT implemented in 4b-1 (slice 2). Modeled here; the
+ *     grant stays `pending` with a clear reason.
+ */
+export interface ConnectionSpec {
+  readonly kind: "vault" | "service" | "mcp";
+  /** Vault name / service key / MCP URL, per `kind`. */
+  readonly target: string;
+  /** Vault grants only — `read` (default) or `write`. */
+  readonly access?: GrantAccess;
+  /** Vault grants only — tag-scope (`scoped_tags`); empty/absent = vault-wide. */
+  readonly tags?: readonly string[];
+  /** Service grants only — injection hints carried for the agent side. */
+  readonly inject?: readonly GrantInject[];
+}
+
+/**
+ * Grant lifecycle. `needs_consent` (added 4b-2) is distinct from `revoked`
+ * (operator-intended teardown) — it means "an mcp grant was working, its refresh
+ * died, re-consent to revive." The status resolver treats it as not-approved
+ * (so the agent def shows it in `pending:[…]`).
+ */
+export type GrantStatus = "pending" | "approved" | "revoked" | "needs_consent";
+
+/**
+ * The granted secret material, kept on disk ONLY. Discriminated by `kind` to
+ * mirror the spec. NEVER returned by the list endpoint; only the approved-only
+ * `/material` endpoint reads it.
+ */
+export type GrantMaterial =
+  | {
+      readonly kind: "vault";
+      /** The minted `vault:<target>:<access>` JWT. */
+      readonly token: string;
+      /** jti of the minted token — registered so revoke can drop it. */
+      readonly jti: string;
+      /** ISO expiry of the minted token. */
+      readonly expiresAt: string;
+    }
+  | {
+      readonly kind: "service";
+      /** The operator-pasted API token. */
+      readonly token: string;
+    }
+  | {
+      readonly kind: "mcp";
+      /**
+       * The remote MCP access token — OAuth-issued (auto-refreshed) OR an
+       * operator-pasted static bearer (no refresh). The `/material` WIRE shape
+       * projects this as `token` (matching the vault/service material the agent
+       * already consumes); the internal store field is `access_token`.
+       */
+      readonly access_token: string;
+      /** OAuth refresh token. Absent for a static-bearer grant. */
+      readonly refresh_token?: string;
+      /** ISO expiry of the access token. Absent for a static bearer (never refreshed). */
+      readonly expiresAt?: string;
+      /** Issuer (for refresh + revoke). Absent for a static bearer. */
+      readonly issuer?: string;
+      /** DCR client_id (for refresh). Absent for a static bearer. */
+      readonly clientId?: string;
+      /** Cached token endpoint (for refresh). Absent for a static bearer. */
+      readonly tokenEndpoint?: string;
+      /** Cached revocation endpoint (for revoke). Absent for a static bearer / non-advertising issuer. */
+      readonly revocationEndpoint?: string;
+      /** The remote MCP URL the agent connects to. */
+      readonly mcpUrl: string;
+    };
+
+export interface GrantRecord {
+  readonly id: string;
+  /** Agent name (the `#agent/definition` note's agent identity). */
+  readonly agent: string;
+  /** The declared connection spec. */
+  readonly connection: ConnectionSpec;
+  readonly status: GrantStatus;
+  /** Why a grant is pending/blocked (e.g. mcp "oauth not yet supported"). */
+  readonly reason?: string;
+  /** The secret — present only when `status === "approved"`. Never logged/listed. */
+  readonly material?: GrantMaterial;
+  readonly createdAt: string;
+  readonly approvedAt?: string;
+}
+
+interface GrantsFile {
+  grants: GrantRecord[];
+}
+
+/**
+ * Stable connection key — the idempotency key for `(agent, connection)` upsert.
+ * A spec's identity is its `kind` + `target` + (for vault) the access verb +
+ * the sorted tag set. `inject` is NOT part of the key — it's an agent-side
+ * hint, so re-declaring the same service with different inject modes updates
+ * the existing grant rather than forking a second one. The grant `id` derives
+ * from `agent` + this key.
+ */
+export function connectionKey(spec: ConnectionSpec): string {
+  const target = spec.target.trim().toLowerCase();
+  if (spec.kind === "vault") {
+    const access = spec.access ?? "read";
+    const tags = [...(spec.tags ?? [])].map((t) => t.trim()).sort();
+    return tags.length > 0
+      ? `vault:${target}:${access}#${tags.join(",")}`
+      : `vault:${target}:${access}`;
+  }
+  if (spec.kind === "service") {
+    return `service:${target}`;
+  }
+  // mcp — keyed on the URL only (its target).
+  return `mcp:${target}`;
+}
+
+const GRANT_ID_CHARSET = /[^a-z0-9]+/g;
+
+/**
+ * Derive the grant id from `(agent, connectionKey)`. A conservative slug — it
+ * lands in a URL path segment (`/admin/grants/<id>/...`). Deterministic so the
+ * same `(agent, connection)` always upserts the same row.
+ *
+ * The slug collapses non-`[a-z0-9]` runs to a single `-`. A collision (two distinct
+ * `(agent, connection)` pairs slugging identically) is infeasible given the upstream
+ * validators — `kind` is an enum, vault `target` passes `validateVaultName`, service
+ * `target` matches `SERVICE_KEY_RE`, `access` is `read|write`, tags are charset-bounded
+ * — so the separators that survive the slug are non-ambiguous in practice.
+ */
+export function grantId(agent: string, spec: ConnectionSpec): string {
+  const raw = `${agent.trim().toLowerCase()}--${connectionKey(spec)}`;
+  return raw.replace(GRANT_ID_CHARSET, "-").replace(/^-+|-+$/g, "");
+}
+
+function emptyFile(): GrantsFile {
+  return { grants: [] };
+}
+
+function isConnectionSpec(v: unknown): v is ConnectionSpec {
+  if (!v || typeof v !== "object") return false;
+  const s = v as Record<string, unknown>;
+  return (
+    (s.kind === "vault" || s.kind === "service" || s.kind === "mcp") && typeof s.target === "string"
+  );
+}
+
+/** Read the store. A missing/garbage file reads as empty (fresh hub). */
+export function readGrants(storePath: string): GrantRecord[] {
+  let buf: string;
+  try {
+    buf = readFileSync(storePath, "utf8");
+  } catch {
+    return [];
+  }
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(buf);
+  } catch {
+    return [];
+  }
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return [];
+  const arr = (parsed as { grants?: unknown }).grants;
+  if (!Array.isArray(arr)) return [];
+  // Lenient: drop a malformed row rather than failing the whole read (mirrors
+  // the connections-store / services.json lenient-read posture).
+  return arr.filter((r): r is GrantRecord => {
+    if (!r || typeof r !== "object") return false;
+    const rec = r as Record<string, unknown>;
+    return (
+      typeof rec.id === "string" &&
+      typeof rec.agent === "string" &&
+      isConnectionSpec(rec.connection) &&
+      // NOTE (4b-2): `needs_consent` MUST be accepted here — else a row that
+      // flipped to needs_consent on a failed mcp refresh is silently dropped on
+      // re-read and `/material` 404s instead of 409ing. Regression-tested.
+      (rec.status === "pending" ||
+        rec.status === "approved" ||
+        rec.status === "revoked" ||
+        rec.status === "needs_consent")
+    );
+  });
+}
+
+function writeAll(storePath: string, records: GrantRecord[]): void {
+  mkdirSync(dirname(storePath), { recursive: true });
+  const file: GrantsFile = { grants: records };
+  // 0600 — UNLIKE connections.json, this file holds the granted secrets
+  // (minted vault tokens + pasted service creds in `material`). `writeFileSync`'s
+  // `mode` applies at CREATE time (passed to open(O_CREAT)), so a fresh file is
+  // never world-readable even for an instant; the chmodSync below is belt-and-
+  // suspenders for the re-write case (an existing file left at looser perms).
+  writeFileSync(storePath, `${JSON.stringify(file, null, 2)}\n`, { mode: 0o600 });
+  try {
+    chmodSync(storePath, 0o600);
+  } catch {
+    // Best-effort on platforms without POSIX perms (the secret is still only
+    // reachable through the approved-only, auth-gated /material endpoint).
+  }
+}
+
+/** Upsert by id (replace an existing record with the same id, else append). */
+export function putGrant(storePath: string, record: GrantRecord): void {
+  const records = readGrants(storePath);
+  const idx = records.findIndex((r) => r.id === record.id);
+  if (idx >= 0) records[idx] = record;
+  else records.push(record);
+  writeAll(storePath, records);
+}
+
+export function getGrant(storePath: string, id: string): GrantRecord | null {
+  return readGrants(storePath).find((r) => r.id === id) ?? null;
+}
+
+/** All grants for an agent, in stored order. */
+export function listGrantsForAgent(storePath: string, agent: string): GrantRecord[] {
+  const want = agent.trim().toLowerCase();
+  return readGrants(storePath).filter((r) => r.agent.trim().toLowerCase() === want);
+}
+
+/** Remove a grant by id. Returns the removed record, or null if absent. */
+export function removeGrant(storePath: string, id: string): GrantRecord | null {
+  const records = readGrants(storePath);
+  const idx = records.findIndex((r) => r.id === id);
+  if (idx < 0) return null;
+  const [removed] = records.splice(idx, 1);
+  writeAll(storePath, records);
+  return removed ?? null;
+}
+
+/** Re-export for the unused-import linter when only the type is consumed. */
+export const _emptyGrantsFile = emptyFile;

package/src/help.ts

@@ -31,6 +31,9 @@ Usage:
   parachute vault <args...>         vault-specific ops (tokens, 2fa, config, init,
                                     etc.) — forwards to parachute-vault.
                                     For lifecycle, use \`parachute start|stop|restart|logs vault\`.
+                                    \`vault remove <name>\` is routed through the hub's
+                                    identity cascade (revokes the vault's tokens/grants),
+                                    not the raw mechanics-only delete.
 
 Flags:
   --help, -h                        show this help (also per-subcommand: \`parachute <cmd> --help\`)
@@ -469,7 +472,7 @@ Module start commands (run by the supervisor under \`serve\`):
   vault     parachute-vault serve
   scribe    parachute-scribe serve
   app       parachute-app serve
-  channel   parachute-channel daemon
+  agent     parachute-agent
   notes     bun <cli>/notes-serve.ts --port <configured> --mount <paths[0]>   # back-compat: legacy notes-daemon
 `;
 }
@@ -583,12 +586,19 @@ export function logsHelp(): string {
 Usage:
   parachute logs <service>          print the last 200 lines
   parachute logs <service> -f       tail the log (like \`tail -f\`)
-  parachute logs hub                logs for the internal hub
-
-Log file:
-  ~/.parachute/<service>/logs/<service>.log
-
-If no log file exists yet, prints a hint to \`parachute start <service>\`.
+  parachute logs hub                the full hub log (every module interleaved)
+
+Where logs live:
+  Supervised modules (the normal shape — hub-as-supervisor) write through
+  the hub: the supervisor multiplexes each child's output into
+  ~/.parachute/hub/logs/hub.log with a \`[<service>]\` line prefix.
+  \`parachute logs <service>\` reads that stream filtered to the service's
+  lines, prefix stripped (-n caps the MATCHING lines, not raw hub-log
+  lines; \`logs hub\` is unfiltered). A legacy per-service file
+  (~/.parachute/<service>/logs/<service>.log) is read instead when it is
+  fresher than the hub log — the pre-supervised install shape.
+
+If no log lines exist yet, prints a hint to \`parachute start <service>\`.
 `;
 }
 

package/src/host-admin-token-validation.ts

@@ -40,11 +40,15 @@
  * OAuth / access-token validation (vault / MCP tokens, `aud: "vault.<name>"`)
  * stays STRICT per-request-issuer and lives on entirely separate code paths
  * (the resource servers' own validators, hub's `/api/auth/*`, etc.). This
- * helper is invoked ONLY from the two loopback host-admin module surfaces
+ * helper is invoked from the two loopback host-admin module surfaces
  * (`/api/modules` GET — the `status` read; `/api/modules/:short/*` POST — the
  * lifecycle ops), both of which already gate on the non-requestable
  * `parachute:host:admin` / `parachute:host:auth` scopes that no OAuth token
- * can carry. The relaxation cannot reach an OAuth token's validation.
+ * can carry, and from the per-UI audience gate's Bearer branch
+ * (`src/audience-gate.ts`, H3) — same self-issued-token shape, same
+ * iss-∈-bound-origins need (a PWA's token carries the public origin while
+ * the proxied request resolves the loopback issuer), with the surface's
+ * declared `scopes_required` enforced by the gate on top.
  */
 import type { Database } from "bun:sqlite";
 import { type ValidatedAccessToken, validateAccessToken } from "./jwt-sign.ts";

package/src/hub-db.ts

@@ -4,7 +4,7 @@
  * issuer — signing keys (v1), users + opaque refresh tokens (v2), OAuth
  * clients + auth-codes + grants + browser sessions (v3), TOTP 2FA
  * enrollment on the users row (v11, hub#473), and one-time invite links
- * (v12, the `invites` table).
+ * (v12, the `invites` table; v13 adds the pre-named `username` column).
  *
  * Each open() runs `migrate()` to bring the schema up to date. A
  * `schema_version` table records every applied migration so re-opens are
@@ -426,6 +426,31 @@ const MIGRATIONS: readonly Migration[] = [
       CREATE INDEX invites_created_at ON invites (created_at);
     `,
   },
+  {
+    version: 13,
+    sql: `
+      -- Pre-named invites (Adam/Jonathan scenario). Adds an optional
+      -- \`username\` column to \`invites\`: when set, the invite pre-names
+      -- the account the redeemer gets — the redemption form shows the name
+      -- read-only and the redeem handler ENFORCES it (the form's username
+      -- field is ignored). NULL = the redeemer picks their own username
+      -- (every pre-v13 invite, and the default for new ones).
+      --
+      -- Enforced (not just pre-filled) because a pre-named invite is a
+      -- *named deliverable*: the admin mints "Jonathan's link" and hands it
+      -- to Jonathan; if the redeemer could pick a different name, the
+      -- link's identity binding would be decorative — the admin's audit
+      -- expectation ("this link = jonathan") and any vault assignment
+      -- story told against that name would silently break.
+      --
+      -- Stored as plain TEXT (already-validated lowercase [a-z0-9_-], the
+      -- users.username vocabulary). Mint-time validation rejects names
+      -- taken by an existing user or reserved by another pending invite;
+      -- the redeem path re-checks authoritatively. No backfill — every
+      -- existing invite predates pre-naming and keeps NULL.
+      ALTER TABLE invites ADD COLUMN username TEXT;
+    `,
+  },
 ];
 
 export function openHubDb(path: string = hubDbPath()): Database {