@rafinery/cli 0.8.16 → 0.11.0

package/lib/skill-deps.mjs

@@ -0,0 +1,377 @@
+// Skill dependencies (wave 6 — the capability arc).
+//
+// rafa's agents lean on a small set of third-party skills (TDD, design method,
+// composition rules, review taxonomy, the grilling interview). They are NOT
+// baked into the blueprint: the dev owns their toolbox, so the CLI DECLARES
+// them here and `rafa update`/`init` offers them ONCE with per-skill reasons —
+// package-manager style: consent → sequential install with progress → verify
+// (frontmatter parses · hashes match · licenses present) → stamp. A decline is
+// remembered (`rafa.json → rafa.skills.declined`; re-offer with `rafa update
+// --skills`), `--yes` installs unprompted (CI), and a verify failure removes
+// the partial dir and NEVER blocks provisioning — a missing capability
+// degrades the SOPs gracefully, it never bricks a repo.
+//
+// The skills ship inside the npm tarball (skills-bundle/, hashed at prepack —
+// deterministic, offline, license-complete). Install target: .agents/skills/
+// (committed — the repo owns the copies; the harness-neutral home, Codex
+// manifests ride along). Agent adoption is the point: the conductor's toolbox
+// slice + the rafa-* SOPs reference these BY CAPABILITY with when-installed
+// semantics — agent-card duty paths NEVER point here (F1: a declined skill
+// must never break a consumer's compile gate).
+
+import { createHash } from "node:crypto";
+import {
+  cpSync,
+  existsSync,
+  mkdirSync,
+  readFileSync,
+  readdirSync,
+  rmSync,
+  statSync,
+} from "node:fs";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+import { readStamp, writeStamp } from "./stamp.mjs";
+import { isInteractive, ask } from "./prompt.mjs";
+
+const HERE = dirname(fileURLToPath(import.meta.url)); // …/packages/cli/lib
+
+// The declared dependencies. `version` is rafa's pin for the vendored snapshot;
+// `source`/`upstreamHash` mirror skills-lock.json provenance at authoring time;
+// `why` is the one-line reason shown in the consent prompt; `licenseFile` names
+// the in-dir license the verify pass requires (null = license carried in
+// frontmatter/metadata, or rafa-authored).
+export const SKILL_DEPS = [
+  {
+    name: "tdd",
+    version: "1.0.0",
+    source: "mattpocock/skills",
+    upstreamHash: "81eca2a5b53a",
+    targetDir: ".agents/skills/tdd",
+    license: "MIT",
+    licenseFile: "LICENSE",
+    why: "atlas builds test-first — the Done-check becomes an executable test (red → green)",
+    requiredBy: "atlas · rafa-build",
+  },
+  {
+    name: "frontend-design",
+    version: "1.0.0",
+    source: "anthropics/skills",
+    upstreamHash: "4eabc6618376",
+    targetDir: ".agents/skills/frontend-design",
+    license: "Apache-2.0",
+    licenseFile: "LICENSE.txt",
+    why: "UI tasks get a design method (token system · signature element) instead of template defaults",
+    requiredBy: "atlas · rafa-build",
+  },
+  {
+    name: "vercel-composition-patterns",
+    version: "1.0.0",
+    source: "vercel-labs/agent-skills",
+    upstreamHash: "575757e3e257",
+    targetDir: ".agents/skills/vercel-composition-patterns",
+    license: "MIT",
+    licenseFile: null, // license declared in SKILL.md frontmatter + metadata.json
+    why: "React composition rules for component tasks (no boolean-prop sprawl · compound components · React 19)",
+    requiredBy: "atlas · rafa-build",
+  },
+  {
+    name: "requesting-code-review",
+    version: "1.0.0",
+    source: "obra/superpowers",
+    upstreamHash: "2304d2073c62",
+    targetDir: ".agents/skills/requesting-code-review",
+    license: "MIT",
+    licenseFile: "LICENSE",
+    why: "review findings get Critical/Important/Minor severity — Minor never blocks",
+    requiredBy: "prism · rafa-review",
+  },
+  {
+    name: "improve-codebase-architecture",
+    version: "1.0.0",
+    source: "mattpocock/skills",
+    upstreamHash: "66e8a50c83c3",
+    targetDir: ".agents/skills/improve-codebase-architecture",
+    license: "MIT",
+    licenseFile: "LICENSE",
+    why: "bloom's architecture lens gets a real method (deletion test · deep/shallow modules)",
+    requiredBy: "bloom · rafa-improve",
+  },
+  {
+    name: "grill-me",
+    version: "1.0.0",
+    source: "mattpocock/skills",
+    upstreamHash: "f361db4e15e6",
+    targetDir: ".agents/skills/grill-me",
+    license: "MIT",
+    licenseFile: "LICENSE",
+    why: "/grill-me — adversarial interview of any plan (human-invoked)",
+    requiredBy: "dev · prism plan-gate",
+  },
+  {
+    name: "grilling",
+    version: "1.0.0",
+    source: "rafinery",
+    upstreamHash: null,
+    targetDir: ".agents/skills/grilling",
+    license: "rafinery (ships with the CLI)",
+    licenseFile: null,
+    why: "the interview procedure grill-me and the plan gate run (one probe at a time · survives-three ends it)",
+    requiredBy: "grill-me · prism plan-gate",
+  },
+];
+
+// ── bundle resolution (mirrors blueprintSource: bundled copy first, monorepo dev fallback) ──
+
+const walkFiles = (dir, base = dir) =>
+  readdirSync(dir).flatMap((e) => {
+    const p = join(dir, e);
+    if (statSync(p).isDirectory()) return walkFiles(p, base);
+    return [p.slice(base.length + 1)];
+  });
+
+export const hashFile = (abs) =>
+  createHash("sha256").update(readFileSync(abs)).digest("hex");
+
+// {dir, manifest: {skills: {name: {version, files: {rel: sha256}}}}} or null.
+export function loadSkillsBundle() {
+  const bundled = join(HERE, "..", "skills-bundle");
+  if (existsSync(join(bundled, "skills-manifest.json"))) {
+    try {
+      return {
+        dir: bundled,
+        manifest: JSON.parse(readFileSync(join(bundled, "skills-manifest.json"), "utf8")),
+      };
+    } catch {
+      return null;
+    }
+  }
+  // Dev fallback: the monorepo's .agents/skills IS the source — manifest computed live.
+  const dev = join(HERE, "..", "..", "..", ".agents", "skills");
+  if (!existsSync(dev)) return null;
+  const skills = {};
+  for (const d of SKILL_DEPS) {
+    const src = join(dev, d.name);
+    if (!existsSync(src)) continue;
+    skills[d.name] = {
+      version: d.version,
+      files: Object.fromEntries(walkFiles(src).map((rel) => [rel, hashFile(join(src, rel))])),
+    };
+  }
+  return { dir: dev, manifest: { skills } };
+}
+
+// ── stamp helpers ──────────────────────────────────────────────────────────────
+
+export function skillsStamp(cwd) {
+  const s = readStamp(cwd).rafa?.skills ?? {};
+  return { installed: s.installed ?? {}, declined: s.declined ?? [] };
+}
+
+function writeSkillsStamp(cwd, { installed, declined }) {
+  writeStamp(cwd, { rafa: { skills: { installed, declined } } });
+}
+
+export function neededSkills(cwd, { reoffer = false } = {}) {
+  const { installed, declined } = skillsStamp(cwd);
+  const declinedSet = new Set(declined);
+  return SKILL_DEPS.filter(
+    (d) => installed[d.name] === undefined && (reoffer || !declinedSet.has(d.name)),
+  );
+}
+
+// ── verify (also the doctor's capabilities check) ─────────────────────────────
+
+// Lenient head-parse for FOREIGN skill files: third-party SKILL.md frontmatter
+// is general YAML (folded scalars, nested maps) that the strict OKF grammar
+// rightly rejects — these are Claude skills, not OKF concepts. Verify only what
+// a skill needs to be loadable: a fenced frontmatter block carrying `name:`.
+export function skillHead(abs) {
+  let text;
+  try {
+    text = readFileSync(abs, "utf8");
+  } catch {
+    return null;
+  }
+  if (!text.startsWith("---")) return null;
+  const end = text.indexOf("\n---", 3);
+  if (end === -1) return null;
+  const fm = text.slice(3, end);
+  const name = fm.match(/^name:\s*(.+)$/m)?.[1]?.trim();
+  const description = fm.match(/^description:\s*(.+)$/m)?.[1]?.trim() ?? "";
+  return name ? { name, description } : null;
+}
+
+// The harness-neutral third-party toolbox inventory: every .agents/skills/<name>
+// with a loadable SKILL.md, as {name, description}. `.agents/` is the
+// cross-harness home (Claude Code · Codex · Cursor — the vendored skills ship
+// Codex `agents/openai.yaml` manifests alongside SKILL.md), so this reader
+// lives HERE, not inside any one toolchain adapter; the leverage engine's
+// repoContext, the conductor's spawn-prompt slice, and the scan's toolbox
+// domain all consume this one implementation.
+export function listAgentSkills(cwd) {
+  const root = join(cwd, ".agents", "skills");
+  if (!existsSync(root)) return [];
+  return readdirSync(root)
+    .filter((e) => {
+      try {
+        return statSync(join(root, e)).isDirectory();
+      } catch {
+        return false;
+      }
+    })
+    .map((e) => {
+      const head = skillHead(join(root, e, "SKILL.md"));
+      return head ? { name: head.name, description: head.description } : null;
+    })
+    .filter(Boolean);
+}
+
+function verifySkill(cwd, dep, bundleManifest) {
+  const dst = join(cwd, dep.targetDir);
+  if (!existsSync(join(dst, "SKILL.md"))) return { ok: false, reason: "SKILL.md missing" };
+  const head = skillHead(join(dst, "SKILL.md"));
+  if (!head) return { ok: false, reason: "SKILL.md frontmatter does not parse (no fenced name:)" };
+  if (dep.licenseFile && !existsSync(join(dst, dep.licenseFile)))
+    return { ok: false, reason: `license file ${dep.licenseFile} missing` };
+  const expect = bundleManifest?.skills?.[dep.name]?.files;
+  if (expect) {
+    for (const [rel, sha] of Object.entries(expect)) {
+      const abs = join(dst, rel);
+      if (!existsSync(abs)) return { ok: false, reason: `${rel} missing` };
+      if (hashFile(abs) !== sha) return { ok: false, reason: `${rel} hash mismatch` };
+    }
+  }
+  return { ok: true };
+}
+
+// Doctor's read: every STAMPED-installed skill re-verified against disk.
+export function verifyInstalled(cwd) {
+  const { installed } = skillsStamp(cwd);
+  const bundle = loadSkillsBundle();
+  const results = [];
+  for (const [name] of Object.entries(installed)) {
+    const dep = SKILL_DEPS.find((d) => d.name === name);
+    if (!dep) {
+      results.push({ name, ok: false, reason: "stamped but no longer a declared dependency" });
+      continue;
+    }
+    results.push({ name, ...verifySkill(cwd, dep, bundle?.manifest) });
+  }
+  return results;
+}
+
+// ── the consent-gated installer (owner's design, wave 6) ──────────────────────
+//
+// prompt is injectable for tests: async (question) => "y" | "n" | … | null
+// (null = non-interactive). Returns { installed, declined, failed, skipped }.
+export async function installSkillDeps(cwd, { prompt = null, args = [] } = {}) {
+  const reoffer = args.includes("--skills");
+  const yes = args.includes("--yes");
+  const needed = neededSkills(cwd, { reoffer });
+  const result = { installed: [], declined: [], failed: [], skipped: false };
+  if (needed.length === 0) return { ...result, skipped: true };
+
+  const bundle = loadSkillsBundle();
+  if (!bundle) {
+    console.log("  ! skill dependencies declared but no skills bundle in this CLI build — skipped");
+    return { ...result, skipped: true };
+  }
+  const available = needed.filter((d) => bundle.manifest.skills?.[d.name]);
+  if (available.length === 0) return { ...result, skipped: true };
+
+  console.log(`\nrafa needs ${available.length} skill(s) for better performance in this release:\n`);
+  for (const d of available)
+    console.log(
+      `    ${(d.name + " " + d.version).padEnd(38)}${d.why}  [${d.license}]`,
+    );
+  console.log(
+    "\n  They install to .agents/skills/ (committed — your repo owns the copies)." +
+      "\n  Decline with n; re-offer any time with `rafa update --skills`.\n",
+  );
+
+  const doAsk = prompt ?? (async (q) => (isInteractive() ? ask(q) : null));
+
+  let toInstall = [];
+  const newlyDeclined = [];
+  if (yes) {
+    toInstall = available;
+  } else if (reoffer) {
+    // Per-skill grammar (the makeConflictResolver interaction): y/N/a/q.
+    let all = false;
+    let quit = false;
+    for (const d of available) {
+      if (all) {
+        toInstall.push(d);
+        continue;
+      }
+      if (quit) {
+        newlyDeclined.push(d.name);
+        continue;
+      }
+      const a = await doAsk(`  • install ${d.name} ${d.version}? [y = yes · N = no · a = all · q = none] `);
+      if (a === null) return { ...result, skipped: true }; // non-TTY: record NOTHING
+      if (a === "a") {
+        all = true;
+        toInstall.push(d);
+      } else if (a === "q") {
+        quit = true;
+        newlyDeclined.push(d.name);
+      } else if (a === "y" || a === "yes") toInstall.push(d);
+      else newlyDeclined.push(d.name);
+    }
+  } else {
+    const a = await doAsk(`  Install all ${available.length}? [Y/n] `);
+    if (a === null) {
+      // Non-TTY without --yes: skip, stamp NOTHING — a human must decide;
+      // CI silently declining for them would be an assumed value.
+      console.log("  · non-interactive — skipped (install later: `rafa update --skills`, or pass --yes)");
+      return { ...result, skipped: true };
+    }
+    if (a === "" || a === "y" || a === "yes") toInstall = available;
+    else newlyDeclined.push(...available.map((d) => d.name));
+  }
+
+  for (const d of toInstall) {
+    const src = join(bundle.dir, d.name);
+    const dst = join(cwd, d.targetDir);
+    try {
+      mkdirSync(dirname(dst), { recursive: true });
+      cpSync(src, dst, { recursive: true });
+      const v = verifySkill(cwd, d, bundle.manifest);
+      if (!v.ok) {
+        rmSync(dst, { recursive: true, force: true });
+        console.log(`  ✗ ${d.name} ${d.version} — verify failed (${v.reason}); not installed`);
+        result.failed.push({ name: d.name, reason: v.reason });
+        continue;
+      }
+      console.log(`  ✓ ${d.name} ${d.version} — installed (${d.targetDir})`);
+      result.installed.push(d.name);
+    } catch (e) {
+      rmSync(dst, { recursive: true, force: true });
+      const reason = e instanceof Error ? e.message : String(e);
+      console.log(`  ✗ ${d.name} ${d.version} — install failed (${reason}); not installed`);
+      result.failed.push({ name: d.name, reason });
+    }
+  }
+
+  // Stamp: installed adds; declined = explicit human "no" only, deduped.
+  const cur = skillsStamp(cwd);
+  const installed = { ...cur.installed };
+  for (const n of result.installed) {
+    const dep = SKILL_DEPS.find((d) => d.name === n);
+    installed[n] = dep.version;
+  }
+  const declined = [...new Set([...cur.declined.filter((n) => !result.installed.includes(n)), ...newlyDeclined])];
+  writeSkillsStamp(cwd, { installed, declined });
+  result.declined = newlyDeclined;
+
+  if (result.installed.length)
+    console.log(
+      `  ✓ verified ${result.installed.length}/${toInstall.length} (frontmatter parses · hashes match · licenses present)` +
+        `\n  → commit .agents/skills/ — the repo owns its toolbox`,
+    );
+  if (newlyDeclined.length)
+    console.log(`  · declined ${newlyDeclined.length} — remembered; agents fall back per SOP (re-offer: rafa update --skills)`);
+  return result;
+}

package/lib/stamp.mjs

@@ -3,6 +3,7 @@
 // stamp against what the running CLI ships to know what changed and what to migrate FROM.
 // (Also holds platform identity fields when the repo was provisioned via a setup URL.)
 
+import { execSync } from "node:child_process";
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { CURRENT, CLI_VERSION, RELEASES } from "./releases.mjs";
@@ -34,6 +35,29 @@ export function writeStamp(cwd, patch = {}) {
   return next;
 }
 
+// The code repo's canonical (prod) branch (owner 2026-07-26: configurable,
+// never hardcoded). Resolution chain: the rafa.json stamp's `prodBranch`
+// (mirrors the platform's per-repo setting — carried down so the CLI's trunk
+// guards agree with the platform's routing) → git's own origin/HEAD symref
+// (the repo's actual default) → "main".
+export function trunkBranchOf(cwd) {
+  const s = readStamp(cwd);
+  if (typeof s.prodBranch === "string" && s.prodBranch.trim() !== "")
+    return s.prodBranch.trim();
+  try {
+    const out = execSync("git symbolic-ref refs/remotes/origin/HEAD", {
+      cwd,
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"],
+    }).trim();
+    const m = out.match(/refs\/remotes\/origin\/(.+)$/);
+    if (m) return m[1];
+  } catch {
+    /* no remote / no symref — fall through */
+  }
+  return "main";
+}
+
 // The versions this repo was last stamped at. Un-stamped repos predate the stamp (added in
 // 0.2.0), so default to the FIRST release's schema — never raise a false migration alarm.
 export function stampedVersions(cwd) {

package/lib/update.mjs

@@ -26,6 +26,15 @@ export default async function update(args = []) {
 
   await notifyIfBehind();
 
+  // Wave 6 — skill dependencies FIRST (owner: consent → install one-by-one →
+  // verify → then the rest of the update proceeds). Declined is remembered;
+  // `--skills` re-offers, `--yes` installs unprompted (CI). A failure never
+  // blocks the update — agents degrade per SOP.
+  {
+    const { installSkillDeps } = await import("./skill-deps.mjs");
+    await installSkillDeps(TARGET, { args });
+  }
+
   console.log("rafa update — syncing the blueprint (non-destructive)");
   reportBlueprint(
     await copyBlueprint(blueprintSource(), TARGET, { onConflict: makeConflictResolver(args) }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rafinery/cli",
-  "version": "0.8.16",
+  "version": "0.11.0",
   "description": "rafa — the AI engineer CLI. Vendors the rafa blueprint into your repo (shadcn-style) and runs the deterministic contract gates.",
   "type": "module",
   "bin": {
@@ -11,7 +11,8 @@
     "bin",
     "lib",
     "blueprint",
-    "CHANGELOG.md"
+    "CHANGELOG.md",
+    "skills-bundle"
   ],
   "engines": {
     "node": ">=18"

package/skills-bundle/frontend-design/LICENSE.txt

@@ -0,0 +1,177 @@
+
+                                 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