From 667d752d3f5b5daeed8afd2b47184979f10f7c2e Mon Sep 17 00:00:00 2001
From: saku0512 <saku0512sec@gmail.com>
Date: Sat, 24 Jan 2026 20:42:43 +0900
Subject: [PATCH 1/5] feat: implement level selection logic and validation in
 grand stage

---
 src/routes/grand/[grandId]/+page.svelte | 31 +++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/routes/grand/[grandId]/+page.svelte b/src/routes/grand/[grandId]/+page.svelte
index 0a147ee..74a8aeb 100644
--- a/src/routes/grand/[grandId]/+page.svelte
+++ b/src/routes/grand/[grandId]/+page.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import { invoke } from "@tauri-apps/api/core";
   import { onMount } from "svelte";
+  import { get } from "svelte/store";
   import { page } from "$app/stores";
   import { goto } from "$app/navigation";
   import Editor from "$lib/components/Editor.svelte";
@@ -47,6 +48,18 @@ _start:
   let stageLevels: any[] = [];
   let stageMissingIds: string[] = [];
 
+  function pickHighestUnlocked(levels: any[]) {
+    if (!levels || levels.length === 0) return null;
+    const completed = get(completedLevelsStore);
+    let highest = levels[0];
+    for (let i = 1; i < levels.length; i++) {
+      const prev = levels[i - 1];
+      if (completed.has(prev.id)) highest = levels[i];
+      else break;
+    }
+    return highest;
+  }
+
   onMount(async () => {
     loadCompletedLevelsFromStorage();
 
@@ -69,6 +82,12 @@ _start:
       stageMissingIds = [];
     }
 
+    // Ensure a level is actually selected (otherwise RUN can "succeed" without saving progress)
+    if (!currentLevel && stageLevels.length > 0) {
+      const initial = pickHighestUnlocked(stageLevels) ?? stageLevels[0];
+      handleLevelSelect(initial);
+    }
+
     // Ensure some initial code exists
     if (!currentLevel) {
       applyDefaultCode("01_Mov&Call");
@@ -117,6 +136,12 @@ _start:
   }
 
   async function runSimulation() {
+    if (!currentLevel) {
+      status = "FAILED";
+      message = "左のリストからレベルを選択してから実行してください。";
+      error = null;
+      return;
+    }
     status = "EXECUTING...";
     message = "Validating logic against test vectors...";
     error = null;
@@ -127,7 +152,7 @@ _start:
         code,
         syntax,
         input,
-        levelId: currentLevel ? currentLevel.id : null,
+        levelId: currentLevel.id,
       });
 
       const vmState = result.vm_state;
@@ -150,9 +175,7 @@ _start:
       } else {
         status = "SUCCESS";
         message = "Mission accomplished. Level cleared.";
-        if (currentLevel) {
-          markLevelComplete(currentLevel.id);
-        }
+        markLevelComplete(currentLevel.id);
       }
 
       if (vmState.error) {

From 51f72cffd2bf42a4a2183f52c26f69bd565faf05 Mon Sep 17 00:00:00 2001
From: saku0512 <saku0512sec@gmail.com>
Date: Sat, 24 Jan 2026 21:12:59 +0900
Subject: [PATCH 2/5] chore: update license from MIT to GPL-2.0-only across all
 relevant files

---
 .github/workflows/release.yml |  64 +++++-
 LICENSE                       | 360 ++++++++++++++++++++++++++++++++--
 README.md                     |   2 +-
 THIRD_PARTY_NOTICES.md        |  12 +-
 package-lock.json             |   2 +-
 package.json                  |   2 +-
 src-tauri/Cargo.toml          |   1 +
 7 files changed, 416 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index abfaccd..91847e2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -60,6 +60,11 @@ jobs:
             インストール方法は各OSの手順に従ってください。
             (ビルド完了後にアセットが追加されます)
 
+            ## License / Source
+            - License: GPL-2.0-only（`LICENSE`）
+            - Third-party notices: `THIRD_PARTY_NOTICES.md`
+            - Corresponding Source: `opcode-logic-${{ steps.version.outputs.version }}-corresponding-source.tar.gz`
+
   # 2. 全プラットフォームで並列ビルド
   build:
     needs: create-release
@@ -128,4 +133,61 @@ jobs:
           projectPath: .
           tagName: v${{ needs.create-release.outputs.version }}
           releaseId: ${{ needs.create-release.outputs.release_id }}
-          args: ${{ matrix.args }}
\ No newline at end of file
+          args: ${{ matrix.args }}
+
+  # 3. 対応ソース（Corresponding Source）と告知ファイルをReleaseに添付
+  corresponding-source:
+    needs: create-release
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Checkout tag
+        run: |
+          git checkout "v${{ needs.create-release.outputs.version }}"
+
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Vendor Rust crates (cargo vendor)
+        working-directory: src-tauri
+        run: |
+          cargo vendor vendor
+          mkdir -p .cargo
+          cat > .cargo/config.toml <<'EOF'
+          [source.crates-io]
+          replace-with = "vendored-sources"
+
+          [source.vendored-sources]
+          directory = "vendor"
+          EOF
+
+      - name: Create corresponding source tarball
+        run: |
+          VERSION="${{ needs.create-release.outputs.version }}"
+          NAME="opcode-logic-${VERSION}-corresponding-source"
+          mkdir -p dist
+          rsync -a --delete \
+            --exclude '.git' \
+            --exclude 'node_modules' \
+            --exclude 'release' \
+            --exclude 'dist' \
+            ./ "dist/${NAME}/"
+          tar -C dist -czf "dist/${NAME}.tar.gz" "${NAME}"
+          sha256sum "dist/${NAME}.tar.gz" > "dist/${NAME}.tar.gz.sha256"
+
+      - name: Upload corresponding source and notices
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: v${{ needs.create-release.outputs.version }}
+          files: |
+            dist/*.tar.gz
+            dist/*.sha256
+            LICENSE
+            THIRD_PARTY_NOTICES.md
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
index 5645274..d159169 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,21 +1,339 @@
-MIT License
-
-Copyright (c) 2026 Saku0512
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  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
+this service 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 make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  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.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+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
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the 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 a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE 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.
+
+                     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
+convey 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 2 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, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision 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, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This 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.
diff --git a/README.md b/README.md
index 89bdd49..49e46fe 100644
--- a/README.md
+++ b/README.md
@@ -161,7 +161,7 @@ npm run check
 
 ## ライセンス
 
-MIT License
+GPL-2.0-only
 
 ## 推奨IDE設定
 
diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md
index e609aef..80f67f9 100644
--- a/THIRD_PARTY_NOTICES.md
+++ b/THIRD_PARTY_NOTICES.md
@@ -1,16 +1,24 @@
 ## Third-party notices
 
+このプロジェクト（OpCode Logic）は **GPL-2.0-only** で配布します。
+デスクトップアプリとして **バイナリ配布**（GitHub Releases / 将来はサイト配布）を行う場合、GPLv2（2-only）の条件に従い、受領者が本プロジェクトの対応ソースコードを入手できる状態にします。
+
+- **本プロジェクトのライセンス本文**: `LICENSE`（GPLv2）
+- **本プロジェクトの対応ソース**: リポジトリのソース、または配布ページ（Release/サイト）から入手可能にします。
+
 このプロジェクトは以下のサードパーティソフトウェアに依存します。配布形態（静的/動的リンク、同梱物）によっては、それぞれのライセンス条件に従う必要があります。
 
 ### Unicorn Engine
 - **Project**: Unicorn CPU Emulator
 - **Repository**: `https://github.com/unicorn-engine/unicorn`
 - **Used via**: Rust crate `unicorn-engine`
-- **License**: GPL-2.0（詳細は上記リポジトリのLICENSEを参照）
+- **Crate version**: `unicorn-engine 2.1.5`（`src-tauri/Cargo.toml` / `src-tauri/Cargo.lock`）
+- **License**: GPL-2.0-only（詳細は上記リポジトリのLICENSEを参照）
 
 ### Keystone Engine
 - **Project**: Keystone Assembler Engine
 - **Repository**: `https://github.com/keystone-engine/keystone`
 - **Used via**: Rust crate `keystone-engine`
-- **License**: GPL-2.0（詳細は上記リポジトリのLICENSEを参照）
+- **Crate version**: `keystone-engine 0.1.0`（`src-tauri/Cargo.toml` / `src-tauri/Cargo.lock`）
+- **License**: GPL-2.0-only（詳細は上記リポジトリのLICENSEを参照）
 
diff --git a/package-lock.json b/package-lock.json
index fc0e794..785f238 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,7 +7,7 @@
     "": {
       "name": "opcode-logic",
       "version": "0.1.0",
-      "license": "MIT",
+      "license": "GPL-2.0-only",
       "dependencies": {
         "@tauri-apps/api": "^2",
         "@tauri-apps/plugin-opener": "^2"
diff --git a/package.json b/package.json
index 53bdefd..1d681bd 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "test:coverage": "vitest --coverage",
     "tauri": "tauri"
   },
-  "license": "MIT",
+  "license": "GPL-2.0-only",
   "dependencies": {
     "@tauri-apps/api": "^2",
     "@tauri-apps/plugin-opener": "^2"
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index a57a065..fd35eea 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -4,6 +4,7 @@ version = "0.2.0"
 description = "Assemble Code learning"
 authors = ["saku0512"]
 edition = "2021"
+license = "GPL-2.0-only"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

From e59d3d0cbafff2dd447c3b9cc8ad0546971472a0 Mon Sep 17 00:00:00 2001
From: saku0512 <saku0512sec@gmail.com>
Date: Sat, 24 Jan 2026 21:22:07 +0900
Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E5=90=84=E3=82=B9=E3=83=86=E3=83=BC?=
 =?UTF-8?q?=E3=82=B8=E3=81=AE=E5=88=9D=E6=9C=9F=E3=82=B3=E3=83=BC=E3=83=89?=
 =?UTF-8?q?=E3=82=92=E8=87=AA=E5=8B=95=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/routes/grand/[grandId]/+page.svelte | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/routes/grand/[grandId]/+page.svelte b/src/routes/grand/[grandId]/+page.svelte
index 74a8aeb..bae84d5 100644
--- a/src/routes/grand/[grandId]/+page.svelte
+++ b/src/routes/grand/[grandId]/+page.svelte
@@ -24,9 +24,9 @@ section .text
     global _start
 
 _start:
-    ; MISSION: Mov & Call
-    ; read from stdin (syscall 0), write to stdout (syscall 1)
-    
+    ; MISSION: (select a level)
+    ; TODO: Write your code here.
+
     ; exit(0)
     mov rax, 60
     xor rdi, rdi
@@ -112,7 +112,11 @@ _start:
   }
 
   function applyDefaultCode(levelId: string) {
-    // すべてのステージで統一された初期コードを使用（後でレベル別テンプレを追加可能）
+    // レベルに合わせたコメント（MISSION/説明）を埋め込む
+    const level = stageLevels.find((l) => l.id === levelId) ?? currentLevel;
+    const mission = level?.name ?? levelId;
+    const desc = level?.description ?? "";
+
     code = `section .bss
     buf resb 16
 
@@ -120,9 +124,9 @@ section .text
     global _start
 
 _start:
-    ; MISSION: Mov & Call
-    ; read from stdin (syscall 0), write to stdout (syscall 1)
-    
+    ; MISSION: ${mission}
+    ${desc ? `; ${desc}` : ";"}
+
     ; exit(0)
     mov rax, 60
     xor rdi, rdi

From d40a6a27fb5f130c069269e1de721d09cfe56163 Mon Sep 17 00:00:00 2001
From: saku0512 <saku0512sec@gmail.com>
Date: Sat, 24 Jan 2026 22:44:54 +0900
Subject: [PATCH 4/5] feat: add stage testing script and enhance explanation
 view with collect code functionality

---
 scripts/test-all-stages.sh                    |  39 +++++
 src-tauri/Cargo.toml                          |   1 +
 src-tauri/src/bin/stage_runner.rs             | 150 ++++++++++++++++++
 src-tauri/src/levels.rs                       | 100 ++++++++----
 src-tauri/src/lib.rs                          |  69 +++++---
 src-tauri/src/x86_runtime.rs                  |  76 +++++++++
 src/lib/components/ExplanationView.svelte     |  59 ++++++-
 src/routes/grand/[grandId]/+page.svelte       |  30 ++--
 .../12_TheAccumulator/12_TheAccumulator.md    |  13 ++
 .../BOSS/12_TheAccumulator/collect.asm        |  65 ++++++++
 .../BOSS/12_TheAccumulator/ini.asm            |  18 +++
 .../BOSS/12_TheAccumulator/test.sh            |  10 ++
 .../1.The-Accumulator/BOSS/TheAccumulator.md  | 116 --------------
 .../Phase1-Registers&ALU/01_Mov&Call.md       |  61 -------
 .../01_Mov&Call/01_Mov&Call.md                |  10 ++
 .../01_Mov&Call/collect.asm                   |  29 ++++
 .../Phase1-Registers&ALU/01_Mov&Call/ini.asm  |  15 ++
 .../Phase1-Registers&ALU/01_Mov&Call/test.sh  |  10 ++
 .../02_Addition/02_Addition.md                |  10 ++
 .../collect.asm}                              |  38 +----
 .../Phase1-Registers&ALU/02_Addition/ini.asm  |  15 ++
 .../Phase1-Registers&ALU/02_Addition/test.sh  |  10 ++
 .../03_Subtraction/03_Subtraction.md          |  10 ++
 .../collect.asm}                              |  38 +----
 .../03_Subtraction/ini.asm                    |  15 ++
 .../03_Subtraction/test.sh                    |  10 ++
 .../04_TheXORTrick/04_TheXORTrick.md          |  10 ++
 .../collect.asm}                              |  38 +----
 .../04_TheXORTrick/ini.asm                    |  15 ++
 .../04_TheXORTrick/test.sh                    |  10 ++
 .../05_Inc&Dec/05_Inc&Dec.md                  |  10 ++
 .../{05_Inc&Dec.md => 05_Inc&Dec/collect.asm} |  38 +----
 .../Phase1-Registers&ALU/05_Inc&Dec/ini.asm   |  15 ++
 .../Phase1-Registers&ALU/05_Inc&Dec/test.sh   |  10 ++
 .../Phase2-Flags&Jumps/06_Unconditional.md    |  70 --------
 .../06_Unconditional/06_Unconditional.md      |  10 ++
 .../06_Unconditional/collect.asm              |  38 +++++
 .../06_Unconditional/ini.asm                  |  15 ++
 .../06_Unconditional/test.sh                  |  10 ++
 .../Phase2-Flags&Jumps/07_ZeroFlag.md         |  76 ---------
 .../07_ZeroFlag/07_ZeroFlag.md                |  10 ++
 .../07_ZeroFlag/collect.asm                   |  44 +++++
 .../Phase2-Flags&Jumps/07_ZeroFlag/ini.asm    |  15 ++
 .../Phase2-Flags&Jumps/07_ZeroFlag/test.sh    |  10 ++
 .../Phase2-Flags&Jumps/08_SignFlag.md         |  75 ---------
 .../08_SignFlag/08_SignFlag.md                |  10 ++
 .../08_SignFlag/collect.asm                   |  42 +++++
 .../Phase2-Flags&Jumps/08_SignFlag/ini.asm    |  15 ++
 .../Phase2-Flags&Jumps/08_SignFlag/test.sh    |  10 ++
 .../09_Comparison/09_Comparison.md            |  10 ++
 .../09_Comparison/collect.asm                 |  68 ++++++++
 .../Phase2-Flags&Jumps/09_Comparison/ini.asm  |  16 ++
 .../Phase2-Flags&Jumps/09_Comparison/test.sh  |  10 ++
 .../Phase2-Flags&Jumps/09_Conmparison.md      |  98 ------------
 .../Phase3-LoopStructures/10_Countdown.md     |  79 ---------
 .../10_Countdown/10_Countdown.md              |  10 ++
 .../10_Countdown/collect.asm                  |  49 ++++++
 .../10_Countdown/ini.asm                      |  15 ++
 .../10_Countdown/test.sh                      |  10 ++
 .../Phase3-LoopStructures/11_Accumulate3.md   |  83 ----------
 .../11_Accumulate3/11_Accumulate3.md          |  10 ++
 .../11_Accumulate3/collect.asm                |  38 +++++
 .../11_Accumulate3/ini.asm                    |  15 ++
 .../11_Accumulate3/test.sh                    |  10 ++
 64 files changed, 1262 insertions(+), 872 deletions(-)
 create mode 100644 scripts/test-all-stages.sh
 create mode 100644 src-tauri/src/bin/stage_runner.rs
 create mode 100644 stages/1.The-Accumulator/BOSS/12_TheAccumulator/12_TheAccumulator.md
 create mode 100644 stages/1.The-Accumulator/BOSS/12_TheAccumulator/collect.asm
 create mode 100644 stages/1.The-Accumulator/BOSS/12_TheAccumulator/ini.asm
 create mode 100644 stages/1.The-Accumulator/BOSS/12_TheAccumulator/test.sh
 delete mode 100644 stages/1.The-Accumulator/BOSS/TheAccumulator.md
 delete mode 100644 stages/1.The-Accumulator/Phase1-Registers&ALU/01_Mov&Call.md
 create mode 100644 stages/1.The-Accumulator/Phase1-Registers&ALU/01_Mov&Call/01_Mov&Call.md
 create mode 100644 stages/1.The-Accumulator/Phase1-Registers&ALU/01_Mov&Call/collect.asm
 create mode 100644 stages/1.The-Accumulator/Phase1-Registers&ALU/01_Mov&Call/ini.asm
 create mode 100644 stages/1.The-Accumulator/Phase1-Registers&ALU/01_Mov&Call/test.sh
 create mode 100644 stages/1.The-Accumulator/Phase1-Registers&ALU/02_Addition/02_Addition.md
 rename stages/1.The-Accumulator/Phase1-Registers&ALU/{02_Addition.md => 02_Addition/collect.asm} (53%)
 create mode 100644 stages/1.The-Accumulator/Phase1-Registers&ALU/02_Addition/ini.asm
 create mode 100644 stages/1.The-Accumulator/Phase1-Registers&ALU/02_Addition/test.sh
 create mode 100644 stages/1.The-Accumulator/Phase1-Registers&ALU/03_Subtraction/03_Subtraction.md
 rename stages/1.The-Accumulator/Phase1-Registers&ALU/{03_Subtraction.md => 03_Subtraction/collect.asm} (54%)
 create mode 100644 stages/1.The-Accumulator/Phase1-Registers&ALU/03_Subtraction/ini.asm
 create mode 100644 stages/1.The-Accumulator/Phase1-Registers&ALU/03_Subtraction/test.sh
 create mode 100644 stages/1.The-Accumulator/Phase1-Registers&ALU/04_TheXORTrick/04_TheXORTrick.md
 rename stages/1.The-Accumulator/Phase1-Registers&ALU/{04_TheXORTrick.md => 04_TheXORTrick/collect.asm} (52%)
 create mode 100644 stages/1.The-Accumulator/Phase1-Registers&ALU/04_TheXORTrick/ini.asm
 create mode 100644 stages/1.The-Accumulator/Phase1-Registers&ALU/04_TheXORTrick/test.sh
 create mode 100644 stages/1.The-Accumulator/Phase1-Registers&ALU/05_Inc&Dec/05_Inc&Dec.md
 rename stages/1.The-Accumulator/Phase1-Registers&ALU/{05_Inc&Dec.md => 05_Inc&Dec/collect.asm} (55%)
 create mode 100644 stages/1.The-Accumulator/Phase1-Registers&ALU/05_Inc&Dec/ini.asm
 create mode 100644 stages/1.The-Accumulator/Phase1-Registers&ALU/05_Inc&Dec/test.sh
 delete mode 100644 stages/1.The-Accumulator/Phase2-Flags&Jumps/06_Unconditional.md
 create mode 100644 stages/1.The-Accumulator/Phase2-Flags&Jumps/06_Unconditional/06_Unconditional.md
 create mode 100644 stages/1.The-Accumulator/Phase2-Flags&Jumps/06_Unconditional/collect.asm
 create mode 100644 stages/1.The-Accumulator/Phase2-Flags&Jumps/06_Unconditional/ini.asm
 create mode 100644 stages/1.The-Accumulator/Phase2-Flags&Jumps/06_Unconditional/test.sh
 delete mode 100644 stages/1.The-Accumulator/Phase2-Flags&Jumps/07_ZeroFlag.md
 create mode 100644 stages/1.The-Accumulator/Phase2-Flags&Jumps/07_ZeroFlag/07_ZeroFlag.md
 create mode 100644 stages/1.The-Accumulator/Phase2-Flags&Jumps/07_ZeroFlag/collect.asm
 create mode 100644 stages/1.The-Accumulator/Phase2-Flags&Jumps/07_ZeroFlag/ini.asm
 create mode 100644 stages/1.The-Accumulator/Phase2-Flags&Jumps/07_ZeroFlag/test.sh
 delete mode 100644 stages/1.The-Accumulator/Phase2-Flags&Jumps/08_SignFlag.md
 create mode 100644 stages/1.The-Accumulator/Phase2-Flags&Jumps/08_SignFlag/08_SignFlag.md
 create mode 100644 stages/1.The-Accumulator/Phase2-Flags&Jumps/08_SignFlag/collect.asm
 create mode 100644 stages/1.The-Accumulator/Phase2-Flags&Jumps/08_SignFlag/ini.asm
 create mode 100644 stages/1.The-Accumulator/Phase2-Flags&Jumps/08_SignFlag/test.sh
 create mode 100644 stages/1.The-Accumulator/Phase2-Flags&Jumps/09_Comparison/09_Comparison.md
 create mode 100644 stages/1.The-Accumulator/Phase2-Flags&Jumps/09_Comparison/collect.asm
 create mode 100644 stages/1.The-Accumulator/Phase2-Flags&Jumps/09_Comparison/ini.asm
 create mode 100644 stages/1.The-Accumulator/Phase2-Flags&Jumps/09_Comparison/test.sh
 delete mode 100644 stages/1.The-Accumulator/Phase2-Flags&Jumps/09_Conmparison.md
 delete mode 100644 stages/1.The-Accumulator/Phase3-LoopStructures/10_Countdown.md
 create mode 100644 stages/1.The-Accumulator/Phase3-LoopStructures/10_Countdown/10_Countdown.md
 create mode 100644 stages/1.The-Accumulator/Phase3-LoopStructures/10_Countdown/collect.asm
 create mode 100644 stages/1.The-Accumulator/Phase3-LoopStructures/10_Countdown/ini.asm
 create mode 100644 stages/1.The-Accumulator/Phase3-LoopStructures/10_Countdown/test.sh
 delete mode 100644 stages/1.The-Accumulator/Phase3-LoopStructures/11_Accumulate3.md
 create mode 100644 stages/1.The-Accumulator/Phase3-LoopStructures/11_Accumulate3/11_Accumulate3.md
 create mode 100644 stages/1.The-Accumulator/Phase3-LoopStructures/11_Accumulate3/collect.asm
 create mode 100644 stages/1.The-Accumulator/Phase3-LoopStructures/11_Accumulate3/ini.asm
 create mode 100644 stages/1.The-Accumulator/Phase3-LoopStructures/11_Accumulate3/test.sh

diff --git a/scripts/test-all-stages.sh b/scripts/test-all-stages.sh
new file mode 100644
index 0000000..cf2ba05
--- /dev/null
+++ b/scripts/test-all-stages.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+
+failures=0
+failed_list=()
+
+shopt -s nullglob
+tests=( "$ROOT_DIR"/stages/*/*/*/test.sh "$ROOT_DIR"/stages/*/*/*/*/test.sh )
+
+if [ ${#tests[@]} -eq 0 ]; then
+  echo "No stage test.sh found under stages/."
+  exit 1
+fi
+
+for t in "${tests[@]}"; do
+  rel="${t#"$ROOT_DIR"/}"
+  echo "==> $rel"
+  if bash "$t"; then
+    echo "PASS: $rel"
+  else
+    echo "FAIL: $rel" >&2
+    failures=$((failures + 1))
+    failed_list+=( "$rel" )
+  fi
+  echo
+done
+
+if [ "$failures" -ne 0 ]; then
+  echo "FAILED ($failures):" >&2
+  for f in "${failed_list[@]}"; do
+    echo " - $f" >&2
+  done
+  exit 1
+fi
+
+echo "All stage tests passed (${#tests[@]})."
+
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index fd35eea..3800978 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -5,6 +5,7 @@ description = "Assemble Code learning"
 authors = ["saku0512"]
 edition = "2021"
 license = "GPL-2.0-only"
+default-run = "opcode-logic"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/src-tauri/src/bin/stage_runner.rs b/src-tauri/src/bin/stage_runner.rs
new file mode 100644
index 0000000..75a107f
--- /dev/null
+++ b/src-tauri/src/bin/stage_runner.rs
@@ -0,0 +1,150 @@
+use opcode_logic_lib::levels;
+use opcode_logic_lib::vm::Syntax;
+use opcode_logic_lib::x86_runtime;
+
+use std::fs;
+use std::path::PathBuf;
+
+fn print_usage_and_exit() -> ! {
+    eprintln!(
+        "Usage:\n  stage_runner --level-id <ID> --asm <path> [--syntax Intel|Att] [--max-instructions N]\n"
+    );
+    std::process::exit(2);
+}
+
+fn main() {
+    let mut level_id: Option<String> = None;
+    let mut asm_path: Option<PathBuf> = None;
+    let mut syntax = Syntax::Intel;
+    let mut max_instructions: usize = 50_000;
+
+    let mut args = std::env::args().skip(1);
+    while let Some(a) = args.next() {
+        match a.as_str() {
+            "--level-id" => level_id = args.next(),
+            "--asm" => asm_path = args.next().map(PathBuf::from),
+            "--syntax" => {
+                let s = args.next().unwrap_or_else(|| {
+                    eprintln!("Missing value for --syntax");
+                    print_usage_and_exit();
+                });
+                syntax = match s.as_str() {
+                    "Intel" => Syntax::Intel,
+                    "Att" => Syntax::Att,
+                    other => {
+                        eprintln!("Unknown syntax: {}", other);
+                        print_usage_and_exit();
+                    }
+                };
+            }
+            "--max-instructions" => {
+                let s = args.next().unwrap_or_else(|| {
+                    eprintln!("Missing value for --max-instructions");
+                    print_usage_and_exit();
+                });
+                max_instructions = s.parse().unwrap_or_else(|_| {
+                    eprintln!("Invalid number for --max-instructions: {}", s);
+                    print_usage_and_exit();
+                });
+            }
+            "-h" | "--help" => print_usage_and_exit(),
+            other => {
+                eprintln!("Unknown arg: {}", other);
+                print_usage_and_exit();
+            }
+        }
+    }
+
+    let level_id = level_id.unwrap_or_else(|| {
+        eprintln!("Missing --level-id");
+        print_usage_and_exit();
+    });
+    let asm_path = asm_path.unwrap_or_else(|| {
+        eprintln!("Missing --asm");
+        print_usage_and_exit();
+    });
+
+    let level = levels::get_level(&level_id).unwrap_or_else(|| {
+        eprintln!("Unknown level id: {}", level_id);
+        std::process::exit(2);
+    });
+
+    let code = fs::read_to_string(&asm_path).unwrap_or_else(|e| {
+        eprintln!("Failed to read asm file {}: {}", asm_path.display(), e);
+        std::process::exit(2);
+    });
+
+    let mut failures = 0usize;
+    for (idx, (test_in, expected)) in level.test_cases.iter().enumerate() {
+        let run =
+            match x86_runtime::run_x86_64(&code, syntax.clone(), test_in.clone(), max_instructions)
+            {
+                Ok(r) => r,
+                Err(e) => {
+                    eprintln!(
+                        "[{}] FAIL: runtime error for input {:?}: {}",
+                        idx + 1,
+                        test_in,
+                        e
+                    );
+                    failures += 1;
+                    continue;
+                }
+            };
+
+        let state = run.state;
+        if let Some(err) = state.error.clone() {
+            eprintln!(
+                "[{}] FAIL: vm error for input {:?}: {}",
+                idx + 1,
+                test_in,
+                err
+            );
+            failures += 1;
+            continue;
+        }
+
+        let got = if !state.output.is_empty() {
+            state.output.clone()
+        } else {
+            // Mirror app behavior: treat RAX as output only if no stream output exists.
+            let rax = *state
+                .registers
+                .get(&opcode_logic_lib::vm::Register::RAX)
+                .unwrap_or(&0);
+            if state.exited && rax == 60 && expected.len() == 1 && expected[0] != 60 {
+                vec![]
+            } else {
+                vec![rax]
+            }
+        };
+
+        let ok = if !got.is_empty() {
+            got.len() >= expected.len() && &got[0..expected.len()] == expected.as_slice()
+        } else {
+            expected.is_empty()
+        };
+
+        if ok {
+            eprintln!("[{}] PASS", idx + 1);
+        } else {
+            eprintln!(
+                "[{}] FAIL: input {:?}\n  expected: {:?}\n  got:      {:?}",
+                idx + 1,
+                test_in,
+                expected,
+                got
+            );
+            failures += 1;
+        }
+    }
+
+    if failures != 0 {
+        eprintln!(
+            "FAILED {} / {} test case(s).",
+            failures,
+            level.test_cases.len()
+        );
+        std::process::exit(1);
+    }
+}
diff --git a/src-tauri/src/levels.rs b/src-tauri/src/levels.rs
index 33f17a1..5f9e34f 100644
--- a/src-tauri/src/levels.rs
+++ b/src-tauri/src/levels.rs
@@ -20,7 +20,8 @@ pub fn get_levels() -> Vec<Level> {
         Level {
             id: "01_Mov&Call".to_string(),
             name: "Mov & Call".to_string(),
-            description: "Read input (RDI), and return it (RAX).".to_string(),
+            description: "Read bytes from stdin (syscall 0), write them to stdout (syscall 1)."
+                .to_string(),
             test_cases: vec![
                 (vec![123], vec![123]),
                 (vec![0], vec![0]),
@@ -30,87 +31,114 @@ pub fn get_levels() -> Vec<Level> {
         Level {
             id: "02_Addition".to_string(),
             name: "Addition".to_string(),
-            description: "Read A (RDI) and B (RSI), return A + B (RAX).".to_string(),
+            description: "Read bytes, add 1 to each byte, write result.".to_string(),
             test_cases: vec![
-                (vec![10, 20], vec![30]),
-                (vec![5, 5], vec![10]),
-                (vec![-10, 20], vec![10]),
+                (vec![10, 20], vec![11, 21]),
+                (vec![5, 5], vec![6, 6]),
+                (vec![-1, 0], vec![0, 1]),
             ],
         },
         Level {
             id: "03_Subtraction".to_string(),
             name: "Subtraction".to_string(),
-            description: "Read A (RDI) and B (RSI), return A - B (RAX).".to_string(),
+            description: "Read bytes, subtract 1 from each byte, write result.".to_string(),
             test_cases: vec![
-                (vec![30, 10], vec![20]),
-                (vec![10, 20], vec![-10]),
-                (vec![0, 0], vec![0]),
+                (vec![10, 20], vec![9, 19]),
+                (vec![0], vec![-1]),
+                (vec![-128], vec![127]),
             ],
         },
         Level {
             id: "04_TheXORTrick".to_string(),
             name: "The XOR Trick".to_string(),
-            description: "Return 0 (RAX). Try using XOR.".to_string(),
-            test_cases: vec![(vec![123], vec![0]), (vec![999], vec![0])],
+            description: "Read bytes, XOR each byte with 0x20, write result.".to_string(),
+            test_cases: vec![
+                (vec![('a' as i64)], vec![('A' as i64)]),
+                (vec![('Z' as i64)], vec![('z' as i64)]),
+                (vec![0], vec![0x20]),
+            ],
         },
         Level {
             id: "05_Inc&Dec".to_string(),
             name: "Inc & Dec".to_string(),
-            description: "Read input A (RDI). Output A+1 and A-1 (Stream Output via OUT)."
+            description: "Read bytes. Inc even-indexed bytes, dec odd-indexed bytes, write result."
                 .to_string(),
-            test_cases: vec![(vec![10], vec![11, 9]), (vec![0], vec![1, -1])],
+            test_cases: vec![
+                (vec![10, 10, 10, 10], vec![11, 9, 11, 9]),
+                (vec![0], vec![1]),
+            ],
         },
         Level {
             id: "06_Unconditional".to_string(),
             name: "Unconditional".to_string(),
-            description: "Output 1 infinitely (Stream). (Test checks for first 5 outputs of 1)."
-                .to_string(),
-            test_cases: vec![(vec![0], vec![1, 1, 1, 1, 1])],
+            description: "Same as stage 01, but use JMP to structure the control flow.".to_string(),
+            test_cases: vec![
+                (vec![1, 2, 3], vec![1, 2, 3]),
+                (vec![-55], vec![-55]),
+            ],
         },
         Level {
             id: "07_ZeroFlag".to_string(),
             name: "Zero Flag".to_string(),
-            description: "Read A (RDI). If 0, return 1. Else return 0 (RAX).".to_string(),
-            test_cases: vec![(vec![0], vec![1]), (vec![5], vec![0]), (vec![-1], vec![0])],
+            description: "Read bytes, replace 0x00 with 0x20 (space), write result.".to_string(),
+            test_cases: vec![
+                (vec![0, 1, 0], vec![0x20, 1, 0x20]),
+                (vec![5], vec![5]),
+            ],
         },
         Level {
             id: "08_SignFlag".to_string(),
             name: "Sign Flag".to_string(),
-            description: "Read A (RDI). If A < 0, return 1. Else return 0 (RAX).".to_string(),
-            test_cases: vec![(vec![-5], vec![1]), (vec![0], vec![0]), (vec![10], vec![0])],
+            description: "Read bytes, output '+' if first byte is non-negative, otherwise '-'.".to_string(),
+            test_cases: vec![
+                (vec![0], vec![('+' as i64)]),
+                (vec![-1], vec![('-' as i64)]),
+            ],
         },
         Level {
             id: "09_Comparison".to_string(),
             name: "Comparison".to_string(),
-            description: "Read A (RDI), B (RSI). Return the larger value (RAX).".to_string(),
+            description:
+                "Read bytes, compare consecutive bytes, output '+', '=', '-' markers (length N-1)."
+                    .to_string(),
             test_cases: vec![
-                (vec![10, 20], vec![20]),
-                (vec![50, 40], vec![50]),
-                (vec![30, 30], vec![30]),
+                (
+                    vec![1, 2, 2, 1],
+                    vec![('+' as i64), ('=' as i64), ('-' as i64)],
+                ),
+                (vec![10], vec![]),
             ],
         },
         Level {
             id: "10_Countdown".to_string(),
             name: "Countdown".to_string(),
-            description: "Read N (RDI). Output N, N-1... 1 (Stream).".to_string(),
-            test_cases: vec![(vec![3], vec![3, 2, 1]), (vec![5], vec![5, 4, 3, 2, 1])],
+            description: "Read one ASCII digit, output a countdown from it to '0'.".to_string(),
+            test_cases: vec![
+                (vec![('3' as i64)], vec![('3' as i64), ('2' as i64), ('1' as i64), ('0' as i64)]),
+                (vec![('0' as i64)], vec![('0' as i64)]),
+            ],
         },
         Level {
             id: "11_Accumulate3".to_string(),
             name: "Accumulate 3".to_string(),
-            description: "Read 3 inputs (RDI, RSI, RDX). Return sum (RAX).".to_string(),
-            test_cases: vec![(vec![1, 2, 3], vec![6]), (vec![10, 10, 10], vec![30])],
+            description: "Read bytes, sum the first 3 bytes (u8), output 1 byte result.".to_string(),
+            test_cases: vec![
+                (vec![1, 2, 3], vec![6]),
+                (vec![10, 10, 10], vec![30]),
+            ],
         },
         Level {
             id: "12_TheAccumulator".to_string(),
             name: "The Accumulator (BOSS)".to_string(),
             description:
-                "Read inputs using 'IN' until 0 is encountered. Return the total sum in RAX."
+                "Read bytes and transform: A-Z -> a-z, 0-9 -> increment (wrap 9->0), others unchanged."
                     .to_string(),
             test_cases: vec![
-                (vec![1, 2, 3, 0], vec![6]),
-                (vec![10, -5, 20, 0], vec![25]),
-                (vec![0], vec![0]),
+                (
+                    vec![('A' as i64), ('z' as i64), ('9' as i64), ('!' as i64)],
+                    vec![('a' as i64), ('z' as i64), ('0' as i64), ('!' as i64)],
+                ),
+                (vec![('B' as i64), ('0' as i64)], vec![('b' as i64), ('1' as i64)]),
             ],
         },
     ]
@@ -151,14 +179,16 @@ mod tests {
     fn test_level_02_addition() {
         let level = get_level("02_Addition").unwrap();
         assert_eq!(level.test_cases.len(), 3);
-        assert_eq!(level.test_cases[0], (vec![10, 20], vec![30]));
+        assert_eq!(level.test_cases[0], (vec![10, 20], vec![11, 21]));
     }
 
     #[test]
     fn test_level_05_inc_dec() {
         let level = get_level("05_Inc&Dec").unwrap();
-        // Stream output test case
-        assert_eq!(level.test_cases[0], (vec![10], vec![11, 9]));
+        assert_eq!(
+            level.test_cases[0],
+            (vec![10, 10, 10, 10], vec![11, 9, 11, 9])
+        );
     }
 
     #[test]
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 79911da..b8c9a37 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -20,33 +20,54 @@ fn get_levels() -> Vec<levels::Level> {
     levels::get_levels()
 }
 
-#[tauri::command]
-fn get_level_explanation(level_id: String) -> Result<String, String> {
-    // レベルIDからファイルパスを生成
-    // 例: "01_Mov&Call" -> "commnet/1.The-Accumulator/Phase1-Registers&ALU/01_Mov&Call.md"
-    let file_path = match level_id.as_str() {
-        "01_Mov&Call" => "commnet/1.The-Accumulator/Phase1-Registers&ALU/01_Mov&Call.md",
-        "02_Addition" => "commnet/1.The-Accumulator/Phase1-Registers&ALU/02_Addition.md",
-        "03_Subtraction" => "commnet/1.The-Accumulator/Phase1-Registers&ALU/03_Subtraction.md",
-        "04_TheXORTrick" => "commnet/1.The-Accumulator/Phase1-Registers&ALU/04_TheXORTrick.md",
-        "05_Inc&Dec" => "commnet/1.The-Accumulator/Phase1-Registers&ALU/05_Inc&Dec.md",
-        "06_Unconditional" => "commnet/1.The-Accumulator/Phase2-Flags&Jumps/06_Unconditional.md",
-        "07_ZeroFlag" => "commnet/1.The-Accumulator/Phase2-Flags&Jumps/07_ZeroFlag.md",
-        "08_SignFlag" => "commnet/1.The-Accumulator/Phase2-Flags&Jumps/08_SignFlag.md",
-        "09_Comparison" => "commnet/1.The-Accumulator/Phase2-Flags&Jumps/09_Conmparison.md",
-        "10_Countdown" => "commnet/1.The-Accumulator/Phase3-LoopStructures/10_Countdown.md",
-        "11_Accumulate3" => "commnet/1.The-Accumulator/Phase3-LoopStructures/11_Accumulate3.md",
-        "12_TheAccumulator" => "commnet/1.The-Accumulator/BOSS/TheAccumulator.md",
-        _ => return Err(format!("Explanation not found for level: {}", level_id)),
-    };
+fn level_dir_for_id(level_id: &str) -> Option<&'static str> {
+    match level_id {
+        "01_Mov&Call" => Some("stages/1.The-Accumulator/Phase1-Registers&ALU/01_Mov&Call"),
+        "02_Addition" => Some("stages/1.The-Accumulator/Phase1-Registers&ALU/02_Addition"),
+        "03_Subtraction" => Some("stages/1.The-Accumulator/Phase1-Registers&ALU/03_Subtraction"),
+        "04_TheXORTrick" => Some("stages/1.The-Accumulator/Phase1-Registers&ALU/04_TheXORTrick"),
+        "05_Inc&Dec" => Some("stages/1.The-Accumulator/Phase1-Registers&ALU/05_Inc&Dec"),
+        "06_Unconditional" => Some("stages/1.The-Accumulator/Phase2-Flags&Jumps/06_Unconditional"),
+        "07_ZeroFlag" => Some("stages/1.The-Accumulator/Phase2-Flags&Jumps/07_ZeroFlag"),
+        "08_SignFlag" => Some("stages/1.The-Accumulator/Phase2-Flags&Jumps/08_SignFlag"),
+        "09_Comparison" => Some("stages/1.The-Accumulator/Phase2-Flags&Jumps/09_Comparison"),
+        "10_Countdown" => Some("stages/1.The-Accumulator/Phase3-LoopStructures/10_Countdown"),
+        "11_Accumulate3" => Some("stages/1.The-Accumulator/Phase3-LoopStructures/11_Accumulate3"),
+        "12_TheAccumulator" => Some("stages/1.The-Accumulator/BOSS/12_TheAccumulator"),
+        _ => None,
+    }
+}
 
+fn read_stage_file(rel_path: &str) -> Result<String, String> {
     // プロジェクトルートからの相対パスで読み込む
     let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
     path.pop(); // src-tauri から出る
-    path.push(file_path);
+    path.push(rel_path);
+    fs::read_to_string(&path).map_err(|e| format!("Failed to read file: {} (path: {:?})", e, path))
+}
+
+#[tauri::command]
+fn get_level_explanation(level_id: String) -> Result<String, String> {
+    let dir = level_dir_for_id(level_id.as_str())
+        .ok_or_else(|| format!("Stage files not found for level: {}", level_id))?;
+    let md = format!("{}/{}.md", dir, level_id);
+    read_stage_file(&md)
+}
 
-    fs::read_to_string(&path)
-        .map_err(|e| format!("Failed to read explanation file: {} (path: {:?})", e, path))
+#[tauri::command]
+fn get_level_ini(level_id: String) -> Result<String, String> {
+    let dir = level_dir_for_id(level_id.as_str())
+        .ok_or_else(|| format!("Stage files not found for level: {}", level_id))?;
+    let p = format!("{}/ini.asm", dir);
+    read_stage_file(&p)
+}
+
+#[tauri::command]
+fn get_level_collect(level_id: String) -> Result<String, String> {
+    let dir = level_dir_for_id(level_id.as_str())
+        .ok_or_else(|| format!("Stage files not found for level: {}", level_id))?;
+    let p = format!("{}/collect.asm", dir);
+    read_stage_file(&p)
 }
 
 #[tauri::command]
@@ -139,7 +160,9 @@ pub fn run() {
         .invoke_handler(tauri::generate_handler![
             run_simulation,
             get_levels,
-            get_level_explanation
+            get_level_explanation,
+            get_level_ini,
+            get_level_collect
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
diff --git a/src-tauri/src/x86_runtime.rs b/src-tauri/src/x86_runtime.rs
index f446dc9..b4e9afd 100644
--- a/src-tauri/src/x86_runtime.rs
+++ b/src-tauri/src/x86_runtime.rs
@@ -159,6 +159,24 @@ fn preprocess_text(code: &str, syntax: &Syntax, bss_labels: &HashMap<String, u64
 
         let line = normalize_decimal_literals(line);
 
+        // Keystone label fixups do not handle `loop <label>` well when we rewrite labels
+        // into absolute immediates. Rewrite it into `dec rcx; jnz <label>`.
+        let lower = line.trim_start().to_lowercase();
+        if lower.starts_with("loop ") {
+            let target = line.trim_start()[4..].trim();
+            match syntax {
+                Syntax::Intel => {
+                    out.push_str("dec rcx\n");
+                    out.push_str(&format!("jnz {}\n", target));
+                }
+                Syntax::Att => {
+                    out.push_str("decq %rcx\n");
+                    out.push_str(&format!("jnz {}\n", target));
+                }
+            }
+            continue;
+        }
+
         match syntax {
             Syntax::Intel => {
                 if let Some((before, inside, after)) = split_first_bracket(&line) {
@@ -240,6 +258,64 @@ fn normalize_decimal_literals(line: &str) -> String {
         } else {
             Some(bytes[i - 1] as char)
         };
+        // If we are at a boundary and see a prefixed literal (0x/0b/0o),
+        // copy it verbatim. This avoids turning `0x20` into `0x0x20`.
+        if boundary(prev) {
+            // 0x... / 0b... / 0o...
+            if i + 1 < bytes.len() && bytes[i] == b'0' {
+                let p = bytes[i + 1];
+                if p == b'x' || p == b'X' || p == b'b' || p == b'B' || p == b'o' || p == b'O' {
+                    // Copy prefix
+                    out.push('0');
+                    out.push(p as char);
+                    i += 2;
+                    // Copy digits
+                    while i < bytes.len() {
+                        let cc = bytes[i] as char;
+                        let ok = match p {
+                            b'x' | b'X' => cc.is_ascii_hexdigit() || cc == '_',
+                            b'b' | b'B' => cc == '0' || cc == '1' || cc == '_',
+                            b'o' | b'O' => (cc.is_ascii_digit() && cc <= '7') || cc == '_',
+                            _ => false,
+                        };
+                        if ok {
+                            out.push(cc);
+                            i += 1;
+                        } else {
+                            break;
+                        }
+                    }
+                    continue;
+                }
+            }
+            // -0x... / -0b... / -0o...
+            if i + 2 < bytes.len() && bytes[i] == b'-' && bytes[i + 1] == b'0' {
+                let p = bytes[i + 2];
+                if p == b'x' || p == b'X' || p == b'b' || p == b'B' || p == b'o' || p == b'O' {
+                    out.push('-');
+                    out.push('0');
+                    out.push(p as char);
+                    i += 3;
+                    while i < bytes.len() {
+                        let cc = bytes[i] as char;
+                        let ok = match p {
+                            b'x' | b'X' => cc.is_ascii_hexdigit() || cc == '_',
+                            b'b' | b'B' => cc == '0' || cc == '1' || cc == '_',
+                            b'o' | b'O' => (cc.is_ascii_digit() && cc <= '7') || cc == '_',
+                            _ => false,
+                        };
+                        if ok {
+                            out.push(cc);
+                            i += 1;
+                        } else {
+                            break;
+                        }
+                    }
+                    continue;
+                }
+            }
+        }
+
         let next = if i + 1 < bytes.len() {
             Some(bytes[i + 1] as char)
         } else {
diff --git a/src/lib/components/ExplanationView.svelte b/src/lib/components/ExplanationView.svelte
index ae68a44..3b41a8e 100644
--- a/src/lib/components/ExplanationView.svelte
+++ b/src/lib/components/ExplanationView.svelte
@@ -6,9 +6,13 @@
   export let isCompleted: boolean = false;
 
   let explanation: string | null = null;
+  let collectCode: string | null = null;
   let loading = false;
+  let loadingCollect = false;
   let error: string | null = null;
+  let errorCollect: string | null = null;
   let showExplanation = false;
+  let showSolution = false;
 
   async function loadExplanation() {
     if (!levelId || !isCompleted) return;
@@ -32,6 +36,27 @@
     showExplanation = !showExplanation;
   }
 
+  async function loadCollect() {
+    if (!levelId || !isCompleted) return;
+    loadingCollect = true;
+    errorCollect = null;
+    try {
+      collectCode = await invoke("get_level_collect", { levelId });
+    } catch (e) {
+      errorCollect = String(e);
+      console.error("Failed to load collect.asm:", e);
+    } finally {
+      loadingCollect = false;
+    }
+  }
+
+  function toggleSolution() {
+    if (!showSolution && !collectCode) {
+      loadCollect();
+    }
+    showSolution = !showSolution;
+  }
+
   // Markdownを簡単にレンダリング（基本的な処理）
   function formatMarkdown(text: string): string {
     let formatted = text;
@@ -63,10 +88,16 @@
 
 {#if isCompleted}
   <div class="explanation-container">
-    <button class="explanation-toggle" on:click={toggleExplanation}>
-      <span class="icon">📖</span>
-      <span>{showExplanation ? "解説を閉じる" : "解説を読む"}</span>
-    </button>
+    <div class="toggle-row">
+      <button class="explanation-toggle" on:click={toggleExplanation}>
+        <span class="icon">📖</span>
+        <span>{showExplanation ? "解説を閉じる" : "解説を読む"}</span>
+      </button>
+      <button class="explanation-toggle" on:click={toggleSolution}>
+        <span class="icon">✅</span>
+        <span>{showSolution ? "模範解答を閉じる" : "模範解答を見る"}</span>
+      </button>
+    </div>
 
     {#if showExplanation}
       <div class="explanation-panel glass">
@@ -81,6 +112,21 @@
         {/if}
       </div>
     {/if}
+
+    {#if showSolution}
+      <div class="explanation-panel glass">
+        {#if loadingCollect}
+          <div class="loading">模範解答を読み込んでいます...</div>
+        {:else if errorCollect}
+          <div class="error">模範解答の読み込みに失敗しました: {errorCollect}</div>
+        {:else if collectCode}
+          <div class="explanation-content">
+            <h2>模範解答（collect.asm）</h2>
+            <pre class="code-block"><code>{collectCode.trim()}</code></pre>
+          </div>
+        {/if}
+      </div>
+    {/if}
   </div>
 {/if}
 
@@ -89,6 +135,11 @@
     margin-top: 1rem;
   }
 
+  .toggle-row {
+    display: flex;
+    gap: 0.75rem;
+  }
+
   .explanation-toggle {
     display: flex;
     align-items: center;
diff --git a/src/routes/grand/[grandId]/+page.svelte b/src/routes/grand/[grandId]/+page.svelte
index bae84d5..afe6d00 100644
--- a/src/routes/grand/[grandId]/+page.svelte
+++ b/src/routes/grand/[grandId]/+page.svelte
@@ -85,16 +85,16 @@ _start:
     // Ensure a level is actually selected (otherwise RUN can "succeed" without saving progress)
     if (!currentLevel && stageLevels.length > 0) {
       const initial = pickHighestUnlocked(stageLevels) ?? stageLevels[0];
-      handleLevelSelect(initial);
+      await handleLevelSelect(initial);
     }
 
     // Ensure some initial code exists
     if (!currentLevel) {
-      applyDefaultCode("01_Mov&Call");
+      await applyDefaultCode("01_Mov&Call");
     }
   });
 
-  function handleLevelSelect(level: any) {
+  async function handleLevelSelect(level: any) {
     currentLevel = level;
     selectedLevelId = level.id;
     status = "READY";
@@ -108,16 +108,21 @@ _start:
       expected = level.test_cases[0][1];
     }
 
-    applyDefaultCode(level.id);
+    await applyDefaultCode(level.id);
   }
 
-  function applyDefaultCode(levelId: string) {
-    // レベルに合わせたコメント（MISSION/説明）を埋め込む
-    const level = stageLevels.find((l) => l.id === levelId) ?? currentLevel;
-    const mission = level?.name ?? levelId;
-    const desc = level?.description ?? "";
-
-    code = `section .bss
+  async function applyDefaultCode(levelId: string) {
+    // 可能ならステージごとの ini.asm を初期コードとして読み込む
+    try {
+      const ini: string = await invoke("get_level_ini", { levelId });
+      code = ini;
+      return;
+    } catch (e) {
+      // fallback: 以前のテンプレ
+      const level = stageLevels.find((l) => l.id === levelId) ?? currentLevel;
+      const mission = level?.name ?? levelId;
+      const desc = level?.description ?? "";
+      code = `section .bss
     buf resb 16
 
 section .text
@@ -131,11 +136,12 @@ _start:
     mov rax, 60
     xor rdi, rdi
     syscall`;
+    }
   }
 
   function resetCode() {
     if (currentLevel) {
-      applyDefaultCode(currentLevel.id);
+      void applyDefaultCode(currentLevel.id);
     }
   }
 
diff --git a/stages/1.The-Accumulator/BOSS/12_TheAccumulator/12_TheAccumulator.md b/stages/1.The-Accumulator/BOSS/12_TheAccumulator/12_TheAccumulator.md
new file mode 100644
index 0000000..a1a20e9
--- /dev/null
+++ b/stages/1.The-Accumulator/BOSS/12_TheAccumulator/12_TheAccumulator.md
@@ -0,0 +1,13 @@
+グランドステージ: 1.The Accumulator
+
+フェーズ: BOSS Stage
+
+ステージ名: The Accumulator (BOSS)
+
+ステージ内容: 入力を読み、以下の変換を行って出力する
+ - 'A'..'Z' は小文字化（+0x20）
+ - '0'..'9' はインクリメント（'9' は '0' にラップ）
+ - その他はそのまま
+
+学習ポイント: cmp/test、条件分岐、ループ、複数条件の組み合わせ
+
diff --git a/stages/1.The-Accumulator/BOSS/12_TheAccumulator/collect.asm b/stages/1.The-Accumulator/BOSS/12_TheAccumulator/collect.asm
new file mode 100644
index 0000000..f448008
--- /dev/null
+++ b/stages/1.The-Accumulator/BOSS/12_TheAccumulator/collect.asm
@@ -0,0 +1,65 @@
+section .bss
+    buf resb 32
+    out resb 32
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: The Accumulator (BOSS STAGE)
+    ; - A-Z -> a-z
+    ; - 0-9 -> increment (wrap 9->0)
+    ; - others unchanged
+
+    ; read(0, buf, 32)
+    mov rax, 0
+    mov rdi, 0
+    mov rsi, buf
+    mov rdx, 32
+    syscall
+
+    mov rcx, rax        ; bytes read
+    xor r8, r8          ; index = 0
+
+.loop:
+    cmp r8, rcx
+    jge .done
+
+    mov al, byte [buf + r8]
+
+    ; uppercase?
+    cmp al, 'A'
+    jl .check_digit
+    cmp al, 'Z'
+    jg .check_digit
+    add al, 0x20
+    jmp .write
+
+.check_digit:
+    cmp al, '0'
+    jl .write
+    cmp al, '9'
+    jg .write
+    inc al
+    cmp al, '9' + 1
+    jne .write
+    mov al, '0'
+
+.write:
+    mov byte [out + r8], al
+    inc r8
+    jmp .loop
+
+.done:
+    ; write(1, out, rcx)
+    mov rdx, rcx
+    mov rax, 1
+    mov rdi, 1
+    mov rsi, out
+    syscall
+
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/1.The-Accumulator/BOSS/12_TheAccumulator/ini.asm b/stages/1.The-Accumulator/BOSS/12_TheAccumulator/ini.asm
new file mode 100644
index 0000000..217d32f
--- /dev/null
+++ b/stages/1.The-Accumulator/BOSS/12_TheAccumulator/ini.asm
@@ -0,0 +1,18 @@
+section .bss
+    buf resb 32
+    out resb 32
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: The Accumulator (BOSS STAGE)
+    ; - A-Z -> a-z
+    ; - 0-9 -> increment (wrap 9->0)
+    ; - others unchanged
+    
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/1.The-Accumulator/BOSS/12_TheAccumulator/test.sh b/stages/1.The-Accumulator/BOSS/12_TheAccumulator/test.sh
new file mode 100644
index 0000000..97af285
--- /dev/null
+++ b/stages/1.The-Accumulator/BOSS/12_TheAccumulator/test.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(git rev-parse --show-toplevel)"
+STAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+cargo run --quiet --manifest-path "$ROOT_DIR/src-tauri/Cargo.toml" --bin stage_runner -- \
+  --level-id "12_TheAccumulator" \
+  --asm "$STAGE_DIR/collect.asm"
+
diff --git a/stages/1.The-Accumulator/BOSS/TheAccumulator.md b/stages/1.The-Accumulator/BOSS/TheAccumulator.md
deleted file mode 100644
index 0986732..0000000
--- a/stages/1.The-Accumulator/BOSS/TheAccumulator.md
+++ /dev/null
@@ -1,116 +0,0 @@
-グランドステージ: 1.The Accumulator
-
-フェーズ: BOSS Stage
-
-ステージ名: The Accumulator
-
-ステージ内容: 複合チャレンジ - すべての学習内容を組み合わせた総合問題
-
-学習ポイント: mov, add, sub, xor, inc, dec, jmp, cmp, test, 条件ジャンプ、ループ
-
-ユーザーに初期状態で表示するコード
-
-```asm
-section .bss
-    buf resb 32
-    out resb 32
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: The Accumulator (BOSS STAGE)
-    ; Challenge: Combine all learned skills
-    ; - Read input
-    ; - Process with various operations
-    ; - Output result
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
-
-正解コード(あくまでも模範解答。ユーザーが出したコードが動けば正解とする)
-
-```asm
-section .bss
-    buf resb 32
-    out resb 32
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: The Accumulator (BOSS STAGE)
-    ; Challenge: Combine all learned skills
-    ; Read input, process each byte:
-    ; - For uppercase letters: convert to lowercase
-    ; - For digits: increment
-    ; - For others: pass through
-    ; Output result
-
-    ; read(0, buf, 32)
-    mov rax, 0          ; syscall: read
-    mov rdi, 0          ; stdin
-    mov rsi, buf        ; buffer
-    mov rdx, 32         ; size
-    syscall
-
-    ; process each byte
-    mov rcx, rax        ; number of bytes read
-    xor r8, r8          ; read index = 0
-    xor r9, r9          ; write index = 0
-
-.loop:
-    cmp r8, rcx
-    jge .done_process
-    
-    mov al, byte [buf + r8]
-    
-    ; check if uppercase letter (A-Z: 0x41-0x5A)
-    cmp al, 'A'
-    jl .check_digit
-    cmp al, 'Z'
-    jg .check_digit
-    
-    ; convert to lowercase (add 0x20)
-    add al, 0x20
-    jmp .write_byte
-    
-.check_digit:
-    ; check if digit (0-9: 0x30-0x39)
-    cmp al, '0'
-    jl .pass_through
-    cmp al, '9'
-    jg .pass_through
-    
-    ; increment digit
-    inc al
-    cmp al, '9' + 1
-    jne .write_byte
-    mov al, '0'         ; wrap 9 to 0
-    jmp .write_byte
-    
-.pass_through:
-    ; keep as is
-    
-.write_byte:
-    mov byte [out + r9], al
-    inc r9
-    inc r8
-    jmp .loop
-
-.done_process:
-    ; write(1, out, r9)
-    mov rdx, r9         ; number of bytes to write
-    mov rax, 1          ; syscall: write
-    mov rdi, 1          ; stdout
-    mov rsi, out
-    syscall
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
diff --git a/stages/1.The-Accumulator/Phase1-Registers&ALU/01_Mov&Call.md b/stages/1.The-Accumulator/Phase1-Registers&ALU/01_Mov&Call.md
deleted file mode 100644
index d4ae101..0000000
--- a/stages/1.The-Accumulator/Phase1-Registers&ALU/01_Mov&Call.md
+++ /dev/null
@@ -1,61 +0,0 @@
-グランドステージ: 1.The Accumulator
-
-フェーズ: Phase 1 - Registers & ALU
-
-ステージ名: Mov & Call
-
-ステージ内容: 入力を読み、そのまま出力する
-
-学習ポイント: mov, call, rax(戻り値), rdi(引数) の役割
-
-ユーザーに初期状態で表示するコード
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: Mov & Call
-    ; read from stdin (syscall 0), write to stdout (syscall 1)
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
-
-正解コード(あくまでも模範解答。ユーザーが出したコードが動けば正解とする)
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: Mov & Call
-    ; read from stdin (syscall 0), write to stdout (syscall 1)
-
-    ; read(0, buf, 16)
-    mov rax, 0          ; syscall: read
-    mov rdi, 0          ; stdin
-    mov rsi, buf        ; buffer
-    mov rdx, 16         ; size
-    syscall
-
-    ; write(1, buf, rax)
-    mov rdx, rax        ; number of bytes read
-    mov rax, 1          ; syscall: write
-    mov rdi, 1          ; stdout
-    mov rsi, buf
-    syscall
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
diff --git a/stages/1.The-Accumulator/Phase1-Registers&ALU/01_Mov&Call/01_Mov&Call.md b/stages/1.The-Accumulator/Phase1-Registers&ALU/01_Mov&Call/01_Mov&Call.md
new file mode 100644
index 0000000..ea52b7c
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase1-Registers&ALU/01_Mov&Call/01_Mov&Call.md
@@ -0,0 +1,10 @@
+グランドステージ: 1.The Accumulator
+
+フェーズ: Phase 1 - Registers & ALU
+
+ステージ名: Mov & Call
+
+ステージ内容: 入力を読み、そのまま出力する
+
+学習ポイント: mov, syscall, rax(戻り値), rdi(引数) の役割
+
diff --git a/stages/1.The-Accumulator/Phase1-Registers&ALU/01_Mov&Call/collect.asm b/stages/1.The-Accumulator/Phase1-Registers&ALU/01_Mov&Call/collect.asm
new file mode 100644
index 0000000..1784fd4
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase1-Registers&ALU/01_Mov&Call/collect.asm
@@ -0,0 +1,29 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: Mov & Call
+    ; read from stdin (syscall 0), write to stdout (syscall 1)
+
+    ; read(0, buf, 16)
+    mov rax, 0          ; syscall: read
+    mov rdi, 0          ; stdin
+    mov rsi, buf        ; buffer
+    mov rdx, 16         ; size
+    syscall
+
+    ; write(1, buf, rax)
+    mov rdx, rax        ; number of bytes read
+    mov rax, 1          ; syscall: write
+    mov rdi, 1          ; stdout
+    mov rsi, buf
+    syscall
+
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/1.The-Accumulator/Phase1-Registers&ALU/01_Mov&Call/ini.asm b/stages/1.The-Accumulator/Phase1-Registers&ALU/01_Mov&Call/ini.asm
new file mode 100644
index 0000000..398a82d
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase1-Registers&ALU/01_Mov&Call/ini.asm
@@ -0,0 +1,15 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: Mov & Call
+    ; read from stdin (syscall 0), write to stdout (syscall 1)
+    
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/1.The-Accumulator/Phase1-Registers&ALU/01_Mov&Call/test.sh b/stages/1.The-Accumulator/Phase1-Registers&ALU/01_Mov&Call/test.sh
new file mode 100644
index 0000000..4133e8e
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase1-Registers&ALU/01_Mov&Call/test.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(git rev-parse --show-toplevel)"
+STAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+cargo run --quiet --manifest-path "$ROOT_DIR/src-tauri/Cargo.toml" --bin stage_runner -- \
+  --level-id "01_Mov&Call" \
+  --asm "$STAGE_DIR/collect.asm"
+
diff --git a/stages/1.The-Accumulator/Phase1-Registers&ALU/02_Addition/02_Addition.md b/stages/1.The-Accumulator/Phase1-Registers&ALU/02_Addition/02_Addition.md
new file mode 100644
index 0000000..9086556
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase1-Registers&ALU/02_Addition/02_Addition.md
@@ -0,0 +1,10 @@
+グランドステージ: 1.The Accumulator
+
+フェーズ: Phase 1 - Registers & ALU
+
+ステージ名: Addition
+
+ステージ内容: 入力を読み、各バイトを1増やして出力する
+
+学習ポイント: add命令、ループ、バイト操作
+
diff --git a/stages/1.The-Accumulator/Phase1-Registers&ALU/02_Addition.md b/stages/1.The-Accumulator/Phase1-Registers&ALU/02_Addition/collect.asm
similarity index 53%
rename from stages/1.The-Accumulator/Phase1-Registers&ALU/02_Addition.md
rename to stages/1.The-Accumulator/Phase1-Registers&ALU/02_Addition/collect.asm
index ccc86e2..8124ae0 100644
--- a/stages/1.The-Accumulator/Phase1-Registers&ALU/02_Addition.md
+++ b/stages/1.The-Accumulator/Phase1-Registers&ALU/02_Addition/collect.asm
@@ -1,35 +1,3 @@
-グランドステージ: 1.The Accumulator
-
-フェーズ: Phase 1 - Registers & ALU
-
-ステージ名: Addition
-
-ステージ内容: 入力を読み、各文字を1増やして出力する
-
-学習ポイント: add命令、rdxレジスタの使用、バイト操作
-
-ユーザーに初期状態で表示するコード
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: Addition
-    ; read from stdin, add 1 to each byte, write to stdout
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
-
-正解コード(あくまでも模範解答。ユーザーが出したコードが動けば正解とする)
-
-```asm
 section .bss
     buf resb 16
 
@@ -60,15 +28,15 @@ _start:
     jmp .loop
 
 .done_add:
-    ; write(1, buf, rax)
+    ; write(1, buf, rcx)
     mov rdx, rcx        ; number of bytes to write
     mov rax, 1          ; syscall: write
     mov rdi, 1          ; stdout
     mov rsi, buf
     syscall
-    
+
     ; exit(0)
     mov rax, 60
     xor rdi, rdi
     syscall
-```
+
diff --git a/stages/1.The-Accumulator/Phase1-Registers&ALU/02_Addition/ini.asm b/stages/1.The-Accumulator/Phase1-Registers&ALU/02_Addition/ini.asm
new file mode 100644
index 0000000..c2f0da8
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase1-Registers&ALU/02_Addition/ini.asm
@@ -0,0 +1,15 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: Addition
+    ; read from stdin, add 1 to each byte, write to stdout
+    
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/1.The-Accumulator/Phase1-Registers&ALU/02_Addition/test.sh b/stages/1.The-Accumulator/Phase1-Registers&ALU/02_Addition/test.sh
new file mode 100644
index 0000000..c24a5ed
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase1-Registers&ALU/02_Addition/test.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(git rev-parse --show-toplevel)"
+STAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+cargo run --quiet --manifest-path "$ROOT_DIR/src-tauri/Cargo.toml" --bin stage_runner -- \
+  --level-id "02_Addition" \
+  --asm "$STAGE_DIR/collect.asm"
+
diff --git a/stages/1.The-Accumulator/Phase1-Registers&ALU/03_Subtraction/03_Subtraction.md b/stages/1.The-Accumulator/Phase1-Registers&ALU/03_Subtraction/03_Subtraction.md
new file mode 100644
index 0000000..1d5ba22
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase1-Registers&ALU/03_Subtraction/03_Subtraction.md
@@ -0,0 +1,10 @@
+グランドステージ: 1.The Accumulator
+
+フェーズ: Phase 1 - Registers & ALU
+
+ステージ名: Subtraction
+
+ステージ内容: 入力を読み、各バイトを1減らして出力する
+
+学習ポイント: sub命令、ループ、バイト操作
+
diff --git a/stages/1.The-Accumulator/Phase1-Registers&ALU/03_Subtraction.md b/stages/1.The-Accumulator/Phase1-Registers&ALU/03_Subtraction/collect.asm
similarity index 54%
rename from stages/1.The-Accumulator/Phase1-Registers&ALU/03_Subtraction.md
rename to stages/1.The-Accumulator/Phase1-Registers&ALU/03_Subtraction/collect.asm
index 2defdd8..207190f 100644
--- a/stages/1.The-Accumulator/Phase1-Registers&ALU/03_Subtraction.md
+++ b/stages/1.The-Accumulator/Phase1-Registers&ALU/03_Subtraction/collect.asm
@@ -1,35 +1,3 @@
-グランドステージ: 1.The Accumulator
-
-フェーズ: Phase 1 - Registers & ALU
-
-ステージ名: Subtraction
-
-ステージ内容: 入力を読み、各文字を1減らして出力する
-
-学習ポイント: sub命令、値の操作
-
-ユーザーに初期状態で表示するコード
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: Subtraction
-    ; read from stdin, subtract 1 from each byte, write to stdout
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
-
-正解コード(あくまでも模範解答。ユーザーが出したコードが動けば正解とする)
-
-```asm
 section .bss
     buf resb 16
 
@@ -60,15 +28,15 @@ _start:
     jmp .loop
 
 .done_sub:
-    ; write(1, buf, rax)
+    ; write(1, buf, rcx)
     mov rdx, rcx        ; number of bytes to write
     mov rax, 1          ; syscall: write
     mov rdi, 1          ; stdout
     mov rsi, buf
     syscall
-    
+
     ; exit(0)
     mov rax, 60
     xor rdi, rdi
     syscall
-```
+
diff --git a/stages/1.The-Accumulator/Phase1-Registers&ALU/03_Subtraction/ini.asm b/stages/1.The-Accumulator/Phase1-Registers&ALU/03_Subtraction/ini.asm
new file mode 100644
index 0000000..8536b92
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase1-Registers&ALU/03_Subtraction/ini.asm
@@ -0,0 +1,15 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: Subtraction
+    ; read from stdin, subtract 1 from each byte, write to stdout
+    
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/1.The-Accumulator/Phase1-Registers&ALU/03_Subtraction/test.sh b/stages/1.The-Accumulator/Phase1-Registers&ALU/03_Subtraction/test.sh
new file mode 100644
index 0000000..8d70ba9
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase1-Registers&ALU/03_Subtraction/test.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(git rev-parse --show-toplevel)"
+STAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+cargo run --quiet --manifest-path "$ROOT_DIR/src-tauri/Cargo.toml" --bin stage_runner -- \
+  --level-id "03_Subtraction" \
+  --asm "$STAGE_DIR/collect.asm"
+
diff --git a/stages/1.The-Accumulator/Phase1-Registers&ALU/04_TheXORTrick/04_TheXORTrick.md b/stages/1.The-Accumulator/Phase1-Registers&ALU/04_TheXORTrick/04_TheXORTrick.md
new file mode 100644
index 0000000..43a9de4
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase1-Registers&ALU/04_TheXORTrick/04_TheXORTrick.md
@@ -0,0 +1,10 @@
+グランドステージ: 1.The Accumulator
+
+フェーズ: Phase 1 - Registers & ALU
+
+ステージ名: The XOR Trick
+
+ステージ内容: 入力を読み、各バイトを 0x20 で XOR して出力する
+
+学習ポイント: xor命令、ビット演算
+
diff --git a/stages/1.The-Accumulator/Phase1-Registers&ALU/04_TheXORTrick.md b/stages/1.The-Accumulator/Phase1-Registers&ALU/04_TheXORTrick/collect.asm
similarity index 52%
rename from stages/1.The-Accumulator/Phase1-Registers&ALU/04_TheXORTrick.md
rename to stages/1.The-Accumulator/Phase1-Registers&ALU/04_TheXORTrick/collect.asm
index 697a750..5fb44f6 100644
--- a/stages/1.The-Accumulator/Phase1-Registers&ALU/04_TheXORTrick.md
+++ b/stages/1.The-Accumulator/Phase1-Registers&ALU/04_TheXORTrick/collect.asm
@@ -1,35 +1,3 @@
-グランドステージ: 1.The Accumulator
-
-フェーズ: Phase 1 - Registers & ALU
-
-ステージ名: The XOR Trick
-
-ステージ内容: 入力を読み、各文字をXOR（0x20）で変換して出力する
-
-学習ポイント: xor命令、ビット演算、大文字小文字変換
-
-ユーザーに初期状態で表示するコード
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: The XOR Trick
-    ; read from stdin, XOR each byte with 0x20, write to stdout
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
-
-正解コード(あくまでも模範解答。ユーザーが出したコードが動けば正解とする)
-
-```asm
 section .bss
     buf resb 16
 
@@ -60,15 +28,15 @@ _start:
     jmp .loop
 
 .done_xor:
-    ; write(1, buf, rax)
+    ; write(1, buf, rcx)
     mov rdx, rcx        ; number of bytes to write
     mov rax, 1          ; syscall: write
     mov rdi, 1          ; stdout
     mov rsi, buf
     syscall
-    
+
     ; exit(0)
     mov rax, 60
     xor rdi, rdi
     syscall
-```
+
diff --git a/stages/1.The-Accumulator/Phase1-Registers&ALU/04_TheXORTrick/ini.asm b/stages/1.The-Accumulator/Phase1-Registers&ALU/04_TheXORTrick/ini.asm
new file mode 100644
index 0000000..6332260
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase1-Registers&ALU/04_TheXORTrick/ini.asm
@@ -0,0 +1,15 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: The XOR Trick
+    ; read from stdin, XOR each byte with 0x20, write to stdout
+    
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/1.The-Accumulator/Phase1-Registers&ALU/04_TheXORTrick/test.sh b/stages/1.The-Accumulator/Phase1-Registers&ALU/04_TheXORTrick/test.sh
new file mode 100644
index 0000000..a6e0962
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase1-Registers&ALU/04_TheXORTrick/test.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(git rev-parse --show-toplevel)"
+STAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+cargo run --quiet --manifest-path "$ROOT_DIR/src-tauri/Cargo.toml" --bin stage_runner -- \
+  --level-id "04_TheXORTrick" \
+  --asm "$STAGE_DIR/collect.asm"
+
diff --git a/stages/1.The-Accumulator/Phase1-Registers&ALU/05_Inc&Dec/05_Inc&Dec.md b/stages/1.The-Accumulator/Phase1-Registers&ALU/05_Inc&Dec/05_Inc&Dec.md
new file mode 100644
index 0000000..490b18d
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase1-Registers&ALU/05_Inc&Dec/05_Inc&Dec.md
@@ -0,0 +1,10 @@
+グランドステージ: 1.The Accumulator
+
+フェーズ: Phase 1 - Registers & ALU
+
+ステージ名: Inc & Dec
+
+ステージ内容: 入力を読み、偶数番目をinc、奇数番目をdecして出力する
+
+学習ポイント: inc/dec命令、インデックス、条件分岐
+
diff --git a/stages/1.The-Accumulator/Phase1-Registers&ALU/05_Inc&Dec.md b/stages/1.The-Accumulator/Phase1-Registers&ALU/05_Inc&Dec/collect.asm
similarity index 55%
rename from stages/1.The-Accumulator/Phase1-Registers&ALU/05_Inc&Dec.md
rename to stages/1.The-Accumulator/Phase1-Registers&ALU/05_Inc&Dec/collect.asm
index c24adcf..eea6167 100644
--- a/stages/1.The-Accumulator/Phase1-Registers&ALU/05_Inc&Dec.md
+++ b/stages/1.The-Accumulator/Phase1-Registers&ALU/05_Inc&Dec/collect.asm
@@ -1,35 +1,3 @@
-グランドステージ: 1.The Accumulator
-
-フェーズ: Phase 1 - Registers & ALU
-
-ステージ名: Inc & Dec
-
-ステージ内容: 入力を読み、各文字の偶数番目をinc、奇数番目をdecして出力する
-
-学習ポイント: inc/dec命令、インデックス操作、条件分岐
-
-ユーザーに初期状態で表示するコード
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: Inc & Dec
-    ; read from stdin, inc even-indexed, dec odd-indexed bytes, write to stdout
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
-
-正解コード(あくまでも模範解答。ユーザーが出したコードが動けば正解とする)
-
-```asm
 section .bss
     buf resb 16
 
@@ -67,15 +35,15 @@ _start:
     jmp .loop
 
 .done_inc_dec:
-    ; write(1, buf, rax)
+    ; write(1, buf, rcx)
     mov rdx, rcx        ; number of bytes to write
     mov rax, 1          ; syscall: write
     mov rdi, 1          ; stdout
     mov rsi, buf
     syscall
-    
+
     ; exit(0)
     mov rax, 60
     xor rdi, rdi
     syscall
-```
+
diff --git a/stages/1.The-Accumulator/Phase1-Registers&ALU/05_Inc&Dec/ini.asm b/stages/1.The-Accumulator/Phase1-Registers&ALU/05_Inc&Dec/ini.asm
new file mode 100644
index 0000000..e0ce48c
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase1-Registers&ALU/05_Inc&Dec/ini.asm
@@ -0,0 +1,15 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: Inc & Dec
+    ; read from stdin, inc even-indexed, dec odd-indexed bytes, write to stdout
+    
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/1.The-Accumulator/Phase1-Registers&ALU/05_Inc&Dec/test.sh b/stages/1.The-Accumulator/Phase1-Registers&ALU/05_Inc&Dec/test.sh
new file mode 100644
index 0000000..4d97425
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase1-Registers&ALU/05_Inc&Dec/test.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(git rev-parse --show-toplevel)"
+STAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+cargo run --quiet --manifest-path "$ROOT_DIR/src-tauri/Cargo.toml" --bin stage_runner -- \
+  --level-id "05_Inc&Dec" \
+  --asm "$STAGE_DIR/collect.asm"
+
diff --git a/stages/1.The-Accumulator/Phase2-Flags&Jumps/06_Unconditional.md b/stages/1.The-Accumulator/Phase2-Flags&Jumps/06_Unconditional.md
deleted file mode 100644
index 9825fb2..0000000
--- a/stages/1.The-Accumulator/Phase2-Flags&Jumps/06_Unconditional.md
+++ /dev/null
@@ -1,70 +0,0 @@
-グランドステージ: 1.The Accumulator
-
-フェーズ: Phase 2 - Flags & Jumps
-
-ステージ名: Unconditional
-
-ステージ内容: 入力を読み、そのまま出力する（jmp命令の練習）
-
-学習ポイント: jmp命令、無条件ジャンプ
-
-ユーザーに初期状態で表示するコード
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: Unconditional
-    ; read from stdin, write to stdout using jmp
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
-
-正解コード(あくまでも模範解答。ユーザーが出したコードが動けば正解とする)
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: Unconditional
-    ; read from stdin, write to stdout using jmp
-
-    jmp .read_input
-
-.read_input:
-    ; read(0, buf, 16)
-    mov rax, 0          ; syscall: read
-    mov rdi, 0          ; stdin
-    mov rsi, buf        ; buffer
-    mov rdx, 16         ; size
-    syscall
-
-    jmp .write_output
-
-.write_output:
-    ; write(1, buf, rax)
-    mov rdx, rax        ; number of bytes read
-    mov rax, 1          ; syscall: write
-    mov rdi, 1          ; stdout
-    mov rsi, buf
-    syscall
-    
-    jmp .exit
-
-.exit:
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
diff --git a/stages/1.The-Accumulator/Phase2-Flags&Jumps/06_Unconditional/06_Unconditional.md b/stages/1.The-Accumulator/Phase2-Flags&Jumps/06_Unconditional/06_Unconditional.md
new file mode 100644
index 0000000..029b6fd
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase2-Flags&Jumps/06_Unconditional/06_Unconditional.md
@@ -0,0 +1,10 @@
+グランドステージ: 1.The Accumulator
+
+フェーズ: Phase 2 - Flags & Jumps
+
+ステージ名: Unconditional
+
+ステージ内容: 入力を読み、そのまま出力する（jmp命令の練習）
+
+学習ポイント: jmp命令、無条件ジャンプ
+
diff --git a/stages/1.The-Accumulator/Phase2-Flags&Jumps/06_Unconditional/collect.asm b/stages/1.The-Accumulator/Phase2-Flags&Jumps/06_Unconditional/collect.asm
new file mode 100644
index 0000000..a94c2c4
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase2-Flags&Jumps/06_Unconditional/collect.asm
@@ -0,0 +1,38 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: Unconditional
+    ; read from stdin, write to stdout using jmp
+
+    jmp .read_input
+
+.read_input:
+    ; read(0, buf, 16)
+    mov rax, 0          ; syscall: read
+    mov rdi, 0          ; stdin
+    mov rsi, buf        ; buffer
+    mov rdx, 16         ; size
+    syscall
+
+    jmp .write_output
+
+.write_output:
+    ; write(1, buf, rax)
+    mov rdx, rax        ; number of bytes read
+    mov rax, 1          ; syscall: write
+    mov rdi, 1          ; stdout
+    mov rsi, buf
+    syscall
+
+    jmp .exit
+
+.exit:
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/1.The-Accumulator/Phase2-Flags&Jumps/06_Unconditional/ini.asm b/stages/1.The-Accumulator/Phase2-Flags&Jumps/06_Unconditional/ini.asm
new file mode 100644
index 0000000..797a6b7
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase2-Flags&Jumps/06_Unconditional/ini.asm
@@ -0,0 +1,15 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: Unconditional
+    ; read from stdin, write to stdout using jmp
+    
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/1.The-Accumulator/Phase2-Flags&Jumps/06_Unconditional/test.sh b/stages/1.The-Accumulator/Phase2-Flags&Jumps/06_Unconditional/test.sh
new file mode 100644
index 0000000..83da833
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase2-Flags&Jumps/06_Unconditional/test.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(git rev-parse --show-toplevel)"
+STAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+cargo run --quiet --manifest-path "$ROOT_DIR/src-tauri/Cargo.toml" --bin stage_runner -- \
+  --level-id "06_Unconditional" \
+  --asm "$STAGE_DIR/collect.asm"
+
diff --git a/stages/1.The-Accumulator/Phase2-Flags&Jumps/07_ZeroFlag.md b/stages/1.The-Accumulator/Phase2-Flags&Jumps/07_ZeroFlag.md
deleted file mode 100644
index d57d801..0000000
--- a/stages/1.The-Accumulator/Phase2-Flags&Jumps/07_ZeroFlag.md
+++ /dev/null
@@ -1,76 +0,0 @@
-グランドステージ: 1.The Accumulator
-
-フェーズ: Phase 2 - Flags & Jumps
-
-ステージ名: Zero Flag
-
-ステージ内容: 入力を読み、ヌル文字（0x00）をスペース（0x20）に変換して出力する
-
-学習ポイント: ZFフラグ、条件付きジャンプ（jz）、フラグの仕組み
-
-ユーザーに初期状態で表示するコード
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: Zero Flag
-    ; read from stdin, replace null bytes with spaces, write to stdout
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
-
-正解コード(あくまでも模範解答。ユーザーが出したコードが動けば正解とする)
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: Zero Flag
-    ; read from stdin, replace null bytes with spaces, write to stdout
-
-    ; read(0, buf, 16)
-    mov rax, 0          ; syscall: read
-    mov rdi, 0          ; stdin
-    mov rsi, buf        ; buffer
-    mov rdx, 16         ; size
-    syscall
-
-    ; replace null bytes with spaces
-    mov rcx, rax        ; number of bytes read
-    xor r8, r8          ; index = 0
-.loop:
-    cmp r8, rcx
-    jge .done_replace
-    mov al, byte [buf + r8]
-    cmp al, 0           ; check if byte is zero (sets ZF)
-    jnz .next_byte
-    mov byte [buf + r8], 0x20 ; replace with space
-.next_byte:
-    inc r8
-    jmp .loop
-
-.done_replace:
-    ; write(1, buf, rax)
-    mov rdx, rcx        ; number of bytes to write
-    mov rax, 1          ; syscall: write
-    mov rdi, 1          ; stdout
-    mov rsi, buf
-    syscall
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
diff --git a/stages/1.The-Accumulator/Phase2-Flags&Jumps/07_ZeroFlag/07_ZeroFlag.md b/stages/1.The-Accumulator/Phase2-Flags&Jumps/07_ZeroFlag/07_ZeroFlag.md
new file mode 100644
index 0000000..f032cfd
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase2-Flags&Jumps/07_ZeroFlag/07_ZeroFlag.md
@@ -0,0 +1,10 @@
+グランドステージ: 1.The Accumulator
+
+フェーズ: Phase 2 - Flags & Jumps
+
+ステージ名: Zero Flag
+
+ステージ内容: 入力を読み、0x00（ヌル）を 0x20（スペース）に変換して出力する
+
+学習ポイント: ZF、条件分岐（jz/jnz）
+
diff --git a/stages/1.The-Accumulator/Phase2-Flags&Jumps/07_ZeroFlag/collect.asm b/stages/1.The-Accumulator/Phase2-Flags&Jumps/07_ZeroFlag/collect.asm
new file mode 100644
index 0000000..ee6abd8
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase2-Flags&Jumps/07_ZeroFlag/collect.asm
@@ -0,0 +1,44 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: Zero Flag
+    ; read from stdin, replace null bytes with spaces, write to stdout
+
+    ; read(0, buf, 16)
+    mov rax, 0          ; syscall: read
+    mov rdi, 0          ; stdin
+    mov rsi, buf        ; buffer
+    mov rdx, 16         ; size
+    syscall
+
+    ; replace null bytes with spaces
+    mov rcx, rax        ; number of bytes read
+    xor r8, r8          ; index = 0
+.loop:
+    cmp r8, rcx
+    jge .done_replace
+    mov al, byte [buf + r8]
+    cmp al, 0           ; sets ZF if al == 0
+    jnz .next
+    mov byte [buf + r8], 0x20
+.next:
+    inc r8
+    jmp .loop
+
+.done_replace:
+    ; write(1, buf, rcx)
+    mov rdx, rcx
+    mov rax, 1
+    mov rdi, 1
+    mov rsi, buf
+    syscall
+
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/1.The-Accumulator/Phase2-Flags&Jumps/07_ZeroFlag/ini.asm b/stages/1.The-Accumulator/Phase2-Flags&Jumps/07_ZeroFlag/ini.asm
new file mode 100644
index 0000000..927394f
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase2-Flags&Jumps/07_ZeroFlag/ini.asm
@@ -0,0 +1,15 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: Zero Flag
+    ; read from stdin, replace null bytes with spaces, write to stdout
+    
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/1.The-Accumulator/Phase2-Flags&Jumps/07_ZeroFlag/test.sh b/stages/1.The-Accumulator/Phase2-Flags&Jumps/07_ZeroFlag/test.sh
new file mode 100644
index 0000000..9ce93ae
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase2-Flags&Jumps/07_ZeroFlag/test.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(git rev-parse --show-toplevel)"
+STAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+cargo run --quiet --manifest-path "$ROOT_DIR/src-tauri/Cargo.toml" --bin stage_runner -- \
+  --level-id "07_ZeroFlag" \
+  --asm "$STAGE_DIR/collect.asm"
+
diff --git a/stages/1.The-Accumulator/Phase2-Flags&Jumps/08_SignFlag.md b/stages/1.The-Accumulator/Phase2-Flags&Jumps/08_SignFlag.md
deleted file mode 100644
index 8f5141a..0000000
--- a/stages/1.The-Accumulator/Phase2-Flags&Jumps/08_SignFlag.md
+++ /dev/null
@@ -1,75 +0,0 @@
-グランドステージ: 1.The Accumulator
-
-フェーズ: Phase 2 - Flags & Jumps
-
-ステージ名: Sign Flag
-
-ステージ内容: 入力を読み、最初の文字が負（0x80以上）かどうかで処理を分岐
-
-学習ポイント: SFフラグ、条件付きジャンプ（js/jns）、符号判定
-
-ユーザーに初期状態で表示するコード
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: Sign Flag
-    ; read from stdin, check if first byte is negative, write result
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
-
-正解コード(あくまでも模範解答。ユーザーが出したコードが動けば正解とする)
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: Sign Flag
-    ; read from stdin, check if first byte is negative, write result
-
-    ; read(0, buf, 16)
-    mov rax, 0          ; syscall: read
-    mov rdi, 0          ; stdin
-    mov rsi, buf        ; buffer
-    mov rdx, 16         ; size
-    syscall
-
-    ; check if first byte is negative
-    mov al, byte [buf]
-    test al, al         ; sets SF based on MSB
-    js .is_negative
-    
-    ; positive
-    mov byte [buf], '+'
-    mov rdx, 1
-    jmp .write_result
-
-.is_negative:
-    mov byte [buf], '-'
-    mov rdx, 1
-
-.write_result:
-    ; write(1, buf, rdx)
-    mov rax, 1          ; syscall: write
-    mov rdi, 1          ; stdout
-    mov rsi, buf
-    syscall
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
diff --git a/stages/1.The-Accumulator/Phase2-Flags&Jumps/08_SignFlag/08_SignFlag.md b/stages/1.The-Accumulator/Phase2-Flags&Jumps/08_SignFlag/08_SignFlag.md
new file mode 100644
index 0000000..62861cf
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase2-Flags&Jumps/08_SignFlag/08_SignFlag.md
@@ -0,0 +1,10 @@
+グランドステージ: 1.The Accumulator
+
+フェーズ: Phase 2 - Flags & Jumps
+
+ステージ名: Sign Flag
+
+ステージ内容: 入力の先頭バイトが負（0x80以上）かで分岐し、'+' か '-' を出力する
+
+学習ポイント: SF、条件分岐（js/jns）、符号判定
+
diff --git a/stages/1.The-Accumulator/Phase2-Flags&Jumps/08_SignFlag/collect.asm b/stages/1.The-Accumulator/Phase2-Flags&Jumps/08_SignFlag/collect.asm
new file mode 100644
index 0000000..bafa6b5
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase2-Flags&Jumps/08_SignFlag/collect.asm
@@ -0,0 +1,42 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: Sign Flag
+    ; read from stdin, check if first byte is negative, write result
+
+    ; read(0, buf, 16)
+    mov rax, 0          ; syscall: read
+    mov rdi, 0          ; stdin
+    mov rsi, buf        ; buffer
+    mov rdx, 16         ; size
+    syscall
+
+    ; check if first byte is negative
+    mov al, byte [buf]
+    test al, al         ; sets SF based on MSB
+    js .is_negative
+
+    ; non-negative
+    mov byte [buf], '+'
+    jmp .write_result
+
+.is_negative:
+    mov byte [buf], '-'
+
+.write_result:
+    ; write(1, buf, 1)
+    mov rdx, 1
+    mov rax, 1          ; syscall: write
+    mov rdi, 1          ; stdout
+    mov rsi, buf
+    syscall
+
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/1.The-Accumulator/Phase2-Flags&Jumps/08_SignFlag/ini.asm b/stages/1.The-Accumulator/Phase2-Flags&Jumps/08_SignFlag/ini.asm
new file mode 100644
index 0000000..8857c2e
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase2-Flags&Jumps/08_SignFlag/ini.asm
@@ -0,0 +1,15 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: Sign Flag
+    ; read from stdin, check if first byte is negative, write result
+    
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/1.The-Accumulator/Phase2-Flags&Jumps/08_SignFlag/test.sh b/stages/1.The-Accumulator/Phase2-Flags&Jumps/08_SignFlag/test.sh
new file mode 100644
index 0000000..93d46af
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase2-Flags&Jumps/08_SignFlag/test.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(git rev-parse --show-toplevel)"
+STAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+cargo run --quiet --manifest-path "$ROOT_DIR/src-tauri/Cargo.toml" --bin stage_runner -- \
+  --level-id "08_SignFlag" \
+  --asm "$STAGE_DIR/collect.asm"
+
diff --git a/stages/1.The-Accumulator/Phase2-Flags&Jumps/09_Comparison/09_Comparison.md b/stages/1.The-Accumulator/Phase2-Flags&Jumps/09_Comparison/09_Comparison.md
new file mode 100644
index 0000000..676b0cf
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase2-Flags&Jumps/09_Comparison/09_Comparison.md
@@ -0,0 +1,10 @@
+グランドステージ: 1.The Accumulator
+
+フェーズ: Phase 2 - Flags & Jumps
+
+ステージ名: Comparison
+
+ステージ内容: 入力を読み、隣り合うバイトを比較して '+', '=', '-' を出力する（長さN-1）
+
+学習ポイント: cmp命令、条件分岐（je/jg/jl）
+
diff --git a/stages/1.The-Accumulator/Phase2-Flags&Jumps/09_Comparison/collect.asm b/stages/1.The-Accumulator/Phase2-Flags&Jumps/09_Comparison/collect.asm
new file mode 100644
index 0000000..646c667
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase2-Flags&Jumps/09_Comparison/collect.asm
@@ -0,0 +1,68 @@
+section .bss
+    buf resb 16
+    out resb 16
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: Comparison
+    ; read from stdin, compare consecutive bytes, output +/=/- markers
+
+    ; read(0, buf, 16)
+    mov rax, 0          ; syscall: read
+    mov rdi, 0          ; stdin
+    mov rsi, buf        ; buffer
+    mov rdx, 16         ; size
+    syscall
+
+    mov rcx, rax        ; number of bytes read
+    cmp rcx, 2
+    jl .write_empty
+
+    xor r8, r8          ; index = 0
+    mov al, byte [buf]  ; prev
+    xor r9, r9          ; out index = 0
+
+.loop:
+    inc r8
+    cmp r8, rcx
+    jge .done
+
+    mov bl, byte [buf + r8] ; cur
+    cmp bl, al
+    je .eq
+    jg .gt
+
+.lt:
+    mov byte [out + r9], '-'
+    jmp .next
+.eq:
+    mov byte [out + r9], '='
+    jmp .next
+.gt:
+    mov byte [out + r9], '+'
+
+.next:
+    mov al, bl
+    inc r9
+    jmp .loop
+
+.done:
+    ; write(1, out, r9)
+    mov rdx, r9
+    mov rax, 1
+    mov rdi, 1
+    mov rsi, out
+    syscall
+    jmp .exit
+
+.write_empty:
+    ; write nothing
+    jmp .exit
+
+.exit:
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/1.The-Accumulator/Phase2-Flags&Jumps/09_Comparison/ini.asm b/stages/1.The-Accumulator/Phase2-Flags&Jumps/09_Comparison/ini.asm
new file mode 100644
index 0000000..4207baf
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase2-Flags&Jumps/09_Comparison/ini.asm
@@ -0,0 +1,16 @@
+section .bss
+    buf resb 16
+    out resb 16
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: Comparison
+    ; read from stdin, compare consecutive bytes, output +/=/- markers
+    
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/1.The-Accumulator/Phase2-Flags&Jumps/09_Comparison/test.sh b/stages/1.The-Accumulator/Phase2-Flags&Jumps/09_Comparison/test.sh
new file mode 100644
index 0000000..64bd512
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase2-Flags&Jumps/09_Comparison/test.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(git rev-parse --show-toplevel)"
+STAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+cargo run --quiet --manifest-path "$ROOT_DIR/src-tauri/Cargo.toml" --bin stage_runner -- \
+  --level-id "09_Comparison" \
+  --asm "$STAGE_DIR/collect.asm"
+
diff --git a/stages/1.The-Accumulator/Phase2-Flags&Jumps/09_Conmparison.md b/stages/1.The-Accumulator/Phase2-Flags&Jumps/09_Conmparison.md
deleted file mode 100644
index 8b0b3bd..0000000
--- a/stages/1.The-Accumulator/Phase2-Flags&Jumps/09_Conmparison.md
+++ /dev/null
@@ -1,98 +0,0 @@
-グランドステージ: 1.The Accumulator
-
-フェーズ: Phase 2 - Flags & Jumps
-
-ステージ名: Comparison
-
-ステージ内容: 入力を読み、各文字を前の文字と比較して、増加/減少/同じ をマーク
-
-学習ポイント: cmp命令、複数の条件判定、比較フラグ
-
-ユーザーに初期状態で表示するコード
-
-```asm
-section .bss
-    buf resb 16
-    out resb 16
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: Comparison
-    ; read from stdin, compare consecutive bytes, output +/=/- markers
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
-
-正解コード(あくまでも模範解答。ユーザーが出したコードが動けば正解とする)
-
-```asm
-section .bss
-    buf resb 16
-    out resb 16
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: Comparison
-    ; read from stdin, compare consecutive bytes, output +/=/- markers
-
-    ; read(0, buf, 16)
-    mov rax, 0          ; syscall: read
-    mov rdi, 0          ; stdin
-    mov rsi, buf        ; buffer
-    mov rdx, 16         ; size
-    syscall
-
-    ; compare consecutive bytes
-    mov rcx, rax        ; number of bytes read
-    xor r8, r8          ; index = 0
-    mov al, byte [buf]  ; prev = first byte
-    xor r9, r9          ; output index = 0
-
-.loop:
-    cmp r8, rcx
-    jge .done_compare
-    inc r8
-    cmp r8, rcx
-    jge .done_compare
-    
-    mov bl, byte [buf + r8] ; current = buf[index]
-    cmp bl, al
-    je .is_equal
-    jg .is_greater
-    
-.is_less:
-    mov byte [out + r9], '-'
-    jmp .next_iter
-    
-.is_equal:
-    mov byte [out + r9], '='
-    jmp .next_iter
-    
-.is_greater:
-    mov byte [out + r9], '+'
-    
-.next_iter:
-    mov al, bl          ; prev = current
-    inc r9
-    jmp .loop
-
-.done_compare:
-    ; write(1, out, r9)
-    mov rdx, r9         ; number of bytes to write
-    mov rax, 1          ; syscall: write
-    mov rdi, 1          ; stdout
-    mov rsi, out
-    syscall
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
diff --git a/stages/1.The-Accumulator/Phase3-LoopStructures/10_Countdown.md b/stages/1.The-Accumulator/Phase3-LoopStructures/10_Countdown.md
deleted file mode 100644
index 69a6298..0000000
--- a/stages/1.The-Accumulator/Phase3-LoopStructures/10_Countdown.md
+++ /dev/null
@@ -1,79 +0,0 @@
-グランドステージ: 1.The Accumulator
-
-フェーズ: Phase 3 - Loop Structures
-
-ステージ名: Countdown
-
-ステージ内容: 入力で受け取った1文字（数字）からカウントダウンして出力
-
-学習ポイント: loop命令、rcxレジスタの活用、ループ制御
-
-ユーザーに初期状態で表示するコード
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: Countdown
-    ; read a digit, count down from it to 0
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
-
-正解コード(あくまでも模範解答。ユーザーが出したコードが動けば正解とする)
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: Countdown
-    ; read a digit, count down from it to 0
-
-    ; read(0, buf, 16)
-    mov rax, 0          ; syscall: read
-    mov rdi, 0          ; stdin
-    mov rsi, buf        ; buffer
-    mov rdx, 16         ; size
-    syscall
-
-    ; get the digit and convert to number
-    mov al, byte [buf]
-    sub al, '0'         ; convert ASCII to number
-    
-    ; setup for countdown
-    xor rcx, rcx
-    mov cl, al          ; rcx = number
-    xor rsi, rsi        ; buffer index = 0
-
-.loop:
-    ; write current number
-    mov al, cl
-    add al, '0'         ; convert back to ASCII
-    mov byte [buf + rsi], al
-    inc rsi
-    
-    loop .loop
-
-    ; write(1, buf, rsi)
-    mov rdx, rsi        ; number of bytes
-    mov rax, 1          ; syscall: write
-    mov rdi, 1          ; stdout
-    mov rsi, buf
-    syscall
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
diff --git a/stages/1.The-Accumulator/Phase3-LoopStructures/10_Countdown/10_Countdown.md b/stages/1.The-Accumulator/Phase3-LoopStructures/10_Countdown/10_Countdown.md
new file mode 100644
index 0000000..670d429
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase3-LoopStructures/10_Countdown/10_Countdown.md
@@ -0,0 +1,10 @@
+グランドステージ: 1.The Accumulator
+
+フェーズ: Phase 3 - Loop Structures
+
+ステージ名: Countdown
+
+ステージ内容: 入力で受け取った1文字（ASCII数字）から '0' までカウントダウンして出力する
+
+学習ポイント: loop命令、rcxレジスタ、カウンタ制御
+
diff --git a/stages/1.The-Accumulator/Phase3-LoopStructures/10_Countdown/collect.asm b/stages/1.The-Accumulator/Phase3-LoopStructures/10_Countdown/collect.asm
new file mode 100644
index 0000000..3d3f8ef
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase3-LoopStructures/10_Countdown/collect.asm
@@ -0,0 +1,49 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: Countdown
+    ; read a digit, count down from it to '0'
+
+    ; read(0, buf, 1)
+    mov rax, 0          ; syscall: read
+    mov rdi, 0          ; stdin
+    mov rsi, buf        ; buffer
+    mov rdx, 1          ; size
+    syscall
+
+    ; convert ASCII digit to number (0..9)
+    mov al, byte [buf]
+    sub al, '0'
+
+    ; rcx = n + 1 (to include 0)
+    xor rcx, rcx
+    mov cl, al
+    inc rcx
+
+    xor r8, r8          ; output index
+
+.loop:
+    ; current digit = (rcx - 1)
+    mov al, cl
+    dec al
+    add al, '0'
+    mov byte [buf + r8], al
+    inc r8
+    loop .loop
+
+    ; write(1, buf, r8)
+    mov rdx, r8
+    mov rax, 1
+    mov rdi, 1
+    mov rsi, buf
+    syscall
+
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/1.The-Accumulator/Phase3-LoopStructures/10_Countdown/ini.asm b/stages/1.The-Accumulator/Phase3-LoopStructures/10_Countdown/ini.asm
new file mode 100644
index 0000000..c323a05
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase3-LoopStructures/10_Countdown/ini.asm
@@ -0,0 +1,15 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: Countdown
+    ; read a digit, count down from it to '0'
+    
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/1.The-Accumulator/Phase3-LoopStructures/10_Countdown/test.sh b/stages/1.The-Accumulator/Phase3-LoopStructures/10_Countdown/test.sh
new file mode 100644
index 0000000..5f50a49
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase3-LoopStructures/10_Countdown/test.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(git rev-parse --show-toplevel)"
+STAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+cargo run --quiet --manifest-path "$ROOT_DIR/src-tauri/Cargo.toml" --bin stage_runner -- \
+  --level-id "10_Countdown" \
+  --asm "$STAGE_DIR/collect.asm"
+
diff --git a/stages/1.The-Accumulator/Phase3-LoopStructures/11_Accumulate3.md b/stages/1.The-Accumulator/Phase3-LoopStructures/11_Accumulate3.md
deleted file mode 100644
index b472464..0000000
--- a/stages/1.The-Accumulator/Phase3-LoopStructures/11_Accumulate3.md
+++ /dev/null
@@ -1,83 +0,0 @@
-グランドステージ: 1.The Accumulator
-
-フェーズ: Phase 3 - Loop Structures
-
-ステージ名: Accumulate 3
-
-ステージ内容: 入力を読み、最初の3文字の合計を出力
-
-学習ポイント: 累積ループ、複数の値の加算、ループ制御
-
-ユーザーに初期状態で表示するコード
-
-```asm
-section .bss
-    buf resb 16
-    out resb 16
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: Accumulate 3
-    ; read input, sum the first 3 bytes, write result
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
-
-正解コード(あくまでも模範解答。ユーザーが出したコードが動けば正解とする)
-
-```asm
-section .bss
-    buf resb 16
-    out resb 16
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: Accumulate 3
-    ; read input, sum the first 3 bytes, write result
-
-    ; read(0, buf, 16)
-    mov rax, 0          ; syscall: read
-    mov rdi, 0          ; stdin
-    mov rsi, buf        ; buffer
-    mov rdx, 16         ; size
-    syscall
-
-    ; accumulate first 3 bytes
-    xor rax, rax        ; sum = 0
-    xor rcx, rcx        ; index = 0
-    
-.loop:
-    cmp rcx, 3
-    jge .done_accumulate
-    
-    mov bl, byte [buf + rcx]
-    movzx rbx, bl       ; zero-extend to 64-bit
-    add rax, rbx
-    inc rcx
-    jmp .loop
-
-.done_accumulate:
-    ; convert sum to decimal string
-    ; for simplicity, assume single digit result
-    add al, '0'
-    mov byte [out], al
-    mov rdx, 1
-
-    ; write(1, out, rdx)
-    mov rax, 1          ; syscall: write
-    mov rdi, 1          ; stdout
-    mov rsi, out
-    syscall
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
diff --git a/stages/1.The-Accumulator/Phase3-LoopStructures/11_Accumulate3/11_Accumulate3.md b/stages/1.The-Accumulator/Phase3-LoopStructures/11_Accumulate3/11_Accumulate3.md
new file mode 100644
index 0000000..a68dd77
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase3-LoopStructures/11_Accumulate3/11_Accumulate3.md
@@ -0,0 +1,10 @@
+グランドステージ: 1.The Accumulator
+
+フェーズ: Phase 3 - Loop Structures
+
+ステージ名: Accumulate 3
+
+ステージ内容: 入力を読み、最初の3バイトの合計を1バイトとして出力する
+
+学習ポイント: 累積、ループ、バイト加算
+
diff --git a/stages/1.The-Accumulator/Phase3-LoopStructures/11_Accumulate3/collect.asm b/stages/1.The-Accumulator/Phase3-LoopStructures/11_Accumulate3/collect.asm
new file mode 100644
index 0000000..fd268af
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase3-LoopStructures/11_Accumulate3/collect.asm
@@ -0,0 +1,38 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: Accumulate 3
+    ; read input, sum the first 3 bytes (u8), write 1 byte result
+
+    ; read(0, buf, 16)
+    mov rax, 0
+    mov rdi, 0
+    mov rsi, buf
+    mov rdx, 16
+    syscall
+
+    ; sum buf[0] + buf[1] + buf[2] into AL (wrapping u8)
+    xor eax, eax
+    mov al, byte [buf + 0]
+    mov bl, byte [buf + 1]
+    add al, bl
+    mov bl, byte [buf + 2]
+    add al, bl
+    mov byte [buf], al
+
+    ; write(1, buf, 1)
+    mov rdx, 1
+    mov rax, 1
+    mov rdi, 1
+    mov rsi, buf
+    syscall
+
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/1.The-Accumulator/Phase3-LoopStructures/11_Accumulate3/ini.asm b/stages/1.The-Accumulator/Phase3-LoopStructures/11_Accumulate3/ini.asm
new file mode 100644
index 0000000..c8d12c8
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase3-LoopStructures/11_Accumulate3/ini.asm
@@ -0,0 +1,15 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: Accumulate 3
+    ; read input, sum the first 3 bytes, write 1 byte result
+    
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/1.The-Accumulator/Phase3-LoopStructures/11_Accumulate3/test.sh b/stages/1.The-Accumulator/Phase3-LoopStructures/11_Accumulate3/test.sh
new file mode 100644
index 0000000..0f959ba
--- /dev/null
+++ b/stages/1.The-Accumulator/Phase3-LoopStructures/11_Accumulate3/test.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(git rev-parse --show-toplevel)"
+STAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+cargo run --quiet --manifest-path "$ROOT_DIR/src-tauri/Cargo.toml" --bin stage_runner -- \
+  --level-id "11_Accumulate3" \
+  --asm "$STAGE_DIR/collect.asm"
+

From 22ef60226ddc3e2fe9c2eab6fa856606891ccd8b Mon Sep 17 00:00:00 2001
From: saku0512 <saku0512sec@gmail.com>
Date: Sat, 24 Jan 2026 23:04:46 +0900
Subject: [PATCH 5/5] feat: add new levels and update stage structure for Grand
 Stage 02: The Stack

---
 src-tauri/src/levels.rs                       |  87 ++++++++++++++
 src-tauri/src/lib.rs                          |  15 +++
 src-tauri/src/x86_runtime.rs                  |  46 +++++++-
 .../24_TheStackMachine/24_TheStackMachine.md  |  19 ++++
 .../BOSS/24_TheStackMachine/collect.asm       |  64 +++++++++++
 .../BOSS/24_TheStackMachine/ini.asm           |  15 +++
 .../BOSS/24_TheStackMachine/test.sh           |  10 ++
 stages/2.The-Stack/BOSS/TheStackMachine.md    | 107 ------------------
 .../Phase1-StackBasics/13_Push&Pop.md         |  65 -----------
 .../13_Push&Pop/13_Push&Pop.md                |  10 ++
 .../13_Push&Pop/collect.asm                   |  33 ++++++
 .../Phase1-StackBasics/13_Push&Pop/ini.asm    |  15 +++
 .../Phase1-StackBasics/13_Push&Pop/test.sh    |  10 ++
 .../Phase1-StackBasics/14_SwapTwo.md          |  67 -----------
 .../14_SwapTwo/14_SwapTwo.md                  |  10 ++
 .../Phase1-StackBasics/14_SwapTwo/collect.asm |  35 ++++++
 .../Phase1-StackBasics/14_SwapTwo/ini.asm     |  15 +++
 .../Phase1-StackBasics/14_SwapTwo/test.sh     |  10 ++
 .../Phase1-StackBasics/15_Duplicate.md        |  60 ----------
 .../15_Duplicate/15_Duplicate.md              |  10 ++
 .../15_Duplicate/collect.asm                  |  28 +++++
 .../Phase1-StackBasics/15_Duplicate/ini.asm   |  15 +++
 .../Phase1-StackBasics/15_Duplicate/test.sh   |  10 ++
 .../Phase2-StackAsBuffer/16_Reverse3.md       |  68 -----------
 .../16_Reverse3/16_Reverse3.md                |  10 ++
 .../16_Reverse3/collect.asm                   |  36 ++++++
 .../Phase2-StackAsBuffer/16_Reverse3/ini.asm  |  15 +++
 .../Phase2-StackAsBuffer/16_Reverse3/test.sh  |  10 ++
 .../Phase2-StackAsBuffer/17_ReverseUntil0.md  |  78 -------------
 .../17_ReverseUntil0/17_ReverseUntil0.md      |  10 ++
 .../17_ReverseUntil0/collect.asm              |  45 ++++++++
 .../17_ReverseUntil0/ini.asm                  |  16 +++
 .../17_ReverseUntil0/test.sh                  |  10 ++
 .../Phase2-StackAsBuffer/18_SumFromStack.md   |  78 -------------
 .../18_SumFromStack/18_SumFromStack.md        |  10 ++
 .../18_SumFromStack/collect.asm               |  45 ++++++++
 .../18_SumFromStack/ini.asm                   |  16 +++
 .../18_SumFromStack/test.sh                   |  10 ++
 .../Phase3-StackAlgorithms/19_SafePop.md      |  94 ---------------
 .../19_SafePop/19_SafePop.md                  |  16 +++
 .../19_SafePop/collect.asm                    |  53 +++++++++
 .../Phase3-StackAlgorithms/19_SafePop/ini.asm |  16 +++
 .../Phase3-StackAlgorithms/19_SafePop/test.sh |  10 ++
 .../Phase3-StackAlgorithms/20_RPN_AddOnly.md  |  83 --------------
 .../20_RPN_AddOnly/20_RPN_AddOnly.md          |  16 +++
 .../20_RPN_AddOnly/collect.asm                |  43 +++++++
 .../20_RPN_AddOnly/ini.asm                    |  15 +++
 .../20_RPN_AddOnly/test.sh                    |  10 ++
 .../Phase3-StackAlgorithms/21_Sort3.md        |  93 ---------------
 .../21_Sort3/21_Sort3.md                      |  11 ++
 .../21_Sort3/collect.asm                      |  58 ++++++++++
 .../Phase3-StackAlgorithms/21_Sort3/ini.asm   |  15 +++
 .../Phase3-StackAlgorithms/21_Sort3/test.sh   |  10 ++
 .../Phase3-StackAlgorithms/22_Rotate3.md      |  76 -------------
 .../22_Rotate3/22_Rotate3.md                  |  11 ++
 .../22_Rotate3/collect.asm                    |  41 +++++++
 .../Phase3-StackAlgorithms/22_Rotate3/ini.asm |  15 +++
 .../Phase3-StackAlgorithms/22_Rotate3/test.sh |  10 ++
 .../23_MinMaxFromStack/23_MinMaxFromStack.md  |  15 +++
 .../collect.asm}                              |  41 +------
 .../23_MinMaxFromStack/ini.asm                |  15 +++
 .../23_MinMaxFromStack/test.sh                |  10 ++
 62 files changed, 1080 insertions(+), 910 deletions(-)
 create mode 100644 stages/2.The-Stack/BOSS/24_TheStackMachine/24_TheStackMachine.md
 create mode 100644 stages/2.The-Stack/BOSS/24_TheStackMachine/collect.asm
 create mode 100644 stages/2.The-Stack/BOSS/24_TheStackMachine/ini.asm
 create mode 100644 stages/2.The-Stack/BOSS/24_TheStackMachine/test.sh
 delete mode 100644 stages/2.The-Stack/BOSS/TheStackMachine.md
 delete mode 100644 stages/2.The-Stack/Phase1-StackBasics/13_Push&Pop.md
 create mode 100644 stages/2.The-Stack/Phase1-StackBasics/13_Push&Pop/13_Push&Pop.md
 create mode 100644 stages/2.The-Stack/Phase1-StackBasics/13_Push&Pop/collect.asm
 create mode 100644 stages/2.The-Stack/Phase1-StackBasics/13_Push&Pop/ini.asm
 create mode 100644 stages/2.The-Stack/Phase1-StackBasics/13_Push&Pop/test.sh
 delete mode 100644 stages/2.The-Stack/Phase1-StackBasics/14_SwapTwo.md
 create mode 100644 stages/2.The-Stack/Phase1-StackBasics/14_SwapTwo/14_SwapTwo.md
 create mode 100644 stages/2.The-Stack/Phase1-StackBasics/14_SwapTwo/collect.asm
 create mode 100644 stages/2.The-Stack/Phase1-StackBasics/14_SwapTwo/ini.asm
 create mode 100644 stages/2.The-Stack/Phase1-StackBasics/14_SwapTwo/test.sh
 delete mode 100644 stages/2.The-Stack/Phase1-StackBasics/15_Duplicate.md
 create mode 100644 stages/2.The-Stack/Phase1-StackBasics/15_Duplicate/15_Duplicate.md
 create mode 100644 stages/2.The-Stack/Phase1-StackBasics/15_Duplicate/collect.asm
 create mode 100644 stages/2.The-Stack/Phase1-StackBasics/15_Duplicate/ini.asm
 create mode 100644 stages/2.The-Stack/Phase1-StackBasics/15_Duplicate/test.sh
 delete mode 100644 stages/2.The-Stack/Phase2-StackAsBuffer/16_Reverse3.md
 create mode 100644 stages/2.The-Stack/Phase2-StackAsBuffer/16_Reverse3/16_Reverse3.md
 create mode 100644 stages/2.The-Stack/Phase2-StackAsBuffer/16_Reverse3/collect.asm
 create mode 100644 stages/2.The-Stack/Phase2-StackAsBuffer/16_Reverse3/ini.asm
 create mode 100644 stages/2.The-Stack/Phase2-StackAsBuffer/16_Reverse3/test.sh
 delete mode 100644 stages/2.The-Stack/Phase2-StackAsBuffer/17_ReverseUntil0.md
 create mode 100644 stages/2.The-Stack/Phase2-StackAsBuffer/17_ReverseUntil0/17_ReverseUntil0.md
 create mode 100644 stages/2.The-Stack/Phase2-StackAsBuffer/17_ReverseUntil0/collect.asm
 create mode 100644 stages/2.The-Stack/Phase2-StackAsBuffer/17_ReverseUntil0/ini.asm
 create mode 100644 stages/2.The-Stack/Phase2-StackAsBuffer/17_ReverseUntil0/test.sh
 delete mode 100644 stages/2.The-Stack/Phase2-StackAsBuffer/18_SumFromStack.md
 create mode 100644 stages/2.The-Stack/Phase2-StackAsBuffer/18_SumFromStack/18_SumFromStack.md
 create mode 100644 stages/2.The-Stack/Phase2-StackAsBuffer/18_SumFromStack/collect.asm
 create mode 100644 stages/2.The-Stack/Phase2-StackAsBuffer/18_SumFromStack/ini.asm
 create mode 100644 stages/2.The-Stack/Phase2-StackAsBuffer/18_SumFromStack/test.sh
 delete mode 100644 stages/2.The-Stack/Phase3-StackAlgorithms/19_SafePop.md
 create mode 100644 stages/2.The-Stack/Phase3-StackAlgorithms/19_SafePop/19_SafePop.md
 create mode 100644 stages/2.The-Stack/Phase3-StackAlgorithms/19_SafePop/collect.asm
 create mode 100644 stages/2.The-Stack/Phase3-StackAlgorithms/19_SafePop/ini.asm
 create mode 100644 stages/2.The-Stack/Phase3-StackAlgorithms/19_SafePop/test.sh
 delete mode 100644 stages/2.The-Stack/Phase3-StackAlgorithms/20_RPN_AddOnly.md
 create mode 100644 stages/2.The-Stack/Phase3-StackAlgorithms/20_RPN_AddOnly/20_RPN_AddOnly.md
 create mode 100644 stages/2.The-Stack/Phase3-StackAlgorithms/20_RPN_AddOnly/collect.asm
 create mode 100644 stages/2.The-Stack/Phase3-StackAlgorithms/20_RPN_AddOnly/ini.asm
 create mode 100644 stages/2.The-Stack/Phase3-StackAlgorithms/20_RPN_AddOnly/test.sh
 delete mode 100644 stages/2.The-Stack/Phase3-StackAlgorithms/21_Sort3.md
 create mode 100644 stages/2.The-Stack/Phase3-StackAlgorithms/21_Sort3/21_Sort3.md
 create mode 100644 stages/2.The-Stack/Phase3-StackAlgorithms/21_Sort3/collect.asm
 create mode 100644 stages/2.The-Stack/Phase3-StackAlgorithms/21_Sort3/ini.asm
 create mode 100644 stages/2.The-Stack/Phase3-StackAlgorithms/21_Sort3/test.sh
 delete mode 100644 stages/2.The-Stack/Phase3-StackAlgorithms/22_Rotate3.md
 create mode 100644 stages/2.The-Stack/Phase3-StackAlgorithms/22_Rotate3/22_Rotate3.md
 create mode 100644 stages/2.The-Stack/Phase3-StackAlgorithms/22_Rotate3/collect.asm
 create mode 100644 stages/2.The-Stack/Phase3-StackAlgorithms/22_Rotate3/ini.asm
 create mode 100644 stages/2.The-Stack/Phase3-StackAlgorithms/22_Rotate3/test.sh
 create mode 100644 stages/2.The-Stack/Phase3-StackAlgorithms/23_MinMaxFromStack/23_MinMaxFromStack.md
 rename stages/2.The-Stack/Phase3-StackAlgorithms/{23_MinMaxFromStack.md => 23_MinMaxFromStack/collect.asm} (50%)
 create mode 100644 stages/2.The-Stack/Phase3-StackAlgorithms/23_MinMaxFromStack/ini.asm
 create mode 100644 stages/2.The-Stack/Phase3-StackAlgorithms/23_MinMaxFromStack/test.sh

diff --git a/src-tauri/src/levels.rs b/src-tauri/src/levels.rs
index 5f9e34f..4d598d6 100644
--- a/src-tauri/src/levels.rs
+++ b/src-tauri/src/levels.rs
@@ -141,6 +141,93 @@ pub fn get_levels() -> Vec<Level> {
                 (vec![('B' as i64), ('0' as i64)], vec![('b' as i64), ('1' as i64)]),
             ],
         },
+        // GRAND STAGE 02: The Stack
+        Level {
+            id: "13_Push&Pop".to_string(),
+            name: "Push & Pop".to_string(),
+            description: "Read A, push/pop it, then output A (1 byte).".to_string(),
+            test_cases: vec![(vec![42], vec![42]), (vec![-1], vec![-1]), (vec![0], vec![0])],
+        },
+        Level {
+            id: "14_SwapTwo".to_string(),
+            name: "Swap Two".to_string(),
+            description: "Read A,B and output B,A (2 bytes).".to_string(),
+            test_cases: vec![
+                (vec![1, 2], vec![2, 1]),
+                (vec![5, -1], vec![-1, 5]),
+            ],
+        },
+        Level {
+            id: "15_Duplicate".to_string(),
+            name: "Duplicate".to_string(),
+            description: "Read A and output A,A (2 bytes).".to_string(),
+            test_cases: vec![(vec![7], vec![7, 7]), (vec![-1], vec![-1, -1])],
+        },
+        Level {
+            id: "16_Reverse3".to_string(),
+            name: "Reverse 3".to_string(),
+            description: "Read A,B,C and output C,B,A (3 bytes).".to_string(),
+            test_cases: vec![(vec![1, 2, 3], vec![3, 2, 1]), (vec![-1, 0, 1], vec![1, 0, -1])],
+        },
+        Level {
+            id: "17_ReverseUntil0".to_string(),
+            name: "Reverse Until 0".to_string(),
+            description: "Read values until 0, output them reversed (0 not included).".to_string(),
+            test_cases: vec![
+                (vec![1, 2, 3, 0], vec![3, 2, 1]),
+                (vec![-1, 0], vec![-1]),
+                (vec![0], vec![]),
+            ],
+        },
+        Level {
+            id: "18_SumFromStack".to_string(),
+            name: "Sum From Stack".to_string(),
+            description: "Read values until 0, sum them, output 1 byte result.".to_string(),
+            test_cases: vec![(vec![1, 2, 3, 0], vec![6]), (vec![10, 20, 0], vec![30]), (vec![-1, 1, 0], vec![0])],
+        },
+        Level {
+            id: "19_SafePop".to_string(),
+            name: "Safe Pop".to_string(),
+            description: "Process tokens (push/pop) without underflow; output final depth.".to_string(),
+            test_cases: vec![
+                (vec![1, 5, 1, 6, -1, 0], vec![1]),
+                (vec![-1, 0], vec![0]),
+                (vec![1, 1, -1, -1, 0], vec![0]),
+            ],
+        },
+        Level {
+            id: "20_RPN_AddOnly".to_string(),
+            name: "RPN (Add Only)".to_string(),
+            description: "RPN evaluation: numbers push, -1 add, 0 end; output top.".to_string(),
+            test_cases: vec![(vec![2, 3, -1, 0], vec![5]), (vec![5, 1, -1, 0], vec![6])],
+        },
+        Level {
+            id: "21_Sort3".to_string(),
+            name: "Sort 3".to_string(),
+            description: "Read 3 values and output them sorted ascending (3 bytes).".to_string(),
+            test_cases: vec![(vec![3, 1, 2], vec![1, 2, 3]), (vec![-1, 0, 1], vec![-1, 0, 1])],
+        },
+        Level {
+            id: "22_Rotate3".to_string(),
+            name: "Rotate 3".to_string(),
+            description: "Read A,B,C and output B,C,A (3 bytes).".to_string(),
+            test_cases: vec![(vec![1, 2, 3], vec![2, 3, 1]), (vec![-1, 5, 0], vec![5, 0, -1])],
+        },
+        Level {
+            id: "23_MinMaxFromStack".to_string(),
+            name: "Min & Max From Stack".to_string(),
+            description: "Read values until 0; output min then max (2 bytes).".to_string(),
+            test_cases: vec![(vec![3, 1, 2, 0], vec![1, 3]), (vec![-1, -5, 2, 0], vec![-5, 2])],
+        },
+        Level {
+            id: "24_TheStackMachine".to_string(),
+            name: "The Stack Machine (BOSS)".to_string(),
+            description: "Token machine: +push, -1 add, -2 sub, -3 xor, 0 end; output top.".to_string(),
+            test_cases: vec![
+                (vec![5, 3, -2, 0], vec![2]),
+                (vec![1, 2, -1, 3, -3, 0], vec![0]),
+            ],
+        },
     ]
 }
 
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index b8c9a37..482a9fe 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -34,6 +34,21 @@ fn level_dir_for_id(level_id: &str) -> Option<&'static str> {
         "10_Countdown" => Some("stages/1.The-Accumulator/Phase3-LoopStructures/10_Countdown"),
         "11_Accumulate3" => Some("stages/1.The-Accumulator/Phase3-LoopStructures/11_Accumulate3"),
         "12_TheAccumulator" => Some("stages/1.The-Accumulator/BOSS/12_TheAccumulator"),
+        // GRAND STAGE 02: The Stack
+        "13_Push&Pop" => Some("stages/2.The-Stack/Phase1-StackBasics/13_Push&Pop"),
+        "14_SwapTwo" => Some("stages/2.The-Stack/Phase1-StackBasics/14_SwapTwo"),
+        "15_Duplicate" => Some("stages/2.The-Stack/Phase1-StackBasics/15_Duplicate"),
+        "16_Reverse3" => Some("stages/2.The-Stack/Phase2-StackAsBuffer/16_Reverse3"),
+        "17_ReverseUntil0" => Some("stages/2.The-Stack/Phase2-StackAsBuffer/17_ReverseUntil0"),
+        "18_SumFromStack" => Some("stages/2.The-Stack/Phase2-StackAsBuffer/18_SumFromStack"),
+        "19_SafePop" => Some("stages/2.The-Stack/Phase3-StackAlgorithms/19_SafePop"),
+        "20_RPN_AddOnly" => Some("stages/2.The-Stack/Phase3-StackAlgorithms/20_RPN_AddOnly"),
+        "21_Sort3" => Some("stages/2.The-Stack/Phase3-StackAlgorithms/21_Sort3"),
+        "22_Rotate3" => Some("stages/2.The-Stack/Phase3-StackAlgorithms/22_Rotate3"),
+        "23_MinMaxFromStack" => {
+            Some("stages/2.The-Stack/Phase3-StackAlgorithms/23_MinMaxFromStack")
+        }
+        "24_TheStackMachine" => Some("stages/2.The-Stack/BOSS/24_TheStackMachine"),
         _ => None,
     }
 }
diff --git a/src-tauri/src/x86_runtime.rs b/src-tauri/src/x86_runtime.rs
index b4e9afd..c6a4c7c 100644
--- a/src-tauri/src/x86_runtime.rs
+++ b/src-tauri/src/x86_runtime.rs
@@ -159,9 +159,44 @@ fn preprocess_text(code: &str, syntax: &Syntax, bss_labels: &HashMap<String, u64
 
         let line = normalize_decimal_literals(line);
 
+        // Pseudo-IO: support tutorial `in <reg>` by rewriting it into a custom syscall.
+        // This keeps tutorial content readable while still using Keystone+Unicorn.
+        //
+        // `in rax`  -> `mov rax, 0x3e8; syscall`
+        // `in rbx`  -> `mov rax, 0x3e8; syscall; mov rbx, rax`
+        let lower = line.trim_start().to_lowercase();
+        if lower.starts_with("in ") {
+            let dst_raw = line.trim_start()[2..].trim();
+            let dst = dst_raw.trim_start_matches('%').to_lowercase();
+            match syntax {
+                Syntax::Intel => {
+                    if dst == "rax" {
+                        out.push_str("mov rax, 0x3e8\nsyscall\n");
+                    } else {
+                        // Preserve RAX across pseudo-IN, because some stages use `in rbx`/`in rcx`
+                        // after having loaded a meaningful value into RAX.
+                        out.push_str("push rax\n");
+                        out.push_str("mov rax, 0x3e8\nsyscall\n");
+                        out.push_str(&format!("mov {}, rax\n", dst));
+                        out.push_str("pop rax\n");
+                    }
+                }
+                Syntax::Att => {
+                    if dst == "rax" {
+                        out.push_str("movq $0x3e8, %rax\nsyscall\n");
+                    } else {
+                        out.push_str("pushq %rax\n");
+                        out.push_str("movq $0x3e8, %rax\nsyscall\n");
+                        out.push_str(&format!("movq %rax, %{}\n", dst));
+                        out.push_str("popq %rax\n");
+                    }
+                }
+            }
+            continue;
+        }
+
         // Keystone label fixups do not handle `loop <label>` well when we rewrite labels
         // into absolute immediates. Rewrite it into `dec rcx; jnz <label>`.
-        let lower = line.trim_start().to_lowercase();
         if lower.starts_with("loop ") {
             let target = line.trim_start()[4..].trim();
             match syntax {
@@ -524,6 +559,15 @@ pub fn run_x86_64(
                 uc.get_data_mut().exited = true;
                 let _ = uc.emu_stop();
             }
+            1000 => {
+                // pseudo-IN: pop next i64 from input queue into RAX
+                if let Some(v) = uc.get_data_mut().input.pop_front() {
+                    let _ = uc.reg_write(RegisterX86::RAX, v as u64);
+                } else {
+                    uc.get_data_mut().error = Some("Input buffer empty".to_string());
+                    let _ = uc.emu_stop();
+                }
+            }
             other => {
                 uc.get_data_mut().error = Some(format!("Unknown syscall: {}", other));
                 let _ = uc.emu_stop();
diff --git a/stages/2.The-Stack/BOSS/24_TheStackMachine/24_TheStackMachine.md b/stages/2.The-Stack/BOSS/24_TheStackMachine/24_TheStackMachine.md
new file mode 100644
index 0000000..d67e655
--- /dev/null
+++ b/stages/2.The-Stack/BOSS/24_TheStackMachine/24_TheStackMachine.md
@@ -0,0 +1,19 @@
+グランドステージ: 2.The Stack
+
+フェーズ: BOSS Stage
+
+ステージ名: The Stack Machine
+
+ステージ内容: スタックを使ってトークン列を評価する簡易RPN計算機を作る（総合問題）
+
+入力仕様:
+- 0: 終了
+- 正の値: push
+- 負の値: 命令
+  - -1: ADD（a + b）
+  - -2: SUB（a - b） ※順序注意（先にpopした方が b）
+  - -3: XOR（a ^ b）
+
+出力仕様:
+- 終了時点のスタックtopを sys_write で出力する
+
diff --git a/stages/2.The-Stack/BOSS/24_TheStackMachine/collect.asm b/stages/2.The-Stack/BOSS/24_TheStackMachine/collect.asm
new file mode 100644
index 0000000..16c31e9
--- /dev/null
+++ b/stages/2.The-Stack/BOSS/24_TheStackMachine/collect.asm
@@ -0,0 +1,64 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+.loop:
+    in rax
+    cmp rax, 0
+    jz .done
+    js .op
+
+    ; positive -> push
+    push rax
+    jmp .loop
+
+.op:
+    cmp rax, -1
+    jz .do_add
+    cmp rax, -2
+    jz .do_sub
+    cmp rax, -3
+    jz .do_xor
+    jmp .loop            ; unknown op -> ignore
+
+.do_add:
+    pop rbx              ; b
+    pop rcx              ; a
+    add rcx, rbx         ; a+b
+    push rcx
+    jmp .loop
+
+.do_sub:
+    pop rbx              ; b
+    pop rcx              ; a
+    sub rcx, rbx         ; a-b
+    push rcx
+    jmp .loop
+
+.do_xor:
+    pop rbx              ; b
+    pop rcx              ; a
+    xor rcx, rbx         ; a^b
+    push rcx
+    jmp .loop
+
+.done:
+    pop rax
+    
+    ; write(1, buf, 1)
+    mov rsi, buf
+    mov [rsi], rax
+    mov rax, 1
+    mov rdi, 1
+    mov rsi, buf
+    mov rdx, 1
+    syscall
+
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/2.The-Stack/BOSS/24_TheStackMachine/ini.asm b/stages/2.The-Stack/BOSS/24_TheStackMachine/ini.asm
new file mode 100644
index 0000000..07669e2
--- /dev/null
+++ b/stages/2.The-Stack/BOSS/24_TheStackMachine/ini.asm
@@ -0,0 +1,15 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: The Stack Machine (BOSS)
+    ; トークン列を評価し、最後の結果をsys_writeで出力する
+    
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/2.The-Stack/BOSS/24_TheStackMachine/test.sh b/stages/2.The-Stack/BOSS/24_TheStackMachine/test.sh
new file mode 100644
index 0000000..fdeb442
--- /dev/null
+++ b/stages/2.The-Stack/BOSS/24_TheStackMachine/test.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(git rev-parse --show-toplevel)"
+STAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+cargo run --quiet --manifest-path "$ROOT_DIR/src-tauri/Cargo.toml" --bin stage_runner -- \
+  --level-id "24_TheStackMachine" \
+  --asm "$STAGE_DIR/collect.asm"
+
diff --git a/stages/2.The-Stack/BOSS/TheStackMachine.md b/stages/2.The-Stack/BOSS/TheStackMachine.md
deleted file mode 100644
index 8f0c319..0000000
--- a/stages/2.The-Stack/BOSS/TheStackMachine.md
+++ /dev/null
@@ -1,107 +0,0 @@
-グランドステージ: 2.The Stack
-
-フェーズ: BOSS Stage
-
-ステージ名: The Stack Machine
-
-ステージ内容: スタックを使ってトークン列を評価する簡易RPN計算機を作る（総合問題）
-
-学習ポイント: in, push/pop, cmp/test, 条件分岐, ループ, 演算の順序（SUB）, sys_write
-
-入力仕様:
-- 0: 終了
-- 正の値: push
-- 負の値: 命令
-  - -1: ADD（a + b）
-  - -2: SUB（a - b） ※順序注意（先にpopした方が b）
-  - -3: XOR（a ^ b）
-
-出力仕様:
-- 終了時点のスタックtopを sys_write で出力する
-
-ユーザーに初期状態で表示するコード
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: The Stack Machine (BOSS)
-    ; トークン列を評価し、最後の結果をsys_writeで出力する
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
-
-正解コード(あくまでも模範解答。ユーザーが出したコードが動けば正解とする)
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-.loop:
-    in rax
-    cmp rax, 0
-    jz .done
-    js .op
-
-    ; positive -> push
-    push rax
-    jmp .loop
-
-.op:
-    cmp rax, -1
-    jz .do_add
-    cmp rax, -2
-    jz .do_sub
-    cmp rax, -3
-    jz .do_xor
-    jmp .loop            ; unknown op -> ignore
-
-.do_add:
-    pop rbx              ; b
-    pop rcx              ; a
-    add rcx, rbx         ; a+b
-    push rcx
-    jmp .loop
-
-.do_sub:
-    pop rbx              ; b
-    pop rcx              ; a
-    sub rcx, rbx         ; a-b
-    push rcx
-    jmp .loop
-
-.do_xor:
-    pop rbx              ; b
-    pop rcx              ; a
-    xor rcx, rbx         ; a^b
-    push rcx
-    jmp .loop
-
-.done:
-    pop rax
-    
-    ; write(1, buf, 1)
-    mov rsi, buf
-    mov [rsi], rax
-    mov rax, 1
-    mov rdi, 1
-    mov rsi, buf
-    mov rdx, 1
-    syscall
-
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
diff --git a/stages/2.The-Stack/Phase1-StackBasics/13_Push&Pop.md b/stages/2.The-Stack/Phase1-StackBasics/13_Push&Pop.md
deleted file mode 100644
index 1c991e5..0000000
--- a/stages/2.The-Stack/Phase1-StackBasics/13_Push&Pop.md
+++ /dev/null
@@ -1,65 +0,0 @@
-グランドステージ: 2.The Stack
-
-フェーズ: Phase 1 - Stack Basics
-
-ステージ名: Push & Pop
-
-ステージ内容: 入力を読み、スタックに退避してから復元し、その値をsys_writeで出力する
-
-学習ポイント: in, push, pop, sys_write, レジスタ退避
-
-ユーザーに初期状態で表示するコード
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: Push & Pop
-    ; INで値を1つ読み、pushで退避し、popで復元してsys_writeで出力する
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
-
-正解コード(あくまでも模範解答。ユーザーが出したコードが動けば正解とする)
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    ; read A
-    in rax
-
-    ; save A on stack
-    push rax
-
-    ; clobber register (prove we can restore)
-    xor rax, rax
-
-    ; restore A
-    pop rax
-    
-    ; write(1, buf, 1)
-    mov rsi, buf
-    mov [rsi], rax
-    mov rax, 1
-    mov rdi, 1
-    mov rsi, buf
-    mov rdx, 1
-    syscall
-
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
diff --git a/stages/2.The-Stack/Phase1-StackBasics/13_Push&Pop/13_Push&Pop.md b/stages/2.The-Stack/Phase1-StackBasics/13_Push&Pop/13_Push&Pop.md
new file mode 100644
index 0000000..ab19822
--- /dev/null
+++ b/stages/2.The-Stack/Phase1-StackBasics/13_Push&Pop/13_Push&Pop.md
@@ -0,0 +1,10 @@
+グランドステージ: 2.The Stack
+
+フェーズ: Phase 1 - Stack Basics
+
+ステージ名: Push & Pop
+
+ステージ内容: 入力を読み、スタックに退避してから復元し、その値をsys_writeで出力する
+
+学習ポイント: in（疑似命令）, push, pop, sys_write, レジスタ退避
+
diff --git a/stages/2.The-Stack/Phase1-StackBasics/13_Push&Pop/collect.asm b/stages/2.The-Stack/Phase1-StackBasics/13_Push&Pop/collect.asm
new file mode 100644
index 0000000..8c3cd87
--- /dev/null
+++ b/stages/2.The-Stack/Phase1-StackBasics/13_Push&Pop/collect.asm
@@ -0,0 +1,33 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; read A
+    in rax
+
+    ; save A on stack
+    push rax
+
+    ; clobber register (prove we can restore)
+    xor rax, rax
+
+    ; restore A
+    pop rax
+    
+    ; write(1, buf, 1)
+    mov rsi, buf
+    mov [rsi], rax
+    mov rax, 1
+    mov rdi, 1
+    mov rsi, buf
+    mov rdx, 1
+    syscall
+
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/2.The-Stack/Phase1-StackBasics/13_Push&Pop/ini.asm b/stages/2.The-Stack/Phase1-StackBasics/13_Push&Pop/ini.asm
new file mode 100644
index 0000000..4d98aba
--- /dev/null
+++ b/stages/2.The-Stack/Phase1-StackBasics/13_Push&Pop/ini.asm
@@ -0,0 +1,15 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: Push & Pop
+    ; INで値を1つ読み、pushで退避し、popで復元してsys_writeで出力する
+    
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/2.The-Stack/Phase1-StackBasics/13_Push&Pop/test.sh b/stages/2.The-Stack/Phase1-StackBasics/13_Push&Pop/test.sh
new file mode 100644
index 0000000..7dfc793
--- /dev/null
+++ b/stages/2.The-Stack/Phase1-StackBasics/13_Push&Pop/test.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(git rev-parse --show-toplevel)"
+STAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+cargo run --quiet --manifest-path "$ROOT_DIR/src-tauri/Cargo.toml" --bin stage_runner -- \
+  --level-id "13_Push&Pop" \
+  --asm "$STAGE_DIR/collect.asm"
+
diff --git a/stages/2.The-Stack/Phase1-StackBasics/14_SwapTwo.md b/stages/2.The-Stack/Phase1-StackBasics/14_SwapTwo.md
deleted file mode 100644
index ce4210d..0000000
--- a/stages/2.The-Stack/Phase1-StackBasics/14_SwapTwo.md
+++ /dev/null
@@ -1,67 +0,0 @@
-グランドステージ: 2.The Stack
-
-フェーズ: Phase 1 - Stack Basics
-
-ステージ名: Swap Two
-
-ステージ内容: 2つの入力(A, B)を読み、出力をB→Aの順にする（sys_write）
-
-学習ポイント: in, push, pop, sys_write, スタックを使った入れ替え
-
-ユーザーに初期状態で表示するコード
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: Swap Two
-    ; INで A, B を読み、sys_writeで B, A の順に出力する
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
-
-正解コード(あくまでも模範解答。ユーザーが出したコードが動けば正解とする)
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    ; read A
-    in rax
-    push rax
-
-    ; read B
-    in rax
-    push rax
-
-    ; output B then A
-    mov rsi, buf
-    pop rax
-    mov [rsi], rax
-    inc rsi
-    pop rax
-    mov [rsi], rax
-
-    ; write(1, buf, 2)
-    mov rax, 1
-    mov rdi, 1
-    mov rsi, buf
-    mov rdx, 2
-    syscall
-
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
diff --git a/stages/2.The-Stack/Phase1-StackBasics/14_SwapTwo/14_SwapTwo.md b/stages/2.The-Stack/Phase1-StackBasics/14_SwapTwo/14_SwapTwo.md
new file mode 100644
index 0000000..a4a72e1
--- /dev/null
+++ b/stages/2.The-Stack/Phase1-StackBasics/14_SwapTwo/14_SwapTwo.md
@@ -0,0 +1,10 @@
+グランドステージ: 2.The Stack
+
+フェーズ: Phase 1 - Stack Basics
+
+ステージ名: Swap Two
+
+ステージ内容: 2つの入力(A, B)を読み、出力をB→Aの順にする（sys_write）
+
+学習ポイント: in（疑似命令）, push, pop, sys_write, スタックを使った入れ替え
+
diff --git a/stages/2.The-Stack/Phase1-StackBasics/14_SwapTwo/collect.asm b/stages/2.The-Stack/Phase1-StackBasics/14_SwapTwo/collect.asm
new file mode 100644
index 0000000..6ff7034
--- /dev/null
+++ b/stages/2.The-Stack/Phase1-StackBasics/14_SwapTwo/collect.asm
@@ -0,0 +1,35 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; read A
+    in rax
+    push rax
+
+    ; read B
+    in rax
+    push rax
+
+    ; output B then A
+    mov rsi, buf
+    pop rax
+    mov [rsi], rax
+    inc rsi
+    pop rax
+    mov [rsi], rax
+
+    ; write(1, buf, 2)
+    mov rax, 1
+    mov rdi, 1
+    mov rsi, buf
+    mov rdx, 2
+    syscall
+
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/2.The-Stack/Phase1-StackBasics/14_SwapTwo/ini.asm b/stages/2.The-Stack/Phase1-StackBasics/14_SwapTwo/ini.asm
new file mode 100644
index 0000000..b87af31
--- /dev/null
+++ b/stages/2.The-Stack/Phase1-StackBasics/14_SwapTwo/ini.asm
@@ -0,0 +1,15 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: Swap Two
+    ; INで A, B を読み、sys_writeで B, A の順に出力する
+    
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/2.The-Stack/Phase1-StackBasics/14_SwapTwo/test.sh b/stages/2.The-Stack/Phase1-StackBasics/14_SwapTwo/test.sh
new file mode 100644
index 0000000..0247b50
--- /dev/null
+++ b/stages/2.The-Stack/Phase1-StackBasics/14_SwapTwo/test.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(git rev-parse --show-toplevel)"
+STAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+cargo run --quiet --manifest-path "$ROOT_DIR/src-tauri/Cargo.toml" --bin stage_runner -- \
+  --level-id "14_SwapTwo" \
+  --asm "$STAGE_DIR/collect.asm"
+
diff --git a/stages/2.The-Stack/Phase1-StackBasics/15_Duplicate.md b/stages/2.The-Stack/Phase1-StackBasics/15_Duplicate.md
deleted file mode 100644
index 70c174f..0000000
--- a/stages/2.The-Stack/Phase1-StackBasics/15_Duplicate.md
+++ /dev/null
@@ -1,60 +0,0 @@
-グランドステージ: 2.The Stack
-
-フェーズ: Phase 1 - Stack Basics
-
-ステージ名: Duplicate
-
-ステージ内容: 入力(A)を読み、同じ値を2回出力する（sys_write）
-
-学習ポイント: in, push, pop, sys_write, 退避して再利用する
-
-ユーザーに初期状態で表示するコード
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: Duplicate
-    ; INで A を読み、sys_writeで A, A を出力する
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
-
-正解コード(あくまでも模範解答。ユーザーが出したコードが動けば正解とする)
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    in rax
-    push rax
-
-    pop rbx
-    mov rsi, buf
-    mov [rsi], rbx
-    inc rsi
-    mov [rsi], rbx
-
-    ; write(1, buf, 2)
-    mov rax, 1
-    mov rdi, 1
-    mov rsi, buf
-    mov rdx, 2
-    syscall
-
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
diff --git a/stages/2.The-Stack/Phase1-StackBasics/15_Duplicate/15_Duplicate.md b/stages/2.The-Stack/Phase1-StackBasics/15_Duplicate/15_Duplicate.md
new file mode 100644
index 0000000..eedae8c
--- /dev/null
+++ b/stages/2.The-Stack/Phase1-StackBasics/15_Duplicate/15_Duplicate.md
@@ -0,0 +1,10 @@
+グランドステージ: 2.The Stack
+
+フェーズ: Phase 1 - Stack Basics
+
+ステージ名: Duplicate
+
+ステージ内容: 入力(A)を読み、同じ値を2回出力する（sys_write）
+
+学習ポイント: in（疑似命令）, push, pop, sys_write, 退避して再利用する
+
diff --git a/stages/2.The-Stack/Phase1-StackBasics/15_Duplicate/collect.asm b/stages/2.The-Stack/Phase1-StackBasics/15_Duplicate/collect.asm
new file mode 100644
index 0000000..b334b7a
--- /dev/null
+++ b/stages/2.The-Stack/Phase1-StackBasics/15_Duplicate/collect.asm
@@ -0,0 +1,28 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    in rax
+    push rax
+
+    pop rbx
+    mov rsi, buf
+    mov [rsi], rbx
+    inc rsi
+    mov [rsi], rbx
+
+    ; write(1, buf, 2)
+    mov rax, 1
+    mov rdi, 1
+    mov rsi, buf
+    mov rdx, 2
+    syscall
+
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/2.The-Stack/Phase1-StackBasics/15_Duplicate/ini.asm b/stages/2.The-Stack/Phase1-StackBasics/15_Duplicate/ini.asm
new file mode 100644
index 0000000..22166ac
--- /dev/null
+++ b/stages/2.The-Stack/Phase1-StackBasics/15_Duplicate/ini.asm
@@ -0,0 +1,15 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: Duplicate
+    ; INで A を読み、sys_writeで A, A を出力する
+    
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/2.The-Stack/Phase1-StackBasics/15_Duplicate/test.sh b/stages/2.The-Stack/Phase1-StackBasics/15_Duplicate/test.sh
new file mode 100644
index 0000000..170664f
--- /dev/null
+++ b/stages/2.The-Stack/Phase1-StackBasics/15_Duplicate/test.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(git rev-parse --show-toplevel)"
+STAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+cargo run --quiet --manifest-path "$ROOT_DIR/src-tauri/Cargo.toml" --bin stage_runner -- \
+  --level-id "15_Duplicate" \
+  --asm "$STAGE_DIR/collect.asm"
+
diff --git a/stages/2.The-Stack/Phase2-StackAsBuffer/16_Reverse3.md b/stages/2.The-Stack/Phase2-StackAsBuffer/16_Reverse3.md
deleted file mode 100644
index 5dce781..0000000
--- a/stages/2.The-Stack/Phase2-StackAsBuffer/16_Reverse3.md
+++ /dev/null
@@ -1,68 +0,0 @@
-グランドステージ: 2.The Stack
-
-フェーズ: Phase 2 - Stack as Buffer
-
-ステージ名: Reverse 3
-
-ステージ内容: 3つの入力(A, B, C)を読み、逆順(C, B, A)で出力する（sys_write）
-
-学習ポイント: push, pop, sys_write, LIFO（後入れ先出し）
-
-ユーザーに初期状態で表示するコード
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: Reverse 3
-    ; INで A, B, C を読み、sys_writeで C, B, A を出力する
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
-
-正解コード(あくまでも模範解答。ユーザーが出したコードが動けば正解とする)
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    in rax
-    push rax
-    in rax
-    push rax
-    in rax
-    push rax
-
-    mov rsi, buf
-    pop rax
-    mov [rsi], rax
-    inc rsi
-    pop rax
-    mov [rsi], rax
-    inc rsi
-    pop rax
-    mov [rsi], rax
-
-    ; write(1, buf, 3)
-    mov rax, 1
-    mov rdi, 1
-    mov rsi, buf
-    mov rdx, 3
-    syscall
-
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
diff --git a/stages/2.The-Stack/Phase2-StackAsBuffer/16_Reverse3/16_Reverse3.md b/stages/2.The-Stack/Phase2-StackAsBuffer/16_Reverse3/16_Reverse3.md
new file mode 100644
index 0000000..faca4c8
--- /dev/null
+++ b/stages/2.The-Stack/Phase2-StackAsBuffer/16_Reverse3/16_Reverse3.md
@@ -0,0 +1,10 @@
+グランドステージ: 2.The Stack
+
+フェーズ: Phase 2 - Stack as Buffer
+
+ステージ名: Reverse 3
+
+ステージ内容: 3つの入力(A, B, C)を読み、逆順(C, B, A)で出力する（sys_write）
+
+学習ポイント: push, pop, sys_write, LIFO（後入れ先出し）
+
diff --git a/stages/2.The-Stack/Phase2-StackAsBuffer/16_Reverse3/collect.asm b/stages/2.The-Stack/Phase2-StackAsBuffer/16_Reverse3/collect.asm
new file mode 100644
index 0000000..607f6cb
--- /dev/null
+++ b/stages/2.The-Stack/Phase2-StackAsBuffer/16_Reverse3/collect.asm
@@ -0,0 +1,36 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    in rax
+    push rax
+    in rax
+    push rax
+    in rax
+    push rax
+
+    mov rsi, buf
+    pop rax
+    mov [rsi], rax
+    inc rsi
+    pop rax
+    mov [rsi], rax
+    inc rsi
+    pop rax
+    mov [rsi], rax
+
+    ; write(1, buf, 3)
+    mov rax, 1
+    mov rdi, 1
+    mov rsi, buf
+    mov rdx, 3
+    syscall
+
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/2.The-Stack/Phase2-StackAsBuffer/16_Reverse3/ini.asm b/stages/2.The-Stack/Phase2-StackAsBuffer/16_Reverse3/ini.asm
new file mode 100644
index 0000000..5666bc9
--- /dev/null
+++ b/stages/2.The-Stack/Phase2-StackAsBuffer/16_Reverse3/ini.asm
@@ -0,0 +1,15 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: Reverse 3
+    ; INで A, B, C を読み、sys_writeで C, B, A を出力する
+    
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/2.The-Stack/Phase2-StackAsBuffer/16_Reverse3/test.sh b/stages/2.The-Stack/Phase2-StackAsBuffer/16_Reverse3/test.sh
new file mode 100644
index 0000000..1e6a0fd
--- /dev/null
+++ b/stages/2.The-Stack/Phase2-StackAsBuffer/16_Reverse3/test.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(git rev-parse --show-toplevel)"
+STAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+cargo run --quiet --manifest-path "$ROOT_DIR/src-tauri/Cargo.toml" --bin stage_runner -- \
+  --level-id "16_Reverse3" \
+  --asm "$STAGE_DIR/collect.asm"
+
diff --git a/stages/2.The-Stack/Phase2-StackAsBuffer/17_ReverseUntil0.md b/stages/2.The-Stack/Phase2-StackAsBuffer/17_ReverseUntil0.md
deleted file mode 100644
index 857be9d..0000000
--- a/stages/2.The-Stack/Phase2-StackAsBuffer/17_ReverseUntil0.md
+++ /dev/null
@@ -1,78 +0,0 @@
-グランドステージ: 2.The Stack
-
-フェーズ: Phase 2 - Stack as Buffer
-
-ステージ名: Reverse Until 0
-
-ステージ内容: 0が来るまで入力をpushし、最後に逆順で全て出力する（sys_write、0は出力しない）
-
-学習ポイント: in, push, pop, sys_write, ループ, カウンタ管理
-
-ユーザーに初期状態で表示するコード
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: Reverse Until 0
-    ; INで値を読み続け、0が来たら終了
-    ; それまでの値を逆順で sys_write する（0は出力しない）
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
-
-正解コード(あくまでも模範解答。ユーザーが出したコードが動けば正解とする)
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    xor rcx, rcx          ; count = 0
-
-.read_loop:
-    in rax
-    cmp rax, 0
-    jz .read_done
-
-    push rax
-    inc rcx
-    jmp .read_loop
-
-.read_done:
-    mov r9, rcx           ; save count
-    mov rsi, buf          ; output pointer
-
-.out_loop:
-    cmp rcx, 0
-    jz .do_write
-
-    pop rax
-    mov [rsi], rax
-    inc rsi
-    dec rcx
-    jmp .out_loop
-
-.do_write:
-    ; write(1, buf, count)
-    mov rax, 1
-    mov rdi, 1
-    mov rsi, buf
-    mov rdx, r9
-    syscall
-
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
diff --git a/stages/2.The-Stack/Phase2-StackAsBuffer/17_ReverseUntil0/17_ReverseUntil0.md b/stages/2.The-Stack/Phase2-StackAsBuffer/17_ReverseUntil0/17_ReverseUntil0.md
new file mode 100644
index 0000000..49d7b38
--- /dev/null
+++ b/stages/2.The-Stack/Phase2-StackAsBuffer/17_ReverseUntil0/17_ReverseUntil0.md
@@ -0,0 +1,10 @@
+グランドステージ: 2.The Stack
+
+フェーズ: Phase 2 - Stack as Buffer
+
+ステージ名: Reverse Until 0
+
+ステージ内容: 0が来るまで入力をpushし、最後に逆順で全て出力する（sys_write、0は出力しない）
+
+学習ポイント: in（疑似命令）, push, pop, sys_write, ループ, カウンタ管理
+
diff --git a/stages/2.The-Stack/Phase2-StackAsBuffer/17_ReverseUntil0/collect.asm b/stages/2.The-Stack/Phase2-StackAsBuffer/17_ReverseUntil0/collect.asm
new file mode 100644
index 0000000..bdd139a
--- /dev/null
+++ b/stages/2.The-Stack/Phase2-StackAsBuffer/17_ReverseUntil0/collect.asm
@@ -0,0 +1,45 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    xor rcx, rcx          ; count = 0
+
+.read_loop:
+    in rax
+    cmp rax, 0
+    jz .read_done
+
+    push rax
+    inc rcx
+    jmp .read_loop
+
+.read_done:
+    mov r9, rcx           ; save count
+    mov rsi, buf          ; output pointer
+
+.out_loop:
+    cmp rcx, 0
+    jz .do_write
+
+    pop rax
+    mov [rsi], rax
+    inc rsi
+    dec rcx
+    jmp .out_loop
+
+.do_write:
+    ; write(1, buf, count)
+    mov rax, 1
+    mov rdi, 1
+    mov rsi, buf
+    mov rdx, r9
+    syscall
+
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/2.The-Stack/Phase2-StackAsBuffer/17_ReverseUntil0/ini.asm b/stages/2.The-Stack/Phase2-StackAsBuffer/17_ReverseUntil0/ini.asm
new file mode 100644
index 0000000..479cfd4
--- /dev/null
+++ b/stages/2.The-Stack/Phase2-StackAsBuffer/17_ReverseUntil0/ini.asm
@@ -0,0 +1,16 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: Reverse Until 0
+    ; INで値を読み続け、0が来たら終了
+    ; それまでの値を逆順で sys_write する（0は出力しない）
+    
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/2.The-Stack/Phase2-StackAsBuffer/17_ReverseUntil0/test.sh b/stages/2.The-Stack/Phase2-StackAsBuffer/17_ReverseUntil0/test.sh
new file mode 100644
index 0000000..133c76f
--- /dev/null
+++ b/stages/2.The-Stack/Phase2-StackAsBuffer/17_ReverseUntil0/test.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(git rev-parse --show-toplevel)"
+STAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+cargo run --quiet --manifest-path "$ROOT_DIR/src-tauri/Cargo.toml" --bin stage_runner -- \
+  --level-id "17_ReverseUntil0" \
+  --asm "$STAGE_DIR/collect.asm"
+
diff --git a/stages/2.The-Stack/Phase2-StackAsBuffer/18_SumFromStack.md b/stages/2.The-Stack/Phase2-StackAsBuffer/18_SumFromStack.md
deleted file mode 100644
index 3b14e10..0000000
--- a/stages/2.The-Stack/Phase2-StackAsBuffer/18_SumFromStack.md
+++ /dev/null
@@ -1,78 +0,0 @@
-グランドステージ: 2.The Stack
-
-フェーズ: Phase 2 - Stack as Buffer
-
-ステージ名: Sum From Stack
-
-ステージ内容: 0が来るまで入力をpushし、最後にpopしながら合計してsys_writeで出力する
-
-学習ポイント: in, push, pop, add, sys_write, ループ, 「読み取りフェーズ」と「計算フェーズ」の分離
-
-ユーザーに初期状態で表示するコード
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: Sum From Stack
-    ; INで 0 が来るまで読み、全てをpush
-    ; その後 pop しながら合計し、sys_writeで出力する（0は含めない）
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
-
-正解コード(あくまでも模範解答。ユーザーが出したコードが動けば正解とする)
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    xor rcx, rcx          ; count = 0
-
-.read_loop:
-    in rax
-    cmp rax, 0
-    jz .read_done
-    push rax
-    inc rcx
-    jmp .read_loop
-
-.read_done:
-    xor rbx, rbx          ; sum = 0
-
-.sum_loop:
-    cmp rcx, 0
-    jz .done
-    pop rax
-    add rbx, rax
-    dec rcx
-    jmp .sum_loop
-
-.done:
-    mov rax, rbx
-    
-    ; write(1, buf, 1)
-    mov rsi, buf
-    mov [rsi], rax
-    mov rax, 1
-    mov rdi, 1
-    mov rsi, buf
-    mov rdx, 1
-    syscall
-
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
diff --git a/stages/2.The-Stack/Phase2-StackAsBuffer/18_SumFromStack/18_SumFromStack.md b/stages/2.The-Stack/Phase2-StackAsBuffer/18_SumFromStack/18_SumFromStack.md
new file mode 100644
index 0000000..550fb66
--- /dev/null
+++ b/stages/2.The-Stack/Phase2-StackAsBuffer/18_SumFromStack/18_SumFromStack.md
@@ -0,0 +1,10 @@
+グランドステージ: 2.The Stack
+
+フェーズ: Phase 2 - Stack as Buffer
+
+ステージ名: Sum From Stack
+
+ステージ内容: 0が来るまで入力をpushし、最後にpopしながら合計してsys_writeで出力する
+
+学習ポイント: in（疑似命令）, push, pop, add, sys_write, ループ, 読み取りと計算の分離
+
diff --git a/stages/2.The-Stack/Phase2-StackAsBuffer/18_SumFromStack/collect.asm b/stages/2.The-Stack/Phase2-StackAsBuffer/18_SumFromStack/collect.asm
new file mode 100644
index 0000000..8fbed56
--- /dev/null
+++ b/stages/2.The-Stack/Phase2-StackAsBuffer/18_SumFromStack/collect.asm
@@ -0,0 +1,45 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    xor rcx, rcx          ; count = 0
+
+.read_loop:
+    in rax
+    cmp rax, 0
+    jz .read_done
+    push rax
+    inc rcx
+    jmp .read_loop
+
+.read_done:
+    xor rbx, rbx          ; sum = 0
+
+.sum_loop:
+    cmp rcx, 0
+    jz .done
+    pop rax
+    add rbx, rax
+    dec rcx
+    jmp .sum_loop
+
+.done:
+    mov rax, rbx
+    
+    ; write(1, buf, 1)
+    mov rsi, buf
+    mov [rsi], rax
+    mov rax, 1
+    mov rdi, 1
+    mov rsi, buf
+    mov rdx, 1
+    syscall
+
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/2.The-Stack/Phase2-StackAsBuffer/18_SumFromStack/ini.asm b/stages/2.The-Stack/Phase2-StackAsBuffer/18_SumFromStack/ini.asm
new file mode 100644
index 0000000..7fdf212
--- /dev/null
+++ b/stages/2.The-Stack/Phase2-StackAsBuffer/18_SumFromStack/ini.asm
@@ -0,0 +1,16 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: Sum From Stack
+    ; INで 0 が来るまで読み、全てをpush
+    ; その後 pop しながら合計し、sys_writeで出力する（0は含めない）
+    
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/2.The-Stack/Phase2-StackAsBuffer/18_SumFromStack/test.sh b/stages/2.The-Stack/Phase2-StackAsBuffer/18_SumFromStack/test.sh
new file mode 100644
index 0000000..1b4649e
--- /dev/null
+++ b/stages/2.The-Stack/Phase2-StackAsBuffer/18_SumFromStack/test.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(git rev-parse --show-toplevel)"
+STAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+cargo run --quiet --manifest-path "$ROOT_DIR/src-tauri/Cargo.toml" --bin stage_runner -- \
+  --level-id "18_SumFromStack" \
+  --asm "$STAGE_DIR/collect.asm"
+
diff --git a/stages/2.The-Stack/Phase3-StackAlgorithms/19_SafePop.md b/stages/2.The-Stack/Phase3-StackAlgorithms/19_SafePop.md
deleted file mode 100644
index 08ff700..0000000
--- a/stages/2.The-Stack/Phase3-StackAlgorithms/19_SafePop.md
+++ /dev/null
@@ -1,94 +0,0 @@
-グランドステージ: 2.The Stack
-
-フェーズ: Phase 3 - Stack Algorithms
-
-ステージ名: Safe Pop
-
-ステージ内容: 操作トークン列を処理し、空のスタックからpopしないように制御する
-
-学習ポイント: cmp, jz, js, ループ, 深さカウンタ（stack depth）, push/popの安全運用, sys_write
-
-入力仕様:
-- 0: 終了
-- 1: 「次の値」を読み、その値をpushする
-- -1: 可能ならpopして捨てる（空なら何もしない）
-
-出力仕様:
-- 最終的なスタック深さを sys_write で出力する
-
-ユーザーに初期状態で表示するコード
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: Safe Pop
-    ; トークン列を処理して、空popを防ぐ
-    ; 最終的な深さを sys_write で出力する
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
-
-正解コード(あくまでも模範解答。ユーザーが出したコードが動けば正解とする)
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    xor rcx, rcx          ; depth = 0
-
-.loop:
-    in rax
-    cmp rax, 0
-    jz .done
-
-    cmp rax, 1
-    jz .do_push
-
-    cmp rax, -1
-    jz .do_pop
-
-    ; unknown token -> ignore
-    jmp .loop
-
-.do_push:
-    in rax                ; read value
-    push rax
-    inc rcx
-    jmp .loop
-
-.do_pop:
-    cmp rcx, 0
-    jz .loop              ; nothing to pop
-    pop rbx               ; discard
-    dec rcx
-    jmp .loop
-
-.done:
-    mov rax, rcx
-    
-    ; write(1, buf, 1)
-    mov rsi, buf
-    mov [rsi], rax
-    mov rax, 1
-    mov rdi, 1
-    mov rsi, buf
-    mov rdx, 1
-    syscall
-
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
diff --git a/stages/2.The-Stack/Phase3-StackAlgorithms/19_SafePop/19_SafePop.md b/stages/2.The-Stack/Phase3-StackAlgorithms/19_SafePop/19_SafePop.md
new file mode 100644
index 0000000..266159e
--- /dev/null
+++ b/stages/2.The-Stack/Phase3-StackAlgorithms/19_SafePop/19_SafePop.md
@@ -0,0 +1,16 @@
+グランドステージ: 2.The Stack
+
+フェーズ: Phase 3 - Stack Algorithms
+
+ステージ名: Safe Pop
+
+ステージ内容: 操作トークン列を処理し、空のスタックからpopしないように制御する
+
+入力仕様:
+- 0: 終了
+- 1: 「次の値」を読み、その値をpushする
+- -1: 可能ならpopして捨てる（空なら何もしない）
+
+出力仕様:
+- 最終的なスタック深さを sys_write で出力する
+
diff --git a/stages/2.The-Stack/Phase3-StackAlgorithms/19_SafePop/collect.asm b/stages/2.The-Stack/Phase3-StackAlgorithms/19_SafePop/collect.asm
new file mode 100644
index 0000000..8a6c89f
--- /dev/null
+++ b/stages/2.The-Stack/Phase3-StackAlgorithms/19_SafePop/collect.asm
@@ -0,0 +1,53 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    xor rcx, rcx          ; depth = 0
+
+.loop:
+    in rax
+    cmp rax, 0
+    jz .done
+
+    cmp rax, 1
+    jz .do_push
+
+    cmp rax, -1
+    jz .do_pop
+
+    ; unknown token -> ignore
+    jmp .loop
+
+.do_push:
+    in rax                ; read value
+    push rax
+    inc rcx
+    jmp .loop
+
+.do_pop:
+    cmp rcx, 0
+    jz .loop              ; nothing to pop
+    pop rbx               ; discard
+    dec rcx
+    jmp .loop
+
+.done:
+    mov rax, rcx
+    
+    ; write(1, buf, 1)
+    mov rsi, buf
+    mov [rsi], rax
+    mov rax, 1
+    mov rdi, 1
+    mov rsi, buf
+    mov rdx, 1
+    syscall
+
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/2.The-Stack/Phase3-StackAlgorithms/19_SafePop/ini.asm b/stages/2.The-Stack/Phase3-StackAlgorithms/19_SafePop/ini.asm
new file mode 100644
index 0000000..6b6d8c9
--- /dev/null
+++ b/stages/2.The-Stack/Phase3-StackAlgorithms/19_SafePop/ini.asm
@@ -0,0 +1,16 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: Safe Pop
+    ; トークン列を処理して、空popを防ぐ
+    ; 最終的な深さを sys_write で出力する
+    
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/2.The-Stack/Phase3-StackAlgorithms/19_SafePop/test.sh b/stages/2.The-Stack/Phase3-StackAlgorithms/19_SafePop/test.sh
new file mode 100644
index 0000000..5164c6c
--- /dev/null
+++ b/stages/2.The-Stack/Phase3-StackAlgorithms/19_SafePop/test.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(git rev-parse --show-toplevel)"
+STAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+cargo run --quiet --manifest-path "$ROOT_DIR/src-tauri/Cargo.toml" --bin stage_runner -- \
+  --level-id "19_SafePop" \
+  --asm "$STAGE_DIR/collect.asm"
+
diff --git a/stages/2.The-Stack/Phase3-StackAlgorithms/20_RPN_AddOnly.md b/stages/2.The-Stack/Phase3-StackAlgorithms/20_RPN_AddOnly.md
deleted file mode 100644
index a1e67e3..0000000
--- a/stages/2.The-Stack/Phase3-StackAlgorithms/20_RPN_AddOnly.md
+++ /dev/null
@@ -1,83 +0,0 @@
-グランドステージ: 2.The Stack
-
-フェーズ: Phase 3 - Stack Algorithms
-
-ステージ名: RPN (Add Only)
-
-ステージ内容: 逆ポーランド記法（RPN）の簡易計算を行う（加算のみ）
-
-学習ポイント: スタック計算, pop順序, ループ, 分岐
-
-入力仕様:
-- 0: 終了
-- 正の値: push
-- -1: ADD（2つpopして足し、結果をpush）
-
-出力仕様:
-- 終了時点のスタックtopを sys_write で出力する
-
-ユーザーに初期状態で表示するコード
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: RPN (Add Only)
-    ; RPNトークン列を処理し、最後にtopをsys_writeで出力する
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
-
-正解コード(あくまでも模範解答。ユーザーが出したコードが動けば正解とする)
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-.loop:
-    in rax
-    cmp rax, 0
-    jz .done
-
-    cmp rax, -1
-    jz .add
-
-    ; push number
-    push rax
-    jmp .loop
-
-.add:
-    pop rbx
-    pop rcx
-    add rcx, rbx
-    push rcx
-    jmp .loop
-
-.done:
-    pop rax
-    
-    ; write(1, buf, 1)
-    mov rsi, buf
-    mov [rsi], rax
-    mov rax, 1
-    mov rdi, 1
-    mov rsi, buf
-    mov rdx, 1
-    syscall
-
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
diff --git a/stages/2.The-Stack/Phase3-StackAlgorithms/20_RPN_AddOnly/20_RPN_AddOnly.md b/stages/2.The-Stack/Phase3-StackAlgorithms/20_RPN_AddOnly/20_RPN_AddOnly.md
new file mode 100644
index 0000000..e3c8119
--- /dev/null
+++ b/stages/2.The-Stack/Phase3-StackAlgorithms/20_RPN_AddOnly/20_RPN_AddOnly.md
@@ -0,0 +1,16 @@
+グランドステージ: 2.The Stack
+
+フェーズ: Phase 3 - Stack Algorithms
+
+ステージ名: RPN (Add Only)
+
+ステージ内容: 逆ポーランド記法（RPN）の簡易計算を行う（加算のみ）
+
+入力仕様:
+- 0: 終了
+- 正の値: push
+- -1: ADD（2つpopして足し、結果をpush）
+
+出力仕様:
+- 終了時点のスタックtopを sys_write で出力する
+
diff --git a/stages/2.The-Stack/Phase3-StackAlgorithms/20_RPN_AddOnly/collect.asm b/stages/2.The-Stack/Phase3-StackAlgorithms/20_RPN_AddOnly/collect.asm
new file mode 100644
index 0000000..bedb72b
--- /dev/null
+++ b/stages/2.The-Stack/Phase3-StackAlgorithms/20_RPN_AddOnly/collect.asm
@@ -0,0 +1,43 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+.loop:
+    in rax
+    cmp rax, 0
+    jz .done
+
+    cmp rax, -1
+    jz .add
+
+    ; push number
+    push rax
+    jmp .loop
+
+.add:
+    pop rbx
+    pop rcx
+    add rcx, rbx
+    push rcx
+    jmp .loop
+
+.done:
+    pop rax
+    
+    ; write(1, buf, 1)
+    mov rsi, buf
+    mov [rsi], rax
+    mov rax, 1
+    mov rdi, 1
+    mov rsi, buf
+    mov rdx, 1
+    syscall
+
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/2.The-Stack/Phase3-StackAlgorithms/20_RPN_AddOnly/ini.asm b/stages/2.The-Stack/Phase3-StackAlgorithms/20_RPN_AddOnly/ini.asm
new file mode 100644
index 0000000..2fd4a91
--- /dev/null
+++ b/stages/2.The-Stack/Phase3-StackAlgorithms/20_RPN_AddOnly/ini.asm
@@ -0,0 +1,15 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: RPN (Add Only)
+    ; RPNトークン列を処理し、最後にtopをsys_writeで出力する
+    
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/2.The-Stack/Phase3-StackAlgorithms/20_RPN_AddOnly/test.sh b/stages/2.The-Stack/Phase3-StackAlgorithms/20_RPN_AddOnly/test.sh
new file mode 100644
index 0000000..ff4da85
--- /dev/null
+++ b/stages/2.The-Stack/Phase3-StackAlgorithms/20_RPN_AddOnly/test.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(git rev-parse --show-toplevel)"
+STAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+cargo run --quiet --manifest-path "$ROOT_DIR/src-tauri/Cargo.toml" --bin stage_runner -- \
+  --level-id "20_RPN_AddOnly" \
+  --asm "$STAGE_DIR/collect.asm"
+
diff --git a/stages/2.The-Stack/Phase3-StackAlgorithms/21_Sort3.md b/stages/2.The-Stack/Phase3-StackAlgorithms/21_Sort3.md
deleted file mode 100644
index 5993d2a..0000000
--- a/stages/2.The-Stack/Phase3-StackAlgorithms/21_Sort3.md
+++ /dev/null
@@ -1,93 +0,0 @@
-グランドステージ: 2.The Stack
-
-フェーズ: Phase 3 - Stack Algorithms
-
-ステージ名: Sort 3
-
-ステージ内容: 3つの入力(A, B, C)を昇順に並べ替えて出力する（sys_write）
-
-学習ポイント: cmp, js, jz, 条件分岐, swap（スタックを一時退避に使う）, sys_write
-
-出力仕様:
-- sys_writeで昇順（小→大）に3つ出力する
-
-ユーザーに初期状態で表示するコード
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: Sort 3
-    ; INで3値を読み、昇順にして sys_write する
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
-
-正解コード(あくまでも模範解答。ユーザーが出したコードが動けば正解とする)
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    ; read A,B,C
-    in rax
-    in rbx
-    in rcx
-
-    ; if A > B then swap(A,B)
-    cmp rax, rbx
-    js .ab_ok
-    jz .ab_ok
-    push rax
-    mov rax, rbx
-    pop rbx
-.ab_ok:
-
-    ; if B > C then swap(B,C)
-    cmp rbx, rcx
-    js .bc_ok
-    jz .bc_ok
-    push rbx
-    mov rbx, rcx
-    pop rcx
-.bc_ok:
-
-    ; again: if A > B then swap(A,B)
-    cmp rax, rbx
-    js .ab2_ok
-    jz .ab2_ok
-    push rax
-    mov rax, rbx
-    pop rbx
-.ab2_ok:
-
-    mov rsi, buf
-    mov [rsi], rax
-    inc rsi
-    mov [rsi], rbx
-    inc rsi
-    mov [rsi], rcx
-    
-    ; write(1, buf, 3)
-    mov rax, 1
-    mov rdi, 1
-    mov rsi, buf
-    mov rdx, 3
-    syscall
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
diff --git a/stages/2.The-Stack/Phase3-StackAlgorithms/21_Sort3/21_Sort3.md b/stages/2.The-Stack/Phase3-StackAlgorithms/21_Sort3/21_Sort3.md
new file mode 100644
index 0000000..5adafc2
--- /dev/null
+++ b/stages/2.The-Stack/Phase3-StackAlgorithms/21_Sort3/21_Sort3.md
@@ -0,0 +1,11 @@
+グランドステージ: 2.The Stack
+
+フェーズ: Phase 3 - Stack Algorithms
+
+ステージ名: Sort 3
+
+ステージ内容: 3つの入力(A, B, C)を昇順に並べ替えて出力する（sys_write）
+
+出力仕様:
+- sys_writeで昇順（小→大）に3つ出力する
+
diff --git a/stages/2.The-Stack/Phase3-StackAlgorithms/21_Sort3/collect.asm b/stages/2.The-Stack/Phase3-StackAlgorithms/21_Sort3/collect.asm
new file mode 100644
index 0000000..f9e36f3
--- /dev/null
+++ b/stages/2.The-Stack/Phase3-StackAlgorithms/21_Sort3/collect.asm
@@ -0,0 +1,58 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; read A,B,C
+    in rax
+    in rbx
+    in rcx
+
+    ; if A > B then swap(A,B)
+    cmp rax, rbx
+    js .ab_ok
+    jz .ab_ok
+    push rax
+    mov rax, rbx
+    pop rbx
+.ab_ok:
+
+    ; if B > C then swap(B,C)
+    cmp rbx, rcx
+    js .bc_ok
+    jz .bc_ok
+    push rbx
+    mov rbx, rcx
+    pop rcx
+.bc_ok:
+
+    ; again: if A > B then swap(A,B)
+    cmp rax, rbx
+    js .ab2_ok
+    jz .ab2_ok
+    push rax
+    mov rax, rbx
+    pop rbx
+.ab2_ok:
+
+    mov rsi, buf
+    mov [rsi], rax
+    inc rsi
+    mov [rsi], rbx
+    inc rsi
+    mov [rsi], rcx
+    
+    ; write(1, buf, 3)
+    mov rax, 1
+    mov rdi, 1
+    mov rsi, buf
+    mov rdx, 3
+    syscall
+    
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/2.The-Stack/Phase3-StackAlgorithms/21_Sort3/ini.asm b/stages/2.The-Stack/Phase3-StackAlgorithms/21_Sort3/ini.asm
new file mode 100644
index 0000000..d949da0
--- /dev/null
+++ b/stages/2.The-Stack/Phase3-StackAlgorithms/21_Sort3/ini.asm
@@ -0,0 +1,15 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: Sort 3
+    ; INで3値を読み、昇順にして sys_write する
+    
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/2.The-Stack/Phase3-StackAlgorithms/21_Sort3/test.sh b/stages/2.The-Stack/Phase3-StackAlgorithms/21_Sort3/test.sh
new file mode 100644
index 0000000..0683e14
--- /dev/null
+++ b/stages/2.The-Stack/Phase3-StackAlgorithms/21_Sort3/test.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(git rev-parse --show-toplevel)"
+STAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+cargo run --quiet --manifest-path "$ROOT_DIR/src-tauri/Cargo.toml" --bin stage_runner -- \
+  --level-id "21_Sort3" \
+  --asm "$STAGE_DIR/collect.asm"
+
diff --git a/stages/2.The-Stack/Phase3-StackAlgorithms/22_Rotate3.md b/stages/2.The-Stack/Phase3-StackAlgorithms/22_Rotate3.md
deleted file mode 100644
index fe03ab5..0000000
--- a/stages/2.The-Stack/Phase3-StackAlgorithms/22_Rotate3.md
+++ /dev/null
@@ -1,76 +0,0 @@
-グランドステージ: 2.The Stack
-
-フェーズ: Phase 3 - Stack Algorithms
-
-ステージ名: Rotate 3
-
-ステージ内容: 3つの入力(A, B, C)を読み、B→C→A の順に出力する（sys_write）
-
-学習ポイント: push/popでの並べ替え, 一時退避レジスタ, sys_write
-
-出力仕様:
-- sys_writeで B, C, A の順に出力する
-
-ユーザーに初期状態で表示するコード
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: Rotate 3
-    ; INで A,B,C を読み、sys_writeで B,C,A を出力する
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
-
-正解コード(あくまでも模範解答。ユーザーが出したコードが動けば正解とする)
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    ; push A,B,C
-    in rax
-    push rax
-    in rax
-    push rax
-    in rax
-    push rax
-
-    ; pop C to temp
-    pop r8
-
-    ; write B, C, A into buf
-    mov rsi, buf
-    pop rax              ; B
-    mov [rsi], rax
-    inc rsi
-    mov rax, r8          ; C
-    mov [rsi], rax
-    inc rsi
-    pop rax              ; A
-    mov [rsi], rax
-
-    ; write(1, buf, 3)
-    mov rax, 1
-    mov rdi, 1
-    mov rsi, buf
-    mov rdx, 3
-    syscall
-
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
diff --git a/stages/2.The-Stack/Phase3-StackAlgorithms/22_Rotate3/22_Rotate3.md b/stages/2.The-Stack/Phase3-StackAlgorithms/22_Rotate3/22_Rotate3.md
new file mode 100644
index 0000000..70f32df
--- /dev/null
+++ b/stages/2.The-Stack/Phase3-StackAlgorithms/22_Rotate3/22_Rotate3.md
@@ -0,0 +1,11 @@
+グランドステージ: 2.The Stack
+
+フェーズ: Phase 3 - Stack Algorithms
+
+ステージ名: Rotate 3
+
+ステージ内容: 3つの入力(A, B, C)を読み、B→C→A の順に出力する（sys_write）
+
+出力仕様:
+- sys_writeで B, C, A の順に出力する
+
diff --git a/stages/2.The-Stack/Phase3-StackAlgorithms/22_Rotate3/collect.asm b/stages/2.The-Stack/Phase3-StackAlgorithms/22_Rotate3/collect.asm
new file mode 100644
index 0000000..73d24a5
--- /dev/null
+++ b/stages/2.The-Stack/Phase3-StackAlgorithms/22_Rotate3/collect.asm
@@ -0,0 +1,41 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; push A,B,C
+    in rax
+    push rax
+    in rax
+    push rax
+    in rax
+    push rax
+
+    ; pop C to temp
+    pop r8
+
+    ; write B, C, A into buf
+    mov rsi, buf
+    pop rax              ; B
+    mov [rsi], rax
+    inc rsi
+    mov rax, r8          ; C
+    mov [rsi], rax
+    inc rsi
+    pop rax              ; A
+    mov [rsi], rax
+
+    ; write(1, buf, 3)
+    mov rax, 1
+    mov rdi, 1
+    mov rsi, buf
+    mov rdx, 3
+    syscall
+
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/2.The-Stack/Phase3-StackAlgorithms/22_Rotate3/ini.asm b/stages/2.The-Stack/Phase3-StackAlgorithms/22_Rotate3/ini.asm
new file mode 100644
index 0000000..3ae1d75
--- /dev/null
+++ b/stages/2.The-Stack/Phase3-StackAlgorithms/22_Rotate3/ini.asm
@@ -0,0 +1,15 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: Rotate 3
+    ; INで A,B,C を読み、sys_writeで B,C,A を出力する
+    
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/2.The-Stack/Phase3-StackAlgorithms/22_Rotate3/test.sh b/stages/2.The-Stack/Phase3-StackAlgorithms/22_Rotate3/test.sh
new file mode 100644
index 0000000..8073af0
--- /dev/null
+++ b/stages/2.The-Stack/Phase3-StackAlgorithms/22_Rotate3/test.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(git rev-parse --show-toplevel)"
+STAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+cargo run --quiet --manifest-path "$ROOT_DIR/src-tauri/Cargo.toml" --bin stage_runner -- \
+  --level-id "22_Rotate3" \
+  --asm "$STAGE_DIR/collect.asm"
+
diff --git a/stages/2.The-Stack/Phase3-StackAlgorithms/23_MinMaxFromStack/23_MinMaxFromStack.md b/stages/2.The-Stack/Phase3-StackAlgorithms/23_MinMaxFromStack/23_MinMaxFromStack.md
new file mode 100644
index 0000000..d9db3bd
--- /dev/null
+++ b/stages/2.The-Stack/Phase3-StackAlgorithms/23_MinMaxFromStack/23_MinMaxFromStack.md
@@ -0,0 +1,15 @@
+グランドステージ: 2.The Stack
+
+フェーズ: Phase 3 - Stack Algorithms
+
+ステージ名: Min & Max From Stack
+
+ステージ内容: 0が来るまで入力をpushし、popしながら最小値と最大値を求めて出力する
+
+入力仕様:
+- 0: 終了
+- それ以外: 対象データ（少なくとも1つは与えられる）
+
+出力仕様:
+- sys_writeで「最小値→最大値」の順に出力する
+
diff --git a/stages/2.The-Stack/Phase3-StackAlgorithms/23_MinMaxFromStack.md b/stages/2.The-Stack/Phase3-StackAlgorithms/23_MinMaxFromStack/collect.asm
similarity index 50%
rename from stages/2.The-Stack/Phase3-StackAlgorithms/23_MinMaxFromStack.md
rename to stages/2.The-Stack/Phase3-StackAlgorithms/23_MinMaxFromStack/collect.asm
index bca90d9..60ffc2d 100644
--- a/stages/2.The-Stack/Phase3-StackAlgorithms/23_MinMaxFromStack.md
+++ b/stages/2.The-Stack/Phase3-StackAlgorithms/23_MinMaxFromStack/collect.asm
@@ -1,42 +1,3 @@
-グランドステージ: 2.The Stack
-
-フェーズ: Phase 3 - Stack Algorithms
-
-ステージ名: Min & Max From Stack
-
-ステージ内容: 0が来るまで入力をpushし、popしながら最小値と最大値を求めて出力する
-
-学習ポイント: スタックでのバッファリング, cmp/jsによる大小判定, ループ, sys_write
-
-入力仕様:
-- 0: 終了
-- それ以外: 対象データ（少なくとも1つは与えられる）
-
-出力仕様:
-- sys_writeで「最小値→最大値」の順に出力する
-
-ユーザーに初期状態で表示するコード
-
-```asm
-section .bss
-    buf resb 16
-
-section .text
-    global _start
-
-_start:
-    ; MISSION: Min & Max From Stack
-    ; 0が来るまで値を読み、最後に min と max を sys_write する
-    
-    ; exit(0)
-    mov rax, 60
-    xor rdi, rdi
-    syscall
-```
-
-正解コード(あくまでも模範解答。ユーザーが出したコードが動けば正解とする)
-
-```asm
 section .bss
     buf resb 16
 
@@ -107,4 +68,4 @@ _start:
     mov rax, 60
     xor rdi, rdi
     syscall
-```
+
diff --git a/stages/2.The-Stack/Phase3-StackAlgorithms/23_MinMaxFromStack/ini.asm b/stages/2.The-Stack/Phase3-StackAlgorithms/23_MinMaxFromStack/ini.asm
new file mode 100644
index 0000000..4aaf49d
--- /dev/null
+++ b/stages/2.The-Stack/Phase3-StackAlgorithms/23_MinMaxFromStack/ini.asm
@@ -0,0 +1,15 @@
+section .bss
+    buf resb 16
+
+section .text
+    global _start
+
+_start:
+    ; MISSION: Min & Max From Stack
+    ; 0が来るまで値を読み、最後に min と max を sys_write する
+    
+    ; exit(0)
+    mov rax, 60
+    xor rdi, rdi
+    syscall
+
diff --git a/stages/2.The-Stack/Phase3-StackAlgorithms/23_MinMaxFromStack/test.sh b/stages/2.The-Stack/Phase3-StackAlgorithms/23_MinMaxFromStack/test.sh
new file mode 100644
index 0000000..17874fb
--- /dev/null
+++ b/stages/2.The-Stack/Phase3-StackAlgorithms/23_MinMaxFromStack/test.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(git rev-parse --show-toplevel)"
+STAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+cargo run --quiet --manifest-path "$ROOT_DIR/src-tauri/Cargo.toml" --bin stage_runner -- \
+  --level-id "23_MinMaxFromStack" \
+  --asm "$STAGE_DIR/collect.asm"
+