Fix accidental macOS 27 deployment target bump

MACOSX_DEPLOYMENT_TARGET was silently bumped 26.2 -> 27.0 in commit
8451db1, most likely by Xcode beta auto-updating it when the project
was opened/built with the macOS 27 beta SDK. No code in the project
actually requires macOS 27 APIs.

DEVELOPMENT.md

@@ -109,7 +109,7 @@ XProtect 5331 flags Debug builds (bash + IMAP + file access = RAT signature matc
 
 ## Contributing
 
-Contributions are welcome! By submitting a pull request you agree that your contribution will be licensed under the PolyForm Noncommercial License 1.0.0, and you grant Rune Olsen the right to relicense your contribution (including for commercial licensing) as part of the project.
+Contributions are welcome! By submitting a pull request you agree that your contribution will be licensed under the AGPL-3.0.
 
 1. Fork the repository
 2. Create a feature branch (`git checkout -b feature/amazing-feature`)

LICENSE

@@ -1,146 +1,663 @@
-# PolyForm Noncommercial License 1.0.0
+oAI — Copyright (C) 2026 Rune Olsen <https://blog.rune.pm>
 
-<https://polyformproject.org/licenses/noncommercial/1.0.0>
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
 
-Required Notice: Copyright (C) 2026 Rune Olsen (https://oai.pm)
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-## Acceptance
+                            Preamble
 
-In order to get any license under these terms, you must agree
-to them as both strict obligations and conditions to all
-your licenses.
+  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.
 
-## Copyright License
+  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.
 
-The licensor grants you a copyright license for the
-software to do everything you might do with the software
-that would otherwise infringe the licensor's copyright
-in it for any permitted purpose.  However, you may
-only distribute the software according to [Distribution
-License](#distribution-license) and make changes or new works
-based on the software according to [Changes and New Works
-License](#changes-and-new-works-license).
+  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.
 
-## Distribution License
+  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.
 
-The licensor grants you an additional copyright license
-to distribute copies of the software.  Your license
-to distribute covers distributing the software with
-changes and new works permitted by [Changes and New Works
-License](#changes-and-new-works-license).
+  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.
 
-## Notices
+  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.
 
-You must ensure that anyone who gets a copy of any part of
-the software from you also gets a copy of these terms or the
-URL for them above, as well as copies of any plain-text lines
-beginning with `Required Notice:` that the licensor provided
-with the software.  For example:
+  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.
 
-> Required Notice: Copyright Yoyodyne, Inc. (http://example.com)
+  The precise terms and conditions for copying, distribution and
+modification follow.
 
-## Changes and New Works License
+                       TERMS AND CONDITIONS
 
-The licensor grants you an additional copyright license to
-make changes and new works based on the software for any
-permitted purpose.
+  0. Definitions.
 
-## Patent License
+  "This License" refers to version 3 of the GNU Affero General Public License.
 
-The licensor grants you a patent license for the software that
-covers patent claims the licensor can license, or becomes able
-to license, that you would infringe by using the software.
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
 
-## Noncommercial Purposes
+  "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.
 
-Any noncommercial purpose is a permitted purpose.
+  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.
 
-## Personal Uses
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
 
-Personal use for research, experiment, and testing for
-the benefit of public knowledge, personal study, private
-entertainment, hobby projects, amateur pursuits, or religious
-observance, without any anticipated commercial application,
-is use for a permitted purpose.
+  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.
 
-## Noncommercial Organizations
+  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.
 
-Use by any charitable organization, educational institution,
-public research organization, public safety or health
-organization, environmental protection organization,
-or government institution is use for a permitted purpose
-regardless of the source of funding or obligations resulting
-from the funding.
+  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.
 
-## Fair Use
+  1. Source Code.
 
-You may have "fair use" rights for the software under the
-law. These terms do not limit them.
+  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.
 
-## No Other Rights
+  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.
 
-These terms do not allow you to sublicense or transfer any of
-your licenses to anyone else, or prevent the licensor from
-granting licenses to anyone else.  These terms do not imply
-any other licenses.
+  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.
 
-## Patent Defense
+  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.
 
-If you make any written claim that the software infringes or
-contributes to infringement of any patent, your patent license
-for the software granted under these terms ends immediately. If
-your company makes such a claim, your patent license ends
-immediately for work on behalf of your company.
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
 
-## Violations
+  The Corresponding Source for a work in source code form is that
+same work.
 
-The first time you are notified in writing that you have
-violated any of these terms, or done anything with the software
-not covered by your licenses, your licenses can nonetheless
-continue if you come into full compliance with these terms,
-and take practical steps to correct past violations, within
-32 days of receiving notice.  Otherwise, all your licenses
-end immediately.
+  2. Basic Permissions.
 
-## No Liability
+  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.
 
-***As far as the law allows, the software comes as is, without
-any warranty or condition, and the licensor will not be liable
-to you for any damages arising out of these terms or the use
-or nature of the software, under any kind of legal claim.***
+  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.
 
-## Definitions
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
 
-The **licensor** is the individual or entity offering these
-terms, and the **software** is the software the licensor makes
-available under these terms.
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
 
-**You** refers to the individual or entity agreeing to these
-terms.
+  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.
 
-**Your company** is any legal entity, sole proprietorship,
-or other kind of organization that you work for, plus all
-organizations that have control over, are under the control of,
-or are under common control with that organization.  **Control**
-means ownership of substantially all the assets of an entity,
-or the power to direct its management and policies by vote,
-contract, or otherwise.  Control can be direct or indirect.
+  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.
 
-**Your licenses** are all the licenses granted to you for the
-software under these terms.
+  4. Conveying Verbatim Copies.
 
-**Use** means anything you do with the software requiring one
-of your licenses.
+  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.
 
-## Commercial Licensing
+  5. Conveying Modified Source Versions.
 
-The Noncommercial Purposes, Personal Uses, and Noncommercial
-Organizations sections above define what you may do without
-paying. Any use intended for or directed toward commercial
-advantage or monetary compensation — including selling this
-software, or any part of it, standalone or bundled into another
-product or service — requires a separate commercial license
-from the copyright holder. Contact Rune Olsen via
-<https://oai.pm> to discuss commercial licensing terms.
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.

README.md

@@ -8,20 +8,19 @@ A powerful native macOS AI chat application with support for multiple providers,
 
 ### 🤖 Multi-Provider Support
 - **OpenAI** - GPT models with native API support
-- **Anthropic** - All Claude models; prompt caching support (direct API and via OpenRouter) reduces cost on repeated system prompts/context
+- **Anthropic** - All Claude models
 - **OpenRouter** - Access to 300+ AI models from multiple providers
 - **Ollama** - Local model inference for privacy
 
 ### 💬 Core Chat Capabilities
 - **Streaming Responses** - Real-time token streaming for faster interactions
 - **Conversation Management** - Save, load, export, and search conversations
-- **Combine Conversations** - Merge 2+ saved conversations, either by chronological concatenation or AI-assisted synthesis
 - **File Attachments** - Support for text files, images, and PDFs
-- **Image Generation** - Create images with supported models (DALL-E, Flux, etc.) - renders inline in chat
+- **Image Generation** - Create images with supported models (DALL-E, Flux, etc.) — renders inline in chat
 - **Reasoning / Thinking Tokens** - Stream live reasoning from thinking-capable models (DeepSeek R1, Claude 3.7+, o1/o3, Qwen); configurable effort level (High/Medium/Low/Minimal); collapsible block auto-expands while thinking and collapses when the answer arrives
 - **Online Mode** - DuckDuckGo and Google web search integration
 - **Session Statistics** - Track token usage, costs, and response times
-- **Command History** - Navigate previous commands with searchable modal (⇧⌘H)
+- **Command History** - Navigate previous commands with searchable modal (⌘H)
 
 ### 🧠 Enhanced Memory & Context System
 - **Smart Context Selection** - Automatically select relevant messages to reduce token usage by 50-80%
@@ -52,25 +51,17 @@ Seamless conversation backup and sync across devices:
 
 ### ⚡ Shortcuts & Agent Skills
 - **Shortcuts** - Personal slash commands that expand to prompt templates; optional `{{input}}` placeholder for inline input
-- **Agent Skills (SKILL.md)** - Markdown instruction files injected into the system prompt; compatible with skill0.io, skillsmp.com, and other SKILL.md marketplaces; import as `.md` or `.zip` bundle with attached data files; a skill named exactly "2nd Brain" can be marked always-trusted, skipping the bash approval prompt for its helper-script calls
+- **Agent Skills (SKILL.md)** - Markdown instruction files injected into the system prompt; compatible with skill0.io, skillsmp.com, and other SKILL.md marketplaces; import as `.md` or `.zip` bundle with attached data files
 
 ### 📚 Anytype Integration
 Connect oAI to your local [Anytype](https://anytype.io) knowledge base:
-- **Search** - find objects by keyword across all spaces or within a specific one
-- **Read** - open any object and read its full markdown content
-- **Append** - add content to the end of an existing object without touching existing text or internal links (preferred over full update)
-- **Create** - make new notes, tasks, or pages
-- **Checkbox tools** - surgically toggle to-do checkboxes or set task done/undone via native relation
+- **Search** — find objects by keyword across all spaces or within a specific one
+- **Read** — open any object and read its full markdown content
+- **Append** — add content to the end of an existing object without touching existing text or internal links (preferred over full update)
+- **Create** — make new notes, tasks, or pages
+- **Checkbox tools** — surgically toggle to-do checkboxes or set task done/undone via native relation
 - All data stays on your machine (local API, no cloud)
 
-### 🛰️ Jarvis Integration
-Connect oAI to a self-hosted [Jarvis](https://jarvis.pm) agent-automation server:
-- **Agent Management** - List, create, edit, enable/disable, run, and stop agents
-- **Run History** - Expandable per-run output with status and timing
-- **Usage & Credits** - Per-agent usage stats and credits balance
-- **Queue Control** - Pause/resume all agents
-- `/jarvis` slash command opens the Jarvis panel directly
-
 ### 🖥️ Power-User Features
 - **Bash Execution** - AI can run shell commands via `/bin/zsh` (opt-in, with per-command approval prompt)
 - **iCloud Backup** - One-click settings backup to iCloud Drive; restore on any Mac; API keys excluded for security
@@ -94,10 +85,9 @@ Automated email responses powered by AI:
 - Footer stats display (messages, tokens, cost, sync status)
 - Header status indicators (MCP, Online mode, Git sync)
 - Responsive message layout with copy buttons
-- **Model Selector (⌘M)** - Filter by capability (Vision / Tools / Online / Image Gen / Thinking 🧠) or by category (Programming, Math, Medical, Translation, Roleplay, Creative, Science, Finance, Legal), sort by price or context window, search by name or description, per-row ⓘ info button; ★ favourite any model - favourites float to the top and can be filtered in one click
+- **Model Selector (⌘M)** - Filter by capability (Vision / Tools / Online / Image Gen / Thinking 🧠), sort by price or context window, search by name or description, per-row ⓘ info button; ★ favourite any model — favourites float to the top and can be filtered in one click
 - **Default Model** - Set a fixed startup model in Settings → General; switching models during a session does not overwrite it
-- **Sidebar Navigation** - Collapsible sidebar for switching between conversations
-- **Localization** - Fully localized into Norwegian Bokmål, Swedish, Danish, German, and French; follows macOS language preference automatically. Translations are AI-generated (machine translation), not reviewed by native speakers - if you spot an awkward or incorrect phrase, please [open an issue](https://gitlab.pm/rune/oai-swift/issues/new)
+- **Localization** - UI ~~fully translated~~ being translated into Norwegian Bokmål, Swedish, Danish, and German; follows macOS language preference automatically
 
 ![Advanced Features](Screenshots/4.png)
 
@@ -107,8 +97,8 @@ Automated email responses powered by AI:
 
 Download the latest release from the [Releases page](https://gitlab.pm/rune/oai-swift/releases). Two builds are available:
 
-- **oAI-x.x.x-AppleSilicon.dmg** - for Macs with an Apple Silicon chip (M1 and later)
-- **oAI-x.x.x-Universal.dmg** - runs natively on both Apple Silicon and Intel Macs
+- **oAI-x.x.x-AppleSilicon.dmg** — for Macs with an Apple Silicon chip (M1 and later)
+- **oAI-x.x.x-Universal.dmg** — runs natively on both Apple Silicon and Intel Macs
 
 ### Installing from DMG
 
@@ -117,19 +107,19 @@ Download the latest release from the [Releases page](https://gitlab.pm/rune/oai-
 3. Eject the DMG
 4. Launch oAI from Applications or Spotlight
 
-### First Launch - Gatekeeper Warning
+### First Launch — Gatekeeper Warning
 
-oAI is **signed by the developer** but has **not yet been notarized by Apple**. Notarization is Apple's automated malware scan - the app itself is safe, but macOS Gatekeeper may block it on first launch with a message saying the app "cannot be opened because the developer cannot be verified."
+oAI is **signed by the developer** but has **not yet been notarized by Apple**. Notarization is Apple's automated malware scan — the app itself is safe, but macOS Gatekeeper may block it on first launch with a message saying the app "cannot be opened because the developer cannot be verified."
 
 To open the app, you have two options:
 
-**Option A - Right-click to open (quickest):**
+**Option A — Right-click to open (quickest):**
 1. Right-click (or Control-click) `oAI.app` in Applications
 2. Select **Open** from the context menu
 3. Click **Open** in the dialog that appears
 4. After doing this once, the app opens normally from then on
 
-**Option B - Remove the quarantine flag via Terminal:**
+**Option B — Remove the quarantine flag via Terminal:**
 
 ```bash
 xattr -dr com.apple.quarantine /Applications/oAI.app
@@ -149,7 +139,7 @@ Add your API keys in Settings (⌘,) → General tab:
 - **Anthropic** - Get from [Anthropic Console](https://console.anthropic.com/) or use OAuth
 - **OpenRouter** - Get from [OpenRouter Keys](https://openrouter.ai/keys)
 - **Ollama** - Base URL (default: http://localhost:11434)
-- **Google** - API key used for Google Custom Search (web search) and Google embeddings (semantic search) - not a chat provider
+- **Google** - API key used for Google Custom Search (web search) and Google embeddings (semantic search) — not a chat provider
 
 ### Essential Settings
 
@@ -193,7 +183,7 @@ Add your API keys in Settings (⌘,) → General tab:
 - `/load` or `/list` - List and load saved conversations (⌘L)
 - `/delete <name>` - Delete a saved conversation
 - `/export <md|json> [filename]` - Export conversation
-- `/history` - Open command history modal (⇧⌘H)
+- `/history` - Open command history modal (⌘H)
 
 ### Provider & Settings
 - `/provider [name]` - Switch or display current provider
@@ -238,7 +228,7 @@ Can you review this code? @~/project/main.swift
 - `⌘,` - Open settings
 - `⌘N` - New conversation
 - `⌘L` - List saved conversations
-- `⇧⌘H` - Command history
+- `⌘H` - Command history
 - `Esc` - Cancel generation / Close dropdown
 - `↑/↓` - Navigate command dropdown (when typing `/`)
 - `Return` - Send message
@@ -323,16 +313,12 @@ AI-powered email auto-responder:
 
 - [x] Vector index for faster semantic search (sqlite-vss)
 - [x] Reasoning / thinking tokens (streamed live, collapsible)
-- [x] Localization (Norwegian Bokmål, Swedish, Danish, German, French)
+- [x] Localization (Norwegian Bokmål, Swedish, Danish, German)
 - [x] iCloud Backup (settings export/restore)
 - [x] Bash execution with per-command approval
 - [x] Anytype integration (read, append, create, checkbox tools)
 - [x] Model favourites (starred models, filter, float to top)
-- [x] Jarvis integration (agent management, run history, usage/credits)
-- [x] Model category filter (Programming, Math, Medical, etc.)
-- [x] Combine saved conversations (concatenation or AI-assisted synthesis)
-- [x] Sidebar navigation redesign
-- [ ] SOUL.md / USER.md - living identity documents injected into system prompt
+- [ ] SOUL.md / USER.md — living identity documents injected into system prompt
 - [ ] Parallel research agents (read-only, concurrent)
 - [ ] Local embeddings (sentence-transformers, $0 cost)
 - [ ] Multi-modal conversation export (PDF, HTML)
@@ -340,18 +326,18 @@ AI-powered email auto-responder:
 
 ## License
 
-oAI is source-available under the **PolyForm Noncommercial License 1.0.0**.
+oAI is free software licensed under the **GNU Affero General Public License v3.0 (AGPL-3.0)**.
 
-This means you are free to use, study, modify, and share oAI for any noncommercial purpose. Commercial use — including selling oAI or any part of it, standalone or bundled into another product or service — requires a separate commercial license.
+This means you are free to use, study, modify, and distribute oAI, but any modified version you run as a network service must also be made available as free software under the same license.
 
-See [LICENSE](LICENSE) for the full license text, or visit [polyformproject.org/licenses/noncommercial/1.0.0](https://polyformproject.org/licenses/noncommercial/1.0.0). For commercial licensing inquiries, contact Rune Olsen via [oai.pm](https://oai.pm).
+See [LICENSE](LICENSE) for the full license text, or visit [gnu.org/licenses/agpl-3.0](https://www.gnu.org/licenses/agpl-3.0.html).
 
 
 ## Author
 
 **Rune Olsen**
 
-- Website: https://oai.pm
+- Website: https://mac.oai.pm
 - Blog: [https://blog.rune.pm](https://blog.rune.pm)
 - Gitlab.pm: [@rune](https://gitlab.pm/rune)
 
@@ -360,7 +346,7 @@ See [LICENSE](LICENSE) for the full license text, or visit [polyformproject.org/
 
 ## Disclaimer
 
-oAI takes real actions on your behalf - it can send emails, write files, make calendar changes, and post Telegram messages. Review your whitelist and permission settings carefully before use. Content you send is processed by your configured AI provider (Anthropic, OpenRouter, or OpenAI). oAI-Web is provided "as is" without warranty of any kind - the author accepts no responsibility for actions taken by the agent or any consequences thereof. See LICENSE for full terms.
+oAI takes real actions on your behalf — it can send emails, write files, make calendar changes, and post Telegram messages. Review your whitelist and permission settings carefully before use. Content you send is processed by your configured AI provider (Anthropic, OpenRouter, or OpenAI). oAI-Web is provided "as is" without warranty of any kind — the author accepts no responsibility for actions taken by the agent or any consequences thereof. See LICENSE for full terms.
 
 ---
 

oAI.xcodeproj/project.pbxproj

@@ -104,7 +104,6 @@
 				da,
 				de,
 				sv,
-				fr,
 			);
 			mainGroup = A550A6592F3B72EA00136F2B;
 			minimizedProjectReferenceProxies = 1;
@@ -270,11 +269,6 @@
 				ENABLE_PREVIEWS = YES;
 				ENABLE_USER_SELECTED_FILES = readonly;
 				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
-				INFOPLIST_KEY_NSCalendarsFullAccessUsageDescription = "oAI can read and create calendar events when you ask it to, if you enable Calendar access in Settings.";
-				INFOPLIST_KEY_NSContactsUsageDescription = "oAI can search your contacts when you ask it to, if you enable Contacts access in Settings.";
-				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "oAI can use your current location to answer questions, if you enable Location & Maps access in Settings.";
-				INFOPLIST_KEY_NSRemindersFullAccessUsageDescription = "oAI can read and create reminders when you ask it to, if you enable Reminders access in Settings.";
 				"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES;
 				"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphonesimulator*]" = YES;
 				"INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphoneos*]" = YES;
@@ -289,7 +283,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 26.2;
-				MARKETING_VERSION = 2.4.1;
+				MARKETING_VERSION = 2.4.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.oai.oAI;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				REGISTER_APP_GROUPS = YES;
@@ -319,11 +313,6 @@
 				ENABLE_PREVIEWS = YES;
 				ENABLE_USER_SELECTED_FILES = readonly;
 				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
-				INFOPLIST_KEY_NSCalendarsFullAccessUsageDescription = "oAI can read and create calendar events when you ask it to, if you enable Calendar access in Settings.";
-				INFOPLIST_KEY_NSContactsUsageDescription = "oAI can search your contacts when you ask it to, if you enable Contacts access in Settings.";
-				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "oAI can use your current location to answer questions, if you enable Location & Maps access in Settings.";
-				INFOPLIST_KEY_NSRemindersFullAccessUsageDescription = "oAI can read and create reminders when you ask it to, if you enable Reminders access in Settings.";
 				"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES;
 				"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphonesimulator*]" = YES;
 				"INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphoneos*]" = YES;
@@ -338,7 +327,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 26.2;
-				MARKETING_VERSION = 2.4.1;
+				MARKETING_VERSION = 2.4.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.oai.oAI;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				REGISTER_APP_GROUPS = YES;

oAI/Assets.xcassets/AppLogo.imageset/Contents.json

@@ -4,14 +4,6 @@
       "filename" : "AppLogo.png",
       "idiom" : "universal",
       "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
     }
   ],
   "info" : {

oAI/Models/AgentSkill.swift

@@ -4,21 +4,23 @@
 //
 //  SKILL.md-style behavioral skills — markdown instruction files injected into the system prompt
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation
@@ -55,10 +57,4 @@ struct AgentSkill: Codable, Identifiable {
         }
         return name
     }
-
-    /// Matches the user's "2nd Brain" skill by name — there's no canonical skill ID,
-    /// so this is the only way to recognize it (used to gate the "always trust" bash setting).
-    var isSecondBrainSkill: Bool {
-        name.trimmingCharacters(in: .whitespacesAndNewlines).caseInsensitiveCompare("2nd Brain") == .orderedSame
-    }
 }

oAI/Models/Conversation.swift

@@ -4,21 +4,23 @@
 //
 //  Model for saved conversations
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation

oAI/Models/EmailLog.swift

@@ -4,21 +4,23 @@
 //
 //  Email processing log entry model
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation

oAI/Models/HistoryEntry.swift

@@ -4,21 +4,23 @@
 //
 //  Command history entry model
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation

oAI/Models/JarvisModels.swift

@@ -4,7 +4,7 @@
 //
 //  Data models for the Jarvis (oAI-Web) API integration.
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 
 import Foundation

oAI/Models/Message.swift

@@ -4,21 +4,23 @@
 //
 //  Core message model for chat conversations
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation

oAI/Models/MockData.swift

@@ -4,21 +4,23 @@
 //
 //  Mock data for Phase 1 testing
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation

oAI/Models/ModelCategory.swift

@@ -4,21 +4,23 @@
 //
 //  Category tags for AI models, inferred from model name/id/description.
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import SwiftUI

oAI/Models/ModelInfo.swift

@@ -4,21 +4,23 @@
 //
 //  Model information and capabilities
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation
@@ -45,7 +47,6 @@ struct ModelInfo: Identifiable, Codable, Hashable {
         let online: Bool           // Web search
         var imageGeneration: Bool = false  // Image output
         var thinking: Bool = false         // Reasoning/thinking tokens
-        var usesImagesAPI: Bool = false    // OpenRouter dedicated /images endpoint
     }
 
     struct Architecture: Codable, Hashable {

oAI/Models/SessionStats.swift

@@ -4,21 +4,23 @@
 //
 //  Session statistics tracking
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation

oAI/Models/Settings.swift

@@ -4,21 +4,23 @@
 //
 //  Application settings and configuration
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation

oAI/Models/Skill.swift

@@ -4,21 +4,23 @@
 //
 //  User-defined slash command templates (prompt shortcuts/macros)
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation

oAI/Models/SyncModels.swift

@@ -1,20 +1,22 @@
 import Foundation
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 enum SyncAuthMethod: String, CaseIterable, Codable {

oAI/Providers/AIProvider.swift

@@ -4,21 +4,23 @@
 //
 //  Protocol for AI provider implementations
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation
@@ -130,19 +132,15 @@ struct ChatResponse: Codable {
         let totalTokens: Int
         let cacheCreationInputTokens: Int?
         let cacheReadInputTokens: Int?
-        /// Direct USD cost returned by the images API (bypasses token-based calculation).
-        let rawCostUSD: Double?
 
-        init(promptTokens: Int, completionTokens: Int, totalTokens: Int, cacheCreationInputTokens: Int? = nil, cacheReadInputTokens: Int? = nil, rawCostUSD: Double? = nil) {
+        init(promptTokens: Int, completionTokens: Int, totalTokens: Int, cacheCreationInputTokens: Int? = nil, cacheReadInputTokens: Int? = nil) {
             self.promptTokens = promptTokens
             self.completionTokens = completionTokens
             self.totalTokens = totalTokens
             self.cacheCreationInputTokens = cacheCreationInputTokens
             self.cacheReadInputTokens = cacheReadInputTokens
-            self.rawCostUSD = rawCostUSD
         }
 
-        // rawCostUSD is set programmatically, never decoded from API responses
         enum CodingKeys: String, CodingKey {
             case promptTokens = "prompt_tokens"
             case completionTokens = "completion_tokens"
@@ -150,16 +148,6 @@ struct ChatResponse: Codable {
             case cacheCreationInputTokens = "cache_creation_input_tokens"
             case cacheReadInputTokens = "cache_read_input_tokens"
         }
-
-        init(from decoder: Decoder) throws {
-            let c = try decoder.container(keyedBy: CodingKeys.self)
-            promptTokens = try c.decode(Int.self, forKey: .promptTokens)
-            completionTokens = try c.decode(Int.self, forKey: .completionTokens)
-            totalTokens = try c.decode(Int.self, forKey: .totalTokens)
-            cacheCreationInputTokens = try c.decodeIfPresent(Int.self, forKey: .cacheCreationInputTokens)
-            cacheReadInputTokens = try c.decodeIfPresent(Int.self, forKey: .cacheReadInputTokens)
-            rawCostUSD = nil
-        }
     }
 
     // Custom Codable since ToolCallInfo/generatedImages are not from API directly
@@ -241,19 +229,6 @@ struct Tool: Codable {
                 let type: String
                 let description: String
                 let `enum`: [String]?
-                let items: Items?
-
-                /// Item schema for `type: "array"` properties (e.g. an array of strings).
-                struct Items: Codable {
-                    let type: String
-                }
-
-                init(type: String, description: String, enum: [String]? = nil, items: Items? = nil) {
-                    self.type = type
-                    self.description = description
-                    self.enum = `enum`
-                    self.items = items
-                }
             }
         }
     }

oAI/Providers/AnthropicProvider.swift

@@ -4,21 +4,23 @@
 //
 //  Anthropic Messages API provider with SSE streaming and tool support
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation
@@ -751,9 +753,6 @@ class AnthropicProvider: AIProvider {
             if let enumVals = prop.enum {
                 propDict["enum"] = enumVals
             }
-            if let items = prop.items {
-                propDict["items"] = ["type": items.type]
-            }
             props[key] = propDict
         }
         var dict: [String: Any] = [

oAI/Providers/OllamaProvider.swift

@@ -4,21 +4,23 @@
 //
 //  Ollama local AI provider with JSON-lines streaming
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation

oAI/Providers/OpenAIProvider.swift

@@ -4,21 +4,23 @@
 //
 //  OpenAI API provider with SSE streaming and tool support
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation

oAI/Providers/OpenRouterModels.swift

@@ -4,21 +4,23 @@
 //
 //  OpenRouter API request and response models
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation
@@ -418,67 +420,6 @@ struct ToolResultMessage: Encodable {
     }
 }
 
-// MARK: - Images API — Model Discovery
-
-struct OpenRouterImageModelsResponse: Codable {
-    let data: [ImageModelData]
-
-    struct ImageModelData: Codable {
-        let id: String
-        let name: String
-        let description: String?
-        let architecture: Architecture?
-        let supportsStreaming: Bool?
-
-        struct Architecture: Codable {
-            let inputModalities: [String]?
-            let outputModalities: [String]?
-
-            enum CodingKeys: String, CodingKey {
-                case inputModalities = "input_modalities"
-                case outputModalities = "output_modalities"
-            }
-        }
-
-        enum CodingKeys: String, CodingKey {
-            case id, name, description, architecture
-            case supportsStreaming = "supports_streaming"
-        }
-    }
-}
-
-// MARK: - Images API — Generation Response
-
-struct OpenRouterImageGenerationResponse: Codable {
-    let created: Int?
-    let data: [ImageData]
-    let usage: Usage?
-
-    struct ImageData: Codable {
-        let b64Json: String
-        let mediaType: String?
-
-        enum CodingKeys: String, CodingKey {
-            case b64Json = "b64_json"
-            case mediaType = "media_type"
-        }
-    }
-
-    struct Usage: Codable {
-        let promptTokens: Int
-        let completionTokens: Int
-        let totalTokens: Int
-        let cost: Double?
-
-        enum CodingKeys: String, CodingKey {
-            case promptTokens = "prompt_tokens"
-            case completionTokens = "completion_tokens"
-            case totalTokens = "total_tokens"
-            case cost
-        }
-    }
-}
-
 // MARK: - Error Response
 
 struct OpenRouterErrorResponse: Codable {

oAI/Providers/OpenRouterProvider.swift

@@ -4,21 +4,23 @@
 //
 //  OpenRouter AI provider implementation with SSE streaming
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation
@@ -51,16 +53,30 @@ class OpenRouterProvider: AIProvider {
     
     func listModels() async throws -> [ModelInfo] {
         Log.api.info("Fetching model list from OpenRouter")
+        let url = URL(string: "\(baseURL)/models")!
+        var request = URLRequest(url: url)
+        request.addValue("Bearer \(apiKey)", forHTTPHeaderField: "Authorization")
+        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
 
-        // Fetch chat models and image models in parallel
-        async let chatData = fetchRaw(path: "/models")
-        async let imageData = fetchRaw(path: "/images/models")
-        let (chatRaw, imageRaw) = try await (chatData, imageData)
+        let (data, response) = try await session.data(for: request)
 
-        let modelsResponse = try JSONDecoder().decode(OpenRouterModelsResponse.self, from: chatRaw)
-        Log.api.info("OpenRouter loaded \(modelsResponse.data.count) chat models")
+        guard let httpResponse = response as? HTTPURLResponse else {
+            Log.api.error("OpenRouter models: invalid response (not HTTP)")
+            throw ProviderError.invalidResponse
+        }
 
-        var models = modelsResponse.data.map { modelData in
+        guard httpResponse.statusCode == 200 else {
+            if let errorResponse = try? JSONDecoder().decode(OpenRouterErrorResponse.self, from: data) {
+                Log.api.error("OpenRouter models HTTP \(httpResponse.statusCode): \(errorResponse.error.message)")
+                throw ProviderError.unknown(errorResponse.error.message)
+            }
+            Log.api.error("OpenRouter models HTTP \(httpResponse.statusCode)")
+            throw ProviderError.unknown("HTTP \(httpResponse.statusCode)")
+        }
+        
+        let modelsResponse = try JSONDecoder().decode(OpenRouterModelsResponse.self, from: data)
+        Log.api.info("OpenRouter loaded \(modelsResponse.data.count) models")
+        return modelsResponse.data.map { modelData in
             let promptPrice = Double(modelData.pricing.prompt) ?? 0.0
             let completionPrice = Double(modelData.pricing.completion) ?? 0.0
             
@@ -113,108 +129,6 @@ class OpenRouterProvider: AIProvider {
             )
             return info
         }
-
-        // Merge dedicated image models (these don't appear in /models)
-        if let imageModelsResponse = try? JSONDecoder().decode(OpenRouterImageModelsResponse.self, from: imageRaw) {
-            Log.api.info("OpenRouter loaded \(imageModelsResponse.data.count) image models")
-            let existingIds = Set(models.map { $0.id })
-            let imageModels = imageModelsResponse.data.compactMap { m -> ModelInfo? in
-                guard !existingIds.contains(m.id) else { return nil }
-                let acceptsImageInput = m.architecture?.inputModalities?.contains("image") ?? false
-                var info = ModelInfo(
-                    id: m.id,
-                    name: m.name,
-                    description: m.description,
-                    contextLength: 0,
-                    pricing: ModelInfo.Pricing(prompt: 0, completion: 0),
-                    capabilities: ModelInfo.ModelCapabilities(
-                        vision: acceptsImageInput,
-                        tools: false,
-                        online: false,
-                        imageGeneration: true,
-                        thinking: false,
-                        usesImagesAPI: true
-                    ),
-                    topProvider: m.id.components(separatedBy: "/").first
-                )
-                info.categories = ModelCategory.infer(name: m.name, id: m.id, description: m.description)
-                return info
-            }
-            models.append(contentsOf: imageModels)
-        }
-
-        return models
-    }
-
-    private func fetchRaw(path: String) async throws -> Data {
-        let url = URL(string: "\(baseURL)\(path)")!
-        var request = URLRequest(url: url)
-        request.addValue("Bearer \(apiKey)", forHTTPHeaderField: "Authorization")
-        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
-        let (data, response) = try await session.data(for: request)
-        guard let httpResponse = response as? HTTPURLResponse else { throw ProviderError.invalidResponse }
-        guard httpResponse.statusCode == 200 else {
-            if let err = try? JSONDecoder().decode(OpenRouterErrorResponse.self, from: data) {
-                throw ProviderError.unknown(err.error.message)
-            }
-            throw ProviderError.unknown("HTTP \(httpResponse.statusCode)")
-        }
-        return data
-    }
-
-    // MARK: - Images API
-
-    func generateImage(model: String, prompt: String) async throws -> ChatResponse {
-        Log.api.info("OpenRouter images API: model=\(model)")
-        let url = URL(string: "\(baseURL)/images")!
-        var urlRequest = URLRequest(url: url)
-        urlRequest.httpMethod = "POST"
-        urlRequest.addValue("Bearer \(apiKey)", forHTTPHeaderField: "Authorization")
-        urlRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
-        urlRequest.addValue("https://github.com/yourusername/oAI", forHTTPHeaderField: "HTTP-Referer")
-        urlRequest.addValue("oAI-Swift", forHTTPHeaderField: "X-Title")
-        urlRequest.httpBody = try JSONSerialization.data(withJSONObject: ["model": model, "prompt": prompt])
-
-        let (data, response) = try await session.data(for: urlRequest)
-        guard let httpResponse = response as? HTTPURLResponse else { throw ProviderError.invalidResponse }
-
-        if httpResponse.statusCode != 200 {
-            if let err = try? JSONDecoder().decode(OpenRouterErrorResponse.self, from: data) {
-                Log.api.error("OpenRouter images HTTP \(httpResponse.statusCode): \(err.error.message)")
-                throw ProviderError.unknown(err.error.message)
-            }
-            Log.api.error("OpenRouter images HTTP \(httpResponse.statusCode)")
-            throw ProviderError.unknown("HTTP \(httpResponse.statusCode)")
-        }
-
-        if let rawStr = String(data: data, encoding: .utf8) {
-            Log.api.debug("Images API raw response (first 200 chars): \(rawStr.prefix(200))")
-        }
-
-        let imageResponse = try JSONDecoder().decode(OpenRouterImageGenerationResponse.self, from: data)
-        let images: [Data] = imageResponse.data.compactMap { item in
-            Data(base64Encoded: item.b64Json)
-        }
-
-        let usage: ChatResponse.Usage? = imageResponse.usage.map { u in
-            ChatResponse.Usage(
-                promptTokens: u.promptTokens,
-                completionTokens: u.completionTokens,
-                totalTokens: u.totalTokens,
-                rawCostUSD: u.cost
-            )
-        }
-
-        return ChatResponse(
-            id: UUID().uuidString,
-            model: model,
-            content: "",
-            role: "assistant",
-            finishReason: "stop",
-            usage: usage,
-            created: Date(),
-            generatedImages: images.isEmpty ? nil : images
-        )
     }
     
     func getModel(_ id: String) async throws -> ModelInfo? {

oAI/Providers/ProviderRegistry.swift

@@ -4,21 +4,23 @@
 //
 //  Registry for managing multiple AI providers
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation

oAI/Resources/oAI.help/Contents/Resources/en.lproj/index.html

@@ -36,9 +36,6 @@
                 <li><a href="#shortcuts">Shortcuts (Prompt Templates)</a></li>
                 <li><a href="#agent-skills">Agent Skills (SKILL.md)</a></li>
                 <li><a href="#anytype">Anytype Integration</a></li>
-                <li><a href="#external-mcp">External MCP Servers</a></li>
-                <li><a href="#personal-data">Personal Data Tools</a></li>
-                <li><a href="#research-agents">Research Agents</a></li>
                 <li><a href="#bash-execution">Bash Execution</a></li>
                 <li><a href="#icloud-backup">iCloud Backup</a></li>
                 <li><a href="#reasoning">Reasoning / Thinking Tokens</a></li>
@@ -52,7 +49,7 @@
             <!-- Getting Started -->
             <section id="getting-started">
                 <h2>Getting Started</h2>
-                <p>oAI is a powerful AI chat assistant that connects to multiple AI providers including OpenAI, Anthropic, OpenRouter, and local models via Ollama. The app is available in English, Norwegian Bokmål, Swedish, Danish, German, and French — it follows your macOS language preference automatically.</p>
+                <p>oAI is a powerful AI chat assistant that connects to multiple AI providers including OpenAI, Anthropic, OpenRouter, and local models via Ollama. The app is available in English, Norwegian Bokmål, Swedish, Danish, and German — it follows your macOS language preference automatically.</p>
 
                 <div class="steps">
                     <h3>Quick Start</h3>
@@ -118,10 +115,6 @@
                     <li><strong>🧠 Thinking</strong> — models that support reasoning / thinking tokens</li>
                 </ul>
 
-                <div class="note">
-                    <strong>Note:</strong> On OpenRouter, dedicated image-generation models (e.g. Sourceful, Seedream, Flux) are fetched from OpenRouter's separate images catalog and merged into the picker automatically — you don't need to configure anything extra to see them.
-                </div>
-
                 <h3>Sorting</h3>
                 <p>Click the <strong>↑↓ Sort</strong> button to sort the list by:</p>
                 <ul>
@@ -1377,6 +1370,7 @@ Whenever the user asks you to translate something, translate it to Norwegian Bok
                 </div>
             </section>
 
+            <!-- Keyboard Shortcuts -->
             <!-- Anytype Integration -->
             <section id="anytype">
                 <h2>Anytype Integration</h2>
@@ -1419,104 +1413,6 @@ Whenever the user asks you to translate something, translate it to Norwegian Bok
                 </ul>
             </section>
 
-            <!-- External MCP Servers -->
-            <section id="external-mcp">
-                <h2>External MCP Servers</h2>
-                <p>Connect any external MCP server that speaks the stdio JSON-RPC protocol (for example <code>safaridriver --mcp</code>) and give the AI access to its tools — no custom integration code needed.</p>
-
-                <h3>Adding a Server</h3>
-                <ol>
-                    <li>Press <kbd>⌘,</kbd> to open Settings</li>
-                    <li>Go to the <strong>MCP</strong> tab → <strong>External MCP Servers</strong> section</li>
-                    <li>Click <strong>Add Server…</strong></li>
-                    <li>Enter a <strong>Name</strong> (used to prefix its tools, e.g. "Safari" → <code>safari_navigate_to_url</code>), the <strong>Command</strong> to launch it, and any <strong>Arguments</strong></li>
-                    <li>Click <strong>Add</strong> — the server starts automatically and its tools are discovered</li>
-                </ol>
-
-                <div class="tip">
-                    <strong>💡 Tip:</strong> Arguments containing spaces can be quoted, e.g. <code>--root "/Users/you/My Documents"</code>.
-                </div>
-
-                <h3>Server Status</h3>
-                <p>Each configured server shows a status dot and label:</p>
-                <ul>
-                    <li><strong>🟢 Connected</strong> — running and its tools are available to the AI</li>
-                    <li><strong>🟠 Connecting…</strong> — starting up or performing the initial handshake</li>
-                    <li><strong>🔴 Error / Crashed</strong> — failed to start or exited unexpectedly</li>
-                    <li><strong>⚪ Not started</strong> — disabled via the toggle</li>
-                </ul>
-                <p>Toggle a server off/on or delete it entirely with the trash icon. Crashed servers automatically restart up to 3 times with increasing delay (5s, 15s, 30s) before giving up.</p>
-
-                <div class="note">
-                    <strong>Note:</strong> Tool names from every external server are prefixed with that server's slug (derived from its Name) so they never collide with oAI's built-in tools or each other.
-                </div>
-            </section>
-
-            <!-- Personal Data Tools -->
-            <section id="personal-data">
-                <h2>Personal Data Tools <span style="font-size: 0.75em; background: #f90; color: #fff; border-radius: 4px; padding: 1px 5px; vertical-align: middle;">Beta</span></h2>
-                <p>Let the AI access your Calendar, Reminders, and Location &amp; Maps to answer questions about your schedule and surroundings. Each service is opt-in and uses Apple's own frameworks (EventKit, CoreLocation, MapKit) with standard macOS permission prompts — nothing goes through a third-party service.</p>
-
-                <h3>Enabling a Service</h3>
-                <ol>
-                    <li>Press <kbd>⌘,</kbd> to open Settings</li>
-                    <li>Go to the <strong>MCP</strong> tab → <strong>Personal Data</strong> section</li>
-                    <li>Toggle on the services you want: <strong>Calendar</strong>, <strong>Reminders</strong>, or <strong>Location &amp; Maps</strong></li>
-                    <li>Click <strong>Request Access</strong> next to a service — macOS shows its standard permission prompt</li>
-                </ol>
-
-                <h3>What the AI Can Do</h3>
-                <ul>
-                    <li><strong>Calendar</strong> — list your calendars and upcoming events, create new events</li>
-                    <li><strong>Reminders</strong> — list reminder lists and items, create new reminders, mark reminders complete</li>
-                    <li><strong>Location &amp; Maps</strong> — get your current location, search for places, geocode addresses, and get directions (all read-only)</li>
-                </ul>
-
-                <div class="warning">
-                    <strong>⚠️ Write actions require approval:</strong> Creating a calendar event or reminder, or completing a reminder, shows an approval sheet first with a plain-language summary of what will happen. Choose <strong>Deny</strong>, <strong>Allow Once</strong>, or <strong>Allow for Session</strong>. Toggle this requirement off in Settings → MCP → Personal Data → Require Approval for Changes.
-                </div>
-
-                <div class="note">
-                    <strong>Note:</strong> Contacts support exists internally but is currently hidden while a macOS permission bug affecting hardened-runtime apps is worked out on Apple's side.
-                </div>
-
-                <h3>Example Prompts</h3>
-                <ul>
-                    <li>"What's on my calendar tomorrow?"</li>
-                    <li>"Remind me to call the dentist on Friday at 2pm"</li>
-                    <li>"How far is the nearest coffee shop from here?"</li>
-                </ul>
-            </section>
-
-            <!-- Research Agents -->
-            <section id="research-agents">
-                <h2>Research Agents</h2>
-                <p>For tasks that involve searching or reading many files, the AI can spawn several read-only research sub-agents that work in parallel instead of doing everything itself, one step at a time.</p>
-
-                <div class="warning">
-                    <strong>⚠️ Cost warning:</strong> Each sub-agent runs its own full chain of model calls. A single request that spawns several agents can cost several times a normal reply. Leave this off unless you specifically want that tradeoff.
-                </div>
-
-                <h3>Enabling Research Agents</h3>
-                <ol>
-                    <li>Press <kbd>⌘,</kbd> to open Settings</li>
-                    <li>Go to the <strong>MCP</strong> tab → <strong>Research Agents</strong> section</li>
-                    <li>Toggle <strong>Enable Research Agents</strong> on</li>
-                    <li>Adjust <strong>Max Concurrent Agents</strong> (1–5, default 3) to control how many sub-agents can run at once</li>
-                </ol>
-
-                <h3>What Sub-Agents Can Do</h3>
-                <p>Sub-agents are intentionally limited to read-only investigation — they cannot write files, run shell commands, or spawn further sub-agents:</p>
-                <ul>
-                    <li>Read file contents</li>
-                    <li>List directory contents</li>
-                    <li>Search for files</li>
-                    <li>Search the web</li>
-                </ul>
-
-                <p class="note">Intended for genuinely independent research tasks (e.g. "compare these five files" or "look into three unrelated topics"), not everyday questions — the AI is instructed to reserve this for cases that actually benefit from parallelism.</p>
-            </section>
-
             <section id="keyboard-shortcuts">
                 <h2>Keyboard Shortcuts</h2>
                 <p>Work faster with these keyboard shortcuts.</p>
@@ -1535,7 +1431,7 @@ Whenever the user asks you to translate something, translate it to Norwegian Bok
                     <dt><kbd>⌘L</kbd></dt>
                     <dd>Browse Conversations</dd>
 
-                    <dt><kbd>⇧⌘H</kbd></dt>
+                    <dt><kbd>⌘H</kbd></dt>
                     <dd>Command History</dd>
 
                     <dt><kbd>⌘M</kbd></dt>
@@ -1594,9 +1490,6 @@ Whenever the user asks you to translate something, translate it to Norwegian Bok
                     <li>Enable/disable write, delete, move, and bash execution permissions</li>
                     <li>Configure gitignore respect</li>
                     <li><strong>Bash Execution</strong> — enable AI shell access, set working directory, timeout, and approval behaviour (see <a href="#bash-execution">Bash Execution</a>)</li>
-                    <li><strong>Research Agents</strong> — let the AI spawn parallel read-only research sub-agents (see <a href="#research-agents">Research Agents</a>)</li>
-                    <li><strong>External MCP Servers</strong> — connect any stdio MCP server for additional tools (see <a href="#external-mcp">External MCP Servers</a>)</li>
-                    <li><strong>Personal Data</strong> — Calendar, Reminders, and Location &amp; Maps access (see <a href="#personal-data">Personal Data Tools</a>)</li>
                 </ul>
 
                 <h3>Sync Tab</h3>

oAI/Services/AgentSkillFilesService.swift

@@ -4,21 +4,23 @@
 //
 //  Manages per-skill file directories in Application Support/oAI/skills/<uuid>/
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation

oAI/Services/AnthropicOAuthService.swift

@@ -4,21 +4,23 @@
 //
 //  OAuth 2.0 PKCE flow for Anthropic Pro/Max subscription login
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation

oAI/Services/AnytypeMCPService.swift

@@ -4,21 +4,23 @@
 //
 //  Anytype MCP integration via local HTTP API at http://127.0.0.1:31009
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation

oAI/Services/BackupService.swift

@@ -4,21 +4,23 @@
 //
 //  iCloud Drive backup of non-encrypted settings (Option C, v1)
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 import Foundation
 import os

oAI/Services/ContactsService.swift

@@ -1,248 +0,0 @@
-//
-//  ContactsService.swift
-//  oAI
-//
-//  Read-only Contacts integration: search and "my card" lookup
-//
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
-// Copyright (C) 2026 Rune Olsen
-//
-// This file is part of oAI.
-//
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
-//
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
-
-
-import Contacts
-import Foundation
-import os
-
-@Observable
-class ContactsService {
-    static let shared = ContactsService()
-
-    private let store = CNContactStore()
-    private let maxResults = 20
-    private let maxScan = 5000
-
-    private init() {}
-
-    // MARK: - Authorization
-
-    var authStatus: CNAuthorizationStatus {
-        CNContactStore.authorizationStatus(for: .contacts)
-    }
-
-    var authorized: Bool {
-        authStatus == .authorized
-    }
-
-    var accessState: PersonalDataAccessState {
-        let status = authStatus
-        Log.mcp.debug("ContactsService.accessState -> status=\(Self.describe(status)) (raw=\(status.rawValue))")
-        switch status {
-        case .authorized: return .granted
-        case .notDetermined: return .notDetermined
-        default: return .denied
-        }
-    }
-
-    @discardableResult
-    func requestAccess() async -> Bool {
-        let before = CNContactStore.authorizationStatus(for: .contacts)
-        Log.mcp.info("ContactsService.requestAccess: status before request = \(Self.describe(before)) (raw=\(before.rawValue))")
-        return await withCheckedContinuation { continuation in
-            store.requestAccess(for: .contacts) { granted, error in
-                let after = CNContactStore.authorizationStatus(for: .contacts)
-                if let error {
-                    Log.mcp.error("ContactsService.requestAccess: error=\(error.localizedDescription); granted=\(granted); status after = \(Self.describe(after)) (raw=\(after.rawValue))")
-                } else {
-                    Log.mcp.info("ContactsService.requestAccess: granted=\(granted); status after = \(Self.describe(after)) (raw=\(after.rawValue))")
-                }
-                continuation.resume(returning: granted)
-            }
-        }
-    }
-
-    nonisolated static func describe(_ status: CNAuthorizationStatus) -> String {
-        switch status {
-        case .notDetermined: return "notDetermined"
-        case .restricted: return "restricted"
-        case .denied: return "denied"
-        case .authorized: return "authorized"
-        case .limited: return "limited"
-        @unknown default: return "unknown"
-        }
-    }
-
-    // MARK: - Tool Schemas
-
-    func getToolSchemas() -> [Tool] {
-        [
-            makeTool(
-                name: "contacts_search",
-                description: "Search Contacts by name, phone number, or email address. Returns matching contacts with their phone numbers and emails. This does NOT match relationship labels like 'mother' or 'spouse' — for those, call contacts_get_me first to find the related person's name, then search for that name.",
-                properties: [
-                    "query": prop("string", "Name, phone number, or email fragment to search for")
-                ],
-                required: ["query"]
-            ),
-            makeTool(
-                name: "contacts_get_me",
-                description: "Get the user's own contact card (\"My Card\" in Contacts.app), if configured. Includes any defined relationships (e.g. mother, spouse, child) with the related person's name — use contacts_search with that name to find their phone/email.",
-                properties: [:],
-                required: []
-            )
-        ]
-    }
-
-    // MARK: - Tool Execution
-
-    func executeTool(name: String, arguments: String) async -> [String: Any] {
-        Log.mcp.info("Executing Contacts tool: \(name)")
-        guard authorized else {
-            return ["error": "Contacts permission not granted. Grant access in Settings > MCP."]
-        }
-
-        switch name {
-        case "contacts_search":
-            guard let data = arguments.data(using: .utf8),
-                  let args = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
-                  let query = args["query"] as? String, !query.isEmpty else {
-                return ["error": "Missing required parameter: query"]
-            }
-            return search(query: query)
-
-        case "contacts_get_me":
-            return getMe()
-
-        default:
-            return ["error": "Unknown Contacts tool: \(name)"]
-        }
-    }
-
-    // MARK: - Implementation
-
-    private let keysToFetch: [CNKeyDescriptor] = [
-        CNContactGivenNameKey as CNKeyDescriptor,
-        CNContactFamilyNameKey as CNKeyDescriptor,
-        CNContactOrganizationNameKey as CNKeyDescriptor,
-        CNContactPhoneNumbersKey as CNKeyDescriptor,
-        CNContactEmailAddressesKey as CNKeyDescriptor,
-        CNContactRelationsKey as CNKeyDescriptor
-    ]
-
-    private func search(query: String) -> [String: Any] {
-        var matches: [CNContact] = []
-
-        // Fast path: name predicate
-        let namePredicate = CNContact.predicateForContacts(matchingName: query)
-        if let nameMatches = try? store.unifiedContacts(matching: namePredicate, keysToFetch: keysToFetch) {
-            matches.append(contentsOf: nameMatches)
-        }
-
-        // Fallback: scan for phone/email substring matches
-        if matches.isEmpty {
-            let lowerQuery = query.lowercased()
-            let digitsQuery = query.filter(\.isNumber)
-            let request = CNContactFetchRequest(keysToFetch: keysToFetch)
-            var scanned = 0
-            try? store.enumerateContacts(with: request) { contact, stop in
-                scanned += 1
-                if scanned > self.maxScan || matches.count >= self.maxResults {
-                    stop.pointee = true
-                    return
-                }
-                let emailMatch = contact.emailAddresses.contains {
-                    ($0.value as String).lowercased().contains(lowerQuery)
-                }
-                let phoneMatch = !digitsQuery.isEmpty && contact.phoneNumbers.contains {
-                    $0.value.stringValue.filter(\.isNumber).contains(digitsQuery)
-                }
-                if emailMatch || phoneMatch {
-                    matches.append(contact)
-                }
-            }
-        }
-
-        let deduped = dedupContacts(matches)
-        let formatted = deduped.prefix(maxResults).map(formatContact)
-        return ["count": formatted.count, "contacts": Array(formatted)]
-    }
-
-    /// Collapses contacts that share a phone number or email — Contacts.app's "linked contacts"
-    /// merge doesn't catch every real-world duplicate card, so do a best-effort merge here too.
-    private func dedupContacts(_ contacts: [CNContact]) -> [CNContact] {
-        var result: [CNContact] = []
-        outer: for contact in contacts {
-            let phones = Set(contact.phoneNumbers.map { $0.value.stringValue.filter(\.isNumber) })
-            let emails = Set(contact.emailAddresses.map { ($0.value as String).lowercased() })
-            for existing in result {
-                let existingPhones = Set(existing.phoneNumbers.map { $0.value.stringValue.filter(\.isNumber) })
-                let existingEmails = Set(existing.emailAddresses.map { ($0.value as String).lowercased() })
-                if !phones.isDisjoint(with: existingPhones) || !emails.isDisjoint(with: existingEmails) {
-                    continue outer
-                }
-            }
-            result.append(contact)
-        }
-        return result
-    }
-
-    private func getMe() -> [String: Any] {
-        guard let me = try? store.unifiedMeContactWithKeys(toFetch: keysToFetch) else {
-            return ["error": "No 'My Card' is configured in Contacts.app"]
-        }
-        return formatContact(me)
-    }
-
-    private func formatContact(_ contact: CNContact) -> [String: Any] {
-        var item: [String: Any] = [
-            "given_name": contact.givenName,
-            "family_name": contact.familyName
-        ]
-        if !contact.organizationName.isEmpty {
-            item["organization"] = contact.organizationName
-        }
-        if !contact.phoneNumbers.isEmpty {
-            item["phones"] = contact.phoneNumbers.map { $0.value.stringValue }
-        }
-        if !contact.emailAddresses.isEmpty {
-            item["emails"] = contact.emailAddresses.map { $0.value as String }
-        }
-        if !contact.contactRelations.isEmpty {
-            item["relations"] = contact.contactRelations.map { labeled -> [String: String] in
-                let label = labeled.label.map { CNLabeledValue<CNContactRelation>.localizedString(forLabel: $0) } ?? "relation"
-                return ["label": label, "name": labeled.value.name]
-            }
-        }
-        return item
-    }
-
-    private func makeTool(name: String, description: String, properties: [String: Tool.Function.Parameters.Property], required: [String]) -> Tool {
-        Tool(
-            type: "function",
-            function: Tool.Function(
-                name: name,
-                description: description,
-                parameters: Tool.Function.Parameters(
-                    type: "object",
-                    properties: properties,
-                    required: required
-                )
-            )
-        )
-    }
-
-    private func prop(_ type: String, _ description: String) -> Tool.Function.Parameters.Property {
-        Tool.Function.Parameters.Property(type: type, description: description, enum: nil)
-    }
-}

oAI/Services/ContextSelectionService.swift

@@ -5,21 +5,23 @@
 //  Smart context selection for AI conversations
 //  Selects relevant messages instead of sending entire history
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation

oAI/Services/ConversationMergeService.swift

@@ -4,21 +4,23 @@
 //
 //  Combine multiple saved conversations into one (simple concatenation or AI-assisted merge)
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation

oAI/Services/DatabaseService.swift

@@ -4,21 +4,23 @@
 //
 //  SQLite persistence layer for conversations using GRDB
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation

oAI/Services/EmailHandlerService.swift

@@ -4,21 +4,23 @@
 //
 //  AI-powered email auto-responder service
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation

oAI/Services/EmailLogService.swift

@@ -4,21 +4,23 @@
 //
 //  Service for managing email handler activity logs
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation

oAI/Services/EmailService.swift

@@ -4,21 +4,23 @@
 //
 //  IMAP IDLE email monitoring service for AI email handler
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation

oAI/Services/EmbeddingService.swift

@@ -5,21 +5,23 @@
 //  Embedding generation and semantic search
 //  Supports multiple providers: OpenAI, OpenRouter, Google
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation

oAI/Services/EncryptionService.swift

@@ -5,21 +5,23 @@
 //  Secure encryption for sensitive data (API keys)
 //  Uses CryptoKit with machine-specific key derivation
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation

oAI/Services/EventKitService.swift

@@ -1,591 +0,0 @@
-//
-//  EventKitService.swift
-//  oAI
-//
-//  Calendar and Reminders integration via EventKit
-//
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
-// Copyright (C) 2026 Rune Olsen
-//
-// This file is part of oAI.
-//
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
-//
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
-
-
-import EventKit
-import Foundation
-import os
-
-/// Shared tri-state authorization status for the Settings UI across all Personal Data services.
-/// `.denied` also covers `.restricted` and (for Calendar) `.writeOnly` — states where the OS
-/// will not show a request dialog again; the user must go to System Settings manually.
-enum PersonalDataAccessState {
-    case notDetermined
-    case denied
-    case granted
-}
-
-@Observable
-class EventKitService {
-    static let shared = EventKitService()
-
-    private let store = EKEventStore()
-
-    private init() {}
-
-    // MARK: - Authorization
-
-    var calendarAuthStatus: EKAuthorizationStatus {
-        let status = EKEventStore.authorizationStatus(for: .event)
-        Log.mcp.debug("EventKitService.calendarAuthStatus -> \(Self.describe(status)) (raw=\(status.rawValue))")
-        return status
-    }
-
-    var reminderAuthStatus: EKAuthorizationStatus {
-        let status = EKEventStore.authorizationStatus(for: .reminder)
-        Log.mcp.debug("EventKitService.reminderAuthStatus -> \(Self.describe(status)) (raw=\(status.rawValue))")
-        return status
-    }
-
-    var calendarAuthorized: Bool {
-        calendarAuthStatus == .fullAccess
-    }
-
-    var reminderAuthorized: Bool {
-        reminderAuthStatus == .fullAccess
-    }
-
-    var calendarAccessState: PersonalDataAccessState {
-        switch calendarAuthStatus {
-        case .fullAccess: return .granted
-        case .notDetermined: return .notDetermined
-        default: return .denied  // .denied, .restricted, .writeOnly (no read access for our tools)
-        }
-    }
-
-    var reminderAccessState: PersonalDataAccessState {
-        switch reminderAuthStatus {
-        case .fullAccess: return .granted
-        case .notDetermined: return .notDetermined
-        default: return .denied
-        }
-    }
-
-    @discardableResult
-    func requestCalendarAccess() async -> Bool {
-        let before = EKEventStore.authorizationStatus(for: .event)
-        Log.mcp.info("requestCalendarAccess: status before request = \(Self.describe(before)) (raw=\(before.rawValue))")
-        do {
-            let granted = try await store.requestFullAccessToEvents()
-            let after = EKEventStore.authorizationStatus(for: .event)
-            Log.mcp.info("requestCalendarAccess: API returned granted=\(granted); status after request = \(Self.describe(after)) (raw=\(after.rawValue))")
-            return granted
-        } catch {
-            let after = EKEventStore.authorizationStatus(for: .event)
-            Log.mcp.error("requestCalendarAccess: threw error: \(error.localizedDescription); status after = \(Self.describe(after)) (raw=\(after.rawValue))")
-            return false
-        }
-    }
-
-    @discardableResult
-    func requestReminderAccess() async -> Bool {
-        let before = EKEventStore.authorizationStatus(for: .reminder)
-        Log.mcp.info("requestReminderAccess: status before request = \(Self.describe(before)) (raw=\(before.rawValue))")
-        do {
-            let granted = try await store.requestFullAccessToReminders()
-            let after = EKEventStore.authorizationStatus(for: .reminder)
-            Log.mcp.info("requestReminderAccess: API returned granted=\(granted); status after request = \(Self.describe(after)) (raw=\(after.rawValue))")
-            return granted
-        } catch {
-            let after = EKEventStore.authorizationStatus(for: .reminder)
-            Log.mcp.error("requestReminderAccess: threw error: \(error.localizedDescription); status after = \(Self.describe(after)) (raw=\(after.rawValue))")
-            return false
-        }
-    }
-
-    nonisolated static func describe(_ status: EKAuthorizationStatus) -> String {
-        switch status {
-        case .notDetermined: return "notDetermined"
-        case .restricted: return "restricted"
-        case .denied: return "denied"
-        case .fullAccess: return "fullAccess"
-        case .writeOnly: return "writeOnly"
-        @unknown default: return "unknown"
-        }
-    }
-
-    // MARK: - Tool Schemas
-
-    func getToolSchemas(calendarEnabled: Bool, remindersEnabled: Bool) -> [Tool] {
-        var tools: [Tool] = []
-
-        if calendarEnabled {
-            tools.append(makeTool(
-                name: "calendar_list_calendars",
-                description: "List all calendars available on this Mac (e.g. iCloud, Work, Home).",
-                properties: [:],
-                required: []
-            ))
-            tools.append(makeTool(
-                name: "calendar_list_events",
-                description: "List calendar events within a date range. Dates are ISO8601 (e.g. '2026-06-20T00:00:00' or '2026-06-20'). Range is limited to 1 year. For open-ended queries like 'next appointment' or 'upcoming events', do NOT limit the range to just today — use a generous forward-looking window (e.g. today through +90 days) so you don't miss events further out.",
-                properties: [
-                    "start_date": prop("string", "Start of the date range (ISO8601)"),
-                    "end_date": prop("string", "End of the date range (ISO8601)"),
-                    "calendar_name": prop("string", "Optional: only list events from this calendar")
-                ],
-                required: ["start_date", "end_date"]
-            ))
-            tools.append(makeTool(
-                name: "calendar_create_event",
-                description: "Create a new calendar event. Requires user approval before it is actually created.",
-                properties: [
-                    "title": prop("string", "Event title"),
-                    "start_date": prop("string", "Start date/time (ISO8601, e.g. '2026-06-20T14:00:00')"),
-                    "end_date": prop("string", "End date/time (ISO8601)"),
-                    "calendar_name": prop("string", "Optional: calendar to add the event to (defaults to the system default calendar)"),
-                    "location": prop("string", "Optional: event location text"),
-                    "notes": prop("string", "Optional: event notes"),
-                    "all_day": prop("boolean", "Optional: whether this is an all-day event (default: false)"),
-                    "alarm_minutes_before": prop("number", "Optional: minutes before the start time to show an alert")
-                ],
-                required: ["title", "start_date", "end_date"]
-            ))
-        }
-
-        if remindersEnabled {
-            tools.append(makeTool(
-                name: "reminders_list_lists",
-                description: "List all reminder lists available on this Mac.",
-                properties: [:],
-                required: []
-            ))
-            tools.append(makeTool(
-                name: "reminders_list",
-                description: "List reminders. Omit list_name to search across ALL reminder lists in a single call — prefer this over calling once per list. Incomplete reminders only unless include_completed is true.",
-                properties: [
-                    "list_name": prop("string", "Optional: only list reminders from this one list (omit to search all lists at once)"),
-                    "include_completed": prop("boolean", "Optional: include completed reminders (default: false)")
-                ],
-                required: []
-            ))
-            tools.append(makeTool(
-                name: "reminders_create",
-                description: "Create a new reminder. Requires user approval before it is actually created.",
-                properties: [
-                    "title": prop("string", "Reminder title"),
-                    "list_name": prop("string", "Optional: reminder list to add to (defaults to the system default list)"),
-                    "due_date": prop("string", "Optional: due date/time (ISO8601)"),
-                    "priority": prop("string", "Optional: priority level", enumValues: ["none", "low", "medium", "high"]),
-                    "notes": prop("string", "Optional: reminder notes")
-                ],
-                required: ["title"]
-            ))
-            tools.append(makeTool(
-                name: "reminders_complete",
-                description: "Mark a reminder as completed. Requires user approval. Use reminders_list to find the reminder_id first.",
-                properties: [
-                    "reminder_id": prop("string", "The reminder's identifier, from reminders_list")
-                ],
-                required: ["reminder_id"]
-            ))
-        }
-
-        return tools
-    }
-
-    // MARK: - Read Tool Execution
-
-    func executeTool(name: String, arguments: String) async -> [String: Any] {
-        Log.mcp.info("Executing EventKit tool: \(name)")
-        let args = Self.parseArgs(arguments)
-
-        switch name {
-        case "calendar_list_calendars":
-            guard calendarAuthorized else { return Self.permissionError(domain: "Calendar") }
-            return listCalendars()
-
-        case "calendar_list_events":
-            guard calendarAuthorized else { return Self.permissionError(domain: "Calendar") }
-            guard let startStr = args["start_date"] as? String, let start = Self.parseDate(startStr) else {
-                return ["error": "Missing or invalid parameter: start_date"]
-            }
-            guard let endStr = args["end_date"] as? String, let end = Self.parseDate(endStr) else {
-                return ["error": "Missing or invalid parameter: end_date"]
-            }
-            let calendarName = args["calendar_name"] as? String
-            return listEvents(start: start, end: end, calendarName: calendarName)
-
-        case "reminders_list_lists":
-            guard reminderAuthorized else { return Self.permissionError(domain: "Reminders") }
-            return listReminderLists()
-
-        case "reminders_list":
-            guard reminderAuthorized else { return Self.permissionError(domain: "Reminders") }
-            let listName = args["list_name"] as? String
-            let includeCompleted = args["include_completed"] as? Bool ?? false
-            return await listReminders(listName: listName, includeCompleted: includeCompleted)
-
-        default:
-            return ["error": "Unknown EventKit tool: \(name)"]
-        }
-    }
-
-    // MARK: - Write Tool Execution (called only after approval)
-
-    func executeWriteTool(name: String, arguments: String) async -> [String: Any] {
-        Log.mcp.info("Executing EventKit write tool: \(name)")
-        let args = Self.parseArgs(arguments)
-
-        switch name {
-        case "calendar_create_event":
-            guard calendarAuthorized else { return Self.permissionError(domain: "Calendar") }
-            return createEvent(args: args)
-
-        case "reminders_create":
-            guard reminderAuthorized else { return Self.permissionError(domain: "Reminders") }
-            return createReminder(args: args)
-
-        case "reminders_complete":
-            guard reminderAuthorized else { return Self.permissionError(domain: "Reminders") }
-            guard let reminderId = args["reminder_id"] as? String else {
-                return ["error": "Missing required parameter: reminder_id"]
-            }
-            return completeReminder(reminderId: reminderId)
-
-        default:
-            return ["error": "Unknown EventKit write tool: \(name)"]
-        }
-    }
-
-    // MARK: - Approval Summary
-
-    /// Human-readable description shown in the approval sheet before a write tool runs.
-    func approvalSummary(forTool name: String, arguments: String) -> String {
-        let args = Self.parseArgs(arguments)
-        switch name {
-        case "calendar_create_event":
-            let title = args["title"] as? String ?? "Untitled event"
-            let start = (args["start_date"] as? String).flatMap(Self.parseDate) ?? Date()
-            let end = (args["end_date"] as? String).flatMap(Self.parseDate) ?? start
-            return "Create calendar event \"\(title)\" from \(Self.displayFormatter.string(from: start)) to \(Self.displayFormatter.string(from: end))"
-        case "reminders_create":
-            let title = args["title"] as? String ?? "Untitled reminder"
-            if let dueStr = args["due_date"] as? String, let due = Self.parseDate(dueStr) {
-                return "Create reminder \"\(title)\" due \(Self.displayFormatter.string(from: due))"
-            }
-            return "Create reminder \"\(title)\""
-        case "reminders_complete":
-            return "Mark reminder as completed"
-        default:
-            return "Perform action: \(name)"
-        }
-    }
-
-    // MARK: - Calendar Read Implementations
-
-    private func listCalendars() -> [String: Any] {
-        let calendars = store.calendars(for: .event).map { cal -> [String: Any] in
-            [
-                "name": cal.title,
-                "type": calendarTypeDescription(cal),
-                "allows_modifications": cal.allowsContentModifications
-            ]
-        }
-        return ["calendars": calendars]
-    }
-
-    private func listEvents(start: Date, end: Date, calendarName: String?) -> [String: Any] {
-        guard end > start else { return ["error": "end_date must be after start_date"] }
-        guard end.timeIntervalSince(start) <= 366 * 24 * 60 * 60 else {
-            return ["error": "Date range too large — limit to 1 year or less"]
-        }
-
-        var calendars = store.calendars(for: .event)
-        if let calendarName {
-            calendars = calendars.filter { $0.title.caseInsensitiveCompare(calendarName) == .orderedSame }
-            if calendars.isEmpty {
-                return ["error": "No calendar found named '\(calendarName)'"]
-            }
-        }
-
-        let predicate = store.predicateForEvents(withStart: start, end: end, calendars: calendars)
-        let events = store.events(matching: predicate)
-            .sorted { $0.startDate < $1.startDate }
-            .prefix(200)
-            .map { event -> [String: Any] in
-                var item: [String: Any] = [
-                    "id": event.eventIdentifier ?? "",
-                    "title": event.title ?? "Untitled",
-                    "start": Self.isoFormatter.string(from: event.startDate),
-                    "end": Self.isoFormatter.string(from: event.endDate),
-                    "all_day": event.isAllDay,
-                    "calendar": event.calendar?.title ?? ""
-                ]
-                if let location = event.location, !location.isEmpty {
-                    item["location"] = location
-                }
-                if let notes = event.notes, !notes.isEmpty {
-                    item["notes"] = String(notes.prefix(500))
-                }
-                return item
-            }
-
-        return ["count": events.count, "events": Array(events)]
-    }
-
-    private func createEvent(args: [String: Any]) -> [String: Any] {
-        guard let title = args["title"] as? String, !title.isEmpty else {
-            return ["error": "Missing required parameter: title"]
-        }
-        guard let startStr = args["start_date"] as? String, let start = Self.parseDate(startStr) else {
-            return ["error": "Missing or invalid parameter: start_date"]
-        }
-        guard let endStr = args["end_date"] as? String, let end = Self.parseDate(endStr) else {
-            return ["error": "Missing or invalid parameter: end_date"]
-        }
-        guard end >= start else {
-            return ["error": "end_date must not be before start_date"]
-        }
-
-        let event = EKEvent(eventStore: store)
-        event.title = title
-        event.startDate = start
-        event.endDate = end
-        event.isAllDay = args["all_day"] as? Bool ?? false
-
-        if let calendarName = args["calendar_name"] as? String,
-           let calendar = store.calendars(for: .event).first(where: { $0.title.caseInsensitiveCompare(calendarName) == .orderedSame }) {
-            event.calendar = calendar
-        } else if let defaultCalendar = store.defaultCalendarForNewEvents {
-            event.calendar = defaultCalendar
-        } else {
-            guard let fallback = store.calendars(for: .event).first(where: { $0.allowsContentModifications }) else {
-                return ["error": "No writable calendar available"]
-            }
-            event.calendar = fallback
-        }
-
-        if let location = args["location"] as? String { event.location = location }
-        if let notes = args["notes"] as? String { event.notes = notes }
-        if let minutesBefore = (args["alarm_minutes_before"] as? Double) ?? (args["alarm_minutes_before"] as? Int).map(Double.init) {
-            event.addAlarm(EKAlarm(relativeOffset: -(minutesBefore * 60)))
-        }
-
-        do {
-            try store.save(event, span: .thisEvent, commit: true)
-            return ["success": true, "event_id": event.eventIdentifier ?? "", "calendar": event.calendar?.title ?? ""]
-        } catch {
-            Log.mcp.error("calendar_create_event failed: \(error.localizedDescription)")
-            return ["error": "Failed to create event: \(error.localizedDescription)"]
-        }
-    }
-
-    // MARK: - Reminders Read Implementations
-
-    private func listReminderLists() -> [String: Any] {
-        let lists = store.calendars(for: .reminder).map { cal -> [String: Any] in
-            ["name": cal.title, "allows_modifications": cal.allowsContentModifications]
-        }
-        return ["lists": lists]
-    }
-
-    private func listReminders(listName: String?, includeCompleted: Bool) async -> [String: Any] {
-        var lists = store.calendars(for: .reminder)
-        if let listName {
-            lists = lists.filter { $0.title.caseInsensitiveCompare(listName) == .orderedSame }
-            if lists.isEmpty {
-                return ["error": "No reminder list found named '\(listName)'"]
-            }
-        }
-
-        let predicate = store.predicateForReminders(in: lists)
-        let reminders: [EKReminder] = await withCheckedContinuation { continuation in
-            store.fetchReminders(matching: predicate) { results in
-                continuation.resume(returning: results ?? [])
-            }
-        }
-
-        let filtered = reminders
-            .filter { includeCompleted || !$0.isCompleted }
-            .sorted { lhs, rhs in
-                let l = lhs.dueDateComponents?.date ?? .distantFuture
-                let r = rhs.dueDateComponents?.date ?? .distantFuture
-                return l < r
-            }
-            .prefix(200)
-            .map { reminder -> [String: Any] in
-                var item: [String: Any] = [
-                    "id": reminder.calendarItemIdentifier,
-                    "title": reminder.title ?? "Untitled",
-                    "completed": reminder.isCompleted,
-                    "list": reminder.calendar?.title ?? ""
-                ]
-                if let due = reminder.dueDateComponents?.date {
-                    item["due"] = Self.isoFormatter.string(from: due)
-                }
-                if reminder.priority > 0 {
-                    item["priority"] = priorityDescription(reminder.priority)
-                }
-                if let notes = reminder.notes, !notes.isEmpty {
-                    item["notes"] = String(notes.prefix(500))
-                }
-                return item
-            }
-
-        return ["count": filtered.count, "reminders": Array(filtered)]
-    }
-
-    private func createReminder(args: [String: Any]) -> [String: Any] {
-        guard let title = args["title"] as? String, !title.isEmpty else {
-            return ["error": "Missing required parameter: title"]
-        }
-
-        let reminder = EKReminder(eventStore: store)
-        reminder.title = title
-
-        if let listName = args["list_name"] as? String,
-           let list = store.calendars(for: .reminder).first(where: { $0.title.caseInsensitiveCompare(listName) == .orderedSame }) {
-            reminder.calendar = list
-        } else if let defaultList = store.defaultCalendarForNewReminders() {
-            reminder.calendar = defaultList
-        } else {
-            guard let fallback = store.calendars(for: .reminder).first(where: { $0.allowsContentModifications }) else {
-                return ["error": "No writable reminder list available"]
-            }
-            reminder.calendar = fallback
-        }
-
-        if let dueStr = args["due_date"] as? String, let due = Self.parseDate(dueStr) {
-            reminder.dueDateComponents = Calendar.current.dateComponents([.year, .month, .day, .hour, .minute, .second], from: due)
-        }
-        if let notes = args["notes"] as? String { reminder.notes = notes }
-        if let priority = args["priority"] as? String { reminder.priority = priorityValue(priority) }
-
-        do {
-            try store.save(reminder, commit: true)
-            return ["success": true, "reminder_id": reminder.calendarItemIdentifier, "list": reminder.calendar?.title ?? ""]
-        } catch {
-            Log.mcp.error("reminders_create failed: \(error.localizedDescription)")
-            return ["error": "Failed to create reminder: \(error.localizedDescription)"]
-        }
-    }
-
-    private func completeReminder(reminderId: String) -> [String: Any] {
-        guard let item = store.calendarItem(withIdentifier: reminderId) as? EKReminder else {
-            return ["error": "No reminder found with id '\(reminderId)'"]
-        }
-        item.isCompleted = true
-        item.completionDate = Date()
-
-        do {
-            try store.save(item, commit: true)
-            return ["success": true, "reminder_id": reminderId, "title": item.title ?? ""]
-        } catch {
-            Log.mcp.error("reminders_complete failed: \(error.localizedDescription)")
-            return ["error": "Failed to complete reminder: \(error.localizedDescription)"]
-        }
-    }
-
-    // MARK: - Helpers
-
-    private func calendarTypeDescription(_ cal: EKCalendar) -> String {
-        switch cal.type {
-        case .local: return "local"
-        case .calDAV: return "caldav"
-        case .exchange: return "exchange"
-        case .subscription: return "subscription"
-        case .birthday: return "birthday"
-        @unknown default: return "unknown"
-        }
-    }
-
-    private func priorityDescription(_ value: Int) -> String {
-        switch value {
-        case 1...4: return "high"
-        case 5: return "medium"
-        case 6...9: return "low"
-        default: return "none"
-        }
-    }
-
-    private func priorityValue(_ description: String) -> Int {
-        switch description.lowercased() {
-        case "high": return 1
-        case "medium": return 5
-        case "low": return 9
-        default: return 0
-        }
-    }
-
-    private func makeTool(name: String, description: String, properties: [String: Tool.Function.Parameters.Property], required: [String]) -> Tool {
-        Tool(
-            type: "function",
-            function: Tool.Function(
-                name: name,
-                description: description,
-                parameters: Tool.Function.Parameters(
-                    type: "object",
-                    properties: properties,
-                    required: required
-                )
-            )
-        )
-    }
-
-    private func prop(_ type: String, _ description: String, enumValues: [String]? = nil) -> Tool.Function.Parameters.Property {
-        Tool.Function.Parameters.Property(type: type, description: description, enum: enumValues)
-    }
-
-    nonisolated static func parseArgs(_ arguments: String) -> [String: Any] {
-        guard let data = arguments.data(using: .utf8),
-              let dict = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else {
-            return [:]
-        }
-        return dict
-    }
-
-    nonisolated static func permissionError(domain: String) -> [String: Any] {
-        ["error": "\(domain) permission not granted. Grant access in Settings > MCP."]
-    }
-
-    nonisolated(unsafe) static let isoFormatter: ISO8601DateFormatter = {
-        let f = ISO8601DateFormatter()
-        f.formatOptions = [.withInternetDateTime]
-        return f
-    }()
-
-    nonisolated static let displayFormatter: DateFormatter = {
-        let f = DateFormatter()
-        f.dateStyle = .medium
-        f.timeStyle = .short
-        return f
-    }()
-
-    nonisolated static func parseDate(_ string: String) -> Date? {
-        if let date = isoFormatter.date(from: string) { return date }
-
-        let isoNoTimezone = ISO8601DateFormatter()
-        isoNoTimezone.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
-        if let date = isoNoTimezone.date(from: string) { return date }
-
-        let localDateTime = DateFormatter()
-        localDateTime.dateFormat = "yyyy-MM-dd'T'HH:mm:ss"
-        if let date = localDateTime.date(from: string) { return date }
-
-        let dateOnly = DateFormatter()
-        dateOnly.dateFormat = "yyyy-MM-dd"
-        if let date = dateOnly.date(from: string) { return date }
-
-        return nil
-    }
-}

oAI/Services/ExternalMCPClient.swift

@@ -1,280 +0,0 @@
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
-// Copyright (C) 2026 Rune Olsen
-
-import Foundation
-
-// MARK: - ExternalMCPClient
-
-/// Manages one MCP stdio server process. All state is MainActor-isolated
-/// (consistent with SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor project setting).
-/// Background I/O runs in Task.detached; state mutations hop back to MainActor.
-@MainActor
-final class ExternalMCPClient {
-    let server: ExternalMCPServer
-    weak var stateDelegate: (any ExternalMCPStateDelegate)?
-
-    private var process: Process?
-    private var stdinHandle: FileHandle?
-    private var readTask: Task<Void, Never>?
-    private var stderrTask: Task<Void, Never>?
-
-    private var nextRequestId: Int = 1
-    private var pendingCalls: [Int: CheckedContinuation<Data, Error>] = [:]
-    private var lineBuffer = Data()
-
-    private(set) var state: MCPClientState = .idle
-    private(set) var discoveredTools: [MCPToolDefinition] = []
-
-    init(server: ExternalMCPServer, stateDelegate: (any ExternalMCPStateDelegate)?) {
-        self.server = server
-        self.stateDelegate = stateDelegate
-    }
-
-    // MARK: - Lifecycle
-
-    func start() async throws {
-        guard state == .idle || state == .stopped || state == .crashed else { return }
-        state = .connecting
-        stateDelegate?.clientDidChangeState(id: server.id, state: .connecting)
-
-        let proc = Process()
-        if server.command.hasPrefix("/") {
-            proc.executableURL = URL(fileURLWithPath: server.command)
-            proc.arguments = server.args
-        } else {
-            proc.executableURL = URL(fileURLWithPath: "/usr/bin/env")
-            proc.arguments = [server.command] + server.args
-        }
-        proc.environment = ProcessInfo.processInfo.environment
-
-        let stdinPipe = Pipe()
-        let stdoutPipe = Pipe()
-        let stderrPipe = Pipe()
-        proc.standardInput = stdinPipe
-        proc.standardOutput = stdoutPipe
-        proc.standardError = stderrPipe
-
-        proc.terminationHandler = { [weak self] _ in
-            Task { @MainActor [weak self] in self?.handleProcessTerminated() }
-        }
-
-        do {
-            try proc.run()
-        } catch {
-            state = .error(error.localizedDescription)
-            stateDelegate?.clientDidChangeState(id: server.id, state: .error(error.localizedDescription))
-            throw MCPClientError.processLaunchFailed(error.localizedDescription)
-        }
-
-        process = proc
-        stdinHandle = stdinPipe.fileHandleForWriting
-        startReadLoop(pipe: stdoutPipe)
-        startStderrLoop(pipe: stderrPipe)
-
-        do {
-            let _: MCPInitializeResult = try await timedRequest(seconds: 15, method: "initialize", params: [
-                "protocolVersion": "2024-11-05",
-                "capabilities": [:] as [String: Any],
-                "clientInfo": ["name": "oAI", "version": "1.0"] as [String: Any]
-            ])
-            try sendNotification(method: "notifications/initialized")
-
-            let toolsResult: MCPToolsListResult = try await timedRequest(seconds: 15, method: "tools/list", params: nil)
-            discoveredTools = toolsResult.tools
-        } catch {
-            state = .error(error.localizedDescription)
-            stateDelegate?.clientDidChangeState(id: server.id, state: .error(error.localizedDescription))
-            proc.terminate()
-            throw error
-        }
-
-        state = .ready
-        stateDelegate?.clientDidBecomeReady(id: server.id, tools: discoveredTools, server: server)
-    }
-
-    func stop() {
-        state = .stopped
-        readTask?.cancel()
-        stderrTask?.cancel()
-        process?.terminate()
-        process = nil
-        stdinHandle = nil
-        lineBuffer = Data()
-        for (_, cont) in pendingCalls { cont.resume(throwing: MCPClientError.notConnected) }
-        pendingCalls.removeAll()
-    }
-
-    // MARK: - Tool Execution
-
-    func callTool(originalName: String, argumentsJSON: String) async -> [String: Any] {
-        guard state == .ready else {
-            return ["error": "MCP server '\(server.name)' is not connected"]
-        }
-        guard let argData = argumentsJSON.data(using: .utf8),
-              let argsDict = try? JSONSerialization.jsonObject(with: argData) as? [String: Any] else {
-            return ["error": "Invalid arguments JSON for tool \(originalName)"]
-        }
-        do {
-            let result: MCPToolCallResult = try await timedRequest(
-                seconds: server.timeout,
-                method: "tools/call",
-                params: ["name": originalName, "arguments": argsDict]
-            )
-            return convertMCPResult(result)
-        } catch MCPClientError.timeout {
-            return ["error": "MCP server '\(server.name)' timed out after \(Int(server.timeout))s"]
-        } catch {
-            return ["error": "MCP call '\(originalName)' failed: \(error.localizedDescription)"]
-        }
-    }
-
-    // MARK: - I/O Loops (detached from MainActor)
-
-    private func startReadLoop(pipe: Pipe) {
-        readTask = Task.detached { [weak self] in
-            let handle = pipe.fileHandleForReading
-            while true {
-                let data = handle.availableData
-                if data.isEmpty { break }
-                await self?.receiveData(data)
-            }
-        }
-    }
-
-    private func startStderrLoop(pipe: Pipe) {
-        let name = server.name
-        stderrTask = Task.detached {
-            let handle = pipe.fileHandleForReading
-            var buf = Data()
-            while true {
-                let data = handle.availableData
-                if data.isEmpty { break }
-                buf.append(data)
-                while let idx = buf.firstIndex(of: UInt8(ascii: "\n")) {
-                    let line = String(data: buf[buf.startIndex..<idx], encoding: .utf8) ?? ""
-                    buf = Data(buf[buf.index(after: idx)...])
-                    if !line.trimmingCharacters(in: .whitespaces).isEmpty {
-                        Log.extMcp.warning("[\(name)] \(line)")
-                    }
-                }
-            }
-        }
-    }
-
-    // MARK: - Data Processing (MainActor)
-
-    private func receiveData(_ data: Data) {
-        lineBuffer.append(data)
-        while let idx = lineBuffer.firstIndex(of: UInt8(ascii: "\n")) {
-            let lineData = Data(lineBuffer[lineBuffer.startIndex..<idx])
-            lineBuffer = Data(lineBuffer[lineBuffer.index(after: idx)...])
-            processLine(lineData)
-        }
-    }
-
-    private func processLine(_ data: Data) {
-        guard !data.isEmpty,
-              let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
-              let id = json["id"] as? Int,
-              let cont = pendingCalls.removeValue(forKey: id) else { return }
-
-        if let err = json["error"] as? [String: Any] {
-            cont.resume(throwing: MCPClientError.invalidResponse(err["message"] as? String ?? "Unknown error"))
-        } else if let result = json["result"],
-                  let resultData = try? JSONSerialization.data(withJSONObject: result) {
-            cont.resume(returning: resultData)
-        } else {
-            cont.resume(throwing: MCPClientError.invalidResponse("Missing result field"))
-        }
-    }
-
-    // MARK: - JSON-RPC
-
-    /// Send a JSON-RPC request with a per-call timeout. The timeout fires a cancellation
-    /// directly into the pending-calls table rather than using a task group (which would
-    /// pass the generic T through a @Sendable closure and trigger an isolated-conformance warning).
-    private func timedRequest<T: Decodable>(seconds: Double, method: String, params: [String: Any]?) async throws -> T {
-        let id = nextRequestId
-        nextRequestId += 1
-        var message: [String: Any] = ["jsonrpc": "2.0", "method": method, "id": id]
-        if let params { message["params"] = params }
-        try writeJSON(message)
-
-        // Schedule timeout: cancels the specific pending call by ID
-        let timeoutId = id
-        Task { [weak self, timeoutId] in
-            try? await Task.sleep(nanoseconds: UInt64(seconds * 1_000_000_000))
-            self?.cancelPendingCall(id: timeoutId, with: MCPClientError.timeout)
-        }
-
-        // Await response data, then decode on MainActor
-        let resultData: Data = try await withCheckedThrowingContinuation { cont in
-            pendingCalls[id] = cont
-        }
-        return try JSONDecoder().decode(T.self, from: resultData)
-    }
-
-    private func cancelPendingCall(id: Int, with error: Error) {
-        pendingCalls.removeValue(forKey: id)?.resume(throwing: error)
-    }
-
-    private func sendNotification(method: String) throws {
-        try writeJSON(["jsonrpc": "2.0", "method": method])
-    }
-
-    private func writeJSON(_ message: [String: Any]) throws {
-        guard let handle = stdinHandle, process?.isRunning == true else {
-            throw MCPClientError.writeFailed
-        }
-        guard let data = try? JSONSerialization.data(withJSONObject: message),
-              let line = String(data: data, encoding: .utf8) else {
-            throw MCPClientError.writeFailed
-        }
-        do {
-            try handle.write(contentsOf: Data((line + "\n").utf8))
-        } catch {
-            throw MCPClientError.writeFailed
-        }
-    }
-
-    // MARK: - Process termination
-
-    private func handleProcessTerminated() {
-        guard state != .stopped else { return }
-        state = .crashed
-        for (_, cont) in pendingCalls { cont.resume(throwing: MCPClientError.notConnected) }
-        pendingCalls.removeAll()
-        stateDelegate?.clientDidChangeState(id: server.id, state: .crashed)
-    }
-
-    // MARK: - Result conversion
-
-    private func convertMCPResult(_ result: MCPToolCallResult) -> [String: Any] {
-        let isError = result.isError ?? false
-        var parts: [String] = []
-        for content in result.content {
-            switch content.type {
-            case "text":
-                if let text = content.text { parts.append(text) }
-            case "image":
-                if let base64 = content.data, let imageData = Data(base64Encoded: base64) {
-                    parts.append("[Image saved to: \(writeTempImage(imageData, mimeType: content.mimeType))]")
-                }
-            case "resource":
-                if let text = content.text { parts.append(text) }
-                else if let uri = content.uri { parts.append("[Resource: \(uri)]") }
-            default:
-                if let text = content.text { parts.append(text) }
-            }
-        }
-        let combined = parts.joined(separator: "\n")
-        return isError ? ["error": combined.isEmpty ? "Tool returned an error" : combined] : ["output": combined]
-    }
-
-    private func writeTempImage(_ data: Data, mimeType: String?) -> String {
-        let ext = mimeType?.contains("png") == true ? "png" : "jpg"
-        let path = "/tmp/oai_mcp_\(Int(Date().timeIntervalSince1970 * 1000)).\(ext)"
-        try? data.write(to: URL(fileURLWithPath: path))
-        return path
-    }
-}

oAI/Services/ExternalMCPManager.swift

@@ -1,202 +0,0 @@
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
-// Copyright (C) 2026 Rune Olsen
-
-import Foundation
-
-// MARK: - ExternalMCPManager
-
-@Observable
-@MainActor
-final class ExternalMCPManager {
-    nonisolated static let shared = ExternalMCPManager()
-
-    private(set) var clientStates: [UUID: MCPClientState] = [:]
-    private(set) var cachedToolSchemas: [Tool] = []
-
-    // Keep server config alongside client so we can access slug without await
-    private var clients: [UUID: ExternalMCPClient] = [:]
-    private var serverConfigs: [UUID: ExternalMCPServer] = [:]
-    private var restartTasks: [UUID: Task<Void, Never>] = [:]
-    private var restartAttempts: [UUID: Int] = [:]
-
-    private nonisolated init() {}
-
-    // MARK: - Lifecycle
-
-    func startAll() {
-        for server in SettingsService.shared.externalMCPServers where server.isEnabled {
-            startClient(for: server)
-        }
-    }
-
-    func stopAll() {
-        for client in clients.values { client.stop() }
-        clients.removeAll()
-        serverConfigs.removeAll()
-        clientStates.removeAll()
-        cachedToolSchemas.removeAll()
-        for task in restartTasks.values { task.cancel() }
-        restartTasks.removeAll()
-        restartAttempts.removeAll()
-    }
-
-    func reconfigure(servers: [ExternalMCPServer]) {
-        let activeIds = Set(servers.filter { $0.isEnabled }.map { $0.id })
-        for id in clients.keys where !activeIds.contains(id) {
-            clients[id]?.stop()
-            clients.removeValue(forKey: id)
-            serverConfigs.removeValue(forKey: id)
-            clientStates.removeValue(forKey: id)
-            restartTasks[id]?.cancel()
-            restartTasks.removeValue(forKey: id)
-            restartAttempts.removeValue(forKey: id)
-            removeCachedSchemas(for: id)
-        }
-        for server in servers where server.isEnabled && clients[server.id] == nil {
-            startClient(for: server)
-        }
-    }
-
-    private func startClient(for server: ExternalMCPServer) {
-        // Stop any existing client for this ID before creating a new one
-        clients[server.id]?.stop()
-        let client = ExternalMCPClient(server: server, stateDelegate: self)
-        clients[server.id] = client
-        serverConfigs[server.id] = server
-        clientStates[server.id] = .connecting
-        Task {
-            do {
-                try await client.start()
-            } catch MCPClientError.processLaunchFailed(let msg) {
-                // Process never started — termination handler won't fire, so manually trigger crashed
-                Log.extMcp.error("Failed to launch '\(server.name)': \(msg)")
-                clientDidChangeState(id: server.id, state: .crashed)
-            } catch {
-                // Handshake/other failure — proc.terminate() was called in start(), termination
-                // handler will fire and set .crashed, which drives the restart from one place only.
-                Log.extMcp.warning("'\(server.name)' start failed: \(error.localizedDescription)")
-            }
-        }
-    }
-
-    private func scheduleRestart(for server: ExternalMCPServer, attempt: Int) {
-        let delays: [Double] = [5, 15, 30]
-        let delay = delays[min(attempt - 1, delays.count - 1)]
-        Log.extMcp.warning("MCP server '\(server.name)' crashed — restarting in \(Int(delay))s (attempt \(attempt)/3)")
-
-        restartTasks[server.id]?.cancel()
-        let id = server.id
-        restartTasks[id] = Task { [weak self, id] in
-            try? await Task.sleep(nanoseconds: UInt64(delay * 1_000_000_000))
-            guard !Task.isCancelled, let self,
-                  self.clients[id] != nil,
-                  SettingsService.shared.externalMCPServers.contains(where: { $0.id == id && $0.isEnabled })
-            else { return }
-            // startClient is the single place that creates and launches clients.
-            // It handles processLaunchFailed by calling clientDidChangeState(.crashed),
-            // and all other failures let the termination handler drive the .crashed callback.
-            self.startClient(for: server)
-        }
-    }
-
-    // MARK: - Tool Schema Integration (synchronous)
-
-    func getToolSchemas() -> [Tool] { cachedToolSchemas }
-
-    func isExternalTool(_ name: String) -> Bool {
-        cachedToolSchemas.contains { $0.function.name == name }
-    }
-
-    // MARK: - Tool Execution
-
-    func executeTool(name: String, argumentsJSON: String) async -> [String: Any] {
-        for (id, client) in clients {
-            guard clientStates[id] == .ready,
-                  let server = serverConfigs[id] else { continue }
-            let prefix = "\(server.slug)_"
-            if name.hasPrefix(prefix) {
-                let originalName = String(name.dropFirst(prefix.count))
-                return await client.callTool(originalName: originalName, argumentsJSON: argumentsJSON)
-            }
-        }
-        return ["error": "No external MCP server found for tool: \(name)"]
-    }
-
-    // MARK: - Schema Cache
-
-    private func rebuildCache(for server: ExternalMCPServer, tools: [MCPToolDefinition]) {
-        removeCachedSchemas(for: server.id, slug: server.slug)
-        let prefixed = tools.compactMap { convertToolDefinition($0, server: server) }
-        cachedToolSchemas.append(contentsOf: prefixed)
-        Log.extMcp.info("[\(server.name)] cached \(prefixed.count) tools: \(prefixed.map { $0.function.name }.joined(separator: ", "))")
-    }
-
-    private func removeCachedSchemas(for id: UUID) {
-        guard let server = serverConfigs[id] else { return }
-        removeCachedSchemas(for: id, slug: server.slug)
-    }
-
-    private func removeCachedSchemas(for id: UUID, slug: String) {
-        cachedToolSchemas.removeAll { $0.function.name.hasPrefix("\(slug)_") }
-    }
-
-    private func convertToolDefinition(_ def: MCPToolDefinition, server: ExternalMCPServer) -> Tool? {
-        Tool(
-            type: "function",
-            function: Tool.Function(
-                name: "\(server.slug)_\(def.name)",
-                description: "[\(server.name)] \(def.description ?? "")",
-                parameters: convertInputSchema(def.inputSchema)
-            )
-        )
-    }
-
-    private func convertInputSchema(_ schema: MCPInputSchema) -> Tool.Function.Parameters {
-        var properties: [String: Tool.Function.Parameters.Property] = [:]
-        for (key, prop) in schema.properties ?? [:] {
-            let normalized: String
-            switch prop.type ?? "string" {
-            case "integer":                                        normalized = "number"
-            case "string", "number", "boolean", "array", "object": normalized = prop.type!
-            default:                                               normalized = "string"
-            }
-            var items: Tool.Function.Parameters.Property.Items? = nil
-            if normalized == "array", let t = prop.items?.type { items = .init(type: t) }
-            properties[key] = Tool.Function.Parameters.Property(
-                type: normalized,
-                description: prop.description ?? "",
-                enum: prop.enum,
-                items: items
-            )
-        }
-        return Tool.Function.Parameters(type: "object", properties: properties, required: schema.required)
-    }
-}
-
-// MARK: - ExternalMCPStateDelegate
-
-extension ExternalMCPManager: ExternalMCPStateDelegate {
-    func clientDidBecomeReady(id: UUID, tools: [MCPToolDefinition], server: ExternalMCPServer) {
-        clientStates[id] = .ready
-        restartAttempts.removeValue(forKey: id)
-        rebuildCache(for: server, tools: tools)
-    }
-
-    func clientDidChangeState(id: UUID, state: MCPClientState) {
-        clientStates[id] = state
-        if case .crashed = state,
-           let server = serverConfigs[id],
-           SettingsService.shared.externalMCPServers.contains(where: { $0.id == id && $0.isEnabled }) {
-            removeCachedSchemas(for: id, slug: server.slug)
-            let attempt = (restartAttempts[id] ?? 0) + 1
-            guard attempt <= 3 else {
-                Log.extMcp.error("MCP server '\(server.name)' gave up after 3 restart attempts")
-                clientStates[id] = .error("Maximum restart attempts reached")
-                restartAttempts.removeValue(forKey: id)
-                return
-            }
-            restartAttempts[id] = attempt
-            scheduleRestart(for: server, attempt: attempt)
-        }
-    }
-}

oAI/Services/ExternalMCPModels.swift

@@ -1,170 +0,0 @@
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
-// Copyright (C) 2026 Rune Olsen
-
-import Foundation
-
-// MARK: - Server Configuration
-
-struct ExternalMCPServer: Codable, Identifiable, Sendable {
-    var id: UUID
-    var name: String
-    var command: String
-    var args: [String]
-    var isEnabled: Bool
-    var timeout: TimeInterval
-    var createdAt: Date
-
-    init(id: UUID = UUID(), name: String, command: String, args: [String] = [],
-         isEnabled: Bool = true, timeout: TimeInterval = 30, createdAt: Date = Date()) {
-        self.id = id
-        self.name = name
-        self.command = command
-        self.args = args
-        self.isEnabled = isEnabled
-        self.timeout = timeout
-        self.createdAt = createdAt
-    }
-
-    var slug: String { Self.makeSlug(from: name) }
-
-    static func makeSlug(from name: String) -> String {
-        let s = name
-            .lowercased()
-            .components(separatedBy: CharacterSet.alphanumerics.inverted)
-            .filter { !$0.isEmpty }
-            .joined(separator: "_")
-        return s.isEmpty ? "ext" : s
-    }
-
-    /// Splits a raw arguments string into tokens, respecting single/double-quoted
-    /// segments so arguments containing spaces (e.g. `--root "/Users/x/My Documents"`)
-    /// survive intact instead of being split on every space.
-    static func parseArguments(_ input: String) -> [String] {
-        var args: [String] = []
-        var current = ""
-        var inSingleQuotes = false
-        var inDoubleQuotes = false
-
-        for char in input {
-            if char == "'" && !inDoubleQuotes {
-                inSingleQuotes.toggle()
-            } else if char == "\"" && !inSingleQuotes {
-                inDoubleQuotes.toggle()
-            } else if char.isWhitespace && !inSingleQuotes && !inDoubleQuotes {
-                if !current.isEmpty {
-                    args.append(current)
-                    current = ""
-                }
-            } else {
-                current.append(char)
-            }
-        }
-        if !current.isEmpty { args.append(current) }
-        return args
-    }
-
-    static let reservedSlugs: Set<String> = [
-        "anytype", "paperless", "calendar", "reminders",
-        "contacts", "location", "maps", "bash", "web", "read", "write",
-        "list", "search", "edit", "delete", "create", "move", "copy", "spawn"
-    ]
-
-    var isSlugReserved: Bool { Self.reservedSlugs.contains(slug) }
-}
-
-// MARK: - Client State
-
-enum MCPClientState: Equatable {
-    case idle
-    case connecting
-    case ready
-    case error(String)
-    case crashed
-    case stopped
-}
-
-// MARK: - State Delegate (all callbacks on MainActor)
-
-@MainActor
-protocol ExternalMCPStateDelegate: AnyObject {
-    func clientDidBecomeReady(id: UUID, tools: [MCPToolDefinition], server: ExternalMCPServer)
-    func clientDidChangeState(id: UUID, state: MCPClientState)
-}
-
-// MARK: - Client Errors
-
-enum MCPClientError: LocalizedError {
-    case notConnected
-    case invalidResponse(String)
-    case timeout
-    case processLaunchFailed(String)
-    case handshakeFailed(String)
-    case writeFailed
-
-    var errorDescription: String? {
-        switch self {
-        case .notConnected:               return "MCP server is not connected"
-        case .invalidResponse(let s):     return "Invalid MCP response: \(s)"
-        case .timeout:                    return "MCP request timed out"
-        case .processLaunchFailed(let s): return "Failed to launch MCP server: \(s)"
-        case .handshakeFailed(let s):     return "MCP handshake failed: \(s)"
-        case .writeFailed:                return "Failed to write to MCP server stdin"
-        }
-    }
-}
-
-// MARK: - MCP Protocol Types
-
-struct MCPInitializeResult: Decodable {
-    let protocolVersion: String
-    let capabilities: MCPCapabilities
-    let serverInfo: MCPServerInfo?
-}
-
-struct MCPCapabilities: Decodable {
-    let tools: MCPToolsCapability?
-    struct MCPToolsCapability: Decodable { let listChanged: Bool? }
-}
-
-struct MCPServerInfo: Decodable {
-    let name: String
-    let version: String?
-}
-
-struct MCPToolsListResult: Decodable {
-    let tools: [MCPToolDefinition]
-    let nextCursor: String?
-}
-
-struct MCPToolDefinition: Decodable {
-    let name: String
-    let description: String?
-    let inputSchema: MCPInputSchema
-}
-
-struct MCPInputSchema: Decodable {
-    let type: String
-    let properties: [String: MCPPropertySchema]?
-    let required: [String]?
-}
-
-struct MCPPropertySchema: Decodable {
-    let type: String?
-    let description: String?
-    let `enum`: [String]?
-    let items: MCPItemsSchema?
-    struct MCPItemsSchema: Decodable { let type: String? }
-}
-
-struct MCPToolCallResult: Decodable {
-    let content: [MCPContent]
-    let isError: Bool?
-}
-
-struct MCPContent: Decodable {
-    let type: String
-    let text: String?
-    let data: String?
-    let mimeType: String?
-    let uri: String?
-}

oAI/Services/GitSyncService.swift

@@ -1,20 +1,22 @@
 import Foundation
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 import os
 

oAI/Services/IMAPClient.swift

@@ -4,21 +4,23 @@
 //
 //  Swift-native IMAP client for email monitoring
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation

oAI/Services/JarvisService.swift

@@ -5,7 +5,7 @@
 //  HTTP client for the Jarvis (oAI-Web) REST API.
 //  Auth: Authorization: Bearer <api-key>
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 
 import Foundation

oAI/Services/LocationMapsService.swift

@@ -1,341 +0,0 @@
-//
-//  LocationMapsService.swift
-//  oAI
-//
-//  Read-only Location and Maps integration via CoreLocation and MapKit
-//
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
-// Copyright (C) 2026 Rune Olsen
-//
-// This file is part of oAI.
-//
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
-//
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
-
-
-import CoreLocation
-import Foundation
-import MapKit
-import os
-
-@Observable
-class LocationMapsService: NSObject, CLLocationManagerDelegate {
-    static let shared = LocationMapsService()
-
-    private let locationManager = CLLocationManager()
-
-    private var authContinuation: CheckedContinuation<Bool, Never>?
-    private var locationContinuation: CheckedContinuation<CLLocation?, Never>?
-
-    private override init() {
-        super.init()
-        locationManager.delegate = self
-    }
-
-    // MARK: - Authorization
-
-    var authStatus: CLAuthorizationStatus {
-        locationManager.authorizationStatus
-    }
-
-    var authorized: Bool {
-        authStatus == .authorizedAlways || authStatus == .authorized
-    }
-
-    var accessState: PersonalDataAccessState {
-        let status = authStatus
-        Log.mcp.debug("LocationMapsService.accessState -> status=\(Self.describe(status)) (raw=\(status.rawValue))")
-        switch status {
-        case .authorizedAlways, .authorized: return .granted
-        case .notDetermined: return .notDetermined
-        default: return .denied
-        }
-    }
-
-    @discardableResult
-    func requestAccess() async -> Bool {
-        let before = locationManager.authorizationStatus
-        Log.mcp.info("LocationMapsService.requestAccess: status before = \(Self.describe(before)) (raw=\(before.rawValue))")
-        if before != .notDetermined {
-            Log.mcp.info("LocationMapsService.requestAccess: skipping OS prompt (not notDetermined)")
-            return authorized
-        }
-        return await withCheckedContinuation { continuation in
-            self.authContinuation = continuation
-            locationManager.requestWhenInUseAuthorization()
-        }
-    }
-
-    func locationManagerDidChangeAuthorization(_ manager: CLLocationManager) {
-        let status = manager.authorizationStatus
-        Log.mcp.info("LocationMapsService: authorization changed -> \(Self.describe(status)) (raw=\(status.rawValue))")
-        authContinuation?.resume(returning: authorized)
-        authContinuation = nil
-    }
-
-    nonisolated static func describe(_ status: CLAuthorizationStatus) -> String {
-        switch status {
-        case .notDetermined: return "notDetermined"
-        case .restricted: return "restricted"
-        case .denied: return "denied"
-        case .authorizedAlways: return "authorizedAlways"
-        case .authorized: return "authorized"
-        @unknown default: return "unknown"
-        }
-    }
-
-    func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
-        locationContinuation?.resume(returning: locations.last)
-        locationContinuation = nil
-    }
-
-    func locationManager(_ manager: CLLocationManager, didFailWithError error: Error) {
-        Log.mcp.error("Location request failed: \(error.localizedDescription)")
-        locationContinuation?.resume(returning: nil)
-        locationContinuation = nil
-    }
-
-    private func currentLocation() async -> CLLocation? {
-        await withCheckedContinuation { continuation in
-            self.locationContinuation = continuation
-            locationManager.requestLocation()
-        }
-    }
-
-    // MARK: - Tool Schemas
-
-    func getToolSchemas() -> [Tool] {
-        [
-            makeTool(
-                name: "location_get_current",
-                description: "Get the device's current location, including a human-readable address.",
-                properties: [:],
-                required: []
-            ),
-            makeTool(
-                name: "maps_search_places",
-                description: "Search for places (businesses, landmarks, addresses) by name or category.",
-                properties: [
-                    "query": prop("string", "What to search for, e.g. 'coffee shops' or 'Eiffel Tower'"),
-                    "near": prop("string", "Optional: an address or 'latitude,longitude' to search near")
-                ],
-                required: ["query"]
-            ),
-            makeTool(
-                name: "maps_geocode",
-                description: "Convert an address into geographic coordinates and a formatted address.",
-                properties: [
-                    "address": prop("string", "The address to geocode")
-                ],
-                required: ["address"]
-            ),
-            makeTool(
-                name: "maps_get_directions",
-                description: "Get distance and estimated travel time between two locations.",
-                properties: [
-                    "origin": prop("string", "Starting address or 'latitude,longitude'"),
-                    "destination": prop("string", "Destination address or 'latitude,longitude'"),
-                    "transport_type": prop("string", "Mode of transport", enumValues: ["driving", "walking", "transit"])
-                ],
-                required: ["origin", "destination"]
-            )
-        ]
-    }
-
-    // MARK: - Tool Execution
-
-    func executeTool(name: String, arguments: String) async -> [String: Any] {
-        Log.mcp.info("Executing LocationMaps tool: \(name)")
-        let args = parseArgs(arguments)
-
-        switch name {
-        case "location_get_current":
-            guard authorized else { return ["error": "Location permission not granted. Grant access in Settings > MCP."] }
-            return await getCurrentLocation()
-
-        case "maps_search_places":
-            guard let query = args["query"] as? String, !query.isEmpty else {
-                return ["error": "Missing required parameter: query"]
-            }
-            let near = args["near"] as? String
-            return await searchPlaces(query: query, near: near)
-
-        case "maps_geocode":
-            guard let address = args["address"] as? String, !address.isEmpty else {
-                return ["error": "Missing required parameter: address"]
-            }
-            return await geocode(address: address)
-
-        case "maps_get_directions":
-            guard let origin = args["origin"] as? String, let destination = args["destination"] as? String else {
-                return ["error": "Missing required parameter: origin and/or destination"]
-            }
-            let transportType = args["transport_type"] as? String ?? "driving"
-            return await getDirections(origin: origin, destination: destination, transportType: transportType)
-
-        default:
-            return ["error": "Unknown LocationMaps tool: \(name)"]
-        }
-    }
-
-    // MARK: - Implementations
-
-    private func getCurrentLocation() async -> [String: Any] {
-        guard let location = await currentLocation() else {
-            return ["error": "Could not determine current location"]
-        }
-        var result: [String: Any] = [
-            "latitude": location.coordinate.latitude,
-            "longitude": location.coordinate.longitude
-        ]
-        if let mapItem = await reverseGeocode(location), let address = addressString(for: mapItem) {
-            result["address"] = address
-        }
-        return result
-    }
-
-    private func searchPlaces(query: String, near: String?) async -> [String: Any] {
-        let request = MKLocalSearch.Request()
-        request.naturalLanguageQuery = query
-        if let near, let coordinate = await coordinate(for: near) {
-            request.region = MKCoordinateRegion(center: coordinate, latitudinalMeters: 20_000, longitudinalMeters: 20_000)
-        }
-
-        do {
-            let response = try await MKLocalSearch(request: request).start()
-            let places = response.mapItems.prefix(15).map { item -> [String: Any] in
-                var place: [String: Any] = ["name": item.name ?? "Unknown"]
-                place["latitude"] = item.location.coordinate.latitude
-                place["longitude"] = item.location.coordinate.longitude
-                if let address = addressString(for: item) {
-                    place["address"] = address
-                }
-                if let phone = item.phoneNumber { place["phone"] = phone }
-                return place
-            }
-            return ["count": places.count, "places": Array(places)]
-        } catch {
-            return ["error": "Search failed: \(error.localizedDescription)"]
-        }
-    }
-
-    private func geocode(address: String) async -> [String: Any] {
-        guard let request = MKGeocodingRequest(addressString: address) else {
-            return ["error": "Invalid address: \(address)"]
-        }
-        do {
-            guard let mapItem = try await request.mapItems.first else {
-                return ["error": "No results found for address: \(address)"]
-            }
-            var result: [String: Any] = [
-                "latitude": mapItem.location.coordinate.latitude,
-                "longitude": mapItem.location.coordinate.longitude
-            ]
-            if let formatted = addressString(for: mapItem) {
-                result["formatted_address"] = formatted
-            }
-            return result
-        } catch {
-            return ["error": "Geocoding failed: \(error.localizedDescription)"]
-        }
-    }
-
-    private func getDirections(origin: String, destination: String, transportType: String) async -> [String: Any] {
-        guard let originCoordinate = await coordinate(for: origin) else {
-            return ["error": "Could not resolve origin: \(origin)"]
-        }
-        guard let destinationCoordinate = await coordinate(for: destination) else {
-            return ["error": "Could not resolve destination: \(destination)"]
-        }
-
-        let request = MKDirections.Request()
-        request.source = MKMapItem(location: CLLocation(latitude: originCoordinate.latitude, longitude: originCoordinate.longitude), address: nil)
-        request.destination = MKMapItem(location: CLLocation(latitude: destinationCoordinate.latitude, longitude: destinationCoordinate.longitude), address: nil)
-        switch transportType {
-        case "walking": request.transportType = .walking
-        case "transit": request.transportType = .transit
-        default: request.transportType = .automobile
-        }
-
-        do {
-            let response = try await MKDirections(request: request).calculate()
-            guard let route = response.routes.first else {
-                return ["error": "No route found"]
-            }
-            let distanceFormatter = MKDistanceFormatter()
-            let durationFormatter = DateComponentsFormatter()
-            durationFormatter.allowedUnits = [.hour, .minute]
-            durationFormatter.unitsStyle = .short
-
-            return [
-                "distance_meters": route.distance,
-                "distance_text": distanceFormatter.string(fromDistance: route.distance),
-                "duration_seconds": route.expectedTravelTime,
-                "duration_text": durationFormatter.string(from: route.expectedTravelTime) ?? "",
-                "transport_type": transportType
-            ]
-        } catch {
-            return ["error": "Directions failed: \(error.localizedDescription)"]
-        }
-    }
-
-    // MARK: - Helpers
-
-    private func coordinate(for text: String) async -> CLLocationCoordinate2D? {
-        let parts = text.split(separator: ",").map { $0.trimmingCharacters(in: .whitespaces) }
-        if parts.count == 2, let lat = Double(parts[0]), let lon = Double(parts[1]) {
-            return CLLocationCoordinate2D(latitude: lat, longitude: lon)
-        }
-        guard let request = MKGeocodingRequest(addressString: text) else { return nil }
-        if let mapItems = try? await request.mapItems, let mapItem = mapItems.first {
-            return mapItem.location.coordinate
-        }
-        return nil
-    }
-
-    private func reverseGeocode(_ location: CLLocation) async -> MKMapItem? {
-        guard let request = MKReverseGeocodingRequest(location: location) else { return nil }
-        let mapItems = try? await request.mapItems
-        return mapItems?.first
-    }
-
-    private func addressString(for mapItem: MKMapItem) -> String? {
-        mapItem.address?.fullAddress
-            ?? mapItem.addressRepresentations?.fullAddress(includingRegion: true, singleLine: true)
-    }
-
-    private func parseArgs(_ arguments: String) -> [String: Any] {
-        guard let data = arguments.data(using: .utf8),
-              let dict = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else {
-            return [:]
-        }
-        return dict
-    }
-
-    private func makeTool(name: String, description: String, properties: [String: Tool.Function.Parameters.Property], required: [String]) -> Tool {
-        Tool(
-            type: "function",
-            function: Tool.Function(
-                name: name,
-                description: description,
-                parameters: Tool.Function.Parameters(
-                    type: "object",
-                    properties: properties,
-                    required: required
-                )
-            )
-        )
-    }
-
-    private func prop(_ type: String, _ description: String, enumValues: [String]? = nil) -> Tool.Function.Parameters.Property {
-        Tool.Function.Parameters.Property(type: type, description: description, enum: enumValues)
-    }
-}

oAI/Services/MCPService.swift

@@ -4,21 +4,23 @@
 //
 //  MCP (Model Context Protocol) service for filesystem tool execution
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation
@@ -96,17 +98,6 @@ class MCPService {
 
     func isPathAllowed(_ path: String) -> Bool {
         let resolved = ((path as NSString).expandingTildeInPath as NSString).standardizingPath
-        // Always allow the system temp directory — external MCP servers and tools write
-        // intermediate data there (e.g. Safari MCP page-content files, generated images).
-        // Check both NSTemporaryDirectory() (per-user Darwin temp dir) and /tmp (what this
-        // codebase's own temp files actually use, e.g. ChatViewModel's /tmp/oai_generated_*
-        // and ExternalMCPClient's /tmp/oai_mcp_* — they resolve to different directories.
-        let tmpCandidates = [
-            (NSTemporaryDirectory() as NSString).standardizingPath,
-            "/tmp",
-            "/private/tmp"
-        ]
-        if tmpCandidates.contains(where: { resolved.hasPrefix($0) }) { return true }
         return allowedFolders.contains { resolved.hasPrefix($0) }
     }
 
@@ -120,9 +111,6 @@ class MCPService {
 
     private let anytypeService = AnytypeMCPService.shared
     private let paperlessService = PaperlessService.shared
-    private let eventKitService = EventKitService.shared
-    private let contactsService = ContactsService.shared
-    private let locationMapsService = LocationMapsService.shared
 
     // MARK: - Bash Approval State
 
@@ -136,19 +124,6 @@ class MCPService {
     private var pendingBashContinuation: CheckedContinuation<[String: Any], Never>? = nil
     private(set) var bashSessionApproved: Bool = false
 
-    // MARK: - Personal Data (Calendar/Reminders) Approval State
-
-    struct PendingPersonalDataAction: Identifiable {
-        let id = UUID()
-        let toolName: String
-        let argumentsJSON: String
-        let summary: String
-    }
-
-    private(set) var pendingPersonalDataAction: PendingPersonalDataAction? = nil
-    private var pendingPersonalDataContinuation: CheckedContinuation<[String: Any], Never>? = nil
-    private(set) var personalDataSessionApproved: Bool = false
-
     // MARK: - Tool Schema Generation
 
     func getToolSchemas(onlineMode: Bool = false) -> [Tool] {
@@ -257,24 +232,6 @@ class MCPService {
             tools.append(contentsOf: paperlessService.getToolSchemas())
         }
 
-        // Add Calendar/Reminders tools if enabled
-        if settings.calendarEnabled || settings.remindersEnabled {
-            tools.append(contentsOf: eventKitService.getToolSchemas(
-                calendarEnabled: settings.calendarEnabled,
-                remindersEnabled: settings.remindersEnabled
-            ))
-        }
-
-        // Add Contacts tools if enabled
-        if settings.contactsEnabled {
-            tools.append(contentsOf: contactsService.getToolSchemas())
-        }
-
-        // Add Location/Maps tools if enabled
-        if settings.locationMapsEnabled {
-            tools.append(contentsOf: locationMapsService.getToolSchemas())
-        }
-
         // Add bash_execute tool when bash is enabled
         if settings.bashEnabled {
             let workDir = settings.bashWorkingDirectory
@@ -303,25 +260,6 @@ class MCPService {
             ))
         }
 
-        // Add spawn_research_agents when Research Agents are enabled
-        if settings.agentsEnabled {
-            tools.append(makeTool(
-                name: "spawn_research_agents",
-                description: "Spawn multiple READ-ONLY research sub-agents that investigate independent questions IN PARALLEL. Each sub-agent gets its own read_file/list_directory/search_files/web_search loop — no write, no bash, no nesting (sub-agents cannot call this tool). ONLY use this when you have 2 or more genuinely independent research questions that benefit from running at the same time (e.g. comparing several unrelated files, topics, or sources). Do NOT use this for a single lookup, a sequential task, or anything answerable with one direct tool call — call read_file/search_files/web_search yourself instead. Each sub-agent is its own full chain of model calls and meaningfully increases cost and latency; using this for trivial tasks is wasteful. Prefer the smallest number of tasks that actually need to run in parallel.",
-                properties: [
-                    "tasks": Tool.Function.Parameters.Property(
-                        type: "array",
-                        description: "List of independent, self-contained research questions — one per sub-agent. Keep this list as short as the task genuinely requires.",
-                        items: .init(type: "string")
-                    )
-                ],
-                required: ["tasks"]
-            ))
-        }
-
-        // Add tools from external MCP servers (stdio JSON-RPC protocol)
-        tools.append(contentsOf: ExternalMCPManager.shared.getToolSchemas())
-
         return tools
     }
 
@@ -346,10 +284,7 @@ class MCPService {
 
     // MARK: - Tool Execution
 
-    /// `agentProvider`/`agentModelId` are only needed for `spawn_research_agents`, which drives
-    /// its own model calls — every other tool ignores them. Passed in by the caller's active
-    /// chat session rather than stored on MCPService, since this service has no provider state.
-    func executeTool(name: String, arguments: String, agentProvider: AIProvider? = nil, agentModelId: String? = nil) async -> [String: Any] {
+    func executeTool(name: String, arguments: String) async -> [String: Any] {
         Log.mcp.info("Executing tool: \(name)")
         guard let argData = arguments.data(using: .utf8),
               let args = try? JSONSerialization.jsonObject(with: argData) as? [String: Any] else {
@@ -464,30 +399,7 @@ class MCPService {
             let mapped = results.map { ["title": $0.title, "url": $0.url, "snippet": $0.snippet] }
             return ["results": mapped]
 
-        case "spawn_research_agents":
-            guard settings.agentsEnabled else {
-                return ["error": "Research agents are disabled. Enable 'Research Agents' in Settings > MCP."]
-            }
-            guard let agentProvider, let agentModelId else {
-                return ["error": "Internal error: missing model context for spawn_research_agents"]
-            }
-            guard let tasks = args["tasks"] as? [String], !tasks.isEmpty else {
-                return ["error": "Missing required parameter: tasks (non-empty array of strings)"]
-            }
-            return await runResearchAgents(tasks: tasks, provider: agentProvider, modelId: agentModelId)
-
-        case "calendar_create_event", "reminders_create", "reminders_complete":
-            guard settings.calendarEnabled || settings.remindersEnabled else {
-                return ["error": "Calendar/Reminders access is disabled. Enable it in Settings > MCP."]
-            }
-            let summary = eventKitService.approvalSummary(forTool: name, arguments: arguments)
-            return await executePersonalDataAction(toolName: name, argumentsJSON: arguments, summary: summary)
-
         default:
-            // Route to external MCP servers (stdio JSON-RPC)
-            if ExternalMCPManager.shared.isExternalTool(name) {
-                return await ExternalMCPManager.shared.executeTool(name: name, argumentsJSON: arguments)
-            }
             // Route anytype_* tools to AnytypeMCPService
             if name.hasPrefix("anytype_") {
                 return await anytypeService.executeTool(name: name, arguments: arguments)
@@ -496,18 +408,6 @@ class MCPService {
             if name.hasPrefix("paperless_") {
                 return await paperlessService.executeTool(name: name, arguments: arguments)
             }
-            // Route calendar_*/reminders_* read tools to EventKitService
-            if name.hasPrefix("calendar_") || name.hasPrefix("reminders_") {
-                return await eventKitService.executeTool(name: name, arguments: arguments)
-            }
-            // Route contacts_* tools to ContactsService
-            if name.hasPrefix("contacts_") {
-                return await contactsService.executeTool(name: name, arguments: arguments)
-            }
-            // Route location_*/maps_* tools to LocationMapsService
-            if name.hasPrefix("location_") || name.hasPrefix("maps_") {
-                return await locationMapsService.executeTool(name: name, arguments: arguments)
-            }
             return ["error": "Unknown tool: \(name)"]
         }
     }
@@ -854,11 +754,6 @@ class MCPService {
         if bashSessionApproved {
             return await runBashCommand(command, workingDirectory: workingDirectory)
         }
-        // 2nd Brain calls its helper script via bash_execute — let the user mark that
-        // specific traffic as always-trusted instead of approving it every time.
-        if isTrustedSecondBrainCommand(command) {
-            return await runBashCommand(command, workingDirectory: workingDirectory)
-        }
         return await withCheckedContinuation { continuation in
             DispatchQueue.main.async {
                 self.pendingBashCommand = PendingBashCommand(command: command, workingDirectory: workingDirectory)
@@ -891,190 +786,6 @@ class MCPService {
         bashSessionApproved = false
     }
 
-    private func isTrustedSecondBrainCommand(_ command: String) -> Bool {
-        guard settings.trustSecondBrainSkill, command.contains(".brain_helper.py") else { return false }
-        return settings.agentSkills.contains { $0.isActive && $0.isSecondBrainSkill }
-    }
-
-    // MARK: - Research Agents (read-only, parallel)
-
-    /// Runs `tasks.count` sub-agents (capped) with bounded concurrency, each in its own
-    /// read-only tool loop, and returns their findings concatenated for the orchestrator.
-    private func runResearchAgents(tasks: [String], provider: AIProvider, modelId: String) async -> [String: Any] {
-        let maxConcurrent = max(1, min(5, settings.maxConcurrentAgents))
-        // Hard cap on total sub-agents regardless of concurrency setting, so a model
-        // requesting an unreasonably long task list can't run away with cost.
-        let cappedTasks = Array(tasks.prefix(8))
-
-        var results: [(Int, String)] = []
-        await withTaskGroup(of: (Int, String).self) { group in
-            var nextIndex = 0
-            func launchNext() {
-                guard nextIndex < cappedTasks.count else { return }
-                let idx = nextIndex
-                let task = cappedTasks[idx]
-                nextIndex += 1
-                group.addTask {
-                    let answer = await self.runSingleResearchAgent(task: task, provider: provider, modelId: modelId)
-                    return (idx, answer)
-                }
-            }
-            for _ in 0..<min(maxConcurrent, cappedTasks.count) { launchNext() }
-            for await result in group {
-                results.append(result)
-                launchNext()
-            }
-        }
-
-        let sorted = results.sorted { $0.0 < $1.0 }
-        let formatted = sorted.map { idx, answer in
-            "### Agent \(idx + 1): \(cappedTasks[idx])\n\(answer)"
-        }.joined(separator: "\n\n")
-
-        var response: [String: Any] = ["agent_count": sorted.count, "results": formatted]
-        if tasks.count > cappedTasks.count {
-            response["note"] = "Only the first \(cappedTasks.count) of \(tasks.count) requested tasks were run (per-call cap)."
-        }
-        return response
-    }
-
-    /// A single sub-agent's self-contained tool loop. Read-only tools only; cannot write,
-    /// run bash, or spawn further sub-agents (spawn_research_agents is not in its tool list).
-    private func runSingleResearchAgent(task: String, provider: AIProvider, modelId: String) async -> String {
-        let readOnlyTools: [Tool] = [
-            makeTool(
-                name: "read_file",
-                description: "Read the contents of a file. Maximum file size is 10MB.",
-                properties: ["file_path": prop("string", "The absolute path to the file to read")],
-                required: ["file_path"]
-            ),
-            makeTool(
-                name: "list_directory",
-                description: "List the contents of a directory. Skips hidden/build directories like .git, node_modules, etc.",
-                properties: [
-                    "dir_path": prop("string", "The absolute path to the directory to list"),
-                    "recursive": prop("boolean", "Whether to list recursively (default: false)")
-                ],
-                required: ["dir_path"]
-            ),
-            makeTool(
-                name: "search_files",
-                description: "Search for files by name pattern or content.",
-                properties: [
-                    "pattern": prop("string", "Glob pattern to match filenames (e.g. '*.py', 'README*')"),
-                    "search_path": prop("string", "Directory to search in (defaults to first allowed folder)"),
-                    "content_search": prop("string", "Optional text to search for inside files")
-                ],
-                required: ["pattern"]
-            ),
-            makeTool(
-                name: "web_search",
-                description: "Search the web for current information using DuckDuckGo.",
-                properties: ["query": prop("string", "The search query to look up")],
-                required: ["query"]
-            )
-        ]
-        let allowedNames = Set(readOnlyTools.map { $0.function.name })
-
-        var apiMessages: [[String: Any]] = [
-            ["role": "system", "content": "You are a read-only research sub-agent. Investigate the assigned task using the available tools and report concise findings as plain text. You cannot write, delete, or execute anything, and cannot spawn further sub-agents. Once you have enough information, respond with your final answer and stop calling tools."],
-            ["role": "user", "content": task]
-        ]
-
-        let maxIterations = 6
-        for iteration in 0..<maxIterations {
-            if Task.isCancelled { return "(cancelled)" }
-
-            guard let response = try? await provider.chatWithToolMessages(
-                model: modelId, messages: apiMessages, tools: readOnlyTools, maxTokens: nil, temperature: nil
-            ) else {
-                return "(error: sub-agent request failed)"
-            }
-
-            let toolCalls = response.toolCalls ?? []
-            guard !toolCalls.isEmpty else {
-                return response.content.isEmpty ? "(no findings)" : response.content
-            }
-
-            var assistantMsg: [String: Any] = ["role": "assistant"]
-            if !response.content.isEmpty { assistantMsg["content"] = response.content }
-            assistantMsg["tool_calls"] = toolCalls.map { tc in
-                ["id": tc.id, "type": tc.type, "function": ["name": tc.functionName, "arguments": tc.arguments]]
-            }
-            apiMessages.append(assistantMsg)
-
-            for tc in toolCalls {
-                let resultJSON: String
-                if allowedNames.contains(tc.functionName) {
-                    let result = await executeTool(name: tc.functionName, arguments: tc.arguments)
-                    resultJSON = serializeToolResult(result)
-                } else {
-                    resultJSON = "{\"error\": \"Tool not available to research sub-agents\"}"
-                }
-                apiMessages.append([
-                    "role": "tool",
-                    "tool_call_id": tc.id,
-                    "name": tc.functionName,
-                    "content": resultJSON
-                ])
-            }
-
-            if iteration == maxIterations - 1 {
-                return "(research incomplete: sub-agent reached its iteration limit)"
-            }
-        }
-        return "(no findings)"
-    }
-
-    private func serializeToolResult(_ result: [String: Any], maxBytes: Int = 20_000) -> String {
-        guard let data = try? JSONSerialization.data(withJSONObject: result),
-              let str = String(data: data, encoding: .utf8) else {
-            return "{\"error\": \"Failed to serialize result\"}"
-        }
-        guard str.utf8.count > maxBytes, let truncated = String(str.utf8.prefix(maxBytes)) else {
-            return str
-        }
-        return truncated + "\n... (result truncated)"
-    }
-
-    // MARK: - Personal Data (Calendar/Reminders) Approval
-
-    private func executePersonalDataAction(toolName: String, argumentsJSON: String, summary: String) async -> [String: Any] {
-        guard settings.personalDataRequireApproval, !personalDataSessionApproved else {
-            return await eventKitService.executeWriteTool(name: toolName, arguments: argumentsJSON)
-        }
-        return await withCheckedContinuation { continuation in
-            DispatchQueue.main.async {
-                self.pendingPersonalDataAction = PendingPersonalDataAction(toolName: toolName, argumentsJSON: argumentsJSON, summary: summary)
-                self.pendingPersonalDataContinuation = continuation
-            }
-        }
-    }
-
-    func approvePendingPersonalDataAction(forSession: Bool = false) {
-        guard let pending = pendingPersonalDataAction, let cont = pendingPersonalDataContinuation else { return }
-        pendingPersonalDataAction = nil
-        pendingPersonalDataContinuation = nil
-        if forSession {
-            personalDataSessionApproved = true
-        }
-        Task.detached(priority: .userInitiated) {
-            let result = await self.eventKitService.executeWriteTool(name: pending.toolName, arguments: pending.argumentsJSON)
-            cont.resume(returning: result)
-        }
-    }
-
-    func denyPendingPersonalDataAction() {
-        guard pendingPersonalDataAction != nil else { return }
-        pendingPersonalDataAction = nil
-        pendingPersonalDataContinuation?.resume(returning: ["error": "User denied this action"])
-        pendingPersonalDataContinuation = nil
-    }
-
-    func resetPersonalDataSessionApproval() {
-        personalDataSessionApproved = false
-    }
-
     private func runBashCommand(_ command: String, workingDirectory: String) async -> [String: Any] {
         let timeoutSeconds = settings.bashTimeout
         let workDir = ((workingDirectory as NSString).expandingTildeInPath as NSString).standardizingPath

oAI/Services/PaperlessService.swift

@@ -4,21 +4,23 @@
 //
 //  Paperless-NGX integration: search, read, and upload documents via REST API
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation

oAI/Services/SMTPClient.swift

@@ -4,21 +4,23 @@
 //
 //  Swift-native SMTP client for sending emails
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation

oAI/Services/SettingsService.swift

@@ -4,39 +4,29 @@
 //
 //  Settings persistence: SQLite for preferences, Keychain for API keys
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation
 import os
 import Security
 
-/// Kill switch for the Personal Data tools (Calendar/Reminders/Contacts/Location & Maps).
-/// Flip `isHiddenPendingAppleFix` back to `false` once Apple fixes the macOS 27 beta TCC bug
-/// (filed with Apple). Each flag hides the relevant UI and forces the `*Enabled` getter to
-/// return `false` regardless of the persisted DB value — no code deleted, just inert.
-enum PersonalDataTools {
-    /// Hides the entire Personal Data section. Flip to `false` once all four services work.
-    static let isHiddenPendingAppleFix = false
-    /// Hides only the Contacts row. Contacts TCC still broken under hardened runtime on
-    /// macOS 27 beta 2 while Calendar/Reminders/Location are fixed. Flip to `false` once fixed.
-    static let isContactsHiddenPendingAppleFix = true
-}
-
 @Observable
 class SettingsService {
     static let shared = SettingsService()
@@ -459,48 +449,6 @@ class SettingsService {
         }
     }
 
-    // MARK: - External MCP Servers
-
-    var externalMCPServers: [ExternalMCPServer] {
-        get {
-            guard let json = cache["externalMCPServers"],
-                  let data = json.data(using: .utf8) else { return [] }
-            let decoder = JSONDecoder()
-            decoder.dateDecodingStrategy = .iso8601
-            return (try? decoder.decode([ExternalMCPServer].self, from: data)) ?? []
-        }
-        set {
-            let encoder = JSONEncoder()
-            encoder.dateEncodingStrategy = .iso8601
-            if let data = try? encoder.encode(newValue),
-               let json = String(data: data, encoding: .utf8) {
-                cache["externalMCPServers"] = json
-                DatabaseService.shared.setSetting(key: "externalMCPServers", value: json)
-            }
-            Task { @MainActor in ExternalMCPManager.shared.reconfigure(servers: newValue) }
-        }
-    }
-
-    func addExternalMCPServer(_ server: ExternalMCPServer) {
-        externalMCPServers = externalMCPServers + [server]
-    }
-
-    func updateExternalMCPServer(_ server: ExternalMCPServer) {
-        externalMCPServers = externalMCPServers.map { $0.id == server.id ? server : $0 }
-    }
-
-    func deleteExternalMCPServer(id: UUID) {
-        externalMCPServers = externalMCPServers.filter { $0.id != id }
-    }
-
-    func toggleExternalMCPServer(id: UUID) {
-        externalMCPServers = externalMCPServers.map { s in
-            s.id == id ? ExternalMCPServer(id: s.id, name: s.name, command: s.command,
-                                           args: s.args, isEnabled: !s.isEnabled,
-                                           timeout: s.timeout, createdAt: s.createdAt) : s
-        }
-    }
-
     // MARK: - Favorite Models
 
     var favoriteModelIds: Set<String> {
@@ -629,37 +577,6 @@ class SettingsService {
         }
     }
 
-    // MARK: - Research Agents Settings
-
-    /// When true, the AI can call `spawn_research_agents` to run multiple read-only
-    /// sub-agents in parallel. Each sub-agent is its own full chain of model calls, so
-    /// this can noticeably increase cost — opt-in, off by default.
-    var agentsEnabled: Bool {
-        get { cache["agentsEnabled"] == "true" }
-        set {
-            cache["agentsEnabled"] = String(newValue)
-            DatabaseService.shared.setSetting(key: "agentsEnabled", value: String(newValue))
-        }
-    }
-
-    var maxConcurrentAgents: Int {
-        get { cache["maxConcurrentAgents"].flatMap(Int.init) ?? 3 }
-        set {
-            cache["maxConcurrentAgents"] = String(newValue)
-            DatabaseService.shared.setSetting(key: "maxConcurrentAgents", value: String(newValue))
-        }
-    }
-
-    /// When true (and an active "2nd Brain" Agent Skill is installed), bash commands that
-    /// invoke the 2nd Brain helper script skip the approval dialog entirely.
-    var trustSecondBrainSkill: Bool {
-        get { cache["trustSecondBrainSkill"] == "true" }
-        set {
-            cache["trustSecondBrainSkill"] = String(newValue)
-            DatabaseService.shared.setSetting(key: "trustSecondBrainSkill", value: String(newValue))
-        }
-    }
-
     var bashWorkingDirectory: String {
         get { cache["bashWorkingDirectory"] ?? "~" }
         set {
@@ -676,48 +593,6 @@ class SettingsService {
         }
     }
 
-    // MARK: - Personal Data Settings (Calendar/Reminders/Contacts/Location/Maps)
-
-    var calendarEnabled: Bool {
-        get { !PersonalDataTools.isHiddenPendingAppleFix && cache["calendarEnabled"] == "true" }
-        set {
-            cache["calendarEnabled"] = String(newValue)
-            DatabaseService.shared.setSetting(key: "calendarEnabled", value: String(newValue))
-        }
-    }
-
-    var remindersEnabled: Bool {
-        get { !PersonalDataTools.isHiddenPendingAppleFix && cache["remindersEnabled"] == "true" }
-        set {
-            cache["remindersEnabled"] = String(newValue)
-            DatabaseService.shared.setSetting(key: "remindersEnabled", value: String(newValue))
-        }
-    }
-
-    var contactsEnabled: Bool {
-        get { !PersonalDataTools.isHiddenPendingAppleFix && !PersonalDataTools.isContactsHiddenPendingAppleFix && cache["contactsEnabled"] == "true" }
-        set {
-            cache["contactsEnabled"] = String(newValue)
-            DatabaseService.shared.setSetting(key: "contactsEnabled", value: String(newValue))
-        }
-    }
-
-    var locationMapsEnabled: Bool {
-        get { !PersonalDataTools.isHiddenPendingAppleFix && cache["locationMapsEnabled"] == "true" }
-        set {
-            cache["locationMapsEnabled"] = String(newValue)
-            DatabaseService.shared.setSetting(key: "locationMapsEnabled", value: String(newValue))
-        }
-    }
-
-    var personalDataRequireApproval: Bool {
-        get { cache["personalDataRequireApproval"].map { $0 == "true" } ?? true }
-        set {
-            cache["personalDataRequireApproval"] = String(newValue)
-            DatabaseService.shared.setSetting(key: "personalDataRequireApproval", value: String(newValue))
-        }
-    }
-
     // MARK: - Paperless-NGX Settings
 
     var paperlessEnabled: Bool {

oAI/Services/ThinkingVerbs.swift

@@ -4,21 +4,23 @@
 //
 //  Fun random verbs for AI thinking/processing states
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation

oAI/Services/UpdateCheckService.swift

@@ -4,21 +4,23 @@
 //
 //  Checks for new releases on GitLab and surfaces an update badge in the footer
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation

oAI/Services/WebSearchService.swift

@@ -4,21 +4,23 @@
 //
 //  DuckDuckGo web search for non-OpenRouter providers
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation

oAI/Utilities/Extensions/Color+Extensions.swift

@@ -4,21 +4,23 @@
 //
 //  Color scheme matching Python TUI dark theme
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import SwiftUI

oAI/Utilities/Extensions/String+Extensions.swift

@@ -4,21 +4,23 @@
 //
 //  String utility extensions
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation

oAI/Utilities/Extensions/View+Extensions.swift

@@ -4,21 +4,23 @@
 //
 //  SwiftUI view helpers and modifiers
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import SwiftUI

oAI/Utilities/Logging.swift

@@ -4,21 +4,23 @@
 //
 //  Dual logging: os.Logger (unified log) + file (~Library/Logs/oAI.log)
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation
@@ -151,5 +153,4 @@ enum Log {
     nonisolated static let search   = AppLogger(subsystem: subsystem, category: "search")
     nonisolated static let ui       = AppLogger(subsystem: subsystem, category: "ui")
     nonisolated static let general  = AppLogger(subsystem: subsystem, category: "general")
-    nonisolated static let extMcp   = AppLogger(subsystem: subsystem, category: "ext-mcp")
 }

oAI/Utilities/SyntaxHighlighter.swift

@@ -4,21 +4,23 @@
 //
 //  Keyword-based syntax highlighting using AttributedString
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import SwiftUI

oAI/ViewModels/ChatViewModel.swift

@@ -4,21 +4,23 @@
 //
 //  Main chat view model
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import Foundation
@@ -358,6 +360,7 @@ Don't narrate future actions ("Let me...") - just use the tools.
     }
 
     func startAutoContinue() {
+        showSystemMessage("↩ Continuing…")
         silentContinuePrompt = "Please continue from where you left off."
         Task { @MainActor in
             generateAIResponse(to: "", attachments: nil)
@@ -796,18 +799,8 @@ Don't narrate future actions ("Let me...") - just use the tools.
         let mcpActive = mcpEnabled || settings.mcpEnabled
         let anytypeActive = settings.anytypeMcpEnabled && settings.anytypeMcpConfigured
         let bashActive = settings.bashEnabled
-        let personalDataActive = settings.calendarEnabled || settings.remindersEnabled || settings.contactsEnabled || settings.locationMapsEnabled
-        let researchAgentsActive = settings.agentsEnabled
-        let externalMCPActive = !settings.externalMCPServers.filter { $0.isEnabled }.isEmpty
-        // Dedicated images API path (OpenRouter /images endpoint — separate from chat completions)
-        if selectedModel?.capabilities.usesImagesAPI == true,
-           let orProvider = provider as? OpenRouterProvider {
-            generateImageAPIResponse(orProvider: orProvider, modelId: modelId, prompt: prompt)
-            return
-        }
-
         let modelSupportTools = selectedModel?.capabilities.tools ?? false
-        if modelSupportTools && (anytypeActive || bashActive || personalDataActive || researchAgentsActive || externalMCPActive || (mcpActive && !mcp.allowedFolders.isEmpty)) {
+        if modelSupportTools && (anytypeActive || bashActive || (mcpActive && !mcp.allowedFolders.isEmpty)) {
             generateAIResponseWithTools(provider: provider, modelId: modelId)
             return
         }
@@ -1268,55 +1261,6 @@ Don't narrate future actions ("Let me...") - just use the tools.
 
     // MARK: - AI Response with Tool Calls
 
-    // MARK: - Images API Generation
-
-    private func generateImageAPIResponse(orProvider: OpenRouterProvider, modelId: String, prompt: String) {
-        isGenerating = true
-        streamingTask?.cancel()
-        streamingTask = Task {
-            let startTime = Date()
-            let assistantMessage = Message(
-                role: .assistant,
-                content: ThinkingVerbs.random(),
-                tokens: nil,
-                cost: nil,
-                timestamp: Date(),
-                attachments: nil,
-                modelId: modelId,
-                isStreaming: true
-            )
-            let messageId = assistantMessage.id
-            messages.append(assistantMessage)
-
-            do {
-                let response = try await orProvider.generateImage(model: modelId, prompt: prompt)
-                let responseTime = Date().timeIntervalSince(startTime)
-
-                if let index = messages.firstIndex(where: { $0.id == messageId }) {
-                    messages[index].content = response.content
-                    messages[index].isStreaming = false
-                    messages[index].generatedImages = response.generatedImages
-                    messages[index].responseTime = responseTime
-
-                    if let usage = response.usage {
-                        messages[index].tokens = usage.completionTokens
-                        let cost = usage.rawCostUSD
-                        messages[index].cost = cost
-                        sessionStats.addMessage(inputTokens: usage.promptTokens, outputTokens: usage.completionTokens, cost: cost)
-                    }
-                }
-                _ = detectGoodbyePhrase(in: "")
-            } catch {
-                if let index = messages.firstIndex(where: { $0.id == messageId }) {
-                    messages[index].content = "❌ Image generation failed: \(error.localizedDescription)"
-                    messages[index].isStreaming = false
-                }
-                Log.api.error("Images API error: \(error)")
-            }
-            isGenerating = false
-        }
-    }
-
     private func generateAIResponseWithTools(provider: AIProvider, modelId: String) {
         let mcp = MCPService.shared
         Log.ui.info("generateAIResponseWithTools: model=\(modelId)")
@@ -1358,12 +1302,6 @@ Don't narrate future actions ("Let me...") - just use the tools.
                     systemParts.append("You have access to the user's Anytype knowledge base through tool calls (anytype_* tools). You can search across all spaces, list spaces, get objects, and create or update notes, tasks, and pages. Use these tools proactively when the user asks about their notes, tasks, or knowledge base.")
                 }
 
-                let activeExternalServers = settings.externalMCPServers.filter { $0.isEnabled }
-                if !activeExternalServers.isEmpty {
-                    let names = activeExternalServers.map { $0.name }.joined(separator: ", ")
-                    systemParts.append("You have access to external tools from MCP servers: \(names). Their tools are prefixed with the server slug (e.g. safari_navigate_to_url). Use them proactively when the user's request relates to what those servers provide.")
-                }
-
                 var systemContent = systemParts.joined(separator: "\n\n")
 
                 // Append the complete system prompt (default + custom)
@@ -1416,7 +1354,6 @@ Don't narrate future actions ("Let me...") - just use the tools.
                 var didContinueAfterImages = false  // Only inject temp-file continuation once
                 var totalUsage: ChatResponse.Usage?
                 var hitIterationLimit = false  // Track if we exited due to hitting the limit
-                var finishedWithEmptyContent = false  // Model stopped calling tools but said nothing
 
                 for iteration in 0..<maxIterations {
                     if Task.isCancelled {
@@ -1469,12 +1406,6 @@ Don't narrate future actions ("Let me...") - just use the tools.
                                 continue
                             }
                         }
-                        if finalContent.isEmpty {
-                            // Some models (observed with Qwen via OpenRouter) stop calling tools
-                            // after a long tool-call chain but return no summarizing text at all.
-                            // Silently nudge a follow-up turn instead of showing a placeholder bubble.
-                            finishedWithEmptyContent = true
-                        }
                         break
                     }
 
@@ -1521,7 +1452,7 @@ Don't narrate future actions ("Let me...") - just use the tools.
                             break
                         }
 
-                        let result = await mcp.executeTool(name: tc.functionName, arguments: tc.arguments, agentProvider: provider, agentModelId: effectiveModelId)
+                        let result = await mcp.executeTool(name: tc.functionName, arguments: tc.arguments)
                         let resultJSON: String
                         if let data = try? JSONSerialization.data(withJSONObject: result),
                            let str = String(data: data, encoding: .utf8) {
@@ -1562,7 +1493,9 @@ Don't narrate future actions ("Let me...") - just use the tools.
                     // If this was the last iteration, note it
                     if iteration == maxIterations - 1 {
                         hitIterationLimit = true  // We're exiting with pending tool calls
-                        finalContent = response.content
+                        finalContent = response.content.isEmpty
+                            ? "[Tool loop reached maximum iterations]"
+                            : response.content
                     }
                 }
 
@@ -1571,57 +1504,41 @@ Don't narrate future actions ("Let me...") - just use the tools.
                     wasCancelled = true
                 }
 
-                // If we hit the iteration limit or the model returned no text at all, silently
-                // nudge a follow-up turn instead of showing a placeholder/blank bubble.
-                let willAutoContinue = (hitIterationLimit || finishedWithEmptyContent) && !wasCancelled
-
                 // Display the final response as an assistant message
                 let responseTime = Date().timeIntervalSince(startTime)
-                if willAutoContinue && finalContent.isEmpty {
-                    // Nothing worth showing yet — still record usage/cost for this turn.
-                    if let usage = totalUsage, let model = selectedModel {
-                        let hasPricing = model.pricing.prompt > 0 || model.pricing.completion > 0
-                        let cost: Double? = hasPricing ? calculateCost(usage: usage, pricing: model.pricing) : nil
-                        sessionStats.addMessage(
-                            inputTokens: usage.promptTokens,
-                            outputTokens: usage.completionTokens,
-                            cost: cost
-                        )
-                    }
-                } else {
-                    let assistantMessage = Message(
-                        role: .assistant,
-                        content: finalContent,
-                        tokens: totalUsage?.completionTokens,
-                        cost: nil,
-                        timestamp: Date(),
-                        attachments: nil,
-                        responseTime: responseTime,
-                        wasInterrupted: wasCancelled,
-                        modelId: modelId,
-                        generatedImages: finalImages.isEmpty ? nil : finalImages
-                    )
-                    messages.append(assistantMessage)
+                let assistantMessage = Message(
+                    role: .assistant,
+                    content: finalContent,
+                    tokens: totalUsage?.completionTokens,
+                    cost: nil,
+                    timestamp: Date(),
+                    attachments: nil,
+                    responseTime: responseTime,
+                    wasInterrupted: wasCancelled,
+                    modelId: modelId,
+                    generatedImages: finalImages.isEmpty ? nil : finalImages
+                )
+                messages.append(assistantMessage)
 
-                    // Calculate cost
-                    if let usage = totalUsage, let model = selectedModel {
-                        let hasPricing = model.pricing.prompt > 0 || model.pricing.completion > 0
-                        let cost: Double? = hasPricing ? calculateCost(usage: usage, pricing: model.pricing) : nil
-                        if let index = messages.lastIndex(where: { $0.id == assistantMessage.id }) {
-                            messages[index].cost = cost
-                        }
-                        sessionStats.addMessage(
-                            inputTokens: usage.promptTokens,
-                            outputTokens: usage.completionTokens,
-                            cost: cost
-                        )
+                // Calculate cost
+                if let usage = totalUsage, let model = selectedModel {
+                    let hasPricing = model.pricing.prompt > 0 || model.pricing.completion > 0
+                    let cost: Double? = hasPricing ? calculateCost(usage: usage, pricing: model.pricing) : nil
+                    if let index = messages.lastIndex(where: { $0.id == assistantMessage.id }) {
+                        messages[index].cost = cost
                     }
+                    sessionStats.addMessage(
+                        inputTokens: usage.promptTokens,
+                        outputTokens: usage.completionTokens,
+                        cost: cost
+                    )
                 }
 
                 isGenerating = false
                 streamingTask = nil
 
-                if willAutoContinue {
+                // If we hit the iteration limit and weren't cancelled, start auto-continue
+                if hitIterationLimit && !wasCancelled {
                     startAutoContinue()
                 }
 

oAI/Views/Main/ChatView.swift

@@ -4,21 +4,23 @@
 //
 //  Main chat interface
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import SwiftUI
@@ -121,16 +123,6 @@ struct ChatView: View {
                 onDeny: { MCPService.shared.denyPendingBashCommand() }
             )
         }
-        .sheet(item: Binding(
-            get: { MCPService.shared.pendingPersonalDataAction },
-            set: { _ in }
-        )) { pending in
-            PersonalDataApprovalSheet(
-                pending: pending,
-                onApprove: { forSession in MCPService.shared.approvePendingPersonalDataAction(forSession: forSession) },
-                onDeny: { MCPService.shared.denyPendingPersonalDataAction() }
-            )
-        }
     }
 }
 

oAI/Views/Main/ContentView.swift

@@ -4,21 +4,23 @@
 //
 //  Root navigation container — NavigationSplitView with collapsible sidebar
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import SwiftUI

oAI/Views/Main/FooterView.swift

@@ -4,21 +4,23 @@
 //
 //  Footer bar with session summary
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import SwiftUI

oAI/Views/Main/HeaderView.swift

@@ -5,21 +5,23 @@
 //  Slim header — provider, model name, star only.
 //  Status pills and stats live in SidebarView and FooterView respectively.
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import SwiftUI

oAI/Views/Main/InputBar.swift

@@ -4,21 +4,23 @@
 //
 //  Message input bar with resizable height and online toggle
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import SwiftUI

oAI/Views/Main/MarkdownContentView.swift

@@ -4,21 +4,23 @@
 //
 //  Renders markdown content with syntax-highlighted code blocks
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import SwiftUI
@@ -59,15 +61,8 @@ struct MarkdownContentView: View {
             .markdownBlockStyle(\.paragraph) { configuration in
                 configuration.label
                     .markdownMargin(top: 0, bottom: 8)
-                    // MarkdownUI builds mixed-style paragraphs (bold/italic runs alongside
-                    // plain text) as concatenated Text(+) segments, which on macOS report
-                    // their ideal (unwrapped, single-line) size instead of wrapping to the
-                    // width actually available — truncating with "…" mid-word. Forcing the
-                    // height to be recomputed for the given (flexible) width fixes it.
-                    .fixedSize(horizontal: false, vertical: true)
             }
             .textSelection(.enabled)
-            .frame(maxWidth: .infinity, alignment: .leading)
     }
 
     // MARK: - Parsing

oAI/Views/Main/MessageRow.swift

@@ -4,21 +4,23 @@
 //
 //  Individual message display
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import SwiftUI
@@ -183,7 +185,6 @@ struct MessageRow: View {
                     .foregroundColor(.oaiSecondary)
                 }
             }
-            .frame(maxWidth: .infinity, alignment: .leading)
         }
         .padding(16)
         .background(Color.messageBackground(for: message.role))

oAI/Views/Main/NativeTextEditor.swift

@@ -5,7 +5,7 @@
 //  NSViewRepresentable text editor with correct Enter-key semantics:
 //  plain Enter → send, Shift+Enter or Cmd+Enter → newline.
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 
 import SwiftUI

oAI/Views/Main/SidebarView.swift

@@ -4,21 +4,23 @@
 //
 //  Collapsible sidebar: new chat, conversation list, status pills
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import SwiftUI

oAI/Views/Main/SyncStatusIndicator.swift

@@ -4,21 +4,23 @@
 //
 //  Git sync status indicator (bottom-right corner)
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import SwiftUI

oAI/Views/Screens/AboutView.swift

@@ -4,21 +4,23 @@
 //
 //  About modal with app icon and version info
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import SwiftUI
@@ -64,7 +66,7 @@ struct AboutView: View {
                     .font(.caption)
                     .foregroundStyle(.secondary)
 
-                Text("[PolyForm Noncommercial License 1.0.0](https://polyformproject.org/licenses/noncommercial/1.0.0)")
+                Text("[GNU Affero General Public License v3.0](https://www.gnu.org/licenses/agpl-3.0.html)")
                     .font(.caption)
                     .foregroundStyle(.secondary)
 

oAI/Views/Screens/AgentSkillEditorSheet.swift

@@ -4,21 +4,23 @@
 //
 //  Create or edit a SKILL.md-style agent skill, with optional support files
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import SwiftUI

oAI/Views/Screens/AgentSkillsView.swift

@@ -4,21 +4,23 @@
 //
 //  Modal for managing SKILL.md-style agent skills (opened via /skills command)
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import SwiftUI
@@ -111,9 +113,7 @@ struct AgentSkillsView: View {
                             onToggle: { settings.toggleAgentSkill(id: skill.id) },
                             onEdit: { editContext = SkillEditContext(skill: skill) },
                             onExport: { exportOne(skill) },
-                            onDelete: { settings.deleteAgentSkill(id: skill.id) },
-                            isTrusted: settings.trustSecondBrainSkill,
-                            onToggleTrust: { settings.trustSecondBrainSkill.toggle() }
+                            onDelete: { settings.deleteAgentSkill(id: skill.id) }
                         )
                     }
                 }
@@ -349,8 +349,6 @@ private struct AgentSkillRow: View {
     let onEdit: () -> Void
     let onExport: () -> Void
     let onDelete: () -> Void
-    var isTrusted: Bool = false
-    var onToggleTrust: (() -> Void)? = nil
 
     private var fileCount: Int {
         AgentSkillFilesService.shared.listFiles(for: skill.id).count
@@ -380,14 +378,6 @@ private struct AgentSkillRow: View {
 
             Spacer()
 
-            // 2nd Brain: let the user mark bash calls to its helper script as always-trusted,
-            // skipping the bash approval dialog. Only shown for this specific skill while active.
-            if skill.isActive, skill.isSecondBrainSkill, let onToggleTrust {
-                Toggle("Trust", isOn: Binding(get: { isTrusted }, set: { _ in onToggleTrust() }))
-                    .toggleStyle(.switch).controlSize(.small)
-                    .help("When on, bash commands that call the 2nd Brain helper script run without asking for approval each time.")
-            }
-
             // File count badge
             if fileCount > 0 {
                 Label("^[\(fileCount) file](inflect: true)", systemImage: "doc")
@@ -489,9 +479,7 @@ struct AgentSkillsTabContent: View {
                             onToggle: { settings.toggleAgentSkill(id: skill.id) },
                             onEdit: { editContext = SkillEditContext(skill: skill) },
                             onExport: { exportOne(skill) },
-                            onDelete: { settings.deleteAgentSkill(id: skill.id) },
-                            isTrusted: settings.trustSecondBrainSkill,
-                            onToggleTrust: { settings.trustSecondBrainSkill.toggle() }
+                            onDelete: { settings.deleteAgentSkill(id: skill.id) }
                         )
                         if idx < settings.agentSkills.count - 1 { Divider() }
                     }

oAI/Views/Screens/BashApprovalSheet.swift

@@ -4,21 +4,23 @@
 //
 //  Approval UI for AI-requested bash commands
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import SwiftUI

oAI/Views/Screens/CombineConversationsSheet.swift

@@ -4,21 +4,23 @@
 //
 //  Combine 2+ saved conversations into one, optionally using AI to merge content
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import SwiftUI

oAI/Views/Screens/ConversationListView.swift

@@ -4,21 +4,23 @@
 //
 //  Saved conversations list
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import os

oAI/Views/Screens/CreditsView.swift

@@ -4,21 +4,23 @@
 //
 //  Account credits and balance
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import SwiftUI

oAI/Views/Screens/EmailLogView.swift

@@ -4,21 +4,23 @@
 //
 //  Email handler activity log viewer
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import SwiftUI

oAI/Views/Screens/HelpView.swift

@@ -4,21 +4,23 @@
 //
 //  Help and commands reference with expandable detail and search
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import SwiftUI
@@ -50,7 +52,7 @@ private let helpCategories: [CommandCategory] = [
             brief: "View command history",
             detail: "Opens a searchable modal showing all your previous messages with timestamps in European format (dd.MM.yyyy HH:mm:ss). Search by text content or date to find specific messages. Click any entry to reuse it.",
             examples: ["/history"],
-            shortcut: "⇧⌘H"
+            shortcut: "⌘H"
         ),
         CommandDetail(
             command: "/clear",

oAI/Views/Screens/HistoryView.swift

@@ -4,21 +4,23 @@
 //
 //  Command history viewer with search
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import os

oAI/Views/Screens/JarvisView.swift

@@ -4,7 +4,7 @@
 //
 //  Main modal for managing Jarvis (oAI-Web) agents and usage.
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 
 import SwiftUI

oAI/Views/Screens/ModelInfoView.swift

@@ -4,21 +4,23 @@
 //
 //  Rich model information modal
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import SwiftUI

oAI/Views/Screens/ModelSelectorView.swift

@@ -4,21 +4,23 @@
 //
 //  Model selection screen
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import SwiftUI

oAI/Views/Screens/PersonalDataApprovalSheet.swift

@@ -1,95 +0,0 @@
-//
-//  PersonalDataApprovalSheet.swift
-//  oAI
-//
-//  Approval UI for AI-requested Calendar/Reminders write actions
-//
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
-// Copyright (C) 2026 Rune Olsen
-//
-// This file is part of oAI.
-//
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
-//
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
-
-
-import SwiftUI
-
-struct PersonalDataApprovalSheet: View {
-    let pending: MCPService.PendingPersonalDataAction
-    let onApprove: (_ forSession: Bool) -> Void
-    let onDeny: () -> Void
-
-    var body: some View {
-        VStack(alignment: .leading, spacing: 20) {
-            // Header
-            HStack(spacing: 12) {
-                Image(systemName: "calendar.badge.exclamationmark")
-                    .font(.title2)
-                    .foregroundStyle(.orange)
-                VStack(alignment: .leading, spacing: 2) {
-                    Text("Allow This Action?")
-                        .font(.system(size: 17, weight: .semibold))
-                    Text("The AI wants to make a change to your calendar or reminders")
-                        .font(.system(size: 13))
-                        .foregroundStyle(.secondary)
-                }
-                Spacer()
-            }
-
-            // Action description
-            VStack(alignment: .leading, spacing: 6) {
-                Text("ACTION")
-                    .font(.system(size: 11, weight: .medium))
-                    .foregroundStyle(.secondary)
-                Text(pending.summary)
-                    .font(.system(size: 13))
-                    .foregroundStyle(.primary)
-                    .frame(maxWidth: .infinity, alignment: .leading)
-                    .textSelection(.enabled)
-                    .padding(12)
-                    .background(Color.secondary.opacity(0.08))
-                    .clipShape(RoundedRectangle(cornerRadius: 8))
-                    .overlay(
-                        RoundedRectangle(cornerRadius: 8)
-                            .stroke(Color.secondary.opacity(0.2), lineWidth: 1)
-                    )
-            }
-
-            // Buttons
-            HStack(spacing: 8) {
-                Button("Deny") {
-                    onDeny()
-                }
-                .buttonStyle(.bordered)
-                .tint(.red)
-                .keyboardShortcut(.escape, modifiers: [])
-
-                Spacer()
-
-                Button("Allow Once") {
-                    onApprove(false)
-                }
-                .buttonStyle(.bordered)
-                .tint(.orange)
-
-                Button("Allow for Session") {
-                    onApprove(true)
-                }
-                .buttonStyle(.borderedProminent)
-                .tint(.orange)
-                .keyboardShortcut(.return, modifiers: [])
-            }
-        }
-        .padding(24)
-        .frame(width: 480)
-    }
-}

oAI/Views/Screens/SettingsView.swift

@@ -4,21 +4,23 @@
 //
 //  Settings and configuration screen
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import SwiftUI
@@ -73,20 +75,6 @@ struct SettingsView: View {
     // Default model picker state
     @State private var showDefaultModelPicker = false
 
-    // External MCP Servers state
-    @State private var showAddExternalMCPServer = false
-    @State private var newMCPServerName = ""
-    @State private var newMCPServerCommand = ""
-    @State private var newMCPServerArgs = ""
-    @State private var newMCPServerTimeout: Double = 30
-    private var externalMCPManager = ExternalMCPManager.shared
-
-    // Personal Data state (Calendar/Reminders/Contacts/Location/Maps)
-    @State private var calendarAccessState = EventKitService.shared.calendarAccessState
-    @State private var remindersAccessState = EventKitService.shared.reminderAccessState
-    @State private var contactsAccessState = ContactsService.shared.accessState
-    @State private var locationAccessState = LocationMapsService.shared.accessState
-
     // Paperless-NGX state
     @State private var paperlessURL = ""
     @State private var paperlessToken = ""
@@ -764,367 +752,6 @@ It's better to admit "I need more information" or "I cannot do that" than to fak
                 .padding(.horizontal, 4)
             }
         }
-
-        // MARK: Research Agents
-        Divider()
-
-        VStack(alignment: .leading, spacing: 8) {
-            HStack(spacing: 8) {
-                Image(systemName: "person.3.fill")
-                    .font(.title2)
-                    .foregroundStyle(.indigo)
-                Text("Research Agents")
-                    .font(.system(size: 18, weight: .semibold))
-            }
-            Text("Let the AI spawn read-only research sub-agents to investigate multiple things in parallel (read files, list/search directories, search the web — no writing, no bash). Intended for genuinely independent research tasks, not everyday questions.")
-                .font(.system(size: 14))
-                .foregroundStyle(.secondary)
-                .fixedSize(horizontal: false, vertical: true)
-        }
-        .padding(.bottom, 4)
-
-        VStack(alignment: .leading, spacing: 6) {
-            sectionHeader("Status")
-            formSection {
-                row("Enable Research Agents") {
-                    Toggle("", isOn: $settingsService.agentsEnabled)
-                        .toggleStyle(.switch)
-                }
-            }
-        }
-
-        HStack(alignment: .top, spacing: 6) {
-            Image(systemName: "exclamationmark.triangle.fill")
-                .font(.system(size: 12))
-                .foregroundStyle(.orange)
-                .padding(.top, 1)
-            Text("Cost warning: each sub-agent runs its own full chain of model calls. A single request that spawns several agents can cost several times a normal reply. The AI is instructed to only use this for genuinely parallel research, but model behavior can vary — leave this off unless you want that tradeoff.")
-                .font(.system(size: 13))
-                .foregroundStyle(.secondary)
-                .fixedSize(horizontal: false, vertical: true)
-        }
-        .padding(.horizontal, 4)
-
-        if settingsService.agentsEnabled {
-            VStack(alignment: .leading, spacing: 6) {
-                sectionHeader("Settings")
-                formSection {
-                    row("Max Concurrent Agents") {
-                        HStack(spacing: 8) {
-                            Stepper("", value: $settingsService.maxConcurrentAgents, in: 1...5)
-                                .labelsHidden()
-                            Text("\(settingsService.maxConcurrentAgents)")
-                                .font(.system(size: 13))
-                                .foregroundStyle(.secondary)
-                                .frame(width: 24, alignment: .trailing)
-                        }
-                    }
-                }
-            }
-        }
-
-        // MARK: External MCP Servers
-        Divider()
-        externalMCPSection
-
-        // MARK: Personal Data
-        // isHiddenPendingAppleFix hides the entire section (macOS 27 beta TCC bug).
-        // isContactsHiddenPendingAppleFix hides just the Contacts row (still broken in beta 2
-        // under hardened runtime while Calendar/Reminders/Location are fixed). Flip each flag
-        // to false once Apple ships a fix.
-        if !PersonalDataTools.isHiddenPendingAppleFix {
-        Divider()
-
-        VStack(alignment: .leading, spacing: 8) {
-            HStack(spacing: 8) {
-                Image(systemName: "person.crop.circle.badge.checkmark")
-                    .font(.title2)
-                    .foregroundStyle(.teal)
-                Text("Personal Data")
-                    .font(.system(size: 18, weight: .semibold))
-                if PersonalDataTools.isContactsHiddenPendingAppleFix {
-                    Text("β")
-                        .font(.system(size: 11, weight: .bold))
-                        .foregroundStyle(.orange)
-                        .padding(.horizontal, 5)
-                        .padding(.vertical, 2)
-                        .background(Color.orange.opacity(0.15))
-                        .clipShape(RoundedRectangle(cornerRadius: 4))
-                        .help("Beta Feature. May change.")
-                }
-            }
-            Text("Let the AI access your Calendar, Reminders, and Location & Maps to answer questions about your schedule and surroundings. Each service is opt-in and uses standard macOS permission prompts. This functionality is in beta and may change.")
-                .font(.system(size: 14))
-                .foregroundStyle(.secondary)
-                .fixedSize(horizontal: false, vertical: true)
-        }
-        .padding(.bottom, 4)
-        .onAppear {
-            // Permission status can change outside the app (System Settings, or a prior
-            // request elsewhere) — re-read it fresh every time this tab appears rather than
-            // trusting the one-time @State initializer.
-            calendarAccessState = EventKitService.shared.calendarAccessState
-            remindersAccessState = EventKitService.shared.reminderAccessState
-            contactsAccessState = ContactsService.shared.accessState
-            locationAccessState = LocationMapsService.shared.accessState
-        }
-
-        VStack(alignment: .leading, spacing: 6) {
-            sectionHeader("Services")
-            formSection {
-                personalDataRow(
-                    title: "Calendar",
-                    isEnabled: $settingsService.calendarEnabled,
-                    state: calendarAccessState,
-                    systemSettingsAnchor: "Privacy_Calendars",
-                    requestAccess: { calendarAccessState = await EventKitService.shared.requestCalendarAccess() ? .granted : EventKitService.shared.calendarAccessState }
-                )
-                rowDivider()
-                personalDataRow(
-                    title: "Reminders",
-                    isEnabled: $settingsService.remindersEnabled,
-                    state: remindersAccessState,
-                    systemSettingsAnchor: "Privacy_Reminders",
-                    requestAccess: { remindersAccessState = await EventKitService.shared.requestReminderAccess() ? .granted : EventKitService.shared.reminderAccessState }
-                )
-                rowDivider()
-                if !PersonalDataTools.isContactsHiddenPendingAppleFix {
-                    personalDataRow(
-                        title: "Contacts",
-                        isEnabled: $settingsService.contactsEnabled,
-                        state: contactsAccessState,
-                        systemSettingsAnchor: "Privacy_Contacts",
-                        requestAccess: { contactsAccessState = await ContactsService.shared.requestAccess() ? .granted : ContactsService.shared.accessState }
-                    )
-                    rowDivider()
-                }
-                personalDataRow(
-                    title: "Location & Maps",
-                    isEnabled: $settingsService.locationMapsEnabled,
-                    state: locationAccessState,
-                    systemSettingsAnchor: "Privacy_LocationServices",
-                    requestAccess: { locationAccessState = await LocationMapsService.shared.requestAccess() ? .granted : LocationMapsService.shared.accessState }
-                )
-            }
-        }
-
-        if settingsService.calendarEnabled || settingsService.remindersEnabled {
-            VStack(alignment: .leading, spacing: 6) {
-                sectionHeader("Write Actions")
-                formSection {
-                    row("Require Approval for Changes") {
-                        Toggle("", isOn: $settingsService.personalDataRequireApproval)
-                            .toggleStyle(.switch)
-                    }
-                }
-            }
-            Text("Creating calendar events or reminders, and completing reminders, will ask for your approval first.")
-                .font(.system(size: 13))
-                .foregroundStyle(.secondary)
-                .fixedSize(horizontal: false, vertical: true)
-                .padding(.horizontal, 4)
-        }
-        }
-    }
-
-    // MARK: - External MCP Servers Section
-
-    @ViewBuilder
-    private var externalMCPSection: some View {
-        VStack(alignment: .leading, spacing: 8) {
-            HStack(spacing: 8) {
-                Image(systemName: "server.rack")
-                    .font(.title2)
-                    .foregroundStyle(.purple)
-                Text("External MCP Servers")
-                    .font(.system(size: 18, weight: .semibold))
-            }
-            Text("Connect any stdio MCP server (e.g. safaridriver --mcp) to give the AI access to its tools. Tool names are prefixed with the server slug.")
-                .font(.system(size: 14))
-                .foregroundStyle(.secondary)
-                .fixedSize(horizontal: false, vertical: true)
-        }
-        .padding(.bottom, 4)
-
-        VStack(alignment: .leading, spacing: 6) {
-            sectionHeader("Configured Servers")
-            formSection {
-                if settingsService.externalMCPServers.isEmpty {
-                    VStack(spacing: 8) {
-                        Image(systemName: "server.rack")
-                            .font(.system(size: 32))
-                            .foregroundStyle(.tertiary)
-                        Text("No external servers configured")
-                            .font(.system(size: 14, weight: .medium))
-                            .foregroundStyle(.secondary)
-                        Text("Add a server below, e.g.: safaridriver --mcp")
-                            .font(.system(size: 12))
-                            .foregroundStyle(.tertiary)
-                    }
-                    .frame(maxWidth: .infinity)
-                    .padding(.vertical, 20)
-                } else {
-                    ForEach(settingsService.externalMCPServers) { server in
-                        HStack(spacing: 10) {
-                            Circle()
-                                .fill(mcpStatusColor(externalMCPManager.clientStates[server.id]))
-                                .frame(width: 8, height: 8)
-                            VStack(alignment: .leading, spacing: 2) {
-                                Text(server.name)
-                                    .font(.system(size: 14))
-                                Text(([server.command] + server.args).joined(separator: " "))
-                                    .font(.system(size: 11, design: .monospaced))
-                                    .foregroundStyle(.secondary)
-                                    .lineLimit(1)
-                            }
-                            Spacer()
-                            Text(mcpStatusLabel(externalMCPManager.clientStates[server.id]))
-                                .font(.system(size: 11))
-                                .foregroundStyle(.secondary)
-                            Toggle("", isOn: Binding(
-                                get: { server.isEnabled },
-                                set: { _ in settingsService.toggleExternalMCPServer(id: server.id) }
-                            ))
-                            .toggleStyle(.switch)
-                            .labelsHidden()
-                            Button {
-                                settingsService.deleteExternalMCPServer(id: server.id)
-                            } label: {
-                                Image(systemName: "trash.fill")
-                                    .foregroundStyle(.red)
-                                    .font(.system(size: 13))
-                            }
-                            .buttonStyle(.plain)
-                        }
-                        .padding(.horizontal, 16)
-                        .padding(.vertical, 10)
-                        if server.id != settingsService.externalMCPServers.last?.id {
-                            rowDivider()
-                        }
-                    }
-                }
-            }
-
-            Button {
-                newMCPServerName = ""
-                newMCPServerCommand = ""
-                newMCPServerArgs = ""
-                newMCPServerTimeout = 30
-                showAddExternalMCPServer = true
-            } label: {
-                Label("Add Server…", systemImage: "plus")
-                    .font(.system(size: 13, weight: .medium))
-                    .foregroundStyle(.white)
-                    .padding(.horizontal, 14)
-                    .padding(.vertical, 7)
-                    .background(Color.purple)
-                    .clipShape(RoundedRectangle(cornerRadius: 8))
-            }
-            .buttonStyle(.plain)
-        }
-        .sheet(isPresented: $showAddExternalMCPServer) {
-            addExternalMCPServerSheet
-        }
-    }
-
-    @ViewBuilder
-    private var addExternalMCPServerSheet: some View {
-        VStack(alignment: .leading, spacing: 20) {
-            Text("Add External MCP Server")
-                .font(.system(size: 16, weight: .semibold))
-                .frame(maxWidth: .infinity, alignment: .center)
-
-            formSection {
-                row("Name") {
-                    TextField("Safari", text: $newMCPServerName)
-                        .textFieldStyle(.roundedBorder)
-                        .frame(width: 240)
-                }
-                rowDivider()
-                row("Command") {
-                    TextField("safaridriver", text: $newMCPServerCommand)
-                        .textFieldStyle(.roundedBorder)
-                        .font(.system(size: 13, design: .monospaced))
-                        .frame(width: 240)
-                }
-                rowDivider()
-                row("Arguments") {
-                    TextField("--mcp", text: $newMCPServerArgs)
-                        .textFieldStyle(.roundedBorder)
-                        .font(.system(size: 13, design: .monospaced))
-                        .frame(width: 240)
-                        .help("Space-separated arguments")
-                }
-                rowDivider()
-                row("Timeout") {
-                    HStack(spacing: 8) {
-                        Stepper("", value: $newMCPServerTimeout, in: 5...120, step: 5)
-                            .labelsHidden()
-                        Text("\(Int(newMCPServerTimeout))s")
-                            .font(.system(size: 13))
-                            .foregroundStyle(.secondary)
-                            .frame(width: 32, alignment: .leading)
-                    }
-                }
-            }
-
-            if !newMCPServerName.isEmpty {
-                let slug = ExternalMCPServer.makeSlug(from: newMCPServerName)
-                HStack(spacing: 6) {
-                    Text("Tool prefix:")
-                        .font(.system(size: 12))
-                        .foregroundStyle(.secondary)
-                    Text("\(slug)_")
-                        .font(.system(size: 12, design: .monospaced))
-                        .foregroundStyle(.secondary)
-                }
-                if ExternalMCPServer.reservedSlugs.contains(slug) {
-                    Text("'\(slug)' is a reserved prefix. Choose a different name.")
-                        .font(.system(size: 12))
-                        .foregroundStyle(.red)
-                }
-            }
-
-            HStack {
-                Button("Cancel") { showAddExternalMCPServer = false }
-                Spacer()
-                Button("Add") {
-                    let args = ExternalMCPServer.parseArguments(newMCPServerArgs)
-                    let server = ExternalMCPServer(
-                        name: newMCPServerName,
-                        command: newMCPServerCommand,
-                        args: args,
-                        timeout: newMCPServerTimeout
-                    )
-                    settingsService.addExternalMCPServer(server)
-                    showAddExternalMCPServer = false
-                }
-                .buttonStyle(.borderedProminent)
-                .disabled(newMCPServerName.isEmpty || newMCPServerCommand.isEmpty ||
-                          ExternalMCPServer.reservedSlugs.contains(ExternalMCPServer.makeSlug(from: newMCPServerName)))
-            }
-        }
-        .padding(24)
-        .frame(minWidth: 460, minHeight: 320)
-    }
-
-    private func mcpStatusColor(_ state: MCPClientState?) -> Color {
-        switch state {
-        case .ready:           return .green
-        case .connecting:      return .orange
-        case .error, .crashed: return .red
-        default:               return Color(nsColor: .tertiaryLabelColor)
-        }
-    }
-
-    private func mcpStatusLabel(_ state: MCPClientState?) -> LocalizedStringKey {
-        switch state {
-        case .ready:      return "Connected"
-        case .connecting: return "Connecting…"
-        case .error:      return "Error"
-        case .crashed:    return "Crashed"
-        default:          return "Not started"
-        }
     }
 
     // MARK: - Appearance Tab
@@ -2819,57 +2446,6 @@ It's better to admit "I need more information" or "I cannot do that" than to fak
         Divider().padding(.leading, 16)
     }
 
-    @ViewBuilder
-    private func personalDataRow(title: LocalizedStringKey, isEnabled: Binding<Bool>, state: PersonalDataAccessState, systemSettingsAnchor: String, requestAccess: @escaping () async -> Void) -> some View {
-        VStack(alignment: .leading, spacing: 6) {
-            HStack(alignment: .center, spacing: 12) {
-                Text(title).font(.system(size: 14))
-                Spacer()
-                Toggle("", isOn: isEnabled)
-                    .toggleStyle(.switch)
-            }
-            if isEnabled.wrappedValue {
-                HStack(spacing: 6) {
-                    Image(systemName: state == .granted ? "checkmark.circle.fill" : (state == .denied ? "exclamationmark.circle.fill" : "circle"))
-                        .foregroundStyle(state == .granted ? .green : (state == .denied ? .orange : .secondary))
-                        .font(.system(size: 12))
-                    Text(statusText(for: state))
-                        .font(.system(size: 12))
-                        .foregroundStyle(.secondary)
-                    Spacer()
-                    if state == .notDetermined {
-                        Button("Request Access") {
-                            Task { await requestAccess() }
-                        }
-                        .buttonStyle(.bordered)
-                        .controlSize(.small)
-                    } else if state == .denied {
-                        Button("Open System Settings") {
-                            openPrivacySettings(anchor: systemSettingsAnchor)
-                        }
-                        .buttonStyle(.bordered)
-                        .controlSize(.small)
-                    }
-                }
-            }
-        }
-        .padding(.horizontal, 16)
-        .padding(.vertical, 10)
-    }
-
-    private func statusText(for state: PersonalDataAccessState) -> LocalizedStringKey {
-        switch state {
-        case .granted: return "Access granted"
-        case .denied: return "Access denied — enable in System Settings"
-        case .notDetermined: return "Access not granted"
-        }
-    }
-
-    private func openPrivacySettings(anchor: String) {
-        guard let url = URL(string: "x-apple.systempreferences:com.apple.preference.security?\(anchor)") else { return }
-        NSWorkspace.shared.open(url)
-    }
-
     private func abbreviatePath(_ path: String) -> String {
         let home = NSHomeDirectory()
         if path.hasPrefix(home) {

oAI/Views/Screens/SkillEditorSheet.swift

@@ -4,21 +4,23 @@
 //
 //  Create or edit a user-defined shortcut (prompt template)
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import SwiftUI

oAI/Views/Screens/SkillsView.swift

@@ -4,21 +4,23 @@
 //
 //  Modal for managing user-defined shortcuts (opened via /shortcuts command)
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import SwiftUI

oAI/Views/Screens/StatsView.swift

@@ -4,21 +4,23 @@
 //
 //  Session statistics screen
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import SwiftUI

oAI/oAI-InfoPlist.xcstrings

@@ -36,54 +36,6 @@
           }
         }
       }
-    },
-    "NSCalendarsFullAccessUsageDescription" : {
-      "comment" : "Privacy - Calendars Full Access Usage Description",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "oAI can read and create calendar events when you ask it to, if you enable Calendar access in Settings."
-          }
-        }
-      }
-    },
-    "NSContactsUsageDescription" : {
-      "comment" : "Privacy - Contacts Usage Description",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "oAI can search your contacts when you ask it to, if you enable Contacts access in Settings."
-          }
-        }
-      }
-    },
-    "NSLocationWhenInUseUsageDescription" : {
-      "comment" : "Privacy - Location When In Use Usage Description",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "oAI can use your current location to answer questions, if you enable Location & Maps access in Settings."
-          }
-        }
-      }
-    },
-    "NSRemindersFullAccessUsageDescription" : {
-      "comment" : "Privacy - Reminders Full Access Usage Description",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "oAI can read and create reminders when you ask it to, if you enable Reminders access in Settings."
-          }
-        }
-      }
     }
   },
   "version" : "1.1"

oAI/oAI.entitlements

@@ -8,13 +8,5 @@
 	<true/>
 	<key>com.apple.security.network.server</key>
 	<false/>
-	<key>com.apple.security.personal-information.calendars</key>
-	<true/>
-	<key>com.apple.security.personal-information.reminders</key>
-	<true/>
-	<key>com.apple.security.personal-information.contacts</key>
-	<true/>
-	<key>com.apple.security.personal-information.location</key>
-	<true/>
 </dict>
 </plist>

oAI/oAIApp.swift

@@ -4,21 +4,23 @@
 //
 //  Main app entry point
 //
-// SPDX-License-Identifier: PolyForm-Noncommercial-1.0.0
+// SPDX-License-Identifier: AGPL-3.0-or-later
 // Copyright (C) 2026 Rune Olsen
 //
 // This file is part of oAI.
 //
-// oAI is licensed under the PolyForm Noncommercial License 1.0.0.
-// You may use, study, modify, and share it for any noncommercial
-// purpose. Commercial use — including selling oAI or any part of
-// it, standalone or bundled into another product or service —
-// requires a separate commercial license from the copyright holder.
+// oAI 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.
 //
-// See the LICENSE file or
-// <https://polyformproject.org/licenses/noncommercial/1.0.0> for
-// the full license text. For commercial licensing, contact Rune
-// Olsen via <https://oai.pm>.
+// oAI 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 oAI. If not, see <https://www.gnu.org/licenses/>.
 
 
 import SwiftUI
@@ -35,9 +37,6 @@ struct oAIApp: App {
         // Start email handler on app launch
         EmailHandlerService.shared.start()
 
-        // Start external MCP servers
-        Task { @MainActor in ExternalMCPManager.shared.startAll() }
-
         // Sync Git changes on app launch (pull + import)
         Task {
             await GitSyncService.shared.syncOnStartup()
@@ -57,7 +56,7 @@ struct oAIApp: App {
                 }
                 #if os(macOS)
                 .onReceive(NotificationCenter.default.publisher(for: NSApplication.willTerminateNotification)) { _ in
-                    Task { @MainActor in ExternalMCPManager.shared.stopAll() }
+                    // Trigger auto-save on app quit
                     Task {
                         await chatViewModel.onAppWillTerminate()
                     }
@@ -130,7 +129,7 @@ struct oAIApp: App {
                 Divider()
 
                 Button("Command History") { chatViewModel.showHistory = true }
-                    .keyboardShortcut("h", modifiers: [.command, .shift])
+                    .keyboardShortcut("h", modifiers: .command)
 
                 Button("In-App Help") { chatViewModel.showHelp = true }
                     .keyboardShortcut("/", modifiers: .command)