grepmax 0.26.43 → 0.26.45

package/dist/lib/store/vector-db.js

@@ -41,6 +41,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __asyncValues = (this && this.__asyncValues) || function (o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VectorDB = exports.DiskPressureError = void 0;
 exports.findStaleLanceTempFiles = findStaleLanceTempFiles;
@@ -48,7 +55,6 @@ exports.sweepStaleLanceTempFiles = sweepStaleLanceTempFiles;
 exports.isLanceCorruptionError = isLanceCorruptionError;
 exports.isMissingTableError = isMissingTableError;
 const fs = __importStar(require("node:fs"));
-const lancedb = __importStar(require("@lancedb/lancedb"));
 const apache_arrow_1 = require("apache-arrow");
 const config_1 = require("../../config");
 const embedding_reuse_1 = require("../index/embedding-reuse");
@@ -56,8 +62,10 @@ const index_config_1 = require("../index/index-config");
 const cleanup_1 = require("../utils/cleanup");
 const filter_builder_1 = require("../utils/filter-builder");
 const logger_1 = require("../utils/logger");
+const query_timeout_1 = require("../utils/query-timeout");
 const ann_config_1 = require("./ann-config");
 const compaction_result_1 = require("./compaction-result");
+const lancedb = __importStar(require("./lance-sdk"));
 const store_lease_1 = require("./store-lease");
 /**
  * Find abandoned Lance scratch files under `<lancedbDir>/ *.lance/data`.
@@ -369,7 +377,11 @@ class VectorDB {
             if (!this.db) {
                 fs.mkdirSync(this.lancedbDir, { recursive: true });
                 this.session = createLanceSession();
-                this.db = yield lancedb.connect(this.lancedbDir, {}, this.session);
+                // 0.38 accepts the legacy third argument in its types but drops it in
+                // the JS wrapper. Put the session in native ConnectionOptions instead.
+                this.db = yield lancedb.connect(this.lancedbDir, {
+                    session: this.session,
+                });
             }
             return this.db;
         });
@@ -1457,7 +1469,11 @@ class VectorDB {
     hasAnyRows() {
         return __awaiter(this, void 0, void 0, function* () {
             const table = yield this.ensureTable();
-            const rows = yield table.query().select(["id"]).limit(1).toArray();
+            const rows = yield table
+                .query()
+                .select(["id"])
+                .limit(1)
+                .toArray(query_timeout_1.QUERY_EXECUTION_OPTIONS);
             return rows.length > 0;
         });
     }
@@ -1470,7 +1486,7 @@ class VectorDB {
                 .select(["id"])
                 .where((0, filter_builder_1.pathStartsWith)(prefix))
                 .limit(1)
-                .toArray();
+                .toArray(query_timeout_1.QUERY_EXECUTION_OPTIONS);
             return rows.length > 0;
         });
     }
@@ -1488,16 +1504,25 @@ class VectorDB {
     }
     getDistinctPathsForPrefix(pathPrefix) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, e_1, _b, _c;
             const table = yield this.ensureTable();
             const prefix = pathPrefix.endsWith("/") ? pathPrefix : `${pathPrefix}/`;
-            const rows = yield table
-                .query()
-                .select(["path"])
-                .where((0, filter_builder_1.pathStartsWith)(prefix))
-                .toArray();
+            const rows = (0, query_timeout_1.streamQueryRows)(table.query().select(["path"]).where((0, filter_builder_1.pathStartsWith)(prefix)), "distinct project paths");
             const unique = new Set();
-            for (const r of rows) {
-                unique.add(String(r.path));
+            try {
+                for (var _d = true, rows_1 = __asyncValues(rows), rows_1_1; rows_1_1 = yield rows_1.next(), _a = rows_1_1.done, !_a; _d = true) {
+                    _c = rows_1_1.value;
+                    _d = false;
+                    const r = _c;
+                    unique.add(String(r.path));
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (!_d && !_a && (_b = rows_1.return)) yield _b.call(rows_1);
+                }
+                finally { if (e_1) throw e_1.error; }
             }
             return unique;
         });
@@ -1522,7 +1547,7 @@ class VectorDB {
                 "doc_token_ids",
             ])
                 .where(`path = '${(0, filter_builder_1.escapeSqlString)(filePath)}'`)
-                .toArray();
+                .toArray(query_timeout_1.QUERY_EXECUTION_OPTIONS);
             const reusable = new Map();
             for (const row of rows) {
                 const vector = (0, embedding_reuse_1.toFloat32)(row.vector);
@@ -1556,9 +1581,25 @@ class VectorDB {
     }
     getDistinctFileCount() {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, e_2, _b, _c;
             const table = yield this.ensureTable();
-            const rows = yield table.query().select(["path"]).toArray();
-            return new Set(rows.map((r) => r.path)).size;
+            const paths = new Set();
+            try {
+                for (var _d = true, _e = __asyncValues((0, query_timeout_1.streamQueryRows)(table.query().select(["path"]), "distinct file count")), _f; _f = yield _e.next(), _a = _f.done, !_a; _d = true) {
+                    _c = _f.value;
+                    _d = false;
+                    const row = _c;
+                    paths.add(String(row.path));
+                }
+            }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            finally {
+                try {
+                    if (!_d && !_a && (_b = _e.return)) yield _b.call(_e);
+                }
+                finally { if (e_2) throw e_2.error; }
+            }
+            return paths.size;
         });
     }
     deletePaths(paths) {
@@ -1581,7 +1622,7 @@ class VectorDB {
                         .select(["id"])
                         .where(where)
                         .limit(1)
-                        .toArray();
+                        .toArray(query_timeout_1.QUERY_EXECUTION_OPTIONS);
                     if (existing.length > 0) {
                         yield table.delete(where);
                         this.markWriteCommitted();
@@ -1630,7 +1671,7 @@ class VectorDB {
                         .select(["id"])
                         .where(where)
                         .limit(1)
-                        .toArray();
+                        .toArray(query_timeout_1.QUERY_EXECUTION_OPTIONS);
                     if (existing.length > 0) {
                         yield table.delete(where);
                         this.markWriteCommitted();

package/dist/lib/utils/cross-project.js

@@ -15,13 +15,13 @@ exports.resolveCrossProjectScope = resolveCrossProjectScope;
 exports.projectForPath = projectForPath;
 exports.groupResultsByProject = groupResultsByProject;
 const project_registry_1 = require("./project-registry");
-function resolveCrossProjectScope(opts) {
+function resolveCrossProjectScope(opts, registeredProjects = (0, project_registry_1.listProjects)()) {
     const active = !!(opts.allProjects || opts.projects);
     if (!active) {
         return { active: false, roots: [], projectRoots: [], warnings: [] };
     }
     // Ignore "error"-status projects: the daemon won't search them anyway.
-    const all = (0, project_registry_1.listProjects)().filter((p) => p.status !== "error");
+    const all = registeredProjects.filter((p) => p.status !== "error");
     const byName = new Map(all.map((p) => [p.name, p]));
     const warnings = [];
     const resolveNames = (csv) => {

package/dist/lib/utils/project-registry.js

@@ -74,16 +74,16 @@ class ProjectRegistryConflictError extends Error {
     }
 }
 exports.ProjectRegistryConflictError = ProjectRegistryConflictError;
-function loadRegistry() {
+function loadRegistry(registryPath = REGISTRY_PATH) {
     let raw;
     try {
-        raw = fs.readFileSync(REGISTRY_PATH, "utf-8");
+        raw = fs.readFileSync(registryPath, "utf-8");
     }
     catch (err) {
         if (err.code === "ENOENT")
             return [];
         const message = err instanceof Error ? err.message : String(err);
-        throw new Error(`Failed to read project registry ${REGISTRY_PATH}: ${message}`);
+        throw new Error(`Failed to read project registry ${registryPath}: ${message}`);
     }
     let parsed;
     try {
@@ -91,14 +91,14 @@ function loadRegistry() {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        throw new Error(`Invalid project registry JSON ${REGISTRY_PATH}: ${message}`);
+        throw new Error(`Invalid project registry JSON ${registryPath}: ${message}`);
     }
     if (!Array.isArray(parsed)) {
-        throw new Error(`Invalid project registry ${REGISTRY_PATH}: expected an array`);
+        throw new Error(`Invalid project registry ${registryPath}: expected an array`);
     }
     for (const [index, entry] of parsed.entries()) {
         if (!isProjectEntry(entry)) {
-            throw new Error(`Invalid project registry entry at index ${index} in ${REGISTRY_PATH}`);
+            throw new Error(`Invalid project registry entry at index ${index} in ${registryPath}`);
         }
     }
     return parsed;
@@ -455,8 +455,8 @@ function stampProjectFullSync(stamp) {
         return entry;
     });
 }
-function listProjects() {
-    return loadRegistry();
+function listProjects(home) {
+    return loadRegistry(home ? path.join(home, "projects.json") : undefined);
 }
 function getProject(root) {
     return loadRegistry().find((e) => e.root === root);

package/dist/lib/utils/query-timeout.js

@@ -8,10 +8,28 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __await = (this && this.__await) || function (v) { return this instanceof __await ? (this.v = v, this) : new __await(v); }
+var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var g = generator.apply(thisArg, _arguments || []), i, q = [];
+    return i = Object.create((typeof AsyncIterator === "function" ? AsyncIterator : Object).prototype), verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function () { return this; }, i;
+    function awaitReturn(f) { return function (v) { return Promise.resolve(v).then(f, reject); }; }
+    function verb(n, f) { if (g[n]) { i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; if (f) i[n] = f(i[n]); } }
+    function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
+    function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
+    function fulfill(value) { resume("next", value); }
+    function reject(value) { resume("throw", value); }
+    function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueryTimeoutError = void 0;
+exports.QueryTimeoutError = exports.QUERY_EXECUTION_OPTIONS = exports.QUERY_TIMEOUT_MS = void 0;
 exports.withQueryTimeout = withQueryTimeout;
-const DEFAULT_TIMEOUT_MS = Number(process.env.GMAX_QUERY_TIMEOUT_MS || "") || 15000;
+exports.streamQueryRows = streamQueryRows;
+const configuredTimeout = Number(process.env.GMAX_QUERY_TIMEOUT_MS);
+exports.QUERY_TIMEOUT_MS = Number.isFinite(configuredTimeout) && configuredTimeout > 0
+    ? Math.max(1, Math.min(Math.floor(configuredTimeout), 2147483647))
+    : 15000;
+exports.QUERY_EXECUTION_OPTIONS = { timeoutMs: exports.QUERY_TIMEOUT_MS };
 class QueryTimeoutError extends Error {
     constructor(label, ms) {
         super(`LanceDB query timed out after ${ms}ms (${label}). ` +
@@ -24,19 +42,13 @@ exports.QueryTimeoutError = QueryTimeoutError;
  * Race a LanceDB query against a wall-clock timeout so a native-layer deadlock
  * surfaces as a loud error instead of hanging the process forever.
  *
- * Known trigger (@lancedb/lancedb 0.27.x): a `content LIKE` scan with
- * `.limit(N)` where more than N rows match never resolves — the limit-pushdown
- * cancellation loses the completion (see lancedb/lancedb#2189 for the same
- * family of hangs). Callers should also avoid that query shape (scan without
- * a limit and cap in JS); this wrapper is the backstop for shapes we missed.
- *
- * The timed-out native promise is NOT cancelled — its tokio task may stay
- * parked. CLI commands exit via gracefulExit() (process.exit), so the leak is
- * bounded to the command's lifetime. Long-lived callers (daemon) should treat
- * a QueryTimeoutError as a signal that the connection may be wedged.
+ * This JavaScript backstop does not cancel its input. Native query callers
+ * must also pass QUERY_EXECUTION_OPTIONS to toArray/execute so Lance enforces
+ * an execution deadline. The historical 0.27 LIKE+limit hang has a native
+ * temporary-store regression on the pinned SDK.
  */
 function withQueryTimeout(promise_1, label_1) {
-    return __awaiter(this, arguments, void 0, function* (promise, label, ms = DEFAULT_TIMEOUT_MS) {
+    return __awaiter(this, arguments, void 0, function* (promise, label, ms = exports.QUERY_TIMEOUT_MS) {
         let timer;
         const timeout = new Promise((_, reject) => {
             timer = setTimeout(() => reject(new QueryTimeoutError(label, ms)), ms);
@@ -50,3 +62,31 @@ function withQueryTimeout(promise_1, label_1) {
         }
     });
 }
+/** Stream bounded Arrow batches with a native and overall wall-clock deadline.
+ * SDK 0.38 exposes execute(options) at runtime but marks it protected in its
+ * declarations. Keep this version-specific adapter here and cover it natively.
+ */
+function streamQueryRows(query_1, label_1) {
+    return __asyncGenerator(this, arguments, function* streamQueryRows_1(query, label, ms = exports.QUERY_TIMEOUT_MS) {
+        var _a;
+        const streaming = query;
+        const iterator = streaming.execute({ timeoutMs: ms, maxBatchLength: 512 });
+        const deadline = Date.now() + ms;
+        try {
+            for (;;) {
+                const remaining = deadline - Date.now();
+                if (remaining <= 0)
+                    throw new QueryTimeoutError(label, ms);
+                const batch = yield __await(withQueryTimeout(iterator.next(), label, remaining));
+                if (batch.done)
+                    return yield __await(void 0);
+                for (const row of batch.value.toArray())
+                    yield yield __await(row);
+            }
+        }
+        finally {
+            // Do not let a broken native iterator's pending next() hang cleanup.
+            void ((_a = iterator.return) === null || _a === void 0 ? void 0 : _a.call(iterator).catch(() => { }));
+        }
+    });
+}

package/dist/lib/utils/store-access.js

@@ -189,15 +189,14 @@ function classifyDaemonError(error) {
  *
  * Kept as a named predicate because it is the exact rule `search-run.ts` has
  * always applied (and re-exports); `unknown command` is deliberately NOT in the
- * set — see `isUnknownCommandError` for the version-skew allowance.
+ * set; an unsupported verb is a live daemon refusing the request.
  */
 function shouldFallbackFromDaemonError(error) {
     return classifyDaemonError(error) === "no-daemon";
 }
 /**
- * A daemon older than this CLI does not know a newly added verb. Treat that as
- * "no daemon" for one release so an unrestarted daemon does not break the
- * command, then remove the allowance. Mirrors the `search-v2` transition rule.
+ * An unsupported verb means a live daemon is outdated or incompatible. It must
+ * be restarted, never bypassed by opening a second reader.
  */
 function isUnknownCommandError(error) {
     return typeof error === "string" && error.startsWith("unknown command");
@@ -304,8 +303,10 @@ function withStoreRead(name, opts) {
         const cls = classifyDaemonError(resp.error);
         if (cls === "sandboxed")
             throw refuseStoreAccess("socket");
+        if (isUnknownCommandError(resp.error)) {
+            throw new Error(`${defaultDaemonErrorMessage(name, resp)}. The daemon is outdated or incompatible; run: gmax watch restart`);
+        }
         if (cls === "no-daemon" ||
-            (opts.fallbackOnUnknownVerb && isUnknownCommandError(resp.error)) ||
             (opts.fallbackOnOversize && isOversizeError(resp.error)) ||
             ((_a = opts.extraFallback) === null || _a === void 0 ? void 0 : _a.call(opts, resp.error)) === true) {
             if (process.env.GMAX_DEBUG === "1") {

package/dist/lib/utils/store-context.js

@@ -0,0 +1,102 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.storeInventory = storeInventory;
+exports.currentStoreContext = currentStoreContext;
+exports.withStoreContext = withStoreContext;
+const node_async_hooks_1 = require("node:async_hooks");
+const fs = __importStar(require("node:fs"));
+const path = __importStar(require("node:path"));
+const config_1 = require("../../config");
+const index_config_1 = require("../index/index-config");
+const project_registry_1 = require("./project-registry");
+const stores_1 = require("./stores");
+/** Metadata only: an offline store is never opened or recreated. */
+function storeInventory(stores = (0, stores_1.readStores)()) {
+    var _a;
+    const homes = new Map();
+    for (const store of stores) {
+        const home = path.resolve(store.home);
+        const prior = homes.get(home);
+        if (prior) {
+            prior.prefixes.push(store.prefix);
+            continue;
+        }
+        const volume = (_a = (0, stores_1.volumeOf)(home)) !== null && _a !== void 0 ? _a : (0, stores_1.volumeOf)(store.prefix);
+        const item = {
+            home,
+            prefixes: [store.prefix],
+            volume,
+            state: "mounted",
+            projects: [],
+        };
+        if (volume && !fs.existsSync(volume))
+            item.state = "offline";
+        else if (!fs.existsSync(home))
+            item.state = "uninitialized";
+        else {
+            try {
+                item.projects = (0, project_registry_1.listProjects)(home);
+            }
+            catch (error) {
+                item.state = "error";
+                item.error = String(error);
+            }
+        }
+        homes.set(home, item);
+    }
+    return [...homes.values()];
+}
+const contexts = new node_async_hooks_1.AsyncLocalStorage();
+function currentStoreContext() {
+    return contexts.getStore();
+}
+function withStoreContext(root, fn) {
+    const match = (0, stores_1.matchStore)(root);
+    if (match.kind === "offline") {
+        throw new Error(`gmax: this project's index lives on ${match.volume}, which is not mounted (store ${match.store.home}). Connect the drive and run the command again.`);
+    }
+    const home = match.kind === "store" ? path.resolve(match.store.home) : config_1.PATHS.globalRoot;
+    const context = {
+        home,
+        root,
+        secondary: match.kind === "store" || process.env.GMAX_SECONDARY_STORE === "1",
+        projects: (0, project_registry_1.listProjects)(home),
+        config: (0, index_config_1.readGlobalConfig)(home),
+        lancedbDir: path.join(home, "lancedb"),
+        lmdbPath: path.join(home, "cache", "meta.lmdb"),
+    };
+    return contexts.run(context, () => fn(context));
+}

package/dist/lib/utils/stores.js

@@ -110,7 +110,7 @@ function matchStore(target, stores = readStores()) {
     if (!stores.length)
         return { kind: "primary" };
     for (const cand of candidates(target)) {
-        for (const store of stores) {
+        for (const store of [...stores].sort((a, b) => path.resolve(b.prefix).length - path.resolve(a.prefix).length)) {
             if (!within(cand, path.resolve(store.prefix)))
                 continue;
             const volume = (_a = volumeOf(store.home)) !== null && _a !== void 0 ? _a : volumeOf(store.prefix);

package/dist/vendor/lancedb/LICENSE

@@ -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.