@frankieai/server 0.2.1 → 0.2.2

package/dist/chunk-NF6IJVES.js

@@ -0,0 +1,75 @@
+// src/config.ts
+import { readFile } from "fs/promises";
+import { resolve } from "path";
+import { parseFrankieConfig } from "@frankieai/core";
+var ConfigError = class extends Error {
+};
+async function loadConfigFromFile(path) {
+  const target = resolve(path ?? process.env["FRANKIE_CONFIG"] ?? "frankie.config.json");
+  let raw;
+  try {
+    raw = await readFile(target, "utf8");
+  } catch {
+    throw new ConfigError(
+      `Could not read Frankie config at ${target}. Set FRANKIE_CONFIG to point at your frankie.config.json.`
+    );
+  }
+  try {
+    return parseFrankieConfig(applyEnvOverrides(JSON.parse(raw)));
+  } catch (error) {
+    throw new ConfigError(`Invalid Frankie config at ${target}: ${error.message}`);
+  }
+}
+function applyEnvOverrides(raw, env = process.env) {
+  const out = { ...raw };
+  const model = { ...isRecord(out["model"]) ? out["model"] : {} };
+  if (env["FRANKIE_MODEL_PROVIDER"]) model["provider"] = env["FRANKIE_MODEL_PROVIDER"];
+  if (env["FRANKIE_MODEL"]) model["model"] = env["FRANKIE_MODEL"];
+  if (env["FRANKIE_MODEL_BASE_URL"]) model["baseUrl"] = env["FRANKIE_MODEL_BASE_URL"];
+  if (Object.keys(model).length > 0) out["model"] = model;
+  const auth = { ...isRecord(out["auth"]) ? out["auth"] : {} };
+  if (env["FRANKIE_ALLOWED_ORIGINS"]) {
+    auth["allowedOrigins"] = env["FRANKIE_ALLOWED_ORIGINS"].split(",").map((o) => o.trim()).filter(Boolean);
+  }
+  if (env["FRANKIE_PUBLISHABLE_KEY"]) auth["publishableKey"] = env["FRANKIE_PUBLISHABLE_KEY"];
+  if (Object.keys(auth).length > 0) out["auth"] = auth;
+  return out;
+}
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function resolveSecrets(config, env = process.env) {
+  const missing = [];
+  const jwtSecret = env[config.auth.jwtSecretEnv];
+  if (!config.auth.jwksUrl && !jwtSecret) missing.push(config.auth.jwtSecretEnv);
+  const sessionSecret = env[config.auth.sessionSecretEnv];
+  if (!sessionSecret) missing.push(config.auth.sessionSecretEnv);
+  const providerApiKey = env[config.model.apiKeyEnv];
+  if (!providerApiKey) missing.push(config.model.apiKeyEnv);
+  if (missing.length) {
+    throw new ConfigError(`Missing required environment variables: ${missing.join(", ")}`);
+  }
+  if (sessionSecret.length < 32) {
+    throw new ConfigError(`${config.auth.sessionSecretEnv} must be at least 32 characters.`);
+  }
+  return {
+    config,
+    secrets: {
+      jwtSecret,
+      sessionSecret,
+      providerApiKey
+    }
+  };
+}
+async function loadResolvedConfig(path) {
+  return resolveSecrets(await loadConfigFromFile(path));
+}
+
+export {
+  ConfigError,
+  loadConfigFromFile,
+  applyEnvOverrides,
+  resolveSecrets,
+  loadResolvedConfig
+};
+//# sourceMappingURL=chunk-NF6IJVES.js.map

package/dist/chunk-NF6IJVES.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/config.ts"],"sourcesContent":["import { readFile } from \"node:fs/promises\";\nimport { resolve } from \"node:path\";\nimport { parseFrankieConfig, type FrankieConfig } from \"@frankieai/core\";\n\n/**\n * Secrets never live in the config file — the file names the env var that\n * holds each one. `ResolvedConfig` is the config plus the resolved values.\n */\nexport interface ResolvedConfig {\n  config: FrankieConfig;\n  secrets: {\n    /** HS256 secret the host signs end-user tokens with. Absent when using JWKS. */\n    jwtSecret?: string;\n    /** Signs Frankie's own session tokens. */\n    sessionSecret: string;\n    /** Key for the model provider named in `model.provider`. */\n    providerApiKey: string;\n  };\n}\n\nexport class ConfigError extends Error {}\n\nexport async function loadConfigFromFile(path?: string): Promise<FrankieConfig> {\n  const target = resolve(path ?? process.env[\"FRANKIE_CONFIG\"] ?? \"frankie.config.json\");\n  let raw: string;\n  try {\n    raw = await readFile(target, \"utf8\");\n  } catch {\n    throw new ConfigError(\n      `Could not read Frankie config at ${target}. Set FRANKIE_CONFIG to point at your frankie.config.json.`,\n    );\n  }\n  try {\n    return parseFrankieConfig(applyEnvOverrides(JSON.parse(raw) as Record<string, unknown>));\n  } catch (error) {\n    throw new ConfigError(`Invalid Frankie config at ${target}: ${(error as Error).message}`);\n  }\n}\n\n/**\n * A handful of fields have to move with the deployment rather than the config\n * file — the model and the origin allowlist are what an operator most often\n * wants to flip without a redeploy.\n */\nexport function applyEnvOverrides(\n  raw: Record<string, unknown>,\n  env: NodeJS.ProcessEnv = process.env,\n): Record<string, unknown> {\n  const out = { ...raw };\n\n  const model = { ...(isRecord(out[\"model\"]) ? out[\"model\"] : {}) };\n  if (env[\"FRANKIE_MODEL_PROVIDER\"]) model[\"provider\"] = env[\"FRANKIE_MODEL_PROVIDER\"];\n  if (env[\"FRANKIE_MODEL\"]) model[\"model\"] = env[\"FRANKIE_MODEL\"];\n  if (env[\"FRANKIE_MODEL_BASE_URL\"]) model[\"baseUrl\"] = env[\"FRANKIE_MODEL_BASE_URL\"];\n  if (Object.keys(model).length > 0) out[\"model\"] = model;\n\n  const auth = { ...(isRecord(out[\"auth\"]) ? out[\"auth\"] : {}) };\n  if (env[\"FRANKIE_ALLOWED_ORIGINS\"]) {\n    auth[\"allowedOrigins\"] = env[\"FRANKIE_ALLOWED_ORIGINS\"].split(\",\").map((o) => o.trim()).filter(Boolean);\n  }\n  if (env[\"FRANKIE_PUBLISHABLE_KEY\"]) auth[\"publishableKey\"] = env[\"FRANKIE_PUBLISHABLE_KEY\"];\n  if (Object.keys(auth).length > 0) out[\"auth\"] = auth;\n\n  return out;\n}\n\nfunction isRecord(value: unknown): value is Record<string, unknown> {\n  return typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n\nexport function resolveSecrets(config: FrankieConfig, env: NodeJS.ProcessEnv = process.env): ResolvedConfig {\n  const missing: string[] = [];\n\n  const jwtSecret = env[config.auth.jwtSecretEnv];\n  if (!config.auth.jwksUrl && !jwtSecret) missing.push(config.auth.jwtSecretEnv);\n\n  const sessionSecret = env[config.auth.sessionSecretEnv];\n  if (!sessionSecret) missing.push(config.auth.sessionSecretEnv);\n\n  const providerApiKey = env[config.model.apiKeyEnv];\n  if (!providerApiKey) missing.push(config.model.apiKeyEnv);\n\n  if (missing.length) {\n    throw new ConfigError(`Missing required environment variables: ${missing.join(\", \")}`);\n  }\n\n  if (sessionSecret!.length < 32) {\n    throw new ConfigError(`${config.auth.sessionSecretEnv} must be at least 32 characters.`);\n  }\n\n  return {\n    config,\n    secrets: {\n      jwtSecret,\n      sessionSecret: sessionSecret!,\n      providerApiKey: providerApiKey!,\n    },\n  };\n}\n\nexport async function loadResolvedConfig(path?: string): Promise<ResolvedConfig> {\n  return resolveSecrets(await loadConfigFromFile(path));\n}\n"],"mappings":";AAAA,SAAS,gBAAgB;AACzB,SAAS,eAAe;AACxB,SAAS,0BAA8C;AAkBhD,IAAM,cAAN,cAA0B,MAAM;AAAC;AAExC,eAAsB,mBAAmB,MAAuC;AAC9E,QAAM,SAAS,QAAQ,QAAQ,QAAQ,IAAI,gBAAgB,KAAK,qBAAqB;AACrF,MAAI;AACJ,MAAI;AACF,UAAM,MAAM,SAAS,QAAQ,MAAM;AAAA,EACrC,QAAQ;AACN,UAAM,IAAI;AAAA,MACR,oCAAoC,MAAM;AAAA,IAC5C;AAAA,EACF;AACA,MAAI;AACF,WAAO,mBAAmB,kBAAkB,KAAK,MAAM,GAAG,CAA4B,CAAC;AAAA,EACzF,SAAS,OAAO;AACd,UAAM,IAAI,YAAY,6BAA6B,MAAM,KAAM,MAAgB,OAAO,EAAE;AAAA,EAC1F;AACF;AAOO,SAAS,kBACd,KACA,MAAyB,QAAQ,KACR;AACzB,QAAM,MAAM,EAAE,GAAG,IAAI;AAErB,QAAM,QAAQ,EAAE,GAAI,SAAS,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,IAAI,CAAC,EAAG;AAChE,MAAI,IAAI,wBAAwB,EAAG,OAAM,UAAU,IAAI,IAAI,wBAAwB;AACnF,MAAI,IAAI,eAAe,EAAG,OAAM,OAAO,IAAI,IAAI,eAAe;AAC9D,MAAI,IAAI,wBAAwB,EAAG,OAAM,SAAS,IAAI,IAAI,wBAAwB;AAClF,MAAI,OAAO,KAAK,KAAK,EAAE,SAAS,EAAG,KAAI,OAAO,IAAI;AAElD,QAAM,OAAO,EAAE,GAAI,SAAS,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,IAAI,CAAC,EAAG;AAC7D,MAAI,IAAI,yBAAyB,GAAG;AAClC,SAAK,gBAAgB,IAAI,IAAI,yBAAyB,EAAE,MAAM,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,OAAO;AAAA,EACxG;AACA,MAAI,IAAI,yBAAyB,EAAG,MAAK,gBAAgB,IAAI,IAAI,yBAAyB;AAC1F,MAAI,OAAO,KAAK,IAAI,EAAE,SAAS,EAAG,KAAI,MAAM,IAAI;AAEhD,SAAO;AACT;AAEA,SAAS,SAAS,OAAkD;AAClE,SAAO,OAAO,UAAU,YAAY,UAAU,QAAQ,CAAC,MAAM,QAAQ,KAAK;AAC5E;AAEO,SAAS,eAAe,QAAuB,MAAyB,QAAQ,KAAqB;AAC1G,QAAM,UAAoB,CAAC;AAE3B,QAAM,YAAY,IAAI,OAAO,KAAK,YAAY;AAC9C,MAAI,CAAC,OAAO,KAAK,WAAW,CAAC,UAAW,SAAQ,KAAK,OAAO,KAAK,YAAY;AAE7E,QAAM,gBAAgB,IAAI,OAAO,KAAK,gBAAgB;AACtD,MAAI,CAAC,cAAe,SAAQ,KAAK,OAAO,KAAK,gBAAgB;AAE7D,QAAM,iBAAiB,IAAI,OAAO,MAAM,SAAS;AACjD,MAAI,CAAC,eAAgB,SAAQ,KAAK,OAAO,MAAM,SAAS;AAExD,MAAI,QAAQ,QAAQ;AAClB,UAAM,IAAI,YAAY,2CAA2C,QAAQ,KAAK,IAAI,CAAC,EAAE;AAAA,EACvF;AAEA,MAAI,cAAe,SAAS,IAAI;AAC9B,UAAM,IAAI,YAAY,GAAG,OAAO,KAAK,gBAAgB,kCAAkC;AAAA,EACzF;AAEA,SAAO;AAAA,IACL;AAAA,IACA,SAAS;AAAA,MACP;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,EACF;AACF;AAEA,eAAsB,mBAAmB,MAAwC;AAC/E,SAAO,eAAe,MAAM,mBAAmB,IAAI,CAAC;AACtD;","names":[]}

package/dist/{chunk-UZSHFMJN.js → chunk-NSOMFNTK.js}

@@ -1,12 +1,22 @@
 import {
   MemoryRateLimiter,
+  applySecurity,
+  buildForwardedHeaders,
+  buildUrl,
+  collectParameters,
   connectMcpTools,
   connectorFetch,
   inspectApiCapabilities,
+  isRecord,
+  loadSpec,
   resolveModel,
+  resolveOperationBaseUrl,
   safeEqual,
+  securitySchemes,
+  slug,
+  specBaseUrl,
   toPublicTenant
-} from "./chunk-WFENEYOV.js";
+} from "./chunk-JOADNB5J.js";
 
 // src/control/app.ts
 import { randomBytes } from "crypto";
@@ -49,10 +59,104 @@ async function refreshApiSource(source, spec) {
   }
   if (!source.baseUrl && (!before || JSON.stringify(before.servers ?? []) !== JSON.stringify(after.servers ?? []))) throw new Error("Set an explicit API base URL in Tools & MCP before refreshing a remote spec or changing its servers.");
   const changes = compareApiDocuments(before ?? { paths: {} }, after);
-  const selectedTools = (source.selectedTools ?? []).filter((id) => changes.unchangedIds.includes(id));
+  const selectedTools = source.selectedTools ? source.selectedTools.filter((id) => changes.unchangedIds.includes(id)) : [...changes.unchangedIds];
+  const priorApprovals = source.selectedTools?.length ?? changes.unchangedIds.length + changes.changed.length + changes.removed.length;
   const updated = { ...source, spec: JSON.stringify(after), selectedTools };
   const capabilities = await inspectApiCapabilities(updated);
-  return { source: { ...updated, capabilities }, changes: { added: changes.added, changed: changes.changed, removed: changes.removed, retainedApprovals: selectedTools.length, revokedApprovals: (source.selectedTools?.length ?? 0) - selectedTools.length } };
+  const newWritesWithAuthGap = capabilities.filter((capability) => capability.authGap && changes.added.includes(`${capability.method} ${capability.path}`)).map((capability) => capability.operationId);
+  return {
+    source: { ...updated, capabilities },
+    changes: {
+      added: changes.added,
+      changed: changes.changed,
+      removed: changes.removed,
+      newWritesWithAuthGap,
+      retainedApprovals: selectedTools.length,
+      revokedApprovals: priorApprovals - selectedTools.length
+    }
+  };
+}
+
+// src/control/api-connectivity-test.ts
+var MAX_SAMPLED_OPERATIONS = 5;
+function redact(message, source) {
+  let text = message;
+  for (const value of [...Object.values(source.security ?? {}), ...Object.values(source.headers ?? {})]) {
+    if (value) text = text.split(value).join("[redacted]");
+  }
+  return text;
+}
+async function probeOperation(doFetch, source, doc, schemes, baseUrl, path, item, operation, operationId, testUserToken) {
+  const params = collectParameters(doc, item, operation);
+  const opBaseUrl = resolveOperationBaseUrl(source, doc, item, operation, baseUrl);
+  const timeout = () => AbortSignal.timeout(source.timeoutMs);
+  try {
+    const unauthenticated = await doFetch(buildUrl(opBaseUrl, path, params, {}), {
+      method: "GET",
+      headers: { accept: "application/json, */*;q=0.8" },
+      signal: timeout()
+    });
+    const { headers: securedHeaders, query: securityQuery } = applySecurity(doc, source, operation, schemes);
+    const session = {
+      id: "connectivity-test",
+      tenantId: source.name,
+      user: { id: "connectivity-test", anonymous: !testUserToken, claims: {} },
+      ...testUserToken ? { userToken: testUserToken } : {},
+      context: {},
+      messages: [],
+      createdAt: Date.now(),
+      lastActiveAt: Date.now(),
+      messageCount: 0,
+      costUsd: 0,
+      busy: false
+    };
+    const headers = buildForwardedHeaders({ ...source, headers: securedHeaders }, session);
+    const authenticated = await doFetch(buildUrl(opBaseUrl, path, params, {}, securityQuery), {
+      method: "GET",
+      headers: { ...headers, accept: "application/json, */*;q=0.8" },
+      signal: timeout()
+    });
+    return {
+      operationId,
+      method: "GET",
+      path,
+      rejectsUnauthenticated: unauthenticated.status === 401 || unauthenticated.status === 403,
+      authenticatedOk: authenticated.ok,
+      deployed: !(unauthenticated.status === 404 && authenticated.status === 404)
+    };
+  } catch (error) {
+    return { operationId, method: "GET", path, deployed: false, error: redact(error instanceof Error ? error.message : String(error), source) };
+  }
+}
+async function testApiConnectivity(source, options = {}) {
+  const doFetch = options.fetchImpl ?? connectorFetch;
+  let doc;
+  try {
+    doc = await loadSpec(source.spec, doFetch);
+  } catch {
+    return { specReachable: false, baseUrlReachable: false, operations: [], ok: false };
+  }
+  const baseUrl = (source.baseUrl ?? specBaseUrl(doc))?.replace(/\/+$/, "");
+  if (!baseUrl) return { specReachable: true, baseUrlReachable: false, operations: [], ok: false };
+  const schemes = securitySchemes(doc);
+  const allowedMethods = new Set(source.methods);
+  const candidates = [];
+  for (const [path, item] of Object.entries(doc.paths ?? {})) {
+    if (candidates.length >= MAX_SAMPLED_OPERATIONS) break;
+    if (!isRecord(item)) continue;
+    const operation = item["get"];
+    if (!isRecord(operation) || !allowedMethods.has("GET")) continue;
+    const operationId = typeof operation["operationId"] === "string" ? operation["operationId"] : `get_${slug(path)}`;
+    if (source.selectedTools && !source.selectedTools.includes(operationId)) continue;
+    if (collectParameters(doc, item, operation).some((param) => param.location === "path" && param.required)) continue;
+    candidates.push({ operationId, path, item, operation });
+  }
+  const operations = [];
+  for (const candidate of candidates) {
+    operations.push(await probeOperation(doFetch, source, doc, schemes, baseUrl, candidate.path, candidate.item, candidate.operation, candidate.operationId, options.testUserToken));
+  }
+  const ok = operations.length > 0 && operations.every((op) => !op.error && op.deployed && op.authenticatedOk);
+  return { specReachable: true, baseUrlReachable: true, operations, ok };
 }
 
 // src/control/automatic-skills.ts
@@ -155,6 +259,7 @@ async function automaticSkills(config, inventory, resolved, generate = generateS
 }
 
 // src/control/app.ts
+import { jwtVerify } from "jose";
 import { Hono } from "hono";
 import { parseFrankieConfig, skillSchema as skillSchema3, approvedSkillTools } from "@frankieai/core";
 function createControlApp(options) {
@@ -163,6 +268,9 @@ function createControlApp(options) {
   const log = options.logger ?? ((event) => console.log(JSON.stringify({ ts: (/* @__PURE__ */ new Date()).toISOString(), ...event })));
   const app = new Hono();
   const generationLimits = new MemoryRateLimiter();
+  const assertionSecret = options.ownerAssertionSecret ?? process.env["FRANKIE_CONTROL_ASSERTION_SECRET"];
+  const assertionKey = assertionSecret ? new TextEncoder().encode(assertionSecret) : void 0;
+  const asserted = /* @__PURE__ */ new WeakMap();
   app.use("/admin/*", async (c, next) => {
     if (!adminToken) {
       return c.json({ error: "Control plane is locked: set FRANKIE_ADMIN_TOKEN." }, 503);
@@ -171,11 +279,32 @@ function createControlApp(options) {
     if (!safeEqual(bearer, adminToken)) {
       return c.json({ error: "Unauthorized." }, 401);
     }
+    if (assertionKey) {
+      const raw = c.req.header("x-frankie-owner-assertion");
+      if (raw) {
+        try {
+          const { payload } = await jwtVerify(raw, assertionKey, {
+            algorithms: ["HS256"],
+            issuer: "frankie-dashboard",
+            audience: "frankie-control",
+            clockTolerance: 30
+          });
+          asserted.set(c.req.raw, {
+            ...typeof payload.sub === "string" ? { owner: payload.sub } : {},
+            ...typeof payload["login"] === "string" ? { login: payload["login"].toLowerCase() } : {}
+          });
+        } catch {
+          return c.json({ error: "Invalid owner assertion." }, 401);
+        }
+      } else if (c.req.header("x-frankie-owner")) {
+        return c.json({ error: "A signed owner assertion is required." }, 401);
+      }
+    }
     await next();
     return;
   });
-  const ownerOf = (c) => c.req.header("x-frankie-owner") || void 0;
-  const loginOf = (c) => c.req.header("x-frankie-login")?.toLowerCase() || void 0;
+  const ownerOf = (c) => assertionKey ? asserted.get(c.req.raw)?.owner : c.req.header("x-frankie-owner") || void 0;
+  const loginOf = (c) => (assertionKey ? asserted.get(c.req.raw)?.login : c.req.header("x-frankie-login")?.toLowerCase()) || void 0;
   const bootstrapAdmins = new Set((options.bootstrapSuperAdmins ?? (process.env["FRANKIE_BOOTSTRAP_SUPER_ADMINS"] ?? "").split(",")).map((id) => id.trim()).filter((id) => /^github:[1-9]\d*$/.test(id)));
   const isSuperAdmin = async (c) => {
     const owner = ownerOf(c);
@@ -238,7 +367,7 @@ function createControlApp(options) {
     const body = await readJson(c) ?? {};
     if (!body.name?.trim()) return c.json({ error: "`name` is required." }, 400);
     const ownerId = ownerOf(c);
-    let id = slug(body.name);
+    let id = slug2(body.name);
     if (await store.get(id)) id = `${id}-${randomBytes(3).toString("hex")}`;
     const publishableKey = `pk_live_${randomBytes(12).toString("hex")}`;
     const jwtSecret = randomBytes(36).toString("base64");
@@ -294,15 +423,25 @@ function createControlApp(options) {
     if (!record.ownerId) return null;
     return orgs.has(record.ownerId) ? record : null;
   };
+  const canAdminister = async (c, record) => {
+    if (!record.ownerId) return await accessibleOrgs(c) === void 0;
+    return canManageMembers(c, record.ownerId);
+  };
+  const adminForbidden = (c) => c.json({ error: "This action requires the workspace owner or an organization admin." }, 403);
   app.get("/admin/tenants", async (c) => {
+    const counts = sessions ? await sessions.countsByTenant() : {};
+    const withCounts = (record) => ({
+      ...toPublicTenant(record),
+      conversationCount: counts[record.id] ?? 0
+    });
     const orgs = await accessibleOrgs(c);
     if (!orgs) {
       if (ownerOf(c)) log({ level: "info", event: "platform_workspace_directory", actor: ownerOf(c) });
-      return c.json({ tenants: (await store.list()).map(toPublicTenant) });
+      return c.json({ tenants: (await store.list()).map(withCounts) });
     }
     const records = [];
     for (const org of orgs) records.push(...await store.list(org));
-    return c.json({ tenants: records.map(toPublicTenant) });
+    return c.json({ tenants: records.map(withCounts) });
   });
   const LOGIN_RE = /^[a-z\d](?:[a-z\d]|-(?=[a-z\d])){0,38}$/i;
   app.get("/admin/orgs/:org/members", async (c) => {
@@ -366,12 +505,14 @@ function createControlApp(options) {
   app.get("/admin/tenants/:id/jwt-secret", async (c) => {
     const record = await own(c);
     if (!record) return c.json({ error: "No such tenant." }, 404);
+    if (!await canAdminister(c, record)) return adminForbidden(c);
     if (!record.jwtSecret) return c.json({ error: "This workspace has no JWT secret." }, 404);
     return c.json({ secrets: { jwtSecret: record.jwtSecret } });
   });
   app.delete("/admin/tenants/:id", async (c) => {
     const record = await own(c);
     if (!record) return c.json({ error: "No such tenant." }, 404);
+    if (!await canAdminister(c, record)) return adminForbidden(c);
     if (record.locked) {
       return c.json({ error: "This workspace is locked. Unlock it before deleting." }, 409);
     }
@@ -521,15 +662,24 @@ function createControlApp(options) {
     if (body.pullRequestUrl && (!pullRequestUrl || !pullRequestUrl.startsWith(`https://github.com/${repository}/pull/`))) {
       return c.json({ error: "Pull request must belong to the connected repository." }, 400);
     }
+    const prev = record.repositoryInstall?.repository === repository ? record.repositoryInstall : void 0;
+    const rollup = ["success", "pending", "failure", "none"].includes(String(body.checkRollup)) ? body.checkRollup : void 0;
+    const pullState = ["draft", "open", "closed", "merged"].includes(String(body.pullRequestState)) ? body.pullRequestState : void 0;
+    const nextStatus = prev && prev.status !== "installing" && status === "installing" ? prev.status : status;
     const updated = {
       ...record,
       repositoryInstall: {
+        ...prev,
         repository,
-        status,
+        status: nextStatus,
         ...typeof body.runId === "string" && body.runId ? { runId: body.runId } : {},
         ...pullRequestUrl ? { pullRequestUrl } : {},
         requiresJwtSecret: Boolean(body.requiresJwtSecret),
         ...typeof body.failureMessage === "string" && body.failureMessage ? { failureMessage: body.failureMessage } : {},
+        ...typeof body.step === "string" && body.step ? { step: body.step } : {},
+        ...pullState ? { pullRequestState: pullState } : {},
+        ...rollup ? { checkRollup: rollup } : {},
+        ...typeof body.checkedAt === "string" && body.checkedAt ? { checkedAt: body.checkedAt } : {},
         updatedAt: (/* @__PURE__ */ new Date()).toISOString()
       },
       updatedAt: (/* @__PURE__ */ new Date()).toISOString()
@@ -559,9 +709,25 @@ function createControlApp(options) {
       return c.json({ error: error instanceof Error ? error.message : "Could not refresh the API spec." }, 400);
     }
   });
+  app.post("/admin/tenants/:id/api-test", async (c) => {
+    const record = await own(c);
+    if (!record) return c.json({ error: "No such tenant." }, 404);
+    const body = await readJson(c);
+    const source = record.config.apis.find((api) => api.name === body?.name);
+    if (!source) return c.json({ error: "API connection not found." }, 404);
+    const testUserToken = typeof body?.testUserToken === "string" && body.testUserToken.trim() ? body.testUserToken.trim() : void 0;
+    const result = await testApiConnectivity(source, { testUserToken });
+    const checkedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const apiConnectivityChecks = { ...record.apiConnectivityChecks, [source.name]: { checkedAt, ok: result.ok } };
+    const updated = { ...record, apiConnectivityChecks, updatedAt: checkedAt };
+    await store.put(updated);
+    log({ level: "info", event: "api_connectivity_tested", tenant: record.id, api: source.name, actor: ownerOf(c), ok: result.ok });
+    return c.json({ tenant: toPublicTenant(updated), result });
+  });
   app.put("/admin/tenants/:id/connection", async (c) => {
     const record = await own(c);
     if (!record) return c.json({ error: "No such tenant." }, 404);
+    if (!await canAdminister(c, record)) return adminForbidden(c);
     const body = await readJson(c) ?? {};
     let config;
     try {
@@ -587,7 +753,8 @@ function createControlApp(options) {
             policy: config.agent.tools,
             fetchImpl: (input, init) => connectorFetch(input, { ...init, signal: AbortSignal.timeout(8e3) })
           });
-          return { ...api, capabilities };
+          const selectedTools = api.selectedTools?.filter((id) => capabilities.some((operation) => operation.operationId === id));
+          return { ...api, capabilities, ...api.selectedTools ? { selectedTools } : {} };
         } catch (error) {
           log({ level: "warn", event: "api_capability_inspection_failed", tenant: record.id, api: api.name, error: error instanceof Error ? error.message : String(error) });
           return { ...api, capabilities: [] };
@@ -652,7 +819,8 @@ function createControlApp(options) {
     try {
       if (result.failed.length) return c.json({ error: "Tool discovery could not connect. If this MCP requires a signed-in user, enter tool names from its tools/list response; Frankie will validate availability when that user chats." }, 422);
       const discoveredTools = result.tools.map((tool) => ({ name: tool.name.slice(("mcp__" + source.name + "__").length), description: tool.description }));
-      const config = parseFrankieConfig({ ...record.config, mcpServers: record.config.mcpServers.map((s) => s.name === source.name ? { ...s, discoveredTools } : s) });
+      const selectedTools = source.selectedTools?.filter((name) => discoveredTools.some((tool) => tool.name === name));
+      const config = parseFrankieConfig({ ...record.config, mcpServers: record.config.mcpServers.map((s) => s.name === source.name ? { ...s, discoveredTools, ...source.selectedTools ? { selectedTools } : {} } : s) });
       const updated = { ...record, config, updatedAt: (/* @__PURE__ */ new Date()).toISOString() };
       await store.put(updated);
       return c.json({ tenant: toPublicTenant(updated) });
@@ -683,9 +851,35 @@ function createControlApp(options) {
     await store.put(updated);
     return c.json({ tenant: toPublicTenant(updated) });
   });
+  app.put("/admin/tenants/:id/api-security", async (c) => {
+    const record = await own(c);
+    if (!record) return c.json({ error: "No such tenant." }, 404);
+    if (!await canAdminister(c, record)) return adminForbidden(c);
+    const body = await readJson(c);
+    const api = record.config.apis.find((s) => s.name === body?.name);
+    if (!api) return c.json({ error: "API source not found." }, 404);
+    if (!body?.security || typeof body.security !== "object") return c.json({ error: "`security` credentials are required." }, 400);
+    const security = { ...api.security };
+    for (const [scheme, value] of Object.entries(body.security)) {
+      if (typeof value !== "string") continue;
+      if (value.trim() === "") delete security[scheme];
+      else security[scheme] = value;
+    }
+    let config;
+    try {
+      config = parseFrankieConfig({ ...record.config, apis: record.config.apis.map((s) => s.name === api.name ? { ...s, security } : s) });
+    } catch (error) {
+      return c.json({ error: `Invalid security credentials: ${error.message}` }, 400);
+    }
+    const updated = { ...record, config, updatedAt: (/* @__PURE__ */ new Date()).toISOString() };
+    await store.put(updated);
+    log({ level: "info", event: "tenant_api_security_updated", tenant: record.id, api: api.name, schemes: Object.keys(security) });
+    return c.json({ tenant: toPublicTenant(updated) });
+  });
   app.put("/admin/tenants/:id/origins", async (c) => {
     const record = await own(c);
     if (!record) return c.json({ error: "No such tenant." }, 404);
+    if (!await canAdminister(c, record)) return adminForbidden(c);
     const body = await readJson(c) ?? {};
     let config;
     try {
@@ -733,6 +927,7 @@ function createControlApp(options) {
   app.post("/admin/tenants/:id/rotate-jwt-secret", async (c) => {
     const record = await own(c);
     if (!record) return c.json({ error: "No such tenant." }, 404);
+    if (!await canAdminister(c, record)) return adminForbidden(c);
     const jwtSecret = randomBytes(36).toString("base64");
     const updated = { ...record, jwtSecret, updatedAt: (/* @__PURE__ */ new Date()).toISOString() };
     await store.put(updated);
@@ -781,7 +976,7 @@ async function readJson(c) {
     return null;
   }
 }
-function slug(value) {
+function slug2(value) {
   return value.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "").slice(0, 40) || "tenant";
 }
 function mergeSources(current, updates) {
@@ -797,4 +992,4 @@ function mergeSources(current, updates) {
 export {
   createControlApp
 };
-//# sourceMappingURL=chunk-UZSHFMJN.js.map
+//# sourceMappingURL=chunk-NSOMFNTK.js.map