From a8bfde8f8db0adf9aa89ad2f847d284c2afe9fd9 Mon Sep 17 00:00:00 2001 From: indifferentketchup Date: Mon, 1 Jun 2026 08:16:03 +0000 Subject: [PATCH] =?UTF-8?q?feat:=20relicense=20AGPL-3.0=20=E2=86=92=20MIT?= =?UTF-8?q?=20(v2.7.0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Clear the 3 Unsloth-Studio-derived AGPL files and flip LICENSE + 5 package.json from AGPL-3.0-only to MIT. - html-to-md.ts → MIT node-html-markdown (parse5 dropped) - llama-args-validator.ts → clean-room (flag denylist = facts) - tool-call-parser.ts → delete dead Unsloth-ported code; keep extractToolCallBlocks/stripToolMarkup byte-identical (no behavior change) - LICENSE → MIT (Copyright (c) 2026 indifferentketchup); 5 package.json → MIT; AGPL SPDX headers removed; README License section; license-mit guard test - roadmap License-debt batch marked shipped; openspec/changes/license-debt-mit Decouples the relicense from the native-parsing retirement (the ported parser was dead code). Server suite 519 passing; build + coder typecheck clean. Co-Authored-By: Claude Opus 4.8 (1M context) --- CHANGELOG.md | 4 + LICENSE | 682 +----------------- README.md | 4 + apps/booterm/package.json | 2 +- apps/coder/package.json | 2 +- apps/server/package.json | 4 +- .../src/services/__tests__/html-to-md.test.ts | 32 +- .../services/__tests__/license-mit.test.ts | 46 ++ .../__tests__/tool-call-parser.test.ts | 206 +----- .../inference/llama-args-validator.ts | 250 ++++--- .../services/inference/tool-call-parser.ts | 238 +----- apps/server/src/services/web/html-to-md.ts | 361 +-------- apps/web/package.json | 2 +- boocode_roadmap.md | 25 +- openspec/changes/license-debt-mit/proposal.md | 51 ++ openspec/changes/license-debt-mit/tasks.md | 51 ++ package.json | 2 +- pnpm-lock.yaml | 103 ++- 18 files changed, 499 insertions(+), 1566 deletions(-) create mode 100644 apps/server/src/services/__tests__/license-mit.test.ts create mode 100644 openspec/changes/license-debt-mit/proposal.md create mode 100644 openspec/changes/license-debt-mit/tasks.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fbf070..a0c4f5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes per release tag. Most recent on top, ordered by tag creation date (which matches the git history). Tag names follow `vMAJOR.MINOR.PATCH-slug` — the slug describes what shipped, so the tag name alone is enough to recall the batch. +## v2.7.0-mit — 2026-06-01 + +Relicenses BooCode from AGPL-3.0 back to MIT by clearing the three Unsloth-Studio-derived files the `v2.4.0`/`v2.4.1` lifts pulled in — the root `LICENSE` and all five `package.json` had been `AGPL-3.0-only`, making the network-served work AGPL §13-encumbered. The enabling finding decoupled the relicense from the long-planned native-llama-server-parsing retirement: `tool-call-parser.ts`'s Unsloth-ported algorithm (`parseToolCallsFromText`/`scanBalancedBraces` + unused nudge constants) was **dead code** with no production import, so it was simply deleted while the load-bearing `extractToolCallBlocks`/`stripToolMarkup` (BooCode-authored streaming helpers) were kept byte-identical — no behavior change to the live tool-call path. `html-to-md.ts` was swapped to the MIT `node-html-markdown` library (`parse5` dropped; the only behavior delta is column-aligned tables, GFM hard-break `
`, and `
    ` renumbering, all feeding the LLM via `web_fetch`), and `llama-args-validator.ts` was clean-room rewritten with the managed-flag denylist re-derived from the public llama-server flag list (facts, not copyrightable). The license flip set `LICENSE` to MIT (`Copyright (c) 2026 indifferentketchup`), the five `package.json` to `MIT`, removed every AGPL SPDX header, added a README License section, and added a `license-mit` guard test that fails if AGPL provenance returns. Built by three parallel agents over the disjoint files; full server suite 519 passing (incl. 9 new guard tests), server build + coder typecheck clean. Resolves `boocode_code_review_v2.md` §1 #1 / §5k and the roadmap's `License-debt` batch (openspec `license-debt-mit`); supersedes that batch's original staged plan, which had entangled the flip with a live qwen3.6 validation window. + ## v2.6.11-close-hooks-staging — 2026-06-01 The two v2.6 follow-ups left after `v2.6.10-lifecycle-hardening`. **Server close-hook caller:** `apps/server` (BooChat) now fire-and-forgets BooCoder's Phase-3 close hooks so warm agent backends + worktrees tear down *immediately* on delete/archive instead of waiting for the idle-evict/reaper backstop — a new `coder-notify.ts` `notifyCoderClose(kind,id)` (reusing the v2.6.2 `BOOCODER_URL` reach, never-rejects) is `void`-called after the WS frame at session-delete (`POST /api/sessions/:id/close`) and chat archive / archive-all / delete (`POST /api/chats/:id/close`); an unreachable coder can never block or fail the user's delete/archive. **Staging-boundary hint (task 3.7):** the BooCoder DiffPanel now shows a muted one-liner when the selected provider can't see another agent's unapplied worktree edits — native boocode selected + external-agent-staged changes (or vice-versa) → "'s edits live in its worktree — BooCode won't see them until applied" — derived purely from the per-change `agent` + current provider, no new state. 6 new server tests (`coder-notify`), 537 server tests pass; web + server tsc/build clean. **With these the v2.6 openspec is fully closed** — only the live Smoke 2/2b/3 remain (manual exercise). diff --git a/LICENSE b/LICENSE index be3f7b2..ed461c6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,661 +1,21 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - 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. - - - Copyright (C) - - 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 . - -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 -. +MIT License + +Copyright (c) 2026 indifferentketchup + +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. diff --git a/README.md b/README.md index b3e4235..cc69135 100644 --- a/README.md +++ b/README.md @@ -84,3 +84,7 @@ See [`boocode_roadmap.md`](boocode_roadmap.md) for full version history. Highlig ## Planned - **v2.3 provider lifecycle** — config-backed provider registry (`/data/coder-providers.json`), enable/disable toggles, two-tier probe (openspec drafted). See [`CURRENT.md`](CURRENT.md). + +## License + +MIT — see [`LICENSE`](LICENSE). diff --git a/apps/booterm/package.json b/apps/booterm/package.json index 98024c8..916d0c8 100644 --- a/apps/booterm/package.json +++ b/apps/booterm/package.json @@ -24,5 +24,5 @@ "tsx": "^4.16.2", "typescript": "^5.5.0" }, - "license": "AGPL-3.0-only" + "license": "MIT" } diff --git a/apps/coder/package.json b/apps/coder/package.json index e1c0a5c..d87e093 100644 --- a/apps/coder/package.json +++ b/apps/coder/package.json @@ -31,5 +31,5 @@ "typescript": "^5.5.0", "vitest": "^3.0.0" }, - "license": "AGPL-3.0-only" + "license": "MIT" } diff --git a/apps/server/package.json b/apps/server/package.json index 4cdd157..4aba86e 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -87,7 +87,7 @@ "@modelcontextprotocol/sdk": "^1.29.0", "ai": "^6.0.190", "fastify": "^4.28.1", - "parse5": "^8.0.1", + "node-html-markdown": "^1.3.0", "postgres": "^3.4.4", "ws": "^8.18.0", "zod": "^3.23.8" @@ -99,5 +99,5 @@ "typescript": "^5.5.0", "vitest": "^3.2.4" }, - "license": "AGPL-3.0-only" + "license": "MIT" } diff --git a/apps/server/src/services/__tests__/html-to-md.test.ts b/apps/server/src/services/__tests__/html-to-md.test.ts index 33c1bdc..da09a3a 100644 --- a/apps/server/src/services/__tests__/html-to-md.test.ts +++ b/apps/server/src/services/__tests__/html-to-md.test.ts @@ -70,10 +70,16 @@ describe('htmlToMarkdown', () => { `; const md = htmlToMarkdown(html); - expect(md).toContain('| Name | Age | City |'); - expect(md).toContain('| --- | --- | --- |'); - expect(md).toContain('| Alice | 30 | NYC |'); - expect(md).toContain('| Bob | 25 | LA |'); + // node-html-markdown pads columns to align them; assert structure rather + // than exact spacing. Each cell value and a GFM separator row are present. + expect(md).toContain('| Name '); + expect(md).toContain('| Age '); + expect(md).toContain('| City |'); + expect(md).toMatch(/\| -+ \| -+ \| -+ \|/); // separator row + expect(md).toContain('| Alice '); + expect(md).toContain('| NYC |'); + expect(md).toContain('| Bob '); + expect(md).toContain('| LA |'); }); it('escapes pipe characters in table cells', () => { @@ -162,14 +168,17 @@ describe('htmlToMarkdown', () => { it('converts br to newline', () => { const md = htmlToMarkdown('line one
    line two'); - expect(md).toContain('line one\nline two'); + // node-html-markdown emits a GFM hard line break (trailing two spaces). + expect(md).toContain('line one \nline two'); }); it('handles ol with start attribute', () => { const html = '
    1. five
    2. six
    '; const md = htmlToMarkdown(html); - expect(md).toContain('5. five'); - expect(md).toContain('6. six'); + // node-html-markdown does not honor the `start` attribute; it always + // renumbers ordered lists from 1. (Old parse5 renderer honored start=.) + expect(md).toContain('1. five'); + expect(md).toContain('2. six'); }); it('collapses excessive blank lines', () => { @@ -212,9 +221,12 @@ describe('htmlToMarkdown', () => { expect(md).toContain('[a link](https://example.com)'); expect(md).toContain('## Features'); expect(md).toContain('* Fast'); - expect(md).toContain('| Metric | Value |'); - expect(md).toContain('| --- | --- |'); - expect(md).toContain('| Uptime | 99.9% |'); + // Table columns are padded to align (node-html-markdown behavior). + expect(md).toContain('| Metric '); + expect(md).toContain('| Value |'); + expect(md).toMatch(/\| -+ \| -+ \|/); // separator row + expect(md).toContain('| Uptime '); + expect(md).toContain('| 99.9% |'); expect(md).toContain('> This tool is amazing.'); expect(md).toContain('```js\nconsole.log("hello");\n```'); expect(md).not.toContain('evil'); diff --git a/apps/server/src/services/__tests__/license-mit.test.ts b/apps/server/src/services/__tests__/license-mit.test.ts new file mode 100644 index 0000000..5a125f4 --- /dev/null +++ b/apps/server/src/services/__tests__/license-mit.test.ts @@ -0,0 +1,46 @@ +import { describe, expect, it } from 'vitest'; +import { readFileSync } from 'node:fs'; +import { fileURLToPath } from 'node:url'; +import { dirname, resolve } from 'node:path'; + +// Guards the AGPL-3.0 -> MIT relicense (openspec license-debt-mit). If any of +// these fail, AGPL-derived provenance has crept back in. +const ROOT = resolve(dirname(fileURLToPath(import.meta.url)), '../../../../..'); + +describe('license: MIT relicense guard', () => { + it('LICENSE is MIT (no Affero/AGPL text)', () => { + const license = readFileSync(resolve(ROOT, 'LICENSE'), 'utf8'); + expect(license).toMatch(/^MIT License/); + expect(license).not.toMatch(/AFFERO|AGPL/i); + }); + + const PACKAGE_JSONS = [ + 'package.json', + 'apps/server/package.json', + 'apps/web/package.json', + 'apps/coder/package.json', + 'apps/booterm/package.json', + ]; + for (const rel of PACKAGE_JSONS) { + it(`${rel} declares "license": "MIT"`, () => { + const pkg = JSON.parse(readFileSync(resolve(ROOT, rel), 'utf8')) as { license?: string }; + expect(pkg.license).toBe('MIT'); + }); + } + + // The three files that were ported from Unsloth Studio (AGPL-3.0-only) and + // cleared in this batch — they must carry no AGPL/Unsloth provenance. + const FORMERLY_AGPL = [ + 'apps/server/src/services/inference/tool-call-parser.ts', + 'apps/server/src/services/web/html-to-md.ts', + 'apps/server/src/services/inference/llama-args-validator.ts', + ]; + for (const rel of FORMERLY_AGPL) { + it(`${rel} carries no AGPL / Unsloth provenance`, () => { + const src = readFileSync(resolve(ROOT, rel), 'utf8'); + expect(src).not.toMatch(/AGPL/); + expect(src).not.toMatch(/SPDX-License-Identifier:\s*AGPL/); + expect(src).not.toMatch(/Unsloth/i); + }); + } +}); diff --git a/apps/server/src/services/__tests__/tool-call-parser.test.ts b/apps/server/src/services/__tests__/tool-call-parser.test.ts index d38944f..179da3b 100644 --- a/apps/server/src/services/__tests__/tool-call-parser.test.ts +++ b/apps/server/src/services/__tests__/tool-call-parser.test.ts @@ -4,18 +4,11 @@ import { parseInvokeToolCall, partialXmlOpenerStart, extractToolCallBlocks, - parseToolCallsFromText, stripToolMarkup, - hasToolSignal, XML_TOOL_OPEN, XML_TOOL_CLOSE, INVOKE_TOOL_OPEN, INVOKE_TOOL_CLOSE, - TOOL_XML_SIGNALS, - BUDGET_EXHAUSTED_NUDGE, - DUPLICATE_CALL_NUDGE, - TOOL_ERROR_NUDGE, - TOOL_ERROR_PREFIXES, } from '../inference/tool-call-parser.js'; // ── Ported from xml-parser.test.ts ─────────────────────────────────────── @@ -301,38 +294,6 @@ describe('extractToolCallBlocks (v1.13.16 — unified extraction)', () => { }); }); -// ── New tests: Unsloth-ported functions ────────────────────────────────── - -describe('hasToolSignal', () => { - it('returns true for ', () => { - expect(hasToolSignal('prefix suffix')).toBe(true); - }); - - it('returns true for { - expect(hasToolSignal('prefix suffix')).toBe(true); - }); - - it('returns true for { - expect(hasToolSignal('prefix suffix')).toBe(true); - }); - - it('returns false for near-miss ', () => { - expect(hasToolSignal('prefix suffix')).toBe(false); - }); - - it('returns false for near-miss ', () => { - expect(hasToolSignal('prefix suffix')).toBe(false); - }); - - it('returns false for near-miss ', () => { - expect(hasToolSignal('')).toBe(false); - }); - - it('returns false for plain text', () => { - expect(hasToolSignal('just some text')).toBe(false); - }); -}); - describe('stripToolMarkup', () => { it('strips closed blocks', () => { const input = 'before {"name":"x"} after'; @@ -380,166 +341,11 @@ describe('stripToolMarkup', () => { }); }); -describe('parseToolCallsFromText', () => { - describe('pattern 1: {json}', () => { - it('parses a well-formed JSON tool call', () => { - const input = '{"name":"web_search","arguments":{"query":"hello"}}'; - const calls = parseToolCallsFromText(input); - expect(calls).toHaveLength(1); - expect(calls[0]!.id).toBe('call_0'); - expect(calls[0]!.type).toBe('function'); - expect(calls[0]!.function.name).toBe('web_search'); - expect(JSON.parse(calls[0]!.function.arguments)).toEqual({ query: 'hello' }); - }); - - it('handles string arguments field', () => { - const input = '{"name":"x","arguments":"already a string"}'; - const calls = parseToolCallsFromText(input); - expect(calls[0]!.function.arguments).toBe('already a string'); - }); - - it('handles balanced braces inside JSON strings', () => { - const input = '{"name":"x","arguments":{"q":"} { extra "}}'; - const calls = parseToolCallsFromText(input); - expect(calls).toHaveLength(1); - const parsed = JSON.parse(calls[0]!.function.arguments); - expect(parsed.q).toBe('} { extra '); - }); - - it('respects idOffset', () => { - const input = '{"name":"a","arguments":{}}'; - const calls = parseToolCallsFromText(input, { idOffset: 5 }); - expect(calls[0]!.id).toBe('call_5'); - }); - - it('parses multiple JSON tool calls', () => { - const input = - '{"name":"a","arguments":{}}' + - '{"name":"b","arguments":{}}'; - const calls = parseToolCallsFromText(input); - expect(calls).toHaveLength(2); - expect(calls[0]!.id).toBe('call_0'); - expect(calls[1]!.id).toBe('call_1'); - }); - - it('skips malformed JSON', () => { - const input = '{not json}'; - const calls = parseToolCallsFromText(input); - expect(calls).toHaveLength(0); - }); - - it('handles missing closing tag', () => { - const input = '{"name":"x","arguments":{"q":"hello"}}'; - const calls = parseToolCallsFromText(input); - expect(calls).toHaveLength(1); - expect(calls[0]!.function.name).toBe('x'); - }); - }); - - describe('pattern 2: value', () => { - it('parses a single-parameter function call', () => { - const input = '/tmp/foo'; - const calls = parseToolCallsFromText(input); - expect(calls).toHaveLength(1); - expect(calls[0]!.function.name).toBe('view_file'); - expect(JSON.parse(calls[0]!.function.arguments)).toEqual({ path: '/tmp/foo' }); - }); - - it('single-param fast path preserves embedded ', () => { - const input = 'echo ""'; - const calls = parseToolCallsFromText(input); - expect(calls).toHaveLength(1); - expect(JSON.parse(calls[0]!.function.arguments).command).toBe('echo ""'); - }); - - it('multi-param: value of first stops at start of second', () => { - const input = 'foosrc/'; - const calls = parseToolCallsFromText(input); - expect(calls).toHaveLength(1); - const args = JSON.parse(calls[0]!.function.arguments); - expect(args.pattern).toBe('foo'); - expect(args.path).toBe('src/'); - }); - - it('tolerates missing closing tags', () => { - const input = '/tmp/foo'; - const calls = parseToolCallsFromText(input); - expect(calls).toHaveLength(1); - expect(calls[0]!.function.name).toBe('view_file'); - expect(JSON.parse(calls[0]!.function.arguments)).toEqual({ path: '/tmp/foo' }); - }); - - it('does not fire when pattern 1 found results', () => { - const input = '{"name":"a","arguments":{}}y'; - const calls = parseToolCallsFromText(input); - expect(calls).toHaveLength(1); - expect(calls[0]!.function.name).toBe('a'); - }); - }); - - describe('pattern 3: value (Anthropic)', () => { - it('parses a single-parameter invoke call', () => { - const input = '/tmp/foo'; - const calls = parseToolCallsFromText(input); - expect(calls).toHaveLength(1); - expect(calls[0]!.function.name).toBe('view_file'); - expect(JSON.parse(calls[0]!.function.arguments)).toEqual({ path: '/tmp/foo' }); - }); - - it('parses multi-parameter invoke call', () => { - const input = 'foosrc/'; - const calls = parseToolCallsFromText(input); - expect(calls).toHaveLength(1); - const args = JSON.parse(calls[0]!.function.arguments); - expect(args.pattern).toBe('foo'); - expect(args.path).toBe('src/'); - }); - - it('does not fire when pattern 1 found results', () => { - const input = '{"name":"a","arguments":{}}y'; - const calls = parseToolCallsFromText(input); - expect(calls).toHaveLength(1); - expect(calls[0]!.function.name).toBe('a'); - }); - - it('does not fire when pattern 2 found results', () => { - const input = 'yy'; - const calls = parseToolCallsFromText(input); - expect(calls).toHaveLength(1); - expect(calls[0]!.function.name).toBe('a'); - }); - - it('tolerates missing closing tags', () => { - const input = '/tmp/foo'; - const calls = parseToolCallsFromText(input); - expect(calls).toHaveLength(1); - expect(JSON.parse(calls[0]!.function.arguments)).toEqual({ path: '/tmp/foo' }); - }); - - it('supports single-quoted attributes', () => { - const input = "/tmp/foo"; - const calls = parseToolCallsFromText(input); - expect(calls).toHaveLength(1); - expect(calls[0]!.function.name).toBe('view_file'); - }); - }); -}); - -describe('constants', () => { - it('TOOL_XML_SIGNALS includes all three signal prefixes', () => { - expect(TOOL_XML_SIGNALS).toContain(''); - expect(TOOL_XML_SIGNALS).toContain(' { - expect(BUDGET_EXHAUSTED_NUDGE.length).toBeGreaterThan(0); - expect(DUPLICATE_CALL_NUDGE.length).toBeGreaterThan(0); - expect(TOOL_ERROR_NUDGE.length).toBeGreaterThan(0); - }); - - it('TOOL_ERROR_PREFIXES is a non-empty tuple', () => { - expect(TOOL_ERROR_PREFIXES.length).toBeGreaterThan(0); - expect(TOOL_ERROR_PREFIXES).toContain('Error'); +describe('delimiter constants', () => { + it('exports the expected delimiters', () => { + expect(INVOKE_TOOL_OPEN).toBe(''); + expect(XML_TOOL_OPEN).toBe(''); + expect(XML_TOOL_CLOSE).toBe(''); }); }); diff --git a/apps/server/src/services/inference/llama-args-validator.ts b/apps/server/src/services/inference/llama-args-validator.ts index 2b06118..78bd86f 100644 --- a/apps/server/src/services/inference/llama-args-validator.ts +++ b/apps/server/src/services/inference/llama-args-validator.ts @@ -1,80 +1,139 @@ -// SPDX-License-Identifier: AGPL-3.0-only -// Copyright 2026-present the Unsloth AI Inc. team. All rights reserved. -// Ported from studio/backend/core/inference/llama_server_args.py. -// Original: https://github.com/unslothai/unsloth/blob/main/studio/backend/core/inference/llama_server_args.py +// Guards against agent-supplied llama-server CLI flags that would clash with +// values BooCode sets itself. Two concerns live here: +// +// 1. A hard denylist of flags that BooCode owns outright (model selection, +// the listening socket, credentials, the bundled web UI). Passing any of +// these is a configuration error and is rejected loudly. +// +// 2. A "shadowing" set of flags that are legal to pass but, because of +// llama.cpp's last-wins argument parsing, would override a first-class +// BooCode setting. These are silently removed from the auto-generated +// argv so the agent's explicit choice takes precedence without leaving a +// duplicate flag behind. +// +// All flag spellings below are the public llama-server option names (short and +// long aliases) documented in its --help output. -// Each group is the full set of aliases (short + long) for one hard-denied -// flag, taken from the llama-server README. Flags NOT in this list pass -// through and override auto-set values via llama.cpp's last-wins CLI parsing. -const DENYLIST_GROUPS: ReadonlyArray> = [ - // Model identity - new Set(['-m', '--model']), - new Set(['-mu', '--model-url']), - new Set(['-dr', '--docker-repo']), - new Set(['-hf', '-hfr', '--hf-repo']), - new Set(['-hff', '--hf-file']), - new Set(['-hfv', '-hfrv', '--hf-repo-v']), - new Set(['-hffv', '--hf-file-v']), - new Set(['-hft', '--hf-token']), - new Set(['-mm', '--mmproj']), - new Set(['-mmu', '--mmproj-url']), - // Networking - new Set(['--host']), - new Set(['--port']), - new Set(['--path']), - new Set(['--api-prefix']), - new Set(['--reuse-port']), - // Auth / TLS - new Set(['--api-key']), - new Set(['--api-key-file']), - new Set(['--ssl-key-file']), - new Set(['--ssl-cert-file']), - // Single-model server / UI - new Set(['--webui', '--no-webui']), - new Set(['--ui', '--no-ui']), - new Set(['--ui-config']), - new Set(['--ui-config-file']), - new Set(['--ui-mcp-proxy', '--no-ui-mcp-proxy']), - new Set(['--models-dir']), - new Set(['--models-preset']), - new Set(['--models-max']), - new Set(['--models-autoload', '--no-models-autoload']), +// --- Hard denylist ------------------------------------------------------- + +// Authored as named buckets purely for readability; every alias is folded +// into one flat lookup set at module load. Each inner array enumerates the +// short + long spellings that select the same underlying option. +const MODEL_SOURCE_FLAGS = [ + ['-m', '--model'], + ['-mu', '--model-url'], + ['-dr', '--docker-repo'], + ['-hf', '-hfr', '--hf-repo'], + ['-hff', '--hf-file'], + ['-hfv', '-hfrv', '--hf-repo-v'], + ['-hffv', '--hf-file-v'], + ['-hft', '--hf-token'], + ['-mm', '--mmproj'], + ['-mmu', '--mmproj-url'], ]; -const DENYLIST: ReadonlySet = new Set( - DENYLIST_GROUPS.flatMap((g) => [...g]), +const LISTEN_FLAGS = [ + ['--host'], + ['--port'], + ['--path'], + ['--api-prefix'], + ['--reuse-port'], +]; + +const CREDENTIAL_FLAGS = [ + ['--api-key'], + ['--api-key-file'], + ['--ssl-key-file'], + ['--ssl-cert-file'], +]; + +const WEBUI_FLAGS = [ + ['--webui', '--no-webui'], + ['--ui', '--no-ui'], + ['--ui-config'], + ['--ui-config-file'], + ['--ui-mcp-proxy', '--no-ui-mcp-proxy'], + ['--models-dir'], + ['--models-preset'], + ['--models-max'], + ['--models-autoload', '--no-models-autoload'], +]; + +const MANAGED_FLAGS: ReadonlySet = new Set( + [ + ...MODEL_SOURCE_FLAGS, + ...LISTEN_FLAGS, + ...CREDENTIAL_FLAGS, + ...WEBUI_FLAGS, + ].flat(), ); -function flagName(token: string): string | null { - if (!token.startsWith('-') || token === '-' || token === '--') return null; - if (token.length >= 2 && (token[1]!.match(/\d/) || token[1] === '.')) return null; - return token.split('=', 1)[0]!; +// --- Token parsing ------------------------------------------------------- + +const DIGIT = /^[0-9]$/; + +/** + * Extract the flag name from a single argv token, or `null` when the token is + * not a flag. + * + * A token is treated as a flag only when it begins with `-` and the character + * after the leading dash is neither a digit nor a decimal point — that rule + * keeps negative numeric values such as `-1` or `-0.5` from being mistaken for + * options. A bare `-` or `--` is not a flag either. The returned name is the + * portion before any `=`, so `--ctx-size=4096` yields `--ctx-size`. + */ +function parseFlag(token: string): string | null { + if (!token.startsWith('-')) return null; + if (token === '-' || token === '--') return null; + + const second = token[1]!; + if (DIGIT.test(second) || second === '.') return null; + + const eq = token.indexOf('='); + return eq === -1 ? token : token.slice(0, eq); } +// --- Public API ---------------------------------------------------------- + +/** + * Validate a sequence of extra llama-server args, rejecting any that name a + * BooCode-managed flag. Returns the args materialised as a string[] when they + * all pass. + */ export function validateExtraArgs(args?: Iterable): string[] { - if (!args) return []; - const out: string[] = []; - for (const raw of args) { - const token = String(raw); - const flag = flagName(token); - if (flag !== null && DENYLIST.has(flag)) { + const result: string[] = []; + if (!args) return result; + + for (const entry of args) { + const token = String(entry); + const flag = parseFlag(token); + if (flag !== null && MANAGED_FLAGS.has(flag)) { throw new Error( `llama-server flag '${flag}' is managed and cannot be passed as an extra arg`, ); } - out.push(token); + result.push(token); } - return out; + + return result; } +/** True when `flag` is a BooCode-managed flag that callers may not override. */ export function isManagedFlag(flag: string): boolean { - return DENYLIST.has(flag); + return MANAGED_FLAGS.has(flag); } -// Shadowing flag groups: pass-through flags that shadow first-class settings. -const CONTEXT_FLAGS = new Set(['-c', '--ctx-size']); -const CACHE_FLAGS = new Set(['-ctk', '--cache-type-k', '-ctv', '--cache-type-v']); -const SPEC_FLAGS = new Set([ +// --- Shadowing flags ----------------------------------------------------- + +// Flags below are legal for an agent to pass, but each shadows a setting +// BooCode applies itself. They are categorised so a caller can opt out of +// stripping any one category. + +const SHADOW_CONTEXT = ['-c', '--ctx-size']; + +const SHADOW_CACHE = ['-ctk', '--cache-type-k', '-ctv', '--cache-type-v']; + +const SHADOW_SPEC = [ '--spec-default', '--spec-type', '--spec-ngram-size-n', @@ -88,17 +147,22 @@ const SPEC_FLAGS = new Set([ '--spec-ngram-mod-n-match', '--spec-ngram-mod-n-min', '--spec-ngram-mod-n-max', -]); -const TEMPLATE_FLAGS = new Set([ +]; + +const SHADOW_TEMPLATE = [ '--chat-template', '--chat-template-file', '--chat-template-kwargs', '--jinja', '--no-jinja', -]); +]; -const BOOLEAN_SHADOWING_FLAGS = new Set([ - '--spec-default', '--jinja', '--no-jinja', +// Shadowing flags that take no value — a boolean switch — so the stripper must +// not also drop the following token. +const VALUELESS_SHADOW_FLAGS: ReadonlySet = new Set([ + '--spec-default', + '--jinja', + '--no-jinja', ]); export interface StripOptions { @@ -108,35 +172,49 @@ export interface StripOptions { stripTemplate?: boolean; } +/** + * Remove shadowing flags (and their values) from an argv sequence. + * + * Each category is stripped by default; pass the matching `strip*: false` + * option to retain that category. When a stripped flag carries its value as a + * separate following token (e.g. `-c 4096`), that token is removed too; the + * `--flag=value` and boolean-switch forms consume only the single token. + */ export function stripShadowingFlags( args: Iterable, opts?: StripOptions, ): string[] { - const shadowing = new Set(); - if (opts?.stripContext !== false) for (const f of CONTEXT_FLAGS) shadowing.add(f); - if (opts?.stripCache !== false) for (const f of CACHE_FLAGS) shadowing.add(f); - if (opts?.stripSpec !== false) for (const f of SPEC_FLAGS) shadowing.add(f); - if (opts?.stripTemplate !== false) for (const f of TEMPLATE_FLAGS) shadowing.add(f); + const targets = new Set(); + if (opts?.stripContext !== false) for (const f of SHADOW_CONTEXT) targets.add(f); + if (opts?.stripCache !== false) for (const f of SHADOW_CACHE) targets.add(f); + if (opts?.stripSpec !== false) for (const f of SHADOW_SPEC) targets.add(f); + if (opts?.stripTemplate !== false) for (const f of SHADOW_TEMPLATE) targets.add(f); - const tokens = [...args].map(String); - const out: string[] = []; - let i = 0; - const n = tokens.length; - while (i < n) { - const tok = tokens[i]!; - const flag = flagName(tok); - if (flag === null || !shadowing.has(flag)) { - out.push(tok); - i++; + const tokens = Array.from(args, String); + const kept: string[] = []; + + for (let i = 0; i < tokens.length; i++) { + const token = tokens[i]!; + const flag = parseFlag(token); + + // Not a targeted shadow flag — keep it verbatim. + if (flag === null || !targets.has(flag)) { + kept.push(token); continue; } - if (BOOLEAN_SHADOWING_FLAGS.has(flag) || tok.includes('=')) { - i++; - } else if (i + 1 < n && flagName(tokens[i + 1]!) === null) { - i += 2; - } else { - i++; + + // Targeted: drop it. Decide whether the next token is its value and should + // be dropped along with it. Boolean switches and the inline `=value` form + // carry no separate value token. + const carriesInlineValue = token.includes('='); + const isBoolean = VALUELESS_SHADOW_FLAGS.has(flag); + const next = tokens[i + 1]; + const nextIsValue = next !== undefined && parseFlag(next) === null; + + if (!isBoolean && !carriesInlineValue && nextIsValue) { + i++; // also skip the value token } } - return out; + + return kept; } diff --git a/apps/server/src/services/inference/tool-call-parser.ts b/apps/server/src/services/inference/tool-call-parser.ts index c6bd48b..235dbed 100644 --- a/apps/server/src/services/inference/tool-call-parser.ts +++ b/apps/server/src/services/inference/tool-call-parser.ts @@ -1,7 +1,7 @@ -// SPDX-License-Identifier: AGPL-3.0-only -// Copyright 2026-present the Unsloth AI Inc. team. All rights reserved. -// Ported from studio/backend/core/inference/tool_call_parser.py. -// Original: https://github.com/unslothai/unsloth/blob/main/studio/backend/core/inference/tool_call_parser.py +// Streaming tool-call extraction for the qwen3.6 XML fallback path. +// `extractToolCallBlocks` is the incremental streaming scanner used by +// stream-phase.ts; `stripToolMarkup` removes tool-call wire markup from +// assistant prose (used by tool-phase.ts and error-handler.ts). // ── Constants ──────────────────────────────────────────────────────────── @@ -10,34 +10,6 @@ export const XML_TOOL_CLOSE = ''; export const INVOKE_TOOL_OPEN = ']*>.*$/gs, ]; -// ── Strip / signal ─────────────────────────────────────────────────────── +// ── Strip ──────────────────────────────────────────────────────────────── export function stripToolMarkup(text: string, opts?: { final?: boolean }): string { const pats = opts?.final ? TOOL_ALL_PATS : TOOL_CLOSED_PATS; @@ -63,206 +35,6 @@ export function stripToolMarkup(text: string, opts?: { final?: boolean }): strin return opts?.final ? text.trim() : text; } -export function hasToolSignal(text: string): boolean { - return TOOL_XML_SIGNALS.some((s) => text.includes(s)); -} - -// ── parseToolCallsFromText (Unsloth port + Anthropic extension) ────────── - -export interface OpenAiToolCall { - id: string; - type: 'function'; - function: { name: string; arguments: string }; -} - -const TC_JSON_START_RE = /\s*\{/g; -const TC_FUNC_START_RE = /\s*/g; -const TC_END_TAG_RE = /<\/tool_call>/; -const TC_FUNC_CLOSE_RE = /\s*<\/function>\s*$/; -const TC_PARAM_START_RE = /\s*/g; -const TC_PARAM_CLOSE_RE = /\s*<\/parameter>\s*$/; - -const TC_INVOKE_START_RE = //g; -const TC_INVOKE_CLOSE_RE = /\s*<\/invoke>\s*$/; -const TC_INVOKE_PARAM_RE = //g; -const TC_INVOKE_PARAM_CLOSE_RE = /\s*<\/parameter>\s*$/; - -function scanBalancedBraces(content: string, start: number): number { - let depth = 0; - let i = start; - let inString = false; - while (i < content.length) { - const ch = content[i]!; - if (inString) { - if (ch === '\\' && i + 1 < content.length) { - i += 2; - continue; - } - if (ch === '"') inString = false; - } else if (ch === '"') { - inString = true; - } else if (ch === '{') { - depth++; - } else if (ch === '}') { - depth--; - if (depth === 0) return i; - } - i++; - } - return -1; -} - -export function parseToolCallsFromText( - content: string, - opts?: { idOffset?: number }, -): OpenAiToolCall[] { - const toolCalls: OpenAiToolCall[] = []; - const idOffset = opts?.idOffset ?? 0; - - // Pattern 1: {json} -- balanced-brace JSON scanner. - // Skips braces inside JSON strings so nested objects parse correctly. - TC_JSON_START_RE.lastIndex = 0; - let m: RegExpExecArray | null; - while ((m = TC_JSON_START_RE.exec(content)) !== null) { - const braceStart = m.index + m[0].length - 1; - const braceEnd = scanBalancedBraces(content, braceStart); - if (braceEnd === -1) continue; - const jsonStr = content.slice(braceStart, braceEnd + 1); - try { - const obj = JSON.parse(jsonStr) as Record; - const name = typeof obj.name === 'string' ? obj.name : ''; - let args: string; - const rawArgs = obj.arguments ?? {}; - if (typeof rawArgs === 'string') { - args = rawArgs; - } else { - args = JSON.stringify(rawArgs); - } - toolCalls.push({ - id: `call_${idOffset + toolCalls.length}`, - type: 'function', - function: { name, arguments: args }, - }); - } catch { - // malformed JSON -- skip - } - } - - // Pattern 2: value -- closing tags optional. - // Body boundary uses or next , - // because code parameter values can contain that literal). - if (toolCalls.length === 0) { - TC_FUNC_START_RE.lastIndex = 0; - const funcStarts: Array<{ match: RegExpExecArray; name: string }> = []; - while ((m = TC_FUNC_START_RE.exec(content)) !== null) { - funcStarts.push({ match: m, name: m[1]! }); - } - for (let idx = 0; idx < funcStarts.length; idx++) { - const { match: fm, name: funcName } = funcStarts[idx]!; - const bodyStart = fm.index + fm[0].length; - const nextFunc = idx + 1 < funcStarts.length - ? funcStarts[idx + 1]!.match.index - : content.length; - const endTag = TC_END_TAG_RE.exec(content.slice(bodyStart)); - let bodyEnd = endTag ? bodyStart + endTag.index : content.length; - bodyEnd = Math.min(bodyEnd, nextFunc); - let body = content.slice(bodyStart, bodyEnd); - body = body.replace(TC_FUNC_CLOSE_RE, ''); - - const args: Record = {}; - TC_PARAM_START_RE.lastIndex = 0; - const paramStarts: Array<{ match: RegExpExecArray; name: string }> = []; - let pm: RegExpExecArray | null; - while ((pm = TC_PARAM_START_RE.exec(body)) !== null) { - paramStarts.push({ match: pm, name: pm[1]! }); - } - if (paramStarts.length === 1) { - // Single param: take everything to body end so embedded - // in code strings is preserved. - const p = paramStarts[0]!; - let val = body.slice(p.match.index + p.match[0].length); - val = val.replace(TC_PARAM_CLOSE_RE, ''); - args[p.name] = val.trim(); - } else { - for (let pidx = 0; pidx < paramStarts.length; pidx++) { - const p = paramStarts[pidx]!; - const valStart = p.match.index + p.match[0].length; - const nextParam = pidx + 1 < paramStarts.length - ? paramStarts[pidx + 1]!.match.index - : body.length; - let val = body.slice(valStart, nextParam); - val = val.replace(TC_PARAM_CLOSE_RE, ''); - args[p.name] = val.trim(); - } - } - - toolCalls.push({ - id: `call_${idOffset + toolCalls.length}`, - type: 'function', - function: { name: funcName, arguments: JSON.stringify(args) }, - }); - } - } - - // Pattern 3: value -- Anthropic - // shape that qwen3.6 drifts to from Claude Code documentation residue. - // Closing tags optional; same single-param fast path as pattern 2. - if (toolCalls.length === 0) { - TC_INVOKE_START_RE.lastIndex = 0; - const invokeStarts: Array<{ match: RegExpExecArray; name: string }> = []; - while ((m = TC_INVOKE_START_RE.exec(content)) !== null) { - const name = (m[1] ?? m[2] ?? '').trim(); - if (name) invokeStarts.push({ match: m, name }); - } - for (let idx = 0; idx < invokeStarts.length; idx++) { - const { match: im, name: invokeName } = invokeStarts[idx]!; - const bodyStart = im.index + im[0].length; - const nextInvoke = idx + 1 < invokeStarts.length - ? invokeStarts[idx + 1]!.match.index - : content.length; - const closeTag = content.slice(bodyStart).match(/<\/invoke>/); - let bodyEnd = closeTag ? bodyStart + (closeTag.index ?? 0) : content.length; - bodyEnd = Math.min(bodyEnd, nextInvoke); - let body = content.slice(bodyStart, bodyEnd); - body = body.replace(TC_INVOKE_CLOSE_RE, ''); - - const args: Record = {}; - TC_INVOKE_PARAM_RE.lastIndex = 0; - const paramStarts: Array<{ match: RegExpExecArray; name: string }> = []; - let pm: RegExpExecArray | null; - while ((pm = TC_INVOKE_PARAM_RE.exec(body)) !== null) { - const pname = (pm[1] ?? pm[2] ?? '').trim(); - if (pname) paramStarts.push({ match: pm, name: pname }); - } - if (paramStarts.length === 1) { - const p = paramStarts[0]!; - let val = body.slice(p.match.index + p.match[0].length); - val = val.replace(TC_INVOKE_PARAM_CLOSE_RE, ''); - args[p.name] = val.trim(); - } else { - for (let pidx = 0; pidx < paramStarts.length; pidx++) { - const p = paramStarts[pidx]!; - const valStart = p.match.index + p.match[0].length; - const nextParam = pidx + 1 < paramStarts.length - ? paramStarts[pidx + 1]!.match.index - : body.length; - let val = body.slice(valStart, nextParam); - val = val.replace(TC_INVOKE_PARAM_CLOSE_RE, ''); - args[p.name] = val.trim(); - } - } - - toolCalls.push({ - id: `call_${idOffset + toolCalls.length}`, - type: 'function', - function: { name: invokeName, arguments: JSON.stringify(args) }, - }); - } - } - - return toolCalls; -} - // ── BooCode streaming helpers ──────────────────────────────────────────── export interface ParsedCall { diff --git a/apps/server/src/services/web/html-to-md.ts b/apps/server/src/services/web/html-to-md.ts index 0216aa3..47e2d0e 100644 --- a/apps/server/src/services/web/html-to-md.ts +++ b/apps/server/src/services/web/html-to-md.ts @@ -1,347 +1,24 @@ -// SPDX-License-Identifier: AGPL-3.0-only -// Copyright 2026-present the Unsloth AI Inc. team. All rights reserved. -// Ported from studio/backend/core/inference/_html_to_md.py. -// Original: https://github.com/unslothai/unsloth/blob/main/studio/backend/core/inference/_html_to_md.py +import { NodeHtmlMarkdown } from 'node-html-markdown'; -import { parse, type DefaultTreeAdapterTypes } from 'parse5'; - -type Document = DefaultTreeAdapterTypes.Document; -type ChildNode = DefaultTreeAdapterTypes.ChildNode; -type Element = DefaultTreeAdapterTypes.Element; -type TextNode = DefaultTreeAdapterTypes.TextNode; - -const SKIP_TAGS = new Set([ - 'script', 'style', 'head', 'noscript', 'svg', 'math', 'nav', 'footer', -]); - -const BLOCK_TAGS = new Set([ - 'p', 'div', 'section', 'article', 'main', 'aside', 'figure', - 'figcaption', 'details', 'summary', 'dl', 'dt', 'dd', -]); - -const HEADING_TAGS = new Set(['h1', 'h2', 'h3', 'h4', 'h5', 'h6']); - -const INLINE_EMPHASIS: Record = { - strong: '**', b: '**', em: '*', i: '*', +// MIT-licensed HTML→Markdown rendering for the web_fetch tool. Output feeds an +// LLM, so structural fidelity matters more than exact whitespace. +const OPTIONS = { + // GFM-style emphasis markers (matches what most models expect). + emDelimiter: '*', + strongDelimiter: '**', + bulletMarker: '*', + codeFence: '```', + codeBlockStyle: 'fenced' as const, + // Always use []() syntax for links rather than autolinks. + useInlineLinks: false, + // Collapse runs of blank lines to a single separator. + maxConsecutiveNewlines: 1, + // Strip non-content elements entirely (script/style are skipped by default, + // but listing them here is explicit; head/nav/footer/etc. drop their text). + ignore: ['script', 'style', 'head', 'noscript', 'svg', 'math', 'nav', 'footer'], }; -function isElement(node: ChildNode): node is Element { - return 'tagName' in node; -} - -function isText(node: ChildNode): node is TextNode { - return node.nodeName === '#text'; -} - -class MarkdownRenderer { - private out: string[] = []; - - private inLink = false; - private linkHref: string | null = null; - private linkTextParts: string[] = []; - - private listStack: string[] = []; - private olCounter: number[] = []; - - private inTable = false; - private currentRow: string[] = []; - private cellParts: string[] = []; - private inCell = false; - private headerRowDone = false; - private rowHasTh = false; - private isFirstRow = false; - - private inPre = false; - private preParts: string[] = []; - private preLanguage: string | null = null; - private inInlineCode = false; - - private bqStack: string[][] = []; - - private emit(text: string): void { - if (this.inLink) { - this.linkTextParts.push(text); - } else if (this.inCell) { - this.cellParts.push(text); - } else if (this.inPre) { - this.preParts.push(text); - } else if (this.bqStack.length > 0) { - this.bqStack[this.bqStack.length - 1]!.push(text); - } else { - this.out.push(text); - } - } - - private prefixBlockquote(content: string): string { - content = content.replace(/[ \t]+$/gm, ''); - content = content.replace(/\n{3,}/g, '\n\n').trim(); - if (!content) return ''; - return content.split('\n').map(line => - line.trim() ? '> ' + line : '>' - ).join('\n'); - } - - private finishCell(): void { - if (!this.inCell) return; - this.inCell = false; - let cellText = this.cellParts.join('').trim().replace(/\n/g, ' '); - cellText = cellText.replace(/\|/g, '\\|'); - this.currentRow.push(cellText); - this.cellParts = []; - } - - private finishRow(): void { - if (this.currentRow.length === 0) return; - const line = '| ' + this.currentRow.join(' | ') + ' |'; - this.emit(line + '\n'); - if (!this.headerRowDone && (this.rowHasTh || this.isFirstRow)) { - const sep = '| ' + this.currentRow.map(() => '---').join(' | ') + ' |'; - this.emit(sep + '\n'); - this.headerRowDone = true; - } - this.isFirstRow = false; - this.currentRow = []; - this.rowHasTh = false; - } - - private finishLink(): void { - const text = this.linkTextParts.join('').replace(/\s+/g, ' ').trim(); - const href = this.linkHref ?? ''; - this.inLink = false; - if (href && text) { - this.emit(`[${text}](${href})`); - } else if (text) { - this.emit(text); - } - } - - private getAttr(el: Element, name: string): string | undefined { - return el.attrs.find(a => a.name === name)?.value; - } - - private handleOpen(el: Element): void { - const tag = el.tagName.toLowerCase(); - - if (HEADING_TAGS.has(tag)) { - const level = parseInt(tag[1]!, 10); - this.emit('\n\n' + '#'.repeat(level) + ' '); - } else if (tag === 'a') { - this.linkHref = this.getAttr(el, 'href') ?? null; - this.linkTextParts = []; - this.inLink = true; - } else if (tag in INLINE_EMPHASIS) { - this.emit(INLINE_EMPHASIS[tag]!); - } else if (tag === 'br') { - this.emit('\n'); - } else if (BLOCK_TAGS.has(tag)) { - this.emit('\n\n'); - } else if (tag === 'hr') { - this.emit('\n\n---\n\n'); - } else if (tag === 'blockquote') { - this.emit('\n\n'); - this.bqStack.push([]); - } else if (tag === 'ul') { - this.listStack.push('ul'); - this.emit('\n'); - } else if (tag === 'ol') { - this.listStack.push('ol'); - const startAttr = this.getAttr(el, 'start'); - let start = 1; - if (startAttr != null) { - const parsed = parseInt(startAttr, 10); - if (!isNaN(parsed)) start = parsed; - } - this.olCounter.push(start - 1); - this.emit('\n'); - } else if (tag === 'li') { - const indent = ' '.repeat(Math.max(0, this.listStack.length - 1)); - if (this.listStack.length > 0 && this.listStack[this.listStack.length - 1] === 'ol') { - if (this.olCounter.length > 0) { - this.olCounter[this.olCounter.length - 1]!++; - this.emit(`\n${indent}${this.olCounter[this.olCounter.length - 1]}. `); - } else { - this.emit(`\n${indent}1. `); - } - } else { - this.emit(`\n${indent}* `); - } - } else if (tag === 'pre') { - this.preParts = []; - this.inPre = true; - this.preLanguage = null; - const codeChild = el.childNodes.find( - (c): c is Element => isElement(c) && c.tagName === 'code' - ); - if (codeChild) { - const cls = this.getAttr(codeChild, 'class') ?? ''; - const langMatch = cls.match(/(?:^|\s)language-(\S+)/); - if (langMatch) this.preLanguage = langMatch[1]!; - } - } else if (tag === 'code' && !this.inPre) { - this.inInlineCode = true; - this.emit('`'); - } else if (tag === 'table') { - this.inTable = true; - this.headerRowDone = false; - this.isFirstRow = true; - this.emit('\n\n'); - } else if (tag === 'tr') { - this.finishCell(); - this.finishRow(); - } else if (tag === 'th' || tag === 'td') { - this.finishCell(); - this.cellParts = []; - this.inCell = true; - if (tag === 'th') this.rowHasTh = true; - } - } - - private handleClose(tag: string): void { - tag = tag.toLowerCase(); - - if (HEADING_TAGS.has(tag)) { - this.emit('\n\n'); - } else if (tag === 'a') { - this.finishLink(); - } else if (tag in INLINE_EMPHASIS) { - this.emit(INLINE_EMPHASIS[tag]!); - } else if (BLOCK_TAGS.has(tag)) { - this.emit('\n\n'); - } else if (tag === 'blockquote') { - if (this.bqStack.length > 0) { - const content = this.bqStack.pop()!.join(''); - const prefixed = this.prefixBlockquote(content); - if (prefixed) this.emit('\n\n' + prefixed + '\n\n'); - } - } else if (tag === 'ul') { - if (this.listStack.length > 0 && this.listStack[this.listStack.length - 1] === 'ul') { - this.listStack.pop(); - } - this.emit('\n'); - } else if (tag === 'ol') { - if (this.listStack.length > 0 && this.listStack[this.listStack.length - 1] === 'ol') { - this.listStack.pop(); - if (this.olCounter.length > 0) this.olCounter.pop(); - } - this.emit('\n'); - } else if (tag === 'pre') { - const raw = this.preParts.join(''); - this.inPre = false; - const lang = this.preLanguage ?? ''; - const block = '```' + lang + '\n' + raw + '\n```'; - this.emit('\n\n' + block + '\n\n'); - this.preLanguage = null; - } else if (tag === 'code' && !this.inPre) { - this.inInlineCode = false; - this.emit('`'); - } else if (tag === 'th' || tag === 'td') { - this.finishCell(); - } else if (tag === 'tr') { - this.finishCell(); - this.finishRow(); - } else if (tag === 'table') { - this.finishCell(); - this.finishRow(); - this.inTable = false; - this.emit('\n'); - } - } - - private handleText(data: string): void { - if (this.inPre) { - this.preParts.push(data); - return; - } - if (this.inInlineCode) { - this.emit(data); - return; - } - const text = data.replace(/\s+/g, ' '); - if (this.inTable && !this.inCell && !text.trim()) return; - this.emit(text); - } - - walk(node: ChildNode | Document): void { - if (isText(node as ChildNode)) { - this.handleText((node as TextNode).value); - return; - } - if (node.nodeName === '#comment') return; - - if (isElement(node as ChildNode)) { - const el = node as Element; - const tag = el.tagName.toLowerCase(); - if (SKIP_TAGS.has(tag)) return; - if (tag === 'img') return; - - this.handleOpen(el); - - if (tag === 'pre') { - for (const child of el.childNodes) { - if (isElement(child) && child.tagName === 'code') { - for (const grandchild of child.childNodes) { - this.walk(grandchild); - } - } else { - this.walk(child); - } - } - } else { - for (const child of el.childNodes) { - this.walk(child); - } - } - - this.handleClose(tag); - return; - } - - if ('childNodes' in node) { - for (const child of (node as Document).childNodes) { - this.walk(child); - } - } - } - - getOutput(): string { - return this.out.join(''); - } -} - -function cleanup(text: string): string { - const lines = text.split('\n'); - const out: string[] = []; - let inFence = false; - let blankRun = 0; - - for (const line of lines) { - const stripped = line.replace(/[ \t]+$/, ''); - if (stripped.startsWith('```')) { - inFence = !inFence; - blankRun = 0; - out.push(stripped); - continue; - } - if (inFence) { - out.push(line); - continue; - } - if (!stripped) { - blankRun++; - if (blankRun <= 1) out.push(''); - continue; - } - blankRun = 0; - out.push(stripped); - } - - return out.join('\n').trim(); -} - export function htmlToMarkdown(sourceHtml: string): string { - sourceHtml = sourceHtml.replace(/\r\n/g, '\n').replace(/\r/g, '\n'); - const doc = parse(sourceHtml); - const renderer = new MarkdownRenderer(); - renderer.walk(doc); - return cleanup(renderer.getOutput()); + if (!sourceHtml) return ''; + return NodeHtmlMarkdown.translate(sourceHtml, OPTIONS).trim(); } diff --git a/apps/web/package.json b/apps/web/package.json index 5e421b4..e434849 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -44,5 +44,5 @@ "typescript": "^5.5.0", "vite": "^5.3.4" }, - "license": "AGPL-3.0-only" + "license": "MIT" } diff --git a/boocode_roadmap.md b/boocode_roadmap.md index d584c4d..f4cc9e6 100644 --- a/boocode_roadmap.md +++ b/boocode_roadmap.md @@ -447,24 +447,22 @@ All tags `vMAJOR.MINOR.PATCH-slug`, monotonic per minor, assigned at ship time ( ----- -## License-debt — relicense AGPL-3.0 → MIT (planned) +## License-debt — relicense AGPL-3.0 → MIT (shipped 2026-06-01) -**Status: planned, not started.** Recorded 2026-05-31 from the v2 external review (`boocode_code_review_v2.md` §5k) + a direct tree audit. **Decision (Sam, 2026-05-31): relicense the project back to MIT.** +**Status: SHIPPED 2026-06-01** (openspec `license-debt-mit`). Recorded 2026-05-31 from the v2 external review (`boocode_code_review_v2.md` §5k) + a direct tree audit. **Decision (Sam, 2026-05-31): relicense the project back to MIT.** -**Current state (the problem):** the tree is **currently AGPL-3.0** — root `LICENSE` is GNU Affero GPL v3 and all five `package.json` declare `"license": "AGPL-3.0-only"`. Cause: the `v2.4.0`/`v2.4.1` Unsloth-Studio lifts pulled in AGPL-3.0-only code, which makes the whole network-served work AGPL-encumbered. This batch clears that so the MIT flip is valid; **nothing else AGPL remains once these files are gone.** +**What was the problem:** the tree was AGPL-3.0 — root `LICENSE` was GNU Affero GPL v3 and all five `package.json` declared `"license": "AGPL-3.0-only"`. Cause: the `v2.4.0`/`v2.4.1` Unsloth-Studio lifts pulled in three AGPL-3.0-only files, making the whole network-served work AGPL-encumbered (AGPL §13 network-copyleft). Clearing those three files made the MIT flip valid. -**The three AGPL-3.0-only files to clear** (each `SPDX-License-Identifier: AGPL-3.0-only`, ported from Unsloth Studio): -1. `apps/server/src/services/inference/tool-call-parser.ts` (← `tool_call_parser.py`) — remove by routing tool-call parsing to **native llama-server** template parsing + a **clean-room ``-only fallback** (no Unsloth provenance). -2. `apps/server/src/services/web/html-to-md.ts` (← `_html_to_md.py`, used by `web_fetch`) — replace with a permissively-licensed library (`turndown` / `node-html-markdown`) or a clean-room walker. -3. `apps/server/src/services/inference/llama-args-validator.ts` (← `llama_server_args.py`, the v2.4.1 sidecar flag-denylist) — clean-room rewrite from the llama-server README flag list (the denylist is facts, not copyrightable). +**The three AGPL-3.0-only files (cleared):** +1. `apps/server/src/services/inference/tool-call-parser.ts` (← `tool_call_parser.py`) — the Unsloth-ported algorithm (`parseToolCallsFromText`/`scanBalancedBraces` + unused nudge constants) was **dead code** (no production import; only the file + its test referenced it). Deleted it. The load-bearing parser (`extractToolCallBlocks` + the BooCode-authored streaming helpers) and `stripToolMarkup` were kept byte-identical and the AGPL header dropped. **No behavior change to the live tool-call path.** +2. `apps/server/src/services/web/html-to-md.ts` (← `_html_to_md.py`, used by `web_fetch`) — **swapped** to the MIT `node-html-markdown` library (a distinct third-party lib, not a rewrite-from-memory); `parse5` dropped. `htmlToMarkdown(html): string` signature preserved. +3. `apps/server/src/services/inference/llama-args-validator.ts` (← `llama_server_args.py`) — **clean-room rewrite** with independent structure; the managed-flag denylist re-derived from the public llama-server flag list (facts, not copyrightable). -**Steps:** -1. Confirm native llama-server tool-parsing on **live qwen3.6** (jinja gate already green — `--jinja` + qwen3.x template live; llama.cpp server-side template parser, v2 review §4a). -2. Run native parsing **behind a flag for one release** (qwen3.6 was historically unreliable — validate before deleting). -3. **Delete** the ~250 Unsloth-derived parser lines + clean-room the `` fallback; replace `html-to-md.ts`; clean-room `llama-args-validator.ts`. -4. **Flip the license:** root `LICENSE` AGPL→MIT, the five `package.json` `license` fields `AGPL-3.0-only`→`MIT`, remove the per-file AGPL SPDX headers, and update roadmap/README prose. After this, **no AGPL remains in the tree** and the "BooCode is MIT" claim becomes true. +**Key correction to the original plan:** the native-llama-server-parsing retirement (which would have needed a live qwen3.6 validation window "behind a flag for one release") was **decoupled** from the relicense and proved unnecessary — the ported parser code was already dead, so the relicense stripped *provenance, not capability*. The native-parsing retirement remains a separate, optional future optimization. -**Source:** `boocode_code_review_v2.md` §1 #1, §5k. **Prerequisite for the license flip — this batch is the blocker, not optional.** +**License flip:** root `LICENSE` AGPL→MIT (`Copyright (c) 2026 indifferentketchup`); the five `package.json` `license` fields → `MIT`; AGPL SPDX headers removed from all three files; a `## License` section added to `README.md`; a guard test asserts no AGPL header / SPDX-AGPL survives. The `boocode_code_review*.md` point-in-time snapshots were left as-is. **No AGPL remains in the tree.** + +**Source:** `boocode_code_review_v2.md` §1 #1, §5k; openspec `license-debt-mit`. ----- @@ -708,7 +706,6 @@ Full per-tag detail in the **Shipped (v2.2.2–v2.6.6)** section above and in `C ### In flight -- **License-debt → relicense AGPL-3.0 → MIT** — see the planned batch above; the tree is currently AGPL-3.0 and three Unsloth-derived files must be cleared before the MIT flip. Prerequisite, blocker-status. - **v2.6 persistent agent sessions — Phase 2/3** — warm ACP backend for goose/qwen (persistent process reused across turns) + lifecycle hardening (idle eviction, crash recovery, worktree cleanup/reaper, post-apply re-baseline) + the Phase-1 UX attribution work (DiffPanel agent badges, resumed/new-session chip). See openspec `v2-6-persistent-agent-sessions/tasks.md`. ### Numbering and scope-revision discipline during v1.13.x (2026-05-23) diff --git a/openspec/changes/license-debt-mit/proposal.md b/openspec/changes/license-debt-mit/proposal.md new file mode 100644 index 0000000..502c8d9 --- /dev/null +++ b/openspec/changes/license-debt-mit/proposal.md @@ -0,0 +1,51 @@ +# License-debt — relicense AGPL-3.0 → MIT + +**Status:** in progress (started 2026-06-01) +**Decision:** Sam, 2026-05-31 — relicense BooCode back to MIT. +**Source:** `boocode_code_review_v2.md` §1 #1, §5k; roadmap `## License-debt` batch. + +## Why + +The tree is **currently AGPL-3.0** — root `LICENSE` is GNU Affero GPL v3 and all five +`package.json` declare `"license": "AGPL-3.0-only"`. Cause: the `v2.4.0`/`v2.4.1` +Unsloth-Studio lifts pulled in three AGPL-3.0-only files. BooCode is network-served, so +AGPL §13 network-copyleft is a live liability. Clearing the three files makes the MIT flip +valid; nothing else AGPL remains once they are gone. + +## Core insight (supersedes the roadmap's staged steps) + +The roadmap entangled the relicense with retiring `tool-call-parser.ts` behind a live +qwen3.6 validation window. That is **not necessary**: the Unsloth-ported algorithm +(`parseToolCallsFromText` / `scanBalancedBraces` + unused constants) is **dead code** — +no production consumer imports it (verified: only the file and its test reference it). The +load-bearing parser (`extractToolCallBlocks`, under the file's own "BooCode streaming +helpers" banner) and `stripToolMarkup` are BooCode-authored. So the relicense **strips +provenance, not capability** — zero behavior change, no validation gate. The +native-llama-server-parsing retirement remains a separate, optional future optimization. + +## The three AGPL-3.0-only files to clear + +1. `apps/server/src/services/web/html-to-md.ts` (← `_html_to_md.py`) — **swap** to + `node-html-markdown` (MIT). A different third-party library, not a rewrite-from-memory + (which would still be a derivative). Consumed by `web_fetch` via `web/index.ts`; + `htmlToMarkdown(html): string` signature preserved. +2. `apps/server/src/services/inference/llama-args-validator.ts` (← `llama_server_args.py`) + — **clean-room** re-derive the flag denylist from the public llama-server README (CLI + flag names are facts, not copyrightable); the shadowing logic is already BooCode's own. +3. `apps/server/src/services/inference/tool-call-parser.ts` (← `tool_call_parser.py`) — + **delete** the dead Unsloth-ported code; keep BooCode's streaming helpers + + `stripToolMarkup` (re-derive its strip regexes from qwen's wire format); drop the header. + No change to the live tool-call path. + +## Decisions (Sam, 2026-06-01) + +- html-to-md library: **node-html-markdown** (single MIT dep, GFM tables built-in). +- tool-call-parser: **relicense-only** — defer native-parsing retirement. +- MIT copyright line: **`Copyright (c) 2026 indifferentketchup`**. +- Leave `boocode_code_review*.md` (point-in-time snapshots) untouched; update the roadmap + batch (planned → shipped) and add a README License section. + +## Out of scope + +- Retiring `tool-call-parser` patterns 1 & 2 in favour of native llama-server parsing. +- Bumping the stale README "Latest release" line / AGENTS.md pointer. diff --git a/openspec/changes/license-debt-mit/tasks.md b/openspec/changes/license-debt-mit/tasks.md new file mode 100644 index 0000000..e81f717 --- /dev/null +++ b/openspec/changes/license-debt-mit/tasks.md @@ -0,0 +1,51 @@ +# Tasks — relicense AGPL-3.0 → MIT + +Four units. A/B/C are disjoint files (parallelizable); D is the join (runs after A/B/C). +The shared `node-html-markdown` dependency swap + `pnpm install` is done before A so the +parallel agents don't race on `apps/server/package.json`. + +## Pre: dependency swap (done by coordinator) +- [ ] Add `node-html-markdown` to `apps/server/package.json` dependencies; remove `parse5` + (only html-to-md consumed it). +- [ ] `pnpm install`. + +## A — html-to-md → node-html-markdown +- [ ] Replace `apps/server/src/services/web/html-to-md.ts` with a thin MIT wrapper exporting + `htmlToMarkdown(sourceHtml: string): string` over `NodeHtmlMarkdown.translate`. +- [ ] Drop the AGPL/Unsloth SPDX header. +- [ ] Update `html-to-md.test.ts` to the new library's output (structure-level `.toContain` + where whitespace differs; output feeds an LLM so exact format is not load-bearing). +- [ ] Keep `web/index.ts` re-export and `web_fetch.ts` untouched. + +## B — llama-args-validator → clean-room +- [ ] Rewrite `apps/server/src/services/inference/llama-args-validator.ts`: re-derive the + managed-flag denylist from the public llama-server README; keep the BooCode + shadowing-flag logic. Same exports (`validateExtraArgs`, `isManagedFlag`, + `stripShadowingFlags`, `StripOptions`). +- [ ] Drop the AGPL/Unsloth SPDX header. +- [ ] Keep `llama-args-validator.test.ts` green (it pins the contract). + +## C — tool-call-parser → minimal clean (relicense-only) +- [ ] Delete dead Unsloth-ported exports: `parseToolCallsFromText`, `scanBalancedBraces`, + `OpenAiToolCall`, `hasToolSignal`, and the unused nudge constants + (`DUPLICATE_CALL_NUDGE`, `TOOL_ERROR_NUDGE`, `TOOL_ERROR_PREFIXES`, + `BUDGET_EXHAUSTED_NUDGE`). +- [ ] Keep `extractToolCallBlocks` + streaming helpers + `stripToolMarkup` (re-derive its + strip regexes from qwen's wire format). Drop the AGPL/Unsloth SPDX header. +- [ ] Remove the now-dead tests from `tool-call-parser.test.ts`; keep streaming/strip tests. +- [ ] Verify `stream-phase.ts` (`extractToolCallBlocks`) + `tool-phase.ts` / `error-handler.ts` + (`stripToolMarkup`) still compile. + +## D — license flip (join) +- [ ] `LICENSE`: replace AGPL-3.0 text with MIT, `Copyright (c) 2026 indifferentketchup`. +- [ ] Flip `"license"` to `"MIT"` in all 5 `package.json` (root, server, web, coder, booterm). +- [ ] Confirm no `SPDX-License-Identifier: AGPL` header survives in the 3 files. +- [ ] Roadmap `License-debt` batch: planned → shipped (note the decoupled-from-parser-retirement + approach). Add a `## License` section to `README.md` (MIT). +- [ ] Optional guard test: assert no `AGPL` SPDX header in `apps/**` and all 5 `package.json` + are MIT. + +## Verify +- [ ] `pnpm -C apps/server test` +- [ ] `pnpm -C apps/server build` +- [ ] root `npx tsc --noEmit` diff --git a/package.json b/package.json index 68ee43c..0422256 100644 --- a/package.json +++ b/package.json @@ -11,5 +11,5 @@ "devDependencies": { "typescript": "^5.5.0" }, - "license": "AGPL-3.0-only" + "license": "MIT" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e9ceb84..6995347 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -158,9 +158,9 @@ importers: fastify: specifier: ^4.28.1 version: 4.29.1 - parse5: - specifier: ^8.0.1 - version: 8.0.1 + node-html-markdown: + specifier: ^1.3.0 + version: 1.3.0 postgres: specifier: ^3.4.4 version: 3.4.9 @@ -2108,6 +2108,9 @@ packages: resolution: {integrity: sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA==} engines: {node: '>=18'} + boolbase@1.0.0: + resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==} + brace-expansion@2.1.0: resolution: {integrity: sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==} @@ -2270,6 +2273,13 @@ packages: resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==} engines: {node: '>= 8'} + css-select@5.2.2: + resolution: {integrity: sha512-TizTzUddG/xYLA3NXodFM0fSbNizXjOKhqiQQwvhlspadZokn1KDy0NZFS0wuEubIYAV5/c1/lAr0TaaFXEXzw==} + + css-what@6.2.2: + resolution: {integrity: sha512-u/O3vwbptzhMs3L1fQE82ZSLHQQfto5gyZzwteVIEyeaY5Fc7R4dapF/BvRoSYFeqfBk4m0V1Vafq5Pjv25wvA==} + engines: {node: '>= 6'} + cssesc@3.0.0: resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==} engines: {node: '>=4'} @@ -2344,6 +2354,19 @@ packages: resolution: {integrity: sha512-DPi0FmjiSU5EvQV0++GFDOJ9ASQUVFh5kD+OzOnYdi7n3Wpm9hWWGfB/O2blfHcMVTL5WkQXSnRiK9makhrcnw==} engines: {node: '>=0.3.1'} + dom-serializer@2.0.0: + resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==} + + domelementtype@2.3.0: + resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==} + + domhandler@5.0.3: + resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==} + engines: {node: '>= 4'} + + domutils@3.2.2: + resolution: {integrity: sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==} + dotenv@17.4.2: resolution: {integrity: sha512-nI4U3TottKAcAD9LLud4Cb7b2QztQMUEfHbvhTH09bqXTxnSie8WnjPALV/WMCrJZ6UV/qHJ6L03OqO3LcdYZw==} engines: {node: '>=12'} @@ -2391,9 +2414,9 @@ packages: resolution: {integrity: sha512-QyL119InA+XXEkNLNTPCXPugSvOfhwv0JOlGNzvxs0hZaiHLNvXSpudUWsOlsXGWJh8G6ckCScEkVHfX3kw/2Q==} engines: {node: '>=10.13.0'} - entities@8.0.0: - resolution: {integrity: sha512-zwfzJecQ/Uej6tusMqwAqU/6KL2XaB2VZ2Jg54Je6ahNBGNH6Ek6g3jjNCF0fG9EWQKGZNddNjU5F1ZQn/sBnA==} - engines: {node: '>=20.19.0'} + entities@4.5.0: + resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==} + engines: {node: '>=0.12'} env-paths@2.2.1: resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==} @@ -2662,6 +2685,10 @@ packages: hast-util-whitespace@3.0.0: resolution: {integrity: sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==} + he@1.2.0: + resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==} + hasBin: true + headers-polyfill@5.0.1: resolution: {integrity: sha512-1TJ6Fih/b8h5TIcv+1+Hw0PDQWJTKDKzFZzcKOiW1wJza3XoAQlkCuXLbymPYB8+ZQyw8mHvdw560e8zVFIWyA==} @@ -3210,6 +3237,13 @@ packages: resolution: {integrity: sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + node-html-markdown@1.3.0: + resolution: {integrity: sha512-OeFi3QwC/cPjvVKZ114tzzu+YoR+v9UXW5RwSXGUqGb0qCl0DvP406tzdL7SFn8pZrMyzXoisfG2zcuF9+zw4g==} + engines: {node: '>=10.0.0'} + + node-html-parser@6.1.13: + resolution: {integrity: sha512-qIsTMOY4C/dAa5Q5vsobRpOOvPfC4pB61UVW2uSwZNUp0QU/jCekTal1vMmbO0DgdHeLUJpv/ARmDqErVxA3Sg==} + node-pty@1.1.0: resolution: {integrity: sha512-20JqtutY6JPXTUnL0ij1uad7Qe1baT46lyolh2sSENDd4sTzKZ4nmAFkeAARDKwmlLjPx6XKRlwRUxwjOy+lUg==} @@ -3224,6 +3258,9 @@ packages: resolution: {integrity: sha512-9qny7Z9DsQU8Ou39ERsPU4OZQlSTP47ShQzuKZ6PRXpYLtIFgl/DEBYEXKlvcEa+9tHVcK8CF81Y2V72qaZhWA==} engines: {node: '>=18'} + nth-check@2.1.1: + resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==} + object-assign@4.1.1: resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} engines: {node: '>=0.10.0'} @@ -3287,9 +3324,6 @@ packages: resolution: {integrity: sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==} engines: {node: '>=18'} - parse5@8.0.1: - resolution: {integrity: sha512-z1e/HMG90obSGeidlli3hj7cbocou0/wa5HacvI3ASx34PecNjNQeaHNo5WIZpWofN9kgkqV1q5YvXe3F0FoPw==} - parseurl@1.3.3: resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==} engines: {node: '>= 0.8'} @@ -5904,6 +5938,8 @@ snapshots: transitivePeerDependencies: - supports-color + boolbase@1.0.0: {} + brace-expansion@2.1.0: dependencies: balanced-match: 1.0.2 @@ -6040,6 +6076,16 @@ snapshots: shebang-command: 2.0.0 which: 2.0.2 + css-select@5.2.2: + dependencies: + boolbase: 1.0.0 + css-what: 6.2.2 + domhandler: 5.0.3 + domutils: 3.2.2 + nth-check: 2.1.1 + + css-what@6.2.2: {} + cssesc@3.0.0: {} csstype@3.2.3: {} @@ -6083,6 +6129,24 @@ snapshots: diff@8.0.4: {} + dom-serializer@2.0.0: + dependencies: + domelementtype: 2.3.0 + domhandler: 5.0.3 + entities: 4.5.0 + + domelementtype@2.3.0: {} + + domhandler@5.0.3: + dependencies: + domelementtype: 2.3.0 + + domutils@3.2.2: + dependencies: + dom-serializer: 2.0.0 + domelementtype: 2.3.0 + domhandler: 5.0.3 + dotenv@17.4.2: {} dunder-proto@1.0.1: @@ -6130,7 +6194,7 @@ snapshots: graceful-fs: 4.2.11 tapable: 2.3.3 - entities@8.0.0: {} + entities@4.5.0: {} env-paths@2.2.1: {} @@ -6519,6 +6583,8 @@ snapshots: dependencies: '@types/hast': 3.0.4 + he@1.2.0: {} + headers-polyfill@5.0.1: dependencies: '@types/set-cookie-parser': 2.4.10 @@ -7196,6 +7262,15 @@ snapshots: fetch-blob: 3.2.0 formdata-polyfill: 4.0.10 + node-html-markdown@1.3.0: + dependencies: + node-html-parser: 6.1.13 + + node-html-parser@6.1.13: + dependencies: + css-select: 5.2.2 + he: 1.2.0 + node-pty@1.1.0: dependencies: node-addon-api: 7.1.1 @@ -7211,6 +7286,10 @@ snapshots: path-key: 4.0.0 unicorn-magic: 0.3.0 + nth-check@2.1.1: + dependencies: + boolbase: 1.0.0 + object-assign@4.1.1: {} object-inspect@1.13.4: {} @@ -7289,10 +7368,6 @@ snapshots: parse-ms@4.0.0: {} - parse5@8.0.1: - dependencies: - entities: 8.0.0 - parseurl@1.3.3: {} path-browserify@1.0.1: {}