feat: multi tab scrolling optimization

.github/workflows/publish_action.yml

@@ -1,20 +0,0 @@
-name: Publish to Comfy registry
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-    paths:
-      - "pyproject.toml"
-
-jobs:
-  publish-node:
-    name: Publish Custom Node to registry
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-      - name: Publish Custom Node
-        uses: Comfy-Org/publish-node-action@main
-        with:
-          personal_access_token: ${{ secrets.REGISTRY_ACCESS_TOKEN }} ## Add your own personal access token to your Github Repository secrets and reference it here.

.gitignore

@@ -11,7 +11,6 @@ pnpm-debug.log*
 lerna-debug.log*
 
 ui/node_modules
-# ui/src/utils/encryptUtils.ts
 db
 dist-ssr
 *.local

LICENSE

@@ -1,21 +1,674 @@
-MIT License
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
-Copyright (c) 2024 11cafe
+ 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.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+                            Preamble
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is 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.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  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.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  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 Affero 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 special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU 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 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 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 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 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 General Public License for more details.
+
+    You should have received a copy of the GNU 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 the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  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 GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -1,10 +1,15 @@
 # ☕️ ComfyUI Workspace Manager - Comfyspace
 
-
-**[2025-4-16] 📣Hi since ComfyUI frontend has built-in workspace management feature now, this plugin becomes obsolte and will not be maintained anymore. Thanks everyone for supporting comfyui-workspace-manager! Sorry that this cannot continue anymore.**
-
 A ComfyUI workflow and model manager extension to **organize and manage all your workflows, models and generated images in one place**. Seamlessly switch between workflows, track version history and image generation history, 1 click install models from Civit ai, browse/update your installed models
 
+If you have questions or suggestions, please [join our Discord](https://discord.gg/HHvfEurv2Z)!
+
+[New!] we're building a comfyui custom nodes library wiki like Pypi: https://www.nodecafe.org/
+welcome any feedbacks!
+
+🔴‼️ If you updated or cloned this repo between March 14-17, 2024, please update it again to latest verison, there were some bugs that may cause you lose changes in Auto Save mode.
+
+‼️ [3-23-2024]**search and install models from civitai is not working in previous versions**, because civitai changed something in their api. **Please update to the latest version** if you are seeing blank screen in Install Models dialog
 
 <img width="610" alt="Screenshot 2024-03-08 at 6 41 18 PM" src="https://github.com/11cafe/comfyui-workspace-manager/assets/18367033/30455eb1-3d12-4930-bb81-28b33148fbaa">
 
@@ -16,26 +21,15 @@ Simply search for “ComfyUI Workspace Manager”, install, and restart ComfyUI.
 
 ### [Option 2] via git
 
-Like any other custom node installation, in your ComfyUI root folder run command and restart your ComfyUI.
+Like any other custom node installation, in your ComfyUI root folder
 
 ```
 cd custom_nodes && git clone https://github.com/11cafe/comfyui-workspace-manager.git
 ```
 
+and restart your ComfyUI.
 
-Please upgrade to V2 asap, you should see an **unicorn🦄** here instead of ☕️ (V1). I will stop supporting V1 soon.
-
-<img width="136" alt="Screenshot 2024-05-31 at 5 39 58 PM" src="https://github.com/11cafe/comfyui-workspace-manager/assets/18367033/f52a83f2-4679-4a40-95ed-e75584516ec5">
-
-Recommanded settings for V2 (Do not use these settings if you are on V1):
- - Enable two way sync (‼️ Will stop supporting non-two-way sync mode starting next version)
- - Make sure My Workspace Save Directory is valid path
-
-<img width="202" alt="Screenshot 2024-05-30 at 6 34 39 PM" src="https://github.com/11cafe/comfyui-workspace-manager/assets/18367033/67020966-c190-48cb-bffc-b715449d5c99">
-
-<img width="377" alt="335530039-10002a3f-ea2f-4bd1-8597-0ae1443d9851" src="https://github.com/11cafe/comfyui-workspace-manager/assets/18367033/6001a7f1-93f2-48ef-86c6-95c9560030ef">
-
-
+It is recommended to do git clone than downloading zip folder, because you can get latest updates by `git pull`!
 
 ## Features
 
@@ -43,11 +37,11 @@ Recommanded settings for V2 (Do not use these settings if you are on V1):
 
 - 🔁Switch between different workflows easily. 1click open workflow in multiple browser tabs.
 - 🤏**Drag and drop** to insert subworkflows into current flow.
-- 🗂️Organize workflows with folders (tags are deprecated, please use folders to organize)
+- 🗂️Organize workflows with folders, tags.
 - 📂Save and sync all your workflows in a local folder (by default under `/ComfyUI/my_workflows` customize in Settings)
   - **Save workflow by pressing the 💾 button, or ⌨Shift+S shortcut** (customize in Settings).
   - Every time you save, it will create a new record in **Version History**. You can easily revert to any version.
-  - **Enable/disable autosave workflow** (please disable autosave if you are experiencing UI slowing)
+  - **Enable/disable autosave workflow** (please disable autosave if you are experiencing UI lagging)
   - You can move files using OS File Explorer and it will be **two-way synced** with workspace.
 - 🕛**Version control** of workflow, create/switch versions
 - Bulk import workflows into your workspace
@@ -69,11 +63,31 @@ Recommend using Chrome browser for the best experience. Safari doesn't work well
 
 [中文版教程](https://www.uisdc.com/workspace-manager) &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [Roadmap](https://github.com/orgs/11cafe/projects/1/views/1)
 
-## Updates
+# <<<<<<< HEAD
 
-**🦄v2.0 Two-way sync with local folder, models manager support external models path like Automatic1111, cloud sync workflows**
-  
-v2.0 demo: https://youtu.be/7Hht_BMe844
+🚧🔴 Drag and drop to insert subworkflow is not working. I have debugged for many hours but just can't make it work perfectly. If anyone is interested here is the code:
+https://github.com/11cafe/comfyui-workspace-manager/blob/d2d2f0c1f1ace35236e73fa5074e9feb83342773/ui/src/utils.tsx#L192
+I would really appreciate it if someone can find a solution to insert a subworkflow to current canvas given the json object.
+
+### 🦄v2.0 beta: Two-way sync with local folder, select model install path, cloud sync workflows
+
+> > > > > > > dev
+
+**🦩v2.1 New gallery coming soon! Inspect image metadata, search image by prompt, model/lora used**
+
+<img width="700" alt="Screenshot 2024-03-23 at 12 58 38 AM" src="https://github.com/11cafe/comfyui-workspace-manager/assets/18367033/5bac9793-7491-4131-b850-037094d03823">
+
+Control+P quick spotlight search (like VSCode)
+
+<img width="500" alt="Screenshot 2024-03-27 at 3 49 35 PM" src="https://github.com/11cafe/comfyui-workspace-manager/assets/18367033/47c14904-180c-4c52-a644-223d0936c9fa">
+
+**🦄v2.0 Two-way sync with local folder, select model install path, cloud sync workflows**
+
+- Two-way sync with selected local folder so you can move files using File Explore or Finder to sync them with workspace!
+- **Models manager support external models path like Automatic1111**! Choose models downloading folder from added external paths.
+- Add models thumbnails image by putting a image file with the same name in models folder like A1111
+- One click sharing to cloud to backup your workflows to cloud
+  v2.0 demo: https://youtu.be/7Hht_BMe844
 
 **v1.7 ComfyUI model manager, view your installed models, install models from civit ai, open workflow in multiple browser tabs**
 
@@ -83,7 +97,7 @@ v2.0 demo: https://youtu.be/7Hht_BMe844
 
 <img width="200" alt="Screenshot 2024-01-23 at 12 26 56 AM" src="https://github.com/11cafe/comfyui-workspace-manager/assets/18367033/d29d0831-a15a-4597-acf6-facee4dbc76e">
 
-## Usage
+<img width="460" alt="gallery" src="https://github.com/11cafe/comfyui-workspace-manager/assets/18367033/2b7886c9-2d4a-46c6-adac-429720f74f11">
 
 switch between flows:
 
@@ -97,6 +111,10 @@ Bulk import flows:
 
 <img width="400" alt="Screenshot 2024-01-02 at 10 22 45 PM" src="https://github.com/11cafe/comfyui-workspace-manager/assets/18367033/884c8852-73c7-41d6-9179-7fb1fcea9d04">
 
+add tags to flow:
+
+<img width="400" alt="Screenshot 2023-12-13 at 1 54 04 AM" src="https://github.com/11cafe/comfyui-workspace-manager/assets/18367033/6bf4d22b-f52a-4d23-8882-4a31162616f3">
+
 Workflow operations: Manual Save, Download, Discard unsaved changes:
 
 <img width="500" alt="Screenshot 2023-12-29 at 9 59 57 PM" src="https://github.com/11cafe/comfyui-workspace-manager/assets/18367033/88c82672-ebf2-4feb-bf5b-74b447843c2c">

__init__.py

@@ -5,26 +5,24 @@ import folder_paths
 import shutil
 import os
 import sys
-import subprocess 
+import subprocess  # don't remove this
+from urllib.parse import urlparse
 import subprocess
 import os
 import json
+from .service.model_manager.model_installer import download_url_with_wget
+from .service.model_manager.model_list import get_model_list
 from .service.media_service import *
 from .service.file_sync_service import *
+from .service.db_service import get_my_workflows_dir
 from .service.node_service import *
-from .service.setting_service import *
-from .service.model_manager.model_installer import *
-try:
-    from send2trash import send2trash
-except ImportError:
-    send2trash = None
 
 WEB_DIRECTORY = "entry"
 NODE_CLASS_MAPPINGS = {}
 __all__ = ['NODE_CLASS_MAPPINGS']
-version = "V2.1.0"
+version = "V1.0.0"
 
-print(f"🦄🦄Loading: Workspace Manager ({version})")
+print(f"### Loading: Workspace Manager ({version})")
 workspace_path = os.path.join(os.path.dirname(__file__))
 comfy_path = os.path.dirname(folder_paths.__file__)
 db_dir_path = os.path.join(workspace_path, "db")
@@ -34,8 +32,39 @@ if os.path.exists(dist_path):
     server.PromptServer.instance.app.add_routes([
         web.static('/workspace_web/', dist_path),
     ])
-else:
-    print(f"🦄🦄🔴🔴Error: Web directory not found: {dist_path}")
+
+BACKUP_DIR = os.path.join(workspace_path, "backup")
+MAX_BACKUP_FILES = 20
+
+@server.PromptServer.instance.routes.post("/workspace/list_backup")
+async def list_backup(request):
+    try:
+        data = await request.json()
+        dir_path = os.path.join(BACKUP_DIR, data.get('dir'))
+        # List all files in the directory
+        files = os.listdir(dir_path)
+
+        # Filter out .json files and sort them by filename (which starts with Unix timestamp)
+        json_files = sorted(
+            [file for file in files if file.endswith('.json')],
+            key=lambda x: x,  # Assuming the format is 'timestamp_filename.json'
+            reverse=True
+        )
+
+        # Select the 10 most recent files
+        recent_json_files = json_files[:10]
+
+        # Read the contents of each JSON file
+        file_contents = []
+        for file in recent_json_files:
+            with open(os.path.join(dir_path, file), 'r') as f:
+                content = json.load(f)
+                file_contents.append({"fileName": file, "jsonStr": content})
+
+        return web.Response(text=json.dumps(file_contents), content_type='application/json')
+    except Exception as e:
+        return web.Response(text=json.dumps({"error": str(e)}), status=500)
+
 
 @server.PromptServer.instance.routes.post("/workspace/get_system_dir")
 async def get_system_dir(request):
@@ -83,28 +112,31 @@ async def update_file(request):
     await asyncio.to_thread(write_json_to_file, json_str)
     return web.Response(text="File updated successfully")
 
+
 @server.PromptServer.instance.routes.post("/workspace/delete_file")
 async def delete_file(request):
     data = await request.json()
     file_path = data['file_path']
+    delete_empty_folder = data['deleteEmptyFolder']
 
-    def sync_delete_file(file_path):
+    def sync_delete_file(file_path, delete_empty_folder):
         my_workflows_dir = get_my_workflows_dir()
         full_path = os.path.join(my_workflows_dir, file_path)
 
         if os.path.exists(full_path):
-            if send2trash:
-                send2trash(full_path)
+            os.remove(full_path)
+            directory = os.path.dirname(full_path)
+            if delete_empty_folder and not os.listdir(directory):
+                # If the directory is empty, remove the directory
+                os.rmdir(directory)
+                return "File and empty directory deleted successfully"
             else:
-                os.remove(full_path)
-                print("❌⛔️send2trash is not available. Deleting file permanently. Please `pip install send2trash`")
-
-            return "File deleted successfully"
+                return "File deleted successfully"
         else:
             return "File not found"
 
     # Run the synchronous file operation in a separate thread
-    response_text = await asyncio.to_thread(sync_delete_file, file_path)
+    response_text = await asyncio.to_thread(sync_delete_file, file_path, delete_empty_folder)
     
     if response_text == "File not found":
         return web.Response(text=response_text, status=404)

dist/workspace_web/AppIsDirtyEventListener-MhB0DEkr.js

@@ -1 +0,0 @@
-import{r as l,N as r}from"./input.js";import{W as S,ag as w,w as p,E as f,ah as _,ai as C}from"./App-qo42s2ji.js";import{u as b}from"./useDebounceFn-ld478fd0.js";function R(){const{isDirty:d,setIsDirty:h,setRoute:g,saveCurWorkflow:v,setCurFlowIDAndName:k}=l.useContext(S),E=l.useRef(d);l.useEffect(()=>{E.current=d},[d]),l.useEffect(()=>{const c=e=>{var n;if(document.visibilityState==="hidden")return;const t=C(e);if(t)switch(t===f.openSpotlightSearch&&e.preventDefault(),window.dispatchEvent(new CustomEvent(_,{detail:{shortcutType:t}})),t){case f.SAVE:v();break;case f.SAVE_AS:g("saveAsModal");break;case f.openSpotlightSearch:g("spotlightSearch");break}else(n=e.target)!=null&&n.matches("input, textarea")&&Object.keys(r.canvas.selected_nodes??{}).length&&m()},u=async()=>{var t,n,a,i;if(!((t=r)!=null&&t.graph)){console.error("🦄 Error in workspace manager! app.graph is not available in restoreCurWorkflow()");return}const e=(a=(n=r.graph.extra)==null?void 0:n[w])==null?void 0:a.id;if(e){const s=await((i=p)==null?void 0:i.get(e));s&&k(s),!(s!=null&&s.saveLock)&&s&&s.json!==JSON.stringify(r.graph.serialize())&&h(!0)}},o=r.graph.onConfigure;return r.graph.onConfigure=function(){o==null||o.apply(this,arguments),setTimeout(()=>{var t,n,a,i;const e=(n=(t=r.graph.extra)==null?void 0:t[w])==null?void 0:n.id;(e==null||e!=((i=(a=p)==null?void 0:a.curWorkflow)==null?void 0:i.id))&&k(null)},500)},document.addEventListener("click",e=>{Object.keys(r.canvas.selected_nodes??{}).length&&(r.canvas.node_over!=null||r.canvas.node_capturing_input!=null||r.canvas.node_widget!=null)&&m()}),document.addEventListener("keydown",c),u(),()=>{document.removeEventListener("keydown",c)}},[]);const y=async()=>{var u,o,e,t;if((o=(u=p)==null?void 0:u.curWorkflow)!=null&&o.saveLock||E.current)return;const c=r.graph.serialize();JSON.stringify(c)!==((t=(e=p)==null?void 0:e.curWorkflow)==null?void 0:t.json)&&h(!0)},[m,D]=b(y,900);return null}export{R as default};

dist/workspace_web/IconCopy-iXaxUe59.js

@@ -1 +0,0 @@
-import{d as a}from"./App-qo42s2ji.js";var p=a("copy","IconCopy",[["path",{d:"M7 7m0 2.667a2.667 2.667 0 0 1 2.667 -2.667h8.666a2.667 2.667 0 0 1 2.667 2.667v8.666a2.667 2.667 0 0 1 -2.667 2.667h-8.666a2.667 2.667 0 0 1 -2.667 -2.667z",key:"svg-0"}],["path",{d:"M4.012 16.737a2.005 2.005 0 0 1 -1.012 -1.737v-10c0 -1.1 .9 -2 2 -2h10c.75 0 1.158 .385 1.5 1",key:"svg-1"}]]);export{p as I};

dist/workspace_web/IconSearch-ZN34j33e.js

@@ -1 +0,0 @@
-import{d as a}from"./App-qo42s2ji.js";var r=a("search","IconSearch",[["path",{d:"M10 10m-7 0a7 7 0 1 0 14 0a7 7 0 1 0 -14 0",key:"svg-0"}],["path",{d:"M21 21l-6 -6",key:"svg-1"}]]);export{r as I};

dist/workspace_web/assets/App-JXePnJiV.css

@@ -1 +0,0 @@
-.dragPanelIcon{display:none!important}.workspaceManagerPanel:hover .dragPanelIcon{display:block!important}

dist/workspace_web/assets/ModelManagerTopbar--iv3sdjQ.css

@@ -1 +0,0 @@
-.drag-model-manager-top-bar-icon{visibility:hidden!important}.model-manager-top-bar:hover .drag-model-manager-top-bar-icon{visibility:visible!important}

dist/workspace_web/chunk-3RSXBRAN-0rzvZpzF.js

@@ -1 +0,0 @@
-import{f as x,j as l,g as i,e as w,k as C,o as E,l as I,r as f,a5 as P}from"./input.js";import{ab as z}from"./App-qo42s2ji.js";var v=x(function(o,s){const{children:t,placeholder:n,className:r,...a}=o;return l.jsxs(i.select,{...a,ref:s,className:w("chakra-select",r),children:[n&&l.jsx("option",{value:"",children:n}),t]})});v.displayName="SelectField";function F(e,o){const s={},t={};for(const[n,r]of Object.entries(e))o.includes(n)?s[n]=r:t[n]=r;return[s,t]}var H=x((e,o)=>{var s;const t=C("Select",e),{rootProps:n,placeholder:r,icon:a,color:c,height:_,h:d,minH:h,minHeight:y,iconColor:p,iconSize:u,...j}=E(e),[g,N]=F(j,P),m=z(N),k={width:"100%",height:"fit-content",position:"relative",color:c},b={paddingEnd:"2rem",...t.field,_focus:{zIndex:"unset",...(s=t.field)==null?void 0:s._focus}};return l.jsxs(i.div,{className:"chakra-select__wrapper",__css:k,...g,...n,children:[l.jsx(v,{ref:o,height:d??_,minH:h??y,placeholder:r,...m,__css:b,children:e.children}),l.jsx(S,{"data-disabled":I(m.disabled),...(p||c)&&{color:p||c},__css:t.icon,...u&&{fontSize:u},children:a})]})});H.displayName="Select";var M=e=>l.jsx("svg",{viewBox:"0 0 24 24",...e,children:l.jsx("path",{fill:"currentColor",d:"M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"})}),R=i("div",{baseStyle:{position:"absolute",display:"inline-flex",alignItems:"center",justifyContent:"center",pointerEvents:"none",top:"50%",transform:"translateY(-50%)"}}),S=e=>{const{children:o=l.jsx(M,{}),...s}=e,t=f.cloneElement(o,{role:"presentation",className:"chakra-select__icon",focusable:!1,"aria-hidden":!0,style:{width:"1em",height:"1em",color:"currentColor"}});return l.jsx(R,{...s,className:"chakra-select__icon-wrapper",children:f.isValidElement(o)?t:null})};S.displayName="SelectIcon";export{H as S};

dist/workspace_web/chunk-JARCRF6W-U6cp0GaY.js

@@ -1 +0,0 @@
-import{b as D,r as h,j as t,g as i,a2 as v,f as j,k as T,o as B,H as E,e as $}from"./input.js";import{u as z}from"./chunk-7D6N5TE5-rpRnbuGR.js";var[Z,F]=D({name:"CheckboxGroupContext",strict:!1});function M(o){const[s,n]=h.useState(o),[e,r]=h.useState(!1);return o!==s&&(r(!0),n(o)),e}function W(o){return t.jsx(i.svg,{width:"1.2em",viewBox:"0 0 12 10",style:{fill:"none",strokeWidth:2,stroke:"currentColor",strokeDasharray:16},...o,children:t.jsx("polyline",{points:"1.5 6 4.5 9 10.5 1"})})}function X(o){return t.jsx(i.svg,{width:"1.2em",viewBox:"0 0 24 24",style:{stroke:"currentColor",strokeWidth:4},...o,children:t.jsx("line",{x1:"21",x2:"3",y1:"12",y2:"12"})})}function H(o){const{isIndeterminate:s,isChecked:n,...e}=o,r=s?X:W;return n||s?t.jsx(i.div,{style:{display:"flex",alignItems:"center",justifyContent:"center",height:"100%"},children:t.jsx(r,{...e})}):null}var L={display:"inline-flex",alignItems:"center",justifyContent:"center",verticalAlign:"top",userSelect:"none",flexShrink:0},O={cursor:"pointer",display:"inline-flex",alignItems:"center",verticalAlign:"top",position:"relative"},q=v({from:{opacity:0,strokeDashoffset:16,transform:"scale(0.95)"},to:{opacity:1,strokeDashoffset:0,transform:"scale(1)"}}),J=v({from:{opacity:0},to:{opacity:1}}),K=v({from:{transform:"scaleX(0.65)"},to:{transform:"scaleX(1)"}}),Q=j(function(s,n){const e=F(),r={...e,...s},a=T("Checkbox",r),c=B(s),{spacing:x="0.5rem",className:C,children:m,iconColor:u,iconSize:d,icon:k=t.jsx(H,{}),isChecked:f,isDisabled:g=e==null?void 0:e.isDisabled,onChange:p,inputProps:w,..._}=c;let y=f;e!=null&&e.value&&c.value&&(y=e.value.includes(c.value));let b=p;e!=null&&e.onChange&&c.value&&(b=E(e.onChange,p));const{state:l,getInputProps:A,getCheckboxProps:S,getLabelProps:G,getRootProps:P}=z({..._,isDisabled:g,isChecked:y,onChange:b}),I=M(l.isChecked),R=h.useMemo(()=>({animation:I?l.isIndeterminate?`${J} 20ms linear, ${K} 200ms linear`:`${q} 200ms linear`:void 0,fontSize:d,color:u,...a.icon}),[u,d,I,l.isIndeterminate,a.icon]),N=h.cloneElement(k,{__css:R,isIndeterminate:l.isIndeterminate,isChecked:l.isChecked});return t.jsxs(i.label,{__css:{...O,...a.container},className:$("chakra-checkbox",C),...P(),children:[t.jsx("input",{className:"chakra-checkbox__input",...A(w,n)}),t.jsx(i.span,{__css:{...L,...a.control},className:"chakra-checkbox__control",...S(),children:N}),m&&t.jsx(i.span,{className:"chakra-checkbox__label",...G(),__css:{marginStart:x,...a.label},children:m})]})});Q.displayName="Checkbox";var U=j(function(s,n){const{templateAreas:e,gap:r,rowGap:a,columnGap:c,column:x,row:C,autoFlow:m,autoRows:u,templateRows:d,autoColumns:k,templateColumns:f,...g}=s,p={display:"grid",gridTemplateAreas:e,gridGap:r,gridRowGap:a,gridColumnGap:c,gridAutoColumns:k,gridColumn:x,gridRow:C,gridAutoFlow:m,gridAutoRows:u,gridTemplateRows:d,gridTemplateColumns:f};return t.jsx(i.div,{ref:n,__css:p,...g})});U.displayName="Grid";export{Q as C,U as G};

dist/workspace_web/chunk-NTCQBYKE-IkW3A38m.js

@@ -1 +0,0 @@
-import{f as t}from"./App-qo42s2ji.js";import{f as o,j as s}from"./input.js";var e=o((a,r)=>s.jsx(t,{align:"center",...a,direction:"column",ref:r}));e.displayName="VStack";export{e as V};

dist/workspace_web/chunk-VTV6N5LE-VOXf0Qhu.js

@@ -1 +0,0 @@
-import{f as l,n as f,o as h,j as e,g as n,e as m,k as y,r as o}from"./input.js";import{u as w}from"./chunk-7D6N5TE5-rpRnbuGR.js";var N=l(function(a,i){const s=f("Link",a),{className:c,isExternal:t,...r}=h(a);return e.jsx(n.a,{target:t?"_blank":void 0,rel:t?"noopener":void 0,ref:i,className:m("chakra-link",c),...r,__css:s})});N.displayName="Link";var j=l(function(a,i){const s=y("Switch",a),{spacing:c="0.5rem",children:t,...r}=h(a),{getIndicatorProps:u,getInputProps:p,getCheckboxProps:x,getRootProps:_,getLabelProps:g}=w(r),b=o.useMemo(()=>({display:"inline-block",position:"relative",verticalAlign:"middle",lineHeight:0,...s.container}),[s.container]),S=o.useMemo(()=>({display:"inline-flex",flexShrink:0,justifyContent:"flex-start",boxSizing:"content-box",cursor:"pointer",...s.track}),[s.track]),d=o.useMemo(()=>({userSelect:"none",marginStart:c,...s.label}),[c,s.label]);return e.jsxs(n.label,{..._(),className:m("chakra-switch",a.className),__css:b,children:[e.jsx("input",{className:"chakra-switch__input",...p({},i)}),e.jsx(n.span,{...x(),className:"chakra-switch__track",__css:S,children:e.jsx(n.span,{__css:s.thumb,className:"chakra-switch__thumb",...u()})}),t&&e.jsx(n.span,{className:"chakra-switch__label",...g(),__css:d,children:t})]})});j.displayName="Switch";export{N as L,j as S};

dist/workspace_web/civitUtils-zqcTmmqF.js

@@ -1 +0,0 @@
-import{h as m}from"./App-qo42s2ji.js";const r="WORKSPACE_CIVIT_API_KEY_STORAGE_KEY";function h(){return localStorage.getItem(r)}function g(e){localStorage.setItem(r,e)}function v(e){return`https://civitai.com/api/download/models/${e}`}async function w(e){var s,a,n;try{const l=`https://civitai.com/api/v1/model-versions/by-hash/${e}`,t=await(await fetch(l)).json();let i;if(await((s=m)==null?void 0:s.getSetting("showNsfwModelThumbnail"))===!0)i=(n=(a=t==null?void 0:t.images)==null?void 0:a[0])==null?void 0:n.url;else if(!t.model.nsfw){const o=t.images.find(c=>c.nsfwLevel==1);i=o==null?void 0:o.url}return{modelName:t.model.name,civitModelID:String(t.modelId),civitModelVersionID:String(t.id),imageUrl:i??void 0}}catch{return{}}}export{v as a,w as f,h as g,g as s};

dist/workspace_web/useDebounceFn-ld478fd0.js

@@ -1 +0,0 @@
-import{r}from"./input.js";function a(u,c){const e=r.useRef(0),t=r.useCallback(()=>{e.current!==null&&(clearTimeout(e.current),e.current=0)},[]),n=r.useCallback((...o)=>{t(),e.current=setTimeout(()=>u(...o),c)},[u,c,t]);return r.useEffect(()=>()=>{t()},[]),[n,t]}export{a as u};

entry/entry.js

@@ -1,6 +1,27 @@
-//@ts-ignore
-import { api } from "../../scripts/api.js";
+const targetNode = document.body;
 
-setTimeout(() => {
-  import(api.api_base + "/workspace_web/input.js");
-}, 500);
+// Options for the observer (which mutations to observe)
+const config = { childList: true, subtree: true };
+const api_base = window.location.pathname.split("/").slice(0, -1).join("/");
+
+// @ts-ignore
+const callback = function (mutationsList, observer) {
+  for (const mutation of mutationsList) {
+    if (mutation.type === "childList") {
+      // @ts-ignore
+      mutation.addedNodes.forEach((node) => {
+        if (node.nodeName === "CANVAS") {
+          // @ts-ignore
+          import(api_base + "/workspace_web/input.js");
+          observer.disconnect();
+        }
+      });
+    }
+  }
+};
+
+// Create an instance of the MutationObserver
+const observer = new MutationObserver(callback);
+
+// Start observing the target node for configured mutations
+observer.observe(targetNode, config);

pyproject.toml

@@ -1,13 +0,0 @@
-[project]
-name = "comfyui-workspace-manager"
-description = "A ComfyUI custom node for project management to centralize the management of all your workflows in one place. Seamlessly switch between workflows, create and update them within a single workspace, like Google Docs."
-version = "1.0.0"
-license = { file = "LICENSE" }
-
-[project.urls]
-Repository = "https://github.com/11cafe/comfyui-workspace-manager"
-
-[tool.comfy]
-PublisherId = "weixuan11"
-DisplayName = "comfyui-workspace-manager"
-Icon = ""

requirements.txt

@@ -1 +0,0 @@
-send2trash

service/db_service.py

@@ -51,3 +51,22 @@ async def get_workspace(request):
     table = request.query.get('table')
     data = await asyncio.to_thread(read_table, table)
     return web.json_response(data)
+
+def get_my_workflows_dir():
+    data = read_table('userSettings')
+    if (data):
+        records = json.loads(data)
+
+        if DEFAULT_USER in records and 'myWorkflowsDir' in records[DEFAULT_USER]:  
+            curDir = records[DEFAULT_USER]['myWorkflowsDir']  
+        elif 'myWorkflowsDir' in records:  
+            curDir = records['myWorkflowsDir']
+        
+        # this is to be compatible of a bug that a dict is stored in userSettings.myWorkflowsDir
+        # should not be needed once all users refresh their settings
+        if not isinstance(curDir, str):
+            curDir = curDir.get('path', None)
+
+        if curDir and os.path.exists(curDir):
+            return curDir
+    return os.path.join(comfy_path, 'my_workflows')

service/file_sync_service.py

@@ -1,6 +1,8 @@
 import asyncio
 import folder_paths
 from datetime import datetime
+import platform
+import tempfile
 import server
 import os
 from aiohttp import web
@@ -134,11 +136,7 @@ def read_workflow_file(path, id):
 
 def check_and_update_workflow_id(file_path, seen_ids):
     with open(file_path, "r", encoding="utf-8") as f:
-        try:
-                json_data = json.load(f)
-        except json.JSONDecodeError as e:
-            print(f"Error reading JSON from {file_path}: {e}")
-            return
+        json_data = json.load(f)
         if (
             "extra" in json_data
             and "workspace_info" in json_data["extra"]
@@ -174,10 +172,7 @@ def dedupe_workflow_ids():
             if not file.endswith(".json"):
                 continue
             file_path = os.path.join(root, file)
-            try:
-                check_and_update_workflow_id(file_path, seen_ids)
-            except Exception as e:
-                print(f"Error while processing file {file_path}: {e}")
+            check_and_update_workflow_id(file_path, seen_ids)
 
 @server.PromptServer.instance.routes.get('/workspace/deduplicate_workflow_ids')
 async def deduplicate_workflow_ids(request):

service/media_service.py

@@ -6,11 +6,10 @@ from aiohttp import FormData, web, ClientSession
 import folder_paths
 import os
 from .model_manager.model_preview import get_thumbnail_for_image_file
-from .setting_service import get_settings
 
 image_extensions = ['.jpg', '.jpeg', '.png', '.gif', '.webp']
 video_extensions = ['.mp4', '.mov', '.avi', '.webm', '.mkv']
-
+API_URL = 'https://www.nodecafe.org/api/image/upload'
 def view_media(filename, isPreview = False, isInput = False):
     if not filename:
         return web.Response(status=404)
@@ -63,9 +62,6 @@ async def view_file(request):
 
 @server.PromptServer.instance.routes.post("/workspace/upload_image")  # Handle POST requests
 async def upload_image_handler(request):
-    settings = get_settings()
-    cloudHost = settings.get("cloudHost", 'https://www.nodecafe.co')
-    API_URL = cloudHost + '/api/image/upload'
     data = await request.json()
     image_paths = data.get("images")
     if not image_paths:

service/model_manager/model_list.py

@@ -18,7 +18,7 @@ if not os.path.exists(FILE_HASH_DICT_FOLDER_PATH):
     os.makedirs(FILE_HASH_DICT_FOLDER_PATH)
 
 # Early open shelve for better performance
-with shelve.open(FILE_HASH_DICT_PATH) as file_hash_dict_early_open:
+with shelve.open(FILE_HASH_DICT_PATH) as file_hash_dict:
     print(f"Workspace manager - Openning file hash dict")
 
 file_list = []

service/scan_my_workflows_folder.py

@@ -3,16 +3,11 @@ from aiohttp import web
 import asyncio
 import json
 import os
-import traceback
-import logging
+import glob
 from threading import Lock
 import server
 import uuid
-from .setting_service import get_my_workflows_dir
-
-@server.PromptServer.instance.routes.get('/workspace/get_os')
-async def scan_my_workflows_files(request):
-    return web.Response(text= json.dumps({'os': platform.system()}), content_type='application/json')
+from .db_service import get_my_workflows_dir
 
 @server.PromptServer.instance.routes.post('/workspace/file/scan_my_workflows_folder')
 async def scan_my_workflows_files(request):
@@ -38,7 +33,6 @@ def folder_handle(path, recursive, metaInfoOnly, fileList=None):
                 createTime, updateTime = getFileCreateTime(item_path)
                 fileList.append({
                     'name': item,
-                    'path': item_path,
                     'type': 'folder',
                     'createTime': createTime,
                     'updateTime': updateTime
@@ -47,23 +41,16 @@ def folder_handle(path, recursive, metaInfoOnly, fileList=None):
                 if recursive:
                     folder_handle(item_path, recursive, metaInfoOnly, fileList)
         except Exception as e:
-            logging.error(f"Error scan workflow {item_path}: {e}, {traceback.format_exc()}")
+            print(f"Error scanning item {item}: {e}")
     return fileList
 
 def file_handle(name, fileList, file_path, metaInfoOnly):
     with open(file_path, 'r', encoding='utf-8') as f:
         json_data = json.load(f)
-
-    if not isinstance(json_data, (dict,)):
-        logging.error(f"{file_path} not in proper ComfyUI workflow format")
-        return
     
     createTime, updateTime = getFileCreateTime(file_path)
     workspace_info = json_data.get('extra', {}).get('workspace_info', {})   
     workflow_id = workspace_info.get('id', str(uuid.uuid4())) 
-    saveLock = workspace_info.get('saveLock', False) 
-    cloudID = workspace_info.get('cloudID', None) 
-    coverMediaPath = workspace_info.get('coverMediaPath', None) 
     # Update JSON data with new ID if needed and write back to file
     if 'id' not in workspace_info:
         if 'extra' not in json_data:
@@ -78,10 +65,6 @@ def file_handle(name, fileList, file_path, metaInfoOnly):
             'name': name,
             'type': "workflow",
             'id': workflow_id,
-            'path': file_path,
-            'saveLock': saveLock,
-            'cloudID': cloudID,
-            'coverMediaPath': coverMediaPath,
             'createTime': createTime,
             'updateTime': updateTime
         }
@@ -100,4 +83,4 @@ def getFileCreateTime(path):
         createTime = int(getattr(file_stats, 'st_birthtime', file_stats.st_ctime) * 1000)
     
     updateTime = int(file_stats.st_mtime * 1000)
-    return createTime, updateTime
+    return createTime, updateTime

service/setting_service.py

@@ -1,60 +0,0 @@
-
-import server
-import os
-import folder_paths
-import json
-import asyncio
-from aiohttp import web
-from .db_service import DEFAULT_USER, read_table, db_dir_path
-
-comfy_path = os.path.dirname(folder_paths.__file__)
-
-@server.PromptServer.instance.routes.get("/workspace/get_settings")
-def get_settings_endpoint(request):
-    settings = get_settings()
-    return web.json_response(text=json.dumps(settings), content_type='application/json')
-
-def get_settings():
-    new_settings_path = os.path.join(db_dir_path, 'settings.json')
-    if os.path.exists(new_settings_path):
-        # to deprecate and remove legacy settings file
-        # if os.path.exists(f'{db_dir_path}/useSettings.json'):
-        #     os.remove(f'{db_dir_path}/useSettings.json')
-        with open(new_settings_path, 'r') as file:
-            return json.load(file)
-    data = read_table('userSettings')
-    if (data):
-        records = json.loads(data)
-        if DEFAULT_USER in records and 'myWorkflowsDir' in records[DEFAULT_USER]:  
-            return records[DEFAULT_USER]
-    return None
-
-@server.PromptServer.instance.routes.post("/workspace/save_settings")
-async def save_settings(request):
-    data = await request.json()
-    json_data = data
-    file_name = f'{db_dir_path}/settings.json'
-    # Offload file writing to a separate thread
-    def write_json_string_to_db(file_name, json_data):
-        if not os.path.exists(db_dir_path):
-            os.makedirs(db_dir_path)
-        # Write the JSON data to the specified file
-        with open(file_name, 'w') as file:
-            file.write(json.dumps(json_data, indent=4))
-    await asyncio.to_thread(write_json_string_to_db, file_name, json_data)
-    return web.Response(text=f"JSON saved to {file_name}")
-
-def get_my_workflows_dir():
-    data = get_settings()
-    if (data):
-        if 'myWorkflowsDir' in data:  
-            curDir = data['myWorkflowsDir']  
-        
-        # this is to be compatible of a bug that a dict is stored in userSettings.myWorkflowsDir
-        # should not be needed once all users refresh their settings
-        if not isinstance(curDir, str):
-            curDir = curDir.get('path', None)
-
-        if curDir and os.path.exists(curDir):
-            return curDir
-    return os.path.join(comfy_path, 'my_workflows')

service/twoway_sync_folder_service.py

@@ -4,11 +4,7 @@ from aiohttp import web
 import os
 from pathlib import Path
 import server
-from .setting_service import get_my_workflows_dir
-try:
-    from send2trash import send2trash
-except ImportError:
-    send2trash = None
+from .db_service import get_my_workflows_dir
 
 @server.PromptServer.instance.routes.post('/workspace/folder/create')
 async def create_folder(request):
@@ -35,11 +31,7 @@ def delete_folder_sync(reqJson):
     folder_path = reqJson.get('path')
     folder_path = os.path.join(get_my_workflows_dir(), folder_path)
     try:
-        if send2trash:
-            send2trash(folder_path)
-        else:
-            shutil.rmtree(folder_path)
-            print("❌⛔️send2trash is not available. Deleting file permanently. Please `pip install send2trash`")
+        shutil.rmtree(folder_path)
         return {"success": True}
     except Exception as e:
         return {"success": False, "error": str(e)}

ui/package.json

@@ -8,7 +8,7 @@
     "build": "vite build",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "preview": "vite preview",
-    "setupGithooks": "node ../scripts/setupGitHooks"
+    "setupGithooks": "node ../scripts/setupGithooks"
   },
   "dependencies": {
     "@chakra-ui/react": "^2.8.2",

ui/src/Api.ts

@@ -1,22 +1,10 @@
 import { Table } from "./db-tables/WorkspaceDB";
 import type { ModelsListRespItem } from "./model-manager/types";
-import { api } from "./utils/comfyapp";
-
-export function fetchApi(
-  route: string,
-  options?: RequestInit,
-): Promise<Response> {
-  if (api == null) {
-    console.error("api is null!");
-    throw new Error("api is null!");
-  }
-  return api.fetchApi(route, options);
-}
 
 export async function getDB(table: Table): Promise<string | undefined> {
   console.warn("[workspace deprecated] getDB is deprecated", table);
   try {
-    const response = await fetchApi(`/workspace/get_db?table=${table}`);
+    const response = await fetch(`/workspace/get_db?table=${table}`);
     if (!response.ok) {
       return undefined;
     }
@@ -30,7 +18,7 @@ export async function getDB(table: Table): Promise<string | undefined> {
 
 export async function saveDB(table: Table, jsonData: string) {
   try {
-    const response = await fetchApi("/workspace/save_db", {
+    const response = await fetch("/workspace/save_db", {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -46,7 +34,7 @@ export async function saveDB(table: Table, jsonData: string) {
 
 export async function updateFile(file_path: string, jsonData: string) {
   try {
-    const response = await fetchApi("/workspace/update_file", {
+    const response = await fetch("/workspace/update_file", {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -66,7 +54,7 @@ export async function updateFile(file_path: string, jsonData: string) {
 
 export async function deleteFile(file_path: string, deleteEmptyFolder = false) {
   try {
-    const response = await fetchApi("/workspace/delete_file", {
+    const response = await fetch("/workspace/delete_file", {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -83,9 +71,27 @@ export async function deleteFile(file_path: string, deleteEmptyFolder = false) {
   }
 }
 
+export async function listBackup(dir: string) {
+  try {
+    const response = await fetch("/workspace/list_backup", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify({
+        dir: dir,
+      }),
+    });
+    const result = await response.text();
+    return result;
+  } catch (error) {
+    console.error("Error saving workspace:", error);
+  }
+}
+
 export async function getSystemDir(root?: string) {
   try {
-    const response = await fetchApi("/workspace/get_system_dir", {
+    const response = await fetch("/workspace/get_system_dir", {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -103,7 +109,7 @@ export async function getSystemDir(root?: string) {
 
 export async function openWorkflowsFolder() {
   try {
-    const response = await fetchApi("/workspace/open_workflow_file_browser", {
+    const response = await fetch("/workspace/open_workflow_file_browser", {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -117,7 +123,7 @@ export async function openWorkflowsFolder() {
 }
 
 export async function fetchMyWorkflowsDir() {
-  const resp = await fetchApi("/workspace/get_my_workflows_dir");
+  const resp = await fetch("/workspace/get_my_workflows_dir");
   const res = (await resp.json()) as {
     path?: string;
     error?: string;
@@ -131,7 +137,7 @@ export async function fetchMyWorkflowsDir() {
 
 export async function getAllModelsList() {
   try {
-    const response = await fetchApi("/model_manager/get_model_list", {
+    const response = await fetch("/model_manager/get_model_list", {
       method: "GET",
       headers: {
         "Content-Type": "application/json",
@@ -146,7 +152,7 @@ export async function getAllModelsList() {
 
 export async function getAllFoldersList() {
   try {
-    const response = await fetchApi("/model_manager/get_folder_list", {
+    const response = await fetch("/model_manager/get_folder_list", {
       method: "GET",
       headers: {
         "Content-Type": "application/json",
@@ -161,7 +167,7 @@ export async function getAllFoldersList() {
 
 export async function deleteLocalDiskFolder(folderPath: string) {
   try {
-    const response = await fetchApi("/workspace/delete_folder", {
+    const response = await fetch("/workspace/delete_folder", {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -179,7 +185,7 @@ export async function deleteLocalDiskFolder(folderPath: string) {
 
 export async function cancelDownload(savePath: string) {
   try {
-    const response = await fetchApi("/model_manager/cancel_installation", {
+    const response = await fetch("/model_manager/cancel_installation", {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -200,7 +206,7 @@ export async function copyFlowsToNewDirectory(
   dstDir: string,
 ) {
   try {
-    const response = await fetchApi("/workspace/copy_json_files", {
+    const response = await fetch("/workspace/copy_json_files", {
       method: "POST",
       headers: {
         "Content-Type": "application/json",

ui/src/App.tsx

@@ -1,4 +1,15 @@
-import { Suspense, useCallback, useEffect, useRef, useState } from "react";
+import {
+  Suspense,
+  useCallback,
+  useEffect,
+  useRef,
+  useState,
+  DragEvent,
+} from "react";
+// @ts-ignore
+import { app } from "/scripts/app.js";
+// @ts-ignore
+import { api } from "/scripts/api.js";
 import { Box, Portal, useToast } from "@chakra-ui/react";
 import {
   loadDBs,
@@ -27,22 +38,22 @@ const GalleryModal = React.lazy(() => import("./gallery/GalleryModal"));
 import { IconExternalLink } from "@tabler/icons-react";
 import { DRAWER_Z_INDEX, UPGRADE_TO_2WAY_SYNC_KEY } from "./const";
 import ServerEventListener from "./model-manager/hooks/ServerEventListener";
-import { Session, WorkspaceRoute } from "./types/types";
+import { nanoid } from "nanoid";
+import { WorkspaceRoute } from "./types/types";
 import { useStateRef } from "./customHooks/useStateRef";
 import { indexdb } from "./db-tables/indexdb";
 import EnableTwowaySyncConfirm from "./settings/EnableTwowaySyncConfirm";
-import { api, app } from "./utils/comfyapp";
-import { fetchApi } from "./Api";
-import { serverInfo } from "./utils/OsPathUtils";
-import { decodeKey } from "./utils/encryptUtils";
+import { deepJsonDiffCheck } from "./utils/deepJsonDiffCheck";
+import {
+  OPEN_TAB_EVENT,
+  tabDataManager,
+} from "./topbar/multipleTabs/TabDataManager";
 
 export default function App() {
-  const [curFlowName, setCurFlowName] = useState<string | null>(null);
   const [route, setRoute] = useState<WorkspaceRoute>("root");
   const [loadingDB, setLoadingDB] = useState(true);
   const [flowID, setFlowID] = useState<string | null>(null);
-  const curFlowID = useRef<string | null>(null);
-  const [session, setSession] = useState<Session | null>(null);
+
   const [isDirty, setIsDirty] = useState(false);
   const workspaceContainerRef = useRef(null);
   const { showDialog } = useDialog();
@@ -50,10 +61,10 @@ export default function App() {
   const developmentEnvLoadFirst = useRef(false);
   const toast = useToast();
   const [curVersion, setCurVersion] = useStateRef<WorkflowVersion | null>(null);
-  const saveCurWorkflow = useCallback(async (force = false) => {
-    const curWorkflow = workflowsTable?.curWorkflow;
-    if (curWorkflow) {
-      if (!force && workflowsTable?.curWorkflow?.saveLock) {
+  const saveCurWorkflow = useCallback(async (newGraphJson?: string) => {
+    const flowId = workflowsTable?.curWorkflow?.id;
+    if (flowId) {
+      if (workflowsTable?.curWorkflow?.saveLock) {
         toast({
           title: "The workflow is locked and cannot be saved",
           status: "warning",
@@ -61,22 +72,33 @@ export default function App() {
         });
         return;
       }
-      const graphJson = JSON.stringify(app.graph.serialize());
+      !newGraphJson && setIsDirty(false);
+      const graphJson = newGraphJson || JSON.stringify(app.graph.serialize());
       await Promise.all([
-        workflowsTable?.updateFlow(curWorkflow.id, {
+        workflowsTable?.updateFlow(flowId, {
           json: graphJson,
         }),
         changelogsTable?.create({
-          workflowID: curWorkflow.id,
+          workflowID: flowId,
           json: graphJson,
           isAutoSave: false,
         }),
       ]);
-      setIsDirty(false);
+      userSettingsTable?.settings?.autoSave &&
+        toast({
+          title: "Saved",
+          status: "success",
+          duration: 1000,
+          isClosable: true,
+        });
     }
   }, []);
 
   const discardUnsavedChanges = async () => {
+    if (userSettingsTable?.settings?.autoSave) {
+      alert("You cannot discard unsaved changes when auto save is enabled");
+      return;
+    }
     const userInput = confirm(
       "Are you sure you want to discard unsaved changes? This will revert current workflow to your last saved version. You will lose all changes made since your last save.",
     );
@@ -103,9 +125,7 @@ export default function App() {
     // curID null is when you deleted current workflow
     const id = workflow?.id ?? null;
     workflowsTable?.updateCurWorkflow(workflow);
-    curFlowID.current = id;
     setFlowID(id);
-    setCurFlowName(workflow?.name ?? "");
     if (id == null) {
       document.title = "ComfyUI";
       window.location.hash = "";
@@ -131,74 +151,84 @@ export default function App() {
     try {
       await loadDBs();
     } catch (error) {
-      console.error("🦄Workspace Manager - Error loading db", error);
+      console.error("error loading db", error);
     }
     setLoadingDB(false);
 
-    const urlWorkflowID = getWorkflowIdInUrlHash();
-    if (urlWorkflowID != null) {
-      loadWorkflowIDImpl(urlWorkflowID);
+    let latestWfID = null;
+    latestWfID = getWorkflowIdInUrlHash();
+    if (latestWfID == null) {
+      latestWfID = localStorage.getItem("curFlowID");
     }
-    fetchApi("/workspace/deduplicate_workflow_ids");
-    fetchApi("/workspace/get_os")
-      .then((resp) => resp.json())
-      .then((data) => {
-        if (data.os) {
-          serverInfo.os = data.os;
+    if (latestWfID) {
+      loadWorkflowIDImpl(latestWfID!, null, true);
+    }
+    fetch("/workspace/deduplicate_workflow_ids");
+    const twoway = await userSettingsTable?.getSetting("twoWaySync");
+    !twoway &&
+      indexdb.cache.get(UPGRADE_TO_2WAY_SYNC_KEY).then(async (value) => {
+        if (value?.value !== "true") {
+          const workflowsCount = await indexdb.workflows.count();
+          if (workflowsCount == 0) {
+            // empty workflows, enable 2way sync
+            await userSettingsTable?.upsert({ twoWaySync: true });
+            await indexdb.cache.put({
+              id: UPGRADE_TO_2WAY_SYNC_KEY,
+              value: "true",
+            });
+            return;
+          }
+          const myWorkflowsDir =
+            await userSettingsTable?.getSetting("myWorkflowsDir");
+          showDialog(
+            <EnableTwowaySyncConfirm
+              myWorkflowsDir={myWorkflowsDir ?? "undefined"}
+            />,
+            [
+              {
+                label: "I have downloaded all my workflows and ready to enable",
+                onClick: async () => {
+                  await userSettingsTable?.upsert({ twoWaySync: true });
+                  if (await userSettingsTable?.getSetting("twoWaySync")) {
+                    indexdb.cache.put({
+                      id: UPGRADE_TO_2WAY_SYNC_KEY,
+                      value: "true",
+                    });
+                    location.reload();
+                  }
+                },
+                colorScheme: "red",
+              },
+            ],
+            {
+              closeOnOverlayClick: false,
+            },
+          );
         }
       });
-    const twoway = await userSettingsTable?.getSetting("twoWaySync");
-
-    if (!twoway) {
-      const workflowsCount = await indexdb.workflows.count();
-      if (workflowsCount == 0) {
-        // empty workflows, enable 2way sync
-        await userSettingsTable?.upsert({ twoWaySync: true });
-        await indexdb.cache.put({
-          id: UPGRADE_TO_2WAY_SYNC_KEY,
-          value: "true",
-        });
-        return;
-      }
-      const myWorkflowsDir =
-        await userSettingsTable?.getSetting("myWorkflowsDir");
-      showDialog(
-        <EnableTwowaySyncConfirm
-          myWorkflowsDir={myWorkflowsDir ?? "undefined"}
-        />,
-        [
-          {
-            label: "I have downloaded all my workflows and ready to enable",
-            onClick: async () => {
-              await userSettingsTable?.upsert({ twoWaySync: true });
-              if (await userSettingsTable?.getSetting("twoWaySync")) {
-                indexdb.cache.put({
-                  id: UPGRADE_TO_2WAY_SYNC_KEY,
-                  value: "true",
-                });
-                location.reload();
-              }
-            },
-            colorScheme: "red",
-          },
-        ],
-        {
-          closeOnOverlayClick: false,
-        },
-      );
-    }
-    const encodedKey = localStorage.getItem("workspace_manager_shareKey");
-    if (encodedKey) {
-      const shareKey = decodeKey(encodedKey);
-      shareKey &&
-        setSession({
-          shareKey: shareKey,
-          username: null,
-        });
-    }
   };
 
-  const loadWorkflowIDImpl = async (id: string, versionID?: string | null) => {
+  const checkIsDirty = () => {
+    if (workflowsTable?.curWorkflow?.id == null) return false;
+    const curflow = workflowsTable?.curWorkflow;
+    if (curflow == null) return false;
+    if (curflow.json == null) return true;
+    const graphJson = app.graph.serialize() ?? {};
+    let lastSaved = {};
+    try {
+      lastSaved = curflow?.json ? JSON.parse(curflow?.json) : {};
+    } catch (e) {
+      console.error("error parsing json", e);
+    }
+    const equal = deepJsonDiffCheck(graphJson, lastSaved);
+    return !equal;
+  };
+
+  const loadWorkflowIDImpl = async (
+    id: string,
+    versionID?: string | null,
+    isInit?: boolean,
+  ) => {
     if (app.graph == null) {
       return;
     }
@@ -213,27 +243,55 @@ export default function App() {
       ? await workflowVersionsTable?.get(versionID)
       : null;
 
-    app.ui.dialog.close();
-    if (version) {
-      setCurVersion(version);
-      setCurFlowIDAndName({
-        ...flow,
-        json: version.json,
-      });
-      app.loadGraphData(JSON.parse(version.json));
-    } else {
-      setCurFlowIDAndName(flow);
-      setCurVersion(null);
-      app.loadGraphData(JSON.parse(flow.json));
+    setCurVersion(version ?? null);
+
+    const tabIndex = tabDataManager.tabs.findIndex((tab) => tab.id === id);
+    if (tabIndex !== -1) {
+      tabDataManager.changeActiveTab(tabIndex);
+      if (version) {
+        tabDataManager.updateTabData(tabIndex, { json: version.json });
+      }
+      return;
     }
+
+    app.ui.dialog.close();
     setRoute("root");
     isDirty && setIsDirty(false);
+
+    const newTabInfo = {
+      id: flow.id,
+      name: flow.name,
+      json: version ? version.json : flow.json,
+      isDirty: false,
+    };
+
+    /**
+     * During initialization,
+     * because the event listener of OPEN_TAB_EVENT has not been registered yet,
+     * the newly added tab will be invalid,
+     * so the tab is added manually during initialization.
+     */
+    if (isInit) {
+      tabDataManager.addTabData(newTabInfo);
+      app.loadGraphData(JSON.parse(newTabInfo.json));
+      setCurFlowIDAndName({
+        ...flow,
+        json: newTabInfo.json,
+      });
+    } else {
+      document.dispatchEvent(
+        new CustomEvent(OPEN_TAB_EVENT, {
+          detail: {
+            tabInfo: newTabInfo,
+          },
+        }),
+      );
+    }
   };
 
   const loadWorkflowID = async (
     id: string | null,
     versionID?: string | null,
-    forceLoad: boolean = false,
   ) => {
     // No current workflow, id is null when you deleted current workflow
     if (id === null) {
@@ -241,18 +299,10 @@ export default function App() {
       app.graph.clear();
       return;
     }
-    if (
-      !isDirty ||
-      forceLoad ||
-      workflowsTable?.curWorkflow == null ||
-      userSettingsTable?.settings?.disableUnsavedWarning
-    ) {
-      loadWorkflowIDImpl(id, versionID);
-      return;
-    }
-    // prompt when auto save disabled and dirty
-    showSaveOrDiscardCurWorkflowDialog(id);
+
+    loadWorkflowIDImpl(id, versionID);
   };
+
   const showSaveOrDiscardCurWorkflowDialog = async (newIDToLoad?: string) => {
     const buttons = [
       newIDToLoad
@@ -327,18 +377,19 @@ export default function App() {
       json: workflow.json,
       name: newFlowName || workflow.name,
       parentFolderID: workflow.parentFolderID,
+      tags: workflow.tags,
     });
     flow && (await loadWorkflowID(flow.id));
   };
 
   const onExecutedCreateMedia = useCallback((image: any) => {
-    if (curFlowID.current == null) return;
+    if (workflowsTable?.curWorkflow?.id == null) return;
     let path = image.filename;
     if (image.subfolder != null && image.subfolder !== "") {
       path = image.subfolder + "/" + path;
     }
     mediaTable?.create({
-      workflowID: curFlowID.current,
+      workflowID: workflowsTable?.curWorkflow?.id,
       localPath: path,
     });
   }, []);
@@ -364,6 +415,42 @@ export default function App() {
     graphAppSetup();
     setLoadChild(true);
 
+    const fileInput = document.getElementById(
+      "comfy-file-input",
+    ) as HTMLInputElement;
+    const fileInputListener = async () => {
+      if (fileInput && fileInput.files && fileInput.files.length > 0) {
+        const newFlow: Workflow = {
+          id: nanoid(),
+          name: fileInput.files[0].name,
+          json: JSON.stringify(defaultGraph),
+          updateTime: Date.now(),
+          createTime: Date.now(),
+        };
+        setCurFlowIDAndName(newFlow);
+        const res = await workflowsTable?.createFlow(newFlow);
+        res &&
+          tabDataManager.updateTabData(tabDataManager.activeIndex, {
+            id: res.id,
+            name: res.name,
+          });
+      }
+    };
+    fileInput?.addEventListener("change", fileInputListener);
+
+    const handleBeforeUnload = (e: BeforeUnloadEvent) => {
+      const autoSaveEnabled = userSettingsTable?.settings?.autoSave ?? true;
+      if (workflowsTable?.curWorkflow?.saveLock) return;
+      const isDirty = checkIsDirty();
+
+      if (!autoSaveEnabled && isDirty) {
+        e.preventDefault(); // For modern browsers
+        e.returnValue = "You have unsaved changes!"; // For older browsers
+        showSaveOrDiscardCurWorkflowDialog();
+      }
+    };
+    window.addEventListener("beforeunload", handleBeforeUnload);
+
     const handleExecuted = (e: any) => {
       e.detail?.output?.images?.forEach(
         (im: { filename: string; subfolder: string; type: string }) => {
@@ -382,8 +469,40 @@ export default function App() {
     };
     api.addEventListener("executed", handleExecuted);
 
+    const handleDrop = async (event: DragEvent) => {
+      const fileName = event.dataTransfer?.files[0]?.name;
+      const n = app.dragOverNode;
+      if (n && n.onDragDrop) {
+        return;
+      }
+      const overwriteFlow =
+        (await userSettingsTable?.getSetting(
+          "overwriteCurWorkflowWhenDroppingFileToCanvas",
+        )) ?? false;
+      if (!overwriteFlow && fileName) {
+        const newFlow: Workflow = {
+          id: nanoid(),
+          name: fileName,
+          json: JSON.stringify(defaultGraph),
+          updateTime: Date.now(),
+          createTime: Date.now(),
+        };
+        setCurFlowIDAndName(newFlow);
+        const res = await workflowsTable?.createFlow(newFlow);
+        res &&
+          tabDataManager.updateTabData(tabDataManager.activeIndex, {
+            id: res.id,
+            name: res.name,
+          });
+      }
+    };
+    app.canvasEl.addEventListener("drop", handleDrop);
+
     return () => {
+      window.removeEventListener("change", fileInputListener);
+      window.removeEventListener("beforeunload", handleBeforeUnload);
       window.removeEventListener("executed", handleExecuted);
+      app.canvasEl.removeEventListener("drop", handleDrop);
     };
   }, []);
 
@@ -408,8 +527,6 @@ export default function App() {
         curVersion: curVersion,
         setCurVersion: setCurVersion,
         setCurFlowIDAndName: setCurFlowIDAndName,
-        session: session,
-        updateSession: setSession,
       }}
     >
       <div ref={workspaceContainerRef} className="workspace_manager">
@@ -424,7 +541,7 @@ export default function App() {
             zIndex={DRAWER_Z_INDEX}
             draggable={false}
           >
-            <Topbar curFlowName={curFlowName} setCurFlowName={setCurFlowName} />
+            <Topbar />
             {loadChild && route === "recentFlows" && (
               <Suspense>
                 <RecentFilesDrawer

ui/src/RecentFilesDrawer/FilesListFolderItem.tsx

@@ -18,7 +18,6 @@ import FilesListFolderItemRightClickMenu from "./FilesListFolderItemRightClickMe
 import { ESortTypes, sortTypeLocalStorageKey } from "./types";
 import { Folder, Workflow } from "../types/dbTypes";
 import ItemsList from "./ItemsList";
-import { getPathSep } from "../utils/OsPathUtils";
 
 type Props = {
   folder: Folder;
@@ -83,8 +82,8 @@ export default memo(function FilesListFolderItem({ folder }: Props) {
   }, [isCollapsed]);
   useEffect(() => {
     const cur = workflowsTable?.curWorkflow;
-    const curWorkflowPath = cur?.parentFolderID + getPathSep();
-    const folderPath = folder.id + getPathSep();
+    const curWorkflowPath = cur?.parentFolderID + "/";
+    const folderPath = folder.id + "/";
     const childreHasCurworkflow = curWorkflowPath.startsWith(folderPath);
     if (childreHasCurworkflow) {
       setIsCollapsed(false);

ui/src/RecentFilesDrawer/MoreActionMenu.tsx

@@ -12,21 +12,15 @@ import {
   IconCopy,
   IconDotsVertical,
   IconExternalLink,
-  IconLink,
   IconLock,
   IconLockOpen,
   IconUpload,
 } from "@tabler/icons-react";
+import AddTagToWorkflowPopover from "./AddTagToWorkflowPopover";
 import { Workflow } from "../types/dbTypes";
-import {
-  mediaTable,
-  userSettingsTable,
-  workflowsTable,
-} from "../db-tables/WorkspaceDB";
+import { mediaTable, workflowsTable } from "../db-tables/WorkspaceDB";
 import { WorkspaceContext } from "../WorkspaceContext";
 import { openWorkflowInNewTab } from "../utils";
-import { fetchApi } from "../Api";
-import CopyShareLinkMenuItem from "../components/CopyShareLinkMenuItem";
 
 type Props = {
   workflow: Workflow;
@@ -61,7 +55,7 @@ export default function MoreActionMenu({ workflow }: Props) {
       body.append(`images[${index}]`, file, file.name);
     });
     body.append("subfolder", "workspace_manager");
-    await fetchApi("/workspace/images/save", {
+    await fetch("/workspace/images/save", {
       method: "POST",
       body,
     });
@@ -120,7 +114,6 @@ export default function MoreActionMenu({ workflow }: Props) {
               {isLocked ? "Unlock" : "Lock"}
             </MenuItem>
           </Tooltip>
-          <CopyShareLinkMenuItem curFlow={workflow} />
           <MenuItem
             icon={<IconUpload />}
             onClick={() => {

ui/src/RecentFilesDrawer/RecentFilesDrawer.tsx

@@ -30,6 +30,8 @@ import RecentFilesDrawerMenu from "./RecentFilesDrawerMenu";
 import { insertWorkflowToCanvas, sortFileItem } from "../utils";
 import MultipleSelectionOperation from "./MultipleSelectionOperation";
 import { ESortTypes, sortTypeLocalStorageKey } from "./types";
+// @ts-expect-error ComfyUI import
+import { app } from "/scripts/app.js";
 import { useDebounce } from "../customHooks/useDebounce";
 import SearchInput from "../components/SearchInput";
 import { openWorkflowsFolder } from "../Api";
@@ -38,7 +40,6 @@ import MyTagsRow from "./MyTagsRow";
 import ImportFlowsFileInput from "./ImportFlowsFileInput";
 import ItemsList from "./ItemsList";
 import { DRAWER_Z_INDEX } from "../const";
-import { app } from "../utils/comfyapp";
 
 type Props = {
   onClose: () => void;
@@ -50,7 +51,6 @@ export default function RecentFilesDrawer({ onClose, onClickNewFlow }: Props) {
     Array<Folder | Workflow>
   >([]);
   const allFlowsRef = useRef<Array<Workflow>>([]);
-  const { loadWorkflowID, curFlowID } = useContext(WorkspaceContext);
   const [selectedTag, setSelectedTag] = useState<string>();
   const [multipleState, setMultipleState] = useState(false);
   const [selectedKeys, setSelectedKeys] = useState<string[]>([]);
@@ -112,9 +112,6 @@ export default function RecentFilesDrawer({ onClose, onClickNewFlow }: Props) {
   const onDelete = useCallback(
     async (id: string) => {
       await workflowsTable?.deleteFlow(id);
-      if (workflowsTable?.curWorkflow?.id === id) {
-        await loadWorkflowID?.(null);
-      }
       await loadLatestWorkflows();
     },
     [selectedTag, debounceSearchValue],
@@ -154,12 +151,6 @@ export default function RecentFilesDrawer({ onClose, onClickNewFlow }: Props) {
   const batchOperationCallback = (type: string, value: unknown) => {
     switch (type) {
       case "batchDelete":
-        curFlowID &&
-          workflowsTable?.get(curFlowID).then((res) => {
-            if (!res) {
-              loadWorkflowID?.(null);
-            }
-          });
         loadLatestWorkflows();
         setMultipleState(false);
         setSelectedKeys([]);
@@ -257,18 +248,22 @@ export default function RecentFilesDrawer({ onClose, onClickNewFlow }: Props) {
             />
             <HStack mb={2} mt={2} p={0} justifyContent="space-between">
               <HStack>
-                <MultipleSelectionOperation
-                  multipleState={multipleState}
-                  changeMultipleState={(state) => {
-                    setMultipleState(state);
-                    !state && setSelectedKeys([]);
-                  }}
-                  selectedKeys={selectedKeys}
-                  isSelectedAll={
-                    selectedKeys.length === allFlowsRef.current.length
-                  }
-                  batchOperationCallback={batchOperationCallback}
-                />
+                {allFlowsRef.current.length > 0 ? (
+                  <MultipleSelectionOperation
+                    multipleState={multipleState}
+                    changeMultipleState={(state) => {
+                      setMultipleState(state);
+                      !state && setSelectedKeys([]);
+                    }}
+                    selectedKeys={selectedKeys}
+                    isSelectedAll={
+                      selectedKeys.length === allFlowsRef.current.length
+                    }
+                    batchOperationCallback={batchOperationCallback}
+                  />
+                ) : (
+                  <Box />
+                )}
                 {!multipleState && (
                   <Tooltip hasArrow label="New folder" placement="bottom-start">
                     <IconButton

ui/src/RecentFilesDrawer/RecentFilesDrawerMenu.tsx

@@ -11,7 +11,9 @@ import {
   IconMoon,
   IconSettings,
   IconSun,
+  IconTag,
 } from "@tabler/icons-react";
+import ManageTagsModal from "./ManageTagsModal";
 import { useState } from "react";
 import WorkspaceSettingsModal from "./WorkspaceSettingsModal";
 const ICON_SIZE = 16;
@@ -19,6 +21,7 @@ type Props = {
   //   onclose: () => void;
 };
 export default function RecentFilesDrawerMenu({}: Props) {
+  const [isManageTagsOpen, setIsManageTagsOpen] = useState(false);
   const [isSettingsOpen, setIsSettingsOpen] = useState(false);
   const { colorMode, toggleColorMode } = useColorMode();
 
@@ -40,6 +43,13 @@ export default function RecentFilesDrawerMenu({}: Props) {
           >
             Settings
           </MenuItem>
+          <MenuItem
+            onClick={() => setIsManageTagsOpen(true)}
+            icon={<IconTag size={ICON_SIZE} />}
+            fontSize={16}
+          >
+            Manage Tags
+          </MenuItem>
           <MenuItem
             onClick={toggleColorMode}
             icon={
@@ -55,6 +65,9 @@ export default function RecentFilesDrawerMenu({}: Props) {
           </MenuItem>
         </MenuList>
       </Menu>
+      {isManageTagsOpen && (
+        <ManageTagsModal onclose={() => setIsManageTagsOpen(false)} />
+      )}
       {isSettingsOpen && (
         <WorkspaceSettingsModal onClose={() => setIsSettingsOpen(false)} />
       )}

ui/src/RecentFilesDrawer/WorkflowListItem.tsx

@@ -89,7 +89,7 @@ export default memo(function WorkflowListItem({ workflow }: Props) {
       w={"100%"}
       justify={"space-between"}
       borderBottom={"1px solid"}
-      borderColor={colorMode == "dark" ? "gray.700" : "gray.200"}
+      borderColor={colorMode == "dark" ? "gray.900" : "gray.200"}
       onMouseEnter={() => setIsHovering(true)}
       onMouseLeave={() => setIsHovering(false)}
     >
@@ -111,7 +111,7 @@ export default memo(function WorkflowListItem({ workflow }: Props) {
             {isHovering ? (
               <WorkflowListItemActionButtons workflow={workflow} />
             ) : (
-              <Text color={"GrayText"} fontSize={"sm"}>
+              <Text color={"GrayText"} ml={"2px"} fontSize={"sm"}>
                 {formatTimestamp(workflow.updateTime, false, false, "/")}
               </Text>
             )}

ui/src/RecentFilesDrawer/WorkspaceSettingsModal.tsx

@@ -10,12 +10,12 @@ import {
   VStack,
 } from "@chakra-ui/react";
 import { ShortcutSettings } from "../settings/ShortcutSettings";
+import FolderOnTopSettings from "../settings/FolderOnTopSettings";
 import TwoWaySyncSettings from "../settings/TwoWaySyncSettings";
 import CommonCheckboxSettings from "../settings/CommonCheckboxSettings";
 import SelectMyWorkflowsDir from "../settings/SelectMyWorkflowsDir";
 import { CommonNumberSetting } from "../settings/CommonNumberSetting";
-import CloudHostSetting from "../settings/CloudHostSetting";
-import SharekeySetting from "../settings/SharekeySetting";
+import AutosaveSetting from "../settings/AutosaveSetting";
 
 export default function WorkspaceSettingsModal({
   onClose,
@@ -38,12 +38,13 @@ export default function WorkspaceSettingsModal({
                 w="100%"
               >
                 <SelectMyWorkflowsDir />
+                <AutosaveSetting />
                 <ShortcutSettings />
                 <TwoWaySyncSettings />
-                <SharekeySetting />
+                <FolderOnTopSettings />
                 <CommonCheckboxSettings
-                  settingKey="foldersOnTop"
-                  text={`Folders always on top`}
+                  settingKey="overwriteCurWorkflowWhenDroppingFileToCanvas"
+                  text="Overwrite current workflow when drag and drop workflow file to canvas"
                 />
                 <CommonNumberSetting
                   label={`Maximum number of save change history to store. This does not include
@@ -51,16 +52,10 @@ export default function WorkspaceSettingsModal({
         and has no limit.`}
                   settingKey="maximumChangelogNumber"
                 />
-                <CommonCheckboxSettings
-                  settingKey="disableUnsavedWarning"
-                  text={`Disable the "Save or Discard" warning when closing a workflow with unsaved changes. ⛔️Be careful, if you disable this reminder and forget to save your workflow, you will lose your changes.`}
-                />
-
                 <CommonCheckboxSettings
                   settingKey="hideCoverImage"
                   text="Hide thumbnail image in workflow list"
                 />
-                <CloudHostSetting />
               </VStack>
             </HStack>
           </ModalBody>

ui/src/WorkspaceContext.ts

@@ -1,6 +1,6 @@
 import { createContext } from "react";
 import { Folder, Workflow, WorkflowVersion } from "./types/dbTypes";
-import { Session, WorkspaceRoute } from "./types/types";
+import { WorkspaceRoute } from "./types/types";
 export type JsonDiff = {
   old: Object;
   new: Object;
@@ -9,13 +9,9 @@ export type JsonDiff = {
 export const WorkspaceContext = createContext<{
   curFlowID: string | null;
   onDuplicateWorkflow?: (flowID: string, newFlowName?: string) => void;
-  loadWorkflowID: (
-    id: string | null,
-    versionID?: string | null,
-    forceLoad?: boolean,
-  ) => void;
+  loadWorkflowID: (id: string | null, versionID?: string | null) => void;
   setIsDirty: (dirty: boolean) => void;
-  saveCurWorkflow: (force?: boolean) => Promise<void>;
+  saveCurWorkflow: (saveCurWorkflow?: string) => Promise<void>;
   discardUnsavedChanges: () => Promise<void>;
   isDirty: boolean;
   loadNewWorkflow: (input?: { json: string; name?: string }) => void;
@@ -24,9 +20,7 @@ export const WorkspaceContext = createContext<{
   route: WorkspaceRoute;
   curVersion: WorkflowVersion | null;
   setCurVersion: (version: WorkflowVersion | null) => void;
-  setCurFlowIDAndName: (workflow: Workflow | null) => void;
-  session: Session | null;
-  updateSession: (session: Session) => void;
+  setCurFlowIDAndName: (workflow: Workflow) => void;
 }>({
   curFlowID: null,
   loadWorkflowID: () => {},
@@ -41,8 +35,6 @@ export const WorkspaceContext = createContext<{
   setIsDirty: () => {},
   setCurVersion: () => {},
   setCurFlowIDAndName: () => {},
-  session: null,
-  updateSession: () => {},
 });
 
 export const RecentFilesContext = createContext<{

ui/src/apis/TwowaySyncApi.ts

@@ -1,4 +1,3 @@
-import { fetchApi } from "../Api";
 import { COMFYSPACE_TRACKING_FIELD_NAME } from "../const";
 import { indexdb } from "../db-tables/indexdb";
 import { Workflow } from "../types/dbTypes";
@@ -14,7 +13,7 @@ export namespace TwowaySyncAPI {
     newParentFolderRelPath: string,
   ) {
     try {
-      const response = await fetchApi("/workspace/file/move", {
+      const response = await fetch("/workspace/file/move", {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -40,7 +39,7 @@ export namespace TwowaySyncAPI {
     parentFolderID: string | null,
   ): Promise<string | null> {
     try {
-      const response = await fetchApi("/workspace/file/gen_unique_name", {
+      const response = await fetch("/workspace/file/gen_unique_name", {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -66,7 +65,7 @@ export namespace TwowaySyncAPI {
     newName: string,
   ) {
     try {
-      const response = await fetchApi("/workspace/file/rename", {
+      const response = await fetch("/workspace/file/rename", {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -86,6 +85,16 @@ export namespace TwowaySyncAPI {
       console.error("Error deleting file:", error);
     }
   }
+
+  interface DuplicatesResponse {
+    duplicates: {
+      [id: string]: Array<{
+        path: string;
+        createTime: number;
+      }>;
+    };
+  }
+
   export async function saveWorkflow(workflow: Workflow) {
     const json = workflow.json;
     const flow = JSON.parse(json);
@@ -93,12 +102,7 @@ export namespace TwowaySyncAPI {
       flow.extra[COMFYSPACE_TRACKING_FIELD_NAME] = {};
     }
     flow.extra[COMFYSPACE_TRACKING_FIELD_NAME].id = workflow.id;
-    flow.extra[COMFYSPACE_TRACKING_FIELD_NAME].saveLock = workflow.saveLock;
-    flow.extra[COMFYSPACE_TRACKING_FIELD_NAME].cloudID = workflow.cloudID;
-    flow.extra[COMFYSPACE_TRACKING_FIELD_NAME].coverMediaPath =
-      workflow.coverMediaPath;
-
-    const response = await fetchApi("/workspace/file/save", {
+    const response = await fetch("/workspace/file/save", {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -121,7 +125,7 @@ export namespace TwowaySyncAPI {
   }
   export async function deleteWorkflow(workflow: Workflow) {
     try {
-      const response = await fetchApi("/workspace/delete_file", {
+      const response = await fetch("/workspace/delete_file", {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -138,8 +142,12 @@ export namespace TwowaySyncAPI {
       console.error("Error deleting file:", error);
     }
   }
-  export async function createWorkflow(workflow: Workflow) {
-    const { parentFolderID, name, json, id } = workflow;
+  export async function createWorkflow({
+    parentFolderID,
+    name,
+    json,
+    id,
+  }: Workflow) {
     let jsonObj: any = JSON.parse(json);
     if (jsonObj.extra == null) {
       jsonObj.extra = {};
@@ -148,10 +156,6 @@ export namespace TwowaySyncAPI {
       jsonObj.extra[COMFYSPACE_TRACKING_FIELD_NAME] = {};
     }
     jsonObj.extra[COMFYSPACE_TRACKING_FIELD_NAME].id = id; // to avoid overwriting deps
-    jsonObj.extra[COMFYSPACE_TRACKING_FIELD_NAME].saveLock = workflow.saveLock;
-    jsonObj.extra[COMFYSPACE_TRACKING_FIELD_NAME].cloudID = workflow.cloudID;
-    jsonObj.extra[COMFYSPACE_TRACKING_FIELD_NAME].coverMediaPath =
-      workflow.coverMediaPath;
     const input: { parentFolderPath: string; name: string; json: string } = {
       parentFolderPath: sanitizeRelPath(parentFolderID ?? ""),
       name: name,
@@ -159,7 +163,7 @@ export namespace TwowaySyncAPI {
     };
 
     try {
-      const response = await fetchApi("/workspace/create_workflow_file", {
+      const response = await fetch("/workspace/create_workflow_file", {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -191,23 +195,12 @@ export namespace TwowaySyncAPI {
     id: string;
     name: string;
   }): Promise<{
-    json?: {
-      extra: {
-        [COMFYSPACE_TRACKING_FIELD_NAME]: {
-          id: string;
-          saveLock: boolean;
-          cloudID: string | null;
-          coverMediaPath: string | null;
-        };
-      };
-    };
-    createTime?: number;
-    updateTime?: number;
+    json?: Object;
     error?: string;
   }> {
     const relPath = joinRelPath(parentFolderID ?? "", name + ".json");
     try {
-      const response = await fetchApi("/workspace/get_workflow_file", {
+      const response = await fetch("/workspace/get_workflow_file", {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -241,11 +234,7 @@ export type ScanLocalFile = {
   type: "workflow";
   name: string;
   id: string;
-  path: string;
   json: string;
-  saveLock: boolean;
-  cloudID: string | null;
-  coverMediaPath: string | null;
   createTime: number;
   updateTime: number;
   lastOpenedTime?: number;
@@ -254,7 +243,6 @@ export type ScanLocalFolder = {
   id: string;
   type: "folder";
   name: string;
-  path: string;
   parentFolderID: string;
 };
 export async function scanLocalFiles(
@@ -263,20 +251,17 @@ export async function scanLocalFiles(
   metaInfoOnly = false,
 ): Promise<Array<ScanLocalFile | ScanLocalFolder>> {
   try {
-    const response = await fetchApi(
-      "/workspace/file/scan_my_workflows_folder",
-      {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({
-          path: sanitizeRelPath(path),
-          recursive,
-          metaInfoOnly,
-        }),
+    const response = await fetch("/workspace/file/scan_my_workflows_folder", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
       },
-    );
+      body: JSON.stringify({
+        path: sanitizeRelPath(path),
+        recursive,
+        metaInfoOnly,
+      }),
+    });
     const result = await response.json();
     return result;
   } catch (error) {

ui/src/apis/TwowaySyncFolderApi.ts

@@ -1,4 +1,3 @@
-import { fetchApi } from "../Api";
 import { Folder } from "../types/dbTypes";
 import { sanitizeRelPath } from "../utils/OsPathUtils";
 
@@ -14,7 +13,7 @@ export namespace TwowayFolderSyncAPI {
   }
 
   export async function createFolder(folder: Folder) {
-    await fetchApi("/workspace/folder/create", {
+    await fetch("/workspace/folder/create", {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -28,7 +27,7 @@ export namespace TwowayFolderSyncAPI {
     folderToBeMoved: string,
     newParentPath: string,
   ) {
-    const resp = await fetchApi("/workspace/folder/move", {
+    const resp = await fetch("/workspace/folder/move", {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -46,7 +45,7 @@ export namespace TwowayFolderSyncAPI {
   }
   export async function deleteFolder(relPath: string) {
     try {
-      const response = await fetchApi("/workspace/folder/delete", {
+      const response = await fetch("/workspace/folder/delete", {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -66,7 +65,7 @@ export namespace TwowayFolderSyncAPI {
     folderRelPath: string,
   ): Promise<number | null> {
     try {
-      const response = await fetchApi("/workspace/file/count_files", {
+      const response = await fetch("/workspace/file/count_files", {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -91,7 +90,7 @@ export namespace TwowayFolderSyncAPI {
     newName: string,
   ): Promise<void> {
     try {
-      const response = await fetchApi("/workspace/folder/rename", {
+      const response = await fetch("/workspace/folder/rename", {
         method: "POST",
         headers: {
           "Content-Type": "application/json",

ui/src/auth/authUtils.ts

@@ -0,0 +1,19 @@
+import { COMFYSPACE_AUTH_REDIRECT_URL } from "../const";
+
+const COGNITO_DOMAIN = import.meta.env.VITE_AWS_COGNITO_DOMAIN;
+const CLIENT_ID = import.meta.env.VITE_AWS_COGNITO_CLIENT_ID;
+const redirectUri = encodeURIComponent(COMFYSPACE_AUTH_REDIRECT_URL);
+
+export function openCognitoPopup() {
+  const cognitoUrl = `${COGNITO_DOMAIN}/login`;
+  const responseType = "token";
+
+  const popupUrl = `${cognitoUrl}?response_type=${responseType}&client_id=${CLIENT_ID}&redirect_uri=${redirectUri}`;
+  const popupWindow = window.open(
+    popupUrl,
+    "ComfyspaceLogin",
+    "width=800,height=600",
+  );
+
+  popupWindow?.focus();
+}

ui/src/components/CopyShareLinkMenuItem.tsx

@@ -1,58 +0,0 @@
-import { HStack, MenuItem, Spinner, useToast } from "@chakra-ui/react";
-import { IconLink } from "@tabler/icons-react";
-import { useContext, useState } from "react";
-import { WorkspaceContext } from "../WorkspaceContext";
-import { copySharelink } from "./copySharelink";
-import { Workflow } from "../types/dbTypes";
-
-export default function CopyShareLinkMenuItem({
-  curFlow,
-}: {
-  curFlow: Workflow;
-}) {
-  const { session } = useContext(WorkspaceContext);
-  const toast = useToast();
-  const [loading, setloading] = useState(false);
-
-  return (
-    <MenuItem
-      onClick={async () => {
-        if (!curFlow) {
-          return;
-        }
-        if (!session?.shareKey) {
-          alert(
-            "Please set your share key first in Settings to enable cloud share.",
-          );
-          return;
-        }
-        setloading(true);
-        const res = await copySharelink(session.shareKey, curFlow!);
-        if (res?.link) {
-          navigator.clipboard.writeText(res.link);
-          toast({
-            title: "Link copied",
-            status: "success",
-            duration: 2000,
-          });
-        } else {
-          toast({
-            title: "Failed to copy link",
-            status: "error",
-            description: res?.error,
-            duration: null,
-          });
-        }
-        setloading(false);
-      }}
-      icon={loading ? <Spinner /> : <IconLink size={20} />}
-      iconSpacing={1}
-      alignItems={"center"}
-      isDisabled={loading}
-    >
-      <HStack>
-        <p>Copy share link</p>
-      </HStack>
-    </MenuItem>
-  );
-}

ui/src/components/CreateVersionDialog.tsx

@@ -1,7 +1,9 @@
 import {
   Button,
   Modal,
+  ModalOverlay,
   ModalContent,
+  ModalHeader,
   ModalCloseButton,
   ModalBody,
   ModalFooter,
@@ -9,30 +11,20 @@ import {
   FormLabel,
   FormErrorMessage,
   Input,
-  Stack,
-  useToast,
 } from "@chakra-ui/react";
-import { userSettingsTable, workflowsTable } from "../db-tables/WorkspaceDB";
-import { useState, ChangeEvent, useContext } from "react";
-import { WorkspaceContext } from "../WorkspaceContext";
-import CreateVersionLogin from "../versionHistory/CreateVersionLogin";
-import { ShareWorkflowData } from "../types/types";
-import { app } from "../utils/comfyapp";
-import { EWorkflowPrivacy } from "../types/dbTypes";
-import { getCurDateString, getNodeDefs } from "../share/shareUtils";
+import { workflowVersionsTable } from "../db-tables/WorkspaceDB";
+import { useState, ChangeEvent } from "react";
+// @ts-ignore
+import { app } from "/scripts/app.js";
 
 interface Props {
   workflowId: string;
   onClose: () => void;
 }
-export default function CreateVersionDialog({ onClose }: Props) {
-  const [newVersionName, setNewVersionName] = useState(
-    "v" + getCurDateString(),
-  );
+export default function CreateVersionDialog({ workflowId, onClose }: Props) {
+  const [newVersionName, setNewVersionName] = useState("");
   const [submitError, setSubmitError] = useState("");
-  const { session } = useContext(WorkspaceContext);
-  const toast = useToast();
-  const [submitting, setSubmitting] = useState(false);
+
   const handleChange = (event: ChangeEvent<HTMLInputElement>) => {
     setNewVersionName(event.target.value);
     submitError && setSubmitError("");
@@ -41,81 +33,31 @@ export default function CreateVersionDialog({ onClose }: Props) {
   const onSubmit = async () => {
     const trimName = newVersionName.trim();
     setNewVersionName(trimName);
-    if (!workflowsTable?.curWorkflow) {
-      throw new Error("No workflow selected");
-    }
-    setSubmitting(true);
-    const prompt = await app.graphToPrompt();
-    const graph = app.graph.serialize();
-    if (!graph.extra) {
-      graph.extra = {};
-    }
-    graph.extra.apiPrompt = prompt.output ?? null;
-    const input: ShareWorkflowData = {
-      workflow: {
-        name: workflowsTable?.curWorkflow?.name,
-        cloudID: workflowsTable?.curWorkflow?.cloudID,
-      },
-      version: {
-        name: trimName,
-        json: JSON.stringify(graph),
-      },
-      nodeDefs: getNodeDefs(),
-      privacy: EWorkflowPrivacy.PRIVATE,
-    };
-    const data = await fetch(
-      userSettingsTable?.settings?.cloudHost + "/api/createCloudflow",
-      {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: `Bearer ${session?.shareKey}`,
-        },
-        body: JSON.stringify(input),
-      },
-    )
-      .then((resp) => resp.json())
-      .then(async (data) => {
-        if (data?.data) {
-          const cloudID = data.data.workflowID;
-          await workflowsTable?.updateMetaInfo(
-            workflowsTable?.curWorkflow?.id!,
-            {
-              cloudID,
-            },
-          );
-          toast({
-            title: "Version created",
-            status: "success",
-            duration: 3000,
-          });
-          onClose();
-        } else {
-          setSubmitError("Failed to create version. " + (data?.error ?? ""));
-        }
-      })
-      .catch((e) => {
-        setSubmitError("Failed to create version");
-        return null;
+    const versionList =
+      (await workflowVersionsTable?.listByWorkflowID(workflowId)) ?? [];
+    if (versionList.some((version) => version.name === trimName)) {
+      setSubmitError(
+        "The name is duplicated, please modify it and submit again.",
+      );
+    } else {
+      const graphJson = JSON.stringify(app.graph.serialize());
+      await workflowVersionsTable?.add({
+        name: newVersionName,
+        workflowID: workflowId,
+        createTime: Date.now(),
+        json: graphJson,
       });
-    setSubmitting(false);
+      onClose();
+    }
   };
-  if (!session?.shareKey) {
-    return <CreateVersionLogin onClose={onClose} />;
-  }
-  const domain = new URL(userSettingsTable!.settings!.cloudHost).hostname;
+
   return (
     <Modal isOpen={true} onClose={onClose}>
+      <ModalOverlay />
       <ModalContent>
+        <ModalHeader>Create Version</ModalHeader>
         <ModalCloseButton />
         <ModalBody>
-          <Stack mb={5}>
-            <p style={{ fontSize: 20, fontWeight: "bold" }}>Create Version</p>
-            <p style={{ color: "GrayText" }}>
-              Saving to{" "}
-              <a href={userSettingsTable?.settings?.cloudHost}> {domain}</a>
-            </p>
-          </Stack>
           <FormControl isInvalid={!!submitError}>
             <FormLabel>Name</FormLabel>
             <Input
@@ -137,8 +79,7 @@ export default function CreateVersionDialog({ onClose }: Props) {
             colorScheme="teal"
             mr={3}
             onClick={onSubmit}
-            isDisabled={!newVersionName}
-            isLoading={submitting}
+            isDisabled={!newVersionName || !!submitError}
           >
             Create
           </Button>

ui/src/components/DropdownTitle.tsx

@@ -26,7 +26,6 @@ import {
   DarkMode,
   Tag,
   HStack,
-  useToast,
 } from "@chakra-ui/react";
 import {
   IconArrowBackUpDouble,
@@ -44,11 +43,11 @@ import { Workflow } from "../types/dbTypes";
 import CreateVersionDialog from "./CreateVersionDialog";
 import HoverMenu from "./HoverMenu";
 const ShareDialog = lazy(() => import("../share/ShareDialog"));
+// @ts-ignore
+import { app } from "/scripts/app.js";
 import { TOPBAR_BUTTON_HEIGHT } from "../const";
+import DownloadSpaceJsonDialog from "../spacejson/DownloadSpaceJsonDialog";
 import { downloadJsonFile } from "../utils/downloadJsonFile";
-import { SharedTopbarButton } from "../share/SharedTopbarButton";
-import { app } from "../utils/comfyapp";
-import CopyShareLinkMenuItem from "./CopyShareLinkMenuItem";
 
 export default function DropdownTitle() {
   const {
@@ -58,7 +57,6 @@ export default function DropdownTitle() {
     saveCurWorkflow,
     setRoute,
     route,
-    session,
   } = useContext(WorkspaceContext);
 
   const [isOpenNewVersion, setIsOpenNewVersion] = useState(false);
@@ -86,7 +84,7 @@ export default function DropdownTitle() {
     setNewFlowName(event.target.value);
     submitError && setSubmitError("");
   };
-  const toast = useToast();
+
   const onSubmit = async () => {
     if (!curFlowID) {
       alert("Flow ID is required");
@@ -100,7 +98,7 @@ export default function DropdownTitle() {
       parentFolderID: workflow?.parentFolderID,
     });
 
-    flow && (await loadWorkflowID(flow.id, null, true));
+    flow && (await loadWorkflowID(flow.id, null));
     handleOnCloseModal();
   };
 
@@ -148,15 +146,17 @@ export default function DropdownTitle() {
               >
                 Save
               </MenuItem>
-              <Tooltip label="Revert workflow to your last saved version. You will lose all changes made since your last save.">
-                <MenuItem
-                  onClick={discardUnsavedChanges}
-                  icon={<IconArrowBackUpDouble size={20} />}
-                  iconSpacing={1}
-                >
-                  Discard unsaved changes
-                </MenuItem>
-              </Tooltip>
+              {!userSettingsTable?.settings?.autoSave && (
+                <Tooltip label="Revert workflow to your last saved version. You will lose all changes made since your last save.">
+                  <MenuItem
+                    onClick={discardUnsavedChanges}
+                    icon={<IconArrowBackUpDouble size={20} />}
+                    iconSpacing={1}
+                  >
+                    Discard unsaved changes
+                  </MenuItem>
+                </Tooltip>
+              )}
               <MenuItem
                 onClick={handleDownload}
                 icon={<IconDownload size={20} />}
@@ -186,20 +186,23 @@ export default function DropdownTitle() {
               >
                 Versions History
               </MenuItem>
+              {/* <MenuItem
+                onClick={() => setRoute("downloadSpaceJson")}
+                icon={<IconDownload size={20} />}
+                iconSpacing={1}
+              >
+                Save runnable workflow🧪
+              </MenuItem> */}
               <MenuItem
-                onClick={() => setRoute("share")}
+                onClick={() => setRoute("downloadSpaceJson")}
                 icon={<IconShare2 size={20} />}
                 iconSpacing={1}
                 alignItems={"center"}
               >
                 <HStack>
                   <p>Share</p> <Tag size={"sm"}>🧪beta</Tag>
-                  <SharedTopbarButton />
                 </HStack>
               </MenuItem>
-              {workflowsTable?.curWorkflow && (
-                <CopyShareLinkMenuItem curFlow={workflowsTable?.curWorkflow} />
-              )}
             </MenuList>
           </Menu>
         }
@@ -208,6 +211,7 @@ export default function DropdownTitle() {
       {route == "versionHistory" && (
         <VersionHistoryDrawer onClose={() => setRoute("root")} />
       )}
+      {route == "downloadSpaceJson" && <DownloadSpaceJsonDialog />}
       {route === "saveAsModal" && (
         <Modal isOpen={true} onClose={handleOnCloseModal}>
           <ModalOverlay />

ui/src/components/EditFlowName.tsx

@@ -22,15 +22,10 @@ import { WorkspaceContext } from "../WorkspaceContext";
 
 type Props = {
   displayName: string;
-  updateFlowName: (newName: string) => void;
-  isDirty: boolean;
+  isActive: boolean;
 };
 
-export default function EditFlowName({
-  displayName,
-  updateFlowName,
-  isDirty,
-}: Props) {
+export default function EditFlowName({ displayName, isActive }: Props) {
   const { isOpen, onOpen, onClose } = useDisclosure();
   const { curFlowID } = useContext(WorkspaceContext);
   const [editName, setEditName] = useState(displayName);
@@ -63,7 +58,6 @@ export default function EditFlowName({
         await workflowsTable?.updateName(curFlowID, {
           name: trimEditName,
         });
-        updateFlowName(trimEditName);
         onCloseModal();
       }
     }
@@ -79,17 +73,15 @@ export default function EditFlowName({
       <Tooltip label={displayName} placement="bottom">
         <Text
           as="div"
-          color="white"
-          onClick={startEdit}
-          maxW={160}
-          fontWeight={500}
+          color={isActive ? "white" : "#9d9d9d"}
+          onDoubleClick={startEdit}
+          maxW="114px"
+          marginRight="4px"
           whiteSpace="nowrap"
           overflow="hidden"
           textOverflow="ellipsis"
+          userSelect="none"
         >
-          <div style={{ width: 8, display: "inline-block" }}>
-            <Text as="span">{isDirty && "* "}</Text>
-          </div>
           {displayName}
         </Text>
       </Tooltip>

ui/src/components/MediaPreview.tsx

@@ -52,5 +52,35 @@ export default function MediaPreview({
       src={`/workspace/view_media?filename=${mediaLocalPath}`}
       alt="workflow image renamed or moved from output folder"
     />
-  ) : null;
+  ) : (
+    <div
+      style={{
+        width: size + "px",
+        height: size + `px`,
+        overflow: "hidden",
+        position: "relative",
+      }}
+    >
+      <video
+        width={size}
+        height={size}
+        src={`/workspace/view_media?filename=${mediaLocalPath}`}
+        loop={true}
+        autoPlay={autoPlay ?? false}
+        muted={true}
+        style={{
+          // for video to crop to center
+          objectFit: "cover",
+          width: "100%",
+          height: "100%",
+          // position: "absolute",
+          // top: "50%", // Align the center of the video with the center of the container vertically
+          // left: "50%", // Align the center of the video with the center of the container horizontally
+          // transform: "translate(-50%, -50%)", // Offset the video to ensure it is centered
+        }}
+      >
+        <track kind="captions" />
+      </video>
+    </div>
+  );
 }

ui/src/components/SpotlightSearch.tsx

@@ -219,12 +219,12 @@ export default function SpotlightSearch() {
 
     document.addEventListener("keyup", handleKeyUp);
     document.addEventListener("keydown", keydownListener);
-    window.addEventListener(SHORTCUT_TRIGGER_EVENT, shortcutTrigger);
+    document.addEventListener(SHORTCUT_TRIGGER_EVENT, shortcutTrigger);
 
     return () => {
       document.removeEventListener("keyup", handleKeyUp);
       document.removeEventListener("keydown", keydownListener);
-      window.removeEventListener(SHORTCUT_TRIGGER_EVENT, shortcutTrigger);
+      document.removeEventListener(SHORTCUT_TRIGGER_EVENT, shortcutTrigger);
     };
   }, []);
 

ui/src/components/VersionHistoryDrawer.tsx

@@ -21,28 +21,26 @@ import {
 import { IconX } from "@tabler/icons-react";
 import {
   changelogsTable,
-  userSettingsTable,
   workflowsTable,
   workflowVersionsTable,
 } from "../db-tables/WorkspaceDB";
 import { useContext, useEffect, useState } from "react";
 import { WorkspaceContext } from "../WorkspaceContext";
+import { formatTimestamp } from "../utils";
+// @ts-ignore
+import { app } from "/scripts/app.js";
 import { Changelog, WorkflowVersion } from "../types/dbTypes";
 import DeleteConfirm from "./DeleteConfirm";
-import { app } from "../utils/comfyapp";
 
 export function VersionHistoryDrawer({ onClose }: { onClose: () => void }) {
-  const { isDirty, loadWorkflowID, curVersion, session } =
+  const toast = useToast();
+  const { curFlowID, isDirty, loadWorkflowID, curVersion } =
     useContext(WorkspaceContext);
   const [active, setActive] = useState(0); // 0: version、1: changelog
   const [selectedVersion, setSelectedVersion] = useState<string | null>(null);
   const [changelogs, setChangelogs] = useState<Changelog[]>([]);
-  const [versions, setVersions] = useState<
-    (WorkflowVersion & { isCloud?: boolean })[]
-  >([]);
-  const curFlow = workflowsTable?.curWorkflow;
-  const cloudHost = userSettingsTable?.settings?.cloudHost;
-  const [loading, setLoading] = useState(false);
+  const [versions, setVersions] = useState<WorkflowVersion[]>([]);
+
   const loadChangeLogs = async (flowId: string) => {
     const workflow = await workflowsTable?.get(flowId);
     const changelogs = await changelogsTable?.listByWorkflowID(flowId);
@@ -55,38 +53,8 @@ export function VersionHistoryDrawer({ onClose }: { onClose: () => void }) {
   };
 
   const loadVersions = async () => {
-    let vers =
-      (await workflowVersionsTable?.listByWorkflowID(curFlow!.id)) ?? [];
-    if (session?.shareKey && curFlow?.cloudID) {
-      setLoading(true);
-      await fetch(
-        userSettingsTable?.settings?.cloudHost! +
-          "/api/listWorkflowVersionsByWorkflowID?workflowID=" +
-          curFlow?.cloudID,
-        {
-          headers: {
-            authorization: `Bearer ${session?.shareKey}`,
-          },
-        },
-      )
-        .then((resp) => resp.json())
-        .then((data) => {
-          if (data.items) {
-            const cloudVers = data.items.map((v: any) => {
-              return {
-                ...v,
-                isCloud: true,
-              };
-            });
-            vers = vers.concat(cloudVers as WorkflowVersion[]);
-          }
-        })
-        .catch((e) => {
-          console.error(e);
-        });
-      setLoading(false);
-    }
-
+    const vers =
+      (await workflowVersionsTable?.listByWorkflowID(curFlowID!)) ?? [];
     setVersions(vers);
   };
 
@@ -102,7 +70,7 @@ export function VersionHistoryDrawer({ onClose }: { onClose: () => void }) {
         loadVersions();
         break;
       case 1:
-        loadChangeLogs(curFlow!.id);
+        loadChangeLogs(curFlowID!);
         break;
     }
   }, [active]);
@@ -149,16 +117,7 @@ export function VersionHistoryDrawer({ onClose }: { onClose: () => void }) {
           </TabList>
           <TabPanels>
             <TabPanel>
-              {session?.shareKey && (
-                <Text color="GrayText" mb={3}>
-                  Connected to{" "}
-                  <a href={cloudHost} target="_blank">
-                    {cloudHost}
-                  </a>
-                </Text>
-              )}
               <Stack divider={<StackDivider />} spacing={2}>
-                {loading && <Text>Loading...</Text>}
                 {versions?.map((version) => {
                   return (
                     <Flex
@@ -172,27 +131,11 @@ export function VersionHistoryDrawer({ onClose }: { onClose: () => void }) {
                       borderRadius={4}
                     >
                       <Stack textAlign={"left"} gap={0}>
-                        {version.isCloud ? (
-                          <a
-                            target="_blank"
-                            href={`${cloudHost}/workflow/${version.workflowID}/${version.id}`}
-                          >
-                            {version.name ?? "untitled"}
-                          </a>
-                        ) : (
-                          <Text fontWeight={"500"}>
-                            {version.name ?? "untitled"}
-                          </Text>
-                        )}
-
+                        <Text fontWeight={"500"}>
+                          {version.name ?? "untitled"}
+                        </Text>
                         <Text color={"GrayText"} fontSize={"sm"}>
-                          Created:{" "}
-                          {new Date(
-                            version.createTime ??
-                              version.createdAt ??
-                              version.created_at ??
-                              "",
-                          ).toLocaleString()}
+                          Created: {formatTimestamp(version.createTime)}
                         </Text>
                       </Stack>
                       <Flex alignItems="center" gap={2}>
@@ -206,19 +149,18 @@ export function VersionHistoryDrawer({ onClose }: { onClose: () => void }) {
                               return;
                             }
                             app.loadGraphData(JSON.parse(version.json));
+                            loadWorkflowID(curFlowID!, version.id);
                             onClose();
                           }}
                         >
                           Load
                         </Button>
-                        {!version.isCloud && (
-                          <DeleteConfirm
-                            promptMessage="Are you sure you want to delete this version?"
-                            onDelete={() => {
-                              onDelete(version.id);
-                            }}
-                          />
-                        )}
+                        <DeleteConfirm
+                          promptMessage="Are you sure you want to delete this version?"
+                          onDelete={() => {
+                            onDelete(version.id);
+                          }}
+                        />
                       </Flex>
                     </Flex>
                   );
@@ -243,6 +185,9 @@ export function VersionHistoryDrawer({ onClose }: { onClose: () => void }) {
                             return;
                           }
                           app.loadGraphData(JSON.parse(c.json));
+                          workflowsTable?.updateFlow(curFlowID!, {
+                            json: c.json,
+                          });
                           onClose();
                         }}
                         isActive={c.id === selectedVersion}

ui/src/components/copySharelink.tsx

@@ -1,76 +0,0 @@
-import { userSettingsTable, workflowsTable } from "../db-tables/WorkspaceDB";
-import { getNodeDefs } from "../share/shareUtils";
-import { EWorkflowPrivacy, Workflow } from "../types/dbTypes";
-import { ShareWorkflowData } from "../types/types";
-import { app } from "../utils/comfyapp";
-
-export async function copySharelink(
-  shareKey: string,
-  curWorkflow: Workflow,
-): Promise<{
-  link?: string | null;
-  error?: string | null;
-} | null> {
-  if (curWorkflow.cloudID) {
-    const link =
-      userSettingsTable?.settings?.cloudHost +
-      "/workflow/" +
-      curWorkflow.cloudID;
-    return {
-      link,
-    };
-  }
-  const prompt = await app.graphToPrompt();
-  const graph = app.graph.serialize();
-  if (!graph.extra) {
-    graph.extra = {};
-  }
-  graph.extra.apiPrompt = prompt.output ?? null;
-  const input: ShareWorkflowData = {
-    workflow: {
-      name: curWorkflow?.name ?? "Untitled",
-      cloudID: curWorkflow?.cloudID,
-    },
-    version: {
-      name: "v1",
-      json: JSON.stringify(graph),
-    },
-    nodeDefs: getNodeDefs(),
-    privacy: EWorkflowPrivacy.UNLISTED,
-  };
-  return await fetch(
-    userSettingsTable?.settings?.cloudHost + "/api/createCloudflow",
-    {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: `Bearer ${shareKey}`,
-      },
-      body: JSON.stringify(input),
-    },
-  )
-    .then((resp) => resp.json())
-    .then((data) => {
-      if (data?.data) {
-        const cloudID = data.data.workflowID;
-        workflowsTable?.updateMetaInfo(curWorkflow?.id!, {
-          cloudID,
-        });
-
-        const link =
-          userSettingsTable?.settings?.cloudHost + "/workflow/" + cloudID;
-        return {
-          link,
-        };
-      } else {
-        return {
-          error: "Failed to create version. " + (data?.error ?? ""),
-        };
-      }
-    })
-    .catch((e) => {
-      return {
-        error: "Failed to create version. " + (e?.error ?? ""),
-      };
-    });
-}

ui/src/db-tables/ChangelogsTable.ts

@@ -44,8 +44,9 @@ export class ChangelogsTable extends TableBase<Changelog> {
       createTime: Date.now(),
       isAutoSave: input.isAutoSave,
     };
-    await indexdb.changelogs.add(change);
     await this.deleteLogsExceedLimit(input.workflowID);
+    await indexdb.changelogs.add(change);
+    await this.saveDiskDB();
     return change;
   }
   async deleteLogsExceedLimit(workflowID: string) {

ui/src/db-tables/DiskFileUtils.ts

@@ -1,6 +1,59 @@
+import { deleteFile, updateFile } from "../Api";
 import { foldersTable, workflowsTable, userSettingsTable } from "./WorkspaceDB";
+import {
+  COMFYSPACE_TRACKING_FIELD_NAME,
+  LEGACY_COMFYSPACE_TRACKING_FIELD_NAME,
+} from "../const";
+import { toFileNameFriendly } from "../utils";
+import { Folder, Workflow } from "../types/dbTypes";
 import { TwowayFolderSyncAPI } from "../apis/TwowaySyncFolderApi";
 
+export async function saveJsonFileMyWorkflows(workflow: Workflow) {
+  const file_path = await generateFilePath(workflow);
+  if (file_path == null) {
+    return;
+  }
+  const fullPath = await generateFilePathAbsolute(workflow);
+  await workflowsTable?.updateMetaInfo(workflow.id, {
+    filePath: fullPath ?? undefined,
+  });
+  const json = workflow.json;
+  const flow = JSON.parse(json);
+  flow.extra[COMFYSPACE_TRACKING_FIELD_NAME] = {
+    id: workflow.id,
+    name: workflow.name,
+  };
+  delete flow.extra[LEGACY_COMFYSPACE_TRACKING_FIELD_NAME];
+
+  await updateFile(file_path, JSON.stringify(flow));
+}
+
+export async function deleteJsonFileMyWorkflows(workflow: Workflow) {
+  if (workflow.name == null) {
+    return;
+  }
+  const file_path = await generateFilePath(workflow);
+  file_path != null && deleteFile(file_path);
+}
+
+export async function generateFilePath(
+  workflow: Workflow,
+): Promise<string | null> {
+  let filePath = toFileNameFriendly(workflow.name) + ".json";
+  let curFolderID = workflow.parentFolderID;
+  while (curFolderID != null) {
+    const folder = await foldersTable?.get(curFolderID);
+    if (folder == null) {
+      break;
+    }
+    const folderName = folder.name;
+    filePath = `${folderName}/${filePath}`;
+    curFolderID = folder.parentFolderID ?? undefined;
+  }
+
+  return filePath ?? null;
+}
+
 export async function genFolderRelPath(
   folderId: string | null,
 ): Promise<string> {
@@ -18,6 +71,46 @@ export async function genFolderRelPath(
 
   return filePath;
 }
+export async function generateFilePathAbsolute(
+  workflow: Workflow,
+): Promise<string | null> {
+  const subPath = await generateFilePath(workflow);
+  let myWorkflowsDir = await userSettingsTable?.getSetting("myWorkflowsDir");
+  if (!myWorkflowsDir) {
+    console.error("myWorkflowsDir is not set");
+    return null;
+  }
+  if (!myWorkflowsDir.endsWith("/")) {
+    myWorkflowsDir = myWorkflowsDir + "/";
+  }
+  return myWorkflowsDir + subPath;
+}
+
+export async function generateFolderPath(id: string): Promise<string | null> {
+  const folder = await foldersTable?.get(id);
+  let parentFolderID = folder?.parentFolderID;
+  let folderPath = folder?.name;
+  while (parentFolderID) {
+    const folder = await foldersTable?.get(parentFolderID);
+    if (folder == null) {
+      break;
+    }
+    folderPath = `${folder.name}/${folderPath}`;
+    parentFolderID = folder.parentFolderID ?? undefined;
+  }
+
+  let myWorkflowsDir = await userSettingsTable?.getSetting("myWorkflowsDir");
+
+  if (!myWorkflowsDir) {
+    console.error("myWorkflowsDir is not set");
+    return null;
+  }
+
+  if (!myWorkflowsDir.endsWith("/")) {
+    myWorkflowsDir = myWorkflowsDir + "/";
+  }
+  return myWorkflowsDir + folderPath;
+}
 
 export async function getFileCountInFolder(folderId: string): Promise<number> {
   const twoWaySyncEnabled = await userSettingsTable?.getSetting("twoWaySync");

ui/src/db-tables/FoldersTable.ts

@@ -1,5 +1,6 @@
 import { userSettingsTable, workflowsTable } from "./WorkspaceDB";
 import { EFlowOperationType, Folder } from "../types/dbTypes";
+import { validateOrSaveAllJsonFileMyWorkflows } from "../utils";
 import { nanoid } from "nanoid";
 import { TableBase } from "./TableBase";
 import { indexdb } from "./indexdb";
@@ -83,6 +84,11 @@ export class FoldersTable extends TableBase<Folder> {
     }
     await indexdb.folders.update(id, input);
     this.saveDiskDB();
+
+    // folder moved or renamed - move all workflows to the right directory(not required when folded state changes)
+    if (nameChanged || parentFolderChanged) {
+      validateOrSaveAllJsonFileMyWorkflows(true);
+    }
     return newRecord;
   }
   public async deleteFolder(

ui/src/db-tables/MediaTable.ts

@@ -2,6 +2,7 @@ import { Table, workflowsTable } from "./WorkspaceDB";
 import { TableBase } from "./TableBase";
 import { Media } from "../types/dbTypes";
 import { indexdb } from "./indexdb";
+import { getMetadataFromUrl } from "../gallery/utils.ts";
 
 export class MediaTable extends TableBase<Media> {
   static readonly TABLE_NAME: Table = "media";
@@ -24,17 +25,28 @@ export class MediaTable extends TableBase<Media> {
     const format = input.localPath.split(".").pop();
     if (format == null) return null;
 
+    const res = await getMetadataFromUrl(
+      `/workspace/view_media?filename=${input.localPath}`,
+    ).catch((e) => {
+      console.error("get meta error:", e);
+      return { prompt: "" };
+    });
+
     const md: Media = {
       id: input.localPath,
       localPath: input.localPath,
       workflowID: input.workflowID,
       createTime: Date.now(),
+      workflowJSON: JSON.stringify(res?.prompt),
+      format: format,
     };
     await workflowsTable?.updateMetaInfo(input.workflowID, {
       latestImage: md.localPath,
     });
     // save indexdb
     indexdb.media.put(md);
+    // save disk file db
+    this.saveDiskDB();
     return md;
   }
 

ui/src/db-tables/TableBase.ts

@@ -12,8 +12,6 @@ export class TableBase<T extends TableBaseModel> {
     this.tableName = tableName;
   }
   protected async saveDiskDB() {
-    // diable save diskdb
-    return;
     const objs = (await indexdb[this.tableName].toArray()) as TableBaseModel[];
     const backup: Record<string, TableBaseModel> = {};
     objs.forEach((f) => {
@@ -45,19 +43,23 @@ export class TableBase<T extends TableBaseModel> {
       newItem.createTime = Date.now();
     }
     await indexdb[this.tableName].add(newItem as any);
+    await this.saveDiskDB();
     return newItem as T;
   }
 
   public async put(newItem: T): Promise<T> {
     await indexdb[this.tableName].put(newItem as any);
+    await this.saveDiskDB();
     return newItem;
   }
   public async bulkPut(newItems: T[]): Promise<void> {
     // @ts-ignore
     await indexdb[this.tableName].bulkPut(newItems as any);
+    this.saveDiskDB();
   }
   public async update(id: string, changes: Partial<T>): Promise<T | null> {
     await indexdb[this.tableName].update(id, changes);
+    this.saveDiskDB();
     return (await this.get(id)) ?? null;
   }
 
@@ -104,6 +106,7 @@ export class TableBase<T extends TableBaseModel> {
 
   public async delete(id: string) {
     await indexdb[this.tableName].delete(id);
+    this.saveDiskDB();
   }
   public async listByIndex(index: keyof T, value: string): Promise<T[]> {
     const list = await indexdb[this.tableName]

ui/src/db-tables/UserSettingsTable.ts

@@ -1,19 +1,29 @@
 import type { UserSettings } from "../types/dbTypes";
 import { TableBase } from "./TableBase";
 import { MODEL_TYPE_TO_FOLDER_MAPPING } from "../model-manager/install-models/util/modelTypes";
-import { fetchApi, fetchMyWorkflowsDir } from "../Api";
+import { fetchMyWorkflowsDir } from "../Api";
 
 export class UserSettingsTable extends TableBase<UserSettings> {
   public defaultSettings: UserSettings;
   public readonly DEFAULT_USER = "guest";
   static readonly TABLE_NAME = "userSettings";
 
+  /**
+   * Because in App.js we will use window.addEventListener("beforeunload", handleBeforeUnload); to remind the user to save the workflow when the user leaves the page.
+   * The autoSave needs to be obtained in the handleBeforeUnload function. If it is obtained through getSetting, the handleBeforeUnload function will become an async function, which will cause the "beforeunload" event to fail.
+   * So we maintain an autoSave here that is always up to date.
+   */
+  private _autoSave: boolean = false;
   private _settings: UserSettings | undefined = undefined;
 
   get settings() {
     return this._settings;
   }
 
+  get autoSave() {
+    return this._autoSave;
+  }
+
   constructor() {
     super("userSettings");
     this.defaultSettings = {
@@ -33,7 +43,8 @@ export class UserSettingsTable extends TableBase<UserSettings> {
       autoSaveDuration: 3,
       twoWaySync: false,
       foldersOnTop: false,
-      cloudHost: "https://www.nodecafe.co",
+      cloudHost: "https://www.nodecafe.org",
+      overwriteCurWorkflowWhenDroppingFileToCanvas: false,
       maximumChangelogNumber: 80,
       hideCoverImage: false,
       disableUnsavedWarning: false,
@@ -54,14 +65,6 @@ export class UserSettingsTable extends TableBase<UserSettings> {
     }
     return currentUserSettings?.[key] ?? this.defaultSettings[key];
   }
-  public async get(_id: string): Promise<UserSettings | undefined> {
-    const obj = await fetchApi("/workspace/get_settings", {
-      headers: {
-        "Content-Type": "application/json",
-      },
-    }).then((res) => res.json());
-    return obj as any;
-  }
 
   public async upsert(newPairs: Partial<UserSettings>) {
     const oldSettings =
@@ -70,13 +73,7 @@ export class UserSettingsTable extends TableBase<UserSettings> {
       ...oldSettings,
       ...newPairs,
     };
-    await fetchApi("/workspace/save_settings", {
-      method: "POST",
-      body: JSON.stringify(newSettings),
-      headers: {
-        "Content-Type": "application/json",
-      },
-    });
+    await this.put(newSettings);
     this._settings = {
       ...this.defaultSettings,
       ...newSettings,
@@ -90,20 +87,16 @@ export class UserSettingsTable extends TableBase<UserSettings> {
     instance.defaultSettings.myWorkflowsDir = myWorkflowsDir.path!;
 
     await instance.get(instance.DEFAULT_USER).then((res) => {
+      instance._autoSave = res?.autoSave ?? false;
       instance._settings = {
         ...instance.defaultSettings,
         ...res,
       };
     });
-    if (
-      instance._settings?.cloudHost?.includes("nodecafe.org") ||
-      instance._settings?.cloudHost?.includes("comfyspace.art")
-    ) {
-      // overwrite legacy comfyspace.art
-      await instance.upsert({
-        cloudHost: instance.defaultSettings.cloudHost,
-      });
-    }
+    // overwrite legacy comfyspace.art
+    await instance.upsert({
+      cloudHost: instance.defaultSettings.cloudHost,
+    });
     return instance;
   }
 }

ui/src/db-tables/WorkflowsTable.ts

@@ -8,6 +8,10 @@ import { sortFileItem } from "../utils";
 import { nanoid } from "nanoid";
 import { TableBase } from "./TableBase";
 import { indexdb } from "./indexdb";
+import {
+  deleteJsonFileMyWorkflows,
+  saveJsonFileMyWorkflows,
+} from "./DiskFileUtils";
 import { ESortTypes, ImportWorkflow } from "../RecentFilesDrawer/types";
 import { defaultGraph } from "../defaultGraph";
 import { scanMyWorkflowsDir } from "../utils/twowaySyncUtils";
@@ -17,6 +21,7 @@ import {
   scanLocalFiles,
 } from "../apis/TwowaySyncApi";
 import { COMFYSPACE_TRACKING_FIELD_NAME } from "../const";
+import { tabDataManager } from "../topbar/multipleTabs/TabDataManager";
 
 export class WorkflowsTable extends TableBase<Workflow> {
   static readonly TABLE_NAME = "workflows";
@@ -47,7 +52,11 @@ export class WorkflowsTable extends TableBase<Workflow> {
   }
 
   /**
-   * Check whether the currently opened workflow is the latest version and is consistent with the DB
+   * Check whether the currently opened workflow is the latest version and is consistent with the DB.
+   * Through updateTime comparison, if it is inconsistent, it means that a newer version already exists in the DB.
+   * If the automatic save function is turned on at this time, the latest version in the DB will be overwritten.
+   * Therefore, the user needs to confirm whether to continue to enable automatic saving.
+   * @returns boolean
    */
   public async latestVersionCheck() {
     if (this._curWorkflow) {
@@ -131,11 +140,15 @@ export class WorkflowsTable extends TableBase<Workflow> {
     };
     //add to IndexDB
     await indexdb.workflows.add(newWorkflow);
+    // add to disk file db
+    this.saveDiskDB();
     // add to my_workflows/
     const twoWaySyncEnabled = await userSettingsTable?.getSetting("twoWaySync");
     if (twoWaySyncEnabled) {
       await TwowaySyncAPI.createWorkflow(newWorkflow);
       return await this.get(newWorkflow.id);
+    } else {
+      saveJsonFileMyWorkflows(newWorkflow);
     }
     return newWorkflow;
   }
@@ -172,6 +185,7 @@ export class WorkflowsTable extends TableBase<Workflow> {
     if (this._curWorkflow && this._curWorkflow.id === id) {
       this._curWorkflow = newWorkflow;
     }
+    this.saveDiskDB();
     return newWorkflow;
   }
 
@@ -184,6 +198,15 @@ export class WorkflowsTable extends TableBase<Workflow> {
     }
     if (twoWaySyncEnabled) {
       await TwowaySyncAPI.moveWorkflow(oldWorkflow, change.parentFolderID!);
+    } else {
+      await saveJsonFileMyWorkflows(newWorkflow);
+      await deleteJsonFileMyWorkflows(oldWorkflow);
+      // update parent folder updateTime
+      if (newWorkflow?.parentFolderID != null) {
+        await indexdb.folders?.update(newWorkflow.parentFolderID, {
+          updateTime: Date.now(),
+        });
+      }
     }
   }
   public async genLastManualSavedJson(id: string) {
@@ -197,6 +220,7 @@ export class WorkflowsTable extends TableBase<Workflow> {
       before &&
         (await TwowaySyncAPI.renameWorkflow(before, change.name + ".json"));
     }
+    tabDataManager.updateTabData(tabDataManager.activeIndex, change);
     return await this.updateMetaInfo(id, change as any);
   }
   public async updateFlow(id: string, input: Pick<Workflow, "json">) {
@@ -218,6 +242,8 @@ export class WorkflowsTable extends TableBase<Workflow> {
     const twoWaySyncEnabled = await userSettingsTable?.getSetting("twoWaySync");
     if (twoWaySyncEnabled) {
       after && (await TwowaySyncAPI.saveWorkflow(after));
+    } else {
+      after && (await saveJsonFileMyWorkflows(after));
     }
   }
 
@@ -270,10 +296,13 @@ export class WorkflowsTable extends TableBase<Workflow> {
         } catch (e) {
           console.error("batchCreateFlows error", e);
         }
+      } else {
+        await saveJsonFileMyWorkflows(newWorkflow);
       }
     }
     try {
       await indexdb.workflows.bulkAdd(newWorkflows);
+      this.saveDiskDB();
     } catch (e) {
       console.error("batchCreateFlows error", e);
     }
@@ -287,10 +316,19 @@ export class WorkflowsTable extends TableBase<Workflow> {
         await userSettingsTable?.getSetting("twoWaySync");
       if (twoWaySyncEnabled) {
         await TwowaySyncAPI.deleteWorkflow(workflow);
+      } else {
+        deleteJsonFileMyWorkflows({ ...workflow });
       }
     }
+    
+    const tabIndex = tabDataManager.tabs.findIndex((tab) => tab.id === id);
+    if (tabIndex !== -1) {
+      tabDataManager?.deleteTabData(tabIndex);
+    }
+
     //add to IndexDB
     await indexdb.workflows.delete(id);
+    this.saveDiskDB();
   }
 
   public async batchDeleteFlow(ids: string[]) {
@@ -301,9 +339,13 @@ export class WorkflowsTable extends TableBase<Workflow> {
         await userSettingsTable?.getSetting("twoWaySync");
       if (twoWaySyncEnabled) {
         await TwowaySyncAPI.deleteWorkflow(flow);
+      } else {
+        deleteJsonFileMyWorkflows({ ...flow });
       }
     }
     await indexdb.workflows.bulkDelete(ids);
+    tabDataManager.batchDeleteTabData(ids);
+    this.saveDiskDB();
   }
 
   public async listFolderContent(

ui/src/db-tables/WorkspaceDB.ts

@@ -61,4 +61,86 @@ export async function loadDBs() {
     loadMedia(),
     loadWorkflowVersions(),
   ]);
+  if (localStorage.getItem("WORKSPACE_INDEXDB_BACKFILL") !== "true") {
+    await backfillIndexdb();
+    localStorage.setItem("WORKSPACE_INDEXDB_BACKFILL", "true");
+  }
+}
+
+export async function backfillIndexdb() {
+  const backfillWorkflows = async () => {
+    try {
+      const all = await workflowsTable?.getRecords();
+      all && (await indexdb.workflows.bulkPut(Object.values(all)));
+    } catch (error) {
+      console.error(error);
+    }
+  };
+  const backfillFolders = async () => {
+    try {
+      const all = await foldersTable?.getRecords();
+      all && (await indexdb.folders.bulkPut(Object.values(all)));
+    } catch (error) {
+      console.error(error);
+    }
+  };
+  const backfillMedia = async () => {
+    try {
+      const all = await mediaTable?.getRecords();
+      all && (await indexdb.media.bulkPut(Object.values(all)));
+    } catch (error) {
+      console.error(error);
+    }
+  };
+  const backfillChangelogs = async () => {
+    try {
+      const all = await changelogsTable?.getRecords();
+      all && (await indexdb.changelogs.bulkPut(Object.values(all)));
+    } catch (error) {
+      console.error(error);
+    }
+  };
+  const backfillTags = async () => {
+    try {
+      const all = await tagsTable?.getRecords();
+      all && (await indexdb.tags.bulkPut(Object.values(all)));
+    } catch (error) {
+      console.error(error);
+    }
+  };
+  const backfillUserSettings = async () => {
+    try {
+      const tableInstance = userSettingsTable!;
+      const backupData = await tableInstance.getRecords().then((data) => {
+        if (!data[tableInstance.DEFAULT_USER]) {
+          // legacy
+          return data;
+        }
+        return data[tableInstance.DEFAULT_USER];
+      });
+      await indexdb.userSettings.put({
+        ...tableInstance.defaultSettings,
+        ...backupData,
+      });
+    } catch (error) {
+      console.error(error);
+    }
+  };
+  const backfillWorkflowVersions = async () => {
+    try {
+      const all = await workflowVersionsTable?.getRecords();
+      all && (await indexdb.workflowVersions.bulkPut(Object.values(all)));
+    } catch (error) {
+      console.error(error);
+    }
+  };
+  await Promise.all([
+    backfillWorkflows(),
+    backfillFolders(),
+    backfillMedia(),
+    backfillChangelogs(),
+    backfillTags(),
+    backfillUserSettings(),
+    backfillWorkflowVersions(),
+  ]);
 }

ui/src/gallery/GalleryModal.tsx

@@ -1,5 +1,8 @@
+// @ts-expect-error ComfyUI import
+import { app } from "/scripts/app.js";
 import {
   Checkbox,
+  Flex,
   Heading,
   HStack,
   IconButton,

ui/src/gallery/components/FormItem/SelectBase.tsx

@@ -1,5 +1,6 @@
 import { FC } from "react";
 import { Flex, Select } from "@chakra-ui/react";
+import { FormItem } from "./types.ts";
 import { PromptNodeInputItem } from "../MetaBox/utils.ts";
 
 export const SelectBase: FC<

ui/src/gallery/components/MetaBox/MetadataForm.tsx

@@ -1,9 +1,9 @@
-import { getMetadataFromUrl } from "../../utils.ts";
+import { MetaData, getMetadataFromUrl } from "../../utils.ts";
 import { Flex, HStack, Switch } from "@chakra-ui/react";
 import { Media } from "../../../types/dbTypes.ts";
 import TopForm from "../TopForm/TopForm.tsx";
 import AllPromptForm from "../AllPromptForm/AllPromptForm.tsx";
-import { useEffect, useState } from "react";
+import { useContext, useEffect, useState } from "react";
 import { FormItem } from "../FormItem/types.ts";
 import {
   calcInputListRecursive,
@@ -11,7 +11,10 @@ import {
   PromptNodeInputItem,
 } from "./utils.ts";
 import { MetaBoxContext } from "./metaBoxContext.ts";
-import { app } from "../../../utils/comfyapp.ts";
+import { workflowsTable } from "../../../db-tables/WorkspaceDB.ts";
+import { WorkspaceContext } from "../../../WorkspaceContext.ts";
+// @ts-ignore
+import { app } from "/scripts/app.js";
 export type TopFieldType = {
   promptKey: string | number;
   class_type?: string;
@@ -32,6 +35,7 @@ export const isInTopField = (
 
 export default function MetadataForm({ media }: { media: Media | null }) {
   const [calcInputList, setCalcInputList] = useState<PromptNodeInputItem[]>([]);
+  const { curFlowID } = useContext(WorkspaceContext);
   const [imagePrompt, setImagePrompt] = useState<ImagePrompt>();
   const [showAllInputs, setShowAllInputs] = useState(true);
   const [showNodeName, setShowNodeName] = useState(true);
@@ -60,6 +64,18 @@ export default function MetadataForm({ media }: { media: Media | null }) {
 
   const [topFields, setTopFields] = useState<TopFieldType[]>([]);
 
+  useEffect(() => {
+    (async () => {
+      if (curFlowID) {
+        const topFieldsConfig = (await workflowsTable?.get(curFlowID))
+          ?.topFieldsConfig;
+        if (topFieldsConfig) {
+          setTopFields(topFieldsConfig);
+          setShowAllInputs(false);
+        }
+      }
+    })();
+  }, [curFlowID]);
   const updateTopField = (field: TopFieldType) => {
     if (
       isInTopField(topFields, {
@@ -72,9 +88,19 @@ export default function MetadataForm({ media }: { media: Media | null }) {
         (v) => v.name !== field.name || v.promptKey !== field.promptKey,
       );
       setTopFields(topFieldsConfig);
+      if (curFlowID) {
+        workflowsTable?.updateTopFields(curFlowID, {
+          topFieldsConfig,
+        });
+      }
     } else {
       const topFieldsConfig = [...topFields, field];
       setTopFields(topFieldsConfig);
+      if (curFlowID) {
+        workflowsTable?.updateTopFields(curFlowID, {
+          topFieldsConfig,
+        });
+      }
     }
   };
 

ui/src/main.tsx

@@ -1,11 +1,12 @@
 import React, { Suspense } from "react";
 import ReactDOM from "react-dom/client";
-import { ColorModeScript, type StyleFunctionProps } from "@chakra-ui/react";
+import { ColorModeScript } from "@chakra-ui/react";
 import { ChakraProvider, extendTheme } from "@chakra-ui/react";
 import { AlertDialogProvider } from "./components/AlertDialogProvider.tsx";
 import CSSReset from "./MyCSSReset.tsx";
-import { waitForApp } from "./utils/comfyapp.ts";
 
+const topbar = document.createElement("div");
+document.body.append(topbar);
 const App = React.lazy(() =>
   import("./App.tsx").then(({ default: App }) => ({
     default: App,
@@ -34,22 +35,23 @@ const zIndices = {
 };
 
 const theme = extendTheme({
-  config: {
-    initialColorMode: "dark",
-    useSystemColorMode: false,
-  },
   zIndices,
-  components: {
-    Card: {
-      baseStyle: (props: StyleFunctionProps) => ({
-        container: {
-          backgroundColor: props.colorMode === "dark" ? "#171B21" : "#F6F8FA",
-        },
-      }),
-    },
-  },
 });
 
+ReactDOM.createRoot(topbar).render(
+  <React.StrictMode>
+    <ChakraProvider resetCSS={false} disableGlobalStyle={true} theme={theme}>
+      <CSSReset scope=".workspace_manager" />
+      <ColorModeScript initialColorMode="dark" />
+      <AlertDialogProvider>
+        <Suspense>
+          <App />
+        </Suspense>
+      </AlertDialogProvider>
+    </ChakraProvider>
+  </React.StrictMode>,
+);
+
 // hacky fix for chakra add extra className (chakra-ui-light) into body
 // and resulted in user unable to copy new nodes into clipboard, because of this check: e.target.className === "litegraph"
 // (https://github.com/comfyanonymous/ComfyUI/blob/57926635e8d84ae9eea4a0416cc75e363f5ede45/web/scripts/app.js#L861)
@@ -81,40 +83,3 @@ const callback = function (
 };
 const observer = new MutationObserver(callback);
 observer.observe(targetNode, observerConfig);
-
-function waitForDocumentBody() {
-  return new Promise((resolve) => {
-    if (document.body) {
-      return resolve(document.body);
-    }
-
-    document.addEventListener("DOMContentLoaded", () => {
-      resolve(document.body);
-    });
-  });
-}
-
-// wait for document.body to load so that the top menu is loaded and my react component has a place to mount
-waitForDocumentBody()
-  .then(() => waitForApp())
-  .then(() => {
-    const topbar = document.createElement("div");
-    document.body.append(topbar);
-    ReactDOM.createRoot(topbar).render(
-      <React.StrictMode>
-        <ChakraProvider
-          resetCSS={false}
-          disableGlobalStyle={true}
-          theme={theme}
-        >
-          <CSSReset scope=".workspace_manager" />
-          <ColorModeScript initialColorMode="dark" />
-          <AlertDialogProvider>
-            <Suspense>
-              <App />
-            </Suspense>
-          </AlertDialogProvider>
-        </ChakraProvider>
-      </React.StrictMode>,
-    );
-  });

ui/src/model-manager/install-models/InstallModelsModal.tsx

@@ -59,8 +59,11 @@ export default function InatallModelsModal({
   >(MODEL_TYPE_TO_FOLDER_MAPPING);
   const loadData = useCallback(async () => {
     setLoading(true);
-    const models = await getModelFromCivitAPi(modelType, searchQuery);
-    // const models = await getModelFromSearch(searchQuery, modelType);
+    // if (!searchQuery) {
+    //   const models = await getModelFromCivitAPi(modelType);
+    //   setModels(models);
+    // } else {
+    const models = await getModelFromSearch(searchQuery, modelType);
     setModels(models);
     const folders_list = await getAllFoldersList();
     folders_list && setFoldersList(folders_list);

ui/src/model-manager/install-models/InstallProgress.tsx

@@ -1,4 +1,5 @@
 // @ts-ignore
+import { api } from "/scripts/api.js";
 import {
   Button,
   HStack,
@@ -10,7 +11,6 @@ import {
 } from "@chakra-ui/react";
 import { useState, useEffect } from "react";
 import { cancelDownload } from "../../Api";
-import { api } from "../../utils/comfyapp";
 
 type Queue = { save_path: string; progress: number };
 

ui/src/model-manager/install-models/util/getModelFromCivitAPI.ts

@@ -1,3 +1,4 @@
+import { userSettingsTable } from "../../../db-tables/WorkspaceDB";
 import { indexdb } from "../../../db-tables/indexdb";
 import { CivitiModel } from "../../types";
 import { CACHE_EXPIRY_DAYS, MODEL_TYPE } from "./modelTypes";
@@ -6,19 +7,20 @@ type CivitModelQueryParams = {
   types?: MODEL_TYPE;
   query?: string;
   limit?: string;
+  nsfw?: boolean;
 };
 
 export async function getModelFromCivitAPi(
   types?: MODEL_TYPE,
-  query?: string,
 ): Promise<CivitiModel[]> {
+  const showNsfwThumbnail = await userSettingsTable?.getSetting(
+    "showNsfwModelThumbnail",
+  );
   const params: CivitModelQueryParams = {
     limit: "30",
+    nsfw: showNsfwThumbnail ?? false,
     types,
   };
-  if (query) {
-    params.query = query;
-  }
 
   const queryString = new URLSearchParams(params).toString();
   const fullURL = `https://civitai.com/api/v1/models?${queryString}`;

ui/src/model-manager/install-models/util/getModelFromSearch.ts

@@ -9,7 +9,7 @@ export async function getModelFromSearch(
     queries: [
       {
         q: q,
-        indexUid: "models_v9",
+        indexUid: "models_v8",
         facets: [
           "category.name",
           "checkpointType",

ui/src/model-manager/missing-models-drawer/MissingModelItem.tsx

@@ -12,12 +12,13 @@ import {
 import { IconExternalLink } from "@tabler/icons-react";
 import { useEffect, useState } from "react";
 import { COMFYSPACE_TRACKING_FIELD_NAME } from "../../const";
+// @ts-ignore
+import { app } from "/scripts/app.js";
 import type {
   DepsResult,
-  ModelDep,
+  ModelFile,
 } from "../../spacejson/handleDownloadSpaceJson";
 import { indexdb } from "../../db-tables/indexdb";
-import { app } from "../../utils/comfyapp";
 
 const HF_LOGO =
   "https://huggingface.co/datasets/huggingface/brand-assets/resolve/main/hf-logo.png";
@@ -32,8 +33,8 @@ export interface MissingModel {
 
 interface Props {
   model: MissingModel;
-  setSelectedModelDeps: (deps: ModelDep[]) => void;
-  selectedModelDeps: ModelDep[];
+  setSelectedModelDeps: (deps: ModelFile[]) => void;
+  selectedModelDeps: ModelFile[];
   foldersList: Record<string, string[]>;
   setFoldersList: (folders: Record<string, string[]>) => void;
 }
@@ -46,7 +47,7 @@ export default function MissingModelItem({
   setFoldersList,
 }: Props) {
   const [suggestedModel, setSuggestedModel] = useState<
-    ModelDep | { existingModel: string }
+    ModelFile | { existingModel: string }
   >();
   const modelDeps: DepsResult["models"] =
     app.graph.extra?.[COMFYSPACE_TRACKING_FIELD_NAME]?.deps?.models;
@@ -76,7 +77,7 @@ export default function MissingModelItem({
 
   const selectedModelNames = selectedModelDeps.map((dep) => dep.filename);
   function isExistingModel(
-    model: ModelDep | { existingModel: string },
+    model: ModelFile | { existingModel: string },
   ): model is { existingModel: string } {
     return (model as { existingModel: string }).existingModel != null;
   }

ui/src/model-manager/missing-models-drawer/MissingModelsListDrawer.tsx

@@ -10,14 +10,15 @@ import {
   useToast,
 } from "@chakra-ui/react";
 import { useCallback, useContext, useEffect, useState } from "react";
+// @ts-ignore
+import { app } from "/scripts/app.js";
 import MissingModelItem from "./MissingModelItem";
 import { DRAWER_Z_INDEX } from "../../const";
-import type { ModelDep } from "../../spacejson/handleDownloadSpaceJson";
+import type { ModelFile } from "../../spacejson/handleDownloadSpaceJson";
 import { getAllFoldersList } from "../../Api";
 import { installModelsApi } from "../api/modelsApi";
 import { getCivitApiKey } from "../../utils/civitUtils";
 import { WorkspaceContext } from "../../WorkspaceContext";
-import { app } from "../../utils/comfyapp";
 
 export interface MissingModel {
   class_type: string;
@@ -40,7 +41,7 @@ export default function MissingModelsListDrawer({
       app.canvasEl.removeEventListener("click", onClose);
     };
   }, []);
-  const [selectedModelDeps, setSelectedModelDeps] = useState<ModelDep[]>([]);
+  const [selectedModelDeps, setSelectedModelDeps] = useState<ModelFile[]>([]);
   const [foldersList, setFoldersList] = useState<Record<string, string[]>>({});
   const { setRoute } = useContext(WorkspaceContext);
   const loadData = useCallback(async () => {
@@ -77,7 +78,7 @@ export default function MissingModelsListDrawer({
       }
       installModelsApi({
         file_hash: model.fileHash ?? undefined,
-        filename: model.name,
+        filename: model.filename,
         save_path: foldersList[model.fileFolder][0],
         url,
         force_filename: true,

ui/src/model-manager/models-list-drawer/ModelsListDrawer.tsx

@@ -13,6 +13,8 @@ import Fuse from "fuse.js/min-basic";
 import { useEffect, useState } from "react";
 import { ModelsTags } from "./ModelsTags";
 import { ModelsList } from "./ModelsList";
+// @ts-expect-error ComfyUI imports
+import { app } from "/scripts/app.js";
 import InstallModelsButton from "../install-models/InstallModelsButton";
 import { type ModelsListRespItem } from "../types";
 import { useUpdateModels } from "../hooks/useUpdateModels";
@@ -21,7 +23,6 @@ import ShowNsfwModelThumbnailSettings from "../../settings/ShowNsfwModelThumbnai
 import { indexdb } from "../../db-tables/indexdb";
 import { type Model } from "../../types/dbTypes";
 import ModelDropEventListener from "../topbar/ModelDropEventListener";
-import { app } from "../../utils/comfyapp";
 interface Props {
   onClose: () => void;
 }

ui/src/model-manager/topbar/InstallMissingModelsButton.tsx

@@ -1,12 +1,13 @@
 import { Button } from "@chakra-ui/react";
 // @ts-ignore
+import { app } from "/scripts/app.js";
+// @ts-ignore
 import { api } from "/scripts/api.js";
 import { useEffect, useState } from "react";
 import MissingModelsListDrawer, {
   MissingModel,
 } from "../missing-models-drawer/MissingModelsListDrawer";
 import { COMFYSPACE_TRACKING_FIELD_NAME } from "../../const";
-import { app } from "../../utils/comfyapp";
 interface Props {}
 
 interface NodeError {

ui/src/model-manager/topbar/ModelDropEventListener.tsx

@@ -1,5 +1,6 @@
 import { useEffect, DragEvent } from "react";
-import { app } from "../../utils/comfyapp";
+// @ts-ignore
+import { app } from "/scripts/app.js";
 
 export default function ModelDropEventListener() {
   const handleModelDrop = async (

ui/src/model-manager/topbar/ModelManagerTopbar.tsx

@@ -1,6 +1,8 @@
 import { Button, DarkMode, Stack } from "@chakra-ui/react";
-import { lazy, useEffect, useContext, Suspense } from "react";
+import { lazy, useEffect, DragEvent, useContext, Suspense } from "react";
 import ModelsListDrawer from "../models-list-drawer/ModelsListDrawer";
+// @ts-ignore
+import { app } from "/scripts/app.js";
 import "./index.css";
 import { WorkspaceContext } from "../../WorkspaceContext";
 // @ts-ignore
@@ -13,10 +15,30 @@ import type { ModelsListRespItemFromApi } from "../types";
 import InatallModelsModal from "../install-models/InstallModelsModal";
 import { TOPBAR_BUTTON_HEIGHT } from "../../const";
 
+const AddMissingModelsButton = lazy(
+  () => import("./InstallMissingModelsButton"),
+);
+
 export default function ModelManagerTopbar() {
   const { setRoute, route } = useContext(WorkspaceContext);
+  const handleModelDrop = async (
+    e: DragEvent<HTMLCanvasElement> & { canvasX: number; canvasY: number },
+  ) => {
+    const eventName = e.dataTransfer.getData("eventName");
+    if (eventName !== "WorkspaceManagerAddNode") {
+      return;
+    }
+    const modelRelativePath = e.dataTransfer.getData("modelRelativePath");
+    const nodeType = e.dataTransfer.getData("nodeType");
+    // @ts-ignore
+    const node = LiteGraph.createNode(nodeType);
+    node.pos = [e.canvasX, e.canvasY];
+    node.configure({ widgets_values: [modelRelativePath] });
+    app.graph.add(node);
+  };
 
   useEffect(() => {
+    app.canvasEl.addEventListener("drop", handleModelDrop);
     api.addEventListener(
       "model_list",
       async (e: { detail: ModelsListRespItemFromApi[] }) => {
@@ -55,22 +77,30 @@ export default function ModelManagerTopbar() {
         window.dispatchEvent(new CustomEvent("model_list_updated"));
       },
     );
+    return () => {
+      app.canvasEl.removeEventListener("drop", handleModelDrop);
+    };
   }, []);
 
   return (
     <Stack style={{ position: "relative" }}>
-      <Button
-        size={"sm"}
-        backgroundColor={"#434554"}
-        color={"white"}
-        colorScheme="blue"
-        aria-label="My models"
-        onClick={() => setRoute("modelList")}
-        px={1}
-        height={TOPBAR_BUTTON_HEIGHT + "px"}
-      >
-        Models
-      </Button>
+      <DarkMode>
+        <Button
+          size={"sm"}
+          backgroundColor={"#434554"}
+          aria-label="My models"
+          onClick={() => setRoute("modelList")}
+          px={1}
+          height={TOPBAR_BUTTON_HEIGHT + "px"}
+        >
+          Models
+        </Button>
+      </DarkMode>
+      <div style={{ position: "absolute", top: "38px", left: "0px" }}>
+        <Suspense>
+          <AddMissingModelsButton />
+        </Suspense>
+      </div>
       {route === "modelList" && (
         <ModelsListDrawer onClose={() => setRoute("root")} />
       )}

ui/src/model-manager/utils.tsx

@@ -1,5 +1,8 @@
 // @ts-ignore
 import { deleteFile } from "./Api";
+// @ts-ignore
+import { app, ComfyApp } from "/scripts/app.js";
+
 export function formatTimestamp(
   unixTimestamp: number,
   showSec: boolean = false,

ui/src/settings/CloudHostSetting.tsx

@@ -1,59 +0,0 @@
-import { Input, Stack, useToast, Text, Flex, Button } from "@chakra-ui/react";
-import { useEffect, useState } from "react";
-import { userSettingsTable } from "../db-tables/WorkspaceDB";
-
-export default function CloudHostSetting() {
-  const toast = useToast();
-  const [text, setText] = useState("");
-
-  const getSettings = () => {
-    userSettingsTable?.getSetting("cloudHost").then((res) => {
-      setText(res ?? "");
-    });
-  };
-
-  useEffect(() => {
-    getSettings();
-  }, []);
-  const submitChange = async (text: string) => {
-    text = text.trim();
-    if (text.endsWith("/")) text = text.slice(0, -1);
-    await userSettingsTable?.upsert({ cloudHost: text });
-    getSettings();
-    toast({
-      title: "Setting saved. Please refresh to see the changes.",
-      status: "success",
-      duration: 4000,
-    });
-  };
-
-  return (
-    <Stack>
-      <Text>
-        For enterprise paid user only. Hosting site of the shared workflow.
-      </Text>
-      <Flex gap={2} alignItems={"center"}>
-        <Input
-          value={text}
-          onChange={(e) => setText(e.target.value)}
-          onBlur={() => submitChange(text)}
-          onKeyDown={(e) => {
-            if (e.key === "Enter") {
-              submitChange(text);
-            }
-          }}
-        />
-        <Button
-          size={"sm"}
-          onClick={() => {
-            const cloudHost = userSettingsTable?.defaultSettings.cloudHost!;
-            setText(cloudHost);
-            submitChange(cloudHost);
-          }}
-        >
-          Reset
-        </Button>
-      </Flex>
-    </Stack>
-  );
-}

ui/src/settings/CommonCheckboxSettings.tsx

@@ -32,7 +32,6 @@ export default function CommonCheckboxSettings({
       <Checkbox
         isChecked={checked}
         onChange={async (e) => {
-          setChecked(e.target.checked);
           await userSettingsTable?.upsert({ [settingKey]: e.target.checked });
           getSetting();
           toast({

ui/src/settings/SelectMyWorkflowsDir.tsx

@@ -108,13 +108,6 @@ export default function SelectMyWorkflowsDir() {
     setCurrentDirectory(getNewPath);
     isManualEntry && setNoPermission(false);
     onCloseEditDirectory();
-    toast({
-      title: "Directory saved successfully. Please refresh the page.",
-      status: "success",
-      duration: 4000,
-      position: "top",
-      isClosable: true,
-    });
   };
 
   const onSubmit = async (manualEntry?: string) => {

ui/src/settings/SharekeySetting.tsx

@@ -1,58 +0,0 @@
-import { Input, Stack, useToast, Text, Flex, Button } from "@chakra-ui/react";
-import { useContext, useEffect, useState } from "react";
-import { userSettingsTable } from "../db-tables/WorkspaceDB";
-import { WorkspaceContext } from "../WorkspaceContext";
-import { saveShareKey } from "../utils/saveShareKey";
-
-export default function SharekeySetting() {
-  const toast = useToast();
-  const { session, updateSession } = useContext(WorkspaceContext);
-  const [text, setText] = useState("");
-  const cloudDomain = new URL(userSettingsTable?.settings?.cloudHost!).hostname;
-
-  useEffect(() => {
-    setText(session?.shareKey ?? "");
-  }, [session]);
-  const submitChange = async (text: string) => {
-    saveShareKey(text);
-    updateSession({ username: session?.username ?? null, shareKey: text });
-    toast({
-      title: "Setting saved. Please refresh to see the changes.",
-      status: "success",
-      duration: 4000,
-    });
-  };
-
-  return (
-    <Stack gap={3}>
-      <p style={{ fontWeight: "bold" }}>Cloud Backup [Beta]</p>
-      <p>
-        <a
-          href={userSettingsTable?.settings?.cloudHost + "/auth/shareKey"}
-          target="_blank"
-          style={{ textDecoration: "underline" }}
-        >
-          <Button size={"sm"}>👉Copy your share key from here</Button>
-        </a>{" "}
-        and paste it below to start saving workflow versions to cloud at{" "}
-        <a href={userSettingsTable?.settings?.cloudHost!} target="_blank">
-          {cloudDomain}
-        </a>
-      </p>
-
-      <Flex alignItems={"center"}>
-        <Input
-          value={text}
-          placeholder="Paste your share key here"
-          onChange={(e) => setText(e.target.value)}
-          onBlur={() => submitChange(text)}
-          onKeyDown={(e) => {
-            if (e.key === "Enter") {
-              submitChange(text);
-            }
-          }}
-        />
-      </Flex>
-    </Stack>
-  );
-}

ui/src/settings/TwoWaySyncSettings.tsx

@@ -49,8 +49,9 @@ export default function TwoWaySyncSettings() {
   return (
     <Stack>
       <Text>
-        Only for legacy two way sync users to get back their data. [DO NOT
-        DISABLE]
+        Only for legacy two way sync users to get back their data. Do not
+        disable two way sync if you have already enabled it. It may cause some
+        unexpected issues.
       </Text>
       <Checkbox isChecked={checked} onChange={onTwoWaySyncChange}>
         Enable two way sync

ui/src/share/ShareDialog.tsx

@@ -10,98 +10,88 @@ import {
   ModalContent,
   ModalHeader,
   ModalOverlay,
+  Radio,
   RadioGroup,
   Stack,
-  Switch,
   Tag,
   Text,
   useToast,
 } from "@chakra-ui/react";
-import {
-  EWorkflowPrivacy,
-  WorkflowPrivacy,
-  WorkflowVersion,
-} from "../types/dbTypes";
-import { useContext, useEffect, useState } from "react";
+import { Workflow, WorkflowPrivacy, WorkflowVersion } from "../types/dbTypes";
+import { useEffect, useRef, useState } from "react";
 import CustomSelector from "../components/CustomSelector";
-import { IconCopy, IconExternalLink } from "@tabler/icons-react";
-import { userSettingsTable, workflowsTable } from "../db-tables/WorkspaceDB";
+import { IconCloud, IconCopy, IconExternalLink } from "@tabler/icons-react";
+import {
+  userSettingsTable,
+  workflowVersionsTable,
+  workflowsTable,
+} from "../db-tables/WorkspaceDB";
 // @ts-ignore
 import { api } from "/scripts/api.js";
+// @ts-ignore
+import { app } from "/scripts/app.js";
 import {
   PrivacyLabel,
   fetchCloudWorkflowPrivacy,
   generateRandomKey,
-  getCurDateString,
   getNodeDefs,
   privacyOptions,
 } from "./shareUtils";
 
-import ResourceDepsForm from "../spacejson/ResourceDepsForm";
-import { app } from "../utils/comfyapp";
-import { useStateRef } from "../customHooks/useStateRef";
-import { WorkspaceContext } from "../WorkspaceContext";
-import {
-  DepsResult,
-  WorkspaceInfoDeps,
-  extractAndFetchFileNames,
-} from "../spacejson/handleDownloadSpaceJson";
-import { fetchApi } from "../Api";
-import { COMFYSPACE_TRACKING_FIELD_NAME } from "../const";
-import { ShareWorkflowData } from "../types/types";
+import ShareDialogWorkflowVersionRadio from "./ShareDialogWorkflowVersionRadio";
 
 interface Props {
   onClose: () => void;
 }
 
 export default function ShareDialog({ onClose }: Props) {
-  const [versionName, setVersionName, versionNameRef] = useStateRef(
-    "v" + getCurDateString(),
-  );
-  const { saveCurWorkflow } = useContext(WorkspaceContext);
-  const [deps, setDeps] = useState<DepsResult>();
-  const [uploadingImage, setUploadingImage] = useState(false);
+  const [versionName, setVersionName] = useState("v" + getCurDateString());
+  const [localVersions, setLocalVersions] = useState<WorkflowVersion[]>([]);
   const [loading, setLoading] = useState(false);
-  const cloudHost = userSettingsTable?.settings?.cloudHost;
-  const [privacy, setPrivacy, privacyRef] =
-    useStateRef<WorkflowPrivacy>("PRIVATE");
+  const [cloudHost, setCloudHost] = useState("");
+  const [privacy, setPrivacy] = useState<WorkflowPrivacy>("PRIVATE");
   const [selectedVersion, setSelectedVersion] = useState<
     string | "new_version"
   >("new_version");
-  const workflow = workflowsTable?.curWorkflow;
+  const cloudHostRef = useRef("");
+  const [workflow, setWorkflow] = useState<Workflow>();
   const toast = useToast();
-  const [enableDeps, setEnableDeps] = useState(true);
   const handleShareWorkflowSuccess = async (event: MessageEvent) => {
     const detail = event.data;
     if (
-      // event.origin !== cloudHostRef.current ||
-      detail.type !== "share_workflow_success" ||
-      !workflow
+      event.origin !== cloudHostRef.current ||
+      detail.type !== "share_workflow_success"
     ) {
       return;
     }
 
+    const localID = detail.localWorkflowID;
+    const localVerID = detail.localVersionID;
     const cloudVersionID = detail.version.id;
     const cloudID = detail.version.workflowID;
 
     cloudID &&
-      (await workflowsTable?.updateMetaInfo(workflow.id, {
+      localID &&
+      (await workflowsTable?.updateMetaInfo(localID, {
         cloudID: cloudID,
+        cloudOrigin: event.origin,
+        privacy: privacy,
+      }));
+    localVerID &&
+      cloudVersionID &&
+      (await workflowVersionsTable?.update(localVerID, {
+        cloudID: cloudVersionID,
+        cloudOrigin: event.origin,
       }));
-
     loadData();
     window.open(
-      cloudHost + "/workflow/" + cloudID + "/" + cloudVersionID,
+      cloudHostRef.current + "/workflow/" + cloudID + "/" + cloudVersionID,
       "_blank",
     );
     setLoading(false);
   };
   useEffect(() => {
     loadData();
-    const graph = app.graph.serialize();
-    extractAndFetchFileNames(graph.nodes ?? []).then((depsRes) => {
-      setDeps(depsRes);
-    });
     window.addEventListener("message", handleShareWorkflowSuccess);
     return () => {
       window.removeEventListener("message", handleShareWorkflowSuccess);
@@ -109,11 +99,24 @@ export default function ShareDialog({ onClose }: Props) {
   }, []);
 
   const loadData = async () => {
+    const host =
+      import.meta.env.MODE === "production"
+        ? await userSettingsTable?.getSetting("cloudHost")
+        : "http://localhost:3000";
+    if (host) {
+      setCloudHost(host);
+      cloudHostRef.current = host;
+    }
+    const workflow = workflowsTable?.curWorkflow ?? undefined;
+    setWorkflow(workflow);
     if (workflow?.cloudID && workflow.cloudOrigin) {
       fetchCloudWorkflowPrivacy(workflow).then((privacy) => {
         setPrivacy(privacy);
       });
     }
+    workflowVersionsTable?.listByWorkflowID(workflow!.id).then((vers) => {
+      setLocalVersions(vers);
+    });
   };
   const copyTextToClipboard = (text: string) => {
     navigator.clipboard
@@ -130,24 +133,7 @@ export default function ShareDialog({ onClose }: Props) {
         console.error("Failed to copy text: ", err);
       });
   };
-  const pushToCloud = async (imageDeps?: DepsResult["images"]) => {
-    const graph = app.graph.serialize();
-    (graph.extra ||= {})[COMFYSPACE_TRACKING_FIELD_NAME] ||= {};
-    graph.extra[COMFYSPACE_TRACKING_FIELD_NAME].deps = {
-      models: deps?.models ?? {},
-      images: imageDeps ?? {},
-      nodeRepos: deps?.nodeRepos ?? [],
-    } as WorkspaceInfoDeps;
-
-    await saveCurWorkflow();
-
-    await app
-      .graphToPrompt(app.graph)
-      .then((data: { output: any; workflow: any }) => {
-        graph.extra[COMFYSPACE_TRACKING_FIELD_NAME].apiPrompt = data.output;
-        return data.output;
-      });
-    const jsonToShare = JSON.stringify(graph);
+  const onShare = async () => {
     setLoading(true);
     const secretKey = generateRandomKey(32);
     const host =
@@ -155,11 +141,30 @@ export default function ShareDialog({ onClose }: Props) {
         ? ((await userSettingsTable?.getSetting("cloudHost")) as string)
         : "http://localhost:3000";
     let nodeDefs: Object;
-    nodeDefs = getNodeDefs();
-    const version: Omit<WorkflowVersion, "id" | "workflowID" | "createTime"> = {
-      name: versionNameRef.current,
-      json: jsonToShare ?? JSON.stringify(app.graph.serialize()),
-    };
+    let version: WorkflowVersion | undefined;
+    try {
+      nodeDefs = getNodeDefs();
+      if (selectedVersion === "new_version") {
+        version = await workflowVersionsTable?.add({
+          workflowID: workflow!.id,
+          name: versionName,
+          createTime: Date.now(),
+          json: JSON.stringify(app.graph.serialize()),
+        });
+      } else {
+        version = await workflowVersionsTable?.get(selectedVersion);
+      }
+      if (!version) {
+        alert(`Failed to find version: ${selectedVersion}, please try again.`);
+        setLoading(false);
+        return;
+      }
+    } catch (e) {
+      console.error(e);
+      setLoading(false);
+      alert("Failed to share workflow, please try again.");
+      return;
+    }
     const protocol = window.location.protocol;
     const baseHost = window.location.host;
     const baseUrl = `${protocol}//${baseHost}`;
@@ -173,84 +178,28 @@ export default function ShareDialog({ onClose }: Props) {
     const handleChildReady = (event: MessageEvent) => {
       if (event.origin === host && event.data === "child_ready") {
         const curWorkflow = workflowsTable?.curWorkflow;
-        if (!curWorkflow) {
-          return;
-        }
-        const input: ShareWorkflowData = {
-          workflow: {
-            name: curWorkflow.name,
-            cloudID: curWorkflow.cloudID,
-          },
-          version: {
-            name: versionNameRef.current,
-            json: jsonToShare,
-          },
-          nodeDefs: nodeDefs,
-          privacy: privacyRef.current as EWorkflowPrivacy,
-        };
         // Send data to the new window after it loads
-        sharePopup!.postMessage(input, host);
+        sharePopup!.postMessage(
+          {
+            workflow: curWorkflow,
+            version: version,
+            nodeDefs: nodeDefs,
+            privacy: privacy,
+          },
+          host,
+        );
         window.removeEventListener("message", handleChildReady);
       }
     };
     window.addEventListener("message", handleChildReady);
   };
 
-  const onShare = async () => {
-    const imageDeps = deps?.images ?? {};
-    if (enableDeps) {
-      // upload images
-      setUploadingImage(true);
-      const imageDepsToUpload = Object.values(deps?.images ?? {})
-        // .filter((i) => !i.url)
-        .map((i) => i.filename);
-      if (imageDepsToUpload.length) {
-        try {
-          const uploadResp = await fetchApi("/workspace/upload_image", {
-            method: "POST",
-            body: JSON.stringify({
-              images: imageDepsToUpload,
-            }),
-          });
-          const json = (await uploadResp.json()) as Record<string, string>;
-          Object.keys(json).forEach((key) => {
-            if (imageDeps?.[key]) {
-              imageDeps[key].url = json[key];
-            }
-          });
-        } catch (error) {
-          console.error("Error uploading images:", error);
-        }
-      }
-      setUploadingImage(false);
-    }
-
-    pushToCloud(imageDeps);
-  };
-
   const cloudWorkflowID = workflowsTable?.curWorkflow?.cloudID;
   return (
     <Modal isOpen={true} onClose={onClose} size={"lg"}>
       <ModalOverlay />
       <ModalContent width={["98%", "90%", "50%"]} maxWidth={"600px"}>
-        <ModalHeader>
-          <Flex justifyContent={"space-between"}>
-            <p>Share "{workflow?.name}"</p>
-            <Button
-              colorScheme="teal"
-              onClick={onShare}
-              size={"sm"}
-              isDisabled={loading}
-            >
-              {loading ? "Sharing" : "Share"}
-            </Button>
-          </Flex>
-          {cloudHost && (
-            <Text fontSize={16} color={"GrayText"} fontWeight={400}>
-              Share to {new URL(cloudHost).host}
-            </Text>
-          )}
-        </ModalHeader>
+        <ModalHeader>Share "{workflow?.name}"</ModalHeader>
         <ModalBody pb={10}>
           <Stack gap={5}>
             {cloudWorkflowID == null ? (
@@ -299,6 +248,7 @@ export default function ShareDialog({ onClose }: Props) {
                 </Button>
               </HStack>
             )}
+            <Text>Choose a version to share:</Text>
             <RadioGroup
               gap={4}
               onChange={(val) => {
@@ -308,6 +258,7 @@ export default function ShareDialog({ onClose }: Props) {
             >
               <Stack>
                 <HStack mb={5} alignItems={"center"}>
+                  <Radio key={"new_version"} value="new_version" />
                   <Input
                     value={versionName}
                     width={"60%"}
@@ -319,37 +270,39 @@ export default function ShareDialog({ onClose }: Props) {
                     }}
                   />
                   <Flex color="green">
-                    <Badge colorScheme="purple">Version Name</Badge>
+                    <Badge colorScheme="purple">New version</Badge>
                   </Flex>
                 </HStack>
+
+                {localVersions.slice(0, 4).map((ver) => {
+                  return (
+                    <ShareDialogWorkflowVersionRadio
+                      key={ver.id}
+                      version={ver}
+                      cloudHost={cloudHost}
+                      cloudWorkflowID={cloudWorkflowID ?? null}
+                    />
+                  );
+                })}
               </Stack>
             </RadioGroup>
-            {Object.keys(deps?.images ?? {}).length > 0 && (
-              <Stack borderRadius={6} borderWidth={"1px"} p={2}>
-                <Switch
-                  isChecked={enableDeps}
-                  onChange={() => setEnableDeps(!enableDeps)}
-                  fontWeight={"600"}
-                >
-                  Share input images
-                </Switch>
-
-                <span style={{ color: "GrayText" }}>
-                  If enabled your input images will be uploaded and shared to{" "}
-                  {cloudHost}
-                </span>
-                {enableDeps && (
-                  <ResourceDepsForm
-                    deps={deps ?? null}
-                    setDeps={setDeps}
-                    uploadingImage={uploadingImage}
-                  />
-                )}
-              </Stack>
-            )}
           </Stack>
+          <HStack justifyContent={"flex-end"} mt={16}>
+            <Button colorScheme="teal" onClick={onShare} isDisabled={loading}>
+              {loading ? "Sharing" : "Share"}
+            </Button>
+          </HStack>
         </ModalBody>
       </ModalContent>
     </Modal>
   );
 }
+
+function getCurDateString() {
+  const currentDate = new Date();
+  const year = currentDate.getFullYear();
+  const month = String(currentDate.getMonth() + 1).padStart(2, "0"); // Months are 0-based in JS
+  const day = String(currentDate.getDate()).padStart(2, "0");
+
+  return `${year}-${month}-${day}`;
+}

ui/src/share/shareUtils.tsx

@@ -1,8 +1,8 @@
 import { IconLink, IconLock, IconWorld } from "@tabler/icons-react";
 import { CustomSelectorOption } from "../components/CustomSelector";
 import { Workflow, WorkflowPrivacy } from "../types/dbTypes";
-import { app } from "../utils/comfyapp";
-import { userSettingsTable } from "../db-tables/WorkspaceDB";
+// @ts-expect-error
+import { app } from "/scripts/app.js";
 
 export function generateRandomKey(length: number) {
   // Generate a random array of bytes
@@ -61,7 +61,10 @@ export const getNodeDefs = () => {
 export async function fetchCloudWorkflowPrivacy(
   workflow: Workflow,
 ): Promise<WorkflowPrivacy> {
-  const cloudOrigin = userSettingsTable?.settings?.cloudHost;
+  const cloudOrigin = workflow.cloudOrigin;
+  if (!cloudOrigin) {
+    throw Error("cloudURL is required");
+  }
   return fetch(cloudOrigin + `/api/getWorkflow?id=${workflow.cloudID}`)
     .then((res) => res.json())
     .then((json) => {
@@ -97,12 +100,3 @@ export function PrivacyLabel({
   }
   return <span>{text}</span>;
 }
-
-export function getCurDateString() {
-  const currentDate = new Date();
-  // const year = currentDate.getFullYear();
-  const month = String(currentDate.getMonth() + 1).padStart(2, "0"); // Months are 0-based in JS
-  const day = String(currentDate.getDate()).padStart(2, "0");
-
-  return `${month}-${day}`;
-}

ui/src/spacejson/DownloadSpaceJsonDialog.tsx

@@ -0,0 +1,56 @@
+import { useContext, useRef } from "react";
+import { WorkspaceContext } from "../WorkspaceContext";
+import {
+  Badge,
+  Button,
+  HStack,
+  Heading,
+  Modal,
+  ModalBody,
+  ModalContent,
+  Text,
+  Tooltip,
+} from "@chakra-ui/react";
+// @ts-ignore
+import { app } from "/scripts/app.js";
+import { IconInfoCircle } from "@tabler/icons-react";
+import ResourceDepsForm from "./ResourceDepsForm";
+
+export default function DownloadSpaceJsonDialog() {
+  const { setRoute } = useContext(WorkspaceContext);
+  const formRef = useRef<HTMLFormElement>(null);
+  return (
+    <Modal isOpen={true} onClose={() => setRoute("root")} size={"xl"}>
+      <ModalContent>
+        <ModalBody p={5} gap={5}>
+          <HStack>
+            <Heading size={"md"}>Add Resouce Dependencies</Heading>
+            <Tooltip
+              label="runnable workflows include all resource dependecy download urls
+              (models, cursom nodes, input images) and can be one-click
+              installed and run in any ComfyUI with workpace-manager installed."
+            >
+              <Badge borderRadius={10}>
+                <IconInfoCircle size={20} />
+              </Badge>
+            </Tooltip>
+          </HStack>
+          <Text color={"GrayText"}>Export runnable workflow</Text>
+          <ResourceDepsForm ref={formRef} />
+          <HStack justifyContent={"flex-end"}>
+            <Button
+              colorScheme="teal"
+              size="sm"
+              onClick={() => formRef.current?.requestSubmit()}
+            >
+              Next
+            </Button>
+            <Button size="sm" onClick={() => setRoute("share")}>
+              Skip
+            </Button>
+          </HStack>
+        </ModalBody>
+      </ModalContent>
+    </Modal>
+  );
+}

ui/src/spacejson/ResourceDepsForm.tsx

@@ -1,44 +1,332 @@
-import { HStack, Heading, Image, Spinner, Stack } from "@chakra-ui/react";
-import { DepsResult } from "./handleDownloadSpaceJson";
+import {
+  forwardRef,
+  useCallback,
+  useContext,
+  useEffect,
+  useState,
+} from "react";
+import { WorkspaceContext } from "../WorkspaceContext";
+import {
+  Button,
+  Flex,
+  HStack,
+  Heading,
+  IconButton,
+  Image,
+  Input,
+  Spinner,
+  Stack,
+  Tag,
+  Text,
+  Tooltip,
+} from "@chakra-ui/react";
+import {
+  DepsResult,
+  ModelFile,
+  WorkspaceInfoDeps,
+  extractAndFetchFileNames,
+} from "./handleDownloadSpaceJson";
+// @ts-ignore
+import { app } from "/scripts/app.js";
+import { IconExternalLink, IconPencil, IconRefresh } from "@tabler/icons-react";
+import { getHgModelInfoUrlFromDownloadUrl } from "../utils/civitUtils";
+import { getAllModelsList } from "../Api";
+import { COMFYSPACE_TRACKING_FIELD_NAME } from "../const";
+import { indexdb } from "../db-tables/indexdb";
 
-export default function ResourceDepsForm({
-  deps,
-  uploadingImage,
-}: {
-  deps: DepsResult | null;
-  setDeps: (deps: DepsResult) => void;
-  uploadingImage: boolean;
-}) {
-  const imageDepsArr = Object.values(deps?.images ?? {});
-  if (!deps) {
-    return <Spinner size="md" color="teal.400" />;
-  }
+export default forwardRef<HTMLFormElement>(
+  function ResourceDepsForm(_props, ref) {
+    const { saveCurWorkflow, setRoute } = useContext(WorkspaceContext);
+    const [deps, setDeps] = useState<DepsResult>();
+    const [errors, setErrors] = useState<Record<string, string>>({});
+    const [uploadingImage, setUploadingImage] = useState(false);
 
-  return (
-    <Stack gap={5}>
-      {imageDepsArr.length > 0 && (
-        <Stack>
-          <HStack>
-            <Heading size={"sm"}>Images ({imageDepsArr.length})</Heading>
-            {/* <Tag colorScheme="yellow">Will be uploaded as url</Tag> */}
-            <p style={{ color: "GrayText" }}>Will be uploaded as url</p>
-          </HStack>
-          {uploadingImage && (
-            <span>
-              <Spinner size="md" color="teal.400" /> Uploading
-            </span>
-          )}
-          {imageDepsArr.map((image) => (
-            <Stack key={image.filename}>
-              <p>{image.filename}</p>
-              <Image
-                width={250}
-                src={`/workspace/view_media?filename=${image.filename}&isPreview=true&isInput=true`}
+    const init = useCallback(async () => {
+      const graph = app.graph.serialize();
+      extractAndFetchFileNames(graph.nodes ?? []).then((depsRes) => {
+        setDeps(depsRes);
+      });
+    }, []);
+
+    const onRefreshModelsList = useCallback(async () => {
+      setDeps(undefined);
+      await getAllModelsList();
+      window.addEventListener("model_list_updated", () => {
+        init();
+        window.removeEventListener("model_list_updated", () => {});
+      });
+    }, []);
+
+    useEffect(() => {
+      init();
+    }, []);
+
+    const validateURL = (url: string) => {
+      const pattern = new RegExp(
+        "^(https?:\\/\\/)?" +
+          "((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|" +
+          "((\\d{1,3}\\.){3}\\d{1,3}))" +
+          "(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*" +
+          "(\\?[;&a-z\\d%_.~+=-]*)?" +
+          "(\\#[-a-z\\d_]*)?$",
+        "i",
+      );
+      return !!pattern.test(url);
+    };
+
+    const handleSubmit = async (event: any) => {
+      event.preventDefault();
+      event.stopPropagation();
+
+      const formData = new FormData(event.target);
+      // validate model deps and save model urls to db
+      const saveModelUrlDBPromises: Promise<ModelFile>[] =
+        Object.values(deps?.models ?? {}).map(async (model) => {
+          const inputDownloadUrl = formData.get(model.filename)?.toString();
+          if (inputDownloadUrl?.length) {
+            // because the models table is storing filename without extension as id, which should be migrated
+            const baseName = getBaseFileName(model.filename);
+            await indexdb.models.update(baseName + "@" + model.fileFolder, {
+              downloadUrl: inputDownloadUrl,
+            });
+          }
+          const infoUrl = model.infoUrl?.length
+            ? model.infoUrl
+            : inputDownloadUrl
+              ? getHgModelInfoUrlFromDownloadUrl(inputDownloadUrl)
+              : null;
+          return {
+            filename: model.filename,
+            nodeType: model.nodeType,
+            fileHash: model.fileHash,
+            fileFolder: model.fileFolder,
+            downloadUrl: inputDownloadUrl ?? model.downloadUrl ?? null,
+            infoUrl: infoUrl ?? null,
+            inputName: model.inputName,
+          };
+        }) ?? [];
+      const modelDepsArr = await Promise.all(saveModelUrlDBPromises);
+      if (!validateModelDeps(modelDepsArr)) {
+        return;
+      }
+      setErrors({});
+
+      // upload images
+      setUploadingImage(true);
+      const imageDepsToUpload = Object.values(deps?.images ?? {})
+        .filter((i) => !i.url)
+        .map((i) => i.filename);
+      const imageDeps = deps?.images ?? {};
+
+      if (imageDepsToUpload.length) {
+        const uploadResp = await fetch("/workspace/upload_image", {
+          method: "POST",
+          body: JSON.stringify({
+            images: imageDepsToUpload,
+          }),
+        });
+        const json = (await uploadResp.json()) as Record<string, string>;
+        Object.keys(json).forEach((key) => {
+          if (imageDeps?.[key]) {
+            imageDeps[key].url = json[key];
+          }
+        });
+      }
+      setUploadingImage(false);
+
+      // save deps to graph
+      const modelDeps: WorkspaceInfoDeps["models"] = {};
+      modelDepsArr.forEach((model) => {
+        modelDeps[model.filename] = model;
+      });
+      const graph = app.graph.serialize();
+      (graph.extra ||= {})[COMFYSPACE_TRACKING_FIELD_NAME] ||= {};
+      graph.extra[COMFYSPACE_TRACKING_FIELD_NAME].deps = {
+        models: modelDeps,
+        images: imageDeps ?? {},
+        nodeRepos: deps?.nodeRepos ?? [],
+      } as WorkspaceInfoDeps;
+      await app
+        .graphToPrompt(app.graph)
+        .then((data: { output: any; workflow: any }) => {
+          graph.extra[COMFYSPACE_TRACKING_FIELD_NAME].apiPrompt = data.output;
+        });
+
+      await saveCurWorkflow();
+      console.log("graph", graph);
+      setRoute("share");
+    };
+
+    const validateModelDeps = useCallback((modelDeps: ModelFile[]) => {
+      let isValid = true;
+      modelDeps.forEach((model) => {
+        const key = model.filename;
+        if (!model.downloadUrl) {
+          setErrors((prev) => ({
+            ...prev,
+            [key]: "Invalid URL",
+          }));
+          isValid = false;
+          return;
+        }
+        if (!validateURL(model.downloadUrl)) {
+          setErrors((prev) => ({ ...prev, [key]: "Invalid URL" }));
+          isValid = false;
+          return;
+        }
+        if (!model.fileFolder) {
+          setErrors((prev) => ({
+            ...prev,
+            [key]: "Model file not found, please re-scan models folder",
+          }));
+          isValid = false;
+          return;
+        }
+      });
+      return isValid;
+    }, []);
+
+    const imageDepsArr = Object.values(deps?.images ?? {});
+    const modelDepsArr = Object.values(deps?.models ?? []);
+    if (!deps) {
+      return <Spinner size="md" color="teal.400" />;
+    }
+
+    return (
+      <form onSubmit={handleSubmit} ref={ref}>
+        <Stack gap={5} mt={5}>
+          <Stack>
+            <Heading size={"sm"}>Models ({modelDepsArr.length})</Heading>
+            {modelDepsArr.map((modelFile, index) => (
+              <ModelDepsItem
+                modelFile={modelFile}
+                key={index}
+                errors={errors}
+                onClickRefetchModelList={onRefreshModelsList}
               />
+            ))}
+          </Stack>
+
+          {imageDepsArr.length > 0 && (
+            <Stack>
+              <HStack>
+                <Heading size={"sm"}>Images ({imageDepsArr.length})</Heading>
+                {/* <Tag colorScheme="yellow">Will be uploaded as url</Tag> */}
+                <p style={{ color: "GrayText" }}>Will be uploaded as url</p>
+              </HStack>
+              {uploadingImage && (
+                <span>
+                  <Spinner size="md" color="teal.400" /> Uploading
+                </span>
+              )}
+              {imageDepsArr.map((image) => (
+                <Stack key={image.filename}>
+                  <p>{image.filename}</p>
+                  <Image
+                    width={250}
+                    src={`/workspace/view_media?filename=${image.filename}&isPreview=true&isInput=true`}
+                  />
+                </Stack>
+              ))}
             </Stack>
-          ))}
+          )}
         </Stack>
-      )}
+      </form>
+    );
+  },
+);
+
+function getBaseFileName(filename: string) {
+  const parts = filename.split(".");
+  if (parts.length > 1) {
+    parts.pop();
+    return parts.join(".");
+  } else {
+    return filename;
+  }
+}
+
+function ModelDepsItem({
+  modelFile,
+  errors,
+  onClickRefetchModelList,
+}: {
+  modelFile: DepsResult["models"][0];
+  errors: Record<string, string>;
+  onClickRefetchModelList: () => void;
+}) {
+  const inputKey = modelFile.filename;
+  const [isEditing, setIsEditing] = useState(!modelFile.downloadUrl);
+
+  if (!modelFile.fileFolder) {
+    return (
+      <Stack>
+        <Flex gap={2}>
+          <p>{modelFile.filename}</p>
+          <Tag size={"sm"} colorScheme={"red"}>
+            Model file not found
+          </Tag>
+        </Flex>
+        <Button
+          size={"sm"}
+          leftIcon={<IconRefresh />}
+          width={"fit-content"}
+          borderColor={"red"}
+          borderWidth={errors[inputKey] != null ? 2 : 0}
+          onClick={onClickRefetchModelList}
+        >
+          Fetch model file
+        </Button>
+      </Stack>
+    );
+  }
+  return (
+    <Stack ml={2}>
+      <Flex key={modelFile.filename + modelFile.nodeType} gap={2}>
+        <Tag height={"fit-content"} colorScheme={"teal"}>
+          {modelFile.fileFolder}
+        </Tag>
+
+        {modelFile.downloadUrl ? (
+          <HStack>
+            <a
+              href={modelFile.infoUrl ?? modelFile.downloadUrl}
+              target="_blank"
+            >
+              {modelFile.filename}
+            </a>
+            <IconExternalLink size={18} />
+            <IconButton
+              ml={3}
+              aria-label="edit"
+              icon={<IconPencil size={18} />}
+              size={"xs"}
+              onClick={() => setIsEditing(!isEditing)}
+            />
+          </HStack>
+        ) : (
+          <Stack>
+            <span>
+              {modelFile.filename} <span>❓</span>
+            </span>
+          </Stack>
+        )}
+      </Flex>
+
+      <Stack style={{ display: isEditing ? "block" : "none" }}>
+        <Tooltip
+          label={"Model download link, supports Huggingface and Civitai"}
+        >
+          <Input
+            name={inputKey}
+            defaultValue={modelFile.downloadUrl ?? ""}
+            size={"sm"}
+            isInvalid={errors[inputKey] != null}
+            placeholder={"https://civitai.com/api/download/models/324524"}
+          />
+        </Tooltip>
+      </Stack>
+      <Text color={"red.400"}>{errors[inputKey]}</Text>
     </Stack>
   );
 }

ui/src/spacejson/handleDownloadSpaceJson.ts

@@ -5,7 +5,8 @@ import {
   getCivitModelPageUrl,
   getHgModelInfoUrlFromDownloadUrl,
 } from "../utils/civitUtils";
-import { app } from "../utils/comfyapp";
+// @ts-ignore
+import { app } from "/scripts/app.js";
 
 type LiteNode = {
   id: number;
@@ -13,18 +14,13 @@ type LiteNode = {
   widgets_values?: Array<string | number>;
 };
 
-export type ModelDep = {
-  name: string;
-  folder: string | null;
-  hash: string | null;
-  url: string | null;
-  // TODO: will be deperecated
-  filename?: string;
-  fileFolder?: string | null;
-  fileHash?: string | null;
-  downloadUrl?: string | null;
+export type ModelFile = {
+  filename: string;
+  fileFolder: string | null;
+  fileHash: string | null;
+  downloadUrl: string | null;
   // optional info
-  infoUrl?: string | null;
+  infoUrl: string | null;
   nodeType?: string;
   inputName?: string;
 };
@@ -45,12 +41,12 @@ export type DepsResult = {
   nodeRepos: NodeRepo[];
 };
 
-export type DepsResultModel = ModelDep & {
+export type DepsResultModel = ModelFile & {
   length: number;
 };
 
 export type WorkspaceInfoDeps = {
-  models: Record<string, ModelDep>;
+  models: Record<string, ModelFile>;
   images: DepsResult["images"];
   nodeRepos: DepsResult["nodeRepos"];
 };
@@ -64,15 +60,18 @@ async function fetchModelData(
     (await indexdb.models.where("fileName").equals(filename).toArray()) ?? [];
   const first = res.at(0);
   const modelFile: DepsResultModel = {
-    name: filename,
+    filename,
     nodeType,
-    hash: first?.fileHash ?? null,
-    folder: first?.fileFolder ?? null,
-    url: first?.civitModelVersionID
+    fileHash: first?.fileHash ?? null,
+    fileFolder: first?.fileFolder ?? null,
+    downloadUrl: first?.civitModelVersionID
       ? getCivitModelDownloadUrl(first.civitModelVersionID)
       : first?.downloadUrl ?? null,
     inputName: inputName,
     length: res.length,
+    infoUrl: first?.civitModelID
+      ? getCivitModelPageUrl(first.civitModelID, first.civitModelVersionID)
+      : getHgModelInfoUrlFromDownloadUrl(first?.downloadUrl ?? "") ?? null,
   };
   return modelFile;
 }
@@ -96,9 +95,13 @@ export async function extractAndFetchFileNames(
           if (typeof value != "string") return;
           // Check if it's a model file
           if (modelFileExtensions.some((ext) => value.endsWith(ext))) {
+            // if (curDeps?.models?.[value]) {
+            // modelPromises.push(Promise.resolve(curDeps.models[value]));
+            // } else {
             modelPromises.push(
               fetchModelData(value, node.class_type, inputName),
             );
+            // }
           }
           // Check if it's an image file
           if (imageFileExtensions.some((ext) => value.endsWith(ext))) {
@@ -132,7 +135,10 @@ export async function extractAndFetchFileNames(
   const models = await Promise.all(modelPromises);
   const modelsMap: Record<string, DepsResultModel> = {};
   models.forEach((model) => {
-    modelsMap[model.name] = model;
+    // if (model.nodeType) {
+    //   model.gitRepo = reposMapping[model.nodeType];
+    // }
+    modelsMap[model.filename] = model;
   });
   const nodeRepos: Record<string, NodeRepo> = {};
   Object.values(reposMapping).forEach((repo) => {

ui/src/topbar/AppIsDirtyEventListener.tsx

@@ -1,31 +1,33 @@
-import { useContext, useEffect, useRef } from "react";
+import { useContext, useEffect, useRef, useState } from "react";
+// @ts-expect-error
+import { app } from "/scripts/app.js";
 import { WorkspaceContext } from "../WorkspaceContext";
-import { workflowsTable } from "../db-tables/WorkspaceDB";
+import {
+  changelogsTable,
+  userSettingsTable,
+  workflowsTable,
+} from "../db-tables/WorkspaceDB";
+import { Tag, Tooltip, useToast } from "@chakra-ui/react";
 import { matchShortcut } from "../utils";
 import { EShortcutKeys } from "../types/dbTypes";
 import useDebounceFn from "../customHooks/useDebounceFn";
-import {
-  COMFYSPACE_TRACKING_FIELD_NAME,
-  SHORTCUT_TRIGGER_EVENT,
-} from "../const";
-import { app } from "../utils/comfyapp";
+import { deepJsonDiffCheck } from "../utils/deepJsonDiffCheck";
+import { SHORTCUT_TRIGGER_EVENT } from "../const";
 
 export default function AppIsDirtyEventListener() {
-  const {
-    isDirty,
-    setIsDirty,
-    setRoute,
-    saveCurWorkflow,
-    setCurFlowIDAndName,
-  } = useContext(WorkspaceContext);
+  const { isDirty, setIsDirty, setRoute, saveCurWorkflow } =
+    useContext(WorkspaceContext);
   const isDirtRef = useRef(isDirty);
+  const [isOutdated, setIsOutdated] = useState(false);
+  const toast = useToast();
+  const autoSaveTimer = useRef<number | null>(null);
 
   useEffect(() => {
     isDirtRef.current = isDirty;
   }, [isDirty]);
 
   useEffect(() => {
-    const keydownListener = (event: KeyboardEvent) => {
+    const shortcutListener = (event: KeyboardEvent) => {
       if (document.visibilityState === "hidden") return;
       const matchResult = matchShortcut(event);
       if (matchResult) {
@@ -58,27 +60,11 @@ export default function AppIsDirtyEventListener() {
         debounceOnIsDirty();
       }
     };
-
-    const restoreCurWorkflow = async () => {
-      if (!app?.graph) {
-        console.error(
-          "🦄 Error in workspace manager! app.graph is not available in restoreCurWorkflow()",
-        );
-        return;
-      }
-      const id = app.graph.extra?.[COMFYSPACE_TRACKING_FIELD_NAME]?.id;
-      if (id) {
-        const flow = await workflowsTable?.get(id);
-        flow && setCurFlowIDAndName(flow);
-
-        if (
-          !flow?.saveLock &&
-          flow &&
-          flow.json !== JSON.stringify(app.graph.serialize())
-        ) {
-          setIsDirty(true);
-        }
-      }
+    const originalOnAfterChange = app.canvas.onAfterChange;
+    app.graph.onAfterChange = function () {
+      // Call the original onAfterChange method
+      originalOnAfterChange?.apply(this, arguments);
+      debounceOnIsDirty();
     };
 
     const originalOnConfigure = app.graph.onConfigure;
@@ -86,11 +72,14 @@ export default function AppIsDirtyEventListener() {
       originalOnConfigure?.apply(this, arguments);
       // delay check diff json cuz it takes time for graph.serialize() to settle up and return the correct json
       setTimeout(() => {
-        const id = app.graph.extra?.[COMFYSPACE_TRACKING_FIELD_NAME]?.id;
-        if (id == null || id != workflowsTable?.curWorkflow?.id) {
-          setCurFlowIDAndName(null);
+        const deepCheck = deepJsonDiffCheck(
+          app.graph.serialize(),
+          JSON.parse(workflowsTable?.curWorkflow?.json ?? "{}"),
+        );
+        if (!deepCheck) {
+          debounceOnIsDirty();
         }
-      }, 500);
+      }, 1000);
     };
 
     document.addEventListener("click", (e) => {
@@ -103,23 +92,63 @@ export default function AppIsDirtyEventListener() {
         debounceOnIsDirty();
       }
     });
-    document.addEventListener("keydown", keydownListener);
+    document.addEventListener("keydown", shortcutListener);
+
+    if (
+      userSettingsTable?.settings?.autoSave &&
+      userSettingsTable.settings.autoSaveDuration
+    ) {
+      autoSaveTimer.current = setInterval(() => {
+        // auto save workflow every 5s
+        autoSaveWorkflow();
+      }, userSettingsTable.settings.autoSaveDuration * 1000);
+    }
 
-    restoreCurWorkflow();
     return () => {
-      document.removeEventListener("keydown", keydownListener);
+      document.removeEventListener("keydown", shortcutListener);
+      autoSaveTimer.current && clearInterval(autoSaveTimer.current);
     };
   }, []);
+  const autoSaveWorkflow = async () => {
+    // autosave workflow if enabled
+    if (
+      workflowsTable?.curWorkflow?.saveLock ||
+      !workflowsTable?.curWorkflow?.id ||
+      !isDirtRef.current
+    ) {
+      return;
+    }
+    const graphJson = JSON.stringify(app.graph.serialize());
+    await workflowsTable?.updateFlow(workflowsTable.curWorkflow.id, {
+      json: graphJson,
+    });
+    changelogsTable?.create({
+      workflowID: workflowsTable.curWorkflow.id,
+      isAutoSave: true,
+      json: graphJson,
+    });
+    setIsDirty(false);
+  };
 
   const onIsDirty = async () => {
     if (workflowsTable?.curWorkflow?.saveLock || isDirtRef.current) return;
-    const graph = app.graph.serialize();
-    if (JSON.stringify(graph) === workflowsTable?.curWorkflow?.json) {
-      return;
-    }
     setIsDirty(true);
+    if (
+      userSettingsTable?.settings?.autoSave &&
+      workflowsTable?.curWorkflow?.id &&
+      !isOutdated
+    ) {
+      const isLatest = await workflowsTable?.latestVersionCheck();
+      if (!isLatest) {
+        setIsOutdated(true);
+      }
+    }
   };
   const [debounceOnIsDirty, _] = useDebounceFn(onIsDirty, 900);
 
-  return null;
+  return isOutdated ? (
+    <Tooltip label="This workflow was changed by another tab, so you are not working on the latest version. Please refresh page to see the latest version of this workflow.">
+      <Tag colorScheme="yellow">⚠️Outdated version</Tag>
+    </Tooltip>
+  ) : null;
 }

ui/src/topbar/Topbar.tsx

@@ -5,8 +5,8 @@ import {
   IconFolder,
   IconGripVertical,
   IconPhoto,
+  IconPlus,
   IconTriangleInvertedFilled,
-  IconLock,
 } from "@tabler/icons-react";
 import DropdownTitle from "../components/DropdownTitle";
 import {
@@ -17,27 +17,29 @@ import {
   useEffect,
   useState,
 } from "react";
-import EditFlowName from "../components/EditFlowName";
 import { WorkspaceContext } from "../WorkspaceContext";
 import { PanelPosition } from "../types/dbTypes";
 import "./Topbar.css";
+import { SharedTopbarButton } from "../share/SharedTopbarButton";
 import VersionNameTopbar from "./VersionNameTopbar";
-import { userSettingsTable, workflowsTable } from "../db-tables/WorkspaceDB";
+import { userSettingsTable } from "../db-tables/WorkspaceDB";
 import { TOPBAR_BUTTON_HEIGHT } from "../const";
-import TopbarNewWorkflowButton from "./TopbarNewWorkflowButton";
 const AppIsDirtyEventListener = lazy(() => import("./AppIsDirtyEventListener"));
+import MultipleTabs from "./multipleTabs";
 const ModelManagerTopbar = lazy(
   () => import("../model-manager/topbar/ModelManagerTopbar"),
 );
 const SpotlightSearch = lazy(() => import("../components/SpotlightSearch"));
 
-interface Props {
-  curFlowName: string | null;
-  setCurFlowName: (newName: string) => void;
-}
-export function Topbar({ curFlowName, setCurFlowName }: Props) {
-  const { isDirty, saveCurWorkflow, setRoute, curFlowID, route } =
-    useContext(WorkspaceContext);
+export function Topbar() {
+  const {
+    isDirty,
+    loadNewWorkflow,
+    saveCurWorkflow,
+    setRoute,
+    curFlowID,
+    route,
+  } = useContext(WorkspaceContext);
   const [positionStyle, setPositionStyle] = useState<PanelPosition>();
   const updatePanelPosition: (
     position?: PanelPosition,
@@ -109,20 +111,21 @@ export function Topbar({ curFlowName, setCurFlowName }: Props) {
         <Suspense fallback={<div style={{ width: "60px" }} />}>
           <ModelManagerTopbar />
         </Suspense>
-        <TopbarNewWorkflowButton />
-        <EditFlowName
-          isDirty={isDirty}
-          displayName={curFlowName ?? ""}
-          updateFlowName={(newName) => {
-            setCurFlowName(newName);
-            requestAnimationFrame(() => {
-              updatePanelPosition();
-            });
-          }}
-        />
-        {workflowsTable?.curWorkflow?.saveLock && (
-          <IconLock color="#FFF" size={20} />
-        )}
+        <Tooltip label="New workflow">
+          <Button
+            size={"sm"}
+            variant={"outline"}
+            colorScheme="teal"
+            aria-label="new workflow"
+            height={TOPBAR_BUTTON_HEIGHT + "px"}
+            onClick={() => loadNewWorkflow()}
+            px={1}
+          >
+            <HStack gap={0}>
+              <IconPlus size={16} color={"white"} />
+            </HStack>
+          </Button>
+        </Tooltip>
         {curFlowID && (
           <HStack gap={"4px"}>
             <Tooltip label="Open gallery">
@@ -151,6 +154,8 @@ export function Topbar({ curFlowName, setCurFlowName }: Props) {
         ) : (
           <div style={{ width: 1 }} />
         )}
+        <MultipleTabs />
+        <SharedTopbarButton />
         <VersionNameTopbar />
         <AppIsDirtyEventListener />
         <IconGripVertical

ui/src/topbar/TopbarNewWorkflowButton.tsx

@@ -1,49 +0,0 @@
-import { Tooltip, Button } from "@chakra-ui/react";
-import { IconDeviceFloppy } from "@tabler/icons-react";
-import { useContext } from "react";
-import { WorkspaceContext } from "../WorkspaceContext";
-import { COMFYSPACE_TRACKING_FIELD_NAME, TOPBAR_BUTTON_HEIGHT } from "../const";
-import { app } from "../utils/comfyapp";
-import { workflowsTable } from "../db-tables/WorkspaceDB";
-import { nanoid } from "nanoid";
-
-export default function TopbarNewWorkflowButton() {
-  const { setCurFlowIDAndName, curFlowID } = useContext(WorkspaceContext);
-  const saveNewWorkflow = async () => {
-    const workflowName = prompt("Enter workflow name", "Untitled");
-    if (!workflowName) return;
-    const id = nanoid();
-    const graph = app.graph.serialize();
-    if (!graph.extra) {
-      graph.extra = {};
-    }
-    if (!graph.extra[COMFYSPACE_TRACKING_FIELD_NAME]) {
-      graph.extra[COMFYSPACE_TRACKING_FIELD_NAME] = {};
-    }
-    graph.extra[COMFYSPACE_TRACKING_FIELD_NAME].id = id;
-    const flow = await workflowsTable?.createFlow({
-      id,
-      json: JSON.stringify(graph),
-      name: workflowName,
-    });
-    flow && setCurFlowIDAndName(flow);
-  };
-  if (curFlowID) {
-    return null;
-  }
-  return (
-    <Tooltip label={"Save workflow"}>
-      <Button
-        size={"sm"}
-        variant={"outline"}
-        colorScheme="teal"
-        aria-label="new workflow"
-        height={TOPBAR_BUTTON_HEIGHT + "px"}
-        onClick={() => saveNewWorkflow()}
-        px={1}
-      >
-        <IconDeviceFloppy size={16} color={"white"} />
-      </Button>
-    </Tooltip>
-  );
-}

ui/src/topbar/multipleTabs/TabDataManager.ts

@@ -0,0 +1,131 @@
+export const RE_RENDER_MULTIPLE_TABS_EVENT = "RE_RENDER_MULTIPLE_TABS_EVENT";
+export const OPEN_TAB_EVENT = "OPEN_TAB_EVENT";
+// @ts-ignore
+import { app } from "/scripts/app.js";
+export type TabData = {
+  id: string;
+  name: string;
+  json: string;
+  isDirty: boolean;
+};
+type TabUpdateInput = Partial<TabData>;
+
+class TabDataManager {
+  tabs: TabData[] = [];
+  activeIndex: number = 0;
+  activeTab: TabData | null = null;
+
+  changeActiveTab(index: number, needLoadNewFlow: boolean = true) {
+    this.saveCurTabJson();
+    this.activeIndex = index;
+    this.activeTab = this.tabs[index];
+    this.notifyChanges(needLoadNewFlow ? "loadNewFlow" : "");
+  }
+
+  updateTabData(index: number, updateInput: TabUpdateInput) {
+    if (this.tabs[index]) {
+      this.tabs[index] = { ...this.tabs[index], ...updateInput };
+      this.activeTab = this.tabs[index];
+      this.notifyChanges(updateInput.json ? "loadNewFlow" : "");
+    }
+  }
+
+  private saveCurTabJson() {
+    const graphJson = JSON.stringify(app.graph.serialize());
+    this.tabs[this.activeIndex].json = graphJson;
+  }
+
+  addTabData(newTab: TabData) {
+    const currentFlowIsDirty = this.activeTab?.isDirty;
+    const existingIndex = this.tabs.findIndex((tab) => tab.id === newTab.id);
+
+    if (this.tabs.length === 0) {
+      this.tabs.push(newTab);
+      this.activeTab = newTab;
+    } else {
+      let nextActiveIndex = -1;
+
+      if (existingIndex !== -1) {
+        nextActiveIndex = existingIndex;
+      } else if (currentFlowIsDirty) {
+        nextActiveIndex = this.activeIndex + 1;
+        this.tabs.splice(nextActiveIndex, 0, newTab);
+      }
+
+      if (nextActiveIndex >= 0) {
+        this.saveCurTabJson();
+        this.activeIndex = nextActiveIndex;
+        this.activeTab = this.tabs[nextActiveIndex];
+      } else {
+        this.updateTabData(this.activeIndex, newTab);
+        return;
+      }
+    }
+
+    this.notifyChanges("loadNewFlow");
+  }
+
+  deleteTabData(index: number) {
+    if (index < 0 || index >= this.tabs.length) return;
+
+    if (this.tabs.length === 1) {
+      this.tabs = [];
+      this.activeIndex = 0;
+      this.activeTab = null;
+      this.notifyChanges("clearCanvas");
+      return;
+    }
+
+    this.tabs.splice(index, 1);
+
+    if (index <= this.activeIndex) {
+      const isDeleteActiveTab = index === this.activeIndex;
+      this.activeIndex = isDeleteActiveTab ? Math.min(this.tabs.length - 1, this.activeIndex) : this.activeIndex - 1;
+      this.activeTab = this.tabs[this.activeIndex];
+      this.notifyChanges(isDeleteActiveTab ? "loadNewFlow" : '');
+      return;
+    }
+    this.notifyChanges('');
+  }
+
+  batchDeleteTabData(ids: string[]) {
+    if (this.tabs.length > 0) {
+      this.tabs = this.tabs.filter(tab => !ids.includes(tab.id));
+      if (this.tabs.length === 0) {
+        this.activeIndex = 0;
+        this.activeTab = null;
+        this.notifyChanges("clearCanvas");
+        return;
+      } else {
+        const activeIndex = this.tabs.findIndex(tab => tab.id === this.activeTab?.id);
+        if (activeIndex === -1) {
+          this.activeIndex = this.tabs.length - 1;
+          this.activeTab = this.tabs[this.activeIndex];
+          this.notifyChanges("loadNewFlow");
+          return;
+        } else if (activeIndex !== this.activeIndex) {
+          this.activeIndex = activeIndex;
+          this.activeTab = this.tabs[activeIndex];
+          this.notifyChanges();
+          return;
+        }
+      }
+
+      this.notifyChanges();
+    }
+  }
+
+  private notifyChanges(otherAction?: string) {
+    const event = new CustomEvent(RE_RENDER_MULTIPLE_TABS_EVENT, {
+      detail: {
+        tabs: this.tabs,
+        activeIndex: this.activeIndex,
+        activeTab: this.activeTab,
+        otherAction,
+      },
+    });
+    document.dispatchEvent(event);
+  }
+}
+
+export const tabDataManager = new TabDataManager();

ui/src/topbar/multipleTabs/index.css

@@ -0,0 +1,25 @@
+.workspace-multiple-tabs::-webkit-scrollbar {
+  background-color: transparent;
+  width: 2px;
+  height: 2px;
+}
+
+.workspace-multiple-tabs::-webkit-scrollbar-thumb {
+  border-radius: 1em;
+  background-color: rgba(130, 129, 129, 0.3);
+}
+
+.workspace-multiple-tabs
+  .workspace-multiple-tabs-item-action:hover
+  .workspace-multiple-tabs-item-dirty {
+  display: none !important;
+}
+
+.workspace-multiple-tabs-item-action:hover
+  .workspace-multiple-tabs-item-dirty-close {
+  display: flex !important;
+}
+
+.workspace-multiple-tabs-item:hover .workspace-multiple-tabs-item-close {
+  display: flex !important;
+}

ui/src/topbar/multipleTabs/index.tsx

@@ -0,0 +1,209 @@
+import { IconButton, HStack, Box } from "@chakra-ui/react";
+import { IconX, IconAsterisk, IconLock } from "@tabler/icons-react";
+import { useEffect, useContext, useReducer } from "react";
+// @ts-ignore
+import { app } from "/scripts/app.js";
+import { WorkspaceContext } from "../../WorkspaceContext";
+import {
+  OPEN_TAB_EVENT,
+  RE_RENDER_MULTIPLE_TABS_EVENT,
+} from "./TabDataManager";
+import { tabDataManager } from "./TabDataManager";
+import "./index.css";
+import { workflowsTable } from "../../db-tables/WorkspaceDB";
+import EditFlowName from "../../components/EditFlowName";
+import { useDialog } from "../../components/AlertDialogProvider";
+
+export default function MultipleTabs() {
+  const { showDialog } = useDialog();
+  const {
+    setCurFlowIDAndName,
+    isDirty,
+    setIsDirty,
+    setCurVersion,
+    curVersion,
+    loadWorkflowID,
+    saveCurWorkflow,
+  } = useContext(WorkspaceContext);
+  const [, reRenderDispatch] = useReducer((state) => state + 1, 0);
+
+  const onClose = (index: number) => {
+    const deleteTabInfo = tabDataManager.tabs[index];
+    if (deleteTabInfo.isDirty) {
+      showDialog(
+        `Please save or discard your changes to "${deleteTabInfo.name}" before leaving, or your changes will be lost.`,
+        [
+          {
+            label: "Save",
+            colorScheme: "teal",
+            onClick: async () => {
+              const deleteFlow = await workflowsTable?.get(deleteTabInfo.id);
+              if (deleteFlow) {
+                /**
+                 * Get the deleted flow information and update updateCurWorkflow,
+                 * Because workflowsTable.curWorkflow.id needs to be used when saving
+                 */
+                workflowsTable?.updateCurWorkflow({
+                  ...deleteFlow,
+                  json: deleteTabInfo.json,
+                });
+                await saveCurWorkflow(deleteTabInfo.json);
+                tabDataManager.deleteTabData(index);
+              }
+            },
+          },
+          {
+            label: "Close",
+            colorScheme: "red",
+            onClick: async () => {
+              tabDataManager.deleteTabData(index);
+            },
+          },
+        ],
+      );
+    } else {
+      tabDataManager.deleteTabData(index);
+    }
+  };
+
+  useEffect(() => {
+    tabDataManager.updateTabData(tabDataManager.activeIndex, { isDirty });
+  }, [isDirty]);
+
+  useEffect(() => {
+    const reRender = (e: CustomEvent) => {
+      const detail = e.detail;
+      reRenderDispatch();
+      switch (detail.otherAction) {
+        case "clearCanvas":
+          loadWorkflowID(null);
+          break;
+        case "loadNewFlow":
+          app.loadGraphData(JSON.parse(detail.activeTab.json));
+          workflowsTable?.get(detail.activeTab.id).then((flow) => {
+            flow &&
+              setCurFlowIDAndName({
+                ...flow,
+                json: detail.activeTab.json,
+              });
+          });
+          setIsDirty(detail.activeTab.isDirty);
+          curVersion && setCurVersion(null);
+          // Avoid scrolling when the corresponding element has not yet been rendered.
+          setTimeout(() => {
+            document
+              .getElementById(
+                `workspace-multiple-tabs-item-${detail.activeTab.id}`,
+              )
+              ?.scrollIntoView({ behavior: "smooth" });
+          }, 0);
+          break;
+      }
+    };
+
+    const openTab = (e: CustomEvent) => {
+      const detail = e.detail;
+      if (detail.tabInfo.id !== tabDataManager.activeTab?.id) {
+        tabDataManager.addTabData(detail.tabInfo);
+      }
+    };
+
+    document.addEventListener(RE_RENDER_MULTIPLE_TABS_EVENT, reRender);
+    document.addEventListener(OPEN_TAB_EVENT, openTab);
+    return () => {
+      document.removeEventListener(RE_RENDER_MULTIPLE_TABS_EVENT, reRender);
+      document.removeEventListener(OPEN_TAB_EVENT, reRender);
+    };
+  }, []);
+
+  return (
+    <HStack
+      spacing={0}
+      className="workspace-multiple-tabs"
+      overflowX="auto"
+      maxW="calc(100vw - 380px)"
+    >
+      {tabDataManager.tabs.map((tab, index) => {
+        const isActive = tabDataManager.activeIndex === index;
+        const { id, name, isDirty } = tab;
+        return (
+          <Box
+            key={`${id}-${name}`}
+            className="workspace-multiple-tabs-item"
+            id={`workspace-multiple-tabs-item-${id}`}
+            cursor="pointer"
+            border="1px"
+            borderColor="#64646459"
+            borderTopColor={isActive ? "#0078d4" : "#64646459"}
+            borderRightWidth={0}
+            display="flex"
+            alignItems="center"
+            justifyContent="space-between"
+            h="32px"
+            lineHeight="32px"
+            padding="0 30px 0 10px"
+            position="relative"
+            bg={isActive ? "#1f1f1f" : "#181818"}
+            _hover={{ bg: "#1f1f1f" }}
+            _last={{ borderRightWidth: 1 }}
+            onClick={() => {
+              tabDataManager.activeIndex !== index &&
+                tabDataManager.changeActiveTab(index);
+            }}
+          >
+            <EditFlowName isActive={isActive} displayName={name ?? ""} />
+            {isDirty ? (
+              <Box
+                className="workspace-multiple-tabs-item-action"
+                position="absolute"
+                right="4px"
+              >
+                <IconButton
+                  icon={<IconAsterisk color="white" width={14} height={14} />}
+                  size={"xs"}
+                  aria-label="un save flag"
+                  variant={"ghost"}
+                  display="flex"
+                  _hover={{ bg: "whiteAlpha.200" }}
+                  className="workspace-multiple-tabs-item-dirty"
+                />
+                <IconButton
+                  onClick={(e) => {
+                    e.stopPropagation();
+                    onClose(index);
+                  }}
+                  icon={<IconX color="white" width={14} height={14} />}
+                  size={"xs"}
+                  aria-label="close tab"
+                  variant={"ghost"}
+                  _hover={{ bg: "whiteAlpha.200" }}
+                  display="none"
+                  className="workspace-multiple-tabs-item-dirty-close"
+                />
+              </Box>
+            ) : (
+              <IconButton
+                onClick={(e) => {
+                  e.stopPropagation();
+                  onClose(index);
+                }}
+                icon={<IconX color="white" width={14} height={14} />}
+                size={"xs"}
+                aria-label="close tab"
+                variant={"ghost"}
+                _hover={{ bg: "whiteAlpha.200" }}
+                display={isActive ? "flex" : "none"}
+                position="absolute"
+                right="4px"
+                className={isActive ? "" : "workspace-multiple-tabs-item-close"}
+              />
+            )}
+            {isActive && workflowsTable?.curWorkflow?.saveLock && (
+              <IconLock color="#FFF" size={20} />
+            )}
+          </Box>
+        );
+      })}
+    </HStack>
+  );
+}

ui/src/types/dbTypes.ts

@@ -10,17 +10,17 @@ export interface SortableItem {
 export interface Workflow extends SortableItem {
   id: string;
   json: string;
+  lastSavedJson?: string; // TODO will be deprecated
   name: string;
-  coverMediaPath?: string | null;
-  saveLock?: boolean;
-  cloudID?: string | null;
   createTime: number;
-
-  // will be deprecated
+  filePath?: string; // TODO will be deprecated
   privacy?: WorkflowPrivacy;
   tags?: string[];
   parentFolderID?: string | null; //TODO remove undefined, use null only
+  coverMediaPath?: string;
+  cloudID?: string; // TODO will be deprecated
   cloudOrigin?: string;
+  saveLock?: boolean;
   latestImage?: string;
   topFieldsConfig?: TopFieldType[];
 }
@@ -66,9 +66,9 @@ export type WorkflowVersion = {
   name: string;
   workflowID: string;
   json: string;
-  createTime?: number;
-  createdAt?: string;
-  created_at?: string;
+  createTime: number;
+  cloudID?: string;
+  cloudOrigin?: string;
   authorID?: string;
   nodeDefs?: string; //for cloud workflow version
 };
@@ -96,6 +96,7 @@ export type UserSettings = {
   foldersOnTop?: boolean;
   showNsfwModelThumbnail?: boolean;
   cloudHost: string;
+  overwriteCurWorkflowWhenDroppingFileToCanvas: boolean;
   defaultFolders: Record<MODEL_TYPE, string>;
   maximumChangelogNumber: number;
   hideCoverImage: boolean;
@@ -130,6 +131,7 @@ export type Media = {
   workflowJSON?: string;
   createTime: number;
   localPath: string;
+  format: string;
 };
 
 /**

ui/src/types/types.ts

@@ -1,5 +1,3 @@
-import { EWorkflowPrivacy } from "./dbTypes";
-
 export type WorkspaceRoute =
   | "root"
   | "customNodes"
@@ -12,21 +10,3 @@ export type WorkspaceRoute =
   | "downloadSpaceJson"
   | "installModels"
   | "share";
-
-export type Session = {
-  username: string | null;
-  shareKey: string;
-};
-
-export type ShareWorkflowData = {
-  version: {
-    name: string;
-    json: string;
-  };
-  workflow: {
-    name: string;
-    cloudID?: string | null;
-  };
-  nodeDefs: Object;
-  privacy: EWorkflowPrivacy;
-};

ui/src/types/workspace.d.ts

@@ -1,12 +1,29 @@
 import { SHORTCUT_TRIGGER_EVENT } from "../const";
+import {
+  OPEN_TAB_EVENT,
+  RE_RENDER_MULTIPLE_TABS_EVENT,
+  TabData,
+} from "../topbar/multipleTabs/TabDataManager";
 import { EOtherKeys, EShortcutKeys } from "./dbTypes";
 
 interface ShortcutTriggerDetail {
   shortcutType: EShortcutKeys | EOtherKeys;
 }
 
+interface reRenderTabsDetail {
+  tabs: TabData;
+  activeIndex: number;
+}
+
+interface reRenderTabsDetail {
+  tabs: TabData;
+  activeIndex: number;
+}
+
 declare global {
-  interface WindowEventMap {
+  interface DocumentEventMap {
     [SHORTCUT_TRIGGER_EVENT]: CustomEvent<ShortcutTriggerDetail>;
+    [RE_RENDER_MULTIPLE_TABS_EVENT]: CustomEvent<reRenderTabsDetail>;
+    [OPEN_TAB_EVENT]: CustomEvent;
   }
 }

ui/src/utils.tsx

@@ -1,7 +1,22 @@
+import { deleteFile, updateFile } from "./Api";
 import { ESortTypes } from "./RecentFilesDrawer/types";
-import { userSettingsTable } from "./db-tables/WorkspaceDB";
-import { Workflow, EShortcutKeys, SortableItem } from "./types/dbTypes";
-import { app } from "./utils/comfyapp";
+import { workflowsTable, userSettingsTable } from "./db-tables/WorkspaceDB";
+import {
+  generateFilePathAbsolute,
+  saveJsonFileMyWorkflows,
+} from "./db-tables/DiskFileUtils";
+import {
+  Workflow,
+  EShortcutKeys,
+  EOtherKeys,
+  SortableItem,
+} from "./types/dbTypes";
+// @ts-expect-error ComfyUI import
+import { app } from "/scripts/app.js";
+import {
+  COMFYSPACE_TRACKING_FIELD_NAME,
+  LEGACY_COMFYSPACE_TRACKING_FIELD_NAME,
+} from "./const";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 declare let LiteGraph: any, LGraph: any, LGraphCanvas: any;
@@ -141,6 +156,22 @@ export function sortFlows(
 
   return copyFlows;
 }
+export async function validateOrSaveAllJsonFileMyWorkflows(
+  deleteEmptyFolder = false,
+) {
+  const twoWaySync = await userSettingsTable?.getSetting("twoWaySync");
+  if (twoWaySync) return; // disable this function in two way sync mode
+  const flowList = (await workflowsTable?.listAll()) ?? [];
+  for (const workflow of flowList) {
+    const fullPath = await generateFilePathAbsolute(workflow);
+    if (workflow.filePath != fullPath) {
+      // file path changed
+      workflow.filePath != null &&
+        (await deleteFile(workflow.filePath, deleteEmptyFolder));
+      await saveJsonFileMyWorkflows(workflow);
+    }
+  }
+}
 
 export const sortFileItem = <T extends SortableItem>(
   items: T[],
@@ -310,3 +341,21 @@ export const openWorkflowInNewTab = (workflowID: string) => {
   const newHash = generateUrlHashWithFlowId(workflowID);
   window.open(`${window.location.origin}/#${newHash}`);
 };
+
+export async function rewriteAllLocalFiles() {
+  const flowList = (await workflowsTable?.listAll()) ?? [];
+  for (const workflow of flowList) {
+    try {
+      const fullPath = await generateFilePathAbsolute(workflow);
+      const flow = JSON.parse(workflow.json);
+      flow.extra[COMFYSPACE_TRACKING_FIELD_NAME] = {
+        id: workflow.id,
+        name: workflow.name,
+      };
+      delete flow.extra[LEGACY_COMFYSPACE_TRACKING_FIELD_NAME];
+      fullPath && (await updateFile(fullPath, JSON.stringify(flow)));
+    } catch (error) {
+      console.error(error);
+    }
+  }
+}

ui/src/utils/OsPathUtils.ts

@@ -1,13 +1,5 @@
 import type { Workflow } from "../types/dbTypes";
 
-export const serverInfo: {
-  os: "Windows" | "Linux" | "Darwin" | "Java" | null;
-} = {
-  os: null,
-};
-
-export const getPathSep = () => (serverInfo.os === "Windows" ? "\\" : "/");
-
 export function joinRelPath(...segments: string[]) {
   const rel = segments.filter((segment) => segment !== "").join("/");
   return sanitizeRelPath(rel);
@@ -23,10 +15,6 @@ export function sanitizeRelPath(path: string) {
   // Remove leading slashes to ensure the path is treated as relative
   sanitizedPath = sanitizedPath.replace(/^\/+/, "");
 
-  if (serverInfo.os === "Windows") {
-    sanitizedPath = segments.replace(/\//g, "\\");
-  }
-
   return sanitizedPath;
 }