plugin-ai-api 1.0.25 → 1.1.0

package/dist/server/plugin.js

@@ -44,7 +44,7 @@ var import_server = require("@nocobase/server");
 var import_router = require("./routes/router");
 var import_ai_api_config = __toESM(require("./resource/ai-api-config"));
 var import_ai_api_usage_monitor = __toESM(require("./resource/ai-api-usage-monitor"));
-var import_ai_api_user_permissions = __toESM(require("./resource/ai-api-user-permissions"));
+var import_ai_api_usage_groups = __toESM(require("./resource/ai-api-usage-groups"));
 var import_rate_limiter = require("./utils/rate-limiter");
 var import_role_permission = require("./middleware/role-permission");
 var import_user_permissions = require("./utils/user-permissions");
@@ -59,7 +59,7 @@ import_dayjs.default.extend(import_timezone.default);
 class PluginAiApiServer extends import_server.Plugin {
   /**
    * Singleton rate limiter — lives for the entire plugin lifetime, shared across all requests.
-   * Uses a 1-minute sliding window to enforce rateLimitPerMinute from aiApiConfig.
+   * Uses a 1-minute sliding window to enforce rateLimitPerMinute from the user's usage group.
    */
   rateLimiter = new import_rate_limiter.RateLimiter(6e4);
   /**
@@ -77,8 +77,54 @@ class PluginAiApiServer extends import_server.Plugin {
     this.app.db.on("aiApiModelMetadata.beforeSave", (model) => {
       (0, import_validation.validateModelMetadata)(model);
     });
-    this.app.db.on("aiApiUserQuotaPolicies.beforeSave", (model) => {
+    this.app.db.on("aiApiUsageGroups.beforeSave", async (model, options) => {
       (0, import_validation.validateQuotaPolicy)(model);
+      if (model.get("isDefault")) {
+        const filter = { isDefault: true };
+        if (model.get("id")) filter.id = { $ne: model.get("id") };
+        const other = await this.db.getRepository("aiApiUsageGroups").findOne({
+          filter,
+          transaction: options == null ? void 0 : options.transaction
+        });
+        if (other) {
+          throw new Error("Only one default usage group is allowed.");
+        }
+      }
+    });
+    this.app.db.on("aiApiGroupMembers.beforeSave", async (model, options) => {
+      const userId = model.get("userId");
+      if (!userId) return;
+      const existing = await this.db.getRepository("aiApiGroupMembers").findOne({
+        filter: { userId },
+        transaction: options == null ? void 0 : options.transaction
+      });
+      if (existing && existing.get("id") !== model.get("id")) {
+        throw new Error("User already belongs to another usage group.");
+      }
+    });
+    this.app.db.on("aiApiUsageGroups.beforeDestroy", async (model, options) => {
+      if (model.get("isDefault")) {
+        throw new Error("The default usage group cannot be deleted.");
+      }
+      const members = await this.db.getRepository("aiApiGroupMembers").find({
+        filter: { groupId: model.get("id") },
+        transaction: options == null ? void 0 : options.transaction
+      });
+      if (members.length === 0) return;
+      const defaultGroup = await this.db.getRepository("aiApiUsageGroups").findOne({
+        filter: { isDefault: true },
+        transaction: options == null ? void 0 : options.transaction
+      });
+      if (!defaultGroup) {
+        throw new Error("Default usage group is missing; cannot reassign members.");
+      }
+      for (const member of members) {
+        await this.db.getRepository("aiApiGroupMembers").update({
+          filterByTk: member.get("id"),
+          values: { groupId: defaultGroup.get("id") },
+          transaction: options == null ? void 0 : options.transaction
+        });
+      }
     });
   }
   async load() {
@@ -95,18 +141,18 @@ class PluginAiApiServer extends import_server.Plugin {
     this.app.use((0, import_router.createAiLlmRouter)(this), { after: "idp-oauth-resource-auth", before: "resourcer" });
     this.app.resourceManager.define(import_ai_api_config.default);
     this.app.resourceManager.define(import_ai_api_usage_monitor.default);
-    this.app.resourceManager.define(import_ai_api_user_permissions.default);
+    this.app.resourceManager.define(import_ai_api_usage_groups.default);
     this.app.db.on("aiApiRolePermissions.afterSave", (model) => {
       (0, import_role_permission.invalidateRolePermissionCache)(model.get("roleName"));
     });
     this.app.db.on("aiApiRolePermissions.afterDestroy", (model) => {
       (0, import_role_permission.invalidateRolePermissionCache)(model.get("roleName"));
     });
-    this.app.db.on("aiApiUserPermissions.afterSave", (model, options) => {
-      this.revokeUserPermissions(model.get("userId"), options == null ? void 0 : options.transaction);
+    this.app.db.on("aiApiUsageGroups.afterSave", (model, options) => {
+      this.invalidateGroupAccess(model.get("id"), options == null ? void 0 : options.transaction);
     });
-    this.app.db.on("aiApiUserPermissions.afterDestroy", (model, options) => {
-      this.revokeUserPermissions(model.get("userId"), options == null ? void 0 : options.transaction);
+    this.app.db.on("aiApiUsageGroups.afterDestroy", (model, options) => {
+      this.invalidateGroupAccess(model.get("id"), options == null ? void 0 : options.transaction);
     });
     this.app.acl.registerSnippet({
       name: import_constants.AI_API_ACL_SNIPPET,
@@ -115,38 +161,35 @@ class PluginAiApiServer extends import_server.Plugin {
         "aiApiRolePermissions:*",
         "aiApiModelPrices:*",
         "aiApiModelMetadata:*",
-        "aiApiUserQuotaPolicies:*",
-        "aiApiUserQuotaBuckets:list",
-        "aiApiUserQuotaBuckets:get",
+        "aiApiUsageGroups:*",
+        "aiApiGroupMembers:*",
+        "aiApiGroupQuotaBuckets:list",
+        "aiApiGroupQuotaBuckets:get",
         "aiApiUsageRecords:list",
         "aiApiUsageRecords:get",
         "aiApiUsageMonitor:summary"
       ]
     });
-    this.app.acl.registerSnippet({
-      name: import_constants.AI_API_USER_PERMISSIONS_SNIPPET,
-      actions: ["aiApiUserPermissions:*"]
-    });
     this.gcInterval = setInterval(() => this.rateLimiter.gc(), 5 * 60 * 1e3);
     this.gcInterval.unref();
   }
   /**
-   * Drop a user's cached LLM scope on every node.
+   * Drop a group's cached model-access scope on every node.
    *
    * The local call is not redundant: syncMessageManager hardcodes skipSelf, so the publishing
    * node never receives its own message. Passing the transaction defers the broadcast until
    * the write commits, so other nodes cannot re-read the old row and re-cache it.
    */
-  revokeUserPermissions(userId, transaction) {
-    (0, import_user_permissions.invalidateUserPermissionCache)(userId);
-    this.sendSyncMessage({ type: "invalidateUserPermissions", userId }, { transaction });
+  invalidateGroupAccess(groupId, transaction) {
+    (0, import_user_permissions.invalidateGroupAccessCache)(groupId);
+    this.sendSyncMessage({ type: "invalidateGroupAccess", groupId }, { transaction });
   }
   /**
    * Received only on the *other* nodes (skipSelf), so this must not re-broadcast.
    */
   async handleSyncMessage(message) {
-    if ((message == null ? void 0 : message.type) === "invalidateUserPermissions") {
-      (0, import_user_permissions.invalidateUserPermissionCache)(message.userId);
+    if ((message == null ? void 0 : message.type) === "invalidateGroupAccess") {
+      (0, import_user_permissions.invalidateGroupAccessCache)(message.groupId);
     }
   }
   async install() {
@@ -156,13 +199,38 @@ class PluginAiApiServer extends import_server.Plugin {
         values: {
           defaultAiEmployee: "",
           enabledLlmServices: [],
-          rateLimitPerMinute: 60,
           quotaEnabled: false,
           pdfRenderPagesAsImages: false,
           defaultReservationOutputTokens: 4096
         }
       });
     }
+    const defaultGroup = await this.db.getRepository("aiApiUsageGroups").findOne({
+      filter: { isDefault: true }
+    });
+    if (!defaultGroup) {
+      await this.db.getRepository("aiApiUsageGroups").create({
+        values: {
+          name: "Default",
+          isDefault: true,
+          quotaMode: "per_user",
+          rateLimitPerMinute: 60,
+          enabled: false,
+          periodType: "monthly",
+          timezone: "UTC",
+          requestLimit: null,
+          totalTokenLimit: null,
+          costLimit: null,
+          currency: "USD",
+          rejectUnpricedModel: true,
+          missingUsageBehavior: "use_reserved",
+          contextOverflowBehavior: "reject",
+          allowedLlmServices: [],
+          allowAllModels: true,
+          allowedModels: []
+        }
+      });
+    }
   }
   async afterEnable() {
   }

package/dist/server/quota-groups.js

@@ -0,0 +1,108 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var quota_groups_exports = {};
+__export(quota_groups_exports, {
+  getDefaultGroup: () => getDefaultGroup,
+  modelToGroup: () => modelToGroup,
+  resolveUserGroup: () => resolveUserGroup
+});
+module.exports = __toCommonJS(quota_groups_exports);
+async function getDefaultGroup(ctx) {
+  const existing = await ctx.db.getRepository("aiApiUsageGroups").findOne({
+    filter: { isDefault: true }
+  });
+  if (existing) {
+    return modelToGroup(existing);
+  }
+  const created = await ctx.db.getRepository("aiApiUsageGroups").create({
+    values: {
+      name: "Default",
+      isDefault: true,
+      quotaMode: "per_user",
+      rateLimitPerMinute: 60,
+      enabled: false,
+      periodType: "monthly",
+      timezone: "UTC",
+      requestLimit: null,
+      totalTokenLimit: null,
+      costLimit: null,
+      currency: "USD",
+      rejectUnpricedModel: true,
+      missingUsageBehavior: "use_reserved",
+      contextOverflowBehavior: "reject",
+      allowedLlmServices: [],
+      allowAllModels: true,
+      allowedModels: []
+    }
+  });
+  return modelToGroup(created);
+}
+async function resolveUserGroup(ctx, userId) {
+  if (userId === void 0 || userId === null) {
+    return getDefaultGroup(ctx);
+  }
+  const member = await ctx.db.getRepository("aiApiGroupMembers").findOne({
+    filter: { userId },
+    appends: ["group"]
+  });
+  if (member && member.get("group")) {
+    return modelToGroup(member.get("group"));
+  }
+  return getDefaultGroup(ctx);
+}
+function modelToGroup(model) {
+  const record = typeof model.get === "function" ? model.get() : model;
+  return {
+    id: record.id,
+    name: record.name ?? "",
+    isDefault: !!record.isDefault,
+    quotaMode: record.quotaMode ?? "per_user",
+    rateLimitPerMinute: Number(record.rateLimitPerMinute ?? 60),
+    enabled: !!record.enabled,
+    periodType: record.periodType ?? "monthly",
+    timezone: record.timezone ?? "UTC",
+    requestLimit: record.requestLimit ?? null,
+    totalTokenLimit: record.totalTokenLimit ?? null,
+    costLimit: record.costLimit ?? null,
+    currency: record.currency ?? "USD",
+    rejectUnpricedModel: !!record.rejectUnpricedModel,
+    missingUsageBehavior: record.missingUsageBehavior ?? "use_reserved",
+    contextOverflowBehavior: record.contextOverflowBehavior ?? "reject",
+    allowedLlmServices: stringArray(record.allowedLlmServices),
+    allowAllModels: record.allowAllModels !== false,
+    allowedModels: stringArray(record.allowedModels)
+  };
+}
+function stringArray(value) {
+  return Array.isArray(value) ? value.filter((item) => typeof item === "string") : [];
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getDefaultGroup,
+  modelToGroup,
+  resolveUserGroup
+});

package/dist/server/resource/ai-api-config.js

@@ -53,7 +53,6 @@ const aiApiConfigResource = {
             defaultAiEmployee: "",
             defaultLlmService: "",
             enabledLlmServices: [],
-            rateLimitPerMinute: 60,
             maxRequestBodyMb: 10,
             pdfRenderPagesAsImages: false,
             quotaEnabled: false,
@@ -76,7 +75,6 @@ const aiApiConfigResource = {
             defaultAiEmployee: values.defaultAiEmployee ?? "",
             defaultLlmService: values.defaultLlmService ?? "",
             enabledLlmServices: values.enabledLlmServices ?? [],
-            rateLimitPerMinute: values.rateLimitPerMinute ?? 60,
             maxRequestBodyMb: coerceMaxRequestBodyMb(values.maxRequestBodyMb ?? DEFAULT_MAX_REQUEST_BODY_MB),
             pdfRenderPagesAsImages: values.pdfRenderPagesAsImages ?? false,
             quotaEnabled: values.quotaEnabled ?? false,
@@ -90,7 +88,6 @@ const aiApiConfigResource = {
         if (values.defaultAiEmployee !== void 0) updateData.defaultAiEmployee = values.defaultAiEmployee;
         if (values.defaultLlmService !== void 0) updateData.defaultLlmService = values.defaultLlmService;
         if (values.enabledLlmServices !== void 0) updateData.enabledLlmServices = values.enabledLlmServices;
-        if (values.rateLimitPerMinute !== void 0) updateData.rateLimitPerMinute = values.rateLimitPerMinute;
         if (values.maxRequestBodyMb !== void 0) {
           updateData.maxRequestBodyMb = coerceMaxRequestBodyMb(values.maxRequestBodyMb);
         }

package/dist/server/resource/ai-api-usage-groups.js

@@ -0,0 +1,168 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var ai_api_usage_groups_exports = {};
+__export(ai_api_usage_groups_exports, {
+  default: () => ai_api_usage_groups_default
+});
+module.exports = __toCommonJS(ai_api_usage_groups_exports);
+const USER_SUMMARY_FIELDS = ["id", "username", "nickname", "email"];
+async function getByUser(ctx, next) {
+  const { userId } = ctx.action.params;
+  if (!userId) {
+    ctx.throw(400, "userId is required");
+  }
+  const member = await ctx.db.getRepository("aiApiGroupMembers").findOne({
+    filter: { userId },
+    appends: ["group"]
+  });
+  if (member && member.get("group")) {
+    ctx.body = member.get("group");
+    return next();
+  }
+  const defaultGroup = await ctx.db.getRepository("aiApiUsageGroups").findOne({
+    filter: { isDefault: true }
+  });
+  if (!defaultGroup) {
+    ctx.throw(404, "Default group not found");
+  }
+  ctx.body = defaultGroup;
+  return next();
+}
+async function listUnassignedUsers(ctx, next) {
+  const { page = 1, pageSize = 20, keyword } = ctx.action.params;
+  const memberRows = await ctx.db.getRepository("aiApiGroupMembers").find({
+    fields: ["userId"],
+    pageSize: 1e4
+  });
+  const assignedUserIds = memberRows.map((row) => {
+    var _a;
+    const value = ((_a = row.get) == null ? void 0 : _a.call(row, "userId")) ?? row.userId;
+    return String(value);
+  });
+  const where = {};
+  if (keyword) {
+    where.$or = [
+      { username: { $includes: keyword } },
+      { email: { $includes: keyword } },
+      { nickname: { $includes: keyword } }
+    ];
+  }
+  if (assignedUserIds.length > 0) {
+    where.id = { $notIn: assignedUserIds };
+  }
+  const repository = ctx.db.getRepository("users");
+  const [rows, count] = await repository.findAndCount({
+    filter: where,
+    fields: USER_SUMMARY_FIELDS,
+    page: Number(page),
+    pageSize: Number(pageSize)
+  });
+  ctx.body = { rows, count };
+  return next();
+}
+async function searchUsers(ctx, next) {
+  const { keyword, pageSize = 20 } = ctx.action.params;
+  const where = {};
+  if (keyword) {
+    where.$or = [
+      { username: { $includes: keyword } },
+      { email: { $includes: keyword } },
+      { nickname: { $includes: keyword } }
+    ];
+  }
+  const [rows, count] = await ctx.db.getRepository("users").findAndCount({
+    filter: where,
+    fields: USER_SUMMARY_FIELDS,
+    page: 1,
+    pageSize: Number(pageSize)
+  });
+  ctx.body = { rows, count };
+  return next();
+}
+async function addMember(ctx, next) {
+  const { groupId, userId } = ctx.action.params.values || ctx.action.params || {};
+  if (!groupId || !userId) {
+    ctx.throw(400, "groupId and userId are required");
+  }
+  const group = await ctx.db.getRepository("aiApiUsageGroups").findOne({
+    filterByTk: groupId
+  });
+  if (!group) {
+    ctx.throw(404, "Usage group not found");
+  }
+  if (group.get("isDefault")) {
+    ctx.throw(400, "Cannot add members to the default group: users without another group use it automatically");
+  }
+  const existing = await ctx.db.getRepository("aiApiGroupMembers").findOne({
+    filter: { userId }
+  });
+  if (existing) {
+    ctx.throw(409, "User already belongs to a group");
+  }
+  const member = await ctx.db.getRepository("aiApiGroupMembers").create({
+    values: { groupId, userId }
+  });
+  ctx.body = member;
+  return next();
+}
+async function removeMember(ctx, next) {
+  const { groupId, userId } = ctx.action.params.values || ctx.action.params || {};
+  if (!groupId || !userId) {
+    ctx.throw(400, "groupId and userId are required");
+  }
+  const member = await ctx.db.getRepository("aiApiGroupMembers").findOne({
+    filter: { groupId, userId }
+  });
+  if (!member) {
+    ctx.throw(404, "Member not found");
+  }
+  await ctx.db.getRepository("aiApiGroupMembers").destroy({
+    filterByTk: member.get("id")
+  });
+  ctx.body = member;
+  return next();
+}
+var ai_api_usage_groups_default = {
+  name: "aiApiUsageGroups",
+  actions: {
+    getByUser: {
+      handler: getByUser
+    },
+    listUnassignedUsers: {
+      handler: listUnassignedUsers
+    },
+    searchUsers: {
+      handler: searchUsers
+    },
+    addMember: {
+      handler: addMember
+    },
+    removeMember: {
+      handler: removeMember
+    }
+  }
+};

package/dist/server/routes/agent-completions.js

@@ -33,6 +33,7 @@ var import_openai_format = require("../utils/openai-format");
 var import_resolve_service = require("../utils/resolve-service");
 var import_role_permission = require("../middleware/role-permission");
 var import_user_permissions = require("../utils/user-permissions");
+var import_request_cache = require("../utils/request-cache");
 var import_streaming = require("../utils/streaming");
 var import_ai_employee_runtime = require("../utils/ai-employee-runtime");
 var import_usage = require("../usage");
@@ -60,7 +61,7 @@ async function handleAgentCompletions(ctx, plugin) {
     );
     return;
   }
-  const config = await ctx.db.getRepository("aiApiConfig").findOne();
+  const config = await (0, import_request_cache.getAiApiConfig)(ctx);
   const defaultAiEmployee = config ? config.get("defaultAiEmployee") || config.defaultAiEmployee : null;
   if (!defaultAiEmployee) {
     ctx.status = 400;

package/dist/server/routes/chat-completions.js

@@ -27,6 +27,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var chat_completions_exports = {};
 __export(chat_completions_exports, {
   applyProviderRequestParameters: () => applyProviderRequestParameters,
+  extractFinishReason: () => extractFinishReason,
   findContentBlockProblem: () => findContentBlockProblem,
   findMessageProblem: () => findMessageProblem,
   getProviderRequestParameters: () => getProviderRequestParameters,
@@ -37,8 +38,8 @@ module.exports = __toCommonJS(chat_completions_exports);
 var import_openai_format = require("../utils/openai-format");
 var import_resolve_service = require("../utils/resolve-service");
 var import_streaming = require("../utils/streaming");
-var import_role_permission = require("../middleware/role-permission");
 var import_user_permissions = require("../utils/user-permissions");
+var import_request_cache = require("../utils/request-cache");
 var import_usage = require("../usage");
 var import_billing = require("../billing");
 var import_direct_llm_context = require("../utils/direct-llm-context");
@@ -119,7 +120,7 @@ async function handleChatCompletions(ctx, plugin) {
       );
       return;
     }
-    const config = await ctx.db.getRepository("aiApiConfig").findOne();
+    const config = await (0, import_request_cache.getAiApiConfig)(ctx);
     if (!await (0, import_user_permissions.enforceModelAccess)(ctx, config == null ? void 0 : config.enabledLlmServices, service, modelId)) {
       return;
     }
@@ -148,30 +149,7 @@ async function handleChatCompletions(ctx, plugin) {
     if (body.frequency_penalty !== void 0) modelOptions.frequencyPenalty = body.frequency_penalty;
     if (body.presence_penalty !== void 0) modelOptions.presencePenalty = body.presence_penalty;
     if (body.stop !== void 0) modelOptions.stop = body.stop;
-    let systemPrompt = "";
-    if (config == null ? void 0 : config.defaultAiEmployee) {
-      if (!(0, import_role_permission.checkEmployeeAccess)(ctx, config.defaultAiEmployee)) {
-        ctx.status = 403;
-        ctx.body = (0, import_openai_format.toOpenAIError)(
-          403,
-          `Role is not permitted to use AI Employee '${config.defaultAiEmployee}'. An admin must grant access in Settings \u2192 Users & Permissions \u2192 [Role] \u2192 AI API.`,
-          "permission_denied",
-          "employee_not_permitted"
-        );
-        return;
-      }
-      const employee = await ctx.db.getRepository("aiEmployees").findOne({
-        filter: { username: config.defaultAiEmployee }
-      });
-      if (employee) {
-        systemPrompt = employee.about || employee.defaultPrompt || "";
-      }
-    }
     let messages = [...body.messages];
-    const hasSystemMessage = messages.some((m) => m.role === "system");
-    if (systemPrompt && !hasSystemMessage) {
-      messages.unshift({ role: "system", content: systemPrompt });
-    }
     messages = await Promise.all(
       messages.map(async (msg) => ({
         ...msg,
@@ -271,12 +249,14 @@ async function handleNonStreamingCompletion(ctx, chatModel, messages, completion
   );
   ctx.status = 200;
   const toolCalls = normalizeToolCalls(result.tool_calls);
+  const providerFinishReason = extractFinishReason(result);
   ctx.body = (0, import_openai_format.toOpenAIResponse)({
     id: completionId,
     model: modelName,
     content,
     usage: usage ?? { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 },
-    toolCalls
+    toolCalls,
+    ...providerFinishReason ? { finishReason: providerFinishReason } : {}
   });
 }
 async function handleStreamingCompletion(ctx, chatModel, messages, completionId, modelName, providerRequestParameters) {
@@ -300,8 +280,10 @@ async function handleStreamingCompletion(ctx, chatModel, messages, completionId,
   );
   const requestAbort = (0, import_streaming.createRequestAbortController)(ctx);
   let usage;
+  let usageResponseMetadata;
   let providerRequestId;
-  let finishReason = "stop";
+  let providerFinishReason;
+  let sawToolCalls = false;
   try {
     const stream = await chatModel.stream(messages, { ...providerRequestParameters, signal: requestAbort.signal });
     for await (const chunk of stream) {
@@ -329,7 +311,7 @@ async function handleStreamingCompletion(ctx, chatModel, messages, completionId,
       const toolCallChunks = normalizeToolCallChunks(chunk.tool_call_chunks);
       if (toolCallChunks.length) {
         (0, import_app_observability.markAiApiFirstProviderOutput)(ctx);
-        finishReason = "tool_calls";
+        sawToolCalls = true;
         await (0, import_streaming.writeResponse)(
           ctx,
           (0, import_openai_format.formatSSE)(
@@ -342,8 +324,14 @@ async function handleStreamingCompletion(ctx, chatModel, messages, completionId,
         );
       }
       if (chunk.usage_metadata) {
-        usage = (0, import_usage.normalizeUsage)(chunk.usage_metadata) ?? usage;
+        const normalized = (0, import_usage.normalizeUsage)(chunk.usage_metadata);
+        if (normalized) {
+          usage = normalized;
+          usageResponseMetadata = chunk.response_metadata;
+        }
       }
+      const chunkFinishReason = extractFinishReason(chunk);
+      if (chunkFinishReason) providerFinishReason = chunkFinishReason;
       providerRequestId = providerRequestId ?? (0, import_usage.extractProviderRequestId)(chunk);
     }
     await (0, import_streaming.writeResponse)(
@@ -353,7 +341,7 @@ async function handleStreamingCompletion(ctx, chatModel, messages, completionId,
           id: completionId,
           model: modelName,
           delta: {},
-          finishReason
+          finishReason: providerFinishReason ?? (sawToolCalls ? "tool_calls" : "stop")
         })
       )
     );
@@ -370,7 +358,7 @@ async function handleStreamingCompletion(ctx, chatModel, messages, completionId,
       );
     }
     await (0, import_streaming.writeResponse)(ctx, (0, import_openai_format.formatSSEDone)());
-    (0, import_usage.setAiApiUsageResult)(ctx, usage, { gatewayResponseId: completionId, providerRequestId });
+    (0, import_usage.setAiApiUsageResult)(ctx, usage, { gatewayResponseId: completionId, providerRequestId }, usageResponseMetadata);
     ctx.state.aiApiStreamResult = { succeeded: true, id: completionId };
   } catch (err) {
     const cancelled = (0, import_streaming.isClientDisconnected)(ctx, err);
@@ -386,7 +374,7 @@ async function handleStreamingCompletion(ctx, chatModel, messages, completionId,
         })
       );
     }
-    (0, import_usage.setAiApiUsageResult)(ctx, usage, { gatewayResponseId: completionId, providerRequestId });
+    (0, import_usage.setAiApiUsageResult)(ctx, usage, { gatewayResponseId: completionId, providerRequestId }, usageResponseMetadata);
     ctx.state.aiApiStreamResult = {
       succeeded: false,
       id: completionId,
@@ -400,6 +388,17 @@ async function handleStreamingCompletion(ctx, chatModel, messages, completionId,
 function getErrorMessage(error, fallback) {
   return error instanceof Error && error.message ? error.message : fallback;
 }
+function extractFinishReason(value) {
+  if (!isRecord(value)) return void 0;
+  const candidates = [
+    isRecord(value.response_metadata) ? value.response_metadata.finish_reason : void 0,
+    isRecord(value.additional_kwargs) ? value.additional_kwargs.finish_reason : void 0
+  ];
+  for (const candidate of candidates) {
+    if (typeof candidate === "string" && candidate.length > 0) return candidate;
+  }
+  return void 0;
+}
 const SUPPORTED_CONTENT_BLOCK_TYPES = /* @__PURE__ */ new Set(["text", "image_url", "file", "file_url"]);
 const BASE64_DATA_URL_PATTERN = /^data:(\w+\/\w+);base64,([A-Za-z0-9+/]+=*)$/;
 const FILE_BASE64_DATA_URL_PATTERN = /^data:([^;\s]+);base64,([A-Za-z0-9+/]+=*)$/;
@@ -641,6 +640,7 @@ function serializeToolArguments(value) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   applyProviderRequestParameters,
+  extractFinishReason,
   findContentBlockProblem,
   findMessageProblem,
   getProviderRequestParameters,