@cremini/skillpack 1.1.8 → 1.1.9

package/README.md

@@ -20,7 +20,9 @@ Skillpack is built for teams that want AI Agents to be deployable, trusted, and
 
 ### 1. Run a skillpack
 
-1. Download the example [Company Deep Research](https://github.com/FinpeakInc/downloads/releases/download/v.0.0.1/Company-Deep-Research.zip)
+1. Download the example
+- [Garry Tan SkillPack](https://github.com/CreminiAI/skillpack-examples/releases/download/v.0.0.3/garry-tan.zip)
+- [Company Deep Research SkillPack](https://github.com/FinpeakInc/downloads/releases/download/v.0.0.1/Company-Deep-Research.zip)
 2. Unzip it and Run ./start.sh on Mac OS, and double click start.bat on Windows (see below), the server starts and opens http://127.0.0.1:26313 in your browser
 
 ```bash
@@ -108,6 +110,7 @@ The start scripts use `npx @cremini/skillpack run .` so Node.js is the only prer
 **Telegram configuration**: requires `Bot Token`
 
 ### Slack App Setup and how to get `App Token` and `Bot Token`
+https://skillpack.gitbook.io/skillpack-docs/getting-started/slack-integration
 
 1. Create a new Slack app at https://api.slack.com/apps
 2. Enable Socket Mode (Settings → Socket Mode → Enable)
@@ -144,6 +147,7 @@ The start scripts use `npx @cremini/skillpack run .` so Node.js is the only prer
 9. On the SkillPack buit-in UI http://127.0.0.1:26313, Tap "Connect to Chat App" button and Enter the **`Bot Token`** and **`App Token`**, Save
 
 ### Telegram Setup and how to get `Bot Token`
+https://skillpack.gitbook.io/skillpack-docs/getting-started/telegram-integration
 
 1. **Open Telegram** and search for the official account **`@BotFather`** (it will have a blue verified checkmark).
 2. **Start a chat** by tapping "Start" or sending the `/start` command.

package/dist/cli.js

@@ -114,7 +114,7 @@ var init_config = __esm({
             console.warn("  Warning: Failed to parse data/config.json:", err);
           }
         }
-        let { apiKey = "", provider = "openai" } = this.configData;
+        let { apiKey = "", provider = "openai", baseUrl = "" } = this.configData;
         if (!apiKey) {
           if (process.env.OPENAI_API_KEY) {
             apiKey = process.env.OPENAI_API_KEY;
@@ -126,6 +126,7 @@ var init_config = __esm({
         }
         this.configData.apiKey = apiKey;
         this.configData.provider = provider;
+        this.configData.baseUrl = baseUrl?.trim() || void 0;
         return this.configData;
       }
       getConfig() {
@@ -141,6 +142,9 @@ var init_config = __esm({
         }
         if (updates.apiKey !== void 0) this.configData.apiKey = updates.apiKey;
         if (updates.provider !== void 0) this.configData.provider = updates.provider;
+        if (updates.baseUrl !== void 0) {
+          this.configData.baseUrl = updates.baseUrl?.trim() || void 0;
+        }
         if (updates.adapters !== void 0) {
           const merged = { ...this.configData.adapters || {} };
           for (const [adapterKey, adapterVal] of Object.entries(updates.adapters)) {
@@ -397,6 +401,7 @@ var init_telegram = __esm({
         try {
           const userText = text || "(User sent an attachment)";
           const result = await this.agent.handleMessage(
+            "telegram",
             channelId,
             userText,
             onEvent,
@@ -830,6 +835,7 @@ var init_slack = __esm({
         };
         try {
           const result = await this.agent.handleMessage(
+            "slack",
             channelId,
             text,
             onEvent,
@@ -1274,6 +1280,7 @@ var init_scheduler = __esm({
         };
         try {
           const result = await this.agent.handleMessage(
+            "scheduler",
             channelId,
             jobConfig.prompt,
             onEvent
@@ -2045,7 +2052,7 @@ import chalk4 from "chalk";
 import express from "express";
 import path11 from "path";
 import fs12 from "fs";
-import { fileURLToPath } from "url";
+import { fileURLToPath as fileURLToPath2 } from "url";
 import { createServer } from "http";
 import { exec } from "child_process";
 
@@ -2053,6 +2060,7 @@ import { exec } from "child_process";
 init_attachment_utils();
 import path7 from "path";
 import fs7 from "fs";
+import { fileURLToPath } from "url";
 import {
   AuthStorage,
   createAgentSession,
@@ -4785,16 +4793,6 @@ var ManageScheduleParams = Type.Object({
       description: "The work prompt to execute when the task triggers. Required for add. Describe only what to do each run; do not repeat timing, cron, or 'every N minutes' instructions here."
     })
   ),
-  notifyAdapter: Type.Optional(
-    Type.String({
-      description: "Target adapter name for result notification: 'telegram' or 'slack'. Required for add."
-    })
-  ),
-  notifyChannelId: Type.Optional(
-    Type.String({
-      description: "Target channelId for result notification (e.g. 'telegram-123456'). Required for add."
-    })
-  ),
   timezone: Type.Optional(
     Type.String({
       description: "Optional timezone for the cron schedule, e.g. 'Asia/Shanghai', 'America/New_York'."
@@ -4804,7 +4802,7 @@ var ManageScheduleParams = Type.Object({
 function textResult(text) {
   return { content: [{ type: "text", text }], details: void 0 };
 }
-function createManageScheduleTool(schedulerRef, _rootDirRef) {
+function createManageScheduleTool(schedulerRef, adapter, channelId) {
   return {
     name: "manage_scheduled_task",
     label: "Manage Scheduled Task",
@@ -4812,7 +4810,7 @@ function createManageScheduleTool(schedulerRef, _rootDirRef) {
       "Manage scheduled tasks (cron jobs) that automatically execute prompts and push results to IM channels.",
       "",
       "Actions:",
-      "- add: Create a new scheduled task. Requires: name, cron, prompt, notifyAdapter, notifyChannelId. The prompt must describe only the work for each run, not the schedule itself.",
+      "- add: Create a new scheduled task. Requires: name, cron, prompt. The notification target always uses the current Telegram or Slack chat. The prompt must describe only the work for each run, not the schedule itself.",
       "- list: List all scheduled tasks with their status.",
       "- remove: Remove a scheduled task by name.",
       "- trigger: Manually trigger a scheduled task by name (runs immediately).",
@@ -4823,10 +4821,7 @@ function createManageScheduleTool(schedulerRef, _rootDirRef) {
       "Examples:",
       "  '0 9 * * 1-5'  = every weekday at 9:00 AM",
       "  '0 18 * * 5'   = every Friday at 6:00 PM",
-      "  '*/30 * * * *'  = every 30 minutes",
-      "",
-      "notifyAdapter: 'telegram' or 'slack'",
-      "notifyChannelId: the channel ID where result will be sent (e.g. 'telegram-123456')"
+      "  '*/30 * * * *'  = every 30 minutes"
     ].join("\n"),
     parameters: ManageScheduleParams,
     async execute(_toolCallId, params, _signal, _onUpdate, _ctx) {
@@ -4856,9 +4851,9 @@ ${lines.join("\n")}`
               "Error: 'name', 'cron', and 'prompt' are required for adding a task."
             );
           }
-          if (!params.notifyAdapter || !params.notifyChannelId) {
+          if (adapter !== "telegram" && adapter !== "slack") {
             return textResult(
-              "Error: 'notifyAdapter' and 'notifyChannelId' are required for adding a task."
+              "Error: Scheduled tasks can only be created from a Telegram or Slack."
             );
           }
           const jobConfig = {
@@ -4866,8 +4861,8 @@ ${lines.join("\n")}`
             cron: params.cron,
             prompt: params.prompt,
             notify: {
-              adapter: params.notifyAdapter,
-              channelId: params.notifyChannelId
+              adapter,
+              channelId
             },
             enabled: true,
             timezone: params.timezone
@@ -4924,6 +4919,75 @@ ${lines.join("\n")}`
 var DEBUG = true;
 var log = (...args) => DEBUG && console.log(...args);
 var write = (data) => DEBUG && process.stdout.write(data);
+var BUILTIN_SKILL_CREATOR_NAME = "skill-creator";
+var BUILTIN_SKILL_CREATOR_DESCRIPTION = "Create new skills, modify and improve existing skills, and measure skill performance. Use when users want to create a skill from scratch, edit, or optimize an existing skill, run evals to test a skill, benchmark skill performance with variance analysis, or optimize a skill's description for better triggering accuracy.";
+var BUILTIN_SKILL_CREATOR_TEMPLATE_DIR = fileURLToPath(
+  new URL("../templates/builtin-skills/skill-creator", import.meta.url)
+);
+function materializeBuiltinSkillCreator(rootDir, skillsPath) {
+  if (!fs7.existsSync(BUILTIN_SKILL_CREATOR_TEMPLATE_DIR)) {
+    log(
+      `[PackAgent] Built-in skill-creator template missing: ${BUILTIN_SKILL_CREATOR_TEMPLATE_DIR}`
+    );
+    return null;
+  }
+  const packConfigPath = path7.resolve(rootDir, "skillpack.json");
+  const skillDir = path7.resolve(skillsPath, BUILTIN_SKILL_CREATOR_NAME);
+  const skillPath = path7.join(skillDir, "SKILL.md");
+  const renderTemplate = (content) => content.replaceAll("{{SKILLS_PATH}}", skillsPath).replaceAll("{{PACK_CONFIG_PATH}}", packConfigPath);
+  const copyDir = (srcDir, destDir) => {
+    fs7.mkdirSync(destDir, { recursive: true });
+    for (const entry of fs7.readdirSync(srcDir, { withFileTypes: true })) {
+      if (entry.name === ".DS_Store") {
+        continue;
+      }
+      const srcPath = path7.join(srcDir, entry.name);
+      const destPath = path7.join(destDir, entry.name);
+      if (entry.isDirectory()) {
+        copyDir(srcPath, destPath);
+        continue;
+      }
+      if (!entry.isFile()) {
+        continue;
+      }
+      if (entry.name.endsWith(".md") || entry.name.endsWith(".py")) {
+        const content = fs7.readFileSync(srcPath, "utf-8");
+        fs7.writeFileSync(destPath, renderTemplate(content), "utf-8");
+        continue;
+      }
+      fs7.copyFileSync(srcPath, destPath);
+    }
+  };
+  if (!fs7.existsSync(skillDir)) {
+    copyDir(BUILTIN_SKILL_CREATOR_TEMPLATE_DIR, skillDir);
+  }
+  if (!fs7.existsSync(skillPath)) {
+    log(
+      `[PackAgent] Materialized built-in skill-creator but SKILL.md is missing: ${skillPath}`
+    );
+    return null;
+  }
+  return {
+    name: BUILTIN_SKILL_CREATOR_NAME,
+    description: BUILTIN_SKILL_CREATOR_DESCRIPTION,
+    filePath: skillPath,
+    baseDir: skillDir,
+    source: "path",
+    disableModelInvocation: false
+  };
+}
+function overrideBuiltinSkillCreator(base, materializedSkill) {
+  if (!materializedSkill) {
+    return base;
+  }
+  const filtered = base.skills.filter(
+    (skill) => skill.name !== BUILTIN_SKILL_CREATOR_NAME
+  );
+  return {
+    skills: [materializedSkill, ...filtered],
+    diagnostics: base.diagnostics
+  };
+}
 function getAssistantDiagnostics(message) {
   if (!message || message.role !== "assistant") {
     return null;
@@ -4949,17 +5013,9 @@ var PackAgent = class {
   fileOutputCallbackRef = {
     current: null
   };
-  sendFileToolDef = createSendFileTool(this.fileOutputCallbackRef);
   schedulerRef = { current: null };
-  rootDirRef;
-  scheduleToolDef;
   constructor(options) {
     this.options = options;
-    this.rootDirRef = { current: options.rootDir };
-    this.scheduleToolDef = createManageScheduleTool(
-      this.schedulerRef,
-      this.rootDirRef
-    );
   }
   /**
    * Inject scheduler reference (called by server.ts after adapter init).
@@ -4967,22 +5023,33 @@ var PackAgent = class {
   setScheduler(scheduler) {
     this.schedulerRef.current = scheduler;
   }
+  createCustomTools(adapter, channelId) {
+    const tools = [createSendFileTool(this.fileOutputCallbackRef)];
+    if (adapter === "telegram" || adapter === "slack") {
+      tools.push(createManageScheduleTool(this.schedulerRef, adapter, channelId));
+    }
+    return tools;
+  }
   /**
    * Lazily create (or return existing) session for a channel.
    */
-  async getOrCreateSession(channelId) {
+  async getOrCreateSession(adapter, channelId) {
     const existing = this.channels.get(channelId);
     if (existing) return existing;
     const pendingCreation = this.pendingSessionCreations.get(channelId);
     if (pendingCreation) return pendingCreation;
     const createSessionPromise = (async () => {
-      const { apiKey, rootDir, provider, modelId } = this.options;
+      const { apiKey, rootDir, provider, modelId, baseUrl } = this.options;
       const authStorage = AuthStorage.inMemory({
         [provider]: { type: "api_key", key: apiKey }
       });
       authStorage.setRuntimeApiKey(provider, apiKey);
       const modelRegistry = new ModelRegistry(authStorage);
-      const model = modelRegistry.find(provider, modelId);
+      const resolvedModel = modelRegistry.find(provider, modelId);
+      const model = resolvedModel && baseUrl ? { ...resolvedModel, baseUrl } : resolvedModel;
+      if (resolvedModel && baseUrl) {
+        log(`[PackAgent] Overriding ${provider}/${modelId} baseUrl -> ${baseUrl}`);
+      }
       const sessionDir = path7.resolve(
         rootDir,
         "data",
@@ -5002,12 +5069,23 @@ var PackAgent = class {
       log(`[PackAgent] Workspace dir: ${workspaceDir}`);
       const skillsPath = path7.resolve(rootDir, "skills");
       log(`[PackAgent] Loading skills from: ${skillsPath}`);
+      const materializedSkillCreator = materializeBuiltinSkillCreator(
+        rootDir,
+        skillsPath
+      );
+      if (materializedSkillCreator) {
+        log(
+          `[PackAgent] Materialized built-in skill-creator to: ${materializedSkillCreator.filePath}`
+        );
+      }
       const resourceLoader = new DefaultResourceLoader({
         cwd: rootDir,
-        additionalSkillPaths: [skillsPath]
+        additionalSkillPaths: [skillsPath],
+        skillsOverride: (base) => overrideBuiltinSkillCreator(base, materializedSkillCreator)
       });
       await resourceLoader.reload();
       const tools = createCodingTools(workspaceDir);
+      const customTools = this.createCustomTools(adapter, channelId);
       const { session } = await createAgentSession({
         cwd: workspaceDir,
         authStorage,
@@ -5016,7 +5094,7 @@ var PackAgent = class {
         resourceLoader,
         model,
         tools,
-        customTools: [this.sendFileToolDef, this.scheduleToolDef]
+        customTools
       });
       const channelSession = {
         session,
@@ -5033,8 +5111,8 @@ var PackAgent = class {
       this.pendingSessionCreations.delete(channelId);
     }
   }
-  async handleMessage(channelId, text, onEvent, attachments) {
-    const cs = await this.getOrCreateSession(channelId);
+  async handleMessage(adapter, channelId, text, onEvent, attachments) {
+    const cs = await this.getOrCreateSession(adapter, channelId);
     const run = async () => {
       cs.running = true;
       let turnHadVisibleOutput = false;
@@ -5243,6 +5321,7 @@ function getRuntimeConfigSignature(config) {
   return JSON.stringify({
     apiKey: config.apiKey || "",
     provider: config.provider || "openai",
+    baseUrl: config.baseUrl || "",
     telegramToken: config.adapters?.telegram?.token || "",
     slackBotToken: config.adapters?.slack?.botToken || "",
     slackAppToken: config.adapters?.slack?.appToken || ""
@@ -5269,6 +5348,7 @@ var WebAdapter = class {
         hasApiKey: !!conf.apiKey,
         apiKey: conf.apiKey || "",
         provider: conf.provider || "openai",
+        baseUrl: conf.baseUrl || "",
         adapters: conf.adapters || {},
         runtimeControl: lifecycle.getRuntimeControl()
       });
@@ -5278,7 +5358,7 @@ var WebAdapter = class {
       res.json(config.skills || []);
     });
     app.post("/api/config/update", (req, res) => {
-      const { key, provider, adapters } = req.body;
+      const { key, provider, baseUrl, adapters } = req.body;
       const updates = {};
       const beforeConfig = JSON.parse(JSON.stringify(configManager.getConfig()));
       if (key !== void 0) {
@@ -5289,6 +5369,9 @@ var WebAdapter = class {
         updates.provider = provider;
         currentProvider = provider;
       }
+      if (baseUrl !== void 0) {
+        updates.baseUrl = baseUrl;
+      }
       if (adapters !== void 0) {
         updates.adapters = adapters;
       }
@@ -5298,6 +5381,7 @@ var WebAdapter = class {
       res.json({
         success: true,
         provider: newConf.provider,
+        baseUrl: newConf.baseUrl || "",
         adapters: newConf.adapters,
         requiresRestart,
         runtimeControl: lifecycle.getRuntimeControl()
@@ -5483,7 +5567,7 @@ var WebAdapter = class {
           if (ws.readyState !== ws.OPEN) return;
           ws.send(JSON.stringify(event));
         };
-        const result = await agent.handleMessage(channelId, text, onEvent);
+        const result = await agent.handleMessage("web", channelId, text, onEvent);
         if (result.errorMessage) {
           ws.send(JSON.stringify({ error: result.errorMessage }));
           return;
@@ -5585,7 +5669,7 @@ var Lifecycle = class {
 };
 
 // src/runtime/server.ts
-var __dirname = path11.dirname(fileURLToPath(import.meta.url));
+var __dirname = path11.dirname(fileURLToPath2(import.meta.url));
 async function startServer(options) {
   const {
     rootDir,
@@ -5596,6 +5680,7 @@ async function startServer(options) {
   const dataConfig = configManager.load(rootDir);
   const apiKey = dataConfig.apiKey || "";
   const provider = dataConfig.provider || "openai";
+  const baseUrl = dataConfig.baseUrl?.trim() || void 0;
   const modelId = provider === "anthropic" ? "claude-opus-4-6" : "gpt-5.4";
   const packageRoot = path11.resolve(__dirname, "..");
   const webDir = fs12.existsSync(path11.join(rootDir, "web")) ? path11.join(rootDir, "web") : path11.join(packageRoot, "web");
@@ -5609,6 +5694,7 @@ async function startServer(options) {
     rootDir,
     provider,
     modelId,
+    baseUrl,
     lifecycleHandler: lifecycle
   });
   const adapters = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cremini/skillpack",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "description": "Pack AI Skills into Local Agents",
   "type": "module",
   "repository": {

package/templates/builtin-skills/skill-creator/LICENSE.txt

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.