@super_studio/ecforce-ai-agent-server 1.4.1 → 1.4.3

package/README.md

@@ -425,7 +425,7 @@ import { generateText } from "ai";
 import { spst } from "@super_studio/ecforce-ai-agent-server/provider";
 
 const result = await generateText({
-  model: spst("google/gemini-3.1-pro-preview-customtools"),
+  model: spst("google/gemini-3.5-flash"),
   prompt: "今日の生成AI関連ニュースを3件まとめて",
   tools: {
     google_search: vertex.tools.googleSearch({}),

package/dist/mcp-auth.cjs

@@ -37,9 +37,20 @@ async function decodeMCPToken(token, options) {
 		secret,
 		salt
 	});
-	if (!decoded) throw new Error("Invalid token");
+	if (!isMCPTokenPayload(decoded)) throw new Error("Invalid token");
 	return decoded;
 }
+function isMCPTokenPayload(value) {
+	if (!isRecord(value) || !isNonEmptyString(value.source)) return false;
+	const { user } = value;
+	return isRecord(user) && isNonEmptyString(user.id) && isNonEmptyString(user.name) && isNonEmptyString(user.email) && isNonEmptyString(user.projectId);
+}
+function isRecord(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isNonEmptyString(value) {
+	return typeof value === "string" && value.trim().length > 0;
+}
 function getMcpToken(req) {
 	const mcpToken = req.headers.get("X-MCP-Token");
 	if (!mcpToken || typeof mcpToken !== "string") throw new Error("Unauthorized");

package/dist/mcp-auth.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-auth.d.cts","names":[],"sources":["../src/mcp-auth.ts"],"sourcesContent":[],"mappings":";;AAMA;AAiBA;;KAjBY,eAAA;EAuBT,MAAA,EAAA,MAAA;EAAA,IAAA,EAAA;IAwBmB,EAAA,EAAA,MAAA;IAuBN,IAAA,EAAA,MAAW;;;;;;;;;iBArDL,cAAA,UACX;;;;IAKR;;;;;;;;iBAwBmB,cAAA;;;IAMnB,QAAQ;iBAiBK,WAAA,MAAiB"}
+{"version":3,"file":"mcp-auth.d.cts","names":[],"sources":["../src/mcp-auth.ts"],"sourcesContent":[],"mappings":";;AAMA;AAiBA;;KAjBY,eAAA;EAuBT,MAAA,EAAA,MAAA;EAAA,IAAA,EAAA;IAwBmB,EAAA,EAAA,MAAA;IA6CN,IAAA,EAAA,MAAW;;;;;;;;;iBA3EL,cAAA,UACX;;;;IAKR;;;;;;;;iBAwBmB,cAAA;;;IAMnB,QAAQ;iBAuCK,WAAA,MAAiB"}

package/dist/mcp-auth.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-auth.d.mts","names":[],"sources":["../src/mcp-auth.ts"],"sourcesContent":[],"mappings":";;AAMA;AAiBA;;KAjBY,eAAA;EAuBT,MAAA,EAAA,MAAA;EAAA,IAAA,EAAA;IAwBmB,EAAA,EAAA,MAAA;IAuBN,IAAA,EAAA,MAAW;;;;;;;;;iBArDL,cAAA,UACX;;;;IAKR;;;;;;;;iBAwBmB,cAAA;;;IAMnB,QAAQ;iBAiBK,WAAA,MAAiB"}
+{"version":3,"file":"mcp-auth.d.mts","names":[],"sources":["../src/mcp-auth.ts"],"sourcesContent":[],"mappings":";;AAMA;AAiBA;;KAjBY,eAAA;EAuBT,MAAA,EAAA,MAAA;EAAA,IAAA,EAAA;IAwBmB,EAAA,EAAA,MAAA;IA6CN,IAAA,EAAA,MAAW;;;;;;;;;iBA3EL,cAAA,UACX;;;;IAKR;;;;;;;;iBAwBmB,cAAA;;;IAMnB,QAAQ;iBAuCK,WAAA,MAAiB"}

package/dist/mcp-auth.mjs

@@ -37,9 +37,20 @@ async function decodeMCPToken(token, options) {
 		secret,
 		salt
 	});
-	if (!decoded) throw new Error("Invalid token");
+	if (!isMCPTokenPayload(decoded)) throw new Error("Invalid token");
 	return decoded;
 }
+function isMCPTokenPayload(value) {
+	if (!isRecord(value) || !isNonEmptyString(value.source)) return false;
+	const { user } = value;
+	return isRecord(user) && isNonEmptyString(user.id) && isNonEmptyString(user.name) && isNonEmptyString(user.email) && isNonEmptyString(user.projectId);
+}
+function isRecord(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isNonEmptyString(value) {
+	return typeof value === "string" && value.trim().length > 0;
+}
 function getMcpToken(req) {
 	const mcpToken = req.headers.get("X-MCP-Token");
 	if (!mcpToken || typeof mcpToken !== "string") throw new Error("Unauthorized");

package/dist/mcp-auth.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-auth.mjs","names":[],"sources":["../src/mcp-auth.ts"],"sourcesContent":["import { decode, encode } from \"./lib/jwt\";\n\n/**\n * 共通のMCPトークンのペイロード。\n * すべてのapps(aidp, ma, bi)はこのトークンの形になります。\n */\nexport type MCPTokenPayload = {\n  source: string;\n  user: {\n    id: string;\n    name: string;\n    email: string;\n    projectId: string;\n  };\n};\n\nconst DEFAULT_MAX_AGE = 60 * 10; // 10 minutes\nconst DEFAULT_SALT = process.env.STAGE === \"local\" ? \"dev\" : process.env.STAGE;\n\n/**\n * Uses Auth.js JWT encoding/decoding.\n * @see https://github.com/nextauthjs/next-auth/blob/main/packages/core/src/jwt.ts\n */\nexport async function createMCPToken(\n  payload: MCPTokenPayload,\n  options?: {\n    secret?: string;\n    salt?: string;\n    maxAge?: number;\n  },\n) {\n  const maxAge = options?.maxAge ?? DEFAULT_MAX_AGE;\n  const secret = options?.secret ?? process.env.MCP_TOKEN_SECRET;\n  const salt = options?.salt ?? DEFAULT_SALT;\n  if (!secret || !salt) {\n    throw new Error(\"Secret or salt is not set\");\n  }\n  const token = await encode<MCPTokenPayload>({\n    token: payload,\n    secret,\n    salt,\n    maxAge,\n  });\n  return {\n    token,\n    expiresAt: new Date(Date.now() + maxAge * 1000),\n  };\n}\n\n/**\n * Uses Auth.js JWT encoding/decoding.\n * @see https://github.com/nextauthjs/next-auth/blob/main/packages/core/src/jwt.ts\n */\nexport async function decodeMCPToken(\n  token: string,\n  options?: {\n    secret?: string;\n    salt?: string;\n  },\n): Promise<MCPTokenPayload> {\n  const secret = options?.secret ?? process.env.MCP_TOKEN_SECRET;\n  const salt = options?.salt ?? DEFAULT_SALT;\n  if (!secret || !salt) {\n    throw new Error(\"Secret or salt is not set\");\n  }\n  const decoded = await decode<MCPTokenPayload>({\n    token,\n    secret,\n    salt,\n  });\n  if (!decoded) {\n    throw new Error(\"Invalid token\");\n  }\n  return decoded;\n}\n\nexport function getMcpToken(req: Request) {\n  const mcpToken = req.headers.get(\"X-MCP-Token\");\n  if (!mcpToken || typeof mcpToken !== \"string\") {\n    throw new Error(\"Unauthorized\");\n  }\n  return mcpToken;\n}\n"],"mappings":";;;AAgBA,MAAM,kBAAkB;AACxB,MAAM,eAAe,QAAQ,IAAI,UAAU,UAAU,QAAQ,QAAQ,IAAI;;;;;AAMzE,eAAsB,eACpB,SACA,SAKA;;CACA,MAAM,8EAAS,QAAS,mEAAU;CAClC,MAAM,8EAAS,QAAS,mEAAU,QAAQ,IAAI;CAC9C,MAAM,0EAAO,QAAS,6DAAQ;AAC9B,KAAI,CAAC,UAAU,CAAC,KACd,OAAM,IAAI,MAAM,4BAA4B;AAQ9C,QAAO;EACL,OAPY,MAAM,OAAwB;GAC1C,OAAO;GACP;GACA;GACA;GACD,CAAC;EAGA,WAAW,IAAI,KAAK,KAAK,KAAK,GAAG,SAAS,IAAK;EAChD;;;;;;AAOH,eAAsB,eACpB,OACA,SAI0B;;CAC1B,MAAM,+EAAS,QAAS,qEAAU,QAAQ,IAAI;CAC9C,MAAM,2EAAO,QAAS,+DAAQ;AAC9B,KAAI,CAAC,UAAU,CAAC,KACd,OAAM,IAAI,MAAM,4BAA4B;CAE9C,MAAM,UAAU,MAAM,OAAwB;EAC5C;EACA;EACA;EACD,CAAC;AACF,KAAI,CAAC,QACH,OAAM,IAAI,MAAM,gBAAgB;AAElC,QAAO;;AAGT,SAAgB,YAAY,KAAc;CACxC,MAAM,WAAW,IAAI,QAAQ,IAAI,cAAc;AAC/C,KAAI,CAAC,YAAY,OAAO,aAAa,SACnC,OAAM,IAAI,MAAM,eAAe;AAEjC,QAAO"}
+{"version":3,"file":"mcp-auth.mjs","names":[],"sources":["../src/mcp-auth.ts"],"sourcesContent":["import { decode, encode } from \"./lib/jwt\";\n\n/**\n * 共通のMCPトークンのペイロード。\n * すべてのapps(aidp, ma, bi)はこのトークンの形になります。\n */\nexport type MCPTokenPayload = {\n  source: string;\n  user: {\n    id: string;\n    name: string;\n    email: string;\n    projectId: string;\n  };\n};\n\nconst DEFAULT_MAX_AGE = 60 * 10; // 10 minutes\nconst DEFAULT_SALT = process.env.STAGE === \"local\" ? \"dev\" : process.env.STAGE;\n\n/**\n * Uses Auth.js JWT encoding/decoding.\n * @see https://github.com/nextauthjs/next-auth/blob/main/packages/core/src/jwt.ts\n */\nexport async function createMCPToken(\n  payload: MCPTokenPayload,\n  options?: {\n    secret?: string;\n    salt?: string;\n    maxAge?: number;\n  },\n) {\n  const maxAge = options?.maxAge ?? DEFAULT_MAX_AGE;\n  const secret = options?.secret ?? process.env.MCP_TOKEN_SECRET;\n  const salt = options?.salt ?? DEFAULT_SALT;\n  if (!secret || !salt) {\n    throw new Error(\"Secret or salt is not set\");\n  }\n  const token = await encode<MCPTokenPayload>({\n    token: payload,\n    secret,\n    salt,\n    maxAge,\n  });\n  return {\n    token,\n    expiresAt: new Date(Date.now() + maxAge * 1000),\n  };\n}\n\n/**\n * Uses Auth.js JWT encoding/decoding.\n * @see https://github.com/nextauthjs/next-auth/blob/main/packages/core/src/jwt.ts\n */\nexport async function decodeMCPToken(\n  token: string,\n  options?: {\n    secret?: string;\n    salt?: string;\n  },\n): Promise<MCPTokenPayload> {\n  const secret = options?.secret ?? process.env.MCP_TOKEN_SECRET;\n  const salt = options?.salt ?? DEFAULT_SALT;\n  if (!secret || !salt) {\n    throw new Error(\"Secret or salt is not set\");\n  }\n  const decoded = await decode<unknown>({\n    token,\n    secret,\n    salt,\n  });\n  if (!isMCPTokenPayload(decoded)) {\n    throw new Error(\"Invalid token\");\n  }\n  return decoded;\n}\n\nfunction isMCPTokenPayload(value: unknown): value is MCPTokenPayload {\n  if (!isRecord(value) || !isNonEmptyString(value.source)) {\n    return false;\n  }\n  const { user } = value;\n  return (\n    isRecord(user) &&\n    isNonEmptyString(user.id) &&\n    isNonEmptyString(user.name) &&\n    isNonEmptyString(user.email) &&\n    isNonEmptyString(user.projectId)\n  );\n}\n\nfunction isRecord(value: unknown): value is Record<string, unknown> {\n  return typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n\nfunction isNonEmptyString(value: unknown): value is string {\n  return typeof value === \"string\" && value.trim().length > 0;\n}\n\nexport function getMcpToken(req: Request) {\n  const mcpToken = req.headers.get(\"X-MCP-Token\");\n  if (!mcpToken || typeof mcpToken !== \"string\") {\n    throw new Error(\"Unauthorized\");\n  }\n  return mcpToken;\n}\n"],"mappings":";;;AAgBA,MAAM,kBAAkB;AACxB,MAAM,eAAe,QAAQ,IAAI,UAAU,UAAU,QAAQ,QAAQ,IAAI;;;;;AAMzE,eAAsB,eACpB,SACA,SAKA;;CACA,MAAM,8EAAS,QAAS,mEAAU;CAClC,MAAM,8EAAS,QAAS,mEAAU,QAAQ,IAAI;CAC9C,MAAM,0EAAO,QAAS,6DAAQ;AAC9B,KAAI,CAAC,UAAU,CAAC,KACd,OAAM,IAAI,MAAM,4BAA4B;AAQ9C,QAAO;EACL,OAPY,MAAM,OAAwB;GAC1C,OAAO;GACP;GACA;GACA;GACD,CAAC;EAGA,WAAW,IAAI,KAAK,KAAK,KAAK,GAAG,SAAS,IAAK;EAChD;;;;;;AAOH,eAAsB,eACpB,OACA,SAI0B;;CAC1B,MAAM,+EAAS,QAAS,qEAAU,QAAQ,IAAI;CAC9C,MAAM,2EAAO,QAAS,+DAAQ;AAC9B,KAAI,CAAC,UAAU,CAAC,KACd,OAAM,IAAI,MAAM,4BAA4B;CAE9C,MAAM,UAAU,MAAM,OAAgB;EACpC;EACA;EACA;EACD,CAAC;AACF,KAAI,CAAC,kBAAkB,QAAQ,CAC7B,OAAM,IAAI,MAAM,gBAAgB;AAElC,QAAO;;AAGT,SAAS,kBAAkB,OAA0C;AACnE,KAAI,CAAC,SAAS,MAAM,IAAI,CAAC,iBAAiB,MAAM,OAAO,CACrD,QAAO;CAET,MAAM,EAAE,SAAS;AACjB,QACE,SAAS,KAAK,IACd,iBAAiB,KAAK,GAAG,IACzB,iBAAiB,KAAK,KAAK,IAC3B,iBAAiB,KAAK,MAAM,IAC5B,iBAAiB,KAAK,UAAU;;AAIpC,SAAS,SAAS,OAAkD;AAClE,QAAO,OAAO,UAAU,YAAY,UAAU,QAAQ,CAAC,MAAM,QAAQ,MAAM;;AAG7E,SAAS,iBAAiB,OAAiC;AACzD,QAAO,OAAO,UAAU,YAAY,MAAM,MAAM,CAAC,SAAS;;AAG5D,SAAgB,YAAY,KAAc;CACxC,MAAM,WAAW,IAAI,QAAQ,IAAI,cAAc;AAC/C,KAAI,CAAC,YAAY,OAAO,aAAa,SACnC,OAAM,IAAI,MAAM,eAAe;AAEjC,QAAO"}

package/package.json

@@ -1,9 +1,19 @@
 {
   "name": "@super_studio/ecforce-ai-agent-server",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.cts",
+  "typesVersions": {
+    "*": {
+      "mcp-auth": [
+        "dist/mcp-auth.d.cts"
+      ],
+      "provider": [
+        "dist/provider.d.cts"
+      ]
+    }
+  },
   "sideEffects": false,
   "files": [
     "dist",

package/src/mcp-auth.ts

@@ -63,17 +63,39 @@ export async function decodeMCPToken(
   if (!secret || !salt) {
     throw new Error("Secret or salt is not set");
   }
-  const decoded = await decode<MCPTokenPayload>({
+  const decoded = await decode<unknown>({
     token,
     secret,
     salt,
   });
-  if (!decoded) {
+  if (!isMCPTokenPayload(decoded)) {
     throw new Error("Invalid token");
   }
   return decoded;
 }
 
+function isMCPTokenPayload(value: unknown): value is MCPTokenPayload {
+  if (!isRecord(value) || !isNonEmptyString(value.source)) {
+    return false;
+  }
+  const { user } = value;
+  return (
+    isRecord(user) &&
+    isNonEmptyString(user.id) &&
+    isNonEmptyString(user.name) &&
+    isNonEmptyString(user.email) &&
+    isNonEmptyString(user.projectId)
+  );
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+function isNonEmptyString(value: unknown): value is string {
+  return typeof value === "string" && value.trim().length > 0;
+}
+
 export function getMcpToken(req: Request) {
   const mcpToken = req.headers.get("X-MCP-Token");
   if (!mcpToken || typeof mcpToken !== "string") {