git-edge 0.4.1 → 0.5.0

package/LICENSE

@@ -1,21 +1,661 @@
-MIT License
-
-Copyright (c) 2026 Nandan Varma
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.

package/README.md

@@ -93,7 +93,7 @@ const hit = cache.get<ParsedCommit>(`${oid}:commit`);
 cache.invalidatePrefix(gitdir); // drop everything under a repo after a rewrite
 ```
 
-- `options.maxSize` — byte budget, estimated via `JSON.stringify(value).length` (default 256 MiB).
+- `options.maxSize` — approximate byte budget; each entry is sized by walking its value, without serialization (default 256 MiB).
 - `options.ttl` — entry TTL in ms (default 1 h).
 - `.invalidatePrefix(prefix)` — drop every key starting with `prefix`; O(cache size), fine for occasional invalidation, not a hot-path operation.
 
@@ -109,8 +109,28 @@ Per-repo isomorphic-git packfile `cache` object management, keyed `` `${ownerKey
 
 - `threeWayMerge`'s content merge (for paths both sides changed from the merge base — most changes are added/deleted/single-side-modified and resolve without touching it at all) uses [`node-diff3`](https://www.npmjs.com/package/node-diff3)'s LCS-based diff3 algorithm, the same approach GNU diffutils' `diff3` and git's own default merge driver use.
 - Binary files (a NUL byte in any version) are never line-merged; both sides changing one is a conflict. No rename detection; criss-cross histories use the first merge base.
+- Object reads and writes are bounded (`MAX_CONCURRENT_READS = 16` in-flight per merge, held for each individual `readTree`/`readBlob`/`writeBlob`/`writeTree` call rather than across the recursive subtree merge). A directory's entries are merged concurrently, so an unbounded fan-out over a repo with tens of thousands of entries in one directory would otherwise issue that many simultaneous store requests from a single merge, with each `readBlob` holding a whole blob in memory.
 - The parsed-object cache and `getRepoCache`/`invalidateRepoCache` are general-purpose helpers, not required by `threeWayMerge` — use whichever pieces you need independently.
 
+## Changelog
+
+See [CHANGELOG.md](CHANGELOG.md) for what changed in each release.
+
 ## License
 
-[MIT](LICENSE)
+Copyright (C) 2026 Nandan Varma.
+
+`git-edge` is free software: you can redistribute it and/or modify it under the
+terms of the GNU Affero General Public License as published by the Free Software
+Foundation, either version 3 of the License, or (at your option) any later
+version.
+
+It is distributed in the hope that it will be useful, but **without any
+warranty**; without even the implied warranty of merchantability or fitness for
+a particular purpose. See the [GNU Affero General Public License](LICENSE) for
+the full terms.
+
+**Licence change:** published versions up to and including `0.4.2` remain
+MIT and are still installable. From the next release onward this package is
+AGPL-3.0-or-later, so a network service built on it must offer its users the
+corresponding source.

package/dist/index.js

@@ -63,19 +63,57 @@ var GitMergeConflictError = class extends GitEdgeError {
 import { withPackedWrites } from "git-fs-s3/ops";
 import git from "isomorphic-git";
 import { merge as diff3Merge } from "node-diff3";
+
+// src/semaphore.ts
+function createSemaphore(limit) {
+  if (!Number.isInteger(limit) || limit < 1) {
+    throw new RangeError(
+      `Semaphore limit must be a positive integer, got ${limit}`
+    );
+  }
+  let active = 0;
+  const waiting = [];
+  function acquire() {
+    if (active < limit) {
+      active += 1;
+      return Promise.resolve();
+    }
+    return new Promise((resolve) => waiting.push(resolve));
+  }
+  function release() {
+    const next = waiting.shift();
+    if (next) next();
+    else active -= 1;
+  }
+  return {
+    async run(fn) {
+      await acquire();
+      try {
+        return await fn();
+      } finally {
+        release();
+      }
+    }
+  };
+}
+
+// src/merge.ts
+var MAX_CONCURRENT_READS = 16;
 var isTree = (entry) => entry?.type === "tree";
 var isFile = (entry) => entry?.type === "blob";
 function same(a, b) {
   if (a === void 0 || b === void 0) return a === b;
   return a.oid === b.oid && a.mode === b.mode;
 }
-async function readEntries(repo, treeOid) {
+async function readEntries(repo, reads, treeOid) {
   if (treeOid === void 0) return /* @__PURE__ */ new Map();
-  const { tree } = await git.readTree({ ...repo, oid: treeOid });
+  const { tree } = await reads.run(
+    () => git.readTree({ ...repo, oid: treeOid })
+  );
   return new Map(tree.map((entry) => [entry.path, entry]));
 }
-async function readBlob(repo, oid) {
-  const { blob } = await git.readBlob({ ...repo, oid });
+async function readBlob(repo, reads, oid) {
+  const { blob } = await reads.run(() => git.readBlob({ ...repo, oid }));
   return blob;
 }
 function mergeText(base, ours, theirs) {
@@ -98,10 +136,11 @@ function mergeMode(base, ours, theirs) {
   if (base?.mode === theirs.mode) return ours.mode;
   return null;
 }
-async function mergeChangedEntry(repo, path, base, ours, theirs, conflicts) {
+async function mergeChangedEntry(repo, reads, path, base, ours, theirs, conflicts) {
   if (isTree(ours) && isTree(theirs)) {
     const oid2 = await mergeTrees(
       repo,
+      reads,
       path,
       isTree(base) ? base.oid : void 0,
       ours.oid,
@@ -121,9 +160,9 @@ async function mergeChangedEntry(repo, path, base, ours, theirs, conflicts) {
   }
   if (ours.oid === theirs.oid) return { mode, oid: ours.oid, type: "blob" };
   const [baseContent, oursContent, theirsContent] = await Promise.all([
-    isFile(base) ? readBlob(repo, base.oid) : new Uint8Array(),
-    readBlob(repo, ours.oid),
-    readBlob(repo, theirs.oid)
+    isFile(base) ? readBlob(repo, reads, base.oid) : new Uint8Array(),
+    readBlob(repo, reads, ours.oid),
+    readBlob(repo, reads, theirs.oid)
   ]);
   if (isBinary(baseContent) || isBinary(oursContent) || isBinary(theirsContent)) {
     conflicts.push(path);
@@ -138,14 +177,14 @@ async function mergeChangedEntry(repo, path, base, ours, theirs, conflicts) {
     conflicts.push(path);
     return null;
   }
-  const oid = await git.writeBlob({ ...repo, blob: content });
+  const oid = await reads.run(() => git.writeBlob({ ...repo, blob: content }));
   return { mode, oid, type: "blob" };
 }
-async function mergeTrees(repo, prefix, baseOid, oursOid, theirsOid, conflicts) {
+async function mergeTrees(repo, reads, prefix, baseOid, oursOid, theirsOid, conflicts) {
   const [base, ours, theirs] = await Promise.all([
-    readEntries(repo, baseOid),
-    readEntries(repo, oursOid),
-    readEntries(repo, theirsOid)
+    readEntries(repo, reads, baseOid),
+    readEntries(repo, reads, oursOid),
+    readEntries(repo, reads, theirsOid)
   ]);
   const names = /* @__PURE__ */ new Set([...base.keys(), ...ours.keys(), ...theirs.keys()]);
   const merged = [];
@@ -160,12 +199,13 @@ async function mergeTrees(repo, prefix, baseOid, oursOid, theirsOid, conflicts)
       if (same(o, t)) result = o;
       else if (same(b, o)) result = t;
       else if (same(b, t)) result = o;
-      else result = await mergeChangedEntry(repo, path, b, o, t, conflicts);
+      else
+        result = await mergeChangedEntry(repo, reads, path, b, o, t, conflicts);
       if (result) merged.push({ ...result, path: name });
     })
   );
   if (conflicts.length > before) return null;
-  return git.writeTree({ ...repo, tree: merged });
+  return reads.run(() => git.writeTree({ ...repo, tree: merged }));
 }
 async function threeWayMerge(repo, sourceRef, targetRef, opts) {
   const [sourceOid, targetOid] = await Promise.all([
@@ -199,10 +239,12 @@ async function threeWayMerge(repo, sourceRef, targetRef, opts) {
     git.readCommit({ ...repo, oid: sourceOid }),
     git.readCommit({ ...repo, oid: targetOid })
   ]);
+  const reads = createSemaphore(MAX_CONCURRENT_READS);
   return withPackedWrites(repo, async (packed) => {
     const conflicts = [];
     const treeOid = await mergeTrees(
       packed,
+      reads,
       "",
       baseCommit.commit.tree,
       targetCommit.commit.tree,

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/cache.ts","../src/errors.ts","../src/merge.ts","../src/repo.ts"],"sourcesContent":["/**\n * Generalized parsed-object LRU cache for isomorphic-git.\n *\n * Stores JS values directly — avoids JSON.parse on every hot-path read.\n * Configurable maxSize (rough byte estimate) and TTL.\n *\n * Edge-compatible: no node: imports.\n */\nimport { LRUCache } from \"lru-cache\";\n\nexport interface ParsedObjectCacheOptions {\n\t/** Maximum estimated size in bytes (default: 256 MB). */\n\tmaxSize?: number;\n\t/** Time-to-live in milliseconds (default: 1 hour). */\n\tttl?: number;\n}\n\nexport interface ParsedObjectStore {\n\tget<T extends object>(key: string): T | null;\n\tset<T extends object>(key: string, value: T): void;\n\tdelete(key: string): void;\n\t/** Delete all keys matching a prefix. */\n\tinvalidatePrefix(prefix: string): void;\n}\n\n/**\n * Create a parsed-object cache instance.\n *\n * `key` convention: `\"${oid}:${format}\"` or any caller-chosen string.\n * `sizeCalculation` walks the value for a rough byte estimate.\n */\n// Rough byte estimate without serializing: JSON.stringify on every set\n// allocated a full copy of large values (commit logs, trees) and expanded\n// byte arrays into decimal text, both on the hot path.\nfunction estimateSize(value: unknown): number {\n\tif (typeof value === \"string\") return value.length;\n\tif (value === null || typeof value !== \"object\") return 8;\n\tif (ArrayBuffer.isView(value)) return value.byteLength;\n\tlet size = 0;\n\tif (Array.isArray(value)) {\n\t\tfor (const item of value) size += estimateSize(item);\n\t\treturn size;\n\t}\n\tfor (const [k, v] of Object.entries(value)) {\n\t\tsize += k.length + estimateSize(v);\n\t}\n\treturn size;\n}\n\nexport function createParsedObjectCache(\n\toptions?: ParsedObjectCacheOptions,\n): ParsedObjectStore {\n\tconst maxSize = options?.maxSize ?? 256 * 1024 * 1024;\n\tconst ttl = options?.ttl ?? 3600 * 1000;\n\n\tconst cache = new LRUCache<string, object>({\n\t\tmaxSize,\n\t\tsizeCalculation: (v) => Math.max(1, estimateSize(v)),\n\t\tttl,\n\t});\n\n\treturn {\n\t\tget<T extends object>(key: string): T | null {\n\t\t\treturn (cache.get(key) as T) ?? null;\n\t\t},\n\t\tset<T extends object>(key: string, value: T): void {\n\t\t\tcache.set(key, value);\n\t\t},\n\t\tdelete(key: string): void {\n\t\t\tcache.delete(key);\n\t\t},\n\t\tinvalidatePrefix(prefix: string): void {\n\t\t\tfor (const k of cache.keys()) {\n\t\t\t\tif (k.startsWith(prefix)) cache.delete(k);\n\t\t\t}\n\t\t},\n\t};\n}\n","/**\n * Error types for git-edge.\n *\n * Edge-compatible: no node: imports.\n */\n\n/** Base class for all git-edge errors. */\nexport class GitEdgeError extends Error {\n\tconstructor(message: string) {\n\t\tsuper(message);\n\t\tthis.name = \"GitEdgeError\";\n\t\tError.captureStackTrace?.(this, this.constructor);\n\t}\n}\n\n/** Thrown when a three-way merge has unresolvable conflicts. */\nexport class GitMergeConflictError extends GitEdgeError {\n\treadonly conflictingPaths: string[];\n\n\tconstructor(conflictingPaths: string[]) {\n\t\tsuper(\n\t\t\t`Merge conflict in ${conflictingPaths.length} file(s): ${conflictingPaths.join(\", \")}`,\n\t\t);\n\t\tthis.name = \"GitMergeConflictError\";\n\t\tthis.conflictingPaths = conflictingPaths;\n\t}\n}\n","/**\n * Object-level three-way merge for isomorphic-git.\n *\n * Merges two commits by walking their trees directly — no worktree, no disk.\n * Returns the merged commit OID, or throws GitMergeConflictError with the\n * list of conflicting paths.\n *\n * Edge-compatible: no node: imports, uses only isomorphic-git object APIs.\n */\n\nimport { type Repo, withPackedWrites } from \"git-fs-s3/ops\";\nimport git from \"isomorphic-git\";\nimport { merge as diff3Merge } from \"node-diff3\";\nimport { GitEdgeError, GitMergeConflictError } from \"./errors.js\";\n\nexport type { Repo };\n\n/** Options for threeWayMerge. */\nexport interface MergeOpts {\n\t/** Merge commit message (default: \"Merge <source> into <target>\"). */\n\tmessage?: string;\n\t/** Author name (default: \"Git Edge\"). */\n\tauthorName?: string;\n\t/** Author email (default: \"git-edge@local\"). */\n\tauthorEmail?: string;\n}\n\n/** Result of a successful merge (or of a no-op: target already up to date). */\nexport interface MergeResult {\n\tcommitOid: string;\n}\n\ninterface Entry {\n\tmode: string;\n\toid: string;\n\ttype: \"blob\" | \"tree\" | \"commit\";\n}\n\nconst isTree = (entry: Entry | undefined): entry is Entry =>\n\tentry?.type === \"tree\";\nconst isFile = (entry: Entry | undefined): entry is Entry =>\n\tentry?.type === \"blob\";\n\n/** Same tree entry: both absent, or identical oid and mode. */\nfunction same(a: Entry | undefined, b: Entry | undefined): boolean {\n\tif (a === undefined || b === undefined) return a === b;\n\treturn a.oid === b.oid && a.mode === b.mode;\n}\n\nasync function readEntries(\n\trepo: Repo,\n\ttreeOid: string | undefined,\n): Promise<Map<string, Entry>> {\n\tif (treeOid === undefined) return new Map();\n\tconst { tree } = await git.readTree({ ...repo, oid: treeOid });\n\treturn new Map(tree.map((entry) => [entry.path, entry]));\n}\n\nasync function readBlob(repo: Repo, oid: string): Promise<Uint8Array> {\n\tconst { blob } = await git.readBlob({ ...repo, oid });\n\treturn blob;\n}\n\n/**\n * Line-level 3-way merge, via node-diff3's LCS-based diff3 algorithm — the\n * same approach GNU diffutils' `diff3` (and git's own default merge driver)\n * use. `conflict` reports whether any hunk couldn't be merged.\n */\nfunction mergeText(\n\tbase: Uint8Array,\n\tours: Uint8Array,\n\ttheirs: Uint8Array,\n): { content: Uint8Array; conflict: boolean } {\n\tconst { conflict, result } = diff3Merge(\n\t\tdecodeLines(ours),\n\t\tdecodeLines(base),\n\t\tdecodeLines(theirs),\n\t\t{ label: { a: \"ours\", b: \"theirs\" } },\n\t);\n\treturn { content: new TextEncoder().encode(result.join(\"\\n\")), conflict };\n}\n\nfunction decodeLines(data: Uint8Array): string[] {\n\tconst text = new TextDecoder().decode(data);\n\treturn text === \"\" ? [] : text.split(\"\\n\");\n}\n\n/** Git's own heuristic: a NUL byte means binary, which is never line-merged. */\nconst isBinary = (data: Uint8Array) => data.includes(0);\n\n/**\n * The merged mode when both sides changed a file: a mode only one side\n * changed wins; both changing it differently is a conflict (null).\n */\nfunction mergeMode(\n\tbase: Entry | undefined,\n\tours: Entry,\n\ttheirs: Entry,\n): string | null {\n\tif (ours.mode === theirs.mode) return ours.mode;\n\tif (base?.mode === ours.mode) return theirs.mode;\n\tif (base?.mode === theirs.mode) return ours.mode;\n\treturn null;\n}\n\n/**\n * Merge one path whose two sides both changed it differently. Returns the\n * merged entry, or null for a conflict (pushed onto `conflicts`).\n */\nasync function mergeChangedEntry(\n\trepo: Repo,\n\tpath: string,\n\tbase: Entry | undefined,\n\tours: Entry | undefined,\n\ttheirs: Entry | undefined,\n\tconflicts: string[],\n): Promise<Entry | null> {\n\tif (isTree(ours) && isTree(theirs)) {\n\t\tconst oid = await mergeTrees(\n\t\t\trepo,\n\t\t\tpath,\n\t\t\tisTree(base) ? base.oid : undefined,\n\t\t\tours.oid,\n\t\t\ttheirs.oid,\n\t\t\tconflicts,\n\t\t);\n\t\treturn oid === null ? null : { mode: \"040000\", oid, type: \"tree\" };\n\t}\n\t// Anything else — modify/delete, file/directory, submodule changes — is a\n\t// conflict unless both sides are regular files with mergeable content.\n\tif (!isFile(ours) || !isFile(theirs) || ours.mode === \"120000\") {\n\t\tconflicts.push(path);\n\t\treturn null;\n\t}\n\tconst mode = mergeMode(base, ours, theirs);\n\tif (mode === null) {\n\t\tconflicts.push(path);\n\t\treturn null;\n\t}\n\tif (ours.oid === theirs.oid) return { mode, oid: ours.oid, type: \"blob\" };\n\tconst [baseContent, oursContent, theirsContent] = await Promise.all([\n\t\tisFile(base) ? readBlob(repo, base.oid) : new Uint8Array(),\n\t\treadBlob(repo, ours.oid),\n\t\treadBlob(repo, theirs.oid),\n\t]);\n\tif (\n\t\tisBinary(baseContent) ||\n\t\tisBinary(oursContent) ||\n\t\tisBinary(theirsContent)\n\t) {\n\t\tconflicts.push(path);\n\t\treturn null;\n\t}\n\tconst { content, conflict } = mergeText(\n\t\tbaseContent,\n\t\toursContent,\n\t\ttheirsContent,\n\t);\n\tif (conflict) {\n\t\tconflicts.push(path);\n\t\treturn null;\n\t}\n\tconst oid = await git.writeBlob({ ...repo, blob: content });\n\treturn { mode, oid, type: \"blob\" };\n}\n\n/**\n * Three-way merge of trees, recursing only into subtrees both sides changed\n * — an untouched or one-sided subtree is taken by oid without being read.\n * Returns the merged tree's oid, or null when any path conflicted.\n */\nasync function mergeTrees(\n\trepo: Repo,\n\tprefix: string,\n\tbaseOid: string | undefined,\n\toursOid: string,\n\ttheirsOid: string,\n\tconflicts: string[],\n): Promise<string | null> {\n\tconst [base, ours, theirs] = await Promise.all([\n\t\treadEntries(repo, baseOid),\n\t\treadEntries(repo, oursOid),\n\t\treadEntries(repo, theirsOid),\n\t]);\n\tconst names = new Set([...base.keys(), ...ours.keys(), ...theirs.keys()]);\n\tconst merged: Array<Entry & { path: string }> = [];\n\tconst before = conflicts.length;\n\n\tawait Promise.all(\n\t\t[...names].map(async (name) => {\n\t\t\tconst path = prefix ? `${prefix}/${name}` : name;\n\t\t\tconst b = base.get(name);\n\t\t\tconst o = ours.get(name);\n\t\t\tconst t = theirs.get(name);\n\t\t\tlet result: Entry | undefined | null;\n\t\t\tif (same(o, t)) result = o;\n\t\t\telse if (same(b, o)) result = t;\n\t\t\telse if (same(b, t)) result = o;\n\t\t\telse result = await mergeChangedEntry(repo, path, b, o, t, conflicts);\n\t\t\tif (result) merged.push({ ...result, path: name });\n\t\t}),\n\t);\n\n\tif (conflicts.length > before) return null;\n\treturn git.writeTree({ ...repo, tree: merged });\n}\n\n/**\n * Merge `sourceRef` into `targetRef`, entirely at the object level.\n *\n * - Target already contains source (same commit, or source is an ancestor):\n *   nothing to do — returns the target's commit, refs untouched.\n * - Source contains target: fast-forward the target ref to source.\n * - Otherwise: a real three-way merge against the merge base. Paths only one\n *   side changed take that side (deletions included); paths both changed are\n *   merged — subtrees recursively, text files line by line (diff3), modes\n *   kept unless both sides changed them differently. Binary files, symlinks,\n *   submodules, modify/delete and file/directory clashes that both sides\n *   touched are conflicts. Any conflict throws `GitMergeConflictError`\n *   without writing anything.\n *\n * New objects are stored as one pack, written before the target ref moves.\n * Serialize concurrent writers to the same repository externally.\n */\nexport async function threeWayMerge(\n\trepo: Repo,\n\tsourceRef: string,\n\ttargetRef: string,\n\topts?: MergeOpts,\n): Promise<MergeResult> {\n\tconst [sourceOid, targetOid] = await Promise.all([\n\t\tgit.resolveRef({ ...repo, ref: sourceRef }),\n\t\tgit.resolveRef({ ...repo, ref: targetRef }),\n\t]);\n\n\tif (\n\t\tsourceOid === targetOid ||\n\t\t(await git.isDescendent({ ...repo, oid: targetOid, ancestor: sourceOid }))\n\t) {\n\t\treturn { commitOid: targetOid };\n\t}\n\n\tif (\n\t\tawait git.isDescendent({ ...repo, oid: sourceOid, ancestor: targetOid })\n\t) {\n\t\tawait git.writeRef({\n\t\t\t...repo,\n\t\t\tref: targetRef,\n\t\t\tvalue: sourceOid,\n\t\t\tforce: true,\n\t\t});\n\t\treturn { commitOid: sourceOid };\n\t}\n\n\tconst baseOids = await git.findMergeBase({\n\t\t...repo,\n\t\toids: [sourceOid, targetOid],\n\t});\n\tconst baseOid = baseOids?.[0];\n\tif (baseOid === undefined) {\n\t\tthrow new GitEdgeError(\n\t\t\t`Refusing to merge unrelated histories (${sourceRef} and ${targetRef} share no commit)`,\n\t\t);\n\t}\n\n\tconst [baseCommit, sourceCommit, targetCommit] = await Promise.all([\n\t\tgit.readCommit({ ...repo, oid: baseOid }),\n\t\tgit.readCommit({ ...repo, oid: sourceOid }),\n\t\tgit.readCommit({ ...repo, oid: targetOid }),\n\t]);\n\n\treturn withPackedWrites(repo, async (packed) => {\n\t\tconst conflicts: string[] = [];\n\t\tconst treeOid = await mergeTrees(\n\t\t\tpacked,\n\t\t\t\"\",\n\t\t\tbaseCommit.commit.tree,\n\t\t\ttargetCommit.commit.tree,\n\t\t\tsourceCommit.commit.tree,\n\t\t\tconflicts,\n\t\t);\n\t\tif (treeOid === null) {\n\t\t\tthrow new GitMergeConflictError(conflicts.sort());\n\t\t}\n\n\t\tconst author = {\n\t\t\tname: opts?.authorName || \"Git Edge\",\n\t\t\temail: opts?.authorEmail || \"git-edge@local\",\n\t\t\ttimestamp: Math.floor(Date.now() / 1000),\n\t\t\ttimezoneOffset: 0,\n\t\t};\n\t\t// writeCommit, not git.commit: git.commit also advances whatever\n\t\t// branch HEAD names, which may not be the target.\n\t\tconst commitOid = await git.writeCommit({\n\t\t\t...packed,\n\t\t\tcommit: {\n\t\t\t\tmessage: opts?.message || `Merge ${sourceRef} into ${targetRef}`,\n\t\t\t\ttree: treeOid,\n\t\t\t\tparent: [targetOid, sourceOid],\n\t\t\t\tauthor,\n\t\t\t\tcommitter: author,\n\t\t\t},\n\t\t});\n\t\tawait git.writeRef({\n\t\t\t...packed,\n\t\t\tref: targetRef,\n\t\t\tvalue: commitOid,\n\t\t\tforce: true,\n\t\t});\n\t\treturn { commitOid };\n\t});\n}\n","/**\n * isomorphic-git per-repo parse cache management.\n *\n * No node: imports.\n */\n\n// ---------------------------------------------------------------------------\n// isomorphic-git cache management\n// ---------------------------------------------------------------------------\n\n/**\n * Per-repo isomorphic-git packfile cache.\n *\n * isomorphic-git re-parses a packfile index from scratch on every\n * readTree/log/readObject call unless callers share a `cache` object\n * across calls. Without this, operations that touch many objects\n * (e.g. walking commit history) pay that parse cost hundreds of times.\n * Objects are content-addressed/immutable so a long-lived per-repo\n * cache is safe.\n */\n// Each cache retains every packfile it has read, in full. Bound the number of\n// repos held so a long-lived process serving many repos doesn't grow without\n// limit; least-recently-used repos are dropped first (Map keeps insertion\n// order, and a hit re-inserts its key at the end).\nconst MAX_REPO_CACHES = 32;\nconst repoCaches = new Map<string, object>();\n\nexport function getRepoCache(ownerKey: string, repoName: string): object {\n\tconst key = `${ownerKey}/${repoName}`;\n\tlet cache = repoCaches.get(key);\n\tif (cache) {\n\t\trepoCaches.delete(key);\n\t} else {\n\t\tcache = {};\n\t\tif (repoCaches.size >= MAX_REPO_CACHES) {\n\t\t\tconst oldest = repoCaches.keys().next().value;\n\t\t\tif (oldest !== undefined) repoCaches.delete(oldest);\n\t\t}\n\t}\n\trepoCaches.set(key, cache);\n\treturn cache;\n}\n\nexport function invalidateRepoCache(ownerKey: string, repoName: string): void {\n\trepoCaches.delete(`${ownerKey}/${repoName}`);\n}\n"],"mappings":";AAQA,SAAS,gBAAgB;AA0BzB,SAAS,aAAa,OAAwB;AAC7C,MAAI,OAAO,UAAU,SAAU,QAAO,MAAM;AAC5C,MAAI,UAAU,QAAQ,OAAO,UAAU,SAAU,QAAO;AACxD,MAAI,YAAY,OAAO,KAAK,EAAG,QAAO,MAAM;AAC5C,MAAI,OAAO;AACX,MAAI,MAAM,QAAQ,KAAK,GAAG;AACzB,eAAW,QAAQ,MAAO,SAAQ,aAAa,IAAI;AACnD,WAAO;AAAA,EACR;AACA,aAAW,CAAC,GAAG,CAAC,KAAK,OAAO,QAAQ,KAAK,GAAG;AAC3C,YAAQ,EAAE,SAAS,aAAa,CAAC;AAAA,EAClC;AACA,SAAO;AACR;AAEO,SAAS,wBACf,SACoB;AACpB,QAAM,UAAU,SAAS,WAAW,MAAM,OAAO;AACjD,QAAM,MAAM,SAAS,OAAO,OAAO;AAEnC,QAAM,QAAQ,IAAI,SAAyB;AAAA,IAC1C;AAAA,IACA,iBAAiB,CAAC,MAAM,KAAK,IAAI,GAAG,aAAa,CAAC,CAAC;AAAA,IACnD;AAAA,EACD,CAAC;AAED,SAAO;AAAA,IACN,IAAsB,KAAuB;AAC5C,aAAQ,MAAM,IAAI,GAAG,KAAW;AAAA,IACjC;AAAA,IACA,IAAsB,KAAa,OAAgB;AAClD,YAAM,IAAI,KAAK,KAAK;AAAA,IACrB;AAAA,IACA,OAAO,KAAmB;AACzB,YAAM,OAAO,GAAG;AAAA,IACjB;AAAA,IACA,iBAAiB,QAAsB;AACtC,iBAAW,KAAK,MAAM,KAAK,GAAG;AAC7B,YAAI,EAAE,WAAW,MAAM,EAAG,OAAM,OAAO,CAAC;AAAA,MACzC;AAAA,IACD;AAAA,EACD;AACD;;;ACtEO,IAAM,eAAN,cAA2B,MAAM;AAAA,EACvC,YAAY,SAAiB;AAC5B,UAAM,OAAO;AACb,SAAK,OAAO;AACZ,UAAM,oBAAoB,MAAM,KAAK,WAAW;AAAA,EACjD;AACD;AAGO,IAAM,wBAAN,cAAoC,aAAa;AAAA,EAC9C;AAAA,EAET,YAAY,kBAA4B;AACvC;AAAA,MACC,qBAAqB,iBAAiB,MAAM,aAAa,iBAAiB,KAAK,IAAI,CAAC;AAAA,IACrF;AACA,SAAK,OAAO;AACZ,SAAK,mBAAmB;AAAA,EACzB;AACD;;;AChBA,SAAoB,wBAAwB;AAC5C,OAAO,SAAS;AAChB,SAAS,SAAS,kBAAkB;AA0BpC,IAAM,SAAS,CAAC,UACf,OAAO,SAAS;AACjB,IAAM,SAAS,CAAC,UACf,OAAO,SAAS;AAGjB,SAAS,KAAK,GAAsB,GAA+B;AAClE,MAAI,MAAM,UAAa,MAAM,OAAW,QAAO,MAAM;AACrD,SAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE;AACxC;AAEA,eAAe,YACd,MACA,SAC8B;AAC9B,MAAI,YAAY,OAAW,QAAO,oBAAI,IAAI;AAC1C,QAAM,EAAE,KAAK,IAAI,MAAM,IAAI,SAAS,EAAE,GAAG,MAAM,KAAK,QAAQ,CAAC;AAC7D,SAAO,IAAI,IAAI,KAAK,IAAI,CAAC,UAAU,CAAC,MAAM,MAAM,KAAK,CAAC,CAAC;AACxD;AAEA,eAAe,SAAS,MAAY,KAAkC;AACrE,QAAM,EAAE,KAAK,IAAI,MAAM,IAAI,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC;AACpD,SAAO;AACR;AAOA,SAAS,UACR,MACA,MACA,QAC6C;AAC7C,QAAM,EAAE,UAAU,OAAO,IAAI;AAAA,IAC5B,YAAY,IAAI;AAAA,IAChB,YAAY,IAAI;AAAA,IAChB,YAAY,MAAM;AAAA,IAClB,EAAE,OAAO,EAAE,GAAG,QAAQ,GAAG,SAAS,EAAE;AAAA,EACrC;AACA,SAAO,EAAE,SAAS,IAAI,YAAY,EAAE,OAAO,OAAO,KAAK,IAAI,CAAC,GAAG,SAAS;AACzE;AAEA,SAAS,YAAY,MAA4B;AAChD,QAAM,OAAO,IAAI,YAAY,EAAE,OAAO,IAAI;AAC1C,SAAO,SAAS,KAAK,CAAC,IAAI,KAAK,MAAM,IAAI;AAC1C;AAGA,IAAM,WAAW,CAAC,SAAqB,KAAK,SAAS,CAAC;AAMtD,SAAS,UACR,MACA,MACA,QACgB;AAChB,MAAI,KAAK,SAAS,OAAO,KAAM,QAAO,KAAK;AAC3C,MAAI,MAAM,SAAS,KAAK,KAAM,QAAO,OAAO;AAC5C,MAAI,MAAM,SAAS,OAAO,KAAM,QAAO,KAAK;AAC5C,SAAO;AACR;AAMA,eAAe,kBACd,MACA,MACA,MACA,MACA,QACA,WACwB;AACxB,MAAI,OAAO,IAAI,KAAK,OAAO,MAAM,GAAG;AACnC,UAAMA,OAAM,MAAM;AAAA,MACjB;AAAA,MACA;AAAA,MACA,OAAO,IAAI,IAAI,KAAK,MAAM;AAAA,MAC1B,KAAK;AAAA,MACL,OAAO;AAAA,MACP;AAAA,IACD;AACA,WAAOA,SAAQ,OAAO,OAAO,EAAE,MAAM,UAAU,KAAAA,MAAK,MAAM,OAAO;AAAA,EAClE;AAGA,MAAI,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,MAAM,KAAK,KAAK,SAAS,UAAU;AAC/D,cAAU,KAAK,IAAI;AACnB,WAAO;AAAA,EACR;AACA,QAAM,OAAO,UAAU,MAAM,MAAM,MAAM;AACzC,MAAI,SAAS,MAAM;AAClB,cAAU,KAAK,IAAI;AACnB,WAAO;AAAA,EACR;AACA,MAAI,KAAK,QAAQ,OAAO,IAAK,QAAO,EAAE,MAAM,KAAK,KAAK,KAAK,MAAM,OAAO;AACxE,QAAM,CAAC,aAAa,aAAa,aAAa,IAAI,MAAM,QAAQ,IAAI;AAAA,IACnE,OAAO,IAAI,IAAI,SAAS,MAAM,KAAK,GAAG,IAAI,IAAI,WAAW;AAAA,IACzD,SAAS,MAAM,KAAK,GAAG;AAAA,IACvB,SAAS,MAAM,OAAO,GAAG;AAAA,EAC1B,CAAC;AACD,MACC,SAAS,WAAW,KACpB,SAAS,WAAW,KACpB,SAAS,aAAa,GACrB;AACD,cAAU,KAAK,IAAI;AACnB,WAAO;AAAA,EACR;AACA,QAAM,EAAE,SAAS,SAAS,IAAI;AAAA,IAC7B;AAAA,IACA;AAAA,IACA;AAAA,EACD;AACA,MAAI,UAAU;AACb,cAAU,KAAK,IAAI;AACnB,WAAO;AAAA,EACR;AACA,QAAM,MAAM,MAAM,IAAI,UAAU,EAAE,GAAG,MAAM,MAAM,QAAQ,CAAC;AAC1D,SAAO,EAAE,MAAM,KAAK,MAAM,OAAO;AAClC;AAOA,eAAe,WACd,MACA,QACA,SACA,SACA,WACA,WACyB;AACzB,QAAM,CAAC,MAAM,MAAM,MAAM,IAAI,MAAM,QAAQ,IAAI;AAAA,IAC9C,YAAY,MAAM,OAAO;AAAA,IACzB,YAAY,MAAM,OAAO;AAAA,IACzB,YAAY,MAAM,SAAS;AAAA,EAC5B,CAAC;AACD,QAAM,QAAQ,oBAAI,IAAI,CAAC,GAAG,KAAK,KAAK,GAAG,GAAG,KAAK,KAAK,GAAG,GAAG,OAAO,KAAK,CAAC,CAAC;AACxE,QAAM,SAA0C,CAAC;AACjD,QAAM,SAAS,UAAU;AAEzB,QAAM,QAAQ;AAAA,IACb,CAAC,GAAG,KAAK,EAAE,IAAI,OAAO,SAAS;AAC9B,YAAM,OAAO,SAAS,GAAG,MAAM,IAAI,IAAI,KAAK;AAC5C,YAAM,IAAI,KAAK,IAAI,IAAI;AACvB,YAAM,IAAI,KAAK,IAAI,IAAI;AACvB,YAAM,IAAI,OAAO,IAAI,IAAI;AACzB,UAAI;AACJ,UAAI,KAAK,GAAG,CAAC,EAAG,UAAS;AAAA,eAChB,KAAK,GAAG,CAAC,EAAG,UAAS;AAAA,eACrB,KAAK,GAAG,CAAC,EAAG,UAAS;AAAA,UACzB,UAAS,MAAM,kBAAkB,MAAM,MAAM,GAAG,GAAG,GAAG,SAAS;AACpE,UAAI,OAAQ,QAAO,KAAK,EAAE,GAAG,QAAQ,MAAM,KAAK,CAAC;AAAA,IAClD,CAAC;AAAA,EACF;AAEA,MAAI,UAAU,SAAS,OAAQ,QAAO;AACtC,SAAO,IAAI,UAAU,EAAE,GAAG,MAAM,MAAM,OAAO,CAAC;AAC/C;AAmBA,eAAsB,cACrB,MACA,WACA,WACA,MACuB;AACvB,QAAM,CAAC,WAAW,SAAS,IAAI,MAAM,QAAQ,IAAI;AAAA,IAChD,IAAI,WAAW,EAAE,GAAG,MAAM,KAAK,UAAU,CAAC;AAAA,IAC1C,IAAI,WAAW,EAAE,GAAG,MAAM,KAAK,UAAU,CAAC;AAAA,EAC3C,CAAC;AAED,MACC,cAAc,aACb,MAAM,IAAI,aAAa,EAAE,GAAG,MAAM,KAAK,WAAW,UAAU,UAAU,CAAC,GACvE;AACD,WAAO,EAAE,WAAW,UAAU;AAAA,EAC/B;AAEA,MACC,MAAM,IAAI,aAAa,EAAE,GAAG,MAAM,KAAK,WAAW,UAAU,UAAU,CAAC,GACtE;AACD,UAAM,IAAI,SAAS;AAAA,MAClB,GAAG;AAAA,MACH,KAAK;AAAA,MACL,OAAO;AAAA,MACP,OAAO;AAAA,IACR,CAAC;AACD,WAAO,EAAE,WAAW,UAAU;AAAA,EAC/B;AAEA,QAAM,WAAW,MAAM,IAAI,cAAc;AAAA,IACxC,GAAG;AAAA,IACH,MAAM,CAAC,WAAW,SAAS;AAAA,EAC5B,CAAC;AACD,QAAM,UAAU,WAAW,CAAC;AAC5B,MAAI,YAAY,QAAW;AAC1B,UAAM,IAAI;AAAA,MACT,0CAA0C,SAAS,QAAQ,SAAS;AAAA,IACrE;AAAA,EACD;AAEA,QAAM,CAAC,YAAY,cAAc,YAAY,IAAI,MAAM,QAAQ,IAAI;AAAA,IAClE,IAAI,WAAW,EAAE,GAAG,MAAM,KAAK,QAAQ,CAAC;AAAA,IACxC,IAAI,WAAW,EAAE,GAAG,MAAM,KAAK,UAAU,CAAC;AAAA,IAC1C,IAAI,WAAW,EAAE,GAAG,MAAM,KAAK,UAAU,CAAC;AAAA,EAC3C,CAAC;AAED,SAAO,iBAAiB,MAAM,OAAO,WAAW;AAC/C,UAAM,YAAsB,CAAC;AAC7B,UAAM,UAAU,MAAM;AAAA,MACrB;AAAA,MACA;AAAA,MACA,WAAW,OAAO;AAAA,MAClB,aAAa,OAAO;AAAA,MACpB,aAAa,OAAO;AAAA,MACpB;AAAA,IACD;AACA,QAAI,YAAY,MAAM;AACrB,YAAM,IAAI,sBAAsB,UAAU,KAAK,CAAC;AAAA,IACjD;AAEA,UAAM,SAAS;AAAA,MACd,MAAM,MAAM,cAAc;AAAA,MAC1B,OAAO,MAAM,eAAe;AAAA,MAC5B,WAAW,KAAK,MAAM,KAAK,IAAI,IAAI,GAAI;AAAA,MACvC,gBAAgB;AAAA,IACjB;AAGA,UAAM,YAAY,MAAM,IAAI,YAAY;AAAA,MACvC,GAAG;AAAA,MACH,QAAQ;AAAA,QACP,SAAS,MAAM,WAAW,SAAS,SAAS,SAAS,SAAS;AAAA,QAC9D,MAAM;AAAA,QACN,QAAQ,CAAC,WAAW,SAAS;AAAA,QAC7B;AAAA,QACA,WAAW;AAAA,MACZ;AAAA,IACD,CAAC;AACD,UAAM,IAAI,SAAS;AAAA,MAClB,GAAG;AAAA,MACH,KAAK;AAAA,MACL,OAAO;AAAA,MACP,OAAO;AAAA,IACR,CAAC;AACD,WAAO,EAAE,UAAU;AAAA,EACpB,CAAC;AACF;;;AC/RA,IAAM,kBAAkB;AACxB,IAAM,aAAa,oBAAI,IAAoB;AAEpC,SAAS,aAAa,UAAkB,UAA0B;AACxE,QAAM,MAAM,GAAG,QAAQ,IAAI,QAAQ;AACnC,MAAI,QAAQ,WAAW,IAAI,GAAG;AAC9B,MAAI,OAAO;AACV,eAAW,OAAO,GAAG;AAAA,EACtB,OAAO;AACN,YAAQ,CAAC;AACT,QAAI,WAAW,QAAQ,iBAAiB;AACvC,YAAM,SAAS,WAAW,KAAK,EAAE,KAAK,EAAE;AACxC,UAAI,WAAW,OAAW,YAAW,OAAO,MAAM;AAAA,IACnD;AAAA,EACD;AACA,aAAW,IAAI,KAAK,KAAK;AACzB,SAAO;AACR;AAEO,SAAS,oBAAoB,UAAkB,UAAwB;AAC7E,aAAW,OAAO,GAAG,QAAQ,IAAI,QAAQ,EAAE;AAC5C;","names":["oid"]}
+{"version":3,"sources":["../src/cache.ts","../src/errors.ts","../src/merge.ts","../src/semaphore.ts","../src/repo.ts"],"sourcesContent":["/**\n * Generalized parsed-object LRU cache for isomorphic-git.\n *\n * Stores JS values directly — avoids JSON.parse on every hot-path read.\n * Configurable maxSize (rough byte estimate) and TTL.\n *\n * Edge-compatible: no node: imports.\n */\nimport { LRUCache } from \"lru-cache\";\n\nexport interface ParsedObjectCacheOptions {\n\t/** Maximum estimated size in bytes (default: 256 MB). */\n\tmaxSize?: number;\n\t/** Time-to-live in milliseconds (default: 1 hour). */\n\tttl?: number;\n}\n\nexport interface ParsedObjectStore {\n\tget<T extends object>(key: string): T | null;\n\tset<T extends object>(key: string, value: T): void;\n\tdelete(key: string): void;\n\t/** Delete all keys matching a prefix. */\n\tinvalidatePrefix(prefix: string): void;\n}\n\n/**\n * Create a parsed-object cache instance.\n *\n * `key` convention: `\"${oid}:${format}\"` or any caller-chosen string.\n * `sizeCalculation` walks the value for a rough byte estimate.\n */\n// Rough byte estimate without serializing: JSON.stringify on every set\n// allocated a full copy of large values (commit logs, trees) and expanded\n// byte arrays into decimal text, both on the hot path.\nfunction estimateSize(value: unknown): number {\n\tif (typeof value === \"string\") return value.length;\n\tif (value === null || typeof value !== \"object\") return 8;\n\tif (ArrayBuffer.isView(value)) return value.byteLength;\n\tlet size = 0;\n\tif (Array.isArray(value)) {\n\t\tfor (const item of value) size += estimateSize(item);\n\t\treturn size;\n\t}\n\tfor (const [k, v] of Object.entries(value)) {\n\t\tsize += k.length + estimateSize(v);\n\t}\n\treturn size;\n}\n\nexport function createParsedObjectCache(\n\toptions?: ParsedObjectCacheOptions,\n): ParsedObjectStore {\n\tconst maxSize = options?.maxSize ?? 256 * 1024 * 1024;\n\tconst ttl = options?.ttl ?? 3600 * 1000;\n\n\tconst cache = new LRUCache<string, object>({\n\t\tmaxSize,\n\t\tsizeCalculation: (v) => Math.max(1, estimateSize(v)),\n\t\tttl,\n\t});\n\n\treturn {\n\t\tget<T extends object>(key: string): T | null {\n\t\t\treturn (cache.get(key) as T) ?? null;\n\t\t},\n\t\tset<T extends object>(key: string, value: T): void {\n\t\t\tcache.set(key, value);\n\t\t},\n\t\tdelete(key: string): void {\n\t\t\tcache.delete(key);\n\t\t},\n\t\tinvalidatePrefix(prefix: string): void {\n\t\t\tfor (const k of cache.keys()) {\n\t\t\t\tif (k.startsWith(prefix)) cache.delete(k);\n\t\t\t}\n\t\t},\n\t};\n}\n","/**\n * Error types for git-edge.\n *\n * Edge-compatible: no node: imports.\n */\n\n/** Base class for all git-edge errors. */\nexport class GitEdgeError extends Error {\n\tconstructor(message: string) {\n\t\tsuper(message);\n\t\tthis.name = \"GitEdgeError\";\n\t\tError.captureStackTrace?.(this, this.constructor);\n\t}\n}\n\n/** Thrown when a three-way merge has unresolvable conflicts. */\nexport class GitMergeConflictError extends GitEdgeError {\n\treadonly conflictingPaths: string[];\n\n\tconstructor(conflictingPaths: string[]) {\n\t\tsuper(\n\t\t\t`Merge conflict in ${conflictingPaths.length} file(s): ${conflictingPaths.join(\", \")}`,\n\t\t);\n\t\tthis.name = \"GitMergeConflictError\";\n\t\tthis.conflictingPaths = conflictingPaths;\n\t}\n}\n","/**\n * Object-level three-way merge for isomorphic-git.\n *\n * Merges two commits by walking their trees directly — no worktree, no disk.\n * Returns the merged commit OID, or throws GitMergeConflictError with the\n * list of conflicting paths.\n *\n * Edge-compatible: no node: imports, uses only isomorphic-git object APIs.\n */\n\nimport { type Repo, withPackedWrites } from \"git-fs-s3/ops\";\nimport git from \"isomorphic-git\";\nimport { merge as diff3Merge } from \"node-diff3\";\nimport { GitEdgeError, GitMergeConflictError } from \"./errors.js\";\nimport { createSemaphore, type Semaphore } from \"./semaphore.js\";\n\nexport type { Repo };\n\n/**\n * How many object reads/writes a merge may have in flight at once. Each\n * `readBlob` materialises a whole blob, so an unbounded fan-out over a wide\n * directory holds as many object-store round trips (and bytes) open as the\n * directory has entries — enough to exhaust a serverless function's sockets\n * and trip storage rate limits. One shared pool keeps that flat regardless of\n * tree width or recursion depth, while staying wide enough to overlap enough\n * round trips to hide object-store latency.\n */\nexport const MAX_CONCURRENT_READS = 16;\n\n/** Options for threeWayMerge. */\nexport interface MergeOpts {\n\t/** Merge commit message (default: \"Merge <source> into <target>\"). */\n\tmessage?: string;\n\t/** Author name (default: \"Git Edge\"). */\n\tauthorName?: string;\n\t/** Author email (default: \"git-edge@local\"). */\n\tauthorEmail?: string;\n}\n\n/** Result of a successful merge (or of a no-op: target already up to date). */\nexport interface MergeResult {\n\tcommitOid: string;\n}\n\ninterface Entry {\n\tmode: string;\n\toid: string;\n\ttype: \"blob\" | \"tree\" | \"commit\";\n}\n\nconst isTree = (entry: Entry | undefined): entry is Entry =>\n\tentry?.type === \"tree\";\nconst isFile = (entry: Entry | undefined): entry is Entry =>\n\tentry?.type === \"blob\";\n\n/** Same tree entry: both absent, or identical oid and mode. */\nfunction same(a: Entry | undefined, b: Entry | undefined): boolean {\n\tif (a === undefined || b === undefined) return a === b;\n\treturn a.oid === b.oid && a.mode === b.mode;\n}\n\nasync function readEntries(\n\trepo: Repo,\n\treads: Semaphore,\n\ttreeOid: string | undefined,\n): Promise<Map<string, Entry>> {\n\tif (treeOid === undefined) return new Map();\n\tconst { tree } = await reads.run(() =>\n\t\tgit.readTree({ ...repo, oid: treeOid }),\n\t);\n\treturn new Map(tree.map((entry) => [entry.path, entry]));\n}\n\nasync function readBlob(\n\trepo: Repo,\n\treads: Semaphore,\n\toid: string,\n): Promise<Uint8Array> {\n\tconst { blob } = await reads.run(() => git.readBlob({ ...repo, oid }));\n\treturn blob;\n}\n\n/**\n * Line-level 3-way merge, via node-diff3's LCS-based diff3 algorithm — the\n * same approach GNU diffutils' `diff3` (and git's own default merge driver)\n * use. `conflict` reports whether any hunk couldn't be merged.\n */\nfunction mergeText(\n\tbase: Uint8Array,\n\tours: Uint8Array,\n\ttheirs: Uint8Array,\n): { content: Uint8Array; conflict: boolean } {\n\tconst { conflict, result } = diff3Merge(\n\t\tdecodeLines(ours),\n\t\tdecodeLines(base),\n\t\tdecodeLines(theirs),\n\t\t{ label: { a: \"ours\", b: \"theirs\" } },\n\t);\n\treturn { content: new TextEncoder().encode(result.join(\"\\n\")), conflict };\n}\n\nfunction decodeLines(data: Uint8Array): string[] {\n\tconst text = new TextDecoder().decode(data);\n\treturn text === \"\" ? [] : text.split(\"\\n\");\n}\n\n/** Git's own heuristic: a NUL byte means binary, which is never line-merged. */\nconst isBinary = (data: Uint8Array) => data.includes(0);\n\n/**\n * The merged mode when both sides changed a file: a mode only one side\n * changed wins; both changing it differently is a conflict (null).\n */\nfunction mergeMode(\n\tbase: Entry | undefined,\n\tours: Entry,\n\ttheirs: Entry,\n): string | null {\n\tif (ours.mode === theirs.mode) return ours.mode;\n\tif (base?.mode === ours.mode) return theirs.mode;\n\tif (base?.mode === theirs.mode) return ours.mode;\n\treturn null;\n}\n\n/**\n * Merge one path whose two sides both changed it differently. Returns the\n * merged entry, or null for a conflict (pushed onto `conflicts`).\n */\nasync function mergeChangedEntry(\n\trepo: Repo,\n\treads: Semaphore,\n\tpath: string,\n\tbase: Entry | undefined,\n\tours: Entry | undefined,\n\ttheirs: Entry | undefined,\n\tconflicts: string[],\n): Promise<Entry | null> {\n\tif (isTree(ours) && isTree(theirs)) {\n\t\tconst oid = await mergeTrees(\n\t\t\trepo,\n\t\t\treads,\n\t\t\tpath,\n\t\t\tisTree(base) ? base.oid : undefined,\n\t\t\tours.oid,\n\t\t\ttheirs.oid,\n\t\t\tconflicts,\n\t\t);\n\t\treturn oid === null ? null : { mode: \"040000\", oid, type: \"tree\" };\n\t}\n\t// Anything else — modify/delete, file/directory, submodule changes — is a\n\t// conflict unless both sides are regular files with mergeable content.\n\tif (!isFile(ours) || !isFile(theirs) || ours.mode === \"120000\") {\n\t\tconflicts.push(path);\n\t\treturn null;\n\t}\n\tconst mode = mergeMode(base, ours, theirs);\n\tif (mode === null) {\n\t\tconflicts.push(path);\n\t\treturn null;\n\t}\n\tif (ours.oid === theirs.oid) return { mode, oid: ours.oid, type: \"blob\" };\n\tconst [baseContent, oursContent, theirsContent] = await Promise.all([\n\t\tisFile(base) ? readBlob(repo, reads, base.oid) : new Uint8Array(),\n\t\treadBlob(repo, reads, ours.oid),\n\t\treadBlob(repo, reads, theirs.oid),\n\t]);\n\tif (\n\t\tisBinary(baseContent) ||\n\t\tisBinary(oursContent) ||\n\t\tisBinary(theirsContent)\n\t) {\n\t\tconflicts.push(path);\n\t\treturn null;\n\t}\n\tconst { content, conflict } = mergeText(\n\t\tbaseContent,\n\t\toursContent,\n\t\ttheirsContent,\n\t);\n\tif (conflict) {\n\t\tconflicts.push(path);\n\t\treturn null;\n\t}\n\tconst oid = await reads.run(() => git.writeBlob({ ...repo, blob: content }));\n\treturn { mode, oid, type: \"blob\" };\n}\n\n/**\n * Three-way merge of trees, recursing only into subtrees both sides changed\n * — an untouched or one-sided subtree is taken by oid without being read.\n * Returns the merged tree's oid, or null when any path conflicted.\n */\nasync function mergeTrees(\n\trepo: Repo,\n\treads: Semaphore,\n\tprefix: string,\n\tbaseOid: string | undefined,\n\toursOid: string,\n\ttheirsOid: string,\n\tconflicts: string[],\n): Promise<string | null> {\n\tconst [base, ours, theirs] = await Promise.all([\n\t\treadEntries(repo, reads, baseOid),\n\t\treadEntries(repo, reads, oursOid),\n\t\treadEntries(repo, reads, theirsOid),\n\t]);\n\tconst names = new Set([...base.keys(), ...ours.keys(), ...theirs.keys()]);\n\tconst merged: Array<Entry & { path: string }> = [];\n\tconst before = conflicts.length;\n\n\tawait Promise.all(\n\t\t[...names].map(async (name) => {\n\t\t\tconst path = prefix ? `${prefix}/${name}` : name;\n\t\t\tconst b = base.get(name);\n\t\t\tconst o = ours.get(name);\n\t\t\tconst t = theirs.get(name);\n\t\t\tlet result: Entry | undefined | null;\n\t\t\tif (same(o, t)) result = o;\n\t\t\telse if (same(b, o)) result = t;\n\t\t\telse if (same(b, t)) result = o;\n\t\t\telse\n\t\t\t\tresult = await mergeChangedEntry(repo, reads, path, b, o, t, conflicts);\n\t\t\tif (result) merged.push({ ...result, path: name });\n\t\t}),\n\t);\n\n\tif (conflicts.length > before) return null;\n\treturn reads.run(() => git.writeTree({ ...repo, tree: merged }));\n}\n\n/**\n * Merge `sourceRef` into `targetRef`, entirely at the object level.\n *\n * - Target already contains source (same commit, or source is an ancestor):\n *   nothing to do — returns the target's commit, refs untouched.\n * - Source contains target: fast-forward the target ref to source.\n * - Otherwise: a real three-way merge against the merge base. Paths only one\n *   side changed take that side (deletions included); paths both changed are\n *   merged — subtrees recursively, text files line by line (diff3), modes\n *   kept unless both sides changed them differently. Binary files, symlinks,\n *   submodules, modify/delete and file/directory clashes that both sides\n *   touched are conflicts. Any conflict throws `GitMergeConflictError`\n *   without writing anything.\n *\n * New objects are stored as one pack, written before the target ref moves.\n * Serialize concurrent writers to the same repository externally.\n */\nexport async function threeWayMerge(\n\trepo: Repo,\n\tsourceRef: string,\n\ttargetRef: string,\n\topts?: MergeOpts,\n): Promise<MergeResult> {\n\tconst [sourceOid, targetOid] = await Promise.all([\n\t\tgit.resolveRef({ ...repo, ref: sourceRef }),\n\t\tgit.resolveRef({ ...repo, ref: targetRef }),\n\t]);\n\n\tif (\n\t\tsourceOid === targetOid ||\n\t\t(await git.isDescendent({ ...repo, oid: targetOid, ancestor: sourceOid }))\n\t) {\n\t\treturn { commitOid: targetOid };\n\t}\n\n\tif (\n\t\tawait git.isDescendent({ ...repo, oid: sourceOid, ancestor: targetOid })\n\t) {\n\t\tawait git.writeRef({\n\t\t\t...repo,\n\t\t\tref: targetRef,\n\t\t\tvalue: sourceOid,\n\t\t\tforce: true,\n\t\t});\n\t\treturn { commitOid: sourceOid };\n\t}\n\n\tconst baseOids = await git.findMergeBase({\n\t\t...repo,\n\t\toids: [sourceOid, targetOid],\n\t});\n\tconst baseOid = baseOids?.[0];\n\tif (baseOid === undefined) {\n\t\tthrow new GitEdgeError(\n\t\t\t`Refusing to merge unrelated histories (${sourceRef} and ${targetRef} share no commit)`,\n\t\t);\n\t}\n\n\tconst [baseCommit, sourceCommit, targetCommit] = await Promise.all([\n\t\tgit.readCommit({ ...repo, oid: baseOid }),\n\t\tgit.readCommit({ ...repo, oid: sourceOid }),\n\t\tgit.readCommit({ ...repo, oid: targetOid }),\n\t]);\n\n\t// One pool per merge: concurrent merges in the same process must not share\n\t// (or leak) each other's limit.\n\tconst reads = createSemaphore(MAX_CONCURRENT_READS);\n\treturn withPackedWrites(repo, async (packed) => {\n\t\tconst conflicts: string[] = [];\n\t\tconst treeOid = await mergeTrees(\n\t\t\tpacked,\n\t\t\treads,\n\t\t\t\"\",\n\t\t\tbaseCommit.commit.tree,\n\t\t\ttargetCommit.commit.tree,\n\t\t\tsourceCommit.commit.tree,\n\t\t\tconflicts,\n\t\t);\n\t\tif (treeOid === null) {\n\t\t\tthrow new GitMergeConflictError(conflicts.sort());\n\t\t}\n\n\t\tconst author = {\n\t\t\tname: opts?.authorName || \"Git Edge\",\n\t\t\temail: opts?.authorEmail || \"git-edge@local\",\n\t\t\ttimestamp: Math.floor(Date.now() / 1000),\n\t\t\ttimezoneOffset: 0,\n\t\t};\n\t\t// writeCommit, not git.commit: git.commit also advances whatever\n\t\t// branch HEAD names, which may not be the target.\n\t\tconst commitOid = await git.writeCommit({\n\t\t\t...packed,\n\t\t\tcommit: {\n\t\t\t\tmessage: opts?.message || `Merge ${sourceRef} into ${targetRef}`,\n\t\t\t\ttree: treeOid,\n\t\t\t\tparent: [targetOid, sourceOid],\n\t\t\t\tauthor,\n\t\t\t\tcommitter: author,\n\t\t\t},\n\t\t});\n\t\tawait git.writeRef({\n\t\t\t...packed,\n\t\t\tref: targetRef,\n\t\t\tvalue: commitOid,\n\t\t\tforce: true,\n\t\t});\n\t\treturn { commitOid };\n\t});\n}\n","/**\n * A tiny FIFO semaphore for bounding concurrent async I/O.\n *\n * Recursive callers (a tree merge recursing into subtrees) can't bound\n * in-flight I/O with a per-level limit — the level limit multiplies by depth.\n * A single shared instance caps the *total* instead.\n *\n * Edge-compatible: no node: imports, no timers, no polling.\n */\n\nexport interface Semaphore {\n\t/**\n\t * Run `fn` once a permit is free, releasing it when `fn` settles.\n\t *\n\t * The permit must not be held across work that itself needs one — with\n\t * every permit held by callers blocked on new permits, the pool deadlocks.\n\t * Wrap the individual I/O call, not a recursive subtree merge.\n\t */\n\trun<T>(fn: () => Promise<T>): Promise<T>;\n}\n\n/**\n * Create a semaphore that runs at most `limit` callbacks at once.\n *\n * `limit` must be a positive integer: a fractional or non-finite bound has no\n * useful meaning as a concurrency count, and would silently behave like an\n * unbounded pool (comparisons against it are never satisfied as intended).\n */\nexport function createSemaphore(limit: number): Semaphore {\n\tif (!Number.isInteger(limit) || limit < 1) {\n\t\tthrow new RangeError(\n\t\t\t`Semaphore limit must be a positive integer, got ${limit}`,\n\t\t);\n\t}\n\tlet active = 0;\n\tconst waiting: Array<() => void> = [];\n\n\tfunction acquire(): Promise<void> {\n\t\tif (active < limit) {\n\t\t\tactive += 1;\n\t\t\treturn Promise.resolve();\n\t\t}\n\t\treturn new Promise((resolve) => waiting.push(resolve));\n\t}\n\n\tfunction release(): void {\n\t\t// Hand the permit straight to the next waiter rather than dropping and\n\t\t// re-acquiring it: decrementing first would let a fresh caller jump the\n\t\t// queue and starve whoever has been waiting longest.\n\t\tconst next = waiting.shift();\n\t\tif (next) next();\n\t\telse active -= 1;\n\t}\n\n\treturn {\n\t\tasync run<T>(fn: () => Promise<T>): Promise<T> {\n\t\t\tawait acquire();\n\t\t\ttry {\n\t\t\t\treturn await fn();\n\t\t\t} finally {\n\t\t\t\trelease();\n\t\t\t}\n\t\t},\n\t};\n}\n","/**\n * isomorphic-git per-repo parse cache management.\n *\n * No node: imports.\n */\n\n// ---------------------------------------------------------------------------\n// isomorphic-git cache management\n// ---------------------------------------------------------------------------\n\n/**\n * Per-repo isomorphic-git packfile cache.\n *\n * isomorphic-git re-parses a packfile index from scratch on every\n * readTree/log/readObject call unless callers share a `cache` object\n * across calls. Without this, operations that touch many objects\n * (e.g. walking commit history) pay that parse cost hundreds of times.\n * Objects are content-addressed/immutable so a long-lived per-repo\n * cache is safe.\n */\n// Each cache retains every packfile it has read, in full. Bound the number of\n// repos held so a long-lived process serving many repos doesn't grow without\n// limit; least-recently-used repos are dropped first (Map keeps insertion\n// order, and a hit re-inserts its key at the end).\nconst MAX_REPO_CACHES = 32;\nconst repoCaches = new Map<string, object>();\n\nexport function getRepoCache(ownerKey: string, repoName: string): object {\n\tconst key = `${ownerKey}/${repoName}`;\n\tlet cache = repoCaches.get(key);\n\tif (cache) {\n\t\trepoCaches.delete(key);\n\t} else {\n\t\tcache = {};\n\t\tif (repoCaches.size >= MAX_REPO_CACHES) {\n\t\t\tconst oldest = repoCaches.keys().next().value;\n\t\t\tif (oldest !== undefined) repoCaches.delete(oldest);\n\t\t}\n\t}\n\trepoCaches.set(key, cache);\n\treturn cache;\n}\n\nexport function invalidateRepoCache(ownerKey: string, repoName: string): void {\n\trepoCaches.delete(`${ownerKey}/${repoName}`);\n}\n"],"mappings":"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","names":["oid"]}

package/dist/types/merge.d.ts

@@ -9,6 +9,16 @@
  */
 import { type Repo } from "git-fs-s3/ops";
 export type { Repo };
+/**
+ * How many object reads/writes a merge may have in flight at once. Each
+ * `readBlob` materialises a whole blob, so an unbounded fan-out over a wide
+ * directory holds as many object-store round trips (and bytes) open as the
+ * directory has entries — enough to exhaust a serverless function's sockets
+ * and trip storage rate limits. One shared pool keeps that flat regardless of
+ * tree width or recursion depth, while staying wide enough to overlap enough
+ * round trips to hide object-store latency.
+ */
+export declare const MAX_CONCURRENT_READS = 16;
 /** Options for threeWayMerge. */
 export interface MergeOpts {
     /** Merge commit message (default: "Merge <source> into <target>"). */

package/dist/types/semaphore.d.ts

@@ -0,0 +1,27 @@
+/**
+ * A tiny FIFO semaphore for bounding concurrent async I/O.
+ *
+ * Recursive callers (a tree merge recursing into subtrees) can't bound
+ * in-flight I/O with a per-level limit — the level limit multiplies by depth.
+ * A single shared instance caps the *total* instead.
+ *
+ * Edge-compatible: no node: imports, no timers, no polling.
+ */
+export interface Semaphore {
+    /**
+     * Run `fn` once a permit is free, releasing it when `fn` settles.
+     *
+     * The permit must not be held across work that itself needs one — with
+     * every permit held by callers blocked on new permits, the pool deadlocks.
+     * Wrap the individual I/O call, not a recursive subtree merge.
+     */
+    run<T>(fn: () => Promise<T>): Promise<T>;
+}
+/**
+ * Create a semaphore that runs at most `limit` callbacks at once.
+ *
+ * `limit` must be a positive integer: a fractional or non-finite bound has no
+ * useful meaning as a concurrency count, and would silently behave like an
+ * unbounded pool (comparisons against it are never satisfied as intended).
+ */
+export declare function createSemaphore(limit: number): Semaphore;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "git-edge",
-  "version": "0.4.1",
-  "description": "High-level edge-compatible git operations — parsed-object cache, object-level three-way merge, and repo management utilities. Composes with git-fs-s3.",
+  "version": "0.5.0",
+  "description": "High-level edge-compatible git operations \u2014 parsed-object cache, object-level three-way merge, and repo management utilities. Composes with git-fs-s3.",
   "type": "module",
   "exports": {
     ".": {
@@ -34,7 +34,7 @@
     "three-way-merge"
   ],
   "author": "Nandan Varma",
-  "license": "MIT",
+  "license": "AGPL-3.0-or-later",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nandan-varma/git-edge.git"