Merge pull request #3617 from fosrl/dev

Dev
This commit is contained in:
Milo Schwartz
2026-08-19 16:41:48 -04:00
committed by GitHub
21 changed files with 205 additions and 103 deletions
+3 -1
View File
@@ -1785,7 +1785,6 @@
"aiClientConfigDescriptionClaude": "Anthropic's agentic coding tool for the terminal.", "aiClientConfigDescriptionClaude": "Anthropic's agentic coding tool for the terminal.",
"aiClientConfigDescriptionCodex": "OpenAI's agentic coding tool for the terminal.", "aiClientConfigDescriptionCodex": "OpenAI's agentic coding tool for the terminal.",
"aiClientConfigDescriptionOpencode": "Open source terminal coding agent.", "aiClientConfigDescriptionOpencode": "Open source terminal coding agent.",
"aiClientConfigDescriptionCursor": "AI code editor built on VS Code.",
"aiClientConfigSetup": "Setup", "aiClientConfigSetup": "Setup",
"aiClientConfigTabCli": "Automatic (CLI)", "aiClientConfigTabCli": "Automatic (CLI)",
"aiClientConfigTabManual": "Manual Configuration", "aiClientConfigTabManual": "Manual Configuration",
@@ -3548,6 +3547,9 @@
"sidebarLogsAction": "Admin Action Logs", "sidebarLogsAction": "Admin Action Logs",
"logRetention": "Log Retention", "logRetention": "Log Retention",
"logRetentionDescription": "Manage how long different types of logs are retained for this organization or disable them", "logRetentionDescription": "Manage how long different types of logs are retained for this organization or disable them",
"logRetentionDisabledWarningTitle": "Log Retention Disabled",
"logRetentionDisabledWarningDescription": "{logType} are not being retained for this organization, so new activity will not appear here. Enable retention in security settings to start collecting these logs.",
"logRetentionDisabledWarningButton": "Go to Security Settings",
"requestLogsDescription": "View detailed request logs for HTTPS resources in this organization", "requestLogsDescription": "View detailed request logs for HTTPS resources in this organization",
"aiSessionLogs": "AI Gateway Session Logs", "aiSessionLogs": "AI Gateway Session Logs",
"aiSessionLogsDescription": "View prompt and response transcripts for AI gateway requests in this organization", "aiSessionLogsDescription": "View prompt and response transcripts for AI gateway requests in this organization",
-12
View File
@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg id="Ebene_1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 466.73 532.09">
<!-- Generator: Adobe Illustrator 29.6.1, SVG Export Plug-In . SVG Version: 2.1.1 Build 9) -->
<defs>
<style>
.st0 {
fill: #26251e;
}
</style>
</defs>
<path class="st0" d="M457.43,125.94L244.42,2.96c-6.84-3.95-15.28-3.95-22.12,0L9.3,125.94c-5.75,3.32-9.3,9.46-9.3,16.11v247.99c0,6.65,3.55,12.79,9.3,16.11l213.01,122.98c6.84,3.95,15.28,3.95,22.12,0l213.01-122.98c5.75-3.32,9.3-9.46,9.3-16.11v-247.99c0-6.65-3.55-12.79-9.3-16.11h-.01ZM444.05,151.99l-205.63,356.16c-1.39,2.4-5.06,1.42-5.06-1.36v-233.21c0-4.66-2.49-8.97-6.53-11.31L24.87,145.67c-2.4-1.39-1.42-5.06,1.36-5.06h411.26c5.84,0,9.49,6.33,6.57,11.39h-.01Z"/>
</svg>

Before

Width:  |  Height:  |  Size: 793 B

-12
View File
@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg id="Ebene_1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 466.73 532.09">
<!-- Generator: Adobe Illustrator 29.6.1, SVG Export Plug-In . SVG Version: 2.1.1 Build 9) -->
<defs>
<style>
.st0 {
fill: #edecec;
}
</style>
</defs>
<path class="st0" d="M457.43,125.94L244.42,2.96c-6.84-3.95-15.28-3.95-22.12,0L9.3,125.94c-5.75,3.32-9.3,9.46-9.3,16.11v247.99c0,6.65,3.55,12.79,9.3,16.11l213.01,122.98c6.84,3.95,15.28,3.95,22.12,0l213.01-122.98c5.75-3.32,9.3-9.46,9.3-16.11v-247.99c0-6.65-3.55-12.79-9.3-16.11h-.01ZM444.05,151.99l-205.63,356.16c-1.39,2.4-5.06,1.42-5.06-1.36v-233.21c0-4.66-2.49-8.97-6.53-11.31L24.87,145.67c-2.4-1.39-1.42-5.06,1.36-5.06h411.26c5.84,0,9.49,6.33,6.57,11.39h-.01Z"/>
</svg>

Before

Width:  |  Height:  |  Size: 793 B

+3 -1
View File
@@ -21,7 +21,9 @@ export function createAiGatewayServer() {
aiGatewayServer.use(helmet()); aiGatewayServer.use(helmet());
aiGatewayServer.use(cors()); aiGatewayServer.use(cors());
aiGatewayServer.use(express.json()); // AI requests can carry large payloads (long conversation history, tool
// results, embedded documents), well beyond express.json()'s 100kb default.
aiGatewayServer.use(express.json({ limit: "50mb" }));
aiGatewayServer.use(createAiGatewayRouter()); aiGatewayServer.use(createAiGatewayRouter());
+1 -1
View File
@@ -69,7 +69,7 @@ export const orgs = pgTable("orgs", {
"settingsLogRetentionDaysAISessions" "settingsLogRetentionDaysAISessions"
) // where 0 = dont keep logs and -1 = keep forever and 9001 = end of the following year ) // where 0 = dont keep logs and -1 = keep forever and 9001 = end of the following year
.notNull() .notNull()
.default(7), .default(0),
sshCaPrivateKey: text("sshCaPrivateKey"), // Encrypted SSH CA private key (PEM format) sshCaPrivateKey: text("sshCaPrivateKey"), // Encrypted SSH CA private key (PEM format)
sshCaPublicKey: text("sshCaPublicKey"), // SSH CA public key (OpenSSH format) sshCaPublicKey: text("sshCaPublicKey"), // SSH CA public key (OpenSSH format)
isBillingOrg: boolean("isBillingOrg"), isBillingOrg: boolean("isBillingOrg"),
+1 -1
View File
@@ -17,7 +17,7 @@ export type AiUsage = {
estimated: boolean; estimated: boolean;
}; };
function emptyUsage(): AiUsage { export function emptyUsage(): AiUsage {
return { return {
promptTokens: 0, promptTokens: 0,
cacheReadTokens: 0, cacheReadTokens: 0,
+5 -1
View File
@@ -443,7 +443,11 @@ export const configSchema = z
disable_config_managed_domains: z.boolean().optional(), disable_config_managed_domains: z.boolean().optional(),
disable_product_help_banners: z.boolean().optional(), disable_product_help_banners: z.boolean().optional(),
disable_enterprise_features: z.boolean().optional(), disable_enterprise_features: z.boolean().optional(),
enable_acme_cert_sync: z.boolean().optional().default(true) enable_acme_cert_sync: z.boolean().optional().default(true),
disable_private_http_placeholder: z
.boolean()
.optional()
.default(false)
}) })
.optional(), .optional(),
acme: z acme: z
+21 -7
View File
@@ -48,7 +48,7 @@ export class PrivateConfig {
this.rawPrivateConfig = parsedPrivateConfig; this.rawPrivateConfig = parsedPrivateConfig;
this.migrateDeprecatedAcmeConfig(privateEnvironment); this.migrateDeprecatedConfig(privateEnvironment);
process.env.BRANDING_HIDE_AUTH_LAYOUT_FOOTER = process.env.BRANDING_HIDE_AUTH_LAYOUT_FOOTER =
this.rawPrivateConfig.branding?.hide_auth_layout_footer === true this.rawPrivateConfig.branding?.hide_auth_layout_footer === true
@@ -152,12 +152,12 @@ export class PrivateConfig {
return this.rawPrivateConfig; return this.rawPrivateConfig;
} }
// `flags.enable_acme_cert_sync` and `acme` used to live in the private // `flags.enable_acme_cert_sync`, `flags.disable_private_http_placeholder`,
// config file. They now live in the public config file. If an operator // and `acme` used to live in the private config file. They now live in
// still has them set in the private config and hasn't moved them over to // the public config file. If an operator still has them set in the
// the public config, pull them forward so behavior doesn't silently // private config and hasn't moved them over to the public config, pull
// change out from under them. // them forward so behavior doesn't silently change out from under them.
private migrateDeprecatedAcmeConfig(privateEnvironment: any) { private migrateDeprecatedConfig(privateEnvironment: any) {
const publicEnvironment: any = readPublicConfigFile(); const publicEnvironment: any = readPublicConfigFile();
const rawConfig: any = config.getRawConfig(); const rawConfig: any = config.getRawConfig();
@@ -182,6 +182,20 @@ export class PrivateConfig {
); );
rawConfig.acme = this.rawPrivateConfig.acme; rawConfig.acme = this.rawPrivateConfig.acme;
} }
if (
privateEnvironment?.flags?.disable_private_http_placeholder !==
undefined &&
publicEnvironment?.flags?.disable_private_http_placeholder ===
undefined
) {
logger.warn(
"`flags.disable_private_http_placeholder` is deprecated in the private config file and has moved to the public config file. Using the value from the private config file for now, but please move it to the public config."
);
rawConfig.flags = rawConfig.flags ?? {};
rawConfig.flags.disable_private_http_placeholder =
this.rawPrivateConfig.flags.disable_private_http_placeholder;
}
} }
} }
+7 -4
View File
@@ -115,10 +115,13 @@ export const privateConfigSchema = z
// any value set here is migrated into the public config at // any value set here is migrated into the public config at
// startup by PrivateConfig (server/private/lib/config.ts). // startup by PrivateConfig (server/private/lib/config.ts).
enable_acme_cert_sync: z.boolean().optional(), enable_acme_cert_sync: z.boolean().optional(),
disable_private_http_placeholder: z // @deprecated Moved to the public config file as
.boolean() // `flags.disable_private_http_placeholder`
.optional() // (server/lib/readConfigFile.ts). Kept here only so existing
.default(false) // private config files keep parsing; any value set here is
// migrated into the public config at startup by PrivateConfig
// (server/private/lib/config.ts).
disable_private_http_placeholder: z.boolean().optional()
}) })
.optional() .optional()
.prefault({}), .prefault({}),
@@ -329,8 +329,7 @@ export async function getTraefikConfig(
}[] = []; }[] = [];
if ( if (
build == "enterprise" && build == "enterprise" &&
!privateConfig.getRawPrivateConfig().flags !config.getRawConfig().flags?.disable_private_http_placeholder
.disable_private_http_placeholder
) { ) {
// we dont want to do this on the cloud // we dont want to do this on the cloud
// Query siteResources in HTTP mode with SSL enabled and aliases - cert generation / HTTPS edge // Query siteResources in HTTP mode with SSL enabled and aliases - cert generation / HTTPS edge
+30 -12
View File
@@ -82,6 +82,7 @@ import {
needsStreamUsageInjection, needsStreamUsageInjection,
withStreamUsageOption, withStreamUsageOption,
extractResponseModel, extractResponseModel,
emptyUsage,
type AiUsage type AiUsage
} from "@server/lib/aiUsageExtraction"; } from "@server/lib/aiUsageExtraction";
import { streamAiGatewayResponse } from "@server/routers/aiGateway/streamAiGatewayResponse"; import { streamAiGatewayResponse } from "@server/routers/aiGateway/streamAiGatewayResponse";
@@ -713,19 +714,35 @@ export function recordAiGatewayCompletion(args: {
budgets budgets
} = args; } = args;
let usage: AiUsage | null = extractUsage( // A non-2xx status means the upstream provider rejected the request
capability, // (bad auth, invalid request, rate limit, 5xx, etc.) before ever running
responseText, // the model - no tokens were actually billed, so don't estimate usage
isStream, // off the error body text or price/charge it. We still record a
headers // zeroed-out row below (rather than skipping it) so request-count
); // dashboards built on aiUsageRecords keep counting every attempt.
if (!usage || isUsageEmpty(usage)) { const upstreamSucceeded = statusCode >= 200 && statusCode < 300;
usage = estimateUsage(JSON.stringify(requestBody ?? ""), responseText);
}
const model = extractResponseModel(responseText) ?? requestedModel; let usage: AiUsage;
const pricing = getModelPricing(provider.type as AiProviderType, model); let model: string | undefined;
const cost = calculateAiCost(pricing, usage); let pricing: ReturnType<typeof getModelPricing> = null;
let cost: ReturnType<typeof calculateAiCost> = null;
if (upstreamSucceeded) {
usage = extractUsage(capability, responseText, isStream, headers) ?? emptyUsage();
if (isUsageEmpty(usage)) {
usage = estimateUsage(
JSON.stringify(requestBody ?? ""),
responseText
);
}
model = extractResponseModel(responseText) ?? requestedModel;
pricing = getModelPricing(provider.type as AiProviderType, model);
cost = calculateAiCost(pricing, usage);
} else {
usage = emptyUsage();
model = requestedModel;
}
// Shared by the usage record and the session log so the two can be // Shared by the usage record and the session log so the two can be
// joined later to show token/cost usage alongside the transcript - // joined later to show token/cost usage alongside the transcript -
@@ -738,6 +755,7 @@ export function recordAiGatewayCompletion(args: {
providerId: provider.providerId, providerId: provider.providerId,
providerType: provider.type, providerType: provider.type,
model, model,
statusCode,
estimated: usage.estimated, estimated: usage.estimated,
promptTokens: usage.promptTokens, promptTokens: usage.promptTokens,
cacheReadTokens: usage.cacheReadTokens, cacheReadTokens: usage.cacheReadTokens,
@@ -19,6 +19,8 @@ import { getPrivateResourceSettingsHref } from "@app/lib/launcherResourceAdminHr
import axios from "axios"; import axios from "axios";
import { useStoredPageSize } from "@app/hooks/useStoredPageSize"; import { useStoredPageSize } from "@app/hooks/useStoredPageSize";
import { PaidFeaturesAlert } from "@app/components/PaidFeaturesAlert"; import { PaidFeaturesAlert } from "@app/components/PaidFeaturesAlert";
import LogRetentionWarning from "@app/components/LogRetentionWarning";
import { useOrgContext } from "@app/hooks/useOrgContext";
import { usePaidStatus } from "@app/hooks/usePaidStatus"; import { usePaidStatus } from "@app/hooks/usePaidStatus";
import { tierMatrix } from "@server/lib/billing/tierMatrix"; import { tierMatrix } from "@server/lib/billing/tierMatrix";
import { logQueries } from "@app/lib/queries"; import { logQueries } from "@app/lib/queries";
@@ -32,6 +34,7 @@ export default function GeneralPage() {
const t = useTranslations(); const t = useTranslations();
const { orgId } = useParams(); const { orgId } = useParams();
const { org } = useOrgContext();
const { isPaidUser } = usePaidStatus(); const { isPaidUser } = usePaidStatus();
const [isExporting, startTransition] = useTransition(); const [isExporting, startTransition] = useTransition();
@@ -529,6 +532,13 @@ export default function GeneralPage() {
<PaidFeaturesAlert tiers={tierMatrix.accessLogs} /> <PaidFeaturesAlert tiers={tierMatrix.accessLogs} />
{org.org.settingsLogRetentionDaysAccess === 0 && (
<LogRetentionWarning
orgId={orgId as string}
logTypeLabel={t("accessLogs")}
/>
)}
<LogDataTable <LogDataTable
columns={columns} columns={columns}
data={rows} data={rows}
@@ -3,8 +3,10 @@ import { ColumnFilterButton } from "@app/components/ColumnFilterButton";
import { DateTimeValue } from "@app/components/DateTimePicker"; import { DateTimeValue } from "@app/components/DateTimePicker";
import { LogDataTable } from "@app/components/LogDataTable"; import { LogDataTable } from "@app/components/LogDataTable";
import { PaidFeaturesAlert } from "@app/components/PaidFeaturesAlert"; import { PaidFeaturesAlert } from "@app/components/PaidFeaturesAlert";
import LogRetentionWarning from "@app/components/LogRetentionWarning";
import SettingsSectionTitle from "@app/components/SettingsSectionTitle"; import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
import { useEnvContext } from "@app/hooks/useEnvContext"; import { useEnvContext } from "@app/hooks/useEnvContext";
import { useOrgContext } from "@app/hooks/useOrgContext";
import { usePaidStatus } from "@app/hooks/usePaidStatus"; import { usePaidStatus } from "@app/hooks/usePaidStatus";
import { useStoredPageSize } from "@app/hooks/useStoredPageSize"; import { useStoredPageSize } from "@app/hooks/useStoredPageSize";
import { toast } from "@app/hooks/useToast"; import { toast } from "@app/hooks/useToast";
@@ -29,6 +31,7 @@ export default function GeneralPage() {
const { orgId } = useParams(); const { orgId } = useParams();
const searchParams = useSearchParams(); const searchParams = useSearchParams();
const { org } = useOrgContext();
const { isPaidUser } = usePaidStatus(); const { isPaidUser } = usePaidStatus();
const [isExporting, startTransition] = useTransition(); const [isExporting, startTransition] = useTransition();
@@ -359,6 +362,13 @@ export default function GeneralPage() {
<PaidFeaturesAlert tiers={tierMatrix.actionLogs} /> <PaidFeaturesAlert tiers={tierMatrix.actionLogs} />
{org.org.settingsLogRetentionDaysAction === 0 && (
<LogRetentionWarning
orgId={orgId as string}
logTypeLabel={t("actionLogs")}
/>
)}
<LogDataTable <LogDataTable
columns={columns} columns={columns}
data={rows} data={rows}
+11
View File
@@ -3,9 +3,11 @@ import { ColumnFilterButton } from "@app/components/ColumnFilterButton";
import { DateTimeValue } from "@app/components/DateTimePicker"; import { DateTimeValue } from "@app/components/DateTimePicker";
import { LogDataTable } from "@app/components/LogDataTable"; import { LogDataTable } from "@app/components/LogDataTable";
import { AiSessionChatView } from "@app/components/AiSessionChatView"; import { AiSessionChatView } from "@app/components/AiSessionChatView";
import LogRetentionWarning from "@app/components/LogRetentionWarning";
import SettingsSectionTitle from "@app/components/SettingsSectionTitle"; import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
import { Button } from "@app/components/ui/button"; import { Button } from "@app/components/ui/button";
import { useEnvContext } from "@app/hooks/useEnvContext"; import { useEnvContext } from "@app/hooks/useEnvContext";
import { useOrgContext } from "@app/hooks/useOrgContext";
import { toast } from "@app/hooks/useToast"; import { toast } from "@app/hooks/useToast";
import { createApiClient } from "@app/lib/api"; import { createApiClient } from "@app/lib/api";
import { useTranslations } from "next-intl"; import { useTranslations } from "next-intl";
@@ -41,6 +43,8 @@ export default function AiSessionLogsPage() {
const { orgId } = useParams(); const { orgId } = useParams();
const searchParams = useSearchParams(); const searchParams = useSearchParams();
const { org } = useOrgContext();
const [isExporting, startTransition] = useTransition(); const [isExporting, startTransition] = useTransition();
const [currentPage, setCurrentPage] = useState<number>(0); const [currentPage, setCurrentPage] = useState<number>(0);
@@ -641,6 +645,13 @@ export default function AiSessionLogsPage() {
description={t("aiSessionLogsDescription")} description={t("aiSessionLogsDescription")}
/> />
{org.org.settingsLogRetentionDaysAISessions === 0 && (
<LogRetentionWarning
orgId={orgId as string}
logTypeLabel={t("aiSessionLogs")}
/>
)}
<LogDataTable <LogDataTable
columns={columns} columns={columns}
data={rows} data={rows}
@@ -4,8 +4,10 @@ import { ColumnFilterButton } from "@app/components/ColumnFilterButton";
import { DateTimeValue } from "@app/components/DateTimePicker"; import { DateTimeValue } from "@app/components/DateTimePicker";
import { LogDataTable } from "@app/components/LogDataTable"; import { LogDataTable } from "@app/components/LogDataTable";
import { PaidFeaturesAlert } from "@app/components/PaidFeaturesAlert"; import { PaidFeaturesAlert } from "@app/components/PaidFeaturesAlert";
import LogRetentionWarning from "@app/components/LogRetentionWarning";
import SettingsSectionTitle from "@app/components/SettingsSectionTitle"; import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
import { useEnvContext } from "@app/hooks/useEnvContext"; import { useEnvContext } from "@app/hooks/useEnvContext";
import { useOrgContext } from "@app/hooks/useOrgContext";
import { usePaidStatus } from "@app/hooks/usePaidStatus"; import { usePaidStatus } from "@app/hooks/usePaidStatus";
import { useStoredPageSize } from "@app/hooks/useStoredPageSize"; import { useStoredPageSize } from "@app/hooks/useStoredPageSize";
import { toast } from "@app/hooks/useToast"; import { toast } from "@app/hooks/useToast";
@@ -47,6 +49,7 @@ export default function ConnectionLogsPage() {
const { orgId } = useParams(); const { orgId } = useParams();
const searchParams = useSearchParams(); const searchParams = useSearchParams();
const { org } = useOrgContext();
const { isPaidUser } = usePaidStatus(); const { isPaidUser } = usePaidStatus();
const [isExporting, startTransition] = useTransition(); const [isExporting, startTransition] = useTransition();
@@ -582,6 +585,13 @@ export default function ConnectionLogsPage() {
<PaidFeaturesAlert tiers={tierMatrix.connectionLogs} /> <PaidFeaturesAlert tiers={tierMatrix.connectionLogs} />
{org.org.settingsLogRetentionDaysConnection === 0 && (
<LogRetentionWarning
orgId={orgId as string}
logTypeLabel={t("connectionLogs")}
/>
)}
<LogDataTable <LogDataTable
columns={columns} columns={columns}
data={rows} data={rows}
+13 -1
View File
@@ -1,6 +1,8 @@
import { verifySession } from "@app/lib/auth/verifySession"; import { verifySession } from "@app/lib/auth/verifySession";
import { redirect } from "next/navigation"; import { redirect } from "next/navigation";
import { cache } from "react"; import { cache } from "react";
import OrgProvider from "@app/providers/OrgProvider";
import { getCachedOrg } from "@app/lib/api/getCachedOrg";
type GeneralSettingsProps = { type GeneralSettingsProps = {
children: React.ReactNode; children: React.ReactNode;
@@ -11,6 +13,8 @@ export default async function GeneralSettingsPage({
children, children,
params params
}: GeneralSettingsProps) { }: GeneralSettingsProps) {
const { orgId } = await params;
const getUser = cache(verifySession); const getUser = cache(verifySession);
const user = await getUser(); const user = await getUser();
@@ -18,5 +22,13 @@ export default async function GeneralSettingsPage({
redirect(`/`); redirect(`/`);
} }
return children; let org = null;
try {
const res = await getCachedOrg(orgId);
org = res.data.data;
} catch {
redirect(`/${orgId}`);
}
return <OrgProvider org={org}>{children}</OrgProvider>;
} }
@@ -2,9 +2,11 @@
import { ColumnFilter } from "@app/components/ColumnFilter"; import { ColumnFilter } from "@app/components/ColumnFilter";
import { DateTimeValue } from "@app/components/DateTimePicker"; import { DateTimeValue } from "@app/components/DateTimePicker";
import { LogDataTable } from "@app/components/LogDataTable"; import { LogDataTable } from "@app/components/LogDataTable";
import LogRetentionWarning from "@app/components/LogRetentionWarning";
import SettingsSectionTitle from "@app/components/SettingsSectionTitle"; import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
import { Button } from "@app/components/ui/button"; import { Button } from "@app/components/ui/button";
import { useEnvContext } from "@app/hooks/useEnvContext"; import { useEnvContext } from "@app/hooks/useEnvContext";
import { useOrgContext } from "@app/hooks/useOrgContext";
import { toast } from "@app/hooks/useToast"; import { toast } from "@app/hooks/useToast";
import { createApiClient } from "@app/lib/api"; import { createApiClient } from "@app/lib/api";
import { useTranslations } from "next-intl"; import { useTranslations } from "next-intl";
@@ -29,6 +31,8 @@ export default function GeneralPage() {
const { orgId } = useParams(); const { orgId } = useParams();
const searchParams = useSearchParams(); const searchParams = useSearchParams();
const { org } = useOrgContext();
const [isExporting, startTransition] = useTransition(); const [isExporting, startTransition] = useTransition();
const [currentPage, setCurrentPage] = useState<number>(0); const [currentPage, setCurrentPage] = useState<number>(0);
@@ -714,6 +718,13 @@ export default function GeneralPage() {
description={t("requestLogsDescription")} description={t("requestLogsDescription")}
/> />
{org.org.settingsLogRetentionDaysRequest === 0 && (
<LogRetentionWarning
orgId={orgId as string}
logTypeLabel={t("requestLogs")}
/>
)}
<LogDataTable <LogDataTable
columns={columns} columns={columns}
data={rows} data={rows}
@@ -201,7 +201,11 @@ export default async function ResourceAuthPage(props: {
// Inference resources never establish a resource session on the inference // Inference resources never establish a resource session on the inference
// host. Authenticated users retrieve their virtual API key on the dashboard. // host. Authenticated users retrieve their virtual API key on the dashboard.
if (isInference && user) { if (isInference && user) {
redirect(keysPath); if (host !== expectedHost) {
redirect(`/auth/org?redirect=${encodeURIComponent(keysPath)}`);
} else {
redirect(keysPath);
}
} }
// After password/pincode/SSO, do not send the browser back to the // After password/pincode/SSO, do not send the browser back to the
+40
View File
@@ -0,0 +1,40 @@
"use client";
import ActionBanner from "@app/components/ActionBanner";
import { Button } from "@app/components/ui/button";
import { ArrowRight, ShieldAlert } from "lucide-react";
import { useTranslations } from "next-intl";
import Link from "next/link";
type LogRetentionWarningProps = {
orgId: string;
logTypeLabel: string;
};
export function LogRetentionWarning({
orgId,
logTypeLabel
}: LogRetentionWarningProps) {
const t = useTranslations();
return (
<ActionBanner
variant="warning"
title={t("logRetentionDisabledWarningTitle")}
titleIcon={<ShieldAlert className="w-5 h-5" />}
description={t("logRetentionDisabledWarningDescription", {
logType: logTypeLabel
})}
actions={
<Link href={`/${orgId}/settings/general/security`}>
<Button variant="outline" className="gap-2">
{t("logRetentionDisabledWarningButton")}
<ArrowRight className="size-4" />
</Button>
</Link>
}
/>
);
}
export default LogRetentionWarning;
@@ -49,10 +49,6 @@ const CLIENT_LOGOS = {
opencode: { opencode: {
light: "/third-party/opencode-dark.svg", light: "/third-party/opencode-dark.svg",
dark: "/third-party/opencode-light.svg" dark: "/third-party/opencode-light.svg"
},
cursor: {
light: "/third-party/cursor-dark.svg",
dark: "/third-party/cursor-light.svg"
} }
} as const; } as const;
@@ -69,8 +65,7 @@ export function AiClientConfigSection({
const descriptions: Record<string, string> = { const descriptions: Record<string, string> = {
claude: t("aiClientConfigDescriptionClaude"), claude: t("aiClientConfigDescriptionClaude"),
codex: t("aiClientConfigDescriptionCodex"), codex: t("aiClientConfigDescriptionCodex"),
opencode: t("aiClientConfigDescriptionOpencode"), opencode: t("aiClientConfigDescriptionOpencode")
cursor: t("aiClientConfigDescriptionCursor")
}; };
return ( return (
+22 -41
View File
@@ -1,11 +1,10 @@
export const AI_CLIENT_IDS = ["claude", "codex", "opencode", "cursor"] as const; export const AI_CLIENT_IDS = ["claude", "codex", "opencode"] as const;
export type AiClientId = (typeof AI_CLIENT_IDS)[number]; export type AiClientId = (typeof AI_CLIENT_IDS)[number];
export const AI_CLIENT_NAMES: Record<AiClientId, string> = { export const AI_CLIENT_NAMES: Record<AiClientId, string> = {
claude: "Claude Code", claude: "Claude Code",
codex: "Codex", codex: "Codex",
opencode: "OpenCode", opencode: "OpenCode"
cursor: "Cursor"
}; };
/** Auth as supplied by callers: the real key isn't fetched yet. */ /** Auth as supplied by callers: the real key isn't fetched yet. */
@@ -293,7 +292,7 @@ function buildOpencodeGuide(
' "options": {', ' "options": {',
` "baseURL": "${endpoint}/v1"`, ` "baseURL": "${endpoint}/v1"`,
" }", " }",
" }", " },",
' "openai": {', ' "openai": {',
' "options": {', ' "options": {',
` "baseURL": "${endpoint}/v1"`, ` "baseURL": "${endpoint}/v1"`,
@@ -314,12 +313,26 @@ function buildOpencodeGuide(
' "anthropic": {', ' "anthropic": {',
' "type": "api",', ' "type": "api",',
` "key": "${key}"`, ` "key": "${key}"`,
" },",
' "openai": {',
' "type": "api",',
` "key": "${key}"`,
" }", " }",
"}" "}"
].join("\n"), ].join("\n"),
auth auth
); );
const moreProviders = block(
"opencode-more-providers",
"More providers",
() =>
"OpenCode configures providers individually, so Anthropic and OpenAI are just the ones set up above. " +
'You can point any other OpenCode-supported provider (e.g. "openrouter", "google", "groq") at this gateway the same way: add a matching entry under "provider" in opencode.json, and under auth.json if it needs an API key.',
auth,
"steps"
);
return { return {
id: "opencode", id: "opencode",
name: AI_CLIENT_NAMES.opencode, name: AI_CLIENT_NAMES.opencode,
@@ -329,41 +342,10 @@ function buildOpencodeGuide(
id: "default", id: "default",
label: "Default", label: "Default",
relation: "steps", relation: "steps",
blocks: [config, authFile] blocks:
} auth.mode === "keyed"
] ? [config, authFile, moreProviders]
}; : [config, moreProviders]
}
function buildCursorGuide(endpoint: string, auth: AiClientAuth): AiClientGuide {
const steps = block(
"cursor-steps",
"Cursor Settings",
(key) =>
[
"1. Open Cursor Settings -> Models.",
'2. Enable "Override OpenAI Base URL".',
`3. Set the base URL to: ${endpoint}/v1`,
auth.mode === "keyed"
? `4. Paste your API key into the OpenAI API Key field: ${key}`
: '4. Leave the OpenAI API Key field set to a placeholder (e.g. "-"). Pangolin authenticates the request over your Newt/Olm connection automatically.',
"5. Add a custom model matching the model your Pangolin AI Gateway serves (e.g. claude-sonnet-4-6)."
].join("\n"),
auth,
"steps",
true
);
return {
id: "cursor",
name: AI_CLIENT_NAMES.cursor,
cli: null,
presets: [
{
id: "default",
label: "Default",
relation: "steps",
blocks: [steps]
} }
] ]
}; };
@@ -379,8 +361,7 @@ const GUIDE_BUILDERS: Record<
> = { > = {
claude: buildClaudeGuide, claude: buildClaudeGuide,
codex: buildCodexGuide, codex: buildCodexGuide,
opencode: buildOpencodeGuide, opencode: buildOpencodeGuide
cursor: buildCursorGuide
}; };
export function buildAiClientGuide( export function buildAiClientGuide(